@optima-chat/browser-cli 0.18.1 → 0.19.0

package/dist/index.js

@@ -785,6 +785,34 @@ import { tmpdir } from "os";
 import { basename, dirname, isAbsolute, join as join3, relative, resolve } from "path";
 var POLL_INTERVAL_MS = 2e3;
 var POLL_TIMEOUT_MS = 18e4;
+var WAIT_DEFAULT_TIMEOUT_S = 90;
+var WAIT_MAX_TIMEOUT_S = 570;
+var EXIT_TASK_STOPPED = 2;
+var EXIT_STILL_RUNNING = 3;
+async function waitForScriptTask(taskId, timeoutMs, first) {
+  const deadline = Date.now() + timeoutMs;
+  let task = first ?? await api.getScriptTask(taskId);
+  while (task.status === "running") {
+    const left = deadline - Date.now();
+    if (left <= 0) return { task, timedOut: true };
+    await sleep(Math.min(POLL_INTERVAL_MS, left));
+    task = await api.getScriptTask(taskId);
+  }
+  return { task, timedOut: false };
+}
+function parseWaitTimeout(raw) {
+  const n = Number(raw);
+  if (!/^\d+$/.test(raw.trim()) || !Number.isInteger(n) || n < 1 || n > WAIT_MAX_TIMEOUT_S) {
+    throw new Error(`--timeout \u987B\u4E3A 1\u2013${WAIT_MAX_TIMEOUT_S} \u7684\u6574\u6570\u79D2(bash \u786C\u4E0A\u9650 600s),\u6536\u5230 ${JSON.stringify(raw)}`);
+  }
+  return n;
+}
+function stillRunningMessage(task, waitedS, nowMs = Date.now()) {
+  const started = task.created_at ? Date.parse(task.created_at) : Number.NaN;
+  const elapsed = Number.isFinite(started) ? `running for ${Math.max(0, Math.round((nowMs - started) / 1e3))}s` : `waited ${waitedS}s`;
+  const step = task.total_steps ? `, step ${task.current_step}/${task.total_steps}` : "";
+  return `Still running (${elapsed}${step}). Call again as a separate command: browser-cli script-task ${task.id} --wait`;
+}
 var REQUIRED_ARG_FLAG = {
   ziniao_profile_id: "--ziniao-profile <id>",
   bitbrowser_profile_id: "--bitbrowser-profile <id>",
@@ -1018,18 +1046,13 @@ function registerScriptCommands(program2) {
       const task = await api.runScript(name, params, opts.connector, opts.ziniaoProfile, opts.bitbrowserProfile, opts.feikuaProfile, opts.chromeProfile);
       console.log(`Script started (task: ${task.id})`);
       if (!opts.poll) {
-        console.log(`Poll with: browser-cli script-task ${task.id}`);
+        console.log(`Wait with: browser-cli script-task ${task.id} --wait`);
         return;
       }
-      const deadline = Date.now() + POLL_TIMEOUT_MS;
-      let result = task;
-      while (result.status === "running" && Date.now() < deadline) {
-        await sleep(POLL_INTERVAL_MS);
-        result = await api.getScriptTask(task.id);
-      }
-      if (result.status === "running") {
+      const { task: result, timedOut } = await waitForScriptTask(task.id, POLL_TIMEOUT_MS, task);
+      if (timedOut) {
         console.log(`Polling timed out. Task ${task.id} still running.`);
-        console.log(`Poll with: browser-cli script-task ${task.id}`);
+        console.log(`Wait with: browser-cli script-task ${task.id} --wait`);
         return;
       }
       if (result.status === "needs_fallback" && result.session_id) {
@@ -1059,20 +1082,42 @@ ${downloadHint(result)}`);
       process.exit(1);
     }
   });
-  program2.command("script-task").argument("<task-id>", "Task ID").description("Check script task status").option("--download [path]", "Save the task's exported file (default: ./<filename>)").option("--json", "Print the raw task (status / error / full output) as JSON").action(async (taskId, opts) => {
+  program2.command("script-task").argument("<task-id>", "Task ID").description("Check script task status").option("--download [path]", "Save the task's exported file (default: ./<filename>)").option("--json", "Print the raw task (status / error / full output) as JSON").option(
+    "--wait",
+    `Block until the task finishes (completed / failed / needs_fallback), at most --timeout seconds. Exit code: 0 completed, 2 failed / needs_fallback, 3 still running (call again), 1 error`
+  ).option("--timeout <seconds>", `With --wait: max seconds to wait (default ${WAIT_DEFAULT_TIMEOUT_S}, max ${WAIT_MAX_TIMEOUT_S})`).action(async (taskId, opts) => {
     try {
       if (opts.json && opts.download !== void 0) {
         throw new Error("--json \u4E0E --download \u53EA\u80FD\u7ED9\u4E00\u4E2A");
       }
-      const task = await api.getScriptTask(taskId);
+      if (opts.timeout !== void 0 && !opts.wait) throw new Error("--timeout \u53EA\u80FD\u548C --wait \u4E00\u8D77\u7528");
+      const timeoutS = opts.timeout === void 0 ? WAIT_DEFAULT_TIMEOUT_S : parseWaitTimeout(opts.timeout);
+      let task;
+      if (opts.wait) {
+        const waited = await waitForScriptTask(taskId, timeoutS * 1e3);
+        task = waited.task;
+        if (waited.timedOut) {
+          if (opts.json) console.log(JSON.stringify(task, null, 2));
+          (opts.json ? console.error : console.log)(stillRunningMessage(task, timeoutS));
+          process.exit(EXIT_STILL_RUNNING);
+          return;
+        }
+      } else {
+        task = await api.getScriptTask(taskId);
+      }
+      const stoppedExit = () => {
+        if (opts.wait && task.status !== "completed") process.exit(EXIT_TASK_STOPPED);
+      };
       if (task.status === "needs_fallback" && task.session_id) saveSessionId(task.session_id);
       if (opts.json) {
         console.log(JSON.stringify(task, null, 2));
+        stoppedExit();
         return;
       }
       if (opts.download === void 0) {
         console.log(formatScriptTask(task));
         if (hasStagedArtifact(task)) console.log(downloadHint(task));
+        stoppedExit();
         return;
       }
       if (task.status === "running") {
@@ -1081,6 +1126,7 @@ ${downloadHint(result)}`);
       const saved = await deliverArtifact(task, typeof opts.download === "string" ? opts.download : void 0);
       if (!saved) throw new Error(`Task ${taskId} produced no file`);
       console.log(`Saved -> ${saved.path}${saved.size === void 0 ? "" : ` (${saved.size} bytes)`}`);
+      stoppedExit();
     } catch (err) {
       const gone = err.errorCode === "artifact_gone";
       console.error(

package/package.json

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