@streamr/dht 101.1.0 → 101.1.1-beta.0
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/package.json +8 -8
- package/dist/src/connection/ConnectionLockRpcLocal.d.ts +1 -1
- package/dist/src/connection/ConnectionLockRpcLocal.js +2 -2
- package/dist/src/connection/ConnectionLockRpcLocal.js.map +1 -1
- package/dist/src/connection/ConnectionManager.js +2 -5
- package/dist/src/connection/ConnectionManager.js.map +1 -1
- package/dist/src/dht/contact/RpcRemote.js +1 -1
- package/dist/src/dht/recursive-operation/RecursiveOperationManager.js +2 -2
- package/dist/src/dht/recursive-operation/RecursiveOperationManager.js.map +1 -1
- package/dist/src/dht/recursive-operation/RecursiveOperationSession.d.ts +1 -0
- package/dist/src/dht/recursive-operation/RecursiveOperationSession.js +3 -2
- package/dist/src/dht/recursive-operation/RecursiveOperationSession.js.map +1 -1
- package/dist/src/dht/routing/RouterRpcRemote.d.ts +1 -0
- package/dist/src/dht/routing/RouterRpcRemote.js +3 -1
- package/dist/src/dht/routing/RouterRpcRemote.js.map +1 -1
- package/dist/src/dht/routing/RoutingSession.js +2 -3
- package/dist/src/dht/routing/RoutingSession.js.map +1 -1
- package/package.json +8 -8
- package/src/connection/ConnectionLockRpcLocal.ts +3 -3
- package/src/connection/ConnectionManager.ts +3 -7
- package/src/dht/contact/RpcRemote.ts +1 -1
- package/src/dht/recursive-operation/RecursiveOperationManager.ts +7 -3
- package/src/dht/recursive-operation/RecursiveOperationSession.ts +3 -1
- package/src/dht/routing/RouterRpcRemote.ts +3 -0
- package/src/dht/routing/RoutingSession.ts +3 -4
- package/test/integration/ConnectionManager.test.ts +53 -0
- package/test/integration/ScaleDownDht.test.ts +0 -71
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@streamr/dht",
|
|
3
|
-
"version": "101.1.0",
|
|
3
|
+
"version": "101.1.1-beta.0",
|
|
4
4
|
"description": "Streamr Network DHT",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -29,11 +29,11 @@
|
|
|
29
29
|
"@js-sdsl/ordered-map": "^4.4.2",
|
|
30
30
|
"@protobuf-ts/runtime": "^2.8.2",
|
|
31
31
|
"@protobuf-ts/runtime-rpc": "^2.8.2",
|
|
32
|
-
"@streamr/autocertifier-client": "101.1.0",
|
|
33
|
-
"@streamr/cdn-location": "101.1.0",
|
|
34
|
-
"@streamr/geoip-location": "101.1.0",
|
|
35
|
-
"@streamr/proto-rpc": "101.1.0",
|
|
36
|
-
"@streamr/utils": "101.1.0",
|
|
32
|
+
"@streamr/autocertifier-client": "101.1.1-beta.0",
|
|
33
|
+
"@streamr/cdn-location": "101.1.1-beta.0",
|
|
34
|
+
"@streamr/geoip-location": "101.1.1-beta.0",
|
|
35
|
+
"@streamr/proto-rpc": "101.1.1-beta.0",
|
|
36
|
+
"@streamr/utils": "101.1.1-beta.0",
|
|
37
37
|
"eventemitter3": "^5.0.0",
|
|
38
38
|
"heap": "^0.2.6",
|
|
39
39
|
"ipaddr.js": "^2.0.1",
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
},
|
|
49
49
|
"devDependencies": {
|
|
50
50
|
"@streamr/browser-test-runner": "^0.0.1",
|
|
51
|
-
"@streamr/test-utils": "101.1.0",
|
|
51
|
+
"@streamr/test-utils": "101.1.1-beta.0",
|
|
52
52
|
"@types/heap": "^0.2.34",
|
|
53
53
|
"@types/k-bucket": "^5.0.1",
|
|
54
54
|
"@types/lodash": "^4.17.7",
|
|
@@ -57,7 +57,7 @@
|
|
|
57
57
|
"@types/ws": "^8.5.12",
|
|
58
58
|
"jest-leak-detector": "^27.3.1",
|
|
59
59
|
"jest-matcher-utils": "^29.5.0",
|
|
60
|
-
"ts-essentials": "^10.0.
|
|
60
|
+
"ts-essentials": "^10.0.2"
|
|
61
61
|
},
|
|
62
62
|
"optionalDependencies": {
|
|
63
63
|
"bufferutil": "^4.0.8",
|
|
@@ -7,7 +7,7 @@ import { DhtAddress } from '../identifiers';
|
|
|
7
7
|
interface ConnectionLockRpcLocalOptions {
|
|
8
8
|
addRemoteLocked: (id: DhtAddress, lockId: LockID) => void;
|
|
9
9
|
removeRemoteLocked: (id: DhtAddress, lockId: LockID) => void;
|
|
10
|
-
closeConnection: (peerDescriptor: PeerDescriptor, gracefulLeave: boolean, reason?: string) => void
|
|
10
|
+
closeConnection: (peerDescriptor: PeerDescriptor, gracefulLeave: boolean, reason?: string) => Promise<void>;
|
|
11
11
|
getLocalPeerDescriptor: () => PeerDescriptor;
|
|
12
12
|
}
|
|
13
13
|
export declare class ConnectionLockRpcLocal implements IConnectionLockRpc {
|
|
@@ -36,10 +36,10 @@ class ConnectionLockRpcLocal {
|
|
|
36
36
|
const senderPeerDescriptor = context.incomingSourceDescriptor;
|
|
37
37
|
logger.trace((0, ConnectionManager_1.getNodeIdOrUnknownFromPeerDescriptor)(senderPeerDescriptor) + ' received gracefulDisconnect notice');
|
|
38
38
|
if (disconnectNotice.disconnectMode === DhtRpc_1.DisconnectMode.LEAVING) {
|
|
39
|
-
this.options.closeConnection(senderPeerDescriptor, true, 'graceful leave notified');
|
|
39
|
+
await this.options.closeConnection(senderPeerDescriptor, true, 'graceful leave notified');
|
|
40
40
|
}
|
|
41
41
|
else {
|
|
42
|
-
this.options.closeConnection(senderPeerDescriptor, false, 'graceful disconnect notified');
|
|
42
|
+
await this.options.closeConnection(senderPeerDescriptor, false, 'graceful disconnect notified');
|
|
43
43
|
}
|
|
44
44
|
return {};
|
|
45
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConnectionLockRpcLocal.js","sourceRoot":"","sources":["../../../src/connection/ConnectionLockRpcLocal.ts"],"names":[],"mappings":";;;AACA,0CAAuC;AAEvC,gEAO4C;AAG5C,2DAA0E;AAE1E,gDAAiG;AASjG,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,sBAAsB;IAEd,OAAO,CAA+B;IAEvD,YAAY,OAAsC;QAC9C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IAC1B,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,WAAwB,EAAE,OAA0B;QAClE,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,IAAI,IAAA,qCAAuB,EAAC,oBAAoB,EAAE,IAAI,CAAC,OAAO,CAAC,sBAAsB,EAAE,CAAC,EAAE,CAAC;YACvF,MAAM,QAAQ,GAAiB;gBAC3B,QAAQ,EAAE,KAAK;aAClB,CAAA;YACD,OAAO,QAAQ,CAAA;QACnB,CAAC;QACD,MAAM,YAAY,GAAG,IAAA,yCAA2B,EAAC,oBAAoB,CAAC,CAAA;QACtE,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,YAAY,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;QAC9D,MAAM,QAAQ,GAAiB;YAC3B,QAAQ,EAAE,IAAI;SACjB,CAAA;QACD,OAAO,QAAQ,CAAA;IACnB,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,aAA4B,EAAE,OAA0B;QACxE,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,MAAM,MAAM,GAAG,IAAA,yCAA2B,EAAC,oBAAoB,CAAC,CAAA;QAChE,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;QAC7D,OAAO,EAAE,CAAA;IACb,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,gBAAkC,EAAE,OAA0B;QACnF,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,MAAM,CAAC,KAAK,CAAC,IAAA,wDAAoC,EAAC,oBAAoB,CAAC,GAAG,qCAAqC,CAAC,CAAA;QAEhH,IAAI,gBAAgB,CAAC,cAAc,KAAK,uBAAc,CAAC,OAAO,EAAE,CAAC;YAC7D,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,oBAAoB,EAAE,IAAI,EAAE,yBAAyB,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"ConnectionLockRpcLocal.js","sourceRoot":"","sources":["../../../src/connection/ConnectionLockRpcLocal.ts"],"names":[],"mappings":";;;AACA,0CAAuC;AAEvC,gEAO4C;AAG5C,2DAA0E;AAE1E,gDAAiG;AASjG,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,sBAAsB;IAEd,OAAO,CAA+B;IAEvD,YAAY,OAAsC;QAC9C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IAC1B,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,WAAwB,EAAE,OAA0B;QAClE,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,IAAI,IAAA,qCAAuB,EAAC,oBAAoB,EAAE,IAAI,CAAC,OAAO,CAAC,sBAAsB,EAAE,CAAC,EAAE,CAAC;YACvF,MAAM,QAAQ,GAAiB;gBAC3B,QAAQ,EAAE,KAAK;aAClB,CAAA;YACD,OAAO,QAAQ,CAAA;QACnB,CAAC;QACD,MAAM,YAAY,GAAG,IAAA,yCAA2B,EAAC,oBAAoB,CAAC,CAAA;QACtE,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,YAAY,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;QAC9D,MAAM,QAAQ,GAAiB;YAC3B,QAAQ,EAAE,IAAI;SACjB,CAAA;QACD,OAAO,QAAQ,CAAA;IACnB,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,aAA4B,EAAE,OAA0B;QACxE,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,MAAM,MAAM,GAAG,IAAA,yCAA2B,EAAC,oBAAoB,CAAC,CAAA;QAChE,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;QAC7D,OAAO,EAAE,CAAA;IACb,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,gBAAkC,EAAE,OAA0B;QACnF,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,MAAM,CAAC,KAAK,CAAC,IAAA,wDAAoC,EAAC,oBAAoB,CAAC,GAAG,qCAAqC,CAAC,CAAA;QAEhH,IAAI,gBAAgB,CAAC,cAAc,KAAK,uBAAc,CAAC,OAAO,EAAE,CAAC;YAC7D,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,oBAAoB,EAAE,IAAI,EAAE,yBAAyB,CAAC,CAAA;QAC7F,CAAC;aAAM,CAAC;YACJ,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,oBAAoB,EAAE,KAAK,EAAE,8BAA8B,CAAC,CAAA;QACnG,CAAC;QACD,OAAO,EAAE,CAAA;IACb,CAAC;CACJ;AA1CD,wDA0CC"}
|
|
@@ -108,10 +108,7 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
|
|
|
108
108
|
const lockRpcLocal = new ConnectionLockRpcLocal_1.ConnectionLockRpcLocal({
|
|
109
109
|
addRemoteLocked: (id, lockId) => this.locks.addRemoteLocked(id, lockId),
|
|
110
110
|
removeRemoteLocked: (id, lockId) => this.locks.removeRemoteLocked(id, lockId),
|
|
111
|
-
closeConnection: (peerDescriptor, gracefulLeave, reason) =>
|
|
112
|
-
// TODO should we have some handling for this floating promise?
|
|
113
|
-
this.closeConnection(peerDescriptor, gracefulLeave, reason);
|
|
114
|
-
},
|
|
111
|
+
closeConnection: (peerDescriptor, gracefulLeave, reason) => this.closeConnection(peerDescriptor, gracefulLeave, reason),
|
|
115
112
|
getLocalPeerDescriptor: () => this.getLocalPeerDescriptor()
|
|
116
113
|
});
|
|
117
114
|
this.rpcCommunicator.registerRpcMethod(DhtRpc_1.LockRequest, DhtRpc_1.LockResponse, 'lockRequest', (req, context) => lockRpcLocal.lockRequest(req, context));
|
|
@@ -170,7 +167,6 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
|
|
|
170
167
|
if (this.disconnectorIntervalRef) {
|
|
171
168
|
clearInterval(this.disconnectorIntervalRef);
|
|
172
169
|
}
|
|
173
|
-
await this.connectorFacade.stop();
|
|
174
170
|
await Promise.all(Array.from(this.endpoints.values()).map(async (endpoint) => {
|
|
175
171
|
if (endpoint.connected) {
|
|
176
172
|
try {
|
|
@@ -197,6 +193,7 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
|
|
|
197
193
|
}
|
|
198
194
|
}
|
|
199
195
|
}));
|
|
196
|
+
await this.connectorFacade.stop();
|
|
200
197
|
this.state = ConnectionManagerState.STOPPED;
|
|
201
198
|
this.rpcCommunicator.stop();
|
|
202
199
|
this.duplicateMessageDetector.clear();
|
|
@@ -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":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAuI;AACvI,iDAA4C;AAC5C,wEAAoE;AACpE,wEAAoE;AACpE,uDAAwC;AACxC,gEAQ4C;AAC5C,8EAAoF;AACpF,wDAAwG;AACxG,gFAA4E;AAC5E,iEAAqE;AAErE,2DAA0F;AAC1F,uEAAmE;AAEnE,qEAAiE;AACjE,gDAAiG;AACjG,kDAAgD;AAEhD,iDAA6C;AAU7C,IAAY,OAGX;AAHD,WAAY,OAAO;IACf,0CAA+B,CAAA;IAC/B,8BAAmB,CAAA;AACvB,CAAC,EAHW,OAAO,uBAAP,OAAO,QAGlB;AAWD,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;AAwCD,MAAM,mBAAmB,GAAG,2BAA2B,CAAA;AAEvD,6FAA6F;AAC7F,uFAAuF;AACvF,+CAA+C;AAC/C,8FAA8F;AAC9F,wEAAwE;AACxE,mEAAmE;AACnE,mFAAmF;AACnF,qCAAqC;AACrC,2DAA2D;AACpD,MAAM,oCAAoC,GAAG,CAAC,cAA0C,EAAU,EAAE;IACvG,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;QAC/B,OAAO,IAAA,yCAA2B,EAAC,cAAc,CAAC,CAAA;IACtD,CAAC;SAAM,CAAC;QACJ,OAAO,SAAS,CAAA;IACpB,CAAC;AACL,CAAC,CAAA;AANY,QAAA,oCAAoC,wCAMhD;AAED,MAAa,iBAAkB,SAAQ,4BAA6B;IAExD,OAAO,CAA0B;IACxB,cAAc,CAAgB;IAC/C,6CAA6C;IAC5B,wBAAwB,GAAsB,IAAI,qCAAiB,CAAC,KAAK,CAAC,CAAA;IAC1E,OAAO,CAA0B;IAC1C,KAAK,GAAG,IAAI,2CAAoB,EAAE,CAAA;IAClC,SAAS,GAA8B,IAAI,GAAG,EAAE,CAAA;IACvC,eAAe,CAAiB;IACzC,eAAe,CAAyB;IACxC,uBAAuB,CAAiB;IACxC,KAAK,GAAG,sBAAsB,CAAC,IAAI,CAAA;IAE3C,YAAY,OAAiC;QACzC,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACpC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAChC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACtD,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,IAAI,IAAI,sBAAc,EAAE,CAAA;QACzE,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,CAAC,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAA;QAC3D,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAChC,IAAI,CAAC,eAAe,GAAG,IAAI,+CAAsB,CAAC,mBAAmB,EAAE,IAAI,CAAC,IAAI,EAAE;YAC9E,iBAAiB,EAAE,KAAK,CAAE,6CAA6C;SAC1E,CAAC,CAAA;QACF,MAAM,YAAY,GAAG,IAAI,+CAAsB,CAAC;YAC5C,eAAe,EAAE,CAAC,EAAc,EAAE,MAAc,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE,EAAE,MAAM,CAAC;YAC3F,kBAAkB,EAAE,CAAC,EAAc,EAAE,MAAc,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE,EAAE,MAAM,CAAC;YACjG,eAAe,EAAE,CAAC,cAA8B,EAAE,aAAsB,EAAE,MAAe,EAAE,EAAE,CACzF,IAAI,CAAC,eAAe,CAAC,cAAc,EAAE,aAAa,EAAE,MAAM,CAAC;YAC/D,sBAAsB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,sBAAsB,EAAE;SAC9D,CAAC,CAAA;QACF,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,oBAAW,EAAE,qBAAY,EAAE,aAAa,EAC3E,CAAC,GAAgB,EAAE,OAA0B,EAAE,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;QAC7F,IAAI,CAAC,eAAe,CAAC,uBAAuB,CAAC,sBAAa,EAAE,eAAe,EACvE,CAAC,GAAkB,EAAE,OAA0B,EAAE,EAAE,CAAC,YAAY,CAAC,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;QACjG,IAAI,CAAC,eAAe,CAAC,uBAAuB,CAAC,yBAAgB,EAAE,oBAAoB,EAC/E,CAAC,GAAqB,EAAE,OAA0B,EAAE,EAAE,CAAC,YAAY,CAAC,kBAAkB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;IAC7G,CAAC;IAED;;;OAGG;IACI,yBAAyB,CAAC,cAAsB,EAAE,WAAmB;QACxE,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,IAAI,cAAc,EAAE,CAAC;YACxC,OAAM;QACV,CAAC;QACD,MAAM,uBAAuB,GAAG,IAAI,qCAAiB,CAAoB;YACrE,WAAW,EAAE,IAAA,yCAA2B,EAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC;YACvE,OAAO,EAAE,MAAM,EAAG,6CAA6C;YAC/D,yBAAyB,EAAE,KAAK;SACnC,CAAC,CAAA;QACF,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YAChC,IAAI,QAAQ,CAAC,SAAS,EAAE,CAAC;gBACrB,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAA;gBACtC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,UAAU,CAAC,oBAAoB,EAAE,GAAG,WAAW,EAAE,CAAC;oBAC/G,MAAM,CAAC,KAAK,CAAC,qCAAqC,GAAG,IAAA,4CAAoC,EAAC,UAAU,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAA;oBAC1H,uBAAuB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAA;gBAClD,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAA;QACF,MAAM,eAAe,GAAG,uBAAuB,CAAC,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,GAAG,cAAc,CAAC,CAAA;QACzG,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE,CAAC;YAC3C,MAAM,cAAc,GAAG,cAAc,CAAC,iBAAiB,EAAG,CAAA;YAC1D,MAAM,CAAC,KAAK,CAAC,oBAAoB,GAAG,IAAA,yCAA2B,EAAC,cAAc,CAAC,CAAC,CAAA;YAChF,IAAI,CAAC,yBAAyB,CAAC,cAAc,EAAE,uBAAc,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC,CAAA;QAC5F,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,KAAK;QACd,IAAI,IAAI,CAAC,KAAK,KAAK,sBAAsB,CAAC,OAAO,IAAI,IAAI,CAAC,KAAK,KAAK,sBAAsB,CAAC,OAAO,EAAE,CAAC;YACjG,MAAM,IAAI,GAAG,CAAC,aAAa,CAAC,wBAAwB,IAAI,CAAC,KAAK,SAAS,CAAC,CAAA;QAC5E,CAAC;QACD,IAAI,CAAC,KAAK,GAAG,sBAAsB,CAAC,OAAO,CAAA;QAC3C,MAAM,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAA;QAC7C,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,CAC5B,CAAC,UAA6B,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,EACnE,CAAC,MAAkB,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAClD,IAAI,CACP,CAAA;QACD,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,OAAO,CAAC,cAAc,IAAI,EAAE,EAAE,eAAe,CAAC,CAAA;QACtF,CAAC,EAAE,IAAI,CAAC,CAAA,CAAE,6CAA6C;IAC3D,CAAC;IAEM,KAAK,CAAC,IAAI;QACb,IAAI,IAAI,CAAC,KAAK,KAAK,sBAAsB,CAAC,OAAO,IAAI,IAAI,CAAC,KAAK,KAAK,sBAAsB,CAAC,QAAQ,EAAE,CAAC;YAClG,OAAM;QACV,CAAC;QACD,IAAI,CAAC,KAAK,GAAG,sBAAsB,CAAC,QAAQ,CAAA;QAC5C,MAAM,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAA;QAC1C,IAAI,IAAI,CAAC,uBAAuB,EAAE,CAAC;YAC/B,aAAa,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAA;QAC/C,CAAC;QACD,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;YACzE,IAAI,QAAQ,CAAC,SAAS,EAAE,CAAC;gBACrB,IAAI,CAAC;oBACD,MAAM,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,UAAU,CAAC,iBAAiB,EAAG,EAAE,uBAAc,CAAC,OAAO,CAAC,CAAA;gBAC1G,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACT,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;gBACnB,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAA;gBACtC,MAAM,CAAC,KAAK,CAAC,sDAAsD,CAAC,CAAA;gBACpE,6CAA6C;gBAC7C,MAAM,aAAa,GAAG,IAAA,qBAAa,EAAC,UAAiB,EAAE,cAAc,EAAE,IAAI,CAAC,CAAA;gBAC5E,+DAA+D;gBAC/D,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;gBACtB,IAAI,CAAC;oBACD,MAAM,aAAa,CAAA;oBACnB,MAAM,CAAC,KAAK,CAAC,6EAA6E,CAAC,CAAA;gBAC/F,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACT,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,CAAA;oBACxB,MAAM,CAAC,KAAK,CAAC,oDAAoD,GAAG,CAAC,CAAC,CAAA;gBAC1E,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC,CAAA;QACH,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,CAAA;QACjC,IAAI,CAAC,KAAK,GAAG,sBAAsB,CAAC,OAAO,CAAA;QAC3C,IAAI,CAAC,eAAgB,CAAC,IAAI,EAAE,CAAA;QAC5B,IAAI,CAAC,wBAAwB,CAAC,KAAK,EAAE,CAAA;QACrC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAA;QAClB,IAAI,CAAC,kBAAkB,EAAE,CAAA;IAC7B,CAAC;IAEM,6BAA6B;QAChC,OAAO,IAAI,CAAC,KAAK,CAAC,6BAA6B,EAAE,CAAA;IACrD,CAAC;IAEM,8BAA8B;QACjC,OAAO,IAAI,CAAC,KAAK,CAAC,8BAA8B,EAAE,CAAA;IACtD,CAAC;IAEM,4BAA4B;QAC/B,OAAO,IAAI,CAAC,KAAK,CAAC,4BAA4B,EAAE,CAAA;IACpD,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,OAAgB,EAAE,OAAoB,iCAAoB;QACxE,IAAI,CAAC,IAAI,CAAC,KAAK,KAAK,sBAAsB,CAAC,OAAO,IAAI,IAAI,CAAC,KAAK,KAAK,sBAAsB,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YAC3H,OAAM;QACV,CAAC;QACD,MAAM,cAAc,GAAG,OAAO,CAAC,gBAAiB,CAAA;QAChD,IAAI,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,EAAE,CAAC;YAC1C,MAAM,IAAI,GAAG,CAAC,mBAAmB,CAAC,qBAAqB,CAAC,CAAA;QAC5D,CAAC;QACD,MAAM,MAAM,GAAG,IAAA,yCAA2B,EAAC,cAAc,CAAC,CAAA;QAC1D,MAAM,CAAC,KAAK,CAAC,uBAAuB,MAAM,EAAE,CAAC,CAAA;QAC7C,OAAO,GAAG;YACN,GAAG,OAAO;YACV,gBAAgB,EAAE,IAAI,CAAC,sBAAsB,EAAE;SAClD,CAAA;QACD,IAAI,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,UAAU,CAAA;QACvD,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAC9B,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAA;YAClE,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAA;QACpC,CAAC;aAAM,IAAI,CAAC,UAAU,EAAE,CAAC;YACrB,MAAM,IAAI,GAAG,CAAC,UAAU,CAAC,gDAAgD,CAAC,CAAA;QAC9E,CAAC;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;QAE5C,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC,SAAS,EAAE,CAAC;YACxC,OAAQ,UAAgC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACzD,CAAC;aAAM,CAAC;YACJ,OAAQ,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAyB,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAClF,CAAC;IACL,CAAC;IAEO,kBAAkB,CAAC,cAA8B;QACrD,OAAO,IAAA,qCAAuB,EAAC,cAAc,EAAE,IAAI,CAAC,sBAAsB,EAAE,CAAC,IAAI,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAA;IAC9H,CAAC;IAEO,oBAAoB,CAAC,cAA8B;QACvD,MAAM,mBAAmB,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAA;QACzD,IAAI,CAAC,cAAc,CAAC,SAAS,KAAK,SAAS,CAAC,IAAI,CAAC,mBAAmB,CAAC,SAAS,KAAK,SAAS,CAAC,EAAE,CAAC;YAC5F,OAAO,CAAC,CAAC,cAAc,CAAC,SAAS,CAAC,IAAI,KAAK,mBAAmB,CAAC,SAAS,CAAC,IAAI,CAAC;mBACvE,CAAC,cAAc,CAAC,SAAS,CAAC,IAAI,KAAK,mBAAmB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAA;QAClF,CAAC;aAAM,CAAC;YACJ,OAAO,KAAK,CAAA;QAChB,CAAC;IACL,CAAC;IAEM,sBAAsB;QACzB,OAAO,IAAI,CAAC,eAAe,CAAC,sBAAsB,EAAG,CAAA;IACzD,CAAC;IAEM,aAAa,CAAC,MAAkB;QACnC,8FAA8F;QAC9F,OAAO,IAAI,CAAC,cAAc,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,yCAA2B,EAAC,CAAC,CAAC,IAAI,MAAM,CAAC,CAAA;IACtF,CAAC;IAEM,kBAAkB;QACrB,yFAAyF;QACzF,OAAO,IAAI,CAAC,cAAc,EAAE,CAAC,MAAM,CAAA;IACvC,CAAC;IAEM,wBAAwB,CAAC,MAAkB;QAC9C,OAAO,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;IAC3C,CAAC;IAEM,yBAAyB,CAAC,MAAkB;QAC/C,OAAO,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAA;IAC5C,CAAC;IAEO,aAAa,CAAC,OAAgB;QAClC,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,SAAS,CAAA;QAC1C,MAAM,CAAC,KAAK,CAAC,2BAA2B,GAAG,WAAW,CAAC,CAAA;QACvD,IAAI,WAAW,KAAK,YAAY,EAAE,CAAC;YAC/B,MAAM,CAAC,KAAK,CAAC,uCAAuC,GAAG,WAAW,CAAC,CAAA;YACnE,OAAM;QACV,CAAC;QACD,IAAI,IAAI,CAAC,wBAAwB,CAAC,qBAAqB,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YACzE,MAAM,CAAC,KAAK,CAAC,mCAAmC,GAAG,IAAA,yCAA2B,EAAC,OAAO,CAAC,gBAAiB,CAAC;kBACnG,GAAG,GAAG,OAAO,CAAC,SAAS,GAAG,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;YACxD,OAAM;QACV,CAAC;QACD,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;QACpD,IAAI,OAAO,CAAC,SAAS,KAAK,mBAAmB,EAAE,CAAC;YAC5C,IAAI,CAAC,eAAe,EAAE,qBAAqB,CAAC,OAAO,CAAC,CAAA;QACxD,CAAC;aAAM,CAAC;YACJ,MAAM,CAAC,KAAK,CAAC,iBAAiB,GAAG,IAAA,yCAA2B,EAAC,OAAO,CAAC,gBAAiB,CAAC;kBACjF,GAAG,GAAG,OAAO,CAAC,SAAS,GAAG,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;YACxD,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;QACjC,CAAC;IACL,CAAC;IAEO,MAAM,CAAC,IAAgB,EAAE,cAA8B;QAC3D,IAAI,IAAI,CAAC,KAAK,KAAK,sBAAsB,CAAC,OAAO,EAAE,CAAC;YAChD,OAAM;QACV,CAAC;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,CAAC;YACD,OAAO,GAAG,gBAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;QACtC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,MAAM,CAAC,KAAK,CAAC,8CAA8C,CAAC,EAAE,CAAC,CAAA;YAC/D,OAAM;QACV,CAAC;QACD,OAAO,CAAC,gBAAgB,GAAG,cAAc,CAAA;QACzC,IAAI,CAAC;YACD,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;QAC/B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,EAAE,CAAC,CAAA;QACvD,CAAC;IACL,CAAC;IAEO,WAAW,CAAC,cAA8B,EAAE,UAAuB;QACvE,MAAM,iBAAiB,GAAG,IAAI,qCAAiB,CAAC,cAAc,EAAE,UAAU,CAAC,CAAA;QAC3E,iBAAiB,CAAC,EAAE,CAAC,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAChD,iBAAiB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,aAAsB,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC,CAAA;QAEtH,MAAM,MAAM,GAAG,IAAA,yCAA2B,EAAC,cAAc,CAAC,CAAA;QAC1D,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAwB,CAAA;QAClE,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAA;QACpC,MAAM,iBAAiB,GAAG,QAAQ,CAAC,UAAU,CAAA;QAC7C,MAAM,MAAM,GAAG,YAAY,CAAC,SAAS,EAAE,CAAA;QACvC,OAAO,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvB,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAA;YAC/B,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAG,CAAC,CAAA;QAC3C,CAAC;QACD,YAAY,CAAC,OAAO,EAAE,CAAA;QACtB,iBAAiB,CAAC,OAAO,EAAE,CAAA;QAC3B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,EAAE;YACvB,SAAS,EAAE,IAAI;YACf,UAAU,EAAE,iBAAiB;SAChC,CAAC,CAAA;QACF,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAA;QACtC,IAAI,CAAC,uBAAuB,EAAE,CAAA;IAClC,CAAC;IAEO,cAAc,CAAC,cAA8B,EAAE,aAAsB;QACzE,MAAM,MAAM,GAAG,IAAA,yCAA2B,EAAC,cAAc,CAAC,CAAA;QAC1D,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,mCAAmC,GAAG,aAAa,CAAC,CAAA;QAC1E,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QAC3C,IAAI,QAAQ,EAAE,CAAC;YACX,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;YAChC,IAAI,QAAQ,CAAC,SAAS,KAAK,KAAK,EAAE,CAAC;gBAC/B,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,CAAA;YAC5B,CAAC;YACD,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;YAC7B,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,yDAAyD,GAAG,aAAa,CAAC,CAAA;YAChG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,cAAc,EAAE,aAAa,CAAC,CAAA;YACxD,IAAI,CAAC,uBAAuB,EAAE,CAAA;QAClC,CAAC;IACL,CAAC;IAEO,eAAe,CAAC,UAA6B;QACjD,IAAI,IAAI,CAAC,KAAK,KAAK,sBAAsB,CAAC,OAAO,EAAE,CAAC;YAChD,OAAO,KAAK,CAAA;QAChB,CAAC;QACD,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAA;QACjC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,EAAE,CAAC;YACxC,OAAO,KAAK,CAAA;QAChB,CAAC;QACD,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,cAA8B,EAAE,UAAuB,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC,CAAA;QACvI,UAAU,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,aAAsB,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,iBAAiB,EAAE,EAAE,aAAa,CAAC,CAAC,CAAA;QAC/H,OAAO,IAAI,CAAA;IACf,CAAC;IAEO,mBAAmB,CAAC,aAAgC;QACxD,MAAM,MAAM,GAAG,IAAA,yCAA2B,EAAC,aAAa,CAAC,iBAAiB,EAAE,CAAC,CAAA;QAC7E,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,wBAAwB,CAAC,CAAA;QAC/C,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YAC7B,IAAI,IAAA,qBAAU,EAAC,IAAA,yCAA2B,EAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC,EAAE,MAAM,CAAC,KAAK,QAAQ,EAAE,CAAC;gBAC9F,IAAI,MAAgC,CAAA;gBACpC,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAE,CAAA;gBAC5C,iEAAiE;gBACjE,4FAA4F;gBAC5F,qFAAqF;gBACrF,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC,SAAS,EAAE,CAAC;oBACxC,MAAM,CAAC,KAAK,CAAC,gCAAgC,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;oBAC1D,MAAM,GAAG,IAAI,2BAAY,EAAE,CAAA;gBAC/B,CAAC;qBAAM,CAAC;oBACJ,MAAM,GAAI,QAA+B,CAAC,MAAM,CAAA;gBACpD,CAAC;gBACD,MAAM,aAAa,GAAG,QAAQ,CAAC,UAAU,CAAA;gBACzC,MAAM,CAAC,KAAK,CAAC,YAAY,GAAG,MAAM,CAAC,CAAA;gBAEnC,aAAa,CAAC,kBAAkB,EAAE,CAAA;gBAClC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;gBAC3F,OAAO,IAAI,CAAA;YACf,CAAC;iBAAM,CAAC;gBACJ,OAAO,KAAK,CAAA;YAChB,CAAC;QACL,CAAC;QAED,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,8CAA8C,CAAC,CAAA;QACrE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,EAAE;YACvB,SAAS,EAAE,KAAK;YAChB,MAAM,EAAE,IAAI,2BAAY,EAAE;YAC1B,UAAU,EAAE,aAAa;SAC5B,CAAC,CAAA;QAEF,OAAO,IAAI,CAAA;IACf,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,cAA8B,EAAE,aAAsB,EAAE,MAAe;QACjG,MAAM,MAAM,GAAG,IAAA,yCAA2B,EAAC,cAAc,CAAC,CAAA;QAC1D,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,GAAG,GAAG,oBAAoB,GAAG,MAAM,CAAC,CAAA;QAC1D,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;QAChC,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YAC7B,MAAM,iBAAiB,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC,UAAU,CAAA;YAChE,MAAM,iBAAiB,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;QAChD,CAAC;aAAM,CAAC;YACJ,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,GAAG,GAAG,sDAAsD,CAAC,CAAA;YACnF,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,cAAc,EAAE,KAAK,CAAC,CAAA;QACpD,CAAC;IACL,CAAC;IAEM,cAAc,CAAC,gBAAgC,EAAE,MAAc;QAClE,IAAI,IAAI,CAAC,KAAK,KAAK,sBAAsB,CAAC,OAAO,IAAI,IAAA,qCAAuB,EAAC,gBAAgB,EAAE,IAAI,CAAC,sBAAsB,EAAE,CAAC,EAAE,CAAC;YAC5H,OAAM;QACV,CAAC;QACD,MAAM,MAAM,GAAG,IAAA,yCAA2B,EAAC,gBAAgB,CAAC,CAAA;QAC5D,MAAM,SAAS,GAAG,IAAI,iDAAuB,CACzC,IAAI,CAAC,sBAAsB,EAAE,EAC7B,gBAAgB,EAChB,IAAI,CAAC,eAAgB,EACrB,uCAAuB,CAC1B,CAAA;QACD,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QACzC,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC;aACxB,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,MAAc;QACpE,IAAI,IAAI,CAAC,KAAK,KAAK,sBAAsB,CAAC,OAAO,IAAI,IAAA,qCAAuB,EAAC,gBAAgB,EAAE,IAAI,CAAC,sBAAsB,EAAE,CAAC,EAAE,CAAC;YAC5H,OAAM;QACV,CAAC;QACD,MAAM,MAAM,GAAG,IAAA,yCAA2B,EAAC,gBAAgB,CAAC,CAAA;QAC5D,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QAC5C,MAAM,SAAS,GAAG,IAAI,iDAAuB,CACzC,IAAI,CAAC,sBAAsB,EAAE,EAC7B,gBAAgB,EAChB,IAAI,CAAC,eAAgB,EACrB,uCAAuB,CAC1B,CAAA;QACD,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YAC7B,SAAS,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;QACnC,CAAC;IACL,CAAC;IAEM,kBAAkB,CAAC,MAAkB,EAAE,MAAc;QACxD,IAAI,IAAI,CAAC,KAAK,KAAK,sBAAsB,CAAC,OAAO,IAAI,CAAC,MAAM,KAAK,IAAA,yCAA2B,EAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAC,EAAE,CAAC;YAC3H,OAAM;QACV,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC5C,CAAC;IAEM,oBAAoB,CAAC,MAAkB,EAAE,MAAc;QAC1D,IAAI,IAAI,CAAC,KAAK,KAAK,sBAAsB,CAAC,OAAO,IAAI,CAAC,MAAM,KAAK,IAAA,yCAA2B,EAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAC,EAAE,CAAC;YAC3H,OAAM;QACV,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC/C,CAAC;IAEO,KAAK,CAAC,yBAAyB,CAAC,gBAAgC,EAAE,cAA8B;QACpG,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAA,yCAA2B,EAAC,gBAAgB,CAAC,CAAC,CAAA;QAElF,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,MAAM,CAAC,KAAK,CAAC,kEAAkE,CAAC,CAAA;YAChF,OAAM;QACV,CAAC;QAED,IAAI,QAAQ,CAAC,SAAS,EAAE,CAAC;YACrB,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAA;YACtC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;gBACnD,6CAA6C;gBAC7C,mDAAmD;gBACnD,IAAA,qBAAa,EAA0B,UAAU,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;oBAC/E,MAAM,CAAC,KAAK,CAAC,4DAA4D,CAAC,CAAA;gBAC9E,CAAC,CAAC;qBACG,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;oBACT,MAAM,CAAC,KAAK,CAAC,yCAAyC,GAAG,CAAC,CAAC,CAAA;oBAC3D,+DAA+D;oBAC/D,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;gBAC1B,CAAC,CAAC;qBACD,OAAO,CAAC,GAAG,EAAE;oBACV,MAAM,CAAC,KAAK,CAAC,8CAA8C,CAAC,CAAA;oBAC5D,OAAO,EAAE,CAAA;gBACb,CAAC,CAAC,CAAA;YACV,CAAC,CAAC,CAAA;YAEF,MAAM,OAAO,CAAC,GAAG,CAAC;gBACd,OAAO;gBACP,IAAI,CAAC,2BAA2B,CAAC,gBAAgB,EAAE,cAAc,CAAC;aACrE,CAAC,CAAA;QACN,CAAC;aAAM,CAAC;YACJ,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACnC,CAAC;IAEL,CAAC;IAEO,KAAK,CAAC,2BAA2B,CAAC,gBAAgC,EAAE,cAA8B;QACtG,MAAM,MAAM,GAAG,IAAA,yCAA2B,EAAC,gBAAgB,CAAC,CAAA;QAC5D,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,8BAA8B,CAAC,CAAA;QACrD,MAAM,SAAS,GAAG,IAAI,iDAAuB,CACzC,IAAI,CAAC,sBAAsB,EAAE,EAC7B,gBAAgB,EAChB,IAAI,CAAC,eAAgB,EACrB,uCAAuB,CAC1B,CAAA;QACD,IAAI,CAAC;YACD,MAAM,SAAS,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAA;QACtD,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC;YACV,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,qCAAqC,GAAG,EAAE,CAAC,CAAA;QACrE,CAAC;IACL,CAAC;IAEM,cAAc;QACjB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;aACrC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC;YAC5B,iFAAiF;YACjF,gFAAgF;aAC/E,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC;aACxC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,iBAAiB,EAAG,CAAC,CAAA;IACpE,CAAC;IAEO,uBAAuB;QAC3B,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IACnE,CAAC;CACJ;AA9dD,8CA8dC"}
|
|
@@ -10,7 +10,7 @@ const WEBSOCKET_CLIENT_TIMEOUT = 5000;
|
|
|
10
10
|
// takes a little bit longer than WEBSOCKET_CLIENT
|
|
11
11
|
const WEBSOCKET_SERVER_TIMEOUT = 7500;
|
|
12
12
|
// WebRTC connections require lots of signalling to open and might take a longer time.
|
|
13
|
-
const WEBRTC_TIMEOUT =
|
|
13
|
+
const WEBRTC_TIMEOUT = 10000;
|
|
14
14
|
// default timeout for existing connections
|
|
15
15
|
exports.EXISTING_CONNECTION_TIMEOUT = 5000;
|
|
16
16
|
const getTimeout = (localPeerDescriptor, remotePeerDescriptor) => {
|
|
@@ -65,7 +65,7 @@ class RecursiveOperationManager {
|
|
|
65
65
|
try {
|
|
66
66
|
await (0, utils_1.runAndWaitForEvents3)([() => session.start(this.options.serviceId)], [[session, 'completed']],
|
|
67
67
|
// TODO use options option or named constant?
|
|
68
|
-
|
|
68
|
+
RecursiveOperationSession_1.RECURSIVE_OPERATION_TIMEOUT);
|
|
69
69
|
}
|
|
70
70
|
catch (err) {
|
|
71
71
|
logger.debug('start failed', { err });
|
|
@@ -98,7 +98,7 @@ class RecursiveOperationManager {
|
|
|
98
98
|
}
|
|
99
99
|
else {
|
|
100
100
|
// TODO use options option or named constant?
|
|
101
|
-
const remoteCommunicator = new ListeningRpcCommunicator_1.ListeningRpcCommunicator(serviceId, this.options.sessionTransport, { rpcRequestTimeout:
|
|
101
|
+
const remoteCommunicator = new ListeningRpcCommunicator_1.ListeningRpcCommunicator(serviceId, this.options.sessionTransport, { rpcRequestTimeout: RecursiveOperationSession_1.RECURSIVE_OPERATION_TIMEOUT });
|
|
102
102
|
const rpcRemote = new RecursiveOperationSessionRpcRemote_1.RecursiveOperationSessionRpcRemote(this.options.localPeerDescriptor, targetPeerDescriptor, remoteCommunicator, DhtRpc_client_1.RecursiveOperationSessionRpcClient,
|
|
103
103
|
// TODO use options option or named constant?
|
|
104
104
|
10000);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RecursiveOperationManager.js","sourceRoot":"","sources":["../../../../src/dht/recursive-operation/RecursiveOperationManager.ts"],"names":[],"mappings":";;;AAAA,mEAQ+C;AAE/C,8DAAuD;AACvD,0CAAqF;AAErF,6FAAyF;AACzF,
|
|
1
|
+
{"version":3,"file":"RecursiveOperationManager.js","sourceRoot":"","sources":["../../../../src/dht/recursive-operation/RecursiveOperationManager.ts"],"names":[],"mappings":";;;AAAA,mEAQ+C;AAE/C,8DAAuD;AACvD,0CAAqF;AAErF,6FAAyF;AACzF,2EAAqI;AAIrI,uFAAmF;AACnF,iFAAkG;AAClG,oEAAgE;AAChE,gEAA4D;AAC5D,8DAAiE;AAEjE,6EAAyE;AACzE,mDAAgJ;AAChJ,gDAA4C;AAiB5C,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,yBAAyB;IAE1B,eAAe,GAA2C,IAAI,GAAG,EAAE,CAAA;IACnE,OAAO,GAAG,KAAK,CAAA;IACN,OAAO,CAAkC;IAE1D,YAAY,OAAyC;QACjD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,uBAAuB,EAAE,CAAA;IAClC,CAAC;IAEO,uBAAuB;QAC3B,MAAM,QAAQ,GAAG,IAAI,uDAA0B,CAAC;YAC5C,cAAc,EAAE,CAAC,aAAkC,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC;YAC1F,UAAU,EAAE,CAAC,OAAuB,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC;YACzE,qBAAqB,EAAE,CAAC,SAAiB,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,qBAAqB,CAAC,SAAS,CAAC;YAClG,sBAAsB,EAAE,CAAC,SAAiB,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,sBAAsB,CAAC,SAAS,CAAC;SACvG,CAAC,CAAA;QACF,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,iBAAiB,CAC1C,4BAAmB,EACnB,wBAAe,EACf,cAAc,EACd,KAAK,EAAE,aAAkC,EAAE,EAAE;YACzC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;gBACf,OAAO,IAAA,sCAAqB,EAAC,aAAa,EAAE,0BAAiB,CAAC,OAAO,CAAC,CAAA;YAC1E,CAAC;iBAAM,CAAC;gBACJ,OAAO,QAAQ,CAAC,YAAY,CAAC,aAAa,CAAC,CAAA;YAC/C,CAAC;QACL,CAAC,CACJ,CAAA;IACL,CAAC;IAEM,KAAK,CAAC,OAAO,CAChB,QAAoB,EACpB,SAA6B,EAC7B,YAAyB,EACzB,iBAAiB,GAAG,IAAI;QAExB,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,CAAA;QAC/B,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,qDAAyB,CAAC;YAC1C,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,gBAAgB;YACxC,QAAQ;YACR,mBAAmB,EAAE,IAAI,CAAC,OAAO,CAAC,mBAAmB;YACrD,6CAA6C;YAC7C,4BAA4B,EAAE,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC3F,SAAS;YACT,gGAAgG;YAChG,cAAc,EAAE,CAAC,aAAkC,EAAE,EAAE;gBACnD,OAAO,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,YAAY,CAAC,CAAA;YAC3D,CAAC;SACJ,CAAC,CAAA;QACF,IAAI,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,kBAAkB,EAAE,KAAK,CAAC,EAAE,CAAC;YAC1D,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAA;YAC5E,OAAO,CAAC,kBAAkB,CACtB,IAAA,yCAA2B,EAAC,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAC7D,CAAC,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAClC,CAAC,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAClC,WAAW,EACX,IAAI,CACP,CAAA;YACD,OAAO,OAAO,CAAC,UAAU,EAAE,CAAA;QAC/B,CAAC;QACD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,OAAO,CAAC,CAAA;QAClD,IAAI,iBAAiB,KAAK,IAAI,EAAE,CAAC;YAC7B,IAAI,CAAC;gBACD,MAAM,IAAA,4BAAoB,EACtB,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAC7C,CAAC,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;gBACxB,6CAA6C;gBAC7C,uDAA2B,CAC9B,CAAA;YACL,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,MAAM,CAAC,KAAK,CAAC,cAAc,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;YACzC,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;YACrC,yDAAyD;YACzD,kEAAkE;YAClE,MAAM,IAAA,YAAI,EAAC,EAAE,CAAC,CAAA;QAClB,CAAC;QACD,IAAI,SAAS,KAAK,2BAAkB,CAAC,UAAU,EAAE,CAAC;YAC9C,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAA;YAC5E,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACzB,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE,OAAO,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,CAAA;YACnI,CAAC;QACL,CAAC;aAAM,IAAI,SAAS,KAAK,2BAAkB,CAAC,WAAW,EAAE,CAAC;YACtD,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAA,yCAA2B,EAAC,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAA;QACtH,CAAC;QACD,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAA;QAC5C,OAAO,CAAC,IAAI,EAAE,CAAA;QACd,OAAO,OAAO,CAAC,UAAU,EAAE,CAAA;IAC/B,CAAC;IAEO,YAAY,CAChB,WAA6B,EAC7B,oBAAoC,EACpC,SAAoB,EACpB,qBAAuC,EACvC,WAAwB,EACxB,qBAA8B,KAAK;QAEnC,MAAM,SAAS,GAAG,IAAA,qCAAuB,EAAC,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE,oBAAoB,CAAC,CAAA;QACjG,IAAI,SAAS,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YACnD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,CAAE;iBAC/B,kBAAkB,CACf,IAAA,yCAA2B,EAAC,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAC7D,WAAW,EACX,qBAAqB,EACrB,WAAW,EACX,kBAAkB,CACrB,CAAA;QACT,CAAC;aAAM,CAAC;YACJ,6CAA6C;YAC7C,MAAM,kBAAkB,GAAG,IAAI,mDAAwB,CACnD,SAAS,EACT,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAC7B,EAAE,iBAAiB,EAAE,uDAA2B,EAAE,CACrD,CAAA;YACD,MAAM,SAAS,GAAG,IAAI,uEAAkC,CACpD,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAChC,oBAAoB,EACpB,kBAAkB,EAClB,kDAAkC;YAClC,6CAA6C;YAC7C,KAAK,CACR,CAAA;YACD,SAAS,CAAC,YAAY,CAAC,WAAW,EAAE,qBAAqB,EAAE,WAAW,EAAE,kBAAkB,CAAC,CAAA;YAC3F,kBAAkB,CAAC,OAAO,EAAE,CAAA;QAChC,CAAC;IACL,CAAC;IAEO,cAAc,CAAC,aAAkC,EAAE,YAAyB;QAChF,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,OAAO,IAAA,sCAAqB,EAAC,aAAa,EAAE,0BAAiB,CAAC,OAAO,CAAC,CAAA;QAC1E,CAAC;QACD,MAAM,QAAQ,GAAG,IAAA,kCAAoB,EAAC,aAAa,CAAC,MAAM,CAAC,CAAA;QAC3D,MAAM,OAAO,GAAI,aAAa,CAAC,OAAQ,CAAC,IAAiE,CAAC,yBAAyB,CAAA;QACnI,6CAA6C;QAC7C,MAAM,qBAAqB,GAAG,IAAI,CAAC,wBAAwB,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAA;QACxE,MAAM,WAAW,GAAG,CAAC,OAAO,CAAC,SAAS,KAAK,2BAAkB,CAAC,UAAU,CAAC;YACrE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC1D,CAAC,CAAC,EAAE,CAAA;QACR,IAAI,OAAO,CAAC,SAAS,KAAK,2BAAkB,CAAC,WAAW,EAAE,CAAC;YACvD,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAA,yCAA2B,EAAC,aAAa,CAAC,UAAW,CAAC,CAAC,CAAA;QAC/G,CAAC;QACD,IAAI,IAAA,wBAAgB,EAAC,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;YAClF,gGAAgG;YAChG,IAAI,CAAC,YAAY,CACb,aAAa,CAAC,WAAW,EACzB,aAAa,CAAC,UAAW,EACzB,OAAO,CAAC,SAAS,EACjB,qBAAqB,EACrB,WAAW,EACX,IAAI,CACP,CAAA;YACD,OAAO,IAAA,sCAAqB,EAAC,aAAa,CAAC,CAAA;QAC/C,CAAC;aAAM,CAAC;YACJ,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,aAAa,EAAE,4BAAW,CAAC,SAAS,EAAE,YAAY,CAAC,CAAA;YAClG,IAAI,CAAC,GAAG,CAAC,KAAK,KAAK,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,KAAK,0BAAiB,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC5E,MAAM,qBAAqB,GAAG,CAAC,GAAG,CAAC,KAAK,KAAK,0BAAiB,CAAC,UAAU,CAAC;oBACtE,CACI,qBAAqB,CAAC,MAAM,GAAG,CAAC;2BAC7B,IAAA,iCAAe,EAAC,aAAa,CAAC;2BAC9B,CAAC,IAAI,CAAC,wBAAwB,CAAC,qBAAqB,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CACxE,CAAA;gBACL,IAAI,CAAC,YAAY,CACb,aAAa,CAAC,WAAW,EACzB,aAAa,CAAC,UAAW,EACzB,OAAO,CAAC,SAAS,EACjB,qBAAqB,EACrB,WAAW,EACX,qBAAqB,CACxB,CAAA;YACL,CAAC;YACD,OAAO,GAAG,CAAA;QACd,CAAC;IACL,CAAC;IAEO,wBAAwB,CAAC,WAAuB,EAAE,KAAa;QACnE,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,cAAc,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAA;QACvH,MAAM,MAAM,GAAG,IAAI,qCAAiB,CAAmB;YACnD,WAAW;YACX,OAAO,EAAE,KAAK;YACd,yBAAyB,EAAE,IAAI;SAClC,CAAC,CAAA;QACF,MAAM,CAAC,WAAW,CAAC,cAAc,CAAC,CAAA;QAClC,OAAO,MAAM,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAA;IACnF,CAAC;IAEO,wBAAwB,CAAC,IAAoB,EAAE,eAA2B;QAC9E,MAAM,kBAAkB,GAAG,IAAA,kCAAoB,EAAC,eAAe,CAAC,CAAA;QAChE,MAAM,SAAS,GAAG,IAAA,yBAAW,EAAC,IAAI,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAA;QAC9D,MAAM,SAAS,GAAG,IAAA,yBAAW,EAAC,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAA;QAC1F,OAAO,SAAS,GAAG,SAAS,CAAA;IAChC,CAAC;IAEM,IAAI;QACP,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QACnB,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE;YAC1C,OAAO,CAAC,IAAI,EAAE,CAAA;QAClB,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;IAChC,CAAC;CACJ;AA7MD,8DA6MC"}
|
|
@@ -7,6 +7,7 @@ import { DhtAddress } from '../../identifiers';
|
|
|
7
7
|
export interface RecursiveOperationSessionEvents {
|
|
8
8
|
completed: () => void;
|
|
9
9
|
}
|
|
10
|
+
export declare const RECURSIVE_OPERATION_TIMEOUT: number;
|
|
10
11
|
export interface RecursiveOperationSessionOptions {
|
|
11
12
|
transport: ITransport;
|
|
12
13
|
targetId: DhtAddress;
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.RecursiveOperationSession = void 0;
|
|
6
|
+
exports.RecursiveOperationSession = exports.RECURSIVE_OPERATION_TIMEOUT = void 0;
|
|
7
7
|
const eventemitter3_1 = __importDefault(require("eventemitter3"));
|
|
8
8
|
const uuid_1 = require("uuid");
|
|
9
9
|
const DhtRpc_1 = require("../../proto/packages/dht/protos/DhtRpc");
|
|
@@ -12,6 +12,7 @@ const Contact_1 = require("../contact/Contact");
|
|
|
12
12
|
const SortedContactList_1 = require("../contact/SortedContactList");
|
|
13
13
|
const RecursiveOperationSessionRpcLocal_1 = require("./RecursiveOperationSessionRpcLocal");
|
|
14
14
|
const identifiers_1 = require("../../identifiers");
|
|
15
|
+
exports.RECURSIVE_OPERATION_TIMEOUT = 10 * 1000;
|
|
15
16
|
class RecursiveOperationSession extends eventemitter3_1.default {
|
|
16
17
|
id = (0, uuid_1.v4)();
|
|
17
18
|
rpcCommunicator;
|
|
@@ -33,7 +34,7 @@ class RecursiveOperationSession extends eventemitter3_1.default {
|
|
|
33
34
|
allowToContainReferenceId: true
|
|
34
35
|
});
|
|
35
36
|
this.rpcCommunicator = new ListeningRpcCommunicator_1.ListeningRpcCommunicator(this.id, options.transport, {
|
|
36
|
-
rpcRequestTimeout:
|
|
37
|
+
rpcRequestTimeout: exports.RECURSIVE_OPERATION_TIMEOUT
|
|
37
38
|
});
|
|
38
39
|
this.registerLocalRpcMethods();
|
|
39
40
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RecursiveOperationSession.js","sourceRoot":"","sources":["../../../../src/dht/recursive-operation/RecursiveOperationSession.ts"],"names":[],"mappings":";;;;;;AAAA,kEAAwC;AACxC,+BAAyB;AACzB,mEAS+C;AAE/C,uFAAmF;AACnF,gDAA4C;AAC5C,oEAAgE;AAGhE,2FAAuF;AACvF,mDAAuH;
|
|
1
|
+
{"version":3,"file":"RecursiveOperationSession.js","sourceRoot":"","sources":["../../../../src/dht/recursive-operation/RecursiveOperationSession.ts"],"names":[],"mappings":";;;;;;AAAA,kEAAwC;AACxC,+BAAyB;AACzB,mEAS+C;AAE/C,uFAAmF;AACnF,gDAA4C;AAC5C,oEAAgE;AAGhE,2FAAuF;AACvF,mDAAuH;AAO1G,QAAA,2BAA2B,GAAG,EAAE,GAAG,IAAI,CAAA;AAWpD,MAAa,yBAA0B,SAAQ,uBAA6C;IAEvE,EAAE,GAAG,IAAA,SAAE,GAAE,CAAA;IACT,eAAe,CAA0B;IAClD,OAAO,CAA4B;IACnC,SAAS,GAA+B,IAAI,GAAG,EAAE,CAAA;IACjD,YAAY,GAAoB,IAAI,GAAG,EAAE,CAAA;IACzC,YAAY,GAAoB,IAAI,GAAG,EAAE,CAAA;IACzC,WAAW,CAAiB;IAC5B,sBAAsB,GAAG,KAAK,CAAA;IAC9B,4BAA4B,GAAG,CAAC,CAAA;IACvB,yBAAyB,GAAoB,IAAI,GAAG,EAAE,CAAA;IACtD,OAAO,CAAkC;IAE1D,YAAY,OAAyC;QACjD,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,OAAO,GAAG,IAAI,qCAAiB,CAAC;YACjC,WAAW,EAAE,OAAO,CAAC,QAAQ;YAC7B,OAAO,EAAE,EAAE,EAAG,6CAA6C;YAC3D,yBAAyB,EAAE,IAAI;SAClC,CAAC,CAAA;QACF,IAAI,CAAC,eAAe,GAAG,IAAI,mDAAwB,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC,SAAS,EAAE;YAC5E,iBAAiB,EAAE,mCAA2B;SACjD,CAAC,CAAA;QACF,IAAI,CAAC,uBAAuB,EAAE,CAAA;IAClC,CAAC;IAEO,uBAAuB;QAC3B,MAAM,QAAQ,GAAG,IAAI,qEAAiC,CAAC;YACnD,kBAAkB,EAAE,CAChB,YAAwB,EACxB,WAA6B,EAC7B,qBAAuC,EACvC,WAAwB,EACxB,kBAA2B,EAC7B,EAAE;gBACA,IAAI,CAAC,kBAAkB,CAAC,YAAY,EAAE,WAAW,EAAE,qBAAqB,EAAE,WAAW,EAAE,kBAAkB,CAAC,CAAA;YAC9G,CAAC;SACJ,CAAC,CAAA;QACF,IAAI,CAAC,eAAe,CAAC,uBAAuB,CAAC,mCAA0B,EAAE,cAAc,EACnF,CAAC,GAA+B,EAAE,OAA0B,EAAE,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;IAC7G,CAAC;IAEM,KAAK,CAAC,SAAoB;QAC7B,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAA;QAChD,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,CAAC,CAAA;IAC7C,CAAC;IAEO,WAAW,CAAC,SAAoB;QACpC,MAAM,OAAO,GAA8B;YACvC,SAAS,EAAE,IAAI,CAAC,KAAK,EAAE;YACvB,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS;SACpC,CAAA;QACD,MAAM,GAAG,GAAY;YACjB,SAAS,EAAE,IAAA,SAAE,GAAE;YACf,SAAS;YACT,IAAI,EAAE;gBACF,SAAS,EAAE,2BAA2B;gBACtC,yBAAyB,EAAE,OAAO;aACrC;SACJ,CAAA;QACD,MAAM,YAAY,GAAwB;YACtC,OAAO,EAAE,GAAG;YACZ,SAAS,EAAE,IAAA,SAAE,GAAE;YACf,MAAM,EAAE,IAAA,kCAAoB,EAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;YACnD,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,mBAAmB;YAC5C,gBAAgB,EAAE,EAAE;YACpB,WAAW,EAAE,EAAE;YACf,mBAAmB,EAAE,EAAE;SAC1B,CAAA;QACD,OAAO,YAAY,CAAA;IACvB,CAAC;IAEO,WAAW;QACf,MAAM,cAAc,GAAoB,IAAI,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;QAClE,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;YAC7B,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAC7B,CAAC,CAAC,CAAA;QACF,IAAI,IAAI,CAAC,4BAA4B,IAAI,CAAC,IAAI,cAAc,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YACtE,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,KAAK,2BAAkB,CAAC,UAAU;mBACrD,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,IAAI,CAAC,4BAA4B,IAAI,IAAI,CAAC,OAAO,CAAC,4BAA4B,CAAC,EAAE,CAAC;gBAChH,OAAO,IAAI,CAAA;YACf,CAAC;iBAAM,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,KAAK,2BAAkB,CAAC,UAAU,EAAE,CAAC;gBAClE,OAAO,KAAK,CAAA;YAChB,CAAC;YACD,OAAO,IAAI,CAAA;QACf,CAAC;QACD,OAAO,KAAK,CAAA;IAChB,CAAC;IAEO,eAAe;QACnB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,KAAK,KAAK,CAAC,CAAA;IACrF,CAAC;IAEM,kBAAkB,CACrB,YAAwB,EACxB,WAA6B,EAC7B,qBAAuC,EACvC,WAAwB,EACxB,kBAA2B;QAE3B,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAA;QAC9B,IAAI,WAAW,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YAC1B,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAA;QAC9D,CAAC;QACD,qBAAqB,CAAC,OAAO,CAAC,CAAC,UAA0B,EAAE,EAAE;YACzD,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,iBAAO,CAAC,UAAU,CAAC,CAAC,CAAA;QACpD,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAA;QAClC,IAAI,kBAAkB,IAAI,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;YACzE,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAA;QAC3C,CAAC;IACL,CAAC;IAEO,YAAY,CAAC,WAA6B;QAC9C,MAAM,WAAW,GAAG,IAAA,yCAA2B,EAAC,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAA;QACjF,WAAW,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACzB,MAAM,SAAS,GAAG,IAAA,yCAA2B,EAAC,IAAI,CAAC,CAAA;YACnD,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;gBAC5B,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;YACpC,CAAC;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAEO,gBAAgB,CAAC,IAAoB;QACzC,MAAM,WAAW,GAAG,IAAA,yCAA2B,EAAC,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAA;QACjF,MAAM,SAAS,GAAG,IAAA,yCAA2B,EAAC,IAAI,CAAC,CAAA;QACnD,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAC5B,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;QACpC,CAAC;QACD,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACrB,IAAI,CAAC,IAAI,CAAC,sBAAsB,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;gBACrD,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;oBACnB,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;oBAC9B,IAAI,CAAC,WAAW,GAAG,SAAS,CAAA;gBAChC,CAAC;gBACD,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;gBACtB,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAA;YACtC,CAAC;QACL,CAAC;IACL,CAAC;IAEO,gBAAgB,CAAC,WAAwB;QAC7C,WAAW,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAC1B,MAAM,aAAa,GAAG,IAAA,kCAAoB,EAAC,KAAK,CAAC,OAAO,CAAC,CAAA;YACzD,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;YACvD,IAAI,CAAC,aAAa,IAAI,aAAa,CAAC,SAAU,GAAG,KAAK,CAAC,SAAU;mBAC1D,CAAC,aAAa,CAAC,SAAU,IAAI,KAAK,CAAC,SAAU,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;gBACrE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,aAAa,EAAE,KAAK,CAAC,CAAA;YAC5C,CAAC;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAEO,oBAAoB,CAAC,YAAwB;QACjD,IAAI,CAAC,4BAA4B,IAAI,CAAC,CAAA;QACtC,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;QAChD,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACrB,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YACtB,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAA;YAClC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;gBACnB,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;gBAC9B,IAAI,CAAC,WAAW,GAAG,SAAS,CAAA;YAChC,CAAC;QACL,CAAC;aAAM,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAC3D,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC/B,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC;oBAC/B,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;oBACtB,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAA;gBACtC,CAAC;YACL,CAAC,EAAE,IAAI,CAAC,CAAA,CAAE,6CAA6C;QAC3D,CAAC;IACL,CAAC;IAEM,UAAU;QACb,OAAO;YACH,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC;YAC7F,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;SACnD,CAAA;IACL,CAAC;IAEM,KAAK;QACR,OAAO,IAAI,CAAC,EAAE,CAAA;IAClB,CAAC;IAEM,IAAI;QACP,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACnB,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YAC9B,IAAI,CAAC,WAAW,GAAG,SAAS,CAAA;QAChC,CAAC;QACD,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,CAAA;QAC9B,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IAC1B,CAAC;CACJ;AAjMD,8DAiMC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { RouteMessageWrapper } from '../../proto/packages/dht/protos/DhtRpc';
|
|
2
2
|
import { RouterRpcClient } from '../../proto/packages/dht/protos/DhtRpc.client';
|
|
3
3
|
import { RpcRemote } from '../contact/RpcRemote';
|
|
4
|
+
export declare const ROUTING_TIMEOUT = 2000;
|
|
4
5
|
export declare class RouterRpcRemote extends RpcRemote<RouterRpcClient> {
|
|
5
6
|
routeMessage(params: RouteMessageWrapper): Promise<boolean>;
|
|
6
7
|
forwardMessage(params: RouteMessageWrapper): Promise<boolean>;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.RouterRpcRemote = void 0;
|
|
3
|
+
exports.RouterRpcRemote = exports.ROUTING_TIMEOUT = void 0;
|
|
4
4
|
const utils_1 = require("@streamr/utils");
|
|
5
5
|
const uuid_1 = require("uuid");
|
|
6
6
|
const DhtRpc_1 = require("../../proto/packages/dht/protos/DhtRpc");
|
|
@@ -8,6 +8,8 @@ const RpcRemote_1 = require("../contact/RpcRemote");
|
|
|
8
8
|
const getPreviousPeer_1 = require("./getPreviousPeer");
|
|
9
9
|
const identifiers_1 = require("../../identifiers");
|
|
10
10
|
const logger = new utils_1.Logger(module);
|
|
11
|
+
// default timeout
|
|
12
|
+
exports.ROUTING_TIMEOUT = 2000;
|
|
11
13
|
class RouterRpcRemote extends RpcRemote_1.RpcRemote {
|
|
12
14
|
async routeMessage(params) {
|
|
13
15
|
const message = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RouterRpcRemote.js","sourceRoot":"","sources":["../../../../src/dht/routing/RouterRpcRemote.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"RouterRpcRemote.js","sourceRoot":"","sources":["../../../../src/dht/routing/RouterRpcRemote.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,6 @@ const RouterRpcRemote_1 = require("./RouterRpcRemote");
|
|
|
12
12
|
const DhtRpc_client_1 = require("../../proto/packages/dht/protos/DhtRpc.client");
|
|
13
13
|
const Contact_1 = require("../contact/Contact");
|
|
14
14
|
const RecursiveOperationRpcRemote_1 = require("../recursive-operation/RecursiveOperationRpcRemote");
|
|
15
|
-
const RpcRemote_1 = require("../contact/RpcRemote");
|
|
16
15
|
const getPreviousPeer_1 = require("./getPreviousPeer");
|
|
17
16
|
const identifiers_1 = require("../../identifiers");
|
|
18
17
|
const lodash_1 = require("lodash");
|
|
@@ -24,8 +23,8 @@ class RoutingRemoteContact extends Contact_1.Contact {
|
|
|
24
23
|
recursiveOperationRpcRemote;
|
|
25
24
|
constructor(peer, localPeerDescriptor, rpcCommunicator) {
|
|
26
25
|
super(peer);
|
|
27
|
-
this.routerRpcRemote = new RouterRpcRemote_1.RouterRpcRemote(localPeerDescriptor, peer, rpcCommunicator, DhtRpc_client_1.RouterRpcClient,
|
|
28
|
-
this.recursiveOperationRpcRemote = new RecursiveOperationRpcRemote_1.RecursiveOperationRpcRemote(localPeerDescriptor, peer, rpcCommunicator, DhtRpc_client_1.RecursiveOperationRpcClient,
|
|
26
|
+
this.routerRpcRemote = new RouterRpcRemote_1.RouterRpcRemote(localPeerDescriptor, peer, rpcCommunicator, DhtRpc_client_1.RouterRpcClient, RouterRpcRemote_1.ROUTING_TIMEOUT);
|
|
27
|
+
this.recursiveOperationRpcRemote = new RecursiveOperationRpcRemote_1.RecursiveOperationRpcRemote(localPeerDescriptor, peer, rpcCommunicator, DhtRpc_client_1.RecursiveOperationRpcClient, RouterRpcRemote_1.ROUTING_TIMEOUT);
|
|
29
28
|
}
|
|
30
29
|
getRouterRpcRemote() {
|
|
31
30
|
return this.routerRpcRemote;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RoutingSession.js","sourceRoot":"","sources":["../../../../src/dht/routing/RoutingSession.ts"],"names":[],"mappings":";;;;;;AAAA,oEAAgE;AAChE,0CAAuC;AACvC,kEAAwC;AACxC,+BAAyB;AAEzB,
|
|
1
|
+
{"version":3,"file":"RoutingSession.js","sourceRoot":"","sources":["../../../../src/dht/routing/RoutingSession.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@streamr/dht",
|
|
3
|
-
"version": "101.1.0",
|
|
3
|
+
"version": "101.1.1-beta.0",
|
|
4
4
|
"description": "Streamr Network DHT",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -29,11 +29,11 @@
|
|
|
29
29
|
"@js-sdsl/ordered-map": "^4.4.2",
|
|
30
30
|
"@protobuf-ts/runtime": "^2.8.2",
|
|
31
31
|
"@protobuf-ts/runtime-rpc": "^2.8.2",
|
|
32
|
-
"@streamr/autocertifier-client": "101.1.0",
|
|
33
|
-
"@streamr/cdn-location": "101.1.0",
|
|
34
|
-
"@streamr/geoip-location": "101.1.0",
|
|
35
|
-
"@streamr/proto-rpc": "101.1.0",
|
|
36
|
-
"@streamr/utils": "101.1.0",
|
|
32
|
+
"@streamr/autocertifier-client": "101.1.1-beta.0",
|
|
33
|
+
"@streamr/cdn-location": "101.1.1-beta.0",
|
|
34
|
+
"@streamr/geoip-location": "101.1.1-beta.0",
|
|
35
|
+
"@streamr/proto-rpc": "101.1.1-beta.0",
|
|
36
|
+
"@streamr/utils": "101.1.1-beta.0",
|
|
37
37
|
"eventemitter3": "^5.0.0",
|
|
38
38
|
"heap": "^0.2.6",
|
|
39
39
|
"ipaddr.js": "^2.0.1",
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
},
|
|
49
49
|
"devDependencies": {
|
|
50
50
|
"@streamr/browser-test-runner": "^0.0.1",
|
|
51
|
-
"@streamr/test-utils": "101.1.0",
|
|
51
|
+
"@streamr/test-utils": "101.1.1-beta.0",
|
|
52
52
|
"@types/heap": "^0.2.34",
|
|
53
53
|
"@types/k-bucket": "^5.0.1",
|
|
54
54
|
"@types/lodash": "^4.17.7",
|
|
@@ -57,7 +57,7 @@
|
|
|
57
57
|
"@types/ws": "^8.5.12",
|
|
58
58
|
"jest-leak-detector": "^27.3.1",
|
|
59
59
|
"jest-matcher-utils": "^29.5.0",
|
|
60
|
-
"ts-essentials": "^10.0.
|
|
60
|
+
"ts-essentials": "^10.0.2"
|
|
61
61
|
},
|
|
62
62
|
"optionalDependencies": {
|
|
63
63
|
"bufferutil": "^4.0.8",
|
|
@@ -18,7 +18,7 @@ import { DhtAddress, areEqualPeerDescriptors, getNodeIdFromPeerDescriptor } from
|
|
|
18
18
|
interface ConnectionLockRpcLocalOptions {
|
|
19
19
|
addRemoteLocked: (id: DhtAddress, lockId: LockID) => void
|
|
20
20
|
removeRemoteLocked: (id: DhtAddress, lockId: LockID) => void
|
|
21
|
-
closeConnection: (peerDescriptor: PeerDescriptor, gracefulLeave: boolean, reason?: string) => void
|
|
21
|
+
closeConnection: (peerDescriptor: PeerDescriptor, gracefulLeave: boolean, reason?: string) => Promise<void>
|
|
22
22
|
getLocalPeerDescriptor: () => PeerDescriptor
|
|
23
23
|
}
|
|
24
24
|
|
|
@@ -60,9 +60,9 @@ export class ConnectionLockRpcLocal implements IConnectionLockRpc {
|
|
|
60
60
|
logger.trace(getNodeIdOrUnknownFromPeerDescriptor(senderPeerDescriptor) + ' received gracefulDisconnect notice')
|
|
61
61
|
|
|
62
62
|
if (disconnectNotice.disconnectMode === DisconnectMode.LEAVING) {
|
|
63
|
-
this.options.closeConnection(senderPeerDescriptor, true, 'graceful leave notified')
|
|
63
|
+
await this.options.closeConnection(senderPeerDescriptor, true, 'graceful leave notified')
|
|
64
64
|
} else {
|
|
65
|
-
this.options.closeConnection(senderPeerDescriptor, false, 'graceful disconnect notified')
|
|
65
|
+
await this.options.closeConnection(senderPeerDescriptor, false, 'graceful disconnect notified')
|
|
66
66
|
}
|
|
67
67
|
return {}
|
|
68
68
|
}
|
|
@@ -152,10 +152,8 @@ export class ConnectionManager extends EventEmitter<TransportEvents> implements
|
|
|
152
152
|
const lockRpcLocal = new ConnectionLockRpcLocal({
|
|
153
153
|
addRemoteLocked: (id: DhtAddress, lockId: LockID) => this.locks.addRemoteLocked(id, lockId),
|
|
154
154
|
removeRemoteLocked: (id: DhtAddress, lockId: LockID) => this.locks.removeRemoteLocked(id, lockId),
|
|
155
|
-
closeConnection: (peerDescriptor: PeerDescriptor, gracefulLeave: boolean, reason?: string) =>
|
|
156
|
-
|
|
157
|
-
this.closeConnection(peerDescriptor, gracefulLeave, reason)
|
|
158
|
-
},
|
|
155
|
+
closeConnection: (peerDescriptor: PeerDescriptor, gracefulLeave: boolean, reason?: string) =>
|
|
156
|
+
this.closeConnection(peerDescriptor, gracefulLeave, reason),
|
|
159
157
|
getLocalPeerDescriptor: () => this.getLocalPeerDescriptor()
|
|
160
158
|
})
|
|
161
159
|
this.rpcCommunicator.registerRpcMethod(LockRequest, LockResponse, 'lockRequest',
|
|
@@ -224,8 +222,6 @@ export class ConnectionManager extends EventEmitter<TransportEvents> implements
|
|
|
224
222
|
if (this.disconnectorIntervalRef) {
|
|
225
223
|
clearInterval(this.disconnectorIntervalRef)
|
|
226
224
|
}
|
|
227
|
-
await this.connectorFacade.stop()
|
|
228
|
-
|
|
229
225
|
await Promise.all(Array.from(this.endpoints.values()).map(async (endpoint) => {
|
|
230
226
|
if (endpoint.connected) {
|
|
231
227
|
try {
|
|
@@ -249,7 +245,7 @@ export class ConnectionManager extends EventEmitter<TransportEvents> implements
|
|
|
249
245
|
}
|
|
250
246
|
}
|
|
251
247
|
}))
|
|
252
|
-
|
|
248
|
+
await this.connectorFacade.stop()
|
|
253
249
|
this.state = ConnectionManagerState.STOPPED
|
|
254
250
|
this.rpcCommunicator!.stop()
|
|
255
251
|
this.duplicateMessageDetector.clear()
|
|
@@ -12,7 +12,7 @@ const WEBSOCKET_CLIENT_TIMEOUT = 5000
|
|
|
12
12
|
// takes a little bit longer than WEBSOCKET_CLIENT
|
|
13
13
|
const WEBSOCKET_SERVER_TIMEOUT = 7500
|
|
14
14
|
// WebRTC connections require lots of signalling to open and might take a longer time.
|
|
15
|
-
const WEBRTC_TIMEOUT =
|
|
15
|
+
const WEBRTC_TIMEOUT = 10000
|
|
16
16
|
// default timeout for existing connections
|
|
17
17
|
export const EXISTING_CONNECTION_TIMEOUT = 5000
|
|
18
18
|
|
|
@@ -12,7 +12,7 @@ import { RoutingMode } from '../routing/RoutingSession'
|
|
|
12
12
|
import { Logger, areEqualBinaries, runAndWaitForEvents3, wait } from '@streamr/utils'
|
|
13
13
|
import { RoutingRpcCommunicator } from '../../transport/RoutingRpcCommunicator'
|
|
14
14
|
import { RecursiveOperationSessionRpcRemote } from './RecursiveOperationSessionRpcRemote'
|
|
15
|
-
import { RecursiveOperationSession, RecursiveOperationSessionEvents } from './RecursiveOperationSession'
|
|
15
|
+
import { RECURSIVE_OPERATION_TIMEOUT, RecursiveOperationSession, RecursiveOperationSessionEvents } from './RecursiveOperationSession'
|
|
16
16
|
import { DhtNodeRpcRemote } from '../DhtNodeRpcRemote'
|
|
17
17
|
import { ITransport } from '../../transport/ITransport'
|
|
18
18
|
import { LocalDataStore } from '../store/LocalDataStore'
|
|
@@ -114,7 +114,7 @@ export class RecursiveOperationManager {
|
|
|
114
114
|
[() => session.start(this.options.serviceId)],
|
|
115
115
|
[[session, 'completed']],
|
|
116
116
|
// TODO use options option or named constant?
|
|
117
|
-
|
|
117
|
+
RECURSIVE_OPERATION_TIMEOUT
|
|
118
118
|
)
|
|
119
119
|
} catch (err) {
|
|
120
120
|
logger.debug('start failed', { err })
|
|
@@ -158,7 +158,11 @@ export class RecursiveOperationManager {
|
|
|
158
158
|
)
|
|
159
159
|
} else {
|
|
160
160
|
// TODO use options option or named constant?
|
|
161
|
-
const remoteCommunicator = new ListeningRpcCommunicator(
|
|
161
|
+
const remoteCommunicator = new ListeningRpcCommunicator(
|
|
162
|
+
serviceId,
|
|
163
|
+
this.options.sessionTransport,
|
|
164
|
+
{ rpcRequestTimeout: RECURSIVE_OPERATION_TIMEOUT }
|
|
165
|
+
)
|
|
162
166
|
const rpcRemote = new RecursiveOperationSessionRpcRemote(
|
|
163
167
|
this.options.localPeerDescriptor,
|
|
164
168
|
targetPeerDescriptor,
|
|
@@ -24,6 +24,8 @@ export interface RecursiveOperationSessionEvents {
|
|
|
24
24
|
completed: () => void
|
|
25
25
|
}
|
|
26
26
|
|
|
27
|
+
export const RECURSIVE_OPERATION_TIMEOUT = 10 * 1000
|
|
28
|
+
|
|
27
29
|
export interface RecursiveOperationSessionOptions {
|
|
28
30
|
transport: ITransport
|
|
29
31
|
targetId: DhtAddress
|
|
@@ -56,7 +58,7 @@ export class RecursiveOperationSession extends EventEmitter<RecursiveOperationSe
|
|
|
56
58
|
allowToContainReferenceId: true
|
|
57
59
|
})
|
|
58
60
|
this.rpcCommunicator = new ListeningRpcCommunicator(this.id, options.transport, {
|
|
59
|
-
rpcRequestTimeout:
|
|
61
|
+
rpcRequestTimeout: RECURSIVE_OPERATION_TIMEOUT
|
|
60
62
|
})
|
|
61
63
|
this.registerLocalRpcMethods()
|
|
62
64
|
}
|
|
@@ -8,6 +8,9 @@ import { getNodeIdFromPeerDescriptor } from '../../identifiers'
|
|
|
8
8
|
|
|
9
9
|
const logger = new Logger(module)
|
|
10
10
|
|
|
11
|
+
// default timeout
|
|
12
|
+
export const ROUTING_TIMEOUT = 2000
|
|
13
|
+
|
|
11
14
|
export class RouterRpcRemote extends RpcRemote<RouterRpcClient> {
|
|
12
15
|
|
|
13
16
|
async routeMessage(params: RouteMessageWrapper): Promise<boolean> {
|
|
@@ -3,12 +3,11 @@ import { Logger } from '@streamr/utils'
|
|
|
3
3
|
import EventEmitter from 'eventemitter3'
|
|
4
4
|
import { v4 } from 'uuid'
|
|
5
5
|
import { PeerDescriptor, RouteMessageWrapper } from '../../proto/packages/dht/protos/DhtRpc'
|
|
6
|
-
import { RouterRpcRemote } from './RouterRpcRemote'
|
|
6
|
+
import { RouterRpcRemote, ROUTING_TIMEOUT } from './RouterRpcRemote'
|
|
7
7
|
import { RoutingRpcCommunicator } from '../../transport/RoutingRpcCommunicator'
|
|
8
8
|
import { RecursiveOperationRpcClient, RouterRpcClient } from '../../proto/packages/dht/protos/DhtRpc.client'
|
|
9
9
|
import { Contact } from '../contact/Contact'
|
|
10
10
|
import { RecursiveOperationRpcRemote } from '../recursive-operation/RecursiveOperationRpcRemote'
|
|
11
|
-
import { EXISTING_CONNECTION_TIMEOUT } from '../contact/RpcRemote'
|
|
12
11
|
import { getPreviousPeer } from './getPreviousPeer'
|
|
13
12
|
import { DhtAddress, areEqualPeerDescriptors, getDhtAddressFromRaw, getNodeIdFromPeerDescriptor } from '../../identifiers'
|
|
14
13
|
import { pull } from 'lodash'
|
|
@@ -31,14 +30,14 @@ export class RoutingRemoteContact extends Contact {
|
|
|
31
30
|
peer,
|
|
32
31
|
rpcCommunicator,
|
|
33
32
|
RouterRpcClient,
|
|
34
|
-
|
|
33
|
+
ROUTING_TIMEOUT
|
|
35
34
|
)
|
|
36
35
|
this.recursiveOperationRpcRemote = new RecursiveOperationRpcRemote(
|
|
37
36
|
localPeerDescriptor,
|
|
38
37
|
peer,
|
|
39
38
|
rpcCommunicator,
|
|
40
39
|
RecursiveOperationRpcClient,
|
|
41
|
-
|
|
40
|
+
ROUTING_TIMEOUT
|
|
42
41
|
)
|
|
43
42
|
}
|
|
44
43
|
|
|
@@ -416,4 +416,57 @@ describe('ConnectionManager', () => {
|
|
|
416
416
|
expect(connectionManager1.getLocalPeerDescriptor().websocket!.tls).toEqual(false)
|
|
417
417
|
await connectionManager1.stop()
|
|
418
418
|
})
|
|
419
|
+
|
|
420
|
+
it('Stopping ConnectionManager is cleaned up from peers', async () => {
|
|
421
|
+
const connectionManager1 = createConnectionManager({
|
|
422
|
+
transport: mockTransport,
|
|
423
|
+
websocketHost: '127.0.0.1',
|
|
424
|
+
websocketServerEnableTls: false,
|
|
425
|
+
websocketPortRange: { min: 10005, max: 10005 }
|
|
426
|
+
})
|
|
427
|
+
|
|
428
|
+
await connectionManager1.start()
|
|
429
|
+
|
|
430
|
+
const connectionManager2 = createConnectionManager({
|
|
431
|
+
transport: mockTransport,
|
|
432
|
+
websocketHost: '127.0.0.1',
|
|
433
|
+
websocketServerEnableTls: false,
|
|
434
|
+
websocketPortRange: { min: 10006, max: 10006 }
|
|
435
|
+
})
|
|
436
|
+
|
|
437
|
+
await connectionManager2.start()
|
|
438
|
+
|
|
439
|
+
const msg: Message = {
|
|
440
|
+
serviceId: SERVICE_ID,
|
|
441
|
+
messageId: '1',
|
|
442
|
+
body: {
|
|
443
|
+
oneofKind: 'rpcMessage',
|
|
444
|
+
rpcMessage: RpcMessage.create()
|
|
445
|
+
},
|
|
446
|
+
targetDescriptor: connectionManager1.getLocalPeerDescriptor()
|
|
447
|
+
}
|
|
448
|
+
|
|
449
|
+
const connectedPromise1 = new Promise<void>((resolve, _reject) => {
|
|
450
|
+
connectionManager1.on('connected', () => {
|
|
451
|
+
resolve()
|
|
452
|
+
})
|
|
453
|
+
})
|
|
454
|
+
|
|
455
|
+
const connectedPromise2 = new Promise<void>((resolve, _reject) => {
|
|
456
|
+
connectionManager2.on('connected', () => {
|
|
457
|
+
resolve()
|
|
458
|
+
})
|
|
459
|
+
})
|
|
460
|
+
await Promise.all([connectedPromise1, connectedPromise2, connectionManager2.send(msg)])
|
|
461
|
+
|
|
462
|
+
expect(connectionManager1.getConnections().length).toEqual(1)
|
|
463
|
+
expect(connectionManager2.getConnections().length).toEqual(1)
|
|
464
|
+
|
|
465
|
+
await connectionManager1.stop()
|
|
466
|
+
|
|
467
|
+
expect(connectionManager2.getConnections().length).toEqual(0)
|
|
468
|
+
|
|
469
|
+
await connectionManager2.stop()
|
|
470
|
+
})
|
|
471
|
+
|
|
419
472
|
})
|
|
@@ -1,71 +0,0 @@
|
|
|
1
|
-
import { LatencyType, Simulator } from '../../src/connection/simulator/Simulator'
|
|
2
|
-
import { DhtNode } from '../../src/dht/DhtNode'
|
|
3
|
-
import { NodeType, PeerDescriptor } from '../../src/proto/packages/dht/protos/DhtRpc'
|
|
4
|
-
import { createMockConnectionDhtNode } from '../utils/utils'
|
|
5
|
-
import { Logger } from '@streamr/utils'
|
|
6
|
-
import { getRandomRegion } from '../../src/connection/simulator/pings'
|
|
7
|
-
import { DhtAddress, areEqualPeerDescriptors, createRandomDhtAddress, getNodeIdFromPeerDescriptor, getRawFromDhtAddress } from '../../src/identifiers'
|
|
8
|
-
|
|
9
|
-
const logger = new Logger(module)
|
|
10
|
-
|
|
11
|
-
const NUM_NODES = 80
|
|
12
|
-
const MAX_CONNECTIONS = 15
|
|
13
|
-
const K = 2
|
|
14
|
-
|
|
15
|
-
describe('Scaling down a Dht network', () => {
|
|
16
|
-
|
|
17
|
-
let entryPoint: DhtNode
|
|
18
|
-
let nodes: DhtNode[]
|
|
19
|
-
let entrypointDescriptor: PeerDescriptor
|
|
20
|
-
const simulator = new Simulator(LatencyType.REAL)
|
|
21
|
-
|
|
22
|
-
beforeEach(async () => {
|
|
23
|
-
nodes = []
|
|
24
|
-
entryPoint = await createMockConnectionDhtNode(simulator,
|
|
25
|
-
createRandomDhtAddress(), K, MAX_CONNECTIONS)
|
|
26
|
-
nodes.push(entryPoint)
|
|
27
|
-
|
|
28
|
-
entrypointDescriptor = {
|
|
29
|
-
nodeId: getRawFromDhtAddress(entryPoint.getNodeId()),
|
|
30
|
-
type: NodeType.NODEJS,
|
|
31
|
-
region: getRandomRegion()
|
|
32
|
-
}
|
|
33
|
-
|
|
34
|
-
for (let i = 1; i < NUM_NODES; i++) {
|
|
35
|
-
const node = await createMockConnectionDhtNode(simulator, undefined, K, MAX_CONNECTIONS)
|
|
36
|
-
nodes.push(node)
|
|
37
|
-
}
|
|
38
|
-
await Promise.all(nodes.map((node) => node.joinDht([entrypointDescriptor])))
|
|
39
|
-
}, 60000)
|
|
40
|
-
|
|
41
|
-
afterEach(async () => {
|
|
42
|
-
await Promise.all(nodes.map((node) => node.stop()))
|
|
43
|
-
}, 10000)
|
|
44
|
-
|
|
45
|
-
it('Remaining nodes cleaned up stopped nodes from states', async () => {
|
|
46
|
-
const randomIndices = []
|
|
47
|
-
for (let i = 1; i < nodes.length; i++) {
|
|
48
|
-
randomIndices.push(i)
|
|
49
|
-
}
|
|
50
|
-
const stoppedNodes: Set<DhtAddress> = new Set()
|
|
51
|
-
while (randomIndices.length > 1) {
|
|
52
|
-
const index = Math.floor(Math.random() * randomIndices.length)
|
|
53
|
-
const nodeIndex = randomIndices[index]
|
|
54
|
-
randomIndices.splice(index, 1)
|
|
55
|
-
const nodeToStop = nodes[nodeIndex]
|
|
56
|
-
const stoppingPeerDescriptor = nodeToStop.getLocalPeerDescriptor()
|
|
57
|
-
stoppedNodes.add(getNodeIdFromPeerDescriptor(stoppingPeerDescriptor))
|
|
58
|
-
await nodeToStop.stop()
|
|
59
|
-
const nodeIsCleaned = nodes.filter((node) => !stoppedNodes.has(node.getNodeId())).every((node) =>
|
|
60
|
-
node.getConnectionsView().getConnections().every((peer) => {
|
|
61
|
-
if (areEqualPeerDescriptors(peer, stoppingPeerDescriptor)) {
|
|
62
|
-
logger.error(getNodeIdFromPeerDescriptor(node.getLocalPeerDescriptor()) + ', '
|
|
63
|
-
+ getNodeIdFromPeerDescriptor(stoppingPeerDescriptor) + ' cleaning up failed')
|
|
64
|
-
}
|
|
65
|
-
return !areEqualPeerDescriptors(peer, stoppingPeerDescriptor)
|
|
66
|
-
})
|
|
67
|
-
)
|
|
68
|
-
expect(nodeIsCleaned).toEqual(true)
|
|
69
|
-
}
|
|
70
|
-
}, 180000)
|
|
71
|
-
})
|