findweb 0.1.1 → 0.1.3

package/README.md

@@ -42,7 +42,8 @@ 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:
 
@@ -52,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
@@ -97,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

@@ -66932,9 +66932,10 @@ async function runMain(cmd, opts = {}) {
 }
 
 // src/search/browser.ts
-import { existsSync as existsSync3 } from "fs";
 import { spawn as spawn3 } from "child_process";
 import http2 from "http";
+import os9 from "os";
+import path12 from "path";
 
 // node_modules/puppeteer-core/lib/esm/puppeteer/api/api.js
 init_Browser();
@@ -76307,13 +76308,19 @@ async function closeSearchBrowser(activeBrowser) {
     activeBrowser.chromeProcess.kill("SIGTERM");
   }
 }
+function defaultXdgDataHome() {
+  const configured = process.env.XDG_DATA_HOME;
+  if (configured && path12.isAbsolute(configured)) {
+    return configured;
+  }
+  return path12.join(os9.homedir(), ".local", "share");
+}
 function defaultUserDataDir() {
   const configured = process.env.GOOGLE_SEARCH_USER_DATA_DIR;
   if (configured) {
     return configured;
   }
-  const legacyProfile = "/tmp/gsearch-manual-login-profile";
-  return ["/tmp/google-search-profile", legacyProfile].find((candidate) => existsSync3(candidate)) ?? "/tmp/google-search-profile";
+  return path12.join(defaultXdgDataHome(), "findweb", "chrome-profile");
 }
 
 // src/search/page.ts
@@ -76472,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 {
@@ -76539,30 +76593,40 @@ 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
 import fs7 from "fs/promises";
-import path12 from "path";
+import path13 from "path";
 var PROFILE_READY_MARKER = ".findweb-profile-ready";
 async function ensureProfileDir(dirPath) {
   await fs7.mkdir(dirPath, { recursive: true });
 }
 function readyMarkerPath(userDataDir) {
-  return path12.join(userDataDir, PROFILE_READY_MARKER);
+  return path13.join(userDataDir, PROFILE_READY_MARKER);
 }
 async function hasPreparedProfile(userDataDir) {
   try {
@@ -76581,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);
@@ -76615,7 +76679,7 @@ async function ensureInteractiveLogin(options) {
 }
 
 // src/cli/schema.ts
-import path13 from "path";
+import path14 from "path";
 
 // node_modules/zod/v4/classic/external.js
 var exports_external = {};
@@ -77382,10 +77446,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path13) {
-  if (!path13)
+function getElementAtPath(obj, path14) {
+  if (!path14)
     return obj;
-  return path13.reduce((acc, key) => acc?.[key], obj);
+  return path14.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -77766,11 +77830,11 @@ function aborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path13, issues) {
+function prefixIssues(path14, issues) {
   return issues.map((iss) => {
     var _a4;
     (_a4 = iss).path ?? (_a4.path = []);
-    iss.path.unshift(path13);
+    iss.path.unshift(path14);
     return iss;
   });
 }
@@ -77953,7 +78017,7 @@ function formatError(error, mapper = (issue2) => issue2.message) {
 }
 function treeifyError(error, mapper = (issue2) => issue2.message) {
   const result = { errors: [] };
-  const processError = (error2, path13 = []) => {
+  const processError = (error2, path14 = []) => {
     var _a4, _b2;
     for (const issue2 of error2.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
@@ -77963,7 +78027,7 @@ function treeifyError(error, mapper = (issue2) => issue2.message) {
       } else if (issue2.code === "invalid_element") {
         processError({ issues: issue2.issues }, issue2.path);
       } else {
-        const fullpath = [...path13, ...issue2.path];
+        const fullpath = [...path14, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -77995,8 +78059,8 @@ function treeifyError(error, mapper = (issue2) => issue2.message) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path13 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path13) {
+  const path14 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path14) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -89743,13 +89807,13 @@ function resolveRef(ref, ctx) {
   if (!ref.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path13 = ref.slice(1).split("/").filter(Boolean);
-  if (path13.length === 0) {
+  const path14 = ref.slice(1).split("/").filter(Boolean);
+  if (path14.length === 0) {
     return ctx.rootSchema;
   }
   const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path13[0] === defsKey) {
-    const key = path13[1];
+  if (path14[0] === defsKey) {
+    const key = path14[1];
     if (!key || !ctx.defs[key]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -90158,7 +90222,7 @@ var sharedSchema = exports_external.object({
   headed: exports_external.boolean().default(false),
   json: exports_external.boolean().default(false),
   lang: defaultedString("lang", "en"),
-  userDataDir: defaultedString("userDataDir", defaultUserDataDir()).transform((value) => path13.resolve(value))
+  userDataDir: defaultedString("userDataDir", defaultUserDataDir()).transform((value) => path14.resolve(value))
 });
 var searchSchema = sharedSchema.extend({
   num: positiveInteger("num").default(3),
@@ -90222,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,
@@ -90235,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;
+      }
     }
   });
 }
@@ -90249,8 +90322,8 @@ import process4 from "process";
 
 // src/search/blocker.ts
 import fs8 from "fs/promises";
-import os9 from "os";
-import path14 from "path";
+import os10 from "os";
+import path15 from "path";
 
 // node_modules/tldts-core/dist/es6/src/domain.js
 function shareSameDomainSuffix(hostname3, vhost) {
@@ -99514,8 +99587,8 @@ class FilterEngine extends EventEmitter5 {
     if (caching === undefined) {
       return init();
     }
-    const { path: path14, read, write } = caching;
-    return read(path14).then((buffer) => this.deserialize(buffer)).catch(() => init().then((engine) => write(path14, engine.serialize()).then(() => engine)));
+    const { path: path15, read, write } = caching;
+    return read(path15).then((buffer) => this.deserialize(buffer)).catch(() => init().then((engine) => write(path15, engine.serialize()).then(() => engine)));
   }
   static empty(config3 = {}) {
     return new this({ config: config3 });
@@ -101307,13 +101380,13 @@ class PuppeteerBlocker extends FilterEngine {
 // src/search/blocker.ts
 var blockerPromise;
 function defaultCacheDir() {
-  return process.env.GOOGLE_SEARCH_CACHE_DIR ?? path14.join(os9.homedir(), ".cache", "google-search");
+  return process.env.GOOGLE_SEARCH_CACHE_DIR ?? path15.join(os10.homedir(), ".cache", "google-search");
 }
 async function readCache(filePath) {
   return fs8.readFile(filePath);
 }
 async function writeCache(filePath, buffer) {
-  await fs8.mkdir(path14.dirname(filePath), { recursive: true });
+  await fs8.mkdir(path15.dirname(filePath), { recursive: true });
   await fs8.writeFile(filePath, buffer);
 }
 async function loadBlocker() {
@@ -101322,7 +101395,7 @@ async function loadBlocker() {
       const cacheDir = defaultCacheDir();
       await fs8.mkdir(cacheDir, { recursive: true });
       return PuppeteerBlocker.fromPrebuiltAdsAndTracking(globalThis.fetch.bind(globalThis), {
-        path: path14.join(cacheDir, "ghostery-engine.bin"),
+        path: path15.join(cacheDir, "ghostery-engine.bin"),
         read: readCache,
         write: writeCache
       });
@@ -101425,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._,
@@ -101473,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;
+      }
     }
   });
 }
@@ -101553,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.1",
+  "version": "0.1.3",
   "description": "Google search CLI powered by system Chrome",
   "type": "module",
   "packageManager": "bun@1.3.11",