@dxos/echo-pipeline 0.8.4-main.c4373fc → 0.8.4-main.c85a9c8dae

package/dist/lib/{browser/chunk-XGG76KKU.mjs → neutral/chunk-FE3UY2NU.mjs}

@@ -61,19 +61,6 @@ import { DataCorruptionError, STORAGE_VERSION } from "@dxos/protocols";
 import { schema as schema2 } from "@dxos/protocols/proto";
 import { Invitation, SpaceState } from "@dxos/protocols/proto/dxos/client/services";
 import { ComplexMap as ComplexMap2, arrayToBuffer, forEachAsync, isNonNullable } from "@dxos/util";
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 function _ts_decorate(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -92,6 +79,21 @@ 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._directory = directory;
+  }
   get metadata() {
     return this._metadata;
   }
@@ -124,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 {
@@ -155,7 +162,7 @@ var MetadataStore = class {
       checksum
     }, {
       F: __dxlog_file2,
-      L: 126,
+      L: 129,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -181,15 +188,14 @@ var MetadataStore = class {
         this._metadata = metadata;
       }
       this._metadata.spaces?.forEach((space) => {
-        var _space;
-        (_space = space).state ?? (_space.state = SpaceState.SPACE_ACTIVE);
+        space.state ??= SpaceState.SPACE_ACTIVE;
       });
     } catch (err) {
       log.error("failed to load metadata", {
         err
       }, {
         F: __dxlog_file2,
-        L: 158,
+        L: 161,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -206,7 +212,7 @@ var MetadataStore = class {
           err
         }, {
           F: __dxlog_file2,
-          L: 170,
+          L: 173,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -243,7 +249,7 @@ var MetadataStore = class {
         err
       }, {
         F: __dxlog_file2,
-        L: 212,
+        L: 215,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -264,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",
@@ -294,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)
     });
@@ -307,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",
@@ -322,11 +328,10 @@ var MetadataStore = class {
     return this._metadata.invitations ?? [];
   }
   async addInvitation(invitation) {
-    var _this__metadata;
     if (this._metadata.invitations?.find((i) => i.invitationId === invitation.invitationId)) {
       return;
     }
-    ((_this__metadata = this._metadata).invitations ?? (_this__metadata.invitations = [])).push(invitation);
+    (this._metadata.invitations ??= []).push(invitation);
     await this._save();
     await this.flush();
   }
@@ -336,17 +341,16 @@ var MetadataStore = class {
     await this.flush();
   }
   async addSpace(record) {
-    var _this__metadata;
     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))",
         "'Cannot overwrite existing space in metadata'"
       ]
     });
-    ((_this__metadata = this._metadata).spaces ?? (_this__metadata.spaces = [])).push(record);
+    (this._metadata.spaces ??= []).push(record);
     await this._save();
     await this.flush();
   }
@@ -391,18 +395,6 @@ var MetadataStore = class {
     await this._save();
     await this.flush();
   }
