findweb 0.1.2 → 0.1.3

package/README.md

@@ -42,7 +42,7 @@ findweb login
 
 - If the profile is already prepared, search runs immediately.
 - If the profile has not been prepared yet, `findweb` automatically opens the login flow first.
-- After you sign in and close the browser window, `findweb` writes a local prepared-profile marker so future searches can start immediately.
+- After sign-in is detected, `findweb` saves a local prepared-profile marker and continues automatically.
 - By default, the profile directory is `${XDG_DATA_HOME:-~/.local/share}/findweb/chrome-profile` unless you pass `--userDataDir` or set `GOOGLE_SEARCH_USER_DATA_DIR`.
 
 In practice, the first search on a fresh profile behaves like this:
@@ -53,7 +53,7 @@ findweb "yc"
 
 1. detect missing prepared-profile marker
 2. open headed Chrome login flow
-3. wait for you to sign in and close the browser
+3. wait for you to finish signing in
 4. continue the original search
 
 ## Options
@@ -98,7 +98,7 @@ You can trigger that ahead of time with:
 findweb login
 ```
 
-This opens a visible Chrome window with the Google sign-in page. After signing in, close the browser. The session is saved to the profile directory, and `findweb` records that the profile is ready for future searches.
+This opens a visible Chrome window with the Google sign-in page. After sign-in is detected, `findweb` saves the session to the profile directory and records that the profile is ready for future searches.
 
 ## Output
 

package/dist/index.js

@@ -76479,12 +76479,59 @@ async function waitForIdle(page) {
 }
 
 // src/search/search.ts
+var LOGIN_POLL_MS = 250;
+function wait2(delayMs) {
+  return new Promise((resolve6) => setTimeout(resolve6, delayMs));
+}
+function hostnameFromUrl(url) {
+  try {
+    return new URL(url).hostname.toLowerCase();
+  } catch {
+    return null;
+  }
+}
+function isCompletedLoginUrl(url) {
+  const hostname = hostnameFromUrl(url);
+  return hostname !== null && hostname !== "accounts.google.com" && (hostname === "google.com" || hostname.endsWith(".google.com"));
+}
+function hasCompletedLoginPage(urls) {
+  return urls.some((url) => isCompletedLoginUrl(url));
+}
+async function pageUrls(browser) {
+  const pages = await browser.pages();
+  return pages.map((page) => page.url());
+}
+async function waitForCompletedLogin(loginPage, browser) {
+  let lastSeenUrls = [loginPage.url()];
+  while (true) {
+    if (browser.connected) {
+      lastSeenUrls = await pageUrls(browser).catch(() => lastSeenUrls);
+      if (hasCompletedLoginPage(lastSeenUrls)) {
+        return;
+      }
+    }
+    if (!browser.connected || loginPage.isClosed()) {
+      if (hasCompletedLoginPage(lastSeenUrls)) {
+        return;
+      }
+      throw new Error("Google login was not completed.");
+    }
+    await wait2(LOGIN_POLL_MS);
+  }
+}
 function isSorryPage(url) {
   return url.includes("/sorry/");
 }
 function toErrorMessage(error) {
   return error instanceof Error ? error.message : String(error);
 }
+function isInterruptedLoginError(error, loginPage, browser) {
+  if (!browser.connected || loginPage?.isClosed()) {
+    return true;
+  }
+  const message = toErrorMessage(error);
+  return message.includes("Navigating frame was detached") || message.includes("LifecycleWatcher disposed") || message.includes("Target closed") || message.includes("Session closed");
+}
 async function searchQuery(options) {
   const page = await options.browser.newPage();
   try {
@@ -76546,19 +76593,29 @@ async function searchQueriesInTabs(browser, blocker, queries, options) {
   return results;
 }
 async function runLoginSession(options) {
-  const loginPage = await options.browser.newPage();
-  await preparePage(loginPage, options.lang);
-  await loginPage.goto(`https://accounts.google.com/ServiceLogin?continue=${encodeURIComponent(`https://www.google.com/?hl=${options.lang}&gl=${options.gl}&pws=0`)}&hl=${encodeURIComponent(options.lang)}`, { waitUntil: "networkidle2" });
-  await new Promise((resolve6) => {
-    const done = () => resolve6();
-    options.browser.once("disconnected", done);
-    process.once("SIGINT", async () => {
-      await options.browser.close().catch(() => {
-        return;
-      });
-      done();
+  let loginPage = null;
+  const handleSigint = () => {
+    options.browser.close().catch(() => {
+      return;
     });
-  });
+  };
+  process.once("SIGINT", handleSigint);
+  try {
+    loginPage = await options.browser.newPage();
+    await preparePage(loginPage, options.lang);
+    await loginPage.goto(`https://accounts.google.com/ServiceLogin?continue=${encodeURIComponent(`https://www.google.com/?hl=${options.lang}&gl=${options.gl}&pws=0`)}&hl=${encodeURIComponent(options.lang)}`, { waitUntil: "networkidle2" });
+    await waitForCompletedLogin(loginPage, options.browser);
+  } catch (error) {
+    if (isInterruptedLoginError(error, loginPage, options.browser)) {
+      throw new Error("Google login was not completed.");
+    }
+    throw error;
+  } finally {
+    process.off("SIGINT", handleSigint);
+    await loginPage?.close().catch(() => {
+      return;
+    });
+  }
 }
 
 // src/cli/profile.ts
@@ -76588,8 +76645,8 @@ async function markProfilePrepared(userDataDir) {
 // src/cli/flows/login.ts
 function printLoginInstructions(userDataDir) {
   console.log(`Login browser launched with profile: ${userDataDir}`);
-  console.log("Sign in to Google to prepare this profile for future searches.");
-  console.log("Close the browser window when you are done.");
+  console.log("Complete Google sign-in to prepare this profile for future searches.");
+  console.log("The session is saved automatically once sign-in is detected.");
 }
 async function runInteractiveLoginFlow(options) {
   await ensureProfileDir(options.userDataDir);
@@ -90229,6 +90286,10 @@ function createLoginArgs() {
     }
   };
 }
+function printCommandError(error48) {
+  const message = error48 instanceof Error ? error48.message : String(error48);
+  console.error(`ERROR: ${message}`);
+}
 async function runLogin(args) {
   const options = normalizeLoginOptions({
     gl: typeof args.gl === "string" ? args.gl : undefined,
@@ -90242,11 +90303,16 @@ function createLoginCommand(commandName = "findweb login") {
     meta: { name: commandName, description: "Open a reusable Google sign-in session." },
     args: createLoginArgs(),
     async run({ args }) {
-      await runLogin({
-        gl: args.gl,
-        lang: args.lang,
-        userDataDir: args.userDataDir
-      });
+      try {
+        await runLogin({
+          gl: args.gl,
+          lang: args.lang,
+          userDataDir: args.userDataDir
+        });
+      } catch (error48) {
+        printCommandError(error48);
+        process.exitCode = 1;
+      }
     }
   });
 }
@@ -101432,6 +101498,10 @@ var searchArgs = {
     description: "Print JSON output"
   }
 };
+function printCommandError2(error49) {
+  const message = error49 instanceof Error ? error49.message : String(error49);
+  console.error(`ERROR: ${message}`);
+}
 async function runSearch(args) {
   const options = normalizeSearchOptions({
     _: args._,
@@ -101480,7 +101550,12 @@ function createSearchCommand(commandName = "findweb") {
     },
     args: searchArgs,
     async run({ args }) {
-      await runSearch(args);
+      try {
+        await runSearch(args);
+      } catch (error49) {
+        printCommandError2(error49);
+        process4.exitCode = 1;
+      }
     }
   });
 }
@@ -101560,4 +101635,10 @@ async function main() {
   }
   await runMain(createSearchCommand(), { rawArgs: action.rawArgs });
 }
-await main();
+try {
+  await main();
+} catch (error49) {
+  const message = error49 instanceof Error ? error49.message : String(error49);
+  console.error(`ERROR: ${message}`);
+  process5.exitCode = 1;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "findweb",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Google search CLI powered by system Chrome",
   "type": "module",
   "packageManager": "bun@1.3.11",