@dxos/echo-pipeline 0.8.4-main.b97322e → 0.8.4-main.bcb3aa67d6

package/dist/lib/{browser/chunk-GBFX5J5B.mjs → neutral/chunk-DN4YBAWV.mjs}

@@ -79,15 +79,19 @@ var emptyLargeSpaceMetadata = () => ({});
 var EchoMetadata = schema2.getCodecForType("dxos.echo.metadata.EchoMetadata");
 var LargeSpaceMetadata = schema2.getCodecForType("dxos.echo.metadata.LargeSpaceMetadata");
 var MetadataStore = class {
+  _metadata = emptyEchoMetadata();
+  _spaceLargeMetadata = new ComplexMap2(PublicKey2.hash);
+  _metadataFile = void 0;
+  update = new Event();
+  _invitationCleanupCtx = new Context(void 0, {
+    F: __dxlog_file2,
+    L: 55
+  });
+  /**
+  * @internal
+  */
+  _directory;
   constructor(directory) {
-    this._metadata = emptyEchoMetadata();
-    this._spaceLargeMetadata = new ComplexMap2(PublicKey2.hash);
-    this._metadataFile = void 0;
-    this.update = new Event();
-    this._invitationCleanupCtx = new Context(void 0, {
-      F: __dxlog_file2,
-      L: 55
-    });
     this._directory = directory;
   }
   get metadata() {
@@ -122,15 +126,20 @@ var MetadataStore = class {
         C: (f, a) => f(...a)
       });
       if (fileLength < dataSize + 8) {
-        throw new DataCorruptionError("Metadata size is smaller than expected.", {
-          fileLength,
-          dataSize
+        throw new DataCorruptionError({
+          message: "Metadata size is smaller than expected.",
+          context: {
+            fileLength,
+            dataSize
+          }
         });
       }
       const data = await file.read(8, dataSize);
       const calculatedChecksum = CRC32.buf(data);
       if (calculatedChecksum !== checksum) {
-        throw new DataCorruptionError("Metadata checksum is invalid.");
+        throw new DataCorruptionError({
+          message: "Metadata checksum is invalid."
+        });
       }
       return codec2.decode(data);
     } finally {
@@ -153,7 +162,7 @@ var MetadataStore = class {
       checksum
     }, {
       F: __dxlog_file2,
-      L: 126,
+      L: 129,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -186,7 +195,7 @@ var MetadataStore = class {
         err
       }, {
         F: __dxlog_file2,
-        L: 158,
+        L: 161,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -203,7 +212,7 @@ var MetadataStore = class {
           err
         }, {
           F: __dxlog_file2,
-          L: 170,
+          L: 173,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -240,7 +249,7 @@ var MetadataStore = class {
         err
       }, {
         F: __dxlog_file2,
-        L: 212,
+        L: 215,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -261,7 +270,7 @@ var MetadataStore = class {
     const space = this.spaces.find((space2) => space2.key.equals(spaceKey));
     invariant2(space, "Space not found", {
       F: __dxlog_file2,
-      L: 234,
+      L: 237,
       S: this,
       A: [
         "space",
@@ -291,7 +300,7 @@ var MetadataStore = class {
   async clear() {
     log("clearing all metadata", void 0, {
       F: __dxlog_file2,
-      L: 262,
+      L: 265,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -304,7 +313,7 @@ var MetadataStore = class {
   async setIdentityRecord(record) {
     invariant2(!this._metadata.identity, "Cannot overwrite existing identity in metadata", {
       F: __dxlog_file2,
-      L: 272,
+      L: 275,
       S: this,
       A: [
         "!this._metadata.identity",
@@ -334,7 +343,7 @@ var MetadataStore = class {
   async addSpace(record) {
     invariant2(!(this._metadata.spaces ?? []).find((space) => space.key.equals(record.key)), "Cannot overwrite existing space in metadata", {
       F: __dxlog_file2,
-      L: 300,
+      L: 303,
       S: this,
       A: [
         "!(this._metadata.spaces ?? []).find((space) => space.key.equals(record.key))",
@@ -429,9 +438,11 @@ var startAfter = (timeframe) => timeframe.frames().map(([feedKey, index]) => ({
   index: index + 1
 }));
 var TimeframeClock = class {
+  _timeframe;
+  update = new Event2();
+  _pendingTimeframe;
   constructor(_timeframe = new Timeframe()) {
     this._timeframe = _timeframe;
-    this.update = new Event2();
     this._pendingTimeframe = _timeframe;
   }
   /**
@@ -498,7 +509,7 @@ _ts_decorate2([
 ], TimeframeClock.prototype, "waitUntilReached", null);
 
 // src/pipeline/pipeline.ts
-import { Event as Event3, sleepWithContext, synchronized as synchronized2, Trigger } from "@dxos/async";
+import { Event as Event3, Trigger, sleepWithContext, synchronized as synchronized2 } from "@dxos/async";
 import { Context as Context2, rejectOnDispose } from "@dxos/context";
 import { failUndefined } from "@dxos/debug";
 import { FeedSetIterator } from "@dxos/feed-store";
@@ -547,17 +558,39 @@ function _ts_decorate3(decorators, target, key, desc) {
 }
 var __dxlog_file5 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/pipeline/pipeline.ts";
 var PipelineState = class {
+  _feeds;
+  _timeframeClock;
+  /**
+  * @internal
+  */
+  _ctx = new Context2(void 0, {
+    F: __dxlog_file5,
+    L: 42
+  });
+  // TODO(dmaretskyi): Remove?. Avoid accessing `_timeframeClock` before constructor initialization.
+  get timeframeUpdate() {
+    return this._timeframeClock.update;
+  }
+  stalled = new Event3();
+  /**
+  * @internal
+  */
+  _startTimeframe = new Timeframe2();
+  /**
+  * Target timeframe we are waiting to reach.
+  */
+  _targetTimeframe;
+  /**
+  * @internal
+  */
+  _reachedTargetPromise;
+  /**
+  * @internal
+  */
+  _reachedTarget = false;
   constructor(_feeds, _timeframeClock) {
     this._feeds = _feeds;
     this._timeframeClock = _timeframeClock;
-    this._ctx = new Context2(void 0, {
-      F: __dxlog_file5,
-      L: 41
-    });
-    this.timeframeUpdate = this._timeframeClock.update;
-    this.stalled = new Event3();
-    this._startTimeframe = new Timeframe2();
-    this._reachedTarget = false;
   }
   /**
   * Latest theoretical timeframe based on the last mutation in each feed.
@@ -603,7 +636,7 @@ var PipelineState = class {
   */
   async waitUntilReachedTargetTimeframe({ ctx = new Context2(void 0, {
     F: __dxlog_file5,
-    L: 129
+    L: 132
   }), timeout, breakOnStall = true } = {}) {
     log4("waitUntilReachedTargetTimeframe", {
       timeout,
@@ -611,7 +644,7 @@ var PipelineState = class {
       target: this.targetTimeframe
     }, {
       F: __dxlog_file5,
-      L: 133,
+      L: 136,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -643,7 +676,7 @@ var PipelineState = class {
             dependencies: Timeframe2.dependencies(this.targetTimeframe, this.timeframe)
           }, {
             F: __dxlog_file5,
-            L: 161,
+            L: 164,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -655,28 +688,30 @@ var PipelineState = class {
   }
 };
 var Pipeline = class {
-  constructor() {
-    this._timeframeClock = new TimeframeClock(new Timeframe2());
-    this._feeds = new ComplexMap3(PublicKey3.hash);
-    // External state accessor.
-    this._state = new PipelineState(this._feeds, this._timeframeClock);
-    // Waits for the message consumer to process the message and yield control back to the pipeline.
-    this._processingTrigger = new Trigger().wake();
-    this._pauseTrigger = new Trigger().wake();
-    // Pending downloads.
-    this._downloads = new ComplexMap3((value) => PublicKey3.hash(value.key));
-    this._isStopping = false;
-    this._isStarted = false;
-    this._isBeingConsumed = false;
-    this._isPaused = false;
-  }
+  _timeframeClock = new TimeframeClock(new Timeframe2());
+  _feeds = new ComplexMap3(PublicKey3.hash);
+  // External state accessor.
+  _state = new PipelineState(this._feeds, this._timeframeClock);
+  // Waits for the message consumer to process the message and yield control back to the pipeline.
+  _processingTrigger = new Trigger().wake();
+  _pauseTrigger = new Trigger().wake();
+  // Pending downloads.
+  _downloads = new ComplexMap3((value) => PublicKey3.hash(value.key));
+  // Inbound feed stream.
+  _feedSetIterator;
+  // Outbound feed writer.
+  _writer;
+  _isStopping = false;
+  _isStarted = false;
+  _isBeingConsumed = false;
+  _isPaused = false;
   get state() {
     return this._state;
   }
   get writer() {
     invariant4(this._writer, "Writer not set.", {
       F: __dxlog_file5,
-      L: 243,
+      L: 246,
       S: this,
       A: [
         "this._writer",
@@ -705,7 +740,7 @@ var Pipeline = class {
   setWriteFeed(feed) {
     invariant4(!this._writer, "Writer already set.", {
       F: __dxlog_file5,
-      L: 270,
+      L: 273,
       S: this,
       A: [
         "!this._writer",
@@ -714,7 +749,7 @@ var Pipeline = class {
     });
     invariant4(feed.properties.writable, "Feed must be writable.", {
       F: __dxlog_file5,
-      L: 271,
+      L: 274,
       S: this,
       A: [
         "feed.properties.writable",
@@ -729,7 +764,7 @@ var Pipeline = class {
   async start() {
     invariant4(!this._isStarted, "Pipeline is already started.", {
       F: __dxlog_file5,
-      L: 284,
+      L: 287,
       S: this,
       A: [
         "!this._isStarted",
@@ -738,7 +773,7 @@ var Pipeline = class {
     });
     log4("starting...", void 0, {
       F: __dxlog_file5,
-      L: 285,
+      L: 288,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -747,7 +782,7 @@ var Pipeline = class {
     this._isStarted = true;
     log4("started", void 0, {
       F: __dxlog_file5,
-      L: 289,
+      L: 292,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -760,7 +795,7 @@ var Pipeline = class {
   async stop() {
     log4("stopping...", void 0, {
       F: __dxlog_file5,
-      L: 300,
+      L: 303,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -774,14 +809,14 @@ var Pipeline = class {
     await this._state._ctx.dispose();
     this._state._ctx = new Context2(void 0, {
       F: __dxlog_file5,
-      L: 309
+      L: 312
     });
     this._state._reachedTargetPromise = void 0;
     this._state._reachedTarget = false;
     this._isStarted = false;
     log4("stopped", void 0, {
       F: __dxlog_file5,
-      L: 313,
+      L: 316,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -793,7 +828,7 @@ var Pipeline = class {
   async setCursor(timeframe) {
     invariant4(!this._isStarted || this._isPaused, "Invalid state.", {
       F: __dxlog_file5,
-      L: 322,
+      L: 325,
       S: this,
       A: [
         "!this._isStarted || this._isPaused",
@@ -822,7 +857,7 @@ var Pipeline = class {
   async unpause() {
     invariant4(this._isPaused, "Pipeline is not paused.", {
       F: __dxlog_file5,
-      L: 351,
+      L: 354,
       S: this,
       A: [
         "this._isPaused",
@@ -842,7 +877,7 @@ var Pipeline = class {
   async *consume() {
     invariant4(!this._isBeingConsumed, "Pipeline is already being consumed.", {
       F: __dxlog_file5,
-      L: 366,
+      L: 369,
       S: this,
       A: [
         "!this._isBeingConsumed",
@@ -852,7 +887,7 @@ var Pipeline = class {
     this._isBeingConsumed = true;
     invariant4(this._feedSetIterator, "Iterator not initialized.", {
       F: __dxlog_file5,
-      L: 369,
+      L: 372,
       S: this,
       A: [
         "this._feedSetIterator",
@@ -866,7 +901,7 @@ var Pipeline = class {
       if (lastFeedSetIterator !== this._feedSetIterator) {
         invariant4(this._feedSetIterator, "Iterator not initialized.", {
           F: __dxlog_file5,
-          L: 378,
+          L: 381,
           S: this,
           A: [
             "this._feedSetIterator",
@@ -901,7 +936,7 @@ var Pipeline = class {
       length: feed.length
     }, {
       F: __dxlog_file5,
-      L: 407,
+      L: 410,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -915,7 +950,7 @@ var Pipeline = class {
           data
         }, {
           F: __dxlog_file5,
-          L: 412,
+          L: 415,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -934,7 +969,7 @@ var Pipeline = class {
         targetTimeframe: this._state.targetTimeframe
       }, {
         F: __dxlog_file5,
-        L: 426,
+        L: 429,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -971,7 +1006,21 @@ import { schema as schema3 } from "@dxos/protocols/proto";
 import { RpcExtension } from "@dxos/teleport";
 var __dxlog_file6 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/space/auth.ts";
 var AuthExtension = class extends RpcExtension {
-  constructor(_authParams) {
+  _authProps;
+  _ctx = new Context3({
+    onError: (err) => {
+      log5.catch(err, void 0, {
+        F: __dxlog_file6,
+        L: 28,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
+  }, {
+    F: __dxlog_file6,
+    L: 26
+  });
+  constructor(_authProps) {
     super({
       requested: {
         AuthService: schema3.getService("dxos.mesh.teleport.auth.AuthService")
@@ -980,26 +1029,14 @@ var AuthExtension = class extends RpcExtension {
         AuthService: schema3.getService("dxos.mesh.teleport.auth.AuthService")
       },
       timeout: 60 * 1e3
-    }), this._authParams = _authParams, this._ctx = new Context3({
-      onError: (err) => {
-        log5.catch(err, void 0, {
-          F: __dxlog_file6,
-          L: 28,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-      }
-    }, {
-      F: __dxlog_file6,
-      L: 26
-    });
+    }), this._authProps = _authProps;
   }
   async getHandlers() {
     return {
       AuthService: {
         authenticate: async ({ challenge }) => {
           try {
-            const credential = await this._authParams.provider(challenge);
+            const credential = await this._authProps.provider(challenge);
             if (!credential) {
               throw new Error("auth rejected");
             }
@@ -1036,7 +1073,7 @@ var AuthExtension = class extends RpcExtension {
             "'invalid credential'"
           ]
         });
-        const success = await this._authParams.verifier(challenge, credential);
+        const success = await this._authProps.verifier(challenge, credential);
         invariant5(success, "credential not verified", {
           F: __dxlog_file6,
           L: 71,
@@ -1046,7 +1083,7 @@ var AuthExtension = class extends RpcExtension {
             "'credential not verified'"
           ]
         });
-        runInContext(this._ctx, () => this._authParams.onAuthSuccess());
+        runInContext(this._ctx, () => this._authProps.onAuthSuccess());
       } catch (err) {
         log5("auth failed", err, {
           F: __dxlog_file6,
@@ -1055,7 +1092,7 @@ var AuthExtension = class extends RpcExtension {
           C: (f, a) => f(...a)
         });
         this.close();
-        this._authParams.onAuthFailure();
+        this._authProps.onAuthFailure();
       }
     });
   }
@@ -1070,7 +1107,7 @@ var AuthExtension = class extends RpcExtension {
 };
 
 // src/space/space.ts
-import { Event as Event4, scheduleMicroTask, synchronized as synchronized3, trackLeaks as trackLeaks2 } from "@dxos/async";
+import { Event as Event4, scheduleMicroTask as scheduleMicroTask2, synchronized as synchronized3, trackLeaks as trackLeaks2 } from "@dxos/async";
 import { Resource } from "@dxos/context";
 import { invariant as invariant6 } from "@dxos/invariant";
 import { log as log7, logInfo } from "@dxos/log";
@@ -1079,7 +1116,7 @@ import { trace as trace2 } from "@dxos/tracing";
 import { Callback as Callback2 } from "@dxos/util";
 
 // src/space/control-pipeline.ts
-import { DeferredTask, sleepWithContext as sleepWithContext2, trackLeaks } from "@dxos/async";
+import { DeferredTask, scheduleMicroTask, sleepWithContext as sleepWithContext2, trackLeaks } from "@dxos/async";
 import { Context as Context4 } from "@dxos/context";
 import { SpaceStateMachine } from "@dxos/credentials";
 import { PublicKey as PublicKey4 } from "@dxos/keys";
@@ -1099,19 +1136,28 @@ var TIMEFRAME_SAVE_DEBOUNCE_INTERVAL = 500;
 var CONTROL_PIPELINE_SNAPSHOT_DELAY = 1e4;
 var USE_SNAPSHOTS = true;
 var ControlPipeline = class {
+  _ctx = new Context4(void 0, {
+    F: __dxlog_file7,
+    L: 47
+  });
+  _pipeline;
+  _spaceStateMachine;
+  _spaceKey;
+  _metadata;
+  _targetTimeframe;
+  _lastTimeframeSaveTime = Date.now();
+  onFeedAdmitted = new Callback();
+  onMemberRoleChanged;
+  onCredentialProcessed;
+  onDelegatedInvitation;
+  onDelegatedInvitationRemoved;
+  _usage = new TimeUsageCounter();
+  _mutations = new TimeSeriesCounter();
+  _snapshotTask = new DeferredTask(this._ctx, async () => {
+    await sleepWithContext2(this._ctx, CONTROL_PIPELINE_SNAPSHOT_DELAY);
+    await this._saveSnapshot();
+  });
   constructor({ spaceKey, genesisFeed, feedProvider, metadataStore }) {
-    this._ctx = new Context4(void 0, {
-      F: __dxlog_file7,
-      L: 47
-    });
-    this._lastTimeframeSaveTime = Date.now();
-    this.onFeedAdmitted = new Callback();
-    this._usage = new TimeUsageCounter();
-    this._mutations = new TimeSeriesCounter();
-    this._snapshotTask = new DeferredTask(this._ctx, async () => {
-      await sleepWithContext2(this._ctx, CONTROL_PIPELINE_SNAPSHOT_DELAY);
-      await this._saveSnapshot();
-    });
     this._spaceKey = spaceKey;
     this._metadata = metadataStore;
     this._pipeline = new Pipeline();
@@ -1127,16 +1173,19 @@ var ControlPipeline = class {
         C: (f, a) => f(...a)
       });
       if (info.assertion.designation === AdmittedFeed.Designation.CONTROL && !info.key.equals(genesisFeed.key)) {
-        queueMicrotask(async () => {
+        scheduleMicroTask(this._ctx, async () => {
           try {
             const feed = await feedProvider(info.key);
+            if (this._ctx.disposed) {
+              return;
+            }
             if (!this._pipeline.hasFeed(feed.key)) {
               await this._pipeline.addFeed(feed);
             }
           } catch (err) {
             log6.catch(err, void 0, {
               F: __dxlog_file7,
-              L: 93,
+              L: 96,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1160,7 +1209,7 @@ var ControlPipeline = class {
     await this._pipeline.addFeed(feed);
     this._pipeline.setWriteFeed(feed);
   }
-  async start() {
+  async start(ctx) {
     const snapshot = this._metadata.getSpaceControlPipelineSnapshot(this._spaceKey);
     log6("load snapshot", {
       key: this._spaceKey,
@@ -1168,7 +1217,7 @@ var ControlPipeline = class {
       tf: snapshot?.timeframe
     }, {
       F: __dxlog_file7,
-      L: 123,
+      L: 126,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1177,20 +1226,17 @@ var ControlPipeline = class {
     }
     log6("starting...", void 0, {
       F: __dxlog_file7,
-      L: 128,
+      L: 131,
       S: this,
       C: (f, a) => f(...a)
     });
     setTimeout(async () => {
-      void this._consumePipeline(new Context4(void 0, {
-        F: __dxlog_file7,
-        L: 130
-      }));
+      void this._consumePipeline(ctx);
     });
     await this._pipeline.start();
     log6("started", void 0, {
       F: __dxlog_file7,
-      L: 134,
+      L: 137,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1207,7 +1253,7 @@ var ControlPipeline = class {
           message
         }, {
           F: __dxlog_file7,
-          L: 147,
+          L: 150,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1229,7 +1275,7 @@ var ControlPipeline = class {
       snapshot: getSnapshotLoggerContext(snapshot)
     }, {
       F: __dxlog_file7,
-      L: 163,
+      L: 166,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1244,7 +1290,7 @@ var ControlPipeline = class {
       } catch (err) {
         log6.catch(err, void 0, {
           F: __dxlog_file7,
-          L: 176,
+          L: 178,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1258,7 +1304,7 @@ var ControlPipeline = class {
       seq: msg.seq
     }, {
       F: __dxlog_file7,
-      L: 185,
+      L: 187,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1273,7 +1319,7 @@ var ControlPipeline = class {
           msg
         }, {
           F: __dxlog_file7,
-          L: 194,
+          L: 196,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1292,7 +1338,7 @@ var ControlPipeline = class {
   async stop() {
     log6("stopping...", void 0, {
       F: __dxlog_file7,
-      L: 214,
+      L: 216,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1301,7 +1347,7 @@ var ControlPipeline = class {
     await this._saveTargetTimeframe(this._pipeline.state.timeframe);
     log6("stopped", void 0, {
       F: __dxlog_file7,
-      L: 218,
+      L: 220,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1314,7 +1360,7 @@ var ControlPipeline = class {
     } catch (err) {
       log6(err, void 0, {
         F: __dxlog_file7,
-        L: 227,
+        L: 229,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1332,9 +1378,6 @@ _ts_decorate4([
     showInBrowserTimeline: true
   })
 ], ControlPipeline.prototype, "start", null);
-_ts_decorate4([
-  trace.span()
-], ControlPipeline.prototype, "_consumePipeline", null);
 _ts_decorate4([
   trace.span()
 ], ControlPipeline.prototype, "_processMessage", null);
@@ -1364,13 +1407,21 @@ function _ts_decorate5(decorators, target, key, desc) {
 }
 var __dxlog_file8 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/space/space.ts";
 var Space = class extends Resource {
+  onCredentialProcessed = new Callback2();
+  stateUpdate = new Event4();
+  protocol;
+  _id;
+  _key;
+  _genesisFeedKey;
+  _feedProvider;
+  _controlPipeline;
+  _controlFeed;
+  _dataFeed;
   constructor(params) {
     super();
-    this.onCredentialProcessed = new Callback2();
-    this.stateUpdate = new Event4();
     invariant6(params.spaceKey && params.feedProvider, void 0, {
       F: __dxlog_file8,
-      L: 72,
+      L: 73,
       S: this,
       A: [
         "params.spaceKey && params.feedProvider",
@@ -1390,7 +1441,7 @@ var Space = class extends Resource {
     this._controlPipeline.onFeedAdmitted.set(async (info) => {
       const sparse = info.assertion.designation === AdmittedFeed2.Designation.DATA;
       if (!info.key.equals(params.genesisFeed.key)) {
-        scheduleMicroTask(this._ctx, async () => {
+        scheduleMicroTask2(this._ctx, async () => {
           await this.protocol.addFeed(await params.feedProvider(info.key, {
             sparse
           }));
@@ -1403,7 +1454,7 @@ var Space = class extends Resource {
         credential
       }, {
         F: __dxlog_file8,
-        L: 99,
+        L: 100,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1414,7 +1465,7 @@ var Space = class extends Resource {
         invitation
       }, {
         F: __dxlog_file8,
-        L: 103,
+        L: 104,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1425,7 +1476,7 @@ var Space = class extends Resource {
         invitation
       }, {
         F: __dxlog_file8,
-        L: 107,
+        L: 108,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1439,7 +1490,7 @@ var Space = class extends Resource {
         ])
       }), {
         F: __dxlog_file8,
-        L: 111,
+        L: 112,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1474,7 +1525,7 @@ var Space = class extends Resource {
   async setControlFeed(feed) {
     invariant6(!this._controlFeed, "Control feed already set.", {
       F: __dxlog_file8,
-      L: 155,
+      L: 156,
       S: this,
       A: [
         "!this._controlFeed",
@@ -1488,7 +1539,7 @@ var Space = class extends Resource {
   async setDataFeed(feed) {
     invariant6(!this._dataFeed, "Data feed already set.", {
       F: __dxlog_file8,
-      L: 162,
+      L: 163,
       S: this,
       A: [
         "!this._dataFeed",
@@ -1507,45 +1558,45 @@ var Space = class extends Resource {
   async _open(ctx) {
     log7("opening...", void 0, {
       F: __dxlog_file8,
-      L: 176,
+      L: 177,
       S: this,
       C: (f, a) => f(...a)
     });
-    await this._controlPipeline.start();
+    await this._controlPipeline.start(ctx);
     log7("opened", void 0, {
       F: __dxlog_file8,
-      L: 181,
+      L: 182,
       S: this,
       C: (f, a) => f(...a)
     });
   }
-  async startProtocol() {
+  async startProtocol(ctx) {
     invariant6(this.isOpen, void 0, {
       F: __dxlog_file8,
-      L: 186,
+      L: 187,
       S: this,
       A: [
         "this.isOpen",
         ""
       ]
     });
-    await this.protocol.start();
+    await this.protocol.start(ctx);
     await this.protocol.addFeed(await this._feedProvider(this._genesisFeedKey));
   }
-  async _close() {
+  async _close(ctx) {
     log7("closing...", {
       key: this._key
     }, {
       F: __dxlog_file8,
-      L: 193,
+      L: 194,
       S: this,
       C: (f, a) => f(...a)
     });
-    await this.protocol.stop();
+    await this.protocol.stop(ctx);
     await this._controlPipeline.stop();
     log7("closed", void 0, {
       F: __dxlog_file8,
-      L: 199,
+      L: 200,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1587,15 +1638,18 @@ import { schema as schema4 } from "@dxos/protocols/proto";
 import { RpcExtension as RpcExtension2 } from "@dxos/teleport";
 var __dxlog_file9 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/space/admission-discovery-extension.ts";
 var CredentialRetrieverExtension = class extends RpcExtension2 {
+  _request;
+  _onResult;
+  _ctx = new Context5(void 0, {
+    F: __dxlog_file9,
+    L: 26
+  });
   constructor(_request, _onResult) {
     super({
       requested: {
         AdmissionDiscoveryService: schema4.getService("dxos.mesh.teleport.AdmissionDiscoveryService")
       }
-    }), this._request = _request, this._onResult = _onResult, this._ctx = new Context5(void 0, {
-      F: __dxlog_file9,
-      L: 26
-    });
+    }), this._request = _request, this._onResult = _onResult;
   }
   async getHandlers() {
     return {};
@@ -1619,6 +1673,7 @@ var CredentialRetrieverExtension = class extends RpcExtension2 {
   }
 };
 var CredentialServerExtension = class extends RpcExtension2 {
+  _space;
   constructor(_space) {
     super({
       exposed: {
@@ -1632,7 +1687,12 @@ var CredentialServerExtension = class extends RpcExtension2 {
         getAdmissionCredential: async (request) => {
           const memberInfo = this._space.spaceState.members.get(request.memberKey);
           if (!memberInfo?.credential) {
-            throw new ProtocolError("Space member not found.", request);
+            throw new ProtocolError({
+              message: "Space member not found.",
+              context: {
+                ...request
+              }
+            });
           }
           return {
             admissionCredential: memberInfo.credential
@@ -1663,16 +1723,34 @@ var __dxlog_file10 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/space/
 var MOCK_AUTH_PROVIDER = async (nonce) => Buffer.from("mock");
 var MOCK_AUTH_VERIFIER = async (nonce, credential) => true;
 var SpaceProtocol = class {
+  _networkManager;
+  _swarmIdentity;
+  _onSessionAuth;
+  _onAuthFailure;
+  blobSync;
+  _disableP2pReplication;
+  _topic;
+  _spaceKey;
+  _feeds = /* @__PURE__ */ new Set();
+  _sessions = new ComplexMap4(PublicKey5.hash);
+  // TODO(burdon): Move to config (with sensible defaults).
+  _topology = new MMSTTopology({
+    originateConnections: 4,
+    maxPeers: 10,
+    sampleSize: 20
+  });
+  _connection;
+  feedAdded = new CallbackCollection();
+  get sessions() {
+    return this._sessions;
+  }
+  get feeds() {
+    return this._feeds;
+  }
+  get _ownPeerKey() {
+    return this._swarmIdentity.peerKey;
+  }
   constructor({ topic, swarmIdentity, networkManager, onSessionAuth, onAuthFailure, blobStore, disableP2pReplication }) {
-    this._feeds = /* @__PURE__ */ new Set();
-    this._sessions = new ComplexMap4(PublicKey5.hash);
-    // TODO(burdon): Move to config (with sensible defaults).
-    this._topology = new MMSTTopology({
-      originateConnections: 4,
-      maxPeers: 10,
-      sampleSize: 20
-    });
-    this.feedAdded = new CallbackCollection();
     this._spaceKey = topic;
     this._networkManager = networkManager;
     this._swarmIdentity = swarmIdentity;
@@ -1684,22 +1762,13 @@ var SpaceProtocol = class {
     this._topic = subtleCrypto2.digest("SHA-256", topic.asBuffer()).then(discoveryKey).then(PublicKey5.from);
     this._disableP2pReplication = disableP2pReplication ?? false;
   }
-  get sessions() {
-    return this._sessions;
-  }
-  get feeds() {
-    return this._feeds;
-  }
-  get _ownPeerKey() {
-    return this._swarmIdentity.peerKey;
-  }
   // TODO(burdon): Create abstraction for Space (e.g., add keys and have provider).
   async addFeed(feed) {
     log8("addFeed", {
       key: feed.key
     }, {
       F: __dxlog_file10,
-      L: 128,
+      L: 132,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1710,7 +1779,7 @@ var SpaceProtocol = class {
     await this.feedAdded.callSerial(feed);
   }
   // TODO(burdon): Rename open? Common open/close interfaces for all services?
-  async start() {
+  async start(ctx) {
     if (this._connection) {
       return;
     }
@@ -1718,12 +1787,12 @@ var SpaceProtocol = class {
     await this.blobSync.open();
     log8("starting...", void 0, {
       F: __dxlog_file10,
-      L: 149,
+      L: 153,
       S: this,
       C: (f, a) => f(...a)
     });
     const topic = await this._topic;
-    this._connection = await this._networkManager.joinSwarm({
+    this._connection = await this._networkManager.joinSwarm(ctx, {
       protocolProvider: this._createProtocolProvider(credentials),
       topic,
       topology: this._topology,
@@ -1731,7 +1800,7 @@ var SpaceProtocol = class {
     });
     log8("started", void 0, {
       F: __dxlog_file10,
-      L: 158,
+      L: 162,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1739,35 +1808,35 @@ var SpaceProtocol = class {
   updateTopology() {
     this._topology.forceUpdate();
   }
-  async stop() {
+  async stop(ctx) {
     await this.blobSync.close();
     if (this._connection) {
       log8("stopping...", void 0, {
         F: __dxlog_file10,
-        L: 169,
+        L: 173,
         S: this,
         C: (f, a) => f(...a)
       });
-      await this._connection.close();
+      await this._connection.close(ctx);
       log8("stopped", void 0, {
         F: __dxlog_file10,
-        L: 171,
+        L: 175,
         S: this,
         C: (f, a) => f(...a)
       });
     }
   }
   _createProtocolProvider(credentials) {
-    return (wireParams) => {
+    return (wireProps) => {
       const session = new SpaceProtocolSession({
-        wireParams,
+        wireProps,
         swarmIdentity: this._swarmIdentity,
         onSessionAuth: this._onSessionAuth,
         onAuthFailure: this._onAuthFailure,
         blobSync: this.blobSync,
         disableP2pReplication: this._disableP2pReplication
       });
-      this._sessions.set(wireParams.remotePeerId, session);
+      this._sessions.set(wireProps.remotePeerId, session);
       for (const feed of this._feeds) {
         session.replicator.addFeed(feed);
       }
@@ -1788,34 +1857,41 @@ _ts_decorate6([
 SpaceProtocol = _ts_decorate6([
   trace3.resource()
 ], SpaceProtocol);
-var AuthStatus = /* @__PURE__ */ function(AuthStatus2) {
+var AuthStatus = /* @__PURE__ */ (function(AuthStatus2) {
   AuthStatus2["INITIAL"] = "INITIAL";
   AuthStatus2["SUCCESS"] = "SUCCESS";
   AuthStatus2["FAILURE"] = "FAILURE";
   return AuthStatus2;
-}({});
+})({});
 var SpaceProtocolSession = class {
+  _wireProps;
+  _disableP2pReplication;
+  _onSessionAuth;
+  _onAuthFailure;
+  _swarmIdentity;
+  _blobSync;
+  _teleport;
+  // TODO(dmaretskyi): Start with upload=false when switching it on the fly works.
+  replicator = new ReplicatorExtension().setOptions({
+    upload: true
+  });
+  _authStatus = "INITIAL";
+  get authStatus() {
+    return this._authStatus;
+  }
+  get stats() {
+    return this._teleport.stats;
+  }
   // TODO(dmaretskyi): Allow to pass in extra extensions.
-  constructor({ wireParams, swarmIdentity, onSessionAuth, onAuthFailure, blobSync, disableP2pReplication }) {
-    // TODO(dmaretskyi): Start with upload=false when switching it on the fly works.
-    this.replicator = new ReplicatorExtension().setOptions({
-      upload: true
-    });
-    this._authStatus = "INITIAL";
-    this._wireParams = wireParams;
+  constructor({ wireProps, swarmIdentity, onSessionAuth, onAuthFailure, blobSync, disableP2pReplication }) {
+    this._wireProps = wireProps;
     this._swarmIdentity = swarmIdentity;
     this._onSessionAuth = onSessionAuth;
     this._onAuthFailure = onAuthFailure;
     this._blobSync = blobSync;
-    this._teleport = new Teleport(wireParams);
+    this._teleport = new Teleport(wireProps);
     this._disableP2pReplication = disableP2pReplication ?? false;
   }
-  get authStatus() {
-    return this._authStatus;
-  }
-  get stats() {
-    return this._teleport.stats;
-  }
   get stream() {
     return this._teleport.stream;
   }
@@ -1827,7 +1903,7 @@ var SpaceProtocolSession = class {
       onAuthSuccess: () => {
         log8("Peer authenticated", void 0, {
           F: __dxlog_file10,
-          L: 282,
+          L: 286,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1847,7 +1923,7 @@ var SpaceProtocolSession = class {
   async close() {
     log8("close", void 0, {
       F: __dxlog_file10,
-      L: 301,
+      L: 305,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1859,14 +1935,14 @@ var SpaceProtocolSession = class {
 };
 _ts_decorate6([
   logInfo2
-], SpaceProtocolSession.prototype, "_wireParams", void 0);
+], SpaceProtocolSession.prototype, "_wireProps", void 0);
 _ts_decorate6([
   logInfo2
 ], SpaceProtocolSession.prototype, "authStatus", null);
 
 // src/space/space-manager.ts
 import { parseAutomergeUrl } from "@automerge/automerge-repo";
-import { synchronized as synchronized4, trackLeaks as trackLeaks3, Trigger as Trigger2 } from "@dxos/async";
+import { Trigger as Trigger2, synchronized as synchronized4, trackLeaks as trackLeaks3 } from "@dxos/async";
 import { getCredentialAssertion } from "@dxos/credentials";
 import { failUndefined as failUndefined2 } from "@dxos/debug";
 import { PublicKey as PublicKey6 } from "@dxos/keys";
@@ -1881,9 +1957,14 @@ function _ts_decorate7(decorators, target, key, desc) {
 }
 var __dxlog_file11 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/space/space-manager.ts";
 var SpaceManager = class {
+  _spaces = new ComplexMap5(PublicKey6.hash);
+  _feedStore;
+  _networkManager;
+  _metadataStore;
+  _blobStore;
+  _instanceId = PublicKey6.random().toHex();
+  _disableP2pReplication;
   constructor({ feedStore, networkManager, metadataStore, blobStore, disableP2pReplication }) {
-    this._spaces = new ComplexMap5(PublicKey6.hash);
-    this._instanceId = PublicKey6.random().toHex();
     this._feedStore = feedStore;
     this._networkManager = networkManager;
     this._metadataStore = metadataStore;
@@ -1906,7 +1987,7 @@ var SpaceManager = class {
       id: this._instanceId
     }), {
       F: __dxlog_file11,
-      L: 102,
+      L: 104,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1914,7 +1995,7 @@ var SpaceManager = class {
       spaceKey: metadata.genesisFeedKey
     }, {
       F: __dxlog_file11,
-      L: 103,
+      L: 105,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1946,19 +2027,19 @@ var SpaceManager = class {
       id: this._instanceId
     }), {
       F: __dxlog_file11,
-      L: 133,
+      L: 135,
       S: this,
       C: (f, a) => f(...a)
     });
     return space;
   }
-  async requestSpaceAdmissionCredential(params) {
+  async requestSpaceAdmissionCredential(ctx, params) {
     const traceKey = "dxos.echo.space-manager.request-space-admission";
     log9.trace(traceKey, trace4.begin({
       id: this._instanceId
     }), {
       F: __dxlog_file11,
-      L: 139,
+      L: 144,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1966,7 +2047,7 @@ var SpaceManager = class {
       spaceKey: params.spaceKey
     }, {
       F: __dxlog_file11,
-      L: 140,
+      L: 145,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1986,7 +2067,7 @@ var SpaceManager = class {
       disableP2pReplication: this._disableP2pReplication
     });
     try {
-      await protocol.start();
+      await protocol.start(ctx);
       const credential = await onCredentialResolved.wait({
         timeout: params.timeout
       });
@@ -1994,7 +2075,7 @@ var SpaceManager = class {
         id: this._instanceId
       }), {
         F: __dxlog_file11,
-        L: 164,
+        L: 169,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2005,13 +2086,13 @@ var SpaceManager = class {
         error: err
       }), {
         F: __dxlog_file11,
-        L: 167,
+        L: 172,
         S: this,
         C: (f, a) => f(...a)
       });
       throw err;
     } finally {
-      await protocol.stop();
+      await protocol.stop(ctx);
     }
   }
   findSpaceByRootDocumentId(documentId) {
@@ -2064,4 +2145,4 @@ export {
   SpaceProtocolSession,
   SpaceManager
 };
-//# sourceMappingURL=chunk-GBFX5J5B.mjs.map
+//# sourceMappingURL=chunk-DN4YBAWV.mjs.map