Merge pull request #272 from perspect3vism/release-0.2.16

Release 0.2.16
coasys · Feb 26, 2023 · 25f37a1 · 25f37a1
2 parents 7693340 + 8780804
commit 25f37a1
Show file tree

Hide file tree

Showing 19 changed files with 133 additions and 38 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -15,6 +15,19 @@ This project _loosely_ adheres to [Semantic Versioning](https://semver.org/spec/
 
 ### Fixed
 
+## [0.2.16] - 25/02/2013
+### Added
+
+### Changed
+ - Main LinkLanguage (Perspective Diff Sync) refactored to replace global/objective latest-revision with a simple gossip algorithm, where agents broadcast their revision and merge in revision of others as they are gossiped. Improves speed and resilience a lot. [PR#12 in PDiff-Sync](https://github.com/perspect3vism/perspective-diff-sync/pull/12) [PR#271](https://github.com/perspect3vism/ad4m/pull/271)
+
+### Deprecated
+
+### Removed
+
+### Fixed
+ - Perspective Diff Sync: calculation of fast_forward_possible fixed, which prevents merge-loops (PR#13)[https://github.com/perspect3vism/perspective-diff-sync/pull/13]
+
 ## [0.2.15] - 23/02/2013
 
 ### Added

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ad4m"
-version = "0.2.15"
+version = "0.2.16"
 edition = "2021"
 authors = ["Nicolas Luck <nicolas@perspect3vism.org>"]
 description = "A command-line interface to AD4M (i.e. the AD4M executor) - https://ad4m.dev"
@@ -12,7 +12,7 @@ documentation = "https://docs.ad4m.dev"
 readme = "README.md"
 
 [dependencies]
-ad4m-client = { path = "../rust-client", version = "0.2.15" }
+ad4m-client = { path = "../rust-client", version = "0.2.16" }
 anyhow = "1.0.65"
 clap = { version = "4.0.8", features = ["derive"] }
 futures = "0.3"

diff --git a/connect/package.json b/connect/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@perspect3vism/ad4m-connect",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "description": "Lib for handling everything needed to setup a connection to a local or remote ad4m-executor",
   "license": "CAL-1.0",
   "main": "dist/web.js",

diff --git a/core/package.json b/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@perspect3vism/ad4m",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "description": "*The Agent-Centric Distributed Application Meta-ontology*  or just:  *Agent-Centric DApp Meta-ontology*  * A new meta-ontology for interoperable, decentralized application design * A spanning-layer to enable seamless integration between Holochain DNAs, blockchains, linked-data structures/ontologies and centralized back-ends * The basis for turning distinct, monolithic and siloed apps into a global, open and interoperable sense-making network",
   "main": "lib/index.cjs",
   "module": "lib/index.js",

diff --git a/docs-src/book.json b/docs-src/book.json
@@ -2,6 +2,6 @@
   "title": "AD4M Documentation",
   "author": "Nicolas Luck",
   "variables": {
-    "ad4mVersion": "0.2.15"
+    "ad4mVersion": "0.2.16"
   }
 }
diff --git a/executor/package.json b/executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@perspect3vism/ad4m-executor",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "description": "Node.js package that allows the running/interfacing of AD4M Languages & Perspectives.",
   "main": "lib/main.js",
   "files": [

diff --git a/executor/scripts/get-builtin-test-langs.js b/executor/scripts/get-builtin-test-langs.js
@@ -14,7 +14,7 @@ const languages = {
     bundle: "https://github.com/perspect3vism/local-neighbourhood-persistence/releases/download/0.0.2/bundle.js",
   },
   "perspective-diff-sync": {
-    bundle: "https://github.com/perspect3vism/perspective-diff-sync/releases/download/v0.2.2-test/bundle.js",
+    bundle: "https://github.com/perspect3vism/perspective-diff-sync/releases/download/v0.3.1/bundle.js",
   },
   "note-ipfs": {
     bundle: "https://github.com/perspect3vism/lang-note-ipfs/releases/download/0.0.4/bundle.js",

diff --git a/executor/src/core/Config.ts b/executor/src/core/Config.ts
@@ -2,7 +2,7 @@ import * as path from 'path';
 import * as fs from 'fs';
 import { Address, Expression } from '@perspect3vism/ad4m';
 
-export let ad4mExecutorVersion = "0.2.15";
+export let ad4mExecutorVersion = "0.2.16";
 export let agentLanguageAlias = "did";
 export let languageLanguageAlias = "lang";
 export let neighbourhoodLanguageAlias = "neighbourhood";

diff --git a/executor/src/core/Perspective.ts b/executor/src/core/Perspective.ts
@@ -90,21 +90,29 @@ export default class Perspective {
 
         if (this.neighbourhood) {
             // setup polling loop for Perspectives with a linkLanguage
-            try {
-                this.getCurrentRevision().then(revision => {
-                    // if revision is null, then we are not connected to the network yet, so we need to poll fast
-                    if(!revision && this.createdFromJoin) {
-                        this.isFastPolling = true;
-                        this.updatePerspectiveState(PerspectiveState.LinkLanguageInstalledButNotSynced);
-                        this.#pollingInterval = this.setupPolling(3000);
-                    } else {
-                        //Say that we are synced here since we dont have any interface on the link language for deeper gossip information
-                        this.updatePerspectiveState(PerspectiveState.Synced);
-                        this.#pollingInterval = this.setupPolling(30000);
-                    }
-                })
-            } catch (e) {
-                console.error(`Perspective.constructor(): NH [${this.sharedUrl}] (${this.name}): Got error when trying to get current revision and setting polling loop: ${e}`);
+            this.setupSyncSingals(3000);
+            //this.setupFullRenderSync(20000);
+
+            // Handle join differently so we wait before publishing diffs until we have seen
+            // a first foreign revision. Otherwise we will never use snaphshots and make the
+            // diff graph complex.
+            if(this.createdFromJoin) {
+                try {
+                    this.getCurrentRevision().then(revision => {
+                        // if revision is null, then we are not connected to the network yet
+                        // Set the state to LinkLanguageInstalledButNotSynced so we will keep
+                        // link additions as pending until we are synced
+                        if(!revision) {
+                            this.setupPendingDiffsPublishing(5000);
+                        } else {
+                            this.updatePerspectiveState(PerspectiveState.Synced);
+                        }
+                    })
+                } catch (e) {
+                    console.error(`Perspective.constructor(): NH [${this.sharedUrl}] (${this.name}): Got error when trying to get current revision: ${e}`);
+                }
+            } else {
+                this.updatePerspectiveState(PerspectiveState.Synced);
             }
         }
 
@@ -126,6 +134,80 @@ export default class Perspective {
         }
     }
 
+    async setupFullRenderSync(intervalMs: number) {
+        if(this.state === PerspectiveState.Synced) {
+            try {
+                await this.syncWithSharingAdapter();
+            } catch(e) {
+                console.error(`Perspective.setupFullRenderSync(): NH [${this.sharedUrl}] (${this.name}): Got error when trying to do full render sync with sharing adapter: ${e}`);
+            }
+        } else {
+            console.log(`Perspective.setupFullRenderSync(): NH [${this.sharedUrl}] (${this.name}): Omitting full render sync since perspective is not synced yet`);
+        }
+        await sleep(intervalMs);
+        this.setupFullRenderSync(intervalMs);
+    }
+
+    async setupSyncSingals(intervalMs: number) {
+        try {
+            await this.callLinksAdapter("pull"); // should rename this in the LinksAdapter interface to sync ...
+        } catch(e) {
+            console.error(`Perspective.setupSyncSingals(): NH [${this.sharedUrl}] (${this.name}): Got error when sending sync signals: ${e}`);
+        }
+        await sleep(intervalMs);
+        this.setupSyncSingals(intervalMs);
+    }
+
+    async setupPendingDiffsPublishing(intervalMs: number) {
+        let pendingGotPublished = false;
+        if(this.state == PerspectiveState.LinkLanguageFailedToInstall) {
+            try {
+                await this.getLinksAdapter()
+            } catch(e) {
+                console.error(`Perspective.setupPendingDiffsPublishing(): NH [${this.sharedUrl}] (${this.name}): Got error when trying to install link language: ${e}`);
+            }
+        }
+
+        try {
+            // If LinkLanguage is connected/synced (otherwise currentRevision would be null)...
+            if (await this.getCurrentRevision()) {
+                //TODO; once we have more data information coming from the link language, correctly determine when to mark perspective as synced
+                this.updatePerspectiveState(PerspectiveState.Synced);
+                //Let's check if we have unpublished diffs:
+                const mutations = this.#db.getPendingDiffs(this.uuid);
+                if(mutations && mutations.length > 0) {
+                    // If we do, collect them...
+                    const batchedMutations = {
+                        additions: [],
+                        removals: []
+                    } as PerspectiveDiff
+                    for(const mutation of mutations) {
+                        for (const addition of mutation.additions) {
+                            batchedMutations.additions.push(addition);
+                        }
+                        for (const removal of mutation.removals) {
+                            batchedMutations.removals.push(removal);
+                        }
+                    }
+
+                    // ...publish them...
+                    await this.callLinksAdapter('commit', batchedMutations);
+                    // ...and clear the temporary storage
+                    this.#db.clearPendingDiffs(this.uuid)
+                    pendingGotPublished = true;
+                }
+            }
+        } catch (e) {
+            console.warn(`Perspective.setupPendingDiffsPublishing(): NH [${this.sharedUrl}] (${this.name}): Got error when trying to repulish pending diffs. Error: ${e}`, e);
+        }
+
+        if(!pendingGotPublished) {
+            await sleep(intervalMs);
+            this.setupPendingDiffsPublishing(intervalMs);
+        }
+    }
+
+
     setupPolling(intervalMs: number) {
         return setInterval(
             async () => {
@@ -381,9 +463,9 @@ export default class Perspective {
             return undefined !== list.find(e =>
                 JSON.stringify(e.author) === JSON.stringify(link.author) &&
                 e.timestamp === link.timestamp &&
-                e.source === link.data.source &&
-                e.target === link.data.target &&
-                e.predicate === link.data.predicate
+                e.data.source === link.data.source &&
+                e.data.target === link.data.target &&
+                e.data.predicate === link.data.predicate
                 )
         }
         let linksToCommit = [];

diff --git a/executor/src/tests/bootstrapSeed.json b/executor/src/tests/bootstrapSeed.json
@@ -1 +1 @@
-{"trustedAgents":["did:key:zQ3shkkuZLvqeFgHdgZgFMUx8VGkgVWsLA83w2oekhZxoCW2n"],"knownLinkLanguages":["QmX6F3iY9X6e9Fy1tdvs4PSqyNmFUqcanMQ8jJjX8u5J8a"],"directMessageLanguage":"QmeHE28cVfSBkSrgwauTpmrb3jhchammCv658oQrP41FT9","agentLanguage":"QmZ16K5HG2RgE6Q8xCC5784HG2KGyKPKtkNmGiDb9YQKZg","perspectiveLanguage":"QmUTkvPcyaUGntqfzi3iR1xomADm5yYC2j8hcPdhMHpTem","neighbourhoodLanguage":"QmT4rtTuguhfiz88Ljxt6MDuKcn1TZBpfeWb5fXGqBwMdK","languageLanguageBundle":""}
+{"trustedAgents":["did:key:zQ3shkkuZLvqeFgHdgZgFMUx8VGkgVWsLA83w2oekhZxoCW2n"],"knownLinkLanguages":["QmdR72zo5yCwnw6Ht9RjzbDPfN8sXBXhcRiBFwe3BF6JKG"],"directMessageLanguage":"QmeHE28cVfSBkSrgwauTpmrb3jhchammCv658oQrP41FT9","agentLanguage":"QmZ16K5HG2RgE6Q8xCC5784HG2KGyKPKtkNmGiDb9YQKZg","perspectiveLanguage":"QmUTkvPcyaUGntqfzi3iR1xomADm5yYC2j8hcPdhMHpTem","neighbourhoodLanguage":"QmT4rtTuguhfiz88Ljxt6MDuKcn1TZBpfeWb5fXGqBwMdK","languageLanguageBundle":""}
diff --git a/host/mainnet_seed.json b/host/mainnet_seed.json
@@ -4,7 +4,7 @@
     "did:key:zQ3sheV6m6sT83woZtVL2PHiz6J1qWRh4FWW2aiJvxy6d2o7S"
   ],
   "knownLinkLanguages": [
-    "QmeYsEe3UnJXmvAPmnDGvfdjnsUH6hWPwV2rmxcdpeokA7"
+    "QmdR72zo5yCwnw6Ht9RjzbDPfN8sXBXhcRiBFwe3BF6JKG"
   ],
   "directMessageLanguage": "QmXR4MZqxqdPmSnCNF24f82EkvahwgXW3FKzGWPZrdC8qb",
   "agentLanguage": "QmR3gt6cjaSBPV3kiLQxeZtiuJT3ZMFLQ755DMpb8yMK2m",

diff --git a/host/oldestSupportedVersion.txt b/host/oldestSupportedVersion.txt
@@ -1 +1 @@
-0.2.14
+0.2.16
diff --git a/host/package.json b/host/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ad4m-host",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "description": "Self hosting ad4m service",
   "private": true,
   "bin": {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ad4m-monorepo",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "workspaces": [
     "core",
     "docs",

diff --git a/rust-client/Cargo.toml b/rust-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ad4m-client"
-version = "0.2.15"
+version = "0.2.16"
 edition = "2021"
 authors = ["Nicolas Luck <nicolas@perspect3vism.org>"]
 description = "Client library wrapping AD4M's GraphQL interface"

diff --git a/ui/package.json b/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ad4m-launcher",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "private": true,
   "type": "module",
   "dependencies": {

diff --git a/ui/src-tauri/Cargo.toml b/ui/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ad4m-launcher"
-version = "0.2.15"
+version = "0.2.16"
 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
@@ -1,7 +1,7 @@
 {
   "package": {
     "productName": "AD4M",
-    "version": "0.2.15"
+    "version": "0.2.16"
   },
   "build": {
     "distDir": "../dist",