@techysy/10router 1.2.1 → 1.3.0

package/app/custom-server.js

@@ -1,177 +1,177 @@
-const http = require("http");
-const path = require("path");
-const fs = require("fs");
-const crypto = require("crypto");
-const { pathToFileURL } = require("url");
-
-const origCreate = http.createServer.bind(http);
-
-// Per-process secret proving x-10r-real-ip was stamped below rather than sent by the client.
-// A bare `next start` / `next dev` never loads this file, so it cannot produce a matching
-// header even though the env var is inherited by child processes. Named like x-9r-cli-token
-// so the request-detail header sanitizer redacts it too.
-const PEER_TOKEN = crypto.randomBytes(24).toString("hex");
-process.env.TENROUTER_PEER_TOKEN = PEER_TOKEN;
-
-// Long-term console archive: tee server console output into a per-day file under
-// the data dir (logs/app-YYYY-MM-DD.log, append-only, no cap — the durable record
-// of upstream answers / request failures that requestDetails' 200-record ring
-// buffer and the desktop 5MB server.log don't keep). Runs only from this file, so
-// `next dev` keeps its plain console. Best-effort: a bare repo checkout without
-// the standalone copy simply skips it.
-import(pathToFileURL(path.join(__dirname, "src", "lib", "consoleArchiveStandalone.mjs")))
-  .then((m) => m.installConsoleArchive())
-  .catch(() => {});
-
-let backgroundRefreshStarted = false;
-
-// Apply the outbound proxy from DB settings at boot. This is the Node-side
-// replacement for the `@/lib/network/initOutboundProxy` import in layout.js,
-// which Next tree-shakes out of the standalone build. Runs in custom-server.js
-// (always loaded, never tree-shaken) so process.env.HTTP(S)_PROXY is restored
-// on every restart instead of waiting for the user to re-save settings.
-let outboundProxyStarted = false;
-function startOutboundProxyFromCustomServer() {
-  if (outboundProxyStarted) return;
-  outboundProxyStarted = true;
-  const modPath = path.join(__dirname, "src", "lib", "network", "outboundProxyStandalone.js");
-  import(pathToFileURL(modPath).href)
-    .then((m) => {
-      try {
-        m.ensureOutboundProxyInitialized();
-      } catch (e) {
-        console.error("[OutboundProxyInit] start failed:", e && e.message ? e.message : e);
-      }
-    })
-    .catch((e) => {
-      // Expected in a bare repo checkout (src/lib/network not shipped). The Next
-      // app bootstrap (layout.js initOutboundProxy) covers it in dev.
-      if (process.env.DEBUG_OUTBOUND_PROXY) {
-        console.error("[OutboundProxyInit] import failed:", e && e.message ? e.message : e);
-      }
-    });
-}
-
-function startBackgroundTokenRefreshFromCustomServer() {
-  if (backgroundRefreshStarted) return;
-  backgroundRefreshStarted = true;
-  // Prefer source path (repo / standalone that still has src). Fail-open if missing
-  // — initializeApp also starts the same scheduler when the Next app boots.
-  const modPath = path.join(__dirname, "src", "sse", "services", "backgroundTokenRefresh.js");
-  import(pathToFileURL(modPath).href)
-    .then((m) => {
-      try {
-        m.startBackgroundTokenRefresh();
-      } catch (e) {
-        console.error("[BackgroundTokenRefresh] start failed:", e && e.message ? e.message : e);
-      }
-      const stop = () => {
-        try {
-          m.stopBackgroundTokenRefresh();
-        } catch {
-          /* ignore */
-        }
-      };
-      process.once("SIGINT", stop);
-      process.once("SIGTERM", stop);
-    })
-    .catch((e) => {
-      // Expected in published CLI standalone (src/ not on disk). App bootstrap covers it.
-      if (process.env.DEBUG_BACKGROUND_TOKEN_REFRESH) {
-        console.error("[BackgroundTokenRefresh] import failed:", e && e.message ? e.message : e);
-      }
-    });
-}
-
-// Wrap Next standalone HTTP server: derive client IP from the TCP socket
-// (unspoofable) and strip client-supplied forwarding headers so downstream
-// rate-limiting keys on the real peer address instead of attacker-controlled XFF.
-http.createServer = (...args) => {
-  const handler = args.find((a) => typeof a === "function");
-  const rest = args.filter((a) => typeof a !== "function");
-  if (!handler) return origCreate(...args);
-  const wrapped = (req, res) => {
-    const socketIp = req.socket && req.socket.remoteAddress ? req.socket.remoteAddress : "";
-    const xff = req.headers["x-forwarded-for"];
-    const xRealIp = req.headers["x-real-ip"];
-    const viaProxy = !!(xff || xRealIp);
-    const isLoopbackProxy = socketIp === "127.0.0.1" || socketIp === "::1" || socketIp === "::ffff:127.0.0.1";
-    // Trust forwarding headers only when the TCP peer is a local reverse proxy.
-    // Direct/public sockets remain keyed by the unspoofable peer address.
-    const proxyIp = xRealIp || (xff ? String(xff).split(",")[0].trim() : "");
-    const ip = isLoopbackProxy && proxyIp ? proxyIp : socketIp;
-    delete req.headers["x-10r-real-ip"];
-    delete req.headers["x-forwarded-for"];
-    delete req.headers["x-10r-via-proxy"];
-    delete req.headers["x-10r-peer-token"];
-    req.headers["x-10r-real-ip"] = ip;
-    req.headers["x-10r-peer-token"] = PEER_TOKEN;
-    if (viaProxy) req.headers["x-10r-via-proxy"] = "1";
-    return handler(req, res);
-  };
-  const server = origCreate(...rest, wrapped);
-  server.once("listening", () => {
-    startBackgroundTokenRefreshFromCustomServer();
-    startOutboundProxyFromCustomServer();
-  });
-  const origEmit = server.emit;
-  // JBR 25 sends h2c upgrades that the HTTP/1.1 server would otherwise close.
-  server.emit = function (event, ...eventArgs) {
-    const [req, socket, head] = eventArgs;
-    if (event !== "upgrade" || String(req.headers.upgrade || "").toLowerCase() !== "h2c") {
-      return origEmit.call(this, event, ...eventArgs);
-    }
-
-    const contentLength = Number(req.headers["content-length"] || 0);
-    if (!Number.isSafeInteger(contentLength) || contentLength < 0) {
-      socket.destroy();
-      return true;
-    }
-    const chunks = [head];
-    let received = head.length;
-    const serve = () => {
-      // Replay the upgraded request through the existing HTTP/1.1 handler.
-      const replay = new http.IncomingMessage(socket);
-      Object.assign(replay, { method: req.method, url: req.url, headers: req.headers, complete: true });
-      if (received) replay.push(Buffer.concat(chunks, received).subarray(0, contentLength));
-      replay.push(null);
-      const res = new http.ServerResponse(replay);
-      res.shouldKeepAlive = false;
-      res.assignSocket(socket);
-      res.once("finish", () => socket.end());
-      Promise.resolve().then(() => wrapped(replay, res)).catch((error) => {
-        console.error("Failed to downgrade h2c request", error);
-        socket.destroy();
-      });
-    };
-    if (received >= contentLength) serve();
-    else {
-      socket.on("data", function readBody(chunk) {
-        chunks.push(chunk);
-        received += chunk.length;
-        if (received < contentLength) return;
-        socket.off("data", readBody);
-        serve();
-      });
-      socket.resume();
-    }
-    delete req.headers.upgrade;
-    delete req.headers["http2-settings"];
-    req.headers.connection = "close";
-    return true;
-  };
-  return server;
-};
-
-if (require.main === module) {
-  const standalone = path.join(__dirname, "server.js");
-  if (fs.existsSync(standalone)) {
-    require(standalone);
-  } else {
-    // Repo checkout has no standalone build next to us. `next start` builds its HTTP
-    // server in-process, so the wrapper above still sanitizes every request.
-    const nextBin = require.resolve("next/dist/bin/next");
-    process.argv = [process.argv[0], nextBin, "start", ...process.argv.slice(2)];
-    require(nextBin);
-  }
-}
+const http = require("http");
+const path = require("path");
+const fs = require("fs");
+const crypto = require("crypto");
+const { pathToFileURL } = require("url");
+
+const origCreate = http.createServer.bind(http);
+
+// Per-process secret proving x-10r-real-ip was stamped below rather than sent by the client.
+// A bare `next start` / `next dev` never loads this file, so it cannot produce a matching
+// header even though the env var is inherited by child processes. Named like x-9r-cli-token
+// so the request-detail header sanitizer redacts it too.
+const PEER_TOKEN = crypto.randomBytes(24).toString("hex");
+process.env.TENROUTER_PEER_TOKEN = PEER_TOKEN;
+
+// Long-term console archive: tee server console output into a per-day file under
+// the data dir (logs/app-YYYY-MM-DD.log, append-only, no cap — the durable record
+// of upstream answers / request failures that requestDetails' 200-record ring
+// buffer and the desktop 5MB server.log don't keep). Runs only from this file, so
+// `next dev` keeps its plain console. Best-effort: a bare repo checkout without
+// the standalone copy simply skips it.
+import(pathToFileURL(path.join(__dirname, "src", "lib", "consoleArchiveStandalone.mjs")))
+  .then((m) => m.installConsoleArchive())
+  .catch(() => {});
+
+let backgroundRefreshStarted = false;
+
+// Apply the outbound proxy from DB settings at boot. This is the Node-side
+// replacement for the `@/lib/network/initOutboundProxy` import in layout.js,
+// which Next tree-shakes out of the standalone build. Runs in custom-server.js
+// (always loaded, never tree-shaken) so process.env.HTTP(S)_PROXY is restored
+// on every restart instead of waiting for the user to re-save settings.
+let outboundProxyStarted = false;
+function startOutboundProxyFromCustomServer() {
+  if (outboundProxyStarted) return;
+  outboundProxyStarted = true;
+  const modPath = path.join(__dirname, "src", "lib", "network", "outboundProxyStandalone.js");
+  import(pathToFileURL(modPath).href)
+    .then((m) => {
+      try {
+        m.ensureOutboundProxyInitialized();
+      } catch (e) {
+        console.error("[OutboundProxyInit] start failed:", e && e.message ? e.message : e);
+      }
+    })
+    .catch((e) => {
+      // Expected in a bare repo checkout (src/lib/network not shipped). The Next
+      // app bootstrap (layout.js initOutboundProxy) covers it in dev.
+      if (process.env.DEBUG_OUTBOUND_PROXY) {
+        console.error("[OutboundProxyInit] import failed:", e && e.message ? e.message : e);
+      }
+    });
+}
+
+function startBackgroundTokenRefreshFromCustomServer() {
+  if (backgroundRefreshStarted) return;
+  backgroundRefreshStarted = true;
+  // Prefer source path (repo / standalone that still has src). Fail-open if missing
+  // — initializeApp also starts the same scheduler when the Next app boots.
+  const modPath = path.join(__dirname, "src", "sse", "services", "backgroundTokenRefresh.js");
+  import(pathToFileURL(modPath).href)
+    .then((m) => {
+      try {
+        m.startBackgroundTokenRefresh();
+      } catch (e) {
+        console.error("[BackgroundTokenRefresh] start failed:", e && e.message ? e.message : e);
+      }
+      const stop = () => {
+        try {
+          m.stopBackgroundTokenRefresh();
+        } catch {
+          /* ignore */
+        }
+      };
+      process.once("SIGINT", stop);
+      process.once("SIGTERM", stop);
+    })
+    .catch((e) => {
+      // Expected in published CLI standalone (src/ not on disk). App bootstrap covers it.
+      if (process.env.DEBUG_BACKGROUND_TOKEN_REFRESH) {
+        console.error("[BackgroundTokenRefresh] import failed:", e && e.message ? e.message : e);
+      }
+    });
+}
+
+// Wrap Next standalone HTTP server: derive client IP from the TCP socket
+// (unspoofable) and strip client-supplied forwarding headers so downstream
+// rate-limiting keys on the real peer address instead of attacker-controlled XFF.
+http.createServer = (...args) => {
+  const handler = args.find((a) => typeof a === "function");
+  const rest = args.filter((a) => typeof a !== "function");
+  if (!handler) return origCreate(...args);
+  const wrapped = (req, res) => {
+    const socketIp = req.socket && req.socket.remoteAddress ? req.socket.remoteAddress : "";
+    const xff = req.headers["x-forwarded-for"];
+    const xRealIp = req.headers["x-real-ip"];
+    const viaProxy = !!(xff || xRealIp);
+    const isLoopbackProxy = socketIp === "127.0.0.1" || socketIp === "::1" || socketIp === "::ffff:127.0.0.1";
+    // Trust forwarding headers only when the TCP peer is a local reverse proxy.
+    // Direct/public sockets remain keyed by the unspoofable peer address.
+    const proxyIp = xRealIp || (xff ? String(xff).split(",")[0].trim() : "");
+    const ip = isLoopbackProxy && proxyIp ? proxyIp : socketIp;
+    delete req.headers["x-10r-real-ip"];
+    delete req.headers["x-forwarded-for"];
+    delete req.headers["x-10r-via-proxy"];
+    delete req.headers["x-10r-peer-token"];
+    req.headers["x-10r-real-ip"] = ip;
+    req.headers["x-10r-peer-token"] = PEER_TOKEN;
+    if (viaProxy) req.headers["x-10r-via-proxy"] = "1";
+    return handler(req, res);
+  };
+  const server = origCreate(...rest, wrapped);
+  server.once("listening", () => {
+    startBackgroundTokenRefreshFromCustomServer();
+    startOutboundProxyFromCustomServer();
+  });
+  const origEmit = server.emit;
+  // JBR 25 sends h2c upgrades that the HTTP/1.1 server would otherwise close.
+  server.emit = function (event, ...eventArgs) {
+    const [req, socket, head] = eventArgs;
+    if (event !== "upgrade" || String(req.headers.upgrade || "").toLowerCase() !== "h2c") {
+      return origEmit.call(this, event, ...eventArgs);
+    }
+
+    const contentLength = Number(req.headers["content-length"] || 0);
+    if (!Number.isSafeInteger(contentLength) || contentLength < 0) {
+      socket.destroy();
+      return true;
+    }
+    const chunks = [head];
+    let received = head.length;
+    const serve = () => {
+      // Replay the upgraded request through the existing HTTP/1.1 handler.
+      const replay = new http.IncomingMessage(socket);
+      Object.assign(replay, { method: req.method, url: req.url, headers: req.headers, complete: true });
+      if (received) replay.push(Buffer.concat(chunks, received).subarray(0, contentLength));
+      replay.push(null);
+      const res = new http.ServerResponse(replay);
+      res.shouldKeepAlive = false;
+      res.assignSocket(socket);
+      res.once("finish", () => socket.end());
+      Promise.resolve().then(() => wrapped(replay, res)).catch((error) => {
+        console.error("Failed to downgrade h2c request", error);
+        socket.destroy();
+      });
+    };
+    if (received >= contentLength) serve();
+    else {
+      socket.on("data", function readBody(chunk) {
+        chunks.push(chunk);
+        received += chunk.length;
+        if (received < contentLength) return;
+        socket.off("data", readBody);
+        serve();
+      });
+      socket.resume();
+    }
+    delete req.headers.upgrade;
+    delete req.headers["http2-settings"];
+    req.headers.connection = "close";
+    return true;
+  };
+  return server;
+};
+
+if (require.main === module) {
+  const standalone = path.join(__dirname, "server.js");
+  if (fs.existsSync(standalone)) {
+    require(standalone);
+  } else {
+    // Repo checkout has no standalone build next to us. `next start` builds its HTTP
+    // server in-process, so the wrapper above still sanitizes every request.
+    const nextBin = require.resolve("next/dist/bin/next");
+    process.argv = [process.argv[0], nextBin, "start", ...process.argv.slice(2)];
+    require(nextBin);
+  }
+}

