@dxos/client-services 0.1.58-main.fa022ee → 0.1.58-main.fc3ea9b

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

@@ -70,9 +70,6 @@ var import_log = require("@dxos/log");
 var import_protocols = require("@dxos/protocols");
 var import_services = require("@dxos/protocols/proto/dxos/client/services");
 
-// packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.1.58-main.fa022ee";
-
 // packages/sdk/client-services/src/packlets/services/platform.ts
 var getPlatform = () => {
   if (process.browser) {
@@ -101,6 +98,9 @@ var getPlatform = () => {
   }
 };
 
+// packages/sdk/client-services/src/version.ts
+var DXOS_VERSION = "0.1.58-main.fc3ea9b";
+
 // 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";
 var DEFAULT_TIMEOUT = 1e3;
@@ -255,7 +255,6 @@ var createAuthProvider = (signer) => async (nonce) => {
   return Credential.encode(credential);
 };
 var TrustedKeySetAuthVerifier = class {
-  // prettier-ignore
   constructor(_params) {
     this._params = _params;
     this._ctx = new import_context.Context();
@@ -270,7 +269,7 @@ var TrustedKeySetAuthVerifier = class {
         credential
       }, {
         F: __dxlog_file2,
-        L: 59,
+        L: 56,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -280,7 +279,7 @@ var TrustedKeySetAuthVerifier = class {
           result
         }, {
           F: __dxlog_file2,
-          L: 63,
+          L: 60,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -292,7 +291,7 @@ var TrustedKeySetAuthVerifier = class {
           credential
         }, {
           F: __dxlog_file2,
-          L: 68,
+          L: 65,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -303,7 +302,7 @@ var TrustedKeySetAuthVerifier = class {
           key: credential.issuer
         }, {
           F: __dxlog_file2,
-          L: 73,
+          L: 70,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -319,7 +318,7 @@ var TrustedKeySetAuthVerifier = class {
             key: credential.issuer
           }, {
             F: __dxlog_file2,
-            L: 84,
+            L: 81,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -329,7 +328,7 @@ var TrustedKeySetAuthVerifier = class {
             key: credential.issuer
           }, {
             F: __dxlog_file2,
-            L: 87,
+            L: 84,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3599,7 +3598,6 @@ function _ts_decorate5(decorators, target, key, desc) {
 }
 var __dxlog_file15 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
 var ServiceContext = class ServiceContext2 {
-  // prettier-ignore
   constructor(storage, networkManager, signalManager, modelFactory) {
     this.storage = storage;
     this.networkManager = networkManager;
@@ -3639,7 +3637,7 @@ var ServiceContext = class ServiceContext2 {
     await this._checkStorageVersion();
     (0, import_log13.log)("opening...", void 0, {
       F: __dxlog_file15,
-      L: 135,
+      L: 129,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3647,7 +3645,7 @@ var ServiceContext = class ServiceContext2 {
       id: this._instanceId
     }), {
       F: __dxlog_file15,
-      L: 136,
+      L: 130,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3663,13 +3661,13 @@ var ServiceContext = class ServiceContext2 {
       id: this._instanceId
     }), {
       F: __dxlog_file15,
-      L: 146,
+      L: 140,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log13.log)("opened", void 0, {
       F: __dxlog_file15,
-      L: 147,
+      L: 141,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3677,7 +3675,7 @@ var ServiceContext = class ServiceContext2 {
   async close() {
     (0, import_log13.log)("closing...", void 0, {
       F: __dxlog_file15,
-      L: 151,
+      L: 145,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3694,7 +3692,7 @@ var ServiceContext = class ServiceContext2 {
     await this.metadataStore.close();
     (0, import_log13.log)("closed", void 0, {
       F: __dxlog_file15,
-      L: 163,
+      L: 157,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3708,7 +3706,7 @@ var ServiceContext = class ServiceContext2 {
     const factory = this._handlerFactories.get(invitation.kind);
     (0, import_invariant13.invariant)(factory, `Unknown invitation kind: ${invitation.kind}`, {
       F: __dxlog_file15,
-      L: 174,
+      L: 168,
       S: this,
       A: [
         "factory",
@@ -3732,7 +3730,7 @@ var ServiceContext = class ServiceContext2 {
   async _initialize(ctx) {
     (0, import_log13.log)("initializing spaces...", void 0, {
       F: __dxlog_file15,
-      L: 195,
+      L: 189,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3755,7 +3753,7 @@ var ServiceContext = class ServiceContext2 {
     this._handlerFactories.set(import_services10.Invitation.Kind.SPACE, (invitation) => {
       (0, import_invariant13.invariant)(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
         F: __dxlog_file15,
-        L: 218,
+        L: 212,
         S: this,
         A: [
           "this.dataSpaceManager",
@@ -3779,7 +3777,7 @@ var ServiceContext = class ServiceContext2 {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 234,
+            L: 228,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3790,7 +3788,7 @@ var ServiceContext = class ServiceContext2 {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 238,
+            L: 232,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3801,7 +3799,7 @@ var ServiceContext = class ServiceContext2 {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 243,
+            L: 237,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3812,7 +3810,7 @@ var ServiceContext = class ServiceContext2 {
         } catch (err) {
           import_log13.log.catch(err, void 0, {
             F: __dxlog_file15,
-            L: 249,
+            L: 243,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3839,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");
@@ -3851,6 +3850,30 @@ var import_text_model = require("@dxos/text-model");
 var import_tracing5 = require("@dxos/tracing");
 var import_websocket_rpc = require("@dxos/websocket-rpc");
 
+// packages/sdk/client-services/src/packlets/services/service-registry.ts
+var ServiceRegistry = class {
+  // prettier-ignore
+  constructor(_serviceBundle, _handlers = {}) {
+    this._serviceBundle = _serviceBundle;
+    this._handlers = _handlers;
+  }
+  get descriptors() {
+    return this._serviceBundle;
+  }
+  get services() {
+    return this._handlers;
+  }
+  setServices(services) {
+    this._handlers = services;
+  }
+  addService(name, service) {
+    this._handlers[name] = service;
+  }
+  removeService(name) {
+    delete this._handlers[name];
+  }
+};
+
 // packages/sdk/client-services/src/packlets/devices/devices-service.ts
 var import_async12 = require("@dxos/async");
 var import_codec_protobuf6 = require("@dxos/codec-protobuf");
@@ -4417,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}/`
     })
   };
 };
@@ -4512,30 +4535,6 @@ var SystemServiceImpl = class {
   }
 };
 
-// packages/sdk/client-services/src/packlets/services/service-registry.ts
-var ServiceRegistry = class {
-  // prettier-ignore
-  constructor(_serviceBundle, _handlers = {}) {
-    this._serviceBundle = _serviceBundle;
-    this._handlers = _handlers;
-  }
-  get descriptors() {
-    return this._serviceBundle;
-  }
-  get services() {
-    return this._handlers;
-  }
-  setServices(services) {
-    this._handlers = services;
-  }
-  addService(name, service) {
-    this._handlers[name] = service;
-  }
-  removeService(name) {
-    delete this._handlers[name];
-  }
-};
-
 // packages/sdk/client-services/src/packlets/services/service-host.ts
 function _ts_decorate7(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -4551,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,
@@ -4637,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",
@@ -4646,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",
@@ -4671,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",
@@ -4685,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)
     });
@@ -4699,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",
@@ -4714,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",
@@ -4723,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",
@@ -4732,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",
@@ -4744,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)
     });
@@ -4753,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 () => {
@@ -4790,7 +4801,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       deviceKey
     }, {
       F: __dxlog_file17,
-      L: 299,
+      L: 316,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4798,7 +4809,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       id: traceId
     }), {
       F: __dxlog_file17,
-      L: 300,
+      L: 317,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4812,7 +4823,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       deviceKey
     }, {
       F: __dxlog_file17,
-      L: 311,
+      L: 328,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4828,7 +4839,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       deviceKey
     }, {
       F: __dxlog_file17,
-      L: 318,
+      L: 335,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4839,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)
     });
@@ -4853,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)
     });
@@ -4861,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()
@@ -5127,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;
@@ -5138,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() {