@apmantza/greedysearch-pi 1.0.14 → 1.0.15

package/cdp.mjs

@@ -38,6 +38,16 @@ function getDevToolsActivePortPath() {
 }
 
 function getWsUrl() {
+  // If CDP_PROFILE_DIR is set (by search.mjs), prefer that profile's port file
+  // so GreedySearch targets its own Chrome, not the user's main session.
+  const profileDir = process.env.CDP_PROFILE_DIR;
+  if (profileDir) {
+    const p = profileDir.replace(/\\/g, '/') + '/DevToolsActivePort';
+    if (existsSync(p)) {
+      const lines = readFileSync(p, 'utf8').trim().split('\n');
+      return `ws://127.0.0.1:${lines[0]}${lines[1]}`;
+    }
+  }
   const portFile = getDevToolsActivePortPath();
   const lines = readFileSync(portFile, 'utf8').trim().split('\n');
   return `ws://127.0.0.1:${lines[0]}${lines[1]}`;

package/launch.mjs

@@ -1,199 +1,199 @@
-#!/usr/bin/env node
-// launch.mjs — start a dedicated Chrome instance for GreedySearch
-//
-// This Chrome instance uses --disable-features=DevToolsPrivacyUI which suppresses
-// the "Allow remote debugging?" dialog entirely. It runs on port 9223 so it doesn't
-// conflict with your main Chrome session.
-//
-// On launch, it overwrites the DevToolsActivePort file that cdp.mjs reads so all
-// extractors automatically target the GreedySearch Chrome, with no code changes.
-// The original file is restored on --kill.
-//
-// Usage:
-//   node launch.mjs          — launch (or report if already running)
-//   node launch.mjs --kill   — stop and restore original DevToolsActivePort
-//   node launch.mjs --status — check if running
-
-import { spawn } from 'child_process';
-import { existsSync, writeFileSync, readFileSync, copyFileSync, mkdirSync, unlinkSync } from 'fs';
-import { tmpdir, homedir, platform } from 'os';
-import { join } from 'path';
-import http from 'http';
-
-const PORT        = 9223;
-const PROFILE_DIR = join(tmpdir(), 'greedysearch-chrome-profile');
-const ACTIVE_PORT = join(PROFILE_DIR, 'DevToolsActivePort');
-const PID_FILE    = join(tmpdir(), 'greedysearch-chrome.pid');
-
-function findChrome() {
-  const os = platform();
-  const candidates = os === 'win32' ? [
-    'C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe',
-    'C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe',
-  ] : os === 'darwin' ? [
-    '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
-    '/Applications/Chromium.app/Contents/MacOS/Chromium',
-  ] : [
-    '/usr/bin/google-chrome',
-    '/usr/bin/google-chrome-stable',
-    '/usr/bin/chromium-browser',
-    '/usr/bin/chromium',
-    '/snap/bin/chromium',
-  ];
-  return candidates.find(existsSync) || null;
-}
-
-function systemPortPath() {
-  const os = platform();
-  if (os === 'win32') return join(homedir(), 'AppData', 'Local', 'Google', 'Chrome', 'User Data', 'DevToolsActivePort');
-  if (os === 'darwin') return join(homedir(), 'Library', 'Application Support', 'Google', 'Chrome', 'DevToolsActivePort');
-  return join(homedir(), '.config', 'google-chrome', 'DevToolsActivePort');
-}
-
-const SYSTEM_PORT   = systemPortPath();
-const SYSTEM_BACKUP = SYSTEM_PORT + '.bak';
-
-const CHROME_FLAGS = [
-  `--remote-debugging-port=${PORT}`,
-  '--disable-features=DevToolsPrivacyUI',      // suppresses "Allow remote debugging?" dialog
-  '--no-first-run',
-  '--no-default-browser-check',
-  '--disable-default-apps',
-  `--user-data-dir=${PROFILE_DIR}`,
-  '--profile-directory=Default',
-  'about:blank',
-];
-
-// ---------------------------------------------------------------------------
-
-
-function isRunning() {
-  if (!existsSync(PID_FILE)) return false;
-  const pid = parseInt(readFileSync(PID_FILE, 'utf8').trim());
-  if (!pid) return false;
-  try { process.kill(pid, 0); return pid; } catch { return false; }
-}
-
-function httpGet(url, timeoutMs = 1000) {
-  return new Promise(resolve => {
-    const req = http.get(url, res => {
-      let body = '';
-      res.on('data', d => body += d);
-      res.on('end', () => resolve({ ok: res.statusCode === 200, body }));
-    });
-    req.on('error', () => resolve({ ok: false }));
-    req.setTimeout(timeoutMs, () => { req.destroy(); resolve({ ok: false }); });
-  });
-}
-
-
-async function writePortFile(timeoutMs = 15000) {
-  // Chrome on Windows doesn't write DevToolsActivePort — we build it from the HTTP API.
-  const deadline = Date.now() + timeoutMs;
-  while (Date.now() < deadline) {
-    const { ok, body } = await httpGet(`http://localhost:${PORT}/json/version`, 1500);
-    if (ok) {
-      try {
-        const { webSocketDebuggerUrl } = JSON.parse(body);
-        // webSocketDebuggerUrl = "ws://localhost:9223/devtools/browser/..."
-        const wsPath = new URL(webSocketDebuggerUrl).pathname;
-        // Write in DevToolsActivePort format: port on line 1, path on line 2
-        const content = `${PORT}\n${wsPath}`;
-        writeFileSync(ACTIVE_PORT, content, 'utf8');
-        return true;
-      } catch { /* malformed response, retry */ }
-    }
-    await new Promise(r => setTimeout(r, 400));
-  }
-  return false;
-}
-
-function redirectCdpToGreedySearch() {
-  // Back up system DevToolsActivePort (user's main Chrome)
-  if (existsSync(SYSTEM_PORT) && !existsSync(SYSTEM_BACKUP)) {
-    copyFileSync(SYSTEM_PORT, SYSTEM_BACKUP);
-  }
-  // Point cdp.mjs to our dedicated Chrome's port
-  copyFileSync(ACTIVE_PORT, SYSTEM_PORT);
-}
-
-function restoreCdpToMainChrome() {
-  if (existsSync(SYSTEM_BACKUP)) {
-    copyFileSync(SYSTEM_BACKUP, SYSTEM_PORT);
-    console.log('Restored DevToolsActivePort to main Chrome.');
-  } else if (existsSync(SYSTEM_PORT)) {
-    // No backup means main Chrome wasn't using CDP — remove our file
-    try { unlinkSync(SYSTEM_PORT); } catch {}
-  }
-}
-
-// ---------------------------------------------------------------------------
-
-async function main() {
-  const arg = process.argv[2];
-
-  if (arg === '--kill') {
-    const pid = isRunning();
-    if (pid) {
-      try { process.kill(pid, 'SIGTERM'); console.log(`Stopped Chrome (pid ${pid}).`); }
-      catch (e) { console.error(`Failed: ${e.message}`); }
-    } else {
-      console.log('GreedySearch Chrome is not running.');
-    }
-    restoreCdpToMainChrome();
-    return;
-  }
-
-  if (arg === '--status') {
-    const pid = isRunning();
-    if (pid) console.log(`Running — pid ${pid}, port ${PORT}, DevToolsActivePort redirected.`);
-    else      console.log('Not running.');
-    return;
-  }
-
-  // Already running?
-  const existing = isRunning();
-  if (existing) {
-    const ready = await writePortFile(5000);
-    if (ready) {
-      console.log(`GreedySearch Chrome already running (pid ${existing}, port ${PORT}).`);
-      redirectCdpToGreedySearch();
-      console.log('DevToolsActivePort redirected.');
-      return;
-    }
-    // Stale PID — process alive but not Chrome on port 9223. Fall through to fresh launch.
-    console.log(`Stale PID ${existing} detected (not Chrome on port ${PORT}) — launching fresh.`);
-    try { unlinkSync(PID_FILE); } catch {}
-  }
-
-  const CHROME_EXE = process.env.CHROME_PATH || findChrome();
-  if (!CHROME_EXE) {
-    console.error('Chrome not found. Tried standard paths for your OS.');
-    console.error('Set the CHROME_PATH environment variable to point to your Chrome binary.');
-    process.exit(1);
-  }
-
-  mkdirSync(PROFILE_DIR, { recursive: true });
-
-  console.log(`Launching GreedySearch Chrome on port ${PORT}...`);
-  const proc = spawn(CHROME_EXE, CHROME_FLAGS, {
-    detached: true,
-    stdio: 'ignore',
-    windowsHide: false,
-  });
-  proc.unref();
-  writeFileSync(PID_FILE, String(proc.pid));
-
-  // Wait for Chrome HTTP endpoint, build DevToolsActivePort file, redirect cdp.mjs
-  const portFileReady = await writePortFile();
-  if (!portFileReady) {
-    console.error('Chrome did not become ready within 15s.');
-    process.exit(1);
-  }
-  redirectCdpToGreedySearch();
-
-  console.log(`Ready. No more "Allow remote debugging?" dialogs.`);
-  console.log(`Run "node launch.mjs --kill" when done to restore your main Chrome's CDP.`);
-}
-
-main();
+#!/usr/bin/env node
+// launch.mjs — start a dedicated Chrome instance for GreedySearch
+//
+// This Chrome instance uses --disable-features=DevToolsPrivacyUI which suppresses
+// the "Allow remote debugging?" dialog entirely. It runs on port 9222 so it doesn't
+// conflict with your main Chrome session (which may use port 9223).
+//
+// On launch, it overwrites the DevToolsActivePort file that cdp.mjs reads so all
+// extractors automatically target the GreedySearch Chrome, with no code changes.
+// The original file is restored on --kill.
+//
+// Usage:
+//   node launch.mjs          — launch (or report if already running)
+//   node launch.mjs --kill   — stop and restore original DevToolsActivePort
+//   node launch.mjs --status — check if running
+
+import { spawn } from 'child_process';
+import { existsSync, writeFileSync, readFileSync, copyFileSync, mkdirSync, unlinkSync } from 'fs';
+import { tmpdir, homedir, platform } from 'os';
+import { join } from 'path';
+import http from 'http';
+
+const PORT        = 9222;
+const PROFILE_DIR = join(tmpdir(), 'greedysearch-chrome-profile');
+const ACTIVE_PORT = join(PROFILE_DIR, 'DevToolsActivePort');
+const PID_FILE    = join(tmpdir(), 'greedysearch-chrome.pid');
+
+function findChrome() {
+  const os = platform();
+  const candidates = os === 'win32' ? [
+    'C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe',
+    'C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe',
+  ] : os === 'darwin' ? [
+    '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
+    '/Applications/Chromium.app/Contents/MacOS/Chromium',
+  ] : [
+    '/usr/bin/google-chrome',
+    '/usr/bin/google-chrome-stable',
+    '/usr/bin/chromium-browser',
+    '/usr/bin/chromium',
+    '/snap/bin/chromium',
+  ];
+  return candidates.find(existsSync) || null;
+}
+
+function systemPortPath() {
+  const os = platform();
+  if (os === 'win32') return join(homedir(), 'AppData', 'Local', 'Google', 'Chrome', 'User Data', 'DevToolsActivePort');
+  if (os === 'darwin') return join(homedir(), 'Library', 'Application Support', 'Google', 'Chrome', 'DevToolsActivePort');
+  return join(homedir(), '.config', 'google-chrome', 'DevToolsActivePort');
+}
+
+const SYSTEM_PORT   = systemPortPath();
+const SYSTEM_BACKUP = SYSTEM_PORT + '.bak';
+
+const CHROME_FLAGS = [
+  `--remote-debugging-port=${PORT}`,
+  '--disable-features=DevToolsPrivacyUI',      // suppresses "Allow remote debugging?" dialog
+  '--no-first-run',
+  '--no-default-browser-check',
+  '--disable-default-apps',
+  `--user-data-dir=${PROFILE_DIR}`,
+  '--profile-directory=Default',
+  'about:blank',
+];
+
+// ---------------------------------------------------------------------------
+
+
+function isRunning() {
+  if (!existsSync(PID_FILE)) return false;
+  const pid = parseInt(readFileSync(PID_FILE, 'utf8').trim());
+  if (!pid) return false;
+  try { process.kill(pid, 0); return pid; } catch { return false; }
+}
+
+function httpGet(url, timeoutMs = 1000) {
+  return new Promise(resolve => {
+    const req = http.get(url, res => {
+      let body = '';
+      res.on('data', d => body += d);
+      res.on('end', () => resolve({ ok: res.statusCode === 200, body }));
+    });
+    req.on('error', () => resolve({ ok: false }));
+    req.setTimeout(timeoutMs, () => { req.destroy(); resolve({ ok: false }); });
+  });
+}
+
+
+async function writePortFile(timeoutMs = 15000) {
+  // Chrome on Windows doesn't write DevToolsActivePort — we build it from the HTTP API.
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    const { ok, body } = await httpGet(`http://localhost:${PORT}/json/version`, 1500);
+    if (ok) {
+      try {
+        const { webSocketDebuggerUrl } = JSON.parse(body);
+        // webSocketDebuggerUrl = "ws://localhost:9223/devtools/browser/..."
+        const wsPath = new URL(webSocketDebuggerUrl).pathname;
+        // Write in DevToolsActivePort format: port on line 1, path on line 2
+        const content = `${PORT}\n${wsPath}`;
+        writeFileSync(ACTIVE_PORT, content, 'utf8');
+        return true;
+      } catch { /* malformed response, retry */ }
+    }
+    await new Promise(r => setTimeout(r, 400));
+  }
+  return false;
+}
+
+function redirectCdpToGreedySearch() {
+  // Back up system DevToolsActivePort (user's main Chrome)
+  if (existsSync(SYSTEM_PORT) && !existsSync(SYSTEM_BACKUP)) {
+    copyFileSync(SYSTEM_PORT, SYSTEM_BACKUP);
+  }
+  // Point cdp.mjs to our dedicated Chrome's port
+  copyFileSync(ACTIVE_PORT, SYSTEM_PORT);
+}
+
+function restoreCdpToMainChrome() {
+  if (existsSync(SYSTEM_BACKUP)) {
+    copyFileSync(SYSTEM_BACKUP, SYSTEM_PORT);
+    console.log('Restored DevToolsActivePort to main Chrome.');
+  } else if (existsSync(SYSTEM_PORT)) {
+    // No backup means main Chrome wasn't using CDP — remove our file
+    try { unlinkSync(SYSTEM_PORT); } catch {}
+  }
+}
+
+// ---------------------------------------------------------------------------
+
+async function main() {
+  const arg = process.argv[2];
+
+  if (arg === '--kill') {
+    const pid = isRunning();
+    if (pid) {
+      try { process.kill(pid, 'SIGTERM'); console.log(`Stopped Chrome (pid ${pid}).`); }
+      catch (e) { console.error(`Failed: ${e.message}`); }
+    } else {
+      console.log('GreedySearch Chrome is not running.');
+    }
+    restoreCdpToMainChrome();
+    return;
+  }
+
+  if (arg === '--status') {
+    const pid = isRunning();
+    if (pid) console.log(`Running — pid ${pid}, port ${PORT}, DevToolsActivePort redirected.`);
+    else      console.log('Not running.');
+    return;
+  }
+
+  // Already running?
+  const existing = isRunning();
+  if (existing) {
+    const ready = await writePortFile(5000);
+    if (ready) {
+      console.log(`GreedySearch Chrome already running (pid ${existing}, port ${PORT}).`);
+      redirectCdpToGreedySearch();
+      console.log('DevToolsActivePort redirected.');
+      return;
+    }
+    // Stale PID — process alive but not Chrome on port 9223. Fall through to fresh launch.
+    console.log(`Stale PID ${existing} detected (not Chrome on port ${PORT}) — launching fresh.`);
+    try { unlinkSync(PID_FILE); } catch {}
+  }
+
+  const CHROME_EXE = process.env.CHROME_PATH || findChrome();
+  if (!CHROME_EXE) {
+    console.error('Chrome not found. Tried standard paths for your OS.');
+    console.error('Set the CHROME_PATH environment variable to point to your Chrome binary.');
+    process.exit(1);
+  }
+
+  mkdirSync(PROFILE_DIR, { recursive: true });
+
+  console.log(`Launching GreedySearch Chrome on port ${PORT}...`);
+  const proc = spawn(CHROME_EXE, CHROME_FLAGS, {
+    detached: true,
+    stdio: 'ignore',
+    windowsHide: false,
+  });
+  proc.unref();
+  writeFileSync(PID_FILE, String(proc.pid));
+
+  // Wait for Chrome HTTP endpoint, build DevToolsActivePort file, redirect cdp.mjs
+  const portFileReady = await writePortFile();
+  if (!portFileReady) {
+    console.error('Chrome did not become ready within 15s.');
+    process.exit(1);
+  }
+  redirectCdpToGreedySearch();
+
+  console.log(`Ready. No more "Allow remote debugging?" dialogs.`);
+  console.log(`Run "node launch.mjs --kill" when done to restore your main Chrome's CDP.`);
+}
+
+main();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apmantza/greedysearch-pi",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "description": "Pi extension: search Perplexity, Bing Copilot, and Google AI simultaneously — synthesized AI answers, not just links",
   "type": "module",
   "keywords": [

package/search.mjs

@@ -23,13 +23,15 @@ import { spawn } from 'child_process';
 import { fileURLToPath } from 'url';
 import { join, dirname } from 'path';
 import { readFileSync, existsSync, writeFileSync } from 'fs';
-import { tmpdir } from 'os';
+import { tmpdir, homedir } from 'os';
 import http from 'http';
 
 const __dir = dirname(fileURLToPath(import.meta.url));
-const CDP = join(__dir, 'cdp.mjs');
+const CDP = join(homedir(), '.claude', 'skills', 'chrome-cdp', 'scripts', 'cdp.mjs');
 const PAGES_CACHE = `${tmpdir().replace(/\\/g, '/')}/cdp-pages.json`;
 
+const GREEDY_PORT = 9222;
+
 const ENGINES = {
   perplexity: 'perplexity.mjs',
   pplx:       'perplexity.mjs',
@@ -182,9 +184,16 @@ function writeOutput(data, outFile) {
   }
 }
 
-function probePort9223(timeoutMs = 3000) {
+const GREEDY_PROFILE_DIR = `${tmpdir().replace(/\\/g, '/')}/greedysearch-chrome-profile`;
+const ACTIVE_PORT_FILE   = `${GREEDY_PROFILE_DIR}/DevToolsActivePort`;
+
+// Tell cdp.mjs to prefer the GreedySearch Chrome profile's DevToolsActivePort,
+// so searches never accidentally attach to the user's main Chrome session.
+process.env.CDP_PROFILE_DIR = GREEDY_PROFILE_DIR;
+
+function probeGreedyChrome(timeoutMs = 3000) {
   return new Promise(resolve => {
-    const req = http.get('http://localhost:9223/json/version', res => {
+    const req = http.get(`http://localhost:${GREEDY_PORT}/json/version`, res => {
       res.resume();
       resolve(res.statusCode === 200);
     });
@@ -193,14 +202,37 @@ function probePort9223(timeoutMs = 3000) {
   });
 }
 
+// Write (or refresh) the DevToolsActivePort file for the GreedySearch Chrome so
+// cdp.mjs always connects to the right port rather than the user's main Chrome.
+async function refreshPortFile() {
+  try {
+    const body = await new Promise((res, rej) => {
+      const req = http.get(`http://localhost:${GREEDY_PORT}/json/version`, r => {
+        let b = '';
+        r.on('data', d => b += d);
+        r.on('end', () => res(b));
+      });
+      req.on('error', rej);
+      req.setTimeout(3000, () => { req.destroy(); rej(new Error('timeout')); });
+    });
+    const { webSocketDebuggerUrl } = JSON.parse(body);
+    const wsPath = new URL(webSocketDebuggerUrl).pathname;
+    writeFileSync(ACTIVE_PORT_FILE, `${GREEDY_PORT}\n${wsPath}`, 'utf8');
+  } catch { /* best-effort — launch.mjs already wrote the file on first start */ }
+}
+
 async function ensureChrome() {
-  const ready = await probePort9223();
+  const ready = await probeGreedyChrome();
   if (!ready) {
-    process.stderr.write('GreedySearch Chrome not running on port 9223 — auto-launching...\n');
+    process.stderr.write(`GreedySearch Chrome not running on port ${GREEDY_PORT} — auto-launching...\n`);
     await new Promise((resolve, reject) => {
       const proc = spawn('node', [join(__dir, 'launch.mjs')], { stdio: ['ignore', process.stderr, process.stderr] });
       proc.on('close', code => code === 0 ? resolve() : reject(new Error('launch.mjs failed')));
     });
+  } else {
+    // Chrome already running — refresh the port file so cdp.mjs always picks
+    // up the right port, even if the file was stale from a previous session.
+    await refreshPortFile();
   }
 }