@dxos/client-services 0.5.8-next.4b7fabd → 0.5.9-main.2d0a5e6

package/dist/lib/node/index.cjs

@@ -18,173 +18,61 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var node_exports = {};
 __export(node_exports, {
-  ClientRpcServer: () => import_chunk_IBTSMFQY.ClientRpcServer,
-  ClientServicesHost: () => import_chunk_IBTSMFQY.ClientServicesHost,
-  ClientServicesProviderResource: () => import_chunk_IBTSMFQY.ClientServicesProviderResource,
-  DataSpace: () => import_chunk_IBTSMFQY.DataSpace,
-  DataSpaceManager: () => import_chunk_IBTSMFQY.DataSpaceManager,
-  DeviceInvitationProtocol: () => import_chunk_IBTSMFQY.DeviceInvitationProtocol,
-  DevtoolsHostEvents: () => import_chunk_IBTSMFQY.DevtoolsHostEvents,
-  DevtoolsServiceImpl: () => import_chunk_IBTSMFQY.DevtoolsServiceImpl,
-  DiagnosticsCollector: () => import_chunk_IBTSMFQY.DiagnosticsCollector,
-  IFrameHostRuntime: () => IFrameHostRuntime,
-  Identity: () => import_chunk_IBTSMFQY.Identity,
-  IdentityManager: () => import_chunk_IBTSMFQY.IdentityManager,
-  IdentityServiceImpl: () => import_chunk_IBTSMFQY.IdentityServiceImpl,
-  InvitationsHandler: () => import_chunk_IBTSMFQY.InvitationsHandler,
-  InvitationsManager: () => import_chunk_IBTSMFQY.InvitationsManager,
-  InvitationsServiceImpl: () => import_chunk_IBTSMFQY.InvitationsServiceImpl,
-  Lock: () => import_chunk_IBTSMFQY.Lock,
-  ServiceContext: () => import_chunk_IBTSMFQY.ServiceContext,
-  ServiceRegistry: () => import_chunk_IBTSMFQY.ServiceRegistry,
-  SharedWorkerConnection: () => SharedWorkerConnection,
-  ShellRuntimeImpl: () => ShellRuntimeImpl,
-  SpaceInvitationProtocol: () => import_chunk_IBTSMFQY.SpaceInvitationProtocol,
-  SpacesServiceImpl: () => import_chunk_IBTSMFQY.SpacesServiceImpl,
-  TrustedKeySetAuthVerifier: () => import_chunk_IBTSMFQY.TrustedKeySetAuthVerifier,
+  ClientRpcServer: () => import_chunk_KYH2GPWL.ClientRpcServer,
+  ClientServicesHost: () => import_chunk_KYH2GPWL.ClientServicesHost,
+  ClientServicesProviderResource: () => import_chunk_KYH2GPWL.ClientServicesProviderResource,
+  DataSpace: () => import_chunk_KYH2GPWL.DataSpace,
+  DataSpaceManager: () => import_chunk_KYH2GPWL.DataSpaceManager,
+  DeviceInvitationProtocol: () => import_chunk_KYH2GPWL.DeviceInvitationProtocol,
+  DevtoolsHostEvents: () => import_chunk_KYH2GPWL.DevtoolsHostEvents,
+  DevtoolsServiceImpl: () => import_chunk_KYH2GPWL.DevtoolsServiceImpl,
+  DiagnosticsCollector: () => import_chunk_KYH2GPWL.DiagnosticsCollector,
+  Identity: () => import_chunk_KYH2GPWL.Identity,
+  IdentityManager: () => import_chunk_KYH2GPWL.IdentityManager,
+  IdentityServiceImpl: () => import_chunk_KYH2GPWL.IdentityServiceImpl,
+  InvitationsHandler: () => import_chunk_KYH2GPWL.InvitationsHandler,
+  InvitationsManager: () => import_chunk_KYH2GPWL.InvitationsManager,
+  InvitationsServiceImpl: () => import_chunk_KYH2GPWL.InvitationsServiceImpl,
+  Lock: () => import_chunk_KYH2GPWL.Lock,
+  ServiceContext: () => import_chunk_KYH2GPWL.ServiceContext,
+  ServiceRegistry: () => import_chunk_KYH2GPWL.ServiceRegistry,
+  SpaceInvitationProtocol: () => import_chunk_KYH2GPWL.SpaceInvitationProtocol,
+  SpacesServiceImpl: () => import_chunk_KYH2GPWL.SpacesServiceImpl,
+  TrustedKeySetAuthVerifier: () => import_chunk_KYH2GPWL.TrustedKeySetAuthVerifier,
   WorkerRuntime: () => WorkerRuntime,
   WorkerSession: () => WorkerSession,
-  createAdmissionKeypair: () => import_chunk_IBTSMFQY.createAdmissionKeypair,
-  createAuthProvider: () => import_chunk_IBTSMFQY.createAuthProvider,
-  createCollectDiagnosticsBroadcastHandler: () => import_chunk_IBTSMFQY.createCollectDiagnosticsBroadcastHandler,
-  createCollectDiagnosticsBroadcastSender: () => import_chunk_IBTSMFQY.createCollectDiagnosticsBroadcastSender,
-  createDiagnostics: () => import_chunk_IBTSMFQY.createDiagnostics,
-  createLevel: () => import_chunk_IBTSMFQY.createLevel,
-  createStorageObjects: () => import_chunk_IBTSMFQY.createStorageObjects,
-  findPropertiesObject: () => import_chunk_IBTSMFQY.findPropertiesObject,
-  getNetworkPeers: () => import_chunk_IBTSMFQY.getNetworkPeers,
-  isLocked: () => import_chunk_IBTSMFQY.isLocked,
-  subscribeToFeedBlocks: () => import_chunk_IBTSMFQY.subscribeToFeedBlocks,
-  subscribeToFeeds: () => import_chunk_IBTSMFQY.subscribeToFeeds,
-  subscribeToNetworkStatus: () => import_chunk_IBTSMFQY.subscribeToNetworkStatus,
-  subscribeToNetworkTopics: () => import_chunk_IBTSMFQY.subscribeToNetworkTopics,
-  subscribeToSignal: () => import_chunk_IBTSMFQY.subscribeToSignal,
-  subscribeToSpaces: () => import_chunk_IBTSMFQY.subscribeToSpaces,
-  subscribeToSwarmInfo: () => import_chunk_IBTSMFQY.subscribeToSwarmInfo
+  createAdmissionKeypair: () => import_chunk_KYH2GPWL.createAdmissionKeypair,
+  createAuthProvider: () => import_chunk_KYH2GPWL.createAuthProvider,
+  createCollectDiagnosticsBroadcastHandler: () => import_chunk_KYH2GPWL.createCollectDiagnosticsBroadcastHandler,
+  createCollectDiagnosticsBroadcastSender: () => import_chunk_KYH2GPWL.createCollectDiagnosticsBroadcastSender,
+  createDiagnostics: () => import_chunk_KYH2GPWL.createDiagnostics,
+  createLevel: () => import_chunk_KYH2GPWL.createLevel,
+  createStorageObjects: () => import_chunk_KYH2GPWL.createStorageObjects,
+  findPropertiesObject: () => import_chunk_KYH2GPWL.findPropertiesObject,
+  getNetworkPeers: () => import_chunk_KYH2GPWL.getNetworkPeers,
+  isLocked: () => import_chunk_KYH2GPWL.isLocked,
+  subscribeToFeedBlocks: () => import_chunk_KYH2GPWL.subscribeToFeedBlocks,
+  subscribeToFeeds: () => import_chunk_KYH2GPWL.subscribeToFeeds,
+  subscribeToNetworkStatus: () => import_chunk_KYH2GPWL.subscribeToNetworkStatus,
+  subscribeToNetworkTopics: () => import_chunk_KYH2GPWL.subscribeToNetworkTopics,
+  subscribeToSignal: () => import_chunk_KYH2GPWL.subscribeToSignal,
+  subscribeToSpaces: () => import_chunk_KYH2GPWL.subscribeToSpaces,
+  subscribeToSwarmInfo: () => import_chunk_KYH2GPWL.subscribeToSwarmInfo
 });
 module.exports = __toCommonJS(node_exports);
