mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-09-14 19:02:17 +03:00
Residuals of #11236 after #10371/#10491 landed on the tip:
- Dist-fold residuals (bugs 2+3): managedBinaryName() (binaryManager),
resolveSpawnArgs() (installers/cliproxy) and the per-OS memory probes in
getProcessInfo() (processManager) still read the process.platform literal,
which the Linux build of the published artifact constant-folds (precedent:
b43a212680 / #10244). Converted to call-time os.platform() reads, matching
the module's documented anti-fold pattern. Test-side process.platform uses
are not bundled and stay.
- Fold guard: new tests/unit/windows-platform-fold-guard-11236.test.ts pins
zero out-of-comment process.platform occurrences in the four artifact
runtime files, with a comment-stripping tokenizer plus mutation self-checks.
- Bug 6 (pid null on Windows): portProbe.resolvePortPid() only probed
lsof/ss/net-tools netstat. Added a netstat -ano probe with a dedicated
LISTENING-row parser (parseWindowsNetstatPid) as the last fallback; Unix
probes unchanged, and the Windows parser never matches Unix rows (LISTEN vs
LISTENING). Also converted the darwin args branch in the same array to
os.platform() (same fold class, same hunk).
- Bug 5 hardening: runOAuthStatus coerces an out-of-contract 200 payload to
an empty list with a sanitized stderr warning instead of crashing on
.filter over a non-array.
TDD: guard test, parser tests and the oauth hardening test all failed RED
before the fix and pass GREEN after; sibling suites (binaryManager,
processManager, portProbePid, cli-oauth-commands, installers,
ServiceSupervisor, version-manager) green. The 6877 spawn-args test's win32
mock moved from defineProperty(process.platform) to
mock.method(os, "platform") to match the new runtime read — assertion
unchanged.
Co-authored-by: Xiangzhe <bakryun0718@proton.me>
182 lines
5.0 KiB
TypeScript
182 lines
5.0 KiB
TypeScript
import { spawn, type ChildProcess } from "child_process";
|
|
import fs from "fs/promises";
|
|
import fsSync from "fs";
|
|
import path from "path";
|
|
import os from "os";
|
|
import { setToolStatus, getVersionManagerTool } from "@/lib/db/versionManager";
|
|
|
|
const DEFAULT_PORT = 8317;
|
|
const GRACEFUL_TIMEOUT_MS = 5000;
|
|
|
|
/**
|
|
* Builds the `spawn()` options for the cliproxyapi child process.
|
|
* `windowsHide: true` suppresses the transient conhost.exe/cmd console
|
|
* window Windows briefly flashes open for spawned child processes (#8131).
|
|
* Exported (rather than inlined) so a unit test can assert on it directly
|
|
* instead of mocking `node:child_process`.
|
|
*/
|
|
export function buildCliproxyapiSpawnOptions(): {
|
|
detached: boolean;
|
|
stdio: ["ignore", "pipe", "pipe"];
|
|
env: NodeJS.ProcessEnv;
|
|
windowsHide: boolean;
|
|
} {
|
|
return {
|
|
detached: false,
|
|
stdio: ["ignore", "pipe", "pipe"],
|
|
env: { ...process.env },
|
|
windowsHide: true,
|
|
};
|
|
}
|
|
|
|
function defaultConfigDir(): string {
|
|
return process.env.CLIPROXYAPI_CONFIG_DIR || path.join(os.homedir(), ".cli-proxy-api");
|
|
}
|
|
|
|
async function writeConfig(
|
|
configDir: string,
|
|
port: number,
|
|
overrides?: Record<string, unknown>
|
|
): Promise<string> {
|
|
await fs.mkdir(configDir, { recursive: true });
|
|
const configPath = path.join(configDir, "config.yaml");
|
|
const config = `port: ${port}
|
|
host: 127.0.0.1
|
|
log_level: warn
|
|
`;
|
|
await fs.writeFile(configPath, config);
|
|
return configPath;
|
|
}
|
|
|
|
export async function startProcess(
|
|
binaryPath: string,
|
|
port?: number,
|
|
configDir?: string
|
|
): Promise<{ pid: number; port: number }> {
|
|
const existing = await getVersionManagerTool("cliproxyapi");
|
|
if (existing?.pid) {
|
|
const alive = isProcessRunning(existing.pid);
|
|
if (alive) return { pid: existing.pid, port: existing.port };
|
|
}
|
|
|
|
const actualPort = port || DEFAULT_PORT;
|
|
const actualConfigDir = configDir || defaultConfigDir();
|
|
await writeConfig(actualConfigDir, actualPort);
|
|
|
|
const child = spawn(
|
|
binaryPath,
|
|
["-c", path.join(actualConfigDir, "config.yaml")],
|
|
buildCliproxyapiSpawnOptions()
|
|
);
|
|
|
|
child.stdout?.on("data", () => {});
|
|
child.stderr?.on("data", () => {});
|
|
|
|
child.on("error", async (err) => {
|
|
await setToolStatus("cliproxyapi", "error", undefined, err.message);
|
|
});
|
|
|
|
child.on("exit", async (code) => {
|
|
if (code !== 0 && code !== null) {
|
|
await setToolStatus("cliproxyapi", "stopped", undefined, `Process exited with code ${code}`);
|
|
}
|
|
});
|
|
|
|
const pid = child.pid;
|
|
await setToolStatus("cliproxyapi", "running", pid);
|
|
|
|
return { pid, port: actualPort };
|
|
}
|
|
|
|
export function isProcessRunning(pid: number): boolean {
|
|
try {
|
|
process.kill(pid, 0);
|
|
return true;
|
|
} catch {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
export function stopProcess(pid: number): Promise<void> {
|
|
return new Promise((resolve) => {
|
|
if (!isProcessRunning(pid)) {
|
|
resolve();
|
|
return;
|
|
}
|
|
|
|
try {
|
|
process.kill(pid, "SIGTERM");
|
|
} catch {
|
|
resolve();
|
|
return;
|
|
}
|
|
|
|
const timer = setTimeout(() => {
|
|
try {
|
|
process.kill(pid, "SIGKILL");
|
|
} catch {}
|
|
clearInterval(check);
|
|
resolve();
|
|
}, GRACEFUL_TIMEOUT_MS);
|
|
|
|
const check = setInterval(() => {
|
|
if (!isProcessRunning(pid)) {
|
|
clearTimeout(timer);
|
|
clearInterval(check);
|
|
resolve();
|
|
}
|
|
}, 200);
|
|
});
|
|
}
|
|
|
|
export async function restartProcess(
|
|
binaryPath: string,
|
|
port?: number,
|
|
configDir?: string,
|
|
currentPid?: number | null
|
|
): Promise<{ pid: number; port: number }> {
|
|
if (currentPid) {
|
|
await stopProcess(currentPid);
|
|
await new Promise((r) => setTimeout(r, 500));
|
|
}
|
|
return startProcess(binaryPath, port, configDir);
|
|
}
|
|
|
|
export async function getProcessInfo(pid: number): Promise<{
|
|
pid: number;
|
|
alive: boolean;
|
|
memoryUsage?: number;
|
|
}> {
|
|
if (!isProcessRunning(pid)) {
|
|
return { pid, alive: false };
|
|
}
|
|
|
|
try {
|
|
// #11236: single runtime os.platform() read for the per-OS memory probes —
|
|
// a process.platform literal is constant-folded to the build machine's
|
|
// platform in the published artifact (same fold class as b43a212680 /
|
|
// #10244/#10293), so the darwin probe branch would be pruned on macOS.
|
|
const platform = os.platform();
|
|
if (platform === "linux" || platform === "android") {
|
|
const statusFile = `/proc/${pid}/status`;
|
|
const content = await fs.readFile(statusFile, "utf-8");
|
|
const match = content.match(/VmRSS:\s+(\d+)\s+kB/);
|
|
if (match) {
|
|
return { pid, alive: true, memoryUsage: parseInt(match[1], 10) * 1024 };
|
|
}
|
|
} else if (platform === "darwin") {
|
|
const { execFile } = await import("child_process");
|
|
const { promisify } = await import("util");
|
|
const execFileAsync = promisify(execFile);
|
|
const { stdout } = await execFileAsync("ps", ["-o", "rss=", "-p", String(pid)]);
|
|
const rssKb = parseInt(stdout.trim(), 10);
|
|
if (!isNaN(rssKb)) {
|
|
return { pid, alive: true, memoryUsage: rssKb * 1024 };
|
|
}
|
|
}
|
|
return { pid, alive: true };
|
|
} catch {
|
|
return { pid, alive: true };
|
|
}
|
|
}
|