@decentnetwork/lan 0.1.191 → 0.1.192

package/dist/proxy/multi-exit-router.d.ts

@@ -49,6 +49,7 @@ export interface MultiExitRouterOptions {
     log?: (msg: string) => void;
 }
 export declare const BUILTIN_REGION_DOMAINS: Record<string, string[]>;
+export declare function isUsefulRecoverySample(peakBps: number, averageBps: number, minBps?: number): boolean;
 interface HlsExitScore {
     speedEwma: number | null;
     flooredAtMs: number | null;

package/dist/proxy/multi-exit-router.js

@@ -149,6 +149,16 @@ const NEVER_LEARN = /(^|\.)(google|gstatic|googleapis|googleusercontent|ggpht|gv
 // (≈0.5 Mbit/s) keeps every usable exit in and sits safely ABOVE the 40 KB/s
 // deprioritize floor so a floored exit still drops out.
 const NEAR_DEAD_EXIT_BPS = 60_000;
+// Foreground HLS needs a materially stronger exit than ordinary browsing.
+// CCTV's 720p variant is 1.8 Mbit/s; an exit below ~1.2 Mbit/s cannot deliver
+// one four-second segment quickly enough to be useful even with a small live
+// buffer. Keep such exits available for last-resort failover, but do not count
+// them as HLS delivery capacity or let a slow redemption probe re-enable them.
+// This is bytes/sec (150 KB/s = 1.2 Mbit/s).
+const HLS_DELIVERY_BPS = 150_000;
+export function isUsefulRecoverySample(peakBps, averageBps, minBps = HLS_DELIVERY_BPS) {
+    return peakBps >= minBps && averageBps >= minBps;
+}
 // A buffered segment fetch is given a deadline sized to deliver its body at
 // roughly this bitrate; an exit that can't keep up is abandoned and the next is
 // tried. Live HLS needs each ~4s segment in a few seconds, so this is set near
@@ -217,7 +227,7 @@ function floorExit(exit) {
 /** Feed one tunnel's rate meter into the exit's speed EWMA (peak-window based).
  *  Only transfers past SPEED_MIN_BYTES count — smaller ones never reveal path
  *  capacity on a high-RTT link. */
-function sampleSpeed(exit, meter, durMs) {
+function sampleSpeed(exit, meter, durMs, recoveryMinBps = NEAR_DEAD_EXIT_BPS) {
     exit.bytesDown += meter.total;
     if (meter.total < SPEED_MIN_BYTES)
         return;
@@ -229,7 +239,12 @@ function sampleSpeed(exit, meter, durMs) {
         // replaces it with the fresh measurement instead of blending the floor into
         // the result. Only a useful-speed transfer proves recovery; a completed but
         // still-too-slow probe remains floored for another redemption interval.
-        if (bps >= NEAR_DEAD_EXIT_BPS) {
+        // Peak-window speed is useful for ranking paths, but HLS redemption must
+        // also prove whole-segment average throughput. A probe observed at a 0.9
+        // Mbit/s peak but only 0.6 Mbit/s average caused six-way prefetch/hedge
+        // congestion when it rejoined a 1.8 Mbit/s stream.
+        const averageBps = durMs > 0 ? (meter.total / durMs) * 1000 : 0;
+        if (isUsefulRecoverySample(bps, averageBps, recoveryMinBps)) {
             exit.speedEwma = bps;
             exit.flooredAtMs = null;
         }
@@ -247,7 +262,7 @@ function sampleSpeed(exit, meter, durMs) {
  * exit is degraded, keep the original pool as a last resort. Exported for the
  * policy regression tests. */
 export function selectHlsPrimaryPool(pool) {
-    const proven = pool.filter((e) => e.flooredAtMs === null && e.speedEwma !== null && e.speedEwma >= NEAR_DEAD_EXIT_BPS);
+    const proven = pool.filter((e) => e.flooredAtMs === null && e.speedEwma !== null && e.speedEwma >= HLS_DELIVERY_BPS);
     if (proven.length > 0)
         return proven;
     const unproven = pool.filter((e) => e.flooredAtMs === null && e.speedEwma === null);
@@ -255,7 +270,10 @@ export function selectHlsPrimaryPool(pool) {
 }
 /** Dynamic prefetch concurrency follows only the foreground-safe pool. */
 export function countHlsDeliveryExits(pool) {
-    return Math.max(1, selectHlsPrimaryPool(pool).length);
+    // Two adjacent live segments in flight keep the buffer moving without the
+    // runaway 6-8 request fan-out seen when every marginal exit increased both
+    // prefetch concurrency and whole-segment hedging.
+    return Math.min(2, Math.max(1, selectHlsPrimaryPool(pool).length));
 }
 function fmtMbps(bps) {
     return bps === null ? "?" : `${((bps * 8) / 1e6).toFixed(1)}Mbps`;
@@ -1274,7 +1292,7 @@ export function startMultiExitRouter(opts) {
                             nextExit(`empty ${status}`);
                             return;
                         }
-                        sampleSpeed(exit, meter, durMs);
+                        sampleSpeed(exit, meter, durMs, HLS_DELIVERY_BPS);
                         if (label) {
                             const kb = (body.length / 1024).toFixed(0);
                             const mbps = durMs > 0 ? ((body.length * 8) / durMs / 1000).toFixed(1) : "?";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decentnetwork/lan",
-  "version": "0.1.191",
+  "version": "0.1.192",
   "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",