-var import_chunk_IBTSMFQY = require("./chunk-IBTSMFQY.cjs");
+var import_chunk_KYH2GPWL = require("./chunk-KYH2GPWL.cjs");
 var import_async = require("@dxos/async");
-var import_client_protocol = require("@dxos/client-protocol");
 var import_context = require("@dxos/context");
+var import_invariant = require("@dxos/invariant");
 var import_log = require("@dxos/log");
 var import_messaging = require("@dxos/messaging");
 var import_network_manager = require("@dxos/network-manager");
-var import_util = require("@dxos/util");
 var import_async2 = require("@dxos/async");
-var import_client_protocol2 = require("@dxos/client-protocol");
-var import_invariant = require("@dxos/invariant");
-var import_iframe = require("@dxos/protocols/proto/dxos/iframe");
-var import_rpc = require("@dxos/rpc");
-var import_async3 = require("@dxos/async");
-var import_client_protocol3 = require("@dxos/client-protocol");
-var import_log2 = require("@dxos/log");
-var import_network_manager2 = require("@dxos/network-manager");
-var import_protocols = require("@dxos/protocols");
-var import_rpc2 = require("@dxos/rpc");
-var import_util2 = require("@dxos/util");
-var import_async4 = require("@dxos/async");
-var import_context2 = require("@dxos/context");
+var import_client_protocol = require("@dxos/client-protocol");
 var import_invariant2 = require("@dxos/invariant");
