@dxos/network-manager 2.33.9-dev.7d11f506 → 2.33.9-dev.9bbef4e2

package/src/transport/transport.ts

@@ -6,7 +6,7 @@ import { Event } from '@dxos/async';
 import { ErrorStream } from '@dxos/debug';
 import { PublicKey } from '@dxos/protocols';
 
-import { Message } from '../proto/gen/dxos/mesh/signal';
+import { SignalMessage } from '../proto/gen/dxos/mesh/signalMessage';
 
 /**
  * Abstraction over a P2P connection transport. Currently either WebRTC or in-memory.
@@ -15,7 +15,7 @@ export interface Transport {
   closed: Event
   connected: Event
   errors: ErrorStream
-  signal (msg: Message): Promise<void> // TODO(burdon): Remove async?
+  signal (msg: SignalMessage): Promise<void> // TODO(burdon): Remove async?
   close (): Promise<void>
 }
 
@@ -38,7 +38,7 @@ export interface TransportOptions {
   /**
    * Send a signal message to remote peer.
    */
-  sendSignal: (msg: Message) => Promise<void> // TODO(burdon): Remove async?
+  sendSignal: (msg: SignalMessage) => Promise<void> // TODO(burdon): Remove async?
 }
 
 export type TransportFactory = (options: TransportOptions) => Transport

package/src/transport/webrtc-transport.ts

@@ -3,15 +3,15 @@
 //
 
 import wrtc from '@koush/wrtc';
-import assert from 'assert';
 import debug from 'debug';
+import assert from 'node:assert';
 import SimplePeerConstructor, { Instance as SimplePeer } from 'simple-peer';
 
 import { Event } from '@dxos/async';
 import { ErrorStream } from '@dxos/debug';
 import { PublicKey } from '@dxos/protocols';
 
-import { Message } from '../proto/gen/dxos/mesh/signal';
+import { SignalMessage } from '../proto/gen/dxos/mesh/signalMessage';
 import { Transport, TransportFactory } from './transport';
 
 const log = debug('dxos:network-manager:swarm:transport:webrtc');
