@dxos/client-services 0.3.11-main.d7d4c52 → 0.3.11-main.d8f9aa0

package/dist/lib/browser/{chunk-CKB4252E.mjs → chunk-YRC7RQJ3.mjs}

@@ -483,7 +483,7 @@ function _ts_decorate(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity.ts";
-var Identity = class Identity2 {
+var Identity = class {
   constructor({ space, signer, identityKey, deviceKey }) {
     this.stateUpdate = new Event();
     this.space = space;
@@ -665,7 +665,7 @@ function _ts_decorate2(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity-manager.ts";
-var IdentityManager = class IdentityManager2 {
+var IdentityManager = class {
   // TODO(burdon): IdentityManagerParams.
   // TODO(dmaretskyi): Perhaps this should take/generate the peerKey outside of an initialized identity.
   constructor(_metadataStore, _keyring, _feedStore, _spaceManager) {
@@ -1025,6 +1025,7 @@ import { signPresentation } from "@dxos/credentials";
 import { todo } from "@dxos/debug";
 import { invariant as invariant3 } from "@dxos/invariant";
 var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity-service.ts";
+var CREATE_PROFILE_WITH_AUTOMERGE_DEFAULT = true;
 var IdentityServiceImpl = class {
   constructor(_createIdentity, _identityManager, _keyring, _onProfileUpdate) {
     this._createIdentity = _createIdentity;
@@ -1033,7 +1034,7 @@ var IdentityServiceImpl = class {
     this._onProfileUpdate = _onProfileUpdate;
   }
   async createIdentity(request) {
-    await this._createIdentity(request);
+    await this._createIdentity(request.profile ?? {}, request.useAutomerge ?? CREATE_PROFILE_WITH_AUTOMERGE_DEFAULT);
     return this._getIdentity();
   }
   async recoverIdentity(request) {
@@ -1061,7 +1062,7 @@ var IdentityServiceImpl = class {
   async updateProfile(profile) {
     invariant3(this._identityManager.identity, "Identity not initialized.", {
       F: __dxlog_file4,
-      L: 60,
+      L: 63,
       S: this,
       A: [
         "this._identityManager.identity",
@@ -1075,7 +1076,7 @@ var IdentityServiceImpl = class {
   async signPresentation({ presentation, nonce }) {
     invariant3(this._identityManager.identity, "Identity not initialized.", {
       F: __dxlog_file4,
-      L: 67,
+      L: 70,
       S: this,
       A: [
         "this._identityManager.identity",
@@ -1094,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 {
@@ -1113,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",
@@ -1131,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 {};
   }
@@ -1149,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",
@@ -1159,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",
@@ -1941,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)
               });
@@ -1962,19 +1969,20 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 323,
+                L: 320,
                 S: this,
                 C: (f, a) => f(...a)
               });
               setState({
                 ...result,
+                target: invitation.target,
                 state: Invitation3.State.SUCCESS
               });
               log5.trace("dxos.sdk.invitations-handler.guest.onOpen", trace4.end({
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 325,
+                L: 322,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1984,7 +1992,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file7,
-                  L: 328,
+                  L: 325,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -1994,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)
                 });
@@ -2005,7 +2013,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file7,
-                L: 334,
+                L: 331,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2023,7 +2031,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file7,
-              L: 345,
+              L: 342,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2033,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)
             });
@@ -2044,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,
@@ -2272,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 {
@@ -2296,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",
@@ -2306,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",
@@ -2315,7 +2329,7 @@ var SpaceInvitationProtocol = class {
     });
     invariant8(request.space, void 0, {
       F: __dxlog_file9,
-      L: 50,
+      L: 51,
       S: this,
       A: [
         "request.space",
@@ -2328,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",
@@ -2345,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'",
@@ -2361,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()
@@ -2381,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",
@@ -2392,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'",
@@ -2401,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,
@@ -2436,7 +2458,7 @@ function _ts_decorate3(decorators, target, key, desc) {
         r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var ClientRpcServer = class ClientRpcServer2 {
+var ClientRpcServer = class {
   constructor(params) {
     this._handlerCache = /* @__PURE__ */ new Map();
     this._callMetrics = new MapCounter();
@@ -2541,7 +2563,7 @@ var getPlatform = () => {
 };
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.3.11-main.d7d4c52";
+var DXOS_VERSION = "0.3.11-main.d8f9aa0";
 
 // 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";
@@ -2560,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",
@@ -2571,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 = {
@@ -2611,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)
     });
@@ -2980,7 +3017,7 @@ function _ts_decorate4(decorators, target, key, desc) {
 }
 var __dxlog_file12 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space.ts";
 var ENABLE_FEED_PURGE = false;
-var DataSpace = class DataSpace2 {
+var DataSpace = class {
   constructor(params) {
     this._ctx = new Context7();
     this._notarizationPlugin = new NotarizationPlugin();
@@ -3469,7 +3506,7 @@ function _ts_decorate5(decorators, target, key, desc) {
 var __dxlog_file13 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts";
 var PRESENCE_ANNOUNCE_INTERVAL = 1e4;
 var PRESENCE_OFFLINE_TIMEOUT = 2e4;
-var DataSpaceManager = class DataSpaceManager2 {
+var DataSpaceManager = class {
   constructor(_spaceManager, _metadataStore, _dataServiceSubscriptions, _keyring, _signingContext, _feedStore, _automergeHost) {
     this._spaceManager = _spaceManager;
     this._metadataStore = _metadataStore;
@@ -3812,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();
@@ -4042,7 +4079,7 @@ function _ts_decorate6(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 var __dxlog_file15 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
-var ServiceContext = class ServiceContext2 {
+var ServiceContext = class {
   constructor(storage, networkManager, signalManager, modelFactory) {
     this.storage = storage;
     this.networkManager = networkManager;
@@ -4343,7 +4380,7 @@ var Lock = class {
   }
   async acquire() {
     this._broadcastChannel.postMessage({
-      message: Message.ACQUIRING
+      message: "acquiring"
     });
     try {
       log14("aquiring lock...", void 0, {
@@ -4379,7 +4416,7 @@ var Lock = class {
     this._releaseTrigger.wake();
   }
   _onMessage(event) {
-    if (event.data.message === Message.ACQUIRING) {
+    if (event.data.message === "acquiring") {
       this._releaseTrigger.wake();
     }
   }
@@ -4489,7 +4526,7 @@ import { clientServiceBundle, defaultKey, Properties } from "@dxos/client-protoc
 import { Context as Context10 } from "@dxos/context";
 import { DocumentModel as DocumentModel2 } from "@dxos/document-model";
 import { DataServiceImpl } from "@dxos/echo-pipeline";
-import { base } from "@dxos/echo-schema";
+import { base, getRawDoc } from "@dxos/echo-schema";
 import { invariant as invariant14 } from "@dxos/invariant";
 import { PublicKey as PublicKey11 } from "@dxos/keys";
 import { log as log16 } from "@dxos/log";
@@ -4776,7 +4813,7 @@ var createGenesisMutationFromTypedObject = (obj) => {
     }
   };
 };
-var ClientServicesHost = class ClientServicesHost2 {
+var ClientServicesHost = class {
   constructor({
     config,
     modelFactory = createDefaultModelFactory(),
@@ -4978,7 +5015,7 @@ var ClientServicesHost = class ClientServicesHost2 {
     this._serviceContext = new ServiceContext(this._storage, this._networkManager, this._signalManager, this._modelFactory);
     this._serviceRegistry.setServices({
       SystemService: this._systemService,
-      IdentityService: new IdentityServiceImpl((params) => this._createIdentity(params), this._serviceContext.identityManager, this._serviceContext.keyring, (profile) => this._serviceContext.broadcastProfileUpdate(profile)),
+      IdentityService: new IdentityServiceImpl((params, useAutomerge) => this._createIdentity(params, useAutomerge), this._serviceContext.identityManager, this._serviceContext.keyring, (profile) => this._serviceContext.broadcastProfileUpdate(profile)),
       InvitationsService: new InvitationsServiceImpl(this._serviceContext.invitations, (invitation) => this._serviceContext.getInvitationHandler(invitation)),
       DevicesService: new DevicesServiceImpl(this._serviceContext.identityManager),
       SpacesService: new SpacesServiceImpl(this._serviceContext.identityManager, this._serviceContext.spaceManager, this._serviceContext.dataServiceSubscriptions, async () => {
@@ -5092,25 +5129,44 @@ var ClientServicesHost = class ClientServicesHost2 {
     });
     await this._callbacks?.onReset?.();
   }
-  async _createIdentity(params) {
+  async _createIdentity(params, useAutomerge) {
     const identity = await this._serviceContext.createIdentity(params);
     await this._serviceContext.initialized.wait();
     const space = await this._serviceContext.dataSpaceManager.createSpace();
     const obj = new Properties(void 0, {
-      automerge: false
+      automerge: useAutomerge
     });
     obj[defaultKey] = identity.identityKey.toHex();
-    await this._serviceRegistry.services.DataService.write({
-      spaceKey: space.key,
-      batch: {
-        objects: [
-          createGenesisMutationFromTypedObject(obj)
+    if (!useAutomerge) {
+      await this._serviceRegistry.services.DataService.write({
+        spaceKey: space.key,
+        batch: {
+          objects: [
+            createGenesisMutationFromTypedObject(obj)
+          ]
+        }
+      });
+      await this._serviceRegistry.services.DataService.flush({
+        spaceKey: space.key
+      });
+    } else {
+      const automergeIndex = space.automergeSpaceState.rootUrl;
+      invariant14(automergeIndex, void 0, {
+        F: __dxlog_file17,
+        L: 375,
+        S: this,
+        A: [
+          "automergeIndex",
+          ""
         ]
-      }
-    });
-    await this._serviceRegistry.services.DataService.flush({
-      spaceKey: space.key
-    });
+      });
+      const document = await this._serviceContext.automergeHost.repo.find(automergeIndex);
+      await document.whenReady();
+      document.change((doc) => {
+        doc.objects ??= {};
+        doc.objects[obj[base]._id] = getRawDoc(obj).handle.docSync();
+      });
+    }
     return identity;
   }
 };
@@ -5166,4 +5222,4 @@ export {
   createDefaultModelFactory,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-CKB4252E.mjs.map
+//# sourceMappingURL=chunk-YRC7RQJ3.mjs.map