@dxos/client-services 0.4.10-main.f68a1ca → 0.4.10-main.fd4f2a3

package/dist/lib/node/{chunk-EC2QGJ2V.cjs → chunk-7WXQVUAE.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_EC2QGJ2V_exports = {};
-__export(chunk_EC2QGJ2V_exports, {
+var chunk_7WXQVUAE_exports = {};
+__export(chunk_7WXQVUAE_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   DataSpace: () => DataSpace,
@@ -48,6 +48,7 @@ __export(chunk_EC2QGJ2V_exports, {
   TrustedKeySetAuthVerifier: () => TrustedKeySetAuthVerifier,
   createAuthProvider: () => createAuthProvider,
   createDiagnostics: () => createDiagnostics,
+  createLevel: () => createLevel,
   createStorageObjects: () => createStorageObjects,
   getNetworkPeers: () => getNetworkPeers,
   invitationExpired: () => invitationExpired,
@@ -60,7 +61,7 @@ __export(chunk_EC2QGJ2V_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_EC2QGJ2V_exports);
+module.exports = __toCommonJS(chunk_7WXQVUAE_exports);
 var import_async = require("@dxos/async");
 var import_codec_protobuf = require("@dxos/codec-protobuf");
 var import_feed_store = require("@dxos/feed-store");
@@ -223,20 +224,23 @@ var import_protocols13 = require("@dxos/protocols");
 var import_invariant15 = require("@dxos/invariant");
 var import_lock_file = require("@dxos/lock-file");
 var import_log13 = require("@dxos/log");
-var import_client_protocol4 = require("@dxos/client-protocol");
 var import_protocols14 = require("@dxos/protocols");
 var import_config = require("@dxos/protocols/proto/dxos/config");
 var import_random_access_storage = require("@dxos/random-access-storage");
+var import_client_protocol4 = require("@dxos/client-protocol");
+var import_config2 = require("@dxos/protocols/proto/dxos/config");
 var import_util8 = require("@dxos/util");
+var import_level = require("level");
+var import_node_path = __toESM(require("node:path"));
+var import_keys11 = require("@dxos/keys");
 var import_async16 = require("@dxos/async");
 var import_client_protocol5 = require("@dxos/client-protocol");
 var import_context11 = require("@dxos/context");
 var import_echo_pipeline4 = require("@dxos/echo-pipeline");
 var E = __toESM(require("@dxos/echo-schema"));
-var import_echo_schema = require("@dxos/echo-schema");
 var import_indexing2 = require("@dxos/indexing");
 var import_invariant16 = require("@dxos/invariant");
-var import_keys11 = require("@dxos/keys");
+var import_keys12 = require("@dxos/keys");
 var import_log14 = require("@dxos/log");
 var import_messaging = require("@dxos/messaging");
 var import_network_manager2 = require("@dxos/network-manager");
@@ -251,7 +255,7 @@ var import_invariant17 = require("@dxos/invariant");
 var import_services14 = require("@dxos/protocols/proto/dxos/client/services");
 var import_async18 = require("@dxos/async");
 var import_codec_protobuf13 = require("@dxos/codec-protobuf");
-var import_keys12 = require("@dxos/keys");
+var import_keys13 = require("@dxos/keys");
 var import_log15 = require("@dxos/log");
 var import_services15 = require("@dxos/protocols/proto/dxos/client/services");
 var import_util10 = require("@dxos/util");
@@ -2887,7 +2891,7 @@ var getPlatform = () => {
     };
   }
 };
-var DXOS_VERSION = "0.4.10-main.f68a1ca";
+var DXOS_VERSION = "0.4.10-main.fd4f2a3";
 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) => {
@@ -4445,13 +4449,13 @@ var createSelectedDocumentsIterator = (automergeHost) => (
       await (0, import_debug7.warnAfterTimeout)(5e3, "to long to load doc", () => handle.whenReady());
       const doc = handle.docSync();
       const hash = (0, import_automerge.getHeads)(doc).join("");
-      yield [
+      yield doc.objects?.[objectId] ? [
         {
           id,
           object: doc.objects[objectId],
           currentHash: hash
         }
-      ];
+      ] : [];
     }
   }
 );
@@ -4517,9 +4521,11 @@ 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 {
-  constructor(storage, networkManager, signalManager, _runtimeParams) {
+var ServiceContext = class extends import_context10.Resource {
+  constructor(storage, level, networkManager, signalManager, _runtimeParams) {
+    super();
     this.storage = storage;
+    this.level = level;
     this.networkManager = networkManager;
     this.signalManager = signalManager;
     this._runtimeParams = _runtimeParams;
@@ -4549,7 +4555,7 @@ var ServiceContext = class {
     });
     this.identityManager = new IdentityManager(this.metadataStore, this.keyring, this.feedStore, this.spaceManager, this._runtimeParams);
     this.indexMetadata = new import_indexing.IndexMetadataStore({
-      directory: storage.createDirectory("index-metadata")
+      db: level.sublevel("index-metadata")
     });
     this.automergeHost = new import_echo_pipeline3.AutomergeHost({
       directory: storage.createDirectory("automerge"),
@@ -4566,11 +4572,11 @@ var ServiceContext = class {
     this.invitations = new InvitationsHandler(this.networkManager);
     this._handlerFactories.set(import_services12.Invitation.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => this.identityManager.identity ?? (0, import_debug6.failUndefined)(), this._acceptIdentity.bind(this)));
   }
-  async open(ctx) {
+  async _open(ctx) {
     await this._checkStorageVersion();
     (0, import_log12.log)("opening...", void 0, {
       F: __dxlog_file15,
-      L: 151,
+      L: 156,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4578,7 +4584,7 @@ var ServiceContext = class {
       id: this._instanceId
     }), {
       F: __dxlog_file15,
-      L: 152,
+      L: 157,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4594,21 +4600,21 @@ var ServiceContext = class {
       id: this._instanceId
     }), {
       F: __dxlog_file15,
-      L: 162,
+      L: 167,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log12.log)("opened", void 0, {
       F: __dxlog_file15,
-      L: 163,
+      L: 168,
       S: this,
       C: (f, a) => f(...a)
     });
   }
-  async close() {
+  async _close() {
     (0, import_log12.log)("closing...", void 0, {
       F: __dxlog_file15,
-      L: 167,
+      L: 172,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4626,7 +4632,7 @@ var ServiceContext = class {
     await this.indexer.destroy();
     (0, import_log12.log)("closed", void 0, {
       F: __dxlog_file15,
-      L: 180,
+      L: 185,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4640,7 +4646,7 @@ var ServiceContext = class {
     const factory = this._handlerFactories.get(invitation.kind);
     (0, import_invariant14.invariant)(factory, `Unknown invitation kind: ${invitation.kind}`, {
       F: __dxlog_file15,
-      L: 191,
+      L: 196,
       S: this,
       A: [
         "factory",
@@ -4672,7 +4678,7 @@ var ServiceContext = class {
   async _initialize(ctx) {
     (0, import_log12.log)("initializing spaces...", void 0, {
       F: __dxlog_file15,
-      L: 222,
+      L: 227,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4695,7 +4701,7 @@ var ServiceContext = class {
     this._handlerFactories.set(import_services12.Invitation.Kind.SPACE, (invitation) => {
       (0, import_invariant14.invariant)(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
         F: __dxlog_file15,
-        L: 246,
+        L: 251,
         S: this,
         A: [
           "this.dataSpaceManager",
@@ -4719,7 +4725,7 @@ var ServiceContext = class {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 262,
+            L: 267,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4730,7 +4736,7 @@ var ServiceContext = class {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 266,
+            L: 271,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4741,7 +4747,7 @@ var ServiceContext = class {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 271,
+            L: 276,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4752,7 +4758,7 @@ var ServiceContext = class {
         } catch (err) {
           import_log12.log.catch(err, void 0, {
             F: __dxlog_file15,
-            L: 277,
+            L: 282,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4764,7 +4770,7 @@ var ServiceContext = class {
 };
 _ts_decorate6([
   import_tracing6.trace.span()
-], ServiceContext.prototype, "open", null);
+], ServiceContext.prototype, "_open", null);
 _ts_decorate6([
   import_tracing6.trace.span()
 ], ServiceContext.prototype, "_initialize", null);
@@ -4848,9 +4854,17 @@ _ts_decorate7([
   import_log13.logInfo
 ], Lock.prototype, "lockKey", null);
 var isLocked = (lockPath) => import_lock_file.LockFile.isLocked(lockPath);
+var getRootPath = (config) => {
+  const { dataRoot = (0, import_util8.isNode)() ? import_client_protocol4.DX_DATA : "dxos/storage" } = config ?? {};
+  return `${dataRoot}/`;
+};
+var isPersistent = (config) => {
+  const { persistent = false } = config ?? {};
+  return config.dataStore !== void 0 && config.dataStore !== import_config2.Runtime.Client.Storage.StorageDriver.RAM || persistent;
+};
 var StorageDriver = import_config.Runtime.Client.Storage.StorageDriver;
 var createStorageObjects = (config) => {
-  const { persistent = false, keyStore, dataStore, dataRoot = (0, import_util8.isNode)() ? import_client_protocol4.DX_DATA : "dxos/storage" } = config ?? {};
+  const { persistent = false, keyStore, dataStore } = config ?? {};
   if (persistent && dataStore === StorageDriver.RAM) {
     throw new import_protocols14.InvalidConfigError("RAM storage cannot be used in persistent mode.");
   }
@@ -4866,7 +4880,7 @@ var createStorageObjects = (config) => {
   return {
     storage: (0, import_random_access_storage.createStorage)({
       type: persistent ? toStorageType(dataStore) : import_random_access_storage.StorageType.RAM,
-      root: `${dataRoot}/`
+      root: getRootPath(config)
     })
   };
 };
@@ -4890,6 +4904,13 @@ var toStorageType = (type) => {
       throw new Error(`Invalid storage type: ${StorageDriver[type]}`);
   }
 };
+var createLevel = async (config) => {
+  const persistent = isPersistent(config);
+  const storagePath = persistent ? getRootPath(config) : import_node_path.default.join("tmp", "level", import_keys11.PublicKey.random().toHex());
+  const level = new import_level.Level(storagePath);
+  await level.open();
+  return level;
+};
 var __dxlog_file17 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devices/devices-service.ts";
 var DevicesServiceImpl = class {
   constructor(_identityManager) {
@@ -4970,7 +4991,7 @@ var LoggingServiceImpl = class {
   constructor() {
     this._logs = new import_async18.Event();
     this._started = Date.now();
-    this._sessionId = import_keys12.PublicKey.random().toHex();
+    this._sessionId = import_keys13.PublicKey.random().toHex();
     this._logProcessor = (_config, entry2) => {
       this._logs.emit(entry2);
     };
@@ -5065,12 +5086,12 @@ var LoggingServiceImpl = class {
     });
   }
 };
-var matchFilter = (filter, level, path, options) => {
+var matchFilter = (filter, level, path2, options) => {
   switch (options) {
     case import_services15.QueryLogsRequest.MatchingOptions.INCLUSIVE:
-      return level >= filter.level && (!filter.pattern || path.includes(filter.pattern));
+      return level >= filter.level && (!filter.pattern || path2.includes(filter.pattern));
     case import_services15.QueryLogsRequest.MatchingOptions.EXPLICIT:
-      return level === filter.level && (!filter.pattern || path.includes(filter.pattern));
+      return level === filter.level && (!filter.pattern || path2.includes(filter.pattern));
   }
 };
 var shouldLog = (entry2, request) => {
@@ -5261,7 +5282,7 @@ var ClientServicesHost = class {
   initialize({ config, ...options }) {
     (0, import_invariant16.invariant)(!this._open, "service host is open", {
       F: __dxlog_file18,
-      L: 180,
+      L: 182,
       S: this,
       A: [
         "!this._open",
@@ -5270,14 +5291,14 @@ var ClientServicesHost = class {
     });
     (0, import_log14.log)("initializing...", void 0, {
       F: __dxlog_file18,
-      L: 181,
+      L: 183,
       S: this,
       C: (f, a) => f(...a)
     });
     if (config) {
       (0, import_invariant16.invariant)(!this._config, "config already set", {
         F: __dxlog_file18,
-        L: 184,
+        L: 186,
         S: this,
         A: [
           "!this._config",
@@ -5292,7 +5313,7 @@ var ClientServicesHost = class {
     if (!options.signalManager) {
       import_log14.log.warn("running signaling without telemetry metadata.", void 0, {
         F: __dxlog_file18,
-        L: 192,
+        L: 194,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -5303,7 +5324,7 @@ var ClientServicesHost = class {
     this._signalManager = signalManager;
     (0, import_invariant16.invariant)(!this._networkManager, "network manager already set", {
       F: __dxlog_file18,
-      L: 203,
+      L: 205,
       S: this,
       A: [
         "!this._networkManager",
@@ -5317,7 +5338,7 @@ var ClientServicesHost = class {
     });
     (0, import_log14.log)("initialized", void 0, {
       F: __dxlog_file18,
-      L: 210,
+      L: 212,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5326,18 +5347,18 @@ var ClientServicesHost = class {
     if (this._open) {
       return;
     }
-    const traceId = import_keys11.PublicKey.random().toHex();
+    const traceId = import_keys12.PublicKey.random().toHex();
     import_log14.log.trace("dxos.client-services.host.open", import_protocols15.trace.begin({
       id: traceId
     }), {
       F: __dxlog_file18,
-      L: 221,
+      L: 223,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant16.invariant)(this._config, "config not set", {
       F: __dxlog_file18,
-      L: 223,
+      L: 225,
       S: this,
       A: [
         "this._config",
@@ -5346,7 +5367,7 @@ var ClientServicesHost = class {
     });
     (0, import_invariant16.invariant)(this._storage, "storage not set", {
       F: __dxlog_file18,
-      L: 224,
+      L: 226,
       S: this,
       A: [
         "this._storage",
@@ -5355,7 +5376,7 @@ var ClientServicesHost = class {
     });
     (0, import_invariant16.invariant)(this._signalManager, "signal manager not set", {
       F: __dxlog_file18,
-      L: 225,
+      L: 227,
       S: this,
       A: [
         "this._signalManager",
@@ -5364,7 +5385,7 @@ var ClientServicesHost = class {
     });
     (0, import_invariant16.invariant)(this._networkManager, "network manager not set", {
       F: __dxlog_file18,
-      L: 226,
+      L: 228,
       S: this,
       A: [
         "this._networkManager",
@@ -5376,13 +5397,16 @@ var ClientServicesHost = class {
       lockKey: this._resourceLock?.lockKey
     }, {
       F: __dxlog_file18,
-      L: 229,
+      L: 231,
       S: this,
       C: (f, a) => f(...a)
     });
+    if (!this._level) {
+      this._level = await createLevel(this._config.get("runtime.client.storage", {}));
+    }
     await this._resourceLock?.acquire();
     await this._loggingService.open();
-    this._serviceContext = new ServiceContext(this._storage, this._networkManager, this._signalManager, this._runtimeParams);
+    this._serviceContext = new ServiceContext(this._storage, this._level, this._networkManager, this._signalManager, this._runtimeParams);
     this._serviceRegistry.setServices({
       SystemService: this._systemService,
       IdentityService: new IdentityServiceImpl((params) => this._createIdentity(params), this._serviceContext.identityManager, this._serviceContext.keyring, (profile) => this._serviceContext.broadcastProfileUpdate(profile)),
@@ -5410,7 +5434,7 @@ var ClientServicesHost = class {
     await this._serviceContext.open(ctx);
     (0, import_invariant16.invariant)(this.serviceRegistry.services.InvitationsService, void 0, {
       F: __dxlog_file18,
-      L: 290,
+      L: 297,
       S: this,
       A: [
         "this.serviceRegistry.services.InvitationsService",
@@ -5422,7 +5446,7 @@ var ClientServicesHost = class {
       count: loadedInvitations.invitations?.length
     }, {
       F: __dxlog_file18,
-      L: 293,
+      L: 300,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5444,7 +5468,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file18,
-      L: 310,
+      L: 317,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5452,7 +5476,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file18,
-      L: 311,
+      L: 318,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5466,7 +5490,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file18,
-      L: 322,
+      L: 329,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5476,30 +5500,31 @@ var ClientServicesHost = class {
     });
     await this._loggingService.close();
     await this._serviceContext.close();
+    await this._level?.close();
     this._open = false;
     this._statusUpdate.emit();
     (0, import_log14.log)("closed", {
       deviceKey
     }, {
       F: __dxlog_file18,
-      L: 329,
+      L: 337,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async reset() {
-    const traceId = import_keys11.PublicKey.random().toHex();
+    const traceId = import_keys12.PublicKey.random().toHex();
     import_log14.log.trace("dxos.sdk.client-services-host.reset", import_protocols15.trace.begin({
       id: traceId
     }), {
       F: __dxlog_file18,
-      L: 334,
+      L: 342,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log14.log)("resetting...", void 0, {
       F: __dxlog_file18,
-      L: 336,
+      L: 344,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5507,7 +5532,7 @@ var ClientServicesHost = class {
     await this._storage.reset();
     (0, import_log14.log)("reset", void 0, {
       F: __dxlog_file18,
-      L: 339,
+      L: 347,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5515,7 +5540,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file18,
-      L: 340,
+      L: 348,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5528,7 +5553,7 @@ var ClientServicesHost = class {
     const automergeIndex = space.automergeSpaceState.rootUrl;
     (0, import_invariant16.invariant)(automergeIndex, void 0, {
       F: __dxlog_file18,
-      L: 352,
+      L: 360,
       S: this,
       A: [
         "automergeIndex",
@@ -5537,18 +5562,25 @@ var ClientServicesHost = class {
     });
     const document = await this._serviceContext.automergeHost.repo.find(automergeIndex);
     await document.whenReady();
-    const objectDocument = (0, import_echo_schema.createRawObjectDoc)({
-      [import_client_protocol5.defaultKey]: identity.identityKey.toHex()
-    }, {
-      type: E.getTypeReference(import_client_protocol5.PropertiesSchema)
-    });
+    const properties = {
+      system: {
+        type: (0, import_echo_pipeline4.encodeReference)(E.getTypeReference(import_client_protocol5.Properties))
+      },
+      data: {
+        [import_client_protocol5.defaultKey]: identity.identityKey.toHex()
+      },
+      meta: {
+        keys: []
+      }
+    };
+    const propertiesId = import_keys12.PublicKey.random().toHex();
     document.change((doc) => {
       (0, import_util9.assignDeep)(doc, [
         "objects",
-        objectDocument.id
-      ], objectDocument.handle.docSync());
+        propertiesId
+      ], properties);
     });
-    await (0, import_async16.sleep)(200);
+    await this._serviceContext.automergeHost.repo.flush();
     return identity;
   }
 };
@@ -5591,6 +5623,7 @@ ClientServicesHost = _ts_decorate8([
   TrustedKeySetAuthVerifier,
   createAuthProvider,
   createDiagnostics,
+  createLevel,
   createStorageObjects,
   getNetworkPeers,
   invitationExpired,
@@ -5603,4 +5636,4 @@ ClientServicesHost = _ts_decorate8([
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-EC2QGJ2V.cjs.map
+//# sourceMappingURL=chunk-7WXQVUAE.cjs.map