Bart/9router
1
0
Fork 0
mirror of https://github.com/decolua/9router.git synced 2026-05-08 12:01:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: enhance MITM server path resolution and ensure runtime server copy

Browse Source
This commit is contained in:
decolua
2026-04-22 10:02:44 +07:00
parent f825a523ab
commit d8c0a7ef44
2 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/mitm/manager.js
View File

@@ -12,7 +12,7 @@ const IS_MAC = process.platform === "darwin";
const { generateCert } = require("./cert/generate"); const { generateCert } = require("./cert/generate");
const { installCert, uninstallCert } = require("./cert/install"); const { installCert, uninstallCert } = require("./cert/install");
const { isCertExpired } = require("./cert/rootCA"); const { isCertExpired } = require("./cert/rootCA");
const { MITM_DIR } = require("./paths"); const { DATA_DIR, MITM_DIR } = require("./paths");
const { log, err } = require("./logger"); const { log, err } = require("./logger");
const DEFAULT_MITM_ROUTER_BASE = "http://localhost:20128"; const DEFAULT_MITM_ROUTER_BASE = "http://localhost:20128";
@@ -48,7 +48,7 @@ let mitmRestartCount = 0;
let mitmLastStartTime = 0; let mitmLastStartTime = 0;
let mitmIsRestarting = false; let mitmIsRestarting = false;
function resolveServerPath() { function resolveBundledServerPath() {
if (process.env.MITM_SERVER_PATH) return process.env.MITM_SERVER_PATH; if (process.env.MITM_SERVER_PATH) return process.env.MITM_SERVER_PATH;
const sibling = path.join(__dirname, "server.js"); const sibling = path.join(__dirname, "server.js");
if (fs.existsSync(sibling)) return sibling; if (fs.existsSync(sibling)) return sibling;
@@ -59,7 +59,38 @@ function resolveServerPath() {
return fromCwd; return fromCwd;
} }
const SERVER_PATH = resolveServerPath(); // Copy bundled server.js into DATA_DIR so MITM doesn't lock node_modules
// (prevents EBUSY on `npm i -g 9router@latest` while MITM is running).
function ensureRuntimeServer(bundledPath) {
try {
if (!bundledPath || !fs.existsSync(bundledPath)) return bundledPath;
// Dev mode: source file has relative requires (./logger, ./config...),
// only the bundled file inside node_modules is self-contained + safe to copy.
if (!bundledPath.includes(`${path.sep}node_modules${path.sep}`)) {
return bundledPath;
}
const runtimeDir = path.join(DATA_DIR, "runtime", "mitm");
const runtimeServer = path.join(runtimeDir, "server.js");
// Skip copy if sizes match (bundle unchanged since last run)
if (fs.existsSync(runtimeServer)) {
try {
if (fs.statSync(bundledPath).size === fs.statSync(runtimeServer).size) return runtimeServer;
} catch { /* recopy */ }
}
fs.mkdirSync(runtimeDir, { recursive: true });
fs.copyFileSync(bundledPath, runtimeServer);
return runtimeServer;
} catch (e) {
try { log(`[MITM] runtime copy failed: ${e.message}`); } catch { /* ignore */ }
return bundledPath;
}
}
const SERVER_PATH = ensureRuntimeServer(resolveBundledServerPath());
const ENCRYPT_ALGO = "aes-256-gcm"; const ENCRYPT_ALGO = "aes-256-gcm";
const ENCRYPT_SALT = "9router-mitm-pwd"; const ENCRYPT_SALT = "9router-mitm-pwd";

2
src/sse/services/auth.js
View File

@@ -243,8 +243,6 @@ export async function clearAccountError(connectionId, currentConnection, model =
} }
await updateProviderConnection(connectionId, clearObj); await updateProviderConnection(connectionId, clearObj);
const connName = conn?.displayName || conn?.name || conn?.email || connectionId.slice(0, 8);
log.info("AUTH", `Account ${connName} cleared lock for model=${model || "__all"}`);
} }
/** /**