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

package/dist/lib/browser/{chunk-B4JZEXRB.mjs → chunk-V2ALN47T.mjs}

@@ -2769,7 +2769,7 @@ var getPlatform = () => {
 };
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.4.10-main.f68a1ca";
+var DXOS_VERSION = "0.4.10-main.fd4f2a3";
 
 // 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";
@@ -4386,7 +4386,7 @@ var getChannelId = (channel) => `user-channel/${channel}`;
 
 // packages/sdk/client-services/src/packlets/services/service-context.ts
 import { Trigger as Trigger5 } from "@dxos/async";
-import { Context as Context10 } from "@dxos/context";
+import { Context as Context10, Resource } from "@dxos/context";
 import { getCredentialAssertion as getCredentialAssertion3 } from "@dxos/credentials";
 import { failUndefined as failUndefined2 } from "@dxos/debug";
 import { AutomergeHost, MetadataStore, SnapshotStore, SpaceManager, valueEncoding } from "@dxos/echo-pipeline";
@@ -4419,13 +4419,13 @@ var createSelectedDocumentsIterator = (automergeHost) => (
       await warnAfterTimeout2(5e3, "to long to load doc", () => handle.whenReady());
       const doc = handle.docSync();
       const hash = getHeads(doc).join("");
-      yield [
+      yield doc.objects?.[objectId] ? [
         {
           id,
           object: doc.objects[objectId],
           currentHash: hash
         }
-      ];
+      ] : [];
     }
   }
 );
