Merge branch 'websocket-reconnect' into staging

CHANGELOG

@@ -11,6 +11,7 @@ This project _loosely_ adheres to [Semantic Versioning](https://semver.org/spec/
 
 ### Changed
 - Partially migrated the Runtime service to Rust. (DM language installation for agents is pending.) [PR#466](https://github.com/coasys/ad4m/pull/466)
+- Improved performance of SDNA / SubjectClass functions by moving code from client into executor and saving a lot of client <-> executor roundtrips [PR#480](https://github.com/coasys/ad4m/pull/480)
 
 
 ## [0.9.0] - 23/03/2024

ad4m-hooks/helpers/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coasys/hooks-helpers",
-  "version": "0.9.1-prerelease",
+  "version": "0.10.0-prerelease",
   "description": "",
   "main": "./src/index.ts",
   "module": "./src/index.ts",

ad4m-hooks/helpers/src/factory/SubjectRepository.ts

@@ -73,8 +73,6 @@ export class SubjectRepository<SubjectClass extends { [x: string]: any }> {
   }
 
   async update(id: string, data: QueryPartialEntity<SubjectClass>) {
-    await this.ensureSubject();
-
     const instance = await this.get(id);
 
     if (!instance) {
@@ -102,8 +100,8 @@ export class SubjectRepository<SubjectClass extends { [x: string]: any }> {
   }
 
   async get(id: string): Promise<SubjectClass | null> {
-    await this.ensureSubject();
     if (id) {
+      await this.ensureSubject();
       const subjectProxy = await this.perspective.getSubjectProxy(
         id,
         this.subject
@@ -118,7 +116,6 @@ export class SubjectRepository<SubjectClass extends { [x: string]: any }> {
   }
 
   async getData(id: string): Promise<SubjectClass | string | null> {
-    await this.ensureSubject();
     const entry = await this.get(id);
     if (entry) {
       // @ts-ignore
@@ -133,28 +130,21 @@ export class SubjectRepository<SubjectClass extends { [x: string]: any }> {
       new LinkQuery({ source: entry.baseExpression })
     );
 
-    const getters = Object.entries(Object.getOwnPropertyDescriptors(entry))
-      .filter(([key, descriptor]) => typeof descriptor.get === "function")
-      .map(([key]) => key);
-
-    const promises = getters.map((getter) => entry[getter]);
-    return Promise.all(promises).then((values) => {
-      return getters.reduce((acc, getter, index) => {
-        let value = values[index];
-        if (this.tempSubject.prototype?.__properties[getter]?.transform) {
-          value =
-            this.tempSubject.prototype.__properties[getter].transform(value);
-        }
+    let data: any = await this.perspective.getSubjectData(this.subject, entry.baseExpression)
 
-        return {
-          ...acc,
-          id: entry.baseExpression,
-          timestamp: links[0].timestamp,
-          author: links[0].author,
-          [getter]: value,
-        };
-      }, {});
-    });
+    for (const key in data) {
+      if (this.tempSubject.prototype?.__properties[key]?.transform) {
+        data[key] =
+          this.tempSubject.prototype.__properties[key].transform(data[key]);
+      }
+    }
+
+    return {
+      id: entry.baseExpression,
+      timestamp: links[0].timestamp,
+      author: links[0].author,
+      ...data,
+    }
   }
 
   async getAll(source?: string, query?: QueryOptions): Promise<SubjectClass[]> {
@@ -232,8 +222,6 @@ export class SubjectRepository<SubjectClass extends { [x: string]: any }> {
     source?: string,
     query?: QueryOptions
   ): Promise<SubjectClass[]> {
-    await this.ensureSubject();
-
     const subjects = await this.getAll(source, query);
 
     const entries = await Promise.all(

ad4m-hooks/react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coasys/ad4m-react-hooks",
-  "version": "0.9.1-prerelease",
+  "version": "0.10.0-prerelease",
   "description": "",
   "main": "./src/index.ts",
   "module": "./src/index.ts",

ad4m-hooks/vue/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coasys/ad4m-vue-hooks",
-  "version": "0.9.1-prerelease",
+  "version": "0.10.0-prerelease",
   "description": "",
   "main": "./src/index.ts",
   "module": "./src/index.ts",

bootstrap-languages/agent-language/package.json

@@ -44,5 +44,5 @@
     "md5": "^2.3.0",
     "postcss": "^8.2.1"
   },
-  "version": "0.9.1-prerelease"
+  "version": "0.10.0-prerelease"
 }

bootstrap-languages/direct-message-language/package.json

@@ -35,5 +35,5 @@
   "dependencies": {
     "@types/node": "^18.0.0"
   },
-  "version": "0.9.1-prerelease"
+  "version": "0.10.0-prerelease"
 }

bootstrap-languages/neighbourhood-language/package.json

@@ -8,5 +8,5 @@
   },
   "author": "[email protected]",
   "license": "ISC",
-  "version": "0.9.1-prerelease"
+  "version": "0.10.0-prerelease"
 }

bootstrap-languages/p-diff-sync/package.json

@@ -38,5 +38,5 @@
   "devDependencies": {
     "run-script-os": "^1.1.6"
   },
-  "version": "0.9.1-prerelease"
+  "version": "0.10.0-prerelease"
 }

bootstrap-languages/perspective-language/package.json

@@ -30,5 +30,5 @@
     "typescript": "^4.5.5",
     "uint8arrays": "^3.0.0"
   },
-  "version": "0.9.1-prerelease"
+  "version": "0.10.0-prerelease"
 }

cli/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "ad4m"
 
-version = "0.9.1-prerelease.0"
+version = "0.10.0-prerelease.0"
 
 edition = "2021"
 authors = ["Nicolas Luck <[email protected]>"]
@@ -24,8 +24,8 @@ path = "src/ad4m_executor.rs"
 [dependencies]
 
 
-ad4m-client = { path = "../rust-client", version="0.9.1-prerelease"}
-ad4m-executor = { path = "../rust-executor", version="0.9.1-prerelease" }
+ad4m-client = { path = "../rust-client", version="0.10.0-prerelease"}
+ad4m-executor = { path = "../rust-executor", version="0.10.0-prerelease" }
 anyhow = "1.0.65"
 clap = { version = "4.0.8", features = ["derive"] }
 futures = "0.3"

connect/package.json

@@ -66,5 +66,5 @@
     "esbuild-plugin-replace": "^1.4.0",
     "lit": "^2.3.1"
   },
-  "version": "0.9.1-prerelease"
+  "version": "0.10.0-prerelease"
 }

connect/src/core.ts

@@ -310,9 +310,16 @@ export default class Ad4mConnect {
         },
         closed: () => {
           if (!this.requestedRestart) {
-            this.notifyConnectionChange(!this.token ? "not_connected" : "disconnected");
-            this.notifyAuthChange("unauthenticated");
-            this.requestedRestart = false;
+            setTimeout(async () => {
+              const client = await this.connect();
+              if (client) {
+                this.ad4mClient = client;
+              } else {
+                this.notifyConnectionChange(!this.token ? "not_connected" : "disconnected");
+                this.notifyAuthChange("unauthenticated");
+                this.requestedRestart = false;
+              }
+            }, 1000);
           }
         },
       },

core/package.json

@@ -60,7 +60,7 @@
     "@types/yargs": "*"
   },
   "patchedDependencies": {},
-  "version": "0.9.1-prerelease",
+  "version": "0.10.0-prerelease",
   "pnpm": {
     "patchedDependencies": {
       "[email protected]": "patches/[email protected]"