mirror of
https://github.com/jackwener/OpenCLI.git
synced 2026-09-14 18:25:42 +08:00
jakevin
12d88e4b23
* refactor(runtime): unify command timeout into a single --timeout arg Drop the cli-level `timeoutSeconds` build-time ceiling field. A command now opts into runtime-enforced timeouts purely by declaring an arg named `timeout`; the user-facing `--timeout` value (its default or override) is the single authoritative knob, used both by the adapter polling loop and by the runtime ceiling (with a 30s padding for return + closeWindow + trace export). Behavior: - Browser commands without a `--timeout` arg fall back to OPENCLI_BROWSER_COMMAND_TIMEOUT (default 60s, unchanged). - Non-browser commands without a `--timeout` arg now run unbounded rather than against the previously implicit `timeoutSeconds` cap. Affected commands keep their old caps via newly added `--timeout` args. - LLM adapters (gemini/claude/deepseek/doubao/qwen/yuanbao ask) keep their current `--timeout` defaults; the runtime ceiling is now strictly more generous (userTimeout + 30s vs. the previous 180s cap), so `--timeout 600` actually buys 600s of polling rather than dying at 180s. Closes the design discussion that started from PR #1227, which proposed a per-site `OPENCLI_GEMINI_ASK_TIMEOUT` env var to work around the same underlying mismatch. * fix(timeout): wire --timeout arg into chatgpt/gemini image adapter polling codex-coder review on PR #1364 caught that the new --timeout arg I added to chatgpt/image and gemini/image only drove the runtime ceiling — the adapter still hardcoded `const timeout = 120`, so users passing --timeout 240/600 saw runtime allow 270s/630s but the adapter stop polling at 120s. That recreated the same single-knob mismatch this PR was meant to delete. Also add the browser-path runWithTimeout assertion codex-coder flagged as missing: a browser command with --timeout default=5 must call runWithTimeout with timeout: 35; a browser command without --timeout arg must fall back to DEFAULT_BROWSER_COMMAND_TIMEOUT. Image adapters now read kwargs.timeout and reject non-positive-integer values with ArgumentError (no silent fallback). chatgpt/image.test.js updated to pass an explicit timeout when calling .func directly (the test bypasses arg coercion). * fix(runtime): reject invalid timeout ceilings * fix(timeout): normalize timeout args to integer values * fix(timeout): preserve remaining command ceilings * fix(runtime): validate timeout before browser setup
82 lines
3.2 KiB
JavaScript
82 lines
3.2 KiB
JavaScript
import { ArgumentError, CommandExecutionError } from '@jackwener/opencli/errors';
|
|
import { cli, Strategy } from '@jackwener/opencli/registry';
|
|
import { SHARE_API, extractPwdId, apiPost, getToken, pollTask, findFolder, } from './utils.js';
|
|
async function saveShare(page, pwdId, stoken, fidList, targetFid, saveAll) {
|
|
const data = await apiPost(page, `${SHARE_API}/save?pr=ucpro&fr=pc`, {
|
|
pwd_id: pwdId,
|
|
stoken,
|
|
pdir_fid: '0',
|
|
to_pdir_fid: targetFid,
|
|
fid_list: fidList,
|
|
pdir_save_all: saveAll,
|
|
scene: 'link',
|
|
});
|
|
return data.task_id;
|
|
}
|
|
cli({
|
|
site: 'quark',
|
|
name: 'save',
|
|
access: 'write',
|
|
description: 'Save shared files to your Quark Drive',
|
|
domain: 'pan.quark.cn',
|
|
strategy: Strategy.COOKIE,
|
|
defaultFormat: 'json',
|
|
args: [
|
|
{ name: 'url', required: true, positional: true, help: 'Quark share URL or pwd_id' },
|
|
{ name: 'to', default: '', help: 'Destination folder path' },
|
|
{ name: 'to-fid', default: '', help: 'Destination folder ID (overrides --to)' },
|
|
{ name: 'fids', default: '', help: 'File IDs to save (comma-separated, from share-tree). Omit to save all.' },
|
|
{ name: 'stoken', default: '', help: 'Share token (from share-tree output, required with --fids)' },
|
|
{ name: 'passcode', default: '', help: 'Share passcode (if required)' },
|
|
{ name: 'timeout', type: 'int', required: false, default: 120, help: 'Max seconds for the overall command (default: 120)' },
|
|
],
|
|
func: async (page, kwargs) => {
|
|
const url = kwargs.url;
|
|
const to = kwargs.to;
|
|
const toFid = kwargs['to-fid'];
|
|
const fids = kwargs.fids;
|
|
const stokenArg = kwargs.stoken;
|
|
const passcode = kwargs.passcode;
|
|
if (!to && !toFid)
|
|
throw new ArgumentError('Either --to or --to-fid is required');
|
|
if (to && toFid)
|
|
throw new ArgumentError('Cannot use both --to and --to-fid');
|
|
const pwdId = extractPwdId(url);
|
|
const saveAll = !fids;
|
|
let stoken;
|
|
let fidList;
|
|
if (saveAll) {
|
|
stoken = stokenArg || await getToken(page, pwdId, passcode);
|
|
fidList = [];
|
|
}
|
|
else {
|
|
if (!stokenArg)
|
|
throw new ArgumentError('--stoken is required when using --fids');
|
|
stoken = stokenArg;
|
|
fidList = [...new Set(fids.split(',').map(id => id.trim()).filter(Boolean))];
|
|
}
|
|
const targetFid = toFid || await findFolder(page, to);
|
|
const taskId = await saveShare(page, pwdId, stoken, fidList, targetFid, saveAll);
|
|
const result = {
|
|
success: false,
|
|
task_id: taskId,
|
|
saved_to: to || toFid,
|
|
target_fid: targetFid,
|
|
...(saveAll ? {} : { fids: fidList }),
|
|
};
|
|
if (taskId) {
|
|
const completed = await pollTask(page, taskId, (task) => {
|
|
result.save_count = task.save_as?.save_as_sum_num;
|
|
});
|
|
result.completed = completed;
|
|
result.success = completed;
|
|
if (!completed)
|
|
throw new CommandExecutionError('quark: Save task timed out');
|
|
}
|
|
else {
|
|
result.success = true;
|
|
}
|
|
return result;
|
|
},
|
|
});
|