@dxos/echo-pipeline 0.4.7 → 0.4.8-main.0602afb

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

@@ -491,7 +491,8 @@ var DataServiceImpl = class {
 
 // packages/core/echo/echo-pipeline/src/metadata/metadata-store.ts
 import CRC32 from "crc-32";
-import { synchronized, Event } from "@dxos/async";
+import { Event, scheduleTaskInterval, synchronized } from "@dxos/async";
+import { Context as Context2 } from "@dxos/context";
 import { invariant as invariant4 } from "@dxos/invariant";
 import { PublicKey as PublicKey3 } from "@dxos/keys";
 import { log as log3 } from "@dxos/log";
@@ -509,6 +510,7 @@ function _ts_decorate(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/metadata/metadata-store.ts";
+var EXPIRED_INVITATION_CLEANUP_INTERVAL = 60 * 60 * 1e3;
 var emptyEchoMetadata = () => ({
   version: STORAGE_VERSION,
   spaces: [],
@@ -524,6 +526,7 @@ var MetadataStore = class {
     this._spaceLargeMetadata = new ComplexMap3(PublicKey3.hash);
     this._metadataFile = void 0;
     this.update = new Event();
+    this._invitationCleanupCtx = new Context2();
     this._directory = directory;
   }
   get metadata() {
@@ -553,7 +556,7 @@ var MetadataStore = class {
         name: file.filename
       }, {
         F: __dxlog_file4,
-        L: 85,
+        L: 89,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -589,12 +592,13 @@ var MetadataStore = class {
       checksum
     }, {
       F: __dxlog_file4,
-      L: 120,
+      L: 124,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async close() {
+    await this._invitationCleanupCtx.dispose();
     await this.flush();
     await this._metadataFile?.close();
     this._metadataFile = void 0;
@@ -621,7 +625,7 @@ var MetadataStore = class {
         err
       }, {
         F: __dxlog_file4,
-        L: 151,
+        L: 156,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -638,12 +642,19 @@ var MetadataStore = class {
           err
         }, {
           F: __dxlog_file4,
-          L: 163,
+          L: 168,
           S: this,
           C: (f, a) => f(...a)
         });
       }
     });
+    scheduleTaskInterval(this._invitationCleanupCtx, async () => {
+      for (const invitation of this.getInvitations()) {
+        if (invitation.created && invitation.lifetime && invitation.lifetime !== 0 && invitation.created.getTime() + invitation.lifetime * 1e3 < Date.now()) {
+          await this.removeInvitation(invitation.invitationId);
+        }
+      }
+    }, EXPIRED_INVITATION_CLEANUP_INTERVAL);
   }
   async _save() {
     const data = {
@@ -668,7 +679,7 @@ var MetadataStore = class {
         err
       }, {
         F: __dxlog_file4,
-        L: 192,
+        L: 215,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -689,7 +700,7 @@ var MetadataStore = class {
     const space = this.spaces.find((space2) => space2.key === spaceKey);
     invariant4(space, "Space not found", {
       F: __dxlog_file4,
-      L: 214,
+      L: 237,
       S: this,
       A: [
         "space",
@@ -713,7 +724,7 @@ var MetadataStore = class {
   async clear() {
     log3("clearing all metadata", void 0, {
       F: __dxlog_file4,
-      L: 233,
+      L: 256,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -726,7 +737,7 @@ var MetadataStore = class {
   async setIdentityRecord(record) {
     invariant4(!this._metadata.identity, "Cannot overwrite existing identity in metadata", {
       F: __dxlog_file4,
-      L: 243,
+      L: 266,
       S: this,
       A: [
         "!this._metadata.identity",
@@ -737,10 +748,26 @@ var MetadataStore = class {
     await this._save();
     await this.flush();
   }
+  getInvitations() {
+    return this._metadata.invitations ?? [];
+  }
+  async addInvitation(invitation) {
+    if (this._metadata.invitations?.find((i) => i.invitationId === invitation.invitationId)) {
+      return;
+    }
+    (this._metadata.invitations ??= []).push(invitation);
+    await this._save();
+    await this.flush();
+  }
+  async removeInvitation(invitationId) {
+    this._metadata.invitations = (this._metadata.invitations ?? []).filter((i) => i.invitationId !== invitationId);
+    await this._save();
+    await this.flush();
+  }
   async addSpace(record) {
     invariant4(!(this._metadata.spaces ?? []).find((space) => space.key === record.key), "Cannot overwrite existing space in metadata", {
       F: __dxlog_file4,
-      L: 251,
+      L: 294,
       S: this,
       A: [
         "!(this._metadata.spaces ?? []).find((space) => space.key === record.key)",
@@ -895,7 +922,7 @@ _ts_decorate2([
 
 // packages/core/echo/echo-pipeline/src/pipeline/pipeline.ts
 import { Event as Event3, sleepWithContext, synchronized as synchronized2, Trigger } from "@dxos/async";
-import { Context as Context2, rejectOnDispose } from "@dxos/context";
+import { Context as Context3, rejectOnDispose } from "@dxos/context";
 import { failUndefined } from "@dxos/debug";
 import { FeedSetIterator } from "@dxos/feed-store";
 import { invariant as invariant6 } from "@dxos/invariant";
@@ -950,7 +977,7 @@ var PipelineState = class {
   constructor(_feeds, _timeframeClock) {
     this._feeds = _feeds;
     this._timeframeClock = _timeframeClock;
-    this._ctx = new Context2();
+    this._ctx = new Context3();
     this.timeframeUpdate = this._timeframeClock.update;
     this.stalled = new Event3();
     this._startTimeframe = new Timeframe2();
@@ -998,7 +1025,7 @@ var PipelineState = class {
   *
   * @param timeout Timeout in milliseconds to specify the maximum wait time.
   */
-  async waitUntilReachedTargetTimeframe({ ctx = new Context2(), timeout, breakOnStall = true } = {}) {
+  async waitUntilReachedTargetTimeframe({ ctx = new Context3(), timeout, breakOnStall = true } = {}) {
     log6("waitUntilReachedTargetTimeframe", {
       timeout,
       current: this.timeframe,
@@ -1166,7 +1193,7 @@ var Pipeline = class {
     await this._feedSetIterator?.close();
     await this._processingTrigger.wait();
     await this._state._ctx.dispose();
-    this._state._ctx = new Context2();
+    this._state._ctx = new Context3();
     this._state._reachedTargetPromise = void 0;
     this._state._reachedTarget = false;
     this._isStarted = false;
@@ -1351,7 +1378,7 @@ _ts_decorate3([
 
 // packages/core/echo/echo-pipeline/src/space/auth.ts
 import { runInContext, scheduleTask } from "@dxos/async";
-import { Context as Context3 } from "@dxos/context";
+import { Context as Context4 } from "@dxos/context";
 import { randomBytes } from "@dxos/crypto";
 import { invariant as invariant7 } from "@dxos/invariant";
 import { log as log7 } from "@dxos/log";
@@ -1370,7 +1397,7 @@ var AuthExtension = class extends RpcExtension {
       timeout: 60 * 1e3
     });
     this._authParams = _authParams;
-    this._ctx = new Context3({
+    this._ctx = new Context4({
       onError: (err) => {
         log7.catch(err, void 0, {
           F: __dxlog_file8,
@@ -1458,7 +1485,7 @@ var AuthExtension = class extends RpcExtension {
 
 // packages/core/echo/echo-pipeline/src/space/data-pipeline.ts
 import { Event as Event4, scheduleTask as scheduleTask2, sleep, synchronized as synchronized3, trackLeaks } from "@dxos/async";
-import { Context as Context4 } from "@dxos/context";
+import { Context as Context5 } from "@dxos/context";
 import { checkCredentialType } from "@dxos/credentials";
 import { getStateMachineFromItem, ItemManager, TYPE_PROPERTIES } from "@dxos/echo-db";
 import { invariant as invariant8 } from "@dxos/invariant";
@@ -1484,7 +1511,7 @@ var TIMEFRAME_SAVE_DEBOUNCE_INTERVAL = 5e3;
 var DataPipeline = class {
   constructor(_params) {
     this._params = _params;
-    this._ctx = new Context4();
+    this._ctx = new Context5();
     this._pipeline = void 0;
     this._targetTimeframe = void 0;
     this._lastAutomaticSnapshotTimeframe = new Timeframe3();
@@ -1592,7 +1619,7 @@ var DataPipeline = class {
     }
     await this.databaseHost?.close();
     await this.itemManager?.destroy();
-    this._ctx = new Context4();
+    this._ctx = new Context5();
     this._pipeline = void 0;
     this._targetTimeframe = void 0;
     this._lastAutomaticSnapshotTimeframe = new Timeframe3();
@@ -1739,7 +1766,7 @@ var DataPipeline = class {
       return;
     }
     await this._epochCtx?.dispose();
-    const ctx = new Context4({
+    const ctx = new Context5({
       onError: (err) => {
         if (err instanceof CancelledError) {
           log8("Epoch processing cancelled.", void 0, {
@@ -1934,7 +1961,7 @@ import { Callback as Callback2 } from "@dxos/util";
 
 // packages/core/echo/echo-pipeline/src/space/control-pipeline.ts
 import { DeferredTask, sleepWithContext as sleepWithContext2, trackLeaks as trackLeaks2 } from "@dxos/async";
-import { Context as Context5 } from "@dxos/context";
+import { Context as Context6 } from "@dxos/context";
 import { SpaceStateMachine } from "@dxos/credentials";
 import { PublicKey as PublicKey5 } from "@dxos/keys";
 import { log as log9 } from "@dxos/log";
@@ -1958,7 +1985,7 @@ var CONTROL_PIPELINE_SNAPSHOT_DELAY = 1e4;
 var USE_SNAPSHOTS = true;
 var ControlPipeline = class {
   constructor({ spaceKey, genesisFeed, feedProvider, metadataStore }) {
-    this._ctx = new Context5();
+    this._ctx = new Context6();
     this._lastTimeframeSaveTime = Date.now();
     this.onFeedAdmitted = new Callback();
     this._usage = new TimeUsageCounter2();
@@ -2033,7 +2060,7 @@ var ControlPipeline = class {
       C: (f, a) => f(...a)
     });
     setTimeout(async () => {
-      void this._consumePipeline(new Context5());
+      void this._consumePipeline(new Context6());
     });
     await this._pipeline.start();
     log9("started", void 0, {
@@ -2766,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";
   }
@@ -3079,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 Context6, 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";
@@ -3131,7 +3156,7 @@ function _ts_decorate9(decorators, target, key, desc) {
 var __dxlog_file16 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts";
 var AutomergeHost = class {
   constructor({ directory, metadata }) {
-    this._ctx = new Context6();
+    this._ctx = new Context7();
     /**
     * spaceKey -> deviceKey[]
     */
@@ -3162,7 +3187,7 @@ var AutomergeHost = class {
       // Hosts, running in the worker, don't share documents unless requested by other peers.
       sharePolicy: async (peerId, documentId) => {
         if (peerId.startsWith("client-")) {
-          return true;
+          return false;
         }
         if (!documentId) {
           return false;
@@ -3183,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", {
@@ -3205,7 +3229,7 @@ var AutomergeHost = class {
               documentId
             }, {
               F: __dxlog_file16,
-              L: 114,
+              L: 112,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -3222,7 +3246,7 @@ var AutomergeHost = class {
             isAuthorized
           }, {
             F: __dxlog_file16,
-            L: 120,
+            L: 118,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3230,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)
           });
@@ -3265,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);
@@ -3278,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)
       });
@@ -3349,7 +3377,7 @@ var AutomergeHost = class {
       deviceKey
     }, {
       F: __dxlog_file16,
-      L: 266,
+      L: 258,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3390,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,
@@ -3419,6 +3454,7 @@ export {
   AutomergeStorageAdapter,
   LocalHostNetworkAdapter,
   MeshNetworkAdapter,
-  AutomergeHost
+  AutomergeHost,
+  getSpaceKeyFromDoc
 };
-//# sourceMappingURL=chunk-UIMWNUNO.mjs.map
+//# sourceMappingURL=chunk-XR2636AC.mjs.map