@dxos/network-manager 2.33.8-dev.c77ba621 → 2.33.9-dev.2637427f
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 +41836 -38304
- 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
|
@@ -41,6 +41,26 @@ const signal_client_1 = require("./signal-client");
|
|
|
41
41
|
await broker1.stop();
|
|
42
42
|
// code await broker2.stop();
|
|
43
43
|
});
|
|
44
|
+
(0, mocha_1.it)('message between 2 clients', async () => {
|
|
45
|
+
const signalMock1 = (0, earljs_1.mockFn)()
|
|
46
|
+
.resolvesTo();
|
|
47
|
+
api1 = new signal_client_1.SignalClient(signalApiUrl1, (async () => { }), signalMock1);
|
|
48
|
+
api2 = new signal_client_1.SignalClient(signalApiUrl1, (async () => { }), (async () => { }));
|
|
49
|
+
await api1.join(topic, peer1);
|
|
50
|
+
await api2.join(topic, peer2);
|
|
51
|
+
const msg = {
|
|
52
|
+
id: peer2,
|
|
53
|
+
remoteId: peer1,
|
|
54
|
+
sessionId: protocols_1.PublicKey.random(),
|
|
55
|
+
topic,
|
|
56
|
+
data: { signal: { json: "foo: 'bar'" } },
|
|
57
|
+
messageId: undefined
|
|
58
|
+
};
|
|
59
|
+
await api2.signal(msg);
|
|
60
|
+
await (0, wait_for_expect_1.default)(() => {
|
|
61
|
+
(0, earljs_1.expect)(signalMock1).toHaveBeenCalledWith([msg]);
|
|
62
|
+
}, 4000);
|
|
63
|
+
}).timeout(5000);
|
|
44
64
|
(0, mocha_1.it)('join', async () => {
|
|
45
65
|
api1 = new signal_client_1.SignalClient(signalApiUrl1, (async () => { }), async () => { });
|
|
46
66
|
const join = await api1.join(topic, peer1);
|
|
@@ -54,7 +74,7 @@ const signal_client_1 = require("./signal-client");
|
|
|
54
74
|
api1 = new signal_client_1.SignalClient(signalApiUrl1, offerMock, async () => { });
|
|
55
75
|
await api1.join(topic, peer1);
|
|
56
76
|
const offer = {
|
|
57
|
-
data: {
|
|
77
|
+
data: { offer: {} },
|
|
58
78
|
id: peer2,
|
|
59
79
|
remoteId: peer1,
|
|
60
80
|
sessionId: protocols_1.PublicKey.random(),
|
|
@@ -74,7 +94,8 @@ const signal_client_1 = require("./signal-client");
|
|
|
74
94
|
remoteId: peer1,
|
|
75
95
|
sessionId: protocols_1.PublicKey.random(),
|
|
76
96
|
topic,
|
|
77
|
-
data: {
|
|
97
|
+
data: { signal: { json: 'bar' } },
|
|
98
|
+
messageId: undefined
|
|
78
99
|
};
|
|
79
100
|
await api1.signal(msg);
|
|
80
101
|
await (0, wait_for_expect_1.default)(() => {
|
|
@@ -113,7 +134,7 @@ const signal_client_1 = require("./signal-client");
|
|
|
113
134
|
id: peer2,
|
|
114
135
|
topic,
|
|
115
136
|
sessionId,
|
|
116
|
-
data: {}
|
|
137
|
+
data: { offer: {} }
|
|
117
138
|
});
|
|
118
139
|
(0, earljs_1.expect)(answer).toEqual({ accept: true });
|
|
119
140
|
const msg = {
|
|
@@ -121,7 +142,7 @@ const signal_client_1 = require("./signal-client");
|
|
|
121
142
|
remoteId: peer1,
|
|
122
143
|
sessionId,
|
|
123
144
|
topic,
|
|
124
|
-
data: {
|
|
145
|
+
data: { offer: { json: 'bar' } }
|
|
125
146
|
};
|
|
126
147
|
await api1.signal(msg);
|
|
127
148
|
await (0, wait_for_expect_1.default)(() => {
|
|
@@ -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,uCAA6C;AAC7C,+CAA4C;AAC5C,yCAAgD;AAChD,qCAAuC;AAGvC,mDAA+C;AAE/C,IAAA,gBAAQ,EAAC,WAAW,EAAE,GAAG,EAAE;IACzB,IAAI,KAAgB,CAAC;IACrB,IAAI,KAAgB,CAAC;IACrB,IAAI,KAAgB,CAAC;IACrB,IAAI,IAAkB,CAAC;IACvB,IAAI,IAAkB,CAAC;IAEvB,IAAI,OAAqD,CAAC;IAC1D,MAAM,cAAc,GAAG,IAAA,gBAAS,EAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC/C,MAAM,aAAa,GAAG,iBAAiB,GAAG,cAAc,CAAC;IAEzD,qDAAqD;IACrD,MAAM,cAAc,GAAG,IAAA,gBAAS,EAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC/C,MAAM,aAAa,GAAG,iBAAiB,GAAG,cAAc,CAAC;IAEzD,MAAM,CAAC,KAAK,IAAI,EAAE;QAChB,OAAO,GAAG,MAAM,IAAA,yBAAgB,EAAC,cAAc,CAAC,CAAC;QACjD,oDAAoD;IACtD,CAAC,CAAC,CAAC;IAEH,UAAU,CAAC,GAAG,EAAE;QACd,KAAK,GAAG,qBAAS,CAAC,MAAM,EAAE,CAAC;QAC3B,KAAK,GAAG,qBAAS,CAAC,MAAM,EAAE,CAAC;QAC3B,KAAK,GAAG,qBAAS,CAAC,MAAM,EAAE,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAChB,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;QACrB,6BAA6B;IAC/B,CAAC,CAAC,CAAC;IAEH,IAAA,UAAI,EAAC,MAAM,EAAE,KAAK,IAAI,EAAE;QACtB,IAAI,GAAG,IAAI,4BAAY,CAAC,aAAa,EAAE,CAAC,KAAK,IAAI,EAAE,GAAE,CAAC,CAAQ,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC,CAAC,CAAC;QAEhF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC3C,IAAA,eAAM,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QAE9B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC5C,IAAA,eAAM,EAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAK,CAAC,CAAC;IAElB,IAAA,UAAI,EAAC,OAAO,EAAE,KAAK,IAAI,EAAE;QACvB,MAAM,SAAS,GAAG,IAAA,eAAM,
|
|
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,uCAA6C;AAC7C,+CAA4C;AAC5C,yCAAgD;AAChD,qCAAuC;AAGvC,mDAA+C;AAE/C,IAAA,gBAAQ,EAAC,WAAW,EAAE,GAAG,EAAE;IACzB,IAAI,KAAgB,CAAC;IACrB,IAAI,KAAgB,CAAC;IACrB,IAAI,KAAgB,CAAC;IACrB,IAAI,IAAkB,CAAC;IACvB,IAAI,IAAkB,CAAC;IAEvB,IAAI,OAAqD,CAAC;IAC1D,MAAM,cAAc,GAAG,IAAA,gBAAS,EAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC/C,MAAM,aAAa,GAAG,iBAAiB,GAAG,cAAc,CAAC;IAEzD,qDAAqD;IACrD,MAAM,cAAc,GAAG,IAAA,gBAAS,EAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC/C,MAAM,aAAa,GAAG,iBAAiB,GAAG,cAAc,CAAC;IAEzD,MAAM,CAAC,KAAK,IAAI,EAAE;QAChB,OAAO,GAAG,MAAM,IAAA,yBAAgB,EAAC,cAAc,CAAC,CAAC;QACjD,oDAAoD;IACtD,CAAC,CAAC,CAAC;IAEH,UAAU,CAAC,GAAG,EAAE;QACd,KAAK,GAAG,qBAAS,CAAC,MAAM,EAAE,CAAC;QAC3B,KAAK,GAAG,qBAAS,CAAC,MAAM,EAAE,CAAC;QAC3B,KAAK,GAAG,qBAAS,CAAC,MAAM,EAAE,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAChB,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;QACrB,6BAA6B;IAC/B,CAAC,CAAC,CAAC;IAEH,IAAA,UAAI,EAAC,2BAA2B,EAAE,KAAK,IAAI,EAAE;QAC3C,MAAM,WAAW,GAAG,IAAA,eAAM,GAAmC;aAC1D,UAAU,EAAE,CAAC;QAChB,IAAI,GAAG,IAAI,4BAAY,CAAC,aAAa,EAAE,CAAC,KAAK,IAAI,EAAE,GAAE,CAAC,CAAQ,EAAE,WAAW,CAAC,CAAC;QAC7E,IAAI,GAAG,IAAI,4BAAY,CAAC,aAAa,EAAE,CAAC,KAAK,IAAI,EAAE,GAAE,CAAC,CAAQ,EAAE,CAAC,KAAK,IAAI,EAAE,GAAE,CAAC,CAAQ,CAAC,CAAC;QAEzF,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC9B,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAE9B,MAAM,GAAG,GAAY;YACnB,EAAE,EAAE,KAAK;YACT,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,qBAAS,CAAC,MAAM,EAAE;YAC7B,KAAK;YACL,IAAI,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE;YACxC,SAAS,EAAE,SAAS;SACrB,CAAC;QACF,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAEvB,MAAM,IAAA,yBAAa,EAAC,GAAG,EAAE;YACvB,IAAA,eAAM,EAAC,WAAW,CAAC,CAAC,oBAAoB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAClD,CAAC,EAAE,IAAK,CAAC,CAAC;IACZ,CAAC,CAAC,CAAC,OAAO,CAAC,IAAK,CAAC,CAAC;IAElB,IAAA,UAAI,EAAC,MAAM,EAAE,KAAK,IAAI,EAAE;QACtB,IAAI,GAAG,IAAI,4BAAY,CAAC,aAAa,EAAE,CAAC,KAAK,IAAI,EAAE,GAAE,CAAC,CAAQ,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC,CAAC,CAAC;QAEhF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC3C,IAAA,eAAM,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QAE9B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC5C,IAAA,eAAM,EAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAK,CAAC,CAAC;IAElB,IAAA,UAAI,EAAC,OAAO,EAAE,KAAK,IAAI,EAAE;QACvB,MAAM,SAAS,GAAG,IAAA,eAAM,GAAqC;aAC1D,UAAU,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAChC,IAAI,GAAG,IAAI,4BAAY,CAAC,aAAa,EAAE,SAAS,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC,CAAC,CAAC;QAElE,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAE9B,MAAM,KAAK,GAAY;YACrB,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;YACnB,EAAE,EAAE,KAAK;YACT,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,qBAAS,CAAC,MAAM,EAAE;YAC7B,KAAK;SACN,CAAC;QACF,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC5C,IAAA,eAAM,EAAC,WAAW,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9C,IAAA,eAAM,EAAC,SAAS,CAAC,CAAC,oBAAoB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC,OAAO,CAAC,IAAK,CAAC,CAAC;IAElB,IAAA,UAAI,EAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;QACxB,MAAM,UAAU,GAAG,IAAA,eAAM,GAAmC;aACzD,UAAU,EAAE,CAAC;QAChB,IAAI,GAAG,IAAI,4BAAY,CAAC,aAAa,EAAE,CAAC,KAAK,IAAI,EAAE,GAAE,CAAC,CAAQ,EAAE,UAAU,CAAC,CAAC;QAE5E,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAE9B,MAAM,GAAG,GAAY;YACnB,EAAE,EAAE,KAAK;YACT,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,qBAAS,CAAC,MAAM,EAAE;YAC7B,KAAK;YACL,IAAI,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE;YACjC,SAAS,EAAE,SAAS;SACrB,CAAC;QACF,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAEvB,MAAM,IAAA,yBAAa,EAAC,GAAG,EAAE;YACvB,IAAA,eAAM,EAAC,UAAU,CAAC,CAAC,oBAAoB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QACjD,CAAC,EAAE,IAAK,CAAC,CAAC;IACZ,CAAC,CAAC,CAAC,OAAO,CAAC,IAAK,CAAC,CAAC;IAElB,UAAI,CAAC,IAAI,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;QAC1D,uCAAuC;QACvC,IAAI,GAAG,IAAI,4BAAY,CAAC,aAAa,EAAE,CAAC,KAAK,IAAI,EAAE,GAAE,CAAC,CAAQ,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC,CAAC,CAAC;QAChF,IAAI,GAAG,IAAI,4BAAY,CAAC,aAAa,EAAE,CAAC,KAAK,IAAI,EAAE,GAAE,CAAC,CAAQ,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC,CAAC,CAAC;QAEhF,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC9B,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAE9B,MAAM,IAAA,yBAAa,EAAC,KAAK,IAAI,EAAE;YAC7B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACvC,IAAA,eAAM,EAAC,KAAK,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAClC,CAAC,EAAE,IAAK,CAAC,CAAC;QAEV,MAAM,IAAA,yBAAa,EAAC,KAAK,IAAI,EAAE;YAC7B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACvC,IAAA,eAAM,EAAC,KAAK,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAClC,CAAC,EAAE,IAAK,CAAC,CAAC;IACZ,CAAC,CAAC,CAAC,OAAO,CAAC,IAAK,CAAC,CAAC;IAElB,4EAA4E;IAC5E,UAAI,CAAC,IAAI,CAAC,iEAAiE,EAAE,KAAK,IAAI,EAAE;QACtF,MAAM,SAAS,GAAG,IAAA,eAAM,GAAqC;aAC1D,UAAU,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAChC,MAAM,UAAU,GAAG,IAAA,eAAM,GAAmC;aACzD,UAAU,EAAE,CAAC;QAEhB,IAAI,GAAG,IAAI,4BAAY,CAAC,aAAa,EAAE,SAAS,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC,CAAC,CAAC;QAClE,IAAI,GAAG,IAAI,4BAAY,CAAC,aAAa,EAAE,CAAC,KAAK,IAAI,EAAE,GAAE,CAAC,CAAQ,EAAE,UAAU,CAAC,CAAC;QAE5E,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC9B,MAAM,IAAA,aAAK,EAAC,IAAI,CAAC,CAAC;QAClB,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAE9B,MAAM,SAAS,GAAG,qBAAS,CAAC,MAAM,EAAE,CAAC;QACrC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC;YAC9B,QAAQ,EAAE,KAAK;YACf,EAAE,EAAE,KAAK;YACT,KAAK;YACL,SAAS;YACT,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;SACpB,CAAC,CAAC;QACH,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAEzC,MAAM,GAAG,GAAY;YACnB,EAAE,EAAE,KAAK;YACT,QAAQ,EAAE,KAAK;YACf,SAAS;YACT,KAAK;YACL,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE;SACjC,CAAC;QACF,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAEvB,MAAM,IAAA,yBAAa,EAAC,GAAG,EAAE;YACvB,IAAA,eAAM,EAAC,UAAU,CAAC,CAAC,oBAAoB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QACjD,CAAC,EAAE,IAAK,CAAC,CAAC;IACZ,CAAC,CAAC,CAAC,OAAO,CAAC,IAAK,CAAC,CAAC;AACpB,CAAC,CAAC,CAAC,OAAO,CAAC,KAAM,CAAC,CAAC"}
|
|
@@ -1,28 +1,43 @@
|
|
|
1
1
|
import { Event } from '@dxos/async';
|
|
2
2
|
import { PublicKey } from '@dxos/protocols';
|
|
3
|
+
import { Answer, Message } from '../proto/gen/dxos/mesh/signal';
|
|
3
4
|
import { SignalApi } from './signal-api';
|
|
5
|
+
/**
|
|
6
|
+
* Signal peer discovery interface.
|
|
7
|
+
*/
|
|
4
8
|
export interface SignalConnection {
|
|
5
9
|
/**
|
|
6
10
|
* Find peers (triggers async event).
|
|
7
11
|
*/
|
|
8
12
|
lookup(topic: PublicKey): void;
|
|
9
13
|
/**
|
|
10
|
-
*
|
|
14
|
+
* Join topic on signal network, to be discoverable by other peers.
|
|
11
15
|
*/
|
|
12
|
-
|
|
16
|
+
join(topic: PublicKey, peerId: PublicKey): void;
|
|
17
|
+
/**
|
|
18
|
+
* Leave topic on signal network, to stop being discoverable by other peers.
|
|
19
|
+
*/
|
|
20
|
+
leave(topic: PublicKey, peerId: PublicKey): void;
|
|
21
|
+
}
|
|
22
|
+
/**
|
|
23
|
+
* Signal peer messaging interface.
|
|
24
|
+
*/
|
|
25
|
+
export interface SignalMessaging {
|
|
26
|
+
/**
|
|
27
|
+
* Offer/answer RPC.
|
|
28
|
+
*/
|
|
29
|
+
offer(msg: Message): Promise<Answer>;
|
|
13
30
|
/**
|
|
14
31
|
* Send message to peer.
|
|
15
32
|
*/
|
|
16
|
-
signal(msg:
|
|
33
|
+
signal(msg: Message): Promise<void>;
|
|
17
34
|
}
|
|
18
|
-
export interface SignalManager extends SignalConnection {
|
|
35
|
+
export interface SignalManager extends SignalConnection, SignalMessaging {
|
|
19
36
|
statusChanged: Event<SignalApi.Status[]>;
|
|
20
37
|
commandTrace: Event<SignalApi.CommandTrace>;
|
|
21
38
|
peerCandidatesChanged: Event<[topic: PublicKey, candidates: PublicKey[]]>;
|
|
22
|
-
onSignal: Event<
|
|
39
|
+
onSignal: Event<Message>;
|
|
23
40
|
getStatus(): SignalApi.Status[];
|
|
24
|
-
join(topic: PublicKey, peerId: PublicKey): void;
|
|
25
|
-
leave(topic: PublicKey, peerId: PublicKey): void;
|
|
26
41
|
destroy(): Promise<void>;
|
|
27
42
|
}
|
|
28
43
|
//# 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,SAAS,EAAE,MAAM,cAAc,CAAC;
|
|
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"}
|
|
@@ -7,10 +7,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
7
7
|
};
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.WebsocketRpc = void 0;
|
|
10
|
-
const assert_1 = __importDefault(require("assert"));
|
|
11
10
|
const debug_1 = __importDefault(require("debug"));
|
|
12
11
|
const isomorphic_ws_1 = __importDefault(require("isomorphic-ws"));
|
|
13
12
|
const nanomessage_rpc_1 = __importDefault(require("nanomessage-rpc"));
|
|
13
|
+
const node_assert_1 = __importDefault(require("node:assert"));
|
|
14
14
|
const util_1 = require("util");
|
|
15
15
|
const async_1 = require("@dxos/async");
|
|
16
16
|
const log = (0, debug_1.default)('dxos:network-manager:websocket-rpc');
|
|
@@ -65,12 +65,12 @@ class WebsocketRpc {
|
|
|
65
65
|
this._rpc = (0, nanomessage_rpc_1.default)({
|
|
66
66
|
send: async (data) => {
|
|
67
67
|
await this._connectTrigger.wait();
|
|
68
|
-
(0,
|
|
68
|
+
(0, node_assert_1.default)(this._socket, 'No socket');
|
|
69
69
|
await (0, util_1.promisify)(this._socket.send.bind(this._socket))(data);
|
|
70
70
|
},
|
|
71
71
|
subscribe: (next) => {
|
|
72
72
|
void this._connectTrigger.wait().then(() => {
|
|
73
|
-
(0,
|
|
73
|
+
(0, node_assert_1.default)(this._socket, 'No socket');
|
|
74
74
|
this._socket.onmessage = async (e) => {
|
|
75
75
|
try {
|
|
76
76
|
// `e.data` is Buffer in node, and Blob in chrome.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-rpc.js","sourceRoot":"","sources":["../../../src/signal/websocket-rpc.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,
|
|
1
|
+
{"version":3,"file":"websocket-rpc.js","sourceRoot":"","sources":["../../../src/signal/websocket-rpc.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Event } from '@dxos/async';
|
|
2
2
|
import { PublicKey } from '@dxos/protocols';
|
|
3
|
+
import { Answer, Message } from '../proto/gen/dxos/mesh/signal';
|
|
3
4
|
import { SignalApi } from './signal-api';
|
|
4
5
|
import { SignalManager } from './signal-manager';
|
|
5
6
|
export declare class WebsocketSignalManager implements SignalManager {
|
|
@@ -13,16 +14,16 @@ export declare class WebsocketSignalManager implements SignalManager {
|
|
|
13
14
|
readonly statusChanged: Event<SignalApi.Status[]>;
|
|
14
15
|
readonly commandTrace: Event<SignalApi.CommandTrace>;
|
|
15
16
|
readonly peerCandidatesChanged: Event<[topic: PublicKey, candidates: PublicKey[]]>;
|
|
16
|
-
readonly onSignal: Event<
|
|
17
|
-
constructor(_hosts: string[], _onOffer: (message:
|
|
17
|
+
readonly onSignal: Event<Message>;
|
|
18
|
+
constructor(_hosts: string[], _onOffer: (message: Message) => Promise<Answer>);
|
|
18
19
|
getStatus(): SignalApi.Status[];
|
|
19
20
|
join(topic: PublicKey, peerId: PublicKey): void;
|
|
20
21
|
leave(topic: PublicKey, peerId: PublicKey): void;
|
|
21
22
|
private _reconcileJoinedTopics;
|
|
22
23
|
private _reconcile;
|
|
23
24
|
lookup(topic: PublicKey): void;
|
|
24
|
-
offer(msg:
|
|
25
|
-
signal(msg:
|
|
25
|
+
offer(msg: Message): Promise<Answer>;
|
|
26
|
+
signal(msg: Message): Promise<void>;
|
|
26
27
|
destroy(): Promise<void>;
|
|
27
28
|
}
|
|
28
29
|
//# sourceMappingURL=websocket-signal-manager.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-signal-manager.d.ts","sourceRoot":"","sources":["../../../src/signal/websocket-signal-manager.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,EAAgB,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAIjD,qBAAa,sBAAuB,YAAW,aAAa;IAexD,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAf3B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmC;IAE5D,qCAAqC;IACrC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgE;IAC9F,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAuD;IAE9F,OAAO,CAAC,mBAAmB,CAAC,CAAiB;IAE7C,QAAQ,CAAC,aAAa,4BAAmC;IACzD,QAAQ,CAAC,YAAY,gCAAuC;IAC5D,QAAQ,CAAC,qBAAqB,qDAA2D;IACzF,QAAQ,CAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"websocket-signal-manager.d.ts","sourceRoot":"","sources":["../../../src/signal/websocket-signal-manager.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,EAAgB,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAIjD,qBAAa,sBAAuB,YAAW,aAAa;IAexD,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAf3B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmC;IAE5D,qCAAqC;IACrC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgE;IAC9F,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAuD;IAE9F,OAAO,CAAC,mBAAmB,CAAC,CAAiB;IAE7C,QAAQ,CAAC,aAAa,4BAAmC;IACzD,QAAQ,CAAC,YAAY,gCAAuC;IAC5D,QAAQ,CAAC,qBAAqB,qDAA2D;IACzF,QAAQ,CAAC,QAAQ,iBAAwB;gBAGtB,MAAM,EAAE,MAAM,EAAE,EAChB,QAAQ,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC;IAkBlE,SAAS,IAAK,SAAS,CAAC,MAAM,EAAE;IAIhC,IAAI,CAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS;IAMzC,KAAK,CAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS;YAO5B,sBAAsB;IA4CpC,OAAO,CAAC,UAAU;IAWlB,MAAM,CAAE,KAAK,EAAE,SAAS;IAgBxB,KAAK,CAAE,GAAG,EAAE,OAAO;IAMb,MAAM,CAAE,GAAG,EAAE,OAAO;IAQpB,OAAO;CAGd"}
|
|
@@ -13,8 +13,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.WebsocketSignalManager = 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 util_1 = require("@dxos/util");
|
|
20
20
|
const signal_client_1 = require("./signal-client");
|
|
@@ -32,7 +32,7 @@ class WebsocketSignalManager {
|
|
|
32
32
|
this.peerCandidatesChanged = new async_1.Event();
|
|
33
33
|
this.onSignal = new async_1.Event();
|
|
34
34
|
log(`Created WebsocketSignalManager with signal servers: ${_hosts}`);
|
|
35
|
-
(0,
|
|
35
|
+
(0, node_assert_1.default)(_hosts.length === 1, 'Only a single signaling server connection is supported');
|
|
36
36
|
for (const host of this._hosts) {
|
|
37
37
|
const server = new signal_client_1.SignalClient(host, async (msg) => this._onOffer(msg), async (msg) => this.onSignal.emit(msg));
|
|
38
38
|
this._servers.set(host, server);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-signal-manager.js","sourceRoot":"","sources":["../../../src/signal/websocket-signal-manager.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;AAEF,
|
|
1
|
+
{"version":3,"file":"websocket-signal-manager.js","sourceRoot":"","sources":["../../../src/signal/websocket-signal-manager.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 { Message } from '../proto/gen/dxos/mesh/signal';
|
|
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: Message) => 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: Message): 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,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAI3D;;GAEG;AACH,oBAAY,eAAe;IACzB;;OAEG;IACH,OAAO,YAAY;IAEnB;;OAEG;IACH,qBAAqB,0BAA0B;IAE/C;;OAEG;IACH,sBAAsB,2BAA2B;IAEjD;;OAEG;IACH,SAAS,cAAc;IAEvB;;OAEG;IACH,MAAM,WAAW;CAClB;AAED;;GAEG;AACH,qBAAa,UAAU;aASH,KAAK,EAAE,SAAS;aAChB,KAAK,EAAE,SAAS;aAChB,QAAQ,EAAE,SAAS;aACnB,SAAS,EAAE,SAAS;aACpB,SAAS,EAAE,OAAO;IAClC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAfpC,OAAO,CAAC,MAAM,CAA4C;IAC1D,OAAO,CAAC,UAAU,CAAwB;IAC1C,OAAO,CAAC,gBAAgB,CAAiB;IAEzC,QAAQ,CAAC,YAAY,yBAAgC;IACrD,QAAQ,CAAC,MAAM,cAAqB;gBAGlB,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,SAAS,EAChB,QAAQ,EAAE,SAAS,EACnB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,OAAO,EACjB,WAAW,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,EAC5C,SAAS,EAAE,QAAQ,EACnB,iBAAiB,EAAE,gBAAgB;IAGtD,IAAI,KAAK,oBAER;IAED,IAAI,SAAS,0BAEZ;IAED,IAAI,QAAQ,aAEX;IAED,OAAO;IAqCD,MAAM,CAAE,GAAG,EAAE,OAAO;IAyBpB,KAAK;CAmBZ"}
|
|
@@ -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,
|
|
@@ -101,22 +101,25 @@ class Connection {
|
|
|
101
101
|
this._bufferedSignals = [];
|
|
102
102
|
}
|
|
103
103
|
async signal(msg) {
|
|
104
|
+
var _a, _b;
|
|
105
|
+
(0, node_assert_1.default)(msg.sessionId);
|
|
104
106
|
if (!msg.sessionId.equals(this.sessionId)) {
|
|
105
107
|
log('Dropping signal for incorrect session id.');
|
|
106
108
|
return;
|
|
107
109
|
}
|
|
108
|
-
|
|
110
|
+
(0, node_assert_1.default)(msg.data);
|
|
111
|
+
if (msg.data.offer && this._state === ConnectionState.INITIATING_CONNECTION) {
|
|
109
112
|
throw new Error('Invalid state: Cannot send offer to an initiating peer.');
|
|
110
113
|
}
|
|
111
|
-
(0,
|
|
112
|
-
(0,
|
|
114
|
+
(0, node_assert_1.default)((_a = msg.id) === null || _a === void 0 ? void 0 : _a.equals(this.remoteId));
|
|
115
|
+
(0, node_assert_1.default)((_b = msg.remoteId) === null || _b === void 0 ? void 0 : _b.equals(this.ownId));
|
|
113
116
|
if (this._state === ConnectionState.INITIAL) {
|
|
114
|
-
log(`${this.ownId} buffered signal from ${this.remoteId}: ${msg.data
|
|
117
|
+
log(`${this.ownId} buffered signal from ${this.remoteId}: ${msg.data}`);
|
|
115
118
|
this._bufferedSignals.push(msg);
|
|
116
119
|
return;
|
|
117
120
|
}
|
|
118
|
-
(0,
|
|
119
|
-
log(`${this.ownId} received signal from ${this.remoteId}: ${msg.data
|
|
121
|
+
(0, node_assert_1.default)(this._transport, 'Connection not ready to accept signals.');
|
|
122
|
+
log(`${this.ownId} received signal from ${this.remoteId}: ${msg.data}`);
|
|
120
123
|
await this._transport.signal(msg);
|
|
121
124
|
}
|
|
122
125
|
async close() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../../src/swarm/connection.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;AAEF,
|
|
1
|
+
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../../src/swarm/connection.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;AAEF,kDAA0B;AAC1B,8DAAiC;AAEjC,uCAAkD;AAClD,uCAA0C;AAO1C,MAAM,GAAG,GAAG,IAAA,eAAK,EAAC,uCAAuC,CAAC,CAAC;AAE3D;;GAEG;AACH,IAAY,eAyBX;AAzBD,WAAY,eAAe;IACzB;;OAEG;IACH,sCAAmB,CAAA;IAEnB;;OAEG;IACH,kEAA+C,CAAA;IAE/C;;OAEG;IACH,oEAAiD,CAAA;IAEjD;;OAEG;IACH,0CAAuB,CAAA;IAEvB;;OAEG;IACH,oCAAiB,CAAA;AACnB,CAAC,EAzBW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAyB1B;AAED;;GAEG;AACH,MAAa,UAAU;IAQrB,YACkB,KAAgB,EAChB,KAAgB,EAChB,QAAmB,EACnB,SAAoB,EACpB,SAAkB,EACjB,WAA4C,EAC5C,SAAmB,EACnB,iBAAmC;QAPpC,UAAK,GAAL,KAAK,CAAW;QAChB,UAAK,GAAL,KAAK,CAAW;QAChB,aAAQ,GAAR,QAAQ,CAAW;QACnB,cAAS,GAAT,SAAS,CAAW;QACpB,cAAS,GAAT,SAAS,CAAS;QACjB,gBAAW,GAAX,WAAW,CAAiC;QAC5C,cAAS,GAAT,SAAS,CAAU;QACnB,sBAAiB,GAAjB,iBAAiB,CAAkB;QAf9C,WAAM,GAAoB,eAAe,CAAC,OAAO,CAAC;QAElD,qBAAgB,GAAc,EAAE,CAAC;QAEhC,iBAAY,GAAG,IAAI,aAAK,EAAmB,CAAC;QAC5C,WAAM,GAAG,IAAI,mBAAW,EAAE,CAAC;IAWjC,CAAC;IAEJ,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,OAAO;QACL,IAAA,qBAAM,EAAC,IAAI,CAAC,MAAM,KAAK,eAAe,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;QAElE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC,qBAAqB,CAAC,CAAC,CAAC,eAAe,CAAC,sBAAsB,CAAC;QAC9G,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEpC,IAAA,qBAAM,EAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACzB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACvC,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM;YAC7B,UAAU,EAAE,IAAI,CAAC,WAAW;SAC7B,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE;YAClC,IAAI,CAAC,MAAM,GAAG,eAAe,CAAC,SAAS,CAAC;YACxC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;YAC/B,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;YAC5B,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAE3C,kEAAkE;QAClE,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,gBAAgB,EAAE;YAC1C,KAAK,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,8BAA8B;SACpE;QAED,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,MAAM,CAAE,GAAY;;QACxB,IAAA,qBAAM,EAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACtB,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;YACzC,GAAG,CAAC,2CAA2C,CAAC,CAAC;YACjD,OAAO;SACR;QACD,IAAA,qBAAM,EAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACjB,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,MAAM,KAAK,eAAe,CAAC,qBAAqB,EAAE;YAC3E,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;SAC5E;QACD,IAAA,qBAAM,EAAC,MAAA,GAAG,CAAC,EAAE,0CAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;QACtC,IAAA,qBAAM,EAAC,MAAA,GAAG,CAAC,QAAQ,0CAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QAEzC,IAAI,IAAI,CAAC,MAAM,KAAK,eAAe,CAAC,OAAO,EAAE;YAC3C,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,yBAAyB,IAAI,CAAC,QAAQ,KAAK,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;YACxE,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAChC,OAAO;SACR;QAED,IAAA,qBAAM,EAAC,IAAI,CAAC,UAAU,EAAE,yCAAyC,CAAC,CAAC;QACnE,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,yBAAyB,IAAI,CAAC,QAAQ,KAAK,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;QACxE,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACpC,CAAC;IAGD,KAAK,CAAC,KAAK;;QACT,IAAI,IAAI,CAAC,MAAM,KAAK,eAAe,CAAC,MAAM,EAAE;YAC1C,OAAO;SACR;QACD,gCAAgC;QAEhC,GAAG,CAAC,WAAW,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QAE7B,gFAAgF;QAChF,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QAE7B,0DAA0D;QAC1D,MAAM,CAAA,MAAA,IAAI,CAAC,UAAU,0CAAE,KAAK,EAAE,CAAA,CAAC;QAE/B,GAAG,CAAC,UAAU,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QAE5B,IAAI,CAAC,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC;QACrC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACtC,CAAC;CACF;AAnBC;IADC,oBAAY;uCAmBZ;AA/GH,gCAgHC"}
|
|
@@ -2,7 +2,8 @@ import { Event } from '@dxos/async';
|
|
|
2
2
|
import { ErrorStream } from '@dxos/debug';
|
|
3
3
|
import { PublicKey } from '@dxos/protocols';
|
|
4
4
|
import { ProtocolProvider } from '../network-manager';
|
|
5
|
-
import {
|
|
5
|
+
import { Answer, Message } from '../proto/gen/dxos/mesh/signal';
|
|
6
|
+
import { SignalMessaging } from '../signal';
|
|
6
7
|
import { Topology } from '../topology';
|
|
7
8
|
import { TransportFactory } from '../transport';
|
|
8
9
|
import { Topic } from '../types';
|
|
@@ -17,7 +18,8 @@ export declare class Swarm {
|
|
|
17
18
|
private readonly _ownPeerId;
|
|
18
19
|
private _topology;
|
|
19
20
|
private readonly _protocolProvider;
|
|
20
|
-
private readonly
|
|
21
|
+
private readonly _signalMessaging;
|
|
22
|
+
private readonly _lookupPeers;
|
|
21
23
|
private readonly _transportFactory;
|
|
22
24
|
private readonly _label;
|
|
23
25
|
/**
|
|
@@ -41,7 +43,7 @@ export declare class Swarm {
|
|
|
41
43
|
*/
|
|
42
44
|
readonly connected: Event<PublicKey>;
|
|
43
45
|
readonly errors: ErrorStream;
|
|
44
|
-
constructor(_topic: PublicKey, _ownPeerId: PublicKey, _topology: Topology, _protocolProvider: ProtocolProvider,
|
|
46
|
+
constructor(_topic: PublicKey, _ownPeerId: PublicKey, _topology: Topology, _protocolProvider: ProtocolProvider, _signalMessaging: SignalMessaging, _lookupPeers: (topic: PublicKey) => void, _transportFactory: TransportFactory, _label: string | undefined);
|
|
45
47
|
get ownPeerId(): PublicKey;
|
|
46
48
|
/**
|
|
47
49
|
* Custom label assigned to this swarm. Used in devtools to display human-readable names for swarms.
|
|
@@ -49,8 +51,8 @@ export declare class Swarm {
|
|
|
49
51
|
get label(): string | undefined;
|
|
50
52
|
get topic(): Topic;
|
|
51
53
|
onPeerCandidatesChanged(candidates: PublicKey[]): void;
|
|
52
|
-
onOffer(message:
|
|
53
|
-
onSignal(message:
|
|
54
|
+
onOffer(message: Message): Promise<Answer>;
|
|
55
|
+
onSignal(message: Message): Promise<void>;
|
|
54
56
|
setTopology(newTopology: Topology): Promise<void>;
|
|
55
57
|
destroy(): Promise<void>;
|
|
56
58
|
private _getSwarmController;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"swarm.d.ts","sourceRoot":"","sources":["../../../src/swarm/swarm.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"swarm.d.ts","sourceRoot":"","sources":["../../../src/swarm/swarm.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAmB,QAAQ,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,UAAU,EAAmB,MAAM,cAAc,CAAC;AAI3D;;;;GAIG;AACH,qBAAa,KAAK;IAiCd,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,MAAM;IAvCzB;;OAEG;IACH,QAAQ,CAAC,EAAE,YAAsB;IAEjC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAyD;IACtF,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA6C;IAC9E,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAe;IAEtD,IAAI,WAAW,iBAEd;IAED;;OAEG;IACH,QAAQ,CAAC,eAAe,oBAA2B;IAEnD;;OAEG;IACH,QAAQ,CAAC,iBAAiB,oBAA2B;IAErD;;OAEG;IACH,QAAQ,CAAC,SAAS,mBAA0B;IAE5C,QAAQ,CAAC,MAAM,cAAqB;gBAIjB,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,SAAS,EAC9B,SAAS,EAAE,QAAQ,EACV,iBAAiB,EAAE,gBAAgB,EACnC,gBAAgB,EAAE,eAAe,EACjC,YAAY,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,EACxC,iBAAiB,EAAE,gBAAgB,EACnC,MAAM,EAAE,MAAM,GAAG,SAAS;IAM7C,IAAI,SAAS,cAEZ;IAED;;OAEG;IACH,IAAI,KAAK,IAAK,MAAM,GAAG,SAAS,CAE/B;IAED,IAAI,KAAK,IAAK,KAAK,CAElB;IAED,uBAAuB,CAAE,UAAU,EAAE,SAAS,EAAE;IAa1C,OAAO,CAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAwC3C,QAAQ,CAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAc1C,WAAW,CAAE,WAAW,EAAE,QAAQ;IAWlC,OAAO;IAMb,OAAO,CAAC,mBAAmB;IAsB3B,OAAO,CAAC,mBAAmB;IA0C3B,OAAO,CAAC,iBAAiB;YAsCX,gBAAgB;CAU/B"}
|
package/dist/src/swarm/swarm.js
CHANGED
|
@@ -7,8 +7,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
7
7
|
};
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.Swarm = 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 async_1 = require("@dxos/async");
|
|
13
13
|
const crypto_1 = require("@dxos/crypto");
|
|
14
14
|
const debug_2 = require("@dxos/debug");
|
|
@@ -23,12 +23,13 @@ const log = (0, debug_1.default)('dxos:network-manager:swarm');
|
|
|
23
23
|
*/
|
|
24
24
|
class Swarm {
|
|
25
25
|
// TODO(burdon): Split up properties.
|
|
26
|
-
constructor(_topic, _ownPeerId, _topology, _protocolProvider,
|
|
26
|
+
constructor(_topic, _ownPeerId, _topology, _protocolProvider, _signalMessaging, _lookupPeers, _transportFactory, _label) {
|
|
27
27
|
this._topic = _topic;
|
|
28
28
|
this._ownPeerId = _ownPeerId;
|
|
29
29
|
this._topology = _topology;
|
|
30
30
|
this._protocolProvider = _protocolProvider;
|
|
31
|
-
this.
|
|
31
|
+
this._signalMessaging = _signalMessaging;
|
|
32
|
+
this._lookupPeers = _lookupPeers;
|
|
32
33
|
this._transportFactory = _transportFactory;
|
|
33
34
|
this._label = _label;
|
|
34
35
|
/**
|
|
@@ -82,11 +83,13 @@ class Swarm {
|
|
|
82
83
|
this._topology.update();
|
|
83
84
|
}
|
|
84
85
|
async onOffer(message) {
|
|
85
|
-
|
|
86
|
+
var _a, _b;
|
|
87
|
+
log(`Offer from ${JSON.stringify(message)}`);
|
|
86
88
|
// Id of the peer offering us the connection.
|
|
89
|
+
(0, node_assert_1.default)(message.id);
|
|
87
90
|
const remoteId = message.id;
|
|
88
|
-
(0,
|
|
89
|
-
(0,
|
|
91
|
+
(0, node_assert_1.default)((_a = message.remoteId) === null || _a === void 0 ? void 0 : _a.equals(this._ownPeerId));
|
|
92
|
+
(0, node_assert_1.default)((_b = message.topic) === null || _b === void 0 ? void 0 : _b.equals(this._topic));
|
|
90
93
|
// Check if we are already trying to connect to that peer.
|
|
91
94
|
if (this._connections.has(remoteId)) {
|
|
92
95
|
// Peer with the highest Id closes it's connection, and accepts remote peer's offer.
|
|
@@ -105,6 +108,7 @@ class Swarm {
|
|
|
105
108
|
let accept = false;
|
|
106
109
|
if (await this._topology.onOffer(remoteId)) {
|
|
107
110
|
if (!this._connections.has(remoteId)) { // Connection might have been already established.
|
|
111
|
+
(0, node_assert_1.default)(message.sessionId);
|
|
108
112
|
const connection = this._createConnection(false, message.id, message.sessionId);
|
|
109
113
|
try {
|
|
110
114
|
connection.connect();
|
|
@@ -119,9 +123,11 @@ class Swarm {
|
|
|
119
123
|
return { accept };
|
|
120
124
|
}
|
|
121
125
|
async onSignal(message) {
|
|
126
|
+
var _a, _b;
|
|
122
127
|
log(`Signal ${this._topic} ${JSON.stringify(message)}`);
|
|
123
|
-
(0,
|
|
124
|
-
(0,
|
|
128
|
+
(0, node_assert_1.default)((_a = message.remoteId) === null || _a === void 0 ? void 0 : _a.equals(this._ownPeerId), `Invalid signal peer id expected=${this.ownPeerId}, actual=${message.remoteId}`);
|
|
129
|
+
(0, node_assert_1.default)((_b = message.topic) === null || _b === void 0 ? void 0 : _b.equals(this._topic));
|
|
130
|
+
(0, node_assert_1.default)(message.id);
|
|
125
131
|
const connection = this._connections.get(message.id);
|
|
126
132
|
if (!connection) {
|
|
127
133
|
log(`Dropping signal message for non-existent connection: topic=${this._topic}, peerId=${message.id}`);
|
|
@@ -162,7 +168,7 @@ class Swarm {
|
|
|
162
168
|
this._topology.update();
|
|
163
169
|
},
|
|
164
170
|
lookup: () => {
|
|
165
|
-
this.
|
|
171
|
+
this._lookupPeers(this._topic);
|
|
166
172
|
}
|
|
167
173
|
};
|
|
168
174
|
}
|
|
@@ -173,12 +179,12 @@ class Swarm {
|
|
|
173
179
|
}
|
|
174
180
|
const sessionId = protocols_1.PublicKey.random();
|
|
175
181
|
const connection = this._createConnection(true, remoteId, sessionId);
|
|
176
|
-
this.
|
|
182
|
+
this._signalMessaging.offer({
|
|
177
183
|
id: this._ownPeerId,
|
|
178
184
|
remoteId,
|
|
179
185
|
sessionId,
|
|
180
186
|
topic: this._topic,
|
|
181
|
-
data: {}
|
|
187
|
+
data: { offer: {} }
|
|
182
188
|
})
|
|
183
189
|
.then(answer => {
|
|
184
190
|
log(`Received answer: ${JSON.stringify(answer)} topic=${this._topic} ownId=${this._ownPeerId} remoteId=${remoteId}`);
|
|
@@ -207,8 +213,8 @@ class Swarm {
|
|
|
207
213
|
}
|
|
208
214
|
_createConnection(initiator, remoteId, sessionId) {
|
|
209
215
|
log(`Create connection topic=${this._topic} remoteId=${remoteId} initiator=${initiator}`);
|
|
210
|
-
(0,
|
|
211
|
-
const connection = new connection_1.Connection(this._topic, this._ownPeerId, remoteId, sessionId, initiator, (msg) => this.
|
|
216
|
+
(0, node_assert_1.default)(!this._connections.has(remoteId), 'Peer already connected.');
|
|
217
|
+
const connection = new connection_1.Connection(this._topic, this._ownPeerId, remoteId, sessionId, initiator, (msg) => this._signalMessaging.signal(msg), this._protocolProvider({ channel: (0, crypto_1.discoveryKey)(this._topic), initiator }), this._transportFactory);
|
|
212
218
|
this._connections.set(remoteId, connection);
|
|
213
219
|
this.connectionAdded.emit(connection);
|
|
214
220
|
connection.errors.handle(error => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"swarm.js","sourceRoot":"","sources":["../../../src/swarm/swarm.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,
|
|
1
|
+
{"version":3,"file":"swarm.js","sourceRoot":"","sources":["../../../src/swarm/swarm.ts"],"names":[],"mappings":"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"}
|