@hasna/browser 0.3.2 → 0.3.4

package/dist/index.js

@@ -4,25 +4,43 @@ var __getProtoOf = Object.getPrototypeOf;
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+function __accessProp(key) {
+  return this[key];
+}
+var __toESMCache_node;
+var __toESMCache_esm;
 var __toESM = (mod, isNodeMode, target) => {
+  var canCache = mod != null && typeof mod === "object";
+  if (canCache) {
+    var cache = isNodeMode ? __toESMCache_node ??= new WeakMap : __toESMCache_esm ??= new WeakMap;
+    var cached = cache.get(mod);
+    if (cached)
+      return cached;
+  }
   target = mod != null ? __create(__getProtoOf(mod)) : {};
   const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
   for (let key of __getOwnPropNames(mod))
     if (!__hasOwnProp.call(to, key))
       __defProp(to, key, {
-        get: () => mod[key],
+        get: __accessProp.bind(mod, key),
         enumerable: true
       });
+  if (canCache)
+    cache.set(mod, to);
   return to;
 };
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
+var __returnValue = (v) => v;
+function __exportSetter(name, newValue) {
+  this[name] = __returnValue.bind(null, newValue);
+}
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, {
       get: all[name],
       enumerable: true,
       configurable: true,
-      set: (newValue) => all[name] = () => newValue
+      set: __exportSetter.bind(all, name)
     });
 };
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
@@ -104,10 +122,30 @@ var init_types = __esm(() => {
 // src/db/schema.ts
 import { Database } from "bun:sqlite";
 import { join } from "path";
-import { mkdirSync } from "fs";
+import { mkdirSync, existsSync, readdirSync, copyFileSync, statSync } from "fs";
 import { homedir } from "os";
 function getDataDir() {
-  return process.env["BROWSER_DATA_DIR"] ?? join(homedir(), ".browser");
+  if (process.env["BROWSER_DATA_DIR"])
+    return process.env["BROWSER_DATA_DIR"];
+  const home = process.env["HOME"] || process.env["USERPROFILE"] || homedir();
+  const newDir = join(home, ".hasna", "browser");
+  const oldDir = join(home, ".browser");
+  if (existsSync(oldDir) && !existsSync(newDir)) {
+    mkdirSync(newDir, { recursive: true });
+    try {
+      for (const file of readdirSync(oldDir)) {
+        const oldPath = join(oldDir, file);
+        const newPath = join(newDir, file);
+        try {
+          if (statSync(oldPath).isFile()) {
+            copyFileSync(oldPath, newPath);
+          }
+        } catch {}
+      }
+    } catch {}
+  }
+  mkdirSync(newDir, { recursive: true });
+  return newDir;
 }
 function getDatabase(path) {
   const resolvedPath = path ?? process.env["BROWSER_DB_PATH"] ?? join(getDataDir(), "browser.db");
@@ -608,9 +646,8 @@ __export(exports_storage_state, {
   listStates: () => listStates,
   deleteState: () => deleteState
 });
-import { mkdirSync as mkdirSync3, existsSync, readdirSync, unlinkSync } from "fs";
+import { mkdirSync as mkdirSync3, existsSync as existsSync2, readdirSync as readdirSync2, unlinkSync } from "fs";
 import { join as join3 } from "path";
-import { homedir as homedir3 } from "os";
 function ensureDir() {
   mkdirSync3(STATES_DIR, { recursive: true });
 }
@@ -628,11 +665,11 @@ async function saveStateFromPage(page, name) {
 }
 function loadStatePath(name) {
   const path = statePath(name);
-  return existsSync(path) ? path : null;
+  return existsSync2(path) ? path : null;
 }
 function listStates() {
   ensureDir();
-  return readdirSync(STATES_DIR).filter((f) => f.endsWith(".json")).map((f) => {
+  return readdirSync2(STATES_DIR).filter((f) => f.endsWith(".json")).map((f) => {
     const path = join3(STATES_DIR, f);
     const stat = Bun.file(path);
     return {
@@ -644,7 +681,7 @@ function listStates() {
 }
 function deleteState(name) {
   const path = statePath(name);
-  if (existsSync(path)) {
+  if (existsSync2(path)) {
     unlinkSync(path);
     return true;
   }
@@ -652,7 +689,8 @@ function deleteState(name) {
 }
 var STATES_DIR;
 var init_storage_state = __esm(() => {
-  STATES_DIR = join3(process.env["BROWSER_DATA_DIR"] ?? join3(homedir3(), ".browser"), "states");
+  init_schema();
+  STATES_DIR = join3(getDataDir(), "states");
 });
 
 // node_modules/sharp/lib/is.js
@@ -7494,10 +7532,15 @@ class BrowserPool {
       this.pool.push({ browser, inUse: true, createdAt: Date.now() });
       return browser;
     }
-    return new Promise((resolve) => {
+    return new Promise((resolve, reject) => {
+      const timeout = setTimeout(() => {
+        clearInterval(interval);
+        reject(new BrowserError("Browser pool exhausted \u2014 no browser became available within 30s", "POOL_TIMEOUT", true));
+      }, 30000);
       const interval = setInterval(() => {
         const free = this.pool.find((e) => !e.inUse);
         if (free) {
+          clearTimeout(timeout);
           clearInterval(interval);
           free.inUse = true;
           resolve(free.browser);
@@ -7539,7 +7582,7 @@ function isLightpandaAvailable() {
     const paths = [
       "/usr/local/bin/lightpanda",
       "/usr/bin/lightpanda",
-      `${process.env["HOME"]}/.browser/bin/lightpanda`
+      `${process.env["HOME"]}/.hasna/browser/bin/lightpanda`
     ];
     return paths.some((p) => {
       try {
@@ -7558,7 +7601,7 @@ function getLightpandaBinaryPath() {
     "lightpanda",
     "/usr/local/bin/lightpanda",
     "/usr/bin/lightpanda",
-    `${process.env["HOME"]}/.browser/bin/lightpanda`
+    `${process.env["HOME"]}/.hasna/browser/bin/lightpanda`
   ];
   for (const p of paths) {
     try {
@@ -7672,14 +7715,14 @@ class LightpandaPage {
 init_types();
 
 // src/engines/bun-webview.ts
+init_schema();
 import { join as join2 } from "path";
 import { mkdirSync as mkdirSync2 } from "fs";
-import { homedir as homedir2 } from "os";
 function isBunWebViewAvailable() {
   return typeof globalThis.Bun !== "undefined" && typeof globalThis.Bun.WebView !== "undefined";
 }
 function getProfileDir(profileName) {
-  const base = process.env["BROWSER_DATA_DIR"] ?? join2(homedir2(), ".browser");
+  const base = getDataDir();
   const dir = join2(base, "profiles", profileName);
   mkdirSync2(dir, { recursive: true });
   return dir;
@@ -8156,6 +8199,7 @@ function enableNetworkLogging(page, sessionId) {
   };
   const onResponse = (res) => {
     const start = requestStart.get(res.url()) ?? Date.now();
+    requestStart.delete(res.url());
     const duration = Date.now() - start;
     const req = res.request();
     try {
@@ -8172,11 +8216,17 @@ function enableNetworkLogging(page, sessionId) {
       });
     } catch {}
   };
+  const onRequestFailed = (req) => {
+    requestStart.delete(req.url());
+  };
   page.on("request", onRequest);
   page.on("response", onResponse);
+  page.on("requestfailed", onRequestFailed);
   return () => {
     page.off("request", onRequest);
     page.off("response", onResponse);
+    page.off("requestfailed", onRequestFailed);
+    requestStart.clear();
   };
 }
 async function addInterceptRule(page, rule) {
@@ -8213,6 +8263,7 @@ function startHAR(page) {
     const start = requestStart.get(key);
     if (!start)
       return;
+    requestStart.delete(key);
     const duration = Date.now() - start.time;
     const entry = {
       startedDateTime: new Date(start.time).toISOString(),
@@ -8235,15 +8286,20 @@ function startHAR(page) {
       timings: { send: 0, wait: duration, receive: 0 }
     };
     entries.push(entry);
-    requestStart.delete(key);
+  };
+  const onRequestFailed = (req) => {
+    requestStart.delete(req.url() + req.method());
   };
   page.on("request", onRequest);
   page.on("response", onResponse);
+  page.on("requestfailed", onRequestFailed);
   return {
     entries,
     stop: () => {
       page.off("request", onRequest);
       page.off("response", onResponse);
+      page.off("requestfailed", onRequestFailed);
+      requestStart.clear();
       return {
         log: {
           version: "1.2",
@@ -9401,7 +9457,6 @@ init_types();
 var import_sharp = __toESM(require_lib(), 1);
 import { join as join4 } from "path";
 import { mkdirSync as mkdirSync4 } from "fs";
-import { homedir as homedir4 } from "os";
 
 // src/db/gallery.ts
 init_schema();
@@ -9446,11 +9501,9 @@ function getEntry(id) {
 }
 
 // src/lib/screenshot.ts
-function getDataDir2() {
-  return process.env["BROWSER_DATA_DIR"] ?? join4(homedir4(), ".browser");
-}
+init_schema();
 function getScreenshotDir(projectId) {
-  const base = join4(getDataDir2(), "screenshots");
+  const base = join4(getDataDir(), "screenshots");
   const date = new Date().toISOString().split("T")[0];
   const dir = projectId ? join4(base, projectId, date) : join4(base, date);
   mkdirSync4(dir, { recursive: true });
@@ -9585,7 +9638,7 @@ async function takeScreenshot(page, opts) {
 }
 async function generatePDF(page, opts) {
   try {
-    const base = join4(getDataDir2(), "pdfs");
+    const base = join4(getDataDir(), "pdfs");
     const date = new Date().toISOString().split("T")[0];
     const dir = opts?.projectId ? join4(base, opts.projectId, date) : join4(base, date);
     mkdirSync4(dir, { recursive: true });