@@ -4493,9 +4493,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 Resource {
+  constructor(storage, level, networkManager, signalManager, _runtimeParams) {
+    super();
     this.storage = storage;
+    this.level = level;
     this.networkManager = networkManager;
     this.signalManager = signalManager;
     this._runtimeParams = _runtimeParams;
@@ -4525,7 +4527,7 @@ var ServiceContext = class {
     });
     this.identityManager = new IdentityManager(this.metadataStore, this.keyring, this.feedStore, this.spaceManager, this._runtimeParams);
     this.indexMetadata = new IndexMetadataStore({
-      directory: storage.createDirectory("index-metadata")
+      db: level.sublevel("index-metadata")
     });
     this.automergeHost = new AutomergeHost({
       directory: storage.createDirectory("automerge"),
@@ -4542,11 +4544,11 @@ var ServiceContext = class {
     this.invitations = new InvitationsHandler(this.networkManager);
     this._handlerFactories.set(Invitation6.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => this.identityManager.identity ?? failUndefined2(), this._acceptIdentity.bind(this)));
   }
-  async open(ctx) {
+  async _open(ctx) {
     await this._checkStorageVersion();
     log12("opening...", void 0, {
       F: __dxlog_file15,
-      L: 151,
+      L: 156,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4554,7 +4556,7 @@ var ServiceContext = class {
       id: this._instanceId
     }), {
       F: __dxlog_file15,
-      L: 152,
+      L: 157,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4570,21 +4572,21 @@ var ServiceContext = class {
       id: this._instanceId
     }), {
       F: __dxlog_file15,
-      L: 162,
+      L: 167,
       S: this,
       C: (f, a) => f(...a)
     });
     log12("opened", void 0, {
       F: __dxlog_file15,
-      L: 163,
+      L: 168,
       S: this,
       C: (f, a) => f(...a)
     });
   }
-  async close() {
+  async _close() {
     log12("closing...", void 0, {
       F: __dxlog_file15,
-      L: 167,
+      L: 172,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4602,7 +4604,7 @@ var ServiceContext = class {
     await this.indexer.destroy();
     log12("closed", void 0, {
       F: __dxlog_file15,
-      L: 180,
+      L: 185,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4616,7 +4618,7 @@ var ServiceContext = class {
     const factory = this._handlerFactories.get(invitation.kind);
     invariant14(factory, `Unknown invitation kind: ${invitation.kind}`, {
       F: __dxlog_file15,
-      L: 191,
+      L: 196,
       S: this,
       A: [
         "factory",
@@ -4648,7 +4650,7 @@ var ServiceContext = class {
   async _initialize(ctx) {
     log12("initializing spaces...", void 0, {
       F: __dxlog_file15,
-      L: 222,
+      L: 227,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4671,7 +4673,7 @@ var ServiceContext = class {
     this._handlerFactories.set(Invitation6.Kind.SPACE, (invitation) => {
       invariant14(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
         F: __dxlog_file15,
-        L: 246,
+        L: 251,
         S: this,
         A: [
           "this.dataSpaceManager",
@@ -4695,7 +4697,7 @@ var ServiceContext = class {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 262,
+            L: 267,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4706,7 +4708,7 @@ var ServiceContext = class {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 266,
+            L: 271,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4717,7 +4719,7 @@ var ServiceContext = class {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 271,
+            L: 276,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4728,7 +4730,7 @@ var ServiceContext = class {
         } catch (err) {
           log12.catch(err, void 0, {
             F: __dxlog_file15,
-            L: 277,
+            L: 282,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4740,7 +4742,7 @@ var ServiceContext = class {
 };
 _ts_decorate6([
   Trace2.span()
-], ServiceContext.prototype, "open", null);
+], ServiceContext.prototype, "_open", null);
 _ts_decorate6([
   Trace2.span()
 ], ServiceContext.prototype, "_initialize", null);
@@ -4898,14 +4900,27 @@ var isLocked = (lockPath) => {
 };
 
 // packages/sdk/client-services/src/packlets/storage/storage.ts
-import { DX_DATA } from "@dxos/client-protocol";
 import { InvalidConfigError } from "@dxos/protocols";
-import { Runtime } from "@dxos/protocols/proto/dxos/config";
+import { Runtime as Runtime2 } from "@dxos/protocols/proto/dxos/config";
 import { createStorage, StorageType } from "@dxos/random-access-storage";
+
+// packages/sdk/client-services/src/packlets/storage/util.ts
+import { DX_DATA } from "@dxos/client-protocol";
+import { Runtime } from "@dxos/protocols/proto/dxos/config";
 import { isNode as isNode2 } from "@dxos/util";
-var StorageDriver = Runtime.Client.Storage.StorageDriver;
+var getRootPath = (config) => {
+  const { dataRoot = isNode2() ? DX_DATA : "dxos/storage" } = config ?? {};
+  return `${dataRoot}/`;
+};
+var isPersistent = (config) => {
+  const { persistent = false } = config ?? {};
+  return config.dataStore !== void 0 && config.dataStore !== Runtime.Client.Storage.StorageDriver.RAM || persistent;
+};
+
+// packages/sdk/client-services/src/packlets/storage/storage.ts
+var StorageDriver = Runtime2.Client.Storage.StorageDriver;
 var createStorageObjects = (config) => {
-  const { persistent = false, keyStore, dataStore, dataRoot = isNode2() ? DX_DATA : "dxos/storage" } = config ?? {};
+  const { persistent = false, keyStore, dataStore } = config ?? {};
   if (persistent && dataStore === StorageDriver.RAM) {
     throw new InvalidConfigError("RAM storage cannot be used in persistent mode.");
   }
@@ -4921,7 +4936,7 @@ var createStorageObjects = (config) => {
   return {
     storage: createStorage({
       type: persistent ? toStorageType(dataStore) : StorageType.RAM,
-      root: `${dataRoot}/`
+      root: getRootPath(config)
     })
   };
 };
@@ -4946,16 +4961,27 @@ var toStorageType = (type) => {
   }
 };
 
+// packages/sdk/client-services/src/packlets/storage/level.ts
+import { Level } from "level";
+import path from "@dxos/node-std/path";
+import { PublicKey as PublicKey11 } from "@dxos/keys";
+var createLevel = async (config) => {
+  const persistent = isPersistent(config);
+  const storagePath = persistent ? getRootPath(config) : path.join("tmp", "level", PublicKey11.random().toHex());
+  const level = new Level(storagePath);
+  await level.open();
+  return level;
+};
+
 // packages/sdk/client-services/src/packlets/services/service-host.ts
-import { Event as Event9, sleep as sleep3, synchronized as synchronized3 } from "@dxos/async";
-import { clientServiceBundle, defaultKey, PropertiesSchema } from "@dxos/client-protocol";
+import { Event as Event9, synchronized as synchronized3 } from "@dxos/async";
+import { clientServiceBundle, defaultKey, Properties } from "@dxos/client-protocol";
 import { Context as Context11 } from "@dxos/context";
-import { DataServiceImpl } from "@dxos/echo-pipeline";
+import { DataServiceImpl, encodeReference } from "@dxos/echo-pipeline";
 import * as E from "@dxos/echo-schema";
-import { createRawObjectDoc } from "@dxos/echo-schema";
 import { IndexServiceImpl } from "@dxos/indexing";
 import { invariant as invariant16 } from "@dxos/invariant";
-import { PublicKey as PublicKey12 } from "@dxos/keys";
+import { PublicKey as PublicKey13 } from "@dxos/keys";
 import { log as log15 } from "@dxos/log";
 import { WebsocketSignalManager } from "@dxos/messaging";
 import { NetworkManager, createSimplePeerTransportFactory } from "@dxos/network-manager";
@@ -5050,7 +5076,7 @@ var DevicesServiceImpl = class {
 // packages/sdk/client-services/src/packlets/logging/logging-service.ts
 import { Event as Event8 } from "@dxos/async";
 import { Stream as Stream12 } from "@dxos/codec-protobuf";
-import { PublicKey as PublicKey11 } from "@dxos/keys";
+import { PublicKey as PublicKey12 } from "@dxos/keys";
 import { getContextFromEntry, log as log14 } from "@dxos/log";
 import { QueryLogsRequest } from "@dxos/protocols/proto/dxos/client/services";
 import { getDebugName, jsonify, numericalValues, tracer } from "@dxos/util";
@@ -5058,7 +5084,7 @@ var LoggingServiceImpl = class {
   constructor() {
     this._logs = new Event8();
     this._started = Date.now();
-    this._sessionId = PublicKey11.random().toHex();
+    this._sessionId = PublicKey12.random().toHex();
     this._logProcessor = (_config, entry2) => {
       this._logs.emit(entry2);
     };
@@ -5153,12 +5179,12 @@ var LoggingServiceImpl = class {
     });
   }
 };
-var matchFilter = (filter, level, path, options) => {
+var matchFilter = (filter, level, path2, options) => {
   switch (options) {
     case QueryLogsRequest.MatchingOptions.INCLUSIVE:
-      return level >= filter.level && (!filter.pattern || path.includes(filter.pattern));
+      return level >= filter.level && (!filter.pattern || path2.includes(filter.pattern));
     case 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) => {
@@ -5359,7 +5385,7 @@ var ClientServicesHost = class {
   initialize({ config, ...options }) {
     invariant16(!this._open, "service host is open", {
       F: __dxlog_file18,
-      L: 180,
+      L: 182,
       S: this,
       A: [
         "!this._open",
@@ -5368,14 +5394,14 @@ var ClientServicesHost = class {
     });
     log15("initializing...", void 0, {
       F: __dxlog_file18,
-      L: 181,
+      L: 183,
       S: this,
       C: (f, a) => f(...a)
     });
     if (config) {
       invariant16(!this._config, "config already set", {
         F: __dxlog_file18,
-        L: 184,
+        L: 186,
         S: this,
         A: [
           "!this._config",
@@ -5390,7 +5416,7 @@ var ClientServicesHost = class {
     if (!options.signalManager) {
       log15.warn("running signaling without telemetry metadata.", void 0, {
         F: __dxlog_file18,
-        L: 192,
+        L: 194,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -5401,7 +5427,7 @@ var ClientServicesHost = class {
     this._signalManager = signalManager;
     invariant16(!this._networkManager, "network manager already set", {
       F: __dxlog_file18,
-      L: 203,
+      L: 205,
       S: this,
       A: [
         "!this._networkManager",
@@ -5415,7 +5441,7 @@ var ClientServicesHost = class {
     });
     log15("initialized", void 0, {
       F: __dxlog_file18,
-      L: 210,
+      L: 212,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5424,18 +5450,18 @@ var ClientServicesHost = class {
     if (this._open) {
       return;
     }
-    const traceId = PublicKey12.random().toHex();
+    const traceId = PublicKey13.random().toHex();
     log15.trace("dxos.client-services.host.open", trace9.begin({
       id: traceId
     }), {
       F: __dxlog_file18,
-      L: 221,
+      L: 223,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant16(this._config, "config not set", {
       F: __dxlog_file18,
-      L: 223,
+      L: 225,
       S: this,
       A: [
         "this._config",
@@ -5444,7 +5470,7 @@ var ClientServicesHost = class {
     });
     invariant16(this._storage, "storage not set", {
       F: __dxlog_file18,
-      L: 224,
+      L: 226,
       S: this,
       A: [
         "this._storage",
@@ -5453,7 +5479,7 @@ var ClientServicesHost = class {
     });
     invariant16(this._signalManager, "signal manager not set", {
       F: __dxlog_file18,
-      L: 225,
+      L: 227,
       S: this,
       A: [
         "this._signalManager",
@@ -5462,7 +5488,7 @@ var ClientServicesHost = class {
     });
     invariant16(this._networkManager, "network manager not set", {
       F: __dxlog_file18,
-      L: 226,
+      L: 228,
       S: this,
       A: [
         "this._networkManager",
@@ -5474,13 +5500,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)),
@@ -5508,7 +5537,7 @@ var ClientServicesHost = class {
     await this._serviceContext.open(ctx);
     invariant16(this.serviceRegistry.services.InvitationsService, void 0, {
       F: __dxlog_file18,
-      L: 290,
+      L: 297,
       S: this,
       A: [
         "this.serviceRegistry.services.InvitationsService",
@@ -5520,7 +5549,7 @@ var ClientServicesHost = class {
       count: loadedInvitations.invitations?.length
     }, {
       F: __dxlog_file18,
-      L: 293,
+      L: 300,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5542,7 +5571,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file18,
-      L: 310,
+      L: 317,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5550,7 +5579,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file18,
-      L: 311,
+      L: 318,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5564,7 +5593,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file18,
-      L: 322,
+      L: 329,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5574,30 +5603,31 @@ var ClientServicesHost = class {
     });
     await this._loggingService.close();
     await this._serviceContext.close();
+    await this._level?.close();
     this._open = false;
     this._statusUpdate.emit();
     log15("closed", {
       deviceKey
     }, {
       F: __dxlog_file18,
-      L: 329,
+      L: 337,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async reset() {
-    const traceId = PublicKey12.random().toHex();
+    const traceId = PublicKey13.random().toHex();
     log15.trace("dxos.sdk.client-services-host.reset", trace9.begin({
       id: traceId
     }), {
       F: __dxlog_file18,
-      L: 334,
+      L: 342,
       S: this,
       C: (f, a) => f(...a)
     });
     log15("resetting...", void 0, {
       F: __dxlog_file18,
-      L: 336,
+      L: 344,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5605,7 +5635,7 @@ var ClientServicesHost = class {
     await this._storage.reset();
     log15("reset", void 0, {
       F: __dxlog_file18,
-      L: 339,
+      L: 347,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5613,7 +5643,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file18,
-      L: 340,
+      L: 348,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5626,7 +5656,7 @@ var ClientServicesHost = class {
     const automergeIndex = space.automergeSpaceState.rootUrl;
     invariant16(automergeIndex, void 0, {
       F: __dxlog_file18,
-      L: 352,
+      L: 360,
       S: this,
       A: [
         "automergeIndex",
@@ -5635,18 +5665,25 @@ var ClientServicesHost = class {
     });
     const document = await this._serviceContext.automergeHost.repo.find(automergeIndex);
     await document.whenReady();
-    const objectDocument = createRawObjectDoc({
-      [defaultKey]: identity.identityKey.toHex()
-    }, {
-      type: E.getTypeReference(PropertiesSchema)
-    });
+    const properties = {
+      system: {
+        type: encodeReference(E.getTypeReference(Properties))
+      },
+      data: {
+        [defaultKey]: identity.identityKey.toHex()
+      },
+      meta: {
+        keys: []
+      }
+    };
+    const propertiesId = PublicKey13.random().toHex();
     document.change((doc) => {
       assignDeep2(doc, [
         "objects",
-        objectDocument.id
-      ], objectDocument.handle.docSync());
+        propertiesId
+      ], properties);
     });
-    await sleep3(200);
+    await this._serviceContext.automergeHost.repo.flush();
     return identity;
   }
 };
@@ -5700,6 +5737,7 @@ export {
   Lock,
   isLocked,
   createStorageObjects,
+  createLevel,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-B4JZEXRB.mjs.map
+//# sourceMappingURL=chunk-V2ALN47T.mjs.map