@dxos/network-manager 2.33.9-dev.7d11f506 → 2.33.9-dev.9bbef4e2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/network-manager.blueprint-test.d.ts +3 -1
- package/dist/src/network-manager.blueprint-test.d.ts.map +1 -1
- package/dist/src/network-manager.blueprint-test.js +46 -17
- package/dist/src/network-manager.blueprint-test.js.map +1 -1
- package/dist/src/network-manager.browser-test.js +1 -1
- package/dist/src/network-manager.browser-test.js.map +1 -1
- package/dist/src/network-manager.d.ts.map +1 -1
- package/dist/src/network-manager.js +13 -12
- package/dist/src/network-manager.js.map +1 -1
- package/dist/src/network-manager.test.js +5 -4
- package/dist/src/network-manager.test.js.map +1 -1
- package/dist/src/proto/gen/dxos/credentials.d.ts +39 -0
- package/dist/src/proto/gen/dxos/credentials.d.ts.map +1 -1
- package/dist/src/proto/gen/dxos/halo/keys.d.ts +44 -2
- package/dist/src/proto/gen/dxos/halo/keys.d.ts.map +1 -1
- package/dist/src/proto/gen/dxos/halo/keys.js +4 -0
- package/dist/src/proto/gen/dxos/halo/keys.js.map +1 -1
- package/dist/src/proto/gen/dxos/mesh/signal.d.ts +74 -16
- package/dist/src/proto/gen/dxos/mesh/signal.d.ts.map +1 -1
- package/dist/src/proto/gen/dxos/mesh/signalMessage.d.ts +79 -0
- package/dist/src/proto/gen/dxos/mesh/signalMessage.d.ts.map +1 -0
- package/dist/src/proto/gen/dxos/mesh/signalMessage.js +3 -0
- package/dist/src/proto/gen/dxos/mesh/signalMessage.js.map +1 -0
- package/dist/src/proto/gen/google/protobuf.d.ts +8 -2
- package/dist/src/proto/gen/google/protobuf.d.ts.map +1 -1
- package/dist/src/proto/gen/index.d.ts +17 -4
- package/dist/src/proto/gen/index.d.ts.map +1 -1
- package/dist/src/proto/gen/index.js +1 -1
- package/dist/src/proto/gen/index.js.map +1 -1
- package/dist/src/proto/substitutions.d.ts +4 -0
- package/dist/src/proto/substitutions.d.ts.map +1 -1
- package/dist/src/proto/substitutions.js +3 -1
- package/dist/src/proto/substitutions.js.map +1 -1
- package/dist/src/protocol-factory.js +3 -3
- package/dist/src/protocol-factory.js.map +1 -1
- package/dist/src/signal/in-memory-signal-manager.d.ts +7 -7
- package/dist/src/signal/in-memory-signal-manager.d.ts.map +1 -1
- package/dist/src/signal/in-memory-signal-manager.js +34 -13
- package/dist/src/signal/in-memory-signal-manager.js.map +1 -1
- package/dist/src/signal/index.d.ts +1 -2
- package/dist/src/signal/index.d.ts.map +1 -1
- package/dist/src/signal/index.js +1 -2
- package/dist/src/signal/index.js.map +1 -1
- package/dist/src/signal/integration.test.d.ts +2 -0
- package/dist/src/signal/integration.test.d.ts.map +1 -0
- package/dist/src/signal/integration.test.js +102 -0
- package/dist/src/signal/integration.test.js.map +1 -0
- package/dist/src/signal/message-router.d.ts +20 -8
- package/dist/src/signal/message-router.d.ts.map +1 -1
- package/dist/src/signal/message-router.js +96 -17
- package/dist/src/signal/message-router.js.map +1 -1
- package/dist/src/signal/message-router.test.js +125 -22
- package/dist/src/signal/message-router.test.js.map +1 -1
- package/dist/src/signal/signal-client.d.ts +33 -17
- package/dist/src/signal/signal-client.d.ts.map +1 -1
- package/dist/src/signal/signal-client.js +102 -82
- package/dist/src/signal/signal-client.js.map +1 -1
- package/dist/src/signal/signal-client.test.js +60 -75
- package/dist/src/signal/signal-client.test.js.map +1 -1
- package/dist/src/signal/{websocket-signal-manager.d.ts → signal-manager-impl.d.ts} +13 -11
- package/dist/src/signal/signal-manager-impl.d.ts.map +1 -0
- package/dist/src/signal/signal-manager-impl.js +151 -0
- package/dist/src/signal/signal-manager-impl.js.map +1 -0
- package/dist/src/signal/signal-manager.d.ts +12 -11
- package/dist/src/signal/signal-manager.d.ts.map +1 -1
- package/dist/src/signal/signal-rpc-client.d.ts +19 -0
- package/dist/src/signal/signal-rpc-client.d.ts.map +1 -0
- package/dist/src/signal/signal-rpc-client.js +108 -0
- package/dist/src/signal/signal-rpc-client.js.map +1 -0
- package/dist/src/signal/signal-rpc-client.test.d.ts +2 -0
- package/dist/src/signal/signal-rpc-client.test.d.ts.map +1 -0
- package/dist/src/signal/signal-rpc-client.test.js +74 -0
- package/dist/src/signal/signal-rpc-client.test.js.map +1 -0
- package/dist/src/swarm/connection.d.ts +3 -3
- package/dist/src/swarm/connection.d.ts.map +1 -1
- package/dist/src/swarm/connection.js +8 -11
- package/dist/src/swarm/connection.js.map +1 -1
- package/dist/src/swarm/swarm.d.ts +6 -7
- package/dist/src/swarm/swarm.d.ts.map +1 -1
- package/dist/src/swarm/swarm.js +29 -25
- package/dist/src/swarm/swarm.js.map +1 -1
- package/dist/src/swarm/swarm.test.js +156 -115
- package/dist/src/swarm/swarm.test.js.map +1 -1
- package/dist/src/testing/test-protocol.d.ts.map +1 -1
- package/dist/src/testing/test-protocol.js +3 -3
- package/dist/src/testing/test-protocol.js.map +1 -1
- package/dist/src/topology/fully-connected-topology.d.ts +0 -1
- package/dist/src/topology/fully-connected-topology.d.ts.map +1 -1
- package/dist/src/topology/fully-connected-topology.js +4 -9
- package/dist/src/topology/fully-connected-topology.js.map +1 -1
- package/dist/src/topology/mmst-topology.d.ts +0 -1
- package/dist/src/topology/mmst-topology.d.ts.map +1 -1
- package/dist/src/topology/mmst-topology.js +6 -11
- package/dist/src/topology/mmst-topology.js.map +1 -1
- package/dist/src/topology/star-topology.d.ts +0 -1
- package/dist/src/topology/star-topology.d.ts.map +1 -1
- package/dist/src/topology/star-topology.js +5 -10
- package/dist/src/topology/star-topology.js.map +1 -1
- package/dist/src/topology/topology.d.ts +0 -6
- package/dist/src/topology/topology.d.ts.map +1 -1
- package/dist/src/transport/in-memory-transport.d.ts +2 -2
- package/dist/src/transport/in-memory-transport.d.ts.map +1 -1
- package/dist/src/transport/in-memory-transport.js +2 -2
- package/dist/src/transport/in-memory-transport.js.map +1 -1
- package/dist/src/transport/transport.d.ts +3 -3
- package/dist/src/transport/transport.d.ts.map +1 -1
- package/dist/src/transport/webrtc-transport.d.ts +3 -3
- package/dist/src/transport/webrtc-transport.d.ts.map +1 -1
- package/dist/src/transport/webrtc-transport.js +3 -3
- package/dist/src/transport/webrtc-transport.js.map +1 -1
- package/dist/tests-setup.js +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +17 -12
- package/src/network-manager.blueprint-test.ts +57 -22
- package/src/network-manager.browser-test.ts +1 -1
- package/src/network-manager.test.ts +8 -7
- package/src/network-manager.ts +10 -10
- package/src/proto/defs/dxos/mesh/signal.proto +54 -23
- package/src/proto/defs/dxos/mesh/signalMessage.proto +51 -0
- package/src/proto/gen/dxos/credentials.ts +40 -0
- package/src/proto/gen/dxos/halo/keys.ts +45 -2
- package/src/proto/gen/dxos/mesh/signal.ts +73 -16
- package/src/proto/gen/dxos/mesh/signalMessage.ts +83 -0
- package/src/proto/gen/google/protobuf.ts +9 -2
- package/src/proto/gen/index.ts +18 -5
- package/src/proto/substitutions.ts +3 -1
- package/src/protocol-factory.ts +1 -1
- package/src/signal/in-memory-signal-manager.ts +38 -13
- package/src/signal/index.ts +1 -2
- package/src/signal/integration.test.ts +117 -0
- package/src/signal/message-router.test.ts +169 -58
- package/src/signal/message-router.ts +120 -27
- package/src/signal/signal-client.test.ts +70 -90
- package/src/signal/signal-client.ts +120 -87
- package/src/signal/signal-manager-impl.ts +166 -0
- package/src/signal/signal-manager.ts +12 -12
- package/src/signal/signal-rpc-client.test.ts +86 -0
- package/src/signal/signal-rpc-client.ts +121 -0
- package/src/swarm/connection.ts +6 -9
- package/src/swarm/swarm.test.ts +208 -167
- package/src/swarm/swarm.ts +26 -22
- package/src/testing/test-protocol.ts +1 -1
- package/src/topology/fully-connected-topology.ts +2 -10
- package/src/topology/mmst-topology.ts +2 -10
- package/src/topology/star-topology.ts +2 -8
- package/src/topology/topology.ts +0 -7
- package/src/transport/in-memory-transport.ts +3 -3
- package/src/transport/transport.ts +3 -3
- package/src/transport/webrtc-transport.ts +4 -4
- package/dist/src/signal/websocket-rpc.d.ts +0 -30
- package/dist/src/signal/websocket-rpc.d.ts.map +0 -1
- package/dist/src/signal/websocket-rpc.js +0 -203
- package/dist/src/signal/websocket-rpc.js.map +0 -1
- package/dist/src/signal/websocket-signal-manager.d.ts.map +0 -1
- package/dist/src/signal/websocket-signal-manager.js +0 -134
- package/dist/src/signal/websocket-signal-manager.js.map +0 -1
- package/src/signal/websocket-rpc.ts +0 -208
- package/src/signal/websocket-signal-manager.ts +0 -158
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signal-client.test.js","sourceRoot":"","sources":["../../../src/signal/signal-client.test.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,mCAAwC;AACxC,iCAA6C;AAC7C,sEAA4C;AAE5C,
|
|
1
|
+
{"version":3,"file":"signal-client.test.js","sourceRoot":"","sources":["../../../src/signal/signal-client.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,29 +1,31 @@
|
|
|
1
1
|
import { Event } from '@dxos/async';
|
|
2
2
|
import { PublicKey } from '@dxos/protocols';
|
|
3
|
-
import {
|
|
3
|
+
import { SwarmEvent } from '../proto/gen/dxos/mesh/signal';
|
|
4
|
+
import { SignalMessage } from '../proto/gen/dxos/mesh/signalMessage';
|
|
4
5
|
import { SignalApi } from './signal-api';
|
|
5
6
|
import { SignalManager } from './signal-manager';
|
|
6
|
-
export declare class
|
|
7
|
+
export declare class SignalManagerImpl implements SignalManager {
|
|
7
8
|
private readonly _hosts;
|
|
8
|
-
private readonly _onOffer;
|
|
9
9
|
private readonly _servers;
|
|
10
10
|
/** Topics joined: topic => peerId */
|
|
11
11
|
private readonly _topicsJoined;
|
|
12
|
+
/** host => topic => peerId */
|
|
12
13
|
private readonly _topicsJoinedPerSignal;
|
|
14
|
+
private _reconciling?;
|
|
13
15
|
private _reconcileTimeoutId?;
|
|
16
|
+
private _destroyed;
|
|
14
17
|
readonly statusChanged: Event<SignalApi.Status[]>;
|
|
15
18
|
readonly commandTrace: Event<SignalApi.CommandTrace>;
|
|
16
|
-
readonly
|
|
17
|
-
readonly
|
|
18
|
-
constructor(_hosts: string[]
|
|
19
|
+
readonly swarmEvent: Event<[topic: PublicKey, swarmEvent: SwarmEvent]>;
|
|
20
|
+
readonly onMessage: Event<SignalMessage>;
|
|
21
|
+
constructor(_hosts: string[]);
|
|
19
22
|
getStatus(): SignalApi.Status[];
|
|
20
23
|
join(topic: PublicKey, peerId: PublicKey): void;
|
|
21
24
|
leave(topic: PublicKey, peerId: PublicKey): void;
|
|
25
|
+
private _scheduleReconcile;
|
|
26
|
+
private _reconcileLater;
|
|
22
27
|
private _reconcileJoinedTopics;
|
|
23
|
-
|
|
24
|
-
lookup(topic: PublicKey): void;
|
|
25
|
-
offer(msg: Message): Promise<Answer>;
|
|
26
|
-
signal(msg: Message): Promise<void>;
|
|
28
|
+
message(msg: SignalMessage): Promise<void>;
|
|
27
29
|
destroy(): Promise<void>;
|
|
28
30
|
}
|
|
29
|
-
//# sourceMappingURL=
|
|
31
|
+
//# sourceMappingURL=signal-manager-impl.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
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"}
|
|
@@ -0,0 +1,151 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
//
|
|
3
|
+
// Copyright 2020 DXOS.org
|
|
4
|
+
//
|
|
5
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
6
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
7
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
8
|
+
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;
|
|
9
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
10
|
+
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.SignalManagerImpl = void 0;
|
|
16
|
+
const debug_1 = __importDefault(require("debug"));
|
|
17
|
+
const node_assert_1 = __importDefault(require("node:assert"));
|
|
18
|
+
const async_1 = require("@dxos/async");
|
|
19
|
+
const util_1 = require("@dxos/util");
|
|
20
|
+
const signal_client_1 = require("./signal-client");
|
|
21
|
+
const log = (0, debug_1.default)('dxos:network-manager:signal-manager-impl');
|
|
22
|
+
class SignalManagerImpl {
|
|
23
|
+
constructor(_hosts) {
|
|
24
|
+
this._hosts = _hosts;
|
|
25
|
+
this._servers = new Map();
|
|
26
|
+
/** Topics joined: topic => peerId */
|
|
27
|
+
this._topicsJoined = new util_1.ComplexMap(topic => topic.toHex());
|
|
28
|
+
/** host => topic => peerId */
|
|
29
|
+
this._topicsJoinedPerSignal = new Map();
|
|
30
|
+
this._reconciling = false;
|
|
31
|
+
this._destroyed = false;
|
|
32
|
+
this.statusChanged = new async_1.Event();
|
|
33
|
+
this.commandTrace = new async_1.Event();
|
|
34
|
+
this.swarmEvent = new async_1.Event();
|
|
35
|
+
this.onMessage = new async_1.Event();
|
|
36
|
+
log(`Created WebsocketSignalManager with signal servers: ${_hosts}`);
|
|
37
|
+
(0, node_assert_1.default)(_hosts.length === 1, 'Only a single signaling server connection is supported');
|
|
38
|
+
for (const host of this._hosts) {
|
|
39
|
+
const server = new signal_client_1.SignalClient(host, async (msg) => this.onMessage.emit(msg));
|
|
40
|
+
// TODO(mykola): Add subscription group
|
|
41
|
+
server.swarmEvent.on(data => this.swarmEvent.emit(data));
|
|
42
|
+
server.statusChanged.on(() => this.statusChanged.emit(this.getStatus()));
|
|
43
|
+
this._servers.set(host, server);
|
|
44
|
+
server.commandTrace.on(trace => this.commandTrace.emit(trace));
|
|
45
|
+
this._topicsJoinedPerSignal.set(host, new util_1.ComplexMap(x => x.toHex()));
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
getStatus() {
|
|
49
|
+
return Array.from(this._servers.values()).map(server => server.getStatus());
|
|
50
|
+
}
|
|
51
|
+
join(topic, peerId) {
|
|
52
|
+
(0, node_assert_1.default)(!this._topicsJoined.has(topic), `Topic ${topic} is already joined`);
|
|
53
|
+
log(`Join ${topic} ${peerId}`);
|
|
54
|
+
this._topicsJoined.set(topic, peerId);
|
|
55
|
+
this._scheduleReconcile();
|
|
56
|
+
}
|
|
57
|
+
leave(topic, peerId) {
|
|
58
|
+
(0, node_assert_1.default)(!!this._topicsJoined.has(topic), `Topic ${topic} was not joined`);
|
|
59
|
+
log(`Leave ${topic} ${peerId}`);
|
|
60
|
+
this._topicsJoined.delete(topic);
|
|
61
|
+
this._scheduleReconcile();
|
|
62
|
+
}
|
|
63
|
+
_scheduleReconcile() {
|
|
64
|
+
if (this._destroyed) {
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
67
|
+
if (!this._reconciling) {
|
|
68
|
+
this._reconciling = true;
|
|
69
|
+
this._reconcileJoinedTopics().then(() => {
|
|
70
|
+
this._reconciling = false;
|
|
71
|
+
}, err => {
|
|
72
|
+
this._reconciling = false;
|
|
73
|
+
log(`Error while reconciling: ${err}`);
|
|
74
|
+
this._reconcileLater();
|
|
75
|
+
});
|
|
76
|
+
}
|
|
77
|
+
else {
|
|
78
|
+
this._reconcileLater();
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
_reconcileLater() {
|
|
82
|
+
if (this._destroyed) {
|
|
83
|
+
return;
|
|
84
|
+
}
|
|
85
|
+
if (!this._reconcileTimeoutId) {
|
|
86
|
+
this._reconcileTimeoutId = setTimeout(async () => this._scheduleReconcile(), 3000);
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
async _reconcileJoinedTopics() {
|
|
90
|
+
// TODO(mykola): Handle reconnects to SS. Maybe move map of joined topics to signal-client.
|
|
91
|
+
log('Reconciling..');
|
|
92
|
+
for (const [host, server] of this._servers) {
|
|
93
|
+
const actualJoinedTopics = this._topicsJoinedPerSignal.get(host);
|
|
94
|
+
// Leave swarms
|
|
95
|
+
for (const [topic, actualPeerId] of actualJoinedTopics) {
|
|
96
|
+
try {
|
|
97
|
+
const desiredPeerId = this._topicsJoined.get(topic);
|
|
98
|
+
if (!desiredPeerId || !desiredPeerId.equals(actualPeerId)) {
|
|
99
|
+
await server.leave(topic, actualPeerId);
|
|
100
|
+
actualJoinedTopics.delete(topic);
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
catch (err) {
|
|
104
|
+
log(`Error leaving swarm: ${err}`);
|
|
105
|
+
this._scheduleReconcile();
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
// Join swarms
|
|
109
|
+
for (const [topic, desiredPeerId] of this._topicsJoined) {
|
|
110
|
+
try {
|
|
111
|
+
const actualPeerId = actualJoinedTopics.get(topic);
|
|
112
|
+
if (!actualPeerId) {
|
|
113
|
+
await server.join(topic, desiredPeerId);
|
|
114
|
+
actualJoinedTopics.set(topic, desiredPeerId);
|
|
115
|
+
}
|
|
116
|
+
else {
|
|
117
|
+
if (!actualPeerId.equals(desiredPeerId)) {
|
|
118
|
+
throw new Error(`Joined with peerId different from desired: ${JSON.stringify({ actualPeerId, desiredPeerId })}`);
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
catch (err) {
|
|
123
|
+
log(`Error joining swarm: ${err}`);
|
|
124
|
+
this._scheduleReconcile();
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
log('Done reconciling..');
|
|
129
|
+
this._reconciling = false;
|
|
130
|
+
}
|
|
131
|
+
async message(msg) {
|
|
132
|
+
log(`Signal ${msg.remoteId}`);
|
|
133
|
+
for (const server of this._servers.values()) {
|
|
134
|
+
server.signal(msg).catch(err => {
|
|
135
|
+
log(`Error signaling: ${err}`);
|
|
136
|
+
});
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
async destroy() {
|
|
140
|
+
this._destroyed = true;
|
|
141
|
+
if (this._reconcileTimeoutId) {
|
|
142
|
+
clearTimeout(this._reconcileTimeoutId);
|
|
143
|
+
}
|
|
144
|
+
await Promise.all(Array.from(this._servers.values()).map(server => server.close()));
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
__decorate([
|
|
148
|
+
async_1.synchronized
|
|
149
|
+
], SignalManagerImpl.prototype, "_reconcileJoinedTopics", null);
|
|
150
|
+
exports.SignalManagerImpl = SignalManagerImpl;
|
|
151
|
+
//# sourceMappingURL=signal-manager-impl.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"signal-manager-impl.js","sourceRoot":"","sources":["../../../src/signal/signal-manager-impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,12 @@
|
|
|
1
1
|
import { Event } from '@dxos/async';
|
|
2
2
|
import { PublicKey } from '@dxos/protocols';
|
|
3
|
-
import {
|
|
3
|
+
import { SwarmEvent } from '../proto/gen/dxos/mesh/signal';
|
|
4
|
+
import { Answer, SignalMessage } from '../proto/gen/dxos/mesh/signalMessage';
|
|
4
5
|
import { SignalApi } from './signal-api';
|
|
5
6
|
/**
|
|
6
7
|
* Signal peer discovery interface.
|
|
7
8
|
*/
|
|
8
9
|
export interface SignalConnection {
|
|
9
|
-
/**
|
|
10
|
-
* Find peers (triggers async event).
|
|
11
|
-
*/
|
|
12
|
-
lookup(topic: PublicKey): void;
|
|
13
10
|
/**
|
|
14
11
|
* Join topic on signal network, to be discoverable by other peers.
|
|
15
12
|
*/
|
|
@@ -26,18 +23,22 @@ export interface SignalMessaging {
|
|
|
26
23
|
/**
|
|
27
24
|
* Offer/answer RPC.
|
|
28
25
|
*/
|
|
29
|
-
offer(msg:
|
|
26
|
+
offer(msg: SignalMessage): Promise<Answer>;
|
|
30
27
|
/**
|
|
31
|
-
*
|
|
28
|
+
* Reliably send a signal to a peer.
|
|
32
29
|
*/
|
|
33
|
-
signal(msg:
|
|
30
|
+
signal(msg: SignalMessage): Promise<void>;
|
|
34
31
|
}
|
|
35
|
-
export interface SignalManager extends SignalConnection
|
|
32
|
+
export interface SignalManager extends SignalConnection {
|
|
36
33
|
statusChanged: Event<SignalApi.Status[]>;
|
|
37
34
|
commandTrace: Event<SignalApi.CommandTrace>;
|
|
38
|
-
|
|
39
|
-
|
|
35
|
+
swarmEvent: Event<[topic: PublicKey, swarmEvent: SwarmEvent]>;
|
|
36
|
+
onMessage: Event<SignalMessage>;
|
|
40
37
|
getStatus(): SignalApi.Status[];
|
|
41
38
|
destroy(): Promise<void>;
|
|
39
|
+
/**
|
|
40
|
+
* Send message to peer.
|
|
41
|
+
*/
|
|
42
|
+
message(msg: SignalMessage): Promise<void>;
|
|
42
43
|
}
|
|
43
44
|
//# sourceMappingURL=signal-manager.d.ts.map
|
|
@@ -1 +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,
|
|
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,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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { Event } from '@dxos/async';
|
|
2
|
+
import { Any, Stream } from '@dxos/codec-protobuf';
|
|
3
|
+
import { PublicKey } from '@dxos/protocols';
|
|
4
|
+
import { Message } from '../proto/gen/dxos/mesh/signal';
|
|
5
|
+
export declare class SignalRPCClient {
|
|
6
|
+
private readonly _url;
|
|
7
|
+
private readonly _socket;
|
|
8
|
+
private readonly _rpc;
|
|
9
|
+
private readonly _connectTrigger;
|
|
10
|
+
readonly connected: Event<void>;
|
|
11
|
+
readonly disconnected: Event<void>;
|
|
12
|
+
readonly error: Event<Error>;
|
|
13
|
+
constructor(_url: string);
|
|
14
|
+
join(topic: PublicKey, peerId: PublicKey): Promise<Stream<import("../proto/gen/dxos/mesh/signal").SwarmEvent>>;
|
|
15
|
+
receiveMessages(peerId: PublicKey): Promise<Stream<Message>>;
|
|
16
|
+
sendMessage(author: PublicKey, recipient: PublicKey, message: Any): Promise<void>;
|
|
17
|
+
close(): Promise<void>;
|
|
18
|
+
}
|
|
19
|
+
//# sourceMappingURL=signal-rpc-client.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
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"}
|
|
@@ -0,0 +1,108 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
//
|
|
3
|
+
// Copyright 2022 DXOS.org
|
|
4
|
+
//
|
|
5
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
6
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
7
|
+
};
|
|
8
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
+
exports.SignalRPCClient = void 0;
|
|
10
|
+
const debug_1 = __importDefault(require("debug"));
|
|
11
|
+
const isomorphic_ws_1 = __importDefault(require("isomorphic-ws"));
|
|
12
|
+
const async_1 = require("@dxos/async");
|
|
13
|
+
const rpc_1 = require("@dxos/rpc");
|
|
14
|
+
const gen_1 = require("../proto/gen");
|
|
15
|
+
const log = (0, debug_1.default)('dxos:network-manager:signal-rpc-client');
|
|
16
|
+
class SignalRPCClient {
|
|
17
|
+
constructor(_url) {
|
|
18
|
+
this._url = _url;
|
|
19
|
+
this._connectTrigger = new async_1.Trigger();
|
|
20
|
+
this.connected = new async_1.Event();
|
|
21
|
+
this.disconnected = new async_1.Event();
|
|
22
|
+
this.error = new async_1.Event();
|
|
23
|
+
this._socket = new isomorphic_ws_1.default(this._url);
|
|
24
|
+
this._socket.onopen = async () => {
|
|
25
|
+
try {
|
|
26
|
+
await this._rpc.open();
|
|
27
|
+
log(`RPC open ${this._url}`);
|
|
28
|
+
this.connected.emit();
|
|
29
|
+
this._connectTrigger.wake();
|
|
30
|
+
}
|
|
31
|
+
catch (err) {
|
|
32
|
+
this.error.emit(err);
|
|
33
|
+
}
|
|
34
|
+
};
|
|
35
|
+
this._socket.onclose = async () => {
|
|
36
|
+
log(`Disconnected ${this._url}`);
|
|
37
|
+
this.disconnected.emit();
|
|
38
|
+
try {
|
|
39
|
+
await this._rpc.close();
|
|
40
|
+
}
|
|
41
|
+
catch (err) {
|
|
42
|
+
this.error.emit(err);
|
|
43
|
+
}
|
|
44
|
+
};
|
|
45
|
+
this._socket.onerror = (e) => {
|
|
46
|
+
var _a;
|
|
47
|
+
log(`Signal socket error ${this._url} ${e.message}`);
|
|
48
|
+
this.error.emit((_a = e.error) !== null && _a !== void 0 ? _a : new Error(e.message));
|
|
49
|
+
};
|
|
50
|
+
this._rpc = (0, rpc_1.createBundledRpcClient)({
|
|
51
|
+
Signal: gen_1.schema.getService('dxos.mesh.signal.Signal')
|
|
52
|
+
}, {
|
|
53
|
+
noHandshake: true,
|
|
54
|
+
port: {
|
|
55
|
+
send: msg => {
|
|
56
|
+
this._socket.send(msg);
|
|
57
|
+
},
|
|
58
|
+
subscribe: cb => {
|
|
59
|
+
this._socket.onmessage = async (msg) => {
|
|
60
|
+
if (typeof Blob !== 'undefined' && msg.data instanceof Blob) {
|
|
61
|
+
cb(Buffer.from(await msg.data.arrayBuffer()));
|
|
62
|
+
}
|
|
63
|
+
else {
|
|
64
|
+
cb(msg.data);
|
|
65
|
+
}
|
|
66
|
+
};
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
});
|
|
70
|
+
}
|
|
71
|
+
async join(topic, peerId) {
|
|
72
|
+
log('join', topic, peerId);
|
|
73
|
+
await this._connectTrigger.wait();
|
|
74
|
+
const swarmStream = this._rpc.rpc.Signal.join({
|
|
75
|
+
swarm: topic.asUint8Array(),
|
|
76
|
+
peer: peerId.asUint8Array()
|
|
77
|
+
});
|
|
78
|
+
await swarmStream.waitUntilReady();
|
|
79
|
+
return swarmStream;
|
|
80
|
+
}
|
|
81
|
+
async receiveMessages(peerId) {
|
|
82
|
+
await this._connectTrigger.wait();
|
|
83
|
+
const messageStream = this._rpc.rpc.Signal.receiveMessages({
|
|
84
|
+
peer: peerId.asUint8Array()
|
|
85
|
+
});
|
|
86
|
+
await messageStream.waitUntilReady();
|
|
87
|
+
return messageStream;
|
|
88
|
+
}
|
|
89
|
+
async sendMessage(author, recipient, message) {
|
|
90
|
+
log('sendMessage', author, recipient, message);
|
|
91
|
+
await this._connectTrigger.wait();
|
|
92
|
+
await this._rpc.rpc.Signal.sendMessage({
|
|
93
|
+
author: author.asUint8Array(),
|
|
94
|
+
recipient: recipient.asUint8Array(),
|
|
95
|
+
payload: message
|
|
96
|
+
});
|
|
97
|
+
}
|
|
98
|
+
async close() {
|
|
99
|
+
try {
|
|
100
|
+
await this._rpc.close();
|
|
101
|
+
}
|
|
102
|
+
finally {
|
|
103
|
+
this._socket.close();
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
exports.SignalRPCClient = SignalRPCClient;
|
|
108
|
+
//# sourceMappingURL=signal-rpc-client.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"signal-rpc-client.js","sourceRoot":"","sources":["../../../src/signal/signal-rpc-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"signal-rpc-client.test.d.ts","sourceRoot":"","sources":["../../../src/signal/signal-rpc-client.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
//
|
|
4
|
+
// Copyright 2022 DXOS.org
|
|
5
|
+
//
|
|
6
|
+
const earljs_1 = require("earljs");
|
|
7
|
+
const protocols_1 = require("@dxos/protocols");
|
|
8
|
+
const signal_1 = require("@dxos/signal");
|
|
9
|
+
const signal_rpc_client_1 = require("./signal-rpc-client");
|
|
10
|
+
describe('SignalRPCClient', () => {
|
|
11
|
+
let broker;
|
|
12
|
+
before(async () => {
|
|
13
|
+
broker = await (0, signal_1.createTestBroker)();
|
|
14
|
+
});
|
|
15
|
+
after(() => {
|
|
16
|
+
broker.stop();
|
|
17
|
+
});
|
|
18
|
+
const setup = async () => {
|
|
19
|
+
const client = new signal_rpc_client_1.SignalRPCClient(broker.url());
|
|
20
|
+
return client;
|
|
21
|
+
};
|
|
22
|
+
it('signal between 2 peers', async () => {
|
|
23
|
+
const client1 = await setup();
|
|
24
|
+
const client2 = await setup();
|
|
25
|
+
const peerId1 = protocols_1.PublicKey.random();
|
|
26
|
+
const peerId2 = protocols_1.PublicKey.random();
|
|
27
|
+
const stream1 = await client1.receiveMessages(peerId1);
|
|
28
|
+
const message = {
|
|
29
|
+
'type_url': 'test',
|
|
30
|
+
value: Uint8Array.from([1, 2, 3])
|
|
31
|
+
};
|
|
32
|
+
await client2.sendMessage(peerId2, peerId1, message);
|
|
33
|
+
const received = await new Promise(resolve => {
|
|
34
|
+
stream1.subscribe(message => {
|
|
35
|
+
resolve(message);
|
|
36
|
+
}, (error) => {
|
|
37
|
+
if (error) {
|
|
38
|
+
console.log(error);
|
|
39
|
+
throw error;
|
|
40
|
+
}
|
|
41
|
+
});
|
|
42
|
+
});
|
|
43
|
+
(0, earljs_1.expect)(received.author).toEqual(peerId2.asUint8Array());
|
|
44
|
+
stream1.close();
|
|
45
|
+
}).timeout(10000);
|
|
46
|
+
it('join', async () => {
|
|
47
|
+
var _a;
|
|
48
|
+
const client1 = await setup();
|
|
49
|
+
const client2 = await setup();
|
|
50
|
+
const peerId1 = protocols_1.PublicKey.random();
|
|
51
|
+
const peerId2 = protocols_1.PublicKey.random();
|
|
52
|
+
const topic = protocols_1.PublicKey.random();
|
|
53
|
+
const stream1 = await client1.join(topic, peerId1);
|
|
54
|
+
const promise = new Promise(resolve => {
|
|
55
|
+
stream1.subscribe((event) => {
|
|
56
|
+
var _a;
|
|
57
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain
|
|
58
|
+
if (peerId2.equals((_a = event.peerAvailable) === null || _a === void 0 ? void 0 : _a.peer)) {
|
|
59
|
+
resolve(event);
|
|
60
|
+
}
|
|
61
|
+
}, (error) => {
|
|
62
|
+
if (error) {
|
|
63
|
+
console.log(error);
|
|
64
|
+
throw error;
|
|
65
|
+
}
|
|
66
|
+
});
|
|
67
|
+
});
|
|
68
|
+
const stream2 = await client2.join(topic, peerId2);
|
|
69
|
+
(0, earljs_1.expect)((_a = (await promise).peerAvailable) === null || _a === void 0 ? void 0 : _a.peer).toEqual(peerId2.asBuffer());
|
|
70
|
+
stream1.close();
|
|
71
|
+
stream2.close();
|
|
72
|
+
}).timeout(10000);
|
|
73
|
+
});
|
|
74
|
+
//# sourceMappingURL=signal-rpc-client.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"signal-rpc-client.test.js","sourceRoot":"","sources":["../../../src/signal/signal-rpc-client.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { Event } from '@dxos/async';
|
|
|
2
2
|
import { ErrorStream } from '@dxos/debug';
|
|
3
3
|
import { Protocol } from '@dxos/mesh-protocol';
|
|
4
4
|
import { PublicKey } from '@dxos/protocols';
|
|
5
|
-
import {
|
|
5
|
+
import { SignalMessage } from '../proto/gen/dxos/mesh/signalMessage';
|
|
6
6
|
import { Transport, TransportFactory } from '../transport';
|
|
7
7
|
/**
|
|
8
8
|
* State machine for each connection.
|
|
@@ -46,12 +46,12 @@ export declare class Connection {
|
|
|
46
46
|
private _bufferedSignals;
|
|
47
47
|
readonly stateChanged: Event<ConnectionState>;
|
|
48
48
|
readonly errors: ErrorStream;
|
|
49
|
-
constructor(topic: PublicKey, ownId: PublicKey, remoteId: PublicKey, sessionId: PublicKey, initiator: boolean, _sendSignal: (msg:
|
|
49
|
+
constructor(topic: PublicKey, ownId: PublicKey, remoteId: PublicKey, sessionId: PublicKey, initiator: boolean, _sendSignal: (msg: SignalMessage) => Promise<void>, _protocol: Protocol, _transportFactory: TransportFactory);
|
|
50
50
|
get state(): ConnectionState;
|
|
51
51
|
get transport(): Transport | undefined;
|
|
52
52
|
get protocol(): Protocol;
|
|
53
53
|
connect(): void;
|
|
54
|
-
signal(msg:
|
|
54
|
+
signal(msg: SignalMessage): Promise<void>;
|
|
55
55
|
close(): Promise<void>;
|
|
56
56
|
}
|
|
57
57
|
//# sourceMappingURL=connection.d.ts.map
|
|
@@ -1 +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,
|
|
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,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"}
|
|
@@ -13,8 +13,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.Connection = exports.ConnectionState = void 0;
|
|
16
|
-
const assert_1 = __importDefault(require("assert"));
|
|
17
16
|
const debug_1 = __importDefault(require("debug"));
|
|
17
|
+
const node_assert_1 = __importDefault(require("node:assert"));
|
|
18
18
|
const async_1 = require("@dxos/async");
|
|
19
19
|
const debug_2 = require("@dxos/debug");
|
|
20
20
|
const log = (0, debug_1.default)('dxos:network-manager:swarm:connection');
|
|
@@ -72,10 +72,10 @@ class Connection {
|
|
|
72
72
|
return this._protocol;
|
|
73
73
|
}
|
|
74
74
|
connect() {
|
|
75
|
-
(0,
|
|
75
|
+
(0, node_assert_1.default)(this._state === ConnectionState.INITIAL, 'Invalid state.');
|
|
76
76
|
this._state = this.initiator ? ConnectionState.INITIATING_CONNECTION : ConnectionState.WAITING_FOR_CONNECTION;
|
|
77
77
|
this.stateChanged.emit(this._state);
|
|
78
|
-
(0,
|
|
78
|
+
(0, node_assert_1.default)(!this._transport);
|
|
79
79
|
this._transport = this._transportFactory({
|
|
80
80
|
topic: this.topic,
|
|
81
81
|
ownId: this.ownId,
|
|
@@ -102,23 +102,20 @@ class Connection {
|
|
|
102
102
|
}
|
|
103
103
|
async signal(msg) {
|
|
104
104
|
var _a, _b;
|
|
105
|
-
(0,
|
|
105
|
+
(0, node_assert_1.default)(msg.sessionId);
|
|
106
106
|
if (!msg.sessionId.equals(this.sessionId)) {
|
|
107
107
|
log('Dropping signal for incorrect session id.');
|
|
108
108
|
return;
|
|
109
109
|
}
|
|
110
|
-
(0,
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
}
|
|
114
|
-
(0, assert_1.default)((_a = msg.id) === null || _a === void 0 ? void 0 : _a.equals(this.remoteId));
|
|
115
|
-
(0, assert_1.default)((_b = msg.remoteId) === null || _b === void 0 ? void 0 : _b.equals(this.ownId));
|
|
110
|
+
(0, node_assert_1.default)(msg.data.signal);
|
|
111
|
+
(0, node_assert_1.default)((_a = msg.id) === null || _a === void 0 ? void 0 : _a.equals(this.remoteId));
|
|
112
|
+
(0, node_assert_1.default)((_b = msg.remoteId) === null || _b === void 0 ? void 0 : _b.equals(this.ownId));
|
|
116
113
|
if (this._state === ConnectionState.INITIAL) {
|
|
117
114
|
log(`${this.ownId} buffered signal from ${this.remoteId}: ${msg.data}`);
|
|
118
115
|
this._bufferedSignals.push(msg);
|
|
119
116
|
return;
|
|
120
117
|
}
|
|
121
|
-
(0,
|
|
118
|
+
(0, node_assert_1.default)(this._transport, 'Connection not ready to accept signals.');
|
|
122
119
|
log(`${this.ownId} received signal from ${this.remoteId}: ${msg.data}`);
|
|
123
120
|
await this._transport.signal(msg);
|
|
124
121
|
}
|