@streamr/dht 103.6.0-rc.0 → 103.7.0-rc.2

package/dist/exports-browser.cjs

@@ -261,6 +261,65 @@ class SendFailed extends Err {
     constructor(message, originalError) { super(ErrorCode.SEND_FAILED, message, originalError); }
 }
 
+let enabled = false;
+function setGapDiagnosticsEnabled(val) {
+    enabled = val;
+    globalThis.__dhtGapDiagEnabled = val;
+}
+const SUMMARY_INTERVAL_MS = 2000;
+const accumulators = new Map();
+function logGapDiagnosticSampled(layer, opts = {}) {
+    if (!enabled)
+        return;
+    const now = performance.now();
+    const threshold = opts.outlierThresholdMs ?? 30;
+    let acc = accumulators.get(layer);
+    if (acc === undefined) {
+        acc = { count: 0, sumDeltaMs: 0, maxDeltaMs: 0, outlierCount: 0, lastReportMs: now, lastEventMs: now };
+        accumulators.set(layer, acc);
+        return;
+    }
+    const deltaMs = now - acc.lastEventMs;
+    acc.lastEventMs = now;
+    acc.count++;
+    if (deltaMs > acc.maxDeltaMs)
+        acc.maxDeltaMs = deltaMs;
+    acc.sumDeltaMs += deltaMs;
+    if (deltaMs > threshold)
+        acc.outlierCount++;
+    if (deltaMs > threshold) {
+        const payload = {
+            layer,
+            timestampMs: now,
+            deltaMs: +deltaMs.toFixed(2),
+            detail: opts.detail,
+        };
+        // eslint-disable-next-line no-console
+        console.log('[gap-diagnostics]', JSON.stringify(payload));
+    }
+    if (now - acc.lastReportMs >= SUMMARY_INTERVAL_MS) {
+        const summaryDetail = {
+            count: acc.count,
+            meanDeltaMs: acc.count > 0 ? +(acc.sumDeltaMs / acc.count).toFixed(2) : 0,
+            maxDeltaMs: +acc.maxDeltaMs.toFixed(2),
+            outlierCount: acc.outlierCount,
+            periodMs: +(now - acc.lastReportMs).toFixed(1),
+        };
+        const summary = {
+            layer: `${layer}.summary`,
+            timestampMs: now,
+            detail: summaryDetail,
+        };
+        // eslint-disable-next-line no-console
+        console.log('[gap-diagnostics]', JSON.stringify(summary));
+        acc.count = 0;
+        acc.sumDeltaMs = 0;
+        acc.maxDeltaMs = 0;
+        acc.outlierCount = 0;
+        acc.lastReportMs = now;
+    }
+}
+
 // @generated message type with reflection information, may provide speed optimized methods
 class Empty$Type extends runtime.MessageType {
     constructor() {
@@ -2305,6 +2364,7 @@ class ConnectionManager extends eventemitter3.EventEmitter {
         if ((this.state === ConnectionManagerState.STOPPED || this.state === ConnectionManagerState.STOPPING) && !opts.sendIfStopped) {
             return;
         }
+        logGapDiagnosticSampled('dht.connMgr.send');
         const peerDescriptor = message.targetDescriptor;
         if (this.isConnectionToSelf(peerDescriptor)) {
             throw new CannotConnectToSelf('Cannot send to self');
@@ -2380,6 +2440,7 @@ class ConnectionManager extends eventemitter3.EventEmitter {
             this.rpcCommunicator?.handleMessageFromPeer(message);
         }
         else {
+            logGapDiagnosticSampled('dht.connMgr.emitMessage');
             logger$A.trace('emit "message" ' + toNodeId(message.sourceDescriptor)
                 + ' ' + message.serviceId + ' ' + message.messageId);
             this.emit('message', message);
@@ -2389,6 +2450,7 @@ class ConnectionManager extends eventemitter3.EventEmitter {
         if (this.state === ConnectionManagerState.STOPPED) {
             return;
         }
+        logGapDiagnosticSampled('dht.connMgr.onData');
         this.metrics.receiveBytesPerSecond.record(data.byteLength);
         this.metrics.receiveMessagesPerSecond.record(1);
         let message;
@@ -2822,7 +2884,7 @@ const parseVersion = (version) => {
     }
 };
 
-var version = "103.6.0-rc.0";
+var version = "103.7.0-rc.2";
 
 const logger$y = new utils.Logger('Handshaker');
 // Optimally the Outgoing and Incoming Handshakers could be their own separate classes
@@ -3280,6 +3342,9 @@ class DirectWebrtcConnection extends eventemitter3.EventEmitter {
     }
     send(data) {
         if (this.lastState === 'connected') {
+            logGapDiagnosticSampled('dht.dc.send', {
+                detail: { bufferedAmount: this.dataChannel.bufferedAmount, queueLen: this.messageQueue.length }
+            });
             if (this.dataChannel.bufferedAmount > this.bufferThresholdHigh) {
                 this.messageQueue.push(data);
             }
@@ -3308,6 +3373,7 @@ class DirectWebrtcConnection extends eventemitter3.EventEmitter {
         };
         dataChannel.onmessage = (msg) => {
             logger$v.trace('dc.onmessage');
+            logGapDiagnosticSampled('dht.dc.onmessage');
             this.emit('data', new Uint8Array(msg.data));
         };
         dataChannel.onbufferedamountlow = () => {
@@ -3602,7 +3668,7 @@ class WorkerWebrtcConnection extends eventemitter3.EventEmitter {
                 if (state === DisconnectedState.CLOSED ||
                     state === DisconnectedState.DISCONNECTED ||
                     state === DisconnectedState.FAILED) {
-                    this.doClose(false);
+                    this.doClose(false, `pcState=${state}`);
                 }
             },
             onDataChannel: (channel) => {
@@ -3655,6 +3721,9 @@ class WorkerWebrtcConnection extends eventemitter3.EventEmitter {
     }
     send(data) {
         if (this.connected && this.dataChannel) {
+            logGapDiagnosticSampled('dht.dc.send', {
+                detail: { bufferedAmount: this.dataChannel.bufferedAmount, queueLen: this.messageQueue.length }
+            });
             if (this.dataChannel.bufferedAmount > this.bufferThresholdHigh) {
                 this.messageQueue.push(data);
             }
@@ -3684,13 +3753,14 @@ class WorkerWebrtcConnection extends eventemitter3.EventEmitter {
         };
         dataChannel.onclose = () => {
             logger$u.trace('dc.onClosed (worker)');
-            this.doClose(false);
+            this.doClose(false, 'dataChannel.onclose');
         };
         dataChannel.onerror = (err) => {
             logger$u.warn('Data channel error (worker)', { err });
         };
         dataChannel.onmessage = (msg) => {
             logger$u.trace('dc.onmessage (worker)');
+            logGapDiagnosticSampled('dht.dc.onmessage');
             this.emit('data', new Uint8Array(msg.data));
         };
         dataChannel.onbufferedamountlow = () => {
@@ -5960,7 +6030,7 @@ class PeerDiscovery {
             logger$d.debug(`Ring join on ${this.options.serviceId} timed out`);
         }
         finally {
-            sessions.forEach((session) => this.ongoingDiscoverySessions.delete(session.id));
+            sessions.forEach((session) => this.ongoingRingDiscoverySessions.delete(session.id));
         }
     }
     async rejoinDht(entryPoint, contactedPeers = new Set(), distantJoinContactPeers = new Set()) {
@@ -8078,7 +8148,9 @@ exports.createOutgoingHandshaker = createOutgoingHandshaker;
 exports.getRandomRegion = getRandomRegion;
 exports.getRegionDelayMatrix = getRegionDelayMatrix;
 exports.installWebrtcBridge = installWebrtcBridge;
+exports.logGapDiagnosticSampled = logGapDiagnosticSampled;
 exports.randomDhtAddress = randomDhtAddress;
+exports.setGapDiagnosticsEnabled = setGapDiagnosticsEnabled;
 exports.toDhtAddress = toDhtAddress;
 exports.toDhtAddressRaw = toDhtAddressRaw;
 exports.toNodeId = toNodeId;