-var import_log3 = require("@dxos/log");
-var import_messaging2 = require("@dxos/messaging");
-var import_network_manager3 = require("@dxos/network-manager");
-var import_async5 = require("@dxos/async");
-var import_client_protocol4 = require("@dxos/client-protocol");
-var import_invariant3 = require("@dxos/invariant");
-var import_log4 = require("@dxos/log");
-var import_rpc3 = require("@dxos/rpc");
-var import_util3 = require("@dxos/util");
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/vault/shell-runtime.ts";
-var ShellRuntimeImpl = class {
-  constructor(_port) {
-    this._port = _port;
-    this.layoutUpdate = new import_async2.Event();
-    this.invitationUrlUpdate = new import_async2.Event();
-    this._layout = import_iframe.ShellLayout.DEFAULT;
-    this._invitationUrl = typeof window !== "undefined" ? window.location.origin : void 0;
-    this._deviceInvitationParam = "deviceInvitationCode";
-    this._spaceInvitationParam = "spaceInvitationCode";
-  }
-  get layout() {
-    return this._layout;
-  }
-  get invitationCode() {
-    return this._invitationCode;
-  }
-  get spaceKey() {
-    return this._spaceKey;
-  }
-  get invitationUrl() {
-    return this._invitationUrl;
-  }
-  get deviceInvitationParam() {
-    return this._deviceInvitationParam;
-  }
-  get spaceInvitationParam() {
-    return this._spaceInvitationParam;
-  }
-  setLayout({ layout, invitationCode, spaceKey }) {
-    this._layout = layout;
-    this._invitationCode = invitationCode;
-    this._spaceKey = spaceKey;
-    this.layoutUpdate.emit({
-      layout,
-      invitationCode,
-      spaceKey
-    });
-  }
-  setInvitationUrl({ invitationUrl, deviceInvitationParam, spaceInvitationParam }) {
-    this._invitationUrl = invitationUrl;
-    this._deviceInvitationParam = deviceInvitationParam;
-    this._spaceInvitationParam = spaceInvitationParam;
-    this.invitationUrlUpdate.emit({
-      invitationUrl,
-      deviceInvitationParam,
-      spaceInvitationParam
-    });
-  }
-  async setAppContext(context) {
-    (0, import_invariant.invariant)(this._appRpc, "runtime not open", {
-      F: __dxlog_file,
-      L: 76,
-      S: this,
-      A: [
-        "this._appRpc",
-        "'runtime not open'"
-      ]
-    });
-    await this._appRpc.rpc.AppService.setContext(context);
-  }
-  async open() {
-    this._appRpc = (0, import_rpc.createProtoRpcPeer)({
-      requested: import_client_protocol2.appServiceBundle,
-      exposed: import_client_protocol2.shellServiceBundle,
-      handlers: {
-        ShellService: {
-          setLayout: async (request) => {
-            this._layout = request.layout;
-            this._invitationCode = request.invitationCode;
-            this._spaceKey = request.spaceKey;
-            this.layoutUpdate.emit(request);
-          },
-          setInvitationUrl: async (request) => {
-            this._invitationUrl = request.invitationUrl;
-            this._deviceInvitationParam = request.deviceInvitationParam;
-            this._spaceInvitationParam = request.spaceInvitationParam;
-            this.invitationUrlUpdate.emit(request);
-          }
-        }
-      },
-      port: this._port
-    });
-    await this._appRpc.open();
-  }
-  async close() {
-    await this._appRpc?.close();
-    this._appRpc = void 0;
-  }
-};
+var import_log2 = require("@dxos/log");
+var import_rpc = require("@dxos/rpc");
+var import_util = require("@dxos/util");
 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")
