@decentnetwork/lan 0.1.297 → 0.1.298

package/dist/router/paced-forwarder.d.ts

@@ -10,6 +10,10 @@ export interface PacedForwarderOptions {
     maxFlowBytes?: number;
     /** Max queued bytes across a destination before shed (backstop). */
     maxDestBytes?: number;
+    /** Longest a packet may sit queued before it is dropped instead of sent.
+     *  Bounds LATENCY, which the byte caps cannot: a low-rate flow never fills
+     *  256 KB and so was never shed, however long the path had been stalled. */
+    maxSojournMs?: number;
     /** Token-bucket burst ceiling as seconds-worth of rate. */
     burstSeconds?: number;
     now?: () => number;

package/dist/router/paced-forwarder.js

@@ -29,6 +29,10 @@
 const DEFAULT_RATE_BPS = 12_500_000; // 100 Mbps — effectively uncapped until measured
 const DEFAULT_MAX_FLOW_BYTES = 256 * 1024;
 const DEFAULT_MAX_DEST_BYTES = 4 * 1024 * 1024;
+// Generous next to any real mesh RTT (relay paths run in the hundreds of ms),
+// decisive against a stall measured in minutes. A packet older than this has
+// outlived whatever asked for it.
+const DEFAULT_MAX_SOJOURN_MS = 3_000;
 const DEFAULT_BURST_SECONDS = 0.05; // 50ms of rate as burst — smooths without adding latency
 const MIN_RATE_BPS = 32 * 1024; // never pace below 256 kbps
 // LOSS-DRIVEN pacing. The old rule paced to `delivered × headroom`, but the
@@ -98,6 +102,7 @@ export class PacedForwarder {
             send: opts.send,
             defaultRateBps: opts.defaultRateBps ?? DEFAULT_RATE_BPS,
             maxFlowBytes: opts.maxFlowBytes ?? DEFAULT_MAX_FLOW_BYTES,
+            maxSojournMs: opts.maxSojournMs ?? DEFAULT_MAX_SOJOURN_MS,
             maxDestBytes: opts.maxDestBytes ?? DEFAULT_MAX_DEST_BYTES,
             burstSeconds: opts.burstSeconds ?? DEFAULT_BURST_SECONDS,
             now: opts.now ?? Date.now,
@@ -162,7 +167,7 @@ export class PacedForwarder {
         }
         let f = d.flows.get(flowKey);
         if (!f) {
-            f = { key: flowKey, packets: [], bytes: 0 };
+            f = { key: flowKey, packets: [], enqueuedAt: [], bytes: 0 };
             d.flows.set(flowKey, f);
             d.order.push(flowKey);
         }
@@ -170,6 +175,7 @@ export class PacedForwarder {
         // congestion to just that flow's TCP without starving the others.
         if (f.bytes + packet.length > this.#opts.maxFlowBytes) {
             const oldest = f.packets.shift();
+            f.enqueuedAt.shift();
             if (oldest) {
                 f.bytes -= oldest.length;
                 d.totalBytes -= oldest.length;
@@ -177,6 +183,7 @@ export class PacedForwarder {
             }
         }
         f.packets.push(packet);
+        f.enqueuedAt.push(this.#opts.now());
         f.bytes += packet.length;
         d.totalBytes += packet.length;
         this.#drain(dstIp);
@@ -205,6 +212,19 @@ export class PacedForwarder {
         d.draining = true;
         this.#pump(dstIp, d);
     }
+    /** Discard packets that have waited past maxSojournMs. Returns true when the
+     *  flow emptied, so the caller can skip it this round. */
+    #dropStale(d, f) {
+        const cutoff = this.#opts.now() - this.#opts.maxSojournMs;
+        while (f.packets.length > 0 && f.enqueuedAt[0] < cutoff) {
+            const stale = f.packets.shift();
+            f.enqueuedAt.shift();
+            f.bytes -= stale.length;
+            d.totalBytes -= stale.length;
+            this.#dropped++;
+        }
+        return f.packets.length === 0;
+    }
     #pump(dstIp, d) {
         d.draining = false;
         const now = this.#opts.now();
@@ -237,8 +257,29 @@ export class PacedForwarder {
                 this.#opts.schedule(() => this.#pump(dstIp, d), ms);
                 return;
             }
+            // Drop what has waited too long, BEFORE spending a token on it.
+            //
+            // The queue was bounded by bytes only — 256 KB a flow — which a
+            // high-rate flow trips in a moment and a low-rate one never trips at
+            // all. Measured 2026-08-31 against a peer on a Thai mobile link: ICMP
+            // echo replies arriving with RTTs of 180 to 250 SECONDS, each one
+            // exactly 1000ms lower than the last, which is the shape of a backlog
+            // flushing after the path came back. At 84 bytes a ping and one a
+            // second, filling 256 KB would take fifty minutes; the packets simply
+            // sat there. Delivering a four-minute-old packet is worse than dropping
+            // it — the sender gave up long ago, and TCP above reads it as a wildly
+            // inflated RTT.
+            //
+            // Bound the SOJOURN TIME, which is what CoDel is about and what a byte
+            // cap cannot express.
+            if (this.#dropStale(d, f)) {
+                d.order.splice(d.cursor % d.order.length, 1);
+                d.flows.delete(f.key);
+                continue;
+            }
             // Emit one packet from this flow, then advance the cursor (fairness).
             const pkt = f.packets.shift();
+            f.enqueuedAt.shift();
             f.bytes -= size;
             d.totalBytes -= size;
             d.tokens -= size;

package/dist/ui/desktop/app.js

@@ -1,4 +1,4 @@
-window.__DK_UI_VERSION="0.1.297";
+window.__DK_UI_VERSION="0.1.298";
 const ICON_PATHS = {
   // ---- tab bar (the four must feel like one set) ----
   users: '<path d="M16 21v-2a4 4 0 0 0-4-4H6a4 4 0 0 0-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M22 21v-2a4 4 0 0 0-3-3.87"/><path d="M16 3.13a4 4 0 0 1 0 7.75"/>',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decentnetwork/lan",
-  "version": "0.1.297",
+  "version": "0.1.298",
   "description": "Private virtual LAN for self-hosted services and AI agents, built on Elastos Carrier. NAT-traversal, name service, ACL, all over a peer-to-peer mesh — no public IP required.",
   "type": "module",
   "main": "./dist/index.js",