@dxos/echo-pipeline 0.6.13 → 0.6.14-main.69511f5

package/dist/lib/browser/{chunk-UKXIJW43.mjs → chunk-RRKGEIVZ.mjs}

@@ -1,8 +1,4 @@
 import "@dxos/node-std/globals";
-import {
-  Buffer,
-  createIdFromSpaceKey
-} from "./chunk-XPCF2V5U.mjs";
 
 // packages/core/echo/echo-pipeline/src/common/codec.ts
 import { createCodecEncoding } from "@dxos/hypercore";
@@ -37,17 +33,34 @@ var createMappedFeedWriter = (mapper, writer) => {
   };
 };
 
+// packages/core/echo/echo-pipeline/src/common/space-id.ts
+import { subtleCrypto } from "@dxos/crypto";
+import { PublicKey, SpaceId } from "@dxos/keys";
+import { ComplexMap } from "@dxos/util";
+var SPACE_IDS_CACHE = new ComplexMap(PublicKey.hash);
+var createIdFromSpaceKey = async (spaceKey) => {
+  const cachedValue = SPACE_IDS_CACHE.get(spaceKey);
+  if (cachedValue !== void 0) {
+    return cachedValue;
+  }
+  const digest = await subtleCrypto.digest("SHA-256", spaceKey.asUint8Array());
+  const bytes = new Uint8Array(digest).slice(0, SpaceId.byteLength);
+  const spaceId = SpaceId.encode(bytes);
+  SPACE_IDS_CACHE.set(spaceKey, spaceId);
+  return spaceId;
+};
+
 // packages/core/echo/echo-pipeline/src/metadata/metadata-store.ts
 import CRC32 from "crc-32";
 import { Event, scheduleTaskInterval, synchronized } from "@dxos/async";
 import { Context } from "@dxos/context";
 import { invariant as invariant2 } from "@dxos/invariant";
-import { PublicKey } from "@dxos/keys";
+import { PublicKey as PublicKey2 } from "@dxos/keys";
 import { log } from "@dxos/log";
 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, arrayToBuffer, forEachAsync, isNotNullOrUndefined } from "@dxos/util";
