@dxos/network-manager 2.33.9-dev.d0ae5f95 → 2.33.9-dev.d0dce35f

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

@@ -0,0 +1 @@
+{"version":3,"file":"signal-manager-impl.d.ts","sourceRoot":"","sources":["../../../src/signal/signal-manager-impl.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,EAAgB,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAIjD,qBAAa,iBAAkB,YAAW,aAAa;IAkBnD,OAAO,CAAC,QAAQ,CAAC,MAAM;IAjBzB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmC;IAE5D,qCAAqC;IACrC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgE;IAC9F,8BAA8B;IAC9B,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAuD;IAE9F,OAAO,CAAC,YAAY,CAAC,CAAkB;IACvC,OAAO,CAAC,mBAAmB,CAAC,CAAiB;IAC7C,OAAO,CAAC,UAAU,CAAS;IAE3B,QAAQ,CAAC,aAAa,4BAAmC;IACzD,QAAQ,CAAC,YAAY,gCAAuC;IAC5D,QAAQ,CAAC,UAAU,oDAA2D;IAC9E,QAAQ,CAAC,SAAS,uBAA8B;gBAG7B,MAAM,EAAE,MAAM,EAAE;IAmBnC,SAAS,IAAK,SAAS,CAAC,MAAM,EAAE;IAIhC,IAAI,CAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS;IAOzC,KAAK,CAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS;IAO1C,OAAO,CAAC,kBAAkB;IAsB1B,OAAO,CAAC,eAAe;YAWT,sBAAsB;IA0C9B,OAAO,CAAE,GAAG,EAAE,aAAa;IAS3B,OAAO;CAOd"}

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

@@ -0,0 +1,151 @@
+"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.SignalManagerImpl = void 0;
+const debug_1 = __importDefault(require("debug"));
+const node_assert_1 = __importDefault(require("node:assert"));
+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:signal-manager-impl');
+class SignalManagerImpl {
+    constructor(_hosts) {
+        this._hosts = _hosts;
+        this._servers = new Map();
+        /** Topics joined: topic => peerId */
+        this._topicsJoined = new util_1.ComplexMap(topic => topic.toHex());
+        /** host => topic => peerId */
+        this._topicsJoinedPerSignal = new Map();
+        this._reconciling = false;
+        this._destroyed = false;
+        this.statusChanged = new async_1.Event();
+        this.commandTrace = new async_1.Event();
+        this.swarmEvent = new async_1.Event();
+        this.onMessage = new async_1.Event();
+        log(`Created WebsocketSignalManager with signal servers: ${_hosts}`);
+        (0, node_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.onMessage.emit(msg));
+            // TODO(mykola): Add subscription group
+            server.swarmEvent.on(data => this.swarmEvent.emit(data));
+            server.statusChanged.on(() => this.statusChanged.emit(this.getStatus()));
+            this._servers.set(host, server);
+            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) {
+        (0, node_assert_1.default)(!this._topicsJoined.has(topic), `Topic ${topic} is already joined`);
+        log(`Join ${topic} ${peerId}`);
+        this._topicsJoined.set(topic, peerId);
+        this._scheduleReconcile();
+    }
+    leave(topic, peerId) {
+        (0, node_assert_1.default)(!!this._topicsJoined.has(topic), `Topic ${topic} was not joined`);
+        log(`Leave ${topic} ${peerId}`);
+        this._topicsJoined.delete(topic);
+        this._scheduleReconcile();
+    }
+    _scheduleReconcile() {
+        if (this._destroyed) {
+            return;
+        }
+        if (!this._reconciling) {
+            this._reconciling = true;
+            this._reconcileJoinedTopics().then(() => {
+                this._reconciling = false;
+            }, err => {
+                this._reconciling = false;
+                log(`Error while reconciling: ${err}`);
+                this._reconcileLater();
+            });
+        }
+        else {
+            this._reconcileLater();
+        }
+    }
+    _reconcileLater() {
+        if (this._destroyed) {
+            return;
+        }
+        if (!this._reconcileTimeoutId) {
+            this._reconcileTimeoutId = setTimeout(async () => this._scheduleReconcile(), 3000);
+        }
+    }
+    async _reconcileJoinedTopics() {
+        // TODO(mykola): Handle reconnects to SS. Maybe move map of joined topics to signal-client.
+        log('Reconciling..');
+        for (const [host, server] of this._servers) {
+            const actualJoinedTopics = this._topicsJoinedPerSignal.get(host);
+            // Leave swarms
+            for (const [topic, actualPeerId] of actualJoinedTopics) {
+                try {
+                    const desiredPeerId = this._topicsJoined.get(topic);
+                    if (!desiredPeerId || !desiredPeerId.equals(actualPeerId)) {
+                        await server.leave(topic, actualPeerId);
+                        actualJoinedTopics.delete(topic);
+                    }
+                }
+                catch (err) {
+                    log(`Error leaving swarm: ${err}`);
+                    this._scheduleReconcile();
+                }
+            }
+            // Join swarms
+            for (const [topic, desiredPeerId] of this._topicsJoined) {
+                try {
+                    const actualPeerId = actualJoinedTopics.get(topic);
+                    if (!actualPeerId) {
+                        await server.join(topic, desiredPeerId);
+                        actualJoinedTopics.set(topic, desiredPeerId);
+                    }
+                    else {
+                        if (!actualPeerId.equals(desiredPeerId)) {
+                            throw new Error(`Joined with peerId different from desired: ${JSON.stringify({ actualPeerId, desiredPeerId })}`);
+                        }
+                    }
+                }
+                catch (err) {
+                    log(`Error joining swarm: ${err}`);
+                    this._scheduleReconcile();
+                }
+            }
+        }
+        log('Done reconciling..');
+        this._reconciling = false;
+    }
+    async message(msg) {
+        log(`Signal ${msg.remoteId}`);
+        for (const server of this._servers.values()) {
+            server.signal(msg).catch(err => {
+                log(`Error signaling: ${err}`);
+            });
+        }
+    }
+    async destroy() {
+        this._destroyed = true;
+        if (this._reconcileTimeoutId) {
+            clearTimeout(this._reconcileTimeoutId);
+        }
+        await Promise.all(Array.from(this._servers.values()).map(server => server.close()));
+    }
+}
+__decorate([
+    async_1.synchronized
+], SignalManagerImpl.prototype, "_reconcileJoinedTopics", null);
+exports.SignalManagerImpl = SignalManagerImpl;
+//# sourceMappingURL=signal-manager-impl.js.map

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

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

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

@@ -1,15 +1,12 @@
 import { Event } from '@dxos/async';
 import { PublicKey } from '@dxos/protocols';
-import { Answer, Message } from '../proto/gen/dxos/mesh/signal';
+import { SwarmEvent } from '../proto/gen/dxos/mesh/signal';
+import { Answer, SignalMessage } from '../proto/gen/dxos/mesh/signalMessage';
 import { SignalApi } from './signal-api';
 /**
  * Signal peer discovery interface.
  */
 export interface SignalConnection {
-    /**
-     * Find peers (triggers async event).
-     */
-    lookup(topic: PublicKey): void;
     /**
      * Join topic on signal network, to be discoverable by other peers.
      */
@@ -26,18 +23,22 @@ export interface SignalMessaging {
     /**
      * Offer/answer RPC.
      */
-    offer(msg: Message): Promise<Answer>;
+    offer(msg: SignalMessage): Promise<Answer>;
     /**
-     * Send message to peer.
+     * Reliably send a signal to a peer.
      */
-    signal(msg: Message): Promise<void>;
+    signal(msg: SignalMessage): Promise<void>;
 }
-export interface SignalManager extends SignalConnection, SignalMessaging {
+export interface SignalManager extends SignalConnection {
     statusChanged: Event<SignalApi.Status[]>;
     commandTrace: Event<SignalApi.CommandTrace>;
-    peerCandidatesChanged: Event<[topic: PublicKey, candidates: PublicKey[]]>;
-    onSignal: Event<Message>;
+    swarmEvent: Event<[topic: PublicKey, swarmEvent: SwarmEvent]>;
+    onMessage: Event<SignalMessage>;
     getStatus(): SignalApi.Status[];
     destroy(): Promise<void>;
+    /**
+     * Send message to peer.
+     */
+    message(msg: SignalMessage): Promise<void>;
 }
 //# sourceMappingURL=signal-manager.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"signal-manager.d.ts","sourceRoot":"","sources":["../../../src/signal/signal-manager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,MAAM,CAAE,KAAK,EAAE,SAAS,GAAG,IAAI,CAAA;IAE/B;;OAEG;IACH,IAAI,CAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,GAAG,IAAI,CAAA;IAEhD;;OAEG;IACH,KAAK,CAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,GAAG,IAAI,CAAA;CAClD;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,KAAK,CAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IAErC;;OAEG;IACH,MAAM,CAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CACrC;AAED,MAAM,WAAW,aAAc,SAAQ,gBAAgB,EAAE,eAAe;IACtE,aAAa,EAAE,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAA;IACxC,YAAY,EAAE,KAAK,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;IAC3C,qBAAqB,EAAE,KAAK,CAAC,CAAC,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC,CAAC,CAAA;IACzE,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;IAExB,SAAS,IAAK,SAAS,CAAC,MAAM,EAAE,CAAA;IAChC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CACzB"}
+{"version":3,"file":"signal-manager.d.ts","sourceRoot":"","sources":["../../../src/signal/signal-manager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,IAAI,CAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,GAAG,IAAI,CAAA;IAEhD;;OAEG;IACH,KAAK,CAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,GAAG,IAAI,CAAA;CAClD;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,KAAK,CAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IAE3C;;OAEG;IACH,MAAM,CAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CAC3C;AAED,MAAM,WAAW,aAAc,SAAQ,gBAAgB;IACrD,aAAa,EAAE,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAA;IACxC,YAAY,EAAE,KAAK,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;IAC3C,UAAU,EAAE,KAAK,CAAC,CAAC,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,CAAA;IAC7D,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC,CAAA;IAE/B,SAAS,IAAK,SAAS,CAAC,MAAM,EAAE,CAAA;IAChC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACxB;;OAEG;IACH,OAAO,CAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CAC5C"}

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

@@ -0,0 +1,19 @@
+import { Event } from '@dxos/async';
+import { Any, Stream } from '@dxos/codec-protobuf';
+import { PublicKey } from '@dxos/protocols';
+import { Message } from '../proto/gen/dxos/mesh/signal';
+export declare class SignalRPCClient {
+    private readonly _url;
+    private readonly _socket;
+    private readonly _rpc;
+    private readonly _connectTrigger;
+    readonly connected: Event<void>;
+    readonly disconnected: Event<void>;
+    readonly error: Event<Error>;
+    constructor(_url: string);
+    join(topic: PublicKey, peerId: PublicKey): Promise<Stream<import("../proto/gen/dxos/mesh/signal").SwarmEvent>>;
+    receiveMessages(peerId: PublicKey): Promise<Stream<Message>>;
+    sendMessage(author: PublicKey, recipient: PublicKey, message: Any): Promise<void>;
+    close(): Promise<void>;
+}
+//# sourceMappingURL=signal-rpc-client.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"signal-rpc-client.d.ts","sourceRoot":"","sources":["../../../src/signal/signal-rpc-client.ts"],"names":[],"mappings":"AAOA,OAAO,EAAW,KAAK,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAI5C,OAAO,EAAE,OAAO,EAAU,MAAM,+BAA+B,CAAC;AAOhE,qBAAa,eAAe;IAUxB,OAAO,CAAC,QAAQ,CAAC,IAAI;IATvB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAW;IACnC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAA0B;IAC/C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAiB;IAEjD,QAAQ,CAAC,SAAS,cAAe;IACjC,QAAQ,CAAC,YAAY,cAAe;IACpC,QAAQ,CAAC,KAAK,eAAsB;gBAGjB,IAAI,EAAE,MAAM;IAqDzB,IAAI,CAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS;IAWzC,eAAe,CAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAS7D,WAAW,CAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG;IAUlE,KAAK;CAOZ"}

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

@@ -0,0 +1,108 @@
+"use strict";
+//
+// Copyright 2022 DXOS.org
+//
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SignalRPCClient = void 0;
+const debug_1 = __importDefault(require("debug"));
+const isomorphic_ws_1 = __importDefault(require("isomorphic-ws"));
+const async_1 = require("@dxos/async");
+const rpc_1 = require("@dxos/rpc");
+const gen_1 = require("../proto/gen");
+const log = (0, debug_1.default)('dxos:network-manager:signal-rpc-client');
+class SignalRPCClient {
+    constructor(_url) {
+        this._url = _url;
+        this._connectTrigger = new async_1.Trigger();
+        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._url);
+        this._socket.onopen = async () => {
+            try {
+                await this._rpc.open();
+                log(`RPC open ${this._url}`);
+                this.connected.emit();
+                this._connectTrigger.wake();
+            }
+            catch (err) {
+                this.error.emit(err);
+            }
+        };
+        this._socket.onclose = async () => {
+            log(`Disconnected ${this._url}`);
+            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._url} ${e.message}`);
+            this.error.emit((_a = e.error) !== null && _a !== void 0 ? _a : new Error(e.message));
+        };
+        this._rpc = (0, rpc_1.createBundledRpcClient)({
+            Signal: gen_1.schema.getService('dxos.mesh.signal.Signal')
+        }, {
+            noHandshake: true,
+            port: {
+                send: msg => {
+                    this._socket.send(msg);
+                },
+                subscribe: cb => {
+                    this._socket.onmessage = async (msg) => {
+                        if (typeof Blob !== 'undefined' && msg.data instanceof Blob) {
+                            cb(Buffer.from(await msg.data.arrayBuffer()));
+                        }
+                        else {
+                            cb(msg.data);
+                        }
+                    };
+                }
+            }
+        });
+    }
+    async join(topic, peerId) {
+        log('join', topic, peerId);
+        await this._connectTrigger.wait();
+        const swarmStream = this._rpc.rpc.Signal.join({
+            swarm: topic.asUint8Array(),
+            peer: peerId.asUint8Array()
+        });
+        await swarmStream.waitUntilReady();
+        return swarmStream;
+    }
+    async receiveMessages(peerId) {
+        await this._connectTrigger.wait();
+        const messageStream = this._rpc.rpc.Signal.receiveMessages({
+            peer: peerId.asUint8Array()
+        });
+        await messageStream.waitUntilReady();
+        return messageStream;
+    }
+    async sendMessage(author, recipient, message) {
+        log('sendMessage', author, recipient, message);
+        await this._connectTrigger.wait();
+        await this._rpc.rpc.Signal.sendMessage({
+            author: author.asUint8Array(),
+            recipient: recipient.asUint8Array(),
+            payload: message
+        });
+    }
+    async close() {
+        try {
+            await this._rpc.close();
+        }
+        finally {
+            this._socket.close();
+        }
+    }
+}
+exports.SignalRPCClient = SignalRPCClient;
+//# sourceMappingURL=signal-rpc-client.js.map

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

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

package/dist/src/signal/signal-rpc-client.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=signal-rpc-client.test.d.ts.map

package/dist/src/signal/signal-rpc-client.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"signal-rpc-client.test.d.ts","sourceRoot":"","sources":["../../../src/signal/signal-rpc-client.test.ts"],"names":[],"mappings":""}

package/dist/src/signal/signal-rpc-client.test.js

@@ -0,0 +1,74 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//
+// Copyright 2022 DXOS.org
+//
+const earljs_1 = require("earljs");
+const protocols_1 = require("@dxos/protocols");
+const signal_1 = require("@dxos/signal");
+const signal_rpc_client_1 = require("./signal-rpc-client");
+describe('SignalRPCClient', () => {
+    let broker;
+    before(async () => {
+        broker = await (0, signal_1.createTestBroker)();
+    });
+    after(() => {
+        broker.stop();
+    });
+    const setup = async () => {
+        const client = new signal_rpc_client_1.SignalRPCClient(broker.url());
+        return client;
+    };
+    it('signal between 2 peers', async () => {
+        const client1 = await setup();
+        const client2 = await setup();
+        const peerId1 = protocols_1.PublicKey.random();
+        const peerId2 = protocols_1.PublicKey.random();
+        const stream1 = await client1.receiveMessages(peerId1);
+        const message = {
+            'type_url': 'test',
+            value: Uint8Array.from([1, 2, 3])
+        };
+        await client2.sendMessage(peerId2, peerId1, message);
+        const received = await new Promise(resolve => {
+            stream1.subscribe(message => {
+                resolve(message);
+            }, (error) => {
+                if (error) {
+                    console.log(error);
+                    throw error;
+                }
+            });
+        });
+        (0, earljs_1.expect)(received.author).toEqual(peerId2.asUint8Array());
+        stream1.close();
+    }).timeout(10000);
+    it('join', async () => {
+        var _a;
+        const client1 = await setup();
+        const client2 = await setup();
+        const peerId1 = protocols_1.PublicKey.random();
+        const peerId2 = protocols_1.PublicKey.random();
+        const topic = protocols_1.PublicKey.random();
+        const stream1 = await client1.join(topic, peerId1);
+        const promise = new Promise(resolve => {
+            stream1.subscribe((event) => {
+                var _a;
+                // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain
+                if (peerId2.equals((_a = event.peerAvailable) === null || _a === void 0 ? void 0 : _a.peer)) {
+                    resolve(event);
+                }
+            }, (error) => {
+                if (error) {
+                    console.log(error);
+                    throw error;
+                }
+            });
+        });
+        const stream2 = await client2.join(topic, peerId2);
+        (0, earljs_1.expect)((_a = (await promise).peerAvailable) === null || _a === void 0 ? void 0 : _a.peer).toEqual(peerId2.asBuffer());
+        stream1.close();
+        stream2.close();
+    }).timeout(10000);
+});
+//# sourceMappingURL=signal-rpc-client.test.js.map

package/dist/src/signal/signal-rpc-client.test.js.map

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

package/dist/src/swarm/connection.d.ts

@@ -2,7 +2,7 @@ import { Event } from '@dxos/async';
 import { ErrorStream } from '@dxos/debug';
 import { Protocol } from '@dxos/mesh-protocol';
 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';
 /**
  * State machine for each connection.
@@ -46,12 +46,12 @@ export declare class Connection {
     private _bufferedSignals;
     readonly stateChanged: Event<ConnectionState>;
     readonly errors: ErrorStream;
-    constructor(topic: PublicKey, ownId: PublicKey, remoteId: PublicKey, sessionId: PublicKey, initiator: boolean, _sendSignal: (msg: Message) => Promise<void>, _protocol: Protocol, _transportFactory: TransportFactory);
+    constructor(topic: PublicKey, ownId: PublicKey, remoteId: PublicKey, sessionId: PublicKey, initiator: boolean, _sendSignal: (msg: SignalMessage) => Promise<void>, _protocol: Protocol, _transportFactory: TransportFactory);
     get state(): ConnectionState;
     get transport(): Transport | undefined;
     get protocol(): Protocol;
     connect(): void;
-    signal(msg: Message): Promise<void>;
+    signal(msg: SignalMessage): Promise<void>;
     close(): Promise<void>;
 }
 //# sourceMappingURL=connection.d.ts.map

package/dist/src/swarm/connection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../../src/swarm/connection.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,EAAgB,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAI3D;;GAEG;AACH,oBAAY,eAAe;IACzB;;OAEG;IACH,OAAO,YAAY;IAEnB;;OAEG;IACH,qBAAqB,0BAA0B;IAE/C;;OAEG;IACH,sBAAsB,2BAA2B;IAEjD;;OAEG;IACH,SAAS,cAAc;IAEvB;;OAEG;IACH,MAAM,WAAW;CAClB;AAED;;GAEG;AACH,qBAAa,UAAU;aASH,KAAK,EAAE,SAAS;aAChB,KAAK,EAAE,SAAS;aAChB,QAAQ,EAAE,SAAS;aACnB,SAAS,EAAE,SAAS;aACpB,SAAS,EAAE,OAAO;IAClC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAfpC,OAAO,CAAC,MAAM,CAA4C;IAC1D,OAAO,CAAC,UAAU,CAAwB;IAC1C,OAAO,CAAC,gBAAgB,CAAiB;IAEzC,QAAQ,CAAC,YAAY,yBAAgC;IACrD,QAAQ,CAAC,MAAM,cAAqB;gBAGlB,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,SAAS,EAChB,QAAQ,EAAE,SAAS,EACnB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,OAAO,EACjB,WAAW,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,EAC5C,SAAS,EAAE,QAAQ,EACnB,iBAAiB,EAAE,gBAAgB;IAGtD,IAAI,KAAK,oBAER;IAED,IAAI,SAAS,0BAEZ;IAED,IAAI,QAAQ,aAEX;IAED,OAAO;IAqCD,MAAM,CAAE,GAAG,EAAE,OAAO;IAyBpB,KAAK;CAmBZ"}
+{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../../src/swarm/connection.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,EAAgB,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAI3D;;GAEG;AACH,oBAAY,eAAe;IACzB;;OAEG;IACH,OAAO,YAAY;IAEnB;;OAEG;IACH,qBAAqB,0BAA0B;IAE/C;;OAEG;IACH,sBAAsB,2BAA2B;IAEjD;;OAEG;IACH,SAAS,cAAc;IAEvB;;OAEG;IACH,MAAM,WAAW;CAClB;AAED;;GAEG;AACH,qBAAa,UAAU;aASH,KAAK,EAAE,SAAS;aAChB,KAAK,EAAE,SAAS;aAChB,QAAQ,EAAE,SAAS;aACnB,SAAS,EAAE,SAAS;aACpB,SAAS,EAAE,OAAO;IAClC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAfpC,OAAO,CAAC,MAAM,CAA4C;IAC1D,OAAO,CAAC,UAAU,CAAwB;IAC1C,OAAO,CAAC,gBAAgB,CAAuB;IAE/C,QAAQ,CAAC,YAAY,yBAAgC;IACrD,QAAQ,CAAC,MAAM,cAAqB;gBAGlB,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,SAAS,EAChB,QAAQ,EAAE,SAAS,EACnB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,OAAO,EACjB,WAAW,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC,EAClD,SAAS,EAAE,QAAQ,EACnB,iBAAiB,EAAE,gBAAgB;IAGtD,IAAI,KAAK,oBAER;IAED,IAAI,SAAS,0BAEZ;IAED,IAAI,QAAQ,aAEX;IAED,OAAO;IAqCD,MAAM,CAAE,GAAG,EAAE,aAAa;IAsB1B,KAAK;CAmBZ"}

package/dist/src/swarm/connection.js

@@ -107,10 +107,7 @@ class Connection {
             log('Dropping signal for incorrect session id.');
             return;
         }
-        (0, node_assert_1.default)(msg.data);
-        if (msg.data.offer && this._state === ConnectionState.INITIATING_CONNECTION) {
-            throw new Error('Invalid state: Cannot send offer to an initiating peer.');
-        }
+        (0, node_assert_1.default)(msg.data.signal);
         (0, node_assert_1.default)((_a = msg.id) === null || _a === void 0 ? void 0 : _a.equals(this.remoteId));
         (0, node_assert_1.default)((_b = msg.remoteId) === null || _b === void 0 ? void 0 : _b.equals(this.ownId));
         if (this._state === ConnectionState.INITIAL) {

package/dist/src/swarm/connection.js.map

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

package/dist/src/swarm/swarm.d.ts

@@ -2,7 +2,8 @@ import { Event } from '@dxos/async';
 import { ErrorStream } from '@dxos/debug';
 import { PublicKey } from '@dxos/protocols';
 import { ProtocolProvider } from '../network-manager';
-import { Answer, Message } from '../proto/gen/dxos/mesh/signal';
+import { SwarmEvent } from '../proto/gen/dxos/mesh/signal';
+import { Answer, SignalMessage } from '../proto/gen/dxos/mesh/signalMessage';
 import { SignalMessaging } from '../signal';
 import { Topology } from '../topology';
 import { TransportFactory } from '../transport';
@@ -19,7 +20,6 @@ export declare class Swarm {
     private _topology;
     private readonly _protocolProvider;
     private readonly _signalMessaging;
-    private readonly _lookupPeers;
     private readonly _transportFactory;
     private readonly _label;
     /**
@@ -28,7 +28,6 @@ export declare class Swarm {
     readonly id: PublicKey;
     private readonly _connections;
     private readonly _discoveredPeers;
-    private readonly _peerCandidatesUpdated;
     get connections(): Connection[];
     /**
      * New connection to a peer is started.
@@ -43,16 +42,16 @@ export declare class Swarm {
      */
     readonly connected: Event<PublicKey>;
     readonly errors: ErrorStream;
-    constructor(_topic: PublicKey, _ownPeerId: PublicKey, _topology: Topology, _protocolProvider: ProtocolProvider, _signalMessaging: SignalMessaging, _lookupPeers: (topic: PublicKey) => void, _transportFactory: TransportFactory, _label: string | undefined);
+    constructor(_topic: PublicKey, _ownPeerId: PublicKey, _topology: Topology, _protocolProvider: ProtocolProvider, _signalMessaging: SignalMessaging, _transportFactory: TransportFactory, _label: string | undefined);
     get ownPeerId(): PublicKey;
     /**
      * Custom label assigned to this swarm. Used in devtools to display human-readable names for swarms.
      */
     get label(): string | undefined;
     get topic(): Topic;
-    onPeerCandidatesChanged(candidates: PublicKey[]): void;
-    onOffer(message: Message): Promise<Answer>;
-    onSignal(message: Message): Promise<void>;
+    onSwarmEvent(swarmEvent: SwarmEvent): void;
+    onOffer(message: SignalMessage): Promise<Answer>;
+    onSignal(message: SignalMessage): Promise<void>;
     setTopology(newTopology: Topology): Promise<void>;
     destroy(): Promise<void>;
     private _getSwarmController;

package/dist/src/swarm/swarm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"swarm.d.ts","sourceRoot":"","sources":["../../../src/swarm/swarm.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAmB,QAAQ,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,UAAU,EAAmB,MAAM,cAAc,CAAC;AAI3D;;;;GAIG;AACH,qBAAa,KAAK;IAiCd,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,MAAM;IAvCzB;;OAEG;IACH,QAAQ,CAAC,EAAE,YAAsB;IAEjC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAyD;IACtF,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA6C;IAC9E,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAe;IAEtD,IAAI,WAAW,iBAEd;IAED;;OAEG;IACH,QAAQ,CAAC,eAAe,oBAA2B;IAEnD;;OAEG;IACH,QAAQ,CAAC,iBAAiB,oBAA2B;IAErD;;OAEG;IACH,QAAQ,CAAC,SAAS,mBAA0B;IAE5C,QAAQ,CAAC,MAAM,cAAqB;gBAIjB,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,SAAS,EAC9B,SAAS,EAAE,QAAQ,EACV,iBAAiB,EAAE,gBAAgB,EACnC,gBAAgB,EAAE,eAAe,EACjC,YAAY,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,EACxC,iBAAiB,EAAE,gBAAgB,EACnC,MAAM,EAAE,MAAM,GAAG,SAAS;IAM7C,IAAI,SAAS,cAEZ;IAED;;OAEG;IACH,IAAI,KAAK,IAAK,MAAM,GAAG,SAAS,CAE/B;IAED,IAAI,KAAK,IAAK,KAAK,CAElB;IAED,uBAAuB,CAAE,UAAU,EAAE,SAAS,EAAE;IAa1C,OAAO,CAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAwC3C,QAAQ,CAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAc1C,WAAW,CAAE,WAAW,EAAE,QAAQ;IAWlC,OAAO;IAMb,OAAO,CAAC,mBAAmB;IAsB3B,OAAO,CAAC,mBAAmB;IA0C3B,OAAO,CAAC,iBAAiB;YAsCX,gBAAgB;CAU/B"}
+{"version":3,"file":"swarm.d.ts","sourceRoot":"","sources":["../../../src/swarm/swarm.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAmB,QAAQ,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,UAAU,EAAmB,MAAM,cAAc,CAAC;AAI3D;;;;GAIG;AACH,qBAAa,KAAK;IAgCd,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,MAAM;IArCzB;;OAEG;IACH,QAAQ,CAAC,EAAE,YAAsB;IAEjC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAyD;IACtF,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA6C;IAE9E,IAAI,WAAW,iBAEd;IAED;;OAEG;IACH,QAAQ,CAAC,eAAe,oBAA2B;IAEnD;;OAEG;IACH,QAAQ,CAAC,iBAAiB,oBAA2B;IAErD;;OAEG;IACH,QAAQ,CAAC,SAAS,mBAA0B;IAE5C,QAAQ,CAAC,MAAM,cAAqB;gBAIjB,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,SAAS,EAC9B,SAAS,EAAE,QAAQ,EACV,iBAAiB,EAAE,gBAAgB,EACnC,gBAAgB,EAAE,eAAe,EACjC,iBAAiB,EAAE,gBAAgB,EACnC,MAAM,EAAE,MAAM,GAAG,SAAS;IAM7C,IAAI,SAAS,cAEZ;IAED;;OAEG;IACH,IAAI,KAAK,IAAK,MAAM,GAAG,SAAS,CAE/B;IAED,IAAI,KAAK,IAAK,KAAK,CAElB;IAED,YAAY,CAAE,UAAU,EAAE,UAAU;IAc9B,OAAO,CAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;IA8CjD,QAAQ,CAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAchD,WAAW,CAAE,WAAW,EAAE,QAAQ;IAWlC,OAAO;IAMb,OAAO,CAAC,mBAAmB;IAmB3B,OAAO,CAAC,mBAAmB;IA2C3B,OAAO,CAAC,iBAAiB;YAsCX,gBAAgB;CAU/B"}