@dxos/network-manager 0.1.0 → 0.1.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/swarm/connection.d.ts +1 -1
- package/dist/src/swarm/connection.d.ts.map +1 -1
- package/dist/src/swarm/connection.js +2 -2
- package/dist/src/swarm/connection.js.map +1 -1
- package/dist/src/transport/webrtc-transport.d.ts +1 -1
- package/dist/src/transport/webrtc-transport.d.ts.map +1 -1
- package/dist/src/transport/webrtc-transport.js +19 -13
- package/dist/src/transport/webrtc-transport.js.map +1 -1
- package/package.json +16 -16
- package/src/swarm/connection.ts +2 -2
- package/src/transport/webrtc-transport.ts +24 -19
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../../src/swarm/connection.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAgB,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAG/C,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAE3D;;GAEG;AACH,oBAAY,eAAe;IACzB;;;OAGG;IACH,OAAO,YAAY;IAEnB;;OAEG;IACH,qBAAqB,0BAA0B;IAE/C;;OAEG;IACH,
|
|
1
|
+
{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../../src/swarm/connection.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAgB,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAG/C,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAE3D;;GAEG;AACH,oBAAY,eAAe;IACzB;;;OAGG;IACH,OAAO,YAAY;IAEnB;;OAEG;IACH,qBAAqB,0BAA0B;IAE/C;;OAEG;IACH,UAAU,eAAe;IAEzB;;OAEG;IACH,QAAQ,aAAa;IAErB;;OAEG;IACH,QAAQ,aAAa;IAErB;;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,gBAAgB;IACjC,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,CAAgB;IAExC,QAAQ,CAAC,YAAY,yBAAgC;IACrD,QAAQ,CAAC,MAAM,cAAqB;gBAGlB,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,SAAS,EAAE,wBAAwB;IAC1C,QAAQ,EAAE,SAAS,EACnB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,OAAO,EACjB,gBAAgB,EAAE,eAAe,EACjC,SAAS,EAAE,QAAQ,EACnB,iBAAiB,EAAE,gBAAgB;IAGtD,IAAI,KAAK,oBAER;IAED,IAAI,SAAS,0BAEZ;IAED,IAAI,QAAQ,aAEX;IAGD,QAAQ;IAmCR,IAAI;IAmCE,KAAK;IAkBL,MAAM,CAAC,GAAG,EAAE,aAAa;IAqB/B,OAAO,CAAC,YAAY;CAIrB"}
|
|
@@ -34,7 +34,7 @@ var ConnectionState;
|
|
|
34
34
|
/**
|
|
35
35
|
* Waiting for a connection to be originated from the remote peer.
|
|
36
36
|
*/
|
|
37
|
-
ConnectionState["
|
|
37
|
+
ConnectionState["CONNECTING"] = "CONNECTING";
|
|
38
38
|
/**
|
|
39
39
|
* Peer rejected offer.
|
|
40
40
|
*/
|
|
@@ -117,7 +117,7 @@ class Connection {
|
|
|
117
117
|
// TODO(burdon): Make async?
|
|
118
118
|
open() {
|
|
119
119
|
(0, node_assert_1.default)(this._state === ConnectionState.INITIAL, 'Invalid state.');
|
|
120
|
-
this._changeState(this.initiator ? ConnectionState.INITIATING_CONNECTION : ConnectionState.
|
|
120
|
+
this._changeState(this.initiator ? ConnectionState.INITIATING_CONNECTION : ConnectionState.CONNECTING);
|
|
121
121
|
(0, node_assert_1.default)(!this._transport);
|
|
122
122
|
this._transport = this._transportFactory.create({
|
|
123
123
|
topic: this.topic,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../../src/swarm/connection.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;AAEF,8DAAiC;AAEjC,uCAAkD;AAClD,uCAA0C;AAE1C,mCAAgC;AAOhC;;GAEG;AACH,IAAY,eAoCX;AApCD,WAAY,eAAe;IACzB;;;OAGG;IACH,sCAAmB,CAAA;IAEnB;;OAEG;IACH,kEAA+C,CAAA;IAE/C;;OAEG;IACH,
|
|
1
|
+
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../../src/swarm/connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,8 +26,8 @@ export declare class WebRTCTransport implements Transport {
|
|
|
26
26
|
get remoteId(): PublicKey;
|
|
27
27
|
get sessionId(): PublicKey;
|
|
28
28
|
get peer(): SimplePeerConstructor.Instance;
|
|
29
|
-
signal(signal: Signal): Promise<void>;
|
|
30
29
|
close(): Promise<void>;
|
|
30
|
+
signal(signal: Signal): Promise<void>;
|
|
31
31
|
private _disconnectStreams;
|
|
32
32
|
}
|
|
33
33
|
export declare const createWebRTCTransportFactory: (webrtcConfig?: any) => TransportFactory;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webrtc-transport.d.ts","sourceRoot":"","sources":["../../../src/transport/webrtc-transport.ts"],"names":[],"mappings":";AAKA,OAAO,qBAAiD,MAAM,aAAa,CAAC;AAE5E,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,WAAW,EAAS,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAE/D,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAG1D;;GAEG;AACH,qBAAa,eAAgB,YAAW,SAAS;IAQ7C,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;IAdjC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAa;IAEnC,QAAQ,CAAC,MAAM,cAAe;IAC9B,QAAQ,CAAC,SAAS,cAAe;IACjC,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,aAAa,KAAK,IAAI,EACzC,aAAa,CAAC,KAAK;
|
|
1
|
+
{"version":3,"file":"webrtc-transport.d.ts","sourceRoot":"","sources":["../../../src/transport/webrtc-transport.ts"],"names":[],"mappings":";AAKA,OAAO,qBAAiD,MAAM,aAAa,CAAC;AAE5E,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,WAAW,EAAS,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAE/D,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAG1D;;GAEG;AACH,qBAAa,eAAgB,YAAW,SAAS;IAQ7C,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;IAdjC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAa;IAEnC,QAAQ,CAAC,MAAM,cAAe;IAC9B,QAAQ,CAAC,SAAS,cAAe;IACjC,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,aAAa,KAAK,IAAI,EACzC,aAAa,CAAC,KAAK;IA+CtC,IAAI,QAAQ,cAEX;IAED,IAAI,SAAS,cAEZ;IAED,IAAI,IAAI,mCAEP;IAEK,KAAK;IAOL,MAAM,CAAC,MAAM,EAAE,MAAM;YAMb,kBAAkB;CAIjC;AAGD,eAAO,MAAM,4BAA4B,kBAAmB,GAAG,KAAG,gBAYhE,CAAC"}
|
|
@@ -29,8 +29,13 @@ class WebRTCTransport {
|
|
|
29
29
|
this.closed = new async_1.Event();
|
|
30
30
|
this.connected = new async_1.Event();
|
|
31
31
|
this.errors = new debug_1.ErrorStream();
|
|
32
|
-
(0, log_1.log)(
|
|
33
|
-
|
|
32
|
+
(0, log_1.log)('created connection', {
|
|
33
|
+
id: this._ownId,
|
|
34
|
+
topic: this._topic,
|
|
35
|
+
remoteId: this._remoteId,
|
|
36
|
+
initiator: this._initiator,
|
|
37
|
+
config: this._webrtcConfig
|
|
38
|
+
}, { file: "packages/core/mesh/network-manager/src/transport/webrtc-transport.ts", line: 38 });
|
|
34
39
|
this._peer = new simple_peer_1.default({
|
|
35
40
|
initiator: this._initiator,
|
|
36
41
|
wrtc: simple_peer_1.default.WEBRTC_SUPPORT ? undefined : webrtc_1.wrtc !== null && webrtc_1.wrtc !== void 0 ? webrtc_1.wrtc : (0, debug_1.raise)(new Error('wrtc not available')),
|
|
@@ -51,19 +56,19 @@ class WebRTCTransport {
|
|
|
51
56
|
}
|
|
52
57
|
});
|
|
53
58
|
this._peer.on('connect', () => {
|
|
54
|
-
(0, log_1.log)(
|
|
59
|
+
(0, log_1.log)('connected', { id: this._ownId, remoteId: this._remoteId }, { file: "packages/core/mesh/network-manager/src/transport/webrtc-transport.ts", line: 66 });
|
|
55
60
|
this._stream.pipe(this._peer).pipe(this._stream);
|
|
56
61
|
this.connected.emit();
|
|
57
62
|
});
|
|
58
|
-
this._peer.on('error', async (err) => {
|
|
59
|
-
this.errors.raise(err);
|
|
60
|
-
await this.close();
|
|
61
|
-
});
|
|
62
63
|
this._peer.on('close', async () => {
|
|
63
|
-
(0, log_1.log)(
|
|
64
|
+
(0, log_1.log)('closed', { id: this._ownId, remoteId: this._remoteId }, { file: "packages/core/mesh/network-manager/src/transport/webrtc-transport.ts", line: 72 });
|
|
64
65
|
await this._disconnectStreams();
|
|
65
66
|
this.closed.emit();
|
|
66
67
|
});
|
|
68
|
+
this._peer.on('error', async (err) => {
|
|
69
|
+
this.errors.raise(err);
|
|
70
|
+
await this.close();
|
|
71
|
+
});
|
|
67
72
|
}
|
|
68
73
|
get remoteId() {
|
|
69
74
|
return this._remoteId;
|
|
@@ -74,16 +79,17 @@ class WebRTCTransport {
|
|
|
74
79
|
get peer() {
|
|
75
80
|
return this._peer;
|
|
76
81
|
}
|
|
82
|
+
async close() {
|
|
83
|
+
(0, log_1.log)('closing...', {}, { file: "packages/core/mesh/network-manager/src/transport/webrtc-transport.ts", line: 96 });
|
|
84
|
+
await this._disconnectStreams();
|
|
85
|
+
this._peer.destroy();
|
|
86
|
+
(0, log_1.log)('closed', {}, { file: "packages/core/mesh/network-manager/src/transport/webrtc-transport.ts", line: 99 });
|
|
87
|
+
}
|
|
77
88
|
async signal(signal) {
|
|
78
89
|
(0, node_assert_1.default)(this._peer, 'Connection not ready to accept signals.');
|
|
79
90
|
(0, node_assert_1.default)(signal.json, 'Signal message must contain signal data.');
|
|
80
91
|
this._peer.signal(JSON.parse(signal.json));
|
|
81
92
|
}
|
|
82
|
-
async close() {
|
|
83
|
-
await this._disconnectStreams();
|
|
84
|
-
this._peer.destroy();
|
|
85
|
-
(0, log_1.log)('Closed.', {}, { file: "packages/core/mesh/network-manager/src/transport/webrtc-transport.ts", line: 100 });
|
|
86
|
-
}
|
|
87
93
|
async _disconnectStreams() {
|
|
88
94
|
var _a, _b, _c, _d;
|
|
89
95
|
// TODO(rzadp): Find a way of unpiping this?
|
|
@@ -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,8DAAiC;AACjC,8DAA4E;AAE5E,uCAAoC;AACpC,uCAAiD;AAEjD,mCAAgC;AAKhC,qCAAgC;AAEhC;;GAEG;AACH,MAAa,eAAe;IAO1B,YACmB,UAAmB,EACnB,OAA+B,EAC/B,MAAiB,EACjB,SAAoB,EACpB,UAAqB,EACrB,MAAiB,EACjB,WAAyC,EACzC,aAAmB;QAPnB,eAAU,GAAV,UAAU,CAAS;QACnB,YAAO,GAAP,OAAO,CAAwB;QAC/B,WAAM,GAAN,MAAM,CAAW;QACjB,cAAS,GAAT,SAAS,CAAW;QACpB,eAAU,GAAV,UAAU,CAAW;QACrB,WAAM,GAAN,MAAM,CAAW;QACjB,gBAAW,GAAX,WAAW,CAA8B;QACzC,kBAAa,GAAb,aAAa,CAAM;QAZ7B,WAAM,GAAG,IAAI,aAAK,EAAE,CAAC;QACrB,cAAS,GAAG,IAAI,aAAK,EAAE,CAAC;QACxB,WAAM,GAAG,IAAI,mBAAW,EAAE,CAAC;QAYlC,IAAA,SAAG,EAAC,
|
|
1
|
+
{"version":3,"file":"webrtc-transport.js","sourceRoot":"","sources":["../../../src/transport/webrtc-transport.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dxos/network-manager",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.2",
|
|
4
4
|
"description": "Network Manager",
|
|
5
5
|
"homepage": "https://dxos.org",
|
|
6
6
|
"bugs": "https://github.com/dxos/dxos/issues",
|
|
@@ -17,19 +17,19 @@
|
|
|
17
17
|
"README.md"
|
|
18
18
|
],
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"@dxos/async": "0.1.
|
|
21
|
-
"@dxos/codec-protobuf": "0.1.
|
|
22
|
-
"@dxos/credentials": "0.1.
|
|
23
|
-
"@dxos/crypto": "0.1.
|
|
24
|
-
"@dxos/debug": "0.1.
|
|
25
|
-
"@dxos/keys": "0.1.
|
|
26
|
-
"@dxos/log": "0.1.
|
|
27
|
-
"@dxos/mesh-protocol": "0.1.
|
|
28
|
-
"@dxos/messaging": "0.1.
|
|
29
|
-
"@dxos/protocol-plugin-presence": "0.1.
|
|
30
|
-
"@dxos/protocols": "0.1.
|
|
31
|
-
"@dxos/rpc": "0.1.
|
|
32
|
-
"@dxos/util": "0.1.
|
|
20
|
+
"@dxos/async": "0.1.2",
|
|
21
|
+
"@dxos/codec-protobuf": "0.1.2",
|
|
22
|
+
"@dxos/credentials": "0.1.2",
|
|
23
|
+
"@dxos/crypto": "0.1.2",
|
|
24
|
+
"@dxos/debug": "0.1.2",
|
|
25
|
+
"@dxos/keys": "0.1.2",
|
|
26
|
+
"@dxos/log": "0.1.2",
|
|
27
|
+
"@dxos/mesh-protocol": "0.1.2",
|
|
28
|
+
"@dxos/messaging": "0.1.2",
|
|
29
|
+
"@dxos/protocol-plugin-presence": "0.1.2",
|
|
30
|
+
"@dxos/protocols": "0.1.2",
|
|
31
|
+
"@dxos/rpc": "0.1.2",
|
|
32
|
+
"@dxos/util": "0.1.2",
|
|
33
33
|
"@koush/wrtc": "^0.5.3",
|
|
34
34
|
"assert": "^2.0.0",
|
|
35
35
|
"isomorphic-ws": "^4.0.1",
|
|
@@ -39,8 +39,8 @@
|
|
|
39
39
|
"xor-distance": "^2.0.0"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
|
-
"@dxos/signal": "0.1.
|
|
43
|
-
"@dxos/testutils": "0.1.
|
|
42
|
+
"@dxos/signal": "0.1.2",
|
|
43
|
+
"@dxos/testutils": "0.1.2",
|
|
44
44
|
"@swc-node/register": "^1.5.4",
|
|
45
45
|
"@swc/core": "^1.3.9",
|
|
46
46
|
"@types/simple-peer": "9.11.3",
|
package/src/swarm/connection.ts
CHANGED
|
@@ -32,7 +32,7 @@ export enum ConnectionState {
|
|
|
32
32
|
/**
|
|
33
33
|
* Waiting for a connection to be originated from the remote peer.
|
|
34
34
|
*/
|
|
35
|
-
|
|
35
|
+
CONNECTING = 'CONNECTING',
|
|
36
36
|
|
|
37
37
|
/**
|
|
38
38
|
* Peer rejected offer.
|
|
@@ -127,7 +127,7 @@ export class Connection {
|
|
|
127
127
|
// TODO(burdon): Make async?
|
|
128
128
|
open() {
|
|
129
129
|
assert(this._state === ConnectionState.INITIAL, 'Invalid state.');
|
|
130
|
-
this._changeState(this.initiator ? ConnectionState.INITIATING_CONNECTION : ConnectionState.
|
|
130
|
+
this._changeState(this.initiator ? ConnectionState.INITIATING_CONNECTION : ConnectionState.CONNECTING);
|
|
131
131
|
|
|
132
132
|
assert(!this._transport);
|
|
133
133
|
this._transport = this._transportFactory.create({
|
|
@@ -35,18 +35,19 @@ export class WebRTCTransport implements Transport {
|
|
|
35
35
|
private readonly _sendSignal: (msg: SignalMessage) => void,
|
|
36
36
|
private readonly _webrtcConfig?: any
|
|
37
37
|
) {
|
|
38
|
-
log(
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
);
|
|
38
|
+
log('created connection', {
|
|
39
|
+
id: this._ownId,
|
|
40
|
+
topic: this._topic,
|
|
41
|
+
remoteId: this._remoteId,
|
|
42
|
+
initiator: this._initiator,
|
|
43
|
+
config: this._webrtcConfig
|
|
44
|
+
});
|
|
45
45
|
this._peer = new SimplePeerConstructor({
|
|
46
46
|
initiator: this._initiator,
|
|
47
47
|
wrtc: SimplePeerConstructor.WEBRTC_SUPPORT ? undefined : wrtc ?? raise(new Error('wrtc not available')),
|
|
48
48
|
config: this._webrtcConfig
|
|
49
49
|
});
|
|
50
|
+
|
|
50
51
|
this._peer.on('signal', async (data) => {
|
|
51
52
|
try {
|
|
52
53
|
await this._sendSignal({
|
|
@@ -60,20 +61,23 @@ export class WebRTCTransport implements Transport {
|
|
|
60
61
|
this.errors.raise(err);
|
|
61
62
|
}
|
|
62
63
|
});
|
|
64
|
+
|
|
63
65
|
this._peer.on('connect', () => {
|
|
64
|
-
log(
|
|
66
|
+
log('connected', { id: this._ownId, remoteId: this._remoteId });
|
|
65
67
|
this._stream.pipe(this._peer!).pipe(this._stream);
|
|
66
68
|
this.connected.emit();
|
|
67
69
|
});
|
|
68
|
-
|
|
69
|
-
this.errors.raise(err);
|
|
70
|
-
await this.close();
|
|
71
|
-
});
|
|
70
|
+
|
|
72
71
|
this._peer.on('close', async () => {
|
|
73
|
-
log(
|
|
72
|
+
log('closed', { id: this._ownId, remoteId: this._remoteId });
|
|
74
73
|
await this._disconnectStreams();
|
|
75
74
|
this.closed.emit();
|
|
76
75
|
});
|
|
76
|
+
|
|
77
|
+
this._peer.on('error', async (err) => {
|
|
78
|
+
this.errors.raise(err);
|
|
79
|
+
await this.close();
|
|
80
|
+
});
|
|
77
81
|
}
|
|
78
82
|
|
|
79
83
|
get remoteId() {
|
|
@@ -88,18 +92,19 @@ export class WebRTCTransport implements Transport {
|
|
|
88
92
|
return this._peer;
|
|
89
93
|
}
|
|
90
94
|
|
|
95
|
+
async close() {
|
|
96
|
+
log('closing...');
|
|
97
|
+
await this._disconnectStreams();
|
|
98
|
+
this._peer!.destroy();
|
|
99
|
+
log('closed');
|
|
100
|
+
}
|
|
101
|
+
|
|
91
102
|
async signal(signal: Signal) {
|
|
92
103
|
assert(this._peer, 'Connection not ready to accept signals.');
|
|
93
104
|
assert(signal.json, 'Signal message must contain signal data.');
|
|
94
105
|
this._peer.signal(JSON.parse(signal.json));
|
|
95
106
|
}
|
|
96
107
|
|
|
97
|
-
async close() {
|
|
98
|
-
await this._disconnectStreams();
|
|
99
|
-
this._peer!.destroy();
|
|
100
|
-
log('Closed.');
|
|
101
|
-
}
|
|
102
|
-
|
|
103
108
|
private async _disconnectStreams() {
|
|
104
109
|
// TODO(rzadp): Find a way of unpiping this?
|
|
105
110
|
this._stream.unpipe?.(this._peer)?.unpipe?.(this._stream);
|