@@ -195,201 +83,13 @@ function _ts_decorate(decorators, target, key, desc) {
         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_file2 = "/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 }) {
-    this._ready = new import_async.Trigger();
-    this._configProvider = config;
-    this.origin = origin;
-    this._appPort = appPort;
-    this._shellPort = shellPort;
-    if (this._shellPort) {
-      this._shellRuntime = new ShellRuntimeImpl(this._shellPort);
-    }
-  }
-  get services() {
-    return this._clientServices;
-  }
-  get shell() {
-    return this._shellRuntime;
-  }
-  async start() {
-    (0, import_log.log)("starting...", void 0, {
-      F: __dxlog_file2,
-      L: 73,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    try {
-      this._config = await (0, import_util.getAsyncValue)(this._configProvider);
-      this._transportFactory = (0, import_network_manager.createSimplePeerTransportFactory)({
-        iceServers: this._config.get("runtime.services.ice")
-      });
-      const signals = this._config.get("runtime.services.signaling");
-      this._clientServices = new import_chunk_IBTSMFQY.ClientServicesHost({
-        lockKey: LOCK_KEY,
-        config: this._config,
-        signalManager: signals ? new import_messaging.WebsocketSignalManager(signals) : new import_messaging.MemorySignalManager(new import_messaging.MemorySignalManagerContext()),
-        transportFactory: this._transportFactory
-      });
-      const middleware = {
-        handleCall: async (method, params, handler) => {
-          const error = await this._ready.wait({
-            timeout: import_client_protocol.PROXY_CONNECTION_TIMEOUT
-          });
-          if (error) {
-            throw error;
-          }
-          return handler(method, params);
-        },
-        handleStream: async (method, params, handler) => {
-          const error = await this._ready.wait({
-            timeout: import_client_protocol.PROXY_CONNECTION_TIMEOUT
-          });
-          if (error) {
-            throw error;
-          }
-          return handler(method, params);
-        }
-      };
-      this._clientRpc = new import_chunk_IBTSMFQY.ClientRpcServer({
-        serviceRegistry: this._clientServices.serviceRegistry,
-        port: this._appPort,
-        ...middleware
-      });
-      await Promise.all([
-        this._clientServices.open(new import_context.Context()),
-        this._clientRpc.open(),
-        this._shellRuntime?.open()
-      ]);
-      this._ready.wake(void 0);
-      (0, import_log.log)("started", void 0, {
-        F: __dxlog_file2,
-        L: 116,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    } catch (err) {
-      this._ready.wake(err);
-      import_log.log.catch(err, void 0, {
-        F: __dxlog_file2,
-        L: 119,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    }
-  }
-  async stop() {
-    (0, import_log.log)("stopping...", void 0, {
-      F: __dxlog_file2,
-      L: 124,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    await this._clientRpc.close();
-    await this._clientServices.close();
-    await this._shellRuntime?.close();
-    (0, import_log.log)("stopped", void 0, {
-      F: __dxlog_file2,
-      L: 128,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-  }
-};
-_ts_decorate([
-  import_log.logInfo
-], IFrameHostRuntime.prototype, "origin", void 0);
-var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/vault/shared-worker-connection.ts";
-var SharedWorkerConnection = class {
-  constructor({ config, systemPort, shellPort }) {
-    this._id = String(Math.floor(Math.random() * 1e6));
-    this._release = new import_async3.Trigger();
-    this._configProvider = config;
-    this._systemPort = systemPort;
-    this._shellPort = shellPort;
-    if (this._shellPort) {
-      this._shellRuntime = new ShellRuntimeImpl(this._shellPort);
-    }
-  }
-  get shell() {
-    return this._shellRuntime;
-  }
-  async open(params) {
-    this._config = await (0, import_util2.getAsyncValue)(this._configProvider);
-    this._transportService = new import_network_manager2.SimplePeerTransportService({
-      iceServers: this._config.get("runtime.services.ice")
-    });
-    this._systemRpc = (0, import_rpc2.createProtoRpcPeer)({
-      requested: import_client_protocol3.workerServiceBundle,
-      exposed: import_client_protocol3.iframeServiceBundle,
-      handlers: {
-        BridgeService: this._transportService
-      },
-      port: this._systemPort,
-      // TODO(wittjosiah): Make longer and factor out to constant.
-      // TODO(wittjosiah): If this is too long then it breaks the reset flows in Composer.
-      timeout: 200
-    });
-    let lockKey;
-    if (typeof navigator !== "undefined") {
-      lockKey = this._lockKey(params.origin);
-      this._release = new import_async3.Trigger();
-      const ready = new import_async3.Trigger();
-      void navigator.locks.request(lockKey, async () => {
-        ready.wake();
-        await this._release.wait();
-      });
-      await ready.wait();
-    }
-    try {
-      await this._systemRpc.open();
-      await this._systemRpc.rpc.WorkerService.start({
-        lockKey,
-        ...params
-      });
-    } catch (err) {
-      import_log2.log.catch(err, void 0, {
-        F: __dxlog_file3,
-        L: 95,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      throw new import_protocols.RemoteServiceConnectionError("Failed to connect to worker");
-    }
-    await this._shellRuntime?.open();
-  }
-  async close() {
-    this._release.wake();
-    await this._shellRuntime?.close();
-    try {
-      await this._systemRpc.rpc.WorkerService.stop();
-    } catch {
-    }
-    await this._systemRpc.close();
-  }
-  _lockKey(origin) {
-    return `${origin}-${this._id}`;
-  }
-};
-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);
-  else
-    for (var i = decorators.length - 1; i >= 0; i--)
-      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_file4 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/vault/worker-session.ts";
+var __dxlog_file = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/worker/worker-session.ts";
 var WorkerSession = class {
   constructor({ serviceHost, systemPort, appPort, shellPort, readySignal }) {
-    this._startTrigger = new import_async5.Trigger();
-    this.onClose = new import_util3.Callback();
-    (0, import_invariant3.invariant)(serviceHost, void 0, {
-      F: __dxlog_file4,
+    this._startTrigger = new import_async2.Trigger();
+    this.onClose = new import_util.Callback();
+    (0, import_invariant2.invariant)(serviceHost, void 0, {
+      F: __dxlog_file,
       L: 54,
       S: this,
       A: [
@@ -401,7 +101,7 @@ var WorkerSession = class {
     const middleware = {
       handleCall: async (method, params, handler) => {
         const error = await readySignal.wait({
-          timeout: import_client_protocol4.PROXY_CONNECTION_TIMEOUT
+          timeout: import_client_protocol.PROXY_CONNECTION_TIMEOUT
         });
         if (error) {
           throw error;
@@ -410,7 +110,7 @@ var WorkerSession = class {
       },
       handleStream: async (method, params, handler) => {
         const error = await readySignal.wait({
-          timeout: import_client_protocol4.PROXY_CONNECTION_TIMEOUT
+          timeout: import_client_protocol.PROXY_CONNECTION_TIMEOUT
         });
         if (error) {
           throw error;
@@ -418,19 +118,19 @@ var WorkerSession = class {
         return handler(method, params);
       }
     };
-    this._clientRpc = new import_chunk_IBTSMFQY.ClientRpcServer({
+    this._clientRpc = new import_chunk_KYH2GPWL.ClientRpcServer({
       serviceRegistry: this._serviceHost.serviceRegistry,
       port: appPort,
       ...middleware
     });
-    this._shellClientRpc = shellPort ? new import_chunk_IBTSMFQY.ClientRpcServer({
+    this._shellClientRpc = shellPort ? new import_chunk_KYH2GPWL.ClientRpcServer({
       serviceRegistry: this._serviceHost.serviceRegistry,
       port: shellPort,
       ...middleware
     }) : void 0;
-    this._iframeRpc = (0, import_rpc3.createProtoRpcPeer)({
-      requested: import_client_protocol4.iframeServiceBundle,
-      exposed: import_client_protocol4.workerServiceBundle,
+    this._iframeRpc = (0, import_rpc.createProtoRpcPeer)({
+      requested: import_client_protocol.iframeServiceBundle,
+      exposed: import_client_protocol.workerServiceBundle,
       handlers: {
         WorkerService: {
           start: async (request) => {
@@ -445,8 +145,8 @@ var WorkerSession = class {
               try {
                 await this.close();
               } catch (err) {
-                import_log4.log.catch(err, void 0, {
-                  F: __dxlog_file4,
+                import_log2.log.catch(err, void 0, {
+                  F: __dxlog_file,
                   L: 108,
                   S: this,
                   C: (f, a) => f(...a)
@@ -462,8 +162,8 @@ var WorkerSession = class {
     this.bridgeService = this._iframeRpc.rpc.BridgeService;
   }
   async open() {
-    import_log4.log.info("opening...", void 0, {
-      F: __dxlog_file4,
+    import_log2.log.info("opening...", void 0, {
+      F: __dxlog_file,
       L: 122,
       S: this,
       C: (f, a) => f(...a)
@@ -474,21 +174,21 @@ var WorkerSession = class {
       this._maybeOpenShell()
     ]);
     await this._startTrigger.wait({
-      timeout: import_client_protocol4.PROXY_CONNECTION_TIMEOUT
+      timeout: import_client_protocol.PROXY_CONNECTION_TIMEOUT
     });
     if (this.lockKey) {
       void this._afterLockReleases(this.lockKey, () => this.close());
     }
-    import_log4.log.info("opened", void 0, {
-      F: __dxlog_file4,
+    import_log2.log.info("opened", void 0, {
+      F: __dxlog_file,
       L: 133,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async close() {
-    import_log4.log.info("closing...", void 0, {
-      F: __dxlog_file4,
+    import_log2.log.info("closing...", void 0, {
+      F: __dxlog_file,
       L: 137,
       S: this,
       C: (f, a) => f(...a)
@@ -496,8 +196,8 @@ var WorkerSession = class {
     try {
       await this.onClose.callIfSet();
     } catch (err) {
-      import_log4.log.catch(err, void 0, {
-        F: __dxlog_file4,
+      import_log2.log.catch(err, void 0, {
+        F: __dxlog_file,
         L: 141,
         S: this,
         C: (f, a) => f(...a)
@@ -507,8 +207,8 @@ var WorkerSession = class {
       this._clientRpc.close(),
       this._iframeRpc.close()
     ]);
-    import_log4.log.info("closed", void 0, {
-      F: __dxlog_file4,
+    import_log2.log.info("closed", void 0, {
+      F: __dxlog_file,
       L: 145,
       S: this,
       C: (f, a) => f(...a)
@@ -516,10 +216,10 @@ var WorkerSession = class {
   }
   async _maybeOpenShell() {
     try {
-      this._shellClientRpc && await (0, import_async5.asyncTimeout)(this._shellClientRpc.open(), 1e3);
+      this._shellClientRpc && await (0, import_async2.asyncTimeout)(this._shellClientRpc.open(), 1e3);
     } catch {
-      import_log4.log.info("No shell connected.", void 0, {
-        F: __dxlog_file4,
+      import_log2.log.info("No shell connected.", void 0, {
+        F: __dxlog_file,
         L: 152,
         S: this,
         C: (f, a) => f(...a)
@@ -531,18 +231,18 @@ var WorkerSession = class {
     }).then(callback);
   }
 };
-_ts_decorate2([
-  import_log4.logInfo
+_ts_decorate([
+  import_log2.logInfo
 ], WorkerSession.prototype, "origin", void 0);
-_ts_decorate2([
-  import_log4.logInfo
+_ts_decorate([
+  import_log2.logInfo
 ], WorkerSession.prototype, "lockKey", void 0);
-var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/vault/worker-runtime.ts";
+var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/worker/worker-runtime.ts";
 var WorkerRuntime = class {
   constructor(_configProvider, { acquireLock, releaseLock, onReset }) {
     this._configProvider = _configProvider;
-    this._transportFactory = new import_network_manager3.SimplePeerTransportProxyFactory();
-    this._ready = new import_async4.Trigger();
+    this._transportFactory = new import_network_manager.SimplePeerTransportProxyFactory();
+    this._ready = new import_async.Trigger();
     this._sessions = /* @__PURE__ */ new Set();
     this._signalMetadataTags = {
       runtime: "worker-runtime"
@@ -550,7 +250,7 @@ var WorkerRuntime = class {
     this._signalTelemetryEnabled = false;
     this._acquireLock = acquireLock;
     this._releaseLock = releaseLock;
-    this._clientServices = new import_chunk_IBTSMFQY.ClientServicesHost({
+    this._clientServices = new import_chunk_KYH2GPWL.ClientServicesHost({
       callbacks: {
         onReset: async () => onReset()
       }
@@ -560,8 +260,8 @@ var WorkerRuntime = class {
     return this._clientServices;
   }
   async start() {
-    (0, import_log3.log)("starting...", void 0, {
-      F: __dxlog_file5,
+    (0, import_log.log)("starting...", void 0, {
+      F: __dxlog_file2,
       L: 71,
       S: this,
       C: (f, a) => f(...a)
@@ -572,18 +272,18 @@ var WorkerRuntime = class {
       const signals = this._config.get("runtime.services.signaling");
       this._clientServices.initialize({
         config: this._config,
-        signalManager: signals ? new import_messaging2.WebsocketSignalManager(signals, () => this._signalTelemetryEnabled ? this._signalMetadataTags : {}) : new import_messaging2.MemorySignalManager(new import_messaging2.MemorySignalManagerContext()),
+        signalManager: signals ? new import_messaging.WebsocketSignalManager(signals, () => this._signalTelemetryEnabled ? this._signalMetadataTags : {}) : new import_messaging.MemorySignalManager(new import_messaging.MemorySignalManagerContext()),
         transportFactory: this._transportFactory
       });
-      await this._clientServices.open(new import_context2.Context());
+      await this._clientServices.open(new import_context.Context());
       this._ready.wake(void 0);
-      (0, import_log3.log)("started", void 0, {
-        F: __dxlog_file5,
+      (0, import_log.log)("started", void 0, {
+        F: __dxlog_file2,
         L: 86,
         S: this,
         C: (f, a) => f(...a)
       });
-      (0, import_messaging2.setIdentityTags)({
+      (0, import_messaging.setIdentityTags)({
         identityService: this._clientServices.services.IdentityService,
         devicesService: this._clientServices.services.DevicesService,
         setTag: (k, v) => {
@@ -592,8 +292,8 @@ var WorkerRuntime = class {
       });
     } catch (err) {
       this._ready.wake(err);
-      import_log3.log.error("starting", err, {
-        F: __dxlog_file5,
+      import_log.log.error("starting", err, {
+        F: __dxlog_file2,
         L: 96,
         S: this,
         C: (f, a) => f(...a)
@@ -626,8 +326,8 @@ var WorkerRuntime = class {
       }
     });
     await session.open();
-    (0, import_invariant2.invariant)(!this._signalMetadataTags.origin || this._signalMetadataTags.origin === session.origin, `worker origin changed from ${this._signalMetadataTags.origin} to ${session.origin}?`, {
-      F: __dxlog_file5,
+    (0, import_invariant.invariant)(!this._signalMetadataTags.origin || this._signalMetadataTags.origin === session.origin, `worker origin changed from ${this._signalMetadataTags.origin} to ${session.origin}?`, {
+      F: __dxlog_file2,
       L: 133,
       S: this,
       A: [
@@ -647,8 +347,8 @@ var WorkerRuntime = class {
   * Selects one of the existing session for WebRTC networking.
   */
   _reconnectWebrtc() {
-    (0, import_log3.log)("reconnecting webrtc...", void 0, {
-      F: __dxlog_file5,
+    (0, import_log.log)("reconnecting webrtc...", void 0, {
+      F: __dxlog_file2,
       L: 151,
       S: this,
       C: (f, a) => f(...a)
@@ -680,7 +380,6 @@ var WorkerRuntime = class {
   DevtoolsHostEvents,
   DevtoolsServiceImpl,
   DiagnosticsCollector,
-  IFrameHostRuntime,
   Identity,
   IdentityManager,
   IdentityServiceImpl,
@@ -690,8 +389,6 @@ var WorkerRuntime = class {
   Lock,
   ServiceContext,
   ServiceRegistry,
-  SharedWorkerConnection,
-  ShellRuntimeImpl,
   SpaceInvitationProtocol,
   SpacesServiceImpl,
   TrustedKeySetAuthVerifier,