@xbrowser/cli 1.1.1 → 1.2.0

package/dist/index.js

@@ -81,8 +81,8 @@ import {
   resolveLaunchOpts,
   saveSessionDiskMeta,
   setActivePage
-} from "./chunk-MWBVZWXA.js";
-import "./chunk-IX4JY6OO.js";
+} from "./chunk-6V57JME6.js";
+import "./chunk-QFROODUU.js";
 import "./chunk-TNEN6VQ2.js";
 import {
   errMsg
@@ -840,6 +840,21 @@ var waitForSelectorDef = {
   }
 };
 var waitCommand = registerCommand({ name: "wait", selectorParams: ["selector"], ...waitForSelectorDef });
+var waitForTimeoutCommand = registerCommand({
+  name: "waitForTimeout",
+  description: "Wait for a specified number of milliseconds",
+  scope: "project",
+  parameters: z4.object({
+    timeout: z4.number().describe("Milliseconds to wait").default(1e3)
+  }),
+  result: z4.object({
+    waited: z4.number()
+  }),
+  handler: async (p) => {
+    await new Promise((r) => setTimeout(r, p.timeout));
+    return ok4({ waited: p.timeout });
+  }
+});
 
 // src/commands/scroll.ts
 import { z as z5 } from "zod";
@@ -1705,7 +1720,7 @@ var healthCheckCommand = registerCommand({
             issues.push({
               severity: "error",
               category: "links",
-              message: `Broken link (fetch error): ${href} \u2014 ${errMsg(err) || "unknown"}`
+              message: `Broken link (fetch error): ${href} \u2014 ${(err instanceof Error ? err.message : String(err)) || "unknown"}`
             });
           }
         }
