@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
|
@@ -46,26 +46,26 @@ const replaceInternalIpWithExternalIp = (candidate, ip) => {
|
|
|
46
46
|
};
|
|
47
47
|
exports.replaceInternalIpWithExternalIp = replaceInternalIpWithExternalIp;
|
|
48
48
|
class WebRtcConnector {
|
|
49
|
-
constructor(config,
|
|
49
|
+
constructor(config, onIncomingConnection) {
|
|
50
50
|
this.ongoingConnectAttempts = new Map();
|
|
51
51
|
this.stopped = false;
|
|
52
52
|
this.config = config;
|
|
53
53
|
this.iceServers = config.iceServers || [];
|
|
54
54
|
this.allowPrivateAddresses = config.allowPrivateAddresses || true;
|
|
55
|
-
this.
|
|
56
|
-
this.rpcCommunicator = new ListeningRpcCommunicator_1.ListeningRpcCommunicator(WebRtcConnector.WEBRTC_CONNECTOR_SERVICE_ID, config.
|
|
55
|
+
this.onIncomingConnection = onIncomingConnection;
|
|
56
|
+
this.rpcCommunicator = new ListeningRpcCommunicator_1.ListeningRpcCommunicator(WebRtcConnector.WEBRTC_CONNECTOR_SERVICE_ID, config.transport, {
|
|
57
57
|
rpcRequestTimeout: 15000
|
|
58
58
|
});
|
|
59
|
-
this.rpcCommunicator.registerRpcNotification(DhtRpc_1.RtcOffer, 'rtcOffer', (req
|
|
60
|
-
this.rpcCommunicator.registerRpcNotification(DhtRpc_1.RtcAnswer, 'rtcAnswer', (req
|
|
61
|
-
this.rpcCommunicator.registerRpcNotification(DhtRpc_1.IceCandidate, 'iceCandidate', (req
|
|
62
|
-
this.rpcCommunicator.registerRpcNotification(DhtRpc_1.WebRtcConnectionRequest, 'requestConnection', (req
|
|
59
|
+
this.rpcCommunicator.registerRpcNotification(DhtRpc_1.RtcOffer, 'rtcOffer', (req) => this.rtcOffer(req));
|
|
60
|
+
this.rpcCommunicator.registerRpcNotification(DhtRpc_1.RtcAnswer, 'rtcAnswer', (req) => this.rtcAnswer(req));
|
|
61
|
+
this.rpcCommunicator.registerRpcNotification(DhtRpc_1.IceCandidate, 'iceCandidate', (req) => this.iceCandidate(req));
|
|
62
|
+
this.rpcCommunicator.registerRpcNotification(DhtRpc_1.WebRtcConnectionRequest, 'requestConnection', (req) => this.requestConnection(req));
|
|
63
63
|
}
|
|
64
64
|
connect(targetPeerDescriptor) {
|
|
65
|
-
if ((0, peerIdFromPeerDescriptor_1.
|
|
65
|
+
if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(targetPeerDescriptor, this.ownPeerDescriptor)) {
|
|
66
66
|
throw new Err.CannotConnectToSelf('Cannot open WebRTC Connection to self');
|
|
67
67
|
}
|
|
68
|
-
logger.trace(`Opening WebRTC connection to ${
|
|
68
|
+
logger.trace(`Opening WebRTC connection to ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor)}`);
|
|
69
69
|
const peerKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor);
|
|
70
70
|
const existingConnection = this.ongoingConnectAttempts.get(peerKey);
|
|
71
71
|
if (existingConnection) {
|
|
@@ -107,12 +107,12 @@ class WebRtcConnector {
|
|
|
107
107
|
remoteConnector.sendIceCandidate(this.ownPeerDescriptor, candidate, mid, connection.connectionId.toString());
|
|
108
108
|
});
|
|
109
109
|
if (offering) {
|
|
110
|
-
connection.once('localDescription', (description
|
|
110
|
+
connection.once('localDescription', (description) => {
|
|
111
111
|
remoteConnector.sendRtcOffer(this.ownPeerDescriptor, description, connection.connectionId.toString());
|
|
112
112
|
});
|
|
113
113
|
}
|
|
114
114
|
else {
|
|
115
|
-
connection.once('localDescription', (description
|
|
115
|
+
connection.once('localDescription', (description) => {
|
|
116
116
|
remoteConnector.sendRtcAnswer(this.ownPeerDescriptor, description, connection.connectionId.toString());
|
|
117
117
|
});
|
|
118
118
|
}
|
|
@@ -135,7 +135,7 @@ class WebRtcConnector {
|
|
|
135
135
|
return true;
|
|
136
136
|
}
|
|
137
137
|
onRtcOffer(remotePeer, targetPeer, description, connectionId) {
|
|
138
|
-
if (this.stopped || !(0, peerIdFromPeerDescriptor_1.
|
|
138
|
+
if (this.stopped || !(0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(targetPeer, this.ownPeerDescriptor)) {
|
|
139
139
|
return;
|
|
140
140
|
}
|
|
141
141
|
const peerKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(remotePeer);
|
|
@@ -146,12 +146,12 @@ class WebRtcConnector {
|
|
|
146
146
|
managedConnection = new ManagedWebRtcConnection_1.ManagedWebRtcConnection(this.ownPeerDescriptor, this.config.protocolVersion, undefined, connection);
|
|
147
147
|
managedConnection.setPeerDescriptor(remotePeer);
|
|
148
148
|
this.ongoingConnectAttempts.set(peerKey, managedConnection);
|
|
149
|
-
this.
|
|
149
|
+
this.onIncomingConnection(managedConnection);
|
|
150
150
|
const remoteConnector = new RemoteWebrtcConnector_1.RemoteWebrtcConnector(remotePeer, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.WebRtcConnectorServiceClient(this.rpcCommunicator.getRpcClientTransport())));
|
|
151
151
|
connection.on('localCandidate', (candidate, mid) => {
|
|
152
152
|
remoteConnector.sendIceCandidate(this.ownPeerDescriptor, candidate, mid, connection.connectionId.toString());
|
|
153
153
|
});
|
|
154
|
-
connection.once('localDescription', (description
|
|
154
|
+
connection.once('localDescription', (description) => {
|
|
155
155
|
remoteConnector.sendRtcAnswer(this.ownPeerDescriptor, description, connection.connectionId.toString());
|
|
156
156
|
});
|
|
157
157
|
connection.start(false);
|
|
@@ -167,7 +167,7 @@ class WebRtcConnector {
|
|
|
167
167
|
});
|
|
168
168
|
}
|
|
169
169
|
onRtcAnswer(remotePeerDescriptor, targetPeerDescriptor, description, connectionId) {
|
|
170
|
-
if (this.stopped || !(0, peerIdFromPeerDescriptor_1.
|
|
170
|
+
if (this.stopped || !(0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(targetPeerDescriptor, this.ownPeerDescriptor)) {
|
|
171
171
|
return;
|
|
172
172
|
}
|
|
173
173
|
const peerKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(remotePeerDescriptor);
|
|
@@ -187,10 +187,10 @@ class WebRtcConnector {
|
|
|
187
187
|
}
|
|
188
188
|
const managedConnection = this.connect(targetPeerDescriptor);
|
|
189
189
|
managedConnection.setPeerDescriptor(targetPeerDescriptor);
|
|
190
|
-
this.
|
|
190
|
+
this.onIncomingConnection(managedConnection);
|
|
191
191
|
}
|
|
192
192
|
onRemoteCandidate(remotePeerDescriptor, targetPeerDescriptor, candidate, mid, connectionId) {
|
|
193
|
-
if (this.stopped || !(0, peerIdFromPeerDescriptor_1.
|
|
193
|
+
if (this.stopped || !(0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(targetPeerDescriptor, this.ownPeerDescriptor)) {
|
|
194
194
|
return;
|
|
195
195
|
}
|
|
196
196
|
const peerKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(remotePeerDescriptor);
|
|
@@ -219,23 +219,23 @@ class WebRtcConnector {
|
|
|
219
219
|
return myId.hasSmallerHashThan(theirId);
|
|
220
220
|
}
|
|
221
221
|
// IWebRTCConnector implementation
|
|
222
|
-
async requestConnection(request
|
|
222
|
+
async requestConnection(request) {
|
|
223
223
|
this.onConnectionRequest(request.requester);
|
|
224
224
|
return {};
|
|
225
225
|
}
|
|
226
|
-
async rtcOffer(request
|
|
226
|
+
async rtcOffer(request) {
|
|
227
227
|
this.onRtcOffer(request.requester, request.target, request.description, request.connectionId);
|
|
228
228
|
return {};
|
|
229
229
|
}
|
|
230
|
-
async rtcAnswer(request
|
|
230
|
+
async rtcAnswer(request) {
|
|
231
231
|
this.onRtcAnswer(request.requester, request.target, request.description, request.connectionId);
|
|
232
232
|
return {};
|
|
233
233
|
}
|
|
234
|
-
async iceCandidate(request
|
|
234
|
+
async iceCandidate(request) {
|
|
235
235
|
this.onRemoteCandidate(request.requester, request.target, request.candidate, request.mid, request.connectionId);
|
|
236
236
|
return {};
|
|
237
237
|
}
|
|
238
238
|
}
|
|
239
239
|
exports.WebRtcConnector = WebRtcConnector;
|
|
240
|
-
WebRtcConnector.WEBRTC_CONNECTOR_SERVICE_ID = 'system/
|
|
240
|
+
WebRtcConnector.WEBRTC_CONNECTOR_SERVICE_ID = 'system/webrtc-connector';
|
|
241
241
|
//# sourceMappingURL=WebRtcConnector.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebRtcConnector.js","sourceRoot":"","sources":["../../../../src/connection/WebRTC/WebRtcConnector.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mEAK+C;AAG/C,uFAAmF;AACnF,iEAA6D;AAC7D,mEAA+D;AAC/D,iFAA4F;AAE5F,wEAAoE;AACpE,0CAAuC;AACvC,0DAA2C;
|
|
1
|
+
{"version":3,"file":"WebRtcConnector.js","sourceRoot":"","sources":["../../../../src/connection/WebRTC/WebRtcConnector.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mEAK+C;AAG/C,uFAAmF;AACnF,iEAA6D;AAC7D,mEAA+D;AAC/D,iFAA4F;AAE5F,wEAAoE;AACpE,0CAAuC;AACvC,0DAA2C;AAG3C,kDAAqD;AACrD,qFAI+C;AAC/C,6DAAsF;AAGtF,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAE1B,MAAM,+BAA+B,GAAG,CAAC,SAAiB,EAAE,EAAU,EAAU,EAAE;IACrF,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACnC,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;IACtB,IAAI,IAAI,KAAK,MAAM,EAAE;QACjB,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,CAAA;KACjB;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC3B,CAAC,CAAA;AAPY,QAAA,+BAA+B,mCAO3C;AAuBD,MAAa,eAAe;IAWxB,YACI,MAA6B,EAC7B,oBAAgE;QAVnD,2BAAsB,GAA4C,IAAI,GAAG,EAAE,CAAA;QAEpF,YAAO,GAAG,KAAK,CAAA;QAUnB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,EAAE,CAAA;QACzC,IAAI,CAAC,qBAAqB,GAAG,MAAM,CAAC,qBAAqB,IAAI,IAAI,CAAA;QACjE,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAA;QAEhD,IAAI,CAAC,eAAe,GAAG,IAAI,mDAAwB,CAAC,eAAe,CAAC,2BAA2B,EAAE,MAAM,CAAC,SAAS,EAAE;YAC/G,iBAAiB,EAAE,KAAK;SAC3B,CAAC,CAAA;QACF,IAAI,CAAC,eAAe,CAAC,uBAAuB,CAAC,iBAAQ,EAAE,UAAU,EAC7D,CAAC,GAAa,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAA;QAC1C,IAAI,CAAC,eAAe,CAAC,uBAAuB,CAAC,kBAAS,EAAE,WAAW,EAC/D,CAAC,GAAc,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;QAC5C,IAAI,CAAC,eAAe,CAAC,uBAAuB,CAAC,qBAAY,EAAE,cAAc,EACrE,CAAC,GAAiB,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAA;QAClD,IAAI,CAAC,eAAe,CAAC,uBAAuB,CAAC,gCAAuB,EAAE,mBAAmB,EACrF,CAAC,GAA4B,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAA;IACtE,CAAC;IAED,OAAO,CAAC,oBAAoC;QACxC,IAAI,IAAA,kDAAuB,EAAC,oBAAoB,EAAE,IAAI,CAAC,iBAAkB,CAAC,EAAE;YACxE,MAAM,IAAI,GAAG,CAAC,mBAAmB,CAAC,uCAAuC,CAAC,CAAA;SAC7E;QAED,MAAM,CAAC,KAAK,CAAC,gCAAgC,IAAA,gDAAqB,EAAC,oBAAoB,CAAC,EAAE,CAAC,CAAA;QAE3F,MAAM,OAAO,GAAG,IAAA,gDAAqB,EAAC,oBAAoB,CAAC,CAAA;QAC3D,MAAM,kBAAkB,GAAG,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QACnE,IAAI,kBAAkB,EAAE;YACpB,OAAO,kBAAkB,CAAA;SAC5B;QAED,MAAM,UAAU,GAAG,IAAI,2CAAoB,CAAC;YACxC,oBAAoB,EAAE,oBAAoB;YAC1C,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,kBAAkB;YAClD,mBAAmB,EAAE,IAAI,CAAC,MAAM,CAAC,mBAAmB;YACpD,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,iBAAiB;YAChD,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS;SACnC,CAAC,CAAA;QAEF,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAA;QACtD,IAAI,iBAA0C,CAAA;QAE9C,IAAI,QAAQ,EAAE;YACV,iBAAiB,GAAG,IAAI,iDAAuB,CAAC,IAAI,CAAC,iBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,UAAU,CAAC,CAAA;SACpH;aAAM;YACH,iBAAiB,GAAG,IAAI,iDAAuB,CAAC,IAAI,CAAC,iBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,SAAS,EAAE,UAAU,CAAC,CAAA;SAC/H;QAED,iBAAiB,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,CAAA;QAEzD,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,IAAA,gDAAqB,EAAC,oBAAoB,CAAC,EAAE,iBAAiB,CAAC,CAAA;QAE/F,MAAM,OAAO,GAAG,GAAG,EAAE;YACjB,IAAI,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;gBAC1C,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;aAC9C;YACD,UAAU,CAAC,GAAG,CAAC,cAAc,EAAE,OAAO,CAAC,CAAA;YACvC,iBAAiB,CAAC,GAAG,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAA;QACxD,CAAC,CAAA;QACD,UAAU,CAAC,EAAE,CAAC,cAAc,EAAE,OAAO,CAAC,CAAA;QACtC,iBAAiB,CAAC,EAAE,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAA;QAEnD,MAAM,eAAe,GAAG,IAAI,6CAAqB,CAC7C,oBAAoB,EACpB,IAAA,4BAAgB,EAAC,IAAI,4CAA4B,CAAC,IAAI,CAAC,eAAe,CAAC,qBAAqB,EAAE,CAAC,CAAC,CACnG,CAAA;QAED,UAAU,CAAC,EAAE,CAAC,gBAAgB,EAAE,CAAC,SAAiB,EAAE,GAAW,EAAE,EAAE;YAC/D,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;gBACxB,SAAS,GAAG,IAAA,uCAA+B,EAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;gBAC9E,MAAM,CAAC,KAAK,CAAC,yCAAyC,SAAS,IAAI,GAAG,EAAE,CAAC,CAAA;aAC5E;YACD,eAAe,CAAC,gBAAgB,CAAC,IAAI,CAAC,iBAAkB,EAAE,SAAS,EAAE,GAAG,EAAE,UAAU,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAA;QACjH,CAAC,CAAC,CAAA;QAEF,IAAI,QAAQ,EAAE;YACV,UAAU,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,WAAmB,EAAE,EAAE;gBACxD,eAAe,CAAC,YAAY,CAAC,IAAI,CAAC,iBAAkB,EAAE,WAAW,EAAE,UAAU,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAA;YAC1G,CAAC,CAAC,CAAA;SACL;aAAM;YACH,UAAU,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,WAAmB,EAAE,EAAE;gBACxD,eAAe,CAAC,aAAa,CAAC,IAAI,CAAC,iBAAkB,EAAE,WAAW,EAAE,UAAU,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAA;YAC3G,CAAC,CAAC,CAAA;SACL;QAED,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QAE1B,IAAI,CAAC,QAAQ,EAAE;YACX,eAAe,CAAC,iBAAiB,CAAC,IAAI,CAAC,iBAAkB,EAAE,UAAU,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAA;SACjG;QAED,OAAO,iBAAiB,CAAA;IAC5B,CAAC;IAED,oBAAoB,CAAC,cAA8B;QAC/C,IAAI,CAAC,iBAAiB,GAAG,cAAc,CAAA;IAC3C,CAAC;IAEO,qBAAqB,CAAC,SAAiB;QAC3C,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE;YAC7B,MAAM,OAAO,GAAG,IAAA,yCAA0B,EAAC,SAAS,CAAC,CAAA;YACrD,IAAI,OAAO,IAAI,IAAA,4BAAa,EAAC,OAAO,CAAC,EAAE;gBACnC,OAAO,KAAK,CAAA;aACf;SACJ;QACD,OAAO,IAAI,CAAA;IACf,CAAC;IAEO,UAAU,CACd,UAA0B,EAC1B,UAA0B,EAC1B,WAAmB,EACnB,YAAoB;QAEpB,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC,IAAA,kDAAuB,EAAC,UAAU,EAAE,IAAI,CAAC,iBAAkB,CAAC,EAAE;YAC/E,OAAM;SACT;QACD,MAAM,OAAO,GAAG,IAAA,gDAAqB,EAAC,UAAU,CAAC,CAAA;QACjD,IAAI,iBAAiB,GAAG,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QAChE,IAAI,UAAU,GAAG,iBAAiB,EAAE,mBAAmB,EAAE,CAAA;QAEzD,IAAI,CAAC,iBAAiB,EAAE;YACpB,UAAU,GAAG,IAAI,2CAAoB,CAAC,EAAE,oBAAoB,EAAE,UAAU,EAAE,CAAC,CAAA;YAC3E,iBAAiB,GAAG,IAAI,iDAAuB,CAAC,IAAI,CAAC,iBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,SAAS,EAAE,UAAU,CAAC,CAAA;YAE5H,iBAAiB,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAA;YAE/C,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAA;YAC3D,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,CAAA;YAE5C,MAAM,eAAe,GAAG,IAAI,6CAAqB,CAC7C,UAAU,EACV,IAAA,4BAAgB,EAAC,IAAI,4CAA4B,CAAC,IAAI,CAAC,eAAe,CAAC,qBAAqB,EAAE,CAAC,CAAC,CACnG,CAAA;YAED,UAAU,CAAC,EAAE,CAAC,gBAAgB,EAAE,CAAC,SAAiB,EAAE,GAAW,EAAE,EAAE;gBAC/D,eAAe,CAAC,gBAAgB,CAAC,IAAI,CAAC,iBAAkB,EAAE,SAAS,EAAE,GAAG,EAAE,UAAW,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAA;YAClH,CAAC,CAAC,CAAA;YAEF,UAAU,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,WAAmB,EAAE,EAAE;gBACxD,eAAe,CAAC,aAAa,CAAC,IAAI,CAAC,iBAAkB,EAAE,WAAW,EAAE,UAAW,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAA;YAC5G,CAAC,CAAC,CAAA;YAEF,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;SAE1B;QAED,mCAAmC;QACnC,UAAW,CAAC,eAAe,CAAC,YAAY,CAAC,CAAA;QACzC,UAAW,CAAC,oBAAoB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;QAEtD,iBAAiB,CAAC,EAAE,CAAC,kBAAkB,EAAE,GAAG,EAAE;YAC1C,IAAI,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;gBAC1C,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;aAC9C;YACD,iBAAkB,CAAC,eAAe,EAAE,CAAA;QACxC,CAAC,CAAC,CAAA;IACN,CAAC;IAEO,WAAW,CACf,oBAAoC,EACpC,oBAAoC,EACpC,WAAmB,EACnB,YAAoB;QAEpB,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC,IAAA,kDAAuB,EAAC,oBAAoB,EAAE,IAAI,CAAC,iBAAkB,CAAC,EAAE;YACzF,OAAM;SACT;QACD,MAAM,OAAO,GAAG,IAAA,gDAAqB,EAAC,oBAAoB,CAAC,CAAA;QAC3D,MAAM,UAAU,GAAG,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,mBAAmB,EAAE,CAAA;QAClF,IAAI,CAAC,UAAU,EAAE;YACb,OAAM;SACT;aAAM,IAAI,UAAU,CAAC,YAAY,CAAC,QAAQ,EAAE,KAAK,YAAY,EAAE;YAC5D,MAAM,CAAC,KAAK,CAAC,kDAAkD,CAAC,CAAA;YAChE,OAAM;SACT;QACD,UAAU,CAAC,oBAAoB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAA;IAC1D,CAAC;IAEO,mBAAmB,CAAC,oBAAoC;QAC5D,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,IAAA,gDAAqB,EAAC,oBAAoB,CAAC,CAAC,EAAE;YAC9F,OAAM;SACT;QACD,MAAM,iBAAiB,GAAG,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAA;QAC5D,iBAAiB,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,CAAA;QAEzD,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,CAAA;IAChD,CAAC;IACO,iBAAiB,CACrB,oBAAoC,EACpC,oBAAoC,EACpC,SAAiB,EACjB,GAAW,EACX,YAAoB;QAEpB,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC,IAAA,kDAAuB,EAAC,oBAAoB,EAAE,IAAI,CAAC,iBAAkB,CAAC,EAAE;YACzF,OAAM;SACT;QACD,MAAM,OAAO,GAAG,IAAA,gDAAqB,EAAC,oBAAoB,CAAC,CAAA;QAC3D,MAAM,UAAU,GAAG,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,mBAAmB,EAAE,CAAA;QAElF,IAAI,CAAC,UAAU,EAAE;YACb,OAAM;SACT;aAAM,IAAI,UAAU,CAAC,YAAY,CAAC,QAAQ,EAAE,KAAK,YAAY,EAAE;YAC5D,MAAM,CAAC,KAAK,CAAC,wDAAwD,CAAC,CAAA;YACtE,OAAM;SACT;aAAM,IAAI,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,EAAE;YAC9C,UAAU,CAAC,kBAAkB,CAAC,SAAS,EAAE,GAAG,CAAC,CAAA;SAChD;IACL,CAAC;IAEM,KAAK,CAAC,IAAI;QACb,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QACtB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QAEnB,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,CAAC,CAAA;QACjE,MAAM,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;QAErE,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,CAAA;IAC/B,CAAC;IAEM,UAAU,CAAC,oBAAoC;QAClD,MAAM,IAAI,GAAG,IAAA,mDAAwB,EAAC,IAAI,CAAC,iBAAkB,CAAC,CAAA;QAC9D,MAAM,OAAO,GAAG,IAAA,mDAAwB,EAAC,oBAAoB,CAAC,CAAA;QAC9D,OAAO,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAA;IAC3C,CAAC;IAED,kCAAkC;IAClC,KAAK,CAAC,iBAAiB,CAAC,OAAgC;QACpD,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,SAAU,CAAC,CAAA;QAC5C,OAAO,EAAE,CAAA;IACb,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAiB;QAC5B,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,SAAU,EAAE,OAAO,CAAC,MAAO,EAAE,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,YAAY,CAAC,CAAA;QAC/F,OAAO,EAAE,CAAA;IACb,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,OAAkB;QAC9B,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,SAAU,EAAE,OAAO,CAAC,MAAO,EAAE,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,YAAY,CAAC,CAAA;QAChG,OAAO,EAAE,CAAA;IACb,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,OAAqB;QACpC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,SAAU,EAAE,OAAO,CAAC,MAAO,EAAE,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,YAAY,CAAC,CAAA;QACjH,OAAO,EAAE,CAAA;IACb,CAAC;;AAtQL,0CAuQC;AAtQ2B,2CAA2B,GAAG,yBAAyB,AAA5B,CAA4B"}
|
|
@@ -26,6 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
26
26
|
exports.RemoteWebSocketConnector = 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 RemoteWebSocketConnector {
|
|
31
32
|
constructor(peerDescriptor, client) {
|
|
@@ -33,7 +34,7 @@ class RemoteWebSocketConnector {
|
|
|
33
34
|
this.client = client;
|
|
34
35
|
}
|
|
35
36
|
async requestConnection(sourceDescriptor, ip, port) {
|
|
36
|
-
logger.trace(`Requesting WebSocket connection from ${this.peerDescriptor
|
|
37
|
+
logger.trace(`Requesting WebSocket connection from ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(this.peerDescriptor)}`);
|
|
37
38
|
const request = {
|
|
38
39
|
target: this.peerDescriptor,
|
|
39
40
|
requester: sourceDescriptor,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RemoteWebSocketConnector.js","sourceRoot":"","sources":["../../../../src/connection/WebSocket/RemoteWebSocketConnector.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAMA,0CAAuC;AACvC,0DAA2C;
|
|
1
|
+
{"version":3,"file":"RemoteWebSocketConnector.js","sourceRoot":"","sources":["../../../../src/connection/WebSocket/RemoteWebSocketConnector.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAMA,0CAAuC;AACvC,0DAA2C;AAE3C,qFAA8E;AAE9E,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,wBAAwB;IAKjC,YAAY,cAA8B,EAAE,MAAwD;QAChG,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;QACpC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,gBAAgC,EAAE,EAAU,EAAE,IAAY;QAC9E,MAAM,CAAC,KAAK,CAAC,wCAAwC,IAAA,gDAAqB,EAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAA;QAClG,MAAM,OAAO,GAA+B;YACxC,MAAM,EAAE,IAAI,CAAC,cAAc;YAC3B,SAAS,EAAE,gBAAgB;YAC3B,EAAE;YACF,IAAI;SACP,CAAA;QACD,MAAM,OAAO,GAAkB;YAC3B,gBAAgB,EAAE,gBAAgB;YAClC,gBAAgB,EAAE,IAAI,CAAC,cAAc;SACxC,CAAA;QACD,IAAI;YACA,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YAEjE,IAAI,GAAG,CAAC,MAAM,EAAE;gBACZ,MAAM,CAAC,KAAK,CAAC,qCAAqC,EAAE;oBAChD,KAAK,EAAE,IAAI,GAAG,CAAC,kCAAkC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,KAAK;iBACtE,CAAC,CAAA;aACL;YACD,OAAO,GAAG,CAAC,QAAQ,CAAA;SACtB;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,kCAAkC,CAAC,qCAAqC,EAAE,GAAG,CAAC,CAAC,KAAM,CAAC,CAAA;YAC3G,OAAO,KAAK,CAAA;SACf;IACL,CAAC;CACJ;AApCD,4DAoCC"}
|
|
@@ -1,10 +1,20 @@
|
|
|
1
1
|
import { ITransport } from '../../transport/ITransport';
|
|
2
2
|
import { ConnectivityMethod, ConnectivityResponse, PeerDescriptor, WebSocketConnectionRequest, WebSocketConnectionResponse } from '../../proto/packages/dht/protos/DhtRpc';
|
|
3
3
|
import { IWebSocketConnectorService } from '../../proto/packages/dht/protos/DhtRpc.server';
|
|
4
|
-
import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
|
|
5
4
|
import { ManagedConnection } from '../ManagedConnection';
|
|
6
5
|
import { PortRange, TlsCertificate } from '../ConnectionManager';
|
|
7
6
|
export declare const connectivityMethodToWebSocketUrl: (ws: ConnectivityMethod) => string;
|
|
7
|
+
interface WebSocketConnectorConfig {
|
|
8
|
+
protocolVersion: string;
|
|
9
|
+
transport: ITransport;
|
|
10
|
+
canConnect: (peerDescriptor: PeerDescriptor, _ip: string, port: number) => boolean;
|
|
11
|
+
onIncomingConnection: (connection: ManagedConnection) => boolean;
|
|
12
|
+
portRange?: PortRange;
|
|
13
|
+
maxMessageSize?: number;
|
|
14
|
+
host?: string;
|
|
15
|
+
entrypoints?: PeerDescriptor[];
|
|
16
|
+
tlsCertificate?: TlsCertificate;
|
|
17
|
+
}
|
|
8
18
|
export declare class WebSocketConnector implements IWebSocketConnectorService {
|
|
9
19
|
private static readonly WEBSOCKET_CONNECTOR_SERVICE_ID;
|
|
10
20
|
private readonly rpcCommunicator;
|
|
@@ -12,24 +22,25 @@ export declare class WebSocketConnector implements IWebSocketConnectorService {
|
|
|
12
22
|
private readonly webSocketServer?;
|
|
13
23
|
private connectivityChecker?;
|
|
14
24
|
private readonly ongoingConnectRequests;
|
|
15
|
-
private
|
|
16
|
-
private portRange?;
|
|
25
|
+
private onIncomingConnection;
|
|
17
26
|
private host?;
|
|
18
|
-
private entrypoints?;
|
|
27
|
+
private readonly entrypoints?;
|
|
19
28
|
private readonly tlsCertificate?;
|
|
20
29
|
private selectedPort?;
|
|
21
30
|
private readonly protocolVersion;
|
|
22
31
|
private ownPeerDescriptor?;
|
|
23
32
|
private connectingConnections;
|
|
24
33
|
private destroyed;
|
|
25
|
-
constructor(
|
|
34
|
+
constructor(config: WebSocketConnectorConfig);
|
|
26
35
|
private attachHandshaker;
|
|
27
36
|
start(): Promise<void>;
|
|
28
|
-
checkConnectivity(
|
|
37
|
+
checkConnectivity(): Promise<ConnectivityResponse>;
|
|
38
|
+
isPossibleToFormConnection(targetPeerDescriptor: PeerDescriptor): boolean;
|
|
29
39
|
connect(targetPeerDescriptor: PeerDescriptor): ManagedConnection;
|
|
30
|
-
requestConnectionFromPeer
|
|
40
|
+
private requestConnectionFromPeer;
|
|
31
41
|
private onServerSocketHandshakeRequest;
|
|
32
42
|
setOwnPeerDescriptor(ownPeerDescriptor: PeerDescriptor): void;
|
|
33
43
|
destroy(): Promise<void>;
|
|
34
|
-
requestConnection(request: WebSocketConnectionRequest
|
|
44
|
+
requestConnection(request: WebSocketConnectionRequest): Promise<WebSocketConnectionResponse>;
|
|
35
45
|
}
|
|
46
|
+
export {};
|
|
@@ -16,14 +16,19 @@ const proto_rpc_1 = require("@streamr/proto-rpc");
|
|
|
16
16
|
const Handshaker_1 = require("../Handshaker");
|
|
17
17
|
const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
|
|
18
18
|
const lodash_1 = require("lodash");
|
|
19
|
+
const AddressTools_1 = require("../../helpers/AddressTools");
|
|
19
20
|
const logger = new utils_1.Logger(module);
|
|
20
21
|
const connectivityMethodToWebSocketUrl = (ws) => {
|
|
21
22
|
return (ws.tls ? 'wss://' : 'ws://') + ws.host + ':' + ws.port;
|
|
22
23
|
};
|
|
23
24
|
exports.connectivityMethodToWebSocketUrl = connectivityMethodToWebSocketUrl;
|
|
25
|
+
const canOpenConnectionFromBrowser = (websocketServer) => {
|
|
26
|
+
const hasPrivateAddress = ((websocketServer.host === 'localhost') || (0, AddressTools_1.isPrivateIPv4)(websocketServer.host));
|
|
27
|
+
return websocketServer.tls || hasPrivateAddress;
|
|
28
|
+
};
|
|
24
29
|
const ENTRY_POINT_CONNECTION_ATTEMPTS = 5;
|
|
25
30
|
class WebSocketConnector {
|
|
26
|
-
constructor(
|
|
31
|
+
constructor(config) {
|
|
27
32
|
this.ongoingConnectRequests = new Map();
|
|
28
33
|
this.connectingConnections = new Map();
|
|
29
34
|
this.destroyed = false;
|
|
@@ -31,14 +36,14 @@ class WebSocketConnector {
|
|
|
31
36
|
const peerId = (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(peerDescriptor);
|
|
32
37
|
if (this.ongoingConnectRequests.has(peerId.toKey())) {
|
|
33
38
|
const ongoingConnectReguest = this.ongoingConnectRequests.get(peerId.toKey());
|
|
34
|
-
ongoingConnectReguest.attachImplementation(serverWebSocket
|
|
39
|
+
ongoingConnectReguest.attachImplementation(serverWebSocket);
|
|
35
40
|
ongoingConnectReguest.acceptHandshake();
|
|
36
41
|
this.ongoingConnectRequests.delete(peerId.toKey());
|
|
37
42
|
}
|
|
38
43
|
else {
|
|
39
44
|
const managedConnection = new ManagedConnection_1.ManagedConnection(this.ownPeerDescriptor, this.protocolVersion, IConnection_1.ConnectionType.WEBSOCKET_SERVER, undefined, serverWebSocket);
|
|
40
45
|
managedConnection.setPeerDescriptor(peerDescriptor);
|
|
41
|
-
if (this.
|
|
46
|
+
if (this.onIncomingConnection(managedConnection)) {
|
|
42
47
|
managedConnection.acceptHandshake();
|
|
43
48
|
}
|
|
44
49
|
else {
|
|
@@ -47,18 +52,21 @@ class WebSocketConnector {
|
|
|
47
52
|
}
|
|
48
53
|
}
|
|
49
54
|
};
|
|
50
|
-
this.protocolVersion = protocolVersion;
|
|
51
|
-
this.webSocketServer = portRange ? new WebSocketServer_1.WebSocketServer(
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
this.
|
|
57
|
-
this.
|
|
58
|
-
this.
|
|
55
|
+
this.protocolVersion = config.protocolVersion;
|
|
56
|
+
this.webSocketServer = config.portRange ? new WebSocketServer_1.WebSocketServer({
|
|
57
|
+
portRange: config.portRange,
|
|
58
|
+
tlsCertificate: config.tlsCertificate,
|
|
59
|
+
maxMessageSize: config.maxMessageSize
|
|
60
|
+
}) : undefined;
|
|
61
|
+
this.onIncomingConnection = config.onIncomingConnection;
|
|
62
|
+
this.host = config.host;
|
|
63
|
+
this.entrypoints = config.entrypoints;
|
|
64
|
+
this.tlsCertificate = config.tlsCertificate;
|
|
65
|
+
this.canConnectFunction = config.canConnect.bind(this);
|
|
66
|
+
this.rpcCommunicator = new ListeningRpcCommunicator_1.ListeningRpcCommunicator(WebSocketConnector.WEBSOCKET_CONNECTOR_SERVICE_ID, config.transport, {
|
|
59
67
|
rpcRequestTimeout: 15000
|
|
60
68
|
});
|
|
61
|
-
this.rpcCommunicator.registerRpcMethod(DhtRpc_1.WebSocketConnectionRequest, DhtRpc_1.WebSocketConnectionResponse, 'requestConnection', (req
|
|
69
|
+
this.rpcCommunicator.registerRpcMethod(DhtRpc_1.WebSocketConnectionRequest, DhtRpc_1.WebSocketConnectionResponse, 'requestConnection', (req) => this.requestConnection(req));
|
|
62
70
|
}
|
|
63
71
|
attachHandshaker(connection) {
|
|
64
72
|
const handshaker = new Handshaker_1.Handshaker(this.ownPeerDescriptor, this.protocolVersion, connection);
|
|
@@ -74,11 +82,11 @@ class WebSocketConnector {
|
|
|
74
82
|
serverSocket.resourceURL.query) {
|
|
75
83
|
const query = serverSocket.resourceURL.query;
|
|
76
84
|
if (query.connectivityRequest) {
|
|
77
|
-
logger.trace('Received connectivity request connection');
|
|
85
|
+
logger.trace('Received connectivity request connection from ' + serverSocket.getRemoteAddress());
|
|
78
86
|
this.connectivityChecker.listenToIncomingConnectivityRequests(serverSocket);
|
|
79
87
|
}
|
|
80
88
|
else if (query.connectivityProbe) {
|
|
81
|
-
logger.trace('Received connectivity probe connection');
|
|
89
|
+
logger.trace('Received connectivity probe connection from ' + serverSocket.getRemoteAddress());
|
|
82
90
|
}
|
|
83
91
|
else {
|
|
84
92
|
this.attachHandshaker(connection);
|
|
@@ -88,12 +96,12 @@ class WebSocketConnector {
|
|
|
88
96
|
this.attachHandshaker(connection);
|
|
89
97
|
}
|
|
90
98
|
});
|
|
91
|
-
const port = await this.webSocketServer.start(
|
|
99
|
+
const port = await this.webSocketServer.start();
|
|
92
100
|
this.selectedPort = port;
|
|
93
101
|
this.connectivityChecker = new ConnectivityChecker_1.ConnectivityChecker(this.selectedPort, this.tlsCertificate !== undefined, this.host);
|
|
94
102
|
}
|
|
95
103
|
}
|
|
96
|
-
async checkConnectivity(
|
|
104
|
+
async checkConnectivity() {
|
|
97
105
|
// TODO: this could throw if the server is not running
|
|
98
106
|
const noServerConnectivityResponse = {
|
|
99
107
|
openInternet: false,
|
|
@@ -103,38 +111,51 @@ class WebSocketConnector {
|
|
|
103
111
|
if (this.destroyed) {
|
|
104
112
|
return noServerConnectivityResponse;
|
|
105
113
|
}
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
if (!this.entrypoints || this.entrypoints.length < 1) {
|
|
113
|
-
// return connectivity info given in config
|
|
114
|
-
const preconfiguredConnectivityResponse = {
|
|
115
|
-
openInternet: true,
|
|
116
|
-
host: this.host,
|
|
117
|
-
natType: ConnectionManager_1.NatType.OPEN_INTERNET,
|
|
118
|
-
websocket: { host: this.host, port: this.selectedPort, tls: this.tlsCertificate !== undefined }
|
|
119
|
-
};
|
|
120
|
-
return preconfiguredConnectivityResponse;
|
|
114
|
+
for (const reattempt of (0, lodash_1.range)(ENTRY_POINT_CONNECTION_ATTEMPTS)) {
|
|
115
|
+
const entryPoint = (0, lodash_1.sample)(this.entrypoints);
|
|
116
|
+
try {
|
|
117
|
+
if (!this.webSocketServer) {
|
|
118
|
+
// If no websocket server, return openInternet: false
|
|
119
|
+
return noServerConnectivityResponse;
|
|
121
120
|
}
|
|
122
121
|
else {
|
|
123
|
-
|
|
124
|
-
|
|
122
|
+
if (!this.entrypoints || this.entrypoints.length < 1) {
|
|
123
|
+
// return connectivity info given in config
|
|
124
|
+
const preconfiguredConnectivityResponse = {
|
|
125
|
+
openInternet: true,
|
|
126
|
+
host: this.host,
|
|
127
|
+
natType: ConnectionManager_1.NatType.OPEN_INTERNET,
|
|
128
|
+
websocket: { host: this.host, port: this.selectedPort, tls: this.tlsCertificate !== undefined }
|
|
129
|
+
};
|
|
130
|
+
return preconfiguredConnectivityResponse;
|
|
131
|
+
}
|
|
132
|
+
else {
|
|
133
|
+
// Do real connectivity checking
|
|
134
|
+
return await this.connectivityChecker.sendConnectivityRequest(entryPoint);
|
|
135
|
+
}
|
|
125
136
|
}
|
|
126
137
|
}
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
else {
|
|
135
|
-
throw err;
|
|
138
|
+
catch (err) {
|
|
139
|
+
if (reattempt < ENTRY_POINT_CONNECTION_ATTEMPTS) {
|
|
140
|
+
const error = `Failed to connect to entrypoint with id ${(0, utils_1.binaryToHex)(entryPoint.kademliaId)} `
|
|
141
|
+
+ `and URL ${(0, exports.connectivityMethodToWebSocketUrl)(entryPoint.websocket)}`;
|
|
142
|
+
logger.error(error, { error: err });
|
|
143
|
+
await (0, utils_1.wait)(2000);
|
|
144
|
+
}
|
|
136
145
|
}
|
|
137
146
|
}
|
|
147
|
+
throw Error(`Failed to connect to the entrypoints after ${ENTRY_POINT_CONNECTION_ATTEMPTS} attempts`);
|
|
148
|
+
}
|
|
149
|
+
isPossibleToFormConnection(targetPeerDescriptor) {
|
|
150
|
+
if (this.ownPeerDescriptor.websocket !== undefined) {
|
|
151
|
+
return (targetPeerDescriptor.type !== DhtRpc_1.NodeType.BROWSER) || canOpenConnectionFromBrowser(this.ownPeerDescriptor.websocket);
|
|
152
|
+
}
|
|
153
|
+
else if (targetPeerDescriptor.websocket !== undefined) {
|
|
154
|
+
return (this.ownPeerDescriptor.type !== DhtRpc_1.NodeType.BROWSER) || canOpenConnectionFromBrowser(targetPeerDescriptor.websocket);
|
|
155
|
+
}
|
|
156
|
+
else {
|
|
157
|
+
return false;
|
|
158
|
+
}
|
|
138
159
|
}
|
|
139
160
|
connect(targetPeerDescriptor) {
|
|
140
161
|
const peerKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor);
|
|
@@ -189,14 +210,14 @@ class WebSocketConnector {
|
|
|
189
210
|
await this.webSocketServer?.stop();
|
|
190
211
|
}
|
|
191
212
|
// IWebSocketConnectorService implementation
|
|
192
|
-
async requestConnection(request
|
|
213
|
+
async requestConnection(request) {
|
|
193
214
|
if (!this.destroyed && this.canConnectFunction(request.requester, request.ip, request.port)) {
|
|
194
215
|
setImmediate(() => {
|
|
195
216
|
if (this.destroyed) {
|
|
196
217
|
return;
|
|
197
218
|
}
|
|
198
219
|
const connection = this.connect(request.requester);
|
|
199
|
-
this.
|
|
220
|
+
this.onIncomingConnection(connection);
|
|
200
221
|
});
|
|
201
222
|
const res = {
|
|
202
223
|
accepted: true
|
|
@@ -209,5 +230,5 @@ class WebSocketConnector {
|
|
|
209
230
|
}
|
|
210
231
|
}
|
|
211
232
|
exports.WebSocketConnector = WebSocketConnector;
|
|
212
|
-
WebSocketConnector.WEBSOCKET_CONNECTOR_SERVICE_ID = 'system/
|
|
233
|
+
WebSocketConnector.WEBSOCKET_CONNECTOR_SERVICE_ID = 'system/websocket-connector';
|
|
213
234
|
//# sourceMappingURL=WebSocketConnector.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebSocketConnector.js","sourceRoot":"","sources":["../../../../src/connection/WebSocket/WebSocketConnector.ts"],"names":[],"mappings":";;;AAAA,uDAAmD;AACnD,gDAA4D;AAE5D,uFAAmF;AACnF,yEAAqE;AACrE,
|
|
1
|
+
{"version":3,"file":"WebSocketConnector.js","sourceRoot":"","sources":["../../../../src/connection/WebSocket/WebSocketConnector.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,22 @@
|
|
|
1
1
|
import EventEmitter from 'eventemitter3';
|
|
2
2
|
import { ConnectionSourceEvents } from '../IConnectionSource';
|
|
3
3
|
import { PortRange, TlsCertificate } from '../ConnectionManager';
|
|
4
|
+
interface WebSocketServerConfig {
|
|
5
|
+
portRange: PortRange;
|
|
6
|
+
tlsCertificate?: TlsCertificate;
|
|
7
|
+
maxMessageSize?: number;
|
|
8
|
+
}
|
|
4
9
|
export declare class WebSocketServer extends EventEmitter<ConnectionSourceEvents> {
|
|
5
10
|
private httpServer?;
|
|
6
11
|
private wsServer?;
|
|
7
12
|
private readonly abortController;
|
|
8
|
-
|
|
13
|
+
private readonly portRange;
|
|
14
|
+
private readonly tlsCertificate?;
|
|
15
|
+
private readonly maxMessageSize;
|
|
16
|
+
constructor(config: WebSocketServerConfig);
|
|
17
|
+
start(): Promise<number>;
|
|
9
18
|
private startServer;
|
|
10
19
|
stop(): Promise<void>;
|
|
11
20
|
private createWsServer;
|
|
12
21
|
}
|
|
22
|
+
export {};
|
|
@@ -15,15 +15,18 @@ const lodash_1 = require("lodash");
|
|
|
15
15
|
const fs_1 = __importDefault(require("fs"));
|
|
16
16
|
const logger = new utils_1.Logger(module);
|
|
17
17
|
class WebSocketServer extends eventemitter3_1.default {
|
|
18
|
-
constructor() {
|
|
19
|
-
super(
|
|
18
|
+
constructor(config) {
|
|
19
|
+
super();
|
|
20
20
|
this.abortController = new AbortController();
|
|
21
|
+
this.portRange = config.portRange;
|
|
22
|
+
this.tlsCertificate = config.tlsCertificate;
|
|
23
|
+
this.maxMessageSize = config.maxMessageSize ?? 1048576;
|
|
21
24
|
}
|
|
22
|
-
async start(
|
|
23
|
-
const ports = (0, lodash_1.range)(portRange.min, portRange.max + 1);
|
|
25
|
+
async start() {
|
|
26
|
+
const ports = (0, lodash_1.range)(this.portRange.min, this.portRange.max + 1);
|
|
24
27
|
for (const port of ports) {
|
|
25
28
|
try {
|
|
26
|
-
await (0, utils_1.asAbortable)(this.startServer(port, tlsCertificate), this.abortController.signal);
|
|
29
|
+
await (0, utils_1.asAbortable)(this.startServer(port, this.tlsCertificate), this.abortController.signal);
|
|
27
30
|
return port;
|
|
28
31
|
}
|
|
29
32
|
catch (err) {
|
|
@@ -35,7 +38,7 @@ class WebSocketServer extends eventemitter3_1.default {
|
|
|
35
38
|
}
|
|
36
39
|
}
|
|
37
40
|
}
|
|
38
|
-
throw new errors_1.WebSocketServerStartError(`Failed to start WebSocket server on any port in range: ${portRange.min}-${portRange.min}`);
|
|
41
|
+
throw new errors_1.WebSocketServerStartError(`Failed to start WebSocket server on any port in range: ${this.portRange.min}-${this.portRange.min}`);
|
|
39
42
|
}
|
|
40
43
|
startServer(port, tlsCertificate) {
|
|
41
44
|
const requestListener = (request, response) => {
|
|
@@ -51,12 +54,12 @@ class WebSocketServer extends eventemitter3_1.default {
|
|
|
51
54
|
}, requestListener)
|
|
52
55
|
:
|
|
53
56
|
(0, http_1.createServer)(requestListener);
|
|
54
|
-
function originIsAllowed(
|
|
57
|
+
function originIsAllowed() {
|
|
55
58
|
return true;
|
|
56
59
|
}
|
|
57
60
|
this.wsServer = this.createWsServer(this.httpServer);
|
|
58
61
|
this.wsServer.on('request', (request) => {
|
|
59
|
-
if (!originIsAllowed(
|
|
62
|
+
if (!originIsAllowed()) {
|
|
60
63
|
// Make sure we only accept requests from an allowed origin
|
|
61
64
|
request.reject();
|
|
62
65
|
logger.trace('IConnection from origin ' + request.origin + ' rejected.');
|
|
@@ -97,13 +100,15 @@ class WebSocketServer extends eventemitter3_1.default {
|
|
|
97
100
|
if (typeof NodeJsWsServer !== 'undefined') {
|
|
98
101
|
return new NodeJsWsServer({
|
|
99
102
|
httpServer,
|
|
100
|
-
autoAcceptConnections: false
|
|
103
|
+
autoAcceptConnections: false,
|
|
104
|
+
maxReceivedMessageSize: this.maxMessageSize
|
|
101
105
|
});
|
|
102
106
|
}
|
|
103
107
|
else {
|
|
104
108
|
return this.wsServer = new websocket_1.server({
|
|
105
109
|
httpServer,
|
|
106
|
-
autoAcceptConnections: false
|
|
110
|
+
autoAcceptConnections: false,
|
|
111
|
+
maxReceivedMessageSize: this.maxMessageSize
|
|
107
112
|
});
|
|
108
113
|
}
|
|
109
114
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebSocketServer.js","sourceRoot":"","sources":["../../../../src/connection/WebSocket/WebSocketServer.ts"],"names":[],"mappings":";;;;;;AAAA,+BAA8G;AAC9G,iCAAgF;AAChF,kEAAwC;AACxC,yCAA8C;AAC9C,uDAAmD;AAKnD,0CAAoD;AACpD,iDAAgE;AAEhE,mCAA8B;AAC9B,4CAAmB;AAEnB,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"WebSocketServer.js","sourceRoot":"","sources":["../../../../src/connection/WebSocket/WebSocketServer.ts"],"names":[],"mappings":"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"}
|