dsclaw 0.1.6 → 0.1.7

package/dist/index.js

@@ -29,14 +29,15 @@ import pino from "pino";
 function createLogger(module) {
   return rootLogger.child({ module });
 }
-var rootLogger;
+var isPkg, rootLogger;
 var init_logger = __esm({
   "src/shared/logger.ts"() {
     "use strict";
     init_tracer();
+    isPkg = typeof process.pkg !== "undefined";
     rootLogger = pino({
       level: process.env["LOG_LEVEL"] ?? "info",
-      transport: process.env["NODE_ENV"] !== "production" ? { target: "pino-pretty", options: { colorize: true } } : void 0,
+      transport: !isPkg && process.env["NODE_ENV"] !== "production" ? { target: "pino-pretty", options: { colorize: true } } : void 0,
       mixin() {
         const ctx = getTraceContext();
         return {
@@ -763,18 +764,20 @@ var CANDIDATES = [
     }
   }
 ];
-function findChromium() {
+function findAllChromium() {
   const platform = process.platform;
+  const found = [];
   for (const candidate of CANDIDATES) {
     const platformPaths = candidate.paths[platform];
     if (!platformPaths) continue;
     for (const p of platformPaths) {
       if (existsSync5(p)) {
-        return { name: candidate.name, executablePath: p };
+        found.push({ name: candidate.name, executablePath: p });
+        break;
       }
     }
   }
-  return null;
+  return found;
 }
 
 // src/dsers/browser-auth.ts
@@ -811,15 +814,11 @@ function parseWsUrl(stderrChunk) {
   const match = stderrChunk.match(/DevTools listening on (ws:\/\/[^\s]+)/);
   return match?.[1] ?? null;
 }
-function launchBrowser() {
-  const browser = findChromium();
-  if (!browser) {
-    throw new Error("No Chromium-based browser found. Please install Chrome, Edge, or Brave.");
-  }
+function tryLaunchBrowser(browser) {
   const tmpDir = mkdtempSync(join5(tmpdir(), "dsclaw-auth-"));
   activeTmpDir = tmpDir;
   log6.info({ browser: browser.name }, "Launching browser for DSers auth");
-  const proc = spawn(browser.executablePath, [
+  const args = [
     `--app=${DSERS_LOGIN_URL}`,
     "--remote-debugging-port=0",
     `--user-data-dir=${tmpDir}`,
@@ -828,7 +827,15 @@ function launchBrowser() {
     "--disable-extensions",
     "--mute-audio",
     "--window-size=480,700"
-  ], {
+  ];
+  if (process.platform === "win32") {
+    args.push(
+      "--disable-background-mode",
+      "--disable-backgrounding-occluded-windows",
+      "--disable-renderer-backgrounding"
+    );
+  }
+  const proc = spawn(browser.executablePath, args, {
     stdio: ["ignore", "ignore", "pipe"],
     detached: false
   });
@@ -947,32 +954,58 @@ function watchLoginResponse(wsUrl) {
     });
   });
 }
+async function attemptLoginWithBrowser(browser) {
+  const { proc, wsUrlPromise } = tryLaunchBrowser(browser);
+  proc.on("exit", () => {
+    activeProcess = null;
+  });
+  const wsUrl = await wsUrlPromise;
+  log6.info({ wsUrl }, "DevTools endpoint acquired");
+  const httpUrl = wsUrl.replace("ws://", "http://").replace(/\/devtools\/browser\/.*/, "/json");
+  const resp = await fetch(httpUrl);
+  const tabs = await resp.json();
+  const dsersTab = tabs.find((t2) => t2.url.includes("dsers.com")) ?? tabs[0];
+  if (!dsersTab?.webSocketDebuggerUrl) {
+    throw new Error("Could not find browser tab");
+  }
+  log6.info({ tabUrl: dsersTab.url }, "Watching tab for login API response");
+  const result = await watchLoginResponse(dsersTab.webSocketDebuggerUrl);
+  cleanup();
+  return result;
+}
 async function loginViaCDP() {
   if (isAuthInProgress()) {
     throw new Error("Auth already in progress");
   }
-  try {
-    const { proc, wsUrlPromise } = launchBrowser();
-    proc.on("exit", () => {
-      activeProcess = null;
-    });
-    const wsUrl = await wsUrlPromise;
-    log6.info({ wsUrl }, "DevTools endpoint acquired");
-    const httpUrl = wsUrl.replace("ws://", "http://").replace(/\/devtools\/browser\/.*/, "/json");
-    const resp = await fetch(httpUrl);
-    const tabs = await resp.json();
-    const dsersTab = tabs.find((t2) => t2.url.includes("dsers.com")) ?? tabs[0];
-    if (!dsersTab?.webSocketDebuggerUrl) {
-      throw new Error("Could not find browser tab");
-    }
-    log6.info({ tabUrl: dsersTab.url }, "Watching tab for login API response");
-    const result = await watchLoginResponse(dsersTab.webSocketDebuggerUrl);
-    cleanup();
-    return result;
-  } catch (error) {
-    cleanup();
-    throw error;
+  const browsers = findAllChromium();
+  if (!browsers.length) {
+    throw new Error("No Chromium-based browser found. Please install Chrome, Edge, or Brave.");
+  }
+  for (let i = 0; i < browsers.length; i++) {
+    const browser = browsers[i];
+    const nextBrowser = browsers[i + 1];
+    try {
+      return await attemptLoginWithBrowser(browser);
+    } catch (error) {
+      cleanup();
+      const msg = error instanceof Error ? error.message : String(error);
+      const isLaunchFailure = msg.includes("Browser exited before DevTools was ready") || msg.includes("Timed out waiting for Chrome DevTools");
+      if (isLaunchFailure && nextBrowser) {
+        log6.warn(
+          { browser: browser.name, error: msg, fallback: nextBrowser.name },
+          "Browser launch failed, trying next browser"
+        );
+        continue;
+      }
+      if (isLaunchFailure && process.platform === "win32") {
+        throw new Error(
+          `Could not launch browser for DSers login. This usually happens when ${browser.name} is already running. Please close all ${browser.name} windows completely (including the system tray icon) and try again.`
+        );
+      }
+      throw error;
+    }
   }
+  throw new Error("All browsers failed to launch for DSers auth.");
 }
 
 // src/agents/core-agent.ts