Merge branch 'main' into or-set

drp-tech · Jul 26, 2024 · d86d908 · d86d908
2 parents 144fcb4 + 9751804
commit d86d908
Show file tree

Hide file tree

Showing 6 changed files with 1,143 additions and 1,100 deletions.
diff --git a/examples/canvas/package.json b/examples/canvas/package.json
@@ -9,10 +9,10 @@
     "start": "ts-node ./src/index.ts"
   },
   "dependencies": {
-    "@topology-foundation/crdt": "0.0.22",
-    "@topology-foundation/network": "0.0.22",
-    "@topology-foundation/node": "0.0.22",
-    "@topology-foundation/object": "0.0.22",
+    "@topology-foundation/crdt": "file:../../packages/crdt",
+    "@topology-foundation/network": "file:../../packages/network",
+    "@topology-foundation/node": "file:../../packages/node",
+    "@topology-foundation/object": "file:../../packages/object",
     "crypto-browserify": "^3.12.0",
     "process": "^0.11.10",
     "stream-browserify": "^3.0.0",

diff --git a/packages/network/package.json b/packages/network/package.json
@@ -35,16 +35,16 @@
     "@chainsafe/libp2p-noise": "^15.1.0",
     "@chainsafe/libp2p-yamux": "^6.0.2",
     "@libp2p/autonat": "^1.0.0",
-    "@libp2p/bootstrap": "^10.1.0",
+    "@libp2p/bootstrap": "^10.1.2",
     "@libp2p/circuit-relay-v2": "^1.1.2",
     "@libp2p/dcutr": "^1.1.0",
-    "@libp2p/identify": "^2.0.2",
+    "@libp2p/identify": "^2.1.2",
     "@libp2p/interface-pubsub": "^4.0.1",
-    "@libp2p/mdns": "^10.1.1",
+    "@libp2p/mdns": "^10.1.2",
     "@libp2p/pubsub-peer-discovery": "^10.0.2",
     "@libp2p/webrtc": "^4.1.2",
-    "@libp2p/websockets": "^8.1.1",
-    "@libp2p/webtransport": "^4.1.1",
+    "@libp2p/websockets": "^8.1.2",
+    "@libp2p/webtransport": "^4.1.2",
     "@multiformats/multiaddr": "^12.3.0",
     "it-pipe": "^3.0.1",
     "libp2p": "^1.8.1"

diff --git a/packages/network/src/node.ts b/packages/network/src/node.ts
@@ -78,8 +78,8 @@ export class TopologyNetworkNode {
             this._config && this._config.bootstrap_peers
               ? this._config.bootstrap_peers
               : [
-                  "/dns4/relay.droak.sh/tcp/443/wss/p2p/Qma3GsJmB47xYuyahPZPSadh1avvxfyYQwk8R3UnFrQ6aP",
-                ],
+                "/dns4/relay.droak.sh/tcp/443/wss/p2p/Qma3GsJmB47xYuyahPZPSadh1avvxfyYQwk8R3UnFrQ6aP",
+              ],
         }),
       ],
       services: {

diff --git a/packages/node/src/index.ts b/packages/node/src/index.ts
@@ -63,6 +63,7 @@ export class TopologyNode {
               uint8ArrayToString(new Uint8Array(message["data"])),
             );
             this._objectStore.put(object["id"], object);
+            break;
           }
           case "object_sync": {
             const objectId = uint8ArrayToString(
@@ -89,6 +90,7 @@ export class TopologyNode {
               local.merge(object);
               this._objectStore.put(object["id"], local);
             }
+            break;
           }
           default: {
             return;
@@ -115,7 +117,7 @@ export class TopologyNode {
       "data": [${uint8ArrayFromString(objectId)}]
     }`;
 
-    if (peerId === "") {
+    if (!peerId) {
       await this.networkNode.sendGroupMessageRandomPeer(
         objectId,
         ["/topology/message/0.0.1"],
@@ -137,7 +139,7 @@ export class TopologyNode {
       "data": [${uint8ArrayFromString(objectId)}]
     }`;
 
-    if (peerId === "") {
+    if (!peerId) {
       await this.networkNode.sendGroupMessageRandomPeer(
         objectId,
         ["/topology/message/0.0.1"],

diff --git a/packages/node/src/version.ts b/packages/node/src/version.ts
@@ -1 +1 @@
-export const VERSION = "0.0.22-2";
+export const VERSION = "0.0.22";
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export const VERSION = "0.0.22-2";
		export const VERSION = "0.0.22";