nezumi/9router
1
0
Fork 0
mirror of https://github.com/Nezumi-2711/9router.git synced 2026-09-23 04:09:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enhance token refresh logic and improve MITM server handling

Browse Source 
- Introduced a caching mechanism for in-flight token refresh requests to prevent race conditions and reduce unnecessary API calls.
- Added error handling for unrecoverable refresh errors, ensuring that the application can gracefully handle token reuse and invalidation scenarios.
- Updated the MITM server management to handle port 443 conflicts, allowing users to kill processes occupying the port before starting the server.
- Improved user feedback in the MitmServerCard component regarding port conflicts and admin privileges.
- Refactored the ComboList component to streamline the display of media provider combos.

This update aims to enhance the reliability and user experience of the token management and MITM functionalities.
This commit is contained in:
decolua
2026-05-03 22:10:03 +07:00
parent b8e3a46add
commit 4ba546afe7
17 changed files with 680 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mitm/manager.js
+43 -17
View File
@@ -444,7 +444,26 @@ async function scheduleMitmRestart(apiKey) {
/**
* Start MITM server only (cert + server, no DNS)
*/
async function startServer(apiKey, sudoPassword) {
async function killPort443Owner(owner, sudoPassword) {
if (!owner || !owner.pid) return;
if (IS_WIN) {
try {
execSync(`powershell -NonInteractive -WindowStyle Hidden -Command "Stop-Process -Id ${owner.pid} -Force -ErrorAction SilentlyContinue"`, { windowsHide: true });
} catch { /* best effort */ }
} else {
try {
const { execWithPassword } = require("./dns/dnsConfig");
if (sudoPassword || isSudoAvailable()) {
await execWithPassword(`kill -9 ${owner.pid}`, sudoPassword || "");
} else {
execSync(`kill -9 ${owner.pid}`, { windowsHide: true });
}
} catch { /* best effort */ }
}
await new Promise(r => setTimeout(r, 800));
}
async function startServer(apiKey, sudoPassword, forceKillPort443 = false) {
if (!serverProcess || serverProcess.killed) {
try {
if (fs.existsSync(PID_FILE)) {
@@ -472,19 +491,19 @@ async function startServer(apiKey, sudoPassword) {
const portStatus = await checkPort443Free();
if (portStatus === "in-use" || portStatus === "no-permission") {
const owner = await getPort443Owner(sudoPassword);
const ownerIsNode = owner && (owner.name === "node" || owner.name.includes("node"));
if (ownerIsNode) {
log(`Killing orphan node process on port 443 (PID ${owner.pid}, name=${owner.name})...`);
try {
const { execWithPassword } = require("./dns/dnsConfig");
await execWithPassword(`kill -9 ${owner.pid}`, sudoPassword);
await new Promise(r => setTimeout(r, 800));
} catch { /* best effort */ }
} else if (owner) {
if (owner) {
const shortName = owner.name.includes("/")
? owner.name.split("/").filter(Boolean).pop()
: owner.name;
throw new Error(`Port 443 is already in use by "${shortName}" (PID ${owner.pid}). Stop that process first.`);
if (forceKillPort443) {
log(`Killing process on port 443 (PID ${owner.pid}, name=${shortName})...`);
await killPort443Owner(owner, sudoPassword);
} else {
const e = new Error(`Port 443 is already in use by "${shortName}" (PID ${owner.pid}).`);
e.code = "PORT_443_BUSY";
e.portOwner = { pid: owner.pid, name: shortName };
throw e;
}
}
}
}
@@ -533,12 +552,19 @@ async function startServer(apiKey, sudoPassword) {
const mitmRouterBase = await resolveMitmRouterBaseUrl();
log(`🚀 Starting server... (router: ${mitmRouterBase})`);
if (IS_WIN) {
// Kill any process using port 443 before spawning
try {
const psKill = `$c = Get-NetTCPConnection -LocalPort 443 -State Listen -ErrorAction SilentlyContinue | Select-Object -First 1; if ($c -and $c.OwningProcess -gt 4) { Stop-Process -Id $c.OwningProcess -Force -ErrorAction SilentlyContinue }`;
execSync(`powershell -NonInteractive -WindowStyle Hidden -Command "${psKill}"`, { windowsHide: true });
await new Promise(r => setTimeout(r, 500));
} catch { /* best effort */ }
// Check port 443 — ask user before killing
const winOwner = await getPort443Owner(sudoPassword);
if (winOwner) {
if (forceKillPort443) {
log(`Killing process on port 443 (PID ${winOwner.pid}, name=${winOwner.name})...`);
await killPort443Owner(winOwner, sudoPassword);
} else {
const e = new Error(`Port 443 is already in use by "${winOwner.name}" (PID ${winOwner.pid}).`);
e.code = "PORT_443_BUSY";
e.portOwner = { pid: winOwner.pid, name: winOwner.name };
throw e;
}
}
// Spawn directly — process already has admin rights
serverProcess = spawn(