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

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

@@ -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.cc2fe2c";
 
 // 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)
     });
@@ -3814,7 +3849,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 +5222,4 @@ export {
   createDefaultModelFactory,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-OZ4IMR73.mjs.map
+//# sourceMappingURL=chunk-RGWEY4Z2.mjs.map