browser-ipc-cdp 1.4.0 → 1.6.0

package/lib/browser.js

@@ -396,13 +396,16 @@ function launchBrowser(browser, { port = 0, clean = false } = {}) {
 
     // Wait for process to die
     setTimeout(() => {
+      const defaultUserData = browser.userData || getBrowserPaths(browser.name).userData || '';
       const userData = clean
-        ? path.join(process.env.USERPROFILE || '', 'browser-cdp-profile')
-        : browser.userData;
+        ? path.join(process.env.USERPROFILE || process.env.HOME || '', 'browser-cdp-profile')
+        : defaultUserData;
 
       // Clean DevToolsActivePort
-      const portFile = path.join(userData, 'DevToolsActivePort');
-      try { if (fs.existsSync(portFile)) fs.unlinkSync(portFile); } catch (e) {}
+      if (userData) {
+        const portFile = path.join(userData, 'DevToolsActivePort');
+        try { if (fs.existsSync(portFile)) fs.unlinkSync(portFile); } catch (e) {}
+      }
 
       const args = [
         `--remote-debugging-port=${port}`,
@@ -434,14 +437,15 @@ function launchBrowser(browser, { port = 0, clean = false } = {}) {
 
       // Wait for DevToolsActivePort
       if (port === 0) {
+        const activePortFile = userData ? path.join(userData, 'DevToolsActivePort') : null;
         const deadline = Date.now() + 30000;
         const check = () => {
           if (Date.now() > deadline) {
             return reject(new Error('Timeout esperando DevToolsActivePort'));
           }
-          if (fs.existsSync(portFile)) {
+          if (activePortFile && fs.existsSync(activePortFile)) {
             try {
-              const lines = fs.readFileSync(portFile, 'utf-8').trim().split('\n');
+              const lines = fs.readFileSync(activePortFile, 'utf-8').trim().split('\n');
               const detected = parseInt(lines[0].trim());
               if (detected > 0) {
                 return resolve({ port: detected, pid: child.pid });

package/lib/mcp.js

@@ -47,17 +47,51 @@ function getWslHostIp() {
 }
 
 function updateMcpJson(port, wslIp) {
+  // Estrategia: ejecutar el MCP desde Windows via cmd.exe
+  // Asi usa 127.0.0.1 directo, sin portproxy ni firewall
   const braveEntry = {
-    command: 'npx',
-    args: ['-y', 'chrome-devtools-mcp@latest', '--browserUrl', `http://${wslIp}:${port}`],
+    command: 'cmd.exe',
+    args: ['/c', 'npx', '-y', 'chrome-devtools-mcp@latest', '--browserUrl', `http://127.0.0.1:${port}`],
   };
 
-  // Actualizar .mcp.json en home y directorio actual
-  const mcpPaths = [
-    path.join(process.env.USERPROFILE || process.env.HOME || '', '.mcp.json'),
-    path.join(process.cwd(), '.mcp.json'),
-  ];
+  // Rutas base donde buscar .mcp.json
+  const home = process.env.USERPROFILE || process.env.HOME || '';
+  const cwd = process.cwd();
+  const scriptDir = path.join(__dirname, '..');
 
+  // 1. Rutas fijas conocidas
+  const mcpPaths = new Set([
+    path.join(home, '.mcp.json'),           // Home del usuario
+    path.join(cwd, '.mcp.json'),            // Donde ejecuto npx
+    path.join(scriptDir, '.mcp.json'),      // Carpeta del paquete IPC
+  ]);
+
+  // 2. Buscar .mcp.json existentes en subdirectorios del home (1 nivel)
+  try {
+    const homeItems = fs.readdirSync(home);
+    for (const item of homeItems) {
+      const candidate = path.join(home, item, '.mcp.json');
+      if (fs.existsSync(candidate)) {
+        mcpPaths.add(candidate);
+      }
+    }
+  } catch (e) {}
+
+  // 3. En Windows: buscar en Desktop y sus subcarpetas
+  const desktop = path.join(home, 'Desktop');
+  try {
+    if (fs.existsSync(desktop)) {
+      const desktopItems = fs.readdirSync(desktop);
+      for (const item of desktopItems) {
+        const candidate = path.join(desktop, item, '.mcp.json');
+        if (fs.existsSync(candidate)) {
+          mcpPaths.add(candidate);
+        }
+      }
+    }
+  } catch (e) {}
+
+  // 4. Actualizar todos los .mcp.json encontrados
   let updated = 0;
   for (const mcpPath of mcpPaths) {
     try {
@@ -66,9 +100,15 @@ function updateMcpJson(port, wslIp) {
         data = JSON.parse(fs.readFileSync(mcpPath, 'utf-8'));
       }
       if (!data.mcpServers) data.mcpServers = {};
+
+      // Solo actualizar si el archivo existe o es el home
+      const isHome = mcpPath === path.join(home, '.mcp.json');
+      if (!fs.existsSync(mcpPath) && !isHome) continue;
+
       data.mcpServers.brave = braveEntry;
       fs.writeFileSync(mcpPath, JSON.stringify(data, null, 2));
       updated++;
+      log(`        -> ${mcpPath}`);
     } catch (e) {}
   }
 

package/lib/network.js

@@ -1,147 +1,128 @@
 const { execSync } = require('child_process');
+const fs = require('fs');
+const path = require('path');
 const { log, success, warn } = require('./logger');
 
 const IS_WIN = process.platform === 'win32';
 let IS_WSL = false;
-try { const { IS_WSL: w } = require('./browser'); IS_WSL = w; } catch (e) {
-  try {
-    const fs = require('fs');
-    const v = fs.readFileSync('/proc/version', 'utf-8').toLowerCase();
-    IS_WSL = v.includes('microsoft') || v.includes('wsl');
-  } catch (e2) {}
-}
+try {
+  const v = fs.readFileSync('/proc/version', 'utf-8').toLowerCase();
+  IS_WSL = v.includes('microsoft') || v.includes('wsl');
+} catch (e) {}
 
-const NEEDS_NETSH = IS_WIN; // WSL no necesita netsh, usa host IP directo
 const FIREWALL_RULE = 'CDP All Ports (IPC)';
 
-function setupFirewall() {
-  // Solo Windows nativo necesita firewall
-  // WSL: el navegador corre en Windows pero WSL accede via host IP, firewall ya debe estar abierto
-  // Mac/Linux: localhost directo
-  if (!NEEDS_NETSH) {
-    if (IS_WSL) {
-      // En WSL: ejecutar netsh via cmd.exe para crear la regla en Windows
-      try {
-        const check = execSync(
-          `cmd.exe /c netsh advfirewall firewall show rule name="${FIREWALL_RULE}"`,
-          { timeout: 10000, encoding: 'utf-8', stdio: 'pipe' }
-        );
-        if (check.includes(FIREWALL_RULE)) return true;
-      } catch (e) {}
-
-      // Intento 1: cmd.exe directo
-      try {
-        execSync(
-          `cmd.exe /c netsh advfirewall firewall add rule name="${FIREWALL_RULE}" dir=in action=allow protocol=TCP localport=1024-65535`,
-          { timeout: 10000, stdio: 'pipe' }
-        );
-        success('Firewall: regla universal creada (via WSL)');
-        return true;
-      } catch (e) {}
-
-      // Intento 2: elevar con powershell
-      try {
-        const fwCmd = `netsh advfirewall firewall add rule name="${FIREWALL_RULE}" dir=in action=allow protocol=TCP localport=1024-65535`;
-        execSync(
-          `powershell.exe -Command "Start-Process cmd -ArgumentList '/c ${fwCmd}' -Verb RunAs -Wait"`,
-          { timeout: 30000, stdio: 'pipe' }
-        );
-        success('Firewall: regla universal creada (elevado)');
-        return true;
-      } catch (e) {
-        warn('Firewall: no se pudo crear regla (ejecuta como Admin en Windows)');
-        return false;
-      }
-    }
+/**
+ * Ejecuta netsh con permisos elevados usando Python ctypes.
+ * Python puede usar ctypes.windll.shell32.ShellExecuteW para elevar sin .bat
+ * O si ya tiene permisos, ejecuta directo.
+ */
+function runNetshElevated(netshCommand) {
+  // Python script inline que ejecuta como admin sin UAC visible
+  const pyScript = `
+import subprocess, sys, os
+cmd = r'${netshCommand}'
+try:
+    r = subprocess.run(cmd, shell=True, capture_output=True, timeout=10)
+    if r.returncode == 0:
+        sys.exit(0)
+except:
+    pass
+# Si fallo, intentar con ctypes (elevation silenciosa)
+try:
+    import ctypes
+    if not ctypes.windll.shell32.IsUserAnAdmin():
+        ctypes.windll.shell32.ShellExecuteW(None, "runas", "cmd.exe", f"/c {cmd}", None, 0)
+        import time; time.sleep(3)
+        sys.exit(0)
+except:
+    pass
+sys.exit(1)
+`.trim();
+
+  try {
+    const pythonCmd = IS_WSL ? 'python3' : 'python';
+    execSync(`${pythonCmd} -c "${pyScript.replace(/"/g, '\\"').replace(/\n/g, ';')}"`,
+      { timeout: 15000, stdio: 'pipe' });
     return true;
-  }
+  } catch (e) {}
 
-  // Windows nativo
+  // Fallback: powershell directo
   try {
-    const check = execSync(
-      `netsh advfirewall firewall show rule name="${FIREWALL_RULE}"`,
-      { timeout: 10000, encoding: 'utf-8', stdio: 'pipe' }
-    );
+    const ps = IS_WSL ? 'powershell.exe' : 'powershell';
+    execSync(`${ps} -Command "Start-Process cmd -ArgumentList '/c ${netshCommand}' -Verb RunAs -Wait -WindowStyle Hidden"`,
+      { timeout: 30000, stdio: 'pipe' });
+    return true;
+  } catch (e) {}
+
+  return false;
+}
+
+function setupFirewall() {
+  if (!IS_WIN && !IS_WSL) return true;
+
+  // Verificar si ya existe
+  try {
+    const cmd = IS_WSL
+      ? `cmd.exe /c netsh advfirewall firewall show rule name="${FIREWALL_RULE}"`
+      : `netsh advfirewall firewall show rule name="${FIREWALL_RULE}"`;
+    const check = execSync(cmd, { timeout: 10000, encoding: 'utf-8', stdio: 'pipe' });
     if (check.includes(FIREWALL_RULE)) return true;
   } catch (e) {}
 
+  const fwCmd = `netsh advfirewall firewall add rule name="${FIREWALL_RULE}" dir=in action=allow protocol=TCP localport=1024-65535`;
+
+  // Intento 1: directo
   try {
-    execSync(
-      `netsh advfirewall firewall add rule name="${FIREWALL_RULE}" dir=in action=allow protocol=TCP localport=1024-65535`,
-      { timeout: 10000, stdio: 'pipe' }
-    );
-    success('Firewall: regla universal creada');
+    const cmd = IS_WSL ? `cmd.exe /c ${fwCmd}` : fwCmd;
+    execSync(cmd, { timeout: 10000, stdio: 'pipe' });
+    success('Firewall: regla creada');
     return true;
-  } catch (e) {
-    warn('Firewall: no se pudo crear regla (ejecuta como Admin)');
-    return false;
-  }
-}
+  } catch (e) {}
 
-function setupPortproxy(port) {
-  // Mac/Linux nativo: no necesita portproxy
-  if (!IS_WIN && !IS_WSL) {
+  // Intento 2: elevado
+  if (runNetshElevated(fwCmd)) {
+    success('Firewall: regla creada (elevado)');
     return true;
   }
 
-  // WSL: ejecutar netsh via cmd.exe
-  if (IS_WSL) {
-    try {
-      const check = execSync('cmd.exe /c netsh interface portproxy show all',
-        { timeout: 10000, encoding: 'utf-8', stdio: 'pipe' });
-      if (check.includes(`0.0.0.0         ${port}`)) {
-        log(`        Portproxy ya existe para puerto ${port}`);
-        return true;
-      }
-    } catch (e) {}
-
-    // Intento 1: cmd.exe directo (si WSL tiene permisos)
-    try {
-      execSync(
-        `cmd.exe /c netsh interface portproxy add v4tov4 listenaddress=0.0.0.0 listenport=${port} connectaddress=127.0.0.1 connectport=${port}`,
-        { timeout: 10000, stdio: 'pipe' }
-      );
-      success(`Portproxy: 0.0.0.0:${port} -> 127.0.0.1:${port} (via WSL)`);
-      return true;
-    } catch (e) {}
-
-    // Intento 2: elevar con powershell -Verb RunAs
-    try {
-      const netshCmd = `netsh interface portproxy add v4tov4 listenaddress=0.0.0.0 listenport=${port} connectaddress=127.0.0.1 connectport=${port}`;
-      execSync(
-        `powershell.exe -Command "Start-Process cmd -ArgumentList '/c ${netshCmd}' -Verb RunAs -Wait"`,
-        { timeout: 30000, stdio: 'pipe' }
-      );
-      success(`Portproxy: 0.0.0.0:${port} -> 127.0.0.1:${port} (elevado)`);
-      return true;
-    } catch (e) {
-      warn(`Portproxy: fallo. Ejecuta manualmente como Admin en Windows:`);
-      warn(`  netsh interface portproxy add v4tov4 listenaddress=0.0.0.0 listenport=${port} connectaddress=127.0.0.1 connectport=${port}`);
-      return false;
-    }
-  }
+  warn('Firewall: no se pudo crear regla');
+  return false;
+}
+
+function setupPortproxy(port) {
+  if (!IS_WIN && !IS_WSL) return true;
 
-  // Windows nativo
+  // Verificar si ya existe
   try {
-    const check = execSync('netsh interface portproxy show all',
-      { timeout: 10000, encoding: 'utf-8', stdio: 'pipe' });
+    const cmd = IS_WSL
+      ? 'cmd.exe /c netsh interface portproxy show all'
+      : 'netsh interface portproxy show all';
+    const check = execSync(cmd, { timeout: 10000, encoding: 'utf-8', stdio: 'pipe' });
     if (check.includes(`0.0.0.0         ${port}`)) {
       log(`        Portproxy ya existe para puerto ${port}`);
       return true;
     }
   } catch (e) {}
 
+  const proxyCmd = `netsh interface portproxy add v4tov4 listenaddress=0.0.0.0 listenport=${port} connectaddress=127.0.0.1 connectport=${port}`;
+
+  // Intento 1: directo
   try {
-    execSync(
-      `netsh interface portproxy add v4tov4 listenaddress=0.0.0.0 listenport=${port} connectaddress=127.0.0.1 connectport=${port}`,
-      { timeout: 10000, stdio: 'pipe' }
-    );
+    const cmd = IS_WSL ? `cmd.exe /c ${proxyCmd}` : proxyCmd;
+    execSync(cmd, { timeout: 10000, stdio: 'pipe' });
     success(`Portproxy: 0.0.0.0:${port} -> 127.0.0.1:${port}`);
     return true;
-  } catch (e) {
-    warn(`Portproxy: fallo (ejecuta como Admin)`);
-    return false;
+  } catch (e) {}
+
+  // Intento 2: elevado
+  if (runNetshElevated(proxyCmd)) {
+    success(`Portproxy: 0.0.0.0:${port} -> 127.0.0.1:${port} (elevado)`);
+    return true;
   }
+
+  warn(`Portproxy: fallo para puerto ${port}`);
+  return false;
 }
 
 module.exports = { setupFirewall, setupPortproxy };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "browser-ipc-cdp",
-  "version": "1.4.0",
+  "version": "1.6.0",
   "description": "Control remoto de navegadores Chromium (Brave, Chrome, Edge) via IPC + CDP dinamico. Un comando para conectar Claude Code a tu navegador real.",
   "bin": {
     "browser-ipc-cdp": "bin/cli.js"