@streamr/dht 0.0.1-tatum.2 → 0.0.1-tatum.4
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 +0 -1
- package/dist/src/connection/ConnectionManager.js +15 -23
- package/dist/src/connection/ConnectionManager.js.map +1 -1
- package/dist/src/connection/ConnectivityChecker.d.ts +2 -1
- package/dist/src/connection/ConnectivityChecker.js +8 -6
- package/dist/src/connection/ConnectivityChecker.js.map +1 -1
- package/dist/src/connection/ManagedConnection.js +2 -6
- package/dist/src/connection/ManagedConnection.js.map +1 -1
- package/dist/src/connection/Simulator/SimulatorTransport.js +1 -1
- package/dist/src/connection/Simulator/SimulatorTransport.js.map +1 -1
- package/dist/src/connection/WebSocket/WebSocketConnector.js +3 -2
- package/dist/src/connection/WebSocket/WebSocketConnector.js.map +1 -1
- package/dist/src/connection/WebSocket/WebSocketServer.d.ts +1 -1
- package/dist/src/connection/WebSocket/WebSocketServer.js +6 -5
- package/dist/src/connection/WebSocket/WebSocketServer.js.map +1 -1
- package/dist/src/dht/DhtNode.d.ts +3 -4
- package/dist/src/dht/DhtNode.js +7 -16
- package/dist/src/dht/DhtNode.js.map +1 -1
- package/dist/src/dht/DhtPeer.js +1 -1
- package/dist/src/dht/routing/RemoteRouter.js +2 -4
- package/dist/src/dht/routing/RemoteRouter.js.map +1 -1
- package/dist/src/dht/store/DataStore.js +6 -6
- package/dist/src/proto/packages/dht/protos/DhtRpc.d.ts +4 -0
- package/dist/src/proto/packages/dht/protos/DhtRpc.js +2 -1
- package/dist/src/proto/packages/dht/protos/DhtRpc.js.map +1 -1
- package/package.json +9 -9
- package/protos/DhtRpc.proto +2 -1
- package/src/connection/ConnectionManager.ts +16 -25
- package/src/connection/ConnectivityChecker.ts +9 -6
- package/src/connection/ManagedConnection.ts +2 -6
- package/src/connection/Simulator/SimulatorTransport.ts +1 -1
- package/src/connection/WebRTC/BrowserWebRtcConnection.ts +13 -2
- package/src/connection/WebSocket/WebSocketConnector.ts +3 -2
- package/src/connection/WebSocket/WebSocketServer.ts +6 -5
- package/src/dht/DhtNode.ts +11 -18
- package/src/dht/DhtPeer.ts +1 -1
- package/src/dht/routing/RemoteRouter.ts +2 -4
- package/src/dht/store/DataStore.ts +6 -6
- package/src/proto/packages/dht/protos/DhtRpc.ts +6 -1
- package/test/benchmark/KademliaCorrectness.test.ts +1 -1
- package/test/benchmark/RecursiveFind.test.ts +1 -1
- package/test/end-to-end/Layer0-Layer1.test.ts +2 -2
- package/test/end-to-end/Layer0.test.ts +4 -4
- package/test/end-to-end/Layer0MixedConnectionTypes.test.ts +5 -5
- package/test/end-to-end/Layer0WebRTC-Layer1.test.ts +15 -17
- package/test/end-to-end/Layer0WebRTC.test.ts +17 -23
- 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 +2 -2
- package/test/integration/ConnectionManager.test.ts +1 -0
- package/test/integration/DhtRpc.test.ts +2 -2
- package/test/integration/MigrateData.test.ts +3 -3
- package/test/integration/RouteMessage.test.ts +2 -2
- package/test/integration/ScaleDownDht.test.ts +1 -1
- package/test/integration/WebRtcConnectionManagement.test.ts +2 -2
- package/test/integration/WebRtcConnectorRpc.test.ts +2 -2
- package/test/integration/WebSocketConnectorRpc.test.ts +4 -4
- package/test/unit/WebSocketServer.test.ts +1 -8
- package/test/utils/utils.ts +1 -2
|
@@ -83,23 +83,23 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
|
|
|
83
83
|
this.onConnectionCountChange();
|
|
84
84
|
};
|
|
85
85
|
this.onDisconnected = (connection, disconnectionType) => {
|
|
86
|
-
logger.trace(' ' + this.
|
|
86
|
+
logger.trace(' ' + this.ownPeerDescriptor?.nodeName + ', ' + connection.getPeerDescriptor()?.nodeName +
|
|
87
87
|
' onDisconnected() ' + disconnectionType);
|
|
88
88
|
const hexKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(connection.getPeerDescriptor());
|
|
89
89
|
const storedConnection = this.connections.get(hexKey);
|
|
90
90
|
if (storedConnection && storedConnection.connectionId.equals(connection.connectionId)) {
|
|
91
91
|
this.locks.clearAllLocks(hexKey);
|
|
92
92
|
this.connections.delete(hexKey);
|
|
93
|
-
logger.trace(' ' + this.
|
|
93
|
+
logger.trace(' ' + this.ownPeerDescriptor?.nodeName + ', ' + connection.getPeerDescriptor()?.nodeName +
|
|
94
94
|
' deleted connection in onDisconnected() ' + disconnectionType);
|
|
95
95
|
this.emit('disconnected', connection.getPeerDescriptor(), disconnectionType);
|
|
96
96
|
this.onConnectionCountChange();
|
|
97
97
|
}
|
|
98
98
|
else {
|
|
99
|
-
logger.trace(' ' + this.
|
|
99
|
+
logger.trace(' ' + this.ownPeerDescriptor?.nodeName + ', ' + connection.getPeerDescriptor()?.nodeName +
|
|
100
100
|
' onDisconnected() did nothing, no such connection in connectionManager');
|
|
101
101
|
if (storedConnection) {
|
|
102
|
-
logger.trace(this.
|
|
102
|
+
logger.trace(this.ownPeerDescriptor?.nodeName + ', ' + connection.getPeerDescriptor()?.nodeName +
|
|
103
103
|
' connectionIds do not match ' + storedConnection.connectionId + ' ' + connection.connectionId);
|
|
104
104
|
}
|
|
105
105
|
}
|
|
@@ -156,7 +156,7 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
|
|
|
156
156
|
const disconnectionCandidates = new SortedContactList_1.SortedContactList((0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.ownPeerDescriptor), 100000);
|
|
157
157
|
this.connections.forEach((connection) => {
|
|
158
158
|
if (!this.locks.isLocked(connection.peerIdKey) && Date.now() - connection.getLastUsed() > lastUsedLimit) {
|
|
159
|
-
logger.trace('disconnecting in timeout interval: ' + this.
|
|
159
|
+
logger.trace('disconnecting in timeout interval: ' + this.ownPeerDescriptor?.nodeName + ', '
|
|
160
160
|
+ connection.getPeerDescriptor()?.nodeName + ' ');
|
|
161
161
|
disconnectionCandidates.addContact(new Contact_1.Contact(connection.getPeerDescriptor()));
|
|
162
162
|
}
|
|
@@ -164,7 +164,7 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
|
|
|
164
164
|
const sortedCandidates = disconnectionCandidates.getAllContacts();
|
|
165
165
|
const targetNum = this.connections.size - maxConnections;
|
|
166
166
|
for (let i = 0; i < sortedCandidates.length && i < targetNum; i++) {
|
|
167
|
-
logger.trace(this.
|
|
167
|
+
logger.trace(this.ownPeerDescriptor?.nodeName + ' garbageCollecting '
|
|
168
168
|
+ sortedCandidates[sortedCandidates.length - 1 - i].getPeerDescriptor().nodeName);
|
|
169
169
|
this.gracefullyDisconnectAsync(sortedCandidates[sortedCandidates.length - 1 - i].getPeerDescriptor(), DhtRpc_1.DisconnectMode.NORMAL).catch((_e) => { });
|
|
170
170
|
}
|
|
@@ -334,7 +334,7 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
|
|
|
334
334
|
return;
|
|
335
335
|
}
|
|
336
336
|
if (this.messageDuplicateDetector.isMostLikelyDuplicate(message.messageId)) {
|
|
337
|
-
logger.trace('handleMessage filtered duplicate ' + this.
|
|
337
|
+
logger.trace('handleMessage filtered duplicate ' + this.ownPeerDescriptor?.nodeName + ', '
|
|
338
338
|
+ message.sourceDescriptor?.nodeName + ' ' + message.serviceId + ' ' + message.messageId);
|
|
339
339
|
return;
|
|
340
340
|
}
|
|
@@ -343,7 +343,7 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
|
|
|
343
343
|
this.rpcCommunicator?.handleMessageFromPeer(message);
|
|
344
344
|
}
|
|
345
345
|
else {
|
|
346
|
-
logger.trace('emit "message" ' + this.
|
|
346
|
+
logger.trace('emit "message" ' + this.ownPeerDescriptor?.nodeName + ', ' + message.sourceDescriptor?.nodeName
|
|
347
347
|
+ ' ' + message.serviceId + ' ' + message.messageId);
|
|
348
348
|
this.emit('message', message);
|
|
349
349
|
}
|
|
@@ -357,7 +357,7 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
|
|
|
357
357
|
let message;
|
|
358
358
|
try {
|
|
359
359
|
message = DhtRpc_1.Message.fromBinary(data);
|
|
360
|
-
logger.trace(`${this.
|
|
360
|
+
logger.trace(`${this.ownPeerDescriptor?.nodeName} received protojson: ${(0, protoToString_1.protoToString)(message, DhtRpc_1.Message)}`);
|
|
361
361
|
}
|
|
362
362
|
catch (e) {
|
|
363
363
|
logger.debug(`Parsing incoming data into Message failed: ${e}`);
|
|
@@ -396,16 +396,16 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
|
|
|
396
396
|
return true;
|
|
397
397
|
}
|
|
398
398
|
acceptIncomingConnection(newConnection) {
|
|
399
|
-
logger.trace(' ' + this.
|
|
399
|
+
logger.trace(' ' + this.ownPeerDescriptor?.nodeName + ', ' + newConnection.getPeerDescriptor()?.nodeName + ' acceptIncomingConnection()');
|
|
400
400
|
const newPeerID = (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(newConnection.getPeerDescriptor());
|
|
401
401
|
const hexKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(newConnection.getPeerDescriptor());
|
|
402
402
|
if (this.connections.has(hexKey)) {
|
|
403
403
|
if (newPeerID.hasSmallerHashThan((0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.ownPeerDescriptor))) {
|
|
404
|
-
logger.trace(' ' + this.
|
|
404
|
+
logger.trace(' ' + this.ownPeerDescriptor?.nodeName + ', ' + newConnection.getPeerDescriptor()?.nodeName +
|
|
405
405
|
' acceptIncomingConnection() replace current connection');
|
|
406
406
|
// replace the current connection
|
|
407
407
|
const oldConnection = this.connections.get(newPeerID.toKey());
|
|
408
|
-
logger.trace('replaced: ' + this.
|
|
408
|
+
logger.trace('replaced: ' + this.ownPeerDescriptor?.nodeName + ', ' + newConnection.getPeerDescriptor()?.nodeName + ' ');
|
|
409
409
|
const buffer = oldConnection.stealOutputBuffer();
|
|
410
410
|
for (const data of buffer) {
|
|
411
411
|
newConnection.sendNoWait(data);
|
|
@@ -424,20 +424,12 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
|
|
|
424
424
|
return true;
|
|
425
425
|
}
|
|
426
426
|
async closeConnection(peerDescriptor, disconnectionType, reason) {
|
|
427
|
-
logger.trace(' ' + this.ownPeerDescriptor?.nodeName + ', ' + peerDescriptor.nodeName + ' ' + 'closeConnection()');
|
|
427
|
+
logger.trace(' ' + this.ownPeerDescriptor?.nodeName + ', ' + peerDescriptor.nodeName + ' ' + 'closeConnection() ' + reason);
|
|
428
428
|
const id = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(peerDescriptor);
|
|
429
429
|
this.locks.clearAllLocks(id);
|
|
430
430
|
if (this.connections.has(id)) {
|
|
431
|
-
logger.trace(' ' + this.ownPeerDescriptor?.nodeName + ', ' + peerDescriptor.nodeName + ' ' +
|
|
432
|
-
'closeConnection() this.connections had the id');
|
|
433
|
-
logger.trace(`Closeconnection called to Peer ${id}${reason ? `: ${reason}` : ''}`);
|
|
434
431
|
const connectionToClose = this.connections.get(id);
|
|
435
|
-
logger.trace('disconnecting: ' + this.config.nodeName + ', ' + connectionToClose.getPeerDescriptor()?.nodeName);
|
|
436
|
-
logger.trace(' ' + this.ownPeerDescriptor?.nodeName + ', ' + peerDescriptor.nodeName + ' ' +
|
|
437
|
-
'closeConnection() calling connection.close()');
|
|
438
432
|
await connectionToClose.close(disconnectionType);
|
|
439
|
-
logger.trace(' ' + this.ownPeerDescriptor?.nodeName + ', ' + peerDescriptor.nodeName + ' ' +
|
|
440
|
-
'closeConnection() connection.close() called');
|
|
441
433
|
}
|
|
442
434
|
else {
|
|
443
435
|
logger.trace(' ' + this.ownPeerDescriptor?.nodeName + ', ' + peerDescriptor.nodeName + ' ' +
|
|
@@ -516,7 +508,7 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
|
|
|
516
508
|
await remoteConnectionLocker.gracefulDisconnect(disconnectMode);
|
|
517
509
|
}
|
|
518
510
|
catch (ex) {
|
|
519
|
-
logger.
|
|
511
|
+
logger.trace(' ' + this.ownPeerDescriptor?.nodeName + ', ' + targetDescriptor.nodeName +
|
|
520
512
|
' remoteConnectionLocker.gracefulDisconnect() failed' + ex);
|
|
521
513
|
}
|
|
522
514
|
}
|
|
@@ -548,7 +540,7 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
|
|
|
548
540
|
}
|
|
549
541
|
// IConnectionLocker server implementation
|
|
550
542
|
async gracefulDisconnect(disconnectNotice, _context) {
|
|
551
|
-
logger.trace(' ' + this.
|
|
543
|
+
logger.trace(' ' + this.ownPeerDescriptor?.nodeName + ', ' + disconnectNotice.peerDescriptor?.nodeName
|
|
552
544
|
+ ' received gracefulDisconnect notice');
|
|
553
545
|
if (disconnectNotice.disconnecMode === DhtRpc_1.DisconnectMode.LEAVING) {
|
|
554
546
|
this.closeConnection(disconnectNotice.peerDescriptor, 'INCOMING_GRACEFUL_LEAVE', 'graceful leave notified');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConnectionManager.js","sourceRoot":"","sources":["../../../src/connection/ConnectionManager.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ConnectionManager.js","sourceRoot":"","sources":["../../../src/connection/ConnectionManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,8 @@ export declare class ConnectivityChecker {
|
|
|
10
10
|
private destroyed;
|
|
11
11
|
private readonly webSocketPort;
|
|
12
12
|
private readonly tls;
|
|
13
|
-
|
|
13
|
+
private readonly host?;
|
|
14
|
+
constructor(webSocketPort: number, tls: boolean, host?: string);
|
|
14
15
|
sendConnectivityRequest(entryPoint: PeerDescriptor): Promise<ConnectivityResponse>;
|
|
15
16
|
listenToIncomingConnectivityRequests(connectionToListenTo: ServerWebSocket): void;
|
|
16
17
|
private handleIncomingConnectivityRequest;
|
|
@@ -41,10 +41,11 @@ var ConnectionMode;
|
|
|
41
41
|
ConnectionMode["PROBE"] = "connectivityProbe";
|
|
42
42
|
})(ConnectionMode || (exports.ConnectionMode = ConnectionMode = {}));
|
|
43
43
|
class ConnectivityChecker {
|
|
44
|
-
constructor(webSocketPort, tls) {
|
|
44
|
+
constructor(webSocketPort, tls, host) {
|
|
45
45
|
this.destroyed = false;
|
|
46
46
|
this.webSocketPort = webSocketPort;
|
|
47
47
|
this.tls = tls;
|
|
48
|
+
this.host = host;
|
|
48
49
|
}
|
|
49
50
|
async sendConnectivityRequest(entryPoint) {
|
|
50
51
|
if (this.destroyed) {
|
|
@@ -65,7 +66,7 @@ class ConnectivityChecker {
|
|
|
65
66
|
throw new Err.ConnectionFailed('Failed to connect to the entrypoints', e);
|
|
66
67
|
}
|
|
67
68
|
// send connectivity request
|
|
68
|
-
const connectivityRequestMessage = { port: this.webSocketPort, tls: this.tls };
|
|
69
|
+
const connectivityRequestMessage = { port: this.webSocketPort, host: this.host, tls: this.tls };
|
|
69
70
|
const msg = {
|
|
70
71
|
serviceId: ConnectivityChecker.CONNECTIVITY_CHECKER_SERVICE_ID,
|
|
71
72
|
messageType: DhtRpc_1.MessageType.CONNECTIVITY_REQUEST, messageId: (0, uuid_1.v4)(),
|
|
@@ -129,10 +130,11 @@ class ConnectivityChecker {
|
|
|
129
130
|
}
|
|
130
131
|
let outgoingConnection;
|
|
131
132
|
let connectivityResponseMessage;
|
|
133
|
+
const host = connectivityRequest.host ?? connection.getRemoteAddress();
|
|
132
134
|
try {
|
|
133
135
|
outgoingConnection = await this.connectAsync({
|
|
134
136
|
wsServerInfo: {
|
|
135
|
-
host
|
|
137
|
+
host,
|
|
136
138
|
port: connectivityRequest.port,
|
|
137
139
|
tls: connectivityRequest.tls
|
|
138
140
|
},
|
|
@@ -143,7 +145,7 @@ class ConnectivityChecker {
|
|
|
143
145
|
logger.debug('error', { err });
|
|
144
146
|
connectivityResponseMessage = {
|
|
145
147
|
openInternet: false,
|
|
146
|
-
host
|
|
148
|
+
host,
|
|
147
149
|
natType: ConnectionManager_1.NatType.UNKNOWN
|
|
148
150
|
};
|
|
149
151
|
}
|
|
@@ -152,9 +154,9 @@ class ConnectivityChecker {
|
|
|
152
154
|
logger.trace('Connectivity test produced positive result, communicating reply to the requester');
|
|
153
155
|
connectivityResponseMessage = {
|
|
154
156
|
openInternet: true,
|
|
155
|
-
host
|
|
157
|
+
host,
|
|
156
158
|
natType: ConnectionManager_1.NatType.OPEN_INTERNET,
|
|
157
|
-
websocket: { host
|
|
159
|
+
websocket: { host, port: connectivityRequest.port, tls: connectivityRequest.tls }
|
|
158
160
|
};
|
|
159
161
|
}
|
|
160
162
|
const msg = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConnectivityChecker.js","sourceRoot":"","sources":["../../../src/connection/ConnectivityChecker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gEAI4C;AAE5C,0CAAsF;AACtF,uDAAwC;AACxC,iEAA6D;AAC7D,+BAAyB;AACzB,2DAA6C;AAE7C,uEAAiF;AAEjF,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,qEAAqE;AACrE,gEAAgE;AAChE,iCAAiC;AAEjC,IAAY,cAA+E;AAA3F,WAAY,cAAc;IAAG,iDAA+B,CAAA;IAAE,6CAA2B,CAAA;AAAC,CAAC,EAA/E,cAAc,8BAAd,cAAc,QAAiE;AAC3F,MAAa,mBAAmB;
|
|
1
|
+
{"version":3,"file":"ConnectivityChecker.js","sourceRoot":"","sources":["../../../src/connection/ConnectivityChecker.ts"],"names":[],"mappings":"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"}
|
|
@@ -77,10 +77,7 @@ class ManagedConnection extends eventemitter3_1.default {
|
|
|
77
77
|
if (outgoingConnection) {
|
|
78
78
|
this.handshaker = new Handshaker_1.Handshaker(this.ownPeerDescriptor, this.protocolVersion, outgoingConnection);
|
|
79
79
|
this.handshaker.once('handshakeFailed', (errorMessage) => {
|
|
80
|
-
logger.trace('
|
|
81
|
-
this.ownPeerDescriptor.nodeName + ', ' + this.peerDescriptor?.nodeName + ' objectid: ' + this.objectId
|
|
82
|
-
+ ' outputBuffer.length: ' + this.outputBuffer.length);
|
|
83
|
-
logger.trace(' ' + this.ownPeerDescriptor.nodeName + ', ' + this.peerDescriptor?.nodeName + ' emitting handshakeFailed');
|
|
80
|
+
logger.trace(' ' + this.ownPeerDescriptor.nodeName + ', ' + this.peerDescriptor?.nodeName + ' handshakeFailed: ' + errorMessage);
|
|
84
81
|
this.emit('handshakeFailed');
|
|
85
82
|
});
|
|
86
83
|
this.handshaker.on('handshakeCompleted', (peerDescriptor) => {
|
|
@@ -227,9 +224,8 @@ class ManagedConnection extends eventemitter3_1.default {
|
|
|
227
224
|
result2 = await (0, utils_1.raceEvents3)(this, ['bufferSentByOtherConnection', 'closing', 'disconnected'], 15000);
|
|
228
225
|
}
|
|
229
226
|
catch (ex) {
|
|
230
|
-
logger.
|
|
227
|
+
logger.trace(' ' + this.ownPeerDescriptor.nodeName + ', ' + this.peerDescriptor?.nodeName +
|
|
231
228
|
' Exception from raceEvents3 while waiting bufferSentByOtherConnection or closing ' + ex);
|
|
232
|
-
logger.trace(this.connectionId + ' Exception from raceEvents3 while waiting bufferSentByOtherConnection');
|
|
233
229
|
throw ex;
|
|
234
230
|
}
|
|
235
231
|
if (result2.winnerName === 'bufferSentByOtherConnection') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ManagedConnection.js","sourceRoot":"","sources":["../../../src/connection/ManagedConnection.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ManagedConnection.js","sourceRoot":"","sources":["../../../src/connection/ManagedConnection.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAA2F;AAC3F,uDAAwC;AACxC,6CAAyC;AAEzC,0CAAmG;AACnG,kEAAwC;AAExC,kFAA2E;AAa3E,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAGjC,MAAa,iBAAkB,SAAQ,uBAAoB;IA6BvD,YACI,iBAAiC,EACjC,eAAuB,EACvB,cAA8B,EAC9B,kBAAgC,EAChC,kBAAgC;QAEhC,KAAK,EAAE,CAAA;QAjCJ,aAAQ,GAAG,CAAC,CAAA;QAGX,iBAAY,GAAiB,EAAE,CAAA;QAC/B,gBAAW,GAAiB,EAAE,CAAA;QAO9B,uBAAkB,GAAG,KAAK,CAAA;QAC1B,0BAAqB,GAAG,KAAK,CAAA;QAE7B,aAAQ,GAAW,IAAI,CAAC,GAAG,EAAE,CAAA;QAC7B,YAAO,GAAG,KAAK,CAAA;QAChB,sBAAiB,GAAG,KAAK,CAAA;QACzB,uBAAkB,GAAG,KAAK,CAAA;QACzB,gCAA2B,GAAG,KAAK,CAAA;QACnC,YAAO,GAAG,KAAK,CAAA;QAChB,8BAAyB,GAAG,KAAK,CAAA;QAgIhC,yBAAoB,GAAG,CAAC,cAA8B,EAAE,EAAE;YAC9D,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;YAE1B,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAA;YACtC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAA;YAE9B,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;gBACjC,MAAM,CAAC,KAAK,CAAC,kCAAkC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAA;gBAEhE,IAAI,CAAC,cAAe,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,EAAG,CAAC,CAAA;aACxD;YAED,MAAM,CAAC,KAAK,CAAC,0CAA0C,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAA;YACxE,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,cAAc,CAAC,CAAA;QACnD,CAAC,CAAA;QAhIG,IAAI,CAAC,QAAQ,GAAG,iBAAiB,CAAC,aAAa,CAAA;QAC/C,iBAAiB,CAAC,aAAa,EAAE,CAAA;QAEjC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEhC,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;QAC1C,IAAI,CAAC,eAAe,GAAG,eAAe,CAAA;QACtC,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAA;QAC5C,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAA;QAC5C,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;QACpC,IAAI,CAAC,YAAY,GAAG,IAAI,0BAAY,EAAE,CAAA;QAEtC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEpD,MAAM,CAAC,KAAK,CAAC,sCAAsC,GAAG,cAAc,GAAG,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAA;QACrG,IAAI,kBAAkB,IAAI,kBAAkB,EAAE;YAC1C,MAAM,IAAI,GAAG,CAAC,gBAAgB,CAAC,oGAAoG,CAAC,CAAA;SACvI;QAED,IAAI,kBAAkB,EAAE;YACpB,IAAI,CAAC,UAAU,GAAG,IAAI,uBAAU,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,eAAe,EAAE,kBAAkB,CAAC,CAAA;YAElG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,YAAY,EAAE,EAAE;gBACrD,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,GAAG,IAAI,GAAG,IAAI,CAAC,cAAc,EAAE,QAAQ,GAAG,oBAAoB,GAAG,YAAY,CAAC,CAAA;gBAChI,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;YAChC,CAAC,CAAC,CAAA;YAEF,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,cAA8B,EAAE,EAAE;gBACxE,MAAM,CAAC,KAAK,CAAC,8CAA8C,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ;oBACzF,IAAI,GAAG,IAAI,CAAC,cAAc,EAAE,QAAQ,GAAG,aAAa,GAAG,IAAI,CAAC,QAAQ;sBAClE,wBAAwB,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAA;gBAE1D,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,CAAA;gBAC7C,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAA;YAC7C,CAAC,CAAC,CAAA;YAEF,kBAAkB,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE;gBACtC,IAAI,CAAC,UAAW,CAAC,oBAAoB,EAAE,CAAA;gBACvC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YAC1B,CAAC,CAAC,CAAA;YACF,kBAAkB,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC,CAAA;SAE/D;aAAM;YACH,IAAI,kBAAkB,EAAE;gBACpB,IAAI,CAAC,UAAU,GAAG,IAAI,uBAAU,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,eAAe,EAAE,kBAAkB,CAAC,CAAA;gBAClG,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,kBAAkB,EAAE,CAAC,cAA8B,EAAE,EAAE;oBACtE,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAA;oBACtC,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,cAAc,CAAC,CAAA;gBACjD,CAAC,CAAC,CAAA;gBAEF,kBAAkB,CAAC,EAAE,CAAC,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC,CAAA;aAE7D;SACJ;IACL,CAAC;IAED,4FAA4F;IAEnF,EAAE,CACP,KAAmB,EACnB,EAA0B;IAC1B,6EAA6E;IAC7E,OAAa;QAEb,IAAI,KAAK,KAAK,aAAa,IAAI,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE;YACpE,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;gBAChC,MAAM,CAAC,KAAK,CAAC,iCAAiC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAA;gBAC/D,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,EAAG,CAAA;gBACtC,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAA;aACrC;SACJ;QACD,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,EAAE,OAAO,CAAC,CAAA;QAC5B,OAAO,IAAI,CAAA;IACf,CAAC;IAEQ,IAAI,CACT,KAAmB,EACnB,EAA0B;IAC1B,6EAA6E;IAC7E,OAAa;QAEb,IAAI,KAAK,KAAK,aAAa,IAAI,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE;YACpE,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC7B,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;oBAChC,MAAM,CAAC,KAAK,CAAC,iCAAiC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAA;oBAC/D,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,EAAG,CAAA;oBACtC,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAA;iBACrC;aACJ;iBAAM;gBACH,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,EAAE,OAAO,CAAC,CAAA;aACjC;SACJ;aAAM;YACH,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,EAAE,OAAO,CAAC,CAAA;SACjC;QAED,OAAO,IAAI,CAAA;IACf,CAAC;IAED,IAAW,SAAS;QAChB,OAAO,IAAA,gDAAqB,EAAC,IAAI,CAAC,cAAe,CAAC,CAAA;IACtD,CAAC;IAEM,WAAW;QACd,OAAO,IAAI,CAAC,QAAQ,CAAA;IACxB,CAAC;IAEM,iBAAiB,CAAC,cAA8B;QACnD,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;IACxC,CAAC;IAEM,iBAAiB;QACpB,OAAO,IAAI,CAAC,cAAc,CAAA;IAC9B,CAAC;IAkBM,oBAAoB,CAAC,IAAiB,EAAE,eAAgC;QAC3E,MAAM,CAAC,KAAK,CAAC,mCAAmC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAA;QACjE,IAAI,CAAC,cAAc,GAAG,IAAI,CAAA;QAE1B,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAiB,EAAE,EAAE;YAClC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;YAC1B,IAAI,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE;gBAEvC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;aAC/B;iBAAM;gBACH,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,KAAK,EAAE,IAAI,CAAC,iBAAiB,EAAG,CAAC,CAAA;aAC7D;QACL,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAY,EAAE,EAAE;YAC9B,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;QAC5B,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,EAAE,CAAC,WAAW,EAAE,GAAG,EAAE;YACtB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;YAC1B,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAA;YACjC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QAC1B,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC,CAAA;QAC7C,IAAI,CAAC,EAAE,CAAC,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC,CAAA;IAChD,CAAC;IAEO,cAAc,CAAC,iBAAoC,EAAE,KAAc,EAAE,OAAgB;QACzF,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,GAAG,IAAI,GAAG,IAAI,CAAC,cAAc,EAAE,QAAQ,GAAG,oBAAoB,GAAG,iBAAiB,CAAC,CAAA;QACrI,IAAI,IAAI,CAAC,2BAA2B,EAAE;YAClC,OAAM;SACT;QACD,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAA;QAClC,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAA;IACxC,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,IAAgB,EAAE,YAAY,GAAG,KAAK;QAC7C,IAAI,IAAI,CAAC,OAAO,EAAE;YACd,OAAM;SACT;QACD,IAAI,IAAI,CAAC,OAAO,EAAE;YACd,OAAM;SACT;QACD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAE1B,IAAI,YAAY,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;YACtC,MAAM,IAAI,GAAG,CAAC,iBAAiB,CAAC,gEAAgE,CAAC,CAAA;SACpG;aAAM,IAAI,IAAI,CAAC,cAAc,EAAE;YAC5B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;SACjC;aAAM;YACH,MAAM,CAAC,KAAK,CAAC,wCAAwC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAA;YAEtE,IAAI,MAA0C,CAAA;YAE9C,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAA;YAEjC,IAAI;gBACA,MAAM,GAAG,MAAM,IAAA,yBAAiB,EAAS,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,oBAAoB,EAAE,iBAAiB;oBAC7H,6BAA6B,EAAE,SAAS,EAAE,uBAAuB,CAAC,EAAE,KAAK,CAAC,CAAA;aACjF;YAAC,OAAO,CAAC,EAAE;gBACR,MAAM,CAAC,KAAK,CAAC,mBAAmB,IAAI,CAAC,iBAAiB,CAAC,QAAQ,OAAO,IAAI,CAAC,cAAc,EAAE,QAAQ,YAAY,CAAC,CAAA;gBAChH,MAAM,CAAC,CAAA;aACV;YAED,IAAI,MAAM,CAAC,UAAU,KAAK,uBAAuB,EAAE;gBAC/C,IAAI,CAAC,qBAAqB,GAAG,KAAK,CAAA;gBAClC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;aAC7B;iBAAM,IAAI,MAAM,CAAC,UAAU,KAAK,iBAAiB,EAAE;gBAChD,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,GAAG,IAAI,GAAG,IAAI,CAAC,cAAc,EAAE,QAAQ,GAAG,2BAA2B,CAAC,CAAA;gBAExH,IAAI,IAAI,CAAC,2BAA2B,EAAE;oBAClC,MAAM,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAA;oBACxD,IAAI,CAAC,qBAAqB,GAAG,KAAK,CAAA;oBAClC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;iBAC7B;qBAAM;oBACH,IAAI,OAA2C,CAAA;oBAE/C,IAAI;wBACA,OAAO,GAAG,MAAM,IAAA,mBAAW,EAAS,IAAI,EACpC,CAAC,6BAA6B,EAAE,SAAS,EAAE,cAAc,CAAC,EAAE,KAAK,CAAC,CAAA;qBACzE;oBAAC,OAAO,EAAE,EAAE;wBACT,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,GAAG,IAAI,GAAG,IAAI,CAAC,cAAc,EAAE,QAAQ;4BACrF,mFAAmF,GAAG,EAAE,CAAC,CAAA;wBAC7F,MAAM,EAAE,CAAA;qBACX;oBACD,IAAI,OAAO,CAAC,UAAU,KAAK,6BAA6B,EAAE;wBACtD,MAAM,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAA;wBACpD,IAAI,CAAC,qBAAqB,GAAG,KAAK,CAAA;wBAClC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;qBAC7B;yBAAM,IAAI,OAAO,CAAC,UAAU,KAAK,SAAS,EAAE;wBACzC,MAAM,CAAC,KAAK,CAAC,4EAA4E,CAAC,CAAA;qBAC7F;yBAAM,IAAI,OAAO,CAAC,UAAU,KAAK,cAAc,EAAE;wBAC9C,MAAM,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAA;qBACpD;iBACJ;aACJ;iBAAM;gBACH,IAAI,CAAC,qBAAqB,GAAG,KAAK,CAAA;aACrC;SACJ;IACL,CAAC;IAEM,UAAU,CAAC,IAAgB;QAC9B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAC1B,IAAI,IAAI,CAAC,cAAc,EAAE;YACrB,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;SACjC;aAAM;YACH,MAAM,CAAC,KAAK,CAAC,wCAAwC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAA;YACtE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;SAC/B;IACL,CAAC;IAEM,iCAAiC;QACpC,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,GAAG,IAAI,GAAG,IAAI,CAAC,cAAc,EAAE,QAAQ,GAAG,oCAAoC,CAAC,CAAA;QACjI,IAAI,IAAI,CAAC,UAAU,EAAE;YACjB,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,CAAA;SACvC;QACD,MAAM,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAA;QACpD,IAAI,CAAC,2BAA2B,GAAG,IAAI,CAAA;QACvC,IAAI,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAA;IAC5C,CAAC;IAEM,0CAA0C;QAC7C,MAAM,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAA;QAC1D,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;IAC9B,CAAC;IAEM,eAAe;QAClB,iEAAiE;QACjE,IAAI,IAAI,CAAC,cAAc,EAAE;YACrB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;gBAClB,IAAI,CAAC,UAAU,GAAG,IAAI,uBAAU,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,cAAc,CAAC,CAAA;aACtG;YAED,IAAI,CAAC,UAAU,CAAC,qBAAqB,EAAE,CAAA;SAE1C;aAAM,EAAG,8DAA8D;YACpE,IAAI,CAAC,UAAW,CAAC,qBAAqB,EAAE,CAAA;YACxC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,kBAAmB,CAAC,CAAA;SACtD;QAED,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,cAAe,CAAC,CAAA;IACnD,CAAC;IAEM,eAAe,CAAC,YAAoB;QACvC,IAAI,CAAC,UAAW,CAAC,qBAAqB,CAAC,YAAY,CAAC,CAAA;IACxD,CAAC;IAEO,YAAY,CAAC,iBAAoC;QACrD,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,GAAG,IAAI,GAAG,IAAI,CAAC,cAAc,EAAE,QAAQ,GAAG,0BAA0B,CAAC,CAAA;QAEvH,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE;YAC7B,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,GAAG,IAAI,GAAG,IAAI,CAAC,cAAc,EAAE,QAAQ,GAAG,wBAAwB,CAAC,CAAA;YACrH,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAA;SAC/C;aAAM;YACH,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,GAAG,IAAI,GAAG,IAAI,CAAC,cAAc,EAAE,QAAQ;gBACrF,sEAAsE,CAAC,CAAA;SAC9E;IACL,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,iBAAoC;QACnD,IAAI,IAAI,CAAC,yBAAyB,EAAE;YAChC,MAAM,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAA;SACxD;QACD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QACnB,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QACpB,IAAI,CAAC,qBAAqB,GAAG,KAAK,CAAA;QAClC,IAAI,IAAI,CAAC,cAAc,EAAE;YACrB,MAAM,IAAI,CAAC,cAAc,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAA;SACtD;aAAM,IAAI,IAAI,CAAC,kBAAkB,EAAE;YAChC,MAAM,IAAI,CAAC,kBAAkB,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAA;SAC1D;aAAM,IAAI,IAAI,CAAC,kBAAkB,EAAE;YAChC,MAAM,IAAI,CAAC,kBAAkB,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAA;SAC1D;aAAM;YACH,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAA;SACvC;IACL,CAAC;IAEM,OAAO;QACV,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QACnB,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QACpB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;YAEnB,IAAI,CAAC,kBAAkB,EAAE,CAAA;YACzB,IAAI,IAAI,CAAC,cAAc,EAAE;gBACrB,IAAI,CAAC,cAAc,EAAE,OAAO,EAAE,CAAA;aACjC;iBAAM,IAAI,IAAI,CAAC,kBAAkB,EAAE;gBAChC,IAAI,CAAC,kBAAkB,EAAE,OAAO,EAAE,CAAA;aACrC;iBAAM,IAAI,IAAI,CAAC,kBAAkB,EAAE;gBAChC,IAAI,CAAC,kBAAkB,EAAE,OAAO,EAAE,CAAA;aACrC;SACJ;IACL,CAAC;IAED,oBAAoB;QAChB,OAAO,IAAI,CAAC,kBAAkB,CAAA;IAClC,CAAC;IAED,iBAAiB;QACb,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,CAAA;QAC7B,IAAI,CAAC,YAAY,GAAG,EAAE,CAAA;QACtB,OAAO,GAAG,CAAA;IACd,CAAC;;AAjXL,8CAkXC;AAhXkB,+BAAa,GAAG,CAAC,AAAJ,CAAI"}
|
|
@@ -4,7 +4,7 @@ exports.SimulatorTransport = void 0;
|
|
|
4
4
|
const ConnectionManager_1 = require("../ConnectionManager");
|
|
5
5
|
class SimulatorTransport extends ConnectionManager_1.ConnectionManager {
|
|
6
6
|
constructor(ownPeerDescriptor, simulator) {
|
|
7
|
-
super({ ownPeerDescriptor: ownPeerDescriptor, simulator, serviceIdPrefix: 'simulator/'
|
|
7
|
+
super({ ownPeerDescriptor: ownPeerDescriptor, simulator, serviceIdPrefix: 'simulator/' });
|
|
8
8
|
}
|
|
9
9
|
}
|
|
10
10
|
exports.SimulatorTransport = SimulatorTransport;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SimulatorTransport.js","sourceRoot":"","sources":["../../../../src/connection/Simulator/SimulatorTransport.ts"],"names":[],"mappings":";;;AACA,4DAAwD;AAGxD,MAAa,kBAAmB,SAAQ,qCAAiB;IACrD,YAAY,iBAAiC,EAAE,SAAoB;QAC/D,KAAK,CAAC,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,SAAS,EAAE,eAAe,EAAE,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"SimulatorTransport.js","sourceRoot":"","sources":["../../../../src/connection/Simulator/SimulatorTransport.ts"],"names":[],"mappings":";;;AACA,4DAAwD;AAGxD,MAAa,kBAAmB,SAAQ,qCAAiB;IACrD,YAAY,iBAAiC,EAAE,SAAoB;QAC/D,KAAK,CAAC,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,SAAS,EAAE,eAAe,EAAE,YAAY,EAAE,CAAC,CAAA;IAC7F,CAAC;CACJ;AAJD,gDAIC"}
|
|
@@ -88,12 +88,13 @@ class WebSocketConnector {
|
|
|
88
88
|
this.attachHandshaker(connection);
|
|
89
89
|
}
|
|
90
90
|
});
|
|
91
|
-
const port = await this.webSocketServer.start(this.portRange, this.
|
|
91
|
+
const port = await this.webSocketServer.start(this.portRange, this.tlsCertificate);
|
|
92
92
|
this.selectedPort = port;
|
|
93
|
-
this.connectivityChecker = new ConnectivityChecker_1.ConnectivityChecker(this.selectedPort, this.tlsCertificate !== undefined);
|
|
93
|
+
this.connectivityChecker = new ConnectivityChecker_1.ConnectivityChecker(this.selectedPort, this.tlsCertificate !== undefined, this.host);
|
|
94
94
|
}
|
|
95
95
|
}
|
|
96
96
|
async checkConnectivity(reattempt = 0) {
|
|
97
|
+
// TODO: this could throw if the server is not running
|
|
97
98
|
const noServerConnectivityResponse = {
|
|
98
99
|
openInternet: false,
|
|
99
100
|
host: '127.0.0.1',
|
|
@@ -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,mEAM+C;AAC/C,iFAA+F;AAC/F,0CAA6C;AAG7C,4DAAwD;AACxD,uDAAmD;AACnD,gEAA4D;AAC5D,4DAAyE;AAGzE,kDAAqD;AACrD,8CAA0C;AAC1C,qFAAwG;AAExG,mCAA+B;AAE/B,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAE1B,MAAM,gCAAgC,GAAG,CAAC,EAAsB,EAAU,EAAE;IAC/E,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,GAAG,GAAG,GAAG,EAAE,CAAC,IAAI,CAAA;AAClE,CAAC,CAAA;AAFY,QAAA,gCAAgC,oCAE5C;AAED,MAAM,+BAA+B,GAAG,CAAC,CAAA;AAEzC,MAAa,kBAAkB;IAkB3B,YACI,eAAuB,EACvB,YAAwB,EACxB,YAAoF,EACpF,0BAAsE,EACtE,SAAqB,EACrB,IAAa,EACb,WAA8B,EAC9B,cAA+B;QApBlB,2BAAsB,GAAsC,IAAI,GAAG,EAAE,CAAA;QAS9E,0BAAqB,GAAsC,IAAI,GAAG,EAAE,CAAA;QACpE,cAAS,GAAG,KAAK,CAAA;
|
|
1
|
+
{"version":3,"file":"WebSocketConnector.js","sourceRoot":"","sources":["../../../../src/connection/WebSocket/WebSocketConnector.ts"],"names":[],"mappings":";;;AAAA,uDAAmD;AACnD,gDAA4D;AAE5D,uFAAmF;AACnF,yEAAqE;AACrE,mEAM+C;AAC/C,iFAA+F;AAC/F,0CAA6C;AAG7C,4DAAwD;AACxD,uDAAmD;AACnD,gEAA4D;AAC5D,4DAAyE;AAGzE,kDAAqD;AACrD,8CAA0C;AAC1C,qFAAwG;AAExG,mCAA+B;AAE/B,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAE1B,MAAM,gCAAgC,GAAG,CAAC,EAAsB,EAAU,EAAE;IAC/E,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,GAAG,GAAG,GAAG,EAAE,CAAC,IAAI,CAAA;AAClE,CAAC,CAAA;AAFY,QAAA,gCAAgC,oCAE5C;AAED,MAAM,+BAA+B,GAAG,CAAC,CAAA;AAEzC,MAAa,kBAAkB;IAkB3B,YACI,eAAuB,EACvB,YAAwB,EACxB,YAAoF,EACpF,0BAAsE,EACtE,SAAqB,EACrB,IAAa,EACb,WAA8B,EAC9B,cAA+B;QApBlB,2BAAsB,GAAsC,IAAI,GAAG,EAAE,CAAA;QAS9E,0BAAqB,GAAsC,IAAI,GAAG,EAAE,CAAA;QACpE,cAAS,GAAG,KAAK,CAAA;QA+JjB,mCAA8B,GAAG,CAAC,cAA8B,EAAE,eAA4B,EAAE,EAAE;YAEtG,MAAM,MAAM,GAAG,IAAA,mDAAwB,EAAC,cAAc,CAAC,CAAA;YAEvD,IAAI,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE;gBACjD,MAAM,qBAAqB,GAAG,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,CAAE,CAAA;gBAC9E,qBAAqB,CAAC,oBAAoB,CAAC,eAAe,EAAE,cAAc,CAAC,CAAA;gBAC3E,qBAAqB,CAAC,eAAe,EAAE,CAAA;gBACvC,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAA;aACrD;iBAAM;gBACH,MAAM,iBAAiB,GAAG,IAAI,qCAAiB,CAAC,IAAI,CAAC,iBAAkB,EAAE,IAAI,CAAC,eAAe,EACzF,4BAAc,CAAC,gBAAgB,EAAE,SAAS,EAAE,eAAe,CAAC,CAAA;gBAEhE,iBAAiB,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAA;gBAEnD,IAAI,IAAI,CAAC,0BAA0B,CAAC,iBAAiB,CAAC,EAAE;oBACpD,iBAAiB,CAAC,eAAe,EAAE,CAAA;iBACtC;qBAAM;oBACH,iBAAiB,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAA;oBACzD,iBAAiB,CAAC,OAAO,EAAE,CAAA;iBAC9B;aACJ;QACL,CAAC,CAAA;QAzKG,IAAI,CAAC,eAAe,GAAG,eAAe,CAAA;QACtC,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,iCAAe,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;QACpE,IAAI,CAAC,0BAA0B,GAAG,0BAA0B,CAAA;QAC5D,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;QAEpC,IAAI,CAAC,kBAAkB,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEjD,IAAI,CAAC,eAAe,GAAG,IAAI,mDAAwB,CAAC,kBAAkB,CAAC,8BAA8B,EAAE,YAAY,EAAE;YACjH,iBAAiB,EAAE,KAAK;SAC3B,CAAC,CAAA;QAEF,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAClC,mCAA0B,EAC1B,oCAA2B,EAC3B,mBAAmB,EACnB,CAAC,GAA+B,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,OAAO,CAAC,CACrF,CAAA;IACL,CAAC;IAEO,gBAAgB,CAAC,UAAuB;QAC5C,MAAM,UAAU,GAAG,IAAI,uBAAU,CAAC,IAAI,CAAC,iBAAkB,EAAE,IAAI,CAAC,eAAe,EAAE,UAAU,CAAC,CAAA;QAC5F,UAAU,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,cAA8B,EAAE,EAAE;YACnE,IAAI,CAAC,8BAA8B,CAAC,cAAc,EAAE,UAAU,CAAC,CAAA;QACnE,CAAC,CAAC,CAAA;IACN,CAAC;IAEM,KAAK,CAAC,KAAK;QACd,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,eAAe,EAAE;YACzC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,UAAuB,EAAE,EAAE;gBAE7D,MAAM,YAAY,GAAG,UAAwC,CAAA;gBAC7D,IAAI,YAAY,CAAC,WAAW;oBACxB,YAAY,CAAC,WAAW,CAAC,KAAK,EAAE;oBAChC,MAAM,KAAK,GAAG,YAAY,CAAC,WAAW,CAAC,KAAkC,CAAA;oBACzE,IAAI,KAAK,CAAC,mBAAmB,EAAE;wBAC3B,MAAM,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAA;wBACxD,IAAI,CAAC,mBAAoB,CAAC,oCAAoC,CAAC,YAAY,CAAC,CAAA;qBAC/E;yBAAM,IAAI,KAAK,CAAC,iBAAiB,EAAE;wBAChC,MAAM,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAA;qBACzD;yBAAM;wBACH,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAA;qBACpC;iBACJ;qBAAM;oBACH,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAA;iBACpC;YACL,CAAC,CAAC,CAAA;YACF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,SAAU,EAAE,IAAI,CAAC,cAAc,CAAC,CAAA;YACnF,IAAI,CAAC,YAAY,GAAG,IAAI,CAAA;YACxB,IAAI,CAAC,mBAAmB,GAAG,IAAI,yCAAmB,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,cAAc,KAAK,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;SACtH;IACL,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAC,SAAS,GAAG,CAAC;QACxC,sDAAsD;QACtD,MAAM,4BAA4B,GAAyB;YACvD,YAAY,EAAE,KAAK;YACnB,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,2BAAO,CAAC,OAAO;SAC3B,CAAA;QACD,IAAI,IAAI,CAAC,SAAS,EAAE;YAChB,OAAO,4BAA4B,CAAA;SACtC;QACD,IAAI;YACA,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE;gBACvB,qDAAqD;gBACrD,OAAO,4BAA4B,CAAA;aACtC;iBAAM;gBACH,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;oBAClD,2CAA2C;oBAC3C,MAAM,iCAAiC,GAAyB;wBAC5D,YAAY,EAAE,IAAI;wBAClB,IAAI,EAAE,IAAI,CAAC,IAAK;wBAChB,OAAO,EAAE,2BAAO,CAAC,aAAa;wBAC9B,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAK,EAAE,IAAI,EAAE,IAAI,CAAC,YAAa,EAAE,GAAG,EAAE,IAAI,CAAC,cAAc,KAAK,SAAS,EAAE;qBACpG,CAAA;oBACD,OAAO,iCAAiC,CAAA;iBAC3C;qBAAM;oBACH,qCAAqC;oBACrC,OAAO,MAAM,IAAI,CAAC,mBAAoB,CAAC,uBAAuB,CAAC,IAAA,eAAM,EAAC,IAAI,CAAC,WAAW,CAAE,CAAC,CAAA;iBAC5F;aACJ;SACJ;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,SAAS,GAAG,+BAA+B,EAAE;gBAC7C,MAAM,CAAC,KAAK,CAAC,qCAAqC,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAA;gBACnE,MAAM,IAAA,YAAI,EAAC,IAAI,CAAC,CAAA;gBAChB,OAAO,IAAI,CAAC,iBAAiB,CAAC,SAAS,GAAG,CAAC,CAAC,CAAA;aAC/C;iBAAM;gBACH,MAAM,GAAG,CAAA;aACZ;SACJ;IAEL,CAAC;IAEM,OAAO,CAAC,oBAAoC;QAC/C,MAAM,OAAO,GAAG,IAAA,gDAAqB,EAAC,oBAAoB,CAAC,CAAA;QAC3D,MAAM,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QAClE,IAAI,kBAAkB,EAAE;YACpB,OAAO,kBAAkB,CAAA;SAC5B;QAED,IAAI,IAAI,CAAC,iBAAkB,CAAC,SAAS,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE;YACtE,OAAO,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,iBAAkB,EAAE,oBAAoB,CAAC,CAAA;SACvF;aAAM;YACH,MAAM,MAAM,GAAG,IAAI,iCAAe,EAAE,CAAA;YAEpC,MAAM,GAAG,GAAG,IAAA,wCAAgC,EAAC,oBAAoB,CAAC,SAAU,CAAC,CAAA;YAE7E,MAAM,iBAAiB,GAAG,IAAI,qCAAiB,CAAC,IAAI,CAAC,iBAAkB,EAAE,IAAI,CAAC,eAAe,EACzF,4BAAc,CAAC,gBAAgB,EAAE,MAAM,EAAE,SAAS,CAAC,CAAA;YACvD,iBAAiB,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,CAAA;YAEzD,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,IAAA,gDAAqB,EAAC,oBAAoB,CAAC,EAAE,iBAAiB,CAAC,CAAA;YAE9F,MAAM,OAAO,GAAG,GAAG,EAAE;gBACjB,IAAI,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;oBACzC,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;iBAC7C;gBACD,MAAM,CAAC,GAAG,CAAC,cAAc,EAAE,OAAO,CAAC,CAAA;gBACnC,iBAAiB,CAAC,GAAG,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAA;YACxD,CAAC,CAAA;YACD,MAAM,CAAC,EAAE,CAAC,cAAc,EAAE,OAAO,CAAC,CAAA;YAClC,iBAAiB,CAAC,EAAE,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAA;YAEnD,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;YAEnB,OAAO,iBAAiB,CAAA;SAC3B;IACL,CAAC;IAEM,yBAAyB,CAAC,iBAAiC,EAAE,oBAAoC;QACpG,YAAY,CAAC,GAAG,EAAE;YACd,MAAM,eAAe,GAAG,IAAI,mDAAwB,CAChD,oBAAoB,EACpB,IAAA,4BAAgB,EAAC,IAAI,+CAA+B,CAAC,IAAI,CAAC,eAAe,CAAC,qBAAqB,EAAE,CAAC,CAAC,CACtG,CAAA;YACD,eAAe,CAAC,iBAAiB,CAAC,iBAAiB,EAAE,iBAAiB,CAAC,SAAU,CAAC,IAAI,EAAE,iBAAiB,CAAC,SAAU,CAAC,IAAI,CAAC,CAAA;QAC9H,CAAC,CAAC,CAAA;QACF,MAAM,iBAAiB,GAAG,IAAI,qCAAiB,CAAC,IAAI,CAAC,iBAAkB,EAAE,IAAI,CAAC,eAAe,EAAE,4BAAc,CAAC,gBAAgB,CAAC,CAAA;QAC/H,iBAAiB,CAAC,EAAE,CAAC,cAAc,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,IAAA,gDAAqB,EAAC,oBAAoB,CAAC,CAAC,CAAC,CAAA;QAC3H,iBAAiB,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,CAAA;QACzD,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,IAAA,gDAAqB,EAAC,oBAAoB,CAAC,EAAE,iBAAiB,CAAC,CAAA;QAC/F,OAAO,iBAAiB,CAAA;IAC5B,CAAC;IA0BM,oBAAoB,CAAC,iBAAiC;QACzD,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;IAC9C,CAAC;IAEM,KAAK,CAAC,OAAO;QAChB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;QACrB,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,CAAA;QAE3B,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,CAAC,CAAA;QACjE,MAAM,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;QAErE,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,CAAC,CAAA;QAChE,MAAM,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;QACrE,IAAI,CAAC,mBAAmB,EAAE,OAAO,EAAE,CAAA;QACnC,MAAM,IAAI,CAAC,eAAe,EAAE,IAAI,EAAE,CAAA;IACtC,CAAC;IAED,4CAA4C;IACrC,KAAK,CAAC,iBAAiB,CAAC,OAAmC,EAAE,QAA2B;QAC3F,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,SAAU,EAAE,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE;YAC1F,YAAY,CAAC,GAAG,EAAE;gBACd,IAAI,IAAI,CAAC,SAAS,EAAE;oBAChB,OAAM;iBACT;gBACD,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,SAAU,CAAC,CAAA;gBACnD,IAAI,CAAC,0BAA0B,CAAC,UAAU,CAAC,CAAA;YAC/C,CAAC,CAAC,CAAA;YACF,MAAM,GAAG,GAAgC;gBACrC,QAAQ,EAAE,IAAI;aACjB,CAAA;YACD,OAAO,GAAG,CAAA;SACb;QACD,OAAO;YACH,QAAQ,EAAE,KAAK;SAClB,CAAA;IACL,CAAC;;AA1OL,gDA2OC;AA1O2B,iDAA8B,GAAG,2BAA2B,AAA9B,CAA8B"}
|
|
@@ -5,7 +5,7 @@ export declare class WebSocketServer extends EventEmitter<ConnectionSourceEvents
|
|
|
5
5
|
private httpServer?;
|
|
6
6
|
private wsServer?;
|
|
7
7
|
private readonly abortController;
|
|
8
|
-
start(portRange: PortRange,
|
|
8
|
+
start(portRange: PortRange, tlsCertificate?: TlsCertificate): Promise<number>;
|
|
9
9
|
private startServer;
|
|
10
10
|
stop(): Promise<void>;
|
|
11
11
|
private createWsServer;
|
|
@@ -19,11 +19,11 @@ class WebSocketServer extends eventemitter3_1.default {
|
|
|
19
19
|
super(...arguments);
|
|
20
20
|
this.abortController = new AbortController();
|
|
21
21
|
}
|
|
22
|
-
async start(portRange,
|
|
22
|
+
async start(portRange, tlsCertificate) {
|
|
23
23
|
const ports = (0, lodash_1.range)(portRange.min, portRange.max + 1);
|
|
24
24
|
for (const port of ports) {
|
|
25
25
|
try {
|
|
26
|
-
await (0, utils_1.asAbortable)(this.startServer(port,
|
|
26
|
+
await (0, utils_1.asAbortable)(this.startServer(port, tlsCertificate), this.abortController.signal);
|
|
27
27
|
return port;
|
|
28
28
|
}
|
|
29
29
|
catch (err) {
|
|
@@ -35,9 +35,9 @@ class WebSocketServer extends eventemitter3_1.default {
|
|
|
35
35
|
}
|
|
36
36
|
}
|
|
37
37
|
}
|
|
38
|
-
throw new errors_1.WebSocketServerStartError(
|
|
38
|
+
throw new errors_1.WebSocketServerStartError(`Failed to start WebSocket server on any port in range: ${portRange.min}-${portRange.min}`);
|
|
39
39
|
}
|
|
40
|
-
startServer(port,
|
|
40
|
+
startServer(port, tlsCertificate) {
|
|
41
41
|
const requestListener = (request, response) => {
|
|
42
42
|
logger.trace('Received request for ' + request.url);
|
|
43
43
|
response.writeHead(404);
|
|
@@ -74,7 +74,8 @@ class WebSocketServer extends eventemitter3_1.default {
|
|
|
74
74
|
resolve();
|
|
75
75
|
});
|
|
76
76
|
try {
|
|
77
|
-
|
|
77
|
+
// Listen only to IPv4 network interfaces, default value listens to IPv6 as well
|
|
78
|
+
this.httpServer.listen(port, '0.0.0.0');
|
|
78
79
|
}
|
|
79
80
|
catch (e) {
|
|
80
81
|
reject(new errors_1.WebSocketServerStartError('Websocket server threw an exception', e));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebSocketServer.js","sourceRoot":"","sources":["../../../../src/connection/WebSocket/WebSocketServer.ts"],"names":[],"mappings":";;;;;;AAAA,+BAA8G;AAC9G,iCAAgF;AAChF,kEAAwC;AACxC,yCAA8C;AAC9C,uDAAmD;AAKnD,0CAAoD;AACpD,iDAAgE;AAEhE,mCAA8B;AAC9B,4CAAmB;AAEnB,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AASjC,MAAa,eAAgB,SAAQ,uBAAoC;IAAzE;;QAIqB,oBAAe,GAAG,IAAI,eAAe,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"WebSocketServer.js","sourceRoot":"","sources":["../../../../src/connection/WebSocket/WebSocketServer.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,7 +40,7 @@ export interface DhtNodeOptions {
|
|
|
40
40
|
entryPoints?: PeerDescriptor[];
|
|
41
41
|
websocketHost?: string;
|
|
42
42
|
websocketPortRange?: PortRange;
|
|
43
|
-
|
|
43
|
+
peerId?: string;
|
|
44
44
|
nodeName?: string;
|
|
45
45
|
rpcRequestTimeout?: number;
|
|
46
46
|
iceServers?: IceServer[];
|
|
@@ -66,7 +66,7 @@ export declare class DhtNodeConfig {
|
|
|
66
66
|
storeMaxTtl: number;
|
|
67
67
|
storeNumberOfCopies: number;
|
|
68
68
|
metricsContext: MetricsContext;
|
|
69
|
-
|
|
69
|
+
peerId: string;
|
|
70
70
|
transportLayer?: ITransport;
|
|
71
71
|
peerDescriptor?: PeerDescriptor;
|
|
72
72
|
entryPoints?: PeerDescriptor[];
|
|
@@ -85,7 +85,7 @@ export declare class DhtNodeConfig {
|
|
|
85
85
|
constructor(conf: Partial<DhtNodeOptions>);
|
|
86
86
|
}
|
|
87
87
|
export type Events = TransportEvents & DhtNodeEvents;
|
|
88
|
-
export declare const createPeerDescriptor: (msg?: ConnectivityResponse,
|
|
88
|
+
export declare const createPeerDescriptor: (msg?: ConnectivityResponse, peerId?: string, nodeName?: string) => PeerDescriptor;
|
|
89
89
|
export declare class DhtNode extends EventEmitter<Events> implements ITransport {
|
|
90
90
|
private readonly config;
|
|
91
91
|
private bucket?;
|
|
@@ -147,7 +147,6 @@ export declare class DhtNode extends EventEmitter<Events> implements ITransport
|
|
|
147
147
|
getNumberOfLocalLockedConnections(): number;
|
|
148
148
|
getNumberOfRemoteLockedConnections(): number;
|
|
149
149
|
getNumberOfWeakLockedConnections(): number;
|
|
150
|
-
getNodeName(): string;
|
|
151
150
|
isJoinOngoing(): boolean;
|
|
152
151
|
hasJoined(): boolean;
|
|
153
152
|
getKnownEntryPoints(): PeerDescriptor[];
|