@dxos/client-services 0.1.58-main.f4192cb → 0.1.58-main.f69fa2f

package/dist/lib/node/packlets/testing/index.cjs

@@ -99,7 +99,7 @@ var getPlatform = () => {
 };
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.1.58-main.f4192cb";
+var DXOS_VERSION = "0.1.58-main.f69fa2f";
 
 // packages/sdk/client-services/src/packlets/services/diagnostics.ts
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/diagnostics.ts";
@@ -3837,6 +3837,7 @@ var import_client_protocol5 = require("@dxos/client-protocol");
 var import_context10 = require("@dxos/context");
 var import_document_model2 = require("@dxos/document-model");
 var import_echo_pipeline3 = require("@dxos/echo-pipeline");
+var import_echo_schema = require("@dxos/echo-schema");
 var import_invariant15 = require("@dxos/invariant");
 var import_keys12 = require("@dxos/keys");
 var import_log16 = require("@dxos/log");
@@ -4439,23 +4440,23 @@ var import_random_access_storage = require("@dxos/random-access-storage");
 var import_util8 = require("@dxos/util");
 var StorageDriver = import_config.Runtime.Client.Storage.StorageDriver;
 var createStorageObjects = (config) => {
-  const { path = (0, import_util8.isNode)() ? import_client_protocol4.DX_DATA : "dxos/storage", storageType, keyStorage, persistent = false } = config ?? {};
-  if (persistent && storageType === StorageDriver.RAM) {
+  const { persistent = false, keyStore, dataStore, dataRoot = (0, import_util8.isNode)() ? import_client_protocol4.DX_DATA : "dxos/storage" } = config ?? {};
+  if (persistent && dataStore === StorageDriver.RAM) {
     throw new import_protocols11.InvalidConfigError("RAM storage cannot be used in persistent mode.");
   }
-  if (!persistent && storageType !== void 0 && storageType !== StorageDriver.RAM) {
+  if (!persistent && dataStore !== void 0 && dataStore !== StorageDriver.RAM) {
     throw new import_protocols11.InvalidConfigError("Cannot use a persistent storage in not persistent mode.");
   }
-  if (persistent && keyStorage === StorageDriver.RAM) {
+  if (persistent && keyStore === StorageDriver.RAM) {
     throw new import_protocols11.InvalidConfigError("RAM key storage cannot be used in persistent mode.");
   }
-  if (!persistent && keyStorage !== StorageDriver.RAM && keyStorage !== void 0) {
+  if (!persistent && keyStore !== StorageDriver.RAM && keyStore !== void 0) {
     throw new import_protocols11.InvalidConfigError("Cannot use a persistent key storage in not persistent mode.");
   }
   return {
     storage: (0, import_random_access_storage.createStorage)({
-      type: persistent ? toStorageType(storageType) : import_random_access_storage.StorageType.RAM,
-      root: `${path}/`
+      type: persistent ? toStorageType(dataStore) : import_random_access_storage.StorageType.RAM,
+      root: `${dataRoot}/`
     })
   };
 };
@@ -4549,6 +4550,18 @@ 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 ClientServicesHost2 {
   constructor({
     config,
@@ -4635,7 +4648,7 @@ var ClientServicesHost = class ClientServicesHost2 {
   initialize({ config, ...options }) {
     (0, import_invariant15.invariant)(!this._open, "service host is open", {
       F: __dxlog_file17,
-      L: 184,
+      L: 201,
       S: this,
       A: [
         "!this._open",
@@ -4644,14 +4657,14 @@ var ClientServicesHost = class ClientServicesHost2 {
     });
     (0, import_log16.log)("initializing...", void 0, {
       F: __dxlog_file17,
-      L: 185,
+      L: 202,
       S: this,
       C: (f, a) => f(...a)
     });
     if (config) {
       (0, import_invariant15.invariant)(!this._config, "config already set", {
         F: __dxlog_file17,
-        L: 188,
+        L: 205,
         S: this,
         A: [
           "!this._config",
@@ -4669,7 +4682,7 @@ var ClientServicesHost = class ClientServicesHost2 {
     this._signalManager = signalManager;
     (0, import_invariant15.invariant)(!this._networkManager, "network manager already set", {
       F: __dxlog_file17,
-      L: 204,
+      L: 221,
       S: this,
       A: [
         "!this._networkManager",
@@ -4683,7 +4696,7 @@ var ClientServicesHost = class ClientServicesHost2 {
     });
     (0, import_log16.log)("initialized", void 0, {
       F: __dxlog_file17,
-      L: 211,
+      L: 228,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4697,13 +4710,13 @@ var ClientServicesHost = class ClientServicesHost2 {
       id: traceId
     }), {
       F: __dxlog_file17,
-      L: 222,
+      L: 239,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant15.invariant)(this._config, "config not set", {
       F: __dxlog_file17,
-      L: 224,
+      L: 241,
       S: this,
       A: [
         "this._config",
@@ -4712,7 +4725,7 @@ var ClientServicesHost = class ClientServicesHost2 {
     });
     (0, import_invariant15.invariant)(this._storage, "storage not set", {
       F: __dxlog_file17,
-      L: 225,
+      L: 242,
       S: this,
       A: [
         "this._storage",
@@ -4721,7 +4734,7 @@ var ClientServicesHost = class ClientServicesHost2 {
     });
     (0, import_invariant15.invariant)(this._signalManager, "signal manager not set", {
       F: __dxlog_file17,
-      L: 226,
+      L: 243,
       S: this,
       A: [
         "this._signalManager",
@@ -4730,7 +4743,7 @@ var ClientServicesHost = class ClientServicesHost2 {
     });
     (0, import_invariant15.invariant)(this._networkManager, "network manager not set", {
       F: __dxlog_file17,
-      L: 227,
+      L: 244,
       S: this,
       A: [
         "this._networkManager",
@@ -4742,7 +4755,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       lockKey: this._resourceLock?.lockKey
     }, {
       F: __dxlog_file17,
-      L: 230,
+      L: 247,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4751,7 +4764,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._serviceContext.createIdentity(params), this._serviceContext.identityManager, this._serviceContext.keyring),
+      IdentityService: new IdentityServiceImpl((params) => this._createIdentity(params), this._serviceContext.identityManager, this._serviceContext.keyring),
       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 () => {
@@ -4788,7 +4801,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       deviceKey
     }, {
       F: __dxlog_file17,
-      L: 299,
+      L: 316,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4796,7 +4809,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       id: traceId
     }), {
       F: __dxlog_file17,
-      L: 300,
+      L: 317,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4810,7 +4823,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       deviceKey
     }, {
       F: __dxlog_file17,
-      L: 311,
+      L: 328,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4826,7 +4839,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       deviceKey
     }, {
       F: __dxlog_file17,
-      L: 318,
+      L: 335,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4837,13 +4850,13 @@ var ClientServicesHost = class ClientServicesHost2 {
       id: traceId
     }), {
       F: __dxlog_file17,
-      L: 323,
+      L: 340,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log16.log)("resetting...", void 0, {
       F: __dxlog_file17,
-      L: 325,
+      L: 342,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4851,7 +4864,7 @@ var ClientServicesHost = class ClientServicesHost2 {
     await this._storage.reset();
     (0, import_log16.log)("reset", void 0, {
       F: __dxlog_file17,
-      L: 328,
+      L: 345,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4859,12 +4872,31 @@ var ClientServicesHost = class ClientServicesHost2 {
       id: traceId
     }), {
       F: __dxlog_file17,
-      L: 329,
+      L: 346,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._callbacks?.onReset?.();
   }
+  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();
+    obj[import_client_protocol5.defaultKey] = identity.identityKey.toHex();
+    await this._serviceRegistry.services.DataService.write({
+      spaceKey: space.key,
+      batch: {
+        objects: [
+          createGenesisMutationFromTypedObject(obj)
+        ]
+      }
+    });
+    await this._serviceRegistry.services.DataService.flush({
+      spaceKey: space.key
+    });
+    return identity;
+  }
 };
 _ts_decorate7([
   import_tracing5.trace.info()
@@ -5125,7 +5157,7 @@ var TestBuilder = class {
 };
 var TestPeer = class {
   constructor(signalContext, opts = {
-    storageType: import_random_access_storage2.StorageType.RAM
+    dataStore: import_random_access_storage2.StorageType.RAM
   }) {
     this.signalContext = signalContext;
     this.opts = opts;
@@ -5136,7 +5168,7 @@ var TestPeer = class {
   }
   get storage() {
     return this._props.storage ??= (0, import_random_access_storage2.createStorage)({
-      type: this.opts.storageType
+      type: this.opts.dataStore
     });
   }
   get keyring() {