@jonathanleelx/meddle 0.5.0-beta.25 → 0.5.0-beta.26

package/bin/index.js

@@ -59,7 +59,7 @@ if (command === 'mock' || command === 'route' || command === 'session') {
   // No command or only flags - start proxy (default behavior)
   require('../index.js')
 } else {
-  console.log(`Unknown command: ${command}`)
+  console.error(`Unknown command: ${command}`)
   showHelp()
   process.exit(1)
 }
@@ -106,7 +106,8 @@ Route 命令:
   meddle route active             查看当前激活的路由文件
   meddle route active set <file>  设置激活的路由文件
   meddle route create <name>      创建路由文件
-  meddle route add <file> <pattern> <target>   添加路由规则
+  meddle route add <file> <pattern> <target> [--exclusions=]
+                              添加路由规则；--exclusions= 清空排除项
   meddle route update <file> <pattern> [<target>] [--exclusions=]
                               更新路由规则；--exclusions= 清空排除项
   meddle route delete <file> <pattern> 删除路由规则
@@ -138,6 +139,7 @@ Route 命令:
   meddle route preview "https://api.example.com/v1/users"  # 预览转发目标
   meddle route preview "https://cdn.com/assets/js/app.js" --file dev-rules --json
   meddle route add dev-rules "api.test.com" "localhost:3000"
+  meddle route add dev-rules "api.test.com" "localhost:3000" --exclusions=
   meddle route update dev-rules "api.test.com" --exclusions=
   meddle route active set beta-rules
 

package/bin/lib/output.js

@@ -51,11 +51,13 @@ function success(message) {
 }
 
 /**
- * Print error message
+ * Print a command failure. Human-readable text goes to stderr so stdout stays
+ * empty on error. In --json mode this is a no-op; the caller prints the
+ * `{ success: false }` object on stdout.
  */
 function error(message) {
   if (jsonMode) return
-  console.log(chalk.red('  ✗'), message)
+  console.error(chalk.red('  ✗'), message)
 }
 
 /**

package/dist/core/browser.d.ts

@@ -1,2 +1,9 @@
-export declare function openBrowserWithProxy(url: string, proxyServer: string, meddleDir: string, remoteDebuggingPort?: number): boolean;
+import * as os from 'os';
+type Platform = ReturnType<typeof os.platform>;
+/** Name of a browser this machine can launch (`google-chrome`, `Google Chrome`, …), or null. */
+export declare function findInstalledBrowser(platform?: Platform): string | null;
+/** Stop browsers opened by this process. Tests call this from afterAll. */
+export declare function closeLaunchedBrowsers(): void;
+export declare function openBrowserWithProxy(url: string, proxyServer: string, meddleDir: string, remoteDebuggingPort?: number): Promise<boolean>;
+export {};
 //# sourceMappingURL=browser.d.ts.map

