@optima-chat/browser-cli 0.10.0 → 0.10.2

package/dist/index.js

@@ -22,24 +22,33 @@ var ENV_CONFIG = {
   // alicloud/stacks/cn-prod-ingress-sae/main.tf 的 yzsgo_sub=browser-api）。
   "cn-prod": {
     apiUrl: "https://browser-api.yzsgo.com"
+  },
+  // 阿里云 cn-stage 预发（独立于 AWS stage 的 .optima.onl；权威映射见 optima-terraform
+  // alicloud/stacks/cn-stage-ingress-sae/main.tf：browser-backend → sub=browser-api，
+  // 通配证书 *.stage.optima.chat 覆盖）。
+  // 漏这一档的后果：cn-stage 容器 OPTIMA_ENV=cn-stage → agent-runtime 写
+  // token.json.env="cn-stage" → 下面 fail-loud 抛 Unknown environment，而那句 throw
+  // 在模块加载期就执行，browser-cli 在任何子命令跑起来之前直接死掉。
+  // optima-scout 撞过同一个 bug（optima-gateway#1384 P0-2）。
+  "cn-stage": {
+    apiUrl: "https://browser-api.stage.optima.chat"
   }
 };
+function isBrowserEnv(value) {
+  return Object.prototype.hasOwnProperty.call(ENV_CONFIG, value);
+}
+var TOKEN_ENV_MAP = {
+  prod: "production",
+  production: "production",
+  stage: "stage",
+  ci: "development",
+  development: "development",
+  "cn-prod": "cn-prod",
+  "cn-stage": "cn-stage"
+};
 var OPTIMA_TOKEN_FILE = join(homedir(), ".optima", "token.json");
 function tokenEnvToBrowserEnv(tokenEnv) {
-  switch (tokenEnv) {
-    case "prod":
-    case "production":
-      return "production";
-    case "stage":
-      return "stage";
-    case "ci":
-    case "development":
-      return "development";
-    case "cn-prod":
-      return "cn-prod";
-    default:
-      return null;
-  }
+  return Object.prototype.hasOwnProperty.call(TOKEN_ENV_MAP, tokenEnv) ? TOKEN_ENV_MAP[tokenEnv] : null;
 }
 function readOptimaToken() {
   if (!existsSync(OPTIMA_TOKEN_FILE)) return null;
@@ -51,11 +60,11 @@ function readOptimaToken() {
 }
 function getCurrentEnv() {
   const browserEnv = process.env.BROWSER_ENV;
-  if (browserEnv && ["production", "stage", "development", "cn-prod"].includes(browserEnv)) {
+  if (browserEnv && isBrowserEnv(browserEnv)) {
     return browserEnv;
   }
   const optimaEnv = process.env.OPTIMA_ENV;
-  if (optimaEnv && ["production", "stage", "development", "cn-prod"].includes(optimaEnv)) {
+  if (optimaEnv && isBrowserEnv(optimaEnv)) {
     return optimaEnv;
   }
   const optimaToken = readOptimaToken();
@@ -63,7 +72,7 @@ function getCurrentEnv() {
     const mapped = tokenEnvToBrowserEnv(optimaToken.env);
     if (mapped) return mapped;
     throw new Error(
-      `Unknown environment "${optimaToken.env}" in ~/.optima/token.json. Known environments: prod, stage, ci, cn-prod. Upgrade browser-cli to a version that knows this environment, or set BROWSER_API_URL to override the endpoint explicitly.`
+      `Unknown environment "${optimaToken.env}" in ~/.optima/token.json. Known environments: ${Object.keys(TOKEN_ENV_MAP).join(", ")}. Upgrade browser-cli to a version that knows this environment, or set BROWSER_API_URL to override the endpoint explicitly.`
     );
   }
   return "development";
@@ -174,13 +183,14 @@ async function requestBinary(path) {
   return Buffer.from(arrayBuffer);
 }
 var BrowserAPI = class {
-  async createSession(url, force, connector, ziniaoProfileId, bitbrowserProfileId) {
+  async createSession(url, force, connector, ziniaoProfileId, bitbrowserProfileId, feikuaProfileId) {
     const body = {};
     if (url) body.url = url;
     if (force) body.force = true;
     if (connector) body.connector = connector;
     if (ziniaoProfileId) body.ziniao_profile_id = ziniaoProfileId;
     if (bitbrowserProfileId) body.bitbrowser_profile_id = bitbrowserProfileId;
+    if (feikuaProfileId) body.feikua_profile_id = feikuaProfileId;
     return request("/api/sessions", {
       method: "POST",
       body: JSON.stringify(body)
@@ -204,6 +214,11 @@ var BrowserAPI = class {
   async getBitBrowserProfiles() {
     return request("/api/user/bitbrowser-profiles");
   }
+  // paired_count = 配对过的店铺浏览器总数(含没在运行的)。老桌面端不返回它,
+  // 所以是可选的 —— 缺失时调用方只能退回「从未配对」的指引。
+  async getFeikuaProfiles() {
+    return request("/api/user/feikua-profiles");
+  }
   async closeSession(sessionId) {
     await request(`/api/sessions/${sessionId}`, { method: "DELETE" });
   }
@@ -234,8 +249,18 @@ var BrowserAPI = class {
   async input(sessionId, index, text, clear = true) {
     return this.actThenState(sessionId, "input", { index, text, clear });
   }
-  async scroll(sessionId, down, pages = 1) {
-    return this.actThenState(sessionId, "scroll", { down, pages });
+  async scroll(sessionId, down, pages = 1, index) {
+    return this.actThenState(sessionId, "scroll", {
+      down,
+      pages,
+      ...index === void 0 ? {} : { index }
+    });
+  }
+  async clickTo(sessionId, selector, native = false) {
+    return this.actThenState(sessionId, "click_to", { selector, ...native ? { native } : {} });
+  }
+  async scrollTo(sessionId, selector) {
+    return this.actThenState(sessionId, "scroll_to", { selector });
   }
   async keys(sessionId, keys) {
     return this.actThenState(sessionId, "keys", { keys });
@@ -333,11 +358,12 @@ var BrowserAPI = class {
   async deleteScript(name) {
     await request(`/api/scripts/${encodeURIComponent(name)}`, { method: "DELETE" });
   }
-  async runScript(scriptName, params = {}, connector, ziniaoProfileId, bitbrowserProfileId) {
+  async runScript(scriptName, params = {}, connector, ziniaoProfileId, bitbrowserProfileId, feikuaProfileId) {
     const payload = { params };
     if (connector) payload.connector = connector;
     if (ziniaoProfileId) payload.ziniao_profile_id = ziniaoProfileId;
     if (bitbrowserProfileId) payload.bitbrowser_profile_id = bitbrowserProfileId;
+    if (feikuaProfileId) payload.feikua_profile_id = feikuaProfileId;
     return request(`/api/scripts/${encodeURIComponent(scriptName)}/run`, {
       method: "POST",
       body: JSON.stringify(payload)
@@ -441,7 +467,12 @@ function formatFind(result) {
   const lines = [`Found ${result.total} element(s):`, ""];
   for (const match of result.matches) {
     const attrs = Object.entries(match.attributes).map(([k, v]) => `${k}="${v}"`).join(" ");
-    lines.push(`  [${match.index}] <${match.tag} ${attrs}>`);
+    const state = Object.entries(match.state ?? {}).filter(([, v]) => v).map(([k]) => k).join(" ");
+    const head = `  [${match.index}] <${match.tag} ${attrs}>`;
+    lines.push(state ? `${head} [${state}]` : head);
+    if (match.text) {
+      lines.push(`      ${match.text}`);
+    }
   }
   return lines.join("\n");
 }
@@ -460,9 +491,9 @@ function formatTabsInline(tabs) {
 
 // src/commands/lifecycle.ts
 function registerLifecycleCommands(program2) {
-  program2.command("launch").description("Launch a browser session").option("--url <url>", "Navigate to URL after launch").option("--force", "Close existing session before launching").option("--connector <type>", "Browser connector: chrome, ziniao, or bitbrowser").option("--ziniao-profile <id>", "ZiNiao browser profile ID").option("--bitbrowser-profile <id>", "BitBrowser profile ID").action(async (opts) => {
+  program2.command("launch").description("Launch a browser session").option("--url <url>", "Navigate to URL after launch").option("--force", "Close existing session before launching").option("--connector <type>", "Browser connector: chrome, ziniao, bitbrowser, or feikua").option("--ziniao-profile <id>", "ZiNiao browser profile ID").option("--bitbrowser-profile <id>", "BitBrowser profile ID").option("--feikua-profile <id>", "Feikua (\u98DE\u8DE8) shop browser instance ID").action(async (opts) => {
     try {
-      const state = await api.createSession(opts.url, opts.force, opts.connector, opts.ziniaoProfile, opts.bitbrowserProfile);
+      const state = await api.createSession(opts.url, opts.force, opts.connector, opts.ziniaoProfile, opts.bitbrowserProfile, opts.feikuaProfile);
       saveSessionId(state.session_id);
       console.log(formatLaunch(state));
     } catch (err) {
@@ -554,12 +585,36 @@ function registerInteractionCommands(program2) {
       process.exit(1);
     }
   });
-  program2.command("scroll").description("Scroll the page up or down").argument("<direction>", "Scroll direction: up or down").option("--pages <n>", "Number of pages to scroll", "1").action(async (direction, opts) => {
+  program2.command("scroll").description("Scroll the page up or down").argument("<direction>", "Scroll direction: up or down").option("--pages <n>", "Number of pages to scroll", "1").option(
+    "--index <n>",
+    "Scroll inside this element instead of the window (for pages with inner scroll containers)"
+  ).action(async (direction, opts) => {
     try {
       const sessionId = loadSessionId();
       const down = direction.toLowerCase() === "down";
       const pages = parseInt(opts.pages, 10);
-      const state = await api.scroll(sessionId, down, pages);
+      const index = opts.index === void 0 ? void 0 : parseInt(opts.index, 10);
+      const state = await api.scroll(sessionId, down, pages, index);
+      console.log(formatPageState(state));
+    } catch (err) {
+      console.error(formatError(err));
+      process.exit(1);
+    }
+  });
+  program2.command("click-to").description("Click the element matching a CSS selector (for elements with no DOM index)").argument("<selector>", "CSS selector of the element to click").option("--native", "Dispatch real mouse events (for controls that ignore synthetic clicks)").action(async (selector, opts) => {
+    try {
+      const sessionId = loadSessionId();
+      const state = await api.clickTo(sessionId, selector, opts.native === true);
+      console.log(formatPageState(state));
+    } catch (err) {
+      console.error(formatError(err));
+      process.exit(1);
+    }
+  });
+  program2.command("scroll-to").description("Scroll the element matching a CSS selector into view").argument("<selector>", "CSS selector of the element to scroll into view").action(async (selector) => {
+    try {
+      const sessionId = loadSessionId();
+      const state = await api.scrollTo(sessionId, selector);
       console.log(formatPageState(state));
     } catch (err) {
       console.error(formatError(err));
@@ -685,7 +740,8 @@ var POLL_INTERVAL_MS = 2e3;
 var POLL_TIMEOUT_MS = 18e4;
 var REQUIRED_ARG_FLAG = {
   ziniao_profile_id: "--ziniao-profile <id>",
-  bitbrowser_profile_id: "--bitbrowser-profile <id>"
+  bitbrowser_profile_id: "--bitbrowser-profile <id>",
+  feikua_profile_id: "--feikua-profile <id>"
 };
 function formatRequiredArgs(s) {
   if (!s.required_args?.length) return null;
@@ -801,7 +857,7 @@ function registerScriptCommands(program2) {
       process.exit(1);
     }
   });
-  program2.command("runscript").argument("<name>", "Script name").description("Run a script (polls until complete)").option("--param <params...>", "Parameters as key=value").option("--connector <type>", "Browser connector: chrome, ziniao, or bitbrowser").option("--ziniao-profile <id>", "ZiNiao browser profile ID (with --connector ziniao)").option("--bitbrowser-profile <id>", "BitBrowser profile ID (with --connector bitbrowser)").option("--out <path>", "Where to write the script's exported file (default: ./<filename>)").option("--no-poll", "Return immediately without polling").action(async (name, opts) => {
+  program2.command("runscript").argument("<name>", "Script name").description("Run a script (polls until complete)").option("--param <params...>", "Parameters as key=value").option("--connector <type>", "Browser connector: chrome, ziniao, bitbrowser, or feikua").option("--ziniao-profile <id>", "ZiNiao browser profile ID (with --connector ziniao)").option("--bitbrowser-profile <id>", "BitBrowser profile ID (with --connector bitbrowser)").option("--feikua-profile <id>", "Feikua (\u98DE\u8DE8) shop browser instance ID (with --connector feikua)").option("--out <path>", "Where to write the script's exported file (default: ./<filename>)").option("--no-poll", "Return immediately without polling").action(async (name, opts) => {
     try {
       const params = {};
       if (opts.param) {
@@ -812,7 +868,7 @@ function registerScriptCommands(program2) {
       }
       if (opts.out) params.out_path = resolve(opts.out);
       clearSessionId();
-      const task = await api.runScript(name, params, opts.connector, opts.ziniaoProfile, opts.bitbrowserProfile);
+      const task = await api.runScript(name, params, opts.connector, opts.ziniaoProfile, opts.bitbrowserProfile, opts.feikuaProfile);
       console.log(`Script started (task: ${task.id})`);
       if (!opts.poll) {
         console.log(`Poll with: browser-cli script-task ${task.id}`);
@@ -1104,6 +1160,41 @@ function registerBitBrowserCommands(program2) {
   });
 }
 
+// src/commands/feikua.ts
+function registerFeikuaCommands(program2) {
+  const feikua = program2.command("feikua").description("Manage Feikua (\u98DE\u8DE8) anti-detect browser");
+  feikua.command("profiles").description("List paired Feikua shop browsers (requires Desktop app online + extension paired)").action(async () => {
+    try {
+      const result = await api.getFeikuaProfiles();
+      if (!result.connected) {
+        console.log(formatDesktopNotConnected(result));
+        process.exit(1);
+      }
+      if (result.profiles.length === 0) {
+        if (result.paired_count) {
+          console.log(
+            `${result.paired_count} paired shop browser(s), but none are running. Open the Feikua shop browser you paired, then retry.`
+          );
+          return;
+        }
+        console.log(
+          'No paired shop browsers. Open the desktop app tray and choose "Pair a Shop Browser", then follow the on-screen code.'
+        );
+        return;
+      }
+      console.log(`Feikua shop browsers (${result.profiles.length}):
+`);
+      for (const p of result.profiles) {
+        console.log(`  ${p.id}  ${p.name}`);
+      }
+      console.log("\nUse: browser-cli launch --connector feikua --feikua-profile <id> --url <url>");
+    } catch (err) {
+      console.error(formatError(err));
+      process.exit(1);
+    }
+  });
+}
+
 // src/commands/files.ts
 function registerFileCommands(program2) {
   program2.command("send-file").description("Send a file from your workspace to your local download folder").requiredOption("--src <path>", "Source path in your workspace (e.g. ~/output/report.pdf)").requiredOption("--dest <path>", "Destination path relative to the download folder").action(async (opts) => {
@@ -1137,5 +1228,6 @@ registerScriptCommands(program);
 registerZiNiaoCommands(program);
 registerRecipeCommands(program);
 registerBitBrowserCommands(program);
+registerFeikuaCommands(program);
 registerFileCommands(program);
 program.parse();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optima-chat/browser-cli",
-  "version": "0.10.0",
+  "version": "0.10.2",
   "type": "module",
   "main": "./dist/index.js",
   "bin": {