@streamr/dht 100.0.0 → 100.1.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 +6 -6
- package/dist/src/connection/ConnectionLockRpcLocal.d.ts +1 -1
- package/dist/src/connection/ConnectionLockRpcRemote.d.ts +1 -1
- package/dist/src/connection/ConnectionLockRpcRemote.js +1 -1
- package/dist/src/connection/ConnectionLockRpcRemote.js.map +1 -1
- package/dist/src/connection/{ConnectionLockHandler.d.ts → ConnectionLockStates.d.ts} +1 -1
- package/dist/src/connection/{ConnectionLockHandler.js → ConnectionLockStates.js} +4 -4
- package/dist/src/connection/ConnectionLockStates.js.map +1 -0
- package/dist/src/connection/ConnectionManager.d.ts +5 -3
- package/dist/src/connection/ConnectionManager.js +8 -11
- package/dist/src/connection/ConnectionManager.js.map +1 -1
- package/dist/src/connection/ConnectorFacade.js +1 -1
- package/dist/src/connection/ConnectorFacade.js.map +1 -1
- package/dist/src/connection/ManagedConnection.d.ts +2 -2
- package/dist/src/connection/ManagedConnection.js +8 -8
- package/dist/src/connection/ManagedConnection.js.map +1 -1
- package/dist/src/connection/connectivityChecker.js +3 -3
- package/dist/src/connection/connectivityChecker.js.map +1 -1
- package/dist/src/connection/connectivityRequestHandler.js +4 -4
- package/dist/src/connection/connectivityRequestHandler.js.map +1 -1
- package/dist/src/connection/websocket/AbstractWebsocketClientConnection.d.ts +28 -0
- package/dist/src/connection/websocket/{ClientWebsocket.js → AbstractWebsocketClientConnection.js} +42 -68
- package/dist/src/connection/websocket/AbstractWebsocketClientConnection.js.map +1 -0
- package/dist/src/connection/websocket/NodeWebsocketClientConnection.d.ts +7 -0
- package/dist/src/connection/websocket/NodeWebsocketClientConnection.js +39 -0
- package/dist/src/connection/websocket/NodeWebsocketClientConnection.js.map +1 -0
- package/dist/src/connection/websocket/WebsocketConnector.js +3 -3
- package/dist/src/connection/websocket/WebsocketConnector.js.map +1 -1
- package/dist/src/connection/websocket/WebsocketServerConnection.js +3 -3
- package/dist/src/connection/websocket/WebsocketServerConnection.js.map +1 -1
- package/dist/src/dht/DhtNode.d.ts +2 -2
- package/dist/src/dht/DhtNode.js +12 -16
- package/dist/src/dht/DhtNode.js.map +1 -1
- package/dist/src/dht/DhtNodeRpcRemote.js +1 -1
- package/dist/src/dht/DhtNodeRpcRemote.js.map +1 -1
- package/dist/src/dht/PeerManager.d.ts +4 -4
- package/dist/src/dht/PeerManager.js +33 -44
- package/dist/src/dht/PeerManager.js.map +1 -1
- package/dist/src/dht/contact/SortedContactList.d.ts +2 -1
- package/dist/src/dht/contact/SortedContactList.js +19 -17
- package/dist/src/dht/contact/SortedContactList.js.map +1 -1
- package/dist/src/dht/discovery/DiscoverySession.js +3 -1
- package/dist/src/dht/discovery/DiscoverySession.js.map +1 -1
- package/dist/src/dht/discovery/PeerDiscovery.d.ts +2 -2
- package/dist/src/dht/discovery/PeerDiscovery.js +6 -4
- package/dist/src/dht/discovery/PeerDiscovery.js.map +1 -1
- package/dist/src/dht/discovery/RingDiscoverySession.js +3 -1
- package/dist/src/dht/discovery/RingDiscoverySession.js.map +1 -1
- package/dist/src/dht/recursive-operation/RecursiveOperationManager.js +1 -1
- package/dist/src/dht/recursive-operation/RecursiveOperationManager.js.map +1 -1
- package/dist/src/dht/recursive-operation/RecursiveOperationRpcRemote.js +1 -1
- package/dist/src/dht/recursive-operation/RecursiveOperationRpcRemote.js.map +1 -1
- package/dist/src/dht/routing/Router.d.ts +0 -1
- package/dist/src/dht/routing/Router.js +0 -1
- package/dist/src/dht/routing/Router.js.map +1 -1
- package/dist/src/dht/routing/RouterRpcLocal.d.ts +0 -1
- package/dist/src/dht/routing/RouterRpcLocal.js.map +1 -1
- package/dist/src/dht/routing/RouterRpcRemote.js +2 -2
- package/dist/src/dht/routing/RouterRpcRemote.js.map +1 -1
- package/dist/src/dht/routing/RoutingSession.js +2 -2
- package/dist/src/dht/routing/RoutingSession.js.map +1 -1
- package/dist/src/dht/store/LocalDataStore.js +2 -2
- package/dist/src/dht/store/LocalDataStore.js.map +1 -1
- package/dist/src/dht/store/StoreManager.js +1 -1
- package/dist/src/dht/store/StoreManager.js.map +1 -1
- package/dist/src/exports.d.ts +2 -2
- package/dist/src/exports.js +3 -3
- package/dist/src/exports.js.map +1 -1
- package/karma.config.js +4 -1
- package/package.json +6 -6
- package/src/connection/ConnectionLockRpcLocal.ts +1 -1
- package/src/connection/ConnectionLockRpcRemote.ts +2 -2
- package/src/connection/{ConnectionLockHandler.ts → ConnectionLockStates.ts} +1 -1
- package/src/connection/ConnectionManager.ts +11 -12
- package/src/connection/ConnectorFacade.ts +1 -1
- package/src/connection/ManagedConnection.ts +8 -8
- package/src/connection/connectivityChecker.ts +3 -3
- package/src/connection/connectivityRequestHandler.ts +4 -4
- package/src/connection/webrtc/BrowserWebrtcConnection.ts +18 -0
- package/src/connection/websocket/{ClientWebsocket.ts → AbstractWebsocketClientConnection.ts} +57 -70
- package/src/connection/websocket/BrowserWebsocketClientConnection.ts +44 -0
- package/src/connection/websocket/NodeWebsocketClientConnection.ts +39 -0
- package/src/connection/websocket/WebsocketConnector.ts +3 -3
- package/src/connection/websocket/WebsocketServerConnection.ts +1 -1
- package/src/dht/DhtNode.ts +13 -16
- package/src/dht/DhtNodeRpcRemote.ts +1 -1
- package/src/dht/PeerManager.ts +36 -46
- package/src/dht/contact/SortedContactList.ts +22 -18
- package/src/dht/discovery/DiscoverySession.ts +3 -1
- package/src/dht/discovery/PeerDiscovery.ts +8 -6
- package/src/dht/discovery/RingDiscoverySession.ts +3 -1
- package/src/dht/recursive-operation/RecursiveOperationManager.ts +1 -1
- package/src/dht/recursive-operation/RecursiveOperationRpcRemote.ts +1 -1
- package/src/dht/routing/Router.ts +0 -2
- package/src/dht/routing/RouterRpcLocal.ts +0 -1
- package/src/dht/routing/RouterRpcRemote.ts +2 -2
- package/src/dht/routing/RoutingSession.ts +2 -2
- package/src/dht/store/LocalDataStore.ts +1 -1
- package/src/dht/store/StoreManager.ts +1 -1
- package/src/exports.ts +2 -2
- package/test/benchmark/WebsocketServerMemoryLeak.test.ts +2 -2
- package/test/integration/Find.test.ts +2 -2
- package/test/integration/ReplicateData.test.ts +3 -3
- package/test/integration/Store.test.ts +2 -2
- package/test/integration/StoreAndDelete.test.ts +2 -2
- package/test/integration/Websocket.test.ts +2 -2
- package/test/unit/PeerManager.test.ts +42 -11
- package/test/unit/Router.test.ts +0 -1
- package/test/utils/utils.ts +17 -37
- package/tsconfig.browser.json +2 -1
- package/tsconfig.jest.json +2 -1
- package/tsconfig.node.json +2 -1
- package/dist/src/connection/ConnectionLockHandler.js.map +0 -1
- package/dist/src/connection/websocket/ClientWebsocket.d.ts +0 -17
- package/dist/src/connection/websocket/ClientWebsocket.js.map +0 -1
- package/dist/src/helpers/MapWithTtl.d.ts +0 -14
- package/dist/src/helpers/MapWithTtl.js +0 -60
- package/dist/src/helpers/MapWithTtl.js.map +0 -1
- package/src/helpers/MapWithTtl.ts +0 -71
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@streamr/dht",
|
|
3
|
-
"version": "100.
|
|
3
|
+
"version": "100.1.0",
|
|
4
4
|
"description": "Streamr Network DHT",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -31,10 +31,10 @@
|
|
|
31
31
|
"@js-sdsl/ordered-map": "^4.4.2",
|
|
32
32
|
"@protobuf-ts/runtime": "^2.8.2",
|
|
33
33
|
"@protobuf-ts/runtime-rpc": "^2.8.2",
|
|
34
|
-
"@streamr/autocertifier-client": "100.
|
|
35
|
-
"@streamr/cdn-location": "100.
|
|
36
|
-
"@streamr/proto-rpc": "100.
|
|
37
|
-
"@streamr/utils": "100.
|
|
34
|
+
"@streamr/autocertifier-client": "100.1.0",
|
|
35
|
+
"@streamr/cdn-location": "100.1.0",
|
|
36
|
+
"@streamr/proto-rpc": "100.1.0",
|
|
37
|
+
"@streamr/utils": "100.1.0",
|
|
38
38
|
"eventemitter3": "^5.0.0",
|
|
39
39
|
"heap": "^0.2.6",
|
|
40
40
|
"ipaddr.js": "^2.0.1",
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
},
|
|
50
50
|
"devDependencies": {
|
|
51
51
|
"@streamr/browser-test-runner": "^0.0.1",
|
|
52
|
-
"@streamr/test-utils": "100.
|
|
52
|
+
"@streamr/test-utils": "100.1.0",
|
|
53
53
|
"@types/express": "^4.17.21",
|
|
54
54
|
"@types/heap": "^0.2.34",
|
|
55
55
|
"@types/k-bucket": "^5.0.1",
|
|
@@ -2,7 +2,7 @@ import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
|
|
|
2
2
|
import { Empty } from '../proto/google/protobuf/empty';
|
|
3
3
|
import { DisconnectNotice, LockRequest, LockResponse, PeerDescriptor, UnlockRequest } from '../proto/packages/dht/protos/DhtRpc';
|
|
4
4
|
import { IConnectionLockRpc } from '../proto/packages/dht/protos/DhtRpc.server';
|
|
5
|
-
import { LockID } from './
|
|
5
|
+
import { LockID } from './ConnectionLockStates';
|
|
6
6
|
import { DhtAddress } from '../identifiers';
|
|
7
7
|
interface ConnectionLockRpcLocalConfig {
|
|
8
8
|
addRemoteLocked: (id: DhtAddress, lockId: LockID) => void;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { RpcRemote } from '../dht/contact/RpcRemote';
|
|
2
2
|
import { DisconnectMode } from '../proto/packages/dht/protos/DhtRpc';
|
|
3
3
|
import { ConnectionLockRpcClient } from '../proto/packages/dht/protos/DhtRpc.client';
|
|
4
|
-
import { LockID } from './
|
|
4
|
+
import { LockID } from './ConnectionLockStates';
|
|
5
5
|
export declare class ConnectionLockRpcRemote extends RpcRemote<ConnectionLockRpcClient> {
|
|
6
6
|
lockRequest(lockId: LockID): Promise<boolean>;
|
|
7
7
|
unlockRequest(lockId: LockID): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConnectionLockRpcRemote.js","sourceRoot":"","sources":["../../../src/connection/ConnectionLockRpcRemote.ts"],"names":[],"mappings":";;;AAAA,0CAAuC;AACvC,wDAAoD;AAIpD,gDAA4D;AAE5D,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,uBAAwB,SAAQ,qBAAkC;IAEpE,KAAK,CAAC,WAAW,CAAC,MAAc;QACnC,MAAM,CAAC,KAAK,CAAC,mCAAmC,IAAA,yCAA2B,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAA;QACxG,MAAM,OAAO,GAAgB;YACzB,MAAM;SACT,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAA;QACxC,IAAI,CAAC;YACD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YAChE,OAAO,GAAG,CAAC,QAAQ,CAAA;QACvB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"ConnectionLockRpcRemote.js","sourceRoot":"","sources":["../../../src/connection/ConnectionLockRpcRemote.ts"],"names":[],"mappings":";;;AAAA,0CAAuC;AACvC,wDAAoD;AAIpD,gDAA4D;AAE5D,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,uBAAwB,SAAQ,qBAAkC;IAEpE,KAAK,CAAC,WAAW,CAAC,MAAc;QACnC,MAAM,CAAC,KAAK,CAAC,mCAAmC,IAAA,yCAA2B,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAA;QACxG,MAAM,OAAO,GAAgB;YACzB,MAAM;SACT,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAA;QACxC,IAAI,CAAC;YACD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YAChE,OAAO,GAAG,CAAC,QAAQ,CAAA;QACvB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;YACjD,OAAO,KAAK,CAAA;QAChB,CAAC;IACL,CAAC;IAEM,aAAa,CAAC,MAAc;QAC/B,MAAM,CAAC,KAAK,CAAC,6CAA6C,IAAA,yCAA2B,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAA;QAClH,MAAM,OAAO,GAAkB;YAC3B,MAAM;SACT,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,YAAY,EAAE,IAAI;SACrB,CAAC,CAAA;QACF,IAAI,CAAC,SAAS,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE;YAC1D,MAAM,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAA;QAChD,CAAC,CAAC,CAAA;IACN,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,cAA8B;QAC1D,MAAM,CAAC,KAAK,CAAC,sCAAsC,IAAA,yCAA2B,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAA;QAC3G,MAAM,OAAO,GAAqB;YAC9B,cAAc;SACjB,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,KAAK;YACd,aAAa,EAAE,IAAI;YACnB,OAAO,EAAE,IAAI,CAAE,4CAA4C;SAC9D,CAAC,CAAA;QACF,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,kBAAkB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IAC/D,CAAC;CACJ;AA1CD,0DA0CC"}
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
// Connection locks are independent of the existence of connections
|
|
3
3
|
// that is why this class is needed
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.
|
|
6
|
-
class
|
|
5
|
+
exports.ConnectionLockStates = void 0;
|
|
6
|
+
class ConnectionLockStates {
|
|
7
7
|
localLocks = new Map();
|
|
8
8
|
remoteLocks = new Map();
|
|
9
9
|
// TODO: remove weakLocks use localLocks instead. When opening weakLocks from the ConnectioManager,
|
|
@@ -98,5 +98,5 @@ class ConnectionLockHandler {
|
|
|
98
98
|
this.weakLocks.clear();
|
|
99
99
|
}
|
|
100
100
|
}
|
|
101
|
-
exports.
|
|
102
|
-
//# sourceMappingURL=
|
|
101
|
+
exports.ConnectionLockStates = ConnectionLockStates;
|
|
102
|
+
//# sourceMappingURL=ConnectionLockStates.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ConnectionLockStates.js","sourceRoot":"","sources":["../../../src/connection/ConnectionLockStates.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { MetricsContext } from '@streamr/utils';
|
|
|
2
2
|
import { EventEmitter } from 'eventemitter3';
|
|
3
3
|
import { Message, PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc';
|
|
4
4
|
import { ITransport, SendOptions, TransportEvents } from '../transport/ITransport';
|
|
5
|
-
import { LockID } from './
|
|
5
|
+
import { LockID } from './ConnectionLockStates';
|
|
6
6
|
import { ConnectorFacade } from './ConnectorFacade';
|
|
7
7
|
import { ManagedConnection } from './ManagedConnection';
|
|
8
8
|
import { DhtAddress } from '../identifiers';
|
|
@@ -20,6 +20,9 @@ export interface ConnectionLocker {
|
|
|
20
20
|
unlockConnection(targetDescriptor: PeerDescriptor, lockId: LockID): void;
|
|
21
21
|
weakLockConnection(nodeId: DhtAddress, lockId: LockID): void;
|
|
22
22
|
weakUnlockConnection(nodeId: DhtAddress, lockId: LockID): void;
|
|
23
|
+
getLocalLockedConnectionCount(): number;
|
|
24
|
+
getRemoteLockedConnectionCount(): number;
|
|
25
|
+
getWeakLockedConnectionCount(): number;
|
|
23
26
|
}
|
|
24
27
|
export interface PortRange {
|
|
25
28
|
min: number;
|
|
@@ -42,7 +45,7 @@ export declare class ConnectionManager extends EventEmitter<TransportEvents> imp
|
|
|
42
45
|
private disconnectorIntervalRef?;
|
|
43
46
|
private state;
|
|
44
47
|
constructor(config: ConnectionManagerConfig);
|
|
45
|
-
garbageCollectConnections(maxConnections: number,
|
|
48
|
+
garbageCollectConnections(maxConnections: number, maxIdleTime: number): void;
|
|
46
49
|
start(): Promise<void>;
|
|
47
50
|
stop(): Promise<void>;
|
|
48
51
|
getLocalLockedConnectionCount(): number;
|
|
@@ -57,7 +60,6 @@ export declare class ConnectionManager extends EventEmitter<TransportEvents> imp
|
|
|
57
60
|
hasLocalLockedConnection(nodeId: DhtAddress): boolean;
|
|
58
61
|
hasRemoteLockedConnection(nodeId: DhtAddress): boolean;
|
|
59
62
|
private handleMessage;
|
|
60
|
-
handleIncomingMessage(message: Message): boolean;
|
|
61
63
|
private onData;
|
|
62
64
|
private onConnected;
|
|
63
65
|
private onDisconnected;
|
|
@@ -33,7 +33,7 @@ const DhtRpc_1 = require("../proto/packages/dht/protos/DhtRpc");
|
|
|
33
33
|
const DhtRpc_client_1 = require("../proto/packages/dht/protos/DhtRpc.client");
|
|
34
34
|
const ITransport_1 = require("../transport/ITransport");
|
|
35
35
|
const RoutingRpcCommunicator_1 = require("../transport/RoutingRpcCommunicator");
|
|
36
|
-
const
|
|
36
|
+
const ConnectionLockStates_1 = require("./ConnectionLockStates");
|
|
37
37
|
const ConnectionLockRpcRemote_1 = require("./ConnectionLockRpcRemote");
|
|
38
38
|
const NodeWebrtcConnection_1 = require("./webrtc/NodeWebrtcConnection");
|
|
39
39
|
const ConnectionLockRpcLocal_1 = require("./ConnectionLockRpcLocal");
|
|
@@ -77,7 +77,7 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
|
|
|
77
77
|
// TODO use config option or named constant?
|
|
78
78
|
duplicateMessageDetector = new DuplicateDetector_1.DuplicateDetector(10000);
|
|
79
79
|
metrics;
|
|
80
|
-
locks = new
|
|
80
|
+
locks = new ConnectionLockStates_1.ConnectionLockStates();
|
|
81
81
|
connections = new Map();
|
|
82
82
|
connectorFacade;
|
|
83
83
|
rpcCommunicator;
|
|
@@ -117,7 +117,11 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
|
|
|
117
117
|
this.rpcCommunicator.registerRpcNotification(DhtRpc_1.UnlockRequest, 'unlockRequest', (req, context) => lockRpcLocal.unlockRequest(req, context));
|
|
118
118
|
this.rpcCommunicator.registerRpcNotification(DhtRpc_1.DisconnectNotice, 'gracefulDisconnect', (req, context) => lockRpcLocal.gracefulDisconnect(req, context));
|
|
119
119
|
}
|
|
120
|
-
|
|
120
|
+
/*
|
|
121
|
+
* Removes connections if there are more than maxConnections: in that case we remove unlocked connections
|
|
122
|
+
* which hasn't been used within maxIdleTime.
|
|
123
|
+
*/
|
|
124
|
+
garbageCollectConnections(maxConnections, maxIdleTime) {
|
|
121
125
|
if (this.connections.size <= maxConnections) {
|
|
122
126
|
return;
|
|
123
127
|
}
|
|
@@ -136,7 +140,7 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
|
|
|
136
140
|
connection.close(false).catch(() => { });
|
|
137
141
|
this.connections.delete(key);
|
|
138
142
|
}
|
|
139
|
-
else if (!this.locks.isLocked(connection.getNodeId()) && Date.now() - connection.
|
|
143
|
+
else if (!this.locks.isLocked(connection.getNodeId()) && Date.now() - connection.getLastUsedTimestamp() > maxIdleTime) {
|
|
140
144
|
logger.trace('disconnecting in timeout interval: ' + (0, exports.getNodeIdOrUnknownFromPeerDescriptor)(connection.getPeerDescriptor()));
|
|
141
145
|
disconnectionCandidates.addContact(connection);
|
|
142
146
|
}
|
|
@@ -293,13 +297,6 @@ class ConnectionManager extends eventemitter3_1.EventEmitter {
|
|
|
293
297
|
this.emit('message', message);
|
|
294
298
|
}
|
|
295
299
|
}
|
|
296
|
-
handleIncomingMessage(message) {
|
|
297
|
-
if (message.serviceId === INTERNAL_SERVICE_ID) {
|
|
298
|
-
this.rpcCommunicator?.handleMessageFromPeer(message);
|
|
299
|
-
return true;
|
|
300
|
-
}
|
|
301
|
-
return false;
|
|
302
|
-
}
|
|
303
300
|
onData(data, peerDescriptor) {
|
|
304
301
|
if (this.state === ConnectionManagerState.STOPPED) {
|
|
305
302
|
return;
|
|
@@ -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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"}
|
|
@@ -70,7 +70,7 @@ class DefaultConnectorFacade {
|
|
|
70
70
|
}
|
|
71
71
|
}
|
|
72
72
|
catch (err) {
|
|
73
|
-
logger.warn('Failed to auto-certify, disabling WebSocket server TLS', {
|
|
73
|
+
logger.warn('Failed to auto-certify, disabling WebSocket server TLS', { err });
|
|
74
74
|
await this.restartWebsocketConnector({
|
|
75
75
|
...webSocketConnectorConfig,
|
|
76
76
|
serverEnableTls: false
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConnectorFacade.js","sourceRoot":"","sources":["../../../src/connection/ConnectorFacade.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ConnectorFacade.js","sourceRoot":"","sources":["../../../src/connection/ConnectorFacade.ts"],"names":[],"mappings":";;;AAAA,0CAAuC;AASvC,uEAAmE;AACnE,8DAAqE;AACrE,uEAA6F;AAc7F,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAwBjC,MAAa,sBAAsB;IAEd,MAAM,CAA8B;IAC7C,mBAAmB,CAAiB;IACpC,kBAAkB,CAAqB;IACvC,eAAe,CAAkB;IACzC,YAAY,MAAoC;QAC5C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,KAAK,CACP,eAA2D,EAC3D,aAA8C,EAC9C,sBAAkC;QAElC,MAAM,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAA;QACnD,MAAM,wBAAwB,GAAG;YAC7B,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS;YAChC,qEAAqE;YACrE,eAAe;YACf,aAAa;YACb,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,kBAAkB;YACzC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa;YAC/B,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW;YACpC,cAAc,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc;YAC1C,eAAe,EAAE,IAAI,CAAC,MAAM,CAAC,wBAAyB;YACtD,gBAAgB,EAAE,IAAI,CAAC,MAAM,CAAC,gBAAiB;YAC/C,uBAAuB,EAAE,IAAI,CAAC,MAAM,CAAC,uBAAwB;YAC7D,sBAAsB;YACtB,cAAc,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc;SAC7C,CAAA;QACD,IAAI,CAAC,kBAAkB,GAAG,IAAI,uCAAkB,CAAC,wBAAwB,CAAC,CAAA;QAC1E,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAA;QAChD,IAAI,CAAC,eAAe,GAAG,IAAI,iCAAe,CAAC;YACvC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS;YAChC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU;YAClC,qBAAqB,EAAE,IAAI,CAAC,MAAM,CAAC,2BAA2B;YAC9D,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,mCAAmC;YACnE,mBAAmB,EAAE,IAAI,CAAC,MAAM,CAAC,oCAAoC;YACrE,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,0BAA0B;YACzD,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU;YAClC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,eAAe;YACtC,cAAc,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc;SAC7C,EAAE,eAAe,CAAC,CAAA;QACnB,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAA;QACrC,wGAAwG;QACxG,qGAAqG;QACrG,yBAAyB;QACzB,2FAA2F;QAC3F,MAAM,qBAAqB,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,IAAI,IAAI,CAAC,MAAM,CAAC,wBAAwB,KAAK,IAAI,CAAC,CAAA;QAC5G,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,qBAAqB,CAAC,CAAA;QACnG,MAAM,mBAAmB,GAAG,IAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,oBAAoB,CAAC,CAAA;QACvF,IAAI,CAAC,sBAAsB,CAAC,mBAAmB,CAAC,CAAA;QAChD,IAAI,mBAAmB,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,IAAI,IAAI,CAAC,MAAM,CAAC,wBAAwB,EAAE,CAAC;YACvG,IAAI,CAAC;gBACD,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,EAAE,CAAA;gBAC3C,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAA;gBACnF,MAAM,gCAAgC,GAAG,IAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,oBAAoB,CAAC,CAAA;gBACpG,IAAI,gCAAgC,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;oBAC3D,IAAI,CAAC,sBAAsB,CAAC,gCAAgC,CAAC,CAAA;gBACjE,CAAC;qBAAM,CAAC;oBACJ,MAAM,CAAC,IAAI,CAAC,oFAAoF,CAAC,CAAA;oBACjG,MAAM,IAAI,CAAC,yBAAyB,CAAC;wBACjC,GAAG,wBAAwB;wBAC3B,eAAe,EAAE,KAAK;qBACzB,CAAC,CAAA;gBACN,CAAC;YACL,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,MAAM,CAAC,IAAI,CAAC,wDAAwD,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;gBAC9E,MAAM,IAAI,CAAC,yBAAyB,CAAC;oBACjC,GAAG,wBAAwB;oBAC3B,eAAe,EAAE,KAAK;iBACzB,CAAC,CAAA;YACN,CAAC;QACL,CAAC;IACL,CAAC;IAEO,sBAAsB,CAAC,cAA8B;QACzD,IAAI,CAAC,mBAAmB,GAAG,cAAc,CAAA;QACzC,IAAI,CAAC,kBAAmB,CAAC,sBAAsB,CAAC,cAAc,CAAC,CAAA;QAC/D,IAAI,CAAC,eAAgB,CAAC,sBAAsB,CAAC,cAAc,CAAC,CAAA;IAChE,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,wBAAkD;QAC9E,MAAM,IAAI,CAAC,kBAAmB,CAAC,OAAO,EAAE,CAAA;QACxC,IAAI,CAAC,kBAAkB,GAAG,IAAI,uCAAkB,CAAC,wBAAwB,CAAC,CAAA;QAC1E,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAA;QACrC,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAA;QACnF,MAAM,mBAAmB,GAAG,IAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,oBAAoB,CAAC,CAAA;QACvF,IAAI,CAAC,sBAAsB,CAAC,mBAAmB,CAAC,CAAA;IACpD,CAAC;IAED,gBAAgB,CAAC,cAA8B;QAC3C,IAAI,IAAI,CAAC,kBAAmB,CAAC,0BAA0B,CAAC,cAAc,CAAC,EAAE,CAAC;YACtE,OAAO,IAAI,CAAC,kBAAmB,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;QAC3D,CAAC;aAAM,CAAC;YACJ,OAAO,IAAI,CAAC,eAAgB,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;QACxD,CAAC;IACL,CAAC;IAED,sBAAsB;QAClB,OAAO,IAAI,CAAC,mBAAmB,CAAA;IACnC,CAAC;IAED,KAAK,CAAC,IAAI;QACN,MAAM,IAAI,CAAC,kBAAmB,CAAC,OAAO,EAAE,CAAA;QACxC,MAAM,IAAI,CAAC,eAAgB,CAAC,IAAI,EAAE,CAAA;IACtC,CAAC;CACJ;AA5GD,wDA4GC;AAED,MAAa,wBAAwB;IAEhB,mBAAmB,CAAgB;IAC5C,kBAAkB,CAAqB;IACvC,SAAS,CAAW;IAE5B,YAAY,mBAAmC,EAAE,SAAoB;QACjE,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAA;QAC9C,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;IAC9B,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,eAA2D;QACnE,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAA;QAC3C,IAAI,CAAC,kBAAkB,GAAG,IAAI,uCAAkB,CAC5C,IAAI,CAAC,mBAAmB,EACxB,IAAI,CAAC,SAAS,EACd,eAAe,CAClB,CAAA;QACD,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAA;IACxD,CAAC;IAED,gBAAgB,CAAC,cAA8B;QAC3C,OAAO,IAAI,CAAC,kBAAmB,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;IAC3D,CAAC;IAED,sBAAsB;QAClB,OAAO,IAAI,CAAC,mBAAmB,CAAA;IACnC,CAAC;IAED,KAAK,CAAC,IAAI;QACN,MAAM,IAAI,CAAC,kBAAmB,CAAC,IAAI,EAAE,CAAA;IACzC,CAAC;CACJ;AAhCD,4DAgCC"}
|
|
@@ -19,7 +19,7 @@ export declare class ManagedConnection extends EventEmitter<Events> {
|
|
|
19
19
|
connectionType: ConnectionType;
|
|
20
20
|
private handshaker?;
|
|
21
21
|
private handshakeCompleted;
|
|
22
|
-
private
|
|
22
|
+
private lastUsedTimestamp;
|
|
23
23
|
private stopped;
|
|
24
24
|
private bufferSentbyOtherConnection;
|
|
25
25
|
private closing;
|
|
@@ -32,7 +32,7 @@ export declare class ManagedConnection extends EventEmitter<Events> {
|
|
|
32
32
|
on(event: keyof Events, fn: (...args: any) => void, context?: any): this;
|
|
33
33
|
once(event: keyof Events, fn: (...args: any) => void, context?: any): this;
|
|
34
34
|
getNodeId(): DhtAddress;
|
|
35
|
-
|
|
35
|
+
getLastUsedTimestamp(): number;
|
|
36
36
|
setRemotePeerDescriptor(peerDescriptor: PeerDescriptor): void;
|
|
37
37
|
getPeerDescriptor(): PeerDescriptor | undefined;
|
|
38
38
|
private onHandshakeCompleted;
|
|
@@ -46,7 +46,7 @@ class ManagedConnection extends eventemitter3_1.default {
|
|
|
46
46
|
connectionType;
|
|
47
47
|
handshaker;
|
|
48
48
|
handshakeCompleted = false;
|
|
49
|
-
|
|
49
|
+
lastUsedTimestamp = Date.now();
|
|
50
50
|
stopped = false;
|
|
51
51
|
bufferSentbyOtherConnection = false;
|
|
52
52
|
closing = false;
|
|
@@ -142,8 +142,8 @@ class ManagedConnection extends eventemitter3_1.default {
|
|
|
142
142
|
getNodeId() {
|
|
143
143
|
return (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.remotePeerDescriptor);
|
|
144
144
|
}
|
|
145
|
-
|
|
146
|
-
return this.
|
|
145
|
+
getLastUsedTimestamp() {
|
|
146
|
+
return this.lastUsedTimestamp;
|
|
147
147
|
}
|
|
148
148
|
setRemotePeerDescriptor(peerDescriptor) {
|
|
149
149
|
this.remotePeerDescriptor = peerDescriptor;
|
|
@@ -152,7 +152,7 @@ class ManagedConnection extends eventemitter3_1.default {
|
|
|
152
152
|
return this.remotePeerDescriptor;
|
|
153
153
|
}
|
|
154
154
|
onHandshakeCompleted(peerDescriptor) {
|
|
155
|
-
this.
|
|
155
|
+
this.lastUsedTimestamp = Date.now();
|
|
156
156
|
this.setRemotePeerDescriptor(peerDescriptor);
|
|
157
157
|
this.handshakeCompleted = true;
|
|
158
158
|
this.handshaker.stop();
|
|
@@ -168,7 +168,7 @@ class ManagedConnection extends eventemitter3_1.default {
|
|
|
168
168
|
logger.trace('attachImplementation()');
|
|
169
169
|
this.implementation = impl;
|
|
170
170
|
impl.on('data', (bytes) => {
|
|
171
|
-
this.
|
|
171
|
+
this.lastUsedTimestamp = Date.now();
|
|
172
172
|
if (this.listenerCount('managedData') === 0) {
|
|
173
173
|
this.inputBuffer.push(bytes);
|
|
174
174
|
}
|
|
@@ -180,7 +180,7 @@ class ManagedConnection extends eventemitter3_1.default {
|
|
|
180
180
|
this.emit('error', name);
|
|
181
181
|
});
|
|
182
182
|
impl.on('connected', () => {
|
|
183
|
-
this.
|
|
183
|
+
this.lastUsedTimestamp = Date.now();
|
|
184
184
|
logger.trace('connected emitted');
|
|
185
185
|
this.emit('connected');
|
|
186
186
|
});
|
|
@@ -203,7 +203,7 @@ class ManagedConnection extends eventemitter3_1.default {
|
|
|
203
203
|
if (this.closing) {
|
|
204
204
|
throw new Err.SendFailed('ManagedConnection is closing');
|
|
205
205
|
}
|
|
206
|
-
this.
|
|
206
|
+
this.lastUsedTimestamp = Date.now();
|
|
207
207
|
if (!connect && !this.implementation) {
|
|
208
208
|
throw new Err.ConnectionNotOpen('Connection not open when calling send() with connect flag as false');
|
|
209
209
|
}
|
|
@@ -232,7 +232,7 @@ class ManagedConnection extends eventemitter3_1.default {
|
|
|
232
232
|
}
|
|
233
233
|
}
|
|
234
234
|
sendNoWait(data) {
|
|
235
|
-
this.
|
|
235
|
+
this.lastUsedTimestamp = Date.now();
|
|
236
236
|
if (this.implementation) {
|
|
237
237
|
this.implementation.send(data);
|
|
238
238
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ManagedConnection.js","sourceRoot":"","sources":["../../../src/connection/ManagedConnection.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uDAAwC;AACxC,6CAAyC;AACzC,gEAAoF;AACpF,0CAAsF;AACtF,kEAAwC;AACxC,2DAA0E;AAC1E,gDAAwE;AACxE,6CAAuD;AAcvD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAIjC,MAAa,iBAAkB,SAAQ,uBAAoB;IAE/C,cAAc,CAAc;IAC5B,mBAAmB,GAAG,IAAI,uBAAY,EAAsB,CAAA;IAC5D,YAAY,GAAiB,EAAE,CAAA;IAC/B,WAAW,GAAiB,EAAE,CAAA;IAC/B,YAAY,CAAc;IACzB,oBAAoB,CAAiB;IACtC,cAAc,CAAgB;IAC7B,UAAU,CAAa;IACvB,kBAAkB,GAAG,KAAK,CAAA;IAC1B,
|
|
1
|
+
{"version":3,"file":"ManagedConnection.js","sourceRoot":"","sources":["../../../src/connection/ManagedConnection.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,13 +28,13 @@ const utils_1 = require("@streamr/utils");
|
|
|
28
28
|
const uuid_1 = require("uuid");
|
|
29
29
|
const Err = __importStar(require("../helpers/errors"));
|
|
30
30
|
const DhtRpc_1 = require("../proto/packages/dht/protos/DhtRpc");
|
|
31
|
-
const
|
|
31
|
+
const NodeWebsocketClientConnection_1 = require("./websocket/NodeWebsocketClientConnection");
|
|
32
32
|
const WebsocketConnector_1 = require("./websocket/WebsocketConnector");
|
|
33
33
|
const version_1 = require("../helpers/version");
|
|
34
34
|
const logger = new utils_1.Logger(module);
|
|
35
35
|
// TODO use config option or named constant?
|
|
36
36
|
const connectAsync = async ({ url, selfSigned, timeoutMs = 1000 }) => {
|
|
37
|
-
const socket = new
|
|
37
|
+
const socket = new NodeWebsocketClientConnection_1.WebsocketClientConnection();
|
|
38
38
|
let result;
|
|
39
39
|
try {
|
|
40
40
|
result = await (0, utils_1.runAndRaceEvents3)([
|
|
@@ -109,7 +109,7 @@ const sendConnectivityRequest = async (request, entryPoint) => {
|
|
|
109
109
|
}
|
|
110
110
|
}
|
|
111
111
|
catch (err) {
|
|
112
|
-
logger.trace(
|
|
112
|
+
logger.trace('Could not parse message', { err });
|
|
113
113
|
}
|
|
114
114
|
};
|
|
115
115
|
outgoingConnection.on('data', listener);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connectivityChecker.js","sourceRoot":"","sources":["../../../src/connection/connectivityChecker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAsF;AACtF,+BAAyB;AACzB,uDAAwC;AACxC,gEAG4C;AAE5C,
|
|
1
|
+
{"version":3,"file":"connectivityChecker.js","sourceRoot":"","sources":["../../../src/connection/connectivityChecker.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,13 +21,13 @@ const attachConnectivityRequestHandler = (connectionToListenTo) => {
|
|
|
21
21
|
await handleIncomingConnectivityRequest(connectionToListenTo, message.body.connectivityRequest);
|
|
22
22
|
logger.trace('handleIncomingConnectivityRequest ok');
|
|
23
23
|
}
|
|
24
|
-
catch (
|
|
25
|
-
logger.error('handleIncomingConnectivityRequest', {
|
|
24
|
+
catch (err1) {
|
|
25
|
+
logger.error('handleIncomingConnectivityRequest', { err: err1 });
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
|
-
catch (
|
|
30
|
-
logger.trace(
|
|
29
|
+
catch (err2) {
|
|
30
|
+
logger.trace('Could not parse message', { err: err2 });
|
|
31
31
|
}
|
|
32
32
|
});
|
|
33
33
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connectivityRequestHandler.js","sourceRoot":"","sources":["../../../src/connection/connectivityRequestHandler.ts"],"names":[],"mappings":";;;AAAA,0CAAqD;AACrD,+BAAyB;AACzB,gEAI4C;AAC5C,2DAA6C;AAC7C,+DAAqF;AAGrF,uEAAiF;AACjF,gDAA2D;AAE9C,QAAA,0BAA0B,GAAG,CAAC,CAAA;AAE3C,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAE1B,MAAM,gCAAgC,GAAG,CAAC,oBAA+C,EAAQ,EAAE;IACtG,oBAAoB,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,IAAgB,EAAE,EAAE;QACvD,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAA;QACpC,IAAI,CAAC;YACD,MAAM,OAAO,GAAG,gBAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;YACxC,IAAI,OAAO,CAAC,IAAI,CAAC,SAAS,KAAK,qBAAqB,EAAE,CAAC;gBACnD,MAAM,CAAC,KAAK,CAAC,gCAAgC,GAAG,IAAI,CAAC,SAAS,CAAC,gBAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;gBACxF,IAAI,CAAC;oBACD,MAAM,iCAAiC,CAAC,oBAAoB,EAAE,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;oBAC/F,MAAM,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAA;gBACxD,CAAC;gBAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"connectivityRequestHandler.js","sourceRoot":"","sources":["../../../src/connection/connectivityRequestHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
2
|
+
import EventEmitter from 'eventemitter3';
|
|
3
|
+
import { ConnectionEvents, ConnectionID, ConnectionType, IConnection } from '../IConnection';
|
|
4
|
+
export interface Socket {
|
|
5
|
+
binaryType: string;
|
|
6
|
+
readyState: number;
|
|
7
|
+
close(code?: number, reason?: string): void;
|
|
8
|
+
send(data: string | Buffer | ArrayBuffer | ArrayBufferView): void;
|
|
9
|
+
}
|
|
10
|
+
export declare const GOING_AWAY = 1001;
|
|
11
|
+
export declare const CUSTOM_GOING_AWAY = 3001;
|
|
12
|
+
export declare abstract class AbstractWebsocketClientConnection extends EventEmitter<ConnectionEvents> implements IConnection {
|
|
13
|
+
readonly connectionId: ConnectionID;
|
|
14
|
+
protected abstract socket?: Socket;
|
|
15
|
+
connectionType: ConnectionType;
|
|
16
|
+
protected destroyed: boolean;
|
|
17
|
+
constructor();
|
|
18
|
+
abstract connect(address: string, selfSigned?: boolean): void;
|
|
19
|
+
protected abstract stopListening(): void;
|
|
20
|
+
send(data: Uint8Array): void;
|
|
21
|
+
close(gracefulLeave: boolean): Promise<void>;
|
|
22
|
+
destroy(): void;
|
|
23
|
+
protected onOpen(): void;
|
|
24
|
+
protected onMessage(message: Uint8Array): void;
|
|
25
|
+
protected onClose(code: number, reason: string): void;
|
|
26
|
+
protected onError(error: Error): void;
|
|
27
|
+
protected doDisconnect(code?: number, reason?: string): void;
|
|
28
|
+
}
|