@streamr/dht 0.0.1-tatum.7 → 0.0.1-tatum.8
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/ConnectionLockRpcRemote.d.ts +10 -0
- package/dist/src/connection/{RemoteConnectionLocker.js → ConnectionLockRpcRemote.js} +20 -35
- package/dist/src/connection/ConnectionLockRpcRemote.js.map +1 -0
- package/dist/src/connection/ConnectionManager.d.ts +0 -1
- package/dist/src/connection/ConnectionManager.js +27 -25
- package/dist/src/connection/ConnectionManager.js.map +1 -1
- package/dist/src/connection/ConnectivityChecker.js +4 -4
- package/dist/src/connection/ConnectivityChecker.js.map +1 -1
- package/dist/src/connection/ConnectorFacade.d.ts +1 -1
- package/dist/src/connection/ConnectorFacade.js +5 -8
- package/dist/src/connection/ConnectorFacade.js.map +1 -1
- package/dist/src/connection/Handshaker.d.ts +1 -2
- package/dist/src/connection/Handshaker.js +1 -4
- package/dist/src/connection/Handshaker.js.map +1 -1
- package/dist/src/connection/ManagedConnection.d.ts +1 -2
- package/dist/src/connection/ManagedConnection.js +4 -5
- package/dist/src/connection/ManagedConnection.js.map +1 -1
- package/dist/src/connection/ManagedWebRtcConnection.d.ts +1 -1
- package/dist/src/connection/ManagedWebRtcConnection.js +2 -2
- package/dist/src/connection/ManagedWebRtcConnection.js.map +1 -1
- package/dist/src/connection/Simulator/SimulatorConnector.d.ts +1 -2
- package/dist/src/connection/Simulator/SimulatorConnector.js +3 -4
- package/dist/src/connection/Simulator/SimulatorConnector.js.map +1 -1
- package/dist/src/connection/WebRTC/NodeWebRtcConnection.d.ts +1 -1
- package/dist/src/connection/WebRTC/{WebRtcConnector.d.ts → WebRtcConnectorRpcLocal.d.ts} +9 -9
- package/dist/src/connection/WebRTC/{WebRtcConnector.js → WebRtcConnectorRpcLocal.js} +38 -30
- package/dist/src/connection/WebRTC/WebRtcConnectorRpcLocal.js.map +1 -0
- package/dist/src/connection/WebRTC/WebRtcConnectorRpcRemote.d.ts +11 -0
- package/dist/src/connection/WebRTC/WebRtcConnectorRpcRemote.js +55 -0
- package/dist/src/connection/WebRTC/WebRtcConnectorRpcRemote.js.map +1 -0
- package/dist/src/connection/WebRTC/iceServerAsString.d.ts +1 -1
- package/dist/src/connection/WebSocket/{WebSocketConnector.d.ts → WebSocketConnectorRpcLocal.d.ts} +6 -7
- package/dist/src/connection/WebSocket/{WebSocketConnector.js → WebSocketConnectorRpcLocal.js} +20 -20
- package/dist/src/connection/WebSocket/WebSocketConnectorRpcLocal.js.map +1 -0
- package/dist/src/connection/WebSocket/WebSocketConnectorRpcRemote.d.ts +8 -0
- package/dist/src/connection/WebSocket/{RemoteWebSocketConnector.js → WebSocketConnectorRpcRemote.js} +11 -16
- package/dist/src/connection/WebSocket/WebSocketConnectorRpcRemote.js.map +1 -0
- package/dist/src/dht/DhtNode.d.ts +6 -7
- package/dist/src/dht/DhtNode.js +22 -23
- package/dist/src/dht/DhtNode.js.map +1 -1
- package/dist/src/dht/{RemoteExternalApi.d.ts → ExternalApiRpcRemote.d.ts} +2 -2
- package/dist/src/dht/{RemoteExternalApi.js → ExternalApiRpcRemote.js} +5 -6
- package/dist/src/dht/ExternalApiRpcRemote.js.map +1 -0
- package/dist/src/dht/discovery/PeerDiscovery.d.ts +1 -1
- package/dist/src/dht/discovery/PeerDiscovery.js +3 -2
- package/dist/src/dht/discovery/PeerDiscovery.js.map +1 -1
- package/dist/src/dht/find/RecursiveFindSession.d.ts +5 -5
- package/dist/src/dht/find/RecursiveFindSession.js +7 -7
- package/dist/src/dht/find/RecursiveFindSession.js.map +1 -1
- package/dist/src/dht/find/RecursiveFinder.d.ts +7 -7
- package/dist/src/dht/find/RecursiveFinder.js +24 -24
- package/dist/src/dht/find/RecursiveFinder.js.map +1 -1
- package/dist/src/dht/find/RemoteRecursiveFindSession.d.ts +1 -1
- package/dist/src/dht/find/RemoteRecursiveFindSession.js +4 -4
- package/dist/src/dht/find/RemoteRecursiveFindSession.js.map +1 -1
- package/dist/src/dht/registerExternalApiRpcMethods.js +4 -3
- package/dist/src/dht/registerExternalApiRpcMethods.js.map +1 -1
- package/dist/src/dht/routing/Router.d.ts +2 -2
- package/dist/src/dht/routing/Router.js +2 -4
- package/dist/src/dht/routing/Router.js.map +1 -1
- package/dist/src/dht/routing/{RemoteRouter.d.ts → RouterRpcRemote.d.ts} +2 -2
- package/dist/src/dht/routing/{RemoteRouter.js → RouterRpcRemote.js} +4 -4
- package/dist/src/dht/routing/RouterRpcRemote.js.map +1 -0
- package/dist/src/dht/routing/RoutingSession.js +2 -2
- package/dist/src/dht/routing/RoutingSession.js.map +1 -1
- package/dist/src/dht/store/{DataStore.d.ts → StoreRpcLocal.d.ts} +4 -4
- package/dist/src/dht/store/{DataStore.js → StoreRpcLocal.js} +27 -27
- package/dist/src/dht/store/StoreRpcLocal.js.map +1 -0
- package/dist/src/dht/store/{RemoteStore.d.ts → StoreRpcRemote.d.ts} +2 -2
- package/dist/src/dht/store/{RemoteStore.js → StoreRpcRemote.js} +4 -4
- package/dist/src/dht/store/StoreRpcRemote.js.map +1 -0
- package/dist/src/exports.d.ts +1 -1
- package/dist/src/helpers/protoClasses.js +2 -2
- package/dist/src/helpers/protoClasses.js.map +1 -1
- package/dist/src/proto/packages/dht/protos/DhtRpc.client.d.ts +29 -29
- package/dist/src/proto/packages/dht/protos/DhtRpc.client.js +39 -39
- package/dist/src/proto/packages/dht/protos/DhtRpc.client.js.map +1 -1
- package/dist/src/proto/packages/dht/protos/DhtRpc.d.ts +49 -158
- package/dist/src/proto/packages/dht/protos/DhtRpc.js +46 -86
- package/dist/src/proto/packages/dht/protos/DhtRpc.js.map +1 -1
- package/dist/src/proto/packages/dht/protos/DhtRpc.server.d.ts +15 -15
- package/dist/src/transport/RoutingRpcCommunicator.js +1 -0
- package/dist/src/transport/RoutingRpcCommunicator.js.map +1 -1
- package/package.json +4 -4
- package/protos/DhtRpc.proto +30 -59
- package/src/connection/ConnectionLockRpcRemote.ts +62 -0
- package/src/connection/ConnectionManager.ts +33 -32
- package/src/connection/ConnectivityChecker.ts +1 -1
- package/src/connection/ConnectorFacade.ts +7 -10
- package/src/connection/Handshaker.ts +0 -5
- package/src/connection/ManagedConnection.ts +3 -6
- package/src/connection/ManagedWebRtcConnection.ts +0 -2
- package/src/connection/Simulator/SimulatorConnector.ts +2 -7
- package/src/connection/WebRTC/NodeWebRtcConnection.ts +1 -1
- package/src/connection/WebRTC/{WebRtcConnector.ts → WebRtcConnectorRpcLocal.ts} +46 -34
- package/src/connection/WebRTC/WebRtcConnectorRpcRemote.ts +71 -0
- package/src/connection/WebRTC/iceServerAsString.ts +1 -1
- package/src/connection/WebSocket/{WebSocketConnector.ts → WebSocketConnectorRpcLocal.ts} +26 -26
- package/src/connection/WebSocket/{RemoteWebSocketConnector.ts → WebSocketConnectorRpcRemote.ts} +13 -18
- package/src/dht/DhtNode.ts +32 -33
- package/src/dht/{RemoteExternalApi.ts → ExternalApiRpcRemote.ts} +3 -4
- package/src/dht/discovery/PeerDiscovery.ts +4 -3
- package/src/dht/find/RecursiveFindSession.ts +11 -11
- package/src/dht/find/RecursiveFinder.ts +29 -30
- package/src/dht/find/RemoteRecursiveFindSession.ts +6 -6
- package/src/dht/registerExternalApiRpcMethods.ts +7 -4
- package/src/dht/routing/Router.ts +4 -6
- package/src/dht/routing/{RemoteRouter.ts → RouterRpcRemote.ts} +2 -2
- package/src/dht/routing/RoutingSession.ts +6 -6
- package/src/dht/store/{DataStore.ts → StoreRpcLocal.ts} +31 -31
- package/src/dht/store/{RemoteStore.ts → StoreRpcRemote.ts} +2 -2
- package/src/exports.ts +1 -1
- package/src/helpers/protoClasses.ts +4 -4
- package/src/proto/packages/dht/protos/DhtRpc.client.ts +54 -54
- package/src/proto/packages/dht/protos/DhtRpc.server.ts +15 -15
- package/src/proto/packages/dht/protos/DhtRpc.ts +76 -210
- package/src/transport/RoutingRpcCommunicator.ts +1 -0
- package/test/integration/{RemoteRouter.test.ts → RouterRpcRemote.test.ts} +8 -8
- package/test/integration/{RemoteStore.test.ts → StoreRpcRemote.test.ts} +13 -13
- package/test/integration/WebRtcConnectorRpc.test.ts +11 -24
- package/test/integration/WebSocketConnectorRpc.test.ts +8 -12
- package/test/unit/RecursiveFinder.test.ts +5 -6
- package/test/unit/{WebSocketConnector.test.ts → WebSocketConnectorRpcLocal.test.ts} +3 -3
- package/test/unit/webrtcReplaceInternalIpWithExternalIp.test.ts +1 -1
- package/test/utils/utils.ts +16 -26
- package/dist/src/connection/RemoteConnectionLocker.d.ts +0 -13
- package/dist/src/connection/RemoteConnectionLocker.js.map +0 -1
- package/dist/src/connection/WebRTC/RemoteWebrtcConnector.d.ts +0 -12
- package/dist/src/connection/WebRTC/RemoteWebrtcConnector.js +0 -74
- package/dist/src/connection/WebRTC/RemoteWebrtcConnector.js.map +0 -1
- package/dist/src/connection/WebRTC/WebRtcConnector.js.map +0 -1
- package/dist/src/connection/WebSocket/RemoteWebSocketConnector.d.ts +0 -9
- package/dist/src/connection/WebSocket/RemoteWebSocketConnector.js.map +0 -1
- package/dist/src/connection/WebSocket/WebSocketConnector.js.map +0 -1
- package/dist/src/dht/RemoteExternalApi.js.map +0 -1
- package/dist/src/dht/routing/RemoteRouter.js.map +0 -1
- package/dist/src/dht/store/DataStore.js.map +0 -1
- package/dist/src/dht/store/RemoteStore.js.map +0 -1
- package/src/connection/RemoteConnectionLocker.ts +0 -85
- package/src/connection/WebRTC/RemoteWebrtcConnector.ts +0 -93
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ManagedConnection.js","sourceRoot":"","sources":["../../../src/connection/ManagedConnection.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ManagedConnection.js","sourceRoot":"","sources":["../../../src/connection/ManagedConnection.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,6 @@ import { PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc';
|
|
|
2
2
|
import { ManagedConnection } from './ManagedConnection';
|
|
3
3
|
import { NodeWebRtcConnection } from './WebRTC/NodeWebRtcConnection';
|
|
4
4
|
export declare class ManagedWebRtcConnection extends ManagedConnection {
|
|
5
|
-
constructor(ownPeerDescriptor: PeerDescriptor,
|
|
5
|
+
constructor(ownPeerDescriptor: PeerDescriptor, connectingConnection?: NodeWebRtcConnection, connectedConnection?: NodeWebRtcConnection);
|
|
6
6
|
getWebRtcConnection(): NodeWebRtcConnection;
|
|
7
7
|
}
|
|
@@ -4,8 +4,8 @@ exports.ManagedWebRtcConnection = void 0;
|
|
|
4
4
|
const IConnection_1 = require("./IConnection");
|
|
5
5
|
const ManagedConnection_1 = require("./ManagedConnection");
|
|
6
6
|
class ManagedWebRtcConnection extends ManagedConnection_1.ManagedConnection {
|
|
7
|
-
constructor(ownPeerDescriptor,
|
|
8
|
-
super(ownPeerDescriptor,
|
|
7
|
+
constructor(ownPeerDescriptor, connectingConnection, connectedConnection) {
|
|
8
|
+
super(ownPeerDescriptor, IConnection_1.ConnectionType.WEBRTC, connectingConnection, connectedConnection);
|
|
9
9
|
}
|
|
10
10
|
getWebRtcConnection() {
|
|
11
11
|
if (this.outgoingConnection) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ManagedWebRtcConnection.js","sourceRoot":"","sources":["../../../src/connection/ManagedWebRtcConnection.ts"],"names":[],"mappings":";;;AACA,+CAA8C;AAC9C,2DAAuD;AAGvD,MAAa,uBAAwB,SAAQ,qCAAiB;IAE1D,YAAY,iBAAiC,EACzC,
|
|
1
|
+
{"version":3,"file":"ManagedWebRtcConnection.js","sourceRoot":"","sources":["../../../src/connection/ManagedWebRtcConnection.ts"],"names":[],"mappings":";;;AACA,+CAA8C;AAC9C,2DAAuD;AAGvD,MAAa,uBAAwB,SAAQ,qCAAiB;IAE1D,YAAY,iBAAiC,EACzC,oBAA2C,EAC3C,mBAA0C;QAC1C,KAAK,CACD,iBAAiB,EACjB,4BAAc,CAAC,MAAM,EACrB,oBAAoB,EACpB,mBAAmB,CAAC,CAAA;IAC5B,CAAC;IAEM,mBAAmB;QACtB,IAAI,IAAI,CAAC,kBAAkB,EAAE;YACzB,OAAO,IAAI,CAAC,kBAAqD,CAAA;SACpE;aAAM;YACH,OAAO,IAAI,CAAC,kBAAqD,CAAA;SACpE;IACL,CAAC;CACJ;AAnBD,0DAmBC"}
|
|
@@ -5,11 +5,10 @@ import { SimulatorConnection } from './SimulatorConnection';
|
|
|
5
5
|
export declare class SimulatorConnector {
|
|
6
6
|
private connectingConnections;
|
|
7
7
|
private stopped;
|
|
8
|
-
private protocolVersion;
|
|
9
8
|
private ownPeerDescriptor;
|
|
10
9
|
private simulator;
|
|
11
10
|
private onIncomingConnection;
|
|
12
|
-
constructor(
|
|
11
|
+
constructor(ownPeerDescriptor: PeerDescriptor, simulator: Simulator, onIncomingConnection: (connection: ManagedConnection) => boolean);
|
|
13
12
|
connect(targetPeerDescriptor: PeerDescriptor): ManagedConnection;
|
|
14
13
|
getPeerDescriptor(): PeerDescriptor;
|
|
15
14
|
handleIncomingConnection(sourceConnection: SimulatorConnection): void;
|
|
@@ -8,10 +8,9 @@ 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(
|
|
11
|
+
constructor(ownPeerDescriptor, simulator, onIncomingConnection) {
|
|
12
12
|
this.connectingConnections = new Map();
|
|
13
13
|
this.stopped = false;
|
|
14
|
-
this.protocolVersion = protocolVersion;
|
|
15
14
|
this.ownPeerDescriptor = ownPeerDescriptor;
|
|
16
15
|
this.simulator = simulator;
|
|
17
16
|
this.onIncomingConnection = onIncomingConnection;
|
|
@@ -24,7 +23,7 @@ class SimulatorConnector {
|
|
|
24
23
|
return existingConnection;
|
|
25
24
|
}
|
|
26
25
|
const connection = new SimulatorConnection_1.SimulatorConnection(this.ownPeerDescriptor, targetPeerDescriptor, IConnection_1.ConnectionType.SIMULATOR_CLIENT, this.simulator);
|
|
27
|
-
const managedConnection = new ManagedConnection_1.ManagedConnection(this.ownPeerDescriptor,
|
|
26
|
+
const managedConnection = new ManagedConnection_1.ManagedConnection(this.ownPeerDescriptor, IConnection_1.ConnectionType.SIMULATOR_CLIENT, connection, undefined);
|
|
28
27
|
managedConnection.setPeerDescriptor(targetPeerDescriptor);
|
|
29
28
|
this.connectingConnections.set(peerKey, managedConnection);
|
|
30
29
|
connection.once('disconnected', () => {
|
|
@@ -45,7 +44,7 @@ class SimulatorConnector {
|
|
|
45
44
|
return;
|
|
46
45
|
}
|
|
47
46
|
const connection = new SimulatorConnection_1.SimulatorConnection(this.ownPeerDescriptor, sourceConnection.ownPeerDescriptor, IConnection_1.ConnectionType.SIMULATOR_SERVER, this.simulator);
|
|
48
|
-
const managedConnection = new ManagedConnection_1.ManagedConnection(this.ownPeerDescriptor,
|
|
47
|
+
const managedConnection = new ManagedConnection_1.ManagedConnection(this.ownPeerDescriptor, IConnection_1.ConnectionType.SIMULATOR_SERVER, undefined, connection);
|
|
49
48
|
logger.trace('connected');
|
|
50
49
|
managedConnection.once('handshakeRequest', () => {
|
|
51
50
|
logger.trace((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(sourceConnection.ownPeerDescriptor) + ' incoming handshake request');
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"SimulatorConnector.js","sourceRoot":"","sources":["../../../../src/connection/Simulator/SimulatorConnector.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { ConnectionType, IConnection, ConnectionID, ConnectionEvents } from '../
|
|
|
3
3
|
import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
|
|
4
4
|
import EventEmitter from 'eventemitter3';
|
|
5
5
|
import { DisconnectionType } from '../../transport/ITransport';
|
|
6
|
-
import { IceServer } from './
|
|
6
|
+
import { IceServer } from './WebRtcConnectorRpcLocal';
|
|
7
7
|
import { PortRange } from '../ConnectionManager';
|
|
8
8
|
export declare const WEB_RTC_CLEANUP: {
|
|
9
9
|
cleanUp(): void;
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { IceCandidate, PeerDescriptor, RtcAnswer, RtcOffer, WebRtcConnectionRequest } from '../../proto/packages/dht/protos/DhtRpc';
|
|
2
2
|
import { Empty } from '../../proto/google/protobuf/empty';
|
|
3
3
|
import { ITransport } from '../../transport/ITransport';
|
|
4
|
-
import {
|
|
4
|
+
import { IWebRtcConnectorRpc } from '../../proto/packages/dht/protos/DhtRpc.server';
|
|
5
5
|
import { ManagedConnection } from '../ManagedConnection';
|
|
6
6
|
import { PortRange } from '../ConnectionManager';
|
|
7
|
+
import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
|
|
7
8
|
export declare const replaceInternalIpWithExternalIp: (candidate: string, ip: string) => string;
|
|
8
|
-
export interface
|
|
9
|
+
export interface WebRtcConnectorRpcLocalConfig {
|
|
9
10
|
transport: ITransport;
|
|
10
|
-
protocolVersion: string;
|
|
11
11
|
iceServers?: IceServer[];
|
|
12
12
|
allowPrivateAddresses?: boolean;
|
|
13
13
|
bufferThresholdLow?: number;
|
|
@@ -24,7 +24,7 @@ export interface IceServer {
|
|
|
24
24
|
password?: string;
|
|
25
25
|
tcp?: boolean;
|
|
26
26
|
}
|
|
27
|
-
export declare class
|
|
27
|
+
export declare class WebRtcConnectorRpcLocal implements IWebRtcConnectorRpc {
|
|
28
28
|
private static readonly WEBRTC_CONNECTOR_SERVICE_ID;
|
|
29
29
|
private readonly rpcCommunicator;
|
|
30
30
|
private readonly ongoingConnectAttempts;
|
|
@@ -34,7 +34,7 @@ export declare class WebRtcConnector implements IWebRtcConnectorService {
|
|
|
34
34
|
private allowPrivateAddresses;
|
|
35
35
|
private config;
|
|
36
36
|
private onIncomingConnection;
|
|
37
|
-
constructor(config:
|
|
37
|
+
constructor(config: WebRtcConnectorRpcLocalConfig, onIncomingConnection: (connection: ManagedConnection) => boolean);
|
|
38
38
|
connect(targetPeerDescriptor: PeerDescriptor): ManagedConnection;
|
|
39
39
|
setOwnPeerDescriptor(peerDescriptor: PeerDescriptor): void;
|
|
40
40
|
private isIceCandidateAllowed;
|
|
@@ -44,8 +44,8 @@ export declare class WebRtcConnector implements IWebRtcConnectorService {
|
|
|
44
44
|
private onRemoteCandidate;
|
|
45
45
|
stop(): Promise<void>;
|
|
46
46
|
isOffering(targetPeerDescriptor: PeerDescriptor): boolean;
|
|
47
|
-
requestConnection(
|
|
48
|
-
rtcOffer(request: RtcOffer): Promise<Empty>;
|
|
49
|
-
rtcAnswer(request: RtcAnswer): Promise<Empty>;
|
|
50
|
-
iceCandidate(request: IceCandidate): Promise<Empty>;
|
|
47
|
+
requestConnection(_request: WebRtcConnectionRequest, context: ServerCallContext): Promise<Empty>;
|
|
48
|
+
rtcOffer(request: RtcOffer, context: ServerCallContext): Promise<Empty>;
|
|
49
|
+
rtcAnswer(request: RtcAnswer, context: ServerCallContext): Promise<Empty>;
|
|
50
|
+
iceCandidate(request: IceCandidate, context: ServerCallContext): Promise<Empty>;
|
|
51
51
|
}
|
|
@@ -23,11 +23,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.
|
|
26
|
+
exports.WebRtcConnectorRpcLocal = exports.replaceInternalIpWithExternalIp = void 0;
|
|
27
27
|
const DhtRpc_1 = require("../../proto/packages/dht/protos/DhtRpc");
|
|
28
28
|
const ListeningRpcCommunicator_1 = require("../../transport/ListeningRpcCommunicator");
|
|
29
29
|
const NodeWebRtcConnection_1 = require("./NodeWebRtcConnection");
|
|
30
|
-
const
|
|
30
|
+
const WebRtcConnectorRpcRemote_1 = require("./WebRtcConnectorRpcRemote");
|
|
31
31
|
const DhtRpc_client_1 = require("../../proto/packages/dht/protos/DhtRpc.client");
|
|
32
32
|
const ManagedWebRtcConnection_1 = require("../ManagedWebRtcConnection");
|
|
33
33
|
const utils_1 = require("@streamr/utils");
|
|
@@ -45,7 +45,7 @@ const replaceInternalIpWithExternalIp = (candidate, ip) => {
|
|
|
45
45
|
return parsed.join(' ');
|
|
46
46
|
};
|
|
47
47
|
exports.replaceInternalIpWithExternalIp = replaceInternalIpWithExternalIp;
|
|
48
|
-
class
|
|
48
|
+
class WebRtcConnectorRpcLocal {
|
|
49
49
|
constructor(config, onIncomingConnection) {
|
|
50
50
|
this.ongoingConnectAttempts = new Map();
|
|
51
51
|
this.stopped = false;
|
|
@@ -53,13 +53,13 @@ class WebRtcConnector {
|
|
|
53
53
|
this.iceServers = config.iceServers || [];
|
|
54
54
|
this.allowPrivateAddresses = config.allowPrivateAddresses || true;
|
|
55
55
|
this.onIncomingConnection = onIncomingConnection;
|
|
56
|
-
this.rpcCommunicator = new ListeningRpcCommunicator_1.ListeningRpcCommunicator(
|
|
56
|
+
this.rpcCommunicator = new ListeningRpcCommunicator_1.ListeningRpcCommunicator(WebRtcConnectorRpcLocal.WEBRTC_CONNECTOR_SERVICE_ID, config.transport, {
|
|
57
57
|
rpcRequestTimeout: 15000
|
|
58
58
|
});
|
|
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));
|
|
59
|
+
this.rpcCommunicator.registerRpcNotification(DhtRpc_1.RtcOffer, 'rtcOffer', (req, context) => this.rtcOffer(req, context));
|
|
60
|
+
this.rpcCommunicator.registerRpcNotification(DhtRpc_1.RtcAnswer, 'rtcAnswer', (req, context) => this.rtcAnswer(req, context));
|
|
61
|
+
this.rpcCommunicator.registerRpcNotification(DhtRpc_1.IceCandidate, 'iceCandidate', (req, context) => this.iceCandidate(req, context));
|
|
62
|
+
this.rpcCommunicator.registerRpcNotification(DhtRpc_1.WebRtcConnectionRequest, 'requestConnection', (req, context) => this.requestConnection(req, context));
|
|
63
63
|
}
|
|
64
64
|
connect(targetPeerDescriptor) {
|
|
65
65
|
if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(targetPeerDescriptor, this.ownPeerDescriptor)) {
|
|
@@ -82,10 +82,10 @@ class WebRtcConnector {
|
|
|
82
82
|
const offering = this.isOffering(targetPeerDescriptor);
|
|
83
83
|
let managedConnection;
|
|
84
84
|
if (offering) {
|
|
85
|
-
managedConnection = new ManagedWebRtcConnection_1.ManagedWebRtcConnection(this.ownPeerDescriptor,
|
|
85
|
+
managedConnection = new ManagedWebRtcConnection_1.ManagedWebRtcConnection(this.ownPeerDescriptor, connection);
|
|
86
86
|
}
|
|
87
87
|
else {
|
|
88
|
-
managedConnection = new ManagedWebRtcConnection_1.ManagedWebRtcConnection(this.ownPeerDescriptor,
|
|
88
|
+
managedConnection = new ManagedWebRtcConnection_1.ManagedWebRtcConnection(this.ownPeerDescriptor, undefined, connection);
|
|
89
89
|
}
|
|
90
90
|
managedConnection.setPeerDescriptor(targetPeerDescriptor);
|
|
91
91
|
this.ongoingConnectAttempts.set((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor), managedConnection);
|
|
@@ -98,27 +98,27 @@ class WebRtcConnector {
|
|
|
98
98
|
};
|
|
99
99
|
connection.on('disconnected', delFunc);
|
|
100
100
|
managedConnection.on('handshakeCompleted', delFunc);
|
|
101
|
-
const remoteConnector = new
|
|
101
|
+
const remoteConnector = new WebRtcConnectorRpcRemote_1.WebRtcConnectorRpcRemote(this.ownPeerDescriptor, targetPeerDescriptor, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.WebRtcConnectorRpcClient(this.rpcCommunicator.getRpcClientTransport())));
|
|
102
102
|
connection.on('localCandidate', (candidate, mid) => {
|
|
103
103
|
if (this.config.externalIp) {
|
|
104
104
|
candidate = (0, exports.replaceInternalIpWithExternalIp)(candidate, this.config.externalIp);
|
|
105
105
|
logger.debug(`onLocalCandidate injected external ip ${candidate} ${mid}`);
|
|
106
106
|
}
|
|
107
|
-
remoteConnector.sendIceCandidate(
|
|
107
|
+
remoteConnector.sendIceCandidate(candidate, mid, connection.connectionId.toString());
|
|
108
108
|
});
|
|
109
109
|
if (offering) {
|
|
110
110
|
connection.once('localDescription', (description) => {
|
|
111
|
-
remoteConnector.sendRtcOffer(
|
|
111
|
+
remoteConnector.sendRtcOffer(description, connection.connectionId.toString());
|
|
112
112
|
});
|
|
113
113
|
}
|
|
114
114
|
else {
|
|
115
115
|
connection.once('localDescription', (description) => {
|
|
116
|
-
remoteConnector.sendRtcAnswer(
|
|
116
|
+
remoteConnector.sendRtcAnswer(description, connection.connectionId.toString());
|
|
117
117
|
});
|
|
118
118
|
}
|
|
119
119
|
connection.start(offering);
|
|
120
120
|
if (!offering) {
|
|
121
|
-
remoteConnector.requestConnection(
|
|
121
|
+
remoteConnector.requestConnection(connection.connectionId.toString());
|
|
122
122
|
}
|
|
123
123
|
return managedConnection;
|
|
124
124
|
}
|
|
@@ -143,16 +143,16 @@ class WebRtcConnector {
|
|
|
143
143
|
let connection = managedConnection?.getWebRtcConnection();
|
|
144
144
|
if (!managedConnection) {
|
|
145
145
|
connection = new NodeWebRtcConnection_1.NodeWebRtcConnection({ remotePeerDescriptor: remotePeer });
|
|
146
|
-
managedConnection = new ManagedWebRtcConnection_1.ManagedWebRtcConnection(this.ownPeerDescriptor,
|
|
146
|
+
managedConnection = new ManagedWebRtcConnection_1.ManagedWebRtcConnection(this.ownPeerDescriptor, undefined, connection);
|
|
147
147
|
managedConnection.setPeerDescriptor(remotePeer);
|
|
148
148
|
this.ongoingConnectAttempts.set(peerKey, managedConnection);
|
|
149
149
|
this.onIncomingConnection(managedConnection);
|
|
150
|
-
const remoteConnector = new
|
|
150
|
+
const remoteConnector = new WebRtcConnectorRpcRemote_1.WebRtcConnectorRpcRemote(this.ownPeerDescriptor, remotePeer, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.WebRtcConnectorRpcClient(this.rpcCommunicator.getRpcClientTransport())));
|
|
151
151
|
connection.on('localCandidate', (candidate, mid) => {
|
|
152
|
-
remoteConnector.sendIceCandidate(
|
|
152
|
+
remoteConnector.sendIceCandidate(candidate, mid, connection.connectionId.toString());
|
|
153
153
|
});
|
|
154
154
|
connection.once('localDescription', (description) => {
|
|
155
|
-
remoteConnector.sendRtcAnswer(
|
|
155
|
+
remoteConnector.sendRtcAnswer(description, connection.connectionId.toString());
|
|
156
156
|
});
|
|
157
157
|
connection.start(false);
|
|
158
158
|
}
|
|
@@ -219,23 +219,31 @@ class WebRtcConnector {
|
|
|
219
219
|
return myId.hasSmallerHashThan(theirId);
|
|
220
220
|
}
|
|
221
221
|
// IWebRTCConnector implementation
|
|
222
|
-
|
|
223
|
-
|
|
222
|
+
// TODO should we read connectionId from WebRtcConnectionRequest (or remove the field)?
|
|
223
|
+
async requestConnection(_request, context) {
|
|
224
|
+
const senderPeerDescriptor = context.incomingSourceDescriptor;
|
|
225
|
+
this.onConnectionRequest(senderPeerDescriptor);
|
|
224
226
|
return {};
|
|
225
227
|
}
|
|
226
|
-
async rtcOffer(request) {
|
|
227
|
-
|
|
228
|
+
async rtcOffer(request, context) {
|
|
229
|
+
const senderPeerDescriptor = context.incomingSourceDescriptor;
|
|
230
|
+
const receiverPeerDescriptor = context.incomingTargetDescriptor;
|
|
231
|
+
this.onRtcOffer(senderPeerDescriptor, receiverPeerDescriptor, request.description, request.connectionId);
|
|
228
232
|
return {};
|
|
229
233
|
}
|
|
230
|
-
async rtcAnswer(request) {
|
|
231
|
-
|
|
234
|
+
async rtcAnswer(request, context) {
|
|
235
|
+
const senderPeerDescriptor = context.incomingSourceDescriptor;
|
|
236
|
+
const receiverPeerDescriptor = context.incomingTargetDescriptor;
|
|
237
|
+
this.onRtcAnswer(senderPeerDescriptor, receiverPeerDescriptor, request.description, request.connectionId);
|
|
232
238
|
return {};
|
|
233
239
|
}
|
|
234
|
-
async iceCandidate(request) {
|
|
235
|
-
|
|
240
|
+
async iceCandidate(request, context) {
|
|
241
|
+
const senderPeerDescriptor = context.incomingSourceDescriptor;
|
|
242
|
+
const receiverPeerDescriptor = context.incomingTargetDescriptor;
|
|
243
|
+
this.onRemoteCandidate(senderPeerDescriptor, receiverPeerDescriptor, request.candidate, request.mid, request.connectionId);
|
|
236
244
|
return {};
|
|
237
245
|
}
|
|
238
246
|
}
|
|
239
|
-
exports.
|
|
240
|
-
|
|
241
|
-
//# sourceMappingURL=
|
|
247
|
+
exports.WebRtcConnectorRpcLocal = WebRtcConnectorRpcLocal;
|
|
248
|
+
WebRtcConnectorRpcLocal.WEBRTC_CONNECTOR_SERVICE_ID = 'system/webrtc-connector';
|
|
249
|
+
//# sourceMappingURL=WebRtcConnectorRpcLocal.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"WebRtcConnectorRpcLocal.js","sourceRoot":"","sources":["../../../../src/connection/WebRTC/WebRtcConnectorRpcLocal.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { Remote } from '../../dht/contact/Remote';
|
|
2
|
+
import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
|
|
3
|
+
import { IWebRtcConnectorRpcClient } from '../../proto/packages/dht/protos/DhtRpc.client';
|
|
4
|
+
import { ProtoRpcClient } from '@streamr/proto-rpc';
|
|
5
|
+
export declare class WebRtcConnectorRpcRemote extends Remote<IWebRtcConnectorRpcClient> {
|
|
6
|
+
constructor(localPeerDescriptor: PeerDescriptor, remotePeerDescriptor: PeerDescriptor, client: ProtoRpcClient<IWebRtcConnectorRpcClient>);
|
|
7
|
+
requestConnection(connectionId: string): void;
|
|
8
|
+
sendRtcOffer(description: string, connectionId: string): void;
|
|
9
|
+
sendRtcAnswer(description: string, connectionId: string): void;
|
|
10
|
+
sendIceCandidate(candidate: string, mid: string, connectionId: string): void;
|
|
11
|
+
}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.WebRtcConnectorRpcRemote = void 0;
|
|
4
|
+
const Remote_1 = require("../../dht/contact/Remote");
|
|
5
|
+
const utils_1 = require("@streamr/utils");
|
|
6
|
+
const logger = new utils_1.Logger(module);
|
|
7
|
+
class WebRtcConnectorRpcRemote extends Remote_1.Remote {
|
|
8
|
+
constructor(localPeerDescriptor, remotePeerDescriptor, client) {
|
|
9
|
+
super(localPeerDescriptor, remotePeerDescriptor, 'DUMMY', client);
|
|
10
|
+
}
|
|
11
|
+
requestConnection(connectionId) {
|
|
12
|
+
const request = {
|
|
13
|
+
connectionId
|
|
14
|
+
};
|
|
15
|
+
const options = this.formDhtRpcOptions({
|
|
16
|
+
notification: true
|
|
17
|
+
});
|
|
18
|
+
this.getClient().requestConnection(request, options).catch((_e) => {
|
|
19
|
+
logger.trace('Failed to send requestConnection');
|
|
20
|
+
});
|
|
21
|
+
}
|
|
22
|
+
sendRtcOffer(description, connectionId) {
|
|
23
|
+
const request = {
|
|
24
|
+
connectionId,
|
|
25
|
+
description
|
|
26
|
+
};
|
|
27
|
+
const options = this.formDhtRpcOptions();
|
|
28
|
+
this.getClient().rtcOffer(request, options).catch((_e) => {
|
|
29
|
+
logger.trace('Failed to send rtcOffer');
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
sendRtcAnswer(description, connectionId) {
|
|
33
|
+
const request = {
|
|
34
|
+
connectionId,
|
|
35
|
+
description
|
|
36
|
+
};
|
|
37
|
+
const options = this.formDhtRpcOptions();
|
|
38
|
+
this.getClient().rtcAnswer(request, options).catch((_e) => {
|
|
39
|
+
logger.trace('Failed to send rtcAnswer');
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
sendIceCandidate(candidate, mid, connectionId) {
|
|
43
|
+
const request = {
|
|
44
|
+
connectionId,
|
|
45
|
+
mid,
|
|
46
|
+
candidate
|
|
47
|
+
};
|
|
48
|
+
const options = this.formDhtRpcOptions();
|
|
49
|
+
this.getClient().iceCandidate(request, options).catch((_e) => {
|
|
50
|
+
logger.trace('Failed to send iceCandidate');
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
exports.WebRtcConnectorRpcRemote = WebRtcConnectorRpcRemote;
|
|
55
|
+
//# sourceMappingURL=WebRtcConnectorRpcRemote.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"WebRtcConnectorRpcRemote.js","sourceRoot":"","sources":["../../../../src/connection/WebRTC/WebRtcConnectorRpcRemote.ts"],"names":[],"mappings":";;;AAAA,qDAAiD;AAUjD,0CAAuC;AAEvC,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,wBAAyB,SAAQ,eAAiC;IAE3E,YACI,mBAAmC,EACnC,oBAAoC,EACpC,MAAiD;QAEjD,KAAK,CAAC,mBAAmB,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;IACrE,CAAC;IAED,iBAAiB,CAAC,YAAoB;QAClC,MAAM,OAAO,GAA4B;YACrC,YAAY;SACf,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,YAAY,EAAE,IAAI;SACrB,CAAC,CAAA;QACF,IAAI,CAAC,SAAS,EAAE,CAAC,iBAAiB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE;YAC9D,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAA;QACpD,CAAC,CAAC,CAAA;IACN,CAAC;IAED,YAAY,CAAC,WAAmB,EAAE,YAAoB;QAClD,MAAM,OAAO,GAAa;YACtB,YAAY;YACZ,WAAW;SACd,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAA;QACxC,IAAI,CAAC,SAAS,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE;YACrD,MAAM,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAA;QAC3C,CAAC,CAAC,CAAA;IACN,CAAC;IAED,aAAa,CAAC,WAAmB,EAAE,YAAoB;QACnD,MAAM,OAAO,GAAc;YACvB,YAAY;YACZ,WAAW;SACd,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAA;QACxC,IAAI,CAAC,SAAS,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE;YACtD,MAAM,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAA;QAC5C,CAAC,CAAC,CAAA;IACN,CAAC;IAED,gBAAgB,CAAC,SAAiB,EAAE,GAAW,EAAE,YAAoB;QACjE,MAAM,OAAO,GAAiB;YAC1B,YAAY;YACZ,GAAG;YACH,SAAS;SACZ,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAA;QACxC,IAAI,CAAC,SAAS,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE;YACzD,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAA;QAC/C,CAAC,CAAC,CAAA;IACN,CAAC;CACJ;AAvDD,4DAuDC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import { IceServer } from './
|
|
1
|
+
import { IceServer } from './WebRtcConnectorRpcLocal';
|
|
2
2
|
export declare function iceServerAsString({ url, port, username, password, tcp }: IceServer): string;
|
package/dist/src/connection/WebSocket/{WebSocketConnector.d.ts → WebSocketConnectorRpcLocal.d.ts}
RENAMED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { ITransport } from '../../transport/ITransport';
|
|
2
2
|
import { ConnectivityMethod, ConnectivityResponse, PeerDescriptor, WebSocketConnectionRequest, WebSocketConnectionResponse } from '../../proto/packages/dht/protos/DhtRpc';
|
|
3
|
-
import {
|
|
3
|
+
import { IWebSocketConnectorRpc } from '../../proto/packages/dht/protos/DhtRpc.server';
|
|
4
4
|
import { ManagedConnection } from '../ManagedConnection';
|
|
5
5
|
import { PortRange, TlsCertificate } from '../ConnectionManager';
|
|
6
|
+
import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
|
|
6
7
|
export declare const connectivityMethodToWebSocketUrl: (ws: ConnectivityMethod) => string;
|
|
7
|
-
interface
|
|
8
|
-
protocolVersion: string;
|
|
8
|
+
interface WebSocketConnectorRpcLocalConfig {
|
|
9
9
|
transport: ITransport;
|
|
10
10
|
canConnect: (peerDescriptor: PeerDescriptor, _ip: string, port: number) => boolean;
|
|
11
11
|
onIncomingConnection: (connection: ManagedConnection) => boolean;
|
|
@@ -15,7 +15,7 @@ interface WebSocketConnectorConfig {
|
|
|
15
15
|
entrypoints?: PeerDescriptor[];
|
|
16
16
|
tlsCertificate?: TlsCertificate;
|
|
17
17
|
}
|
|
18
|
-
export declare class
|
|
18
|
+
export declare class WebSocketConnectorRpcLocal implements IWebSocketConnectorRpc {
|
|
19
19
|
private static readonly WEBSOCKET_CONNECTOR_SERVICE_ID;
|
|
20
20
|
private readonly rpcCommunicator;
|
|
21
21
|
private readonly canConnectFunction;
|
|
@@ -27,11 +27,10 @@ export declare class WebSocketConnector implements IWebSocketConnectorService {
|
|
|
27
27
|
private readonly entrypoints?;
|
|
28
28
|
private readonly tlsCertificate?;
|
|
29
29
|
private selectedPort?;
|
|
30
|
-
private readonly protocolVersion;
|
|
31
30
|
private ownPeerDescriptor?;
|
|
32
31
|
private connectingConnections;
|
|
33
32
|
private destroyed;
|
|
34
|
-
constructor(config:
|
|
33
|
+
constructor(config: WebSocketConnectorRpcLocalConfig);
|
|
35
34
|
private attachHandshaker;
|
|
36
35
|
start(): Promise<void>;
|
|
37
36
|
checkConnectivity(): Promise<ConnectivityResponse>;
|
|
@@ -41,6 +40,6 @@ export declare class WebSocketConnector implements IWebSocketConnectorService {
|
|
|
41
40
|
private onServerSocketHandshakeRequest;
|
|
42
41
|
setOwnPeerDescriptor(ownPeerDescriptor: PeerDescriptor): void;
|
|
43
42
|
destroy(): Promise<void>;
|
|
44
|
-
requestConnection(request: WebSocketConnectionRequest): Promise<WebSocketConnectionResponse>;
|
|
43
|
+
requestConnection(request: WebSocketConnectionRequest, context: ServerCallContext): Promise<WebSocketConnectionResponse>;
|
|
45
44
|
}
|
|
46
45
|
export {};
|
package/dist/src/connection/WebSocket/{WebSocketConnector.js → WebSocketConnectorRpcLocal.js}
RENAMED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.WebSocketConnectorRpcLocal = exports.connectivityMethodToWebSocketUrl = void 0;
|
|
4
4
|
const ClientWebSocket_1 = require("./ClientWebSocket");
|
|
5
5
|
const IConnection_1 = require("../IConnection");
|
|
6
6
|
const ListeningRpcCommunicator_1 = require("../../transport/ListeningRpcCommunicator");
|
|
7
|
-
const
|
|
7
|
+
const WebSocketConnectorRpcRemote_1 = require("./WebSocketConnectorRpcRemote");
|
|
8
8
|
const DhtRpc_1 = require("../../proto/packages/dht/protos/DhtRpc");
|
|
9
9
|
const DhtRpc_client_1 = require("../../proto/packages/dht/protos/DhtRpc.client");
|
|
10
10
|
const utils_1 = require("@streamr/utils");
|
|
@@ -27,7 +27,7 @@ const canOpenConnectionFromBrowser = (websocketServer) => {
|
|
|
27
27
|
return websocketServer.tls || hasPrivateAddress;
|
|
28
28
|
};
|
|
29
29
|
const ENTRY_POINT_CONNECTION_ATTEMPTS = 5;
|
|
30
|
-
class
|
|
30
|
+
class WebSocketConnectorRpcLocal {
|
|
31
31
|
constructor(config) {
|
|
32
32
|
this.ongoingConnectRequests = new Map();
|
|
33
33
|
this.connectingConnections = new Map();
|
|
@@ -41,7 +41,7 @@ class WebSocketConnector {
|
|
|
41
41
|
this.ongoingConnectRequests.delete(peerId.toKey());
|
|
42
42
|
}
|
|
43
43
|
else {
|
|
44
|
-
const managedConnection = new ManagedConnection_1.ManagedConnection(this.ownPeerDescriptor,
|
|
44
|
+
const managedConnection = new ManagedConnection_1.ManagedConnection(this.ownPeerDescriptor, IConnection_1.ConnectionType.WEBSOCKET_SERVER, undefined, serverWebSocket);
|
|
45
45
|
managedConnection.setPeerDescriptor(peerDescriptor);
|
|
46
46
|
if (this.onIncomingConnection(managedConnection)) {
|
|
47
47
|
managedConnection.acceptHandshake();
|
|
@@ -52,7 +52,6 @@ class WebSocketConnector {
|
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
54
|
};
|
|
55
|
-
this.protocolVersion = config.protocolVersion;
|
|
56
55
|
this.webSocketServer = config.portRange ? new WebSocketServer_1.WebSocketServer({
|
|
57
56
|
portRange: config.portRange,
|
|
58
57
|
tlsCertificate: config.tlsCertificate,
|
|
@@ -63,13 +62,13 @@ class WebSocketConnector {
|
|
|
63
62
|
this.entrypoints = config.entrypoints;
|
|
64
63
|
this.tlsCertificate = config.tlsCertificate;
|
|
65
64
|
this.canConnectFunction = config.canConnect.bind(this);
|
|
66
|
-
this.rpcCommunicator = new ListeningRpcCommunicator_1.ListeningRpcCommunicator(
|
|
65
|
+
this.rpcCommunicator = new ListeningRpcCommunicator_1.ListeningRpcCommunicator(WebSocketConnectorRpcLocal.WEBSOCKET_CONNECTOR_SERVICE_ID, config.transport, {
|
|
67
66
|
rpcRequestTimeout: 15000
|
|
68
67
|
});
|
|
69
|
-
this.rpcCommunicator.registerRpcMethod(DhtRpc_1.WebSocketConnectionRequest, DhtRpc_1.WebSocketConnectionResponse, 'requestConnection', (req) => this.requestConnection(req));
|
|
68
|
+
this.rpcCommunicator.registerRpcMethod(DhtRpc_1.WebSocketConnectionRequest, DhtRpc_1.WebSocketConnectionResponse, 'requestConnection', (req, context) => this.requestConnection(req, context));
|
|
70
69
|
}
|
|
71
70
|
attachHandshaker(connection) {
|
|
72
|
-
const handshaker = new Handshaker_1.Handshaker(this.ownPeerDescriptor,
|
|
71
|
+
const handshaker = new Handshaker_1.Handshaker(this.ownPeerDescriptor, connection);
|
|
73
72
|
handshaker.once('handshakeRequest', (peerDescriptor) => {
|
|
74
73
|
this.onServerSocketHandshakeRequest(peerDescriptor, connection);
|
|
75
74
|
});
|
|
@@ -130,7 +129,7 @@ class WebSocketConnector {
|
|
|
130
129
|
return preconfiguredConnectivityResponse;
|
|
131
130
|
}
|
|
132
131
|
else {
|
|
133
|
-
// Do real connectivity checking
|
|
132
|
+
// Do real connectivity checking
|
|
134
133
|
return await this.connectivityChecker.sendConnectivityRequest(entryPoint);
|
|
135
134
|
}
|
|
136
135
|
}
|
|
@@ -169,7 +168,7 @@ class WebSocketConnector {
|
|
|
169
168
|
else {
|
|
170
169
|
const socket = new ClientWebSocket_1.ClientWebSocket();
|
|
171
170
|
const url = (0, exports.connectivityMethodToWebSocketUrl)(targetPeerDescriptor.websocket);
|
|
172
|
-
const managedConnection = new ManagedConnection_1.ManagedConnection(this.ownPeerDescriptor,
|
|
171
|
+
const managedConnection = new ManagedConnection_1.ManagedConnection(this.ownPeerDescriptor, IConnection_1.ConnectionType.WEBSOCKET_CLIENT, socket, undefined);
|
|
173
172
|
managedConnection.setPeerDescriptor(targetPeerDescriptor);
|
|
174
173
|
this.connectingConnections.set((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor), managedConnection);
|
|
175
174
|
const delFunc = () => {
|
|
@@ -187,10 +186,10 @@ class WebSocketConnector {
|
|
|
187
186
|
}
|
|
188
187
|
requestConnectionFromPeer(ownPeerDescriptor, targetPeerDescriptor) {
|
|
189
188
|
setImmediate(() => {
|
|
190
|
-
const remoteConnector = new
|
|
191
|
-
remoteConnector.requestConnection(ownPeerDescriptor
|
|
189
|
+
const remoteConnector = new WebSocketConnectorRpcRemote_1.WebSocketConnectorRpcRemote(ownPeerDescriptor, targetPeerDescriptor, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.WebSocketConnectorRpcClient(this.rpcCommunicator.getRpcClientTransport())));
|
|
190
|
+
remoteConnector.requestConnection(ownPeerDescriptor.websocket.host, ownPeerDescriptor.websocket.port);
|
|
192
191
|
});
|
|
193
|
-
const managedConnection = new ManagedConnection_1.ManagedConnection(this.ownPeerDescriptor,
|
|
192
|
+
const managedConnection = new ManagedConnection_1.ManagedConnection(this.ownPeerDescriptor, IConnection_1.ConnectionType.WEBSOCKET_SERVER);
|
|
194
193
|
managedConnection.on('disconnected', () => this.ongoingConnectRequests.delete((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor)));
|
|
195
194
|
managedConnection.setPeerDescriptor(targetPeerDescriptor);
|
|
196
195
|
this.ongoingConnectRequests.set((0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(targetPeerDescriptor), managedConnection);
|
|
@@ -209,14 +208,15 @@ class WebSocketConnector {
|
|
|
209
208
|
this.connectivityChecker?.destroy();
|
|
210
209
|
await this.webSocketServer?.stop();
|
|
211
210
|
}
|
|
212
|
-
//
|
|
213
|
-
async requestConnection(request) {
|
|
214
|
-
|
|
211
|
+
// IWebSocketConnectorRpc implementation
|
|
212
|
+
async requestConnection(request, context) {
|
|
213
|
+
const senderPeerDescriptor = context.incomingSourceDescriptor;
|
|
214
|
+
if (!this.destroyed && this.canConnectFunction(senderPeerDescriptor, request.ip, request.port)) {
|
|
215
215
|
setImmediate(() => {
|
|
216
216
|
if (this.destroyed) {
|
|
217
217
|
return;
|
|
218
218
|
}
|
|
219
|
-
const connection = this.connect(
|
|
219
|
+
const connection = this.connect(senderPeerDescriptor);
|
|
220
220
|
this.onIncomingConnection(connection);
|
|
221
221
|
});
|
|
222
222
|
const res = {
|
|
@@ -229,6 +229,6 @@ class WebSocketConnector {
|
|
|
229
229
|
};
|
|
230
230
|
}
|
|
231
231
|
}
|
|
232
|
-
exports.
|
|
233
|
-
|
|
234
|
-
//# sourceMappingURL=
|
|
232
|
+
exports.WebSocketConnectorRpcLocal = WebSocketConnectorRpcLocal;
|
|
233
|
+
WebSocketConnectorRpcLocal.WEBSOCKET_CONNECTOR_SERVICE_ID = 'system/websocket-connector';
|
|
234
|
+
//# sourceMappingURL=WebSocketConnectorRpcLocal.js.map
|