@dxos/network-manager 2.33.8-dev.8609bc45 → 2.33.9-dev.002e8917
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/browser-mocha/bundle.js +19347 -15815
- package/dist/src/network-manager.d.ts +1 -0
- package/dist/src/network-manager.d.ts.map +1 -1
- package/dist/src/network-manager.js +15 -9
- package/dist/src/network-manager.js.map +1 -1
- package/dist/src/proto/gen/dxos/credentials.d.ts +26 -0
- package/dist/src/proto/gen/dxos/credentials.d.ts.map +1 -0
- package/dist/src/proto/gen/dxos/credentials.js +3 -0
- package/dist/src/proto/gen/dxos/credentials.js.map +1 -0
- package/dist/src/proto/gen/dxos/halo/keys.d.ts +60 -0
- package/dist/src/proto/gen/dxos/halo/keys.d.ts.map +1 -0
- package/dist/src/proto/gen/dxos/halo/keys.js +13 -0
- package/dist/src/proto/gen/dxos/halo/keys.js.map +1 -0
- package/dist/src/proto/gen/dxos/mesh/signal.d.ts +49 -0
- package/dist/src/proto/gen/dxos/mesh/signal.d.ts.map +1 -0
- package/dist/src/proto/gen/dxos/mesh/signal.js +3 -0
- package/dist/src/proto/gen/dxos/mesh/signal.js.map +1 -0
- package/dist/src/proto/gen/google/protobuf.d.ts +5 -0
- package/dist/src/proto/gen/google/protobuf.d.ts.map +1 -0
- package/dist/src/proto/gen/google/protobuf.js +3 -0
- package/dist/src/proto/gen/google/protobuf.js.map +1 -0
- package/dist/src/proto/gen/index.d.ts +29 -0
- package/dist/src/proto/gen/index.d.ts.map +1 -0
- package/dist/src/proto/gen/index.js +11 -0
- package/dist/src/proto/gen/index.js.map +1 -0
- package/dist/src/proto/substitutions.d.ts +17 -0
- package/dist/src/proto/substitutions.d.ts.map +1 -0
- package/dist/src/proto/substitutions.js +10 -0
- package/dist/src/proto/substitutions.js.map +1 -0
- package/dist/src/protocol-factory.js +7 -6
- package/dist/src/protocol-factory.js.map +1 -1
- package/dist/src/signal/in-memory-signal-manager.d.ts +5 -4
- package/dist/src/signal/in-memory-signal-manager.d.ts.map +1 -1
- package/dist/src/signal/in-memory-signal-manager.js +5 -3
- package/dist/src/signal/in-memory-signal-manager.js.map +1 -1
- package/dist/src/signal/message-router.d.ts +36 -0
- package/dist/src/signal/message-router.d.ts.map +1 -0
- package/dist/src/signal/message-router.js +145 -0
- package/dist/src/signal/message-router.js.map +1 -0
- package/dist/src/signal/message-router.test.d.ts +2 -0
- package/dist/src/signal/message-router.test.d.ts.map +1 -0
- package/dist/src/signal/message-router.test.js +265 -0
- package/dist/src/signal/message-router.test.js.map +1 -0
- package/dist/src/signal/signal-api.d.ts +6 -0
- package/dist/src/signal/signal-api.d.ts.map +1 -1
- package/dist/src/signal/signal-api.js.map +1 -1
- package/dist/src/signal/signal-client.d.ts +5 -3
- package/dist/src/signal/signal-client.d.ts.map +1 -1
- package/dist/src/signal/signal-client.js +33 -21
- package/dist/src/signal/signal-client.js.map +1 -1
- package/dist/src/signal/signal-client.test.js +25 -4
- package/dist/src/signal/signal-client.test.js.map +1 -1
- package/dist/src/signal/signal-manager.d.ts +22 -7
- package/dist/src/signal/signal-manager.d.ts.map +1 -1
- package/dist/src/signal/websocket-rpc.js +3 -3
- package/dist/src/signal/websocket-rpc.js.map +1 -1
- package/dist/src/signal/websocket-signal-manager.d.ts +5 -4
- package/dist/src/signal/websocket-signal-manager.d.ts.map +1 -1
- package/dist/src/signal/websocket-signal-manager.js +2 -2
- package/dist/src/signal/websocket-signal-manager.js.map +1 -1
- 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 +12 -9
- package/dist/src/swarm/connection.js.map +1 -1
- package/dist/src/swarm/swarm.d.ts +7 -5
- package/dist/src/swarm/swarm.d.ts.map +1 -1
- package/dist/src/swarm/swarm.js +19 -13
- package/dist/src/swarm/swarm.js.map +1 -1
- package/dist/src/swarm/swarm.test.js +44 -4
- 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 +10 -10
- package/dist/src/testing/test-protocol.js.map +1 -1
- package/dist/src/topology/fully-connected-topology.js +3 -3
- package/dist/src/topology/fully-connected-topology.js.map +1 -1
- package/dist/src/topology/mmst-topology.js +5 -5
- package/dist/src/topology/mmst-topology.js.map +1 -1
- package/dist/src/topology/star-topology.js +4 -4
- package/dist/src/topology/star-topology.js.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 +6 -4
- package/dist/src/transport/webrtc-transport.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +17 -13
- package/src/network-manager.ts +18 -7
- package/src/proto/defs/dxos/mesh/signal.proto +51 -0
- package/src/proto/gen/dxos/credentials.ts +27 -0
- package/src/proto/gen/dxos/halo/keys.ts +62 -0
- package/src/proto/gen/dxos/mesh/signal.ts +52 -0
- package/src/proto/gen/google/protobuf.ts +9 -0
- package/src/proto/gen/index.ts +29 -0
- package/src/proto/substitutions.ts +9 -0
- package/src/protocol-factory.ts +5 -5
- package/src/signal/in-memory-signal-manager.ts +8 -5
- package/src/signal/message-router.test.ts +334 -0
- package/src/signal/message-router.ts +178 -0
- package/src/signal/signal-api.ts +6 -0
- package/src/signal/signal-client.test.ts +37 -12
- package/src/signal/signal-client.ts +51 -23
- package/src/signal/signal-manager.ts +24 -9
- package/src/signal/websocket-rpc.ts +1 -1
- package/src/signal/websocket-signal-manager.ts +6 -5
- package/src/swarm/connection.ts +12 -10
- package/src/swarm/swarm.test.ts +63 -11
- package/src/swarm/swarm.ts +19 -14
- package/src/testing/test-protocol.ts +8 -8
- package/src/topology/fully-connected-topology.ts +1 -1
- package/src/topology/mmst-topology.ts +1 -1
- package/src/topology/star-topology.ts +1 -1
- package/src/transport/in-memory-transport.ts +3 -3
- package/src/transport/transport.ts +3 -3
- package/src/transport/webrtc-transport.ts +7 -6
|
@@ -14,6 +14,7 @@ const async_1 = require("@dxos/async");
|
|
|
14
14
|
const mesh_protocol_1 = require("@dxos/mesh-protocol");
|
|
15
15
|
const protocols_1 = require("@dxos/protocols");
|
|
16
16
|
const testutils_1 = require("@dxos/testutils");
|
|
17
|
+
const message_router_1 = require("../signal/message-router");
|
|
17
18
|
const topology_1 = require("../topology");
|
|
18
19
|
const transport_1 = require("../transport");
|
|
19
20
|
const swarm_1 = require("./swarm");
|
|
@@ -23,7 +24,6 @@ class MockSignalConnection {
|
|
|
23
24
|
this._swarm = _swarm;
|
|
24
25
|
this._delay = _delay;
|
|
25
26
|
}
|
|
26
|
-
lookup(topic) { }
|
|
27
27
|
async offer(msg) {
|
|
28
28
|
await (0, async_1.sleep)(this._delay);
|
|
29
29
|
return this._swarm().onOffer(msg);
|
|
@@ -33,12 +33,30 @@ class MockSignalConnection {
|
|
|
33
33
|
await this._swarm().onSignal(msg);
|
|
34
34
|
}
|
|
35
35
|
}
|
|
36
|
-
const setup = () => {
|
|
36
|
+
const setup = ({ router = false } = {}) => {
|
|
37
37
|
const topic = protocols_1.PublicKey.random();
|
|
38
38
|
const peerId1 = protocols_1.PublicKey.random();
|
|
39
39
|
const peerId2 = protocols_1.PublicKey.random();
|
|
40
|
-
|
|
41
|
-
|
|
40
|
+
// eslint-disable-next-line prefer-const
|
|
41
|
+
let swarm1;
|
|
42
|
+
// eslint-disable-next-line prefer-const
|
|
43
|
+
let swarm2;
|
|
44
|
+
const mr1 = new message_router_1.MessageRouter({
|
|
45
|
+
sendMessage: msg => mr2.receiveMessage(msg),
|
|
46
|
+
onSignal: msg => swarm1.onSignal(msg),
|
|
47
|
+
onOffer: msg => swarm1.onOffer(msg)
|
|
48
|
+
});
|
|
49
|
+
(0, testutils_1.afterTest)(() => mr1.destroy());
|
|
50
|
+
const mr2 = new message_router_1.MessageRouter({
|
|
51
|
+
sendMessage: msg => mr1.receiveMessage(msg),
|
|
52
|
+
onSignal: msg => swarm2.onSignal(msg),
|
|
53
|
+
onOffer: msg => swarm2.onOffer(msg)
|
|
54
|
+
});
|
|
55
|
+
(0, testutils_1.afterTest)(() => mr2.destroy());
|
|
56
|
+
const sm1 = router ? mr1 : new MockSignalConnection(() => swarm2);
|
|
57
|
+
const sm2 = router ? mr2 : new MockSignalConnection(() => swarm1);
|
|
58
|
+
swarm1 = new swarm_1.Swarm(topic, peerId1, new topology_1.FullyConnectedTopology(), () => new mesh_protocol_1.Protocol(), sm1, () => { }, (0, transport_1.createWebRTCTransportFactory)(), undefined);
|
|
59
|
+
swarm2 = new swarm_1.Swarm(topic, peerId2, new topology_1.FullyConnectedTopology(), () => new mesh_protocol_1.Protocol(), sm2, () => { }, (0, transport_1.createWebRTCTransportFactory)(), undefined);
|
|
42
60
|
(0, testutils_1.afterTest)(async () => {
|
|
43
61
|
await swarm1.destroy();
|
|
44
62
|
await swarm2.destroy();
|
|
@@ -99,4 +117,26 @@ const setup = () => {
|
|
|
99
117
|
(0, earljs_1.expect)(onData).toHaveBeenCalledWith([data]);
|
|
100
118
|
});
|
|
101
119
|
}).timeout(5000);
|
|
120
|
+
(0, mocha_1.it)('swarming with message router', async () => {
|
|
121
|
+
const { swarm1, swarm2, peerId2 } = setup({ router: true });
|
|
122
|
+
const promise = Promise.all([
|
|
123
|
+
(0, async_1.promiseTimeout)(swarm1.connected.waitForCount(1), 3000, new Error('Swarm1 connect timeout.')),
|
|
124
|
+
(0, async_1.promiseTimeout)(swarm2.connected.waitForCount(1), 3000, new Error('Swarm2 connect timeout.'))
|
|
125
|
+
]);
|
|
126
|
+
swarm1.onPeerCandidatesChanged([peerId2]);
|
|
127
|
+
log('Candidates changed');
|
|
128
|
+
await promise;
|
|
129
|
+
log('Swarms connected');
|
|
130
|
+
const swarm1Connection = swarm1.connections[0];
|
|
131
|
+
const swarm2Connection = swarm2.connections[0];
|
|
132
|
+
const onData = (0, earljs_1.mockFn)().returns(undefined);
|
|
133
|
+
swarm2Connection.transport.peer.on('data', onData);
|
|
134
|
+
const data = Buffer.from('1234');
|
|
135
|
+
swarm1Connection.transport.peer.send(data);
|
|
136
|
+
await (0, wait_for_expect_1.default)(() => {
|
|
137
|
+
(0, earljs_1.expect)(onData).toHaveBeenCalledWith([data]);
|
|
138
|
+
});
|
|
139
|
+
await swarm1.destroy();
|
|
140
|
+
await swarm2.destroy();
|
|
141
|
+
}).timeout(5000);
|
|
102
142
|
//# sourceMappingURL=swarm.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"swarm.test.js","sourceRoot":"","sources":["../../../src/swarm/swarm.test.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,kDAA0B;AAC1B,mCAAwC;AACxC,iCAAmC;AACnC,sEAA4C;AAE5C,uCAAoD;AACpD,uDAA+C;AAC/C,+CAA4C;AAC5C,+CAA4C;
|
|
1
|
+
{"version":3,"file":"swarm.test.js","sourceRoot":"","sources":["../../../src/swarm/swarm.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-protocol.d.ts","sourceRoot":"","sources":["../../../src/testing/test-protocol.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"test-protocol.d.ts","sourceRoot":"","sources":["../../../src/testing/test-protocol.ts"],"names":[],"mappings":";;AAOA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAU1D,eAAO,MAAM,SAAS,aAAc,QAAQ,WAG3C,CAAC;AAEF;;;;GAIG;AACH,qBAAa,kBAAmB,SAAQ,YAAY;IAClD,sCAAsC;IACtC,MAAM,gBAAC;IAEP,qBAAqB;IACrB,OAAO,SAAC;IAER,sBAAsB;IACtB,UAAU,UAAC;IAEX,UAAU,UAAS;IAEnB;;;;;;OAMG;gBACU,MAAM,EAAE,MAAM,EAAE,SAAS,UAAQ;IAU9C;;;OAGG;IACH,IAAI,MAAM,WAET;IAED;;;OAGG;IACH,IAAI,KAAK,UAER;IAED;;;;OAIG;IACH,eAAe;IAWf;;;;;OAKG;IACG,IAAI,CAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YAW/C,KAAK;IAIb,QAAQ,CAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG;IAUvC,cAAc,CAAE,QAAQ,EAAE,QAAQ;IAclC,iBAAiB,CAAE,QAAQ,EAAE,QAAQ;CAS5C;AAED;;GAEG;AAEH,eAAO,MAAM,oBAAoB,aAAc,MAAM,UAAU,MAAM,kBAAkB,GAAG,kCAIxF,CAAC"}
|
|
@@ -8,11 +8,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.testProtocolProvider = exports.TestProtocolPlugin = exports.getPeerId = void 0;
|
|
10
10
|
// Test/mock Protocol implementation used in network-manager tests.
|
|
11
|
-
const assert_1 = __importDefault(require("assert"));
|
|
12
11
|
const debug_1 = __importDefault(require("debug"));
|
|
13
12
|
const events_1 = require("events");
|
|
14
|
-
const
|
|
13
|
+
const node_assert_1 = __importDefault(require("node:assert"));
|
|
15
14
|
const mesh_protocol_1 = require("@dxos/mesh-protocol");
|
|
15
|
+
const protocols_1 = require("@dxos/protocols");
|
|
16
16
|
const protocol_factory_1 = require("../protocol-factory");
|
|
17
17
|
const log = (0, debug_1.default)('dxos:network-manager:test');
|
|
18
18
|
const EXTENSION_NAME = 'test';
|
|
@@ -20,7 +20,7 @@ const EXTENSION_NAME = 'test';
|
|
|
20
20
|
const getPeerId = (protocol) => {
|
|
21
21
|
var _a;
|
|
22
22
|
const { peerId } = (_a = protocol.getSession()) !== null && _a !== void 0 ? _a : {};
|
|
23
|
-
return
|
|
23
|
+
return protocols_1.PublicKey.bufferize(peerId);
|
|
24
24
|
};
|
|
25
25
|
exports.getPeerId = getPeerId;
|
|
26
26
|
/**
|
|
@@ -39,7 +39,7 @@ class TestProtocolPlugin extends events_1.EventEmitter {
|
|
|
39
39
|
constructor(peerId, uppercase = false) {
|
|
40
40
|
super();
|
|
41
41
|
this.initCalled = false;
|
|
42
|
-
(0,
|
|
42
|
+
(0, node_assert_1.default)(Buffer.isBuffer(peerId));
|
|
43
43
|
// TODO(dboreham): Mis-named because this is OUR node ID, not the id of any peer.
|
|
44
44
|
this._peerId = peerId;
|
|
45
45
|
this._uppercase = uppercase;
|
|
@@ -80,8 +80,8 @@ class TestProtocolPlugin extends events_1.EventEmitter {
|
|
|
80
80
|
* @return Message received from peer in response to our request.
|
|
81
81
|
*/
|
|
82
82
|
async send(peerId, payload) {
|
|
83
|
-
(0,
|
|
84
|
-
const peerIdStr =
|
|
83
|
+
(0, node_assert_1.default)(Buffer.isBuffer(peerId));
|
|
84
|
+
const peerIdStr = protocols_1.PublicKey.stringify(peerId);
|
|
85
85
|
const peer = this._peers.get(peerIdStr);
|
|
86
86
|
// TODO(dboreham): Throw fatal error if peer not found.
|
|
87
87
|
const extension = peer.getExtension(EXTENSION_NAME);
|
|
@@ -93,7 +93,7 @@ class TestProtocolPlugin extends events_1.EventEmitter {
|
|
|
93
93
|
this.initCalled = true;
|
|
94
94
|
}
|
|
95
95
|
async _receive(protocol, data) {
|
|
96
|
-
const peerIdStr =
|
|
96
|
+
const peerIdStr = protocols_1.PublicKey.stringify((0, exports.getPeerId)(protocol));
|
|
97
97
|
let payload = data.data.toString();
|
|
98
98
|
if (this._uppercase) {
|
|
99
99
|
payload = payload.toUpperCase();
|
|
@@ -106,7 +106,7 @@ class TestProtocolPlugin extends events_1.EventEmitter {
|
|
|
106
106
|
if (peerId === undefined) {
|
|
107
107
|
return;
|
|
108
108
|
}
|
|
109
|
-
const peerIdStr =
|
|
109
|
+
const peerIdStr = protocols_1.PublicKey.stringify(peerId);
|
|
110
110
|
if (this._peers.has(peerIdStr)) {
|
|
111
111
|
return;
|
|
112
112
|
}
|
|
@@ -118,7 +118,7 @@ class TestProtocolPlugin extends events_1.EventEmitter {
|
|
|
118
118
|
if (peerId === undefined) {
|
|
119
119
|
return;
|
|
120
120
|
}
|
|
121
|
-
this._peers.delete(
|
|
121
|
+
this._peers.delete(protocols_1.PublicKey.stringify(peerId));
|
|
122
122
|
this.emit('disconnect', peerId);
|
|
123
123
|
}
|
|
124
124
|
}
|
|
@@ -129,7 +129,7 @@ exports.TestProtocolPlugin = TestProtocolPlugin;
|
|
|
129
129
|
// TODO(dboreham): Try to encapsulate swarmKey, nodeId.
|
|
130
130
|
const testProtocolProvider = (swarmKey, nodeId, protocolPlugin) => (0, protocol_factory_1.protocolFactory)({
|
|
131
131
|
getTopics: () => [swarmKey],
|
|
132
|
-
session: { peerId:
|
|
132
|
+
session: { peerId: protocols_1.PublicKey.stringify(nodeId) },
|
|
133
133
|
plugins: [protocolPlugin]
|
|
134
134
|
});
|
|
135
135
|
exports.testProtocolProvider = testProtocolProvider;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-protocol.js","sourceRoot":"","sources":["../../../src/testing/test-protocol.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,mEAAmE;AAEnE,
|
|
1
|
+
{"version":3,"file":"test-protocol.js","sourceRoot":"","sources":["../../../src/testing/test-protocol.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,17 +7,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
7
7
|
};
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.FullyConnectedTopology = void 0;
|
|
10
|
-
const
|
|
10
|
+
const node_assert_1 = __importDefault(require("node:assert"));
|
|
11
11
|
class FullyConnectedTopology {
|
|
12
12
|
init(controller) {
|
|
13
|
-
(0,
|
|
13
|
+
(0, node_assert_1.default)(!this._controller, 'Already initialized');
|
|
14
14
|
this._controller = controller;
|
|
15
15
|
this._intervalId = setInterval(() => {
|
|
16
16
|
controller.lookup();
|
|
17
17
|
}, 10000);
|
|
18
18
|
}
|
|
19
19
|
update() {
|
|
20
|
-
(0,
|
|
20
|
+
(0, node_assert_1.default)(this._controller, 'Not initialized');
|
|
21
21
|
const { candidates: discovered } = this._controller.getState();
|
|
22
22
|
for (const peer of discovered) {
|
|
23
23
|
this._controller.connect(peer);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fully-connected-topology.js","sourceRoot":"","sources":["../../../src/topology/fully-connected-topology.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,
|
|
1
|
+
{"version":3,"file":"fully-connected-topology.js","sourceRoot":"","sources":["../../../src/topology/fully-connected-topology.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,8DAAiC;AAMjC,MAAa,sBAAsB;IAKjC,IAAI,CAAE,UAA2B;QAC/B,IAAA,qBAAM,EAAC,CAAC,IAAI,CAAC,WAAW,EAAE,qBAAqB,CAAC,CAAC;QACjD,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAE9B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC,GAAG,EAAE;YAClC,UAAU,CAAC,MAAM,EAAE,CAAC;QACtB,CAAC,EAAE,KAAM,CAAC,CAAC;IACb,CAAC;IAED,MAAM;QACJ,IAAA,qBAAM,EAAC,IAAI,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;QAC5C,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;QAC/D,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE;YAC7B,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SAChC;IACH,CAAC;IAED,KAAK,CAAC,OAAO,CAAE,IAAe;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,IAAI,CAAC,WAAW,KAAK,SAAS,EAAE;YAClC,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACjC;IACH,CAAC;IAED,QAAQ;QACN,OAAO,wBAAwB,CAAC;IAClC,CAAC;CACF;AAnCD,wDAmCC"}
|
|
@@ -7,8 +7,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
7
7
|
};
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.MMSTTopology = void 0;
|
|
10
|
-
const assert_1 = __importDefault(require("assert"));
|
|
11
10
|
const debug_1 = __importDefault(require("debug"));
|
|
11
|
+
const node_assert_1 = __importDefault(require("node:assert"));
|
|
12
12
|
const xor_distance_1 = __importDefault(require("xor-distance"));
|
|
13
13
|
const log = (0, debug_1.default)('dxos:network-manager:topology:mmst-topology');
|
|
14
14
|
class MMSTTopology {
|
|
@@ -19,14 +19,14 @@ class MMSTTopology {
|
|
|
19
19
|
this._sampleSize = sampleSize;
|
|
20
20
|
}
|
|
21
21
|
init(controller) {
|
|
22
|
-
(0,
|
|
22
|
+
(0, node_assert_1.default)(!this._controller, 'Already initialized');
|
|
23
23
|
this._controller = controller;
|
|
24
24
|
this._lookupIntervalId = setInterval(() => {
|
|
25
25
|
controller.lookup();
|
|
26
26
|
}, 10000);
|
|
27
27
|
}
|
|
28
28
|
update() {
|
|
29
|
-
(0,
|
|
29
|
+
(0, node_assert_1.default)(this._controller, 'Not initialized');
|
|
30
30
|
const { connected, candidates } = this._controller.getState();
|
|
31
31
|
// Run the algorithms if we have first candidates, ran it before, or have more connections than needed.
|
|
32
32
|
if (this._sampleCollected || connected.length > this._maxPeers || candidates.length > 0) {
|
|
@@ -36,7 +36,7 @@ class MMSTTopology {
|
|
|
36
36
|
}
|
|
37
37
|
}
|
|
38
38
|
async onOffer(peer) {
|
|
39
|
-
(0,
|
|
39
|
+
(0, node_assert_1.default)(this._controller, 'Not initialized');
|
|
40
40
|
const { connected } = this._controller.getState();
|
|
41
41
|
const accept = connected.length < this._maxPeers;
|
|
42
42
|
log(`Offer ${peer} accept=${accept}`);
|
|
@@ -48,7 +48,7 @@ class MMSTTopology {
|
|
|
48
48
|
}
|
|
49
49
|
}
|
|
50
50
|
_runAlgorithm() {
|
|
51
|
-
(0,
|
|
51
|
+
(0, node_assert_1.default)(this._controller, 'Not initialized');
|
|
52
52
|
const { connected, candidates, ownPeerId } = this._controller.getState();
|
|
53
53
|
if (connected.length > this._maxPeers) {
|
|
54
54
|
// Disconnect extra peers.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mmst-topology.js","sourceRoot":"","sources":["../../../src/topology/mmst-topology.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,
|
|
1
|
+
{"version":3,"file":"mmst-topology.js","sourceRoot":"","sources":["../../../src/topology/mmst-topology.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,8 +7,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
7
7
|
};
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.StarTopology = void 0;
|
|
10
|
-
const assert_1 = __importDefault(require("assert"));
|
|
11
10
|
const debug_1 = __importDefault(require("debug"));
|
|
11
|
+
const node_assert_1 = __importDefault(require("node:assert"));
|
|
12
12
|
const log = (0, debug_1.default)('dxos:network-manager:topology:star');
|
|
13
13
|
class StarTopology {
|
|
14
14
|
constructor(_centralPeer) {
|
|
@@ -18,14 +18,14 @@ class StarTopology {
|
|
|
18
18
|
return `StarTopology(${this._centralPeer})`;
|
|
19
19
|
}
|
|
20
20
|
init(controller) {
|
|
21
|
-
(0,
|
|
21
|
+
(0, node_assert_1.default)(!this._controller, 'Already initialized.');
|
|
22
22
|
this._controller = controller;
|
|
23
23
|
this._intervalId = setInterval(() => {
|
|
24
24
|
controller.lookup();
|
|
25
25
|
}, 10000);
|
|
26
26
|
}
|
|
27
27
|
update() {
|
|
28
|
-
(0,
|
|
28
|
+
(0, node_assert_1.default)(this._controller, 'Not initialized.');
|
|
29
29
|
const { candidates, connected, ownPeerId } = this._controller.getState();
|
|
30
30
|
if (!ownPeerId.equals(this._centralPeer)) {
|
|
31
31
|
log('As leaf peer dropping all connections apart from central peer.');
|
|
@@ -46,7 +46,7 @@ class StarTopology {
|
|
|
46
46
|
}
|
|
47
47
|
}
|
|
48
48
|
async onOffer(peer) {
|
|
49
|
-
(0,
|
|
49
|
+
(0, node_assert_1.default)(this._controller, 'Not initialized.');
|
|
50
50
|
const { ownPeerId } = this._controller.getState();
|
|
51
51
|
log(`Offer from ${peer} isCentral=${peer.equals(this._centralPeer)} isSelfCentral=${ownPeerId.equals(this._centralPeer)}`);
|
|
52
52
|
return ownPeerId.equals(this._centralPeer) || peer.equals(this._centralPeer);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"star-topology.js","sourceRoot":"","sources":["../../../src/topology/star-topology.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,
|
|
1
|
+
{"version":3,"file":"star-topology.js","sourceRoot":"","sources":["../../../src/topology/star-topology.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,kDAA0B;AAC1B,8DAAiC;AAMjC,MAAM,GAAG,GAAG,IAAA,eAAK,EAAC,oCAAoC,CAAC,CAAC;AAExD,MAAa,YAAY;IAIvB,YACmB,YAAuB;QAAvB,iBAAY,GAAZ,YAAY,CAAW;IACvC,CAAC;IAEJ,QAAQ;QACN,OAAO,gBAAgB,IAAI,CAAC,YAAY,GAAG,CAAC;IAC9C,CAAC;IAED,IAAI,CAAE,UAA2B;QAC/B,IAAA,qBAAM,EAAC,CAAC,IAAI,CAAC,WAAW,EAAE,sBAAsB,CAAC,CAAC;QAClD,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAC9B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC,GAAG,EAAE;YAClC,UAAU,CAAC,MAAM,EAAE,CAAC;QACtB,CAAC,EAAE,KAAM,CAAC,CAAC;IACb,CAAC;IAED,MAAM;QACJ,IAAA,qBAAM,EAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC;QAC7C,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;QACzE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE;YACxC,GAAG,CAAC,gEAAgE,CAAC,CAAC;YACtE,gDAAgD;YAChD,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE;gBAC5B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE;oBACnC,GAAG,CAAC,6BAA6B,IAAI,EAAE,CAAC,CAAC;oBACzC,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;iBACnC;aACF;SACF;QAED,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE;YAC7B,2BAA2B;YAC3B,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE;gBACzE,GAAG,CAAC,sBAAsB,IAAI,EAAE,CAAC,CAAC;gBAClC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;aAChC;SACF;IACH,CAAC;IAED,KAAK,CAAC,OAAO,CAAE,IAAe;QAC5B,IAAA,qBAAM,EAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC;QAC7C,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;QAClD,GAAG,CAAC,cAAc,IAAI,cAAc,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,kBAAkB,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QAC3H,OAAO,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC/E,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,IAAI,CAAC,WAAW,KAAK,SAAS,EAAE;YAClC,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACjC;IACH,CAAC;CACF;AAvDD,oCAuDC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import { Event } from '@dxos/async';
|
|
3
3
|
import { ErrorStream } from '@dxos/debug';
|
|
4
4
|
import { PublicKey } from '@dxos/protocols';
|
|
5
|
-
import {
|
|
5
|
+
import { Message } from '../proto/gen/dxos/mesh/signal';
|
|
6
6
|
import { Transport, TransportFactory } from './transport';
|
|
7
7
|
export declare class InMemoryTransport implements Transport {
|
|
8
8
|
private readonly _ownId;
|
|
@@ -22,7 +22,7 @@ export declare class InMemoryTransport implements Transport {
|
|
|
22
22
|
constructor(_ownId: PublicKey, _remoteId: PublicKey, _sessionId: PublicKey, _topic: PublicKey, _stream: NodeJS.ReadWriteStream);
|
|
23
23
|
get remoteId(): PublicKey;
|
|
24
24
|
get sessionId(): PublicKey;
|
|
25
|
-
signal(msg:
|
|
25
|
+
signal(msg: Message): Promise<void>;
|
|
26
26
|
close(): Promise<void>;
|
|
27
27
|
}
|
|
28
28
|
export declare const inMemoryTransportFactory: TransportFactory;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"in-memory-transport.d.ts","sourceRoot":"","sources":["../../../src/transport/in-memory-transport.ts"],"names":[],"mappings":";AAQA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"in-memory-transport.d.ts","sourceRoot":"","sources":["../../../src/transport/in-memory-transport.ts"],"names":[],"mappings":";AAQA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAU1D,qBAAa,iBAAkB,YAAW,SAAS;IAmB/C,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IApB1B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CACgD;IAEpF,SAAgB,MAAM,cAAqB;IAC3C,SAAgB,SAAS,cAAqB;IAC9C,SAAgB,MAAM,cAAqB;IAE3C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgB;IACxC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAgB;IAE3C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgD;IAC/E,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgD;IAE/E,OAAO,CAAC,iBAAiB,CAAC,CAAoB;gBAG3B,MAAM,EAAE,SAAS,EACjB,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,SAAS,EACrB,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,MAAM,CAAC,eAAe;IA0BlD,IAAI,QAAQ,IAAK,SAAS,CAEzB;IAED,IAAI,SAAS,IAAK,SAAS,CAE1B;IAEK,MAAM,CAAE,GAAG,EAAE,OAAO;IAIpB,KAAK,IAAK,OAAO,CAAC,IAAI,CAAC;CA0B9B;AAGD,eAAO,MAAM,wBAAwB,EAAE,gBAMtC,CAAC"}
|
|
@@ -7,8 +7,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
7
7
|
};
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.inMemoryTransportFactory = exports.InMemoryTransport = void 0;
|
|
10
|
-
const assert_1 = __importDefault(require("assert"));
|
|
11
10
|
const debug_1 = __importDefault(require("debug"));
|
|
11
|
+
const node_assert_1 = __importDefault(require("node:assert"));
|
|
12
12
|
const stream_1 = require("stream");
|
|
13
13
|
const async_1 = require("@dxos/async");
|
|
14
14
|
const debug_2 = require("@dxos/debug");
|
|
@@ -32,7 +32,7 @@ class InMemoryTransport {
|
|
|
32
32
|
log(`Registering connection topic=${this._topic} peerId=${this._ownId} remoteId=${this._remoteId}`);
|
|
33
33
|
this._ownKey = [this._topic, this._ownId, this._remoteId];
|
|
34
34
|
this._remoteKey = [this._topic, this._remoteId, this._ownId];
|
|
35
|
-
(0,
|
|
35
|
+
(0, node_assert_1.default)(!InMemoryTransport._connections.has(this._ownKey), 'Duplicate in-memory connection');
|
|
36
36
|
InMemoryTransport._connections.set(this._ownKey, this);
|
|
37
37
|
this._remoteConnection = InMemoryTransport._connections.get(this._remoteKey);
|
|
38
38
|
if (this._remoteConnection) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"in-memory-transport.js","sourceRoot":"","sources":["../../../src/transport/in-memory-transport.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,
|
|
1
|
+
{"version":3,"file":"in-memory-transport.js","sourceRoot":"","sources":["../../../src/transport/in-memory-transport.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import { Event } from '@dxos/async';
|
|
3
3
|
import { ErrorStream } from '@dxos/debug';
|
|
4
4
|
import { PublicKey } from '@dxos/protocols';
|
|
5
|
-
import {
|
|
5
|
+
import { Message } from '../proto/gen/dxos/mesh/signal';
|
|
6
6
|
/**
|
|
7
7
|
* Abstraction over a P2P connection transport. Currently either WebRTC or in-memory.
|
|
8
8
|
*/
|
|
@@ -10,7 +10,7 @@ export interface Transport {
|
|
|
10
10
|
closed: Event;
|
|
11
11
|
connected: Event;
|
|
12
12
|
errors: ErrorStream;
|
|
13
|
-
signal(msg:
|
|
13
|
+
signal(msg: Message): Promise<void>;
|
|
14
14
|
close(): Promise<void>;
|
|
15
15
|
}
|
|
16
16
|
export interface TransportOptions {
|
|
@@ -29,7 +29,7 @@ export interface TransportOptions {
|
|
|
29
29
|
/**
|
|
30
30
|
* Send a signal message to remote peer.
|
|
31
31
|
*/
|
|
32
|
-
sendSignal: (msg:
|
|
32
|
+
sendSignal: (msg: Message) => Promise<void>;
|
|
33
33
|
}
|
|
34
34
|
export declare type TransportFactory = (options: TransportOptions) => Transport;
|
|
35
35
|
//# sourceMappingURL=transport.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../../src/transport/transport.ts"],"names":[],"mappings":";AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../../src/transport/transport.ts"],"names":[],"mappings":";AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAExD;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,KAAK,CAAA;IACb,SAAS,EAAE,KAAK,CAAA;IAChB,MAAM,EAAE,WAAW,CAAA;IACnB,MAAM,CAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACpC,KAAK,IAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CACxB;AAED,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,SAAS,EAAE,OAAO,CAAA;IAElB,KAAK,EAAE,SAAS,CAAA;IAChB,QAAQ,EAAE,SAAS,CAAA;IACnB,SAAS,EAAE,SAAS,CAAA;IACpB,KAAK,EAAE,SAAS,CAAA;IAEhB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC,eAAe,CAAA;IAE9B;;OAEG;IACH,UAAU,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CAC5C;AAED,oBAAY,gBAAgB,GAAG,CAAC,OAAO,EAAE,gBAAgB,KAAK,SAAS,CAAA"}
|
|
@@ -3,7 +3,7 @@ import SimplePeerConstructor from 'simple-peer';
|
|
|
3
3
|
import { Event } from '@dxos/async';
|
|
4
4
|
import { ErrorStream } from '@dxos/debug';
|
|
5
5
|
import { PublicKey } from '@dxos/protocols';
|
|
6
|
-
import {
|
|
6
|
+
import { Message } from '../proto/gen/dxos/mesh/signal';
|
|
7
7
|
import { Transport, TransportFactory } from './transport';
|
|
8
8
|
/**
|
|
9
9
|
* Implements Transport for WebRTC. Uses simple-peer under the hood.
|
|
@@ -21,11 +21,11 @@ export declare class WebRTCTransport implements Transport {
|
|
|
21
21
|
readonly closed: Event<void>;
|
|
22
22
|
readonly connected: Event<void>;
|
|
23
23
|
readonly errors: ErrorStream;
|
|
24
|
-
constructor(_initiator: boolean, _stream: NodeJS.ReadWriteStream, _ownId: PublicKey, _remoteId: PublicKey, _sessionId: PublicKey, _topic: PublicKey, _sendSignal: (msg:
|
|
24
|
+
constructor(_initiator: boolean, _stream: NodeJS.ReadWriteStream, _ownId: PublicKey, _remoteId: PublicKey, _sessionId: PublicKey, _topic: PublicKey, _sendSignal: (msg: Message) => void, _webrtcConfig?: any);
|
|
25
25
|
get remoteId(): PublicKey;
|
|
26
26
|
get sessionId(): PublicKey;
|
|
27
27
|
get peer(): SimplePeerConstructor.Instance;
|
|
28
|
-
signal(msg:
|
|
28
|
+
signal(msg: Message): Promise<void>;
|
|
29
29
|
close(): Promise<void>;
|
|
30
30
|
private _disconnectStreams;
|
|
31
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webrtc-transport.d.ts","sourceRoot":"","sources":["../../../src/transport/webrtc-transport.ts"],"names":[],"mappings":";AAOA,OAAO,qBAAiD,MAAM,aAAa,CAAC;AAE5E,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"webrtc-transport.d.ts","sourceRoot":"","sources":["../../../src/transport/webrtc-transport.ts"],"names":[],"mappings":";AAOA,OAAO,qBAAiD,MAAM,aAAa,CAAC;AAE5E,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAI1D;;GAEG;AACH,qBAAa,eAAgB,YAAW,SAAS;IAU7C,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC;IAhBjC,OAAO,CAAC,KAAK,CAAa;IAE1B,QAAQ,CAAC,MAAM,cAAe;IAE9B,QAAQ,CAAC,SAAS,cAAe;IAEjC,QAAQ,CAAC,MAAM,cAAqB;gBAGjB,UAAU,EAAE,OAAO,EACnB,OAAO,EAAE,MAAM,CAAC,eAAe,EAC/B,MAAM,EAAE,SAAS,EACjB,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,SAAS,EACrB,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,EACnC,aAAa,CAAC,KAAK;IAyCtC,IAAI,QAAQ,cAEX;IAED,IAAI,SAAS,cAEZ;IAED,IAAI,IAAI,mCAEP;IAEK,MAAM,CAAE,GAAG,EAAE,OAAO;IAMpB,KAAK;YAMG,kBAAkB;CAIjC;AAED,eAAO,MAAM,4BAA4B,kBAAmB,GAAG,KAAG,gBASjE,CAAC"}
|
|
@@ -8,8 +8,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.createWebRTCTransportFactory = exports.WebRTCTransport = void 0;
|
|
10
10
|
const wrtc_1 = __importDefault(require("@koush/wrtc"));
|
|
11
|
-
const assert_1 = __importDefault(require("assert"));
|
|
12
11
|
const debug_1 = __importDefault(require("debug"));
|
|
12
|
+
const node_assert_1 = __importDefault(require("node:assert"));
|
|
13
13
|
const simple_peer_1 = __importDefault(require("simple-peer"));
|
|
14
14
|
const async_1 = require("@dxos/async");
|
|
15
15
|
const debug_2 = require("@dxos/debug");
|
|
@@ -44,7 +44,7 @@ class WebRTCTransport {
|
|
|
44
44
|
remoteId: this._remoteId,
|
|
45
45
|
sessionId: this._sessionId,
|
|
46
46
|
topic: this._topic,
|
|
47
|
-
data
|
|
47
|
+
data: { signal: { json: JSON.stringify(data) } }
|
|
48
48
|
});
|
|
49
49
|
}
|
|
50
50
|
catch (err) {
|
|
@@ -76,8 +76,10 @@ class WebRTCTransport {
|
|
|
76
76
|
return this._peer;
|
|
77
77
|
}
|
|
78
78
|
async signal(msg) {
|
|
79
|
-
|
|
80
|
-
this._peer.
|
|
79
|
+
var _a, _b;
|
|
80
|
+
(0, node_assert_1.default)(this._peer, 'Connection not ready to accept signals.');
|
|
81
|
+
(0, node_assert_1.default)((_b = (_a = msg.data) === null || _a === void 0 ? void 0 : _a.signal) === null || _b === void 0 ? void 0 : _b.json, 'Signal message must contain signal data.');
|
|
82
|
+
this._peer.signal(JSON.parse(msg.data.signal.json));
|
|
81
83
|
}
|
|
82
84
|
async close() {
|
|
83
85
|
await this._disconnectStreams();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webrtc-transport.js","sourceRoot":"","sources":["../../../src/transport/webrtc-transport.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,uDAA+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"webrtc-transport.js","sourceRoot":"","sources":["../../../src/transport/webrtc-transport.ts"],"names":[],"mappings":"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"}
|