@dxos/client-services 0.3.11-main.c8e9429 → 0.3.11-main.c95bc86

package/dist/lib/browser/{chunk-OZ4IMR73.mjs → chunk-4ZZIUZXZ.mjs}

@@ -996,7 +996,7 @@ var IdentityManager = class {
         genesisFeedKey: spaceRecord.genesisFeedKey
       },
       swarmIdentity,
-      onNetworkConnection: () => {
+      onAuthorizedConnection: () => {
       },
       onAuthFailure: () => {
         log3.warn("auth failure", void 0, {
@@ -1095,6 +1095,7 @@ var IdentityServiceImpl = class {
 
 // packages/sdk/client-services/src/packlets/invitations/device-invitation-protocol.ts
 import { invariant as invariant4 } from "@dxos/invariant";
+import { AlreadyJoinedError } from "@dxos/protocols";
 import { Invitation } from "@dxos/protocols/proto/dxos/client/services";
 var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/device-invitation-protocol.ts";
 var DeviceInvitationProtocol = class {
@@ -1114,7 +1115,7 @@ var DeviceInvitationProtocol = class {
   async admit(request) {
     invariant4(request.device, void 0, {
       F: __dxlog_file5,
-      L: 35,
+      L: 36,
       S: this,
       A: [
         "request.device",
@@ -1132,6 +1133,15 @@ var DeviceInvitationProtocol = class {
       }
     };
   }
+  checkInvitation(invitation) {
+    try {
+      const identity = this._getIdentity();
+      if (identity) {
+        return new AlreadyJoinedError("Currently only one identity per client is supported.");
+      }
+    } catch {
+    }
+  }
   createIntroduction() {
     return {};
   }
@@ -1150,7 +1160,7 @@ var DeviceInvitationProtocol = class {
   async accept(response, request) {
     invariant4(response.device, void 0, {
       F: __dxlog_file5,
-      L: 68,
+      L: 80,
       S: this,
       A: [
         "response.device",
@@ -1160,7 +1170,7 @@ var DeviceInvitationProtocol = class {
     const { identityKey, haloSpaceKey, genesisFeedKey, controlTimeframe } = response.device;
     invariant4(request.device, void 0, {
       F: __dxlog_file5,
-      L: 71,
+      L: 83,
       S: this,
       A: [
         "request.device",
@@ -1942,16 +1952,12 @@ var InvitationsHandler = class {
                     }
                   }
                 }
-              } else {
-                setState({
-                  state: Invitation3.State.READY_FOR_AUTHENTICATION
-                });
               }
               log5("request admission", {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 312,
+                L: 309,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1963,7 +1969,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 323,
+                L: 320,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1976,7 +1982,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 325,
+                L: 322,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1986,7 +1992,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file7,
-                  L: 328,
+                  L: 325,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -1996,7 +2002,7 @@ var InvitationsHandler = class {
               } else {
                 log5("auth failed", err, {
                   F: __dxlog_file7,
-                  L: 331,
+                  L: 328,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -2007,7 +2013,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file7,
-                L: 334,
+                L: 331,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2025,7 +2031,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file7,
-              L: 345,
+              L: 342,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2035,7 +2041,7 @@ var InvitationsHandler = class {
           } else {
             log5("auth failed", err, {
               F: __dxlog_file7,
-              L: 348,
+              L: 345,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2046,29 +2052,34 @@ var InvitationsHandler = class {
       return extension;
     };
     scheduleTask2(ctx, async () => {
-      invariant6(invitation.swarmKey, void 0, {
-        F: __dxlog_file7,
-        L: 358,
-        S: this,
-        A: [
-          "invitation.swarmKey",
-          ""
-        ]
-      });
-      const topic = invitation.swarmKey;
-      const swarmConnection = await this._networkManager.joinSwarm({
-        topic,
-        peerId: PublicKey6.random(),
-        protocolProvider: createTeleportProtocolFactory(async (teleport) => {
-          teleport.addExtension("dxos.halo.invitations", createExtension());
-        }),
-        topology: new StarTopology(topic),
-        label: "invitation guest"
-      });
-      ctx.onDispose(() => swarmConnection.close());
-      setState({
-        state: Invitation3.State.CONNECTING
-      });
+      const error = protocol.checkInvitation(invitation);
+      if (error) {
+        stream.error(error);
+      } else {
+        invariant6(invitation.swarmKey, void 0, {
+          F: __dxlog_file7,
+          L: 359,
+          S: this,
+          A: [
+            "invitation.swarmKey",
+            ""
+          ]
+        });
+        const topic = invitation.swarmKey;
+        const swarmConnection = await this._networkManager.joinSwarm({
+          topic,
+          peerId: PublicKey6.random(),
+          protocolProvider: createTeleportProtocolFactory(async (teleport) => {
+            teleport.addExtension("dxos.halo.invitations", createExtension());
+          }),
+          topology: new StarTopology(topic),
+          label: "invitation guest"
+        });
+        ctx.onDispose(() => swarmConnection.close());
+        setState({
+          state: Invitation3.State.CONNECTING
+        });
+      }
     });
     const observable = new AuthenticatingInvitation({
       initialInvitation: invitation,
@@ -2274,6 +2285,7 @@ import { createAdmissionCredentials, getCredentialAssertion } from "@dxos/creden
 import { writeMessages as writeMessages2 } from "@dxos/feed-store";
 import { invariant as invariant8 } from "@dxos/invariant";
 import { log as log7 } from "@dxos/log";
+import { AlreadyJoinedError as AlreadyJoinedError2 } from "@dxos/protocols";
 import { Invitation as Invitation5 } from "@dxos/protocols/proto/dxos/client/services";
 var __dxlog_file9 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/space-invitation-protocol.ts";
 var SpaceInvitationProtocol = class {
@@ -2298,7 +2310,7 @@ var SpaceInvitationProtocol = class {
   async admit(request, guestProfile) {
     invariant8(this._spaceKey, void 0, {
       F: __dxlog_file9,
-      L: 46,
+      L: 47,
       S: this,
       A: [
         "this._spaceKey",
@@ -2308,7 +2320,7 @@ var SpaceInvitationProtocol = class {
     const space = await this._spaceManager.spaces.get(this._spaceKey);
     invariant8(space, void 0, {
       F: __dxlog_file9,
-      L: 48,
+      L: 49,
       S: this,
       A: [
         "space",
@@ -2317,7 +2329,7 @@ var SpaceInvitationProtocol = class {
     });
     invariant8(request.space, void 0, {
       F: __dxlog_file9,
-      L: 50,
+      L: 51,
       S: this,
       A: [
         "request.space",
@@ -2330,14 +2342,14 @@ var SpaceInvitationProtocol = class {
       guest: deviceKey
     }, {
       F: __dxlog_file9,
-      L: 53,
+      L: 54,
       S: this,
       C: (f, a) => f(...a)
     });
     const credentials = await createAdmissionCredentials(this._signingContext.credentialSigner, identityKey, space.key, space.inner.genesisFeedKey, guestProfile);
     invariant8(credentials[0].credential, void 0, {
       F: __dxlog_file9,
-      L: 64,
+      L: 65,
       S: this,
       A: [
         "credentials[0].credential",
@@ -2347,7 +2359,7 @@ var SpaceInvitationProtocol = class {
     const spaceMemberCredential = credentials[0].credential.credential;
     invariant8(getCredentialAssertion(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file9,
-      L: 66,
+      L: 67,
       S: this,
       A: [
         "getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2363,6 +2375,11 @@ var SpaceInvitationProtocol = class {
       }
     };
   }
+  checkInvitation(invitation) {
+    if (invitation.spaceKey && this._spaceManager.spaces.has(invitation.spaceKey)) {
+      return new AlreadyJoinedError2("Already joined space.");
+    }
+  }
   createIntroduction() {
     return {
       profile: this._signingContext.getProfile()
@@ -2383,7 +2400,7 @@ var SpaceInvitationProtocol = class {
   async accept(response) {
     invariant8(response.space, void 0, {
       F: __dxlog_file9,
-      L: 101,
+      L: 108,
       S: this,
       A: [
         "response.space",
@@ -2394,7 +2411,7 @@ var SpaceInvitationProtocol = class {
     const assertion = getCredentialAssertion(credential);
     invariant8(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
       F: __dxlog_file9,
-      L: 104,
+      L: 111,
       S: this,
       A: [
         "assertion['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2403,13 +2420,16 @@ var SpaceInvitationProtocol = class {
     });
     invariant8(credential.subject.id.equals(this._signingContext.identityKey), void 0, {
       F: __dxlog_file9,
-      L: 105,
+      L: 112,
       S: this,
       A: [
         "credential.subject.id.equals(this._signingContext.identityKey)",
         ""
       ]
     });
+    if (this._spaceManager.spaces.has(assertion.spaceKey)) {
+      throw new AlreadyJoinedError2("Already joined space.");
+    }
     await this._spaceManager.acceptSpace({
       spaceKey: assertion.spaceKey,
       genesisFeedKey: assertion.genesisFeedKey,
@@ -2543,7 +2563,7 @@ var getPlatform = () => {
 };
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.3.11-main.c8e9429";
+var DXOS_VERSION = "0.3.11-main.c95bc86";
 
 // packages/sdk/client-services/src/packlets/services/diagnostics.ts
 var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/diagnostics.ts";
@@ -2562,7 +2582,7 @@ var createDiagnostics = async (clientServices, serviceContext, config) => {
   {
     invariant9(clientServices.LoggingService, "SystemService is not available.", {
       F: __dxlog_file10,
-      L: 92,
+      L: 93,
       S: void 0,
       A: [
         "clientServices.LoggingService",
@@ -2573,6 +2593,21 @@ var createDiagnostics = async (clientServices, serviceContext, config) => {
       timeout: DEFAULT_TIMEOUT
     }).catch(() => void 0);
   }
+  if (typeof navigator !== "undefined" && navigator.storage) {
+    const map = /* @__PURE__ */ new Map();
+    const dir = await navigator.storage.getDirectory();
+    for await (const filename of dir?.keys()) {
+      const idx = filename.indexOf("-", filename.indexOf("-") + 1);
+      if (idx === -1) {
+        continue;
+      }
+      map.set(filename.slice(0, idx), (map.get(filename.slice(0, idx)) ?? 0) + 1);
+    }
+    diagnostics.storage = Array.from(map.entries()).sort((a, b) => b[1] - a[1]).map(([file, count]) => ({
+      file,
+      count
+    }));
+  }
   const identity = serviceContext.identityManager.identity;
   if (identity) {
     diagnostics.identity = {
@@ -2613,7 +2648,7 @@ var getProperties = (space) => {
   } catch (err) {
     log8.warn(err.message, void 0, {
       F: __dxlog_file10,
-      L: 160,
+      L: 178,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -2674,6 +2709,7 @@ import { AUTH_TIMEOUT as AUTH_TIMEOUT2 } from "@dxos/client-protocol";
 import { cancelWithContext as cancelWithContext2, Context as Context7 } from "@dxos/context";
 import { timed } from "@dxos/debug";
 import { createMappedFeedWriter } from "@dxos/echo-pipeline";
+import { failedInvariant } from "@dxos/invariant";
 import { PublicKey as PublicKey8 } from "@dxos/keys";
 import { log as log10 } from "@dxos/log";
 import { CancelledError, SystemError } from "@dxos/protocols";
@@ -2686,7 +2722,8 @@ import { ComplexSet as ComplexSet3 } from "@dxos/util";
 // packages/sdk/client-services/src/packlets/spaces/automerge-space-state.ts
 import { checkCredentialType } from "@dxos/credentials";
 var AutomergeSpaceState = class {
-  constructor() {
+  constructor(_onNewRoot) {
+    this._onNewRoot = _onNewRoot;
     this.rootUrl = void 0;
     this.lastEpoch = void 0;
   }
@@ -2697,6 +2734,7 @@ var AutomergeSpaceState = class {
     this.lastEpoch = credential;
     if (credential.subject.assertion.automergeRoot) {
       this.rootUrl = credential.subject.assertion.automergeRoot;
+      this._onNewRoot(this.rootUrl);
     }
   }
 };
@@ -2988,7 +3026,7 @@ var DataSpace = class {
     this._notarizationPlugin = new NotarizationPlugin();
     this._cache = void 0;
     // TODO(dmaretskyi): Move into Space?
-    this._automergeSpaceState = new AutomergeSpaceState();
+    this._automergeSpaceState = new AutomergeSpaceState((rootUrl) => this._onNewAutomergeRoot(rootUrl));
     this._state = SpaceState.CLOSED;
     /**
     * Error for _state === SpaceState.ERROR.
@@ -3017,7 +3055,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 137,
+      L: 138,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3064,7 +3102,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 189,
+      L: 190,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3082,7 +3120,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 203,
+      L: 204,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3114,7 +3152,7 @@ var DataSpace = class {
         if (err instanceof CancelledError) {
           log10("data pipeline initialization cancelled", err, {
             F: __dxlog_file12,
-            L: 236,
+            L: 237,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3122,7 +3160,7 @@ var DataSpace = class {
         }
         log10.error("Error initializing data pipeline", err, {
           F: __dxlog_file12,
-          L: 240,
+          L: 241,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3131,7 +3169,7 @@ var DataSpace = class {
           state: SpaceState[this._state]
         }, {
           F: __dxlog_file12,
-          L: 242,
+          L: 243,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3151,7 +3189,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 258,
+      L: 259,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3162,7 +3200,7 @@ var DataSpace = class {
     await cancelWithContext2(this._ctx, this._inner.dataPipeline.ensureEpochInitialized());
     log10("waiting for data pipeline to reach target timeframe", void 0, {
       F: __dxlog_file12,
-      L: 272,
+      L: 273,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3173,7 +3211,7 @@ var DataSpace = class {
     this.metrics.dataPipelineReady = /* @__PURE__ */ new Date();
     log10("data pipeline ready", void 0, {
       F: __dxlog_file12,
-      L: 281,
+      L: 282,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3183,7 +3221,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 285,
+      L: 286,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3199,7 +3237,7 @@ var DataSpace = class {
     await this._createWritableFeeds();
     log10("writable feeds created", void 0, {
       F: __dxlog_file12,
-      L: 301,
+      L: 302,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3256,6 +3294,40 @@ var DataSpace = class {
       await this._metadataStore.setWritableFeedKeys(this.key, this.inner.controlFeedKey, this.inner.dataFeedKey);
     }
   }
+  _onNewAutomergeRoot(rootUrl) {
+    log10.info("loading automerge root doc for space", {
+      space: this.key,
+      rootUrl
+    }, {
+      F: __dxlog_file12,
+      L: 368,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    const handle = this._automergeHost.repo.find(rootUrl);
+    queueMicrotask(async () => {
+      try {
+        await handle.whenReady();
+        const doc = handle.docSync() ?? failedInvariant();
+        if (!doc.experimental_spaceKey) {
+          handle.change((doc2) => {
+            doc2.experimental_spaceKey = this.key.toHex();
+          });
+        }
+      } catch (err) {
+        log10.warn("error loading automerge root doc", {
+          space: this.key,
+          rootUrl,
+          err
+        }, {
+          F: __dxlog_file12,
+          L: 381,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      }
+    });
+  }
   // TODO(dmaretskyi): Use profile from signing context.
   async updateOwnProfile(profile) {
     const credential = await this._signingContext.credentialSigner.createCredential({
@@ -3339,7 +3411,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 450,
+      L: 470,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3598,12 +3670,15 @@ var DataSpaceManager = class {
     });
     const space = await this._constructSpace(metadata);
     const automergeRoot = this._automergeHost.repo.create();
+    automergeRoot.change((doc) => {
+      doc.experimental_spaceKey = spaceKey.toHex();
+    });
     const credentials = await spaceGenesis(this._keyring, this._signingContext, space.inner, automergeRoot.url);
     await this._metadataStore.addSpace(metadata);
     const memberCredential = credentials[1];
     invariant11(getCredentialAssertion2(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file13,
-      L: 151,
+      L: 154,
       S: this,
       A: [
         "getCredentialAssertion(memberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -3621,13 +3696,13 @@ var DataSpaceManager = class {
       opts
     }, {
       F: __dxlog_file13,
-      L: 163,
+      L: 166,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant11(this._isOpen, "Not open.", {
       F: __dxlog_file13,
-      L: 164,
+      L: 167,
       S: this,
       A: [
         "this._isOpen",
@@ -3636,7 +3711,7 @@ var DataSpaceManager = class {
     });
     invariant11(!this._spaces.has(opts.spaceKey), "Space already exists.", {
       F: __dxlog_file13,
-      L: 165,
+      L: 168,
       S: this,
       A: [
         "!this._spaces.has(opts.spaceKey)",
@@ -3671,7 +3746,7 @@ var DataSpaceManager = class {
       metadata
     }, {
       F: __dxlog_file13,
-      L: 198,
+      L: 201,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3698,17 +3773,18 @@ var DataSpaceManager = class {
         credentialProvider: createAuthProvider(this._signingContext.credentialSigner),
         credentialAuthenticator: deferFunction2(() => dataSpace.authVerifier.verifier)
       },
-      onNetworkConnection: (session) => {
+      onAuthorizedConnection: (session) => {
         session.addExtension("dxos.mesh.teleport.gossip", gossip.createExtension({
           remotePeerId: session.remotePeerId
         }));
         session.addExtension("dxos.mesh.teleport.notarization", dataSpace.notarizationPlugin.createExtension());
+        this._automergeHost.authorizeDevice(space.key, session.remotePeerId);
         session.addExtension("dxos.mesh.teleport.automerge", this._automergeHost.createExtension());
       },
       onAuthFailure: () => {
         log11.warn("auth failure", void 0, {
           F: __dxlog_file13,
-          L: 234,
+          L: 238,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3732,7 +3808,7 @@ var DataSpaceManager = class {
             space: space.key
           }, {
             F: __dxlog_file13,
-            L: 252,
+            L: 256,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3744,7 +3820,7 @@ var DataSpaceManager = class {
             open: this._isOpen
           }, {
             F: __dxlog_file13,
-            L: 259,
+            L: 263,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3757,7 +3833,7 @@ var DataSpaceManager = class {
             space: space.key
           }, {
             F: __dxlog_file13,
-            L: 265,
+            L: 269,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3814,7 +3890,7 @@ var SpacesServiceImpl = class {
   }
   async createSpace() {
     if (!this._identityManager.identity) {
-      throw new Error("This device has no HALO identity available. See https://docs.dxos.org/guide/halo");
+      throw new Error("This device has no HALO identity available. See https://docs.dxos.org/guide/platform/halo");
     }
     const dataSpaceManager = await this._getDataSpaceManager();
     const space = await dataSpaceManager.createSpace();
@@ -5187,4 +5263,4 @@ export {
   createDefaultModelFactory,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-OZ4IMR73.mjs.map
+//# sourceMappingURL=chunk-4ZZIUZXZ.mjs.map