From f638832dc85164abc6a1e995204fffce65d016b8 Mon Sep 17 00:00:00 2001 From: Niko PLP Date: Mon, 21 Apr 2025 12:37:13 +0300 Subject: [PATCH] remving logs --- helpers/app-auth/src/App.svelte | 4 ++-- helpers/app-auth/src/main.ts | 10 +++++----- helpers/app-auth/src/worker.js | 4 ++-- helpers/net-auth/src/App.svelte | 4 ++-- helpers/net-auth/src/lib/Home.svelte | 4 ++-- helpers/net-auth/src/main.ts | 4 ++-- helpers/net-bootstrap/src/main.ts | 18 +++++++++--------- helpers/nextgraphweb/package.json | 2 +- helpers/nextgraphweb/src/index.ts | 8 ++++---- ng-app/src/store.ts | 4 ++-- .../example-webapp-react/package-lock.json | 16 ++++++++-------- ng-sdk-js/example-webapp-react/package.json | 4 ++-- .../example-webapp-react/src/MakeContact.tsx | 14 ++++++++------ .../src/createBrowserNGReactMethods.tsx | 6 +++--- ng-sdk-js/example-webapp-vite/package.json | 3 ++- ng-sdk-js/example-webapp-vite/src/main.js | 14 +++++++------- 16 files changed, 61 insertions(+), 58 deletions(-) diff --git a/helpers/app-auth/src/App.svelte b/helpers/app-auth/src/App.svelte index ec5f6aa..8d1f17e 100644 --- a/helpers/app-auth/src/App.svelte +++ b/helpers/app-auth/src/App.svelte @@ -236,10 +236,10 @@ }); unsubscribe_session = active_session.subscribe(async (value) => { - console.log("active_session has changed", value) + //console.log("active_session has changed", value) if (value) { if ((window).ng_status_callback) { - console.log("writing loggedin to callback"); + //console.log("writing loggedin to callback"); (window).ng_status_callback.write({status:"loggedin", session:value}); } } else { diff --git a/helpers/app-auth/src/main.ts b/helpers/app-auth/src/main.ts index ccf39b6..03e03fd 100644 --- a/helpers/app-auth/src/main.ts +++ b/helpers/app-auth/src/main.ts @@ -40,7 +40,7 @@ const AUTH_HOME = "#/"; // const AUTH_WALLET = "#/wallet"; window.addEventListener("message", async (event)=>{ - console.log("got msg in app-auth",event) + //console.log("got msg in app-auth",event) const { method, port } = event.data; const writable = fromWritablePort(port); const writer = writable.getWriter(); @@ -49,7 +49,7 @@ window.addEventListener("message", async (event)=>{ writer.close(); } else if ( method === "init" ) { - console.log("app-auth init done, ng_status_callback set"); + //console.log("app-auth init done, ng_status_callback set"); (window).ng_status_callback = writer; manifest.set(event.data.manifest); @@ -70,7 +70,7 @@ window.addEventListener("message", async (event)=>{ } else if ( method === "doc_subscribe" ) { let args = event.data.args; - console.log("processing doc_subscribe...",method, args); + //console.log("processing doc_subscribe...",method, args); args.push((callbacked)=> { writer.write({stream:true, ret:callbacked}); }); @@ -87,7 +87,7 @@ window.addEventListener("message", async (event)=>{ } else { // forwarding to ng - console.log("processing...",method, event.data.args); + //console.log("processing...",method, event.data.args); try { let res = await Reflect.apply(web_api[method], null, event.data.args); writer.write({ok:true, ret:res}); @@ -101,7 +101,7 @@ window.addEventListener("message", async (event)=>{ }, false); -console.log("addEventListener for message in app-auth done") +//console.log("addEventListener for message in app-auth done") parent.postMessage({ready:true},origin); const app = new App({ diff --git a/helpers/app-auth/src/worker.js b/helpers/app-auth/src/worker.js index c39cc21..dd0d6eb 100644 --- a/helpers/app-auth/src/worker.js +++ b/helpers/app-auth/src/worker.js @@ -15,7 +15,7 @@ self.onmessage = (event) => { const { method, args, port } = event.data; const writable = fromWritablePort(port); const writer = writable.getWriter(); - console.log("Message received by worker", method, args); + //console.log("Message received by worker", method, args); let ret = await Reflect.apply(sdk[method], null, args); writer.write(ret); @@ -23,4 +23,4 @@ self.onmessage = (event) => { })(); } -console.log("worker loaded"); \ No newline at end of file +//console.log("worker loaded"); \ No newline at end of file diff --git a/helpers/net-auth/src/App.svelte b/helpers/net-auth/src/App.svelte index debe256..c669042 100644 --- a/helpers/net-auth/src/App.svelte +++ b/helpers/net-auth/src/App.svelte @@ -73,7 +73,7 @@ window.document.getElementById("app").className=""; let info = Bowser.parse(window.navigator.userAgent); - console.log(info); + //console.log(info); is_safari = info.browser.name == "Safari"; if (is_safari) return; @@ -108,7 +108,7 @@ } catch (e) { no_local_storage = true; - console.log("no access to localStorage") + console.log("no access to localStorage",e) } if (!no_local_storage) { diff --git a/helpers/net-auth/src/lib/Home.svelte b/helpers/net-auth/src/lib/Home.svelte index f63cf27..5b66a29 100644 --- a/helpers/net-auth/src/lib/Home.svelte +++ b/helpers/net-auth/src/lib/Home.svelte @@ -67,7 +67,7 @@ //remove this listener window.removeEventListener("message",ready_handler); const { readable, writablePort } = new RemoteReadableStream(); - console.log("sending init message to app-auth"); + //console.log("sending init message to app-auth"); (window).ng_broker_selected.postMessage({ method: "init", manifest:window.ng_manifest, port: writablePort }, (window).ng_iframe_origin, [writablePort]); const reader = readable.getReader(); for (var msg; msg = await reader.read(); ) { @@ -75,7 +75,7 @@ (window).ng_status_callback.close(); break; } else { - console.log("forwarding upstream",msg.value); + //console.log("forwarding upstream",msg.value); (window).ng_status_callback.write(msg.value); } } diff --git a/helpers/net-auth/src/main.ts b/helpers/net-auth/src/main.ts index da1cb50..0ccb1e0 100644 --- a/helpers/net-auth/src/main.ts +++ b/helpers/net-auth/src/main.ts @@ -96,11 +96,11 @@ window.addEventListener("message", async (event)=>{ } } else if ( method === "doc_subscribe" ) { - console.log("net forward doc_subscribe to app", method, event.data.args) + //console.log("net forward doc_subscribe to app", method, event.data.args) await rpc_stream(method, event.data.args, writer); } else { - console.log("net forward to app", method, event.data.args) + //console.log("net forward to app", method, event.data.args) // forward to app auth iframe writer.write(await rpc(method, event.data.args)); writer.close(); diff --git a/helpers/net-bootstrap/src/main.ts b/helpers/net-bootstrap/src/main.ts index 931d25c..53f1850 100644 --- a/helpers/net-bootstrap/src/main.ts +++ b/helpers/net-bootstrap/src/main.ts @@ -67,7 +67,7 @@ catch (e) { window.addEventListener("message", async (event)=>{ - console.log("net-bootstrap got msg", event.data, event.origin) + //console.log("net-bootstrap got msg", event.data, event.origin) const {method, port, msgs} = event.data; const writable = fromWritablePort(port); const writer = writable.getWriter(); @@ -93,9 +93,9 @@ window.addEventListener("message", async (event)=>{ } } localStorage - console.log("net-bootstrap writes back ok") + //console.log("net-bootstrap writes back ok") writer.write({status:'ok'}); - console.log(`localStorage on bootstrap ${location.origin} is ok`) + //console.log(`localStorage on bootstrap ${location.origin} is ok`) } catch (e) { console.log("net-bootstrap writes back error") writer.write({status:'error', error:e}); @@ -123,13 +123,13 @@ window.addEventListener("message", async (event)=>{ let key; - console.log("ng_bootstrap received msg",JSON.stringify(data), is_ng_box, is_domain,is_lan,is_local,new URL(event.origin).hostname, new URL(event.origin).hostname === data.domain, data.domain && is_domain && new URL(event.origin).hostname === data.domain ) + //console.log("ng_bootstrap received msg",JSON.stringify(data), is_ng_box, is_domain,is_lan,is_local,new URL(event.origin).hostname, new URL(event.origin).hostname === data.domain, data.domain && is_domain && new URL(event.origin).hostname === data.domain ) if (data.ngbox && (is_ng_box || is_lan || is_local || is_domain)) { key = "Self-hosted / NGbox"; } else if (data.domain && is_domain && new URL(event.origin).hostname === data.domain ) { key = data.domain; - console.log("key for domain is", key) + //console.log("key for domain is", key) } else if (data.localhost && (is_local || is_lan)) { if (!data.peer_id) { writer.write({status:'error', error:"missing peer_id of localhost"}); @@ -179,17 +179,17 @@ window.addEventListener("message", async (event)=>{ } let bootstraps = JSON.parse(ls.getItem("ng_bootstrap") || "{}"); for (const [i, key] of keys.entries()) { - console.log(method, method === "add",bootstraps, !bootstraps[key]) + //console.log(method, method === "add",bootstraps, !bootstraps[key]) const value = msgs[i]; if ( method === "add" && !bootstraps[key]) { - console.log("adding..."+key) + //console.log("adding..."+key) bootstraps[key] = value; if (channel) channel.postMessage({ key, value }); - console.log("added",key,value); + //console.log("added",key,value); } else if ( method === "remove" && bootstraps[key]) { delete bootstraps[key]; if (channel) channel.postMessage({ key }); - console.log("removed",key); + //console.log("removed",key); } } ls.setItem("ng_bootstrap",JSON.stringify(bootstraps)); diff --git a/helpers/nextgraphweb/package.json b/helpers/nextgraphweb/package.json index cd1368d..a3c1227 100644 --- a/helpers/nextgraphweb/package.json +++ b/helpers/nextgraphweb/package.json @@ -4,7 +4,7 @@ "Niko PLP " ], "description": "TS SDK of NextGraph for web apps", - "version": "0.1.1-alpha.3", + "version": "0.1.1-alpha.4", "license": "MIT/Apache-2.0", "repository": { "type": "git", diff --git a/helpers/nextgraphweb/src/index.ts b/helpers/nextgraphweb/src/index.ts index 8c4a7c2..dbe8bfa 100644 --- a/helpers/nextgraphweb/src/index.ts +++ b/helpers/nextgraphweb/src/index.ts @@ -136,7 +136,7 @@ function hide_nextgraph_auth() { async function rpc( method:string, args?: any) : Promise { const { readable, writablePort } = new RemoteReadableStream(); - console.log("POSTING",method, args); + //console.log("POSTING",method, args); if (method==="doc_subscribe") { let callback = args[2]; @@ -147,14 +147,14 @@ async function rpc( method:string, args?: any) : Promise { resolve(()=>{ // unsub function that does nothing. //TODO: implement it - console.log("unsubscribed!"); + //console.log("unsubscribed!"); }); for (var msg; msg = await reader.read(); ) { if (msg.done) break; if (msg.value.error) { throw new Error(msg.value.ret); } else if (msg.value.stream) { - console.log("GOT",msg.value.ret); + //console.log("GOT",msg.value.ret); (callback)(msg.value.ret); } // TODO: deal with end of stream @@ -166,7 +166,7 @@ async function rpc( method:string, args?: any) : Promise { initialized?.postMessage({ method, args, port: writablePort }, iframe_config.origin, [writablePort]); const reader = readable.getReader(); let ret = await reader.read(); - console.log(ret) + //console.log(ret) await reader.read(); // the close if (ret.value.ok) return ret.value.ret; diff --git a/ng-app/src/store.ts b/ng-app/src/store.ts index c35438b..069e449 100644 --- a/ng-app/src/store.ts +++ b/ng-app/src/store.ts @@ -26,11 +26,11 @@ let all_branches = {}; let retry_branches = {}; export const register_bootstrap = async function (bootstrap_iframe_msgs) { - console.log("register_bootstrap", bootstrap_iframe_msgs) + //console.log("register_bootstrap", bootstrap_iframe_msgs) let iframe = (window.document.getElementById('nextgraph-bootstrap-iframe'))?.contentWindow; if (!iframe) return false; const { readable, writablePort } = new RemoteReadableStream(); - console.log("adding", bootstrap_iframe_msgs, NG_BOOTSTRAP_IFRAME_ORIGIN) + //console.log("adding", bootstrap_iframe_msgs, NG_BOOTSTRAP_IFRAME_ORIGIN) iframe.postMessage({ method: "add", port:writablePort, msgs: bootstrap_iframe_msgs}, NG_BOOTSTRAP_IFRAME_ORIGIN, [writablePort]); const reader = readable.getReader(); let ret = await reader.read(); diff --git a/ng-sdk-js/example-webapp-react/package-lock.json b/ng-sdk-js/example-webapp-react/package-lock.json index 029fd1f..e2f4dbd 100644 --- a/ng-sdk-js/example-webapp-react/package-lock.json +++ b/ng-sdk-js/example-webapp-react/package-lock.json @@ -8,10 +8,10 @@ "name": "example-webapp-react", "version": "0.0.0", "dependencies": { - "@ldo/connected-nextgraph": "^1.0.0-alpha.7", + "@ldo/connected-nextgraph": "^1.0.0-alpha.8", "@ldo/ldo": "^1.0.0-alpha.3", "@ldo/react": "^1.0.0-alpha.3", - "nextgraphweb": "^0.1.1-alpha.1", + "nextgraphweb": "^0.1.1-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0" }, @@ -1126,9 +1126,9 @@ } }, "node_modules/@ldo/connected-nextgraph": { - "version": "1.0.0-alpha.7", - "resolved": "https://registry.npmjs.org/@ldo/connected-nextgraph/-/connected-nextgraph-1.0.0-alpha.7.tgz", - "integrity": "sha512-hzu9Vu+1jMIty86pLrNuz26ux0PAm7QCwanw2ztllsyjo0hnHesZ3PF1o6tMKM9tQ5FIS0G8QhyEIdiuOTIj/A==", + "version": "1.0.0-alpha.8", + "resolved": "https://registry.npmjs.org/@ldo/connected-nextgraph/-/connected-nextgraph-1.0.0-alpha.8.tgz", + "integrity": "sha512-+EYEgt9FUAOk4ZcqNO9IygPSFWzD/LoasCFOqP7lhLVcl5b+AEmvAKylBA/h9VR5Mvpz5JUwJgkLJ0yhjyvghA==", "license": "MIT", "dependencies": { "@ldo/connected": "^1.0.0-alpha.3", @@ -4366,9 +4366,9 @@ "license": "MIT" }, "node_modules/nextgraphweb": { - "version": "0.1.1-alpha.1", - "resolved": "https://registry.npmjs.org/nextgraphweb/-/nextgraphweb-0.1.1-alpha.1.tgz", - "integrity": "sha512-4+a0YpB/hr3IhDWwK/SiOqrnNihSDBKSOzdAVOZ2MlZhaeEpOJREryOgoJq7ZfMHqYrGtGetdwZXViRdY03f6A==", + "version": "0.1.1-alpha.4", + "resolved": "https://registry.npmjs.org/nextgraphweb/-/nextgraphweb-0.1.1-alpha.4.tgz", + "integrity": "sha512-2vX7+VAx7pp+iJG/KrzWJhzwgur04WdZegkjAOQHCSpVa5Q+3CYN+Jyo3A+BHjpXJmr/jWyVZRJr/K/lRXhnfg==", "license": "MIT/Apache-2.0", "dependencies": { "async-proxy": "^0.4.1", diff --git a/ng-sdk-js/example-webapp-react/package.json b/ng-sdk-js/example-webapp-react/package.json index c5a6367..98b2d11 100644 --- a/ng-sdk-js/example-webapp-react/package.json +++ b/ng-sdk-js/example-webapp-react/package.json @@ -11,10 +11,10 @@ "build:ldo": "ldo build --input src/.shapes --output src/.ldo" }, "dependencies": { - "@ldo/connected-nextgraph": "^1.0.0-alpha.7", + "@ldo/connected-nextgraph": "^1.0.0-alpha.8", "@ldo/ldo": "^1.0.0-alpha.3", "@ldo/react": "^1.0.0-alpha.3", - "nextgraphweb": "^0.1.1-alpha.3", + "nextgraphweb": "^0.1.1-alpha.4", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/ng-sdk-js/example-webapp-react/src/MakeContact.tsx b/ng-sdk-js/example-webapp-react/src/MakeContact.tsx index a78438c..d40d3cc 100644 --- a/ng-sdk-js/example-webapp-react/src/MakeContact.tsx +++ b/ng-sdk-js/example-webapp-react/src/MakeContact.tsx @@ -12,12 +12,14 @@ export const MakeContact: FunctionComponent = () => { const onSubmit = useCallback( async (e: FormEvent) => { e.preventDefault(); - - if (name.trim().length > 2 && email.trim().length > 6 && email.indexOf("@") >= 0) { - + const new_name = name.trim(); + const new_email = email.trim(); + if (new_name.trim().length > 2 && new_email.trim().length > 6 && new_email.indexOf("@") >= 0) { + setName(""); + setEmail(""); const resource = await dataset.createResource("nextgraph"); if (!resource.isError) { - console.log("Created resource:", resource.uri); + //console.log("Created resource:", resource.uri); const contact = createData( NGSocialContactShapeType, @@ -26,8 +28,8 @@ export const MakeContact: FunctionComponent = () => { ); contact.type = { "@id": "Individual" }; - contact.fn = name.trim(); - contact.hasEmail = email.trim(); + contact.fn = new_name; + contact.hasEmail = new_email; const result = await commitData(contact); if (result.isError) { console.error(result.message); diff --git a/ng-sdk-js/example-webapp-react/src/createBrowserNGReactMethods.tsx b/ng-sdk-js/example-webapp-react/src/createBrowserNGReactMethods.tsx index 8a665c3..4a46dd6 100644 --- a/ng-sdk-js/example-webapp-react/src/createBrowserNGReactMethods.tsx +++ b/ng-sdk-js/example-webapp-react/src/createBrowserNGReactMethods.tsx @@ -27,14 +27,14 @@ export function createBrowserNGReactMethods( const [ranInitialAuthCheck, setRanInitialAuthCheck] = useState(false); const runInitialAuthCheck = useCallback(async () => { - console.log("runInitialAuthCheck called", ranInitialAuthCheck) + //console.log("runInitialAuthCheck called", ranInitialAuthCheck) if (ranInitialAuthCheck) return; - console.log("init called"); + //console.log("init called"); setRanInitialAuthCheck(true); // TODO: export the types for the session object coming from NG. await init( (event: { status: string; session: { session_id: unknown; protected_store_id: unknown; private_store_id: unknown; public_store_id: unknown; }; }) => { - console.log("called back in react", event) + //console.log("called back in react", event) // callback // once you receive event.status == "loggedin" diff --git a/ng-sdk-js/example-webapp-vite/package.json b/ng-sdk-js/example-webapp-vite/package.json index acdd1c4..c575ff9 100644 --- a/ng-sdk-js/example-webapp-vite/package.json +++ b/ng-sdk-js/example-webapp-vite/package.json @@ -27,6 +27,7 @@ "vite": "^6.2.6" }, "dependencies": { - "@ldo/connected-nextgraph": "^1.0.0-alpha.6" + "@ldo/connected-nextgraph": "^1.0.0-alpha.8", + "nextgraphweb": "^0.1.1-alpha.4" } } diff --git a/ng-sdk-js/example-webapp-vite/src/main.js b/ng-sdk-js/example-webapp-vite/src/main.js index c20d0bb..2f666bc 100644 --- a/ng-sdk-js/example-webapp-vite/src/main.js +++ b/ng-sdk-js/example-webapp-vite/src/main.js @@ -15,12 +15,12 @@ const ldoDataset = createNextGraphLdoDataset(); init( async (event) => { // callback // event.status: "loggedin"... - console.log("callback",event); + //console.log("callback",event); if (event.status == "cancelled") { document.getElementById("result").innerText = "Login cancelled"; - console.log("CANCELLED"); + //console.log("CANCELLED"); } else if (event.status == "loggedin") { @@ -34,7 +34,7 @@ init( async (event) => { const resource = await ldoDataset.createResource("nextgraph"); if (!resource.isError) { - console.log("Created resource:", resource.uri); + //console.log("Created resource:", resource.uri); } const ttlData = ` @@ -54,14 +54,14 @@ init( async (event) => { // TESTING error handling. See the "SELCT" instead of SELECT try { let res = await ng.sparql_query(session_id,"SELCT ?subject ?predicate ?object WHERE { ?subject ?predicate ?object .} LIMIT 10"); - console.log(res); + //console.log(res); } catch (e) { - console.error("got an error", e) + //console.error("got an error", e) } // This one shall pass try { let res = await ng.sparql_query(session_id,"SELECT ?subject ?predicate ?object WHERE { ?subject ?predicate ?object .} LIMIT 10"); - console.log(res); + //console.log(res); } catch (e) { console.error("got an error", e) } @@ -69,5 +69,5 @@ init( async (event) => { }, true, []//list of AccessRequests ).then(async ()=>{ - console.log("1st login returned",await ng.login()); + //console.log("1st login returned",await ng.login()); });