@streamr/dht 0.0.1-tatum.1 → 0.0.1-tatum.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/connection/ConnectionManager.d.ts +6 -0
- package/dist/src/connection/ConnectionManager.js +6 -3
- package/dist/src/connection/ConnectionManager.js.map +1 -1
- package/dist/src/connection/ConnectivityChecker.d.ts +3 -2
- package/dist/src/connection/ConnectivityChecker.js +21 -19
- package/dist/src/connection/ConnectivityChecker.js.map +1 -1
- package/dist/src/connection/WebRTC/WebRtcConnector.d.ts +2 -0
- package/dist/src/connection/WebRTC/WebRtcConnector.js +14 -1
- package/dist/src/connection/WebRTC/WebRtcConnector.js.map +1 -1
- package/dist/src/connection/WebSocket/WebSocketConnector.d.ts +5 -3
- package/dist/src/connection/WebSocket/WebSocketConnector.js +18 -12
- package/dist/src/connection/WebSocket/WebSocketConnector.js.map +1 -1
- package/dist/src/connection/WebSocket/WebSocketServer.d.ts +2 -2
- package/dist/src/connection/WebSocket/WebSocketServer.js +27 -36
- package/dist/src/connection/WebSocket/WebSocketServer.js.map +1 -1
- package/dist/src/dht/DhtNode.d.ts +6 -2
- package/dist/src/dht/DhtNode.js +8 -6
- package/dist/src/dht/DhtNode.js.map +1 -1
- package/dist/src/dht/discovery/PeerDiscovery.d.ts +4 -2
- package/dist/src/dht/discovery/PeerDiscovery.js +18 -33
- package/dist/src/dht/discovery/PeerDiscovery.js.map +1 -1
- package/dist/src/exports.d.ts +1 -1
- package/dist/src/exports.js.map +1 -1
- package/dist/src/helpers/errors.d.ts +1 -1
- package/dist/src/helpers/errors.js +3 -3
- package/dist/src/helpers/errors.js.map +1 -1
- package/dist/src/helpers/protoClasses.js +0 -2
- package/dist/src/helpers/protoClasses.js.map +1 -1
- package/dist/src/proto/packages/dht/protos/DhtRpc.client.js +1 -1
- package/dist/src/proto/packages/dht/protos/DhtRpc.d.ts +10 -50
- package/dist/src/proto/packages/dht/protos/DhtRpc.js +8 -35
- package/dist/src/proto/packages/dht/protos/DhtRpc.js.map +1 -1
- package/dist/src/proto/packages/proto-rpc/protos/ProtoRpc.js +1 -1
- package/package.json +4 -4
- package/protos/DhtRpc.proto +5 -15
- package/src/connection/ConnectionManager.ts +15 -3
- package/src/connection/ConnectivityChecker.ts +25 -23
- package/src/connection/WebRTC/WebRtcConnector.ts +14 -0
- package/src/connection/WebSocket/WebSocketConnector.ts +22 -12
- package/src/connection/WebSocket/WebSocketServer.ts +31 -19
- package/src/dht/DhtNode.ts +13 -7
- package/src/dht/discovery/PeerDiscovery.ts +17 -8
- package/src/exports.ts +1 -1
- package/src/helpers/errors.ts +1 -1
- package/src/helpers/protoClasses.ts +1 -5
- package/src/proto/google/protobuf/any.ts +1 -1
- package/src/proto/google/protobuf/empty.ts +1 -1
- package/src/proto/google/protobuf/timestamp.ts +1 -1
- package/src/proto/packages/dht/protos/DhtRpc.client.ts +1 -1
- package/src/proto/packages/dht/protos/DhtRpc.server.ts +1 -1
- package/src/proto/packages/dht/protos/DhtRpc.ts +17 -69
- package/src/proto/packages/proto-rpc/protos/ProtoRpc.ts +1 -1
- package/test/end-to-end/Layer0-Layer1.test.ts +1 -1
- package/test/end-to-end/Layer0.test.ts +1 -1
- package/test/end-to-end/Layer0MixedConnectionTypes.test.ts +1 -1
- package/test/end-to-end/Layer0WebRTC-Layer1.test.ts +3 -2
- package/test/end-to-end/Layer0WebRTC.test.ts +1 -1
- package/test/end-to-end/Layer1-Scale-WebRTC.test.ts +1 -1
- package/test/end-to-end/Layer1-Scale-WebSocket.test.ts +1 -1
- package/test/end-to-end/WebSocketConnectionRequest.test.ts +1 -1
- package/test/integration/ConnectionManager.test.ts +9 -9
- package/test/integration/SimultaneousConnections.test.ts +9 -6
- package/test/integration/WebSocketConnectionManagement.test.ts +3 -2
- package/test/unit/webrtcReplaceInternalIpWithExternalIp.ts +18 -0
|
@@ -19,7 +19,9 @@ export declare class ConnectionManagerConfig {
|
|
|
19
19
|
webrtcDatachannelBufferThresholdLow?: number;
|
|
20
20
|
webrtcDatachannelBufferThresholdHigh?: number;
|
|
21
21
|
webrtcNewConnectionTimeout?: number;
|
|
22
|
+
externalIp?: string;
|
|
22
23
|
webrtcPortRange?: PortRange;
|
|
24
|
+
tlsCertificate?: TlsCertificate;
|
|
23
25
|
simulator?: Simulator;
|
|
24
26
|
ownPeerDescriptor?: PeerDescriptor;
|
|
25
27
|
serviceIdPrefix?: string;
|
|
@@ -44,6 +46,10 @@ export interface PortRange {
|
|
|
44
46
|
min: number;
|
|
45
47
|
max: number;
|
|
46
48
|
}
|
|
49
|
+
export interface TlsCertificate {
|
|
50
|
+
privateKeyFileName: string;
|
|
51
|
+
certFileName: string;
|
|
52
|
+
}
|
|
47
53
|
export type Events = TransportEvents & ConnectionManagerEvents;
|
|
48
54
|
export declare class ConnectionManager extends EventEmitter<Events> implements ITransport, ConnectionLocker {
|
|
49
55
|
static PROTOCOL_VERSION: string;
|
|
@@ -126,7 +126,7 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
|
|
|
126
126
|
}
|
|
127
127
|
else {
|
|
128
128
|
logger.trace(`Creating WebSocketConnector`);
|
|
129
|
-
this.webSocketConnector = new WebSocketConnector_1.WebSocketConnector(ConnectionManager.PROTOCOL_VERSION, this.config.transportLayer, this.canConnect.bind(this), this.incomingConnectionCallback, this.config.websocketPortRange, this.config.websocketHost, this.config.entryPoints);
|
|
129
|
+
this.webSocketConnector = new WebSocketConnector_1.WebSocketConnector(ConnectionManager.PROTOCOL_VERSION, this.config.transportLayer, this.canConnect.bind(this), this.incomingConnectionCallback, this.config.websocketPortRange, this.config.websocketHost, this.config.entryPoints, this.config.tlsCertificate);
|
|
130
130
|
logger.trace(`Creating WebRTCConnector`);
|
|
131
131
|
this.webrtcConnector = new WebRtcConnector_1.WebRtcConnector({
|
|
132
132
|
rpcTransport: this.config.transportLayer,
|
|
@@ -136,6 +136,7 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
|
|
|
136
136
|
bufferThresholdLow: this.config.webrtcDatachannelBufferThresholdLow,
|
|
137
137
|
bufferThresholdHigh: this.config.webrtcDatachannelBufferThresholdHigh,
|
|
138
138
|
connectionTimeout: this.config.webrtcNewConnectionTimeout,
|
|
139
|
+
externalIp: this.config.externalIp,
|
|
139
140
|
portRange: this.config.webrtcPortRange
|
|
140
141
|
}, this.incomingConnectionCallback);
|
|
141
142
|
}
|
|
@@ -286,7 +287,7 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
|
|
|
286
287
|
isOwnWebSocketServer(peerDescriptor) {
|
|
287
288
|
if ((peerDescriptor.websocket !== undefined) && (this.ownPeerDescriptor.websocket !== undefined)) {
|
|
288
289
|
return ((peerDescriptor.websocket.port === this.ownPeerDescriptor.websocket.port)
|
|
289
|
-
&& (peerDescriptor.websocket.
|
|
290
|
+
&& (peerDescriptor.websocket.host === this.ownPeerDescriptor.websocket.host));
|
|
290
291
|
}
|
|
291
292
|
else {
|
|
292
293
|
return false;
|
|
@@ -297,7 +298,9 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
|
|
|
297
298
|
return this.simulatorConnector.connect(peerDescriptor);
|
|
298
299
|
}
|
|
299
300
|
else if (peerDescriptor.websocket || this.ownPeerDescriptor.websocket) {
|
|
300
|
-
|
|
301
|
+
if (!(peerDescriptor.type === DhtRpc_1.NodeType.BROWSER && this.ownPeerDescriptor.websocket?.tls)) {
|
|
302
|
+
return this.webSocketConnector.connect(peerDescriptor);
|
|
303
|
+
}
|
|
301
304
|
}
|
|
302
305
|
return this.webrtcConnector.connect(peerDescriptor);
|
|
303
306
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConnectionManager.js","sourceRoot":"","sources":["../../../src/connection/ConnectionManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAA4C;AAC5C,gEAW4C;AAC5C,uEAAmE;AAEnE,4DAAwD;AAExD,8DAAqE;AACrE,0CAAuI;AACvI,uDAAwC;AACxC,wEAA+D;AAE/D,gFAA4E;AAC5E,kDAAqD;AACrD,8EAAmF;AACnF,qEAAiE;AAIjE,uEAAmE;AACnE,mEAA+D;AAC/D,wEAAoE;AACpE,wEAAoE;AACpE,oDAAgD;AAChD,kFAI4C;AAE5C,MAAa,uBAAuB;IAoBhC,YAAY,IAAsC;QAdlD,mBAAc,GAAW,EAAE,CAAA;QAevB,uDAAuD;QACvD,IAAI,CAAoB,CAAA;QACxB,KAAK,CAAC,IAAI,IAAI,EAAE;YACZ,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE;gBACvB,OAAO,IAAI,CAAC,CAAC,CAAC,CAAA;aACjB;SACJ;QACD,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IAC7B,CAAC;CACJ;AA9BD,0DA8BC;AAED,IAAY,OAGX;AAHD,WAAY,OAAO;IACf,0CAA+B,CAAA;IAC/B,8BAAmB,CAAA;AACvB,CAAC,EAHW,OAAO,uBAAP,OAAO,QAGlB;AAeD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,IAAK,sBAKJ;AALD,WAAK,sBAAsB;IACvB,uCAAa,CAAA;IACb,6CAAmB,CAAA;IACnB,+CAAqB,CAAA;IACrB,6CAAmB,CAAA;AACvB,CAAC,EALI,sBAAsB,KAAtB,sBAAsB,QAK1B;AAoBD,MAAa,iBAAkB,SAAQ,4BAAoB;IAiBvD,YAAY,IAAsC;QAC9C,KAAK,EAAE,CAAA;QAbM,6BAAwB,GAAsB,IAAI,qCAAiB,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;QAEzF,UAAK,GAAG,IAAI,6CAAqB,EAAE,CAAA;QACnC,gBAAW,GAAsC,IAAI,GAAG,EAAE,CAAA;QAO1D,UAAK,GAAG,sBAAsB,CAAC,IAAI,CAAA;QA0SnC,gBAAW,GAAG,CAAC,UAA6B,EAAE,EAAE;YACpD,MAAM,cAAc,GAAG,UAAU,CAAC,iBAAiB,EAAG,CAAA;YACtD,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAA;YACtC,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,iBAAiB,EAAE,QAAQ,GAAG,IAAI,GAAG,cAAc,CAAC,QAAQ,GAAG,iBAAiB,GAAG,UAAU,CAAC,cAAc,CAAC,CAAA;YACrI,IAAI,CAAC,uBAAuB,EAAE,CAAA;QAClC,CAAC,CAAA;QAEO,mBAAc,GAAG,CAAC,UAA6B,EAAE,iBAAoC,EAAE,EAAE;YAC7F,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,IAAI,GAAG,UAAU,CAAC,iBAAiB,EAAE,EAAE,QAAQ;gBACrF,oBAAoB,GAAG,iBAAiB,CAAC,CAAA;YAE7C,MAAM,MAAM,GAAG,IAAA,gDAAqB,EAAC,UAAU,CAAC,iBAAiB,EAAG,CAAC,CAAA;YACrE,MAAM,gBAAgB,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;YACrD,IAAI,gBAAgB,IAAI,gBAAgB,CAAC,YAAY,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;gBACnF,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;gBAChC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;gBAC/B,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,IAAI,GAAG,UAAU,CAAC,iBAAiB,EAAE,EAAE,QAAQ;oBACrF,0CAA0C,GAAG,iBAAiB,CAAC,CAAA;gBACnE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,UAAU,CAAC,iBAAiB,EAAG,EAAE,iBAAiB,CAAC,CAAA;gBAC7E,IAAI,CAAC,uBAAuB,EAAE,CAAA;aACjC;iBAAM;gBACH,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,IAAI,GAAG,UAAU,CAAC,iBAAiB,EAAE,EAAE,QAAQ;oBACrF,wEAAwE,CAAC,CAAA;gBAC7E,IAAI,gBAAgB,EAAE;oBAClB,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,IAAI,GAAG,UAAU,CAAC,iBAAiB,EAAE,EAAE,QAAQ;wBAC/E,8BAA8B,GAAG,gBAAgB,CAAC,YAAY,GAAG,GAAG,GAAG,UAAU,CAAC,YAAY,CAAC,CAAA;iBACtG;aACJ;QAEL,CAAC,CAAA;QAnUG,IAAI,CAAC,MAAM,GAAG,IAAI,uBAAuB,CAAC,IAAI,CAAC,CAAA;QAC/C,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACpC,IAAI,CAAC,0BAA0B,GAAG,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC5E,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,IAAI,IAAI,sBAAc,EAAE,CAAA;QACxE,IAAI,CAAC,OAAO,GAAG;YACX,qBAAqB,EAAE,IAAI,kBAAU,EAAE;YACvC,kBAAkB,EAAE,IAAI,kBAAU,EAAE;YACpC,wBAAwB,EAAE,IAAI,kBAAU,EAAE;YAC1C,qBAAqB,EAAE,IAAI,kBAAU,EAAE;YACvC,sBAAsB,EAAE,IAAI,mBAAW,CAAC,CAAC,CAAC;YAC1C,2BAA2B,EAAE,IAAI,mBAAW,EAAE;SACjD,CAAA;QACD,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;QACpD,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;YACvB,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAA;YAC3C,IAAI,CAAC,kBAAkB,GAAG,IAAI,uCAAkB,CAC5C,iBAAiB,CAAC,gBAAgB,EAClC,IAAI,CAAC,MAAM,CAAC,iBAAkB,EAC9B,IAAI,CAAC,MAAM,CAAC,SAAS,EACrB,IAAI,CAAC,0BAA0B,CAClC,CAAA;YACD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAA;YAC3D,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAA;YACtD,IAAI,CAAC,KAAK,GAAG,sBAAsB,CAAC,OAAO,CAAA;SAC9C;aAAM;YACH,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAA;YAC3C,IAAI,CAAC,kBAAkB,GAAG,IAAI,uCAAkB,CAC5C,iBAAiB,CAAC,gBAAgB,EAClC,IAAI,CAAC,MAAM,CAAC,cAAe,EAC3B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAC1B,IAAI,CAAC,0BAA0B,EAC/B,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAC9B,IAAI,CAAC,MAAM,CAAC,aAAa,EACzB,IAAI,CAAC,MAAM,CAAC,WAAW,CAC1B,CAAA;YACD,MAAM,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAA;YACxC,IAAI,CAAC,eAAe,GAAG,IAAI,iCAAe,CAAC;gBACvC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,cAAe;gBACzC,eAAe,EAAE,iBAAiB,CAAC,gBAAgB;gBACnD,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU;gBAClC,qBAAqB,EAAE,IAAI,CAAC,MAAM,CAAC,2BAA2B;gBAC9D,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,mCAAmC;gBACnE,mBAAmB,EAAE,IAAI,CAAC,MAAM,CAAC,oCAAoC;gBACrE,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,0BAA0B;gBACzD,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,eAAe;aACzC,EAAE,IAAI,CAAC,0BAA0B,CAAC,CAAA;SACtC;QACD,IAAI,CAAC,SAAS,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,mBAAmB,CAAA;QACvG,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAChC,IAAI,CAAC,eAAe,GAAG,IAAI,+CAAsB,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,EAAE;YACzE,iBAAiB,EAAE,KAAK;SAC3B,CAAC,CAAA;QACF,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,oBAAW,EAAE,qBAAY,EAAE,aAAa,EAC3E,CAAC,GAAgB,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;QAClE,IAAI,CAAC,eAAe,CAAC,uBAAuB,CAAC,sBAAa,EAAE,eAAe,EACvE,CAAC,GAAkB,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;QACtE,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,yBAAgB,EAAE,iCAAwB,EAAE,oBAAoB,EACnG,CAAC,GAAqB,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;IAClF,CAAC;IAEM,yBAAyB,CAAC,cAAsB,EAAE,aAAqB;QAC1E,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,cAAc,EAAE;YACzC,OAAM;SACT;QACD,MAAM,uBAAuB,GAAG,IAAI,qCAAiB,CAAC,IAAA,mDAAwB,EAAC,IAAI,CAAC,iBAAkB,CAAC,EAAE,MAAM,CAAC,CAAA;QAChH,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;YACpC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,UAAU,CAAC,WAAW,EAAE,GAAG,aAAa,EAAE;gBACrG,MAAM,CAAC,KAAK,CAAC,qCAAqC,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,IAAI;sBAC1E,UAAU,CAAC,iBAAiB,EAAE,EAAE,QAAQ,GAAG,GAAG,CAAC,CAAA;gBACrD,uBAAuB,CAAC,UAAU,CAAC,IAAI,iBAAO,CAAC,UAAU,CAAC,iBAAiB,EAAG,CAAC,CAAC,CAAA;aACnF;QACL,CAAC,CAAC,CAAA;QACF,MAAM,gBAAgB,GAAG,uBAAuB,CAAC,cAAc,EAAE,CAAA;QACjE,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,GAAG,cAAc,CAAA;QACxD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,gBAAgB,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS,EAAE,CAAC,EAAE,EAAE;YAC/D,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,qBAAqB;kBACnD,gBAAgB,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,iBAAiB,EAAE,CAAC,QAAQ,CAAC,CAAA;YACrF,IAAI,CAAC,yBAAyB,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,iBAAiB,EAAE,EAChG,uBAAc,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC,CAAA;SAChD;IACL,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,+BAAiE;QAChF,IAAI,IAAI,CAAC,KAAK,KAAK,sBAAsB,CAAC,OAAO,IAAI,IAAI,CAAC,KAAK,KAAK,sBAAsB,CAAC,OAAO,EAAE;YAChG,MAAM,IAAI,GAAG,CAAC,aAAa,CAAC,wBAAwB,IAAI,CAAC,KAAK,SAAS,CAAC,CAAA;SAC3E;QACD,IAAI,CAAC,KAAK,GAAG,sBAAsB,CAAC,OAAO,CAAA;QAC3C,MAAM,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAA;QAC7C,oCAAoC;QACpC,IAAI,CAAC,uBAAuB,GAAG,WAAW,CAAC,GAAG,EAAE;YAC5C,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAA;YACpC,MAAM,eAAe,GAAG,KAAK,CAAA;YAC7B,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,eAAe,CAAC,CAAA;QAC/E,CAAC,EAAE,IAAI,CAAC,CAAA;QACR,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;YACxB,MAAM,IAAI,CAAC,kBAAmB,CAAC,KAAK,EAAE,CAAA;YACtC,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,kBAAmB,CAAC,iBAAiB,EAAE,CAAA;YAC/E,MAAM,iBAAiB,GAAG,+BAAgC,CAAC,oBAAoB,CAAC,CAAA;YAChF,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;YAC1C,IAAI,CAAC,kBAAmB,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,CAAA;YAChE,IAAI,CAAC,eAAgB,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,CAAA;SAChE;IACL,CAAC;IAEM,KAAK,CAAC,IAAI;QACb,IAAI,IAAI,CAAC,KAAK,KAAK,sBAAsB,CAAC,OAAO,IAAI,IAAI,CAAC,KAAK,KAAK,sBAAsB,CAAC,QAAQ,EAAE;YACjG,OAAM;SACT;QACD,IAAI,CAAC,KAAK,GAAG,sBAAsB,CAAC,QAAQ,CAAA;QAC5C,MAAM,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAA;QAC1C,IAAI,IAAI,CAAC,uBAAuB,EAAE;YAC9B,aAAa,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAA;SAC9C;QACD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;YACxB,MAAM,IAAI,CAAC,kBAAmB,CAAC,OAAO,EAAE,CAAA;YACxC,IAAI,CAAC,kBAAkB,GAAG,SAAS,CAAA;YACnC,MAAM,IAAI,CAAC,eAAgB,CAAC,IAAI,EAAE,CAAA;YAClC,IAAI,CAAC,eAAe,GAAG,SAAS,CAAA;SACnC;aAAM;YACH,MAAM,IAAI,CAAC,kBAAmB,CAAC,IAAI,EAAE,CAAA;YACrC,IAAI,CAAC,kBAAkB,GAAG,SAAS,CAAA;SACtC;QAED,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;YACvE,IAAI,IAAI,CAAC,oBAAoB,EAAE,EAAE;gBAC7B,IAAI;oBACA,MAAM,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,iBAAiB,EAAG,EAAE,uBAAc,CAAC,OAAO,CAAC,CAAA;iBAC1F;gBAAC,OAAO,CAAC,EAAE;oBACR,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;iBAClB;aACJ;iBAAM;gBACH,MAAM,CAAC,KAAK,CAAC,sDAAsD,CAAC,CAAA;gBACpE,MAAM,aAAa,GAAG,IAAA,qBAAa,EAA0B,IAAI,EAAE,cAAc,EAAE,IAAI,CAAC,CAAA;gBACxF,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;gBACnB,IAAI;oBACA,MAAM,aAAa,CAAA;oBACnB,MAAM,CAAC,KAAK,CAAC,6EAA6E,CAAC,CAAA;iBAC9F;gBAAC,OAAO,CAAC,EAAE;oBACR,MAAM,CAAC,KAAK,CAAC,oDAAoD,GAAG,CAAC,CAAC,CAAA;iBACzE;aACJ;QACL,CAAC,CAAC,CAAC,CAAA;QAEH,IAAI,CAAC,KAAK,GAAG,sBAAsB,CAAC,OAAO,CAAA;QAC3C,IAAI,CAAC,eAAgB,CAAC,IAAI,EAAE,CAAA;QAC5B,IAAI,CAAC,MAAM,CAAC,cAAc,GAAG,SAAS,CAAA;QACtC,IAAI,CAAC,wBAAwB,CAAC,KAAK,EAAE,CAAA;QACrC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAA;QAClB,IAAI,CAAC,kBAAkB,EAAE,CAAA;QACzB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;YAExB,sCAAe,CAAC,OAAO,EAAE,CAAA;SAC5B;IACL,CAAC;IAEM,eAAe,CAAC,EAAa;QAChC,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAE,CAAA;IACpC,CAAC;IAEM,iCAAiC;QACpC,OAAO,IAAI,CAAC,KAAK,CAAC,iCAAiC,EAAE,CAAA;IACzD,CAAC;IAEM,kCAAkC;QACrC,OAAO,IAAI,CAAC,KAAK,CAAC,kCAAkC,EAAE,CAAA;IAC1D,CAAC;IAEM,gCAAgC;QACnC,OAAO,IAAI,CAAC,KAAK,CAAC,gCAAgC,EAAE,CAAA;IACxD,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,OAAgB,EAAE,YAAY,GAAG,KAAK,EAAE,gBAAgB,GAAG,KAAK;QAC9E,IAAI,IAAI,CAAC,KAAK,KAAK,sBAAsB,CAAC,OAAO,IAAI,CAAC,gBAAgB,EAAE;YACpE,OAAM;SACT;QAED,MAAM,cAAc,GAAG,OAAO,CAAC,gBAAiB,CAAA;QAChD,IAAI,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,EAAE;YACzC,MAAM,IAAI,GAAG,CAAC,mBAAmB,CAAC,qBAAqB,CAAC,CAAA;SAC3D;QACD,MAAM,CAAC,KAAK,CAAC,uBAAuB,cAAc,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;QAC3E,OAAO,GAAG;YACN,GAAG,OAAO;YACV,gBAAgB,EAAE,OAAO,CAAC,gBAAgB,IAAI,cAAc;YAC5D,gBAAgB,EAAE,OAAO,CAAC,gBAAgB,IAAI,IAAI,CAAC,iBAAiB;SACvE,CAAA;QACD,MAAM,KAAK,GAAG,IAAA,gDAAqB,EAAC,cAAc,CAAC,CAAA;QACnD,IAAI,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QAC5C,IAAI,CAAC,UAAU,IAAI,CAAC,YAAY,EAAE;YAC9B,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAA;YAClD,IAAI,CAAC,0BAA0B,CAAC,UAAU,CAAC,CAAA;SAC9C;aAAM,IAAI,CAAC,UAAU,EAAE;YACpB,MAAM,IAAI,GAAG,CAAC,UAAU,CAAC,oDAAoD,CAAC,CAAA;SACjF;QACD,MAAM,MAAM,GAAG,gBAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;QACxC,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;QACzD,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;QAC5C,OAAO,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;IAChD,CAAC;IAEO,kBAAkB,CAAC,cAA8B;QACrD,OAAO,IAAA,+CAAoB,EAAC,cAAc,EAAE,IAAI,CAAC,iBAAkB,CAAC,IAAI,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAA;IACrH,CAAC;IAEO,oBAAoB,CAAC,cAA8B;QACvD,IAAI,CAAC,cAAc,CAAC,SAAS,KAAK,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAkB,CAAC,SAAS,KAAK,SAAS,CAAC,EAAE;YAC/F,OAAO,CAAC,CAAC,cAAc,CAAC,SAAS,CAAC,IAAI,KAAK,IAAI,CAAC,iBAAkB,CAAC,SAAU,CAAC,IAAI,CAAC;mBAC5E,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,KAAK,IAAI,CAAC,iBAAkB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAA;SACjF;aAAM;YACH,OAAO,KAAK,CAAA;SACf;IACL,CAAC;IAEO,gBAAgB,CAAC,cAA8B;QACnD,IAAI,IAAI,CAAC,kBAAkB,EAAE;YACzB,OAAO,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;SACzD;aAAM,IAAI,cAAc,CAAC,SAAS,IAAI,IAAI,CAAC,iBAAkB,CAAC,SAAS,EAAE;YACtE,OAAO,IAAI,CAAC,kBAAmB,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;SAC1D;QACD,OAAO,IAAI,CAAC,eAAgB,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;IACxD,CAAC;IAEM,aAAa,CAAC,cAA8B;QAC/C,MAAM,KAAK,GAAG,IAAA,gDAAqB,EAAC,cAAc,CAAC,CAAA;QACnD,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IACtC,CAAC;IAEM,iBAAiB;QACpB,OAAO,IAAI,CAAC,iBAAkB,CAAA;IAClC,CAAC;IAEM,aAAa,CAAC,cAA8B;QAC/C,MAAM,KAAK,GAAG,IAAA,gDAAqB,EAAC,cAAc,CAAC,CAAA;QACnD,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IACtC,CAAC;IAEM,wBAAwB,CAAC,cAA8B,EAAE,UAAsB;QAClF,MAAM,KAAK,GAAG,IAAA,gDAAqB,EAAC,cAAc,CAAC,CAAA;QACnD,OAAO,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,CAAA;IAC1C,CAAC;IAEM,yBAAyB,CAAC,cAA8B,EAAE,UAAsB;QACnF,MAAM,KAAK,GAAG,IAAA,gDAAqB,EAAC,cAAc,CAAC,CAAA;QACnD,OAAO,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,CAAA;IAC3C,CAAC;IAEM,UAAU,CAAC,cAA8B,EAAE,GAAW,EAAE,KAAa;QACxE,wDAAwD;QACxD,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,CAAA,CAAC,6BAA6B;IAC5E,CAAC;IAEM,aAAa,CAAC,OAAgB;QACjC,MAAM,CAAC,KAAK,CAAC,2BAA2B,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;QAC/D,IAAI,OAAO,CAAC,WAAW,KAAK,oBAAW,CAAC,GAAG,EAAE;YACzC,MAAM,CAAC,KAAK,CAAC,uCAAuC,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;YAC3E,OAAM;SACT;QACD,IAAI,IAAI,CAAC,wBAAwB,CAAC,qBAAqB,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YACxE,MAAM,CAAC,KAAK,CAAC,mCAAmC,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,IAAI;kBACxE,OAAO,CAAC,gBAAgB,EAAE,QAAQ,GAAG,GAAG,GAAG,OAAO,CAAC,SAAS,GAAG,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;YAC7F,OAAM;SACT;QACD,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,gBAAiB,CAAC,QAAS,EAAE,OAAO,CAAC,CAAA;QAClG,IAAI,OAAO,CAAC,SAAS,KAAK,IAAI,CAAC,SAAS,EAAE;YACtC,IAAI,CAAC,eAAe,EAAE,qBAAqB,CAAC,OAAO,CAAC,CAAA;SACvD;aAAM;YACH,MAAM,CAAC,KAAK,CAAC,iBAAiB,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,IAAI,GAAG,OAAO,CAAC,gBAAgB,EAAE,QAAQ;kBAC3F,GAAG,GAAG,OAAO,CAAC,SAAS,GAAG,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;YACxD,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;SAChC;IACL,CAAC;IAEO,MAAM,CAAC,IAAgB,EAAE,cAA8B;QAC3D,IAAI,IAAI,CAAC,KAAK,KAAK,sBAAsB,CAAC,OAAO,EAAE;YAC/C,OAAM;SACT;QACD,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAC1D,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;QAC/C,IAAI,OAA4B,CAAA;QAChC,IAAI;YACA,OAAO,GAAG,gBAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;YAClC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,wBAAwB,IAAA,6BAAa,EAAC,OAAO,EAAE,gBAAO,CAAC,EAAE,CAAC,CAAA;SACjG;QAAC,OAAO,CAAC,EAAE;YACR,MAAM,CAAC,KAAK,CAAC,8CAA8C,CAAC,EAAE,CAAC,CAAA;YAC/D,OAAM;SACT;QACD,OAAO,CAAC,gBAAgB,GAAG,cAAc,CAAA;QACzC,IAAI;YACA,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;SAC9B;QAAC,OAAO,CAAC,EAAE;YACR,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,EAAE,CAAC,CAAA;SACtD;IACL,CAAC;IAiCO,0BAA0B,CAAC,UAA6B;QAC5D,IAAI,IAAI,CAAC,KAAK,KAAK,sBAAsB,CAAC,OAAO,EAAE;YAC/C,OAAO,KAAK,CAAA;SACf;QACD,MAAM,CAAC,KAAK,CAAC,wCAAwC,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAA;QAC5E,UAAU,CAAC,iBAAiB,GAAG,IAAI,CAAA;QACnC,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,UAAU,CAAC,EAAE;YAC5C,OAAO,KAAK,CAAA;SACf;QACD,UAAU,CAAC,EAAE,CAAC,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QACzC,UAAU,CAAC,EAAE,CAAC,cAAc,EAAE,CAAC,iBAAoC,EAAE,KAAc,EAAE,OAAgB,EAAE,EAAE;YACrG,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAA;QACtD,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,UAAU,CAAC,CAAA;QACtC,IAAI,UAAU,CAAC,oBAAoB,EAAE,EAAE;YACnC,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAA;SAC/B;aAAM;YACH,UAAU,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC,eAA+B,EAAE,EAAE;gBACtE,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAA;YAChC,CAAC,CAAC,CAAA;SACL;QACD,OAAO,IAAI,CAAA;IACf,CAAC;IAEO,wBAAwB,CAAC,aAAgC;QAC7D,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,IAAI,GAAG,aAAa,CAAC,iBAAiB,EAAE,EAAE,QAAQ,GAAG,6BAA6B,CAAC,CAAA;QAC7H,MAAM,SAAS,GAAG,IAAA,mDAAwB,EAAC,aAAa,CAAC,iBAAiB,EAAG,CAAC,CAAA;QAC9E,MAAM,MAAM,GAAG,IAAA,gDAAqB,EAAC,aAAa,CAAC,iBAAiB,EAAG,CAAC,CAAA;QACxE,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YAC9B,IAAI,SAAS,CAAC,kBAAkB,CAAC,IAAA,mDAAwB,EAAC,IAAI,CAAC,iBAAkB,CAAC,CAAC,EAAE;gBACjF,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,IAAI,GAAG,aAAa,CAAC,iBAAiB,EAAE,EAAE,QAAQ;oBACxF,wDAAwD,CAAC,CAAA;gBAC7D,iCAAiC;gBACjC,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,EAAE,CAAE,CAAA;gBAC9D,MAAM,CAAC,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,IAAI,GAAG,aAAa,CAAC,iBAAiB,EAAE,EAAE,QAAQ,GAAG,GAAG,CAAC,CAAA;gBAC5G,MAAM,MAAM,GAAG,aAAa,CAAC,iBAAiB,EAAE,CAAA;gBAEhD,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE;oBACvB,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;iBACjC;gBAED,aAAa,CAAC,iCAAiC,EAAE,CAAA;gBACjD,aAAa,CAAC,yBAAyB,GAAG,IAAI,CAAA;aACjD;iBAAM;gBACH,aAAa,CAAC,kBAAkB,GAAG,IAAI,CAAA;gBACvC,OAAO,KAAK,CAAA;aACf;SACJ;QAED,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,iBAAiB,EAAE,QAAQ,GAAG,IAAI,GAAG,aAAa,CAAC,iBAAiB,EAAE,EAAE,QAAQ;YACpG,mDAAmD,CAAC,CAAA;QACxD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;QAE3C,OAAO,IAAI,CAAA;IACf,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,cAA8B,EAAE,iBAAoC,EAAE,MAAe;QAC/G,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,iBAAiB,EAAE,QAAQ,GAAG,IAAI,GAAG,cAAc,CAAC,QAAQ,GAAG,GAAG,GAAG,mBAAmB,CAAC,CAAA;QACjH,MAAM,EAAE,GAAG,IAAA,gDAAqB,EAAC,cAAc,CAAC,CAAA;QAChD,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;QAC5B,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YAC1B,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,iBAAiB,EAAE,QAAQ,GAAG,IAAI,GAAG,cAAc,CAAC,QAAQ,GAAG,GAAG;gBACtF,+CAA+C,CAAC,CAAA;YACpD,MAAM,CAAC,KAAK,CAAC,kCAAkC,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;YAClF,MAAM,iBAAiB,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAE,CAAA;YACnD,MAAM,CAAC,KAAK,CAAC,iBAAiB,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,IAAI,GAAG,iBAAiB,CAAC,iBAAiB,EAAE,EAAE,QAAQ,CAAC,CAAA;YAC/G,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,iBAAiB,EAAE,QAAQ,GAAG,IAAI,GAAG,cAAc,CAAC,QAAQ,GAAG,GAAG;gBACtF,8CAA8C,CAAC,CAAA;YACnD,MAAM,iBAAiB,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAA;YAChD,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,iBAAiB,EAAE,QAAQ,GAAG,IAAI,GAAG,cAAc,CAAC,QAAQ,GAAG,GAAG;gBACtF,6CAA6C,CAAC,CAAA;SAErD;aAAM;YACH,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,iBAAiB,EAAE,QAAQ,GAAG,IAAI,GAAG,cAAc,CAAC,QAAQ,GAAG,GAAG;gBACtF,wDAAwD,CAAC,CAAA;YAC7D,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,cAAc,EAAE,OAAO,CAAC,CAAA;SACrD;IACL,CAAC;IAEM,cAAc,CAAC,gBAAgC,EAAE,SAAoB;QACxE,IAAI,IAAI,CAAC,KAAK,KAAK,sBAAsB,CAAC,OAAO,IAAI,IAAA,+CAAoB,EAAC,gBAAgB,EAAE,IAAI,CAAC,iBAAkB,CAAC,EAAE;YAClH,OAAM;SACT;QACD,MAAM,MAAM,GAAG,IAAA,gDAAqB,EAAC,gBAAgB,CAAC,CAAA;QACtD,MAAM,sBAAsB,GAAG,IAAI,+CAAsB,CACrD,IAAI,CAAC,iBAAkB,EACvB,gBAAgB,EAChB,iBAAiB,CAAC,gBAAgB,EAClC,IAAA,4BAAgB,EAAC,IAAI,sCAAsB,CAAC,IAAI,CAAC,eAAgB,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAC9F,CAAA;QACD,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;QAC5C,sBAAsB,CAAC,WAAW,CAAC,SAAS,CAAC;aACxC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;aAC3D,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA,CAAC,CAAC,CAAC,CAAA;IAC9C,CAAC;IAEM,gBAAgB,CAAC,gBAAgC,EAAE,SAAoB;QAC1E,IAAI,IAAI,CAAC,KAAK,KAAK,sBAAsB,CAAC,OAAO,IAAI,IAAA,+CAAoB,EAAC,gBAAgB,EAAE,IAAI,CAAC,iBAAkB,CAAC,EAAE;YAClH,OAAM;SACT;QACD,MAAM,MAAM,GAAG,IAAA,gDAAqB,EAAC,gBAAgB,CAAC,CAAA;QACtD,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;QAC/C,MAAM,sBAAsB,GAAG,IAAI,+CAAsB,CACrD,IAAI,CAAC,iBAAkB,EACvB,gBAAgB,EAChB,iBAAiB,CAAC,gBAAgB,EAClC,IAAA,4BAAgB,EAAC,IAAI,sCAAsB,CAAC,IAAI,CAAC,eAAgB,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAC9F,CAAA;QACD,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YAC9B,sBAAsB,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;SAClD;IACL,CAAC;IAEM,kBAAkB,CAAC,gBAAgC;QACtD,IAAI,IAAI,CAAC,KAAK,KAAK,sBAAsB,CAAC,OAAO,IAAI,IAAA,+CAAoB,EAAC,gBAAgB,EAAE,IAAI,CAAC,iBAAkB,CAAC,EAAE;YAClH,OAAM;SACT;QACD,MAAM,MAAM,GAAG,IAAA,gDAAqB,EAAC,gBAAgB,CAAC,CAAA;QACtD,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;IACpC,CAAC;IAEM,oBAAoB,CAAC,gBAAgC;QACxD,IAAI,IAAI,CAAC,KAAK,KAAK,sBAAsB,CAAC,OAAO,IAAI,IAAA,+CAAoB,EAAC,gBAAgB,EAAE,IAAI,CAAC,iBAAkB,CAAC,EAAE;YAClH,OAAM;SACT;QACD,MAAM,MAAM,GAAG,IAAA,gDAAqB,EAAC,gBAAgB,CAAC,CAAA;QACtD,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAA;IAEvC,CAAC;IAEO,KAAK,CAAC,yBAAyB,CAAC,gBAAgC,EAAE,cAA8B;QAEpG,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAA,mDAAwB,EAAC,gBAAgB,CAAC,CAAC,KAAK,EAAE,CAAC,CAAA;QAE3F,IAAI,CAAC,UAAU,EAAE;YACb,MAAM,CAAC,KAAK,CAAC,kEAAkE,CAAC,CAAA;YAChF,OAAM;SACT;QAED,MAAM,OAAO,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;YACnD,mDAAmD;YACnD,IAAA,qBAAa,EAA0B,UAAU,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;gBAC/E,MAAM,CAAC,KAAK,CAAC,4DAA4D,CAAC,CAAA;gBAC1E,OAAM;YACV,CAAC,CAAC;iBACG,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;gBACT,MAAM,CAAC,KAAK,CAAC,yCAAyC,GAAG,CAAC,CAAC,CAAA;gBAC3D,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;YAC7B,CAAC,CAAC;iBACD,OAAO,CAAC,GAAG,EAAE;gBACV,MAAM,CAAC,KAAK,CAAC,8CAA8C,CAAC,CAAA;gBAC5D,OAAO,EAAE,CAAA;YACb,CAAC,CAAC,CAAA;QACV,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,2BAA2B,CAAC,gBAAgB,EAAE,cAAc,CAAC;aAC7D,IAAI,CAAC,GAAG,EAAE,GAAG,OAAM,CAAC,CAAC,CAAC;aACtB,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACT,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QACnB,CAAC,CAAC,CAAA;QAEN,MAAM,OAAO,CAAA;IACjB,CAAC;IAEO,KAAK,CAAC,2BAA2B,CAAC,gBAAgC,EAAE,cAA8B;QACtG,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,iBAAiB,EAAE,QAAQ,GAAG,IAAI,GAAG,gBAAgB,CAAC,QAAQ,GAAG,8BAA8B,CAAC,CAAA;QACxH,MAAM,sBAAsB,GAAG,IAAI,+CAAsB,CACrD,IAAI,CAAC,iBAAkB,EACvB,gBAAgB,EAChB,iBAAiB,CAAC,gBAAgB,EAClC,IAAA,4BAAgB,EAAC,IAAI,sCAAsB,CAAC,IAAI,CAAC,eAAgB,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAC9F,CAAA;QACD,IAAI;YACA,MAAM,sBAAsB,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAA;SAClE;QAAC,OAAO,EAAE,EAAE;YACT,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,iBAAiB,EAAE,QAAQ,GAAG,IAAI,GAAG,gBAAgB,CAAC,QAAQ;gBAClF,qDAAqD,GAAG,EAAE,CAAC,CAAA;SAClE;IACL,CAAC;IAEM,+BAA+B;QAClC,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;aACvC,MAAM,CAAC,CAAC,iBAAoC,EAAE,EAAE,CAAC,iBAAiB,CAAC,oBAAoB,EAAE,CAAC;aAC1F,GAAG,CAAC,CAAC,iBAAoC,EAAE,EAAE,CAAC,iBAAiB,CAAC,iBAAiB,EAAG,CAAC,CAAA;IAC9F,CAAC;IAED,0CAA0C;IAClC,KAAK,CAAC,WAAW,CAAC,WAAwB,EAAE,QAA2B;QAC3E,MAAM,YAAY,GAAG,IAAA,mDAAwB,EAAC,WAAW,CAAC,cAAe,CAAC,CAAA;QAC1E,IAAI,IAAA,+CAAoB,EAAC,WAAW,CAAC,cAAe,EAAE,IAAI,CAAC,iBAAkB,CAAC,EAAE;YAC5E,MAAM,QAAQ,GAAiB;gBAC3B,QAAQ,EAAE,KAAK;aAClB,CAAA;YACD,OAAO,QAAQ,CAAA;SAClB;QACD,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,YAAY,CAAC,KAAK,EAAE,EAAE,WAAW,CAAC,SAAS,CAAC,CAAA;QACvE,MAAM,QAAQ,GAAiB;YAC3B,QAAQ,EAAE,IAAI;SACjB,CAAA;QACD,OAAO,QAAQ,CAAA;IACnB,CAAC;IAED,0CAA0C;IAClC,KAAK,CAAC,aAAa,CAAC,aAA4B,EAAE,QAA2B;QACjF,MAAM,MAAM,GAAG,IAAA,gDAAqB,EAAC,aAAa,CAAC,cAAe,CAAC,CAAA;QACnE,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,MAAM,EAAE,aAAa,CAAC,SAAS,CAAC,CAAA;QAC9D,OAAO,EAAE,CAAA;IACb,CAAC;IAED,0CAA0C;IAClC,KAAK,CAAC,kBAAkB,CAAC,gBAAkC,EAAE,QAA2B;QAC5F,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,IAAI,GAAG,gBAAgB,CAAC,cAAc,EAAE,QAAQ;cACpF,qCAAqC,CAAC,CAAA;QAE5C,IAAI,gBAAgB,CAAC,aAAa,KAAK,uBAAc,CAAC,OAAO,EAAE;YAC3D,IAAI,CAAC,eAAe,CAAC,gBAAgB,CAAC,cAAe,EAAE,yBAAyB,EAAE,yBAAyB,CAAC,CAAA;SAC/G;aAAM;YACH,IAAI,CAAC,eAAe,CAAC,gBAAgB,CAAC,cAAe,EAAE,8BAA8B,EAAE,8BAA8B,CAAC,CAAA;SACzH;QACD,OAAO,EAAE,CAAA;IACb,CAAC;IAEO,uBAAuB;QAC3B,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;IACrE,CAAC;;AAxjBL,8CAyjBC;AAxjBiB,kCAAgB,GAAG,KAAK,AAAR,CAAQ"}
|
|
1
|
+
{"version":3,"file":"ConnectionManager.js","sourceRoot":"","sources":["../../../src/connection/ConnectionManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,8 +8,9 @@ export declare class ConnectivityChecker {
|
|
|
8
8
|
private static readonly CONNECTIVITY_CHECKER_SERVICE_ID;
|
|
9
9
|
private static readonly CONNECTIVITY_CHECKER_TIMEOUT;
|
|
10
10
|
private destroyed;
|
|
11
|
-
private webSocketPort
|
|
12
|
-
|
|
11
|
+
private readonly webSocketPort;
|
|
12
|
+
private readonly tls;
|
|
13
|
+
constructor(webSocketPort: number, tls: boolean);
|
|
13
14
|
sendConnectivityRequest(entryPoint: PeerDescriptor): Promise<ConnectivityResponse>;
|
|
14
15
|
listenToIncomingConnectivityRequests(connectionToListenTo: ServerWebSocket): void;
|
|
15
16
|
private handleIncomingConnectivityRequest;
|
|
@@ -30,6 +30,7 @@ const Err = __importStar(require("../helpers/errors"));
|
|
|
30
30
|
const ClientWebSocket_1 = require("./WebSocket/ClientWebSocket");
|
|
31
31
|
const uuid_1 = require("uuid");
|
|
32
32
|
const ConnectionManager_1 = require("./ConnectionManager");
|
|
33
|
+
const WebSocketConnector_1 = require("./WebSocket/WebSocketConnector");
|
|
33
34
|
const logger = new utils_1.Logger(module);
|
|
34
35
|
// Class for handling both client and server side of the connectivity
|
|
35
36
|
// checks. This is attached to all ServerWebSockets to listen to
|
|
@@ -40,9 +41,10 @@ var ConnectionMode;
|
|
|
40
41
|
ConnectionMode["PROBE"] = "connectivityProbe";
|
|
41
42
|
})(ConnectionMode || (exports.ConnectionMode = ConnectionMode = {}));
|
|
42
43
|
class ConnectivityChecker {
|
|
43
|
-
constructor(webSocketPort) {
|
|
44
|
+
constructor(webSocketPort, tls) {
|
|
44
45
|
this.destroyed = false;
|
|
45
46
|
this.webSocketPort = webSocketPort;
|
|
47
|
+
this.tls = tls;
|
|
46
48
|
}
|
|
47
49
|
async sendConnectivityRequest(entryPoint) {
|
|
48
50
|
if (this.destroyed) {
|
|
@@ -51,16 +53,19 @@ class ConnectivityChecker {
|
|
|
51
53
|
let outgoingConnection;
|
|
52
54
|
try {
|
|
53
55
|
outgoingConnection = await this.connectAsync({
|
|
54
|
-
|
|
56
|
+
wsServerInfo: {
|
|
57
|
+
host: entryPoint.websocket.host,
|
|
58
|
+
port: entryPoint.websocket.port,
|
|
59
|
+
tls: entryPoint.websocket.tls,
|
|
60
|
+
},
|
|
55
61
|
mode: ConnectionMode.REQUEST
|
|
56
62
|
});
|
|
57
63
|
}
|
|
58
64
|
catch (e) {
|
|
59
|
-
logger.error('Failed to connect to the entrypoints');
|
|
60
65
|
throw new Err.ConnectionFailed('Failed to connect to the entrypoints', e);
|
|
61
66
|
}
|
|
62
67
|
// send connectivity request
|
|
63
|
-
const connectivityRequestMessage = { port: this.webSocketPort };
|
|
68
|
+
const connectivityRequestMessage = { port: this.webSocketPort, tls: this.tls };
|
|
64
69
|
const msg = {
|
|
65
70
|
serviceId: ConnectivityChecker.CONNECTIVITY_CHECKER_SERVICE_ID,
|
|
66
71
|
messageType: DhtRpc_1.MessageType.CONNECTIVITY_REQUEST, messageId: (0, uuid_1.v4)(),
|
|
@@ -126,15 +131,19 @@ class ConnectivityChecker {
|
|
|
126
131
|
let connectivityResponseMessage;
|
|
127
132
|
try {
|
|
128
133
|
outgoingConnection = await this.connectAsync({
|
|
129
|
-
|
|
130
|
-
|
|
134
|
+
wsServerInfo: {
|
|
135
|
+
host: connection.getRemoteAddress(),
|
|
136
|
+
port: connectivityRequest.port,
|
|
137
|
+
tls: connectivityRequest.tls
|
|
138
|
+
},
|
|
139
|
+
mode: ConnectionMode.PROBE
|
|
131
140
|
});
|
|
132
141
|
}
|
|
133
142
|
catch (err) {
|
|
134
143
|
logger.debug('error', { err });
|
|
135
144
|
connectivityResponseMessage = {
|
|
136
145
|
openInternet: false,
|
|
137
|
-
|
|
146
|
+
host: connection.getRemoteAddress(),
|
|
138
147
|
natType: ConnectionManager_1.NatType.UNKNOWN
|
|
139
148
|
};
|
|
140
149
|
}
|
|
@@ -143,9 +152,9 @@ class ConnectivityChecker {
|
|
|
143
152
|
logger.trace('Connectivity test produced positive result, communicating reply to the requester');
|
|
144
153
|
connectivityResponseMessage = {
|
|
145
154
|
openInternet: true,
|
|
146
|
-
|
|
155
|
+
host: connection.getRemoteAddress(),
|
|
147
156
|
natType: ConnectionManager_1.NatType.OPEN_INTERNET,
|
|
148
|
-
websocket: {
|
|
157
|
+
websocket: { host: connection.getRemoteAddress(), port: connectivityRequest.port, tls: connectivityRequest.tls }
|
|
149
158
|
};
|
|
150
159
|
}
|
|
151
160
|
const msg = {
|
|
@@ -159,20 +168,13 @@ class ConnectivityChecker {
|
|
|
159
168
|
connection.send(DhtRpc_1.Message.toBinary(msg));
|
|
160
169
|
}
|
|
161
170
|
// eslint-disable-next-line class-methods-use-this
|
|
162
|
-
async connectAsync({
|
|
171
|
+
async connectAsync({ wsServerInfo, mode, timeoutMs = 1000, }) {
|
|
163
172
|
const socket = new ClientWebSocket_1.ClientWebSocket();
|
|
164
|
-
|
|
165
|
-
if (url) {
|
|
166
|
-
address = url;
|
|
167
|
-
}
|
|
168
|
-
else if (host && port) {
|
|
169
|
-
address = 'ws://' + host + ':' + port;
|
|
170
|
-
}
|
|
171
|
-
address += '?' + mode + '=true';
|
|
173
|
+
const url = `${(0, WebSocketConnector_1.connectivityMethodToWebSocketUrl)(wsServerInfo)}?${mode}=true`;
|
|
172
174
|
let result;
|
|
173
175
|
try {
|
|
174
176
|
result = await (0, utils_1.runAndRaceEvents3)([
|
|
175
|
-
() => { socket.connect(
|
|
177
|
+
() => { socket.connect(url); }
|
|
176
178
|
], socket, ['connected', 'error'], timeoutMs);
|
|
177
179
|
}
|
|
178
180
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConnectivityChecker.js","sourceRoot":"","sources":["../../../src/connection/ConnectivityChecker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"ConnectivityChecker.js","sourceRoot":"","sources":["../../../src/connection/ConnectivityChecker.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ import { IWebRtcConnectorService } from '../../proto/packages/dht/protos/DhtRpc.
|
|
|
5
5
|
import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
|
|
6
6
|
import { ManagedConnection } from '../ManagedConnection';
|
|
7
7
|
import { PortRange } from '../ConnectionManager';
|
|
8
|
+
export declare const replaceInternalIpWithExternalIp: (candidate: string, ip: string) => string;
|
|
8
9
|
export interface WebRtcConnectorConfig {
|
|
9
10
|
rpcTransport: ITransport;
|
|
10
11
|
protocolVersion: string;
|
|
@@ -13,6 +14,7 @@ export interface WebRtcConnectorConfig {
|
|
|
13
14
|
bufferThresholdLow?: number;
|
|
14
15
|
bufferThresholdHigh?: number;
|
|
15
16
|
connectionTimeout?: number;
|
|
17
|
+
externalIp?: string;
|
|
16
18
|
portRange?: PortRange;
|
|
17
19
|
}
|
|
18
20
|
export interface IceServer {
|
|
@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.WebRtcConnector = void 0;
|
|
26
|
+
exports.WebRtcConnector = exports.replaceInternalIpWithExternalIp = void 0;
|
|
27
27
|
const DhtRpc_1 = require("../../proto/packages/dht/protos/DhtRpc");
|
|
28
28
|
const ListeningRpcCommunicator_1 = require("../../transport/ListeningRpcCommunicator");
|
|
29
29
|
const NodeWebRtcConnection_1 = require("./NodeWebRtcConnection");
|
|
@@ -36,6 +36,15 @@ const proto_rpc_1 = require("@streamr/proto-rpc");
|
|
|
36
36
|
const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
|
|
37
37
|
const AddressTools_1 = require("../../helpers/AddressTools");
|
|
38
38
|
const logger = new utils_1.Logger(module);
|
|
39
|
+
const replaceInternalIpWithExternalIp = (candidate, ip) => {
|
|
40
|
+
const parsed = candidate.split(' ');
|
|
41
|
+
const type = parsed[7];
|
|
42
|
+
if (type === 'host') {
|
|
43
|
+
parsed[4] = ip;
|
|
44
|
+
}
|
|
45
|
+
return parsed.join(' ');
|
|
46
|
+
};
|
|
47
|
+
exports.replaceInternalIpWithExternalIp = replaceInternalIpWithExternalIp;
|
|
39
48
|
class WebRtcConnector {
|
|
40
49
|
constructor(config, incomingConnectionCallback) {
|
|
41
50
|
this.ongoingConnectAttempts = new Map();
|
|
@@ -91,6 +100,10 @@ class WebRtcConnector {
|
|
|
91
100
|
managedConnection.on('handshakeCompleted', delFunc);
|
|
92
101
|
const remoteConnector = new RemoteWebrtcConnector_1.RemoteWebrtcConnector(targetPeerDescriptor, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.WebRtcConnectorServiceClient(this.rpcCommunicator.getRpcClientTransport())));
|
|
93
102
|
connection.on('localCandidate', (candidate, mid) => {
|
|
103
|
+
if (this.config.externalIp) {
|
|
104
|
+
candidate = (0, exports.replaceInternalIpWithExternalIp)(candidate, this.config.externalIp);
|
|
105
|
+
logger.debug(`onLocalCandidate injected external ip ${candidate} ${mid}`);
|
|
106
|
+
}
|
|
94
107
|
remoteConnector.sendIceCandidate(this.ownPeerDescriptor, candidate, mid, connection.connectionId.toString());
|
|
95
108
|
});
|
|
96
109
|
if (offering) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebRtcConnector.js","sourceRoot":"","sources":["../../../../src/connection/WebRTC/WebRtcConnector.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mEAK+C;AAG/C,uFAAmF;AACnF,iEAA6D;AAC7D,mEAA+D;AAC/D,iFAA4F;AAE5F,wEAAoE;AACpE,0CAAuC;AACvC,0DAA2C;AAI3C,kDAAqD;AACrD,qFAI+C;AAC/C,6DAAsF;AAGtF,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"WebRtcConnector.js","sourceRoot":"","sources":["../../../../src/connection/WebRTC/WebRtcConnector.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { ITransport } from '../../transport/ITransport';
|
|
2
|
-
import { ConnectivityResponse, PeerDescriptor, WebSocketConnectionRequest, WebSocketConnectionResponse } from '../../proto/packages/dht/protos/DhtRpc';
|
|
2
|
+
import { ConnectivityMethod, ConnectivityResponse, PeerDescriptor, WebSocketConnectionRequest, WebSocketConnectionResponse } from '../../proto/packages/dht/protos/DhtRpc';
|
|
3
3
|
import { IWebSocketConnectorService } from '../../proto/packages/dht/protos/DhtRpc.server';
|
|
4
4
|
import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
|
|
5
5
|
import { ManagedConnection } from '../ManagedConnection';
|
|
6
|
-
import { PortRange } from '../ConnectionManager';
|
|
6
|
+
import { PortRange, TlsCertificate } from '../ConnectionManager';
|
|
7
|
+
export declare const connectivityMethodToWebSocketUrl: (ws: ConnectivityMethod) => string;
|
|
7
8
|
export declare class WebSocketConnector implements IWebSocketConnectorService {
|
|
8
9
|
private static readonly WEBSOCKET_CONNECTOR_SERVICE_ID;
|
|
9
10
|
private readonly rpcCommunicator;
|
|
@@ -15,12 +16,13 @@ export declare class WebSocketConnector implements IWebSocketConnectorService {
|
|
|
15
16
|
private portRange?;
|
|
16
17
|
private host?;
|
|
17
18
|
private entrypoints?;
|
|
19
|
+
private readonly tlsCertificate?;
|
|
18
20
|
private selectedPort?;
|
|
19
21
|
private readonly protocolVersion;
|
|
20
22
|
private ownPeerDescriptor?;
|
|
21
23
|
private connectingConnections;
|
|
22
24
|
private destroyed;
|
|
23
|
-
constructor(protocolVersion: string, rpcTransport: ITransport, fnCanConnect: (peerDescriptor: PeerDescriptor, _ip: string, port: number) => boolean, incomingConnectionCallback: (connection: ManagedConnection) => boolean, portRange?: PortRange, host?: string, entrypoints?: PeerDescriptor[]);
|
|
25
|
+
constructor(protocolVersion: string, rpcTransport: ITransport, fnCanConnect: (peerDescriptor: PeerDescriptor, _ip: string, port: number) => boolean, incomingConnectionCallback: (connection: ManagedConnection) => boolean, portRange?: PortRange, host?: string, entrypoints?: PeerDescriptor[], tlsCertificate?: TlsCertificate);
|
|
24
26
|
private attachHandshaker;
|
|
25
27
|
start(): Promise<void>;
|
|
26
28
|
checkConnectivity(reattempt?: number): Promise<ConnectivityResponse>;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.WebSocketConnector = void 0;
|
|
3
|
+
exports.WebSocketConnector = exports.connectivityMethodToWebSocketUrl = void 0;
|
|
4
4
|
const ClientWebSocket_1 = require("./ClientWebSocket");
|
|
5
5
|
const IConnection_1 = require("../IConnection");
|
|
6
6
|
const ListeningRpcCommunicator_1 = require("../../transport/ListeningRpcCommunicator");
|
|
@@ -17,8 +17,13 @@ const Handshaker_1 = require("../Handshaker");
|
|
|
17
17
|
const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
|
|
18
18
|
const lodash_1 = require("lodash");
|
|
19
19
|
const logger = new utils_1.Logger(module);
|
|
20
|
+
const connectivityMethodToWebSocketUrl = (ws) => {
|
|
21
|
+
return (ws.tls ? 'wss://' : 'ws://') + ws.host + ':' + ws.port;
|
|
22
|
+
};
|
|
23
|
+
exports.connectivityMethodToWebSocketUrl = connectivityMethodToWebSocketUrl;
|
|
24
|
+
const ENTRY_POINT_CONNECTION_ATTEMPTS = 5;
|
|
20
25
|
class WebSocketConnector {
|
|
21
|
-
constructor(protocolVersion, rpcTransport, fnCanConnect, incomingConnectionCallback, portRange, host, entrypoints) {
|
|
26
|
+
constructor(protocolVersion, rpcTransport, fnCanConnect, incomingConnectionCallback, portRange, host, entrypoints, tlsCertificate) {
|
|
22
27
|
this.ongoingConnectRequests = new Map();
|
|
23
28
|
this.connectingConnections = new Map();
|
|
24
29
|
this.destroyed = false;
|
|
@@ -48,6 +53,7 @@ class WebSocketConnector {
|
|
|
48
53
|
this.portRange = portRange;
|
|
49
54
|
this.host = host;
|
|
50
55
|
this.entrypoints = entrypoints;
|
|
56
|
+
this.tlsCertificate = tlsCertificate;
|
|
51
57
|
this.canConnectFunction = fnCanConnect.bind(this);
|
|
52
58
|
this.rpcCommunicator = new ListeningRpcCommunicator_1.ListeningRpcCommunicator(WebSocketConnector.WEBSOCKET_CONNECTOR_SERVICE_ID, rpcTransport, {
|
|
53
59
|
rpcRequestTimeout: 15000
|
|
@@ -82,15 +88,15 @@ class WebSocketConnector {
|
|
|
82
88
|
this.attachHandshaker(connection);
|
|
83
89
|
}
|
|
84
90
|
});
|
|
85
|
-
const port = await this.webSocketServer.start(this.portRange, this.host);
|
|
91
|
+
const port = await this.webSocketServer.start(this.portRange, this.host, this.tlsCertificate);
|
|
86
92
|
this.selectedPort = port;
|
|
87
|
-
this.connectivityChecker = new ConnectivityChecker_1.ConnectivityChecker(this.selectedPort);
|
|
93
|
+
this.connectivityChecker = new ConnectivityChecker_1.ConnectivityChecker(this.selectedPort, this.tlsCertificate !== undefined);
|
|
88
94
|
}
|
|
89
95
|
}
|
|
90
96
|
async checkConnectivity(reattempt = 0) {
|
|
91
97
|
const noServerConnectivityResponse = {
|
|
92
98
|
openInternet: false,
|
|
93
|
-
|
|
99
|
+
host: '127.0.0.1',
|
|
94
100
|
natType: ConnectionManager_1.NatType.UNKNOWN
|
|
95
101
|
};
|
|
96
102
|
if (this.destroyed) {
|
|
@@ -106,9 +112,9 @@ class WebSocketConnector {
|
|
|
106
112
|
// return connectivity info given in config
|
|
107
113
|
const preconfiguredConnectivityResponse = {
|
|
108
114
|
openInternet: true,
|
|
109
|
-
|
|
115
|
+
host: this.host,
|
|
110
116
|
natType: ConnectionManager_1.NatType.OPEN_INTERNET,
|
|
111
|
-
websocket: {
|
|
117
|
+
websocket: { host: this.host, port: this.selectedPort, tls: this.tlsCertificate !== undefined }
|
|
112
118
|
};
|
|
113
119
|
return preconfiguredConnectivityResponse;
|
|
114
120
|
}
|
|
@@ -119,7 +125,8 @@ class WebSocketConnector {
|
|
|
119
125
|
}
|
|
120
126
|
}
|
|
121
127
|
catch (err) {
|
|
122
|
-
if (reattempt <
|
|
128
|
+
if (reattempt < ENTRY_POINT_CONNECTION_ATTEMPTS) {
|
|
129
|
+
logger.error('Failed to connect to the entrypoint', { error: err });
|
|
123
130
|
await (0, utils_1.wait)(2000);
|
|
124
131
|
return this.checkConnectivity(reattempt + 1);
|
|
125
132
|
}
|
|
@@ -139,8 +146,7 @@ class WebSocketConnector {
|
|
|
139
146
|
}
|
|
140
147
|
else {
|
|
141
148
|
const socket = new ClientWebSocket_1.ClientWebSocket();
|
|
142
|
-
const
|
|
143
|
-
targetPeerDescriptor.websocket.port;
|
|
149
|
+
const url = (0, exports.connectivityMethodToWebSocketUrl)(targetPeerDescriptor.websocket);
|
|
144
150
|
const managedConnection = new ManagedConnection_1.ManagedConnection(this.ownPeerDescriptor, this.protocolVersion, IConnection_1.ConnectionType.WEBSOCKET_CLIENT, socket, undefined);
|
|
145
151
|
managedConnection.setPeerDescriptor(targetPeerDescriptor);
|
|
146
152
|
this.connectingConnections.set((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor), managedConnection);
|
|
@@ -153,14 +159,14 @@ class WebSocketConnector {
|
|
|
153
159
|
};
|
|
154
160
|
socket.on('disconnected', delFunc);
|
|
155
161
|
managedConnection.on('handshakeCompleted', delFunc);
|
|
156
|
-
socket.connect(
|
|
162
|
+
socket.connect(url);
|
|
157
163
|
return managedConnection;
|
|
158
164
|
}
|
|
159
165
|
}
|
|
160
166
|
requestConnectionFromPeer(ownPeerDescriptor, targetPeerDescriptor) {
|
|
161
167
|
setImmediate(() => {
|
|
162
168
|
const remoteConnector = new RemoteWebSocketConnector_1.RemoteWebSocketConnector(targetPeerDescriptor, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.WebSocketConnectorServiceClient(this.rpcCommunicator.getRpcClientTransport())));
|
|
163
|
-
remoteConnector.requestConnection(ownPeerDescriptor, ownPeerDescriptor.websocket.
|
|
169
|
+
remoteConnector.requestConnection(ownPeerDescriptor, ownPeerDescriptor.websocket.host, ownPeerDescriptor.websocket.port);
|
|
164
170
|
});
|
|
165
171
|
const managedConnection = new ManagedConnection_1.ManagedConnection(this.ownPeerDescriptor, this.protocolVersion, IConnection_1.ConnectionType.WEBSOCKET_SERVER);
|
|
166
172
|
managedConnection.on('disconnected', () => this.ongoingConnectRequests.delete((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor)));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebSocketConnector.js","sourceRoot":"","sources":["../../../../src/connection/WebSocket/WebSocketConnector.ts"],"names":[],"mappings":";;;AAAA,uDAAmD;AACnD,gDAA4D;AAE5D,uFAAmF;AACnF,yEAAqE;AACrE,
|
|
1
|
+
{"version":3,"file":"WebSocketConnector.js","sourceRoot":"","sources":["../../../../src/connection/WebSocket/WebSocketConnector.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import EventEmitter from 'eventemitter3';
|
|
2
2
|
import { ConnectionSourceEvents } from '../IConnectionSource';
|
|
3
|
-
import { PortRange } from '../ConnectionManager';
|
|
3
|
+
import { PortRange, TlsCertificate } from '../ConnectionManager';
|
|
4
4
|
export declare class WebSocketServer extends EventEmitter<ConnectionSourceEvents> {
|
|
5
5
|
private httpServer?;
|
|
6
6
|
private wsServer?;
|
|
7
7
|
private readonly abortController;
|
|
8
|
-
start(portRange: PortRange, host?: string): Promise<number>;
|
|
8
|
+
start(portRange: PortRange, host?: string, tlsCertificate?: TlsCertificate): Promise<number>;
|
|
9
9
|
private startServer;
|
|
10
10
|
stop(): Promise<void>;
|
|
11
11
|
private createWsServer;
|