@streamr/dht 103.0.0-rc.9 → 103.1.0-rc.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/generated/google/protobuf/any.d.ts +2 -2
- package/dist/generated/google/protobuf/timestamp.d.ts +2 -2
- package/dist/generated/packages/dht/protos/DhtRpc.client.d.ts +44 -44
- package/dist/generated/packages/dht/protos/DhtRpc.client.js +23 -23
- package/dist/generated/packages/dht/protos/DhtRpc.client.js.map +1 -1
- package/dist/generated/packages/dht/protos/DhtRpc.d.ts +100 -100
- package/dist/generated/packages/dht/protos/DhtRpc.js +12 -12
- package/dist/generated/packages/dht/protos/DhtRpc.js.map +1 -1
- package/dist/generated/packages/dht/protos/DhtRpc.server.d.ts +22 -22
- package/dist/generated/packages/proto-rpc/protos/ProtoRpc.d.ts +8 -8
- package/dist/generated/packages/proto-rpc/protos/ProtoRpc.js +1 -1
- package/dist/generated/packages/proto-rpc/protos/ProtoRpc.js.map +1 -1
- package/dist/package.json +11 -11
- package/dist/src/connection/ConnectionManager.d.ts +1 -1
- package/dist/src/connection/ConnectionManager.js +2 -3
- package/dist/src/connection/ConnectionManager.js.map +1 -1
- package/dist/src/connection/IConnection.d.ts +0 -8
- package/dist/src/connection/IConnection.js.map +1 -1
- package/dist/src/connection/ManagedConnection.d.ts +1 -3
- package/dist/src/connection/ManagedConnection.js +0 -1
- package/dist/src/connection/ManagedConnection.js.map +1 -1
- package/dist/src/connection/connectivityChecker.js +3 -3
- package/dist/src/connection/connectivityChecker.js.map +1 -1
- package/dist/src/connection/webrtc/BrowserWebrtcConnection.d.ts +4 -11
- package/dist/src/connection/webrtc/BrowserWebrtcConnection.js +15 -74
- package/dist/src/connection/webrtc/BrowserWebrtcConnection.js.map +1 -1
- package/dist/src/connection/webrtc/IWebrtcConnection.d.ts +2 -1
- package/dist/src/connection/webrtc/IWebrtcConnection.js.map +1 -1
- package/dist/src/connection/webrtc/NodeWebrtcConnection.d.ts +2 -4
- package/dist/src/connection/webrtc/NodeWebrtcConnection.js.map +1 -1
- package/dist/src/connection/websocket/AutoCertifierClientFacade.d.ts +1 -0
- package/dist/src/connection/websocket/AutoCertifierClientFacade.js +1 -1
- package/dist/src/connection/websocket/AutoCertifierClientFacade.js.map +1 -1
- package/dist/src/dht/DhtNode.d.ts +3 -3
- package/dist/src/dht/DhtNode.js +4 -3
- package/dist/src/dht/DhtNode.js.map +1 -1
- package/dist/src/dht/recursive-operation/RecursiveOperationManager.js +3 -3
- package/dist/src/dht/recursive-operation/RecursiveOperationManager.js.map +1 -1
- package/dist/src/dht/routing/Router.js +6 -9
- package/dist/src/dht/routing/Router.js.map +1 -1
- package/dist/src/exports.d.ts +11 -12
- package/dist/src/exports.js.map +1 -1
- package/dist/src/helpers/createPeerDescriptor.d.ts +1 -1
- package/dist/src/helpers/createPeerDescriptor.js +7 -6
- package/dist/src/helpers/createPeerDescriptor.js.map +1 -1
- package/dist/src/transport/ITransport.d.ts +1 -6
- package/dist/src/transport/ITransport.js.map +1 -1
- package/package.json +11 -11
|
@@ -63,9 +63,9 @@ class RecursiveOperationManager {
|
|
|
63
63
|
this.ongoingSessions.set(session.getId(), session);
|
|
64
64
|
if (waitForCompletion === true) {
|
|
65
65
|
try {
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
66
|
+
const eventPromise = (0, utils_1.waitForEvent)(session, 'completed', RecursiveOperationSession_1.RECURSIVE_OPERATION_TIMEOUT);
|
|
67
|
+
session.start(this.options.serviceId);
|
|
68
|
+
await eventPromise;
|
|
69
69
|
}
|
|
70
70
|
catch (err) {
|
|
71
71
|
logger.debug('start failed', { err });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RecursiveOperationManager.js","sourceRoot":"","sources":["../../../../src/dht/recursive-operation/RecursiveOperationManager.ts"],"names":[],"mappings":";;;AAAA,0EAQsD;AAEtD,8DAAuD;AACvD,
|
|
1
|
+
{"version":3,"file":"RecursiveOperationManager.js","sourceRoot":"","sources":["../../../../src/dht/recursive-operation/RecursiveOperationManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -95,19 +95,16 @@ class Router {
|
|
|
95
95
|
const contacts = session.updateAndGetRoutablePeers();
|
|
96
96
|
if (contacts.length > 0) {
|
|
97
97
|
this.addRoutingSession(session);
|
|
98
|
-
logger.trace('starting to
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
eventReceived = (0, utils_1.raceEvents3)(session, ['routingSucceeded', 'partialSuccess', 'routingFailed', 'stopped'], null);
|
|
102
|
-
});
|
|
98
|
+
logger.trace('starting to raceForEvent from routingSession: ' + session.sessionId);
|
|
99
|
+
const eventReceived = (0, utils_1.raceForEvent)(session, ['routingSucceeded', 'partialSuccess', 'routingFailed', 'stopped'], 10000 // TODO use options option or named constant?
|
|
100
|
+
);
|
|
103
101
|
setImmediate(async () => {
|
|
104
102
|
try {
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
logger.trace('raceEvents ended from routingSession: ' + session.sessionId);
|
|
103
|
+
await eventReceived;
|
|
104
|
+
logger.trace('raceForEvent ended from routingSession: ' + session.sessionId);
|
|
108
105
|
}
|
|
109
106
|
catch {
|
|
110
|
-
logger.trace('
|
|
107
|
+
logger.trace('raceForEvent timed out for routingSession ' + session.sessionId);
|
|
111
108
|
}
|
|
112
109
|
session.stop();
|
|
113
110
|
this.removeRoutingSession(session.sessionId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Router.js","sourceRoot":"","sources":["../../../../src/dht/routing/Router.ts"],"names":[],"mappings":";;;AAAA,0EAAgJ;AAChJ,
|
|
1
|
+
{"version":3,"file":"Router.js","sourceRoot":"","sources":["../../../../src/dht/routing/Router.ts"],"names":[],"mappings":"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"}
|
package/dist/src/exports.d.ts
CHANGED
|
@@ -1,26 +1,25 @@
|
|
|
1
|
-
export { DhtNode, DhtNodeEvents, DhtNodeOptions } from './dht/DhtNode';
|
|
1
|
+
export { DhtNode, type DhtNodeEvents, type DhtNodeOptions } from './dht/DhtNode';
|
|
2
2
|
export { ListeningRpcCommunicator } from './transport/ListeningRpcCommunicator';
|
|
3
3
|
export { RoutingRpcCommunicator } from './transport/RoutingRpcCommunicator';
|
|
4
4
|
export { Simulator, LatencyType } from './connection/simulator/Simulator';
|
|
5
5
|
export { SimulatorTransport } from './connection/simulator/SimulatorTransport';
|
|
6
6
|
export { getRandomRegion, getRegionDelayMatrix } from './connection/simulator/pings';
|
|
7
7
|
export { PeerDescriptor, Message, NodeType, DataEntry } from '../generated/packages/dht/protos/DhtRpc';
|
|
8
|
-
export { ITransport, TransportEvents } from './transport/ITransport';
|
|
9
|
-
export { ConnectionManager, ConnectionLocker, PortRange, TlsCertificate } from './connection/ConnectionManager';
|
|
10
|
-
export { ConnectionsView } from './connection/ConnectionsView';
|
|
11
|
-
export { LockID } from './connection/ConnectionLockStates';
|
|
8
|
+
export type { ITransport, TransportEvents } from './transport/ITransport';
|
|
9
|
+
export { ConnectionManager, type ConnectionLocker, type PortRange, type TlsCertificate } from './connection/ConnectionManager';
|
|
10
|
+
export type { ConnectionsView } from './connection/ConnectionsView';
|
|
11
|
+
export type { LockID } from './connection/ConnectionLockStates';
|
|
12
12
|
export { DefaultConnectorFacade } from './connection/ConnectorFacade';
|
|
13
|
-
export { DhtRpcOptions } from './rpc-protocol/DhtRpcOptions';
|
|
13
|
+
export type { DhtRpcOptions } from './rpc-protocol/DhtRpcOptions';
|
|
14
14
|
export { RpcRemote, EXISTING_CONNECTION_TIMEOUT } from './dht/contact/RpcRemote';
|
|
15
|
-
export { IceServer } from './connection/webrtc/WebrtcConnector';
|
|
15
|
+
export type { IceServer } from './connection/webrtc/WebrtcConnector';
|
|
16
16
|
export { DhtCallContext } from './rpc-protocol/DhtCallContext';
|
|
17
17
|
export { WebsocketClientConnection } from './connection/websocket/NodeWebsocketClientConnection';
|
|
18
18
|
export { ManagedConnection } from './connection/ManagedConnection';
|
|
19
19
|
export { PendingConnection } from './connection/PendingConnection';
|
|
20
|
-
export { IConnection } from './connection/IConnection';
|
|
20
|
+
export type { IConnection } from './connection/IConnection';
|
|
21
21
|
export { ConnectionType } from './connection/IConnection';
|
|
22
|
-
export {
|
|
23
|
-
export {
|
|
24
|
-
export { RingContacts } from './dht/contact/RingContactList';
|
|
22
|
+
export type { ServiceID } from './types/ServiceID';
|
|
23
|
+
export type { RingContacts } from './dht/contact/RingContactList';
|
|
25
24
|
export { createOutgoingHandshaker } from './connection/Handshaker';
|
|
26
|
-
export { DhtAddress, DhtAddressRaw, toDhtAddress, toDhtAddressRaw, randomDhtAddress, areEqualPeerDescriptors, toNodeId } from './identifiers';
|
|
25
|
+
export { type DhtAddress, type DhtAddressRaw, toDhtAddress, toDhtAddressRaw, randomDhtAddress, areEqualPeerDescriptors, toNodeId } from './identifiers';
|
package/dist/src/exports.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exports.js","sourceRoot":"","sources":["../../src/exports.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"exports.js","sourceRoot":"","sources":["../../src/exports.ts"],"names":[],"mappings":";;;AAAA,yCAAgF;AAAvE,kGAAA,OAAO,OAAA;AAChB,iFAA+E;AAAtE,oIAAA,wBAAwB,OAAA;AACjC,6EAA2E;AAAlE,gIAAA,sBAAsB,OAAA;AAC/B,8DAAyE;AAAhE,sGAAA,SAAS,OAAA;AAAE,wGAAA,WAAW,OAAA;AAC/B,gFAA8E;AAArE,wHAAA,kBAAkB,OAAA;AAC3B,sDAAoF;AAA3E,wGAAA,eAAe,OAAA;AAAE,6GAAA,oBAAoB,OAAA;AAC9C,kEAAsG;AAA7F,wGAAA,cAAc,OAAA;AAAE,iGAAA,OAAO,OAAA;AAAE,kGAAA,QAAQ,OAAA;AAAE,mGAAA,SAAS,OAAA;AAErD,oEAA8H;AAArH,sHAAA,iBAAiB,OAAA;AAG1B,gEAAqE;AAA5D,yHAAA,sBAAsB,OAAA;AAE/B,qDAAgF;AAAvE,sGAAA,SAAS,OAAA;AAAE,wHAAA,2BAA2B,OAAA;AAE/C,gEAA8D;AAArD,gHAAA,cAAc,OAAA;AACvB,sGAAgG;AAAvF,0IAAA,yBAAyB,OAAA;AAClC,oEAAkE;AAAzD,sHAAA,iBAAiB,OAAA;AAC1B,oEAAkE;AAAzD,sHAAA,iBAAiB,OAAA;AAE1B,wDAAyD;AAAhD,6GAAA,cAAc,OAAA;AAGvB,sDAAkE;AAAzD,sHAAA,wBAAwB,OAAA;AACjC,6CAQsB;AALlB,2GAAA,YAAY,OAAA;AACZ,8GAAA,eAAe,OAAA;AACf,+GAAA,gBAAgB,OAAA;AAChB,sHAAA,uBAAuB,OAAA;AACvB,uGAAA,QAAQ,OAAA"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { DhtAddress } from '../identifiers';
|
|
2
2
|
import { ConnectivityResponse, PeerDescriptor } from '../../generated/packages/dht/protos/DhtRpc';
|
|
3
|
-
export declare const createPeerDescriptor: (connectivityResponse: ConnectivityResponse, region: number, nodeId?: DhtAddress) => PeerDescriptor
|
|
3
|
+
export declare const createPeerDescriptor: (connectivityResponse: ConnectivityResponse, region: number, nodeId?: DhtAddress) => Promise<PeerDescriptor>;
|
|
@@ -10,7 +10,8 @@ const isBrowserEnvironment_1 = require("../helpers/browser/isBrowserEnvironment"
|
|
|
10
10
|
const createPeerDescriptorSignaturePayload_1 = require("../helpers/createPeerDescriptorSignaturePayload");
|
|
11
11
|
const identifiers_1 = require("../identifiers");
|
|
12
12
|
const DhtRpc_1 = require("../../generated/packages/dht/protos/DhtRpc");
|
|
13
|
-
const
|
|
13
|
+
const signingUtil = new utils_1.EcdsaSecp256k1Evm();
|
|
14
|
+
const calculateNodeIdRaw = async (ipAddress, privateKey) => {
|
|
14
15
|
// nodeId is calculated as
|
|
15
16
|
// concatenate(
|
|
16
17
|
// get104leastSignificatBits(hash(ipAddress)),
|
|
@@ -18,15 +19,15 @@ const calculateNodeIdRaw = (ipAddress, privateKey) => {
|
|
|
18
19
|
// )
|
|
19
20
|
const ipAsBuffer = Buffer.alloc(4);
|
|
20
21
|
ipAsBuffer.writeUInt32BE(ipAddress);
|
|
21
|
-
const ipHash =
|
|
22
|
-
const signature =
|
|
22
|
+
const ipHash = signingUtil.keccakHash(ipAsBuffer);
|
|
23
|
+
const signature = await signingUtil.createSignature(ipAsBuffer, privateKey);
|
|
23
24
|
const nodeIdRaw = Buffer.concat([
|
|
24
25
|
ipHash.subarray(ipHash.length - 13, ipHash.length),
|
|
25
26
|
signature.subarray(signature.length - 7, signature.length)
|
|
26
27
|
]);
|
|
27
28
|
return nodeIdRaw;
|
|
28
29
|
};
|
|
29
|
-
const createPeerDescriptor = (connectivityResponse, region, nodeId) => {
|
|
30
|
+
const createPeerDescriptor = async (connectivityResponse, region, nodeId) => {
|
|
30
31
|
const privateKey = crypto_1.default.randomBytes(32);
|
|
31
32
|
const publicKey = crypto_1.default.randomBytes(20); // TODO calculate publicKey from privateKey
|
|
32
33
|
let nodeIdRaw;
|
|
@@ -34,7 +35,7 @@ const createPeerDescriptor = (connectivityResponse, region, nodeId) => {
|
|
|
34
35
|
nodeIdRaw = (0, identifiers_1.toDhtAddressRaw)(nodeId);
|
|
35
36
|
}
|
|
36
37
|
else {
|
|
37
|
-
nodeIdRaw = calculateNodeIdRaw(connectivityResponse.ipAddress, privateKey);
|
|
38
|
+
nodeIdRaw = await calculateNodeIdRaw(connectivityResponse.ipAddress, privateKey);
|
|
38
39
|
}
|
|
39
40
|
const ret = {
|
|
40
41
|
nodeId: nodeIdRaw,
|
|
@@ -50,7 +51,7 @@ const createPeerDescriptor = (connectivityResponse, region, nodeId) => {
|
|
|
50
51
|
tls: connectivityResponse.websocket.tls
|
|
51
52
|
};
|
|
52
53
|
}
|
|
53
|
-
ret.signature =
|
|
54
|
+
ret.signature = await signingUtil.createSignature((0, createPeerDescriptorSignaturePayload_1.createPeerDescriptorSignaturePayload)(ret), privateKey);
|
|
54
55
|
return ret;
|
|
55
56
|
};
|
|
56
57
|
exports.createPeerDescriptor = createPeerDescriptor;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createPeerDescriptor.js","sourceRoot":"","sources":["../../../src/helpers/createPeerDescriptor.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"createPeerDescriptor.js","sourceRoot":"","sources":["../../../src/helpers/createPeerDescriptor.ts"],"names":[],"mappings":";;;;;;AAAA,0CAAkD;AAClD,oDAA2B;AAC3B,kFAA8E;AAC9E,0GAAsG;AACtG,gDAA2E;AAC3E,uEAImD;AAEnD,MAAM,WAAW,GAAG,IAAI,yBAAiB,EAAE,CAAA;AAE3C,MAAM,kBAAkB,GAAG,KAAK,EAAE,SAAiB,EAAE,UAAsB,EAA0B,EAAE;IACnG,2BAA2B;IAC3B,eAAe;IACf,iDAAiD;IACjD,8CAA8C;IAC9C,IAAI;IACJ,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IAClC,UAAU,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;IACnC,MAAM,MAAM,GAAG,WAAW,CAAC,UAAU,CAAC,UAAU,CAAC,CAAA;IACjD,MAAM,SAAS,GAAG,MAAM,WAAW,CAAC,eAAe,CAAC,UAAU,EAAE,UAAU,CAAC,CAAA;IAC3E,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC;QAC5B,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,GAAG,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC;QAClD,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC;KAC7D,CAAC,CAAA;IACF,OAAO,SAAS,CAAA;AACpB,CAAC,CAAA;AAEM,MAAM,oBAAoB,GAAG,KAAK,EAAE,oBAA0C,EACjF,MAAc,EAAE,MAAmB,EAA2B,EAAE;IAChE,MAAM,UAAU,GAAG,gBAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;IACzC,MAAM,SAAS,GAAG,gBAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA,CAAE,2CAA2C;IACrF,IAAI,SAAwB,CAAA;IAC5B,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACvB,SAAS,GAAG,IAAA,6BAAe,EAAC,MAAM,CAAC,CAAA;IACvC,CAAC;SAAM,CAAC;QACJ,SAAS,GAAG,MAAM,kBAAkB,CAAC,oBAAoB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAA;IACpF,CAAC;IACD,MAAM,GAAG,GAAmB;QACxB,MAAM,EAAE,SAAS;QACjB,IAAI,EAAE,IAAA,2CAAoB,GAAE,CAAC,CAAC,CAAC,iBAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,iBAAQ,CAAC,MAAM;QACjE,SAAS,EAAE,oBAAoB,CAAC,SAAS;QACzC,MAAM;QACN,SAAS;KACZ,CAAA;IACD,IAAI,oBAAoB,CAAC,SAAS,EAAE,CAAC;QACjC,GAAG,CAAC,SAAS,GAAG;YACZ,IAAI,EAAE,oBAAoB,CAAC,SAAS,CAAC,IAAI;YACzC,IAAI,EAAE,oBAAoB,CAAC,SAAS,CAAC,IAAI;YACzC,GAAG,EAAE,oBAAoB,CAAC,SAAS,CAAC,GAAG;SAC1C,CAAA;IACL,CAAC;IACD,GAAG,CAAC,SAAS,GAAG,MAAM,WAAW,CAAC,eAAe,CAAC,IAAA,2EAAoC,EAAC,GAAG,CAAC,EAAE,UAAU,CAAC,CAAA;IACxG,OAAO,GAAG,CAAA;AACd,CAAC,CAAA;AA1BY,QAAA,oBAAoB,wBA0BhC"}
|
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
import { Message, PeerDescriptor } from '../../generated/packages/dht/protos/DhtRpc';
|
|
2
|
-
import { ConnectionStatistics } from '../connection/IConnection';
|
|
3
2
|
export interface TransportEvents {
|
|
3
|
+
connected: (peerDescriptor: PeerDescriptor) => void;
|
|
4
4
|
disconnected: (peerDescriptor: PeerDescriptor, gracefulLeave: boolean) => void;
|
|
5
5
|
message: (message: Message) => void;
|
|
6
|
-
connected: (peerDescriptor: PeerDescriptor) => void;
|
|
7
|
-
statisticsChanged: (peerDescriptor: PeerDescriptor, statistics: ConnectionStatistics) => void;
|
|
8
6
|
}
|
|
9
7
|
export interface SendOptions {
|
|
10
8
|
connect: boolean;
|
|
@@ -20,15 +18,12 @@ export interface ITransport {
|
|
|
20
18
|
on<T extends keyof TransportEvents>(eventName: T, listener: (message: Message) => void): void;
|
|
21
19
|
on<T extends keyof TransportEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor) => void): void;
|
|
22
20
|
on<T extends keyof TransportEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor, gracefulLeave: boolean) => void): void;
|
|
23
|
-
on<T extends keyof TransportEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor, statistics: ConnectionStatistics) => void): void;
|
|
24
21
|
once<T extends keyof TransportEvents>(eventName: T, listener: (message: Message) => void): void;
|
|
25
22
|
once<T extends keyof TransportEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor) => void): void;
|
|
26
23
|
once<T extends keyof TransportEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor, gracefulLeave: boolean) => void): void;
|
|
27
|
-
once<T extends keyof TransportEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor, statistics: ConnectionStatistics) => void): void;
|
|
28
24
|
off<T extends keyof TransportEvents>(eventName: T, listener: (message: Message) => void): void;
|
|
29
25
|
off<T extends keyof TransportEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor) => void): void;
|
|
30
26
|
off<T extends keyof TransportEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor, gracefulLeave: boolean) => void): void;
|
|
31
|
-
off<T extends keyof TransportEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor, statistics: ConnectionStatistics) => void): void;
|
|
32
27
|
send(msg: Message, opts?: SendOptions): Promise<void>;
|
|
33
28
|
getLocalPeerDescriptor(): PeerDescriptor;
|
|
34
29
|
stop(): void | Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ITransport.js","sourceRoot":"","sources":["../../../src/transport/ITransport.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"ITransport.js","sourceRoot":"","sources":["../../../src/transport/ITransport.ts"],"names":[],"mappings":";;;AAca,QAAA,oBAAoB,GAAG;IAChC,OAAO,EAAE,IAAI;IACb,aAAa,EAAE,KAAK;IACpB,0BAA0B,EAAE,KAAK;CACpC,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@streamr/dht",
|
|
3
|
-
"version": "103.
|
|
3
|
+
"version": "103.1.0-rc.0",
|
|
4
4
|
"description": "Streamr Network DHT",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -40,33 +40,33 @@
|
|
|
40
40
|
"@js-sdsl/ordered-map": "^4.4.2",
|
|
41
41
|
"@protobuf-ts/runtime": "^2.8.2",
|
|
42
42
|
"@protobuf-ts/runtime-rpc": "^2.8.2",
|
|
43
|
-
"@streamr/autocertifier-client": "103.
|
|
44
|
-
"@streamr/cdn-location": "103.
|
|
45
|
-
"@streamr/geoip-location": "103.
|
|
46
|
-
"@streamr/proto-rpc": "103.
|
|
47
|
-
"@streamr/utils": "103.
|
|
43
|
+
"@streamr/autocertifier-client": "103.1.0-rc.0",
|
|
44
|
+
"@streamr/cdn-location": "103.1.0-rc.0",
|
|
45
|
+
"@streamr/geoip-location": "103.1.0-rc.0",
|
|
46
|
+
"@streamr/proto-rpc": "103.1.0-rc.0",
|
|
47
|
+
"@streamr/utils": "103.1.0-rc.0",
|
|
48
48
|
"eventemitter3": "^5.0.0",
|
|
49
49
|
"heap": "^0.2.6",
|
|
50
50
|
"ipaddr.js": "^2.0.1",
|
|
51
51
|
"k-bucket": "^5.1.0",
|
|
52
52
|
"lodash": "^4.17.21",
|
|
53
53
|
"lru-cache": "^11.1.0",
|
|
54
|
-
"node-datachannel": "^0.
|
|
54
|
+
"node-datachannel": "^0.27.0",
|
|
55
55
|
"uuid": "^11.1.0",
|
|
56
56
|
"websocket": "^1.0.34",
|
|
57
|
-
"ws": "^8.18.
|
|
57
|
+
"ws": "^8.18.2"
|
|
58
58
|
},
|
|
59
59
|
"devDependencies": {
|
|
60
60
|
"@streamr/browser-test-runner": "^0.0.1",
|
|
61
|
-
"@streamr/test-utils": "103.
|
|
61
|
+
"@streamr/test-utils": "103.1.0-rc.0",
|
|
62
62
|
"@types/heap": "^0.2.34",
|
|
63
63
|
"@types/k-bucket": "^5.0.1",
|
|
64
|
-
"@types/lodash": "^4.17.
|
|
64
|
+
"@types/lodash": "^4.17.17",
|
|
65
65
|
"@types/websocket": "^1.0.10",
|
|
66
66
|
"@types/ws": "^8.18.1",
|
|
67
67
|
"jest-leak-detector": "^27.3.1",
|
|
68
68
|
"jest-matcher-utils": "^29.7.0",
|
|
69
|
-
"ts-essentials": "^10.0
|
|
69
|
+
"ts-essentials": "^10.1.0",
|
|
70
70
|
"ts-node": "^10.9.2"
|
|
71
71
|
},
|
|
72
72
|
"optionalDependencies": {
|