@dxos/client-services 0.4.4 → 0.4.5-main.60c9234

package/dist/lib/node/{chunk-DZARJVRB.cjs → chunk-G6IFLZAA.cjs}

@@ -26,8 +26,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_DZARJVRB_exports = {};
-__export(chunk_DZARJVRB_exports, {
+var chunk_G6IFLZAA_exports = {};
+__export(chunk_G6IFLZAA_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   DataSpace: () => DataSpace,
@@ -60,7 +60,7 @@ __export(chunk_DZARJVRB_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_DZARJVRB_exports);
+module.exports = __toCommonJS(chunk_G6IFLZAA_exports);
 var import_async = require("@dxos/async");
 var import_codec_protobuf = require("@dxos/codec-protobuf");
 var import_feed_store = require("@dxos/feed-store");
@@ -238,6 +238,7 @@ var import_protocols14 = require("@dxos/protocols");
 var import_services12 = require("@dxos/protocols/proto/dxos/client/services");
 var import_text_model = require("@dxos/text-model");
 var import_tracing7 = require("@dxos/tracing");
+var import_util9 = require("@dxos/util");
 var import_websocket_rpc = require("@dxos/websocket-rpc");
 var import_async16 = require("@dxos/async");
 var import_codec_protobuf12 = require("@dxos/codec-protobuf");
@@ -246,11 +247,11 @@ var import_async17 = require("@dxos/async");
 var import_codec_protobuf13 = require("@dxos/codec-protobuf");
 var import_log16 = require("@dxos/log");
 var import_services14 = require("@dxos/protocols/proto/dxos/client/services");
-var import_util9 = require("@dxos/util");
+var import_util10 = require("@dxos/util");
 var import_codec_protobuf14 = require("@dxos/codec-protobuf");
 var import_codec_protobuf15 = require("@dxos/codec-protobuf");
 var import_services15 = require("@dxos/protocols/proto/dxos/client/services");
-var import_util10 = require("@dxos/util");
+var import_util11 = require("@dxos/util");
 var subscribeToFeeds = ({ feedStore }, { feedKeys }) => {
   return new import_codec_protobuf.Stream(({ next }) => {
     const subscriptions = new import_async.EventSubscriptions();
@@ -1202,7 +1203,6 @@ IdentityManager = _ts_decorate2([
   import_tracing2.trace.resource()
 ], IdentityManager);
 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;
@@ -1211,7 +1211,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) {
@@ -1239,7 +1239,7 @@ var IdentityServiceImpl = class {
   async updateProfile(profile) {
     (0, import_invariant3.invariant)(this._identityManager.identity, "Identity not initialized.", {
       F: __dxlog_file4,
-      L: 63,
+      L: 61,
       S: this,
       A: [
         "this._identityManager.identity",
@@ -1253,7 +1253,7 @@ var IdentityServiceImpl = class {
   async signPresentation({ presentation, nonce }) {
     (0, import_invariant3.invariant)(this._identityManager.identity, "Identity not initialized.", {
       F: __dxlog_file4,
-      L: 70,
+      L: 68,
       S: this,
       A: [
         "this._identityManager.identity",
@@ -2675,7 +2675,7 @@ var getPlatform = () => {
     };
   }
 };
-var DXOS_VERSION = "0.4.4";
+var DXOS_VERSION = "0.4.5-main.60c9234";
 var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/diagnostics.ts";
 var DEFAULT_TIMEOUT = 1e3;
 var createDiagnostics = async (clientServices, serviceContext, config) => {
@@ -3397,9 +3397,11 @@ var DataSpace = class {
           return;
         }
         const doc = handle.docSync() ?? (0, import_invariant10.failedInvariant)();
-        if (!doc.experimental_spaceKey) {
+        if (!doc.access?.spaceKey) {
           handle.change((doc2) => {
-            doc2.experimental_spaceKey = this.key.toHex();
+            doc2.access = {
+              spaceKey: this.key.toHex()
+            };
           });
         }
       } catch (err) {
@@ -3758,7 +3760,9 @@ var DataSpaceManager = class {
     });
     const automergeRoot = this._automergeHost.repo.create();
     automergeRoot.change((doc) => {
-      doc.experimental_spaceKey = spaceKey.toHex();
+      doc.access = {
+        spaceKey: spaceKey.toHex()
+      };
     });
     const space = await this._constructSpace(metadata);
     const credentials = await spaceGenesis(this._keyring, this._signingContext, space.inner, automergeRoot.url);
@@ -4599,15 +4603,15 @@ var LoggingServiceImpl = class {
   }
   async controlMetrics({ reset, record }) {
     if (reset) {
-      import_util9.tracer.clear();
+      import_util10.tracer.clear();
     }
     if (record === true) {
-      import_util9.tracer.start();
+      import_util10.tracer.start();
     } else if (record === false) {
-      import_util9.tracer.stop();
+      import_util10.tracer.stop();
     }
     return {
-      recording: import_util9.tracer.recording
+      recording: import_util10.tracer.recording
     };
   }
   /**
@@ -4615,10 +4619,10 @@ var LoggingServiceImpl = class {
   */
   queryMetrics({ interval = 5e3 }) {
     const getNumericalValues = (key) => {
-      const events = import_util9.tracer.get(key) ?? [];
+      const events = import_util10.tracer.get(key) ?? [];
       return {
         key,
-        stats: (0, import_util9.numericalValues)(events, "duration")
+        stats: (0, import_util10.numericalValues)(events, "duration")
       };
     };
     return new import_codec_protobuf13.Stream(({ next }) => {
@@ -4656,7 +4660,7 @@ var LoggingServiceImpl = class {
         }
         const record = {
           ...entry2,
-          context: (0, import_util9.jsonify)((0, import_log16.getContextFromEntry)(entry2)),
+          context: (0, import_util10.jsonify)((0, import_log16.getContextFromEntry)(entry2)),
           timestamp: /* @__PURE__ */ new Date(),
           meta: {
             // TODO(dmaretskyi): Fix proto.
@@ -4741,7 +4745,7 @@ var SystemServiceImpl = class {
     const diagnostics = await this._getDiagnostics();
     return {
       timestamp: /* @__PURE__ */ new Date(),
-      diagnostics: JSON.parse(JSON.stringify(diagnostics, (0, import_util10.jsonKeyReplacer)({
+      diagnostics: JSON.parse(JSON.stringify(diagnostics, (0, import_util11.jsonKeyReplacer)({
         truncate: keys === import_services15.GetDiagnosticsRequest.KEY_OPTION.TRUNCATE,
         humanize: keys === import_services15.GetDiagnosticsRequest.KEY_OPTION.HUMANIZE
       })))
@@ -4788,18 +4792,6 @@ var __dxlog_file17 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/s
 var createDefaultModelFactory = () => {
   return new import_model_factory.ModelFactory().registerModel(import_document_model2.DocumentModel).registerModel(import_text_model.TextModel);
 };
-var createGenesisMutationFromTypedObject = (obj) => {
-  const snapshot = obj[import_echo_schema.base]._createSnapshot();
-  return {
-    objectId: obj[import_echo_schema.base]._id,
-    genesis: {
-      modelType: obj[import_echo_schema.base]._modelConstructor.meta.type
-    },
-    snapshot: {
-      model: snapshot
-    }
-  };
-};
 var ClientServicesHost = class {
   constructor({
     config,
@@ -4886,7 +4878,7 @@ var ClientServicesHost = class {
   initialize({ config, ...options }) {
     (0, import_invariant16.invariant)(!this._open, "service host is open", {
       F: __dxlog_file17,
-      L: 201,
+      L: 186,
       S: this,
       A: [
         "!this._open",
@@ -4895,14 +4887,14 @@ var ClientServicesHost = class {
     });
     (0, import_log15.log)("initializing...", void 0, {
       F: __dxlog_file17,
-      L: 202,
+      L: 187,
       S: this,
       C: (f, a) => f(...a)
     });
     if (config) {
       (0, import_invariant16.invariant)(!this._config, "config already set", {
         F: __dxlog_file17,
-        L: 205,
+        L: 190,
         S: this,
         A: [
           "!this._config",
@@ -4920,7 +4912,7 @@ var ClientServicesHost = class {
     this._signalManager = signalManager;
     (0, import_invariant16.invariant)(!this._networkManager, "network manager already set", {
       F: __dxlog_file17,
-      L: 221,
+      L: 206,
       S: this,
       A: [
         "!this._networkManager",
@@ -4934,7 +4926,7 @@ var ClientServicesHost = class {
     });
     (0, import_log15.log)("initialized", void 0, {
       F: __dxlog_file17,
-      L: 228,
+      L: 213,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4948,13 +4940,13 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file17,
-      L: 239,
+      L: 224,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant16.invariant)(this._config, "config not set", {
       F: __dxlog_file17,
-      L: 241,
+      L: 226,
       S: this,
       A: [
         "this._config",
@@ -4963,7 +4955,7 @@ var ClientServicesHost = class {
     });
     (0, import_invariant16.invariant)(this._storage, "storage not set", {
       F: __dxlog_file17,
-      L: 242,
+      L: 227,
       S: this,
       A: [
         "this._storage",
@@ -4972,7 +4964,7 @@ var ClientServicesHost = class {
     });
     (0, import_invariant16.invariant)(this._signalManager, "signal manager not set", {
       F: __dxlog_file17,
-      L: 243,
+      L: 228,
       S: this,
       A: [
         "this._signalManager",
@@ -4981,7 +4973,7 @@ var ClientServicesHost = class {
     });
     (0, import_invariant16.invariant)(this._networkManager, "network manager not set", {
       F: __dxlog_file17,
-      L: 244,
+      L: 229,
       S: this,
       A: [
         "this._networkManager",
@@ -4993,7 +4985,7 @@ var ClientServicesHost = class {
       lockKey: this._resourceLock?.lockKey
     }, {
       F: __dxlog_file17,
-      L: 247,
+      L: 232,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5002,7 +4994,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 () => {
@@ -5039,7 +5031,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file17,
-      L: 320,
+      L: 305,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5047,7 +5039,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file17,
-      L: 321,
+      L: 306,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5061,7 +5053,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file17,
-      L: 332,
+      L: 317,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5077,7 +5069,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file17,
-      L: 339,
+      L: 324,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5088,13 +5080,13 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file17,
-      L: 344,
+      L: 329,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log15.log)("resetting...", void 0, {
       F: __dxlog_file17,
-      L: 346,
+      L: 331,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5102,7 +5094,7 @@ var ClientServicesHost = class {
     await this._storage.reset();
     (0, import_log15.log)("reset", void 0, {
       F: __dxlog_file17,
-      L: 349,
+      L: 334,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5110,50 +5102,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 import_client_protocol5.Properties(void 0, {
-      automerge: useAutomerge
-    });
+    const obj = new import_client_protocol5.Properties(void 0);
     obj[import_client_protocol5.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;
-      (0, import_invariant16.invariant)(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[import_echo_schema.base]._id] = (0, import_echo_schema.getRawDoc)(obj).handle.docSync();
-      });
-    }
+    const automergeIndex = space.automergeSpaceState.rootUrl;
+    (0, import_invariant16.invariant)(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) => {
+      (0, import_util9.assignDeep)(doc, [
+        "objects",
+        obj[import_echo_schema.base]._id
+      ], (0, import_echo_schema.getRawDoc)(obj).handle.docSync());
+    });
     return identity;
   }
 };
@@ -5208,4 +5186,4 @@ ClientServicesHost = _ts_decorate8([
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-DZARJVRB.cjs.map
+//# sourceMappingURL=chunk-G6IFLZAA.cjs.map