@dxos/echo-pipeline 0.7.2 → 0.7.3-staging.0905f03

package/dist/lib/node/index.cjs

@@ -28,11 +28,11 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var node_exports = {};
 __export(node_exports, {
-  AuthExtension: () => import_chunk_6KAVD3GU.AuthExtension,
-  AuthStatus: () => import_chunk_6KAVD3GU.AuthStatus,
+  AuthExtension: () => import_chunk_MACQJ2EP.AuthExtension,
+  AuthStatus: () => import_chunk_MACQJ2EP.AuthStatus,
   AutomergeHost: () => AutomergeHost,
-  CredentialRetrieverExtension: () => import_chunk_6KAVD3GU.CredentialRetrieverExtension,
-  CredentialServerExtension: () => import_chunk_6KAVD3GU.CredentialServerExtension,
+  CredentialRetrieverExtension: () => import_chunk_MACQJ2EP.CredentialRetrieverExtension,
+  CredentialServerExtension: () => import_chunk_MACQJ2EP.CredentialServerExtension,
   DataServiceImpl: () => DataServiceImpl,
   DatabaseRoot: () => DatabaseRoot,
   DocumentsSynchronizer: () => DocumentsSynchronizer,
@@ -40,37 +40,35 @@ __export(node_exports, {
   EchoEdgeReplicator: () => EchoEdgeReplicator,
   EchoHost: () => EchoHost,
   LevelDBStorageAdapter: () => LevelDBStorageAdapter,
-  MOCK_AUTH_PROVIDER: () => import_chunk_6KAVD3GU.MOCK_AUTH_PROVIDER,
-  MOCK_AUTH_VERIFIER: () => import_chunk_6KAVD3GU.MOCK_AUTH_VERIFIER,
+  MOCK_AUTH_PROVIDER: () => import_chunk_MACQJ2EP.MOCK_AUTH_PROVIDER,
+  MOCK_AUTH_VERIFIER: () => import_chunk_MACQJ2EP.MOCK_AUTH_VERIFIER,
   MeshEchoReplicator: () => MeshEchoReplicator,
-  MetadataStore: () => import_chunk_6KAVD3GU.MetadataStore,
-  Pipeline: () => import_chunk_6KAVD3GU.Pipeline,
+  MetadataStore: () => import_chunk_MACQJ2EP.MetadataStore,
+  Pipeline: () => import_chunk_MACQJ2EP.Pipeline,
   QueryServiceImpl: () => QueryServiceImpl,
   QueryState: () => QueryState,
-  Space: () => import_chunk_6KAVD3GU.Space,
-  SpaceManager: () => import_chunk_6KAVD3GU.SpaceManager,
-  SpaceProtocol: () => import_chunk_6KAVD3GU.SpaceProtocol,
-  SpaceProtocolSession: () => import_chunk_6KAVD3GU.SpaceProtocolSession,
-  TimeframeClock: () => import_chunk_6KAVD3GU.TimeframeClock,
-  codec: () => import_chunk_6KAVD3GU.codec,
-  convertLegacyReferences: () => convertLegacyReferences,
-  convertLegacySpaceRootDoc: () => convertLegacySpaceRootDoc,
-  createIdFromSpaceKey: () => import_chunk_6KAVD3GU.createIdFromSpaceKey,
-  createMappedFeedWriter: () => import_chunk_6KAVD3GU.createMappedFeedWriter,
+  Space: () => import_chunk_MACQJ2EP.Space,
+  SpaceManager: () => import_chunk_MACQJ2EP.SpaceManager,
+  SpaceProtocol: () => import_chunk_MACQJ2EP.SpaceProtocol,
+  SpaceProtocolSession: () => import_chunk_MACQJ2EP.SpaceProtocolSession,
+  TimeframeClock: () => import_chunk_MACQJ2EP.TimeframeClock,
+  codec: () => import_chunk_MACQJ2EP.codec,
+  createIdFromSpaceKey: () => import_chunk_MACQJ2EP.createIdFromSpaceKey,
+  createMappedFeedWriter: () => import_chunk_MACQJ2EP.createMappedFeedWriter,
   deriveCollectionIdFromSpaceId: () => deriveCollectionIdFromSpaceId,
   diffCollectionState: () => diffCollectionState,
   encodingOptions: () => encodingOptions,
   findInlineObjectOfType: () => findInlineObjectOfType,
   getSpaceIdFromCollectionId: () => getSpaceIdFromCollectionId,
   getSpaceKeyFromDoc: () => getSpaceKeyFromDoc,
-  hasInvitationExpired: () => import_chunk_6KAVD3GU.hasInvitationExpired,
-  mapFeedIndexesToTimeframe: () => import_chunk_6KAVD3GU.mapFeedIndexesToTimeframe,
-  mapTimeframeToFeedIndexes: () => import_chunk_6KAVD3GU.mapTimeframeToFeedIndexes,
-  startAfter: () => import_chunk_6KAVD3GU.startAfter,
-  valueEncoding: () => import_chunk_6KAVD3GU.valueEncoding
+  hasInvitationExpired: () => import_chunk_MACQJ2EP.hasInvitationExpired,
+  mapFeedIndexesToTimeframe: () => import_chunk_MACQJ2EP.mapFeedIndexesToTimeframe,
+  mapTimeframeToFeedIndexes: () => import_chunk_MACQJ2EP.mapTimeframeToFeedIndexes,
+  startAfter: () => import_chunk_MACQJ2EP.startAfter,
+  valueEncoding: () => import_chunk_MACQJ2EP.valueEncoding
 });
 module.exports = __toCommonJS(node_exports);
-var import_chunk_6KAVD3GU = require("./chunk-6KAVD3GU.cjs");
+var import_chunk_MACQJ2EP = require("./chunk-MACQJ2EP.cjs");
 var import_async = require("@dxos/async");
 var import_stream = require("@dxos/codec-protobuf/stream");
 var import_invariant = require("@dxos/invariant");
@@ -153,10 +151,6 @@ var import_echo_protocol4 = require("@dxos/echo-protocol");
 var import_invariant11 = require("@dxos/invariant");
 var A4 = __toESM(require("@dxos/automerge/automerge"));
 var import_log10 = require("@dxos/log");
-var import_echo_protocol5 = require("@dxos/echo-protocol");
-var import_echo_protocol6 = require("@dxos/echo-protocol");
-var import_echo_schema = require("@dxos/echo-schema");
-var import_util6 = require("@dxos/util");
 var import_async8 = require("@dxos/async");
 var A5 = __toESM(require("@dxos/automerge/automerge"));
 var import_automerge_repo5 = require("@dxos/automerge/automerge-repo");
@@ -167,7 +161,8 @@ var import_log11 = require("@dxos/log");
 var import_protocols6 = require("@dxos/protocols");
 var import_buf = require("@dxos/protocols/buf");
 var import_messenger_pb = require("@dxos/protocols/buf/dxos/edge/messenger_pb");
-var import_util7 = require("@dxos/util");
+var import_util6 = require("@dxos/util");
+var import_echo_protocol5 = require("@dxos/echo-protocol");
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/documents-synchronizer.ts";
 var MAX_UPDATE_FREQ = 10;
 var DocumentsSynchronizer = class extends import_context.Resource {
@@ -603,7 +598,7 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
       getContainingSpaceForDocument: this._params.getContainingSpaceForDocument,
       getContainingSpaceIdForDocument: async (documentId) => {
         const key = await this._params.getContainingSpaceForDocument(documentId);
-        return key ? (0, import_chunk_6KAVD3GU.createIdFromSpaceKey)(key) : null;
+        return key ? (0, import_chunk_MACQJ2EP.createIdFromSpaceKey)(key) : null;
       }
     });
   }
