@dxos/client-services 0.5.8-next.4b7fabd → 0.5.9-main.079a532

package/dist/lib/browser/index.mjs

@@ -28,7 +28,6 @@ import {
   createDiagnostics,
   createLevel,
   createStorageObjects,
-  findPropertiesObject,
   getNetworkPeers,
   isLocked,
   subscribeToFeedBlocks,
@@ -38,329 +37,24 @@ import {
   subscribeToSignal,
   subscribeToSpaces,
   subscribeToSwarmInfo
-} from "./chunk-ACQUT3OK.mjs";
+} from "./chunk-QZ5LNV55.mjs";
 
-// packages/sdk/client-services/src/packlets/vault/iframe-host-runtime.ts
-import { Trigger } from "@dxos/async";
-import { PROXY_CONNECTION_TIMEOUT } from "@dxos/client-protocol";
-import { Context } from "@dxos/context";
-import { log, logInfo } from "@dxos/log";
-import { MemorySignalManager, MemorySignalManagerContext, WebsocketSignalManager } from "@dxos/messaging";
-import { createSimplePeerTransportFactory } from "@dxos/network-manager";
-import { getAsyncValue } from "@dxos/util";
-
-// packages/sdk/client-services/src/packlets/vault/shell-runtime.ts
-import { Event } from "@dxos/async";
-import { appServiceBundle, shellServiceBundle } from "@dxos/client-protocol";
-import { invariant } from "@dxos/invariant";
-import { ShellLayout } from "@dxos/protocols/proto/dxos/iframe";
-import { createProtoRpcPeer } from "@dxos/rpc";
-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 Event();
-    this.invitationUrlUpdate = new Event();
-    this._layout = 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) {
-    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 = createProtoRpcPeer({
-      requested: appServiceBundle,
-      exposed: 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;
-  }
-};
-
-// packages/sdk/client-services/src/packlets/vault/iframe-host-runtime.ts
-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);
-  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_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 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() {
-    log("starting...", void 0, {
-      F: __dxlog_file2,
-      L: 73,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    try {
-      this._config = await getAsyncValue(this._configProvider);
-      this._transportFactory = createSimplePeerTransportFactory({
-        iceServers: this._config.get("runtime.services.ice")
-      });
-      const signals = this._config.get("runtime.services.signaling");
-      this._clientServices = new ClientServicesHost({
-        lockKey: LOCK_KEY,
-        config: this._config,
-        signalManager: signals ? new WebsocketSignalManager(signals) : new MemorySignalManager(new MemorySignalManagerContext()),
-        transportFactory: this._transportFactory
-      });
-      const middleware = {
-        handleCall: async (method, params, handler) => {
-          const error = await this._ready.wait({
-            timeout: PROXY_CONNECTION_TIMEOUT
-          });
-          if (error) {
-            throw error;
-          }
-          return handler(method, params);
-        },
-        handleStream: async (method, params, handler) => {
-          const error = await this._ready.wait({
-            timeout: PROXY_CONNECTION_TIMEOUT
-          });
-          if (error) {
-            throw error;
-          }
-          return handler(method, params);
-        }
-      };
-      this._clientRpc = new ClientRpcServer({
-        serviceRegistry: this._clientServices.serviceRegistry,
-        port: this._appPort,
-        ...middleware
-      });
-      await Promise.all([
-        this._clientServices.open(new Context()),
-        this._clientRpc.open(),
-        this._shellRuntime?.open()
-      ]);
-      this._ready.wake(void 0);
-      log("started", void 0, {
-        F: __dxlog_file2,
-        L: 116,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    } catch (err) {
-      this._ready.wake(err);
-      log.catch(err, void 0, {
-        F: __dxlog_file2,
-        L: 119,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    }
-  }
-  async stop() {
-    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();
-    log("stopped", void 0, {
-      F: __dxlog_file2,
-      L: 128,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-  }
-};
-_ts_decorate([
-  logInfo
-], IFrameHostRuntime.prototype, "origin", void 0);
-
-// packages/sdk/client-services/src/packlets/vault/shared-worker-connection.ts
+// packages/sdk/client-services/src/packlets/worker/worker-runtime.ts
 import { Trigger as Trigger2 } from "@dxos/async";
-import { iframeServiceBundle, workerServiceBundle } from "@dxos/client-protocol";
+import { Context } from "@dxos/context";
+import { invariant as invariant2 } from "@dxos/invariant";
 import { log as log2 } from "@dxos/log";
-import { SimplePeerTransportService } from "@dxos/network-manager";
-import { RemoteServiceConnectionError } from "@dxos/protocols";
-import { createProtoRpcPeer as createProtoRpcPeer2 } from "@dxos/rpc";
-import { getAsyncValue as getAsyncValue2 } from "@dxos/util";
-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 Trigger2();
-    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 getAsyncValue2(this._configProvider);
-    this._transportService = new SimplePeerTransportService({
-      iceServers: this._config.get("runtime.services.ice")
-    });
-    this._systemRpc = createProtoRpcPeer2({
-      requested: workerServiceBundle,
-      exposed: 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 Trigger2();
-      const ready = new Trigger2();
-      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) {
-      log2.catch(err, void 0, {
-        F: __dxlog_file3,
-        L: 95,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      throw new 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}`;
-  }
-};
-
-// packages/sdk/client-services/src/packlets/vault/worker-runtime.ts
-import { Trigger as Trigger4 } from "@dxos/async";
-import { Context as Context2 } from "@dxos/context";
-import { invariant as invariant3 } from "@dxos/invariant";
-import { log as log4 } from "@dxos/log";
-import { MemorySignalManager as MemorySignalManager2, MemorySignalManagerContext as MemorySignalManagerContext2, WebsocketSignalManager as WebsocketSignalManager2, setIdentityTags } from "@dxos/messaging";
+import { MemorySignalManager, MemorySignalManagerContext, WebsocketSignalManager, setIdentityTags } from "@dxos/messaging";
 import { SimplePeerTransportProxyFactory } from "@dxos/network-manager";
 
-// packages/sdk/client-services/src/packlets/vault/worker-session.ts
-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 { invariant as invariant2 } from "@dxos/invariant";
-import { log as log3, logInfo as logInfo2 } from "@dxos/log";
-import { createProtoRpcPeer as createProtoRpcPeer3 } from "@dxos/rpc";
+// packages/sdk/client-services/src/packlets/worker/worker-session.ts
+import { asyncTimeout, Trigger } from "@dxos/async";
+import { iframeServiceBundle, PROXY_CONNECTION_TIMEOUT, workerServiceBundle } from "@dxos/client-protocol";
+import { invariant } from "@dxos/invariant";
+import { log, logInfo } from "@dxos/log";
+import { createProtoRpcPeer } from "@dxos/rpc";
 import { Callback } from "@dxos/util";
-function _ts_decorate2(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);
@@ -370,13 +64,13 @@ function _ts_decorate2(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_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 Trigger3();
+    this._startTrigger = new Trigger();
     this.onClose = new Callback();
-    invariant2(serviceHost, void 0, {
-      F: __dxlog_file4,
+    invariant(serviceHost, void 0, {
+      F: __dxlog_file,
       L: 54,
       S: this,
       A: [
@@ -388,7 +82,7 @@ var WorkerSession = class {
     const middleware = {
       handleCall: async (method, params, handler) => {
         const error = await readySignal.wait({
-          timeout: PROXY_CONNECTION_TIMEOUT2
+          timeout: PROXY_CONNECTION_TIMEOUT
         });
         if (error) {
           throw error;
@@ -397,7 +91,7 @@ var WorkerSession = class {
       },
       handleStream: async (method, params, handler) => {
         const error = await readySignal.wait({
-          timeout: PROXY_CONNECTION_TIMEOUT2
+          timeout: PROXY_CONNECTION_TIMEOUT
         });
         if (error) {
           throw error;
@@ -415,9 +109,9 @@ var WorkerSession = class {
       port: shellPort,
       ...middleware
     }) : void 0;
-    this._iframeRpc = createProtoRpcPeer3({
-      requested: iframeServiceBundle2,
-      exposed: workerServiceBundle2,
+    this._iframeRpc = createProtoRpcPeer({
+      requested: iframeServiceBundle,
+      exposed: workerServiceBundle,
       handlers: {
         WorkerService: {
           start: async (request) => {
@@ -432,8 +126,8 @@ var WorkerSession = class {
               try {
                 await this.close();
               } catch (err) {
-                log3.catch(err, void 0, {
-                  F: __dxlog_file4,
+                log.catch(err, void 0, {
+                  F: __dxlog_file,
                   L: 108,
                   S: this,
                   C: (f, a) => f(...a)
@@ -449,8 +143,8 @@ var WorkerSession = class {
     this.bridgeService = this._iframeRpc.rpc.BridgeService;
   }
   async open() {
-    log3.info("opening...", void 0, {
-      F: __dxlog_file4,
+    log.info("opening...", void 0, {
+      F: __dxlog_file,
       L: 122,
       S: this,
       C: (f, a) => f(...a)
@@ -461,21 +155,21 @@ var WorkerSession = class {
       this._maybeOpenShell()
     ]);
     await this._startTrigger.wait({
-      timeout: PROXY_CONNECTION_TIMEOUT2
+      timeout: PROXY_CONNECTION_TIMEOUT
     });
     if (this.lockKey) {
       void this._afterLockReleases(this.lockKey, () => this.close());
     }
-    log3.info("opened", void 0, {
-      F: __dxlog_file4,
+    log.info("opened", void 0, {
+      F: __dxlog_file,
       L: 133,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async close() {
-    log3.info("closing...", void 0, {
-      F: __dxlog_file4,
+    log.info("closing...", void 0, {
+      F: __dxlog_file,
       L: 137,
       S: this,
       C: (f, a) => f(...a)
@@ -483,8 +177,8 @@ var WorkerSession = class {
     try {
       await this.onClose.callIfSet();
     } catch (err) {
-      log3.catch(err, void 0, {
-        F: __dxlog_file4,
+      log.catch(err, void 0, {
+        F: __dxlog_file,
         L: 141,
         S: this,
         C: (f, a) => f(...a)
@@ -494,8 +188,8 @@ var WorkerSession = class {
       this._clientRpc.close(),
       this._iframeRpc.close()
     ]);
-    log3.info("closed", void 0, {
-      F: __dxlog_file4,
+    log.info("closed", void 0, {
+      F: __dxlog_file,
       L: 145,
       S: this,
       C: (f, a) => f(...a)
@@ -505,8 +199,8 @@ var WorkerSession = class {
     try {
       this._shellClientRpc && await asyncTimeout(this._shellClientRpc.open(), 1e3);
     } catch {
-      log3.info("No shell connected.", void 0, {
-        F: __dxlog_file4,
+      log.info("No shell connected.", void 0, {
+        F: __dxlog_file,
         L: 152,
         S: this,
         C: (f, a) => f(...a)
@@ -518,20 +212,20 @@ var WorkerSession = class {
     }).then(callback);
   }
 };
-_ts_decorate2([
-  logInfo2
+_ts_decorate([
+  logInfo
 ], WorkerSession.prototype, "origin", void 0);
-_ts_decorate2([
-  logInfo2
+_ts_decorate([
+  logInfo
 ], WorkerSession.prototype, "lockKey", void 0);
 
-// packages/sdk/client-services/src/packlets/vault/worker-runtime.ts
-var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/vault/worker-runtime.ts";
+// packages/sdk/client-services/src/packlets/worker/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 SimplePeerTransportProxyFactory();
-    this._ready = new Trigger4();
+    this._ready = new Trigger2();
     this._sessions = /* @__PURE__ */ new Set();
     this._signalMetadataTags = {
       runtime: "worker-runtime"
@@ -549,8 +243,8 @@ var WorkerRuntime = class {
     return this._clientServices;
   }
   async start() {
-    log4("starting...", void 0, {
-      F: __dxlog_file5,
+    log2("starting...", void 0, {
+      F: __dxlog_file2,
       L: 71,
       S: this,
       C: (f, a) => f(...a)
@@ -561,13 +255,13 @@ var WorkerRuntime = class {
       const signals = this._config.get("runtime.services.signaling");
       this._clientServices.initialize({
         config: this._config,
-        signalManager: signals ? new WebsocketSignalManager2(signals, () => this._signalTelemetryEnabled ? this._signalMetadataTags : {}) : new MemorySignalManager2(new MemorySignalManagerContext2()),
+        signalManager: signals ? new WebsocketSignalManager(signals, () => this._signalTelemetryEnabled ? this._signalMetadataTags : {}) : new MemorySignalManager(new MemorySignalManagerContext()),
         transportFactory: this._transportFactory
       });
-      await this._clientServices.open(new Context2());
+      await this._clientServices.open(new Context());
       this._ready.wake(void 0);
-      log4("started", void 0, {
-        F: __dxlog_file5,
+      log2("started", void 0, {
+        F: __dxlog_file2,
         L: 86,
         S: this,
         C: (f, a) => f(...a)
@@ -581,8 +275,8 @@ var WorkerRuntime = class {
       });
     } catch (err) {
       this._ready.wake(err);
-      log4.error("starting", err, {
-        F: __dxlog_file5,
+      log2.error("starting", err, {
+        F: __dxlog_file2,
         L: 96,
         S: this,
         C: (f, a) => f(...a)
@@ -615,8 +309,8 @@ var WorkerRuntime = class {
       }
     });
     await session.open();
-    invariant3(!this._signalMetadataTags.origin || this._signalMetadataTags.origin === session.origin, `worker origin changed from ${this._signalMetadataTags.origin} to ${session.origin}?`, {
-      F: __dxlog_file5,
+    invariant2(!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: [
@@ -636,8 +330,8 @@ var WorkerRuntime = class {
   * Selects one of the existing session for WebRTC networking.
   */
   _reconnectWebrtc() {
-    log4("reconnecting webrtc...", void 0, {
-      F: __dxlog_file5,
+    log2("reconnecting webrtc...", void 0, {
+      F: __dxlog_file2,
       L: 151,
       S: this,
       C: (f, a) => f(...a)
@@ -668,7 +362,6 @@ export {
   DevtoolsHostEvents,
   DevtoolsServiceImpl,
   DiagnosticsCollector,
-  IFrameHostRuntime,
   Identity,
   IdentityManager,
   IdentityServiceImpl,
@@ -678,8 +371,6 @@ export {
   Lock,
   ServiceContext,
   ServiceRegistry,
-  SharedWorkerConnection,
-  ShellRuntimeImpl,
   SpaceInvitationProtocol,
   SpacesServiceImpl,
   TrustedKeySetAuthVerifier,
@@ -692,7 +383,6 @@ export {
   createDiagnostics,
   createLevel,
   createStorageObjects,
-  findPropertiesObject,
   getNetworkPeers,
   isLocked,
   subscribeToFeedBlocks,