@dxos/network-manager 2.33.9-dev.bba8fc00 → 2.33.9-dev.ceab0857

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

@@ -12,40 +12,29 @@ const wait_for_expect_1 = __importDefault(require("wait-for-expect"));
 const async_1 = require("@dxos/async");
 const protocols_1 = require("@dxos/protocols");
 const signal_1 = require("@dxos/signal");
-const util_1 = require("@dxos/util");
+const testutils_1 = require("@dxos/testutils");
 const signal_client_1 = require("./signal-client");
-(0, mocha_1.describe)('SignalApi', () => {
-    let topic;
-    let peer1;
-    let peer2;
-    let api1;
-    let api2;
+(0, mocha_1.describe)('SignalClient', () => {
     let broker1;
-    const signalApiPort1 = (0, util_1.randomInt)(10000, 50000);
-    const signalApiUrl1 = 'http://0.0.0.0:' + signalApiPort1;
-    // code let broker2: ReturnType<typeof createBroker>;
-    const signalApiPort2 = (0, util_1.randomInt)(10000, 50000);
-    const signalApiUrl2 = 'http://0.0.0.0:' + signalApiPort2;
+    let broker2;
     before(async () => {
-        broker1 = await (0, signal_1.createTestBroker)(signalApiPort1);
-        // broker2 = await createTestBroker(signalApiPort2);
+        broker1 = await (0, signal_1.createTestBroker)();
+        // broker2 = await await createTestBroker(signalApiPort2);
     });
-    beforeEach(() => {
-        topic = protocols_1.PublicKey.random();
-        peer1 = protocols_1.PublicKey.random();
-        peer2 = protocols_1.PublicKey.random();
-    });
-    after(async function () {
-        this.timeout(0);
-        await api1.close();
-        await broker1.stop();
+    after(() => {
+        broker1.stop();
         // code await broker2.stop();
     });
     (0, mocha_1.it)('message between 2 clients', async () => {
+        const topic = protocols_1.PublicKey.random();
+        const peer1 = protocols_1.PublicKey.random();
+        const peer2 = protocols_1.PublicKey.random();
         const signalMock1 = (0, earljs_1.mockFn)()
             .resolvesTo();
-        api1 = new signal_client_1.SignalClient(signalApiUrl1, (async () => { }), signalMock1);
-        api2 = new signal_client_1.SignalClient(signalApiUrl1, (async () => { }), (async () => { }));
+        const api1 = new signal_client_1.SignalClient(broker1.url(), signalMock1);
+        (0, testutils_1.afterTest)(() => api1.close());
+        const api2 = new signal_client_1.SignalClient(broker1.url(), (async () => { }));
+        (0, testutils_1.afterTest)(() => api2.close());
         await api1.join(topic, peer1);
         await api2.join(topic, peer2);
         const msg = {
@@ -53,90 +42,84 @@ const signal_client_1 = require("./signal-client");
             remoteId: peer1,
             sessionId: protocols_1.PublicKey.random(),
             topic,
-            data: { signal: { json: "foo: 'bar'" } },
-            messageId: undefined
+            data: { signal: { json: JSON.stringify({ 'asd': 'asd' }) } }
         };
         await api2.signal(msg);
         await (0, wait_for_expect_1.default)(() => {
             (0, earljs_1.expect)(signalMock1).toHaveBeenCalledWith([msg]);
         }, 4000);
-    }).timeout(5000);
+    }).timeout(500);
     (0, mocha_1.it)('join', async () => {
-        api1 = new signal_client_1.SignalClient(signalApiUrl1, (async () => { }), async () => { });
-        const join = await api1.join(topic, peer1);
-        (0, earljs_1.expect)(join).toEqual([peer1]);
-        const join2 = await api1.join(topic, peer2);
-        (0, earljs_1.expect)(join2).toEqual([peer1, peer2]);
-    }).timeout(1000);
-    (0, mocha_1.it)('offer', async () => {
-        const offerMock = (0, earljs_1.mockFn)()
-            .resolvesTo({ accept: true });
-        api1 = new signal_client_1.SignalClient(signalApiUrl1, offerMock, async () => { });
+        const topic = protocols_1.PublicKey.random();
+        const peer1 = protocols_1.PublicKey.random();
+        const peer2 = protocols_1.PublicKey.random();
+        const api1 = new signal_client_1.SignalClient(broker1.url(), async () => { });
+        (0, testutils_1.afterTest)(() => api1.close());
+        const api2 = new signal_client_1.SignalClient(broker1.url(), async () => { });
+        (0, testutils_1.afterTest)(() => api2.close());
+        const promise1 = api1.swarmEvent.waitFor(([, swarmEvent]) => !!swarmEvent.peerAvailable && peer2.equals(swarmEvent.peerAvailable.peer));
+        const promise2 = api2.swarmEvent.waitFor(([, swarmEvent]) => !!swarmEvent.peerAvailable && peer1.equals(swarmEvent.peerAvailable.peer));
         await api1.join(topic, peer1);
-        const offer = {
-            data: { offer: {} },
-            id: peer2,
-            remoteId: peer1,
-            sessionId: protocols_1.PublicKey.random(),
-            topic
-        };
-        const offerResult = await api1.offer(offer);
-        (0, earljs_1.expect)(offerResult).toEqual({ accept: true });
-        (0, earljs_1.expect)(offerMock).toHaveBeenCalledWith([offer]);
-    }).timeout(5000);
-    (0, mocha_1.it)('signal', async () => {
+        await api2.join(topic, peer2);
+        await promise1;
+        await promise2;
+    }).timeout(500);
+    (0, mocha_1.it)('signal to self', async () => {
+        const topic = protocols_1.PublicKey.random();
+        const peer1 = protocols_1.PublicKey.random();
+        const peer2 = protocols_1.PublicKey.random();
         const signalMock = (0, earljs_1.mockFn)()
             .resolvesTo();
-        api1 = new signal_client_1.SignalClient(signalApiUrl1, (async () => { }), signalMock);
+        const api1 = new signal_client_1.SignalClient(broker1.url(), signalMock);
+        (0, testutils_1.afterTest)(() => api1.close());
         await api1.join(topic, peer1);
         const msg = {
             id: peer2,
             remoteId: peer1,
             sessionId: protocols_1.PublicKey.random(),
             topic,
-            data: { signal: { json: 'bar' } },
-            messageId: undefined
+            data: { signal: { json: JSON.stringify({ 'asd': 'asd' }) } }
         };
         await api1.signal(msg);
         await (0, wait_for_expect_1.default)(() => {
             (0, earljs_1.expect)(signalMock).toHaveBeenCalledWith([msg]);
         }, 4000);
-    }).timeout(5000);
+    }).timeout(500);
     mocha_1.it.skip('join across multiple signal servers', async () => {
+        const topic = protocols_1.PublicKey.random();
+        const peer1 = protocols_1.PublicKey.random();
+        const peer2 = protocols_1.PublicKey.random();
         // This feature is not implemented yet.
-        api1 = new signal_client_1.SignalClient(signalApiUrl1, (async () => { }), async () => { });
-        api2 = new signal_client_1.SignalClient(signalApiUrl2, (async () => { }), async () => { });
+        const api1 = new signal_client_1.SignalClient(broker1.url(), async () => { });
+        (0, testutils_1.afterTest)(() => api1.close());
+        const api2 = new signal_client_1.SignalClient(broker2.url(), async () => { });
+        (0, testutils_1.afterTest)(() => api2.close());
         await api1.join(topic, peer1);
         await api2.join(topic, peer2);
-        await (0, wait_for_expect_1.default)(async () => {
-            const peers = await api2.lookup(topic);
-            (0, earljs_1.expect)(peers.length).toEqual(2);
-        }, 4000);
-        await (0, wait_for_expect_1.default)(async () => {
-            const peers = await api1.lookup(topic);
-            (0, earljs_1.expect)(peers.length).toEqual(2);
-        }, 4000);
+        // await waitForExpect(async () => {
+        //   const peers = await api2.lookup(topic);
+        //   expect(peers.length).toEqual(2);
+        // }, 4_000);
+        // await waitForExpect(async () => {
+        //   const peers = await api1.lookup(topic);
+        //   expect(peers.length).toEqual(2);
+        // }, 4_000);
     }).timeout(5000);
     // Skip because communication between signal servers is not yet implemented.
     mocha_1.it.skip('newly joined peer can receive signals from other signal servers', async () => {
-        const offerMock = (0, earljs_1.mockFn)()
-            .resolvesTo({ accept: true });
+        const topic = protocols_1.PublicKey.random();
+        const peer1 = protocols_1.PublicKey.random();
+        const peer2 = protocols_1.PublicKey.random();
         const signalMock = (0, earljs_1.mockFn)()
             .resolvesTo();
-        api1 = new signal_client_1.SignalClient(signalApiUrl1, offerMock, async () => { });
-        api2 = new signal_client_1.SignalClient(signalApiUrl2, (async () => { }), signalMock);
+        const api1 = new signal_client_1.SignalClient(broker1.url(), async () => { });
+        (0, testutils_1.afterTest)(() => api1.close());
+        const api2 = new signal_client_1.SignalClient(broker2.url(), signalMock);
+        (0, testutils_1.afterTest)(() => api2.close());
         await api1.join(topic, peer1);
         await (0, async_1.sleep)(3000);
         await api2.join(topic, peer2);
         const sessionId = protocols_1.PublicKey.random();
-        const answer = await api2.offer({
-            remoteId: peer1,
-            id: peer2,
-            topic,
-            sessionId,
-            data: { offer: {} }
-        });
-        (0, earljs_1.expect)(answer).toEqual({ accept: true });
         const msg = {
             id: peer2,
             remoteId: peer1,
@@ -149,5 +132,5 @@ const signal_client_1 = require("./signal-client");
             (0, earljs_1.expect)(signalMock).toHaveBeenCalledWith([msg]);
         }, 4000);
     }).timeout(5000);
-}).timeout(10000);
+});
 //# sourceMappingURL=signal-client.test.js.map

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

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

