@dxos/client-services 0.1.51 → 0.1.52-main.0e90c21

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

@@ -61,13 +61,13 @@ var createMockCredential = async ({ signer, issuer }) => (0, import_credentials.
 });
 
 // packages/sdk/client-services/src/packlets/testing/invitation-utils.ts
-var import_node_assert13 = __toESM(require("node:assert"));
-var import_async19 = require("@dxos/async");
+var import_node_assert14 = __toESM(require("node:assert"));
+var import_async18 = require("@dxos/async");
 var import_services13 = require("@dxos/protocols/proto/dxos/client/services");
 
 // packages/sdk/client-services/src/packlets/services/service-host.ts
-var import_node_assert12 = __toESM(require("node:assert"));
-var import_async18 = require("@dxos/async");
+var import_node_assert13 = __toESM(require("node:assert"));
+var import_async17 = require("@dxos/async");
 var import_client_protocol5 = require("@dxos/client-protocol");
 var import_echo_pipeline4 = require("@dxos/echo-pipeline");
 var import_keys12 = require("@dxos/keys");
@@ -2164,8 +2164,8 @@ var SpaceInvitationProtocol = class {
 };
 
 // packages/sdk/client-services/src/packlets/locks/node.ts
-var import_lockfile = __toESM(require("lockfile"));
-var import_async11 = require("@dxos/async");
+var import_node_assert9 = __toESM(require("node:assert"));
+var import_lock_file = require("@dxos/lock-file");
 var import_log8 = require("@dxos/log");
 var __decorate = function(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -2179,7 +2179,6 @@ var __decorate = function(decorators, target, key, desc) {
 };
 var Lock = class {
   constructor({ lockKey: lockPath, onAcquire, onRelease }) {
-    this._releaseTrigger = new import_async11.Trigger();
     this._lockPath = lockPath;
     this._onAcquire = onAcquire;
     this._onRelease = onRelease;
@@ -2191,29 +2190,24 @@ var Lock = class {
     var _a;
     (0, import_log8.log)("acquiring lock...", {}, {
       file: "node.ts",
-      line: 31,
+      line: 32,
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    if (import_lockfile.default.checkSync(this.lockKey)) {
-      throw new Error(`Lock already acquired: ${this._lockPath}`);
-    }
-    import_lockfile.default.lockSync(this._lockPath);
+    this._fileHandle = await import_lock_file.LockFile.acquire(this._lockPath);
     await ((_a = this._onAcquire) == null ? void 0 : _a.call(this));
     (0, import_log8.log)("acquired lock", {}, {
       file: "node.ts",
-      line: 39,
+      line: 37,
       scope: this,
       callSite: (f, a) => f(...a)
     });
   }
   async release() {
     var _a;
-    if (!import_lockfile.default.checkSync(this._lockPath)) {
-      throw new Error(`Lock already acquired: ${this._lockPath}`);
-    }
     await ((_a = this._onRelease) == null ? void 0 : _a.call(this));
-    import_lockfile.default.unlockSync(this._lockPath);
+    (0, import_node_assert9.default)(this._fileHandle, "Lock is not acquired");
+    await import_lock_file.LockFile.release(this._fileHandle);
   }
 };
 __decorate([
@@ -2221,14 +2215,14 @@ __decorate([
 ], Lock.prototype, "lockKey", null);
 
 // packages/sdk/client-services/src/packlets/logging/logging-service.ts
-var import_async12 = require("@dxos/async");
+var import_async11 = require("@dxos/async");
 var import_codec_protobuf10 = require("@dxos/codec-protobuf");
 var import_log9 = require("@dxos/log");
 var import_services7 = require("@dxos/protocols/proto/dxos/client/services");
 var import_util3 = require("@dxos/util");
 var LoggingServiceImpl = class {
   constructor() {
-    this._logs = new import_async12.Event();
+    this._logs = new import_async11.Event();
     this._logProcessor = (_config, entry2) => {
       this._logs.emit(entry2);
     };
@@ -2329,8 +2323,8 @@ var NetworkServiceImpl = class {
 };
 
 // packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts
-var import_node_assert10 = __toESM(require("node:assert"));
-var import_async15 = require("@dxos/async");
+var import_node_assert11 = __toESM(require("node:assert"));
+var import_async14 = require("@dxos/async");
 var import_context7 = require("@dxos/context");
 var import_credentials13 = require("@dxos/credentials");
 var import_keys10 = require("@dxos/keys");
@@ -2341,7 +2335,7 @@ var import_teleport_extension_gossip = require("@dxos/teleport-extension-gossip"
 var import_util6 = require("@dxos/util");
 
 // packages/sdk/client-services/src/packlets/spaces/data-space.ts
-var import_async14 = require("@dxos/async");
+var import_async13 = require("@dxos/async");
 var import_client_protocol3 = require("@dxos/client-protocol");
 var import_context6 = require("@dxos/context");
 var import_debug3 = require("@dxos/debug");
@@ -2355,8 +2349,8 @@ var import_timeframe = require("@dxos/timeframe");
 var import_util5 = require("@dxos/util");
 
 // packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts
-var import_node_assert9 = __toESM(require("node:assert"));
-var import_async13 = require("@dxos/async");
+var import_node_assert10 = __toESM(require("node:assert"));
+var import_async12 = require("@dxos/async");
 var import_context5 = require("@dxos/context");
 var import_keys8 = require("@dxos/keys");
 var import_log10 = require("@dxos/log");
@@ -2370,7 +2364,7 @@ var WRITER_NOT_SET_ERROR_CODE = "WRITER_NOT_SET";
 var NotarizationPlugin = class {
   constructor() {
     this._ctx = new import_context5.Context();
-    this._extensionOpened = new import_async13.Event();
+    this._extensionOpened = new import_async12.Event();
     this._extensions = /* @__PURE__ */ new Set();
     this._processedCredentials = new import_util4.ComplexSet(import_keys8.PublicKey.hash);
     this._processCredentialsTriggers = new import_util4.ComplexMap(import_keys8.PublicKey.hash);
@@ -2392,8 +2386,8 @@ var NotarizationPlugin = class {
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    (0, import_node_assert9.default)(credentials.every((credential) => credential.id), "Credentials must have an id");
-    const errors = new import_async13.Trigger();
+    (0, import_node_assert10.default)(credentials.every((credential) => credential.id), "Credentials must have an id");
+    const errors = new import_async12.Trigger();
     const ctx = this._ctx.derive({
       onError: (err) => {
         import_log10.log.warn("Notarization error", {
@@ -2410,7 +2404,7 @@ var NotarizationPlugin = class {
     });
     opCtx == null ? void 0 : opCtx.onDispose(() => ctx.dispose());
     if (timeout !== 0) {
-      (0, import_async13.scheduleTask)(ctx, () => {
+      (0, import_async12.scheduleTask)(ctx, () => {
         import_log10.log.warn("Notarization timeout", {
           timeout,
           peers: Array.from(this._extensions).map((extension) => extension.remotePeerId)
@@ -2421,12 +2415,12 @@ var NotarizationPlugin = class {
           callSite: (f, a) => f(...a)
         });
         void ctx.dispose();
-        errors.throw(new import_async13.TimeoutError(timeout, "Notarization timed out"));
+        errors.throw(new import_async12.TimeoutError(timeout, "Notarization timed out"));
       }, timeout);
     }
     const allNotarized = Promise.all(credentials.map((credential) => this._waitUntilProcessed(credential.id)));
     const peersTried = /* @__PURE__ */ new Set();
-    const notarizeTask = new import_async13.DeferredTask(ctx, async () => {
+    const notarizeTask = new import_async12.DeferredTask(ctx, async () => {
       try {
         if (this._extensions.size === 0) {
           return;
@@ -2444,7 +2438,7 @@ var NotarizationPlugin = class {
             callSite: (f, a) => f(...a)
           });
           peersTried.clear();
-          (0, import_async13.scheduleTask)(ctx, () => notarizeTask.schedule(), retryTimeout);
+          (0, import_async12.scheduleTask)(ctx, () => notarizeTask.schedule(), retryTimeout);
           return;
         }
         peersTried.add(peer);
@@ -2466,7 +2460,7 @@ var NotarizationPlugin = class {
           scope: this,
           callSite: (f, a) => f(...a)
         });
-        await (0, import_async13.sleep)(successDelay);
+        await (0, import_async12.sleep)(successDelay);
       } catch (err) {
         if (!ctx.disposed && !err.message.includes(WRITER_NOT_SET_ERROR_CODE)) {
           import_log10.log.warn("error notarizing (recoverable)", err, {
@@ -2510,14 +2504,14 @@ var NotarizationPlugin = class {
     this._processCredentialsTriggers.delete(credential.id);
   }
   setWriter(writer) {
-    (0, import_node_assert9.default)(!this._writer, "Writer already set.");
+    (0, import_node_assert10.default)(!this._writer, "Writer already set.");
     this._writer = writer;
   }
   async _waitUntilProcessed(id) {
     if (this._processedCredentials.has(id)) {
       return;
     }
-    await (0, import_util4.entry)(this._processCredentialsTriggers, id).orInsert(new import_async13.Trigger()).value.wait();
+    await (0, import_util4.entry)(this._processCredentialsTriggers, id).orInsert(new import_async12.Trigger()).value.wait();
   }
   /**
   * Requests from other peers to notarize credentials.
@@ -2528,7 +2522,7 @@ var NotarizationPlugin = class {
       throw new Error(WRITER_NOT_SET_ERROR_CODE);
     }
     for (const credential of (_a = request.credentials) != null ? _a : []) {
-      (0, import_node_assert9.default)(credential.id, "Credential must have an id");
+      (0, import_node_assert10.default)(credential.id, "Credential must have an id");
       if (this._processedCredentials.has(credential.id)) {
         continue;
       }
@@ -2615,7 +2609,7 @@ var DataSpace = class DataSpace2 {
     * Error for _state === SpaceState.ERROR.
     */
     this.error = void 0;
-    this.stateUpdate = new import_async14.Event();
+    this.stateUpdate = new import_async13.Event();
     this.metrics = {};
     var _a;
     this._inner = params.inner;
@@ -2686,7 +2680,7 @@ var DataSpace = class DataSpace2 {
   * Initialize the data pipeline in a separate task.
   */
   initializeDataPipelineAsync() {
-    (0, import_async14.scheduleTask)(this._ctx, async () => {
+    (0, import_async13.scheduleTask)(this._ctx, async () => {
       try {
         this.metrics.pipelineInitBegin = new Date();
         await this.initializeDataPipeline();
@@ -2839,7 +2833,7 @@ __decorate2([
   (0, import_debug3.timed)(1e4)
 ], DataSpace.prototype, "_createWritableFeeds", null);
 DataSpace = __decorate2([
-  (0, import_async14.trackLeaks)("open", "close")
+  (0, import_async13.trackLeaks)("open", "close")
 ], DataSpace);
 
 // packages/sdk/client-services/src/packlets/spaces/genesis.ts
@@ -2932,7 +2926,7 @@ var DataSpaceManager = class DataSpaceManager2 {
     this._signingContext = _signingContext;
     this._feedStore = _feedStore;
     this._ctx = new import_context7.Context();
-    this.updated = new import_async15.Event();
+    this.updated = new import_async14.Event();
     this._spaces = new import_util6.ComplexMap(import_keys10.PublicKey.hash);
     this._isOpen = false;
     this._instanceId = import_keys10.PublicKey.random().toHex();
@@ -3017,7 +3011,7 @@ var DataSpaceManager = class DataSpaceManager2 {
   * Creates a new space writing the genesis credentials to the control feed.
   */
   async createSpace() {
-    (0, import_node_assert10.default)(this._isOpen, "Not open.");
+    (0, import_node_assert11.default)(this._isOpen, "Not open.");
     const spaceKey = await this._keyring.createKey();
     const controlFeedKey = await this._keyring.createKey();
     const dataFeedKey = await this._keyring.createKey();
@@ -3039,7 +3033,7 @@ var DataSpaceManager = class DataSpaceManager2 {
     const credentials = await spaceGenesis(this._keyring, this._signingContext, space.inner);
     await this._metadataStore.addSpace(metadata);
     const memberCredential = credentials[1];
-    (0, import_node_assert10.default)((0, import_credentials13.getCredentialAssertion)(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember");
+    (0, import_node_assert11.default)((0, import_credentials13.getCredentialAssertion)(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember");
     await this._signingContext.recordCredential(memberCredential);
     await space.initializeDataPipeline();
     this.updated.emit();
@@ -3055,8 +3049,8 @@ var DataSpaceManager = class DataSpaceManager2 {
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    (0, import_node_assert10.default)(this._isOpen, "Not open.");
-    (0, import_node_assert10.default)(!this._spaces.has(opts.spaceKey), "Space already exists.");
+    (0, import_node_assert11.default)(this._isOpen, "Not open.");
+    (0, import_node_assert11.default)(!this._spaces.has(opts.spaceKey), "Space already exists.");
     const metadata = {
       key: opts.spaceKey,
       genesisFeedKey: opts.genesisFeedKey,
@@ -3179,23 +3173,23 @@ var DataSpaceManager = class DataSpaceManager2 {
   }
 };
 __decorate3([
-  import_async15.synchronized
+  import_async14.synchronized
 ], DataSpaceManager.prototype, "open", null);
 __decorate3([
-  import_async15.synchronized
+  import_async14.synchronized
 ], DataSpaceManager.prototype, "close", null);
 __decorate3([
-  import_async15.synchronized
+  import_async14.synchronized
 ], DataSpaceManager.prototype, "createSpace", null);
 __decorate3([
-  import_async15.synchronized
+  import_async14.synchronized
 ], DataSpaceManager.prototype, "acceptSpace", null);
 DataSpaceManager = __decorate3([
-  (0, import_async15.trackLeaks)("open", "close")
+  (0, import_async14.trackLeaks)("open", "close")
 ], DataSpaceManager);
 
 // packages/sdk/client-services/src/packlets/spaces/spaces-service.ts
-var import_async16 = require("@dxos/async");
+var import_async15 = require("@dxos/async");
 var import_codec_protobuf12 = require("@dxos/codec-protobuf");
 var import_debug5 = require("@dxos/debug");
 var import_echo_pipeline2 = require("@dxos/echo-pipeline");
@@ -3239,9 +3233,9 @@ var SpacesServiceImpl = class {
           spaces
         });
       };
-      (0, import_async16.scheduleTask)(ctx, async () => {
+      (0, import_async15.scheduleTask)(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
-        const subscriptions = new import_async16.EventSubscriptions();
+        const subscriptions = new import_async15.EventSubscriptions();
         ctx.onDispose(() => subscriptions.clear());
         const subscribeSpaces = () => {
           subscriptions.clear();
@@ -3277,7 +3271,7 @@ var SpacesServiceImpl = class {
   }
   subscribeMessages({ spaceKey, channel }) {
     return new import_codec_protobuf12.Stream(({ ctx, next }) => {
-      (0, import_async16.scheduleTask)(ctx, async () => {
+      (0, import_async15.scheduleTask)(ctx, async () => {
         var _a;
         const dataSpaceManager = await this._getDataSpaceManager();
         const space = (_a = dataSpaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug5.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
@@ -3298,7 +3292,7 @@ var SpacesServiceImpl = class {
         }
       });
       ctx.onDispose(() => processor.close());
-      (0, import_async16.scheduleTask)(ctx, () => processor.open());
+      (0, import_async15.scheduleTask)(ctx, () => processor.open());
     });
   }
   async writeCredentials({ spaceKey, credentials }) {
@@ -3445,8 +3439,8 @@ var SystemServiceImpl = class {
 };
 
 // packages/sdk/client-services/src/packlets/services/service-context.ts
-var import_node_assert11 = __toESM(require("node:assert"));
-var import_async17 = require("@dxos/async");
+var import_node_assert12 = __toESM(require("node:assert"));
+var import_async16 = require("@dxos/async");
 var import_credentials14 = require("@dxos/credentials");
 var import_debug6 = require("@dxos/debug");
 var import_echo_pipeline3 = require("@dxos/echo-pipeline");
@@ -3464,7 +3458,7 @@ var ServiceContext = class {
     this.networkManager = networkManager;
     this.signalManager = signalManager;
     this.modelFactory = modelFactory;
-    this.initialized = new import_async17.Trigger();
+    this.initialized = new import_async16.Trigger();
     this.dataServiceSubscriptions = new import_echo_pipeline3.DataServiceSubscriptions();
     this._handlerFactories = /* @__PURE__ */ new Map();
     this._instanceId = import_keys11.PublicKey.random().toHex();
@@ -3564,7 +3558,7 @@ var ServiceContext = class {
   }
   getInvitationHandler(invitation) {
     const factory = this._handlerFactories.get(invitation.kind);
-    (0, import_node_assert11.default)(factory, `Unknown invitation kind: ${invitation.kind}`);
+    (0, import_node_assert12.default)(factory, `Unknown invitation kind: ${invitation.kind}`);
     return factory(invitation);
   }
   async _acceptIdentity(params) {
@@ -3604,7 +3598,7 @@ var ServiceContext = class {
     this.dataSpaceManager = new DataSpaceManager(this.spaceManager, this.metadataStore, this.dataServiceSubscriptions, this.keyring, signingContext, this.feedStore);
     await this.dataSpaceManager.open();
     this._handlerFactories.set(import_services11.Invitation.Kind.SPACE, (invitation) => {
-      (0, import_node_assert11.default)(this.dataSpaceManager, "dataSpaceManager not initialized yet");
+      (0, import_node_assert12.default)(this.dataSpaceManager, "dataSpaceManager not initialized yet");
       return new SpaceInvitationProtocol(this.dataSpaceManager, signingContext, this.keyring, invitation.spaceKey);
     });
     this.initialized.wake();
@@ -3703,7 +3697,7 @@ var ClientServicesHost = class {
     // TODO(wittjosiah): Turn this on by default.
     lockKey
   } = {}) {
-    this._statusUpdate = new import_async18.Event();
+    this._statusUpdate = new import_async17.Event();
     this._opening = false;
     this._open = false;
     this._storage = storage;
@@ -3766,9 +3760,9 @@ var ClientServicesHost = class {
   */
   initialize({ config, ...options }) {
     var _a, _b, _c;
-    (0, import_node_assert12.default)(!this._open, "service host is open");
+    (0, import_node_assert13.default)(!this._open, "service host is open");
     if (config) {
-      (0, import_node_assert12.default)(!this._config, "config already set");
+      (0, import_node_assert13.default)(!this._config, "config already set");
       this._config = config;
       if (!this._storage) {
         this._storage = createStorageObjects(config.get("runtime.client.storage", {})).storage;
@@ -3778,7 +3772,7 @@ var ClientServicesHost = class {
       iceServers: (_a = this._config) == null ? void 0 : _a.get("runtime.services.ice")
     }), signalManager = new import_messaging.WebsocketSignalManager((_c = (_b = this._config) == null ? void 0 : _b.get("runtime.services.signaling")) != null ? _c : []) } = options;
     this._signalManager = signalManager;
-    (0, import_node_assert12.default)(!this._networkManager, "network manager already set");
+    (0, import_node_assert13.default)(!this._networkManager, "network manager already set");
     this._networkManager = new import_network_manager2.NetworkManager({
       log: connectionLog,
       transportFactory,
@@ -3799,10 +3793,10 @@ var ClientServicesHost = class {
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    (0, import_node_assert12.default)(this._config, "config not set");
-    (0, import_node_assert12.default)(this._storage, "storage not set");
-    (0, import_node_assert12.default)(this._signalManager, "signal manager not set");
-    (0, import_node_assert12.default)(this._networkManager, "network manager not set");
+    (0, import_node_assert13.default)(this._config, "config not set");
+    (0, import_node_assert13.default)(this._storage, "storage not set");
+    (0, import_node_assert13.default)(this._signalManager, "signal manager not set");
+    (0, import_node_assert13.default)(this._networkManager, "network manager not set");
     this._opening = true;
     (0, import_log15.log)("opening...", {
       lockKey: (_a = this._resourceLock) == null ? void 0 : _a.lockKey
@@ -3935,9 +3929,9 @@ var sanitizeInvitation = (invitation) => {
   };
 };
 var performInvitation = ({ host, guest, options, hooks }) => {
-  const hostComplete = new import_async19.Trigger();
-  const guestComplete = new import_async19.Trigger();
-  const authCode = new import_async19.Trigger();
+  const hostComplete = new import_async18.Trigger();
+  const guestComplete = new import_async18.Trigger();
+  const authCode = new import_async18.Trigger();
   const hostObservable = createInvitation(host, options);
   hostObservable.subscribe(async (hostInvitation) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
@@ -3954,7 +3948,7 @@ var performInvitation = ({ host, guest, options, hooks }) => {
               if ((_b2 = (_a2 = hooks == null ? void 0 : hooks.guest) == null ? void 0 : _a2.onConnecting) == null ? void 0 : _b2.call(_a2, guestObservable)) {
                 break;
               }
-              (0, import_node_assert13.default)(hostInvitation.swarmKey.equals(guestInvitation.swarmKey));
+              (0, import_node_assert14.default)(hostInvitation.swarmKey.equals(guestInvitation.swarmKey));
               break;
             }
             case import_services13.Invitation.State.CONNECTED: {