mirror of
https://github.com/jackwener/OpenCLI.git
synced 2026-09-14 18:25:42 +08:00
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
70 lines
2.8 KiB
JavaScript
70 lines
2.8 KiB
JavaScript
import { describe, expect, it, vi } from 'vitest';
|
|
import { AuthRequiredError, EmptyResultError } from '@jackwener/opencli/errors';
|
|
import { getRegistry } from '@jackwener/opencli/registry';
|
|
import './create-draft.js';
|
|
import './drafts.js';
|
|
import './search.js';
|
|
|
|
function createPageMock(overrides = {}) {
|
|
return {
|
|
goto: vi.fn().mockResolvedValue(undefined),
|
|
wait: vi.fn().mockResolvedValue(undefined),
|
|
evaluate: overrides.evaluate ?? vi.fn().mockResolvedValue(undefined),
|
|
setFileInput: vi.fn().mockResolvedValue(undefined),
|
|
};
|
|
}
|
|
|
|
describe('weixin command registration', () => {
|
|
it('registers create-draft and drafts commands', () => {
|
|
const registry = getRegistry();
|
|
const values = [...registry.values()];
|
|
expect(values.find(c => c.site === 'weixin' && c.name === 'create-draft')).toBeDefined();
|
|
const draftsCommand = values.find(c => c.site === 'weixin' && c.name === 'drafts');
|
|
expect(draftsCommand).toBeDefined();
|
|
expect(draftsCommand.args.find((arg) => arg.name === 'timeout')).toMatchObject({ type: 'int', default: 60 });
|
|
expect(values.find(c => c.site === 'weixin' && c.name === 'search')).toBeDefined();
|
|
});
|
|
});
|
|
|
|
describe('weixin drafts command', () => {
|
|
it('throws AuthRequiredError when no session token is available', async () => {
|
|
const command = getRegistry().get('weixin/drafts');
|
|
const page = createPageMock({
|
|
evaluate: vi.fn().mockResolvedValueOnce(undefined),
|
|
});
|
|
|
|
await expect(command.func(page, { limit: 10 })).rejects.toBeInstanceOf(AuthRequiredError);
|
|
});
|
|
|
|
it('fails instead of scraping arbitrary body text when structured selectors miss', async () => {
|
|
const command = getRegistry().get('weixin/drafts');
|
|
const evaluate = vi.fn()
|
|
.mockResolvedValueOnce('123456')
|
|
.mockImplementationOnce(async (script) => {
|
|
expect(script).not.toContain('document.body.innerText');
|
|
return [];
|
|
});
|
|
const page = createPageMock({ evaluate });
|
|
|
|
await expect(command.func(page, { limit: 10 })).rejects.toBeInstanceOf(EmptyResultError);
|
|
});
|
|
|
|
it('returns structured drafts and respects the requested limit', async () => {
|
|
const command = getRegistry().get('weixin/drafts');
|
|
const page = createPageMock({
|
|
evaluate: vi.fn()
|
|
.mockResolvedValueOnce('123456')
|
|
.mockResolvedValueOnce([
|
|
{ Index: 1, Title: '第一篇草稿', Time: '2026-04-24 10:00' },
|
|
{ Index: 2, Title: '第二篇草稿', Time: '2026-04-24 11:00' },
|
|
]),
|
|
});
|
|
|
|
const result = await command.func(page, { limit: 1 });
|
|
|
|
expect(result).toEqual([
|
|
{ Index: 1, Title: '第一篇草稿', Time: '2026-04-24 10:00' },
|
|
]);
|
|
});
|
|
});
|