@dxos/echo-pipeline 0.4.10-main.fa5a270 → 0.4.10-main.fd8ea31

package/dist/lib/browser/{chunk-RTEEJ723.mjs → chunk-KMWJLYEQ.mjs}

@@ -133,6 +133,7 @@ var DataServiceImpl = class {
     throw new Error("Deprecated.");
   }
   async flush(request) {
+    await this._automergeHost.flush(request);
   }
   // Automerge specific.
   async getHostInfo(request) {
@@ -154,7 +155,7 @@ import { invariant as invariant2 } from "@dxos/invariant";
 import { PublicKey as PublicKey2 } from "@dxos/keys";
 import { log } from "@dxos/log";
 import { DataCorruptionError, STORAGE_VERSION, schema as schema4 } from "@dxos/protocols";
-import { SpaceState } from "@dxos/protocols/proto/dxos/client/services";
+import { Invitation, SpaceState } from "@dxos/protocols/proto/dxos/client/services";
 import { ComplexMap, arrayToBuffer, forEachAsync, isNotNullOrUndefined } from "@dxos/util";
 function _ts_decorate(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -306,8 +307,8 @@ var MetadataStore = class {
       }
     });
     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()) {
+      for (const invitation of this._metadata.invitations ?? []) {
+        if (hasInvitationExpired(invitation) || isLegacyInvitationFormat(invitation)) {
           await this.removeInvitation(invitation.invitationId);
         }
       }
@@ -336,7 +337,7 @@ var MetadataStore = class {
         err
       }, {
         F: __dxlog_file2,
-        L: 215,
+        L: 210,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -357,7 +358,7 @@ var MetadataStore = class {
     const space = this.spaces.find((space2) => space2.key === spaceKey);
     invariant2(space, "Space not found", {
       F: __dxlog_file2,
-      L: 237,
+      L: 232,
       S: this,
       A: [
         "space",
@@ -381,7 +382,7 @@ var MetadataStore = class {
   async clear() {
     log("clearing all metadata", void 0, {
       F: __dxlog_file2,
-      L: 256,
+      L: 251,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -394,7 +395,7 @@ var MetadataStore = class {
   async setIdentityRecord(record) {
     invariant2(!this._metadata.identity, "Cannot overwrite existing identity in metadata", {
       F: __dxlog_file2,
-      L: 266,
+      L: 261,
       S: this,
       A: [
         "!this._metadata.identity",
@@ -424,7 +425,7 @@ var MetadataStore = class {
   async addSpace(record) {
     invariant2(!(this._metadata.spaces ?? []).find((space) => space.key === record.key), "Cannot overwrite existing space in metadata", {
       F: __dxlog_file2,
-      L: 294,
+      L: 289,
       S: this,
       A: [
         "!(this._metadata.spaces ?? []).find((space) => space.key === record.key)",
@@ -479,6 +480,12 @@ _ts_decorate([
   synchronized
 ], MetadataStore.prototype, "_saveSpaceLargeMetadata", null);
 var fromBytesInt32 = (buf) => buf.readInt32LE(0);
+var hasInvitationExpired = (invitation) => {
+  return Boolean(invitation.created && invitation.lifetime && invitation.lifetime !== 0 && invitation.created.getTime() + invitation.lifetime * 1e3 < Date.now());
+};
+var isLegacyInvitationFormat = (invitation) => {
+  return invitation.type === Invitation.Type.MULTIUSE;
+};
 
 // packages/core/echo/echo-pipeline/src/pipeline/timeframe-clock.ts
 import { Event as Event2 } from "@dxos/async";
@@ -1142,6 +1149,7 @@ var AuthExtension = class extends RpcExtension {
 
 // packages/core/echo/echo-pipeline/src/space/space.ts
 import { Event as Event4, Mutex, synchronized as synchronized3, trackLeaks as trackLeaks2 } from "@dxos/async";
+import { Resource, LifecycleState } from "@dxos/context";
 import { invariant as invariant6 } from "@dxos/invariant";
 import { log as log7, logInfo } from "@dxos/log";
 import { AdmittedFeed as AdmittedFeed2 } from "@dxos/protocols/proto/dxos/halo/credentials";
@@ -1193,7 +1201,7 @@ var ControlPipeline = class {
         key: info.key
       }, {
         F: __dxlog_file7,
-        L: 74,
+        L: 82,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1207,7 +1215,7 @@ var ControlPipeline = class {
           } catch (err) {
             log6.catch(err, void 0, {
               F: __dxlog_file7,
-              L: 85,
+              L: 93,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1218,6 +1226,8 @@ var ControlPipeline = class {
     });
     this.onMemberAdmitted = this._spaceStateMachine.onMemberAdmitted;
     this.onCredentialProcessed = this._spaceStateMachine.onCredentialProcessed;
+    this.onDelegatedInvitation = this._spaceStateMachine.onDelegatedInvitation;
+    this.onDelegatedInvitationRemoved = this._spaceStateMachine.onDelegatedInvitationRemoved;
   }
   get spaceState() {
     return this._spaceStateMachine;
@@ -1237,7 +1247,7 @@ var ControlPipeline = class {
       tf: snapshot?.timeframe
     }, {
       F: __dxlog_file7,
-      L: 113,
+      L: 123,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1246,7 +1256,7 @@ var ControlPipeline = class {
     }
     log6("starting...", void 0, {
       F: __dxlog_file7,
-      L: 118,
+      L: 128,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1256,7 +1266,7 @@ var ControlPipeline = class {
     await this._pipeline.start();
     log6("started", void 0, {
       F: __dxlog_file7,
-      L: 124,
+      L: 134,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1273,7 +1283,7 @@ var ControlPipeline = class {
           message
         }, {
           F: __dxlog_file7,
-          L: 137,
+          L: 147,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1295,7 +1305,7 @@ var ControlPipeline = class {
       snapshot
     }, {
       F: __dxlog_file7,
-      L: 153,
+      L: 163,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1310,7 +1320,7 @@ var ControlPipeline = class {
       } catch (err) {
         log6.catch(err, void 0, {
           F: __dxlog_file7,
-          L: 166,
+          L: 176,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1324,7 +1334,7 @@ var ControlPipeline = class {
       seq: msg.seq
     }, {
       F: __dxlog_file7,
-      L: 176,
+      L: 186,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1339,7 +1349,7 @@ var ControlPipeline = class {
           msg
         }, {
           F: __dxlog_file7,
-          L: 185,
+          L: 195,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1358,7 +1368,7 @@ var ControlPipeline = class {
   async stop() {
     log6("stopping...", void 0, {
       F: __dxlog_file7,
-      L: 205,
+      L: 215,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1367,7 +1377,7 @@ var ControlPipeline = class {
     await this._saveTargetTimeframe(this._pipeline.state.timeframe);
     log6("stopped", void 0, {
       F: __dxlog_file7,
-      L: 209,
+      L: 219,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1380,7 +1390,7 @@ var ControlPipeline = class {
     } catch (err) {
       log6(err, void 0, {
         F: __dxlog_file7,
-        L: 218,
+        L: 228,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1421,15 +1431,15 @@ function _ts_decorate5(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/space/space.ts";
-var Space = class {
+var Space = class extends Resource {
   constructor(params) {
+    super();
     this._addFeedMutex = new Mutex();
     this.onCredentialProcessed = new Callback2();
     this.stateUpdate = new Event4();
-    this._isOpen = false;
     invariant6(params.spaceKey && params.feedProvider, void 0, {
       F: __dxlog_file8,
-      L: 72,
+      L: 74,
       S: this,
       A: [
         "params.spaceKey && params.feedProvider",
@@ -1462,12 +1472,34 @@ var Space = class {
         credential
       }, {
         F: __dxlog_file8,
-        L: 99,
+        L: 101,
         S: this,
         C: (f, a) => f(...a)
       });
       this.stateUpdate.emit();
     });
+    this._controlPipeline.onDelegatedInvitation.set(async (invitation) => {
+      log7("onDelegatedInvitation", {
+        invitation
+      }, {
+        F: __dxlog_file8,
+        L: 105,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      await params.onDelegatedInvitationStatusChange(invitation, true);
+    });
+    this._controlPipeline.onDelegatedInvitationRemoved.set(async (invitation) => {
+      log7("onDelegatedInvitationRemoved", {
+        invitation
+      }, {
+        F: __dxlog_file8,
+        L: 109,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      await params.onDelegatedInvitationStatusChange(invitation, false);
+    });
     this.protocol = params.protocol;
     this.protocol.addFeed(params.genesisFeed);
   }
@@ -1475,7 +1507,7 @@ var Space = class {
     return this._key;
   }
   get isOpen() {
-    return this._isOpen;
+    return this._lifecycleState === LifecycleState.OPEN;
   }
   get genesisFeedKey() {
     return this._genesisFeedKey;
@@ -1501,7 +1533,7 @@ var Space = class {
   async setControlFeed(feed) {
     invariant6(!this._controlFeed, "Control feed already set.", {
       F: __dxlog_file8,
-      L: 146,
+      L: 156,
       S: this,
       A: [
         "!this._controlFeed",
@@ -1515,7 +1547,7 @@ var Space = class {
   async setDataFeed(feed) {
     invariant6(!this._dataFeed, "Data feed already set.", {
       F: __dxlog_file8,
-      L: 153,
+      L: 163,
       S: this,
       A: [
         "!this._dataFeed",
@@ -1531,50 +1563,36 @@ var Space = class {
   getControlFeeds() {
     return Array.from(this._controlPipeline.spaceState.feeds.values());
   }
-  /**
-  * Use for diagnostics.
-  */
-  // getDataFeeds(): FeedInfo[] {
-  //   return this._dataPipeline?.getFeeds();
-  // }
-  async open(ctx) {
+  async _open(ctx) {
     log7("opening...", void 0, {
       F: __dxlog_file8,
-      L: 174,
+      L: 177,
       S: this,
       C: (f, a) => f(...a)
     });
-    if (this._isOpen) {
-      return;
-    }
     await this._controlPipeline.start();
     await this.protocol.start();
-    this._isOpen = true;
     log7("opened", void 0, {
       F: __dxlog_file8,
-      L: 184,
+      L: 183,
       S: this,
       C: (f, a) => f(...a)
     });
   }
-  async close() {
+  async _close() {
     log7("closing...", {
       key: this._key
     }, {
       F: __dxlog_file8,
-      L: 189,
+      L: 188,
       S: this,
       C: (f, a) => f(...a)
     });
-    if (!this._isOpen) {
-      return;
-    }
     await this.protocol.stop();
     await this._controlPipeline.stop();
-    this._isOpen = false;
     log7("closed", void 0, {
       F: __dxlog_file8,
-      L: 199,
+      L: 194,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1591,12 +1609,11 @@ _ts_decorate5([
   trace2.info()
 ], Space.prototype, "key", null);
 _ts_decorate5([
-  synchronized3,
   trace2.span()
-], Space.prototype, "open", null);
+], Space.prototype, "_open", null);
 _ts_decorate5([
   synchronized3
-], Space.prototype, "close", null);
+], Space.prototype, "_close", null);
 Space = _ts_decorate5([
   trackLeaks2("open", "close"),
   trace2.resource()
@@ -1856,12 +1873,12 @@ var SpaceManager = class {
       ...this._spaces.values()
     ].map((space) => space.close()));
   }
-  async constructSpace({ metadata, swarmIdentity, onAuthorizedConnection, onAuthFailure, memberKey }) {
+  async constructSpace({ metadata, swarmIdentity, onAuthorizedConnection, onAuthFailure, onDelegatedInvitationStatusChange, memberKey }) {
     log9.trace("dxos.echo.space-manager.construct-space", trace4.begin({
       id: this._instanceId
     }), {
       F: __dxlog_file10,
-      L: 89,
+      L: 92,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1869,7 +1886,7 @@ var SpaceManager = class {
       spaceKey: metadata.genesisFeedKey
     }, {
       F: __dxlog_file10,
-      L: 90,
+      L: 93,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1891,14 +1908,15 @@ var SpaceManager = class {
       feedProvider: (feedKey, opts) => this._feedStore.openFeed(feedKey, opts),
       metadataStore: this._metadataStore,
       snapshotManager,
-      memberKey
+      memberKey,
+      onDelegatedInvitationStatusChange
     });
     this._spaces.set(space.key, space);
     log9.trace("dxos.echo.space-manager.construct-space", trace4.end({
       id: this._instanceId
     }), {
       F: __dxlog_file10,
-      L: 117,
+      L: 121,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1916,6 +1934,7 @@ SpaceManager = _ts_decorate7([
 ], SpaceManager);
 
 export {
+  Buffer,
   codec,
   valueEncoding,
   createMappedFeedWriter,
@@ -1923,6 +1942,7 @@ export {
   SnapshotStore,
   DataServiceImpl,
   MetadataStore,
+  hasInvitationExpired,
   mapTimeframeToFeedIndexes,
   mapFeedIndexesToTimeframe,
   startAfter,
@@ -1937,4 +1957,4 @@ export {
   SpaceProtocolSession,
   SpaceManager
 };
-//# sourceMappingURL=chunk-RTEEJ723.mjs.map
+//# sourceMappingURL=chunk-KMWJLYEQ.mjs.map