signalk-edge-link 2.1.0 → 2.1.1

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Karl-Erik Gustafsson
+Copyright (c) 2024-2026 Karl-Erik Gustafsson
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/lib/connection-config.js

@@ -235,6 +235,20 @@ function validateConnectionConfig(connection, prefix = "") {
                 }
             }
         }
+        // Validate that primary and backup links are different
+        const primaryLink = bonding.primary;
+        const backupLink = bonding.backup;
+        if (primaryLink && backupLink) {
+            const sameAddress = primaryLink.address !== undefined &&
+                backupLink.address !== undefined &&
+                primaryLink.address === backupLink.address;
+            const samePort = primaryLink.port !== undefined &&
+                backupLink.port !== undefined &&
+                primaryLink.port === backupLink.port;
+            if (sameAddress && samePort) {
+                return `${p}bonding primary and backup links must use different address:port combinations`;
+            }
+        }
         if (bonding.failover !== undefined) {
             if (!bonding.failover ||
                 typeof bonding.failover !== "object" ||

package/lib/instance.js

@@ -93,7 +93,6 @@ function createInstance(app, options, instanceId, pluginId, onStatusChange) {
         pipelineServer: null,
         heartbeatHandle: null,
         monitoring: null,
-        networkSimulator: null,
         configDebounceTimers: {},
         configContentHashes: {},
         configWatcherObjects: [],
@@ -269,7 +268,7 @@ function createInstance(app, options, instanceId, pluginId, onStatusChange) {
         }
         finally {
             state.batchSendInFlight = false;
-            if (state.deltas.length > 0 && !state.pendingRetry) {
+            if (state.deltas.length > 0 && !state.pendingRetry && !state.stopped) {
                 setImmediate(() => {
                     flushDeltaBatch();
                 });
@@ -884,7 +883,6 @@ function createInstance(app, options, instanceId, pluginId, onStatusChange) {
             }
             state.monitoring = null;
         }
-        state.networkSimulator = null;
         // Stop ping monitor
         if (state.pingMonitor) {
             state.pingMonitor.stop();

package/lib/pipeline-v2-client.js

@@ -140,8 +140,11 @@ function createPipelineV2Client(app, state, metricsApi) {
     }
     function _effectiveRetransmitAge() {
         let maxAge = retransmitMaxAge;
-        if ((metrics.rtt ?? 0) > 0) {
-            const rttBasedAge = Math.round((metrics.rtt ?? 0) * retransmitRttMultiplier);
+        // Use the congestion controller's smoothed RTT (EMA) instead of the raw
+        // latest sample to avoid volatile timeout swings from single RTT spikes.
+        const smoothedRtt = congestionControl.getAvgRTT();
+        if (smoothedRtt > 0) {
+            const rttBasedAge = Math.round(smoothedRtt * retransmitRttMultiplier);
             maxAge = Math.min(maxAge, Math.max(retransmitMinAge, rttBasedAge));
         }
         const ackIdleMs = Date.now() - lastAckAt;
@@ -349,10 +352,12 @@ function createPipelineV2Client(app, state, metricsApi) {
             const ackedSeq = packetParser.parseACKPayload(parsed.payload);
             const now = Date.now();
             let rttSample = null;
-            // Estimate RTT from original send timestamp (not retransmit timestamp).
+            // Only sample RTT from packets that were NOT retransmitted (Karn's algorithm).
+            // When a retransmitted packet is ACKed, the measurement is ambiguous — the ACK
+            // could be for the original or the retransmit — so we skip it entirely.
             const entry = retransmitQueue.get(ackedSeq);
-            if (entry && (entry.originalTimestamp || entry.timestamp)) {
-                rttSample = Math.max(0, now - (entry.originalTimestamp || entry.timestamp));
+            if (entry && entry.attempts === 0) {
+                rttSample = Math.max(0, now - entry.originalTimestamp);
             }
             if (rttSample !== null) {
                 metrics.rtt = rttSample;
@@ -376,10 +381,13 @@ function createPipelineV2Client(app, state, metricsApi) {
             lastAckAt = now;
             lastAckRinfo = rinfo ? { address: rinfo.address, port: rinfo.port } : lastAckRinfo;
             // Update congestion control with latest network metrics.
+            // Only feed RTT when we have a fresh sample; passing -1 causes the
+            // congestion controller's >= 0 guard to skip the RTT EMA update,
+            // preventing stale values from being repeatedly folded into the average.
             // Clamp packetLoss to [0, 1] as a defensive measure against any future
             // changes to _calculatePacketLoss that could produce out-of-range values.
             congestionControl.updateMetrics({
-                rtt: metrics.rtt ?? 0,
+                rtt: rttSample ?? -1,
                 packetLoss: Math.min(1, Math.max(0, _calculatePacketLoss()))
             });
             app.debug(`ACK received: seq=${ackedSeq}, removed=${removed}, queueDepth=${retransmitQueue.getSize()}, rtt=${metrics.rtt}ms`);

package/lib/routes/monitoring.js

@@ -336,15 +336,9 @@ function register(router, ctx) {
             if (!bundle) {
                 return res.status(503).json({ error: "Plugin not started" });
             }
-            const { state } = bundle;
-            if (!state.networkSimulator) {
-                return res.json({ enabled: false });
-            }
-            res.json({
-                enabled: true,
-                conditions: state.networkSimulator.getConditions(),
-                stats: state.networkSimulator.getStats()
-            });
+            // Network simulator is not currently implemented; endpoint kept for
+            // API compatibility and future use.
+            res.json({ enabled: false });
         }
         catch (err) {
             res.status(500).json({ error: err instanceof Error ? err.message : String(err) });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "signalk-edge-link",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "SignalK Edge Link. Secure UDP link for data exchange.",
   "main": "lib/index.js",
   "files": [
@@ -83,6 +83,10 @@
   },
   "author": "Karl-Erik Gustafsson",
   "repository": "https://github.com/KEGustafsson/signalk-edge-link",
+  "homepage": "https://github.com/KEGustafsson/signalk-edge-link#readme",
+  "bugs": {
+    "url": "https://github.com/KEGustafsson/signalk-edge-link/issues"
+  },
   "license": "MIT",
   "jest": {
     "testEnvironment": "node",