@dxos/client-services 0.1.29-next.ed4ce05 → 0.1.29

package/dist/lib/node/index.cjs

@@ -1924,8 +1924,8 @@ var SpaceInvitationsServiceImpl = class extends AbstractInvitationsService {
 // packages/sdk/client-services/src/packlets/services/service-host.ts
 var import_node_assert12 = __toESM(require("node:assert"));
 var import_async19 = require("@dxos/async");
-var import_client7 = require("@dxos/client");
-var import_debug6 = require("@dxos/debug");
+var import_client6 = require("@dxos/client");
+var import_debug7 = require("@dxos/debug");
 var import_echo_pipeline5 = require("@dxos/echo-pipeline");
 var import_log15 = require("@dxos/log");
 var import_services8 = require("@dxos/protocols/proto/dxos/client/services");
@@ -2757,7 +2757,8 @@ var SystemServiceImpl = class {
     this._onReset = onReset;
   }
   async getConfig() {
-    return this._config.values;
+    var _a, _b;
+    return (_b = (_a = this._config) == null ? void 0 : _a.values) != null ? _b : {};
   }
   async updateStatus({ status }) {
     await this._onUpdateStatus(status);
@@ -2785,19 +2786,70 @@ var SystemServiceImpl = class {
 
 // packages/sdk/client-services/src/packlets/vault/iframe-host-runtime.ts
 var import_async14 = require("@dxos/async");
-var import_client4 = require("@dxos/client");
 var import_log10 = require("@dxos/log");
 var import_messaging = require("@dxos/messaging");
 var import_network_manager3 = require("@dxos/network-manager");
-var import_rpc2 = require("@dxos/rpc");
 var import_util7 = require("@dxos/util");
 
+// packages/sdk/client-services/src/packlets/services/client-rpc-server.ts
+var import_codec_protobuf12 = require("@dxos/codec-protobuf");
+var import_debug5 = 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_protobuf12.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_debug5.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_node_assert10 = __toESM(require("node:assert"));
 var import_async13 = require("@dxos/async");
 var import_client3 = require("@dxos/client");
 var import_iframe = require("@dxos/protocols/proto/dxos/iframe");
-var import_rpc = require("@dxos/rpc");
+var import_rpc2 = require("@dxos/rpc");
 var ShellRuntimeImpl = class {
   constructor(_port) {
     this._port = _port;
@@ -2827,7 +2879,7 @@ var ShellRuntimeImpl = class {
     await this._appRpc.rpc.AppService.setContext(context);
   }
   async open() {
-    this._appRpc = (0, import_rpc.createProtoRpcPeer)({
+    this._appRpc = (0, import_rpc2.createProtoRpcPeer)({
       requested: import_client3.appServiceBundle,
       exposed: import_client3.shellServiceBundle,
       handlers: {
@@ -2900,17 +2952,6 @@ var IFrameHostRuntime = class {
     this._configProvider = configProvider;
     this._appPort = appPort;
     this._shellPort = shellPort;
-    this._getService = async (find) => {
-      const error = await this._ready.wait();
-      if (error) {
-        throw error;
-      }
-      const service = await find(this._clientServices.services);
-      if (!service) {
-        throw new Error("Service not found");
-      }
-      return service;
-    };
     if (this._shellPort) {
       this._shellRuntime = new ShellRuntimeImpl(this._shellPort);
     }
@@ -2925,7 +2966,7 @@ var IFrameHostRuntime = class {
     var _a;
     (0, import_log10.log)("starting...", {}, {
       file: "iframe-host-runtime.ts",
-      line: 84,
+      line: 67,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -2943,21 +2984,30 @@ var IFrameHostRuntime = class {
           transportFactory: this._transportFactory
         })
       });
-      this._clientRpc = (0, import_rpc2.createProtoRpcPeer)({
-        exposed: import_client4.clientServiceBundle,
-        handlers: {
-          DataService: async () => await this._getService((services) => services.DataService),
-          DeviceInvitationsService: async () => await this._getService((services) => services.DeviceInvitationsService),
-          DevicesService: async () => await this._getService((services) => services.DevicesService),
-          DevtoolsHost: async () => await this._getService((services) => services.DevtoolsHost),
-          NetworkService: async () => await this._getService((services) => services.NetworkService),
-          IdentityService: async () => await this._getService((services) => services.IdentityService),
-          SpaceInvitationsService: async () => await this._getService((services) => services.SpaceInvitationsService),
-          SpacesService: async () => await this._getService((services) => services.SpacesService),
-          SystemService: async () => await this._getService((services) => services.SystemService),
-          TracingService: async () => await this._getService((services) => services.TracingService)
+      const middleware = {
+        handleCall: async (method, params, handler) => {
+          const error = await this._ready.wait({
+            timeout: 3e3
+          });
+          if (error) {
+            throw error;
+          }
+          return handler(method, params);
         },
-        port: this._appPort
+        handleStream: async (method, params, handler) => {
+          const error = await this._ready.wait({
+            timeout: 3e3
+          });
+          if (error) {
+            throw error;
+          }
+          return handler(method, params);
+        }
+      };
+      this._clientRpc = new ClientRpcServer({
+        serviceRegistry: this._clientServices.host.serviceRegistry,
+        port: this._appPort,
+        ...middleware
       });
       await Promise.all([
         this._clientServices.open(),
@@ -2967,7 +3017,7 @@ var IFrameHostRuntime = class {
       this._ready.wake(void 0);
       (0, import_log10.log)("started", {}, {
         file: "iframe-host-runtime.ts",
-        line: 119,
+        line: 110,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -2975,7 +3025,7 @@ var IFrameHostRuntime = class {
       this._ready.wake(err);
       import_log10.log.catch(err, {}, {
         file: "iframe-host-runtime.ts",
-        line: 122,
+        line: 113,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -2985,7 +3035,7 @@ var IFrameHostRuntime = class {
     var _a;
     (0, import_log10.log)("stopping...", {}, {
       file: "iframe-host-runtime.ts",
-      line: 127,
+      line: 118,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -2994,7 +3044,7 @@ var IFrameHostRuntime = class {
     await ((_a = this._shellRuntime) == null ? void 0 : _a.close());
     (0, import_log10.log)("stopped", {}, {
       file: "iframe-host-runtime.ts",
-      line: 131,
+      line: 122,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3005,7 +3055,7 @@ __decorate3([
 ], IFrameHostRuntime.prototype, "origin", void 0);
 
 // packages/sdk/client-services/src/packlets/vault/iframe-proxy-runtime.ts
-var import_client5 = require("@dxos/client");
+var import_client4 = require("@dxos/client");
 var import_network_manager4 = require("@dxos/network-manager");
 var import_rpc3 = require("@dxos/rpc");
 var IFrameProxyRuntime = class {
@@ -3016,8 +3066,8 @@ var IFrameProxyRuntime = class {
     this._workerAppPort = workerAppPort;
     this._shellPort = shellPort;
     this._systemRpc = (0, import_rpc3.createProtoRpcPeer)({
-      requested: import_client5.workerServiceBundle,
-      exposed: import_client5.iframeServiceBundle,
+      requested: import_client4.workerServiceBundle,
+      exposed: import_client4.iframeServiceBundle,
       handlers: {
         BridgeService: this._transportService,
         IframeService: {
@@ -3143,7 +3193,7 @@ var import_network_manager5 = require("@dxos/network-manager");
 // packages/sdk/client-services/src/packlets/vault/worker-session.ts
 var import_node_assert11 = __toESM(require("node:assert"));
 var import_async16 = require("@dxos/async");
-var import_client6 = require("@dxos/client");
+var import_client5 = require("@dxos/client");
 var import_log12 = require("@dxos/log");
 var import_rpc4 = require("@dxos/rpc");
 var import_util8 = require("@dxos/util");
@@ -3158,40 +3208,48 @@ var __decorate4 = function(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 var WorkerSession = class {
-  constructor({ getService, systemPort, appPort, shellPort, options = {
+  constructor({ serviceHost, systemPort, appPort, shellPort, readySignal, options = {
     heartbeatInterval: 1e3
   } }) {
     this._startTrigger = new import_async16.Trigger();
     this.onClose = new import_util8.Callback();
     (0, import_node_assert11.default)(options);
-    (0, import_node_assert11.default)(getService);
+    (0, import_node_assert11.default)(serviceHost);
     this._options = options;
-    this._getService = getService;
-    const handlers = {
-      DataService: () => this._getService((services) => services.DataService),
-      DeviceInvitationsService: () => this._getService((services) => services.DeviceInvitationsService),
-      DevicesService: () => this._getService((services) => services.DevicesService),
-      DevtoolsHost: () => this._getService((services) => services.DevtoolsHost),
-      NetworkService: () => this._getService((services) => services.NetworkService),
-      IdentityService: () => this._getService((services) => services.IdentityService),
-      SpaceInvitationsService: () => this._getService((services) => services.SpaceInvitationsService),
-      SpacesService: () => this._getService((services) => services.SpacesService),
-      SystemService: () => this._getService((services) => services.SystemService),
-      TracingService: () => this._getService((services) => services.TracingService)
+    this._serviceHost = serviceHost;
+    const middleware = {
+      handleCall: async (method, params, handler) => {
+        const error = await readySignal.wait({
+          timeout: 3e3
+        });
+        if (error) {
+          throw error;
+        }
+        return handler(method, params);
+      },
+      handleStream: async (method, params, handler) => {
+        const error = await readySignal.wait({
+          timeout: 3e3
+        });
+        if (error) {
+          throw error;
+        }
+        return handler(method, params);
+      }
     };
-    this._clientRpc = (0, import_rpc4.createProtoRpcPeer)({
-      exposed: import_client6.clientServiceBundle,
-      handlers,
-      port: appPort
+    this._clientRpc = new ClientRpcServer({
+      serviceRegistry: this._serviceHost.serviceRegistry,
+      port: appPort,
+      ...middleware
     });
-    this._shellClientRpc = (0, import_rpc4.createProtoRpcPeer)({
-      exposed: import_client6.clientServiceBundle,
-      handlers,
-      port: shellPort
+    this._shellClientRpc = new ClientRpcServer({
+      serviceRegistry: this._serviceHost.serviceRegistry,
+      port: shellPort,
+      ...middleware
     });
     this._iframeRpc = (0, import_rpc4.createProtoRpcPeer)({
-      requested: import_client6.iframeServiceBundle,
-      exposed: import_client6.workerServiceBundle,
+      requested: import_client5.iframeServiceBundle,
+      exposed: import_client5.workerServiceBundle,
       handlers: {
         WorkerService: {
           start: async (request) => {
@@ -3205,7 +3263,7 @@ var WorkerSession = class {
               } catch (err) {
                 import_log12.log.catch(err, {}, {
                   file: "worker-session.ts",
-                  line: 95,
+                  line: 107,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
@@ -3223,7 +3281,7 @@ var WorkerSession = class {
   async open() {
     import_log12.log.info("opening..", {}, {
       file: "worker-session.ts",
-      line: 109,
+      line: 121,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3243,7 +3301,7 @@ var WorkerSession = class {
           err: err1
         }, {
           file: "worker-session.ts",
-          line: 121,
+          line: 133,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -3252,7 +3310,7 @@ var WorkerSession = class {
         } catch (err) {
           import_log12.log.catch(err, {}, {
             file: "worker-session.ts",
-            line: 125,
+            line: 137,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -3263,7 +3321,7 @@ var WorkerSession = class {
   async close() {
     import_log12.log.info("closing..", {}, {
       file: "worker-session.ts",
-      line: 132,
+      line: 144,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3272,7 +3330,7 @@ var WorkerSession = class {
     } catch (err) {
       import_log12.log.catch(err, {}, {
         file: "worker-session.ts",
-        line: 136,
+        line: 148,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -3291,7 +3349,7 @@ var WorkerSession = class {
     } catch (e) {
       import_log12.log.info("No shell connected.", {}, {
         file: "worker-session.ts",
-        line: 150,
+        line: 162,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -3310,18 +3368,19 @@ var WorkerRuntime = class {
     this._transportFactory = new import_network_manager5.WebRTCTransportProxyFactory();
     this._ready = new import_async17.Trigger();
     this.sessions = /* @__PURE__ */ new Set();
+    this._clientServices = new ClientServicesHost();
   }
   async start() {
     (0, import_log13.log)("starting...", {}, {
       file: "worker-runtime.ts",
-      line: 42,
+      line: 44,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     try {
       this._config = await this._configProvider();
       const signalServer = this._config.get("runtime.services.signal.server");
-      this._clientServices = new ClientServicesHost({
+      this._clientServices.initialize({
         config: this._config,
         networkManager: new import_network_manager5.NetworkManager({
           log: true,
@@ -3335,7 +3394,7 @@ var WorkerRuntime = class {
       this._ready.wake(void 0);
       (0, import_log13.log)("started", {}, {
         file: "worker-runtime.ts",
-        line: 59,
+        line: 61,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -3343,7 +3402,7 @@ var WorkerRuntime = class {
       this._ready.wake(err);
       import_log13.log.catch(err, {}, {
         file: "worker-runtime.ts",
-        line: 62,
+        line: 64,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -3357,17 +3416,7 @@ var WorkerRuntime = class {
   */
   async createSession({ appPort, systemPort, shellPort }) {
     const session = new WorkerSession({
-      getService: async (find) => {
-        const error = await this._ready.wait();
-        if (error) {
-          throw error;
-        }
-        const service = find(this._clientServices.services);
-        if (!service) {
-          throw new Error("Service not found");
-        }
-        return service;
-      },
+      serviceHost: this._clientServices,
       appPort,
       systemPort,
       shellPort,
@@ -3405,7 +3454,7 @@ var WorkerRuntime = class {
 // packages/sdk/client-services/src/packlets/services/service-context.ts
 var import_async18 = require("@dxos/async");
 var import_credentials11 = require("@dxos/credentials");
-var import_debug5 = require("@dxos/debug");
+var import_debug6 = require("@dxos/debug");
 var import_echo_pipeline4 = require("@dxos/echo-pipeline");
 var import_feed_store4 = require("@dxos/feed-store");
 var import_keyring = require("@dxos/keyring");
@@ -3439,7 +3488,7 @@ var ServiceContext = class {
       networkManager: this.networkManager,
       getIdentity: () => {
         var _a;
-        return (_a = this.identityManager.identity) != null ? _a : (0, import_debug5.failUndefined)();
+        return (_a = this.identityManager.identity) != null ? _a : (0, import_debug6.failUndefined)();
       },
       acceptIdentity: this._acceptIdentity.bind(this),
       keyring: this.keyring
@@ -3522,7 +3571,7 @@ var ServiceContext = class {
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    const identity = (_a = this.identityManager.identity) != null ? _a : (0, import_debug5.failUndefined)();
+    const identity = (_a = this.identityManager.identity) != null ? _a : (0, import_debug6.failUndefined)();
     const signingContext = {
       credentialSigner: identity.getIdentityCredentialSigner(),
       identityKey: identity.identityKey,
@@ -3601,7 +3650,7 @@ var ServiceContext = class {
 // packages/sdk/client-services/src/packlets/services/service-registry.ts
 var ServiceRegistry = class {
   // prettier-ignore
-  constructor(_serviceBundle, _handlers) {
+  constructor(_serviceBundle, _handlers = {}) {
     this._serviceBundle = _serviceBundle;
     this._handlers = _handlers;
   }
@@ -3614,25 +3663,35 @@ var ServiceRegistry = class {
   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
 var ClientServicesHost = class {
   constructor({
     config,
-    modelFactory = (0, import_client7.createDefaultModelFactory)(),
+    modelFactory = (0, import_client6.createDefaultModelFactory)(),
     // TODO(burdon): Create ApolloLink abstraction (see Client).
     networkManager,
-    storage = createStorageObjects(config.get("runtime.client.storage", {})).storage,
+    storage,
     // TODO(wittjosiah): Turn this on by default.
     lockKey
-  }) {
+  } = {}) {
     this._statusUpdate = new import_async19.Event();
     this._open = false;
-    this._config = config;
-    this._modelFactory = modelFactory;
-    this._networkManager = networkManager;
     this._storage = storage;
+    this._modelFactory = modelFactory;
+    if (config) {
+      this.initialize({
+        config,
+        networkManager
+      });
+    }
     this._resourceLock = lockKey ? new VaultResourceLock({
       lockKey,
       onAcquire: () => this.open(),
@@ -3655,27 +3714,52 @@ var ClientServicesHost = class {
         await this._serviceContext.reset();
       }
     });
-    this._serviceRegistry = new ServiceRegistry(import_client7.clientServiceBundle, {
+    this._serviceRegistry = new ServiceRegistry(import_client6.clientServiceBundle, {
       SystemService: this._systemService
     });
   }
   get isOpen() {
     return this._open;
   }
+  get serviceRegistry() {
+    return this._serviceRegistry;
+  }
   get descriptors() {
     return this._serviceRegistry.descriptors;
   }
   get services() {
     return this._serviceRegistry.services;
   }
+  /**
+  * Initialize the service host with the config.
+  * Config can also be provided in the constructor.
+  * Can only be called once.
+  */
+  initialize({ config, networkManager }) {
+    (0, import_node_assert12.default)(!this._open, "service host is open");
+    if (config) {
+      (0, import_node_assert12.default)(!this._config, "config already set");
+      this._config = config;
+      if (!this._storage) {
+        this._storage = createStorageObjects(config.get("runtime.client.storage", {})).storage;
+      }
+    }
+    if (networkManager) {
+      (0, import_node_assert12.default)(!this._networkManager, "network manager already set");
+      this._networkManager = networkManager;
+    }
+  }
   async open() {
     var _a, _b;
     if (this._open) {
       return;
     }
+    (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._networkManager, "network manager not set");
     (0, import_log15.log)("opening...", {}, {
       file: "service-host.ts",
-      line: 125,
+      line: 166,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3688,10 +3772,10 @@ var ClientServicesHost = class {
       DeviceInvitationsService: new DeviceInvitationsServiceImpl(this._serviceContext.identityManager, this._serviceContext.deviceInvitations),
       SpaceInvitationsService: new SpaceInvitationsServiceImpl(this._serviceContext.identityManager, () => {
         var _a2;
-        return (_a2 = this._serviceContext.spaceInvitations) != null ? _a2 : (0, import_debug6.raise)(new Error("SpaceInvitations not initialized"));
+        return (_a2 = this._serviceContext.spaceInvitations) != null ? _a2 : (0, import_debug7.raise)(new Error("SpaceInvitations not initialized"));
       }, () => {
         var _a2;
-        return (_a2 = this._serviceContext.dataSpaceManager) != null ? _a2 : (0, import_debug6.raise)(new Error("SpaceManager not initialized"));
+        return (_a2 = this._serviceContext.dataSpaceManager) != null ? _a2 : (0, import_debug7.raise)(new Error("SpaceManager not initialized"));
       }),
       SpacesService: new SpacesServiceImpl(this._serviceContext.identityManager, this._serviceContext.spaceManager, this._serviceContext.dataServiceSubscriptions, async () => {
         await this._serviceContext.initialized.wait();
@@ -3715,7 +3799,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       file: "service-host.ts",
-      line: 178,
+      line: 219,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3730,7 +3814,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       file: "service-host.ts",
-      line: 187,
+      line: 228,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3744,7 +3828,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       file: "service-host.ts",
-      line: 192,
+      line: 233,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3762,6 +3846,9 @@ var LocalClientServices = class {
   get services() {
     return this._host.services;
   }
+  get host() {
+    return this._host;
+  }
   async open() {
     await this._host.open();
   }