From 78b110b0812efa3591c98d90036c0f8572ea9621 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Mon, 5 Aug 2024 12:46:02 +0530 Subject: [PATCH 1/9] chore: Fix WebSocket connection issue with proxy URLs --- connect/src/utils.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/connect/src/utils.ts b/connect/src/utils.ts index a5199418c..37294c1d4 100644 --- a/connect/src/utils.ts +++ b/connect/src/utils.ts @@ -14,12 +14,15 @@ export async function connectWebSocket(url, timeout = 10000) { return Promise.race([ new Promise((resolve, reject) => { try { + if (url.includes("proxy")) { + resolve(new WebSocket(url)); + } const websocket = new WebSocket(url); - + websocket.onopen = () => { resolve(websocket); }; - + websocket.onerror = (error) => { reject(error); }; From e0dfda0217e6709db9f9278d91c7bf206f248259 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Mon, 5 Aug 2024 12:46:55 +0530 Subject: [PATCH 2/9] remove timeout --- connect/src/core.ts | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/connect/src/core.ts b/connect/src/core.ts index 92a4cc629..0304d64f2 100644 --- a/connect/src/core.ts +++ b/connect/src/core.ts @@ -193,7 +193,7 @@ export default class Ad4mConnect { if (data.serviceId) { this.setPort(data.port); this.setUrl(data.url); - + this.isHosting = true; setForVersion('ad4mhosting', 'true'); @@ -297,15 +297,7 @@ export default class Ad4mConnect { try { const websocket = new WebSocket(this.url); - websocket.onerror = (error) => { - this.notifyConnectionChange("not_connected"); - }; - setTimeout(() => { - if (websocket.readyState !== WebSocket.OPEN) { - this.notifyConnectionChange("not_connected"); - } - }, 10000); } catch (e) { this.notifyConnectionChange("not_connected"); return; @@ -315,6 +307,8 @@ export default class Ad4mConnect { this.requestedRestart = true; this.wsClient.dispose(); this.apolloClient.stop(); + this.wsClient = null; + this.apolloClient = null; } this.wsClient = createClient({ From 9548fcf369f4cd44d50e1ffa4b46fc79cd35cc79 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Wed, 7 Aug 2024 20:09:10 +0530 Subject: [PATCH 3/9] chore: Remove unnecessary code in WebSocket connection initialization --- connect/src/core.ts | 2 -- connect/src/web.ts | 27 +++++++++++++++++++++------ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/connect/src/core.ts b/connect/src/core.ts index 0304d64f2..b36272e0b 100644 --- a/connect/src/core.ts +++ b/connect/src/core.ts @@ -296,8 +296,6 @@ export default class Ad4mConnect { // Make sure the url is valid try { const websocket = new WebSocket(this.url); - - } catch (e) { this.notifyConnectionChange("not_connected"); return; diff --git a/connect/src/web.ts b/connect/src/web.ts index e33e72f80..e2f8b9dae 100644 --- a/connect/src/web.ts +++ b/connect/src/web.ts @@ -471,10 +471,10 @@ export class Ad4mConnectElement extends LitElement { @state() private _hostingStep = 0; - + @state() private _email = ""; - + @state() private _passowrd = ""; @@ -612,7 +612,7 @@ export class Ad4mConnectElement extends LitElement { private changeEmail(email: string) { this._email = email; - } + } private changePassword(passowrd: string) { this._passowrd = passowrd; @@ -683,10 +683,15 @@ export class Ad4mConnectElement extends LitElement { } private handleConnectionChange(event: ConnectionStates) { - console.log(event); - // this._isOpen = true; + console.log(event); + // this._isOpen = true; if (event === "connected") { - this.changeUIState("requestcap"); + if (this.authState !== "authenticated") { + this.changeUIState("requestcap"); + } else { + this.changeUIState("connected"); + this._isOpen = false; + } } if (event === "disconnected") { this._isOpen = true; @@ -740,6 +745,11 @@ export class Ad4mConnectElement extends LitElement { this._isOpen = true; this.requestUpdate(); const client = await this._client.connect(); + const status = await client.agent.status(); + if (status.isUnlocked && status.isInitialized) { + window.location.reload(); + } + console.log("sssss", status); return client; } @@ -750,6 +760,11 @@ export class Ad4mConnectElement extends LitElement { async connectRemote(url) { try { const client = await this._client.connect(url); + const status = await client.agent.status(); + if (status.isUnlocked && status.isInitialized) { + return client + } + this.changeUIState("requestcap"); return client; } catch (e) { From f4d335c8f2f58a42680bcbbdfa35ba2eb04411c5 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Wed, 7 Aug 2024 20:25:00 +0530 Subject: [PATCH 4/9] fix: Handle WebSocket connection issue with proxy URLs --- connect/src/utils.ts | 2 +- connect/src/web.ts | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/connect/src/utils.ts b/connect/src/utils.ts index 37294c1d4..bcc6c7e6c 100644 --- a/connect/src/utils.ts +++ b/connect/src/utils.ts @@ -14,7 +14,7 @@ export async function connectWebSocket(url, timeout = 10000) { return Promise.race([ new Promise((resolve, reject) => { try { - if (url.includes("proxy")) { + if (!url.includes("localhost")) { resolve(new WebSocket(url)); } const websocket = new WebSocket(url); diff --git a/connect/src/web.ts b/connect/src/web.ts index e2f8b9dae..1649b4dee 100644 --- a/connect/src/web.ts +++ b/connect/src/web.ts @@ -745,11 +745,14 @@ export class Ad4mConnectElement extends LitElement { this._isOpen = true; this.requestUpdate(); const client = await this._client.connect(); - const status = await client.agent.status(); - if (status.isUnlocked && status.isInitialized) { - window.location.reload(); + try { + const status = await client.agent.status(); + if (status.isUnlocked && status.isInitialized) { + window.location.reload(); + } + } catch (e) { + console.warn(e); } - console.log("sssss", status); return client; } From cc116470bc0ed18c5f8043b4a485d53fd9149a08 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 8 Aug 2024 12:44:40 +0530 Subject: [PATCH 5/9] chore: Update Ad4mConnectElement to handle URL changes and WebSocket connection issues --- connect/src/web.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/connect/src/web.ts b/connect/src/web.ts index 1649b4dee..9ac3fe036 100644 --- a/connect/src/web.ts +++ b/connect/src/web.ts @@ -631,6 +631,11 @@ export class Ad4mConnectElement extends LitElement { } private changeUrl(url) { + if (url !== this._client.url) { + removeForVersion("ad4mtoken") + this._client.setToken(null); + } + this._client.setUrl(url); } @@ -762,6 +767,7 @@ export class Ad4mConnectElement extends LitElement { async connectRemote(url) { try { + this.changeUrl(url); const client = await this._client.connect(url); const status = await client.agent.status(); if (status.isUnlocked && status.isInitialized) { @@ -771,9 +777,8 @@ export class Ad4mConnectElement extends LitElement { this.changeUIState("requestcap"); return client; } catch (e) { - if (e.message === "Socket closed with event 4500 Invalid Compact JWS") { this.changeUIState("requestcap"); - } + this._isOpen = true; } } From b61bfeccd42caa41fd152b7ded7d737398cc59cd Mon Sep 17 00:00:00 2001 From: Nicolas Luck Date: Thu, 8 Aug 2024 10:31:44 +0200 Subject: [PATCH 6/9] Avoid iterating over JS object props that are guarded by strict mode, in PerspectiveProxy.buildQueryFromTemplate() --- core/src/perspectives/PerspectiveProxy.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/core/src/perspectives/PerspectiveProxy.ts b/core/src/perspectives/PerspectiveProxy.ts index 62bcfbc5f..7f0a51ca6 100644 --- a/core/src/perspectives/PerspectiveProxy.ts +++ b/core/src/perspectives/PerspectiveProxy.ts @@ -453,24 +453,24 @@ export class PerspectiveProxy { } // Collect all set functions of the object in a list - let setFunctions = Object.getOwnPropertyNames(obj).filter(key => (typeof obj[key] === "function") && key.startsWith("set") && !key.startsWith("setCollection")) + let setFunctions = Object.keys(obj).filter(key => (Object.prototype.hasOwnProperty.call(obj, key) && typeof obj[key] === "function") && key.startsWith("set") && !key.startsWith("setCollection")) // Add all set functions of the object's prototype to that list - setFunctions = setFunctions.concat(Object.getOwnPropertyNames(Object.getPrototypeOf(obj)).filter(key => (typeof obj[key] === "function") && key.startsWith("set") && !key.startsWith("setCollection"))) + setFunctions = setFunctions.concat(Object.keys(Object.getPrototypeOf(obj)).filter(key => (Object.prototype.hasOwnProperty.call(Object.getPrototypeOf(obj), key) && typeof Object.getPrototypeOf(obj)[key] === "function") && key.startsWith("set") && !key.startsWith("setCollection"))) // Collect all add functions of the object in a list - let addFunctions = Object.getOwnPropertyNames(obj).filter(key => (typeof obj[key] === "function") && key.startsWith("add")) + let addFunctions = Object.keys(obj).filter(key => (Object.prototype.hasOwnProperty.call(obj, key) && typeof obj[key] === "function") && key.startsWith("add")) // Add all add functions of the object's prototype to that list - addFunctions = addFunctions.concat(Object.getOwnPropertyNames(Object.getPrototypeOf(obj)).filter(key => (typeof obj[key] === "function") && key.startsWith("add"))) + addFunctions = addFunctions.concat(Object.keys(Object.getPrototypeOf(obj)).filter(key => (Object.prototype.hasOwnProperty.call(Object.getPrototypeOf(obj), key) && typeof Object.getPrototypeOf(obj)[key] === "function") && key.startsWith("add"))) // Collect all remove functions of the object in a list - let removeFunctions = Object.getOwnPropertyNames(obj).filter(key => (typeof obj[key] === "function") && key.startsWith("remove")) + let removeFunctions = Object.keys(obj).filter(key => (Object.prototype.hasOwnProperty.call(obj, key) && typeof obj[key] === "function") && key.startsWith("remove")) // Add all remove functions of the object's prototype to that list - removeFunctions = removeFunctions.concat(Object.getOwnPropertyNames(Object.getPrototypeOf(obj)).filter(key => (typeof obj[key] === "function") && key.startsWith("remove"))) + removeFunctions = removeFunctions.concat(Object.keys(Object.getPrototypeOf(obj)).filter(key => (Object.prototype.hasOwnProperty.call(Object.getPrototypeOf(obj), key) && typeof Object.getPrototypeOf(obj)[key] === "function") && key.startsWith("remove"))) // Collect all add functions of the object in a list - let setCollectionFunctions = Object.getOwnPropertyNames(obj).filter(key => (typeof obj[key] === "function") && key.startsWith("setCollection")) + let setCollectionFunctions = Object.keys(obj).filter(key => (Object.prototype.hasOwnProperty.call(obj, key) && typeof obj[key] === "function") && key.startsWith("setCollection")) // Add all add functions of the object's prototype to that list - setCollectionFunctions = setCollectionFunctions.concat(Object.getOwnPropertyNames(Object.getPrototypeOf(obj)).filter(key => (typeof obj[key] === "function") && key.startsWith("setCollection"))) + setCollectionFunctions = setCollectionFunctions.concat(Object.keys(Object.getPrototypeOf(obj)).filter(key => (Object.prototype.hasOwnProperty.call(Object.getPrototypeOf(obj), key) && typeof Object.getPrototypeOf(obj)[key] === "function") && key.startsWith("setCollection"))) // Construct query to find all subject classes that have the given properties and collections let query = `subject_class(Class, C)` From d8b6aec992221f48c60cecbd47e6f4b75c2e8d85 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 8 Aug 2024 14:06:21 +0530 Subject: [PATCH 7/9] chore: Update Ad4mConnectElement to handle URL changes and WebSocket connection issues --- connect/src/core.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/src/core.ts b/connect/src/core.ts index b36272e0b..92a61690f 100644 --- a/connect/src/core.ts +++ b/connect/src/core.ts @@ -405,7 +405,7 @@ export default class Ad4mConnect { let token = localStorage.getItem('hosting_token'); const response = await fetch('https://hosting.ad4m.dev/api/service/checkStatus', { - method: 'GET', + method: 'POST', headers: { 'Content-Type': 'application/json', 'Authorization': 'Bearer ' + token From 558c79ab5d16802b04598133e428b4e3fdcb5577 Mon Sep 17 00:00:00 2001 From: Nicolas Luck Date: Thu, 8 Aug 2024 13:50:09 +0200 Subject: [PATCH 8/9] Go back to using getOwnPropertyNames() but keep the guard around obj[key] --- core/src/perspectives/PerspectiveProxy.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/core/src/perspectives/PerspectiveProxy.ts b/core/src/perspectives/PerspectiveProxy.ts index 7f0a51ca6..1fd2b1a74 100644 --- a/core/src/perspectives/PerspectiveProxy.ts +++ b/core/src/perspectives/PerspectiveProxy.ts @@ -453,24 +453,24 @@ export class PerspectiveProxy { } // Collect all set functions of the object in a list - let setFunctions = Object.keys(obj).filter(key => (Object.prototype.hasOwnProperty.call(obj, key) && typeof obj[key] === "function") && key.startsWith("set") && !key.startsWith("setCollection")) + let setFunctions = Object.getOwnPropertyNames(obj).filter(key => (typeof obj[key] === "function") && key.startsWith("set") && !key.startsWith("setCollection")) // Add all set functions of the object's prototype to that list - setFunctions = setFunctions.concat(Object.keys(Object.getPrototypeOf(obj)).filter(key => (Object.prototype.hasOwnProperty.call(Object.getPrototypeOf(obj), key) && typeof Object.getPrototypeOf(obj)[key] === "function") && key.startsWith("set") && !key.startsWith("setCollection"))) + setFunctions = setFunctions.concat(Object.getOwnPropertyNames(Object.getPrototypeOf(obj)).filter(key => (typeof Object.getPrototypeOf(obj)[key] === "function") && key.startsWith("set") && !key.startsWith("setCollection"))) // Collect all add functions of the object in a list - let addFunctions = Object.keys(obj).filter(key => (Object.prototype.hasOwnProperty.call(obj, key) && typeof obj[key] === "function") && key.startsWith("add")) + let addFunctions = Object.getOwnPropertyNames(obj).filter(key => (Object.prototype.hasOwnProperty.call(obj, key) && typeof obj[key] === "function") && key.startsWith("add")) // Add all add functions of the object's prototype to that list addFunctions = addFunctions.concat(Object.keys(Object.getPrototypeOf(obj)).filter(key => (Object.prototype.hasOwnProperty.call(Object.getPrototypeOf(obj), key) && typeof Object.getPrototypeOf(obj)[key] === "function") && key.startsWith("add"))) // Collect all remove functions of the object in a list - let removeFunctions = Object.keys(obj).filter(key => (Object.prototype.hasOwnProperty.call(obj, key) && typeof obj[key] === "function") && key.startsWith("remove")) + let removeFunctions = Object.getOwnPropertyNames(obj).filter(key => (Object.prototype.hasOwnProperty.call(obj, key) && typeof obj[key] === "function") && key.startsWith("remove")) // Add all remove functions of the object's prototype to that list - removeFunctions = removeFunctions.concat(Object.keys(Object.getPrototypeOf(obj)).filter(key => (Object.prototype.hasOwnProperty.call(Object.getPrototypeOf(obj), key) && typeof Object.getPrototypeOf(obj)[key] === "function") && key.startsWith("remove"))) + removeFunctions = removeFunctions.concat(Object.getOwnPropertyNames(Object.getPrototypeOf(obj)).filter(key => (Object.prototype.hasOwnProperty.call(Object.getPrototypeOf(obj), key) && typeof Object.getPrototypeOf(obj)[key] === "function") && key.startsWith("remove"))) // Collect all add functions of the object in a list - let setCollectionFunctions = Object.keys(obj).filter(key => (Object.prototype.hasOwnProperty.call(obj, key) && typeof obj[key] === "function") && key.startsWith("setCollection")) + let setCollectionFunctions = Object.getOwnPropertyNames(obj).filter(key => (Object.prototype.hasOwnProperty.call(obj, key) && typeof obj[key] === "function") && key.startsWith("setCollection")) // Add all add functions of the object's prototype to that list - setCollectionFunctions = setCollectionFunctions.concat(Object.keys(Object.getPrototypeOf(obj)).filter(key => (Object.prototype.hasOwnProperty.call(Object.getPrototypeOf(obj), key) && typeof Object.getPrototypeOf(obj)[key] === "function") && key.startsWith("setCollection"))) + setCollectionFunctions = setCollectionFunctions.concat(Object.getOwnPropertyNames(Object.getPrototypeOf(obj)).filter(key => (Object.prototype.hasOwnProperty.call(Object.getPrototypeOf(obj), key) && typeof Object.getPrototypeOf(obj)[key] === "function") && key.startsWith("setCollection"))) // Construct query to find all subject classes that have the given properties and collections let query = `subject_class(Class, C)` From 7eb4deb34fcb79de2f31a60b10594655ec7afbad Mon Sep 17 00:00:00 2001 From: Nicolas Luck Date: Thu, 8 Aug 2024 15:14:26 +0200 Subject: [PATCH 9/9] set version 0.10.0-rc6 --- Cargo.lock | 8 ++++---- ad4m-hooks/helpers/package.json | 2 +- ad4m-hooks/react/package.json | 2 +- ad4m-hooks/vue/package.json | 2 +- bootstrap-languages/agent-language/package.json | 2 +- bootstrap-languages/direct-message-language/package.json | 2 +- bootstrap-languages/neighbourhood-language/package.json | 2 +- bootstrap-languages/p-diff-sync/package.json | 2 +- bootstrap-languages/perspective-language/package.json | 2 +- cli/Cargo.toml | 6 +++--- connect/package.json | 2 +- core/package.json | 2 +- docs/package.json | 2 +- executor/package.json | 2 +- executor/src/core/Config.ts | 2 +- package.json | 2 +- rust-client/Cargo.toml | 2 +- rust-executor/Cargo.toml | 4 ++-- rust-executor/package.json | 2 +- rust-executor/src/globals.rs | 2 +- test-runner/package.json | 2 +- tests/js/package.json | 2 +- ui/package.json | 2 +- ui/src-tauri/Cargo.toml | 2 +- ui/src-tauri/tauri.conf.json | 2 +- 25 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e5418d40f..7d12a021a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14,7 +14,7 @@ dependencies = [ [[package]] name = "ad4m" -version = "0.10.0-rc5" +version = "0.10.0-rc6" dependencies = [ "ad4m-client", "ad4m-executor", @@ -39,7 +39,7 @@ dependencies = [ [[package]] name = "ad4m-client" -version = "0.10.0-rc5" +version = "0.10.0-rc6" dependencies = [ "anyhow", "async-tungstenite", @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "ad4m-executor" -version = "0.10.0-rc5" +version = "0.10.0-rc6" dependencies = [ "ad4m-client", "argon2", @@ -127,7 +127,7 @@ dependencies = [ [[package]] name = "ad4m-launcher" -version = "0.10.0-rc5" +version = "0.10.0-rc6" dependencies = [ "ad4m-client", "ad4m-executor", diff --git a/ad4m-hooks/helpers/package.json b/ad4m-hooks/helpers/package.json index 245bc90a9..f0494344b 100644 --- a/ad4m-hooks/helpers/package.json +++ b/ad4m-hooks/helpers/package.json @@ -1,6 +1,6 @@ { "name": "@coasys/hooks-helpers", - "version": "0.10.0-rc5", + "version": "0.10.0-rc6", "description": "", "main": "./src/index.ts", "module": "./src/index.ts", diff --git a/ad4m-hooks/react/package.json b/ad4m-hooks/react/package.json index 7bceab602..88832cbfe 100644 --- a/ad4m-hooks/react/package.json +++ b/ad4m-hooks/react/package.json @@ -1,6 +1,6 @@ { "name": "@coasys/ad4m-react-hooks", - "version": "0.10.0-rc5", + "version": "0.10.0-rc6", "description": "", "main": "./src/index.ts", "module": "./src/index.ts", diff --git a/ad4m-hooks/vue/package.json b/ad4m-hooks/vue/package.json index 7aba7b21f..f3fc94838 100644 --- a/ad4m-hooks/vue/package.json +++ b/ad4m-hooks/vue/package.json @@ -1,6 +1,6 @@ { "name": "@coasys/ad4m-vue-hooks", - "version": "0.10.0-rc5", + "version": "0.10.0-rc6", "description": "", "main": "./src/index.ts", "module": "./src/index.ts", diff --git a/bootstrap-languages/agent-language/package.json b/bootstrap-languages/agent-language/package.json index 37fd737e5..186cc4268 100644 --- a/bootstrap-languages/agent-language/package.json +++ b/bootstrap-languages/agent-language/package.json @@ -44,5 +44,5 @@ "md5": "^2.3.0", "postcss": "^8.2.1" }, - "version": "0.10.0-rc5" + "version": "0.10.0-rc6" } diff --git a/bootstrap-languages/direct-message-language/package.json b/bootstrap-languages/direct-message-language/package.json index 581cad50a..2ca282e0f 100644 --- a/bootstrap-languages/direct-message-language/package.json +++ b/bootstrap-languages/direct-message-language/package.json @@ -35,5 +35,5 @@ "dependencies": { "@types/node": "^18.0.0" }, - "version": "0.10.0-rc5" + "version": "0.10.0-rc6" } diff --git a/bootstrap-languages/neighbourhood-language/package.json b/bootstrap-languages/neighbourhood-language/package.json index d973205a5..c4b611ce9 100644 --- a/bootstrap-languages/neighbourhood-language/package.json +++ b/bootstrap-languages/neighbourhood-language/package.json @@ -8,5 +8,5 @@ }, "author": "joshuadparkin@gmail.com", "license": "ISC", - "version": "0.10.0-rc5" + "version": "0.10.0-rc6" } diff --git a/bootstrap-languages/p-diff-sync/package.json b/bootstrap-languages/p-diff-sync/package.json index 33d9fca25..d61141c41 100644 --- a/bootstrap-languages/p-diff-sync/package.json +++ b/bootstrap-languages/p-diff-sync/package.json @@ -38,5 +38,5 @@ "devDependencies": { "run-script-os": "^1.1.6" }, - "version": "0.10.0-rc5" + "version": "0.10.0-rc6" } diff --git a/bootstrap-languages/perspective-language/package.json b/bootstrap-languages/perspective-language/package.json index a87cf2855..18d5a374e 100644 --- a/bootstrap-languages/perspective-language/package.json +++ b/bootstrap-languages/perspective-language/package.json @@ -30,5 +30,5 @@ "typescript": "^4.5.5", "uint8arrays": "^3.0.0" }, - "version": "0.10.0-rc5" + "version": "0.10.0-rc6" } diff --git a/cli/Cargo.toml b/cli/Cargo.toml index a4f03fc9c..226436f7f 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "ad4m" -version = "0.10.0-rc5" +version = "0.10.0-rc6" edition = "2021" authors = ["Nicolas Luck "] @@ -24,8 +24,8 @@ path = "src/ad4m_executor.rs" [dependencies] -ad4m-client = { path = "../rust-client", version="0.10.0-rc4"} -ad4m-executor = { path = "../rust-executor", version="0.10.0-rc4" } +ad4m-client = { path = "../rust-client", version="0.10.0-rc6"} +ad4m-executor = { path = "../rust-executor", version="0.10.0-rc6" } anyhow = "1.0.65" clap = { version = "4.0.8", features = ["derive"] } futures = "0.3" diff --git a/connect/package.json b/connect/package.json index 3b65b456f..4acf84a7a 100644 --- a/connect/package.json +++ b/connect/package.json @@ -66,5 +66,5 @@ "esbuild-plugin-replace": "^1.4.0", "lit": "^2.3.1" }, - "version": "0.10.0-rc5" + "version": "0.10.0-rc6" } diff --git a/core/package.json b/core/package.json index fd11a0cff..1b746b006 100644 --- a/core/package.json +++ b/core/package.json @@ -60,7 +60,7 @@ "@types/yargs": "*" }, "patchedDependencies": {}, - "version": "0.10.0-rc5", + "version": "0.10.0-rc6", "pnpm": { "patchedDependencies": { "graphql@15.7.2": "patches/graphql@15.7.2.patch" diff --git a/docs/package.json b/docs/package.json index 891551233..973a4a577 100644 --- a/docs/package.json +++ b/docs/package.json @@ -22,5 +22,5 @@ "typedoc-plugin-markdown": "^3.15.2", "typescript": "^4.9.3" }, - "version": "0.10.0-rc5" + "version": "0.10.0-rc6" } diff --git a/executor/package.json b/executor/package.json index 5fb504ee2..9a82f8f15 100644 --- a/executor/package.json +++ b/executor/package.json @@ -78,5 +78,5 @@ "tmp": "^0.2.1", "uuid": "*" }, - "version": "0.10.0-rc5" + "version": "0.10.0-rc6" } diff --git a/executor/src/core/Config.ts b/executor/src/core/Config.ts index d6db70178..6f60aec86 100644 --- a/executor/src/core/Config.ts +++ b/executor/src/core/Config.ts @@ -2,7 +2,7 @@ import * as path from 'node:path'; import * as fs from 'node:fs'; import { Address, Expression } from '@coasys/ad4m'; -export let ad4mExecutorVersion = "0.10.0-rc5"; +export let ad4mExecutorVersion = "0.10.0-rc6"; export let agentLanguageAlias = "did"; export let languageLanguageAlias = "lang"; export let neighbourhoodLanguageAlias = "neighbourhood"; diff --git a/package.json b/package.json index aba98e64c..69717fad9 100644 --- a/package.json +++ b/package.json @@ -93,5 +93,5 @@ "safer-buffer@2.1.2": "patches/safer-buffer@2.1.2.patch" } }, - "version": "0.10.0-rc5" + "version": "0.10.0-rc6" } diff --git a/rust-client/Cargo.toml b/rust-client/Cargo.toml index c650f9074..d822449ff 100644 --- a/rust-client/Cargo.toml +++ b/rust-client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ad4m-client" -version = "0.10.0-rc5" +version = "0.10.0-rc6" edition = "2021" authors = ["Nicolas Luck "] description = "Client library wrapping AD4M's GraphQL interface" diff --git a/rust-executor/Cargo.toml b/rust-executor/Cargo.toml index 76d0933bc..5b0788be5 100644 --- a/rust-executor/Cargo.toml +++ b/rust-executor/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ad4m-executor" -version = "0.10.0-rc5" +version = "0.10.0-rc6" edition = "2021" authors = ["Nicolas Luck "] description = "Runtime implementation of AD4M as library - https://ad4m.dev" @@ -89,7 +89,7 @@ kitsune_p2p_types = { version = "0.3.2-rc.0", git = "https://github.com/coasys/h scryer-prolog = { version = "0.9.4" } # scryer-prolog = { path = "../../scryer-prolog", features = ["multi_thread"] } -ad4m-client = { path = "../rust-client", version="0.10.0-rc5" } +ad4m-client = { path = "../rust-client", version="0.10.0-rc6" } reqwest = { version = "0.11.20", features = ["json", "native-tls"] } rusqlite = { version = "0.29.0", git = "https://github.com/coasys/rusqlite.git", rev = "12ec1330bd4b46411ab9895364da4a3e172d0fbb", features = ["bundled"] } diff --git a/rust-executor/package.json b/rust-executor/package.json index d2ad4fbd0..c9cff6b64 100644 --- a/rust-executor/package.json +++ b/rust-executor/package.json @@ -31,5 +31,5 @@ "@coasys/ad4m-executor": "link:../core" }, "dependencies": {}, - "version": "0.10.0-rc5" + "version": "0.10.0-rc6" } diff --git a/rust-executor/src/globals.rs b/rust-executor/src/globals.rs index c5e212bd3..07c2369b7 100644 --- a/rust-executor/src/globals.rs +++ b/rust-executor/src/globals.rs @@ -2,7 +2,7 @@ use lazy_static::lazy_static; lazy_static! { /// The current version of AD4M - pub static ref AD4M_VERSION: String = String::from("0.10.0-rc5"); + pub static ref AD4M_VERSION: String = String::from("0.10.0-rc6"); } /// Struct representing oldest supported version and indicator if state should be cleared if update is required diff --git a/test-runner/package.json b/test-runner/package.json index c44cb78ff..0cdb420bf 100644 --- a/test-runner/package.json +++ b/test-runner/package.json @@ -63,5 +63,5 @@ "bugs": { "url": "https://github.com/perspect3vism/ad4m-test/issues" }, - "version": "0.10.0-rc5" + "version": "0.10.0-rc6" } diff --git a/tests/js/package.json b/tests/js/package.json index d78ac3174..b168d59ef 100644 --- a/tests/js/package.json +++ b/tests/js/package.json @@ -64,5 +64,5 @@ "dependencies": { "uuid": "*" }, - "version": "0.10.0-rc5" + "version": "0.10.0-rc6" } diff --git a/ui/package.json b/ui/package.json index 0f65ae62f..842858f26 100644 --- a/ui/package.json +++ b/ui/package.json @@ -71,5 +71,5 @@ "resolutions": { "react-error-overlay": "6.0.9" }, - "version": "0.10.0-rc5" + "version": "0.10.0-rc6" } diff --git a/ui/src-tauri/Cargo.toml b/ui/src-tauri/Cargo.toml index 46bbb4a0b..efa070941 100644 --- a/ui/src-tauri/Cargo.toml +++ b/ui/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ad4m-launcher" -version = "0.10.0-rc5" +version = "0.10.0-rc6" description = "Administration of ad4m services" authors = ["Kaichao Sun"] license = "" diff --git a/ui/src-tauri/tauri.conf.json b/ui/src-tauri/tauri.conf.json index 3baeaf928..3cd18e352 100644 --- a/ui/src-tauri/tauri.conf.json +++ b/ui/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "package": { "productName": "ADAM Launcher", - "version": "0.10.0-rc5" + "version": "0.10.0-rc6" }, "build": { "distDir": "../dist",