nothing-browser 0.1.0 → 0.1.2

package/piggy/client/index.ts

@@ -1,4 +1,4 @@
-// piggy/client/index.ts
+//piggy/client/index.ts 
 import { connect, type Socket } from "net";
 import { writeFileSync, mkdirSync } from "fs";
 import { dirname } from "path";
@@ -280,6 +280,23 @@ export class PiggyClient {
         }
       }
     }
+
+    if (event.event === "dialog") {
+      const key = `dialog:${event.tabId ?? "default"}`;
+      const handlers = this.globalEventHandlers.get(key);
+      if (handlers) {
+        for (const h of handlers) {
+          try {
+            h({
+              dialogType:   event.dialogType,
+              message:      event.message,
+              defaultValue: event.defaultValue,
+              tabId:        event.tabId,
+            });
+          } catch (e) { logger.error(`dialog handler error: ${e}`); }
+        }
+      }
+    }
   }
 
   onEvent(eventName: string, tabId: string, handler: (data: any) => void): () => void {
@@ -384,9 +401,9 @@ export class PiggyClient {
 
   // ── Cookies ───────────────────────────────────────────────────────────────
   async setCookie(name: string, value: string, domain: string, path = "/", tabId = "default"): Promise<void> { await this.send("cookie.set", { name, value, domain, path, tabId }); }
-  async getCookie(name: string, tabId = "default"): Promise<any> { return this.send("cookie.get", { name, tabId }); }
-  async deleteCookie(name: string, tabId = "default"): Promise<void> { await this.send("cookie.delete", { name, tabId }); }
-  async listCookies(tabId = "default"): Promise<any[]> { return this.send<any[]>("cookie.list", { tabId }); }
+  async getCookie(name: string, domain = "", tabId = "default"): Promise<any> { return this.send("cookie.get", { name, domain, tabId }); }
+  async deleteCookie(name: string, domain: string, tabId = "default"): Promise<void> { await this.send("cookie.delete", { name, domain, tabId }); }
+  async listCookies(domain = "", tabId = "default"): Promise<any[]> { return this.send<any[]>("cookie.list", { domain, tabId }); }
 
   // ── Interception ──────────────────────────────────────────────────────────
   async addInterceptRule(action: "block" | "redirect" | "modifyHeaders", pattern: string, options: { redirectUrl?: string; headers?: Record<string, string> } = {}, tabId = "default"): Promise<void> {
@@ -407,55 +424,14 @@ export class PiggyClient {
   async sessionExport(tabId = "default"): Promise<any> { return this.send("session.export", { tabId }); }
   async sessionImport(data: any, tabId = "default"): Promise<void> { await this.send("session.import", { data, tabId }); }
 
-  // ── Session persistence (opt-in) ──────────────────────────────────────────
-  // WS frames and pings are NOT saved by default — you must opt in.
-  // Files are written to cwd (same folder as cookies.json / profile.json).
-
-  /** Enable or disable saving WebSocket frames to ws.json in cwd */
-  async sessionWsSave(enabled = true): Promise<void> {
-    await this.send("session.ws.save", { enabled });
-  }
-
-  /** Enable or disable saving ping log to pings.json in cwd */
-  async sessionPingsSave(enabled = true): Promise<void> {
-    await this.send("session.pings.save", { enabled });
-  }
-
-  /** Get all data file paths for the current session */
-  async sessionPaths(): Promise<{
-    workDir: string;
-    cookies: string;
-    profile: string;
-    ws: string;
-    pings: string;
-  }> {
-    return this.send("session.paths", {});
-  }
-
-  /** Get path to cookies.json */
-  async sessionCookiesPath(): Promise<string> {
-    return this.send("session.cookies.path", {});
-  }
-
-  /** Get path to profile.json */
-  async sessionProfilePath(): Promise<string> {
-    return this.send("session.profile.path", {});
-  }
-
-  /** Get path to ws.json */
-  async sessionWsPath(): Promise<string> {
-    return this.send("session.ws.path", {});
-  }
-
-  /** Get path to pings.json */
-  async sessionPingsPath(): Promise<string> {
-    return this.send("session.pings.path", {});
-  }
-
-  /** Reload cookies.json and profile.json from disk without restarting */
-  async sessionReload(): Promise<void> {
-    await this.send("session.reload", {});
-  }
+  async sessionWsSave(enabled = true): Promise<void> { await this.send("session.ws.save", { enabled }); }
+  async sessionPingsSave(enabled = true): Promise<void> { await this.send("session.pings.save", { enabled }); }
+  async sessionPaths(): Promise<{ workDir: string; cookies: string; profile: string; ws: string; pings: string; }> { return this.send("session.paths", {}); }
+  async sessionCookiesPath(): Promise<string> { return this.send("session.cookies.path", {}); }
+  async sessionProfilePath(): Promise<string> { return this.send("session.profile.path", {}); }
+  async sessionWsPath(): Promise<string> { return this.send("session.ws.path", {}); }
+  async sessionPingsPath(): Promise<string> { return this.send("session.pings.path", {}); }
+  async sessionReload(): Promise<void> { await this.send("session.reload", {}); }
 
   // ── Expose Function ───────────────────────────────────────────────────────
   async exposeFunction(name: string, handler: (data: any) => Promise<any> | any, tabId = "default"): Promise<void> {
@@ -485,82 +461,28 @@ export class PiggyClient {
   }
 
   // ── Proxy ─────────────────────────────────────────────────────────────────
-
-  async proxyLoad(path: string): Promise<void> {
-    await this.send("proxy.load", { path });
-  }
-
-  async proxyFetch(url: string): Promise<void> {
-    await this.send("proxy.fetch", { url });
-  }
-
-  async proxyOvpn(path: string): Promise<void> {
-    await this.send("proxy.ovpn", { path });
-  }
+  async proxyLoad(path: string): Promise<void> { await this.send("proxy.load", { path }); }
+  async proxyFetch(url: string): Promise<void> { await this.send("proxy.fetch", { url }); }
+  async proxyOvpn(path: string): Promise<void> { await this.send("proxy.ovpn", { path }); }
 
   async proxySet(opts: {
-    host?: string;
-    port?: number;
+    host?: string; port?: number;
     type?: "http" | "https" | "socks5" | "socks4";
-    user?: string;
-    pass?: string;
-    proxy?: string;
-  }): Promise<void> {
-    await this.send("proxy.set", opts as Record<string, any>);
-  }
-
-  async proxyTest(): Promise<void> {
-    await this.send("proxy.test", {});
-  }
-
-  async proxyTestStop(): Promise<void> {
-    await this.send("proxy.test.stop", {});
-  }
-
-  async proxyNext(): Promise<void> {
-    await this.send("proxy.next", {});
-  }
-
-  async proxyDisable(): Promise<void> {
-    await this.send("proxy.disable", {});
-  }
-
-  async proxyEnable(): Promise<void> {
-    await this.send("proxy.enable", {});
-  }
-
-  async proxyCurrent(): Promise<{
-    host: string; port: number; type: string;
-    user?: string; alive: boolean; latencyMs?: number;
-  }> {
-    return this.send("proxy.current", {});
-  }
-
-  async proxyStats(): Promise<{
-    total: number; alive: number; dead: number;
-    index: number; checking: boolean;
-  }> {
-    return this.send("proxy.stats", {});
-  }
-
-  async proxyList(limit?: number): Promise<{
-    host: string; port: number; type: string;
-    alive: boolean; latencyMs?: number;
-  }[]> {
-    return this.send("proxy.list", limit !== undefined ? { limit } : {});
-  }
-
-  async proxyRotation(mode: "none" | "timed" | "perrequest", interval?: number): Promise<void> {
-    await this.send("proxy.rotation", { mode, ...(interval !== undefined ? { interval } : {}) });
-  }
-
-  async proxyConfig(opts: { skipDead?: boolean; autoCheck?: boolean }): Promise<void> {
-    await this.send("proxy.config", opts as Record<string, any>);
-  }
-
-  async proxySave(path: string, filter: "alive" | "dead" | "all" = "all"): Promise<void> {
-    await this.send("proxy.save", { path, filter });
-  }
+    user?: string; pass?: string; proxy?: string;
+  }): Promise<void> { await this.send("proxy.set", opts as Record<string, any>); }
+
+  async proxyTest(): Promise<void> { await this.send("proxy.test", {}); }
+  async proxyTestStop(): Promise<void> { await this.send("proxy.test.stop", {}); }
+  async proxyNext(): Promise<void> { await this.send("proxy.next", {}); }
+  async proxyDisable(): Promise<void> { await this.send("proxy.disable", {}); }
+  async proxyEnable(): Promise<void> { await this.send("proxy.enable", {}); }
+
+  async proxyCurrent(): Promise<{ host: string; port: number; type: string; user?: string; alive: boolean; latencyMs?: number; }> { return this.send("proxy.current", {}); }
+  async proxyStats(): Promise<{ total: number; alive: number; dead: number; index: number; checking: boolean; }> { return this.send("proxy.stats", {}); }
+  async proxyList(limit?: number): Promise<{ host: string; port: number; type: string; alive: boolean; latencyMs?: number; }[]> { return this.send("proxy.list", limit !== undefined ? { limit } : {}); }
+  async proxyRotation(mode: "none" | "timed" | "perrequest", interval?: number): Promise<void> { await this.send("proxy.rotation", { mode, ...(interval !== undefined ? { interval } : {}) }); }
+  async proxyConfig(opts: { skipDead?: boolean; autoCheck?: boolean }): Promise<void> { await this.send("proxy.config", opts as Record<string, any>); }
+  async proxySave(path: string, filter: "alive" | "dead" | "all" = "all"): Promise<void> { await this.send("proxy.save", { path, filter }); }
 
   onProxyEvent(event: string, handler: (data: any) => void): () => void {
     return this.onEvent(event, "*", handler);

package/piggy/expose/index.ts

@@ -0,0 +1,42 @@
+import { PiggyClient } from "../client";
+import logger from "../logger";
+
+export async function exposeFunction(
+  client: PiggyClient,
+  fnName: string,
+  handler: (data: any) => Promise<any> | any,
+  tabId: string
+): Promise<void> {
+  await client.exposeFunction(fnName, handler, tabId);
+  logger.success(`[${tabId}] exposed function: ${fnName}`);
+}
+
+export async function unexposeFunction(
+  client: PiggyClient,
+  fnName: string,
+  tabId: string
+): Promise<void> {
+  await client.unexposeFunction(fnName, tabId);
+  logger.info(`[${tabId}] unexposed function: ${fnName}`);
+}
+
+export async function clearExposedFunctions(
+  client: PiggyClient,
+  tabId: string
+): Promise<void> {
+  await client.clearExposedFunctions(tabId);
+  logger.info(`[${tabId}] cleared all exposed functions`);
+}
+
+export async function exposeAndInject(
+  client: PiggyClient,
+  fnName: string,
+  handler: (data: any) => Promise<any> | any,
+  injectionJs: string | ((fnName: string) => string),
+  tabId: string
+): Promise<void> {
+  await client.exposeFunction(fnName, handler, tabId);
+  const js = typeof injectionJs === "function" ? injectionJs(fnName) : injectionJs;
+  await client.evaluate(js, tabId);
+  logger.success(`[${tabId}] exposed and injected: ${fnName}`);
+}

package/piggy/find/index.ts

@@ -5,69 +5,35 @@ import { PiggyClient } from "../client";
 // Mirrors __nb_serialize() in PiggyFind.cpp
 
 export interface ElementDescriptor {
-  tag: string;
-  id: string;
-  cls: string;
+  tag:   string;
+  id:    string;
+  cls:   string;
   /** First 400 chars of innerText */
-  text: string;
+  text:  string;
   /** First 800 chars of innerHTML */
-  html: string;
-  href: string;
-  src: string;
+  html:  string;
+  href:  string;
+  src:   string;
   value: string;
   attrs: Record<string, string>;
 }
 
-// ─── Option types ─────────────────────────────────────────────────────────────
-
-export interface FindByTextOptions {
-  text: string;
-  /** Narrow the search to descendants of this CSS selector. */
-  selector?: string;
-  /** If true, innerText must match exactly (trimmed). Default: false. */
-  exact?: boolean;
-}
-
-export interface FindByAttrOptions {
-  attr: string;
-  /** If omitted, matches any element that has the attribute at all. */
-  value?: string;
-  /** Optionally scope to a parent selector. */
-  selector?: string;
-}
-
-export interface FindByRoleOptions {
-  role: string;
-  /** Filter by aria-label or innerText containing this string. */
-  name?: string;
-}
-
-export interface FindClosestOptions {
-  /** CSS selector for the starting element. */
-  selector: string;
-  /** CSS selector for the ancestor to climb to. */
-  ancestor: string;
-}
-
-export interface FindFilterOptions {
-  selector: string;
-  attr: string;
-  value: string;
-}
-
 // ─── FindClient ───────────────────────────────────────────────────────────────
+// find answers ONE question: "is this thing here, and where?"
+// All methods take plain selector strings — no option objects, no parent scoping.
+// If you need a value out of an element, use provide instead.
 
 export class FindClient {
   constructor(private client: PiggyClient) {}
 
-  // ── Multi-result queries ─────────────────────────────────────────────────────
+  // ── Multi-result ─────────────────────────────────────────────────────────────
 
   /** querySelectorAll — returns all matching elements. */
   css(selector: string, tabId = "default"): Promise<ElementDescriptor[]> {
     return this.client.send("find.css", { selector, tabId });
   }
 
-  /** Alias for css() — querySelectorAll. */
+  /** Alias for css(). */
   all(selector: string, tabId = "default"): Promise<ElementDescriptor[]> {
     return this.client.send("find.all", { selector, tabId });
   }
@@ -77,14 +43,14 @@ export class FindClient {
     return this.client.send("find.first", { selector, tabId });
   }
 
-  /** Find elements whose innerText contains (or exactly matches) the given text. */
-  byText(opts: FindByTextOptions, tabId = "default"): Promise<ElementDescriptor[]> {
-    return this.client.send("find.byText", { ...opts, tabId });
+  /** Find elements whose innerText contains the given text. */
+  byText(text: string, tabId = "default"): Promise<ElementDescriptor[]> {
+    return this.client.send("find.byText", { text, tabId });
   }
 
-  /** Find elements by attribute name and optional value. */
-  byAttr(opts: FindByAttrOptions, tabId = "default"): Promise<ElementDescriptor[]> {
-    return this.client.send("find.byAttr", { ...opts, tabId });
+  /** Find elements by attribute name (and optional value). */
+  byAttr(attr: string, value?: string, tabId = "default"): Promise<ElementDescriptor[]> {
+    return this.client.send("find.byAttr", { attr, value, tabId });
   }
 
   /** getElementsByTagName. */
@@ -97,9 +63,9 @@ export class FindClient {
     return this.client.send("find.byPlaceholder", { text, tabId });
   }
 
-  /** Find elements by ARIA role, optionally filtered by aria-label / innerText. */
-  byRole(opts: FindByRoleOptions, tabId = "default"): Promise<ElementDescriptor[]> {
-    return this.client.send("find.byRole", { ...opts, tabId });
+  /** Find elements by ARIA role, optionally filtered by accessible name. */
+  byRole(role: string, name?: string, tabId = "default"): Promise<ElementDescriptor[]> {
+    return this.client.send("find.byRole", { role, name, tabId });
   }
 
   /** Direct children of the matched element. */
@@ -107,42 +73,29 @@ export class FindClient {
     return this.client.send("find.children", { selector, tabId });
   }
 
-  /**
-   * Filter querySelectorAll results by attribute value substring.
-   * Equivalent to: querySelectorAll(selector).filter(el => el.attr.includes(value))
-   */
-  filter(opts: FindFilterOptions, tabId = "default"): Promise<ElementDescriptor[]> {
-    return this.client.send("find.filter", { ...opts, tabId });
-  }
-
-  // ── Single-element traversal ──────────────────────────────────────────────
-
-  /** Walk up the DOM from selector until ancestor matches. */
-  closest(opts: FindClosestOptions, tabId = "default"): Promise<ElementDescriptor[]> {
-    return this.client.send("find.closest", { ...opts, tabId });
-  }
-
   /** parentElement of the matched element. */
   parent(selector: string, tabId = "default"): Promise<ElementDescriptor[]> {
     return this.client.send("find.parent", { selector, tabId });
   }
 
-  // ── Boolean / numeric queries ─────────────────────────────────────────────
+  /** Walk up the DOM from selector until ancestor matches. */
+  closest(selector: string, ancestor: string, tabId = "default"): Promise<ElementDescriptor[]> {
+    return this.client.send("find.closest", { selector, ancestor, tabId });
+  }
+
+  // ── Boolean / numeric ────────────────────────────────────────────────────────
 
   /** Number of elements matching the selector. */
   count(selector: string, tabId = "default"): Promise<number> {
     return this.client.send("find.count", { selector, tabId });
   }
 
-  /** True if at least one element matches the selector. */
+  /** True if at least one element matches. */
   exists(selector: string, tabId = "default"): Promise<boolean> {
     return this.client.send("find.exists", { selector, tabId });
   }
 
-  /**
-   * True if the first matched element is visible
-   * (display !== none, visibility !== hidden, opacity !== 0).
-   */
+  /** True if the first matched element is visible. */
   visible(selector: string, tabId = "default"): Promise<boolean> {
     return this.client.send("find.visible", { selector, tabId });
   }
@@ -158,7 +111,7 @@ export class FindClient {
   }
 }
 
-// ── Factory helper ────────────────────────────────────────────────────────────
+// ─── Factory helper ───────────────────────────────────────────────────────────
 
 export function createFindAPI(client: PiggyClient): FindClient {
   return new FindClient(client);

package/piggy/provide/index.ts

@@ -1,6 +1,29 @@
 // piggy/provide/index.ts
 import { PiggyClient } from "../client";
 
+// ─── Shared base option ───────────────────────────────────────────────────────
+// Every provide method targets a selector, and optionally scopes under a parent.
+
+export interface ProvideOptions {
+  /** CSS selector for the target element(s). */
+  selector: string;
+  /**
+   * Optional parent selector to scope the query under.
+   * Equivalent to: parent.querySelector(selector)
+   */
+  parent?: string;
+}
+
+export interface ProvideAttrOptions extends ProvideOptions {
+  /** The attribute name to extract. */
+  attr: string;
+}
+
+export interface ProvideListOptions extends ProvideOptions {
+  /** Optional child selector to scope list items. */
+  itemSel?: string;
+}
+
 // ─── Return types ─────────────────────────────────────────────────────────────
 
 export interface ProvideTable {
@@ -54,86 +77,89 @@ export interface ProvideSelect {
 }
 
 // ─── ProvideClient ────────────────────────────────────────────────────────────
+// provide answers ONE question: "give me the actual value from this element."
+// All methods take an options object { selector, parent? } so scoping is consistent.
+// If you just want to know if something exists, use find instead.
 
 export class ProvideClient {
   constructor(private client: PiggyClient) {}
 
   /** innerText of the first matched element. */
-  text(selector: string, tabId = "default"): Promise<string> {
-    return this.client.send("provide.text", { selector, tabId });
+  text(opts: ProvideOptions, tabId = "default"): Promise<string> {
+    return this.client.send("provide.text", { ...opts, tabId });
   }
 
   /** innerText of all matched elements. */
-  textAll(selector: string, tabId = "default"): Promise<string[]> {
-    return this.client.send("provide.textAll", { selector, tabId });
+  textAll(opts: ProvideOptions, tabId = "default"): Promise<string[]> {
+    return this.client.send("provide.textAll", { ...opts, tabId });
   }
 
   /** Single attribute value from the first matched element. */
-  attr(selector: string, attr: string, tabId = "default"): Promise<string> {
-    return this.client.send("provide.attr", { selector, attr, tabId });
+  attr(opts: ProvideAttrOptions, tabId = "default"): Promise<string> {
+    return this.client.send("provide.attr", { ...opts, tabId });
   }
 
   /** Attribute value from all matched elements. */
-  attrAll(selector: string, attr: string, tabId = "default"): Promise<string[]> {
-    return this.client.send("provide.attrAll", { selector, attr, tabId });
+  attrAll(opts: ProvideAttrOptions, tabId = "default"): Promise<string[]> {
+    return this.client.send("provide.attrAll", { ...opts, tabId });
   }
 
   /** innerHTML of the first matched element. */
-  html(selector: string, tabId = "default"): Promise<string> {
-    return this.client.send("provide.html", { selector, tabId });
+  html(opts: ProvideOptions, tabId = "default"): Promise<string> {
+    return this.client.send("provide.html", { ...opts, tabId });
   }
 
   /** Extract a table into headers + rows. */
-  table(selector: string, tabId = "default"): Promise<ProvideTable> {
-    return this.client.send("provide.table", { selector, tabId });
+  table(opts: ProvideOptions, tabId = "default"): Promise<ProvideTable> {
+    return this.client.send("provide.table", { ...opts, tabId });
   }
 
-  /** Extract a list of text items. Optionally scope items with itemSel. */
-  list(selector: string, itemSel?: string, tabId = "default"): Promise<string[]> {
-    return this.client.send("provide.list", { selector, itemSel, tabId });
+  /** Extract a list of text items, optionally scoped to child items. */
+  list(opts: ProvideListOptions, tabId = "default"): Promise<string[]> {
+    return this.client.send("provide.list", { ...opts, tabId });
   }
 
-  /** All links inside an optional selector. */
-  links(selector?: string, tabId = "default"): Promise<ProvideLink[]> {
-    return this.client.send("provide.links", { selector, tabId });
+  /** All links inside the matched selector. */
+  links(opts: ProvideOptions, tabId = "default"): Promise<ProvideLink[]> {
+    return this.client.send("provide.links", { ...opts, tabId });
   }
 
-  /** All images inside an optional selector. */
-  images(selector?: string, tabId = "default"): Promise<ProvideImage[]> {
-    return this.client.send("provide.images", { selector, tabId });
+  /** All images inside the matched selector. */
+  images(opts: ProvideOptions, tabId = "default"): Promise<ProvideImage[]> {
+    return this.client.send("provide.images", { ...opts, tabId });
   }
 
   /** Form field name→value map. */
-  form(selector: string, tabId = "default"): Promise<ProvideForm> {
-    return this.client.send("provide.form", { selector, tabId });
+  form(opts: ProvideOptions, tabId = "default"): Promise<ProvideForm> {
+    return this.client.send("provide.form", { ...opts, tabId });
   }
 
-  /** Full page info: title, url, html, text. */
+  /** Full page info: title, url, html, text. No selector needed. */
   page(tabId = "default"): Promise<ProvidePage> {
     return this.client.send("provide.page", { tabId });
   }
 
-  /** Structured div: tag, id, cls, text, html, children[]. */
-  div(selector: string, tabId = "default"): Promise<ProvideDiv> {
-    return this.client.send("provide.div", { selector, tabId });
+  /** Structured div tree: tag, id, cls, text, html, children[]. */
+  div(opts: ProvideOptions, tabId = "default"): Promise<ProvideDiv> {
+    return this.client.send("provide.div", { ...opts, tabId });
   }
 
-  /** All <meta> name→content pairs. */
+  /** All <meta> name→content pairs. No selector needed. */
   meta(tabId = "default"): Promise<ProvideMeta> {
     return this.client.send("provide.meta", { tabId });
   }
 
   /** <select> current value + all options. */
-  select(selector: string, tabId = "default"): Promise<ProvideSelect> {
-    return this.client.send("provide.select", { selector, tabId });
+  select(opts: ProvideOptions, tabId = "default"): Promise<ProvideSelect> {
+    return this.client.send("provide.select", { ...opts, tabId });
   }
 
   /**
    * Parse JSON from element innerText or script[type=application/json].
    * selector is optional — defaults to the first matching JSON script tag.
    */
-  json(selector?: string, tabId = "default"): Promise<unknown> {
-    return this.client.send("provide.json", { selector, tabId });
+  json(opts?: Partial<ProvideOptions>, tabId = "default"): Promise<unknown> {
+    return this.client.send("provide.json", { ...opts, tabId });
   }
 }