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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/echo-pipeline",
-  "version": "0.4.8-main.c4e8b01",
+  "version": "0.4.8-main.de30065",
   "description": "ECHO database.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -36,38 +36,38 @@
   ],
   "dependencies": {
     "crc-32": "^1.2.2",
-    "@dxos/async": "0.4.8-main.c4e8b01",
-    "@dxos/automerge": "0.4.8-main.c4e8b01",
-    "@dxos/codec-protobuf": "0.4.8-main.c4e8b01",
-    "@dxos/credentials": "0.4.8-main.c4e8b01",
-    "@dxos/context": "0.4.8-main.c4e8b01",
-    "@dxos/crypto": "0.4.8-main.c4e8b01",
-    "@dxos/debug": "0.4.8-main.c4e8b01",
-    "@dxos/document-model": "0.4.8-main.c4e8b01",
-    "@dxos/echo-db": "0.4.8-main.c4e8b01",
-    "@dxos/feed-store": "0.4.8-main.c4e8b01",
-    "@dxos/hypercore": "0.4.8-main.c4e8b01",
-    "@dxos/invariant": "0.4.8-main.c4e8b01",
-    "@dxos/keyring": "0.4.8-main.c4e8b01",
-    "@dxos/keys": "0.4.8-main.c4e8b01",
-    "@dxos/log": "0.4.8-main.c4e8b01",
-    "@dxos/messaging": "0.4.8-main.c4e8b01",
-    "@dxos/network-manager": "0.4.8-main.c4e8b01",
-    "@dxos/model-factory": "0.4.8-main.c4e8b01",
-    "@dxos/node-std": "0.4.8-main.c4e8b01",
-    "@dxos/protocols": "0.4.8-main.c4e8b01",
-    "@dxos/rpc": "0.4.8-main.c4e8b01",
-    "@dxos/teleport": "0.4.8-main.c4e8b01",
-    "@dxos/random-access-storage": "0.4.8-main.c4e8b01",
-    "@dxos/teleport-extension-automerge-replicator": "0.4.8-main.c4e8b01",
-    "@dxos/teleport-extension-gossip": "0.4.8-main.c4e8b01",
-    "@dxos/teleport-extension-object-sync": "0.4.8-main.c4e8b01",
-    "@dxos/text-model": "0.4.8-main.c4e8b01",
-    "@dxos/tracing": "0.4.8-main.c4e8b01",
-    "@dxos/typings": "0.4.8-main.c4e8b01",
-    "@dxos/teleport-extension-replicator": "0.4.8-main.c4e8b01",
-    "@dxos/util": "0.4.8-main.c4e8b01",
-    "@dxos/timeframe": "0.4.8-main.c4e8b01"
+    "@dxos/async": "0.4.8-main.de30065",
+    "@dxos/automerge": "0.4.8-main.de30065",
+    "@dxos/codec-protobuf": "0.4.8-main.de30065",
+    "@dxos/context": "0.4.8-main.de30065",
+    "@dxos/credentials": "0.4.8-main.de30065",
+    "@dxos/crypto": "0.4.8-main.de30065",
+    "@dxos/debug": "0.4.8-main.de30065",
+    "@dxos/document-model": "0.4.8-main.de30065",
+    "@dxos/echo-db": "0.4.8-main.de30065",
+    "@dxos/feed-store": "0.4.8-main.de30065",
+    "@dxos/hypercore": "0.4.8-main.de30065",
+    "@dxos/invariant": "0.4.8-main.de30065",
+    "@dxos/keyring": "0.4.8-main.de30065",
+    "@dxos/keys": "0.4.8-main.de30065",
+    "@dxos/log": "0.4.8-main.de30065",
+    "@dxos/model-factory": "0.4.8-main.de30065",
+    "@dxos/messaging": "0.4.8-main.de30065",
+    "@dxos/network-manager": "0.4.8-main.de30065",
+    "@dxos/node-std": "0.4.8-main.de30065",
+    "@dxos/protocols": "0.4.8-main.de30065",
+    "@dxos/random-access-storage": "0.4.8-main.de30065",
+    "@dxos/rpc": "0.4.8-main.de30065",
+    "@dxos/teleport": "0.4.8-main.de30065",
+    "@dxos/teleport-extension-automerge-replicator": "0.4.8-main.de30065",
+    "@dxos/teleport-extension-gossip": "0.4.8-main.de30065",
+    "@dxos/teleport-extension-object-sync": "0.4.8-main.de30065",
+    "@dxos/teleport-extension-replicator": "0.4.8-main.de30065",
+    "@dxos/text-model": "0.4.8-main.de30065",
+    "@dxos/tracing": "0.4.8-main.de30065",
+    "@dxos/timeframe": "0.4.8-main.de30065",
+    "@dxos/typings": "0.4.8-main.de30065",
+    "@dxos/util": "0.4.8-main.de30065"
   },
   "devDependencies": {
     "fast-check": "^3.15.1",

package/src/automerge/automerge-host.ts

@@ -13,7 +13,7 @@ import {
 } from '@dxos/automerge/automerge-repo';
 import { IndexedDBStorageAdapter } from '@dxos/automerge/automerge-repo-storage-indexeddb';
 import { type Stream } from '@dxos/codec-protobuf';
-import { Context, cancelWithContext } from '@dxos/context';
+import { Context } from '@dxos/context';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { idCodec } from '@dxos/protocols';
@@ -31,7 +31,7 @@ import { MeshNetworkAdapter } from './mesh-network-adapter';
 export type { DocumentId };
 
 export interface MetadataMethods {
-  markDirty(id: string, lastAvailableHash: string): Promise<void>;
+  markDirty(idToLastHash: Map<string, string>): Promise<void>;
 }
 
 export type AutomergeHostParams = {
@@ -98,15 +98,13 @@ export class AutomergeHost {
         }
 
         try {
-          // experimental_spaceKey is set on old documents, new ones are created with doc.access.spaceKey
-          const rawSpaceKey = doc.access?.spaceKey ?? doc.experimental_spaceKey;
-          if (!rawSpaceKey) {
+          const spaceKey = getSpaceKeyFromDoc(doc);
+          if (!spaceKey) {
             log('space key not found for share policy check', { peerId, documentId });
             return false;
           }
 
-          const spaceKey = PublicKey.from(rawSpaceKey);
-          const authorizedDevices = this._authorizedDevices.get(spaceKey);
+          const authorizedDevices = this._authorizedDevices.get(PublicKey.from(spaceKey));
 
           // TODO(mykola): Hack, stop abusing `peerMetadata` field.
           const deviceKeyHex = (this.repo.peerMetadataByPeerId[peerId] as any)?.dxos_deviceKey;
@@ -164,8 +162,8 @@ export class AutomergeHost {
   }
 
   private _onUpdate(event: DocHandleChangePayload<any>) {
-    const spaceKey = event.doc.access?.spaceKey;
-    if (!spaceKey) {
+    const spaceKey = getSpaceKeyFromDoc(event.doc);
+    if (!spaceKey || this._metadata == null) {
       return;
     }
 
@@ -180,24 +178,18 @@ export class AutomergeHost {
       return;
     }
 
-    const markingDirtyPromise = Promise.all(
-      objectIds.map(async (objectId) => {
-        await cancelWithContext(
-          this._ctx,
-          this._metadata!.markDirty(
-            idCodec.encode({ documentId: event.handle.documentId, objectId }),
-            lastAvailableHash,
-          ),
-        );
-      }),
-    )
+    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: Error) => {
-        !this._ctx.disposed && log.catch(err);
+        this._ctx.disposed && log.catch(err);
       });
-
     this._updatingMetadata.set(event.handle.documentId, markingDirtyPromise);
   }
 
@@ -285,3 +277,13 @@ const getInlineChanges = (event: DocHandleChangePayload<any>) => {
   }
   return [...inlineChangedObjectIds];
 };
+
+export const getSpaceKeyFromDoc = (doc: any): string | null => {
+  // experimental_spaceKey is set on old documents, new ones are created with doc.access.spaceKey
+  const rawSpaceKey = doc.access?.spaceKey ?? doc.experimental_spaceKey;
+  if (rawSpaceKey == null) {
+    return null;
+  }
+
+  return String(rawSpaceKey);
+};

package/src/automerge/automerge-storage-adapter.ts

@@ -5,20 +5,18 @@
 // Copyright 2023 DXOS.org
 //
 
-import { StorageAdapter, type Chunk, type StorageKey } from '@dxos/automerge/automerge-repo';
+import { type Chunk, type StorageKey, type StorageAdapterInterface } from '@dxos/automerge/automerge-repo';
 import { type Directory } from '@dxos/random-access-storage';
 import { arrayToBuffer, bufferToArray } from '@dxos/util';
 
-export class AutomergeStorageAdapter extends StorageAdapter {
+export class AutomergeStorageAdapter implements StorageAdapterInterface {
   // TODO(mykola): Hack for restricting automerge Repo to access storage if Host is `closed`.
   //               Automerge Repo do not have any lifetime management.
   private _state: 'opened' | 'closed' = 'opened';
 
-  constructor(private readonly _directory: Directory) {
-    super();
-  }
+  constructor(private readonly _directory: Directory) {}
 
-  override async load(key: StorageKey): Promise<Uint8Array | undefined> {
+  async load(key: StorageKey): Promise<Uint8Array | undefined> {
     if (this._state !== 'opened') {
       return undefined;
     }
@@ -32,7 +30,7 @@ export class AutomergeStorageAdapter extends StorageAdapter {
     return bufferToArray(buffer);
   }
 
-  override async save(key: StorageKey, data: Uint8Array): Promise<void> {
+  async save(key: StorageKey, data: Uint8Array): Promise<void> {
     if (this._state !== 'opened') {
       return undefined;
     }
@@ -44,7 +42,7 @@ export class AutomergeStorageAdapter extends StorageAdapter {
     await file.flush?.();
   }
 
-  override async remove(key: StorageKey): Promise<void> {
+  async remove(key: StorageKey): Promise<void> {
     if (this._state !== 'opened') {
       return undefined;
     }
@@ -54,7 +52,7 @@ export class AutomergeStorageAdapter extends StorageAdapter {
     await file.destroy();
   }
 
-  override async loadRange(keyPrefix: StorageKey): Promise<Chunk[]> {
+  async loadRange(keyPrefix: StorageKey): Promise<Chunk[]> {
     if (this._state !== 'opened') {
       return [];
     }
@@ -75,7 +73,7 @@ export class AutomergeStorageAdapter extends StorageAdapter {
     );
   }
 
-  override async removeRange(keyPrefix: StorageKey): Promise<void> {
+  async removeRange(keyPrefix: StorageKey): Promise<void> {
     if (this._state !== 'opened') {
       return undefined;
     }