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
67 lines
2.9 KiB
JavaScript
67 lines
2.9 KiB
JavaScript
import { AuthRequiredError, EmptyResultError } from '@jackwener/opencli/errors';
|
|
import { cli, Strategy } from '@jackwener/opencli/registry';
|
|
|
|
const WEIXIN_DOMAIN = 'mp.weixin.qq.com';
|
|
|
|
export const draftsCommand = cli({
|
|
site: 'weixin',
|
|
name: 'drafts',
|
|
access: 'read',
|
|
description: '列出微信公众号草稿箱',
|
|
domain: WEIXIN_DOMAIN,
|
|
strategy: Strategy.COOKIE,
|
|
browser: true,
|
|
navigateBefore: false,
|
|
args: [
|
|
{ name: 'limit', type: 'int', default: 10, help: '最多显示条数' },
|
|
{ name: 'timeout', type: 'int', required: false, default: 60, help: 'Max seconds for the overall command (default: 60)' },
|
|
],
|
|
columns: ['Index', 'Title', 'Time'],
|
|
|
|
func: async (page, kwargs) => {
|
|
await page.goto('https://mp.weixin.qq.com/');
|
|
await page.wait(3);
|
|
const token = await page.evaluate(`(window.location.href.match(/token=(\\d+)/)||[])[1]`);
|
|
if (!token) {
|
|
throw new AuthRequiredError(WEIXIN_DOMAIN, '微信公众号草稿箱需要已登录的 mp.weixin.qq.com 会话');
|
|
}
|
|
|
|
await page.goto(`https://mp.weixin.qq.com/cgi-bin/appmsg?begin=0&count=${kwargs.limit}&type=77&action=list_card&token=${token}&lang=zh_CN`);
|
|
await page.wait(4);
|
|
|
|
const drafts = await page.evaluate(`(() => {
|
|
var results = [];
|
|
var idx = 0;
|
|
|
|
var cards = document.querySelectorAll('.weui-desktop-card');
|
|
for (var i = 0; i < cards.length; i++) {
|
|
if (cards[i].className.includes('card_new')) continue;
|
|
var titleEl = cards[i].querySelector('[class*=title]');
|
|
var timeEl = cards[i].querySelector('[class*=tips]');
|
|
var title = titleEl ? titleEl.textContent.trim() : '';
|
|
var time = timeEl ? timeEl.textContent.trim().replace(/\\s+/g, ' ') : '';
|
|
if (title) results.push({ Index: ++idx, Title: title, Time: time });
|
|
}
|
|
if (results.length > 0) return results;
|
|
|
|
var rows = document.querySelectorAll('tr, [class*=appmsg_item], [class*=list_item]');
|
|
rows.forEach(function(row) {
|
|
var titleEl = row.querySelector('[class*=title] a, [class*=title], h4');
|
|
var timeEl = row.querySelector('[class*=time], td:nth-child(2)');
|
|
var title = titleEl ? titleEl.textContent.trim() : '';
|
|
var time = timeEl ? timeEl.textContent.trim() : '';
|
|
if (title && title !== '内容' && title.length < 80) {
|
|
results.push({ Index: ++idx, Title: title, Time: time });
|
|
}
|
|
});
|
|
return results;
|
|
})()`);
|
|
|
|
if (!drafts || drafts.length === 0) {
|
|
throw new EmptyResultError('weixin drafts', 'No structured drafts found in the current Weixin Official Account backend');
|
|
}
|
|
|
|
return drafts.slice(0, kwargs.limit);
|
|
},
|
|
});
|