package/dist/core/browser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../../core/browser.ts"],"names":[],"mappings":"AAMA,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,mBAAmB,CAAC,EAAE,MAAM,GAAG,OAAO,CAuC/H"}
+{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../../core/browser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAA;AAmBxB,KAAK,QAAQ,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,CAAA;AAgC9C,gGAAgG;AAChG,wBAAgB,oBAAoB,CAAC,QAAQ,GAAE,QAAwB,GAAG,MAAM,GAAG,IAAI,CAStF;AAwCD,2EAA2E;AAC3E,wBAAgB,qBAAqB,IAAI,IAAI,CAM5C;AA2GD,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,mBAAmB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAuB9I"}

package/dist/core/browser.js

@@ -36,57 +36,260 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.findInstalledBrowser = findInstalledBrowser;
+exports.closeLaunchedBrowsers = closeLaunchedBrowsers;
 exports.openBrowserWithProxy = openBrowserWithProxy;
 const os = __importStar(require("os"));
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs"));
 const child_process_1 = require("child_process");
 const chalk_1 = __importDefault(require("chalk"));
-function openBrowserWithProxy(url, proxyServer, meddleDir, remoteDebuggingPort) {
-    const platform = os.platform();
-    const userDataDir = path.join(meddleDir, 'chrome-proxy');
-    if (!fs.existsSync(userDataDir))
-        fs.mkdirSync(userDataDir, { recursive: true });
-    const browsers = platform === 'darwin'
-        ? ['Google Chrome', 'Microsoft Edge', 'Chromium']
-        : platform === 'win32'
-            ? ['chrome', 'msedge', 'chromium']
-            : ['google-chrome', 'chromium', 'chromium-browser'];
-    let proxyArgs = `--user-data-dir="${userDataDir}" --proxy-server=${proxyServer} --window-size=1920,1080`;
-    if (remoteDebuggingPort)
-        proxyArgs += ` --remote-debugging-port=${remoteDebuggingPort}`;
-    for (const app of browsers) {
-        try {
-            if (platform === 'darwin') {
-                (0, child_process_1.execSync)(`open -a "${app}" --args ${proxyArgs} "${url}"`, { stdio: 'ignore' });
-                return true;
-            }
-            else if (platform === 'win32') {
-                (0, child_process_1.execSync)(`start "" "${app}" ${proxyArgs} "${url}"`, { stdio: 'ignore' });
-                return true;
+// Linux `execSync('google-chrome …')` waits until Chrome exits. Chrome does not
+// exit, so the caller — including the Vitest worker in tests/browser.spec.ts —
+// blocks forever and the test timeout never fires (#130). Spawn instead. A
+// process that is still alive after a short grace period is open. Exit 0 is
+// also success: Chrome hands the URL to an existing window with the same
+// profile and quits. A non-zero exit is a failed start. Kill anything that
+// fails to start or that tests ask us to close.
+const BROWSER_GRACE_MS = 500;
+const LAUNCHER_TIMEOUT_MS = 2000;
+const launched = [];
+const profiles = [];
+function browserCandidates(platform) {
+    if (platform === 'darwin')
+        return ['Google Chrome', 'Microsoft Edge', 'Chromium'];
+    if (platform === 'win32')
+        return ['chrome', 'msedge', 'chromium'];
+    return ['google-chrome', 'google-chrome-stable', 'chromium', 'chromium-browser'];
+}
+function commandOnPath(name) {
+    const directories = (process.env.PATH || '').split(path.delimiter).filter(Boolean);
+    const suffixes = process.platform === 'win32'
+        ? (process.env.PATHEXT || '.EXE;.CMD;.BAT;.COM').split(';')
+        : [''];
+    for (const directory of directories) {
+        for (const suffix of suffixes) {
+            const candidate = path.join(directory, name + suffix);
+            try {
+                fs.accessSync(candidate, fs.constants.X_OK);
+                return candidate;
             }
-            else {
-                (0, child_process_1.execSync)(`${app} ${proxyArgs} "${url}"`, { stdio: 'ignore' });
-                return true;
+            catch {
+                // try the next directory
             }
         }
-        catch (_) {
+    }
+    return null;
+}
+function darwinAppExists(app) {
+    const roots = ['/Applications', path.join(os.homedir(), 'Applications')];
+    return roots.some((root) => fs.existsSync(path.join(root, `${app}.app`)));
+}
+/** Name of a browser this machine can launch (`google-chrome`, `Google Chrome`, …), or null. */
+function findInstalledBrowser(platform = os.platform()) {
+    for (const app of browserCandidates(platform)) {
+        if (platform === 'darwin') {
+            if (darwinAppExists(app))
+                return app;
             continue;
         }
+        if (commandOnPath(app))
+            return app;
     }
+    return null;
+}
+function killPid(pid) {
     try {
-        if (platform === 'darwin')
-            (0, child_process_1.execSync)(`open "${url}"`, { stdio: 'ignore' });
-        else if (platform === 'win32')
-            (0, child_process_1.execSync)(`start "" "${url}"`, { stdio: 'ignore' });
-        else
-            (0, child_process_1.execSync)(`xdg-open "${url}"`, { stdio: 'ignore' });
-        console.log(chalk_1.default.yellow('未找到 Chrome/Edge，已用默认浏览器打开，请手动设置代理:', proxyServer));
-        return true;
+        // detached: true puts the child in its own process group, so this also
+        // stops Chrome helpers spawned from it.
+        process.kill(-pid, 'SIGKILL');
     }
-    catch (err) {
-        console.error(chalk_1.default.red('浏览器并未启动:'), err.message);
+    catch {
+        try {
+            process.kill(pid, 'SIGKILL');
+        }
+        catch { /* already exited */ }
+    }
+}
+function forget(child) {
+    const index = launched.indexOf(child);
+    if (index >= 0)
+        launched.splice(index, 1);
+    if (child.pid)
+        killPid(child.pid);
+}
+function killProcessesUsingProfile(dir) {
+    if (process.platform === 'win32')
+        return;
+    let output = '';
+    try {
+        output = (0, child_process_1.execFileSync)('ps', ['-Aww', '-o', 'pid=', '-o', 'args='], {
+            encoding: 'utf8',
+            timeout: 2000,
+            stdio: ['ignore', 'pipe', 'ignore'],
+        });
+    }
+    catch {
+        return;
+    }
+    for (const line of output.split('\n')) {
+        if (!line.includes(dir))
+            continue;
+        const match = /^\s*(\d+)\s/.exec(line);
+        if (!match)
+            continue;
+        const pid = Number(match[1]);
+        if (!pid || pid === process.pid)
+            continue;
+        try {
+            process.kill(pid, 'SIGKILL');
+        }
+        catch { /* already exited */ }
+    }
+}
+/** Stop browsers opened by this process. Tests call this from afterAll. */
+function closeLaunchedBrowsers() {
+    for (const child of launched.splice(0)) {
+        if (!child.pid || child.exitCode !== null || child.signalCode !== null)
+            continue;
+        killPid(child.pid);
+    }
+    for (const dir of profiles.splice(0))
+        killProcessesUsingProfile(dir);
+}
+function spawnTracked(command, args, shell = false) {
+    try {
+        const child = (0, child_process_1.spawn)(command, args, {
+            detached: true,
+            stdio: 'ignore',
+            windowsHide: true,
+            shell,
+        });
+        // 'error' is async (ENOENT). A listener is required so Node does not
+        // throw it as an unhandled error after we have already moved on.
+        child.on('error', () => { });
+        launched.push(child);
+        return child;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Browser binaries stay in the foreground. Still running after the grace
+ * period means opened. Exit 0 also means opened: a second Chrome with the
+ * same profile hands the URL to the existing window and quits.
+ */
+function launchDetached(command, args) {
+    return new Promise((resolve) => {
+        const child = spawnTracked(command, args);
+        if (!child) {
+            resolve(false);
+            return;
+        }
+        let settled = false;
+        let timer;
+        const finish = (ok) => {
+            if (settled)
+                return;
+            settled = true;
+            if (timer)
+                clearTimeout(timer);
+            if (ok) {
+                // Already exited (handoff). Drop it so a later cleanup cannot
+                // signal a recycled pid. A process that is still running stays
+                // tracked so tests can close it.
+                if (child.exitCode !== null || child.signalCode !== null) {
+                    const index = launched.indexOf(child);
+                    if (index >= 0)
+                        launched.splice(index, 1);
+                }
+                child.unref();
+            }
+            else {
+                forget(child);
+            }
+            resolve(ok);
+        };
+        timer = setTimeout(() => {
+            finish(child.exitCode === null && child.signalCode === null);
+        }, BROWSER_GRACE_MS);
+        child.once('error', () => finish(false));
+        child.once('exit', (code) => finish(code === 0));
+    });
+}
+/** `open`, `start`, and `xdg-open` are supposed to exit. Kill them if they do not. */
+function launchExiting(command, args, shell = false) {
+    return new Promise((resolve) => {
+        const child = spawnTracked(command, args, shell);
+        if (!child) {
+            resolve(false);
+            return;
+        }
+        let settled = false;
+        let timer;
+        const finish = (ok) => {
+            if (settled)
+                return;
+            settled = true;
+            if (timer)
+                clearTimeout(timer);
+            if (ok) {
+                const index = launched.indexOf(child);
+                if (index >= 0)
+                    launched.splice(index, 1);
+                child.unref();
+            }
+            else {
+                forget(child);
+            }
+            resolve(ok);
+        };
+        timer = setTimeout(() => finish(false), LAUNCHER_TIMEOUT_MS);
+        child.once('error', () => finish(false));
+        child.once('exit', (code) => finish(code === 0));
+    });
+}
+async function launchCandidate(platform, app, argList, url) {
+    if (platform === 'darwin') {
+        return launchExiting('open', ['-a', app, '--args', ...argList, url]);
+    }
+    if (platform === 'win32') {
+        return launchExiting('cmd.exe', ['/c', 'start', '', app, ...argList, url]);
+    }
+    const command = commandOnPath(app);
+    if (!command)
         return false;
+    return launchDetached(command, [...argList, url]);
+}
+function launchFallback(platform, url) {
+    if (platform === 'darwin')
+        return launchExiting('open', [url]);
+    if (platform === 'win32')
+        return launchExiting('cmd.exe', ['/c', 'start', '', url]);
+    return launchExiting('xdg-open', [url]);
+}
+async function openBrowserWithProxy(url, proxyServer, meddleDir, remoteDebuggingPort) {
+    const platform = os.platform();
+    const userDataDir = path.join(meddleDir, 'chrome-proxy');
+    fs.mkdirSync(userDataDir, { recursive: true });
+    profiles.push(userDataDir);
+    const argList = [
+        `--user-data-dir=${userDataDir}`,
+        `--proxy-server=${proxyServer}`,
+        '--window-size=1920,1080',
+    ];
+    if (remoteDebuggingPort)
+        argList.push(`--remote-debugging-port=${remoteDebuggingPort}`);
+    for (const app of browserCandidates(platform)) {
+        if (await launchCandidate(platform, app, argList, url))
+            return true;
+    }
+    if (await launchFallback(platform, url)) {
+        console.log(chalk_1.default.yellow('未找到 Chrome/Edge，已用默认浏览器打开，请手动设置代理:', proxyServer));
+        return true;
     }
+    console.error(chalk_1.default.red('浏览器并未启动:'), 'no supported browser found');
+    return false;
 }
 //# sourceMappingURL=browser.js.map

package/dist/core/browser.js.map

@@ -1 +1 @@
-{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../core/browser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAMA,oDAuCC;AA7CD,uCAAwB;AACxB,2CAA4B;AAC5B,uCAAwB;AACxB,iDAAwC;AACxC,kDAAyB;AAEzB,SAAgB,oBAAoB,CAAC,GAAW,EAAE,WAAmB,EAAE,SAAiB,EAAE,mBAA4B;IAClH,MAAM,QAAQ,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAA;IAC9B,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,CAAA;IACxD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC;QAAE,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IAE/E,MAAM,QAAQ,GAAa,QAAQ,KAAK,QAAQ;QAC5C,CAAC,CAAC,CAAC,eAAe,EAAE,gBAAgB,EAAE,UAAU,CAAC;QACjD,CAAC,CAAC,QAAQ,KAAK,OAAO;YAClB,CAAC,CAAC,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,CAAC;YAClC,CAAC,CAAC,CAAC,eAAe,EAAE,UAAU,EAAE,kBAAkB,CAAC,CAAA;IAE3D,IAAI,SAAS,GAAG,oBAAoB,WAAW,oBAAoB,WAAW,0BAA0B,CAAA;IACxG,IAAI,mBAAmB;QAAE,SAAS,IAAI,4BAA4B,mBAAmB,EAAE,CAAA;IAEvF,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QACzB,IAAI,CAAC;YACD,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;gBACxB,IAAA,wBAAQ,EAAC,YAAY,GAAG,YAAY,SAAS,KAAK,GAAG,GAAG,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAA;gBAC9E,OAAO,IAAI,CAAA;YACf,CAAC;iBAAM,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;gBAC9B,IAAA,wBAAQ,EAAC,aAAa,GAAG,KAAK,SAAS,KAAK,GAAG,GAAG,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAA;gBACxE,OAAO,IAAI,CAAA;YACf,CAAC;iBAAM,CAAC;gBACJ,IAAA,wBAAQ,EAAC,GAAG,GAAG,IAAI,SAAS,KAAK,GAAG,GAAG,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAA;gBAC7D,OAAO,IAAI,CAAA;YACf,CAAC;QACL,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YAAC,SAAQ;QAAC,CAAC;IAC5B,CAAC;IAED,IAAI,CAAC;QACD,IAAI,QAAQ,KAAK,QAAQ;YAAE,IAAA,wBAAQ,EAAC,SAAS,GAAG,GAAG,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAA;aACpE,IAAI,QAAQ,KAAK,OAAO;YAAE,IAAA,wBAAQ,EAAC,aAAa,GAAG,GAAG,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAA;;YAC5E,IAAA,wBAAQ,EAAC,aAAa,GAAG,GAAG,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAA;QACvD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,MAAM,CAAC,oCAAoC,EAAE,WAAW,CAAC,CAAC,CAAA;QAC5E,OAAO,IAAI,CAAA;IACf,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAChB,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,CAAA;QACjD,OAAO,KAAK,CAAA;IAChB,CAAC;AACL,CAAC"}
+{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../core/browser.ts"],"names":[],"mappings":"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"}

package/index.js

@@ -549,7 +549,7 @@ localWSServer.on('connection', (client, req) => {})
     await ensureRootCA({ trustCheckAsync: true })
     await pluginBoot.bootstrapBuiltinPlugins()
     const port = await getFreePort()
-    proxyServer.listen(port, remoteAccess.bindHost, () => {
+    proxyServer.listen(port, remoteAccess.bindHost, async () => {
         const proxyUrl = `http://127.0.0.1:${port}`
         console.log(chalk.green('代理服务器已启动:'), chalk.cyan(proxyUrl))
         proxyDebug('proxy-server start on ' + chalk.green(proxyUrl))
@@ -568,7 +568,8 @@ localWSServer.on('connection', (client, req) => {})
         if (ctx.AUTO_OPEN) {
             const proxyAddr = `127.0.0.1:${port}`
             const remotePort = process.env.MEDDLE_OPEN_CHROMEDEVTOOLS ? 9222 : undefined
-            if (openBrowserWithProxy(proxyUrl, proxyAddr, ctx.meddleDir, remotePort)) {
+            const opened = await openBrowserWithProxy(proxyUrl, proxyAddr, ctx.meddleDir, remotePort).catch(() => false)
+            if (opened) {
                 console.log(chalk.green('已启动浏览器（代理:'), proxyAddr + chalk.green(')'))
             } else {
                 console.log(chalk.yellow('浏览器并未启动，请手动打开'), chalk.cyan(proxyUrl), chalk.yellow('并设置代理'), proxyAddr)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jonathanleelx/meddle",
-  "version": "0.5.0-beta.25",
+  "version": "0.5.0-beta.26",
   "description": "A simple development proxy server with custom routing rules, mock responses, HTTPS interception, and a plugin system",
   "type": "commonjs",
   "main": "index.js",