remving logs

master
Niko PLP 21 hours ago
parent 49aed791c0
commit f638832dc8
  1. 4
      helpers/app-auth/src/App.svelte
  2. 10
      helpers/app-auth/src/main.ts
  3. 4
      helpers/app-auth/src/worker.js
  4. 4
      helpers/net-auth/src/App.svelte
  5. 4
      helpers/net-auth/src/lib/Home.svelte
  6. 4
      helpers/net-auth/src/main.ts
  7. 18
      helpers/net-bootstrap/src/main.ts
  8. 2
      helpers/nextgraphweb/package.json
  9. 8
      helpers/nextgraphweb/src/index.ts
  10. 4
      ng-app/src/store.ts
  11. 16
      ng-sdk-js/example-webapp-react/package-lock.json
  12. 4
      ng-sdk-js/example-webapp-react/package.json
  13. 14
      ng-sdk-js/example-webapp-react/src/MakeContact.tsx
  14. 6
      ng-sdk-js/example-webapp-react/src/createBrowserNGReactMethods.tsx
  15. 3
      ng-sdk-js/example-webapp-vite/package.json
  16. 14
      ng-sdk-js/example-webapp-vite/src/main.js

@ -236,10 +236,10 @@
}); });
unsubscribe_session = active_session.subscribe(async (value) => { unsubscribe_session = active_session.subscribe(async (value) => {
console.log("active_session has changed", value) //console.log("active_session has changed", value)
if (value) { if (value) {
if ((<any>window).ng_status_callback) { if ((<any>window).ng_status_callback) {
console.log("writing loggedin to callback"); //console.log("writing loggedin to callback");
(<any>window).ng_status_callback.write({status:"loggedin", session:value}); (<any>window).ng_status_callback.write({status:"loggedin", session:value});
} }
} else { } else {

@ -40,7 +40,7 @@ const AUTH_HOME = "#/";
// const AUTH_WALLET = "#/wallet"; // const AUTH_WALLET = "#/wallet";
window.addEventListener("message", async (event)=>{ 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 { method, port } = event.data;
const writable = fromWritablePort(port); const writable = fromWritablePort(port);
const writer = writable.getWriter(); const writer = writable.getWriter();
@ -49,7 +49,7 @@ window.addEventListener("message", async (event)=>{
writer.close(); writer.close();
} else if ( method === "init" ) { } else if ( method === "init" ) {
console.log("app-auth init done, ng_status_callback set"); //console.log("app-auth init done, ng_status_callback set");
(<any>window).ng_status_callback = writer; (<any>window).ng_status_callback = writer;
manifest.set(event.data.manifest); manifest.set(event.data.manifest);
@ -70,7 +70,7 @@ window.addEventListener("message", async (event)=>{
} else if ( method === "doc_subscribe" ) { } else if ( method === "doc_subscribe" ) {
let args = event.data.args; let args = event.data.args;
console.log("processing doc_subscribe...",method, args); //console.log("processing doc_subscribe...",method, args);
args.push((callbacked)=> { args.push((callbacked)=> {
writer.write({stream:true, ret:callbacked}); writer.write({stream:true, ret:callbacked});
}); });
@ -87,7 +87,7 @@ window.addEventListener("message", async (event)=>{
} else { } else {
// forwarding to ng // forwarding to ng
console.log("processing...",method, event.data.args); //console.log("processing...",method, event.data.args);
try { try {
let res = await Reflect.apply(web_api[method], null, event.data.args); let res = await Reflect.apply(web_api[method], null, event.data.args);
writer.write({ok:true, ret:res}); writer.write({ok:true, ret:res});
@ -101,7 +101,7 @@ window.addEventListener("message", async (event)=>{
}, false); }, false);
console.log("addEventListener for message in app-auth done") //console.log("addEventListener for message in app-auth done")
parent.postMessage({ready:true},origin); parent.postMessage({ready:true},origin);
const app = new App({ const app = new App({

@ -15,7 +15,7 @@ self.onmessage = (event) => {
const { method, args, port } = event.data; const { method, args, port } = event.data;
const writable = fromWritablePort(port); const writable = fromWritablePort(port);
const writer = writable.getWriter(); 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); let ret = await Reflect.apply(sdk[method], null, args);
writer.write(ret); writer.write(ret);
@ -23,4 +23,4 @@ self.onmessage = (event) => {
})(); })();
} }
console.log("worker loaded"); //console.log("worker loaded");

@ -73,7 +73,7 @@
window.document.getElementById("app").className=""; window.document.getElementById("app").className="";
let info = Bowser.parse(window.navigator.userAgent); let info = Bowser.parse(window.navigator.userAgent);
console.log(info); //console.log(info);
is_safari = info.browser.name == "Safari"; is_safari = info.browser.name == "Safari";
if (is_safari) return; if (is_safari) return;
@ -108,7 +108,7 @@
} catch (e) { } catch (e) {
no_local_storage = true; no_local_storage = true;
console.log("no access to localStorage") console.log("no access to localStorage",e)
} }
if (!no_local_storage) { if (!no_local_storage) {

@ -67,7 +67,7 @@
//remove this listener //remove this listener
window.removeEventListener("message",ready_handler); window.removeEventListener("message",ready_handler);
const { readable, writablePort } = new RemoteReadableStream(); const { readable, writablePort } = new RemoteReadableStream();
console.log("sending init message to app-auth"); //console.log("sending init message to app-auth");
(<any>window).ng_broker_selected.postMessage({ method: "init", manifest:window.ng_manifest, port: writablePort }, (<any>window).ng_iframe_origin, [writablePort]); (<any>window).ng_broker_selected.postMessage({ method: "init", manifest:window.ng_manifest, port: writablePort }, (<any>window).ng_iframe_origin, [writablePort]);
const reader = readable.getReader(); const reader = readable.getReader();
for (var msg; msg = await reader.read(); ) { for (var msg; msg = await reader.read(); ) {
@ -75,7 +75,7 @@
(<any>window).ng_status_callback.close(); (<any>window).ng_status_callback.close();
break; break;
} else { } else {
console.log("forwarding upstream",msg.value); //console.log("forwarding upstream",msg.value);
(<any>window).ng_status_callback.write(msg.value); (<any>window).ng_status_callback.write(msg.value);
} }
} }

@ -96,11 +96,11 @@ window.addEventListener("message", async (event)=>{
} }
} else if ( method === "doc_subscribe" ) { } 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); await rpc_stream(method, event.data.args, writer);
} else { } 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 // forward to app auth iframe
writer.write(await rpc(method, event.data.args)); writer.write(await rpc(method, event.data.args));
writer.close(); writer.close();

@ -67,7 +67,7 @@ catch (e) {
window.addEventListener("message", async (event)=>{ 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 {method, port, msgs} = event.data;
const writable = fromWritablePort(port); const writable = fromWritablePort(port);
const writer = writable.getWriter(); const writer = writable.getWriter();
@ -93,9 +93,9 @@ window.addEventListener("message", async (event)=>{
} }
} }
localStorage localStorage
console.log("net-bootstrap writes back ok") //console.log("net-bootstrap writes back ok")
writer.write({status:'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) { } catch (e) {
console.log("net-bootstrap writes back error") console.log("net-bootstrap writes back error")
writer.write({status:'error', error:e}); writer.write({status:'error', error:e});
@ -123,13 +123,13 @@ window.addEventListener("message", async (event)=>{
let key; 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)) { if (data.ngbox && (is_ng_box || is_lan || is_local || is_domain)) {
key = "Self-hosted / NGbox"; key = "Self-hosted / NGbox";
} else if (data.domain && is_domain && new URL(event.origin).hostname === data.domain ) { } else if (data.domain && is_domain && new URL(event.origin).hostname === data.domain ) {
key = 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)) { } else if (data.localhost && (is_local || is_lan)) {
if (!data.peer_id) { if (!data.peer_id) {
writer.write({status:'error', error:"missing peer_id of localhost"}); 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") || "{}"); let bootstraps = JSON.parse(ls.getItem("ng_bootstrap") || "{}");
for (const [i, key] of keys.entries()) { 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]; const value = msgs[i];
if ( method === "add" && !bootstraps[key]) { if ( method === "add" && !bootstraps[key]) {
console.log("adding..."+key) //console.log("adding..."+key)
bootstraps[key] = value; bootstraps[key] = value;
if (channel) channel.postMessage({ key, value }); if (channel) channel.postMessage({ key, value });
console.log("added",key,value); //console.log("added",key,value);
} else if ( method === "remove" && bootstraps[key]) { } else if ( method === "remove" && bootstraps[key]) {
delete bootstraps[key]; delete bootstraps[key];
if (channel) channel.postMessage({ key }); if (channel) channel.postMessage({ key });
console.log("removed",key); //console.log("removed",key);
} }
} }
ls.setItem("ng_bootstrap",JSON.stringify(bootstraps)); ls.setItem("ng_bootstrap",JSON.stringify(bootstraps));

@ -4,7 +4,7 @@
"Niko PLP <niko@nextgraph.org>" "Niko PLP <niko@nextgraph.org>"
], ],
"description": "TS SDK of NextGraph for web apps", "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", "license": "MIT/Apache-2.0",
"repository": { "repository": {
"type": "git", "type": "git",

@ -136,7 +136,7 @@ function hide_nextgraph_auth() {
async function rpc( method:string, args?: any) : Promise<any> { async function rpc( method:string, args?: any) : Promise<any> {
const { readable, writablePort } = new RemoteReadableStream(); const { readable, writablePort } = new RemoteReadableStream();
console.log("POSTING",method, args); //console.log("POSTING",method, args);
if (method==="doc_subscribe") { if (method==="doc_subscribe") {
let callback = args[2]; let callback = args[2];
@ -147,14 +147,14 @@ async function rpc( method:string, args?: any) : Promise<any> {
resolve(()=>{ resolve(()=>{
// unsub function that does nothing. // unsub function that does nothing.
//TODO: implement it //TODO: implement it
console.log("unsubscribed!"); //console.log("unsubscribed!");
}); });
for (var msg; msg = await reader.read(); ) { for (var msg; msg = await reader.read(); ) {
if (msg.done) break; if (msg.done) break;
if (msg.value.error) { if (msg.value.error) {
throw new Error(msg.value.ret); throw new Error(msg.value.ret);
} else if (msg.value.stream) { } else if (msg.value.stream) {
console.log("GOT",msg.value.ret); //console.log("GOT",msg.value.ret);
(callback)(msg.value.ret); (callback)(msg.value.ret);
} }
// TODO: deal with end of stream // TODO: deal with end of stream
@ -166,7 +166,7 @@ async function rpc( method:string, args?: any) : Promise<any> {
initialized?.postMessage({ method, args, port: writablePort }, iframe_config.origin, [writablePort]); initialized?.postMessage({ method, args, port: writablePort }, iframe_config.origin, [writablePort]);
const reader = readable.getReader(); const reader = readable.getReader();
let ret = await reader.read(); let ret = await reader.read();
console.log(ret) //console.log(ret)
await reader.read(); // the close await reader.read(); // the close
if (ret.value.ok) if (ret.value.ok)
return ret.value.ret; return ret.value.ret;

@ -26,11 +26,11 @@ let all_branches = {};
let retry_branches = {}; let retry_branches = {};
export const register_bootstrap = async function (bootstrap_iframe_msgs) { 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 = (<HTMLIFrameElement>window.document.getElementById('nextgraph-bootstrap-iframe'))?.contentWindow; let iframe = (<HTMLIFrameElement>window.document.getElementById('nextgraph-bootstrap-iframe'))?.contentWindow;
if (!iframe) return false; if (!iframe) return false;
const { readable, writablePort } = new RemoteReadableStream(); 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]); iframe.postMessage({ method: "add", port:writablePort, msgs: bootstrap_iframe_msgs}, NG_BOOTSTRAP_IFRAME_ORIGIN, [writablePort]);
const reader = readable.getReader(); const reader = readable.getReader();
let ret = await reader.read(); let ret = await reader.read();

@ -8,10 +8,10 @@
"name": "example-webapp-react", "name": "example-webapp-react",
"version": "0.0.0", "version": "0.0.0",
"dependencies": { "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/ldo": "^1.0.0-alpha.3",
"@ldo/react": "^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": "^19.0.0",
"react-dom": "^19.0.0" "react-dom": "^19.0.0"
}, },
@ -1126,9 +1126,9 @@
} }
}, },
"node_modules/@ldo/connected-nextgraph": { "node_modules/@ldo/connected-nextgraph": {
"version": "1.0.0-alpha.7", "version": "1.0.0-alpha.8",
"resolved": "https://registry.npmjs.org/@ldo/connected-nextgraph/-/connected-nextgraph-1.0.0-alpha.7.tgz", "resolved": "https://registry.npmjs.org/@ldo/connected-nextgraph/-/connected-nextgraph-1.0.0-alpha.8.tgz",
"integrity": "sha512-hzu9Vu+1jMIty86pLrNuz26ux0PAm7QCwanw2ztllsyjo0hnHesZ3PF1o6tMKM9tQ5FIS0G8QhyEIdiuOTIj/A==", "integrity": "sha512-+EYEgt9FUAOk4ZcqNO9IygPSFWzD/LoasCFOqP7lhLVcl5b+AEmvAKylBA/h9VR5Mvpz5JUwJgkLJ0yhjyvghA==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@ldo/connected": "^1.0.0-alpha.3", "@ldo/connected": "^1.0.0-alpha.3",
@ -4366,9 +4366,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/nextgraphweb": { "node_modules/nextgraphweb": {
"version": "0.1.1-alpha.1", "version": "0.1.1-alpha.4",
"resolved": "https://registry.npmjs.org/nextgraphweb/-/nextgraphweb-0.1.1-alpha.1.tgz", "resolved": "https://registry.npmjs.org/nextgraphweb/-/nextgraphweb-0.1.1-alpha.4.tgz",
"integrity": "sha512-4+a0YpB/hr3IhDWwK/SiOqrnNihSDBKSOzdAVOZ2MlZhaeEpOJREryOgoJq7ZfMHqYrGtGetdwZXViRdY03f6A==", "integrity": "sha512-2vX7+VAx7pp+iJG/KrzWJhzwgur04WdZegkjAOQHCSpVa5Q+3CYN+Jyo3A+BHjpXJmr/jWyVZRJr/K/lRXhnfg==",
"license": "MIT/Apache-2.0", "license": "MIT/Apache-2.0",
"dependencies": { "dependencies": {
"async-proxy": "^0.4.1", "async-proxy": "^0.4.1",

@ -11,10 +11,10 @@
"build:ldo": "ldo build --input src/.shapes --output src/.ldo" "build:ldo": "ldo build --input src/.shapes --output src/.ldo"
}, },
"dependencies": { "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/ldo": "^1.0.0-alpha.3",
"@ldo/react": "^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": "^19.0.0",
"react-dom": "^19.0.0" "react-dom": "^19.0.0"
}, },

@ -12,12 +12,14 @@ export const MakeContact: FunctionComponent = () => {
const onSubmit = useCallback( const onSubmit = useCallback(
async (e: FormEvent<HTMLFormElement>) => { async (e: FormEvent<HTMLFormElement>) => {
e.preventDefault(); e.preventDefault();
const new_name = name.trim();
if (name.trim().length > 2 && email.trim().length > 6 && email.indexOf("@") >= 0) { 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"); const resource = await dataset.createResource("nextgraph");
if (!resource.isError) { if (!resource.isError) {
console.log("Created resource:", resource.uri); //console.log("Created resource:", resource.uri);
const contact = createData( const contact = createData(
NGSocialContactShapeType, NGSocialContactShapeType,
@ -26,8 +28,8 @@ export const MakeContact: FunctionComponent = () => {
); );
contact.type = { "@id": "Individual" }; contact.type = { "@id": "Individual" };
contact.fn = name.trim(); contact.fn = new_name;
contact.hasEmail = email.trim(); contact.hasEmail = new_email;
const result = await commitData(contact); const result = await commitData(contact);
if (result.isError) { if (result.isError) {
console.error(result.message); console.error(result.message);

@ -27,14 +27,14 @@ export function createBrowserNGReactMethods(
const [ranInitialAuthCheck, setRanInitialAuthCheck] = useState(false); const [ranInitialAuthCheck, setRanInitialAuthCheck] = useState(false);
const runInitialAuthCheck = useCallback(async () => { const runInitialAuthCheck = useCallback(async () => {
console.log("runInitialAuthCheck called", ranInitialAuthCheck) //console.log("runInitialAuthCheck called", ranInitialAuthCheck)
if (ranInitialAuthCheck) return; if (ranInitialAuthCheck) return;
console.log("init called"); //console.log("init called");
setRanInitialAuthCheck(true); setRanInitialAuthCheck(true);
// TODO: export the types for the session object coming from NG. // 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; }; }) => { 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 // callback
// once you receive event.status == "loggedin" // once you receive event.status == "loggedin"

@ -27,6 +27,7 @@
"vite": "^6.2.6" "vite": "^6.2.6"
}, },
"dependencies": { "dependencies": {
"@ldo/connected-nextgraph": "^1.0.0-alpha.6" "@ldo/connected-nextgraph": "^1.0.0-alpha.8",
"nextgraphweb": "^0.1.1-alpha.4"
} }
} }

@ -15,12 +15,12 @@ const ldoDataset = createNextGraphLdoDataset();
init( async (event) => { init( async (event) => {
// callback // callback
// event.status: "loggedin"... // event.status: "loggedin"...
console.log("callback",event); //console.log("callback",event);
if (event.status == "cancelled") { if (event.status == "cancelled") {
document.getElementById("result").innerText = "Login cancelled"; document.getElementById("result").innerText = "Login cancelled";
console.log("CANCELLED"); //console.log("CANCELLED");
} else if (event.status == "loggedin") { } else if (event.status == "loggedin") {
@ -34,7 +34,7 @@ init( async (event) => {
const resource = await ldoDataset.createResource("nextgraph"); const resource = await ldoDataset.createResource("nextgraph");
if (!resource.isError) { if (!resource.isError) {
console.log("Created resource:", resource.uri); //console.log("Created resource:", resource.uri);
} }
const ttlData = ` const ttlData = `
@ -54,14 +54,14 @@ init( async (event) => {
// TESTING error handling. See the "SELCT" instead of SELECT // TESTING error handling. See the "SELCT" instead of SELECT
try { try {
let res = await ng.sparql_query(session_id,"SELCT ?subject ?predicate ?object WHERE { ?subject ?predicate ?object .} LIMIT 10"); 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) { } catch (e) {
console.error("got an error", e) //console.error("got an error", e)
} }
// This one shall pass // This one shall pass
try { try {
let res = await ng.sparql_query(session_id,"SELECT ?subject ?predicate ?object WHERE { ?subject ?predicate ?object .} LIMIT 10"); 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) { } catch (e) {
console.error("got an error", e) console.error("got an error", e)
} }
@ -69,5 +69,5 @@ init( async (event) => {
}, true, []//list of AccessRequests }, true, []//list of AccessRequests
).then(async ()=>{ ).then(async ()=>{
console.log("1st login returned",await ng.login()); //console.log("1st login returned",await ng.login());
}); });

Loading…
Cancel
Save