sync-interop: import from @ndn/psync and @ndn/svs

yoursunny · Feb 6, 2024 · 6077d95 · 6077d95
1 parent 87f9c28
commit 6077d95
Show file tree

Hide file tree

Showing 22 changed files with 24 additions and 23 deletions.
diff --git a/integ/browser-tests/package.json b/integ/browser-tests/package.json
@@ -27,7 +27,7 @@
     "@types/webpack": "^5.28.5",
     "fork-ts-checker-webpack-plugin": "^9.0.2",
     "html-webpack-plugin": "^5.6.0",
-    "puppeteer": "^21.10.0",
+    "puppeteer": "^22.0.0",
     "ts-loader": "^9.5.1",
     "tslib": "^2.6.2",
     "type-fest": "^4.10.2",

diff --git a/integ/sync-interop/README.md b/integ/sync-interop/README.md
@@ -1,4 +1,4 @@
-# `@ndn/sync` Interoperability Test
+# `@ndn/psync` and `@ndn/svs` Interoperability Test
 
 ## PSync
 

diff --git a/integ/sync-interop/package.json b/integ/sync-interop/package.json
@@ -7,8 +7,9 @@
     "@ndn/keychain": "workspace:*",
     "@ndn/naming-convention2": "workspace:*",
     "@ndn/packet": "workspace:*",
+    "@ndn/psync": "workspace:*",
     "@ndn/repo": "workspace:*",
-    "@ndn/sync": "workspace:*",
+    "@ndn/svs": "workspace:*",
     "@ndn/util": "workspace:*",
     "@types/memdown": "^3.0.5",
     "memdown": "^6.1.1",

diff --git a/integ/sync-interop/psync-full.ts b/integ/sync-interop/psync-full.ts
@@ -1,6 +1,6 @@
 import { exitClosers, openUplinks } from "@ndn/cli-common";
 import { Name } from "@ndn/packet";
-import { makePSyncCompatParam, PSyncFull, PSyncZlib } from "@ndn/sync";
+import { makePSyncCompatParam, PSyncFull, PSyncZlib } from "@ndn/psync";
 import { console } from "@ndn/util";
 
 const syncPrefix = new Name("/psync-interop");

diff --git a/integ/sync-interop/psync-partial-publisher.ts b/integ/sync-interop/psync-partial-publisher.ts
@@ -1,6 +1,6 @@
 import { exitClosers, openUplinks } from "@ndn/cli-common";
 import { Name } from "@ndn/packet";
-import { makePSyncCompatParam, PSyncPartialPublisher, PSyncZlib, type SyncNode } from "@ndn/sync";
+import { makePSyncCompatParam, PSyncPartialPublisher, PSyncZlib, type SyncNode } from "@ndn/psync";
 import { console } from "@ndn/util";
 
 const syncPrefix = new Name("/psync-interop");

diff --git a/integ/sync-interop/psync-partial-subscriber.ts b/integ/sync-interop/psync-partial-subscriber.ts
@@ -1,6 +1,6 @@
 import { exitClosers, openUplinks } from "@ndn/cli-common";
 import { Name } from "@ndn/packet";
-import { makePSyncCompatParam, PSyncPartialSubscriber, PSyncZlib, type Subscription } from "@ndn/sync";
+import { makePSyncCompatParam, PSyncPartialSubscriber, PSyncZlib, type Subscription } from "@ndn/psync";
 import { console } from "@ndn/util";
 
 const syncPrefix = new Name("/psync-interop");

diff --git a/integ/sync-interop/svs-common.ts b/integ/sync-interop/svs-common.ts
@@ -1,7 +1,7 @@
 import { exitClosers, openUplinks } from "@ndn/cli-common";
 import { createSigner, createVerifier, HMAC } from "@ndn/keychain";
 import { Name } from "@ndn/packet";
-import { SvSync } from "@ndn/sync";
+import { SvSync } from "@ndn/svs";
 
 export const syncPrefix = new Name("/ndn/svs");
 export const myID = new Name(`/${process.pid}-${Date.now()}`);

diff --git a/integ/sync-interop/svsps-publisher.ts b/integ/sync-interop/svsps-publisher.ts
@@ -2,7 +2,7 @@ import { exitClosers } from "@ndn/cli-common";
 import { Timestamp } from "@ndn/naming-convention2";
 import { digestSigning, Name } from "@ndn/packet";
 import { DataStore } from "@ndn/repo";
-import { SvPublisher } from "@ndn/sync";
+import { SvPublisher } from "@ndn/svs";
 import { console, crypto, toHex, toUtf8 } from "@ndn/util";
 import memdown from "memdown";
 

diff --git a/integ/sync-interop/svsps-subscriber.ts b/integ/sync-interop/svsps-subscriber.ts
@@ -1,6 +1,6 @@
 import { exitClosers } from "@ndn/cli-common";
 import { digestSigning, Name } from "@ndn/packet";
-import { SvSubscriber } from "@ndn/sync";
+import { SvSubscriber } from "@ndn/svs";
 import { console, fromUtf8 } from "@ndn/util";
 
 import { openSvSync } from "./svs-common";

diff --git a/integ/sync-interop/syncps.ts b/integ/sync-interop/syncps.ts
@@ -1,6 +1,6 @@
 import { exitClosers, openUplinks } from "@ndn/cli-common";
 import { Data, Name } from "@ndn/packet";
-import { makeSyncpsCompatParam, SyncpsPubsub } from "@ndn/sync";
+import { makeSyncpsCompatParam, SyncpsPubsub } from "@ndn/psync";
 import { console } from "@ndn/util";
 
 const syncPrefix = new Name("/syncps-interop");

diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
   "devDependencies": {
     "@types/node": "^20.11.16",
     "@types/wtfnode": "^0.7.3",
-    "@typescript/lib-dom": "npm:@types/[email protected].137",
+    "@typescript/lib-dom": "npm:@types/[email protected].138",
     "@vitest/coverage-v8": "^1.2.2",
     "@yoursunny/xo-config": "0.56.2",
     "codedown": "^3.1.0",

diff --git a/pkg/endpoint/src/producer.ts b/pkg/endpoint/src/producer.ts
@@ -39,8 +39,8 @@ export interface ProducerOptions {
    *
    * @remarks
    * If all nexthops of a FIB entry are set to non-capture, FIB lookup may continue onto nexthops
-   * on FIB entries with shorter prefixes. One use case is in `@ndn/sync` package, where both local
-   * and remote sync participants want to receive each other's Interests.
+   * on FIB entries with shorter prefixes. One use case is in dataset synchronization protocols,
+   * where both local and remote sync participants want to receive each other's Interests.
    */
   routeCapture?: boolean;
 

diff --git a/pkg/fileserver/package.json b/pkg/fileserver/package.json
@@ -33,7 +33,7 @@
     "@ndn/segmented-object": "workspace:*",
     "@ndn/tlv": "workspace:*",
     "@ndn/util": "workspace:*",
-    "mnemonist": "^0.39.7",
+    "mnemonist": "^0.39.8",
     "obliterator": "^2.0.4",
     "streaming-iterables": "^8.0.1",
     "tslib": "^2.6.2"

diff --git a/pkg/fw/package.json b/pkg/fw/package.json
@@ -30,7 +30,7 @@
     "@ndn/util": "workspace:*",
     "@types/retry": "^0.12.5",
     "hirestime": "^7.0.3",
-    "mnemonist": "^0.39.7",
+    "mnemonist": "^0.39.8",
     "retry": "^0.13.1",
     "streaming-iterables": "^8.0.1",
     "tslib": "^2.6.2",

diff --git a/pkg/keychain/package.json b/pkg/keychain/package.json
@@ -35,7 +35,7 @@
     "@yoursunny/asn1": "0.0.20200718",
     "@yoursunny/webcrypto-ed25519": "0.0.20230624",
     "idb-keyval": "^6.2.1",
-    "mnemonist": "^0.39.7",
+    "mnemonist": "^0.39.8",
     "throat": "^6.0.2",
     "tslib": "^2.6.2",
     "type-fest": "^4.10.2"

diff --git a/pkg/nac/package.json b/pkg/nac/package.json
@@ -35,7 +35,7 @@
     "@ndn/tlv": "workspace:*",
     "@ndn/util": "workspace:*",
     "@yoursunny/asn1": "0.0.20200718",
-    "mnemonist": "^0.39.7",
+    "mnemonist": "^0.39.8",
     "tslib": "^2.6.2",
     "type-fest": "^4.10.2"
   },

diff --git a/pkg/packet/package.json b/pkg/packet/package.json
@@ -29,7 +29,7 @@
     "@ndn/tlv": "workspace:*",
     "@ndn/util": "workspace:*",
     "buffer-compare": "^1.1.1",
-    "mnemonist": "^0.39.7",
+    "mnemonist": "^0.39.8",
     "tslib": "^2.6.2",
     "type-fest": "^4.10.2"
   },

diff --git a/pkg/psync/package.json b/pkg/psync/package.json
@@ -35,7 +35,7 @@
     "@ndn/util": "workspace:*",
     "@yoursunny/psync-bloom": "github:yoursunny/PSyncBloom-wasm#build",
     "applymixins": "^1.1.0",
-    "mnemonist": "^0.39.7",
+    "mnemonist": "^0.39.8",
     "murmurhash3js-revisited": "^3.0.0",
     "obliterator": "^2.0.4",
     "p-defer": "^4.0.0",

diff --git a/pkg/segmented-object/package.json b/pkg/segmented-object/package.json
@@ -33,7 +33,7 @@
     "@ndn/util": "workspace:*",
     "event-iterator": "^2.0.0",
     "hirestime": "^7.0.3",
-    "mnemonist": "^0.39.7",
+    "mnemonist": "^0.39.8",
     "p-defer": "^4.0.0",
     "p-event": "^6.0.0",
     "p-lazy": "^4.0.0",

diff --git a/pkg/svs/package.json b/pkg/svs/package.json
@@ -45,6 +45,6 @@
     "@ndn/l3face": "workspace:*",
     "@ndn/repo": "workspace:*",
     "memdown": "^6.1.1",
-    "mnemonist": "^0.39.7"
+    "mnemonist": "^0.39.8"
   }
 }
diff --git a/pkg/tlv/package.json b/pkg/tlv/package.json
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "@ndn/util": "workspace:*",
-    "mnemonist": "^0.39.7",
+    "mnemonist": "^0.39.8",
     "tslib": "^2.6.2",
     "type-fest": "^4.10.2"
   }

diff --git a/pkg/trust-schema/package.json b/pkg/trust-schema/package.json
@@ -31,7 +31,7 @@
     "@ndn/naming-convention2": "workspace:*",
     "@ndn/packet": "workspace:*",
     "@ndn/util": "workspace:*",
-    "mnemonist": "^0.39.7",
+    "mnemonist": "^0.39.8",
     "tslib": "^2.6.2",
     "type-fest": "^4.10.2"
   },