@streamr/dht 0.0.1-tatum.5 → 0.0.1-tatum.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/connection/ConnectionLockHandler.d.ts +1 -1
- package/dist/src/connection/ConnectionLockHandler.js.map +1 -1
- package/dist/src/connection/ConnectionManager.d.ts +17 -39
- package/dist/src/connection/ConnectionManager.js +138 -192
- package/dist/src/connection/ConnectionManager.js.map +1 -1
- package/dist/src/connection/ConnectivityChecker.js +14 -11
- package/dist/src/connection/ConnectivityChecker.js.map +1 -1
- package/dist/src/connection/ConnectorFacade.d.ts +49 -0
- package/dist/src/connection/ConnectorFacade.js +86 -0
- package/dist/src/connection/ConnectorFacade.js.map +1 -0
- package/dist/src/connection/ManagedConnection.d.ts +1 -4
- package/dist/src/connection/ManagedConnection.js +23 -31
- package/dist/src/connection/ManagedConnection.js.map +1 -1
- package/dist/src/connection/RemoteConnectionLocker.js +4 -3
- package/dist/src/connection/RemoteConnectionLocker.js.map +1 -1
- package/dist/src/connection/Simulator/Simulator.d.ts +0 -2
- package/dist/src/connection/Simulator/Simulator.js +0 -5
- package/dist/src/connection/Simulator/Simulator.js.map +1 -1
- package/dist/src/connection/Simulator/SimulatorConnection.js +16 -13
- package/dist/src/connection/Simulator/SimulatorConnection.js.map +1 -1
- package/dist/src/connection/Simulator/SimulatorConnector.d.ts +2 -2
- package/dist/src/connection/Simulator/SimulatorConnector.js +10 -11
- package/dist/src/connection/Simulator/SimulatorConnector.js.map +1 -1
- package/dist/src/connection/Simulator/SimulatorTransport.js +6 -1
- package/dist/src/connection/Simulator/SimulatorTransport.js.map +1 -1
- package/dist/src/connection/WebRTC/NodeWebRtcConnection.d.ts +2 -0
- package/dist/src/connection/WebRTC/NodeWebRtcConnection.js +12 -12
- package/dist/src/connection/WebRTC/NodeWebRtcConnection.js.map +1 -1
- package/dist/src/connection/WebRTC/WebRtcConnector.d.ts +9 -9
- package/dist/src/connection/WebRTC/WebRtcConnector.js +22 -22
- package/dist/src/connection/WebRTC/WebRtcConnector.js.map +1 -1
- package/dist/src/connection/WebSocket/RemoteWebSocketConnector.js +2 -1
- package/dist/src/connection/WebSocket/RemoteWebSocketConnector.js.map +1 -1
- package/dist/src/connection/WebSocket/WebSocketConnector.d.ts +19 -8
- package/dist/src/connection/WebSocket/WebSocketConnector.js +67 -46
- package/dist/src/connection/WebSocket/WebSocketConnector.js.map +1 -1
- package/dist/src/connection/WebSocket/WebSocketServer.d.ts +11 -1
- package/dist/src/connection/WebSocket/WebSocketServer.js +15 -10
- package/dist/src/connection/WebSocket/WebSocketServer.js.map +1 -1
- package/dist/src/dht/DhtNode.d.ts +16 -54
- package/dist/src/dht/DhtNode.js +116 -137
- package/dist/src/dht/DhtNode.js.map +1 -1
- package/dist/src/dht/{DhtPeer.d.ts → RemoteDhtNode.d.ts} +3 -2
- package/dist/src/dht/{DhtPeer.js → RemoteDhtNode.js} +22 -16
- package/dist/src/dht/RemoteDhtNode.js.map +1 -0
- package/dist/src/dht/contact/Contact.d.ts +1 -15
- package/dist/src/dht/contact/Contact.js +1 -9
- package/dist/src/dht/contact/Contact.js.map +1 -1
- package/dist/src/dht/contact/ContactList.d.ts +13 -3
- package/dist/src/dht/contact/ContactList.js +9 -4
- package/dist/src/dht/contact/ContactList.js.map +1 -1
- package/dist/src/dht/contact/RandomContactList.d.ts +3 -3
- package/dist/src/dht/contact/RandomContactList.js +4 -8
- package/dist/src/dht/contact/RandomContactList.js.map +1 -1
- package/dist/src/dht/contact/Remote.d.ts +1 -5
- package/dist/src/dht/contact/Remote.js +0 -5
- package/dist/src/dht/contact/Remote.js.map +1 -1
- package/dist/src/dht/contact/SortedContactList.d.ts +3 -5
- package/dist/src/dht/contact/SortedContactList.js +9 -19
- package/dist/src/dht/contact/SortedContactList.js.map +1 -1
- package/dist/src/dht/discovery/DiscoverySession.d.ts +5 -7
- package/dist/src/dht/discovery/DiscoverySession.js +9 -10
- package/dist/src/dht/discovery/DiscoverySession.js.map +1 -1
- package/dist/src/dht/discovery/PeerDiscovery.d.ts +11 -10
- package/dist/src/dht/discovery/PeerDiscovery.js +32 -37
- package/dist/src/dht/discovery/PeerDiscovery.js.map +1 -1
- package/dist/src/dht/find/RecursiveFindSession.d.ts +5 -6
- package/dist/src/dht/find/RecursiveFindSession.js +8 -8
- package/dist/src/dht/find/RecursiveFindSession.js.map +1 -1
- package/dist/src/dht/find/RecursiveFinder.d.ts +2 -4
- package/dist/src/dht/find/RecursiveFinder.js +11 -12
- package/dist/src/dht/find/RecursiveFinder.js.map +1 -1
- package/dist/src/dht/registerExternalApiRpcMethods.d.ts +1 -1
- package/dist/src/dht/routing/DuplicateDetector.d.ts +1 -2
- package/dist/src/dht/routing/DuplicateDetector.js +2 -7
- package/dist/src/dht/routing/DuplicateDetector.js.map +1 -1
- package/dist/src/dht/routing/RemoteRouter.js +4 -4
- package/dist/src/dht/routing/RemoteRouter.js.map +1 -1
- package/dist/src/dht/routing/Router.d.ts +10 -13
- package/dist/src/dht/routing/Router.js +28 -29
- package/dist/src/dht/routing/Router.js.map +1 -1
- package/dist/src/dht/routing/RoutingSession.d.ts +3 -5
- package/dist/src/dht/routing/RoutingSession.js +19 -13
- package/dist/src/dht/routing/RoutingSession.js.map +1 -1
- package/dist/src/dht/store/DataStore.d.ts +2 -2
- package/dist/src/dht/store/DataStore.js +7 -7
- package/dist/src/dht/store/DataStore.js.map +1 -1
- package/dist/src/exports.d.ts +1 -8
- package/dist/src/exports.js +2 -16
- package/dist/src/exports.js.map +1 -1
- package/dist/src/helpers/PeerID.d.ts +0 -1
- package/dist/src/helpers/PeerID.js +0 -6
- package/dist/src/helpers/PeerID.js.map +1 -1
- package/dist/src/helpers/browser/isBrowserEnvironment.d.ts +1 -0
- package/dist/src/helpers/browser/isBrowserEnvironment.js +6 -0
- package/dist/src/helpers/browser/isBrowserEnvironment.js.map +1 -0
- package/dist/src/helpers/browser/isBrowserEnvironment_override.d.ts +1 -0
- package/dist/src/helpers/browser/isBrowserEnvironment_override.js +7 -0
- package/dist/src/helpers/browser/isBrowserEnvironment_override.js.map +1 -0
- package/dist/src/helpers/kademliaId.d.ts +1 -0
- package/dist/src/helpers/kademliaId.js +14 -0
- package/dist/src/helpers/kademliaId.js.map +1 -0
- package/dist/src/helpers/peerIdFromPeerDescriptor.d.ts +1 -1
- package/dist/src/helpers/peerIdFromPeerDescriptor.js +3 -3
- package/dist/src/helpers/peerIdFromPeerDescriptor.js.map +1 -1
- package/dist/src/proto/packages/dht/protos/DhtRpc.d.ts +0 -4
- package/dist/src/proto/packages/dht/protos/DhtRpc.js +1 -2
- package/dist/src/proto/packages/dht/protos/DhtRpc.js.map +1 -1
- package/package.json +10 -9
- package/protos/DhtRpc.proto +0 -1
- package/src/connection/ConnectionLockHandler.ts +1 -1
- package/src/connection/ConnectionManager.ts +156 -240
- package/src/connection/ConnectivityChecker.ts +14 -11
- package/src/connection/ConnectorFacade.ts +143 -0
- package/src/connection/ManagedConnection.ts +23 -34
- package/src/connection/RemoteConnectionLocker.ts +4 -3
- package/src/connection/Simulator/Simulator.ts +0 -7
- package/src/connection/Simulator/SimulatorConnection.ts +16 -13
- package/src/connection/Simulator/SimulatorConnector.ts +11 -12
- package/src/connection/Simulator/SimulatorTransport.ts +6 -1
- package/src/connection/WebRTC/NodeWebRtcConnection.ts +14 -13
- package/src/connection/WebRTC/WebRtcConnector.ts +31 -31
- package/src/connection/WebSocket/RemoteWebSocketConnector.ts +2 -1
- package/src/connection/WebSocket/WebSocketConnector.ts +85 -62
- package/src/connection/WebSocket/WebSocketServer.ts +26 -8
- package/src/dht/DhtNode.ts +164 -189
- package/src/dht/{DhtPeer.ts → RemoteDhtNode.ts} +14 -7
- package/src/dht/contact/Contact.ts +1 -18
- package/src/dht/contact/ContactList.ts +16 -6
- package/src/dht/contact/RandomContactList.ts +6 -11
- package/src/dht/contact/Remote.ts +1 -10
- package/src/dht/contact/SortedContactList.ts +12 -25
- package/src/dht/discovery/DiscoverySession.ts +20 -23
- package/src/dht/discovery/PeerDiscovery.ts +45 -44
- package/src/dht/find/RecursiveFindSession.ts +12 -13
- package/src/dht/find/RecursiveFinder.ts +16 -19
- package/src/dht/registerExternalApiRpcMethods.ts +1 -1
- package/src/dht/routing/DuplicateDetector.ts +3 -10
- package/src/dht/routing/RemoteRouter.ts +5 -5
- package/src/dht/routing/Router.ts +35 -39
- package/src/dht/routing/RoutingSession.ts +37 -28
- package/src/dht/store/DataStore.ts +11 -11
- package/src/exports.ts +1 -8
- package/src/helpers/PeerID.ts +0 -7
- package/src/helpers/browser/isBrowserEnvironment.ts +1 -0
- package/src/helpers/browser/isBrowserEnvironment_override.ts +3 -0
- package/src/helpers/kademliaId.ts +8 -0
- package/src/helpers/peerIdFromPeerDescriptor.ts +1 -1
- package/src/proto/packages/dht/protos/DhtRpc.ts +1 -6
- package/test/benchmark/KademliaCorrectness.test.ts +5 -2
- package/test/benchmark/RecursiveFind.test.ts +6 -6
- package/test/end-to-end/Layer0-Layer1.test.ts +14 -14
- package/test/end-to-end/Layer0WebRTC-Layer1.test.ts +5 -5
- package/test/end-to-end/Layer0WebRTC.test.ts +5 -6
- package/test/end-to-end/Layer1-Scale-WebRTC.test.ts +13 -8
- package/test/end-to-end/Layer1-Scale-WebSocket.test.ts +15 -10
- package/test/end-to-end/WebSocketConnectionRequest.test.ts +5 -5
- package/test/integration/ConnectionLocking.test.ts +32 -26
- package/test/integration/ConnectionManager.test.ts +90 -93
- package/test/integration/DhtJoinPeerDiscovery.test.ts +53 -0
- package/test/integration/DhtRpc.test.ts +4 -6
- package/test/integration/Layer1-scale.test.ts +8 -8
- package/test/integration/MigrateData.test.ts +9 -9
- package/test/integration/Mock-Layer1-Layer0.test.ts +1 -2
- package/test/integration/RecursiveFind.test.ts +5 -5
- package/test/integration/{DhtPeer.test.ts → RemoteDhtNode.test.ts} +11 -12
- package/test/integration/RemoteRouter.test.ts +5 -6
- package/test/integration/RemoteStore.test.ts +4 -5
- package/test/integration/RouteMessage.test.ts +7 -9
- package/test/integration/RpcErrors.test.ts +25 -10
- package/test/integration/ScaleDownDht.test.ts +8 -8
- package/test/integration/SimultaneousConnections.test.ts +35 -36
- package/test/integration/Store.test.ts +8 -9
- package/test/integration/StoreAndDelete.test.ts +11 -11
- package/test/integration/StoreOnDhtWithTwoNodes.test.ts +7 -7
- package/test/integration/WebRtcConnectionManagement.test.ts +26 -19
- package/test/integration/WebRtcConnectorRpc.test.ts +6 -8
- package/test/integration/WebSocket.test.ts +4 -2
- package/test/integration/WebSocketConnectionManagement.test.ts +30 -17
- package/test/integration/WebSocketConnectorRpc.test.ts +2 -3
- package/test/unit/DuplicateDetector.test.ts +3 -4
- package/test/unit/LocalDataStore.test.ts +6 -8
- package/test/unit/RandomContactList.test.ts +25 -74
- package/test/unit/RecursiveFinder.test.ts +8 -12
- package/test/unit/Router.test.ts +18 -21
- package/test/unit/SortedContactList.test.ts +62 -112
- package/test/unit/WebSocketConnector.test.ts +64 -0
- package/test/unit/WebSocketServer.test.ts +24 -12
- package/test/utils/mock/RecursiveFinder.ts +2 -2
- package/test/utils/mock/Router.ts +9 -11
- package/test/utils/mock/Transport.ts +2 -2
- package/test/utils/utils.ts +40 -49
- package/dist/src/dht/DhtPeer.js.map +0 -1
- package/dist/src/helpers/browser/isBrowser.d.ts +0 -1
- package/dist/src/helpers/browser/isBrowser.js +0 -6
- package/dist/src/helpers/browser/isBrowser.js.map +0 -1
- package/dist/src/helpers/browser/isNodeJS.d.ts +0 -1
- package/dist/src/helpers/browser/isNodeJS.js +0 -6
- package/dist/src/helpers/browser/isNodeJS.js.map +0 -1
- package/src/helpers/browser/isBrowser.ts +0 -1
- package/src/helpers/browser/isNodeJS.ts +0 -1
- package/test/integration/DhtWithMockConnectionLatencies.test.ts +0 -46
- package/test/integration/DhtWithMockConnections.test.ts +0 -46
- package/test/integration/DhtWithRealConnectionLatencies.test.ts +0 -47
- /package/test/unit/{webrtcReplaceInternalIpWithExternalIp.ts → webrtcReplaceInternalIpWithExternalIp.test.ts} +0 -0
|
@@ -26,6 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
26
26
|
exports.RemoteConnectionLocker = void 0;
|
|
27
27
|
const utils_1 = require("@streamr/utils");
|
|
28
28
|
const Err = __importStar(require("../helpers/errors"));
|
|
29
|
+
const peerIdFromPeerDescriptor_1 = require("../helpers/peerIdFromPeerDescriptor");
|
|
29
30
|
const logger = new utils_1.Logger(module);
|
|
30
31
|
class RemoteConnectionLocker {
|
|
31
32
|
constructor(ownPeerDescriptor, targetPeerDescriptor, protocolVersion, client) {
|
|
@@ -35,7 +36,7 @@ class RemoteConnectionLocker {
|
|
|
35
36
|
this.client = client;
|
|
36
37
|
}
|
|
37
38
|
async lockRequest(serviceId) {
|
|
38
|
-
logger.trace(`Requesting locked connection to ${this.targetPeerDescriptor
|
|
39
|
+
logger.trace(`Requesting locked connection to ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.targetPeerDescriptor)}`);
|
|
39
40
|
const request = {
|
|
40
41
|
peerDescriptor: this.ownPeerDescriptor,
|
|
41
42
|
protocolVersion: this.protocolVersion,
|
|
@@ -55,7 +56,7 @@ class RemoteConnectionLocker {
|
|
|
55
56
|
}
|
|
56
57
|
}
|
|
57
58
|
unlockRequest(serviceId) {
|
|
58
|
-
logger.trace(`Requesting connection to be unlocked from ${this.targetPeerDescriptor
|
|
59
|
+
logger.trace(`Requesting connection to be unlocked from ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.targetPeerDescriptor)}`);
|
|
59
60
|
const request = {
|
|
60
61
|
peerDescriptor: this.ownPeerDescriptor,
|
|
61
62
|
protocolVersion: this.protocolVersion,
|
|
@@ -71,7 +72,7 @@ class RemoteConnectionLocker {
|
|
|
71
72
|
});
|
|
72
73
|
}
|
|
73
74
|
async gracefulDisconnect(disconnecMode) {
|
|
74
|
-
logger.trace(`Notifying a graceful disconnect to ${this.targetPeerDescriptor
|
|
75
|
+
logger.trace(`Notifying a graceful disconnect to ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.targetPeerDescriptor)}`);
|
|
75
76
|
const request = {
|
|
76
77
|
peerDescriptor: this.ownPeerDescriptor,
|
|
77
78
|
protocolVersion: this.protocolVersion,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RemoteConnectionLocker.js","sourceRoot":"","sources":["../../../src/connection/RemoteConnectionLocker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAuC;AAMvC,uDAAwC;
|
|
1
|
+
{"version":3,"file":"RemoteConnectionLocker.js","sourceRoot":"","sources":["../../../src/connection/RemoteConnectionLocker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAuC;AAMvC,uDAAwC;AACxC,kFAA2E;AAE3E,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,sBAAsB;IAM/B,YACI,iBAAiC,EACjC,oBAAoC,EACpC,eAAuB,EACvB,MAA+C;QAE/C,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;QAC1C,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAA;QAChD,IAAI,CAAC,eAAe,GAAG,eAAe,CAAA;QACtC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,SAAiB;QACtC,MAAM,CAAC,KAAK,CAAC,mCAAmC,IAAA,gDAAqB,EAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAA;QACnG,MAAM,OAAO,GAAgB;YACzB,cAAc,EAAE,IAAI,CAAC,iBAAiB;YACtC,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,SAAS;SACZ,CAAA;QACD,MAAM,OAAO,GAAkB;YAC3B,gBAAgB,EAAE,IAAI,CAAC,iBAAiB;YACxC,gBAAgB,EAAE,IAAI,CAAC,oBAAoB;SAC9C,CAAA;QACD,IAAI;YACA,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YAC3D,OAAO,GAAG,CAAC,QAAQ,CAAA;SACtB;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,gBAAgB,CAAC,0BAA0B,EAAE,GAAG,CAAC,CAAC,KAAM,CAAC,CAAA;YAC9E,OAAO,KAAK,CAAA;SACf;IACL,CAAC;IAEM,aAAa,CAAC,SAAiB;QAClC,MAAM,CAAC,KAAK,CAAC,6CAA6C,IAAA,gDAAqB,EAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAA;QAC7G,MAAM,OAAO,GAAkB;YAC3B,cAAc,EAAE,IAAI,CAAC,iBAAiB;YACtC,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,SAAS;SACZ,CAAA;QACD,MAAM,OAAO,GAAkB;YAC3B,gBAAgB,EAAE,IAAI,CAAC,iBAAiB;YACxC,gBAAgB,EAAE,IAAI,CAAC,oBAAoB;YAC3C,YAAY,EAAE,IAAI;SACrB,CAAA;QAED,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE;YACrD,MAAM,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAA;QAChD,CAAC,CAAC,CAAA;IAEN,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,aAA6B;QACzD,MAAM,CAAC,KAAK,CAAC,sCAAsC,IAAA,gDAAqB,EAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAA;QACtG,MAAM,OAAO,GAAqB;YAC9B,cAAc,EAAE,IAAI,CAAC,iBAAiB;YACtC,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,aAAa;SAChB,CAAA;QACD,MAAM,OAAO,GAAG;YACZ,gBAAgB,EAAE,IAAI,CAAC,iBAAiB;YACxC,gBAAgB,EAAE,IAAI,CAAC,oBAAoB;YAC3C,YAAY,EAAE,IAAI;YAClB,gBAAgB,EAAE,IAAI;YACtB,OAAO,EAAE,IAAI;SAChB,CAAA;QACD,MAAM,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IAC1D,CAAC;CACJ;AAzED,wDAyEC"}
|
|
@@ -18,7 +18,6 @@ export declare class Simulator extends EventEmitter<ConnectionSourceEvents> {
|
|
|
18
18
|
private latencyType;
|
|
19
19
|
private fixedLatency?;
|
|
20
20
|
private loopCounter;
|
|
21
|
-
private operationCounter;
|
|
22
21
|
private MAX_LOOPS;
|
|
23
22
|
private operationQueue;
|
|
24
23
|
private simulatorTimeout?;
|
|
@@ -33,7 +32,6 @@ export declare class Simulator extends EventEmitter<ConnectionSourceEvents> {
|
|
|
33
32
|
private executeCloseOperation;
|
|
34
33
|
private executeSendOperation;
|
|
35
34
|
private executeQueuedOperations;
|
|
36
|
-
getOperationCounter(): number;
|
|
37
35
|
private scheduleNextTimeout;
|
|
38
36
|
private scheduleOperation;
|
|
39
37
|
connect(sourceConnection: SimulatorConnection, targetDescriptor: PeerDescriptor, connectedCallback: (error?: string) => void): void;
|
|
@@ -120,7 +120,6 @@ class Simulator extends eventemitter3_1.default {
|
|
|
120
120
|
this.connectors = new Map();
|
|
121
121
|
this.associations = new Map();
|
|
122
122
|
this.loopCounter = 0;
|
|
123
|
-
this.operationCounter = 0;
|
|
124
123
|
this.MAX_LOOPS = 1000;
|
|
125
124
|
this.operationQueue = new heap_1.default((a, b) => {
|
|
126
125
|
if ((a.executionTime - b.executionTime) === 0) {
|
|
@@ -230,7 +229,6 @@ class Simulator extends eventemitter3_1.default {
|
|
|
230
229
|
while (this.operationQueue.size() > 0
|
|
231
230
|
&& this.operationQueue.peek().executionTime <= currentTime) {
|
|
232
231
|
const operation = this.operationQueue.pop();
|
|
233
|
-
this.operationCounter++;
|
|
234
232
|
if (operation instanceof ConnectOperation) {
|
|
235
233
|
this.executeConnectOperation(operation);
|
|
236
234
|
}
|
|
@@ -252,9 +250,6 @@ class Simulator extends eventemitter3_1.default {
|
|
|
252
250
|
}
|
|
253
251
|
this.scheduleNextTimeout();
|
|
254
252
|
}
|
|
255
|
-
getOperationCounter() {
|
|
256
|
-
return this.operationCounter;
|
|
257
|
-
}
|
|
258
253
|
scheduleNextTimeout() {
|
|
259
254
|
if (this.simulatorTimeout) {
|
|
260
255
|
clearTimeout(this.simulatorTimeout);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Simulator.js","sourceRoot":"","sources":["../../../../src/connection/Simulator/Simulator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAA4D;AAC5D,kEAAwC;AAOxC,0CAAuC;AACvC,mCAA8C;AAC9C,qFAA8E;AAC9E,gDAAuB;AACvB,6DAAsD;AACtD,6CAA8B;AAM9B,SAAgB,mBAAmB;IAC/B,gDAAgD;IAChD,OAAO,OAAO,sBAAsB,KAAK,WAAW,CAAA;AACxD,CAAC;AAHD,kDAGC;AAED,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,IAAY,WAAgF;AAA5F,WAAY,WAAW;IAAG,4BAAa,CAAA;IAAE,gCAAiB,CAAA;IAAE,4BAAa,CAAA;IAAE,8BAAe,CAAA;AAAC,CAAC,EAAhF,WAAW,2BAAX,WAAW,QAAqE;AAE5F,6BAA6B;AAE7B,MAAM,WAAW;IAMb,YAAY,gBAAqC,EAC7C,qBAA2C,EACpC,iBAA4C;QAA5C,sBAAiB,GAAjB,iBAAiB,CAA2B;QAL/C,oBAAe,GAAW,CAAC,CAAA;QAC3B,YAAO,GAAG,KAAK,CAAA;QAMnB,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;QACxC,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAA;IACtD,CAAC;IAEM,wBAAwB,CAAC,UAA+B;QAC3D,IAAI,CAAC,qBAAqB,GAAG,UAAU,CAAA;IAC3C,CAAC;IAEM,kBAAkB;QACrB,OAAO,IAAI,CAAC,eAAe,CAAA;IAC/B,CAAC;IAEM,kBAAkB,CAAC,aAAqB;QAC3C,IAAI,CAAC,eAAe,GAAG,aAAa,CAAA;IACxC,CAAC;IAEM,UAAU;QACb,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;IACvB,CAAC;IAEM,SAAS;QACZ,OAAO,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;CACJ;AAED,MAAM,kBAAkB;IAIpB,YACW,aAAqB,EACrB,WAAwB;QADxB,kBAAa,GAAb,aAAa,CAAQ;QACrB,gBAAW,GAAX,WAAW,CAAa;QAJ5B,aAAQ,GAAG,CAAC,CAAA;QAMf,IAAI,CAAC,QAAQ,GAAG,kBAAkB,CAAC,aAAa,CAAA;QAChD,kBAAkB,CAAC,aAAa,EAAE,CAAA;IACtC,CAAC;;AATc,gCAAa,GAAG,CAAC,AAAJ,CAAI;AAYpC,MAAM,gBAAiB,SAAQ,kBAAkB;IAC7C,YACI,aAAqB,EACrB,WAAwB,EACjB,gBAAqC,EACrC,gBAAgC;QAEvC,KAAK,CAAC,aAAa,EAAE,WAAW,CAAC,CAAA;QAH1B,qBAAgB,GAAhB,gBAAgB,CAAqB;QACrC,qBAAgB,GAAhB,gBAAgB,CAAgB;IAG3C,CAAC;CACJ;AAED,MAAM,aAAc,SAAQ,kBAAkB;IAC1C,YACI,aAAqB,EACrB,WAAwB,EACjB,IAAgB;QAEvB,KAAK,CAAC,aAAa,EAAE,WAAW,CAAC,CAAA;QAF1B,SAAI,GAAJ,IAAI,CAAY;IAG3B,CAAC;CACJ;AAED,MAAM,cAAe,SAAQ,kBAAkB;CAC9C;AAED,MAAa,SAAU,SAAQ,uBAAoC;
|
|
1
|
+
{"version":3,"file":"Simulator.js","sourceRoot":"","sources":["../../../../src/connection/Simulator/Simulator.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ const DhtRpc_1 = require("../../proto/packages/dht/protos/DhtRpc");
|
|
|
5
5
|
const Connection_1 = require("../Connection");
|
|
6
6
|
const utils_1 = require("@streamr/utils");
|
|
7
7
|
const protoToString_1 = require("../../helpers/protoToString");
|
|
8
|
+
const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
|
|
8
9
|
const logger = new utils_1.Logger(module);
|
|
9
10
|
class SimulatorConnection extends Connection_1.Connection {
|
|
10
11
|
constructor(ownPeerDescriptor, targetPeerDescriptor, connectionType, simulator) {
|
|
@@ -29,34 +30,35 @@ class SimulatorConnection extends Connection_1.Connection {
|
|
|
29
30
|
this.simulator.send(this, data);
|
|
30
31
|
}
|
|
31
32
|
else {
|
|
32
|
-
logger.error(
|
|
33
|
+
logger.error((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ', ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.targetPeerDescriptor) +
|
|
33
34
|
'tried to send() on a stopped connection');
|
|
34
35
|
}
|
|
35
36
|
}
|
|
36
37
|
async close(disconnectionType) {
|
|
37
|
-
logger.trace(
|
|
38
|
+
logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ', ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.targetPeerDescriptor) + ' close()');
|
|
38
39
|
if (!this.stopped) {
|
|
39
|
-
logger.trace(
|
|
40
|
+
logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ', '
|
|
41
|
+
+ (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.targetPeerDescriptor) + ' close() not stopped');
|
|
40
42
|
this.stopped = true;
|
|
41
43
|
try {
|
|
42
|
-
logger.trace(
|
|
44
|
+
logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ', ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.targetPeerDescriptor) +
|
|
43
45
|
' close() calling simulator.disconnect()');
|
|
44
46
|
this.simulator.close(this);
|
|
45
|
-
logger.trace(
|
|
47
|
+
logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ', ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.targetPeerDescriptor) +
|
|
46
48
|
' close() simulator.disconnect returned');
|
|
47
49
|
}
|
|
48
50
|
catch (e) {
|
|
49
|
-
logger.trace(
|
|
51
|
+
logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ', ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.targetPeerDescriptor) +
|
|
50
52
|
'close aborted' + e);
|
|
51
53
|
}
|
|
52
54
|
finally {
|
|
53
|
-
logger.trace(
|
|
55
|
+
logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ', ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.targetPeerDescriptor) +
|
|
54
56
|
' calling this.doDisconnect');
|
|
55
57
|
this.doDisconnect(disconnectionType);
|
|
56
58
|
}
|
|
57
59
|
}
|
|
58
60
|
else {
|
|
59
|
-
logger.trace(
|
|
61
|
+
logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ', ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.targetPeerDescriptor) +
|
|
60
62
|
' close() tried to close a stopped connection');
|
|
61
63
|
}
|
|
62
64
|
}
|
|
@@ -89,7 +91,7 @@ class SimulatorConnection extends Connection_1.Connection {
|
|
|
89
91
|
}
|
|
90
92
|
handleIncomingDisconnection() {
|
|
91
93
|
if (!this.stopped) {
|
|
92
|
-
logger.trace(this.ownPeerDescriptor
|
|
94
|
+
logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ' handleIncomingDisconnection()');
|
|
93
95
|
this.stopped = true;
|
|
94
96
|
this.doDisconnect('OTHER');
|
|
95
97
|
}
|
|
@@ -99,18 +101,19 @@ class SimulatorConnection extends Connection_1.Connection {
|
|
|
99
101
|
}
|
|
100
102
|
destroy() {
|
|
101
103
|
if (!this.stopped) {
|
|
102
|
-
logger.trace(this.ownPeerDescriptor
|
|
104
|
+
logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ' destroy()');
|
|
103
105
|
this.removeAllListeners();
|
|
104
106
|
this.close('OTHER').catch((_e) => { });
|
|
105
107
|
}
|
|
106
108
|
else {
|
|
107
|
-
logger.trace(this.ownPeerDescriptor
|
|
109
|
+
logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ' tried to call destroy() a stopped connection');
|
|
108
110
|
}
|
|
109
111
|
}
|
|
110
112
|
doDisconnect(disconnectionType) {
|
|
111
|
-
logger.trace(this.ownPeerDescriptor
|
|
113
|
+
logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ' doDisconnect()');
|
|
112
114
|
this.stopped = true;
|
|
113
|
-
logger.trace(
|
|
115
|
+
logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.ownPeerDescriptor) + ', '
|
|
116
|
+
+ (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.targetPeerDescriptor) + ' doDisconnect emitting');
|
|
114
117
|
this.emit('disconnected', disconnectionType);
|
|
115
118
|
}
|
|
116
119
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SimulatorConnection.js","sourceRoot":"","sources":["../../../../src/connection/Simulator/SimulatorConnection.ts"],"names":[],"mappings":";;;AAEA,mEAAgF;AAChF,8CAA0C;AAC1C,0CAAuC;AACvC,+DAA2D;
|
|
1
|
+
{"version":3,"file":"SimulatorConnection.js","sourceRoot":"","sources":["../../../../src/connection/Simulator/SimulatorConnection.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,8 +8,8 @@ export declare class SimulatorConnector {
|
|
|
8
8
|
private protocolVersion;
|
|
9
9
|
private ownPeerDescriptor;
|
|
10
10
|
private simulator;
|
|
11
|
-
private
|
|
12
|
-
constructor(protocolVersion: string, ownPeerDescriptor: PeerDescriptor, simulator: Simulator,
|
|
11
|
+
private onIncomingConnection;
|
|
12
|
+
constructor(protocolVersion: string, ownPeerDescriptor: PeerDescriptor, simulator: Simulator, onIncomingConnection: (connection: ManagedConnection) => boolean);
|
|
13
13
|
connect(targetPeerDescriptor: PeerDescriptor): ManagedConnection;
|
|
14
14
|
getPeerDescriptor(): PeerDescriptor;
|
|
15
15
|
handleIncomingConnection(sourceConnection: SimulatorConnection): void;
|
|
@@ -8,16 +8,16 @@ const SimulatorConnection_1 = require("./SimulatorConnection");
|
|
|
8
8
|
const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
|
|
9
9
|
const logger = new utils_1.Logger(module);
|
|
10
10
|
class SimulatorConnector {
|
|
11
|
-
constructor(protocolVersion, ownPeerDescriptor, simulator,
|
|
11
|
+
constructor(protocolVersion, ownPeerDescriptor, simulator, onIncomingConnection) {
|
|
12
12
|
this.connectingConnections = new Map();
|
|
13
13
|
this.stopped = false;
|
|
14
14
|
this.protocolVersion = protocolVersion;
|
|
15
15
|
this.ownPeerDescriptor = ownPeerDescriptor;
|
|
16
16
|
this.simulator = simulator;
|
|
17
|
-
this.
|
|
17
|
+
this.onIncomingConnection = onIncomingConnection;
|
|
18
18
|
}
|
|
19
19
|
connect(targetPeerDescriptor) {
|
|
20
|
-
logger.trace('connect() ' +
|
|
20
|
+
logger.trace('connect() ' + (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor));
|
|
21
21
|
const peerKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor);
|
|
22
22
|
const existingConnection = this.connectingConnections.get(peerKey);
|
|
23
23
|
if (existingConnection) {
|
|
@@ -40,19 +40,18 @@ class SimulatorConnector {
|
|
|
40
40
|
return this.ownPeerDescriptor;
|
|
41
41
|
}
|
|
42
42
|
handleIncomingConnection(sourceConnection) {
|
|
43
|
-
logger.trace(
|
|
44
|
-
' incoming connection, stopped: ' + this.stopped);
|
|
43
|
+
logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(sourceConnection.ownPeerDescriptor) + ' incoming connection, stopped: ' + this.stopped);
|
|
45
44
|
if (this.stopped) {
|
|
46
45
|
return;
|
|
47
46
|
}
|
|
48
47
|
const connection = new SimulatorConnection_1.SimulatorConnection(this.ownPeerDescriptor, sourceConnection.ownPeerDescriptor, IConnection_1.ConnectionType.SIMULATOR_SERVER, this.simulator);
|
|
49
48
|
const managedConnection = new ManagedConnection_1.ManagedConnection(this.ownPeerDescriptor, this.protocolVersion, IConnection_1.ConnectionType.SIMULATOR_SERVER, undefined, connection);
|
|
50
|
-
logger.trace('connected
|
|
51
|
-
managedConnection.once('handshakeRequest', (
|
|
52
|
-
logger.trace(
|
|
53
|
-
logger.trace('incoming handshake request
|
|
54
|
-
if (this.
|
|
55
|
-
logger.trace(
|
|
49
|
+
logger.trace('connected');
|
|
50
|
+
managedConnection.once('handshakeRequest', () => {
|
|
51
|
+
logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(sourceConnection.ownPeerDescriptor) + ' incoming handshake request');
|
|
52
|
+
logger.trace('incoming handshake request');
|
|
53
|
+
if (this.onIncomingConnection(managedConnection)) {
|
|
54
|
+
logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(sourceConnection.ownPeerDescriptor) + ' calling acceptHandshake');
|
|
56
55
|
managedConnection.acceptHandshake();
|
|
57
56
|
}
|
|
58
57
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SimulatorConnector.js","sourceRoot":"","sources":["../../../../src/connection/Simulator/SimulatorConnector.ts"],"names":[],"mappings":";;;AAAA,gDAA+C;AAK/C,0CAAuC;AACvC,4DAAwD;AAGxD,+DAA2D;AAC3D,qFAA8E;AAE9E,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,kBAAkB;IAS3B,YACI,eAAuB,EACvB,iBAAiC,EACjC,SAAoB,EACpB,
|
|
1
|
+
{"version":3,"file":"SimulatorConnector.js","sourceRoot":"","sources":["../../../../src/connection/Simulator/SimulatorConnector.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.SimulatorTransport = void 0;
|
|
4
|
+
const utils_1 = require("@streamr/utils");
|
|
4
5
|
const ConnectionManager_1 = require("../ConnectionManager");
|
|
6
|
+
const ConnectorFacade_1 = require("../ConnectorFacade");
|
|
5
7
|
class SimulatorTransport extends ConnectionManager_1.ConnectionManager {
|
|
6
8
|
constructor(ownPeerDescriptor, simulator) {
|
|
7
|
-
super({
|
|
9
|
+
super({
|
|
10
|
+
createConnectorFacade: () => new ConnectorFacade_1.SimulatorConnectorFacade(ownPeerDescriptor, simulator),
|
|
11
|
+
metricsContext: new utils_1.MetricsContext()
|
|
12
|
+
});
|
|
8
13
|
}
|
|
9
14
|
}
|
|
10
15
|
exports.SimulatorTransport = SimulatorTransport;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SimulatorTransport.js","sourceRoot":"","sources":["../../../../src/connection/Simulator/SimulatorTransport.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"SimulatorTransport.js","sourceRoot":"","sources":["../../../../src/connection/Simulator/SimulatorTransport.ts"],"names":[],"mappings":";;;AAAA,0CAA+C;AAE/C,4DAAwD;AAExD,wDAA6D;AAE7D,MAAa,kBAAmB,SAAQ,qCAAiB;IACrD,YAAY,iBAAiC,EAAE,SAAoB;QAC/D,KAAK,CAAC;YACF,qBAAqB,EAAE,GAAG,EAAE,CAAC,IAAI,0CAAwB,CAAC,iBAAiB,EAAE,SAAS,CAAC;YACvF,cAAc,EAAE,IAAI,sBAAc,EAAE;SACvC,CAAC,CAAA;IACN,CAAC;CACJ;AAPD,gDAOC"}
|
|
@@ -13,6 +13,7 @@ export interface Params {
|
|
|
13
13
|
bufferThresholdHigh?: number;
|
|
14
14
|
bufferThresholdLow?: number;
|
|
15
15
|
connectingTimeout?: number;
|
|
16
|
+
maxMessageSize?: number;
|
|
16
17
|
iceServers?: IceServer[];
|
|
17
18
|
portRange?: PortRange;
|
|
18
19
|
}
|
|
@@ -31,6 +32,7 @@ export declare class NodeWebRtcConnection extends EventEmitter<Events> implement
|
|
|
31
32
|
private readonly connectingTimeout;
|
|
32
33
|
private readonly remotePeerDescriptor;
|
|
33
34
|
private readonly portRange?;
|
|
35
|
+
private readonly maxMessageSize?;
|
|
34
36
|
private closed;
|
|
35
37
|
constructor(params: Params);
|
|
36
38
|
start(isOffering: boolean): void;
|
|
@@ -35,7 +35,6 @@ const errors_1 = require("../../helpers/errors");
|
|
|
35
35
|
const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
|
|
36
36
|
const iceServerAsString_1 = require("./iceServerAsString");
|
|
37
37
|
const logger = new utils_1.Logger(module);
|
|
38
|
-
const MAX_MESSAGE_SIZE = 1048576;
|
|
39
38
|
exports.WEB_RTC_CLEANUP = new class {
|
|
40
39
|
// eslint-disable-next-line class-methods-use-this
|
|
41
40
|
cleanUp() {
|
|
@@ -62,21 +61,22 @@ class NodeWebRtcConnection extends eventemitter3_1.default {
|
|
|
62
61
|
this.connectionType = IConnection_1.ConnectionType.WEBRTC;
|
|
63
62
|
this.closed = false;
|
|
64
63
|
this.connectionId = new IConnection_1.ConnectionID();
|
|
65
|
-
this.iceServers = params.iceServers
|
|
64
|
+
this.iceServers = params.iceServers ?? [];
|
|
66
65
|
// eslint-disable-next-line no-underscore-dangle
|
|
67
|
-
this._bufferThresholdHigh = params.bufferThresholdHigh
|
|
68
|
-
this.bufferThresholdLow = params.bufferThresholdLow
|
|
69
|
-
this.connectingTimeout = params.connectingTimeout
|
|
66
|
+
this._bufferThresholdHigh = params.bufferThresholdHigh ?? 2 ** 17;
|
|
67
|
+
this.bufferThresholdLow = params.bufferThresholdLow ?? 2 ** 15;
|
|
68
|
+
this.connectingTimeout = params.connectingTimeout ?? 20000;
|
|
70
69
|
this.remotePeerDescriptor = params.remotePeerDescriptor;
|
|
70
|
+
this.maxMessageSize = params.maxMessageSize ?? 1048576;
|
|
71
71
|
this.portRange = params.portRange;
|
|
72
72
|
}
|
|
73
73
|
start(isOffering) {
|
|
74
|
-
logger.trace(`Staring new connection for peer: ${this.remotePeerDescriptor
|
|
75
|
-
const
|
|
76
|
-
logger.trace(`Staring new connection for peer: ${
|
|
77
|
-
this.connection = new node_datachannel_1.PeerConnection(
|
|
74
|
+
logger.trace(`Staring new connection for peer: ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.remotePeerDescriptor)}`);
|
|
75
|
+
const peerIdKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.remotePeerDescriptor);
|
|
76
|
+
logger.trace(`Staring new connection for peer: ${peerIdKey} offering: ${isOffering}`);
|
|
77
|
+
this.connection = new node_datachannel_1.PeerConnection(peerIdKey, {
|
|
78
78
|
iceServers: this.iceServers.map(iceServerAsString_1.iceServerAsString),
|
|
79
|
-
maxMessageSize:
|
|
79
|
+
maxMessageSize: this.maxMessageSize,
|
|
80
80
|
portRangeBegin: this.portRange?.min,
|
|
81
81
|
portRangeEnd: this.portRange?.max,
|
|
82
82
|
});
|
|
@@ -85,7 +85,7 @@ class NodeWebRtcConnection extends eventemitter3_1.default {
|
|
|
85
85
|
this.doClose('OTHER');
|
|
86
86
|
}, this.connectingTimeout);
|
|
87
87
|
this.connection.onStateChange((state) => this.onStateChange(state));
|
|
88
|
-
this.connection.onGatheringStateChange((
|
|
88
|
+
this.connection.onGatheringStateChange(() => { });
|
|
89
89
|
this.connection.onLocalDescription((description, type) => {
|
|
90
90
|
this.emit('localDescription', description, type.toString());
|
|
91
91
|
});
|
|
@@ -209,7 +209,7 @@ class NodeWebRtcConnection extends eventemitter3_1.default {
|
|
|
209
209
|
clearTimeout(this.connectingTimeoutRef);
|
|
210
210
|
}
|
|
211
211
|
this.dataChannel = dataChannel;
|
|
212
|
-
logger.trace(`DataChannel opened for peer ${this.remotePeerDescriptor
|
|
212
|
+
logger.trace(`DataChannel opened for peer ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.remotePeerDescriptor)}`);
|
|
213
213
|
this.emit('connected');
|
|
214
214
|
}
|
|
215
215
|
onStateChange(state) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodeWebRtcConnection.js","sourceRoot":"","sources":["../../../../src/connection/WebRTC/NodeWebRtcConnection.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAA4F;AAE5F,kEAAwC;AACxC,qEAAgG;AAChG,0CAAuC;AACvC,iDAAoE;AACpE,qFAA8E;AAE9E,2DAAuD;AAIvD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"NodeWebRtcConnection.js","sourceRoot":"","sources":["../../../../src/connection/WebRTC/NodeWebRtcConnection.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,17 +2,17 @@ import { IceCandidate, PeerDescriptor, RtcAnswer, RtcOffer, WebRtcConnectionRequ
|
|
|
2
2
|
import { Empty } from '../../proto/google/protobuf/empty';
|
|
3
3
|
import { ITransport } from '../../transport/ITransport';
|
|
4
4
|
import { IWebRtcConnectorService } from '../../proto/packages/dht/protos/DhtRpc.server';
|
|
5
|
-
import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
|
|
6
5
|
import { ManagedConnection } from '../ManagedConnection';
|
|
7
6
|
import { PortRange } from '../ConnectionManager';
|
|
8
7
|
export declare const replaceInternalIpWithExternalIp: (candidate: string, ip: string) => string;
|
|
9
8
|
export interface WebRtcConnectorConfig {
|
|
10
|
-
|
|
9
|
+
transport: ITransport;
|
|
11
10
|
protocolVersion: string;
|
|
12
11
|
iceServers?: IceServer[];
|
|
13
12
|
allowPrivateAddresses?: boolean;
|
|
14
13
|
bufferThresholdLow?: number;
|
|
15
14
|
bufferThresholdHigh?: number;
|
|
15
|
+
maxMessageSize?: number;
|
|
16
16
|
connectionTimeout?: number;
|
|
17
17
|
externalIp?: string;
|
|
18
18
|
portRange?: PortRange;
|
|
@@ -33,19 +33,19 @@ export declare class WebRtcConnector implements IWebRtcConnectorService {
|
|
|
33
33
|
private iceServers;
|
|
34
34
|
private allowPrivateAddresses;
|
|
35
35
|
private config;
|
|
36
|
-
private
|
|
37
|
-
constructor(config: WebRtcConnectorConfig,
|
|
36
|
+
private onIncomingConnection;
|
|
37
|
+
constructor(config: WebRtcConnectorConfig, onIncomingConnection: (connection: ManagedConnection) => boolean);
|
|
38
38
|
connect(targetPeerDescriptor: PeerDescriptor): ManagedConnection;
|
|
39
39
|
setOwnPeerDescriptor(peerDescriptor: PeerDescriptor): void;
|
|
40
|
-
isIceCandidateAllowed
|
|
40
|
+
private isIceCandidateAllowed;
|
|
41
41
|
private onRtcOffer;
|
|
42
42
|
private onRtcAnswer;
|
|
43
43
|
private onConnectionRequest;
|
|
44
44
|
private onRemoteCandidate;
|
|
45
45
|
stop(): Promise<void>;
|
|
46
46
|
isOffering(targetPeerDescriptor: PeerDescriptor): boolean;
|
|
47
|
-
requestConnection(request: WebRtcConnectionRequest
|
|
48
|
-
rtcOffer(request: RtcOffer
|
|
49
|
-
rtcAnswer(request: RtcAnswer
|
|
50
|
-
iceCandidate(request: IceCandidate
|
|
47
|
+
requestConnection(request: WebRtcConnectionRequest): Promise<Empty>;
|
|
48
|
+
rtcOffer(request: RtcOffer): Promise<Empty>;
|
|
49
|
+
rtcAnswer(request: RtcAnswer): Promise<Empty>;
|
|
50
|
+
iceCandidate(request: IceCandidate): Promise<Empty>;
|
|
51
51
|
}
|