@dxos/client-services 0.1.53 → 0.1.54-main.270ec56

package/dist/lib/browser/index.mjs

@@ -1,5 +1,6 @@
-import "@dxos/node-std/globals"
+import "@dxos/node-std/globals";
 import {
+  ClientRpcServer,
   ClientServicesHost,
   DataSpace,
   DataSpaceManager,
@@ -18,6 +19,7 @@ import {
   SpacesServiceImpl,
   TrustedKeySetAuthVerifier,
   createAuthProvider,
+  createDefaultModelFactory,
   createStorageObjects,
   getNetworkPeers,
   isLocked,
@@ -28,7 +30,7 @@ import {
   subscribeToSignal,
   subscribeToSpaces,
   subscribeToSwarmInfo
-} from "./chunk-6ITWCQIT.mjs";
+} from "./chunk-F4BHRFH4.mjs";
 
 // packages/sdk/client-services/src/packlets/vault/iframe-host-runtime.ts
 import { Trigger } from "@dxos/async";
@@ -38,61 +40,8 @@ import { MemorySignalManager, MemorySignalManagerContext, WebsocketSignalManager
 import { createWebRTCTransportFactory } from "@dxos/network-manager";
 import { getAsyncValue } from "@dxos/util";
 
-// packages/sdk/client-services/src/packlets/services/client-rpc-server.ts
-import { Stream } from "@dxos/codec-protobuf";
-import { raise } from "@dxos/debug";
-import { parseMethodName, RpcPeer } from "@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 RpcPeer({
-      ...rpcOptions,
-      callHandler: (method, params2) => {
-        const [serviceName, methodName] = 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] = parseMethodName(method);
-        const handler = (method2, params3) => this._getServiceHandler(serviceName).callStream(method2, params3);
-        if (this._handleStream) {
-          return 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 : 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
-import assert from "@dxos/node-std/assert";
+import invariant from "tiny-invariant";
 import { Event } from "@dxos/async";
 import { appServiceBundle, shellServiceBundle } from "@dxos/client-protocol";
 import { ShellLayout } from "@dxos/protocols/proto/dxos/iframe";
@@ -122,7 +71,7 @@ var ShellRuntimeImpl = class {
     });
   }
   async setAppContext(context) {
-    assert(this._appRpc, "runtime not open");
+    invariant(this._appRpc, "runtime not open");
     await this._appRpc.rpc.AppService.setContext(context);
   }
   async open() {
@@ -149,39 +98,9 @@ var ShellRuntimeImpl = class {
     this._appRpc = void 0;
   }
 };
-var MemoryShellRuntime = class {
-  constructor({ layout, invitationCode, spaceKey } = {}) {
-    this.layoutUpdate = new Event();
-    this.contextUpdate = new Event();
-    this._layout = layout != null ? layout : ShellLayout.DEFAULT;
-    this._invitationCode = invitationCode;
-    this._spaceKey = spaceKey;
-  }
-  get layout() {
-    return this._layout;
-  }
-  get invitationCode() {
-    return this._invitationCode;
-  }
-  get spaceKey() {
-    return this._spaceKey;
-  }
-  setLayout(layout, options = {}) {
-    this._layout = layout;
-    this._invitationCode = options.invitationCode;
-    this._spaceKey = options.spaceKey;
-    this.layoutUpdate.emit({
-      layout,
-      ...options
-    });
-  }
-  async setAppContext(context) {
-    this.contextUpdate.emit(context);
-  }
-};
 
 // packages/sdk/client-services/src/packlets/vault/iframe-host-runtime.ts
-var __decorate = function(decorators, target, key, desc) {
+function _ts_decorate(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
     r = Reflect.decorate(decorators, target, key, desc);
@@ -190,7 +109,8 @@ var __decorate = function(decorators, target, key, desc) {
       if (d = decorators[i])
         r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
+}
+var __dxlog_file = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/vault/iframe-host-runtime.ts";
 var LOCK_KEY = "DXOS_RESOURCE_LOCK";
 var IFrameHostRuntime = class {
   constructor({ config, origin, appPort, shellPort }) {
@@ -211,11 +131,11 @@ var IFrameHostRuntime = class {
   }
   async start() {
     var _a;
-    log("starting...", {}, {
-      file: "iframe-host-runtime.ts",
-      line: 70,
-      scope: this,
-      callSite: (f, a) => f(...a)
+    log("starting...", void 0, {
+      F: __dxlog_file,
+      L: 70,
+      S: this,
+      C: (f, a) => f(...a)
     });
     try {
       this._config = await getAsyncValue(this._configProvider);
@@ -260,42 +180,42 @@ var IFrameHostRuntime = class {
         (_a = this._shellRuntime) == null ? void 0 : _a.open()
       ]);
       this._ready.wake(void 0);
-      log("started", {}, {
-        file: "iframe-host-runtime.ts",
-        line: 113,
-        scope: this,
-        callSite: (f, a) => f(...a)
+      log("started", void 0, {
+        F: __dxlog_file,
+        L: 113,
+        S: this,
+        C: (f, a) => f(...a)
       });
     } catch (err) {
       this._ready.wake(err);
-      log.catch(err, {}, {
-        file: "iframe-host-runtime.ts",
-        line: 116,
-        scope: this,
-        callSite: (f, a) => f(...a)
+      log.catch(err, void 0, {
+        F: __dxlog_file,
+        L: 116,
+        S: this,
+        C: (f, a) => f(...a)
       });
     }
   }
   async stop() {
     var _a;
-    log("stopping...", {}, {
-      file: "iframe-host-runtime.ts",
-      line: 121,
-      scope: this,
-      callSite: (f, a) => f(...a)
+    log("stopping...", void 0, {
+      F: __dxlog_file,
+      L: 121,
+      S: this,
+      C: (f, a) => f(...a)
     });
     await this._clientRpc.close();
     await this._clientServices.close();
     await ((_a = this._shellRuntime) == null ? void 0 : _a.close());
-    log("stopped", {}, {
-      file: "iframe-host-runtime.ts",
-      line: 125,
-      scope: this,
-      callSite: (f, a) => f(...a)
+    log("stopped", void 0, {
+      F: __dxlog_file,
+      L: 125,
+      S: this,
+      C: (f, a) => f(...a)
     });
   }
 };
-__decorate([
+_ts_decorate([
   logInfo
 ], IFrameHostRuntime.prototype, "origin", void 0);
 
@@ -307,6 +227,7 @@ import { log as log2 } from "@dxos/log";
 import { WebRTCTransportService } from "@dxos/network-manager";
 import { createProtoRpcPeer as createProtoRpcPeer2 } from "@dxos/rpc";
 import { getAsyncValue as getAsyncValue2 } from "@dxos/util";
+var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/vault/iframe-proxy-runtime.ts";
 var IFrameProxyRuntime = class {
   constructor({ config, systemPort, shellPort }) {
     this._id = String(Math.floor(Math.random() * 1e6));
@@ -354,11 +275,11 @@ var IFrameProxyRuntime = class {
         lockKey
       });
     } catch (err) {
-      log2.catch(err, {}, {
-        file: "iframe-proxy-runtime.ts",
-        line: 85,
-        scope: this,
-        callSite: (f, a) => f(...a)
+      log2.catch(err, void 0, {
+        F: __dxlog_file2,
+        L: 85,
+        S: this,
+        C: (f, a) => f(...a)
       });
       throw new RemoteServiceConnectionError("Failed to connect to worker");
     }
@@ -383,13 +304,13 @@ import { MemorySignalManager as MemorySignalManager2, MemorySignalManagerContext
 import { WebRTCTransportProxyFactory } from "@dxos/network-manager";
 
 // packages/sdk/client-services/src/packlets/vault/worker-session.ts
-import assert2 from "@dxos/node-std/assert";
+import invariant2 from "tiny-invariant";
 import { asyncTimeout, Trigger as Trigger3 } from "@dxos/async";
 import { iframeServiceBundle as iframeServiceBundle2, PROXY_CONNECTION_TIMEOUT as PROXY_CONNECTION_TIMEOUT2, workerServiceBundle as workerServiceBundle2 } from "@dxos/client-protocol";
 import { log as log3, logInfo as logInfo2 } from "@dxos/log";
 import { createProtoRpcPeer as createProtoRpcPeer3 } from "@dxos/rpc";
 import { Callback } from "@dxos/util";
-var __decorate2 = function(decorators, target, key, desc) {
+function _ts_decorate2(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
     r = Reflect.decorate(decorators, target, key, desc);
@@ -398,12 +319,13 @@ var __decorate2 = function(decorators, target, key, desc) {
       if (d = decorators[i])
         r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
+}
+var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/vault/worker-session.ts";
 var WorkerSession = class {
   constructor({ serviceHost, systemPort, appPort, shellPort, readySignal }) {
     this._startTrigger = new Trigger3();
     this.onClose = new Callback();
-    assert2(serviceHost);
+    invariant2(serviceHost);
     this._serviceHost = serviceHost;
     const middleware = {
       handleCall: async (method, params, handler) => {
@@ -450,11 +372,11 @@ var WorkerSession = class {
               try {
                 await this.close();
               } catch (err) {
-                log3.catch(err, {}, {
-                  file: "worker-session.ts",
-                  line: 100,
-                  scope: this,
-                  callSite: (f, a) => f(...a)
+                log3.catch(err, void 0, {
+                  F: __dxlog_file3,
+                  L: 99,
+                  S: this,
+                  C: (f, a) => f(...a)
                 });
               }
             });
@@ -467,11 +389,11 @@ var WorkerSession = class {
     this.bridgeService = this._iframeRpc.rpc.BridgeService;
   }
   async open() {
-    log3.info("opening..", {}, {
-      file: "worker-session.ts",
-      line: 114,
-      scope: this,
-      callSite: (f, a) => f(...a)
+    log3.info("opening...", void 0, {
+      F: __dxlog_file3,
+      L: 113,
+      S: this,
+      C: (f, a) => f(...a)
     });
     await Promise.all([
       this._clientRpc.open(),
@@ -484,38 +406,50 @@ var WorkerSession = class {
     if (this.lockKey) {
       void this._afterLockReleases(this.lockKey, () => this.close());
     }
+    log3.info("opened", void 0, {
+      F: __dxlog_file3,
+      L: 120,
+      S: this,
+      C: (f, a) => f(...a)
+    });
   }
   async close() {
-    log3.info("closing..", {}, {
-      file: "worker-session.ts",
-      line: 124,
-      scope: this,
-      callSite: (f, a) => f(...a)
+    log3.info("closing...", void 0, {
+      F: __dxlog_file3,
+      L: 124,
+      S: this,
+      C: (f, a) => f(...a)
     });
     try {
       await this.onClose.callIfSet();
     } catch (err) {
-      log3.catch(err, {}, {
-        file: "worker-session.ts",
-        line: 128,
-        scope: this,
-        callSite: (f, a) => f(...a)
+      log3.catch(err, void 0, {
+        F: __dxlog_file3,
+        L: 128,
+        S: this,
+        C: (f, a) => f(...a)
       });
     }
     await Promise.all([
       this._clientRpc.close(),
       this._iframeRpc.close()
     ]);
+    log3.info("closed", void 0, {
+      F: __dxlog_file3,
+      L: 132,
+      S: this,
+      C: (f, a) => f(...a)
+    });
   }
   async _maybeOpenShell() {
     try {
       await asyncTimeout(this._shellClientRpc.open(), 1e3);
     } catch (e) {
-      log3.info("No shell connected.", {}, {
-        file: "worker-session.ts",
-        line: 138,
-        scope: this,
-        callSite: (f, a) => f(...a)
+      log3.info("No shell connected.", void 0, {
+        F: __dxlog_file3,
+        L: 139,
+        S: this,
+        C: (f, a) => f(...a)
       });
     }
   }
@@ -524,14 +458,15 @@ var WorkerSession = class {
     }).then(callback);
   }
 };
-__decorate2([
+_ts_decorate2([
   logInfo2
 ], WorkerSession.prototype, "origin", void 0);
-__decorate2([
+_ts_decorate2([
   logInfo2
 ], WorkerSession.prototype, "lockKey", void 0);
 
 // packages/sdk/client-services/src/packlets/vault/worker-runtime.ts
+var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/vault/worker-runtime.ts";
 var WorkerRuntime = class {
   // prettier-ignore
   constructor(_configProvider) {
@@ -539,17 +474,23 @@ var WorkerRuntime = class {
     this._transportFactory = new WebRTCTransportProxyFactory();
     this._ready = new Trigger4();
     this.sessions = /* @__PURE__ */ new Set();
-    this._clientServices = new ClientServicesHost();
+    this._clientServices = new ClientServicesHost({
+      callbacks: {
+        onReset: async () => {
+          self.close();
+        }
+      }
+    });
   }
   get host() {
     return this._clientServices;
   }
   async start() {
-    log4("starting...", {}, {
-      file: "worker-runtime.ts",
-      line: 48,
-      scope: this,
-      callSite: (f, a) => f(...a)
+    log4("starting...", void 0, {
+      F: __dxlog_file4,
+      L: 48,
+      S: this,
+      C: (f, a) => f(...a)
     });
     try {
       this._config = await this._configProvider();
@@ -561,19 +502,19 @@ var WorkerRuntime = class {
       });
       await this._clientServices.open();
       this._ready.wake(void 0);
-      log4("started", {}, {
-        file: "worker-runtime.ts",
-        line: 62,
-        scope: this,
-        callSite: (f, a) => f(...a)
+      log4("started", void 0, {
+        F: __dxlog_file4,
+        L: 62,
+        S: this,
+        C: (f, a) => f(...a)
       });
     } catch (err) {
       this._ready.wake(err);
-      log4.catch(err, {}, {
-        file: "worker-runtime.ts",
-        line: 65,
-        scope: this,
-        callSite: (f, a) => f(...a)
+      log4.catch(err, void 0, {
+        F: __dxlog_file4,
+        L: 65,
+        S: this,
+        C: (f, a) => f(...a)
       });
     }
   }
@@ -603,11 +544,11 @@ var WorkerRuntime = class {
   * Selects one of the existing session fro WebRTC networking.
   */
   _reconnectWebrtc() {
-    log4("reconnecting webrtc...", {}, {
-      file: "worker-runtime.ts",
-      line: 102,
-      scope: this,
-      callSite: (f, a) => f(...a)
+    log4("reconnecting webrtc...", void 0, {
+      F: __dxlog_file4,
+      L: 102,
+      S: this,
+      C: (f, a) => f(...a)
     });
     if (this._sessionForNetworking) {
       if (!this.sessions.has(this._sessionForNetworking)) {
@@ -626,6 +567,7 @@ var WorkerRuntime = class {
   }
 };
 export {
+  ClientRpcServer,
   ClientServicesHost,
   DataSpace,
   DataSpaceManager,
@@ -640,7 +582,6 @@ export {
   InvitationsHandler,
   InvitationsServiceImpl,
   Lock,
-  MemoryShellRuntime,
   ServiceContext,
   ServiceRegistry,
   ShellRuntimeImpl,
@@ -650,6 +591,7 @@ export {
   WorkerRuntime,
   WorkerSession,
   createAuthProvider,
+  createDefaultModelFactory,
   createStorageObjects,
   getNetworkPeers,
   isLocked,