+import { ComplexMap as ComplexMap2, 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;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -68,12 +81,12 @@ var LargeSpaceMetadata = schema2.getCodecForType("dxos.echo.metadata.LargeSpaceM
 var MetadataStore = class {
   constructor(directory) {
     this._metadata = emptyEchoMetadata();
-    this._spaceLargeMetadata = new ComplexMap(PublicKey.hash);
+    this._spaceLargeMetadata = new ComplexMap2(PublicKey2.hash);
     this._metadataFile = void 0;
     this.update = new Event();
     this._invitationCleanupCtx = new Context(void 0, {
       F: __dxlog_file2,
-      L: 54
+      L: 55
     });
     this._directory = directory;
   }
@@ -104,7 +117,7 @@ var MetadataStore = class {
         name: file.filename
       }, {
         F: __dxlog_file2,
-        L: 90,
+        L: 91,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -140,7 +153,7 @@ var MetadataStore = class {
       checksum
     }, {
       F: __dxlog_file2,
-      L: 125,
+      L: 126,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -173,7 +186,7 @@ var MetadataStore = class {
         err
       }, {
         F: __dxlog_file2,
-        L: 157,
+        L: 158,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -190,7 +203,7 @@ var MetadataStore = class {
           err
         }, {
           F: __dxlog_file2,
-          L: 169,
+          L: 170,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -227,7 +240,7 @@ var MetadataStore = class {
         err
       }, {
         F: __dxlog_file2,
-        L: 211,
+        L: 212,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -245,10 +258,10 @@ var MetadataStore = class {
     if (this._metadata.identity?.haloSpace.key.equals(spaceKey)) {
       return this._metadata.identity.haloSpace;
     }
-    const space = this.spaces.find((space2) => space2.key === spaceKey);
+    const space = this.spaces.find((space2) => space2.key.equals(spaceKey));
     invariant2(space, "Space not found", {
       F: __dxlog_file2,
-      L: 233,
+      L: 234,
       S: this,
       A: [
         "space",
@@ -257,6 +270,12 @@ var MetadataStore = class {
     });
     return space;
   }
+  hasSpace(spaceKey) {
+    if (this._metadata.identity?.haloSpace.key.equals(spaceKey)) {
+      return true;
+    }
+    return !!this.spaces.find((space) => space.key.equals(spaceKey));
+  }
   _getLargeSpaceMetadata(key) {
     let entry = this._spaceLargeMetadata.get(key);
     if (entry) {
@@ -272,7 +291,7 @@ var MetadataStore = class {
   async clear() {
     log("clearing all metadata", void 0, {
       F: __dxlog_file2,
-      L: 252,
+      L: 262,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -285,7 +304,7 @@ var MetadataStore = class {
   async setIdentityRecord(record) {
     invariant2(!this._metadata.identity, "Cannot overwrite existing identity in metadata", {
       F: __dxlog_file2,
-      L: 262,
+      L: 272,
       S: this,
       A: [
         "!this._metadata.identity",
@@ -313,12 +332,12 @@ var MetadataStore = class {
     await this.flush();
   }
   async addSpace(record) {
-    invariant2(!(this._metadata.spaces ?? []).find((space) => space.key === record.key), "Cannot overwrite existing space in metadata", {
+    invariant2(!(this._metadata.spaces ?? []).find((space) => space.key.equals(record.key)), "Cannot overwrite existing space in metadata", {
       F: __dxlog_file2,
-      L: 290,
+      L: 300,
       S: this,
       A: [
-        "!(this._metadata.spaces ?? []).find((space) => space.key === record.key)",
+        "!(this._metadata.spaces ?? []).find((space) => space.key.equals(record.key))",
         "'Cannot overwrite existing space in metadata'"
       ]
     });
@@ -359,6 +378,14 @@ var MetadataStore = class {
     await this._saveSpaceLargeMetadata(spaceKey);
     await this.flush();
   }
+  getSpaceEdgeReplicationSetting(spaceKey) {
+    return this.hasSpace(spaceKey) ? this._getSpace(spaceKey).edgeReplication : void 0;
+  }
+  async setSpaceEdgeReplicationSetting(spaceKey, setting) {
+    this._getSpace(spaceKey).edgeReplication = setting;
+    await this._save();
+    await this.flush();
+  }
 };
 _ts_decorate([
   synchronized
@@ -476,10 +503,10 @@ import { Context as Context2, rejectOnDispose } from "@dxos/context";
 import { failUndefined } from "@dxos/debug";
 import { FeedSetIterator } from "@dxos/feed-store";
 import { invariant as invariant4 } from "@dxos/invariant";
-import { PublicKey as PublicKey2 } from "@dxos/keys";
+import { PublicKey as PublicKey3 } from "@dxos/keys";
 import { log as log4 } from "@dxos/log";
 import { Timeframe as Timeframe2 } from "@dxos/timeframe";
-import { ComplexMap as ComplexMap2 } from "@dxos/util";
+import { ComplexMap as ComplexMap3 } from "@dxos/util";
 
 // packages/core/echo/echo-pipeline/src/pipeline/message-selector.ts
 import { invariant as invariant3 } from "@dxos/invariant";
@@ -630,14 +657,14 @@ var PipelineState = class {
 var Pipeline = class {
   constructor() {
     this._timeframeClock = new TimeframeClock(new Timeframe2());
-    this._feeds = new ComplexMap2(PublicKey2.hash);
+    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 ComplexMap2((value) => PublicKey2.hash(value.key));
+    this._downloads = new ComplexMap3((value) => PublicKey3.hash(value.key));
     this._isStopping = false;
     this._isStarted = false;
     this._isBeingConsumed = false;
@@ -853,7 +880,7 @@ var Pipeline = class {
       if (!done) {
         const block = value ?? failUndefined();
         this._processingTrigger.reset();
-        this._timeframeClock.updatePendingTimeframe(PublicKey2.from(block.feedKey), block.seq);
+        this._timeframeClock.updatePendingTimeframe(PublicKey3.from(block.feedKey), block.seq);
         yield block;
         this._processingTrigger.wake();
         this._timeframeClock.updateTimeframe();
@@ -1054,7 +1081,7 @@ import { Callback as Callback2 } from "@dxos/util";
 import { DeferredTask, sleepWithContext as sleepWithContext2, trackLeaks } from "@dxos/async";
 import { Context as Context4 } from "@dxos/context";
 import { SpaceStateMachine } from "@dxos/credentials";
-import { PublicKey as PublicKey3 } from "@dxos/keys";
+import { PublicKey as PublicKey4 } from "@dxos/keys";
 import { log as log6 } from "@dxos/log";
 import { AdmittedFeed } from "@dxos/protocols/proto/dxos/halo/credentials";
 import { Timeframe as Timeframe3 } from "@dxos/timeframe";
@@ -1198,7 +1225,7 @@ var ControlPipeline = class {
     await this._pipeline.unpause();
     log6("save snapshot", {
       key: this._spaceKey,
-      snapshot
+      snapshot: getSnapshotLoggerContext(snapshot)
     }, {
       F: __dxlog_file7,
       L: 163,
@@ -1237,7 +1264,7 @@ var ControlPipeline = class {
     if (msg.data.payload.credential) {
       const timer = tracer.mark("dxos.echo.pipeline.control");
       const result = await this._spaceStateMachine.process(msg.data.payload.credential.credential, {
-        sourceFeed: PublicKey3.from(msg.feedKey)
+        sourceFeed: PublicKey4.from(msg.feedKey)
       });
       timer.end();
       if (!result) {
@@ -1314,6 +1341,18 @@ ControlPipeline = _ts_decorate4([
   trace.resource(),
   trackLeaks("start", "stop")
 ], ControlPipeline);
+var getSnapshotLoggerContext = (snapshot) => {
+  return snapshot.messages?.map((msg) => {
+    const issuer = msg.credential.issuer;
+    const subject = msg.credential.subject.id;
+    const type = msg.credential.subject.assertion["@type"];
+    return {
+      issuer,
+      subject,
+      type
+    };
+  });
+};
 
 // packages/core/echo/echo-pipeline/src/space/space.ts
 function _ts_decorate5(decorators, target, key, desc) {
@@ -1472,21 +1511,32 @@ var Space = class extends Resource {
       C: (f, a) => f(...a)
     });
     await this._controlPipeline.start();
-    await this.protocol.start();
-    await this.protocol.addFeed(await this._feedProvider(this._genesisFeedKey));
     log7("opened", void 0, {
       F: __dxlog_file8,
-      L: 182,
+      L: 180,
       S: this,
       C: (f, a) => f(...a)
     });
   }
+  async startProtocol() {
+    invariant6(this.isOpen, void 0, {
+      F: __dxlog_file8,
+      L: 185,
+      S: this,
+      A: [
+        "this.isOpen",
+        ""
+      ]
+    });
+    await this.protocol.start();
+    await this.protocol.addFeed(await this._feedProvider(this._genesisFeedKey));
+  }
   async _close() {
     log7("closing...", {
       key: this._key
     }, {
       F: __dxlog_file8,
-      L: 187,
+      L: 192,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1494,7 +1544,7 @@ var Space = class extends Resource {
     await this._controlPipeline.stop();
     log7("closed", void 0, {
       F: __dxlog_file8,
-      L: 193,
+      L: 198,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1517,6 +1567,9 @@ _ts_decorate5([
 _ts_decorate5([
   trace2.span()
 ], Space.prototype, "_open", null);
+_ts_decorate5([
+  synchronized3
+], Space.prototype, "startProtocol", null);
 _ts_decorate5([
   synchronized3
 ], Space.prototype, "_close", null);
@@ -1594,15 +1647,15 @@ var CredentialServerExtension = class extends RpcExtension2 {
 };
 
 // packages/core/echo/echo-pipeline/src/space/space-protocol.ts
-import { discoveryKey, subtleCrypto } from "@dxos/crypto";
-import { PublicKey as PublicKey4 } from "@dxos/keys";
+import { discoveryKey, subtleCrypto as subtleCrypto2 } from "@dxos/crypto";
+import { PublicKey as PublicKey5 } from "@dxos/keys";
 import { log as log8, logInfo as logInfo2 } from "@dxos/log";
 import { MMSTTopology } from "@dxos/network-manager";
 import { Teleport } from "@dxos/teleport";
 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 ComplexMap3 } from "@dxos/util";
+import { CallbackCollection, ComplexMap as ComplexMap4 } from "@dxos/util";
 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);
@@ -1615,7 +1668,7 @@ var MOCK_AUTH_VERIFIER = async (nonce, credential) => true;
 var SpaceProtocol = class {
   constructor({ topic, swarmIdentity, networkManager, onSessionAuth, onAuthFailure, blobStore, disableP2pReplication }) {
     this._feeds = /* @__PURE__ */ new Set();
-    this._sessions = new ComplexMap3(PublicKey4.hash);
+    this._sessions = new ComplexMap4(PublicKey5.hash);
     // TODO(burdon): Move to config (with sensible defaults).
     this._topology = new MMSTTopology({
       originateConnections: 4,
@@ -1631,7 +1684,7 @@ var SpaceProtocol = class {
     this.blobSync = new BlobSync({
       blobStore
     });
-    this._topic = subtleCrypto.digest("SHA-256", topic.asBuffer()).then(discoveryKey).then(PublicKey4.from);
+    this._topic = subtleCrypto2.digest("SHA-256", topic.asBuffer()).then(discoveryKey).then(PublicKey5.from);
     this._disableP2pReplication = disableP2pReplication ?? false;
   }
   get sessions() {
@@ -1675,17 +1728,13 @@ var SpaceProtocol = class {
     const topic = await this._topic;
     this._connection = await this._networkManager.joinSwarm({
       protocolProvider: this._createProtocolProvider(credentials),
-      peerInfo: {
-        peerKey: this._swarmIdentity.peerKey.toHex(),
-        identityKey: this._swarmIdentity.identityKey.toHex()
-      },
       topic,
       topology: this._topology,
       label: `swarm ${topic.truncate()} for space ${this._spaceKey.truncate()}`
     });
     log8("started", void 0, {
       F: __dxlog_file10,
-      L: 162,
+      L: 158,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1698,14 +1747,14 @@ var SpaceProtocol = class {
     if (this._connection) {
       log8("stopping...", void 0, {
         F: __dxlog_file10,
-        L: 173,
+        L: 169,
         S: this,
         C: (f, a) => f(...a)
       });
       await this._connection.close();
       log8("stopped", void 0, {
         F: __dxlog_file10,
-        L: 175,
+        L: 171,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1781,7 +1830,7 @@ var SpaceProtocolSession = class {
       onAuthSuccess: () => {
         log8("Peer authenticated", void 0, {
           F: __dxlog_file10,
-          L: 286,
+          L: 282,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1801,7 +1850,7 @@ var SpaceProtocolSession = class {
   async close() {
     log8("close", void 0, {
       F: __dxlog_file10,
-      L: 305,
+      L: 301,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1821,10 +1870,10 @@ _ts_decorate6([
 // packages/core/echo/echo-pipeline/src/space/space-manager.ts
 import { synchronized as synchronized4, trackLeaks as trackLeaks3, Trigger as Trigger2 } from "@dxos/async";
 import { failUndefined as failUndefined2 } from "@dxos/debug";
-import { PublicKey as PublicKey5 } from "@dxos/keys";
+import { PublicKey as PublicKey6 } from "@dxos/keys";
 import { log as log9 } from "@dxos/log";
 import { trace as trace4 } from "@dxos/protocols";
-import { ComplexMap as ComplexMap4 } from "@dxos/util";
+import { ComplexMap as ComplexMap5 } from "@dxos/util";
 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);
@@ -1834,8 +1883,8 @@ function _ts_decorate7(decorators, target, key, desc) {
 var __dxlog_file11 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/space/space-manager.ts";
 var SpaceManager = class {
   constructor({ feedStore, networkManager, metadataStore, blobStore, disableP2pReplication }) {
-    this._spaces = new ComplexMap4(PublicKey5.hash);
-    this._instanceId = PublicKey5.random().toHex();
+    this._spaces = new ComplexMap5(PublicKey6.hash);
+    this._instanceId = PublicKey6.random().toHex();
     this._feedStore = feedStore;
     this._networkManager = networkManager;
     this._metadataStore = metadataStore;
@@ -1981,6 +2030,7 @@ export {
   codec,
   valueEncoding,
   createMappedFeedWriter,
+  createIdFromSpaceKey,
   MetadataStore,
   hasInvitationExpired,
   mapTimeframeToFeedIndexes,
@@ -1999,4 +2049,4 @@ export {
   SpaceProtocolSession,
   SpaceManager
 };
-//# sourceMappingURL=chunk-UKXIJW43.mjs.map
+//# sourceMappingURL=chunk-RRKGEIVZ.mjs.map