mirror of
https://github.com/Nezumi-2711/9router.git
synced 2026-09-23 04:09:49 +00:00
Refactor global styles and enhance MITM functionality
- Updated global CSS to implement a new brand color palette and improve light/dark theme consistency. - Enhanced the MitmServerCard component to provide clearer user feedback regarding admin privileges. - Filtered LLM combos in the CombosPage to ensure only relevant data is displayed. - Improved APIPageClient layout for better usability and visual consistency. - Added functionality to save and load DNS tool states in the MITM manager. - Updated OAuth configuration URLs for Qwen to reflect the new endpoint structure. - Refined tunnel management logic to improve reliability and user experience.
This commit is contained in:
+33
-23
@@ -65,6 +65,14 @@ function execWithPassword(command, password) {
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Trim trailing blank lines/whitespace, ensure file ends with exactly one newline.
|
||||
*/
|
||||
function normalizeHostsContent(content) {
|
||||
const eol = IS_WIN ? "\r\n" : "\n";
|
||||
return content.replace(/[\r\n\s]+$/g, "") + eol;
|
||||
}
|
||||
|
||||
/**
|
||||
* Flush DNS cache (macOS/Linux)
|
||||
*/
|
||||
@@ -120,19 +128,26 @@ async function addDNSEntry(tool, sudoPassword) {
|
||||
return;
|
||||
}
|
||||
|
||||
const entries = entriesToAdd.map(h => `127.0.0.1 ${h}`).join("\n");
|
||||
|
||||
try {
|
||||
if (IS_WIN) {
|
||||
const toAppend = entriesToAdd.map(h => `127.0.0.1 ${h}`).join("`r`n");
|
||||
// Single elevated script: append to hosts + flush DNS (1 UAC popup, or zero if admin)
|
||||
// Read → trim → append → write (avoids stacked blank lines from Add-Content)
|
||||
const current = fs.readFileSync(HOSTS_FILE, "utf8");
|
||||
const trimmed = current.replace(/[\r\n\s]+$/g, "");
|
||||
const toAppend = entriesToAdd.map(h => `127.0.0.1 ${h}`).join("\r\n");
|
||||
const next = `${trimmed}\r\n${toAppend}\r\n`;
|
||||
const script = `
|
||||
Add-Content -LiteralPath ${quotePs(HOSTS_FILE)} -Value ${quotePs(toAppend)}
|
||||
Set-Content -LiteralPath ${quotePs(HOSTS_FILE)} -Value ${quotePs(next)} -NoNewline
|
||||
ipconfig /flushdns | Out-Null
|
||||
`;
|
||||
await runElevatedPowerShell(script);
|
||||
} else {
|
||||
await execWithPassword(`echo "${entries}" >> ${HOSTS_FILE}`, sudoPassword);
|
||||
const current = fs.readFileSync(HOSTS_FILE, "utf8");
|
||||
const trimmed = current.replace(/[\r\n\s]+$/g, "");
|
||||
const toAppend = entriesToAdd.map(h => `127.0.0.1 ${h}`).join("\n");
|
||||
const next = `${trimmed}\n${toAppend}\n`;
|
||||
// Use tee via sudo to overwrite atomically — escape single quotes in content
|
||||
const escaped = next.replace(/'/g, "'\\''");
|
||||
await execWithPassword(`printf '%s' '${escaped}' | tee ${HOSTS_FILE} > /dev/null`, sudoPassword);
|
||||
await flushDNS(sudoPassword);
|
||||
}
|
||||
log(`🌐 DNS ${tool}: ✅ added ${entriesToAdd.join(", ")}`);
|
||||
@@ -157,26 +172,20 @@ async function removeDNSEntry(tool, sudoPassword) {
|
||||
|
||||
try {
|
||||
if (IS_WIN) {
|
||||
// Build PowerShell list literal of hosts to strip
|
||||
const hostsList = entriesToRemove.map(quotePs).join(",");
|
||||
const current = fs.readFileSync(HOSTS_FILE, "utf8");
|
||||
const filtered = current.split(/\r?\n/).filter(l => !entriesToRemove.some(h => l.includes(h))).join("\r\n");
|
||||
const next = filtered.replace(/[\r\n\s]+$/g, "") + "\r\n";
|
||||
const script = `
|
||||
$hosts = @(${hostsList})
|
||||
$lines = Get-Content -LiteralPath ${quotePs(HOSTS_FILE)}
|
||||
$filtered = $lines | Where-Object {
|
||||
$line = $_
|
||||
-not ($hosts | Where-Object { $line -match [regex]::Escape($_) })
|
||||
}
|
||||
Set-Content -LiteralPath ${quotePs(HOSTS_FILE)} -Value $filtered
|
||||
Set-Content -LiteralPath ${quotePs(HOSTS_FILE)} -Value ${quotePs(next)} -NoNewline
|
||||
ipconfig /flushdns | Out-Null
|
||||
`;
|
||||
await runElevatedPowerShell(script);
|
||||
} else {
|
||||
for (const host of entriesToRemove) {
|
||||
const sedCmd = IS_MAC
|
||||
? `sed -i '' '/${host}/d' ${HOSTS_FILE}`
|
||||
: `sed -i '/${host}/d' ${HOSTS_FILE}`;
|
||||
await execWithPassword(sedCmd, sudoPassword);
|
||||
}
|
||||
const current = fs.readFileSync(HOSTS_FILE, "utf8");
|
||||
const filtered = current.split(/\r?\n/).filter(l => !entriesToRemove.some(h => l.includes(h))).join("\n");
|
||||
const next = filtered.replace(/[\r\n\s]+$/g, "") + "\n";
|
||||
const escaped = next.replace(/'/g, "'\\''");
|
||||
await execWithPassword(`printf '%s' '${escaped}' | tee ${HOSTS_FILE} > /dev/null`, sudoPassword);
|
||||
await flushDNS(sudoPassword);
|
||||
}
|
||||
log(`🌐 DNS ${tool}: ✅ removed ${entriesToRemove.join(", ")}`);
|
||||
@@ -210,8 +219,9 @@ function removeAllDNSEntriesSync() {
|
||||
const content = fs.readFileSync(HOSTS_FILE, "utf8");
|
||||
const eol = IS_WIN ? "\r\n" : "\n";
|
||||
const filtered = content.split(/\r?\n/).filter(l => !allHosts.some(h => l.includes(h))).join(eol);
|
||||
if (filtered === content) return;
|
||||
fs.writeFileSync(HOSTS_FILE, filtered, "utf8");
|
||||
const next = filtered.replace(/[\r\n\s]+$/g, "") + eol;
|
||||
if (next === content) return;
|
||||
fs.writeFileSync(HOSTS_FILE, next, "utf8");
|
||||
if (IS_WIN) {
|
||||
try { execSync("ipconfig /flushdns", { windowsHide: true, stdio: "ignore" }); } catch { /* ignore */ }
|
||||
} else if (IS_MAC) {
|
||||
|
||||
Reference in New Issue
Block a user