package/dist/src/signal/{websocket-signal-manager.d.ts → signal-manager-impl.d.ts}

@@ -1,29 +1,31 @@
 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 { SignalMessage } from '../proto/gen/dxos/mesh/signalMessage';
 import { SignalApi } from './signal-api';
 import { SignalManager } from './signal-manager';
-export declare class WebsocketSignalManager implements SignalManager {
+export declare class SignalManagerImpl implements SignalManager {
     private readonly _hosts;
-    private readonly _onOffer;
     private readonly _servers;
     /** Topics joined: topic => peerId */
     private readonly _topicsJoined;
+    /** host => topic => peerId */
     private readonly _topicsJoinedPerSignal;
+    private _reconciling?;
     private _reconcileTimeoutId?;
+    private _destroyed;
     readonly statusChanged: Event<SignalApi.Status[]>;
     readonly commandTrace: Event<SignalApi.CommandTrace>;
-    readonly peerCandidatesChanged: Event<[topic: PublicKey, candidates: PublicKey[]]>;
-    readonly onSignal: Event<Message>;
-    constructor(_hosts: string[], _onOffer: (message: Message) => Promise<Answer>);
+    readonly swarmEvent: Event<[topic: PublicKey, swarmEvent: SwarmEvent]>;
+    readonly onMessage: Event<SignalMessage>;
+    constructor(_hosts: string[]);
     getStatus(): SignalApi.Status[];
     join(topic: PublicKey, peerId: PublicKey): void;
     leave(topic: PublicKey, peerId: PublicKey): void;
+    private _scheduleReconcile;
+    private _reconcileLater;
     private _reconcileJoinedTopics;
-    private _reconcile;
-    lookup(topic: PublicKey): void;
-    offer(msg: Message): Promise<Answer>;
-    signal(msg: Message): Promise<void>;
+    message(msg: SignalMessage): Promise<void>;
     destroy(): Promise<void>;
 }
-//# sourceMappingURL=websocket-signal-manager.d.ts.map
+//# sourceMappingURL=signal-manager-impl.d.ts.map

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