@@ -2381,9 +2396,53 @@ var scrapeCommand = registerCommand({
           }
           let content;
           switch (p.format) {
-            case "markdown":
+            case "markdown": {
+              const tablesMd = await page.evaluate(() => {
+                const tableSelectors = [
+                  "table",
+                  '[role="table"]',
+                  '[role="grid"]',
+                  '[class*="el-table"]',
+                  // Element UI
+                  '[class*="ant-table"]',
+                  // Ant Design
+                  '[class*="MuiTable"]',
+                  // Material UI
+                  '[class*="table"]'
+                  // Generic table-like
+                ].join(",");
+                const tables = document.querySelectorAll(tableSelectors);
+                if (tables.length === 0) return "";
+                return Array.from(tables).map((table) => {
+                  const rows = table.querySelectorAll('tr, [role="row"], [class*="row"]');
+                  if (rows.length === 0) return "";
+                  const mdRows = Array.from(rows).map((row) => {
+                    const cells = row.querySelectorAll('th, td, [role="columnheader"], [role="cell"], [class*="cell"], [class*="col"]');
+                    return "| " + Array.from(cells).map((c) => {
+                      const cellText = c.innerText?.trim().replace(/\n/g, " ") || "";
+                      return cellText.replace(/\|/g, "\\|") || "";
+                    }).join(" | ") + " |";
+                  }).join("\n");
+                  const headerRow = rows[0];
+                  const headerCells = headerRow.querySelectorAll('th, [role="columnheader"], [class*="header"]');
+                  const hasHeader = headerCells.length > 0;
+                  if (hasHeader && mdRows) {
+                    const headerCount = headerCells.length;
+                    const sep = "| " + Array(headerCount).fill("---").join(" | ") + " |";
+                    return mdRows.split("\n").map((line, i) => {
+                      if (i === 0) return line + "\n" + sep;
+                      return line;
+                    }).join("\n");
+                  }
+                  return mdRows;
+                }).join("\n\n");
+              });
               content = htmlToMarkdown(html, { onlyMainContent: p.onlyMainContent });
+              if (tablesMd) {
+                content = tablesMd + "\n\n" + content;
+              }
               break;
+            }
             case "html":
               content = html;
               break;
@@ -5600,6 +5659,7 @@ function parseCommandChain(input, options) {
         continue;
       }
       if (char === ";") {
+        lastOperator = "sequence";
         flushPipeline();
         continue;
       }
@@ -5654,6 +5714,7 @@ registerCommandDefinition("uncheck", ["selector"]);
 registerCommandDefinition("hover", ["selector"]);
 registerCommandDefinition("dblclick", ["selector"]);
 registerCommandDefinition("wait", ["selector"]);
+registerCommandDefinition("waitForTimeout", ["timeout"]);
 registerCommandDefinition("screenshot", []);
 registerCommandDefinition("eval", ["expression"]);
 registerCommandDefinition("scroll", ["direction"]);
@@ -7289,7 +7350,7 @@ async function executeCommand(commandName, params, sessionName = "default", extr
   }
   let targetPageOverride = null;
   if (_target && extraOpts?.cdpEndpoint) {
-    const { findTargetPage } = await import("./browser-5FR3B57B.js");
+    const { findTargetPage } = await import("./browser-JP2LFPR2.js");
     targetPageOverride = await findTargetPage(extraOpts.cdpEndpoint, _target);
     if (!targetPageOverride) {
       return errorResult(`Target "${_target}" not found. Use 'xbrowser targets --cdp ${extraOpts.cdpEndpoint}' to list available pages.`);
@@ -9817,7 +9878,17 @@ var SELECTOR_COMMANDS = /* @__PURE__ */ new Set([
   "dblclick",
   "wait"
 ]);
+var CAMEL_TO_KEBAB = {
+  getCookies: "get-cookies",
+  setCookie: "set-cookie",
+  clearCookies: "clear-cookies",
+  getLocalStorage: "get-local-storage",
+  setLocalStorage: "set-local-storage",
+  clearLocalStorage: "clear-local-storage",
+  setViewport: "set-viewport"
+};
 async function handleBrowserCommand(command, args, options, sessionName, mode, cdpEndpoint) {
+  command = CAMEL_TO_KEBAB[command] || command;
   if (args.includes("--help") || args.includes("-h") || options.help || options.h) {
     const cmdDef = getCommand(command);
     if (cmdDef) {
@@ -9934,7 +10005,8 @@ async function handleBrowserCommand(command, args, options, sessionName, mode, c
         if (!args[0]) outputError(`Usage: xbrowser ${command} <url>`);
         cmdName = "goto";
         params = {
-          url: /^https?:\/\//i.test(args[0]) || /^wss?:\/\//i.test(args[0]) ? args[0] : "https://" + args[0],
+          // Don't prefix if URL already has a scheme (http, file, about, data, etc.)
+          url: /^(https?|wss?|file|about|data|chrome|blob):/i.test(args[0]) ? args[0] : /^[\w-]+(\.[\w-]+)+/.test(args[0]) || args[0].startsWith("localhost") ? "https://" + args[0] : args[0],
           waitUntil: options.waitUntil,
           ...options.timeout ? { timeout: Number(options.timeout) } : {}
         };
@@ -9946,7 +10018,7 @@ async function handleBrowserCommand(command, args, options, sessionName, mode, c
           type: options.type,
           selector: options.selector || options.s,
           base64: !!options.base64,
-          output: options.output || options.o
+          output: options.output || options.o || args[0]
         };
         break;
       case "eval":
@@ -9992,11 +10064,12 @@ async function handleBrowserCommand(command, args, options, sessionName, mode, c
         break;
       }
       case "mouse": {
-        const action = options.action || args.find((a) => ["move", "click", "dblclick", "down", "up"].includes(a));
-        const actionIdx = action ? args.indexOf(action) : -1;
-        const x = options.x !== void 0 ? Number(options.x) : actionIdx >= 0 && args[actionIdx + 1] ? Number(args[actionIdx + 1]) : void 0;
-        const y = options.y !== void 0 ? Number(options.y) : actionIdx >= 0 && args[actionIdx + 2] ? Number(args[actionIdx + 2]) : void 0;
-        if (!action || x === void 0 || y === void 0) {
+        const flatArgs = args.flatMap((a) => a.split(/\s+/).filter(Boolean));
+        const action = options.action || flatArgs.find((a) => ["move", "click", "dblclick", "down", "up"].includes(a));
+        const actionIdx = action ? flatArgs.indexOf(action) : -1;
+        const x = options.x !== void 0 ? Number(options.x) : actionIdx >= 0 && flatArgs[actionIdx + 1] ? Number(flatArgs[actionIdx + 1]) : void 0;
+        const y = options.y !== void 0 ? Number(options.y) : actionIdx >= 0 && flatArgs[actionIdx + 2] ? Number(flatArgs[actionIdx + 2]) : void 0;
+        if (!action || x === void 0 || y === void 0 || isNaN(x) || isNaN(y)) {
           outputError("Usage: xbrowser mouse <move|click|dblclick> <x> <y>\n       xbrowser mouse --action <action> --x <x> --y <y>");
         }
         cmdName = "mouse";
@@ -10182,6 +10255,7 @@ async function handleBrowserCommand(command, args, options, sessionName, mode, c
       outputResult(result.data, mode);
       console.error(`
   \u26A0\uFE0F  ${hint}`);
+      process.exit(1);
     } else {
       outputResult(result.data, mode);
     }
@@ -10276,11 +10350,6 @@ async function handleSession(args, options, mode, _cdpEndpoint) {
 }
 
 // src/cli/plugin-routes.ts
-var pluginLoader3 = null;
-function getPluginLoader2() {
-  if (!pluginLoader3) pluginLoader3 = new XBrowserPluginLoader();
-  return pluginLoader3;
-}
 async function buildRuntimePluginInfo() {
   const loader = await getPluginLoader();
   const sites = loader.getCore().loader.getSites();
@@ -10538,6 +10607,10 @@ async function handlePlugin(args, options, mode) {
       } else {
         result = await installer.installWithMarketplaceFallback(source, installOpts);
       }
+      try {
+        await (await getPluginLoader()).reloadPlugin(result.name);
+      } catch {
+      }
       outputResult(
         { ok: true, name: result.name, source: result.source, path: result.path },
         mode
@@ -10553,6 +10626,11 @@ async function handlePlugin(args, options, mode) {
         outputError(`Plugin "${name}" is not installed. Use 'xbrowser plugin list' to see installed plugins.`);
       }
       await installer.uninstall(name);
+      try {
+        const loader = await getPluginLoader();
+        await loader.reloadPlugin(name);
+      } catch {
+      }
       outputResult({ ok: true, name }, mode);
       break;
     }
@@ -10606,7 +10684,7 @@ Total: ${enrichedPlugins.length} plugins`);
     case "reload": {
       const name = subArgs[0];
       if (!name) outputError("Usage: xbrowser plugin reload <name>");
-      await getPluginLoader2().reloadPlugin(name);
+      (await getPluginLoader()).reloadPlugin(name);
       outputResult({ ok: true, name }, mode);
       break;
     }
@@ -10990,15 +11068,20 @@ async function handleExtract(args, _mode) {
   console.log(`
 Saved LLM summary: ${outputPath}`);
 }
-async function handleFilter(args, _mode) {
+async function handleFilter(args, _mode, options) {
   const filePath = args[0];
   const outputPath = args[1];
   if (!filePath || !outputPath) {
-    console.error("Usage: xbrowser filter <input.yaml> <output.yaml> [--exclude-types=type1,type2]");
+    console.error("Usage: xbrowser filter <input.yaml> <output.yaml> [--exclude type1,type2]");
     process.exit(1);
   }
   const { filterRecording: filterRecording2, parseExcludeTypes: parseExcludeTypes2 } = await import("./filter-3JQWBM5F.js");
-  const excludeTypes = parseExcludeTypes2(args.slice(2));
+  const excludeArgs = args.slice(2).concat(
+    Object.entries(options || {}).flatMap(
+      ([k, v]) => k.startsWith("exclude") ? [`--${k}${typeof v === "string" ? "=" + v : ""}`] : []
+    )
+  );
+  const excludeTypes = parseExcludeTypes2(excludeArgs);
   const result = filterRecording2(filePath, outputPath, excludeTypes);
   console.log(`Filtered ${filePath} -> ${outputPath}`);
   console.log(`  Original: ${result.originalCount}, After: ${result.filteredCount}, Removed: ${result.removed} (${result.percentage}%)`);
@@ -12449,10 +12532,18 @@ function extractCdpFromArgv(argv) {
 async function handleStdinMode(stdinCommands, argv) {
   const chain = stdinCommands.join(" && ");
   const cdpEndpoint = argv ? extractCdpFromArgv(argv) : void 0;
-  const chainResult = await executeChain(chain, { fileMode: true, cdpEndpoint });
+  const sessionName = argv ? extractSessionNameFromArgv(argv) : "default";
+  const chainResult = await executeChain(chain, { fileMode: true, cdpEndpoint, sessionName });
   printChainResult(chainResult);
   if (!chainResult.success) throw new Error("Command failed");
 }
+function extractSessionNameFromArgv(argv) {
+  for (let i = 0; i < argv.length; i++) {
+    if (argv[i] === "--session" && argv[i + 1]) return argv[i + 1];
+    if (typeof argv[i] === "string" && argv[i].startsWith("--session=")) return argv[i].slice(10);
+  }
+  return process.env.XBROWSER_SESSION || "default";
+}
 async function handleEvalMode(argv) {
   const evalCommands = parseEvalFlags(argv);
   if (evalCommands.length === 0) return;
@@ -12592,6 +12683,31 @@ async function routeCommand(argvIn, stdinCommands) {
       }
       return;
     }
+    const SUBCOMMAND_HELP = {
+      session: "session open|close|kill|list [--session <name>] [--cdp <endpoint>]",
+      plugin: "plugin install|uninstall|list|reload|schema|search|info <name>",
+      record: "record start|stop|status [--url <url>] [--name <flow>]",
+      daemon: "daemon status [--port <port>]",
+      replay: "replay <file> [--slow-mo <ms>] [--stop-on-error]",
+      create: "create <name> [--template static|dynamic|login|api]",
+      run: "run <file>",
+      serve: "serve [--port <port>] [--token <token>]",
+      remote: "remote <url> [command] [--token <token>]",
+      convert: "convert <file> [--to js|py|sh]",
+      extract: "extract <file> [--format json|yaml]",
+      filter: "filter <file> [--include <type>] [--exclude <type>]",
+      test: "test <name> [--cdp <endpoint>]",
+      viewer: "viewer [--session <name>]",
+      kill: "kill [--all]",
+      net: "net [--cdp <endpoint>]"
+    };
+    const subHelp = SUBCOMMAND_HELP[command];
+    if (subHelp) {
+      console.log(`
+  Usage: xbrowser ${subHelp}
+`);
+      return;
+    }
     showMainHelp();
     return;
   }
@@ -12629,7 +12745,7 @@ async function routeCommand(argvIn, stdinCommands) {
         await handleExtract(cmdArgs, mode);
         break;
       case "filter":
-        await handleFilter(cmdArgs, mode);
+        await handleFilter(cmdArgs, mode, options);
         break;
       case "run":
         if (!cmdArgs[0]) {
@@ -15865,7 +15981,7 @@ var DataCollector = class {
     return results;
   }
   async createBrowserContext() {
-    const { launch } = await import("./cdp-driver-LKNM6OQI.js");
+    const { launch } = await import("./cdp-driver-S5STYUZZ.js");
     const { browser } = await launch({
       headless: true,
       args: ["--no-sandbox", "--disable-setuid-sandbox"]

package/dist/{session-replayer-YWMSSZWC.js → session-replayer-IXLSCF5U.js}

@@ -31,7 +31,7 @@ var SessionReplayer = class {
     if (this.opts.page) {
       this.page = this.opts.page;
     } else if (this.opts.cdpUrl) {
-      const { launch } = await import("./cdp-driver-LKNM6OQI.js");
+      const { launch } = await import("./cdp-driver-S5STYUZZ.js");
       const { browser } = await launch({ cdpEndpoint: this.opts.cdpUrl });
       let contexts = browser.contexts();
       for (let i = 0; i < 10 && contexts.length === 0; i++) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xbrowser/cli",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "Browser automation CLI for web scraping, headless browsing, SEO analysis, and AI agent workflows. A command-line alternative to Playwright, Puppeteer, and Selenium.",
   "type": "module",
   "bin": {
@@ -96,7 +96,7 @@
     "sharp": "^0.34.5",
     "turndown": "^7.2.4",
     "turndown-plugin-gfm": "^1.0.2",
-    "ws": "^8.20.0",
+    "ws": "^8.21.0",
     "yaml": "^2.8.4",
     "zod": "^3.24.0"
   },