@dxos/client-services 0.1.53-main.304e2d2 → 0.1.53-main.3ab34c0

package/dist/lib/node/index.cjs

@@ -30,6 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // packages/sdk/client-services/src/index.ts
 var src_exports = {};
 __export(src_exports, {
+  ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   DataSpace: () => DataSpace,
   DataSpaceManager: () => DataSpaceManager,
@@ -420,6 +421,7 @@ var import_credentials = require("@dxos/credentials");
 var import_log = require("@dxos/log");
 var import_protocols = require("@dxos/protocols");
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/authenticator.ts";
+var Credential = import_protocols.schema.getCodecForType("dxos.halo.credentials.Credential");
 var createAuthProvider = (signer) => async (nonce) => {
   const credential = await signer.createCredential({
     assertion: {
@@ -428,7 +430,7 @@ var createAuthProvider = (signer) => async (nonce) => {
     subject: signer.getIssuer(),
     nonce
   });
-  return import_protocols.schema.getCodecForType("dxos.halo.credentials.Credential").encode(credential);
+  return Credential.encode(credential);
 };
 var TrustedKeySetAuthVerifier = class {
   // prettier-ignore
@@ -441,12 +443,12 @@ var TrustedKeySetAuthVerifier = class {
   }
   get verifier() {
     return async (nonce, auth) => {
-      const credential = import_protocols.schema.getCodecForType("dxos.halo.credentials.Credential").decode(auth);
+      const credential = Credential.decode(auth);
       (0, import_log.log)("authenticating...", {
         credential
       }, {
         F: __dxlog_file,
-        L: 57,
+        L: 59,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -456,7 +458,7 @@ var TrustedKeySetAuthVerifier = class {
           result
         }, {
           F: __dxlog_file,
-          L: 61,
+          L: 63,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -468,7 +470,7 @@ var TrustedKeySetAuthVerifier = class {
           credential
         }, {
           F: __dxlog_file,
-          L: 66,
+          L: 68,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -479,7 +481,7 @@ var TrustedKeySetAuthVerifier = class {
           key: credential.issuer
         }, {
           F: __dxlog_file,
-          L: 71,
+          L: 73,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -495,7 +497,7 @@ var TrustedKeySetAuthVerifier = class {
             key: credential.issuer
           }, {
             F: __dxlog_file,
-            L: 82,
+            L: 84,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -505,7 +507,7 @@ var TrustedKeySetAuthVerifier = class {
             key: credential.issuer
           }, {
             F: __dxlog_file,
-            L: 85,
+            L: 87,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2148,11 +2150,64 @@ var SpaceInvitationProtocol = class {
   }
 };
 
+// packages/sdk/client-services/src/packlets/services/client-rpc-server.ts
+var import_codec_protobuf9 = require("@dxos/codec-protobuf");
+var import_debug3 = require("@dxos/debug");
+var import_rpc = require("@dxos/rpc");
+var ClientRpcServer = class {
+  constructor(params) {
+    this._handlerCache = /* @__PURE__ */ new Map();
+    const { serviceRegistry, handleCall, handleStream, ...rpcOptions } = params;
+    this._handleCall = handleCall;
+    this._handleStream = handleStream;
+    this._serviceRegistry = serviceRegistry;
+    this._rpcPeer = new import_rpc.RpcPeer({
+      ...rpcOptions,
+      callHandler: (method, params2) => {
+        const [serviceName, methodName] = (0, import_rpc.parseMethodName)(method);
+        const handler = (method2, params3) => this._getServiceHandler(serviceName).call(method2, params3);
+        if (this._handleCall) {
+          return this._handleCall(methodName, params2, handler);
+        } else {
+          return handler(methodName, params2);
+        }
+      },
+      streamHandler: (method, params2) => {
+        const [serviceName, methodName] = (0, import_rpc.parseMethodName)(method);
+        const handler = (method2, params3) => this._getServiceHandler(serviceName).callStream(method2, params3);
+        if (this._handleStream) {
+          return import_codec_protobuf9.Stream.unwrapPromise(this._handleStream(methodName, params2, handler));
+        } else {
+          return handler(methodName, params2);
+        }
+      }
+    });
+  }
+  async open() {
+    await this._rpcPeer.open();
+  }
+  async close() {
+    await this._rpcPeer.close();
+  }
+  _getServiceHandler(serviceName) {
+    var _a;
+    if (!this._handlerCache.has(serviceName)) {
+      const [key, descriptor] = (_a = Object.entries(this._serviceRegistry.descriptors).find(([key2, descriptor2]) => descriptor2.name === serviceName)) != null ? _a : (0, import_debug3.raise)(new Error(`Service not available: ${serviceName}`));
+      const service = this._serviceRegistry.services[key];
+      if (!service) {
+        throw new Error(`Service not available: ${serviceName}`);
+      }
+      this._handlerCache.set(serviceName, descriptor.createServer(service));
+    }
+    return this._handlerCache.get(serviceName);
+  }
+};
+
 // packages/sdk/client-services/src/packlets/services/service-context.ts
 var import_tiny_invariant11 = __toESM(require("tiny-invariant"));
 var import_async14 = require("@dxos/async");
 var import_credentials13 = require("@dxos/credentials");
-var import_debug6 = require("@dxos/debug");
+var import_debug7 = require("@dxos/debug");
 var import_echo_pipeline3 = require("@dxos/echo-pipeline");
 var import_feed_store4 = require("@dxos/feed-store");
 var import_keyring = require("@dxos/keyring");
@@ -2178,7 +2233,7 @@ var import_util5 = require("@dxos/util");
 var import_async11 = require("@dxos/async");
 var import_client_protocol3 = require("@dxos/client-protocol");
 var import_context6 = require("@dxos/context");
-var import_debug3 = require("@dxos/debug");
+var import_debug4 = require("@dxos/debug");
 var import_echo_pipeline = require("@dxos/echo-pipeline");
 var import_errors3 = require("@dxos/errors");
 var import_keys8 = require("@dxos/keys");
@@ -2712,7 +2767,7 @@ _ts_decorate([
   import_async11.synchronized
 ], DataSpace.prototype, "close", null);
 _ts_decorate([
-  (0, import_debug3.timed)(1e4)
+  (0, import_debug4.timed)(1e4)
 ], DataSpace.prototype, "_createWritableFeeds", null);
 _ts_decorate([
   import_async11.synchronized
@@ -2726,7 +2781,7 @@ DataSpace = _ts_decorate([
 
 // packages/sdk/client-services/src/packlets/spaces/genesis.ts
 var import_credentials10 = require("@dxos/credentials");
-var import_debug4 = require("@dxos/debug");
+var import_debug5 = require("@dxos/debug");
 var import_credentials11 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_timeframe2 = require("@dxos/timeframe");
 var spaceGenesis = async (keyring, signingContext, space) => {
@@ -2750,11 +2805,11 @@ var spaceGenesis = async (keyring, signingContext, space) => {
         spaceKey: space.key,
         role: import_credentials11.SpaceMember.Role.ADMIN,
         profile: signingContext.profile,
-        genesisFeedKey: (_a = space.controlFeedKey) != null ? _a : (0, import_debug4.failUndefined)()
+        genesisFeedKey: (_a = space.controlFeedKey) != null ? _a : (0, import_debug5.failUndefined)()
       }
     }),
     await signingContext.credentialSigner.createCredential({
-      subject: (_b = space.controlFeedKey) != null ? _b : (0, import_debug4.failUndefined)(),
+      subject: (_b = space.controlFeedKey) != null ? _b : (0, import_debug5.failUndefined)(),
       assertion: {
         "@type": "dxos.halo.credentials.AdmittedFeed",
         spaceKey: space.key,
@@ -2764,7 +2819,7 @@ var spaceGenesis = async (keyring, signingContext, space) => {
       }
     }),
     await signingContext.credentialSigner.createCredential({
-      subject: (_c = space.dataFeedKey) != null ? _c : (0, import_debug4.failUndefined)(),
+      subject: (_c = space.dataFeedKey) != null ? _c : (0, import_debug5.failUndefined)(),
       assertion: {
         "@type": "dxos.halo.credentials.AdmittedFeed",
         spaceKey: space.key,
@@ -2774,7 +2829,7 @@ var spaceGenesis = async (keyring, signingContext, space) => {
       }
     }),
     await signingContext.credentialSigner.createCredential({
-      subject: (_d = space.key) != null ? _d : (0, import_debug4.failUndefined)(),
+      subject: (_d = space.key) != null ? _d : (0, import_debug5.failUndefined)(),
       assertion: {
         "@type": "dxos.halo.credentials.Epoch",
         number: 0,
@@ -3096,8 +3151,8 @@ DataSpaceManager = _ts_decorate2([
 
 // packages/sdk/client-services/src/packlets/spaces/spaces-service.ts
 var import_async13 = require("@dxos/async");
-var import_codec_protobuf9 = require("@dxos/codec-protobuf");
-var import_debug5 = require("@dxos/debug");
+var import_codec_protobuf10 = require("@dxos/codec-protobuf");
+var import_debug6 = require("@dxos/debug");
 var import_echo_pipeline2 = require("@dxos/echo-pipeline");
 var import_errors4 = require("@dxos/errors");
 var import_log11 = require("@dxos/log");
@@ -3123,7 +3178,7 @@ var SpacesServiceImpl = class {
   async updateSpace({ spaceKey, state }) {
     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));
+    const space = (_a = dataSpaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
     if (state) {
       switch (state) {
         case import_services8.SpaceState.ACTIVE:
@@ -3138,7 +3193,7 @@ var SpacesServiceImpl = class {
     }
   }
   querySpaces() {
-    return new import_codec_protobuf9.Stream(({ next, ctx }) => {
+    return new import_codec_protobuf10.Stream(({ next, ctx }) => {
       const scheduler = new import_async13.UpdateScheduler(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
         const spaces = Array.from(dataSpaceManager.spaces.values()).map((space) => this._serializeSpace(space));
@@ -3189,15 +3244,15 @@ var SpacesServiceImpl = class {
   async postMessage({ spaceKey, channel, message }) {
     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));
+    const space = (_a = dataSpaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
     await space.postMessage(getChannelId(channel), message);
   }
   subscribeMessages({ spaceKey, channel }) {
-    return new import_codec_protobuf9.Stream(({ ctx, next }) => {
+    return new import_codec_protobuf10.Stream(({ ctx, next }) => {
       (0, import_async13.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));
+        const space = (_a = dataSpaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
         const handle = space.listen(getChannelId(channel), (message) => {
           next(message);
         });
@@ -3206,9 +3261,9 @@ var SpacesServiceImpl = class {
     });
   }
   queryCredentials({ spaceKey }) {
-    return new import_codec_protobuf9.Stream(({ ctx, next }) => {
+    return new import_codec_protobuf10.Stream(({ ctx, next }) => {
       var _a;
-      const space = (_a = this._spaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug5.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
+      const space = (_a = this._spaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
       const processor = {
         processCredential: async (credential) => {
           next(credential);
@@ -3220,7 +3275,7 @@ var SpacesServiceImpl = class {
   }
   async writeCredentials({ spaceKey, credentials }) {
     var _a;
-    const space = (_a = this._spaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug5.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
+    const space = (_a = this._spaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
     for (const credential of credentials != null ? credentials : []) {
       await space.controlPipeline.writer.write({
         credential: {
@@ -3232,7 +3287,7 @@ var SpacesServiceImpl = class {
   async createEpoch({ spaceKey }) {
     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));
+    const space = (_a = dataSpaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
     await space.createEpoch();
   }
   _serializeSpace(space) {
@@ -3312,7 +3367,7 @@ var ServiceContext = class {
     this.invitations = new InvitationsHandler(this.networkManager);
     this._handlerFactories.set(import_services9.Invitation.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => {
       var _a;
-      return (_a = this.identityManager.identity) != null ? _a : (0, import_debug6.failUndefined)();
+      return (_a = this.identityManager.identity) != null ? _a : (0, import_debug7.failUndefined)();
     }, this._acceptIdentity.bind(this)));
   }
   async open() {
@@ -3408,7 +3463,7 @@ var ServiceContext = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    const identity = (_a = this.identityManager.identity) != null ? _a : (0, import_debug6.failUndefined)();
+    const identity = (_a = this.identityManager.identity) != null ? _a : (0, import_debug7.failUndefined)();
     const signingContext = {
       credentialSigner: identity.getIdentityCredentialSigner(),
       identityKey: identity.identityKey,
@@ -3504,7 +3559,7 @@ var import_text_model = require("@dxos/text-model");
 
 // packages/sdk/client-services/src/packlets/devices/devices-service.ts
 var import_async15 = require("@dxos/async");
-var import_codec_protobuf10 = require("@dxos/codec-protobuf");
+var import_codec_protobuf11 = require("@dxos/codec-protobuf");
 var import_services10 = require("@dxos/protocols/proto/dxos/client/services");
 var DevicesServiceImpl = class {
   constructor(_identityManager) {
@@ -3514,7 +3569,7 @@ var DevicesServiceImpl = class {
     throw new Error("Method not implemented.");
   }
   queryDevices() {
-    return new import_codec_protobuf10.Stream(({ next }) => {
+    return new import_codec_protobuf11.Stream(({ next }) => {
       const update = () => {
         var _a;
         const deviceKeys = (_a = this._identityManager.identity) == null ? void 0 : _a.authorizedDeviceKeys;
@@ -3604,7 +3659,7 @@ var isLocked = (lockPath) => import_lock_file.LockFile.isLocked(lockPath);
 
 // packages/sdk/client-services/src/packlets/logging/logging-service.ts
 var import_async16 = require("@dxos/async");
-var import_codec_protobuf11 = require("@dxos/codec-protobuf");
+var import_codec_protobuf12 = require("@dxos/codec-protobuf");
 var import_log14 = require("@dxos/log");
 var import_services11 = require("@dxos/protocols/proto/dxos/client/services");
 var import_util7 = require("@dxos/util");
@@ -3623,7 +3678,7 @@ var LoggingServiceImpl = class {
     import_log14.log.runtimeConfig.processors.splice(index, 1);
   }
   queryLogs(request) {
-    return new import_codec_protobuf11.Stream(({ ctx, next }) => {
+    return new import_codec_protobuf12.Stream(({ ctx, next }) => {
       const handler = (entry2) => {
         var _a, _b, _c, _d, _e;
         if (LOG_PROCESSING > 0) {
@@ -3679,14 +3734,14 @@ var shouldLog = (entry2, request) => {
 var LOG_PROCESSING = 0;
 
 // packages/sdk/client-services/src/packlets/network/network-service.ts
-var import_codec_protobuf12 = require("@dxos/codec-protobuf");
+var import_codec_protobuf13 = require("@dxos/codec-protobuf");
 var NetworkServiceImpl = class {
   constructor(networkManager, signalManager) {
     this.networkManager = networkManager;
     this.signalManager = signalManager;
   }
   queryStatus() {
-    return new import_codec_protobuf12.Stream(({ next }) => {
+    return new import_codec_protobuf13.Stream(({ next }) => {
       const update = () => {
         next({
           swarm: this.networkManager.connectionState,
@@ -3760,7 +3815,7 @@ var toStorageType = (type) => {
 };
 
 // packages/sdk/client-services/src/packlets/system/system-service.ts
-var import_codec_protobuf13 = require("@dxos/codec-protobuf");
+var import_codec_protobuf14 = require("@dxos/codec-protobuf");
 var SystemServiceImpl = class {
   constructor({ config, statusUpdate, onUpdateStatus, getCurrentStatus, onReset }) {
     this._config = config;
@@ -3777,7 +3832,7 @@ var SystemServiceImpl = class {
     await this._onUpdateStatus(status);
   }
   queryStatus() {
-    return new import_codec_protobuf13.Stream(({ next }) => {
+    return new import_codec_protobuf14.Stream(({ next }) => {
       const update = () => {
         next({
           status: this._getCurrentStatus()
@@ -4084,59 +4139,6 @@ var import_messaging2 = require("@dxos/messaging");
 var import_network_manager3 = require("@dxos/network-manager");
 var import_util9 = require("@dxos/util");
 
-// packages/sdk/client-services/src/packlets/services/client-rpc-server.ts
-var import_codec_protobuf14 = require("@dxos/codec-protobuf");
-var import_debug7 = require("@dxos/debug");
-var import_rpc = require("@dxos/rpc");
-var ClientRpcServer = class {
-  constructor(params) {
-    this._handlerCache = /* @__PURE__ */ new Map();
-    const { serviceRegistry, handleCall, handleStream, ...rpcOptions } = params;
-    this._handleCall = handleCall;
-    this._handleStream = handleStream;
-    this._serviceRegistry = serviceRegistry;
-    this._rpcPeer = new import_rpc.RpcPeer({
-      ...rpcOptions,
-      callHandler: (method, params2) => {
-        const [serviceName, methodName] = (0, import_rpc.parseMethodName)(method);
-        const handler = (method2, params3) => this._getServiceHandler(serviceName).call(method2, params3);
-        if (this._handleCall) {
-          return this._handleCall(methodName, params2, handler);
-        } else {
-          return handler(methodName, params2);
-        }
-      },
-      streamHandler: (method, params2) => {
-        const [serviceName, methodName] = (0, import_rpc.parseMethodName)(method);
-        const handler = (method2, params3) => this._getServiceHandler(serviceName).callStream(method2, params3);
-        if (this._handleStream) {
-          return import_codec_protobuf14.Stream.unwrapPromise(this._handleStream(methodName, params2, handler));
-        } else {
-          return handler(methodName, params2);
-        }
-      }
-    });
-  }
-  async open() {
-    await this._rpcPeer.open();
-  }
-  async close() {
-    await this._rpcPeer.close();
-  }
-  _getServiceHandler(serviceName) {
-    var _a;
-    if (!this._handlerCache.has(serviceName)) {
-      const [key, descriptor] = (_a = Object.entries(this._serviceRegistry.descriptors).find(([key2, descriptor2]) => descriptor2.name === serviceName)) != null ? _a : (0, import_debug7.raise)(new Error(`Service not available: ${serviceName}`));
-      const service = this._serviceRegistry.services[key];
-      if (!service) {
-        throw new Error(`Service not available: ${serviceName}`);
-      }
-      this._handlerCache.set(serviceName, descriptor.createServer(service));
-    }
-    return this._handlerCache.get(serviceName);
-  }
-};
-
 // packages/sdk/client-services/src/packlets/vault/shell-runtime.ts
 var import_tiny_invariant14 = __toESM(require("tiny-invariant"));
 var import_async18 = require("@dxos/async");
@@ -4471,7 +4473,7 @@ var WorkerSession = class {
               } catch (err) {
                 import_log18.log.catch(err, void 0, {
                   F: __dxlog_file17,
-                  L: 100,
+                  L: 99,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -4486,9 +4488,9 @@ var WorkerSession = class {
     this.bridgeService = this._iframeRpc.rpc.BridgeService;
   }
   async open() {
-    import_log18.log.info("opening..", void 0, {
+    import_log18.log.info("opening...", void 0, {
       F: __dxlog_file17,
-      L: 114,
+      L: 113,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4503,9 +4505,15 @@ var WorkerSession = class {
     if (this.lockKey) {
       void this._afterLockReleases(this.lockKey, () => this.close());
     }
+    import_log18.log.info("opened", void 0, {
+      F: __dxlog_file17,
+      L: 120,
+      S: this,
+      C: (f, a) => f(...a)
+    });
   }
   async close() {
-    import_log18.log.info("closing..", void 0, {
+    import_log18.log.info("closing...", void 0, {
       F: __dxlog_file17,
       L: 124,
       S: this,
@@ -4525,6 +4533,12 @@ var WorkerSession = class {
       this._clientRpc.close(),
       this._iframeRpc.close()
     ]);
+    import_log18.log.info("closed", void 0, {
+      F: __dxlog_file17,
+      L: 132,
+      S: this,
+      C: (f, a) => f(...a)
+    });
   }
   async _maybeOpenShell() {
     try {
@@ -4532,7 +4546,7 @@ var WorkerSession = class {
     } catch (e) {
       import_log18.log.info("No shell connected.", void 0, {
         F: __dxlog_file17,
-        L: 138,
+        L: 139,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -4653,6 +4667,7 @@ var WorkerRuntime = class {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  ClientRpcServer,
   ClientServicesHost,
   DataSpace,
   DataSpaceManager,