feed-the-machine 1.6.1 → 1.7.1

package/ftm-browse/daemon/browser-manager.ts

@@ -1,206 +1,206 @@
-import * as fs from "fs";
-import * as path from "path";
-import { chromium, type Browser, type BrowserContext, type Page } from "playwright";
-
-const IDLE_TIMEOUT_MS = 30 * 60 * 1000; // 30 minutes
-const DEFAULT_USER_DATA_DIR = path.join(process.env.HOME || "~", ".ftm-browse", "user-data");
-
-class BrowserManager {
-  private browser: Browser | null = null;
-  private context: BrowserContext | null = null;
-  private page: Page | null = null;
-  private idleTimer: ReturnType<typeof setTimeout> | null = null;
-  private shutdownCallback: (() => void) | null = null;
-  private initPromise: Promise<void> | null = null;
-  private userDataDir: string | null = null;
-
-  setUserDataDir(dir: string | null): void {
-    this.userDataDir = dir;
-  }
-
-  setShutdownCallback(cb: () => void): void {
-    this.shutdownCallback = cb;
-  }
-
-  resetIdleTimer(): void {
-    if (this.idleTimer) {
-      clearTimeout(this.idleTimer);
-    }
-    this.idleTimer = setTimeout(() => {
-      console.log("[browser-manager] 30min idle timeout reached, shutting down");
-      void this.shutdown();
-    }, IDLE_TIMEOUT_MS);
-  }
-
-  async initialize(): Promise<void> {
-    // Short-circuit if already running (handles both ephemeral and persistent context modes)
-    if (this.isRunning()) return;
-
-    // Deduplicate concurrent init calls
-    if (this.initPromise) {
-      return this.initPromise;
-    }
-
-    this.initPromise = this._doInit().finally(() => {
-      this.initPromise = null;
-    });
-    return this.initPromise;
-  }
-
-  private async _doInit(): Promise<void> {
-    const launchArgs = [
-      "--no-sandbox",
-      "--disable-setuid-sandbox",
-      "--disable-dev-shm-usage",
-      "--disable-gpu",
-      "--disable-background-networking",
-      "--disable-default-apps",
-      "--disable-extensions",
-      "--disable-sync",
-      "--disable-translate",
-      "--metrics-recording-only",
-      "--mute-audio",
-      "--no-first-run",
-      "--safebrowsing-disable-auto-update",
-    ];
-
-    const contextOptions = {
-      viewport: { width: 1280, height: 800 } as { width: number; height: number } | null,
-      userAgent:
-        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
-    };
-
-    if (this.userDataDir) {
-      // Persistent context — cookies and session data survive daemon restarts
-      const resolvedDir = this.userDataDir === "default" ? DEFAULT_USER_DATA_DIR : this.userDataDir;
-      console.log(`[browser-manager] Launching Chromium with persistent context at: ${resolvedDir}`);
-
-      if (!fs.existsSync(resolvedDir)) {
-        fs.mkdirSync(resolvedDir, { recursive: true, mode: 0o700 });
-      }
-
-      // launchPersistentContext returns a BrowserContext directly (no separate Browser)
-      this.context = await chromium.launchPersistentContext(resolvedDir, {
-        headless: true,
-        args: launchArgs,
-        ...contextOptions,
-      });
-
-      // Reuse existing page if available, otherwise open a new one
-      const existingPages = this.context.pages();
-      this.page = existingPages.length > 0 ? existingPages[0] : await this.context.newPage();
-    } else {
-      // Ephemeral context — no persistence (default, safe)
-      console.log("[browser-manager] Launching Chromium (ephemeral)...");
-
-      this.browser = await chromium.launch({
-        headless: true,
-        args: launchArgs,
-      });
-
-      this.context = await this.browser.newContext(contextOptions);
-      this.page = await this.context.newPage();
-    }
-
-    // Start idle timer
-    this.resetIdleTimer();
-
-    console.log("[browser-manager] Browser ready");
-  }
-
-  async getPage(): Promise<Page> {
-    await this.initialize();
-    this.resetIdleTimer();
-
-    if (!this.page || this.page.isClosed()) {
-      console.log("[browser-manager] Page was closed, creating new page");
-      this.page = await this.context!.newPage();
-    }
-
-    return this.page;
-  }
-
-  async getOrCreatePage(tabIndex?: number): Promise<Page> {
-    await this.initialize();
-    this.resetIdleTimer();
-
-    const pages = this.context!.pages();
-
-    if (tabIndex !== undefined && tabIndex < pages.length) {
-      this.page = pages[tabIndex];
-      return this.page;
-    }
-
-    if (!this.page || this.page.isClosed()) {
-      this.page = await this.context!.newPage();
-    }
-
-    return this.page;
-  }
-
-  async getAllPages(): Promise<Page[]> {
-    if (!this.context) return [];
-    return this.context.pages();
-  }
-
-  async setActivePage(index: number): Promise<Page | null> {
-    if (!this.context) return null;
-    const pages = this.context.pages();
-    if (index < 0 || index >= pages.length) return null;
-    this.page = pages[index];
-    this.resetIdleTimer();
-    return this.page;
-  }
-
-  async shutdown(): Promise<void> {
-    if (this.idleTimer) {
-      clearTimeout(this.idleTimer);
-      this.idleTimer = null;
-    }
-
-    try {
-      if (this.page && !this.page.isClosed()) {
-        await this.page.close();
-      }
-    } catch {
-      // Ignore close errors
-    }
-
-    try {
-      if (this.context) {
-        await this.context.close();
-      }
-    } catch {
-      // Ignore close errors
-    }
-
-    try {
-      if (this.browser) {
-        await this.browser.close();
-      }
-    } catch {
-      // Ignore close errors
-    }
-
-    this.page = null;
-    this.context = null;
-    this.browser = null;
-
-    console.log("[browser-manager] Browser shut down");
-
-    if (this.shutdownCallback) {
-      this.shutdownCallback();
-    }
-  }
-
-  isRunning(): boolean {
-    // Persistent context mode: browser is null, check context instead
-    if (this.userDataDir) {
-      return this.context !== null;
-    }
-    return this.browser !== null && this.browser.isConnected();
-  }
-}
-
-// Singleton instance
-export const browserManager = new BrowserManager();
+import * as fs from "fs";
+import * as path from "path";
+import { chromium, type Browser, type BrowserContext, type Page } from "playwright";
+
+const IDLE_TIMEOUT_MS = 30 * 60 * 1000; // 30 minutes
+const DEFAULT_USER_DATA_DIR = path.join(process.env.HOME || "~", ".ftm-browse", "user-data");
+
+class BrowserManager {
+  private browser: Browser | null = null;
+  private context: BrowserContext | null = null;
+  private page: Page | null = null;
+  private idleTimer: ReturnType<typeof setTimeout> | null = null;
+  private shutdownCallback: (() => void) | null = null;
+  private initPromise: Promise<void> | null = null;
+  private userDataDir: string | null = null;
+
+  setUserDataDir(dir: string | null): void {
+    this.userDataDir = dir;
+  }
+
+  setShutdownCallback(cb: () => void): void {
+    this.shutdownCallback = cb;
+  }
+
+  resetIdleTimer(): void {
+    if (this.idleTimer) {
+      clearTimeout(this.idleTimer);
+    }
+    this.idleTimer = setTimeout(() => {
+      console.log("[browser-manager] 30min idle timeout reached, shutting down");
+      void this.shutdown();
+    }, IDLE_TIMEOUT_MS);
+  }
+
+  async initialize(): Promise<void> {
+    // Short-circuit if already running (handles both ephemeral and persistent context modes)
+    if (this.isRunning()) return;
+
+    // Deduplicate concurrent init calls
+    if (this.initPromise) {
+      return this.initPromise;
+    }
+
+    this.initPromise = this._doInit().finally(() => {
+      this.initPromise = null;
+    });
+    return this.initPromise;
+  }
+
+  private async _doInit(): Promise<void> {
+    const launchArgs = [
+      "--no-sandbox",
+      "--disable-setuid-sandbox",
+      "--disable-dev-shm-usage",
+      "--disable-gpu",
+      "--disable-background-networking",
+      "--disable-default-apps",
+      "--disable-extensions",
+      "--disable-sync",
+      "--disable-translate",
+      "--metrics-recording-only",
+      "--mute-audio",
+      "--no-first-run",
+      "--safebrowsing-disable-auto-update",
+    ];
+
+    const contextOptions = {
+      viewport: { width: 1280, height: 800 } as { width: number; height: number } | null,
+      userAgent:
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
+    };
+
+    if (this.userDataDir) {
+      // Persistent context — cookies and session data survive daemon restarts
+      const resolvedDir = this.userDataDir === "default" ? DEFAULT_USER_DATA_DIR : this.userDataDir;
+      console.log(`[browser-manager] Launching Chromium with persistent context at: ${resolvedDir}`);
+
+      if (!fs.existsSync(resolvedDir)) {
+        fs.mkdirSync(resolvedDir, { recursive: true, mode: 0o700 });
+      }
+
+      // launchPersistentContext returns a BrowserContext directly (no separate Browser)
+      this.context = await chromium.launchPersistentContext(resolvedDir, {
+        headless: true,
+        args: launchArgs,
+        ...contextOptions,
+      });
+
+      // Reuse existing page if available, otherwise open a new one
+      const existingPages = this.context.pages();
+      this.page = existingPages.length > 0 ? existingPages[0] : await this.context.newPage();
+    } else {
+      // Ephemeral context — no persistence (default, safe)
+      console.log("[browser-manager] Launching Chromium (ephemeral)...");
+
+      this.browser = await chromium.launch({
+        headless: true,
+        args: launchArgs,
+      });
+
+      this.context = await this.browser.newContext(contextOptions);
+      this.page = await this.context.newPage();
+    }
+
+    // Start idle timer
+    this.resetIdleTimer();
+
+    console.log("[browser-manager] Browser ready");
+  }
+
+  async getPage(): Promise<Page> {
+    await this.initialize();
+    this.resetIdleTimer();
+
+    if (!this.page || this.page.isClosed()) {
+      console.log("[browser-manager] Page was closed, creating new page");
+      this.page = await this.context!.newPage();
+    }
+
+    return this.page;
+  }
+
+  async getOrCreatePage(tabIndex?: number): Promise<Page> {
+    await this.initialize();
+    this.resetIdleTimer();
+
+    const pages = this.context!.pages();
+
+    if (tabIndex !== undefined && tabIndex < pages.length) {
+      this.page = pages[tabIndex];
+      return this.page;
+    }
+
+    if (!this.page || this.page.isClosed()) {
+      this.page = await this.context!.newPage();
+    }
+
+    return this.page;
+  }
+
+  async getAllPages(): Promise<Page[]> {
+    if (!this.context) return [];
+    return this.context.pages();
+  }
+
+  async setActivePage(index: number): Promise<Page | null> {
+    if (!this.context) return null;
+    const pages = this.context.pages();
+    if (index < 0 || index >= pages.length) return null;
+    this.page = pages[index];
+    this.resetIdleTimer();
+    return this.page;
+  }
+
+  async shutdown(): Promise<void> {
+    if (this.idleTimer) {
+      clearTimeout(this.idleTimer);
+      this.idleTimer = null;
+    }
+
+    try {
+      if (this.page && !this.page.isClosed()) {
+        await this.page.close();
+      }
+    } catch {
+      // Ignore close errors
+    }
+
+    try {
+      if (this.context) {
+        await this.context.close();
+      }
+    } catch {
+      // Ignore close errors
+    }
+
+    try {
+      if (this.browser) {
+        await this.browser.close();
+      }
+    } catch {
+      // Ignore close errors
+    }
+
+    this.page = null;
+    this.context = null;
+    this.browser = null;
+
+    console.log("[browser-manager] Browser shut down");
+
+    if (this.shutdownCallback) {
+      this.shutdownCallback();
+    }
+  }
+
+  isRunning(): boolean {
+    // Persistent context mode: browser is null, check context instead
+    if (this.userDataDir) {
+      return this.context !== null;
+    }
+    return this.browser !== null && this.browser.isConnected();
+  }
+}
+
+// Singleton instance
+export const browserManager = new BrowserManager();

