@dxos/echo-pipeline 0.7.2 → 0.7.3-staging.971cd8d

package/dist/lib/browser/index.mjs

@@ -21,7 +21,7 @@ import {
   mapTimeframeToFeedIndexes,
   startAfter,
   valueEncoding
-} from "./chunk-RRKGEIVZ.mjs";
+} from "./chunk-LZK5YFYE.mjs";
 
 // packages/core/echo/echo-pipeline/src/db-host/data-service.ts
 import { UpdateScheduler as UpdateScheduler2 } from "@dxos/async";
@@ -889,7 +889,7 @@ function _ts_decorate2(decorators, target, key, desc) {
 }
 var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts";
 var AutomergeHost = class extends Resource4 {
-  constructor({ db, indexMetadataStore, dataMonitor }) {
+  constructor({ db, indexMetadataStore, dataMonitor, peerIdProvider }) {
     super();
     this._collectionSynchronizer = new CollectionSynchronizer({
       queryCollectionState: this._queryCollectionState.bind(this),
@@ -917,9 +917,10 @@ var AutomergeHost = class extends Resource4 {
       db: db.sublevel("heads")
     });
     this._indexMetadataStore = indexMetadataStore;
+    this._peerIdProvider = peerIdProvider;
   }
   async _open() {
-    this._peerId = `host-${PublicKey.random().toHex()}`;
+    this._peerId = `host-${this._peerIdProvider?.() ?? PublicKey.random().toHex()}`;
     await this._storage.open?.();
     this._repo = new Repo({
       peerId: this._peerId,
@@ -1019,7 +1020,7 @@ var AutomergeHost = class extends Resource4 {
       await Promise.all(headsToWait.map(async (entry, index) => {
         const handle = await this.loadDoc(Context.default(void 0, {
           F: __dxlog_file4,
-          L: 230
+          L: 239
         }), entry.documentId);
         await waitForHeads(handle, entry.heads);
       }));
@@ -1032,7 +1033,7 @@ var AutomergeHost = class extends Resource4 {
         documentId
       }, {
         F: __dxlog_file4,
-        L: 242,
+        L: 251,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1048,7 +1049,7 @@ var AutomergeHost = class extends Resource4 {
           documentId
         }, {
           F: __dxlog_file4,
-          L: 246,
+          L: 255,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1057,7 +1058,7 @@ var AutomergeHost = class extends Resource4 {
       const doc = handle.docSync();
       invariant3(doc, void 0, {
         F: __dxlog_file4,
-        L: 251,
+        L: 260,
         S: this,
         A: [
           "doc",
@@ -1071,7 +1072,7 @@ var AutomergeHost = class extends Resource4 {
     }
     log4.info("done re-indexing heads", void 0, {
       F: __dxlog_file4,
-      L: 258,
+      L: 267,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1277,7 +1278,7 @@ var AutomergeHost = class extends Resource4 {
       count: toReplicate.length
     }, {
       F: __dxlog_file4,
-      L: 486,
+      L: 495,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1344,7 +1345,7 @@ var changeIsPresentInDoc = (doc, changeHash) => {
 var decodeCollectionState = (state) => {
   invariant3(typeof state === "object" && state !== null, "Invalid state", {
     F: __dxlog_file4,
-    L: 544,
+    L: 553,
     S: void 0,
     A: [
       "typeof state === 'object' && state !== null",
@@ -2886,7 +2887,7 @@ var INDEXER_CONFIG = {
   ]
 };
 var EchoHost = class extends Resource9 {
-  constructor({ kv }) {
+  constructor({ kv, peerIdProvider }) {
     super();
     this._spaceStateManager = new SpaceStateManager();
     this._indexMetadataStore = new IndexMetadataStore({
@@ -2896,7 +2897,8 @@ var EchoHost = class extends Resource9 {
     this._automergeHost = new AutomergeHost({
       db: kv,
       dataMonitor: this._echoDataMonitor,
-      indexMetadataStore: this._indexMetadataStore
+      indexMetadataStore: this._indexMetadataStore,
+      peerIdProvider
     });
     this._indexer = new Indexer({
       db: kv,
@@ -3016,7 +3018,7 @@ var EchoHost = class extends Resource9 {
   async createSpaceRoot(spaceKey) {
     invariant11(this._lifecycleState === LifecycleState4.OPEN, void 0, {
       F: __dxlog_file15,
-      L: 206,
+      L: 209,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -3044,7 +3046,7 @@ var EchoHost = class extends Resource9 {
   async openSpaceRoot(spaceId, automergeUrl) {
     invariant11(this._lifecycleState === LifecycleState4.OPEN, void 0, {
       F: __dxlog_file15,
-      L: 225,
+      L: 228,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -3076,43 +3078,6 @@ var EchoHost = class extends Resource9 {
   }
 };
 
-// packages/core/echo/echo-pipeline/src/db-host/migration.ts
-import { convertLegacyReference } from "@dxos/echo-protocol";
-import { decodeReference, encodeReference, isLegacyReference, LEGACY_TYPE_PROPERTIES, Reference, SpaceDocVersion as SpaceDocVersion4 } from "@dxos/echo-protocol";
-import { TYPE_PROPERTIES } from "@dxos/echo-schema";
-import { deepMapValuesAsync } from "@dxos/util";
-var convertLegacyReferences = async (doc) => {
-  const newDoc = await deepMapValuesAsync(doc, async (value, recurse) => {
-    if (isLegacyReference(value)) {
-      return convertLegacyReference(value);
-    }
-    return recurse(value);
-  });
-  newDoc.version = SpaceDocVersion4.CURRENT;
-  return newDoc;
-};
-var convertLegacySpaceRootDoc = async (root) => {
-  const newDoc = await convertLegacyReferences(root);
-  const properties = findInlineObjectOfType(newDoc, LEGACY_TYPE_PROPERTIES);
-  if (properties) {
-    const [_, obj] = properties;
-    obj.system.type = encodeReference(Reference.fromLegacyTypename(TYPE_PROPERTIES));
-  }
-  return newDoc;
-};
-var findInlineObjectOfType = (spaceDoc, typename) => {
-  for (const id in spaceDoc.objects ?? {}) {
-    const obj = spaceDoc.objects[id];
-    if (obj.system.type && decodeReference(obj.system.type).objectId === typename) {
-      return [
-        id,
-        obj
-      ];
-    }
-  }
-  return void 0;
-};
-
 // packages/core/echo/echo-pipeline/src/edge/echo-edge-replicator.ts
 import { Mutex, scheduleTask as scheduleTask2, scheduleMicroTask } from "@dxos/async";
 import * as A5 from "@dxos/automerge/automerge";
@@ -3262,6 +3227,9 @@ var EchoEdgeReplicator = class {
     try {
       var _usingCtx = _using_ctx();
       const _guard = _usingCtx.u(await this._mutex.acquire());
+      if (this._connectedSpaces.has(spaceId)) {
+        return;
+      }
       this._connectedSpaces.add(spaceId);
       if (this._context !== null) {
         await this._openConnection(spaceId);
@@ -3291,7 +3259,7 @@ var EchoEdgeReplicator = class {
   async _openConnection(spaceId, reconnects = 0) {
     invariant12(this._context, void 0, {
       F: __dxlog_file16,
-      L: 121,
+      L: 124,
       S: this,
       A: [
         "this._context",
@@ -3300,7 +3268,7 @@ var EchoEdgeReplicator = class {
     });
     invariant12(!this._connections.has(spaceId), void 0, {
       F: __dxlog_file16,
-      L: 122,
+      L: 125,
       S: this,
       A: [
         "!this._connections.has(spaceId)",
@@ -3330,7 +3298,7 @@ var EchoEdgeReplicator = class {
           restartDelay
         }, {
           F: __dxlog_file16,
-          L: 145,
+          L: 148,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3388,7 +3356,7 @@ var EdgeReplicatorConnection = class extends Resource10 {
   async _open(ctx) {
     log11("open", void 0, {
       F: __dxlog_file16,
-      L: 239,
+      L: 242,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3400,7 +3368,7 @@ var EdgeReplicatorConnection = class extends Resource10 {
   async _close() {
     log11("close", void 0, {
       F: __dxlog_file16,
-      L: 251,
+      L: 254,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3410,7 +3378,7 @@ var EdgeReplicatorConnection = class extends Resource10 {
   get peerId() {
     invariant12(this._remotePeerId, "Not connected", {
       F: __dxlog_file16,
-      L: 257,
+      L: 260,
       S: this,
       A: [
         "this._remotePeerId",
@@ -3450,7 +3418,7 @@ var EdgeReplicatorConnection = class extends Resource10 {
       };
     }, {
       F: __dxlog_file16,
-      L: 288,
+      L: 291,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3473,7 +3441,7 @@ var EdgeReplicatorConnection = class extends Resource10 {
       documentId: message.documentId
     }, {
       F: __dxlog_file16,
-      L: 318,
+      L: 321,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3491,6 +3459,21 @@ var EdgeReplicatorConnection = class extends Resource10 {
   }
 };
 var isForbiddenErrorMessage = (message) => message.type === "error" && message.message === "Forbidden";
+
+// packages/core/echo/echo-pipeline/src/util.ts
+import { decodeReference } from "@dxos/echo-protocol";
+var findInlineObjectOfType = (spaceDoc, typename) => {
+  for (const id in spaceDoc.objects ?? {}) {
+    const obj = spaceDoc.objects[id];
+    if (obj.system.type && decodeReference(obj.system.type).objectId === typename) {
+      return [
+        id,
+        obj
+      ];
+    }
+  }
+  return void 0;
+};
 export {
   AuthExtension,
   AuthStatus,
@@ -3517,8 +3500,6 @@ export {
   SpaceProtocolSession,
   TimeframeClock,
   codec,
-  convertLegacyReferences,
-  convertLegacySpaceRootDoc,
   createIdFromSpaceKey,
   createMappedFeedWriter,
   deriveCollectionIdFromSpaceId,