@dxos/echo-pipeline 0.4.8-main.c4e8b01 → 0.4.8-main.de30065

package/dist/lib/browser/{chunk-LED7X4WK.mjs → chunk-XR2636AC.mjs}

@@ -2793,11 +2793,9 @@ SpaceManager = _ts_decorate8([
 ], SpaceManager);
 
 // packages/core/echo/echo-pipeline/src/automerge/automerge-storage-adapter.ts
-import { StorageAdapter } from "@dxos/automerge/automerge-repo";
 import { arrayToBuffer as arrayToBuffer2, bufferToArray } from "@dxos/util";
-var AutomergeStorageAdapter = class extends StorageAdapter {
+var AutomergeStorageAdapter = class {
   constructor(_directory) {
-    super();
     this._directory = _directory;
     this._state = "opened";
   }
@@ -3106,7 +3104,7 @@ var MeshNetworkAdapter = class extends NetworkAdapter2 {
 import { next as automerge, getHeads } from "@dxos/automerge/automerge";
 import { Repo } from "@dxos/automerge/automerge-repo";
 import { IndexedDBStorageAdapter } from "@dxos/automerge/automerge-repo-storage-indexeddb";
-import { Context as Context7, cancelWithContext as cancelWithContext2 } from "@dxos/context";
+import { Context as Context7 } from "@dxos/context";
 import { PublicKey as PublicKey8 } from "@dxos/keys";
 import { log as log15 } from "@dxos/log";
 import { idCodec } from "@dxos/protocols";
@@ -3210,21 +3208,20 @@ var AutomergeHost = class {
           return isRequested;
         }
         try {
-          const rawSpaceKey = doc.access?.spaceKey ?? doc.experimental_spaceKey;
-          if (!rawSpaceKey) {
+          const spaceKey = getSpaceKeyFromDoc(doc);
+          if (!spaceKey) {
             log15("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 = PublicKey8.from(rawSpaceKey);
-          const authorizedDevices = this._authorizedDevices.get(spaceKey);
+          const authorizedDevices = this._authorizedDevices.get(PublicKey8.from(spaceKey));
           const deviceKeyHex = this.repo.peerMetadataByPeerId[peerId]?.dxos_deviceKey;
           if (!deviceKeyHex) {
             log15("device key not found for share policy check", {
@@ -3232,7 +3229,7 @@ var AutomergeHost = class {
               documentId
             }, {
               F: __dxlog_file16,
-              L: 114,
+              L: 112,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -3249,7 +3246,7 @@ var AutomergeHost = class {
             isAuthorized
           }, {
             F: __dxlog_file16,
-            L: 120,
+            L: 118,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3257,7 +3254,7 @@ var AutomergeHost = class {
         } catch (err) {
           log15.catch(err, void 0, {
             F: __dxlog_file16,
-            L: 130,
+            L: 128,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3292,8 +3289,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);
@@ -3305,17 +3302,21 @@ var AutomergeHost = class {
     if (!lastAvailableHash) {
       return;
     }
-    const markingDirtyPromise = Promise.all(objectIds.map(async (objectId) => {
-      await cancelWithContext2(this._ctx, this._metadata.markDirty(idCodec.encode({
-        documentId: event.handle.documentId,
-        objectId
-      }), lastAvailableHash));
-    })).then(() => {
+    const encodedIds = objectIds.map((objectId) => 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 && log15.catch(err, void 0, {
+      this._ctx.disposed && log15.catch(err, void 0, {
         F: __dxlog_file16,
-        L: 198,
+        L: 191,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3376,7 +3377,7 @@ var AutomergeHost = class {
       deviceKey
     }, {
       F: __dxlog_file16,
-      L: 266,
+      L: 258,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3417,6 +3418,13 @@ var getInlineChanges = (event) => {
     ...inlineChangedObjectIds
   ];
 };
+var getSpaceKeyFromDoc = (doc) => {
+  const rawSpaceKey = doc.access?.spaceKey ?? doc.experimental_spaceKey;
+  if (rawSpaceKey == null) {
+    return null;
+  }
+  return String(rawSpaceKey);
+};
 
 export {
   codec,
@@ -3446,6 +3454,7 @@ export {
   AutomergeStorageAdapter,
   LocalHostNetworkAdapter,
   MeshNetworkAdapter,
-  AutomergeHost
+  AutomergeHost,
+  getSpaceKeyFromDoc
 };
-//# sourceMappingURL=chunk-LED7X4WK.mjs.map
+//# sourceMappingURL=chunk-XR2636AC.mjs.map