-  constructor(directory) {
-    _define_property(this, "_metadata", emptyEchoMetadata());
-    _define_property(this, "_spaceLargeMetadata", new ComplexMap2(PublicKey2.hash));
-    _define_property(this, "_metadataFile", void 0);
-    _define_property(this, "update", new Event());
-    _define_property(this, "_invitationCleanupCtx", new Context(void 0, {
-      F: __dxlog_file2,
-      L: 55
-    }));
-    _define_property(this, "_directory", void 0);
-    this._directory = directory;
-  }
 };
 _ts_decorate([
   synchronized
@@ -426,19 +418,6 @@ import { Event as Event2 } from "@dxos/async";
 import { timed } from "@dxos/debug";
 import { log as log2 } from "@dxos/log";
 import { Timeframe } from "@dxos/timeframe";
-function _define_property2(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 function _ts_decorate2(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -459,6 +438,13 @@ 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._pendingTimeframe = _timeframe;
+  }
   /**
   * Timeframe that was processed by ECHO.
   */
@@ -517,14 +503,6 @@ var TimeframeClock = class {
       return Timeframe.dependencies(target, this._timeframe).isEmpty();
     });
   }
-  constructor(_timeframe = new Timeframe()) {
-    _define_property2(this, "_timeframe", void 0);
-    _define_property2(this, "update", void 0);
-    _define_property2(this, "_pendingTimeframe", void 0);
-    this._timeframe = _timeframe;
-    this.update = new Event2();
-    this._pendingTimeframe = _timeframe;
-  }
 };
 _ts_decorate2([
   timed(5e3)
@@ -572,19 +550,6 @@ var createMessageSelector = (timeframeClock) => {
 };
 
 // src/pipeline/pipeline.ts
-function _define_property3(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 function _ts_decorate3(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -593,10 +558,40 @@ 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;
+  }
   /**
   * Latest theoretical timeframe based on the last mutation in each feed.
   * NOTE: This might never be reached if the mutation dependencies
@@ -653,14 +648,14 @@ var PipelineState = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    this._reachedTargetPromise ?? (this._reachedTargetPromise = Promise.race([
+    this._reachedTargetPromise ??= Promise.race([
       this._timeframeClock.update.waitForCondition(() => {
         return Timeframe2.dependencies(this.targetTimeframe, this.timeframe).isEmpty();
       }),
       ...breakOnStall ? [
         this.stalled.discardParameter().waitForCount(1)
       ] : []
-    ]));
+    ]);
     let done = false;
     if (timeout) {
       return Promise.race([
@@ -691,27 +686,25 @@ var PipelineState = class {
       return this._reachedTargetPromise;
     }
   }
-  constructor(_feeds, _timeframeClock) {
-    _define_property3(this, "_feeds", void 0);
-    _define_property3(this, "_timeframeClock", void 0);
-    _define_property3(this, "_ctx", void 0);
-    _define_property3(this, "stalled", void 0);
-    _define_property3(this, "_startTimeframe", void 0);
-    _define_property3(this, "_targetTimeframe", void 0);
-    _define_property3(this, "_reachedTargetPromise", void 0);
-    _define_property3(this, "_reachedTarget", void 0);
-    this._feeds = _feeds;
-    this._timeframeClock = _timeframeClock;
-    this._ctx = new Context2(void 0, {
-      F: __dxlog_file5,
-      L: 42
-    });
-    this.stalled = new Event3();
-    this._startTimeframe = new Timeframe2();
-    this._reachedTarget = false;
-  }
 };
 var Pipeline = class {
+  _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;
   }
@@ -986,20 +979,6 @@ var Pipeline = class {
       await this._feedSetIterator.addFeed(feed);
     }
   }
-  constructor() {
-    _define_property3(this, "_timeframeClock", new TimeframeClock(new Timeframe2()));
-    _define_property3(this, "_feeds", new ComplexMap3(PublicKey3.hash));
-    _define_property3(this, "_state", new PipelineState(this._feeds, this._timeframeClock));
-    _define_property3(this, "_processingTrigger", new Trigger().wake());
-    _define_property3(this, "_pauseTrigger", new Trigger().wake());
-    _define_property3(this, "_downloads", new ComplexMap3((value) => PublicKey3.hash(value.key)));
-    _define_property3(this, "_feedSetIterator", void 0);
-    _define_property3(this, "_writer", void 0);
-    _define_property3(this, "_isStopping", false);
-    _define_property3(this, "_isStarted", false);
-    _define_property3(this, "_isBeingConsumed", false);
-    _define_property3(this, "_isPaused", false);
-  }
 };
 _ts_decorate3([
   synchronized2
@@ -1025,27 +1004,39 @@ import { invariant as invariant5 } from "@dxos/invariant";
 import { log as log5 } from "@dxos/log";
 import { schema as schema3 } from "@dxos/protocols/proto";
 import { RpcExtension } from "@dxos/teleport";
-function _define_property4(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file6 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/space/auth.ts";
 var AuthExtension = class extends RpcExtension {
+  _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")
+      },
+      exposed: {
+        AuthService: schema3.getService("dxos.mesh.teleport.auth.AuthService")
+      },
+      timeout: 60 * 1e3
+    }), 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");
             }
@@ -1082,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,
@@ -1092,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,
@@ -1101,7 +1092,7 @@ var AuthExtension = class extends RpcExtension {
           C: (f, a) => f(...a)
         });
         this.close();
-        this._authParams.onAuthFailure();
+        this._authProps.onAuthFailure();
       }
     });
   }
@@ -1113,29 +1104,6 @@ var AuthExtension = class extends RpcExtension {
     await this._ctx.dispose();
     await super.onAbort();
   }
-  constructor(_authParams) {
-    super({
-      requested: {
-        AuthService: schema3.getService("dxos.mesh.teleport.auth.AuthService")
-      },
-      exposed: {
-        AuthService: schema3.getService("dxos.mesh.teleport.auth.AuthService")
-      },
-      timeout: 60 * 1e3
-    }), _define_property4(this, "_authParams", void 0), _define_property4(this, "_ctx", void 0), 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
-    });
-  }
 };
 
 // src/space/space.ts
@@ -1157,19 +1125,6 @@ import { AdmittedFeed } from "@dxos/protocols/proto/dxos/halo/credentials";
 import { Timeframe as Timeframe3 } from "@dxos/timeframe";
 import { TimeSeriesCounter, TimeUsageCounter, trace } from "@dxos/tracing";
 import { Callback, tracer } from "@dxos/util";
-function _define_property5(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 function _ts_decorate4(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -1181,6 +1136,69 @@ 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._spaceKey = spaceKey;
+    this._metadata = metadataStore;
+    this._pipeline = new Pipeline();
+    void this._pipeline.addFeed(genesisFeed);
+    this._spaceStateMachine = new SpaceStateMachine(spaceKey);
+    this._spaceStateMachine.onFeedAdmitted.set(async (info) => {
+      log6("feed admitted", {
+        key: info.key
+      }, {
+        F: __dxlog_file7,
+        L: 82,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      if (info.assertion.designation === AdmittedFeed.Designation.CONTROL && !info.key.equals(genesisFeed.key)) {
+        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: 96,
+              S: this,
+              C: (f, a) => f(...a)
+            });
+          }
+        });
+      }
+      await this.onFeedAdmitted.callIfSet(info);
+    });
+    this.onMemberRoleChanged = this._spaceStateMachine.onMemberRoleChanged;
+    this.onCredentialProcessed = this._spaceStateMachine.onCredentialProcessed;
+    this.onDelegatedInvitation = this._spaceStateMachine.onDelegatedInvitation;
+    this.onDelegatedInvitationRemoved = this._spaceStateMachine.onDelegatedInvitationRemoved;
+  }
   get spaceState() {
     return this._spaceStateMachine;
   }
@@ -1351,69 +1369,6 @@ var ControlPipeline = class {
       });
     }
   }
-  constructor({ spaceKey, genesisFeed, feedProvider, metadataStore }) {
-    _define_property5(this, "_ctx", new Context4(void 0, {
-      F: __dxlog_file7,
-      L: 47
-    }));
-    _define_property5(this, "_pipeline", void 0);
-    _define_property5(this, "_spaceStateMachine", void 0);
-    _define_property5(this, "_spaceKey", void 0);
-    _define_property5(this, "_metadata", void 0);
-    _define_property5(this, "_targetTimeframe", void 0);
-    _define_property5(this, "_lastTimeframeSaveTime", Date.now());
-    _define_property5(this, "onFeedAdmitted", new Callback());
-    _define_property5(this, "onMemberRoleChanged", void 0);
-    _define_property5(this, "onCredentialProcessed", void 0);
-    _define_property5(this, "onDelegatedInvitation", void 0);
-    _define_property5(this, "onDelegatedInvitationRemoved", void 0);
-    _define_property5(this, "_usage", new TimeUsageCounter());
-    _define_property5(this, "_mutations", new TimeSeriesCounter());
-    _define_property5(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();
-    void this._pipeline.addFeed(genesisFeed);
-    this._spaceStateMachine = new SpaceStateMachine(spaceKey);
-    this._spaceStateMachine.onFeedAdmitted.set(async (info) => {
-      log6("feed admitted", {
-        key: info.key
-      }, {
-        F: __dxlog_file7,
-        L: 82,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      if (info.assertion.designation === AdmittedFeed.Designation.CONTROL && !info.key.equals(genesisFeed.key)) {
-        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: 96,
-              S: this,
-              C: (f, a) => f(...a)
-            });
-          }
-        });
-      }
-      await this.onFeedAdmitted.callIfSet(info);
-    });
-    this.onMemberRoleChanged = this._spaceStateMachine.onMemberRoleChanged;
-    this.onCredentialProcessed = this._spaceStateMachine.onCredentialProcessed;
-    this.onDelegatedInvitation = this._spaceStateMachine.onDelegatedInvitation;
-    this.onDelegatedInvitationRemoved = this._spaceStateMachine.onDelegatedInvitationRemoved;
-  }
 };
 _ts_decorate4([
   trace.metricsCounter()
@@ -1450,19 +1405,6 @@ var getSnapshotLoggerContext = (snapshot) => {
 };
 
 // src/space/space.ts
-function _define_property6(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 function _ts_decorate5(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -1471,6 +1413,97 @@ 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();
+    invariant6(params.spaceKey && params.feedProvider, void 0, {
+      F: __dxlog_file8,
+      L: 73,
+      S: this,
+      A: [
+        "params.spaceKey && params.feedProvider",
+        ""
+      ]
+    });
+    this._id = params.id;
+    this._key = params.spaceKey;
+    this._genesisFeedKey = params.genesisFeed.key;
+    this._feedProvider = params.feedProvider;
+    this._controlPipeline = new ControlPipeline({
+      spaceKey: params.spaceKey,
+      genesisFeed: params.genesisFeed,
+      feedProvider: params.feedProvider,
+      metadataStore: params.metadataStore
+    });
+    this._controlPipeline.onFeedAdmitted.set(async (info) => {
+      const sparse = info.assertion.designation === AdmittedFeed2.Designation.DATA;
+      if (!info.key.equals(params.genesisFeed.key)) {
+        scheduleMicroTask2(this._ctx, async () => {
+          await this.protocol.addFeed(await params.feedProvider(info.key, {
+            sparse
+          }));
+        });
+      }
+    });
+    this._controlPipeline.onCredentialProcessed.set(async (credential) => {
+      await this.onCredentialProcessed.callIfSet(credential);
+      log7("onCredentialProcessed", {
+        credential
+      }, {
+        F: __dxlog_file8,
+        L: 100,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      this.stateUpdate.emit();
+    });
+    this._controlPipeline.onDelegatedInvitation.set(async (invitation) => {
+      log7("onDelegatedInvitation", {
+        invitation
+      }, {
+        F: __dxlog_file8,
+        L: 104,
+        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: 108,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      await params.onDelegatedInvitationStatusChange(invitation, false);
+    });
+    this._controlPipeline.onMemberRoleChanged.set(async (changedMembers) => {
+      log7("onMemberRoleChanged", () => ({
+        changedMembers: changedMembers.map((m) => [
+          m.key,
+          m.role
+        ])
+      }), {
+        F: __dxlog_file8,
+        L: 112,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      await params.onMemberRolesChanged(changedMembers);
+    });
+    this.protocol = params.protocol;
+  }
   get id() {
     return this._id;
   }
@@ -1574,87 +1607,6 @@ var Space = class extends Resource {
       C: (f, a) => f(...a)
     });
   }
-  constructor(params) {
-    super(), _define_property6(this, "onCredentialProcessed", new Callback2()), _define_property6(this, "stateUpdate", new Event4()), _define_property6(this, "protocol", void 0), _define_property6(this, "_id", void 0), _define_property6(this, "_key", void 0), _define_property6(this, "_genesisFeedKey", void 0), _define_property6(this, "_feedProvider", void 0), _define_property6(this, "_controlPipeline", void 0), _define_property6(this, "_controlFeed", void 0), _define_property6(this, "_dataFeed", void 0);
-    invariant6(params.spaceKey && params.feedProvider, void 0, {
-      F: __dxlog_file8,
-      L: 73,
-      S: this,
-      A: [
-        "params.spaceKey && params.feedProvider",
-        ""
-      ]
-    });
-    this._id = params.id;
-    this._key = params.spaceKey;
-    this._genesisFeedKey = params.genesisFeed.key;
-    this._feedProvider = params.feedProvider;
-    this._controlPipeline = new ControlPipeline({
-      spaceKey: params.spaceKey,
-      genesisFeed: params.genesisFeed,
-      feedProvider: params.feedProvider,
-      metadataStore: params.metadataStore
-    });
-    this._controlPipeline.onFeedAdmitted.set(async (info) => {
-      const sparse = info.assertion.designation === AdmittedFeed2.Designation.DATA;
-      if (!info.key.equals(params.genesisFeed.key)) {
-        scheduleMicroTask2(this._ctx, async () => {
-          await this.protocol.addFeed(await params.feedProvider(info.key, {
-            sparse
-          }));
-        });
-      }
-    });
-    this._controlPipeline.onCredentialProcessed.set(async (credential) => {
-      await this.onCredentialProcessed.callIfSet(credential);
-      log7("onCredentialProcessed", {
-        credential
-      }, {
-        F: __dxlog_file8,
-        L: 100,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      this.stateUpdate.emit();
-    });
-    this._controlPipeline.onDelegatedInvitation.set(async (invitation) => {
-      log7("onDelegatedInvitation", {
-        invitation
-      }, {
-        F: __dxlog_file8,
-        L: 104,
-        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: 108,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      await params.onDelegatedInvitationStatusChange(invitation, false);
-    });
-    this._controlPipeline.onMemberRoleChanged.set(async (changedMembers) => {
-      log7("onMemberRoleChanged", () => ({
-        changedMembers: changedMembers.map((m) => [
-          m.key,
-          m.role
-        ])
-      }), {
-        F: __dxlog_file8,
-        L: 112,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      await params.onMemberRolesChanged(changedMembers);
-    });
-    this.protocol = params.protocol;
-  }
 };
 _ts_decorate5([
   trace2.info()
@@ -1690,21 +1642,21 @@ import { Context as Context5 } from "@dxos/context";
 import { ProtocolError } from "@dxos/protocols";
 import { schema as schema4 } from "@dxos/protocols/proto";
 import { RpcExtension as RpcExtension2 } from "@dxos/teleport";
-function _define_property7(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 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;
+  }
   async getHandlers() {
     return {};
   }
@@ -1725,25 +1677,28 @@ var CredentialRetrieverExtension = class extends RpcExtension2 {
   async onAbort() {
     await this._ctx.dispose();
   }
-  constructor(_request, _onResult) {
+};
+var CredentialServerExtension = class extends RpcExtension2 {
+  _space;
+  constructor(_space) {
     super({
-      requested: {
+      exposed: {
         AdmissionDiscoveryService: schema4.getService("dxos.mesh.teleport.AdmissionDiscoveryService")
       }
-    }), _define_property7(this, "_request", void 0), _define_property7(this, "_onResult", void 0), _define_property7(this, "_ctx", void 0), this._request = _request, this._onResult = _onResult, this._ctx = new Context5(void 0, {
-      F: __dxlog_file9,
-      L: 26
-    });
+    }), this._space = _space;
   }
-};
-var CredentialServerExtension = class extends RpcExtension2 {
   async getHandlers() {
     return {
       AdmissionDiscoveryService: {
         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
@@ -1752,13 +1707,6 @@ var CredentialServerExtension = class extends RpcExtension2 {
       }
     };
   }
-  constructor(_space) {
-    super({
-      exposed: {
-        AdmissionDiscoveryService: schema4.getService("dxos.mesh.teleport.AdmissionDiscoveryService")
-      }
-    }), _define_property7(this, "_space", void 0), this._space = _space;
-  }
 };
 
 // src/space/space-protocol.ts
@@ -1771,19 +1719,6 @@ import { BlobSync } from "@dxos/teleport-extension-object-sync";
 import { ReplicatorExtension } from "@dxos/teleport-extension-replicator";
 import { trace as trace3 } from "@dxos/tracing";
 import { CallbackCollection, ComplexMap as ComplexMap4 } from "@dxos/util";
-function _define_property8(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 function _ts_decorate6(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -1794,6 +1729,24 @@ 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;
   }
@@ -1803,6 +1756,18 @@ var SpaceProtocol = class {
   get _ownPeerKey() {
     return this._swarmIdentity.peerKey;
   }
+  constructor({ topic, swarmIdentity, networkManager, onSessionAuth, onAuthFailure, blobStore, disableP2pReplication }) {
+    this._spaceKey = topic;
+    this._networkManager = networkManager;
+    this._swarmIdentity = swarmIdentity;
+    this._onSessionAuth = onSessionAuth;
+    this._onAuthFailure = onAuthFailure;
+    this.blobSync = new BlobSync({
+      blobStore
+    });
+    this._topic = subtleCrypto2.digest("SHA-256", topic.asBuffer()).then(discoveryKey).then(PublicKey5.from);
+    this._disableP2pReplication = disableP2pReplication ?? false;
+  }
   // TODO(burdon): Create abstraction for Space (e.g., add keys and have provider).
   async addFeed(feed) {
     log8("addFeed", {
@@ -1868,51 +1833,22 @@ var SpaceProtocol = class {
     }
   }
   _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);
       }
       return session;
     };
   }
-  constructor({ topic, swarmIdentity, networkManager, onSessionAuth, onAuthFailure, blobStore, disableP2pReplication }) {
-    _define_property8(this, "_networkManager", void 0);
-    _define_property8(this, "_swarmIdentity", void 0);
-    _define_property8(this, "_onSessionAuth", void 0);
-    _define_property8(this, "_onAuthFailure", void 0);
-    _define_property8(this, "blobSync", void 0);
-    _define_property8(this, "_disableP2pReplication", void 0);
-    _define_property8(this, "_topic", void 0);
-    _define_property8(this, "_spaceKey", void 0);
-    _define_property8(this, "_feeds", /* @__PURE__ */ new Set());
-    _define_property8(this, "_sessions", new ComplexMap4(PublicKey5.hash));
-    _define_property8(this, "_topology", new MMSTTopology({
-      originateConnections: 4,
-      maxPeers: 10,
-      sampleSize: 20
-    }));
-    _define_property8(this, "_connection", void 0);
-    _define_property8(this, "feedAdded", new CallbackCollection());
-    this._spaceKey = topic;
-    this._networkManager = networkManager;
-    this._swarmIdentity = swarmIdentity;
-    this._onSessionAuth = onSessionAuth;
-    this._onAuthFailure = onAuthFailure;
-    this.blobSync = new BlobSync({
-      blobStore
-    });
-    this._topic = subtleCrypto2.digest("SHA-256", topic.asBuffer()).then(discoveryKey).then(PublicKey5.from);
-    this._disableP2pReplication = disableP2pReplication ?? false;
-  }
 };
 _ts_decorate6([
   logInfo2,
@@ -1934,12 +1870,34 @@ var AuthStatus = /* @__PURE__ */ (function(AuthStatus2) {
   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({ 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(wireProps);
+    this._disableP2pReplication = disableP2pReplication ?? false;
+  }
   get stream() {
     return this._teleport.stream;
   }
@@ -1980,31 +1938,10 @@ var SpaceProtocolSession = class {
   async abort() {
     await this._teleport.abort();
   }
-  // TODO(dmaretskyi): Allow to pass in extra extensions.
-  constructor({ wireParams, swarmIdentity, onSessionAuth, onAuthFailure, blobSync, disableP2pReplication }) {
-    _define_property8(this, "_wireParams", void 0);
-    _define_property8(this, "_disableP2pReplication", void 0);
-    _define_property8(this, "_onSessionAuth", void 0);
-    _define_property8(this, "_onAuthFailure", void 0);
-    _define_property8(this, "_swarmIdentity", void 0);
-    _define_property8(this, "_blobSync", void 0);
-    _define_property8(this, "_teleport", void 0);
-    _define_property8(this, "replicator", new ReplicatorExtension().setOptions({
-      upload: true
-    }));
-    _define_property8(this, "_authStatus", "INITIAL");
-    this._wireParams = wireParams;
-    this._swarmIdentity = swarmIdentity;
-    this._onSessionAuth = onSessionAuth;
-    this._onAuthFailure = onAuthFailure;
-    this._blobSync = blobSync;
-    this._teleport = new Teleport(wireParams);
-    this._disableP2pReplication = disableP2pReplication ?? false;
-  }
 };
 _ts_decorate6([
   logInfo2
-], SpaceProtocolSession.prototype, "_wireParams", void 0);
+], SpaceProtocolSession.prototype, "_wireProps", void 0);
 _ts_decorate6([
   logInfo2
 ], SpaceProtocolSession.prototype, "authStatus", null);
@@ -2018,19 +1955,6 @@ import { PublicKey as PublicKey6 } from "@dxos/keys";
 import { log as log9 } from "@dxos/log";
 import { trace as trace4 } from "@dxos/protocols";
 import { ComplexMap as ComplexMap5 } from "@dxos/util";
-function _define_property9(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 function _ts_decorate7(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -2039,6 +1963,20 @@ 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._feedStore = feedStore;
+    this._networkManager = networkManager;
+    this._metadataStore = metadataStore;
+    this._blobStore = blobStore;
+    this._disableP2pReplication = disableP2pReplication ?? false;
+  }
   // TODO(burdon): Remove.
   get spaces() {
     return this._spaces;
@@ -2179,20 +2117,6 @@ var SpaceManager = class {
       });
     });
   }
-  constructor({ feedStore, networkManager, metadataStore, blobStore, disableP2pReplication }) {
-    _define_property9(this, "_spaces", new ComplexMap5(PublicKey6.hash));
-    _define_property9(this, "_feedStore", void 0);
-    _define_property9(this, "_networkManager", void 0);
-    _define_property9(this, "_metadataStore", void 0);
-    _define_property9(this, "_blobStore", void 0);
-    _define_property9(this, "_instanceId", PublicKey6.random().toHex());
-    _define_property9(this, "_disableP2pReplication", void 0);
-    this._feedStore = feedStore;
-    this._networkManager = networkManager;
-    this._metadataStore = metadataStore;
-    this._blobStore = blobStore;
-    this._disableP2pReplication = disableP2pReplication ?? false;
-  }
 };
 _ts_decorate7([
   synchronized4
@@ -2227,4 +2151,4 @@ export {
   SpaceProtocolSession,
   SpaceManager
 };
-//# sourceMappingURL=chunk-XGG76KKU.mjs.map
+//# sourceMappingURL=chunk-FE3UY2NU.mjs.map