@@ -35,7 +35,7 @@ export class WebRTCTransport implements Transport {
     private readonly _remoteId: PublicKey,
     private readonly _sessionId: PublicKey,
     private readonly _topic: PublicKey,
-    private readonly _sendSignal: (msg: Message) => void,
+    private readonly _sendSignal: (msg: SignalMessage) => void,
     private readonly _webrtcConfig?: any
   ) {
     log(`Created WebRTC connection ${this._ownId} -> ${this._remoteId} initiator=${this._initiator}`);
@@ -89,7 +89,7 @@ export class WebRTCTransport implements Transport {
     return this._peer;
   }
 
-  async signal (msg: Message) {
+  async signal (msg: SignalMessage) {
     assert(this._peer, 'Connection not ready to accept signals.');
     assert(msg.data?.signal?.json, 'Signal message must contain signal data.');
     this._peer.signal(JSON.parse(msg.data.signal.json));

package/dist/src/signal/websocket-rpc.d.ts

@@ -1,30 +0,0 @@
-import { Event } from '@dxos/async';
-import { SignalApi } from './signal-api';
-/**
- * A websocket connection paired with nanomessage-rpc endpoint.
- *
- * Provides lifecycle events and command trace.
- *
- * Does not automatically reconnect, if the connection is dropped client must recreate the class instance.
- */
-export declare class WebsocketRpc {
-    private readonly _host;
-    private readonly _connectTrigger;
-    private readonly _socket;
-    private readonly _rpc;
-    private _messageId;
-    readonly commandTrace: Event<SignalApi.CommandTrace>;
-    readonly connected: Event<void>;
-    readonly disconnected: Event<void>;
-    readonly error: Event<Error>;
-    /**
-     * @param _host Signal server websocket URL.
-     */
-    constructor(_host: string);
-    close(): Promise<void>;
-    call(method: string, payload: any): Promise<any>;
-    emit(method: string, data: any): Promise<any>;
-    addHandler(method: string, handler: (data: any) => Promise<any>): void;
-    subscribe(method: string, handler: (data: any) => void): void;
-}
-//# sourceMappingURL=websocket-rpc.d.ts.map

package/dist/src/signal/websocket-rpc.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"websocket-rpc.d.ts","sourceRoot":"","sources":["../../../src/signal/websocket-rpc.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,EAAkB,MAAM,aAAa,CAAC;AAEpD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAMzC;;;;;;GAMG;AACH,qBAAa,YAAY;IAerB,OAAO,CAAC,QAAQ,CAAC,KAAK;IAdxB,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAiB;IACjD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAY;IACpC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAM;IAC3B,OAAO,CAAC,UAAU,CAAc;IAEhC,QAAQ,CAAC,YAAY,gCAAuC;IAC5D,QAAQ,CAAC,SAAS,cAAe;IACjC,QAAQ,CAAC,YAAY,cAAe;IACpC,QAAQ,CAAC,KAAK,eAAsB;IAEpC;;OAEG;gBAEgB,KAAK,EAAE,MAAM;IAiE1B,KAAK;IAQL,IAAI,CAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAqCjD,IAAI,CAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG;IAYrC,UAAU,CAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC;IAgChE,SAAS,CAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI;CAaxD"}

package/dist/src/signal/websocket-rpc.js

@@ -1,203 +0,0 @@
-"use strict";
-//
-// Copyright 2020 DXOS.org
-//
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebsocketRpc = void 0;
-const assert_1 = __importDefault(require("assert"));
-const debug_1 = __importDefault(require("debug"));
-const isomorphic_ws_1 = __importDefault(require("isomorphic-ws"));
-const nanomessage_rpc_1 = __importDefault(require("nanomessage-rpc"));
-const util_1 = require("util");
-const async_1 = require("@dxos/async");
-const log = (0, debug_1.default)('dxos:network-manager:websocket-rpc');
-const RPC_TIMEOUT = 3000;
-/**
- * A websocket connection paired with nanomessage-rpc endpoint.
- *
- * Provides lifecycle events and command trace.
- *
- * Does not automatically reconnect, if the connection is dropped client must recreate the class instance.
- */
-class WebsocketRpc {
-    /**
-     * @param _host Signal server websocket URL.
-     */
-    constructor(_host) {
-        this._host = _host;
-        this._connectTrigger = new async_1.Trigger();
-        this._messageId = Date.now();
-        this.commandTrace = new async_1.Event();
-        this.connected = new async_1.Event();
-        this.disconnected = new async_1.Event();
-        this.error = new async_1.Event();
-        this._socket = new isomorphic_ws_1.default(this._host);
-        this._socket.onopen = async () => {
-            log(`Websocket connected ${this._host}`);
-            this._connectTrigger.wake();
-            try {
-                await this._rpc.open();
-                log(`RPC open ${this._host}`);
-                this.connected.emit();
-            }
-            catch (err) {
-                this.error.emit(err);
-            }
-        };
-        this._socket.onclose = async () => {
-            log(`Disconnected ${this._host}`);
-            this.disconnected.emit();
-            try {
-                await this._rpc.close();
-            }
-            catch (err) {
-                this.error.emit(err);
-            }
-        };
-        this._socket.onerror = e => {
-            var _a;
-            log(`Signal socket error ${this._host} ${e.message}`);
-            this.error.emit((_a = e.error) !== null && _a !== void 0 ? _a : new Error(e.message));
-        };
-        this._rpc = (0, nanomessage_rpc_1.default)({
-            send: async (data) => {
-                await this._connectTrigger.wait();
-                (0, assert_1.default)(this._socket, 'No socket');
-                await (0, util_1.promisify)(this._socket.send.bind(this._socket))(data);
-            },
-            subscribe: (next) => {
-                void this._connectTrigger.wait().then(() => {
-                    (0, assert_1.default)(this._socket, 'No socket');
-                    this._socket.onmessage = async (e) => {
-                        try {
-                            // `e.data` is Buffer in node, and Blob in chrome.
-                            let data;
-                            if (Object.getPrototypeOf(e.data).constructor.name === 'Blob') {
-                                data = Buffer.from(await e.data.arrayBuffer());
-                            }
-                            else {
-                                data = e.data;
-                            }
-                            next(data);
-                        }
-                        catch (err) {
-                            this.error.emit(err);
-                        }
-                    };
-                });
-                return () => {
-                    if (this._socket) {
-                        this._socket.onmessage = () => { };
-                    }
-                };
-            }
-        });
-        this._rpc.on('error', (error) => this.error.emit(error));
-    }
-    async close() {
-        try {
-            await this._rpc.close();
-        }
-        finally {
-            this._socket.close();
-        }
-    }
-    async call(method, payload) {
-        const start = Date.now();
-        try {
-            const response = await Promise.race([
-                (async () => {
-                    await this._rpc.open();
-                    await this._connectTrigger.wait();
-                    return this._rpc.call(method, payload);
-                })(),
-                (0, async_1.sleep)(RPC_TIMEOUT).then(() => Promise.reject(new Error(`Signal RPC call timed out in ${RPC_TIMEOUT} ms`)))
-            ]);
-            this.commandTrace.emit({
-                messageId: `${this._host}-${this._messageId++}`,
-                host: this._host,
-                incoming: false,
-                time: Date.now() - start,
-                method,
-                payload,
-                response
-            });
-            log(`Signal RPC ${this._host}: ${method} ${JSON.stringify(payload)} ${JSON.stringify(response)}`);
-            return response;
-        }
-        catch (err) {
-            log(`Signal RPC error ${this._host}: ${method} ${JSON.stringify(payload)} ${err.message}`);
-            this.commandTrace.emit({
-                messageId: `${this._host}-${this._messageId++}`,
-                host: this._host,
-                incoming: false,
-                time: Date.now() - start,
-                method,
-                payload,
-                error: err.message
-            });
-            throw err;
-        }
-    }
-    async emit(method, data) {
-        this.commandTrace.emit({
-            messageId: `${this._host}-${this._messageId++}`,
-            host: this._host,
-            incoming: false,
-            time: 0,
-            method,
-            payload: data
-        });
-        return this._rpc.emit('signal', data);
-    }
-    addHandler(method, handler) {
-        this._rpc.actions({
-            [method]: async (data) => {
-                const begin = Date.now();
-                try {
-                    const response = await handler(data);
-                    this.commandTrace.emit({
-                        messageId: `${this._host}-${this._messageId++}`,
-                        host: this._host,
-                        incoming: true,
-                        time: Date.now() - begin,
-                        method,
-                        payload: data,
-                        response
-                    });
-                    return response;
-                }
-                catch (error) {
-                    this.commandTrace.emit({
-                        messageId: `${this._host}-${this._messageId++}`,
-                        host: this._host,
-                        incoming: true,
-                        time: Date.now() - begin,
-                        method,
-                        payload: data,
-                        error: error.message
-                    });
-                    throw error;
-                }
-            }
-        });
-    }
-    subscribe(method, handler) {
-        this._rpc.on(method, (data) => {
-            this.commandTrace.emit({
-                messageId: `${this._host}-${this._messageId++}`,
-                host: this._host,
-                incoming: true,
-                time: 0,
-                method,
-                payload: data
-            });
-            handler(data);
-        });
-    }
-}
-exports.WebsocketRpc = WebsocketRpc;
-//# sourceMappingURL=websocket-rpc.js.map

package/dist/src/signal/websocket-rpc.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"websocket-rpc.js","sourceRoot":"","sources":["../../../src/signal/websocket-rpc.ts"],"names":[],"mappings":"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"}

package/dist/src/signal/websocket-signal-manager.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"websocket-signal-manager.d.ts","sourceRoot":"","sources":["../../../src/signal/websocket-signal-manager.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,EAAgB,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAIjD,qBAAa,sBAAuB,YAAW,aAAa;IAexD,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAf3B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmC;IAE5D,qCAAqC;IACrC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgE;IAC9F,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAuD;IAE9F,OAAO,CAAC,mBAAmB,CAAC,CAAiB;IAE7C,QAAQ,CAAC,aAAa,4BAAmC;IACzD,QAAQ,CAAC,YAAY,gCAAuC;IAC5D,QAAQ,CAAC,qBAAqB,qDAA2D;IACzF,QAAQ,CAAC,QAAQ,iBAAwB;gBAGtB,MAAM,EAAE,MAAM,EAAE,EAChB,QAAQ,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC;IAkBlE,SAAS,IAAK,SAAS,CAAC,MAAM,EAAE;IAIhC,IAAI,CAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS;IAMzC,KAAK,CAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS;YAO5B,sBAAsB;IA4CpC,OAAO,CAAC,UAAU;IAWlB,MAAM,CAAE,KAAK,EAAE,SAAS;IAgBxB,KAAK,CAAE,GAAG,EAAE,OAAO;IAMb,MAAM,CAAE,GAAG,EAAE,OAAO;IAQpB,OAAO;CAGd"}

package/dist/src/signal/websocket-signal-manager.js

@@ -1,134 +0,0 @@
-"use strict";
-//
-// Copyright 2020 DXOS.org
-//
-var __decorate = (this && this.__decorate) || function (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 __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebsocketSignalManager = void 0;
-const assert_1 = __importDefault(require("assert"));
-const debug_1 = __importDefault(require("debug"));
-const async_1 = require("@dxos/async");
-const util_1 = require("@dxos/util");
-const signal_client_1 = require("./signal-client");
-const log = (0, debug_1.default)('dxos:network-manager:websocket-signal-manager');
-class WebsocketSignalManager {
-    constructor(_hosts, _onOffer) {
-        this._hosts = _hosts;
-        this._onOffer = _onOffer;
-        this._servers = new Map();
-        /** Topics joined: topic => peerId */
-        this._topicsJoined = new util_1.ComplexMap(topic => topic.toHex());
-        this._topicsJoinedPerSignal = new Map();
-        this.statusChanged = new async_1.Event();
-        this.commandTrace = new async_1.Event();
-        this.peerCandidatesChanged = new async_1.Event();
-        this.onSignal = new async_1.Event();
-        log(`Created WebsocketSignalManager with signal servers: ${_hosts}`);
-        (0, assert_1.default)(_hosts.length === 1, 'Only a single signaling server connection is supported');
-        for (const host of this._hosts) {
-            const server = new signal_client_1.SignalClient(host, async (msg) => this._onOffer(msg), async (msg) => this.onSignal.emit(msg));
-            this._servers.set(host, server);
-            server.statusChanged.on(() => this.statusChanged.emit(this.getStatus()));
-            server.commandTrace.on(trace => this.commandTrace.emit(trace));
-            this._topicsJoinedPerSignal.set(host, new util_1.ComplexMap(x => x.toHex()));
-        }
-    }
-    getStatus() {
-        return Array.from(this._servers.values()).map(server => server.getStatus());
-    }
-    join(topic, peerId) {
-        log(`Join ${topic} ${peerId}`);
-        this._topicsJoined.set(topic, peerId);
-        void this._reconcileJoinedTopics();
-    }
-    leave(topic, peerId) {
-        log(`Leave ${topic} ${peerId}`);
-        this._topicsJoined.delete(topic);
-        void this._reconcileJoinedTopics();
-    }
-    async _reconcileJoinedTopics() {
-        log('Reconciling joined topics');
-        const promises = [];
-        for (const [host, server] of this._servers.entries()) {
-            for (const [topic, peerId] of this._topicsJoined.entries()) {
-                if (!this._topicsJoinedPerSignal.get(host).has(topic)) {
-                    log(`Join ${topic} as ${peerId} on ${host}`);
-                    promises.push(server.join(topic, peerId).then(peers => {
-                        log(`Joined successfully ${host}`);
-                        this._topicsJoinedPerSignal.get(host).set(topic, peerId);
-                        log(`Peer candidates changed ${topic} ${peers}`);
-                        // TODO(marik-d): Deduplicate peers.
-                        this.peerCandidatesChanged.emit([topic, peers]);
-                    }, err => {
-                        log(`Join error ${host} ${err.message}`);
-                        this._topicsJoinedPerSignal.get(host).delete(topic);
-                        this._reconcile();
-                    }));
-                }
-                for (const [topic, peerId] of this._topicsJoinedPerSignal.get(host).entries()) {
-                    if (!this._topicsJoined.has(topic)) {
-                        log(`Leave ${topic} as ${peerId} on ${host}`);
-                        promises.push(server.leave(topic, peerId).then(() => {
-                            log(`Left successfully ${host}`);
-                            this._topicsJoinedPerSignal.get(host).delete(topic);
-                        }, err => {
-                            log(`Leave error ${host} ${err.message}`);
-                            this._reconcile();
-                        }));
-                    }
-                }
-            }
-        }
-        await Promise.all(promises);
-    }
-    _reconcile() {
-        if (this._reconcileTimeoutId !== undefined) {
-            return;
-        }
-        log('Will reconcile in 3 seconds');
-        this._reconcileTimeoutId = setTimeout(async () => {
-            this._reconcileTimeoutId = undefined;
-            await this._reconcileJoinedTopics();
-        }, 3000);
-    }
-    lookup(topic) {
-        log(`Lookup ${topic}`);
-        for (const server of this._servers.values()) {
-            server.lookup(topic).then(peers => {
-                log(`Peer candidates changed ${topic} ${peers}`);
-                // TODO(marik-d): Deduplicate peers.
-                this.peerCandidatesChanged.emit([topic, peers]);
-            }, () => {
-                // Error will already be reported in devtools. No need to do anything here.
-            });
-        }
-    }
-    offer(msg) {
-        log(`Offer ${msg.remoteId}`);
-        // TODO(marik-d): Broadcast to all signal servers.
-        return Array.from(this._servers.values())[0].offer(msg);
-    }
-    async signal(msg) {
-        log(`Signal ${msg.remoteId}`);
-        for (const server of this._servers.values()) {
-            void server.signal(msg);
-            // TODO(marik-d): Error handling.
-        }
-    }
-    async destroy() {
-        await Promise.all(Array.from(this._servers.values()).map(server => server.close()));
-    }
-}
-__decorate([
-    async_1.synchronized
-], WebsocketSignalManager.prototype, "_reconcileJoinedTopics", null);
-exports.WebsocketSignalManager = WebsocketSignalManager;
-//# sourceMappingURL=websocket-signal-manager.js.map

package/dist/src/signal/websocket-signal-manager.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"websocket-signal-manager.js","sourceRoot":"","sources":["../../../src/signal/websocket-signal-manager.ts"],"names":[],"mappings":"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"}

package/src/signal/websocket-rpc.ts

@@ -1,208 +0,0 @@
-//
-// Copyright 2020 DXOS.org
-//
-
-import assert from 'assert';
-import debug from 'debug';
-import WebSocket from 'isomorphic-ws';
-import nanomessagerpc from 'nanomessage-rpc';
-import { promisify } from 'util';
-
-import { Event, Trigger, sleep } from '@dxos/async';
-
-import { SignalApi } from './signal-api';
-
-const log = debug('dxos:network-manager:websocket-rpc');
-
-const RPC_TIMEOUT = 3_000;
-
-/**
- * A websocket connection paired with nanomessage-rpc endpoint.
- *
- * Provides lifecycle events and command trace.
- *
- * Does not automatically reconnect, if the connection is dropped client must recreate the class instance.
- */
-export class WebsocketRpc {
-  private readonly _connectTrigger = new Trigger();
-  private readonly _socket: WebSocket;
-  private readonly _rpc: any;
-  private _messageId = Date.now();
-
-  readonly commandTrace = new Event<SignalApi.CommandTrace>();
-  readonly connected = new Event();
-  readonly disconnected = new Event();
-  readonly error = new Event<Error>();
-
-  /**
-   * @param _host Signal server websocket URL.
-   */
-  constructor (
-    private readonly _host: string
-  ) {
-    this._socket = new WebSocket(this._host);
-    this._socket.onopen = async () => {
-      log(`Websocket connected ${this._host}`);
-      this._connectTrigger.wake();
-      try {
-        await this._rpc.open();
-        log(`RPC open ${this._host}`);
-        this.connected.emit();
-      } catch (err: any) {
-        this.error.emit(err);
-      }
-    };
-
-    this._socket.onclose = async () => {
-      log(`Disconnected ${this._host}`);
-      this.disconnected.emit();
-      try {
-        await this._rpc.close();
-      } catch (err: any) {
-        this.error.emit(err);
-      }
-    };
-
-    this._socket.onerror = e => {
-      log(`Signal socket error ${this._host} ${e.message}`);
-      this.error.emit(e.error ?? new Error(e.message));
-    };
-
-    this._rpc = nanomessagerpc({
-      send: async (data: Uint8Array) => {
-        await this._connectTrigger.wait();
-        assert(this._socket, 'No socket');
-        await promisify(this._socket.send.bind(this._socket) as any)(data);
-      },
-      subscribe: (next: (data: any) => void) => {
-        void this._connectTrigger.wait().then(() => {
-          assert(this._socket, 'No socket');
-          this._socket.onmessage = async e => {
-            try {
-              // `e.data` is Buffer in node, and Blob in chrome.
-              let data: Buffer;
-              if (Object.getPrototypeOf(e.data).constructor.name === 'Blob') {
-                data = Buffer.from(await (e.data as any).arrayBuffer());
-              } else {
-                data = e.data as any;
-              }
-              next(data);
-            } catch (err: any) {
-              this.error.emit(err);
-            }
-          };
-        });
-
-        return () => {
-          if (this._socket) {
-            this._socket.onmessage = () => {};
-          }
-        };
-      }
-    });
-    this._rpc.on('error', (error: Error) => this.error.emit(error));
-  }
-
-  async close () {
-    try {
-      await this._rpc.close();
-    } finally {
-      this._socket.close();
-    }
-  }
-
-  async call (method: string, payload: any): Promise<any> {
-    const start = Date.now();
-    try {
-      const response = await Promise.race([
-        (async () => {
-          await this._rpc.open();
-          await this._connectTrigger.wait();
-          return this._rpc.call(method, payload);
-        })(),
-        sleep(RPC_TIMEOUT).then(() => Promise.reject(new Error(`Signal RPC call timed out in ${RPC_TIMEOUT} ms`)))
-      ]);
-      this.commandTrace.emit({
-        messageId: `${this._host}-${this._messageId++}`,
-        host: this._host,
-        incoming: false,
-        time: Date.now() - start,
-        method,
-        payload,
-        response
-      });
-      log(`Signal RPC ${this._host}: ${method} ${JSON.stringify(payload)} ${JSON.stringify(response)}`);
-      return response;
-    } catch (err: any) {
-      log(`Signal RPC error ${this._host}: ${method} ${JSON.stringify(payload)} ${err.message}`);
-      this.commandTrace.emit({
-        messageId: `${this._host}-${this._messageId++}`,
-        host: this._host,
-        incoming: false,
-        time: Date.now() - start,
-        method,
-        payload,
-        error: err.message
-      });
-      throw err;
-    }
-  }
-
-  async emit (method: string, data: any) {
-    this.commandTrace.emit({
-      messageId: `${this._host}-${this._messageId++}`,
-      host: this._host,
-      incoming: false,
-      time: 0,
-      method,
-      payload: data
-    });
-    return this._rpc.emit('signal', data);
-  }
-
-  addHandler (method: string, handler: (data: any) => Promise<any>) {
-    this._rpc.actions({
-      [method]: async (data: any) => {
-        const begin = Date.now();
-        try {
-          const response = await handler(data);
-          this.commandTrace.emit({
-            messageId: `${this._host}-${this._messageId++}`,
-            host: this._host,
-            incoming: true,
-            time: Date.now() - begin,
-            method,
-            payload: data,
-            response
-          });
-          return response;
-        } catch (error: any) {
-          this.commandTrace.emit({
-            messageId: `${this._host}-${this._messageId++}`,
-            host: this._host,
-            incoming: true,
-            time: Date.now() - begin,
-            method,
-            payload: data,
-            error: error.message
-          });
-          throw error;
-        }
-      }
-    });
-  }
-
-  subscribe (method: string, handler: (data: any) => void) {
-    this._rpc.on(method, (data: any) => {
-      this.commandTrace.emit({
-        messageId: `${this._host}-${this._messageId++}`,
-        host: this._host,
-        incoming: true,
-        time: 0,
-        method,
-        payload: data
-      });
-      handler(data);
-    });
-  }
-}