@@ -979,7 +974,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 import_context2.Resource {
-  constructor({ db, indexMetadataStore, dataMonitor }) {
+  constructor({ db, indexMetadataStore, dataMonitor, peerIdProvider }) {
     super();
     this._collectionSynchronizer = new CollectionSynchronizer({
       queryCollectionState: this._queryCollectionState.bind(this),
@@ -1007,9 +1002,10 @@ var AutomergeHost = class extends import_context2.Resource {
       db: db.sublevel("heads")
     });
     this._indexMetadataStore = indexMetadataStore;
+    this._peerIdProvider = peerIdProvider;
   }
   async _open() {
-    this._peerId = `host-${import_keys2.PublicKey.random().toHex()}`;
+    this._peerId = `host-${this._peerIdProvider?.() ?? import_keys2.PublicKey.random().toHex()}`;
     await this._storage.open?.();
     this._repo = new import_automerge_repo.Repo({
       peerId: this._peerId,
@@ -1109,7 +1105,7 @@ var AutomergeHost = class extends import_context2.Resource {
       await Promise.all(headsToWait.map(async (entry, index) => {
         const handle = await this.loadDoc(import_context2.Context.default(void 0, {
           F: __dxlog_file4,
-          L: 230
+          L: 239
         }), entry.documentId);
         await waitForHeads(handle, entry.heads);
       }));
@@ -1122,7 +1118,7 @@ var AutomergeHost = class extends import_context2.Resource {
         documentId
       }, {
         F: __dxlog_file4,
-        L: 242,
+        L: 251,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1138,7 +1134,7 @@ var AutomergeHost = class extends import_context2.Resource {
           documentId
         }, {
           F: __dxlog_file4,
-          L: 246,
+          L: 255,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1147,7 +1143,7 @@ var AutomergeHost = class extends import_context2.Resource {
       const doc = handle.docSync();
       (0, import_invariant3.invariant)(doc, void 0, {
         F: __dxlog_file4,
-        L: 251,
+        L: 260,
         S: this,
         A: [
           "doc",
@@ -1161,7 +1157,7 @@ var AutomergeHost = class extends import_context2.Resource {
     }
     import_log3.log.info("done re-indexing heads", void 0, {
       F: __dxlog_file4,
-      L: 258,
+      L: 267,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1367,7 +1363,7 @@ var AutomergeHost = class extends import_context2.Resource {
       count: toReplicate.length
     }, {
       F: __dxlog_file4,
-      L: 486,
+      L: 495,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1434,7 +1430,7 @@ var changeIsPresentInDoc = (doc, changeHash) => {
 var decodeCollectionState = (state) => {
   (0, import_invariant3.invariant)(typeof state === "object" && state !== null, "Invalid state", {
     F: __dxlog_file4,
-    L: 544,
+    L: 553,
     S: void 0,
     A: [
       "typeof state === 'object' && state !== null",
@@ -1712,7 +1708,7 @@ var MeshEchoReplicator = class {
             });
             return remoteDocumentExists;
           }
-          const spaceId = await (0, import_chunk_6KAVD3GU.createIdFromSpaceKey)(spaceKey);
+          const spaceId = await (0, import_chunk_MACQJ2EP.createIdFromSpaceKey)(spaceKey);
           const authorizedDevices = this._authorizedDevices.get(spaceId);
           if (!connection.remoteDeviceKey) {
             (0, import_log6.log)("device key not found for share policy check", {
@@ -1783,7 +1779,7 @@ var MeshEchoReplicator = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    const spaceId = await (0, import_chunk_6KAVD3GU.createIdFromSpaceKey)(spaceKey);
+    const spaceId = await (0, import_chunk_MACQJ2EP.createIdFromSpaceKey)(spaceKey);
     (0, import_util3.defaultMap)(this._authorizedDevices, spaceId, () => new import_util3.ComplexSet(import_keys3.PublicKey.hash)).add(deviceKey);
     for (const connection of this._connections) {
       if (connection.remoteDeviceKey && connection.remoteDeviceKey.equals(deviceKey)) {
@@ -2883,7 +2879,7 @@ var INDEXER_CONFIG = {
   ]
 };
 var EchoHost = class extends import_context7.Resource {
-  constructor({ kv }) {
+  constructor({ kv, peerIdProvider }) {
     super();
     this._spaceStateManager = new SpaceStateManager();
     this._indexMetadataStore = new import_indexing2.IndexMetadataStore({
@@ -2893,7 +2889,8 @@ var EchoHost = class extends import_context7.Resource {
     this._automergeHost = new AutomergeHost({
       db: kv,
       dataMonitor: this._echoDataMonitor,
-      indexMetadataStore: this._indexMetadataStore
+      indexMetadataStore: this._indexMetadataStore,
+      peerIdProvider
     });
     this._indexer = new import_indexing2.Indexer({
       db: kv,
@@ -3013,7 +3010,7 @@ var EchoHost = class extends import_context7.Resource {
   async createSpaceRoot(spaceKey) {
     (0, import_invariant8.invariant)(this._lifecycleState === import_context7.LifecycleState.OPEN, void 0, {
       F: __dxlog_file15,
-      L: 206,
+      L: 209,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -3041,7 +3038,7 @@ var EchoHost = class extends import_context7.Resource {
   async openSpaceRoot(spaceId, automergeUrl) {
     (0, import_invariant8.invariant)(this._lifecycleState === import_context7.LifecycleState.OPEN, void 0, {
       F: __dxlog_file15,
-      L: 225,
+      L: 228,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -3072,37 +3069,6 @@ var EchoHost = class extends import_context7.Resource {
     return this._automergeHost.getCollectionSyncState(collectionId);
   }
 };
-var convertLegacyReferences = async (doc) => {
-  const newDoc = await (0, import_util6.deepMapValuesAsync)(doc, async (value, recurse) => {
-    if ((0, import_echo_protocol6.isLegacyReference)(value)) {
-      return (0, import_echo_protocol5.convertLegacyReference)(value);
-    }
-    return recurse(value);
-  });
-  newDoc.version = import_echo_protocol6.SpaceDocVersion.CURRENT;
-  return newDoc;
-};
-var convertLegacySpaceRootDoc = async (root) => {
-  const newDoc = await convertLegacyReferences(root);
-  const properties = findInlineObjectOfType(newDoc, import_echo_protocol6.LEGACY_TYPE_PROPERTIES);
-  if (properties) {
-    const [_, obj] = properties;
-    obj.system.type = (0, import_echo_protocol6.encodeReference)(import_echo_protocol6.Reference.fromLegacyTypename(import_echo_schema.TYPE_PROPERTIES));
-  }
-  return newDoc;
-};
-var findInlineObjectOfType = (spaceDoc, typename) => {
-  for (const id in spaceDoc.objects ?? {}) {
-    const obj = spaceDoc.objects[id];
-    if (obj.system.type && (0, import_echo_protocol6.decodeReference)(obj.system.type).objectId === typename) {
-      return [
-        id,
-        obj
-      ];
-    }
-  }
-  return void 0;
-};
 function _using_ctx() {
   var _disposeSuppressedError = typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed) {
     var err = new Error();
@@ -3240,6 +3206,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);
@@ -3269,7 +3238,7 @@ var EchoEdgeReplicator = class {
   async _openConnection(spaceId, reconnects = 0) {
     (0, import_invariant12.invariant)(this._context, void 0, {
       F: __dxlog_file16,
-      L: 121,
+      L: 124,
       S: this,
       A: [
         "this._context",
@@ -3278,7 +3247,7 @@ var EchoEdgeReplicator = class {
     });
     (0, import_invariant12.invariant)(!this._connections.has(spaceId), void 0, {
       F: __dxlog_file16,
-      L: 122,
+      L: 125,
       S: this,
       A: [
         "!this._connections.has(spaceId)",
@@ -3308,7 +3277,7 @@ var EchoEdgeReplicator = class {
           restartDelay
         }, {
           F: __dxlog_file16,
-          L: 145,
+          L: 148,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3366,7 +3335,7 @@ var EdgeReplicatorConnection = class extends import_context12.Resource {
   async _open(ctx) {
     (0, import_log11.log)("open", void 0, {
       F: __dxlog_file16,
-      L: 239,
+      L: 242,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3378,7 +3347,7 @@ var EdgeReplicatorConnection = class extends import_context12.Resource {
   async _close() {
     (0, import_log11.log)("close", void 0, {
       F: __dxlog_file16,
-      L: 251,
+      L: 254,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3388,7 +3357,7 @@ var EdgeReplicatorConnection = class extends import_context12.Resource {
   get peerId() {
     (0, import_invariant12.invariant)(this._remotePeerId, "Not connected", {
       F: __dxlog_file16,
-      L: 257,
+      L: 260,
       S: this,
       A: [
         "this._remotePeerId",
@@ -3403,7 +3372,20 @@ var EdgeReplicatorConnection = class extends import_context12.Resource {
     }
     const spaceId = await this._context.getContainingSpaceIdForDocument(params.documentId);
     if (!spaceId) {
-      return true;
+      const remoteDocumentExists = await this._context.isDocumentInRemoteCollection({
+        documentId: params.documentId,
+        peerId: this._remotePeerId
+      });
+      import_log11.log.info("document not found locally for share policy check, accepting the remote document", {
+        documentId: params.documentId,
+        remoteDocumentExists
+      }, {
+        F: __dxlog_file16,
+        L: 275,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      return remoteDocumentExists;
     }
     return spaceId === this._spaceId;
   }
@@ -3428,7 +3410,7 @@ var EdgeReplicatorConnection = class extends import_context12.Resource {
       };
     }, {
       F: __dxlog_file16,
-      L: 288,
+      L: 302,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3451,7 +3433,7 @@ var EdgeReplicatorConnection = class extends import_context12.Resource {
       documentId: message.documentId
     }, {
       F: __dxlog_file16,
-      L: 318,
+      L: 332,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3463,12 +3445,24 @@ var EdgeReplicatorConnection = class extends import_context12.Resource {
         peerKey: this._edgeConnection.peerKey
       },
       payload: {
-        value: (0, import_util7.bufferToArray)(encoded)
+        value: (0, import_util6.bufferToArray)(encoded)
       }
     }));
   }
 };
 var isForbiddenErrorMessage = (message) => message.type === "error" && message.message === "Forbidden";
+var findInlineObjectOfType = (spaceDoc, typename) => {
+  for (const id in spaceDoc.objects ?? {}) {
+    const obj = spaceDoc.objects[id];
+    if (obj.system.type && (0, import_echo_protocol5.decodeReference)(obj.system.type).objectId === typename) {
+      return [
+        id,
+        obj
+      ];
+    }
+  }
+  return void 0;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AuthExtension,
@@ -3496,8 +3490,6 @@ var isForbiddenErrorMessage = (message) => message.type === "error" && message.m
   SpaceProtocolSession,
   TimeframeClock,
   codec,
-  convertLegacyReferences,
-  convertLegacySpaceRootDoc,
   createIdFromSpaceKey,
   createMappedFeedWriter,
   deriveCollectionIdFromSpaceId,