@dxos/client-services 0.1.41-next.d517c89 → 0.1.41

package/src/packlets/vault/iframe-proxy-runtime.ts

@@ -2,20 +2,20 @@
 // Copyright 2022 DXOS.org
 //
 
-import { iframeServiceBundle, workerServiceBundle, WorkerServiceBundle } from '@dxos/client';
+import { Config, iframeServiceBundle, workerServiceBundle, WorkerServiceBundle } from '@dxos/client';
 import { RemoteServiceConnectionError } from '@dxos/errors';
 import { log } from '@dxos/log';
 import { WebRTCTransportService } from '@dxos/network-manager';
 import { BridgeService } from '@dxos/protocols/proto/dxos/mesh/bridge';
 import { createProtoRpcPeer, ProtoRpcPeer, RpcPort } from '@dxos/rpc';
+import { getAsyncValue, MaybePromise, Provider } from '@dxos/util';
 
 import { ShellRuntime, ShellRuntimeImpl } from './shell-runtime';
 
 // NOTE: Keep as RpcPorts to avoid dependency on @dxos/rpc-tunnel so we don't depend on browser-specific apis.
 export type IFrameProxyRuntimeParams = {
+  config: Config | Provider<MaybePromise<Config>>;
   systemPort: RpcPort;
-  workerAppPort: RpcPort;
-  windowAppPort: RpcPort;
   shellPort?: RpcPort;
 };
 
@@ -23,32 +23,40 @@ export type IFrameProxyRuntimeParams = {
  * Manages the client connection to the shared worker.
  */
 export class IFrameProxyRuntime {
+  private readonly _configProvider: IFrameProxyRuntimeParams['config'];
   private readonly _systemPort: RpcPort;
-  private readonly _windowAppPort: RpcPort;
-  private readonly _workerAppPort: RpcPort;
   private readonly _shellPort?: RpcPort;
-  private readonly _systemRpc: ProtoRpcPeer<WorkerServiceBundle>;
-  private readonly _shellRuntime?: ShellRuntimeImpl;
-  private readonly _transportService = new WebRTCTransportService({
-    iceServers: [
-      { urls: 'stun:dev.kube.dxos.org:3478', username: 'dxos', credential: 'dxos' },
-      { urls: 'turn:dev.kube.dxos.org:3478', username: 'dxos', credential: 'dxos' },
-      { urls: 'stun:kube.dxos.org:3478', username: 'dxos', credential: 'dxos' },
-      { urls: 'turn:kube.dxos.org:3478', username: 'dxos', credential: 'dxos' }
-    ]
-  });
+  private _config!: Config;
+  private _transportService!: BridgeService;
+  private _systemRpc!: ProtoRpcPeer<WorkerServiceBundle>;
+  private _shellRuntime?: ShellRuntimeImpl;
 
-  constructor({ systemPort, workerAppPort, windowAppPort, shellPort }: IFrameProxyRuntimeParams) {
+  constructor({ config, systemPort, shellPort }: IFrameProxyRuntimeParams) {
+    this._configProvider = config;
     this._systemPort = systemPort;
-    this._windowAppPort = windowAppPort;
-    this._workerAppPort = workerAppPort;
     this._shellPort = shellPort;
 
+    if (this._shellPort) {
+      this._shellRuntime = new ShellRuntimeImpl(this._shellPort);
+    }
+  }
+
+  get shell(): ShellRuntime | undefined {
+    return this._shellRuntime;
+  }
+
+  async open(origin: string) {
+    this._config = await getAsyncValue(this._configProvider);
+
+    this._transportService = new WebRTCTransportService({
+      iceServers: this._config.get('runtime.services.ice')
+    });
+
     this._systemRpc = createProtoRpcPeer({
       requested: workerServiceBundle,
       exposed: iframeServiceBundle,
       handlers: {
-        BridgeService: this._transportService as BridgeService,
+        BridgeService: this._transportService,
         IframeService: {
           async heartbeat() {
             // Ok.
@@ -56,22 +64,9 @@ export class IFrameProxyRuntime {
         }
       },
       port: this._systemPort,
-      timeout: 1000
+      timeout: 200
     });
 
-    this._workerAppPort.subscribe((msg) => this._windowAppPort.send(msg));
-    this._windowAppPort.subscribe((msg) => this._workerAppPort.send(msg));
-
-    if (this._shellPort) {
-      this._shellRuntime = new ShellRuntimeImpl(this._shellPort);
-    }
-  }
-
-  get shell(): ShellRuntime | undefined {
-    return this._shellRuntime;
-  }
-
-  async open(origin: string) {
     try {
       await this._systemRpc.open();
       await this._systemRpc.rpc.WorkerService.start({ origin });
@@ -79,7 +74,6 @@ export class IFrameProxyRuntime {
       log.catch(err);
       throw new RemoteServiceConnectionError('Failed to connect to worker');
     }
-
     await this._shellRuntime?.open();
   }