browserclaw 0.2.4 → 0.2.6

package/README.md

@@ -1,7 +1,9 @@
-# browserclaw
+<h2 align="center">🦞 BrowserClaw — Standalone OpenClaw browser module</h1>
 
-[![npm version](https://img.shields.io/npm/v/browserclaw.svg)](https://www.npmjs.com/package/browserclaw)
-[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](./LICENSE)
+<p align="center">
+  <a href="https://www.npmjs.com/package/browserclaw"><img src="https://img.shields.io/npm/v/browserclaw.svg" alt="npm version" /></a>
+  <a href="./LICENSE"><img src="https://img.shields.io/badge/License-MIT-blue.svg" alt="License: MIT" /></a>
+</p>
 
 Extracted and refined from [OpenClaw](https://github.com/openclaw/openclaw)'s browser automation module. A standalone, typed library for AI-friendly browser control with **snapshot + ref targeting** — no CSS selectors, no XPath, no vision, just numbered refs that map to interactive elements.
 

package/dist/index.cjs

@@ -408,7 +408,8 @@ async function launchChrome(opts = {}) {
       args.push("--no-sandbox", "--disable-setuid-sandbox");
     }
     if (process.platform === "linux") args.push("--disable-dev-shm-usage");
-    if (opts.chromeArgs?.length) args.push(...opts.chromeArgs);
+    const extraArgs = Array.isArray(opts.chromeArgs) ? opts.chromeArgs.filter((a) => typeof a === "string" && a.trim().length > 0) : [];
+    if (extraArgs.length) args.push(...extraArgs);
     args.push("about:blank");
     return child_process.spawn(exe.path, args, {
       stdio: "pipe",
@@ -701,10 +702,20 @@ async function pageTargetId(page) {
 }
 async function findPageByTargetId(browser, targetId, cdpUrl) {
   const pages = await getAllPages(browser);
+  let resolvedViaCdp = false;
   for (const page of pages) {
-    const tid = await pageTargetId(page).catch(() => null);
+    let tid = null;
+    try {
+      tid = await pageTargetId(page);
+      resolvedViaCdp = true;
+    } catch {
+      tid = null;
+    }
     if (tid && tid === targetId) return page;
   }
+  if (!resolvedViaCdp && pages.length === 1) {
+    return pages[0];
+  }
   if (cdpUrl) {
     try {
       const listUrl = `${cdpUrl.replace(/\/+$/, "").replace(/^ws:/, "http:").replace(/\/cdp$/, "")}/json/list`;
@@ -835,6 +846,27 @@ function getIndentLevel(line) {
   const match = line.match(/^(\s*)/);
   return match ? Math.floor(match[1].length / 2) : 0;
 }
+function matchInteractiveSnapshotLine(line, options) {
+  const depth = getIndentLevel(line);
+  if (options.maxDepth !== void 0 && depth > options.maxDepth) {
+    return null;
+  }
+  const match = line.match(/^(\s*-\s*)(\w+)(?:\s+"([^"]*)")?(.*)$/);
+  if (!match) {
+    return null;
+  }
+  const [, , roleRaw, name, suffix] = match;
+  if (roleRaw.startsWith("/")) {
+    return null;
+  }
+  const role = roleRaw.toLowerCase();
+  return {
+    roleRaw,
+    role,
+    ...name ? { name } : {},
+    suffix
+  };
+}
 function createRoleNameTracker() {
   const counts = /* @__PURE__ */ new Map();
   const refsByKey = /* @__PURE__ */ new Map();
@@ -908,14 +940,11 @@ function buildRoleSnapshotFromAriaSnapshot(ariaSnapshot, options = {}) {
   if (options.interactive) {
     const result2 = [];
     for (const line of lines) {
-      const depth = getIndentLevel(line);
-      if (options.maxDepth !== void 0 && depth > options.maxDepth) continue;
-      const match = line.match(/^(\s*-\s*)(\w+)(?:\s+"([^"]*)")?(.*)$/);
-      if (!match) continue;
-      const [, prefix, roleRaw, name, suffix] = match;
-      if (roleRaw.startsWith("/")) continue;
-      const role = roleRaw.toLowerCase();
+      const parsed = matchInteractiveSnapshotLine(line, options);
+      if (!parsed) continue;
+      const { roleRaw, role, name, suffix } = parsed;
       if (!INTERACTIVE_ROLES.has(role)) continue;
+      const prefix = line.match(/^(\s*-\s*)/)?.[1] ?? "";
       const ref = nextRef();
       const nth = tracker.getNextIndex(role, name);
       tracker.trackRef(role, name, ref);
@@ -978,16 +1007,13 @@ function buildRoleSnapshotFromAiSnapshot(aiSnapshot, options = {}) {
   if (options.interactive) {
     const out2 = [];
     for (const line of lines) {
-      const depth = getIndentLevel(line);
-      if (options.maxDepth !== void 0 && depth > options.maxDepth) continue;
-      const match = line.match(/^(\s*-\s*)(\w+)(?:\s+"([^"]*)")?(.*)$/);
-      if (!match) continue;
-      const [, prefix, roleRaw, name, suffix] = match;
-      if (roleRaw.startsWith("/")) continue;
-      const role = roleRaw.toLowerCase();
+      const parsed = matchInteractiveSnapshotLine(line, options);
+      if (!parsed) continue;
+      const { roleRaw, role, name, suffix } = parsed;
       if (!INTERACTIVE_ROLES.has(role)) continue;
       const ref = parseAiSnapshotRef(suffix);
       if (!ref) continue;
+      const prefix = line.match(/^(\s*-\s*)/)?.[1] ?? "";
       refs[ref] = { role, ...name ? { name } : {} };
       out2.push(`${prefix}${roleRaw}${name ? ` "${name}"` : ""}${suffix}`);
     }
@@ -1380,6 +1406,60 @@ function assertSafeOutputPath(path2, allowedRoots) {
     }
   }
 }
+function expandIPv6(ip) {
+  let normalized = ip;
+  const v4Match = normalized.match(/^(.+:)(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/);
+  if (v4Match) {
+    const octets = v4Match[2].split(".").map(Number);
+    if (octets.some((o) => o > 255)) return null;
+    const hexHi = (octets[0] << 8 | octets[1]).toString(16).padStart(4, "0");
+    const hexLo = (octets[2] << 8 | octets[3]).toString(16).padStart(4, "0");
+    normalized = v4Match[1] + hexHi + ":" + hexLo;
+  }
+  const halves = normalized.split("::");
+  if (halves.length > 2) return null;
+  if (halves.length === 2) {
+    const left = halves[0] !== "" ? halves[0].split(":") : [];
+    const right = halves[1] !== "" ? halves[1].split(":") : [];
+    const needed = 8 - left.length - right.length;
+    if (needed < 0) return null;
+    const groups2 = [...left, ...Array(needed).fill("0"), ...right];
+    if (groups2.length !== 8) return null;
+    return groups2.map((g) => g.padStart(4, "0")).join(":");
+  }
+  const groups = normalized.split(":");
+  if (groups.length !== 8) return null;
+  return groups.map((g) => g.padStart(4, "0")).join(":");
+}
+function hexToIPv4(hiHex, loHex) {
+  const hi = parseInt(hiHex, 16);
+  const lo = parseInt(loHex, 16);
+  return `${hi >> 8 & 255}.${hi & 255}.${lo >> 8 & 255}.${lo & 255}`;
+}
+function extractEmbeddedIPv4(lower) {
+  if (lower.startsWith("::ffff:")) {
+    return lower.slice(7);
+  }
+  const expanded = expandIPv6(lower);
+  if (expanded === null) return "";
+  const groups = expanded.split(":");
+  if (groups.length !== 8) return "";
+  if (groups[0] === "0064" && groups[1] === "ff9b" && groups[2] === "0000" && groups[3] === "0000" && groups[4] === "0000" && groups[5] === "0000") {
+    return hexToIPv4(groups[6], groups[7]);
+  }
+  if (groups[0] === "0064" && groups[1] === "ff9b" && groups[2] === "0001") {
+    return hexToIPv4(groups[6], groups[7]);
+  }
+  if (groups[0] === "2002") {
+    return hexToIPv4(groups[1], groups[2]);
+  }
+  if (groups[0] === "2001" && groups[1] === "0000") {
+    const hiXored = (parseInt(groups[6], 16) ^ 65535).toString(16).padStart(4, "0");
+    const loXored = (parseInt(groups[7], 16) ^ 65535).toString(16).padStart(4, "0");
+    return hexToIPv4(hiXored, loXored);
+  }
+  return null;
+}
 function isInternalIP(ip) {
   if (/^127\./.test(ip)) return true;
   if (/^10\./.test(ip)) return true;
@@ -1392,9 +1472,10 @@ function isInternalIP(ip) {
   if (lower === "::1") return true;
   if (lower.startsWith("fe80:")) return true;
   if (lower.startsWith("fc") || lower.startsWith("fd")) return true;
-  if (lower.startsWith("::ffff:")) {
-    const v4 = lower.replace(/^::ffff:/, "");
-    return isInternalIP(v4);
+  const embedded = extractEmbeddedIPv4(lower);
+  if (embedded !== null) {
+    if (embedded === "") return true;
+    return isInternalIP(embedded);
   }
   return false;
 }