@dxos/echo-pipeline 0.4.8-main.27faba7 → 0.4.8-main.512e4c8

package/dist/lib/node/{chunk-UKREXVZX.cjs → chunk-LD4R726W.cjs}

@@ -26,8 +26,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_UKREXVZX_exports = {};
-__export(chunk_UKREXVZX_exports, {
+var chunk_LD4R726W_exports = {};
+__export(chunk_LD4R726W_exports, {
   AuthExtension: () => AuthExtension,
   AuthStatus: () => AuthStatus,
   AutomergeHost: () => AutomergeHost,
@@ -52,12 +52,13 @@ __export(chunk_UKREXVZX_exports, {
   TimeframeClock: () => TimeframeClock,
   codec: () => codec,
   createMappedFeedWriter: () => createMappedFeedWriter,
+  getSpaceKeyFromDoc: () => getSpaceKeyFromDoc,
   mapFeedIndexesToTimeframe: () => mapFeedIndexesToTimeframe,
   mapTimeframeToFeedIndexes: () => mapTimeframeToFeedIndexes,
   startAfter: () => startAfter,
   valueEncoding: () => valueEncoding
 });
-module.exports = __toCommonJS(chunk_UKREXVZX_exports);
+module.exports = __toCommonJS(chunk_LD4R726W_exports);
 var import_hypercore = require("@dxos/hypercore");
 var import_protocols = require("@dxos/protocols");
 var import_invariant = require("@dxos/invariant");
@@ -152,20 +153,19 @@ var import_keys7 = require("@dxos/keys");
 var import_log12 = require("@dxos/log");
 var import_protocols7 = require("@dxos/protocols");
 var import_util9 = require("@dxos/util");
-var import_automerge_repo = require("@dxos/automerge/automerge-repo");
 var import_util10 = require("@dxos/util");
 var import_async10 = require("@dxos/async");
-var import_automerge_repo2 = require("@dxos/automerge/automerge-repo");
+var import_automerge_repo = require("@dxos/automerge/automerge-repo");
 var import_codec_protobuf2 = require("@dxos/codec-protobuf");
 var import_invariant10 = require("@dxos/invariant");
 var import_log13 = require("@dxos/log");
 var import_async11 = require("@dxos/async");
-var import_automerge_repo3 = require("@dxos/automerge/automerge-repo");
+var import_automerge_repo2 = require("@dxos/automerge/automerge-repo");
 var import_invariant11 = require("@dxos/invariant");
 var import_log14 = require("@dxos/log");
 var import_teleport_extension_automerge_replicator = require("@dxos/teleport-extension-automerge-replicator");
 var import_automerge = require("@dxos/automerge/automerge");
-var import_automerge_repo4 = require("@dxos/automerge/automerge-repo");
+var import_automerge_repo3 = require("@dxos/automerge/automerge-repo");
 var import_automerge_repo_storage_indexeddb = require("@dxos/automerge/automerge-repo-storage-indexeddb");
 var import_context8 = require("@dxos/context");
 var import_keys8 = require("@dxos/keys");
@@ -2823,9 +2823,8 @@ _ts_decorate8([
 SpaceManager = _ts_decorate8([
   (0, import_async9.trackLeaks)("open", "close")
 ], SpaceManager);
-var AutomergeStorageAdapter = class extends import_automerge_repo.StorageAdapter {
+var AutomergeStorageAdapter = class {
   constructor(_directory) {
-    super();
     this._directory = _directory;
     this._state = "opened";
   }
@@ -2898,7 +2897,7 @@ var AutomergeStorageAdapter = class extends import_automerge_repo.StorageAdapter
   }
 };
 var __dxlog_file14 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/local-host-network-adapter.ts";
-var LocalHostNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
+var LocalHostNetworkAdapter = class extends import_automerge_repo.NetworkAdapter {
   constructor() {
     super(...arguments);
     this._peers = /* @__PURE__ */ new Map();
@@ -2951,7 +2950,7 @@ var LocalHostNetworkAdapter = class extends import_automerge_repo2.NetworkAdapte
         connected: true,
         send: (message) => {
           next({
-            syncMessage: import_automerge_repo2.cbor.encode(message)
+            syncMessage: import_automerge_repo.cbor.encode(message)
           });
         },
         disconnect: () => {
@@ -2981,7 +2980,7 @@ var LocalHostNetworkAdapter = class extends import_automerge_repo2.NetworkAdapte
     await this._connected.wait({
       timeout: 1e3
     });
-    const message = import_automerge_repo2.cbor.decode(syncMessage);
+    const message = import_automerge_repo.cbor.decode(syncMessage);
     this.emit("message", message);
   }
   async getHostInfo() {
@@ -3006,7 +3005,7 @@ var LocalHostNetworkAdapter = class extends import_automerge_repo2.NetworkAdapte
   }
 };
 var __dxlog_file15 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/mesh-network-adapter.ts";
-var MeshNetworkAdapter = class extends import_automerge_repo3.NetworkAdapter {
+var MeshNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
   constructor() {
     super(...arguments);
     this._extensions = /* @__PURE__ */ new Map();
@@ -3037,7 +3036,7 @@ var MeshNetworkAdapter = class extends import_automerge_repo3.NetworkAdapter {
       ]
     });
     extension.sendSyncMessage({
-      payload: import_automerge_repo3.cbor.encode(message)
+      payload: import_automerge_repo2.cbor.encode(message)
     }).catch((err) => import_log14.log.catch(err, void 0, {
       F: __dxlog_file15,
       L: 39,
@@ -3099,7 +3098,7 @@ var MeshNetworkAdapter = class extends import_automerge_repo3.NetworkAdapter {
         if (!peerInfo) {
           return;
         }
-        const message = import_automerge_repo3.cbor.decode(payload);
+        const message = import_automerge_repo2.cbor.decode(payload);
         this.emit("message", message);
       },
       onClose: async () => {
@@ -3173,7 +3172,7 @@ var AutomergeHost = class {
       }
     });
     this._peerId = `host-${import_keys8.PublicKey.random().toHex()}`;
-    this._repo = new import_automerge_repo4.Repo({
+    this._repo = new import_automerge_repo3.Repo({
       peerId: this._peerId,
       network: [
         this._clientNetwork,
@@ -3205,21 +3204,20 @@ var AutomergeHost = class {
           return isRequested;
         }
         try {
-          const rawSpaceKey = doc.access?.spaceKey ?? doc.experimental_spaceKey;
-          if (!rawSpaceKey) {
+          const spaceKey = getSpaceKeyFromDoc(doc);
+          if (!spaceKey) {
             (0, import_log15.log)("space key not found for share policy check", {
               peerId,
               documentId
             }, {
               F: __dxlog_file16,
-              L: 104,
+              L: 103,
               S: this,
               C: (f, a) => f(...a)
             });
             return false;
           }
-          const spaceKey = import_keys8.PublicKey.from(rawSpaceKey);
-          const authorizedDevices = this._authorizedDevices.get(spaceKey);
+          const authorizedDevices = this._authorizedDevices.get(import_keys8.PublicKey.from(spaceKey));
           const deviceKeyHex = this.repo.peerMetadataByPeerId[peerId]?.dxos_deviceKey;
           if (!deviceKeyHex) {
             (0, import_log15.log)("device key not found for share policy check", {
@@ -3227,7 +3225,7 @@ var AutomergeHost = class {
               documentId
             }, {
               F: __dxlog_file16,
-              L: 114,
+              L: 112,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -3244,7 +3242,7 @@ var AutomergeHost = class {
             isAuthorized
           }, {
             F: __dxlog_file16,
-            L: 120,
+            L: 118,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3252,7 +3250,7 @@ var AutomergeHost = class {
         } catch (err) {
           import_log15.log.catch(err, void 0, {
             F: __dxlog_file16,
-            L: 130,
+            L: 128,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3287,8 +3285,8 @@ var AutomergeHost = class {
     });
   }
   _onUpdate(event) {
-    const spaceKey = event.doc.access?.spaceKey;
-    if (!spaceKey) {
+    const spaceKey = getSpaceKeyFromDoc(event.doc);
+    if (!spaceKey || this._metadata == null) {
       return;
     }
     const objectIds = getInlineChanges(event);
@@ -3300,17 +3298,21 @@ var AutomergeHost = class {
     if (!lastAvailableHash) {
       return;
     }
-    const markingDirtyPromise = Promise.all(objectIds.map(async (objectId) => {
-      await (0, import_context8.cancelWithContext)(this._ctx, this._metadata.markDirty(import_protocols8.idCodec.encode({
-        documentId: event.handle.documentId,
-        objectId
-      }), lastAvailableHash));
-    })).then(() => {
+    const encodedIds = objectIds.map((objectId) => import_protocols8.idCodec.encode({
+      documentId: event.handle.documentId,
+      objectId,
+      spaceKey
+    }));
+    const idToLastHash = new Map(encodedIds.map((id) => [
+      id,
+      lastAvailableHash
+    ]));
+    const markingDirtyPromise = this._metadata.markDirty(idToLastHash).then(() => {
       this._updatingMetadata.delete(event.handle.documentId);
     }).catch((err) => {
-      !this._ctx.disposed && import_log15.log.catch(err, void 0, {
+      this._ctx.disposed && import_log15.log.catch(err, void 0, {
         F: __dxlog_file16,
-        L: 198,
+        L: 191,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3371,7 +3373,7 @@ var AutomergeHost = class {
       deviceKey
     }, {
       F: __dxlog_file16,
-      L: 266,
+      L: 258,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3412,6 +3414,13 @@ var getInlineChanges = (event) => {
     ...inlineChangedObjectIds
   ];
 };
+var getSpaceKeyFromDoc = (doc) => {
+  const rawSpaceKey = doc.access?.spaceKey ?? doc.experimental_spaceKey;
+  if (rawSpaceKey == null) {
+    return null;
+  }
+  return String(rawSpaceKey);
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AuthExtension,
@@ -3438,9 +3447,10 @@ var getInlineChanges = (event) => {
   TimeframeClock,
   codec,
   createMappedFeedWriter,
+  getSpaceKeyFromDoc,
   mapFeedIndexesToTimeframe,
   mapTimeframeToFeedIndexes,
   startAfter,
   valueEncoding
 });
-//# sourceMappingURL=chunk-UKREXVZX.cjs.map
+//# sourceMappingURL=chunk-LD4R726W.cjs.map