@dxos/network-manager 2.33.5-dev.b9f5bea6 → 2.33.5-dev.c6e30fbc
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 +413 -279
- package/dist/src/index.js +5 -1
- package/dist/src/index.js.map +1 -1
- package/dist/src/network-manager.blueprint-test.js +5 -1
- package/dist/src/network-manager.blueprint-test.js.map +1 -1
- package/dist/src/network-manager.d.ts +1 -1
- package/dist/src/network-manager.d.ts.map +1 -1
- package/dist/src/network-manager.js +19 -17
- package/dist/src/network-manager.js.map +1 -1
- package/dist/src/signal/in-memory-signal-manager.d.ts +2 -2
- package/dist/src/signal/in-memory-signal-manager.d.ts.map +1 -1
- package/dist/src/signal/in-memory-signal-manager.js +2 -1
- package/dist/src/signal/in-memory-signal-manager.js.map +1 -1
- package/dist/src/signal/index.d.ts +2 -1
- package/dist/src/signal/index.d.ts.map +1 -1
- package/dist/src/signal/index.js +7 -2
- package/dist/src/signal/index.js.map +1 -1
- package/dist/src/signal/signal-api.d.ts +8 -66
- package/dist/src/signal/signal-api.d.ts.map +1 -1
- package/dist/src/signal/signal-api.js +2 -190
- package/dist/src/signal/signal-api.js.map +1 -1
- package/dist/src/signal/signal-client.d.ts +54 -0
- package/dist/src/signal/signal-client.d.ts.map +1 -0
- package/dist/src/signal/signal-client.js +198 -0
- package/dist/src/signal/signal-client.js.map +1 -0
- package/dist/src/signal/signal-client.test.d.ts +2 -0
- package/dist/src/signal/signal-client.test.d.ts.map +1 -0
- package/dist/src/signal/{signal-api.test.js → signal-client.test.js} +27 -27
- package/dist/src/signal/signal-client.test.js.map +1 -0
- package/dist/src/signal/{interface.d.ts → signal-manager.d.ts} +16 -5
- package/dist/src/signal/signal-manager.d.ts.map +1 -0
- package/dist/src/signal/{interface.js → signal-manager.js} +1 -1
- package/dist/src/signal/signal-manager.js.map +1 -0
- package/dist/src/signal/websocket-rpc.d.ts.map +1 -1
- package/dist/src/signal/websocket-rpc.js.map +1 -1
- package/dist/src/signal/websocket-signal-manager.d.ts +4 -4
- package/dist/src/signal/websocket-signal-manager.d.ts.map +1 -1
- package/dist/src/signal/websocket-signal-manager.js +4 -6
- package/dist/src/signal/websocket-signal-manager.js.map +1 -1
- package/dist/src/swarm/connection.d.ts +4 -1
- package/dist/src/swarm/connection.d.ts.map +1 -1
- package/dist/src/swarm/connection.js +6 -3
- package/dist/src/swarm/connection.js.map +1 -1
- package/dist/src/swarm/index.js +5 -1
- package/dist/src/swarm/index.js.map +1 -1
- package/dist/src/swarm/swarm.d.ts +4 -6
- package/dist/src/swarm/swarm.d.ts.map +1 -1
- package/dist/src/swarm/swarm.js +11 -12
- package/dist/src/swarm/swarm.js.map +1 -1
- package/dist/src/swarm/swarm.test.js +17 -14
- package/dist/src/swarm/swarm.test.js.map +1 -1
- package/dist/src/testing/test-protocol.d.ts +1 -0
- package/dist/src/testing/test-protocol.d.ts.map +1 -1
- package/dist/src/topology/index.js +5 -1
- package/dist/src/topology/index.js.map +1 -1
- package/dist/src/transport/in-memory-transport.d.ts +1 -1
- 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/index.js +5 -1
- package/dist/src/transport/index.js.map +1 -1
- package/dist/src/transport/transport.d.ts +1 -1
- package/dist/src/transport/transport.d.ts.map +1 -1
- package/dist/src/transport/webrtc-transport.d.ts +4 -4
- package/dist/src/transport/webrtc-transport.d.ts.map +1 -1
- package/dist/src/transport/webrtc-transport.js +8 -7
- package/dist/src/transport/webrtc-transport.js.map +1 -1
- package/dist/src/transport/webrtc-transport.test.js +4 -4
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +10 -10
- package/src/network-manager.ts +23 -23
- package/src/signal/in-memory-signal-manager.ts +6 -5
- package/src/signal/index.ts +2 -1
- package/src/signal/signal-api.ts +13 -246
- package/src/signal/{signal-api.test.ts → signal-client.test.ts} +27 -26
- package/src/signal/signal-client.ts +235 -0
- package/src/signal/signal-manager.ts +39 -0
- package/src/signal/websocket-rpc.ts +3 -6
- package/src/signal/websocket-signal-manager.ts +11 -15
- package/src/swarm/connection.ts +7 -6
- package/src/swarm/swarm.test.ts +32 -25
- package/src/swarm/swarm.ts +16 -15
- package/src/transport/in-memory-transport.ts +2 -2
- package/src/transport/transport.ts +13 -17
- package/src/transport/webrtc-transport.test.ts +5 -5
- package/src/transport/webrtc-transport.ts +6 -5
- package/dist/src/signal/interface.d.ts.map +0 -1
- package/dist/src/signal/interface.js.map +0 -1
- package/dist/src/signal/signal-api.test.d.ts +0 -2
- package/dist/src/signal/signal-api.test.d.ts.map +0 -1
- package/dist/src/signal/signal-api.test.js.map +0 -1
- package/src/signal/interface.ts +0 -32
|
@@ -1,7 +1,21 @@
|
|
|
1
1
|
import { Event } from '@dxos/async';
|
|
2
2
|
import { PublicKey } from '@dxos/crypto';
|
|
3
3
|
import { SignalApi } from './signal-api';
|
|
4
|
-
export interface
|
|
4
|
+
export interface SignalConnection {
|
|
5
|
+
/**
|
|
6
|
+
* Find peers (triggers async event).
|
|
7
|
+
*/
|
|
8
|
+
lookup(topic: PublicKey): void;
|
|
9
|
+
/**
|
|
10
|
+
*
|
|
11
|
+
*/
|
|
12
|
+
offer(msg: SignalApi.SignalMessage): Promise<SignalApi.Answer>;
|
|
13
|
+
/**
|
|
14
|
+
* Send message to peer.
|
|
15
|
+
*/
|
|
16
|
+
signal(msg: SignalApi.SignalMessage): Promise<void>;
|
|
17
|
+
}
|
|
18
|
+
export interface SignalManager extends SignalConnection {
|
|
5
19
|
statusChanged: Event<SignalApi.Status[]>;
|
|
6
20
|
commandTrace: Event<SignalApi.CommandTrace>;
|
|
7
21
|
peerCandidatesChanged: Event<[topic: PublicKey, candidates: PublicKey[]]>;
|
|
@@ -9,9 +23,6 @@ export interface SignalManager {
|
|
|
9
23
|
getStatus(): SignalApi.Status[];
|
|
10
24
|
join(topic: PublicKey, peerId: PublicKey): void;
|
|
11
25
|
leave(topic: PublicKey, peerId: PublicKey): void;
|
|
12
|
-
lookup(topic: PublicKey): void;
|
|
13
|
-
offer(msg: SignalApi.SignalMessage): Promise<SignalApi.Answer>;
|
|
14
|
-
signal(msg: SignalApi.SignalMessage): void;
|
|
15
26
|
destroy(): Promise<void>;
|
|
16
27
|
}
|
|
17
|
-
//# sourceMappingURL=
|
|
28
|
+
//# sourceMappingURL=signal-manager.d.ts.map
|
|
@@ -0,0 +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,cAAc,CAAC;AAEzC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAGzC,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,MAAM,CAAE,KAAK,EAAE,SAAS,GAAG,IAAI,CAAA;IAE/B;;OAEG;IAEH,KAAK,CAAE,GAAG,EAAE,SAAS,CAAC,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;IAE/D;;OAEG;IACH,MAAM,CAAE,GAAG,EAAE,SAAS,CAAC,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CACrD;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,qBAAqB,EAAE,KAAK,CAAC,CAAC,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC,CAAC,CAAA;IACzE,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,aAAa,CAAC,CAAA;IAExC,SAAS,IAAK,SAAS,CAAC,MAAM,EAAE,CAAA;IAChC,IAAI,CAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,GAAG,IAAI,CAAA;IAChD,KAAK,CAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,GAAG,IAAI,CAAA;IACjD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CACzB"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"signal-manager.js","sourceRoot":"","sources":["../../../src/signal/signal-manager.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-rpc.d.ts","sourceRoot":"","sources":["../../../src/signal/websocket-rpc.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,EAAkB,MAAM,aAAa,CAAC;AAEpD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAMzC;;;;;;GAMG;AACH,qBAAa,YAAY;
|
|
1
|
+
{"version":3,"file":"websocket-rpc.d.ts","sourceRoot":"","sources":["../../../src/signal/websocket-rpc.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,EAAkB,MAAM,aAAa,CAAC;AAEpD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAMzC;;;;;;GAMG;AACH,qBAAa,YAAY;IAerB,OAAO,CAAC,QAAQ,CAAC,KAAK;IAdxB,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAiB;IACjD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAY;IACpC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAM;IAC3B,OAAO,CAAC,UAAU,CAAc;IAEhC,QAAQ,CAAC,YAAY,gCAAuC;IAC5D,QAAQ,CAAC,SAAS,cAAe;IACjC,QAAQ,CAAC,YAAY,cAAe;IACpC,QAAQ,CAAC,KAAK,eAAsB;IAEpC;;OAEG;gBAEgB,KAAK,EAAE,MAAM;IAiE1B,KAAK;IAQL,IAAI,CAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAqCjD,IAAI,CAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG;IAYrC,UAAU,CAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC;IAgChE,SAAS,CAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI;CAaxD"}
|
|
@@ -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,oDAA4B;AAC5B,kDAA0B;AAC1B,kEAAsC;AACtC,sEAA6C;AAC7C,+BAAiC;AAEjC,uCAAoD;AAIpD,MAAM,GAAG,GAAG,IAAA,eAAK,EAAC,oCAAoC,CAAC,CAAC;AAExD,MAAM,WAAW,GAAG,IAAK,CAAC;AAE1B;;;;;;GAMG;AACH,MAAa,YAAY;
|
|
1
|
+
{"version":3,"file":"websocket-rpc.js","sourceRoot":"","sources":["../../../src/signal/websocket-rpc.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Event } from '@dxos/async';
|
|
2
2
|
import { PublicKey } from '@dxos/crypto';
|
|
3
|
-
import { SignalManager } from './interface';
|
|
4
3
|
import { SignalApi } from './signal-api';
|
|
4
|
+
import { SignalManager } from './signal-manager';
|
|
5
5
|
export declare class WebsocketSignalManager implements SignalManager {
|
|
6
6
|
private readonly _hosts;
|
|
7
7
|
private readonly _onOffer;
|
|
@@ -12,6 +12,8 @@ export declare class WebsocketSignalManager implements SignalManager {
|
|
|
12
12
|
private _reconcileTimeoutId?;
|
|
13
13
|
readonly statusChanged: Event<SignalApi.Status[]>;
|
|
14
14
|
readonly commandTrace: Event<SignalApi.CommandTrace>;
|
|
15
|
+
readonly peerCandidatesChanged: Event<[topic: PublicKey, candidates: PublicKey[]]>;
|
|
16
|
+
readonly onSignal: Event<SignalApi.SignalMessage>;
|
|
15
17
|
constructor(_hosts: string[], _onOffer: (message: SignalApi.SignalMessage) => Promise<SignalApi.Answer>);
|
|
16
18
|
getStatus(): SignalApi.Status[];
|
|
17
19
|
join(topic: PublicKey, peerId: PublicKey): void;
|
|
@@ -20,9 +22,7 @@ export declare class WebsocketSignalManager implements SignalManager {
|
|
|
20
22
|
private _reconcile;
|
|
21
23
|
lookup(topic: PublicKey): void;
|
|
22
24
|
offer(msg: SignalApi.SignalMessage): Promise<SignalApi.Answer>;
|
|
23
|
-
signal(msg: SignalApi.SignalMessage): void
|
|
25
|
+
signal(msg: SignalApi.SignalMessage): Promise<void>;
|
|
24
26
|
destroy(): Promise<void>;
|
|
25
|
-
peerCandidatesChanged: Event<[topic: PublicKey, candidates: PublicKey[]]>;
|
|
26
|
-
onSignal: Event<SignalApi.SignalMessage>;
|
|
27
27
|
}
|
|
28
28
|
//# 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,cAAc,CAAC;AAGzC,OAAO,EAAE,
|
|
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,cAAc,CAAC;AAGzC,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,iCAAwC;gBAGtC,MAAM,EAAE,MAAM,EAAE,EAChB,QAAQ,EAAE,CAAC,OAAO,EAAE,SAAS,CAAC,aAAa,KAAK,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC;IAkB5F,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,SAAS,CAAC,aAAa;IAM7B,MAAM,CAAE,GAAG,EAAE,SAAS,CAAC,aAAa;IAQpC,OAAO;CAGd"}
|
|
@@ -17,7 +17,7 @@ const assert_1 = __importDefault(require("assert"));
|
|
|
17
17
|
const debug_1 = __importDefault(require("debug"));
|
|
18
18
|
const async_1 = require("@dxos/async");
|
|
19
19
|
const util_1 = require("@dxos/util");
|
|
20
|
-
const
|
|
20
|
+
const signal_client_1 = require("./signal-client");
|
|
21
21
|
const log = (0, debug_1.default)('dxos:network-manager:websocket-signal-manager');
|
|
22
22
|
class WebsocketSignalManager {
|
|
23
23
|
constructor(_hosts, _onOffer) {
|
|
@@ -25,7 +25,7 @@ class WebsocketSignalManager {
|
|
|
25
25
|
this._onOffer = _onOffer;
|
|
26
26
|
this._servers = new Map();
|
|
27
27
|
/** Topics joined: topic => peerId */
|
|
28
|
-
this._topicsJoined = new util_1.ComplexMap(
|
|
28
|
+
this._topicsJoined = new util_1.ComplexMap(topic => topic.toHex());
|
|
29
29
|
this._topicsJoinedPerSignal = new Map();
|
|
30
30
|
this.statusChanged = new async_1.Event();
|
|
31
31
|
this.commandTrace = new async_1.Event();
|
|
@@ -34,9 +34,7 @@ class WebsocketSignalManager {
|
|
|
34
34
|
log(`Created WebsocketSignalManager with signal servers: ${_hosts}`);
|
|
35
35
|
(0, assert_1.default)(_hosts.length === 1, 'Only a single signaling server connection is supported');
|
|
36
36
|
for (const host of this._hosts) {
|
|
37
|
-
const server = new
|
|
38
|
-
this.onSignal.emit(msg);
|
|
39
|
-
});
|
|
37
|
+
const server = new signal_client_1.SignalClient(host, async (msg) => this._onOffer(msg), async (msg) => this.onSignal.emit(msg));
|
|
40
38
|
this._servers.set(host, server);
|
|
41
39
|
server.statusChanged.on(() => this.statusChanged.emit(this.getStatus()));
|
|
42
40
|
server.commandTrace.on(trace => this.commandTrace.emit(trace));
|
|
@@ -118,7 +116,7 @@ class WebsocketSignalManager {
|
|
|
118
116
|
// TODO(marik-d): Broadcast to all signal servers.
|
|
119
117
|
return Array.from(this._servers.values())[0].offer(msg);
|
|
120
118
|
}
|
|
121
|
-
signal(msg) {
|
|
119
|
+
async signal(msg) {
|
|
122
120
|
log(`Signal ${msg.remoteId}`);
|
|
123
121
|
for (const server of this._servers.values()) {
|
|
124
122
|
void server.signal(msg);
|
|
@@ -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,oDAA4B;AAC5B,kDAA0B;AAE1B,uCAAkD;AAElD,qCAAwC;AAGxC,
|
|
1
|
+
{"version":3,"file":"websocket-signal-manager.js","sourceRoot":"","sources":["../../../src/signal/websocket-signal-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,6 +29,9 @@ export declare enum ConnectionState {
|
|
|
29
29
|
*/
|
|
30
30
|
CLOSED = "CLOSED"
|
|
31
31
|
}
|
|
32
|
+
/**
|
|
33
|
+
* Represents a connection to a remote peer.
|
|
34
|
+
*/
|
|
32
35
|
export declare class Connection {
|
|
33
36
|
readonly topic: PublicKey;
|
|
34
37
|
readonly ownId: PublicKey;
|
|
@@ -48,7 +51,7 @@ export declare class Connection {
|
|
|
48
51
|
get transport(): Transport | undefined;
|
|
49
52
|
get protocol(): Protocol;
|
|
50
53
|
connect(): void;
|
|
51
|
-
signal(msg: SignalApi.SignalMessage): void
|
|
54
|
+
signal(msg: SignalApi.SignalMessage): Promise<void>;
|
|
52
55
|
close(): Promise<void>;
|
|
53
56
|
}
|
|
54
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,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE/C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,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,qBAAa,UAAU;
|
|
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,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE/C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,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,CAAiC;IAEzD,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,SAAS,CAAC,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC,EAC5D,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,SAAS,CAAC,aAAa;IAuBpC,KAAK;CAmBZ"}
|
|
@@ -44,6 +44,9 @@ var ConnectionState;
|
|
|
44
44
|
*/
|
|
45
45
|
ConnectionState["CLOSED"] = "CLOSED";
|
|
46
46
|
})(ConnectionState = exports.ConnectionState || (exports.ConnectionState = {}));
|
|
47
|
+
/**
|
|
48
|
+
* Represents a connection to a remote peer.
|
|
49
|
+
*/
|
|
47
50
|
class Connection {
|
|
48
51
|
constructor(topic, ownId, remoteId, sessionId, initiator, _sendSignal, _protocol, _transportFactory) {
|
|
49
52
|
this.topic = topic;
|
|
@@ -93,11 +96,11 @@ class Connection {
|
|
|
93
96
|
this._transport.errors.pipeTo(this.errors);
|
|
94
97
|
// Replay signals that were received before transport was created.
|
|
95
98
|
for (const signal of this._bufferedSignals) {
|
|
96
|
-
this._transport.signal(signal);
|
|
99
|
+
void this._transport.signal(signal); // TODO(burdon): Remove async?
|
|
97
100
|
}
|
|
98
101
|
this._bufferedSignals = [];
|
|
99
102
|
}
|
|
100
|
-
signal(msg) {
|
|
103
|
+
async signal(msg) {
|
|
101
104
|
if (!msg.sessionId.equals(this.sessionId)) {
|
|
102
105
|
log('Dropping signal for incorrect session id.');
|
|
103
106
|
return;
|
|
@@ -114,7 +117,7 @@ class Connection {
|
|
|
114
117
|
}
|
|
115
118
|
(0, assert_1.default)(this._transport, 'Connection not ready to accept signals.');
|
|
116
119
|
log(`${this.ownId} received signal from ${this.remoteId}: ${msg.data.type}`);
|
|
117
|
-
this._transport.signal(msg);
|
|
120
|
+
await this._transport.signal(msg);
|
|
118
121
|
}
|
|
119
122
|
async close() {
|
|
120
123
|
var _a;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../../src/swarm/connection.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;AAEF,oDAA4B;AAC5B,kDAA0B;AAE1B,uCAAkD;AAElD,uCAA0C;AAM1C,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,MAAa,UAAU;
|
|
1
|
+
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../../src/swarm/connection.ts"],"names":[],"mappings":"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"}
|
package/dist/src/swarm/index.js
CHANGED
|
@@ -4,7 +4,11 @@
|
|
|
4
4
|
//
|
|
5
5
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
6
6
|
if (k2 === undefined) k2 = k;
|
|
7
|
-
Object.
|
|
7
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
8
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
9
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
10
|
+
}
|
|
11
|
+
Object.defineProperty(o, k2, desc);
|
|
8
12
|
}) : (function(o, m, k, k2) {
|
|
9
13
|
if (k2 === undefined) k2 = k;
|
|
10
14
|
o[k2] = m[k];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/swarm/index.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/swarm/index.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;;;;;AAEF,+CAA6B;AAC7B,0CAAwB;AACxB,iDAA+B"}
|
|
@@ -2,7 +2,7 @@ import { Event } from '@dxos/async';
|
|
|
2
2
|
import { PublicKey } from '@dxos/crypto';
|
|
3
3
|
import { ErrorStream } from '@dxos/debug';
|
|
4
4
|
import { ProtocolProvider } from '../network-manager';
|
|
5
|
-
import { SignalApi } from '../signal';
|
|
5
|
+
import { SignalApi, SignalConnection } from '../signal';
|
|
6
6
|
import { Topology } from '../topology';
|
|
7
7
|
import { TransportFactory } from '../transport';
|
|
8
8
|
import { Topic } from '../types';
|
|
@@ -16,10 +16,8 @@ export declare class Swarm {
|
|
|
16
16
|
private readonly _topic;
|
|
17
17
|
private readonly _ownPeerId;
|
|
18
18
|
private _topology;
|
|
19
|
-
private readonly
|
|
20
|
-
private readonly
|
|
21
|
-
private readonly _sendSignal;
|
|
22
|
-
private readonly _lookup;
|
|
19
|
+
private readonly _protocolProvider;
|
|
20
|
+
private readonly _signalConnection;
|
|
23
21
|
private readonly _transportFactory;
|
|
24
22
|
private readonly _label;
|
|
25
23
|
/**
|
|
@@ -43,7 +41,7 @@ export declare class Swarm {
|
|
|
43
41
|
*/
|
|
44
42
|
readonly connected: Event<PublicKey>;
|
|
45
43
|
readonly errors: ErrorStream;
|
|
46
|
-
constructor(_topic: PublicKey, _ownPeerId: PublicKey, _topology: Topology,
|
|
44
|
+
constructor(_topic: PublicKey, _ownPeerId: PublicKey, _topology: Topology, _protocolProvider: ProtocolProvider, _signalConnection: SignalConnection, _transportFactory: TransportFactory, _label: string | undefined);
|
|
47
45
|
get ownPeerId(): PublicKey;
|
|
48
46
|
/**
|
|
49
47
|
* Custom label assigned to this swarm. Used in devtools to display human-readable names for swarms.
|
|
@@ -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;AACpC,OAAO,EAAgB,SAAS,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"swarm.d.ts","sourceRoot":"","sources":["../../../src/swarm/swarm.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAgB,SAAS,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AACxD,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,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,MAAM;IAtCzB;;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,iBAAiB,EAAE,gBAAgB,EACnC,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,SAAS,CAAC,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC;IAsCrE,QAAQ,CAAE,OAAO,EAAE,SAAS,CAAC,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAa1D,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
|
@@ -22,14 +22,12 @@ const log = (0, debug_1.default)('dxos:network-manager:swarm');
|
|
|
22
22
|
*/
|
|
23
23
|
class Swarm {
|
|
24
24
|
// TODO(burdon): Split up properties.
|
|
25
|
-
constructor(_topic, _ownPeerId, _topology,
|
|
25
|
+
constructor(_topic, _ownPeerId, _topology, _protocolProvider, _signalConnection, _transportFactory, _label) {
|
|
26
26
|
this._topic = _topic;
|
|
27
27
|
this._ownPeerId = _ownPeerId;
|
|
28
28
|
this._topology = _topology;
|
|
29
|
-
this.
|
|
30
|
-
this.
|
|
31
|
-
this._sendSignal = _sendSignal;
|
|
32
|
-
this._lookup = _lookup;
|
|
29
|
+
this._protocolProvider = _protocolProvider;
|
|
30
|
+
this._signalConnection = _signalConnection;
|
|
33
31
|
this._transportFactory = _transportFactory;
|
|
34
32
|
this._label = _label;
|
|
35
33
|
/**
|
|
@@ -128,7 +126,7 @@ class Swarm {
|
|
|
128
126
|
log(`Dropping signal message for non-existent connection: topic=${this._topic}, peerId=${message.id}`);
|
|
129
127
|
return;
|
|
130
128
|
}
|
|
131
|
-
connection.signal(message);
|
|
129
|
+
await connection.signal(message);
|
|
132
130
|
}
|
|
133
131
|
async setTopology(newTopology) {
|
|
134
132
|
log(`Set topology for ${this._topic} ${Object.getPrototypeOf(this._topology).constructor.name} ${Object.getPrototypeOf(newTopology).constructor.name}`);
|
|
@@ -163,7 +161,7 @@ class Swarm {
|
|
|
163
161
|
this._topology.update();
|
|
164
162
|
},
|
|
165
163
|
lookup: () => {
|
|
166
|
-
this.
|
|
164
|
+
this._signalConnection.lookup(this._topic);
|
|
167
165
|
}
|
|
168
166
|
};
|
|
169
167
|
}
|
|
@@ -174,7 +172,7 @@ class Swarm {
|
|
|
174
172
|
}
|
|
175
173
|
const sessionId = crypto_1.PublicKey.random();
|
|
176
174
|
const connection = this._createConnection(true, remoteId, sessionId);
|
|
177
|
-
this.
|
|
175
|
+
this._signalConnection.offer({
|
|
178
176
|
id: this._ownPeerId,
|
|
179
177
|
remoteId,
|
|
180
178
|
sessionId,
|
|
@@ -184,7 +182,7 @@ class Swarm {
|
|
|
184
182
|
.then(answer => {
|
|
185
183
|
log(`Received answer: ${JSON.stringify(answer)} topic=${this._topic} ownId=${this._ownPeerId} remoteId=${remoteId}`);
|
|
186
184
|
if (connection.state !== connection_1.ConnectionState.INITIAL) {
|
|
187
|
-
log('Ignoring answer');
|
|
185
|
+
log('Ignoring answer.');
|
|
188
186
|
return;
|
|
189
187
|
}
|
|
190
188
|
if (answer.accept) {
|
|
@@ -208,8 +206,8 @@ class Swarm {
|
|
|
208
206
|
}
|
|
209
207
|
_createConnection(initiator, remoteId, sessionId) {
|
|
210
208
|
log(`Create connection topic=${this._topic} remoteId=${remoteId} initiator=${initiator}`);
|
|
211
|
-
(0, assert_1.default)(!this._connections.has(remoteId), 'Peer already connected');
|
|
212
|
-
const connection = new connection_1.Connection(this._topic, this._ownPeerId, remoteId, sessionId, initiator, this.
|
|
209
|
+
(0, assert_1.default)(!this._connections.has(remoteId), 'Peer already connected.');
|
|
210
|
+
const connection = new connection_1.Connection(this._topic, this._ownPeerId, remoteId, sessionId, initiator, (msg) => this._signalConnection.signal(msg), this._protocolProvider({ channel: (0, crypto_1.discoveryKey)(this._topic), initiator }), this._transportFactory);
|
|
213
211
|
this._connections.set(remoteId, connection);
|
|
214
212
|
this.connectionAdded.emit(connection);
|
|
215
213
|
connection.errors.handle(error => {
|
|
@@ -220,7 +218,8 @@ class Swarm {
|
|
|
220
218
|
void connection.stateChanged.waitFor(s => s === connection_1.ConnectionState.CLOSED).then(() => {
|
|
221
219
|
var _a;
|
|
222
220
|
log(`Connection closed topic=${this._topic} remoteId=${remoteId} initiator=${initiator}`);
|
|
223
|
-
// Connection might have been already closed or replace by a different one.
|
|
221
|
+
// Connection might have been already closed or replace by a different one.
|
|
222
|
+
// Only remove the connection if it has the same session id.
|
|
224
223
|
if ((_a = this._connections.get(remoteId)) === null || _a === void 0 ? void 0 : _a.sessionId.equals(sessionId)) {
|
|
225
224
|
this._connections.delete(remoteId);
|
|
226
225
|
this.connectionRemoved.emit(connection);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"swarm.js","sourceRoot":"","sources":["../../../src/swarm/swarm.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAC5B,kDAA0B;AAE1B,uCAAoC;AACpC,yCAAuD;AACvD,uCAA0C;AAC1C,qCAAoD;AAOpD,6CAA2D;AAE3D,MAAM,GAAG,GAAG,IAAA,eAAK,EAAC,4BAA4B,CAAC,CAAC;AAEhD;;;;GAIG;AACH,MAAa,KAAK;
|
|
1
|
+
{"version":3,"file":"swarm.js","sourceRoot":"","sources":["../../../src/swarm/swarm.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,24 +18,27 @@ const topology_1 = require("../topology");
|
|
|
18
18
|
const transport_1 = require("../transport");
|
|
19
19
|
const swarm_1 = require("./swarm");
|
|
20
20
|
const log = (0, debug_1.default)('dxos:network-manager:swarm:test');
|
|
21
|
+
class MockSignalConnection {
|
|
22
|
+
constructor(_swarm, _delay = 10) {
|
|
23
|
+
this._swarm = _swarm;
|
|
24
|
+
this._delay = _delay;
|
|
25
|
+
}
|
|
26
|
+
lookup(topic) { }
|
|
27
|
+
async offer(msg) {
|
|
28
|
+
await (0, async_1.sleep)(this._delay);
|
|
29
|
+
return this._swarm().onOffer(msg);
|
|
30
|
+
}
|
|
31
|
+
async signal(msg) {
|
|
32
|
+
await (0, async_1.sleep)(this._delay);
|
|
33
|
+
await this._swarm().onSignal(msg);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
21
36
|
const setup = () => {
|
|
22
37
|
const topic = crypto_1.PublicKey.random();
|
|
23
38
|
const peerId1 = crypto_1.PublicKey.random();
|
|
24
39
|
const peerId2 = crypto_1.PublicKey.random();
|
|
25
|
-
const swarm1 = new swarm_1.Swarm(topic, peerId1, new topology_1.FullyConnectedTopology(), () => new mesh_protocol_1.Protocol(),
|
|
26
|
-
|
|
27
|
-
return swarm2.onOffer(msg);
|
|
28
|
-
}, async (msg) => {
|
|
29
|
-
await (0, async_1.sleep)(10); // Simulating network delay.
|
|
30
|
-
await swarm2.onSignal(msg);
|
|
31
|
-
}, () => { }, (0, transport_1.createWebRtcTransportFactory)(), undefined);
|
|
32
|
-
const swarm2 = new swarm_1.Swarm(topic, peerId2, new topology_1.FullyConnectedTopology(), () => new mesh_protocol_1.Protocol(), async (msg) => {
|
|
33
|
-
await (0, async_1.sleep)(10); // Simulating network delay.
|
|
34
|
-
return swarm1.onOffer(msg);
|
|
35
|
-
}, async (msg) => {
|
|
36
|
-
await (0, async_1.sleep)(10); // Simulating network delay.
|
|
37
|
-
await swarm1.onSignal(msg);
|
|
38
|
-
}, () => { }, (0, transport_1.createWebRtcTransportFactory)(), undefined);
|
|
40
|
+
const swarm1 = new swarm_1.Swarm(topic, peerId1, new topology_1.FullyConnectedTopology(), () => new mesh_protocol_1.Protocol(), new MockSignalConnection(() => swarm2), (0, transport_1.createWebRTCTransportFactory)(), undefined);
|
|
41
|
+
const swarm2 = new swarm_1.Swarm(topic, peerId2, new topology_1.FullyConnectedTopology(), () => new mesh_protocol_1.Protocol(), new MockSignalConnection(() => swarm1), (0, transport_1.createWebRTCTransportFactory)(), undefined);
|
|
39
42
|
(0, testutils_1.afterTest)(async () => {
|
|
40
43
|
await swarm1.destroy();
|
|
41
44
|
await swarm2.destroy();
|
|
@@ -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,yCAAyC;AACzC,uDAA+C;AAC/C,+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":";;AAQA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAS1D,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"}
|
|
@@ -4,7 +4,11 @@
|
|
|
4
4
|
//
|
|
5
5
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
6
6
|
if (k2 === undefined) k2 = k;
|
|
7
|
-
Object.
|
|
7
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
8
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
9
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
10
|
+
}
|
|
11
|
+
Object.defineProperty(o, k2, desc);
|
|
8
12
|
}) : (function(o, m, k, k2) {
|
|
9
13
|
if (k2 === undefined) k2 = k;
|
|
10
14
|
o[k2] = m[k];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/topology/index.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/topology/index.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;;;;;AAEF,6DAA2C;AAC3C,kDAAgC;AAChC,kDAAgC;AAChC,6CAA2B"}
|
|
@@ -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: SignalApi.SignalMessage): void
|
|
25
|
+
signal(msg: SignalApi.SignalMessage): 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,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG1C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,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;
|
|
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,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG1C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,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,SAAS,CAAC,aAAa;IAIpC,KAAK,IAAK,OAAO,CAAC,IAAI,CAAC;CA0B9B;AAGD,eAAO,MAAM,wBAAwB,EAAE,gBAMtC,CAAC"}
|
|
@@ -53,8 +53,8 @@ class InMemoryTransport {
|
|
|
53
53
|
get sessionId() {
|
|
54
54
|
return this._sessionId;
|
|
55
55
|
}
|
|
56
|
-
signal(msg) {
|
|
57
|
-
//
|
|
56
|
+
async signal(msg) {
|
|
57
|
+
// No-op.
|
|
58
58
|
}
|
|
59
59
|
async close() {
|
|
60
60
|
log(`Closing connection topic=${this._topic} peerId=${this._ownId} remoteId=${this._remoteId}`);
|