package/app/package.json

@@ -1,69 +1,71 @@
-{
-  "name": "10router-app",
-  "version": "1.2.1",
-  "description": "10Router web dashboard",
-  "private": true,
-  "scripts": {
-    "dev": "next dev --port 20127",
-    "dev:webpack": "next dev --webpack --port 20127",
-    "build": "node --max-old-space-size=24576 node_modules/next/dist/bin/next build --webpack",
-    "prebuild:fpk": "node scripts/sync-manifest-version.mjs",
-    "postbuild": "node scripts/copy-standalone-assets.mjs",
-    "postbuild:bun": "node scripts/copy-standalone-assets.mjs",
-    "start": "node custom-server.js --port 20127",
-    "dev:bun": "bun --bun next dev --webpack --port 20127",
-    "build:bun": "bun --bun next build --webpack",
-    "start:bun": "bun ./.next/standalone/custom-server.js",
-    "test": "npm --prefix tests test",
-    "cli:pack": "npm --prefix cli run pack:cli",
-    "cli:publish": "npm --prefix cli run publish:cli",
-    "test-version": "node scripts/test-build-version.mjs"
-  },
-  "dependencies": {
-    "@dnd-kit/core": "^6.3.1",
-    "@dnd-kit/modifiers": "^9.0.0",
-    "@dnd-kit/sortable": "^10.0.0",
-    "@dnd-kit/utilities": "^3.2.2",
-    "@lobehub/icons": "^5.18.0",
-    "@monaco-editor/react": "^4.7.0",
-    "@next/third-parties": "^16.2.9",
-    "@node-saml/node-saml": "^5.1.0",
-    "@xyflow/react": "^12.10.1",
-    "bcryptjs": "^3.0.3",
-    "chalk": "^5.6.2",
-    "confbox": "^0.2.4",
-    "express": "^5.2.1",
-    "http-proxy-middleware": "^3.0.5",
-    "jose": "^6.1.3",
-    "marked": "^18.0.1",
-    "material-symbols": "^0.44.6",
-    "monaco-editor": "^0.55.1",
-    "next": "^16.1.6",
-    "node-forge": "^1.3.3",
-    "node-machine-id": "^1.1.12",
-    "open": "^11.0.0",
-    "ora": "^9.1.0",
-    "prop-types": "^15.8.1",
-    "react": "19.2.4",
-    "react-dom": "19.2.4",
-    "react-is": "^16.13.1",
-    "recharts": "^3.7.0",
-    "selfsigned": "^5.5.0",
-    "socks-proxy-agent": "^8.0.5",
-    "sql.js": "^1.14.1",
-    "undici": "^7.19.2",
-    "uuid": "^13.0.0",
-    "zustand": "^5.0.10"
-  },
-  "optionalDependencies": {
-    "better-sqlite3": "^12.6.2"
-  },
-  "comment_better_sqlite3": "REQUIRED AT BUILD TIME even though almost nothing loads it at runtime — do not remove. adapters/betterSqliteAdapter.js imports it statically and api/oauth/cursor/auto-import/route.js requires it, so webpack must resolve the specifier; serverExternalPackages only stops it being bundled, it does not make it optional to the build. Removing it fails `next build` with 'Module not found'. At runtime it usually is absent: npm >= 11 skips optionalDependencies whose install script isn't allowlisted, and Next output tracing copies only its lib/*.js, never the .node binary — so the Docker image, the fpk and the standalone tarball all fall through to node:sqlite. The npm CLI is the exception: cli/hooks/sqliteRuntime.js installs a working copy into ~/.10router/runtime.",
-  "devDependencies": {
-    "@tailwindcss/postcss": "^4.1.18",
-    "eslint": "^9",
-    "eslint-config-next": "16.1.6",
-    "postcss": "^8.5.6",
-    "tailwindcss": "^4"
-  }
-}
+{
+  "name": "10router-app",
+  "version": "1.3.0",
+  "description": "10Router web dashboard",
+  "private": true,
+  "scripts": {
+    "dev": "next dev --port 20127",
+    "dev:webpack": "next dev --webpack --port 20127",
+    "build": "node --max-old-space-size=24576 node_modules/next/dist/bin/next build --webpack",
+    "prebuild:fpk": "node scripts/sync-manifest-version.mjs",
+    "postbuild": "node scripts/copy-standalone-assets.mjs",
+    "postbuild:bun": "node scripts/copy-standalone-assets.mjs",
+    "start": "node custom-server.js --port 20127",
+    "dev:bun": "bun --bun next dev --webpack --port 20127",
+    "build:bun": "bun --bun next build --webpack",
+    "start:bun": "bun ./.next/standalone/custom-server.js",
+    "test": "npm --prefix tests test",
+    "cli:pack": "npm --prefix cli run pack:cli",
+    "cli:publish": "npm --prefix cli run publish:cli",
+    "test-version": "node scripts/test-build-version.mjs"
+  },
+  "dependencies": {
+    "@dnd-kit/core": "^6.3.1",
+    "@dnd-kit/modifiers": "^9.0.0",
+    "@dnd-kit/sortable": "^10.0.0",
+    "@dnd-kit/utilities": "^3.2.2",
+    "@lobehub/icons": "^5.18.0",
+    "@monaco-editor/react": "^4.7.0",
+    "@next/third-parties": "^16.2.9",
+    "@node-saml/node-saml": "^5.1.0",
+    "@xyflow/react": "^12.10.1",
+    "bcryptjs": "^3.0.3",
+    "chalk": "^5.6.2",
+    "confbox": "^0.2.4",
+    "express": "^5.2.1",
+    "http-proxy-middleware": "^3.0.5",
+    "jose": "^6.1.3",
+    "marked": "^18.0.1",
+    "material-symbols": "^0.44.6",
+    "monaco-editor": "^0.55.1",
+    "next": "^16.1.6",
+    "node-forge": "^1.3.3",
+    "node-machine-id": "^1.1.12",
+    "open": "^11.0.0",
+    "ora": "^9.1.0",
+    "prop-types": "^15.8.1",
+    "react": "19.2.4",
+    "react-dom": "19.2.4",
+    "react-is": "^16.13.1",
+    "recharts": "^3.7.0",
+    "selfsigned": "^5.5.0",
+    "socks-proxy-agent": "^8.0.5",
+    "sql.js": "^1.14.1",
+    "undici": "^7.19.2",
+    "uuid": "^13.0.0",
+    "zustand": "^5.0.10"
+  },
+  "optionalDependencies": {
+    "better-sqlite3": "^12.6.2"
+  },
+  "comment_better_sqlite3": "REQUIRED AT BUILD TIME even though almost nothing loads it at runtime — do not remove. adapters/betterSqliteAdapter.js imports it statically and api/oauth/cursor/auto-import/route.js requires it, so webpack must resolve the specifier; serverExternalPackages only stops it being bundled, it does not make it optional to the build. Removing it fails `next build` with 'Module not found'. At runtime it usually is absent: npm >= 11 skips optionalDependencies whose install script isn't allowlisted, and Next output tracing copies only its lib/*.js, never the .node binary — so the Docker image, the fpk and the standalone tarball all fall through to node:sqlite. The npm CLI is the exception: cli/hooks/sqliteRuntime.js installs a working copy into ~/.10router/runtime.",
+  "devDependencies": {
+    "@tailwindcss/postcss": "^4.1.18",
+    "eslint": "^9",
+    "eslint-config-next": "16.1.6",
+    "happy-dom": "^20.14.5",
+    "jsdom": "^30.1.1",
+    "postcss": "^8.5.6",
+    "tailwindcss": "^4"
+  }
+}