chrome-cdp-cli 2.0.4 → 2.1.0

package/dist/cli/CLIApplication.js

@@ -7,7 +7,6 @@ const ConnectionManager_1 = require("../connection/ConnectionManager");
 const handlers_1 = require("../handlers");
 const logger_1 = require("../utils/logger");
 const CommandRouter_1 = require("./CommandRouter");
-const ProxyManager_1 = require("../proxy/ProxyManager");
 const OutputManager_1 = require("./OutputManager");
 class CLIApplication {
     constructor() {
@@ -16,7 +15,6 @@ class CLIApplication {
         this.connectionManager = new ConnectionManager_1.ConnectionManager();
         this.outputManager = new OutputManager_1.OutputManager();
         this.logger = new logger_1.Logger();
-        this.proxyManager = ProxyManager_1.ProxyManager.getInstance();
         this.setupHandlers();
     }
     setupHandlers() {
@@ -36,14 +34,13 @@ class CLIApplication {
         this.cli.registerHandler(new handlers_1.UploadFileHandler());
         this.cli.registerHandler(new handlers_1.WaitForHandler());
         this.cli.registerHandler(new handlers_1.HandleDialogHandler());
-        this.cli.registerHandler(new handlers_1.RestartProxyHandler());
     }
     configureDebugMode(debug) {
         const registry = this.cli.getRegistry();
         const handlerNames = registry.getCommandNames();
         for (const handlerName of handlerNames) {
             const handler = registry.get(handlerName);
-            if (handler && typeof handler.setDebug === 'function') {
+            if (handler && typeof handler.setDebug === "function") {
                 handler.setDebug(debug);
             }
         }
@@ -56,10 +53,10 @@ class CLIApplication {
             }
             catch (parseError) {
                 if (parseError instanceof Error) {
-                    if (parseError.message === 'VERSION_COMMAND_EXECUTED') {
+                    if (parseError.message === "VERSION_COMMAND_EXECUTED") {
                         return CommandRouter_1.ExitCode.SUCCESS;
                     }
-                    if (parseError.message === 'HELP_COMMAND_EXECUTED') {
+                    if (parseError.message === "HELP_COMMAND_EXECUTED") {
                         return CommandRouter_1.ExitCode.SUCCESS;
                     }
                 }
@@ -85,49 +82,148 @@ class CLIApplication {
                 this.logger.setLevel(2);
             }
             this.configureDebugMode(command.config.debug);
-            this.logger.debug('CLIApplication.run called with argv:', argv);
-            this.logger.debug('Parsed command:', command);
-            if (command.config.verbose) {
-                this.proxyManager.setLogging(true);
-            }
-            this.logger.debug('Ensuring proxy is ready...');
-            await this.ensureProxyReady();
+            this.logger.debug("CLIApplication.run called with argv:", argv);
+            this.logger.debug("Parsed command:", command);
             if (this.needsConnection(command.name)) {
-                this.logger.debug('Command needs connection, ensuring connection...');
-                await this.ensureConnection(command);
+                this.logger.debug("Command needs connection, ensuring connection...");
+                try {
+                    await this.ensureConnection(command);
+                }
+                catch (connectionError) {
+                    const msg = connectionError instanceof Error
+                        ? connectionError.message
+                        : String(connectionError);
+                    if (msg === "Cancelled") {
+                        return CommandRouter_1.ExitCode.SUCCESS;
+                    }
+                    process.stderr.write(`\nError: ${msg}\n`);
+                    process.stderr.write("\nTip: Launch Chrome with remote debugging enabled:\n" +
+                        "  chrome --remote-debugging-port=9222 --user-data-dir=/tmp/chrome-debug\n\n" +
+                        "From Chrome 136, --user-data-dir is required. See:\n" +
+                        "  https://developer.chrome.com/blog/remote-debugging-port\n\n");
+                    return CommandRouter_1.ExitCode.CONNECTION_ERROR;
+                }
             }
-            this.logger.debug('Executing command via CLI interface...');
+            this.logger.debug("Executing command via CLI interface...");
             const result = await this.cli.execute(command);
-            this.logger.debug('Command execution result:', result);
+            this.logger.debug("Command execution result:", result);
             this.outputResult(result, command);
-            return result.exitCode || (result.success ? CommandRouter_1.ExitCode.SUCCESS : CommandRouter_1.ExitCode.GENERAL_ERROR);
+            return (result.exitCode ||
+                (result.success ? CommandRouter_1.ExitCode.SUCCESS : CommandRouter_1.ExitCode.GENERAL_ERROR));
         }
         catch (error) {
-            this.logger.debug('Error in CLIApplication.run:', error);
+            this.logger.debug("Error in CLIApplication.run:", error);
             const errorMessage = error instanceof Error ? error.message : String(error);
-            console.error(this.formatError(errorMessage, { outputFormat: 'text', verbose: false, quiet: false, debug: false, host: 'localhost', port: 9222, timeout: 30000 }));
+            console.error(this.formatError(errorMessage, {
+                outputFormat: "text",
+                verbose: false,
+                quiet: false,
+                debug: false,
+                host: "localhost",
+                port: 9222,
+                timeout: 30000,
+            }));
             return CommandRouter_1.ExitCode.GENERAL_ERROR;
         }
     }
-    async ensureProxyReady() {
-        try {
-            const isReady = await this.proxyManager.ensureProxyReady();
-            if (!isReady) {
-            }
-        }
-        catch (error) {
-        }
-    }
     needsConnection(commandName) {
         const noConnectionCommands = [
-            'help',
-            'connect',
-            'disconnect',
-            'install_cursor_command',
-            'install_claude_skill'
+            "help",
+            "connect",
+            "disconnect",
+            "install_cursor_command",
+            "install_claude_skill",
         ];
         return !noConnectionCommands.includes(commandName);
     }
+    isDevToolsWindow(target) {
+        const url = target.url.toLowerCase();
+        const title = target.title.toLowerCase();
+        return (url.startsWith("chrome-devtools://") ||
+            url.startsWith("devtools://") ||
+            title.includes("devtools") ||
+            title.includes("chrome devtools"));
+    }
+    async selectTargetInteractive(targets) {
+        if (!process.stdin.isTTY || !process.stderr.isTTY) {
+            process.stderr.write("\nAvailable Chrome pages (excluding DevTools windows):\n");
+            targets.forEach((t, i) => {
+                const url = t.url.length > 70 ? t.url.substring(0, 67) + "..." : t.url;
+                process.stderr.write(`  [${i + 1}] ${t.title || "(Untitled)"}\n      ${url}\n`);
+            });
+            process.stderr.write(`\nTip: re-run with  cdp -i <number> <command>\n\n`);
+            throw new Error(`Multiple Chrome pages found (${targets.length}). Use  -i <number>  to pick one.`);
+        }
+        return new Promise((resolve, reject) => {
+            let cursor = 0;
+            const RESET = "\x1b[0m";
+            const BOLD = "\x1b[1m";
+            const CYAN = "\x1b[36m";
+            const DIM = "\x1b[2m";
+            const CLEAR_LINE = "\x1b[2K\x1b[G";
+            const SAVE = "\x1b[s";
+            const RESTORE = "\x1b[u";
+            const truncate = (s, max) => s.length > max ? s.substring(0, max - 1) + "…" : s;
+            const render = (first) => {
+                if (first) {
+                    process.stderr.write(SAVE);
+                }
+                else {
+                    process.stderr.write(RESTORE);
+                }
+                process.stderr.write(`${CLEAR_LINE}${BOLD}Select a Chrome page${RESET}  (↑↓ navigate, Enter select, q quit)\n`);
+                process.stderr.write(`${CLEAR_LINE}${"─".repeat(54)}\n`);
+                targets.forEach((t, i) => {
+                    const num = `[${i + 1}]`;
+                    const rawTitle = t.title || "(Untitled)";
+                    const title = truncate(rawTitle, 52);
+                    const url = truncate(t.url, 60);
+                    const selected = i === cursor;
+                    if (selected) {
+                        process.stderr.write(`${CLEAR_LINE}${CYAN}${BOLD} ❯ ${num} ${title}${RESET}\n`);
+                        process.stderr.write(`${CLEAR_LINE}${CYAN}       ${url}${RESET}\n`);
+                    }
+                    else {
+                        process.stderr.write(`${CLEAR_LINE}   ${num} ${title}\n`);
+                        process.stderr.write(`${CLEAR_LINE}${DIM}       ${url}${RESET}\n`);
+                    }
+                });
+                process.stderr.write(`${CLEAR_LINE}${"─".repeat(54)}\n`);
+                process.stderr.write(`${CLEAR_LINE}${DIM}Tip: skip this prompt with  cdp -i <number> <command>${RESET}\n` +
+                    `${CLEAR_LINE}${DIM}     or close other tabs until only one remains.${RESET}\n`);
+            };
+            render(true);
+            process.stdin.setRawMode(true);
+            process.stdin.resume();
+            process.stdin.setEncoding("utf8");
+            const onKey = (key) => {
+                if (key === "\x1b[A") {
+                    cursor = (cursor - 1 + targets.length) % targets.length;
+                    render(false);
+                }
+                else if (key === "\x1b[B") {
+                    cursor = (cursor + 1) % targets.length;
+                    render(false);
+                }
+                else if (key === "\r" || key === "\n") {
+                    cleanup();
+                    process.stderr.write("\n");
+                    resolve(targets[cursor]);
+                }
+                else if (key === "q" || key === "\x03" || key === "\x1b") {
+                    cleanup();
+                    process.stderr.write("\n");
+                    reject(new Error("Cancelled"));
+                }
+            };
+            const cleanup = () => {
+                process.stdin.removeListener("data", onKey);
+                process.stdin.setRawMode(false);
+                process.stdin.pause();
+            };
+            process.stdin.on("data", onKey);
+        });
+    }
     async ensureConnection(command) {
         if (this.client) {
             return;
@@ -136,26 +232,55 @@ class CLIApplication {
             const targets = await this.connectionManager.discoverTargets(command.config.host, command.config.port);
             if (targets.length === 0) {
                 throw new Error(`No Chrome targets found at ${command.config.host}:${command.config.port}. ` +
-                    'Make sure Chrome is running with --remote-debugging-port=9222');
+                    "Make sure Chrome is running with --remote-debugging-port=9222");
+            }
+            const pageTargets = targets.filter((target) => target.type === "page");
+            const nonDevToolsTargets = pageTargets.filter((target) => !this.isDevToolsWindow(target));
+            if (nonDevToolsTargets.length === 0) {
+                throw new Error("No page targets available (excluding DevTools windows). Open a tab in Chrome.");
+            }
+            let selectedTarget;
+            if (command.config.targetIndex !== undefined) {
+                const index = command.config.targetIndex - 1;
+                if (index < 0 || index >= nonDevToolsTargets.length) {
+                    process.stderr.write("\nAvailable Chrome pages:\n");
+                    nonDevToolsTargets.forEach((t, i) => {
+                        process.stderr.write(`  [${i + 1}] ${t.title || "(Untitled)"}\n`);
+                    });
+                    throw new Error(`Invalid -i value: ${command.config.targetIndex}. ` +
+                        `Choose a number between 1 and ${nonDevToolsTargets.length}.`);
+                }
+                selectedTarget = nonDevToolsTargets[index];
+            }
+            else if (nonDevToolsTargets.length === 1) {
+                selectedTarget = nonDevToolsTargets[0];
             }
-            const pageTarget = targets.find(target => target.type === 'page');
-            if (!pageTarget) {
-                throw new Error('No page targets available. Open a tab in Chrome.');
+            else {
+                selectedTarget = await this.selectTargetInteractive(nonDevToolsTargets);
             }
-            this.client = await this.connectionManager.connectToTarget(pageTarget);
+            this.client = (await this.connectionManager.connectToTarget(selectedTarget));
             this.cli.setClient(this.client);
             if (command.config.verbose) {
-                this.logger.info(`Connected to Chrome target: ${pageTarget.title} (${pageTarget.url})`);
+                this.logger.info(`Connected to Chrome target: ${selectedTarget.title} (${selectedTarget.url})`);
             }
         }
         catch (error) {
-            throw new Error(`Failed to connect to Chrome: ${error instanceof Error ? error.message : String(error)}`);
+            if (error instanceof Error) {
+                throw error;
+            }
+            throw new Error(String(error));
         }
     }
     outputResult(result, command) {
+        if (result._rawOutput === true) {
+            return;
+        }
         if (command.config.quiet && result.success) {
             return;
         }
+        if (result.isLongRunning === true) {
+            return;
+        }
         const output = this.cli.formatOutput(result, command.config.outputFormat);
         if (result.success) {
             console.log(output);
@@ -169,45 +294,50 @@ class CLIApplication {
         const args = argv.slice(2);
         for (let i = 0; i < args.length; i++) {
             const arg = args[i];
-            if (arg === '--config' || arg === '-c') {
+            if (arg === "--config" || arg === "-c") {
                 if (i + 1 < args.length) {
                     options.configFile = args[i + 1];
                 }
             }
-            else if (arg === '--profile') {
+            else if (arg === "--profile") {
                 if (i + 1 < args.length) {
                     options.profile = args[i + 1];
                 }
             }
-            else if (arg === '--host' || arg === '-h') {
+            else if (arg === "--host" || arg === "-h") {
                 if (i + 1 < args.length) {
                     options.host = args[i + 1];
                 }
             }
-            else if (arg === '--port' || arg === '-p') {
+            else if (arg === "--port" || arg === "-p") {
                 if (i + 1 < args.length) {
                     options.port = parseInt(args[i + 1], 10);
                 }
             }
-            else if (arg === '--timeout' || arg === '-t') {
+            else if (arg === "--timeout" || arg === "-t") {
                 if (i + 1 < args.length) {
                     options.timeout = parseInt(args[i + 1], 10);
                 }
             }
-            else if (arg === '--format' || arg === '-f') {
+            else if (arg === "--format" || arg === "-f") {
                 if (i + 1 < args.length) {
                     options.outputFormat = args[i + 1];
                 }
             }
-            else if (arg === '--verbose' || arg === '-v') {
+            else if (arg === "--verbose" || arg === "-v") {
                 options.verbose = true;
             }
-            else if (arg === '--quiet' || arg === '-q') {
+            else if (arg === "--quiet" || arg === "-q") {
                 options.quiet = true;
             }
-            else if (arg === '--debug' || arg === '-d') {
+            else if (arg === "--debug" || arg === "-d") {
                 options.debug = true;
             }
+            else if (arg === "--target-index") {
+                if (i + 1 < args.length) {
+                    options.targetIndex = parseInt(args[i + 1], 10);
+                }
+            }
         }
         return options;
     }
@@ -220,15 +350,9 @@ class CLIApplication {
                 await this.client.disconnect();
             }
             catch (error) {
-                this.logger.error('Error during shutdown:', error);
+                this.logger.error("Error during shutdown:", error);
             }
         }
-        try {
-            await this.proxyManager.shutdown();
-        }
-        catch (error) {
-            this.logger.error('Error shutting down proxy manager:', error);
-        }
     }
     getCLI() {
         return this.cli;