@streamr/dht 103.0.0-rc.17 → 103.0.0-rc.19
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.d.ts +100 -100
- package/dist/generated/packages/dht/protos/DhtRpc.js +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/package.json +8 -8
- 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 -9
- package/dist/src/connection/IConnection.js.map +1 -1
- package/dist/src/connection/ManagedConnection.d.ts +1 -2
- 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 +2 -9
- package/dist/src/connection/webrtc/BrowserWebrtcConnection.js +15 -82
- package/dist/src/connection/webrtc/BrowserWebrtcConnection.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/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 +0 -1
- package/dist/src/exports.js.map +1 -1
- package/dist/src/transport/ITransport.d.ts +0 -5
- package/dist/src/transport/ITransport.js.map +1 -1
- package/package.json +8 -8
|
@@ -26,23 +26,14 @@ class NodeWebrtcConnection extends eventemitter3_1.default {
|
|
|
26
26
|
lastState = 'connecting';
|
|
27
27
|
iceServers;
|
|
28
28
|
peerConnection;
|
|
29
|
+
bufferThresholdHigh = 2 ** 17;
|
|
30
|
+
bufferThresholdLow = 2 ** 15;
|
|
29
31
|
dataChannel;
|
|
30
32
|
makingOffer = false;
|
|
31
33
|
isOffering = false;
|
|
32
34
|
closed = false;
|
|
33
35
|
earlyTimeout;
|
|
34
36
|
messageQueue = [];
|
|
35
|
-
currentBufferedAmount = 0;
|
|
36
|
-
statistics = {
|
|
37
|
-
uploadRateBytesPerSecond: 0,
|
|
38
|
-
downloadRateBytesPerSecond: 0,
|
|
39
|
-
bufferedAmount: 0
|
|
40
|
-
};
|
|
41
|
-
lastBytesSent = 0;
|
|
42
|
-
lastBytesReceived = 0;
|
|
43
|
-
lastStatsCollectionTime = 0;
|
|
44
|
-
statsInterval;
|
|
45
|
-
statsUpdateInterval = 200; // ms, adjust as needed for X times per second
|
|
46
37
|
constructor(params) {
|
|
47
38
|
super();
|
|
48
39
|
this.connectionId = (0, Connection_1.createRandomConnectionId)();
|
|
@@ -138,11 +129,6 @@ class NodeWebrtcConnection extends eventemitter3_1.default {
|
|
|
138
129
|
this.closed = true;
|
|
139
130
|
this.lastState = 'closed';
|
|
140
131
|
clearTimeout(this.earlyTimeout);
|
|
141
|
-
// Clear the stats collection interval
|
|
142
|
-
if (this.statsInterval) {
|
|
143
|
-
clearInterval(this.statsInterval);
|
|
144
|
-
this.statsInterval = undefined;
|
|
145
|
-
}
|
|
146
132
|
this.stopListening();
|
|
147
133
|
this.emit('disconnected', gracefulLeave, undefined, reason);
|
|
148
134
|
this.removeAllListeners();
|
|
@@ -172,14 +158,11 @@ class NodeWebrtcConnection extends eventemitter3_1.default {
|
|
|
172
158
|
}
|
|
173
159
|
send(data) {
|
|
174
160
|
if (this.lastState === 'connected') {
|
|
175
|
-
this.dataChannel
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
this.
|
|
180
|
-
// Update bufferedAmount in statistics but keep the upload rate the same
|
|
181
|
-
this.statistics.bufferedAmount = this.currentBufferedAmount;
|
|
182
|
-
this.emit('statisticsUpdated', this.statistics);
|
|
161
|
+
if (this.dataChannel.bufferedAmount > this.bufferThresholdHigh) {
|
|
162
|
+
this.messageQueue.push(data);
|
|
163
|
+
}
|
|
164
|
+
else {
|
|
165
|
+
this.dataChannel?.send(data);
|
|
183
166
|
}
|
|
184
167
|
}
|
|
185
168
|
else {
|
|
@@ -189,6 +172,7 @@ class NodeWebrtcConnection extends eventemitter3_1.default {
|
|
|
189
172
|
setupDataChannel(dataChannel) {
|
|
190
173
|
this.dataChannel = dataChannel;
|
|
191
174
|
this.dataChannel.binaryType = 'arraybuffer';
|
|
175
|
+
this.dataChannel.bufferedAmountLowThreshold = this.bufferThresholdLow;
|
|
192
176
|
dataChannel.onopen = () => {
|
|
193
177
|
logger.trace('dc.onOpen');
|
|
194
178
|
this.onDataChannelOpen();
|
|
@@ -204,6 +188,13 @@ class NodeWebrtcConnection extends eventemitter3_1.default {
|
|
|
204
188
|
logger.trace('dc.onmessage');
|
|
205
189
|
this.emit('data', new Uint8Array(msg.data));
|
|
206
190
|
};
|
|
191
|
+
dataChannel.onbufferedamountlow = () => {
|
|
192
|
+
logger.trace('dc.onBufferedAmountLow');
|
|
193
|
+
while (this.messageQueue.length > 0 && this.dataChannel.bufferedAmount < this.bufferThresholdHigh) {
|
|
194
|
+
const data = this.messageQueue.shift();
|
|
195
|
+
this.dataChannel.send(data);
|
|
196
|
+
}
|
|
197
|
+
};
|
|
207
198
|
}
|
|
208
199
|
stopListening() {
|
|
209
200
|
if (this.dataChannel !== undefined) {
|
|
@@ -224,69 +215,11 @@ class NodeWebrtcConnection extends eventemitter3_1.default {
|
|
|
224
215
|
onDataChannelOpen() {
|
|
225
216
|
this.lastState = 'connected';
|
|
226
217
|
this.emit('connected');
|
|
227
|
-
this.startStatsCollection();
|
|
228
|
-
}
|
|
229
|
-
startStatsCollection() {
|
|
230
|
-
// Clear any existing interval
|
|
231
|
-
if (this.statsInterval) {
|
|
232
|
-
clearInterval(this.statsInterval);
|
|
233
|
-
}
|
|
234
|
-
// Initialize the last collection time
|
|
235
|
-
this.lastStatsCollectionTime = Date.now();
|
|
236
|
-
// Start collecting stats periodically
|
|
237
|
-
this.statsInterval = setInterval(() => {
|
|
238
|
-
this.collectAndEmitStats();
|
|
239
|
-
}, this.statsUpdateInterval);
|
|
240
|
-
}
|
|
241
|
-
async collectAndEmitStats() {
|
|
242
|
-
if (!this.peerConnection || this.lastState !== 'connected') {
|
|
243
|
-
return;
|
|
244
|
-
}
|
|
245
|
-
try {
|
|
246
|
-
const currentTime = Date.now();
|
|
247
|
-
const elapsedTimeSeconds = (currentTime - this.lastStatsCollectionTime) / 1000;
|
|
248
|
-
// Avoid division by zero or very small time intervals
|
|
249
|
-
if (elapsedTimeSeconds < 0.1) {
|
|
250
|
-
return;
|
|
251
|
-
}
|
|
252
|
-
const stats = await this.peerConnection.getStats();
|
|
253
|
-
let currentBytesSent = 0;
|
|
254
|
-
let currentBytesReceived = 0;
|
|
255
|
-
stats.forEach((report) => {
|
|
256
|
-
if (report.type === 'transport') {
|
|
257
|
-
currentBytesSent = report.bytesSent ?? 0;
|
|
258
|
-
currentBytesReceived = report.bytesReceived ?? 0;
|
|
259
|
-
}
|
|
260
|
-
});
|
|
261
|
-
// Calculate upload and download rates based on actual elapsed time
|
|
262
|
-
const bytesSentDelta = Math.max(0, currentBytesSent - this.lastBytesSent);
|
|
263
|
-
const uploadRateBytesPerSecond = Math.round(bytesSentDelta / elapsedTimeSeconds);
|
|
264
|
-
const bytesReceivedDelta = Math.max(0, currentBytesReceived - this.lastBytesReceived);
|
|
265
|
-
const downloadRateBytesPerSecond = Math.round(bytesReceivedDelta / elapsedTimeSeconds);
|
|
266
|
-
this.lastBytesSent = currentBytesSent;
|
|
267
|
-
this.lastBytesReceived = currentBytesReceived;
|
|
268
|
-
this.lastStatsCollectionTime = currentTime;
|
|
269
|
-
// Update statistics and emit event
|
|
270
|
-
this.statistics = {
|
|
271
|
-
uploadRateBytesPerSecond,
|
|
272
|
-
downloadRateBytesPerSecond,
|
|
273
|
-
bufferedAmount: this.currentBufferedAmount
|
|
274
|
-
};
|
|
275
|
-
this.emit('statisticsUpdated', this.statistics);
|
|
276
|
-
}
|
|
277
|
-
catch (err) {
|
|
278
|
-
logger.warn('Failed to collect WebRTC stats', { err });
|
|
279
|
-
}
|
|
280
218
|
}
|
|
281
219
|
onStateChange() {
|
|
282
220
|
if (this.peerConnection.connectionState === DisconnectedRtcPeerConnectionStateEnum.CLOSED
|
|
283
221
|
|| this.peerConnection.connectionState === DisconnectedRtcPeerConnectionStateEnum.DISCONNECTED
|
|
284
222
|
|| this.peerConnection.connectionState === DisconnectedRtcPeerConnectionStateEnum.FAILED) {
|
|
285
|
-
// Clear stats interval when connection is closed
|
|
286
|
-
if (this.statsInterval) {
|
|
287
|
-
clearInterval(this.statsInterval);
|
|
288
|
-
this.statsInterval = undefined;
|
|
289
|
-
}
|
|
290
223
|
this.doClose(false);
|
|
291
224
|
}
|
|
292
225
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BrowserWebrtcConnection.js","sourceRoot":"","sources":["../../../../src/connection/webrtc/BrowserWebrtcConnection.ts"],"names":[],"mappings":";AAAA,2BAA2B;;;;;;AAE3B,kEAAwC;AACxC,2DAA+F;AAC/F,
|
|
1
|
+
{"version":3,"file":"BrowserWebrtcConnection.js","sourceRoot":"","sources":["../../../../src/connection/webrtc/BrowserWebrtcConnection.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ export interface IAutoCertifierClient {
|
|
|
4
4
|
start(): Promise<void>;
|
|
5
5
|
stop(): void;
|
|
6
6
|
on(eventName: string, cb: (subdomain: CertifiedSubdomain) => void): void;
|
|
7
|
+
off(eventName: string, cb: (subdomain: CertifiedSubdomain) => void): void;
|
|
7
8
|
}
|
|
8
9
|
interface AutoCertifierClientFacadeOptions {
|
|
9
10
|
url: string;
|
|
@@ -26,7 +26,7 @@ class AutoCertifierClientFacade {
|
|
|
26
26
|
logger.trace(`Updated certificate`);
|
|
27
27
|
});
|
|
28
28
|
await Promise.all([
|
|
29
|
-
(0, utils_1.
|
|
29
|
+
(0, utils_1.waitForEvent)(this.autoCertifierClient, 'updatedCertificate', START_TIMEOUT),
|
|
30
30
|
this.autoCertifierClient.start()
|
|
31
31
|
]);
|
|
32
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AutoCertifierClientFacade.js","sourceRoot":"","sources":["../../../../src/connection/websocket/AutoCertifierClientFacade.ts"],"names":[],"mappings":";;;AAAA,wEAOsC;AACtC,uFAAmF;AACnF,
|
|
1
|
+
{"version":3,"file":"AutoCertifierClientFacade.js","sourceRoot":"","sources":["../../../../src/connection/websocket/AutoCertifierClientFacade.ts"],"names":[],"mappings":";;;AAAA,wEAOsC;AACtC,uFAAmF;AACnF,0CAAqD;AAGrD,MAAM,aAAa,GAAG,EAAE,GAAG,IAAI,CAAA;AAE/B,MAAM,iCAAiC,GAAG,CACtC,UAAkB,EAClB,gBAAwB,EACxB,4BAAsD,EACtD,YAAoB,EACtB,EAAE,CAAC,IAAI,0CAAmB,CACxB,UAAU,EACV,YAAY,EACZ,gBAAgB,EAChB,CAAC,UAAkB,EAAE,aAAqB,EAAE,MAAkB,EAAE,EAAE;IAC9D,4BAA4B,CAAC,iBAAiB,CAC1C,wCAAiB,EACjB,yCAAkB,EAClB,aAAa,EACb,MAAM,CACT,CAAA;AACL,CAAC,CACJ,CAAA;AAqBD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,yBAAyB;IAE1B,mBAAmB,CAAsB;IAChC,eAAe,CAA0B;IACzC,OAAO,CAAkC;IAE1D,YAAY,OAAyC;QACjD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,eAAe,GAAG,IAAI,mDAAwB,CAAC,iCAAyB,EAAE,OAAO,CAAC,SAAS,CAAC,CAAA;QACjG,IAAI,CAAC,mBAAmB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC,OAAO,CAAC,mBAAmB,EAAE;YAClF,CAAC,CAAC,iCAAiC,CAC/B,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,GAAG,EACX,IAAI,CAAC,eAAe,EACpB,OAAO,CAAC,YAAY,CACvB,CAAA;IACT,CAAC;IAED,KAAK,CAAC,KAAK;QACP,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,SAA6B,EAAE,EAAE;YAChF,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;YACpC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,SAAS,CAAC,WAAW,EAAE,SAAS,CAAC,UAAU,CAAC,CAAA;YAC3E,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAA;QACvC,CAAC,CAAC,CAAA;QACF,MAAM,OAAO,CAAC,GAAG,CAAC;YACd,IAAA,oBAAY,EAAC,IAAI,CAAC,mBAAmB,EAAE,oBAAoB,EAAE,aAAa,CAAC;YAC3E,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE;SACnC,CAAC,CAAA;IACN,CAAC;IAED,IAAI;QACA,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAA;QAC/B,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,CAAA;IAClC,CAAC;CAEJ;AAnCD,8DAmCC"}
|
|
@@ -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
|
@@ -19,7 +19,6 @@ export { ManagedConnection } from './connection/ManagedConnection';
|
|
|
19
19
|
export { PendingConnection } from './connection/PendingConnection';
|
|
20
20
|
export type { IConnection } from './connection/IConnection';
|
|
21
21
|
export { ConnectionType } from './connection/IConnection';
|
|
22
|
-
export type { ConnectionStatistics } from './connection/IConnection';
|
|
23
22
|
export type { ServiceID } from './types/ServiceID';
|
|
24
23
|
export type { RingContacts } from './dht/contact/RingContactList';
|
|
25
24
|
export { createOutgoingHandshaker } from './connection/Handshaker';
|
package/dist/src/exports.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
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;
|
|
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,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 {
|
|
4
3
|
connected: (peerDescriptor: PeerDescriptor) => void;
|
|
5
4
|
disconnected: (peerDescriptor: PeerDescriptor, gracefulLeave: boolean) => void;
|
|
6
5
|
message: (message: Message) => void;
|
|
7
|
-
statisticsUpdated: (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.0.0-rc.
|
|
3
|
+
"version": "103.0.0-rc.19",
|
|
4
4
|
"description": "Streamr Network DHT",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -40,11 +40,11 @@
|
|
|
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.0.0-rc.
|
|
44
|
-
"@streamr/cdn-location": "103.0.0-rc.
|
|
45
|
-
"@streamr/geoip-location": "103.0.0-rc.
|
|
46
|
-
"@streamr/proto-rpc": "103.0.0-rc.
|
|
47
|
-
"@streamr/utils": "103.0.0-rc.
|
|
43
|
+
"@streamr/autocertifier-client": "103.0.0-rc.19",
|
|
44
|
+
"@streamr/cdn-location": "103.0.0-rc.19",
|
|
45
|
+
"@streamr/geoip-location": "103.0.0-rc.19",
|
|
46
|
+
"@streamr/proto-rpc": "103.0.0-rc.19",
|
|
47
|
+
"@streamr/utils": "103.0.0-rc.19",
|
|
48
48
|
"eventemitter3": "^5.0.0",
|
|
49
49
|
"heap": "^0.2.6",
|
|
50
50
|
"ipaddr.js": "^2.0.1",
|
|
@@ -58,10 +58,10 @@
|
|
|
58
58
|
},
|
|
59
59
|
"devDependencies": {
|
|
60
60
|
"@streamr/browser-test-runner": "^0.0.1",
|
|
61
|
-
"@streamr/test-utils": "103.0.0-rc.
|
|
61
|
+
"@streamr/test-utils": "103.0.0-rc.19",
|
|
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",
|