@dxos/client-services 0.4.4-main.8a6f0d0 → 0.4.4-main.8f561b4

package/dist/lib/browser/{chunk-QGZQVG3C.mjs → chunk-QNMD46PN.mjs}

@@ -1025,7 +1025,6 @@ 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;
@@ -1034,7 +1033,7 @@ var IdentityServiceImpl = class {
     this._onProfileUpdate = _onProfileUpdate;
   }
   async createIdentity(request) {
-    await this._createIdentity(request.profile ?? {}, request.useAutomerge ?? CREATE_PROFILE_WITH_AUTOMERGE_DEFAULT);
+    await this._createIdentity(request.profile ?? {});
     return this._getIdentity();
   }
   async recoverIdentity(request) {
@@ -1062,7 +1061,7 @@ var IdentityServiceImpl = class {
   async updateProfile(profile) {
     invariant3(this._identityManager.identity, "Identity not initialized.", {
       F: __dxlog_file4,
-      L: 63,
+      L: 61,
       S: this,
       A: [
         "this._identityManager.identity",
@@ -1076,7 +1075,7 @@ var IdentityServiceImpl = class {
   async signPresentation({ presentation, nonce }) {
     invariant3(this._identityManager.identity, "Identity not initialized.", {
       F: __dxlog_file4,
-      L: 70,
+      L: 68,
       S: this,
       A: [
         "this._identityManager.identity",
@@ -2566,7 +2565,7 @@ var getPlatform = () => {
 };
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.4.4-main.8a6f0d0";
+var DXOS_VERSION = "0.4.4-main.8f561b4";
 
 // 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";
@@ -2836,7 +2835,7 @@ var NotarizationPlugin = class {
           ...this._extensions
         ].find((peer2) => !peersTried.has(peer2));
         if (!peer) {
-          log9.warn("Exhausted all peers to notarize with", {
+          log9.info("Exhausted all peers to notarize with", {
             retryIn: retryTimeout
           }, {
             F: __dxlog_file11,
@@ -2870,7 +2869,7 @@ var NotarizationPlugin = class {
         await sleep(successDelay);
       } catch (err) {
         if (!ctx.disposed && !err.message.includes(WRITER_NOT_SET_ERROR_CODE)) {
-          log9.warn("error notarizing (recoverable)", err, {
+          log9.info("error notarizing (recoverable)", err, {
             F: __dxlog_file11,
             L: 151,
             S: this,
@@ -3221,7 +3220,7 @@ var DataSpace = class {
     this.metrics.dataPipelineReady = /* @__PURE__ */ new Date();
     log10("data pipeline ready", void 0, {
       F: __dxlog_file12,
-      L: 295,
+      L: 294,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3231,7 +3230,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 299,
+      L: 298,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3247,7 +3246,7 @@ var DataSpace = class {
     await this._createWritableFeeds();
     log10("writable feeds created", void 0, {
       F: __dxlog_file12,
-      L: 315,
+      L: 314,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3310,10 +3309,11 @@ var DataSpace = class {
       rootUrl
     }, {
       F: __dxlog_file12,
-      L: 381,
+      L: 380,
       S: this,
       C: (f, a) => f(...a)
     });
+    this._automergeHost._requestedDocs.add(rootUrl);
     const handle = this._automergeHost.repo.find(rootUrl);
     queueMicrotask(async () => {
       try {
@@ -3703,17 +3703,17 @@ var DataSpaceManager = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    const space = await this._constructSpace(metadata);
     const automergeRoot = this._automergeHost.repo.create();
     automergeRoot.change((doc) => {
       doc.experimental_spaceKey = spaceKey.toHex();
     });
+    const space = await this._constructSpace(metadata);
     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: 154,
+      L: 155,
       S: this,
       A: [
         "getCredentialAssertion(memberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -3731,13 +3731,13 @@ var DataSpaceManager = class {
       opts
     }, {
       F: __dxlog_file13,
-      L: 166,
+      L: 167,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant11(this._isOpen, "Not open.", {
       F: __dxlog_file13,
-      L: 167,
+      L: 168,
       S: this,
       A: [
         "this._isOpen",
@@ -3746,7 +3746,7 @@ var DataSpaceManager = class {
     });
     invariant11(!this._spaces.has(opts.spaceKey), "Space already exists.", {
       F: __dxlog_file13,
-      L: 168,
+      L: 169,
       S: this,
       A: [
         "!this._spaces.has(opts.spaceKey)",
@@ -3781,7 +3781,7 @@ var DataSpaceManager = class {
       metadata
     }, {
       F: __dxlog_file13,
-      L: 201,
+      L: 202,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3819,7 +3819,7 @@ var DataSpaceManager = class {
       onAuthFailure: () => {
         log11.warn("auth failure", void 0, {
           F: __dxlog_file13,
-          L: 238,
+          L: 239,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3843,7 +3843,7 @@ var DataSpaceManager = class {
             space: space.key
           }, {
             F: __dxlog_file13,
-            L: 256,
+            L: 257,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3855,7 +3855,7 @@ var DataSpaceManager = class {
             open: this._isOpen
           }, {
             F: __dxlog_file13,
-            L: 263,
+            L: 264,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3868,7 +3868,7 @@ var DataSpaceManager = class {
             space: space.key
           }, {
             F: __dxlog_file13,
-            L: 269,
+            L: 270,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4613,6 +4613,7 @@ import { trace as trace9 } from "@dxos/protocols";
 import { SystemStatus } from "@dxos/protocols/proto/dxos/client/services";
 import { TextModel } from "@dxos/text-model";
 import { TRACE_PROCESSOR as TRACE_PROCESSOR2, trace as Trace3 } from "@dxos/tracing";
+import { assignDeep } from "@dxos/util";
 import { WebsocketRpcClient } from "@dxos/websocket-rpc";
 
 // packages/sdk/client-services/src/packlets/devices/devices-service.ts
@@ -4881,18 +4882,6 @@ var __dxlog_file17 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/s
 var createDefaultModelFactory = () => {
   return new ModelFactory().registerModel(DocumentModel2).registerModel(TextModel);
 };
-var createGenesisMutationFromTypedObject = (obj) => {
-  const snapshot = obj[base]._createSnapshot();
-  return {
-    objectId: obj[base]._id,
-    genesis: {
-      modelType: obj[base]._modelConstructor.meta.type
-    },
-    snapshot: {
-      model: snapshot
-    }
-  };
-};
 var ClientServicesHost = class {
   constructor({
     config,
@@ -4979,7 +4968,7 @@ var ClientServicesHost = class {
   initialize({ config, ...options }) {
     invariant14(!this._open, "service host is open", {
       F: __dxlog_file17,
-      L: 201,
+      L: 186,
       S: this,
       A: [
         "!this._open",
@@ -4988,14 +4977,14 @@ var ClientServicesHost = class {
     });
     log16("initializing...", void 0, {
       F: __dxlog_file17,
-      L: 202,
+      L: 187,
       S: this,
       C: (f, a) => f(...a)
     });
     if (config) {
       invariant14(!this._config, "config already set", {
         F: __dxlog_file17,
-        L: 205,
+        L: 190,
         S: this,
         A: [
           "!this._config",
@@ -5013,7 +5002,7 @@ var ClientServicesHost = class {
     this._signalManager = signalManager;
     invariant14(!this._networkManager, "network manager already set", {
       F: __dxlog_file17,
-      L: 221,
+      L: 206,
       S: this,
       A: [
         "!this._networkManager",
@@ -5027,7 +5016,7 @@ var ClientServicesHost = class {
     });
     log16("initialized", void 0, {
       F: __dxlog_file17,
-      L: 228,
+      L: 213,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5041,13 +5030,13 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file17,
-      L: 239,
+      L: 224,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant14(this._config, "config not set", {
       F: __dxlog_file17,
-      L: 241,
+      L: 226,
       S: this,
       A: [
         "this._config",
@@ -5056,7 +5045,7 @@ var ClientServicesHost = class {
     });
     invariant14(this._storage, "storage not set", {
       F: __dxlog_file17,
-      L: 242,
+      L: 227,
       S: this,
       A: [
         "this._storage",
@@ -5065,7 +5054,7 @@ var ClientServicesHost = class {
     });
     invariant14(this._signalManager, "signal manager not set", {
       F: __dxlog_file17,
-      L: 243,
+      L: 228,
       S: this,
       A: [
         "this._signalManager",
@@ -5074,7 +5063,7 @@ var ClientServicesHost = class {
     });
     invariant14(this._networkManager, "network manager not set", {
       F: __dxlog_file17,
-      L: 244,
+      L: 229,
       S: this,
       A: [
         "this._networkManager",
@@ -5086,7 +5075,7 @@ var ClientServicesHost = class {
       lockKey: this._resourceLock?.lockKey
     }, {
       F: __dxlog_file17,
-      L: 247,
+      L: 232,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5095,7 +5084,7 @@ var ClientServicesHost = class {
     this._serviceContext = new ServiceContext(this._storage, this._networkManager, this._signalManager, this._modelFactory);
     this._serviceRegistry.setServices({
       SystemService: this._systemService,
-      IdentityService: new IdentityServiceImpl((params, useAutomerge) => this._createIdentity(params, useAutomerge), this._serviceContext.identityManager, this._serviceContext.keyring, (profile) => this._serviceContext.broadcastProfileUpdate(profile)),
+      IdentityService: new IdentityServiceImpl((params) => this._createIdentity(params), 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 () => {
@@ -5132,7 +5121,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file17,
-      L: 320,
+      L: 305,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5140,7 +5129,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file17,
-      L: 321,
+      L: 306,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5154,7 +5143,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file17,
-      L: 332,
+      L: 317,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5170,7 +5159,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file17,
-      L: 339,
+      L: 324,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5181,13 +5170,13 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file17,
-      L: 344,
+      L: 329,
       S: this,
       C: (f, a) => f(...a)
     });
     log16("resetting...", void 0, {
       F: __dxlog_file17,
-      L: 346,
+      L: 331,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5195,7 +5184,7 @@ var ClientServicesHost = class {
     await this._storage.reset();
     log16("reset", void 0, {
       F: __dxlog_file17,
-      L: 349,
+      L: 334,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5203,50 +5192,36 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file17,
-      L: 350,
+      L: 335,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._callbacks?.onReset?.();
   }
-  async _createIdentity(params, useAutomerge) {
+  async _createIdentity(params) {
     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: useAutomerge
-    });
+    const obj = new Properties(void 0);
     obj[defaultKey] = identity.identityKey.toHex();
-    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",
-          ""
-        ]
-      });
-      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();
-      });
-    }
+    const automergeIndex = space.automergeSpaceState.rootUrl;
+    invariant14(automergeIndex, void 0, {
+      F: __dxlog_file17,
+      L: 350,
+      S: this,
+      A: [
+        "automergeIndex",
+        ""
+      ]
+    });
+    const document = await this._serviceContext.automergeHost.repo.find(automergeIndex);
+    await document.whenReady();
+    document.change((doc) => {
+      assignDeep(doc, [
+        "objects",
+        obj[base]._id
+      ], getRawDoc(obj).handle.docSync());
+    });
     return identity;
   }
 };
@@ -5302,4 +5277,4 @@ export {
   createDefaultModelFactory,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-QGZQVG3C.mjs.map
+//# sourceMappingURL=chunk-QNMD46PN.mjs.map