@dxos/client-services 0.1.39-next.90cb9b6 → 0.1.40

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

@@ -3,6 +3,8 @@
 //
 
 import { 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';
@@ -27,7 +29,14 @@ export class IFrameProxyRuntime {
   private readonly _shellPort?: RpcPort;
   private readonly _systemRpc: ProtoRpcPeer<WorkerServiceBundle>;
   private readonly _shellRuntime?: ShellRuntimeImpl;
-  private readonly _transportService = new WebRTCTransportService();
+  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' }
+    ]
+  });
 
   constructor({ systemPort, workerAppPort, windowAppPort, shellPort }: IFrameProxyRuntimeParams) {
     this._systemPort = systemPort;
@@ -47,7 +56,7 @@ export class IFrameProxyRuntime {
         }
       },
       port: this._systemPort,
-      timeout: 200
+      timeout: 1000
     });
 
     this._workerAppPort.subscribe((msg) => this._windowAppPort.send(msg));
@@ -63,8 +72,14 @@ export class IFrameProxyRuntime {
   }
 
   async open(origin: string) {
-    await this._systemRpc.open();
-    await this._systemRpc.rpc.WorkerService.start({ origin });
+    try {
+      await this._systemRpc.open();
+      await this._systemRpc.rpc.WorkerService.start({ origin });
+    } catch (err) {
+      log.catch(err);
+      throw new RemoteServiceConnectionError('Failed to connect to worker');
+    }
+
     await this._shellRuntime?.open();
   }
 

package/src/packlets/vault/worker-runtime.ts

@@ -48,13 +48,13 @@ export class WorkerRuntime {
     log('starting...');
     try {
       this._config = await this._configProvider();
-      const signalServer = this._config.get('runtime.services.signal.server');
+      const signals = this._config.get('runtime.services.signaling');
       this._clientServices.initialize({
         config: this._config,
         networkManager: new NetworkManager({
           log: true,
-          signalManager: signalServer
-            ? new WebsocketSignalManager([signalServer])
+          signalManager: signals
+            ? new WebsocketSignalManager(signals)
             : new MemorySignalManager(new MemorySignalManagerContext()), // TODO(dmaretskyi): Inject this context.
           transportFactory: this._transportFactory
         })