package/ftm-browse/daemon/bun.lock

@@ -1,30 +1,30 @@
-{
-  "lockfileVersion": 1,
-  "configVersion": 1,
-  "workspaces": {
-    "": {
-      "name": "ftm-browse",
-      "dependencies": {
-        "playwright": "^1.49.0",
-      },
-      "devDependencies": {
-        "@types/bun": "latest",
-      },
-    },
-  },
-  "packages": {
-    "@types/bun": ["@types/bun@1.3.10", "", { "dependencies": { "bun-types": "1.3.10" } }, "sha512-0+rlrUrOrTSskibryHbvQkDOWRJwJZqZlxrUs1u4oOoTln8+WIXBPmAuCF35SWB2z4Zl3E84Nl/D0P7803nigQ=="],
-
-    "@types/node": ["@types/node@25.5.0", "", { "dependencies": { "undici-types": "~7.18.0" } }, "sha512-jp2P3tQMSxWugkCUKLRPVUpGaL5MVFwF8RDuSRztfwgN1wmqJeMSbKlnEtQqU8UrhTmzEmZdu2I6v2dpp7XIxw=="],
-
-    "bun-types": ["bun-types@1.3.10", "", { "dependencies": { "@types/node": "*" } }, "sha512-tcpfCCl6XWo6nCVnpcVrxQ+9AYN1iqMIzgrSKYMB/fjLtV2eyAVEg7AxQJuCq/26R6HpKWykQXuSOq/21RYcbg=="],
-
-    "fsevents": ["fsevents@2.3.2", "", { "os": "darwin" }, "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="],
-
-    "playwright": ["playwright@1.58.2", "", { "dependencies": { "playwright-core": "1.58.2" }, "optionalDependencies": { "fsevents": "2.3.2" }, "bin": { "playwright": "cli.js" } }, "sha512-vA30H8Nvkq/cPBnNw4Q8TWz1EJyqgpuinBcHET0YVJVFldr8JDNiU9LaWAE1KqSkRYazuaBhTpB5ZzShOezQ6A=="],
-
-    "playwright-core": ["playwright-core@1.58.2", "", { "bin": { "playwright-core": "cli.js" } }, "sha512-yZkEtftgwS8CsfYo7nm0KE8jsvm6i/PTgVtB8DL726wNf6H2IMsDuxCpJj59KDaxCtSnrWan2AeDqM7JBaultg=="],
-
-    "undici-types": ["undici-types@7.18.2", "", {}, "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w=="],
-  }
-}
+{
+  "lockfileVersion": 1,
+  "configVersion": 1,
+  "workspaces": {
+    "": {
+      "name": "ftm-browse",
+      "dependencies": {
+        "playwright": "^1.49.0",
+      },
+      "devDependencies": {
+        "@types/bun": "latest",
+      },
+    },
+  },
+  "packages": {
+    "@types/bun": ["@types/bun@1.3.10", "", { "dependencies": { "bun-types": "1.3.10" } }, "sha512-0+rlrUrOrTSskibryHbvQkDOWRJwJZqZlxrUs1u4oOoTln8+WIXBPmAuCF35SWB2z4Zl3E84Nl/D0P7803nigQ=="],
+
+    "@types/node": ["@types/node@25.5.0", "", { "dependencies": { "undici-types": "~7.18.0" } }, "sha512-jp2P3tQMSxWugkCUKLRPVUpGaL5MVFwF8RDuSRztfwgN1wmqJeMSbKlnEtQqU8UrhTmzEmZdu2I6v2dpp7XIxw=="],
+
+    "bun-types": ["bun-types@1.3.10", "", { "dependencies": { "@types/node": "*" } }, "sha512-tcpfCCl6XWo6nCVnpcVrxQ+9AYN1iqMIzgrSKYMB/fjLtV2eyAVEg7AxQJuCq/26R6HpKWykQXuSOq/21RYcbg=="],
+
+    "fsevents": ["fsevents@2.3.2", "", { "os": "darwin" }, "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="],
+
+    "playwright": ["playwright@1.58.2", "", { "dependencies": { "playwright-core": "1.58.2" }, "optionalDependencies": { "fsevents": "2.3.2" }, "bin": { "playwright": "cli.js" } }, "sha512-vA30H8Nvkq/cPBnNw4Q8TWz1EJyqgpuinBcHET0YVJVFldr8JDNiU9LaWAE1KqSkRYazuaBhTpB5ZzShOezQ6A=="],
+
+    "playwright-core": ["playwright-core@1.58.2", "", { "bin": { "playwright-core": "cli.js" } }, "sha512-yZkEtftgwS8CsfYo7nm0KE8jsvm6i/PTgVtB8DL726wNf6H2IMsDuxCpJj59KDaxCtSnrWan2AeDqM7JBaultg=="],
+
+    "undici-types": ["undici-types@7.18.2", "", {}, "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w=="],
+  }
+}