@jackwener/opencli 1.5.1 → 1.5.3

package/src/browser.test.ts

@@ -1,10 +1,14 @@
-import { afterEach, describe, it, expect, vi } from 'vitest';
-import { BrowserBridge, __test__, generateStealthJs } from './browser/index.js';
+import { describe, it, expect, vi } from 'vitest';
+import { BrowserBridge, generateStealthJs } from './browser/index.js';
+import { extractTabEntries, diffTabIndexes, appendLimited } from './browser/tabs.js';
+import { withTimeoutMs } from './runtime.js';
+import { __test__ as cdpTest } from './browser/cdp.js';
+import { isRetryableSettleError } from './browser/page.js';
 import * as daemonClient from './browser/daemon-client.js';
 
 describe('browser helpers', () => {
   it('extracts tab entries from string snapshots', () => {
-    const entries = __test__.extractTabEntries('Tab 0 https://example.com\nTab 1 Chrome Extension');
+    const entries = extractTabEntries('Tab 0 https://example.com\nTab 1 Chrome Extension');
 
     expect(entries).toEqual([
       { index: 0, identity: 'https://example.com' },
@@ -13,7 +17,7 @@ describe('browser helpers', () => {
   });
 
   it('extracts tab entries from MCP markdown format', () => {
-    const entries = __test__.extractTabEntries(
+    const entries = extractTabEntries(
       '- 0: (current) [Playwright MCP extension](chrome-extension://abc/connect.html)\n- 1: [知乎 - 首页](https://www.zhihu.com/)'
     );
 
@@ -24,7 +28,7 @@ describe('browser helpers', () => {
   });
 
   it('closes only tabs that were opened during the session', () => {
-    const tabsToClose = __test__.diffTabIndexes(
+    const tabsToClose = diffTabIndexes(
       ['https://example.com', 'Chrome Extension'],
       [
         { index: 0, identity: 'https://example.com' },
@@ -38,15 +42,21 @@ describe('browser helpers', () => {
   });
 
   it('keeps only the tail of stderr buffers', () => {
-    expect(__test__.appendLimited('12345', '67890', 8)).toBe('34567890');
+    expect(appendLimited('12345', '67890', 8)).toBe('34567890');
   });
 
   it('times out slow promises', async () => {
-    await expect(__test__.withTimeoutMs(new Promise(() => {}), 10, 'timeout')).rejects.toThrow('timeout');
+    await expect(withTimeoutMs(new Promise(() => {}), 10, 'timeout')).rejects.toThrow('timeout');
+  });
+
+  it('retries settle only for target-invalidated errors', () => {
+    expect(isRetryableSettleError(new Error('{"code":-32000,"message":"Inspected target navigated or closed"}'))).toBe(true);
+    expect(isRetryableSettleError(new Error('attach failed: target no longer exists'))).toBe(false);
+    expect(isRetryableSettleError(new Error('malformed exec payload'))).toBe(false);
   });
 
   it('prefers the real Electron app target over DevTools and blank pages', () => {
-    const target = __test__.selectCDPTarget([
+    const target = cdpTest.selectCDPTarget([
       {
         type: 'page',
         title: 'DevTools - localhost:9224',
@@ -73,7 +83,7 @@ describe('browser helpers', () => {
   it('honors OPENCLI_CDP_TARGET when multiple inspectable targets exist', () => {
     vi.stubEnv('OPENCLI_CDP_TARGET', 'codex');
 
-    const target = __test__.selectCDPTarget([
+    const target = cdpTest.selectCDPTarget([
       {
         type: 'app',
         title: 'Cursor',

package/src/clis/36kr/hot.ts

@@ -60,7 +60,7 @@ cli({
 
     await page.installInterceptor('36kr.com/api');
     await page.goto(url);
-    await page.wait(6);
+    await page.waitForCapture(6);
 
     // Scrape rendered article links from DOM (deduplicated)
     const domItems: any = await page.evaluate(`

package/src/clis/36kr/search.ts

@@ -24,7 +24,7 @@ cli({
 
     await page.installInterceptor('36kr.com/api');
     await page.goto(`https://www.36kr.com/search/articles/${query}`);
-    await page.wait(6);
+    await page.waitForCapture(6);
 
     const domItems: any = await page.evaluate(`
       (() => {

package/src/clis/_shared/common.ts

@@ -0,0 +1,11 @@
+/**
+ * Shared utilities for CLI adapters.
+ */
+
+/**
+ * Clamp a numeric value to [min, max].
+ * Matches the signature of lodash.clamp and Rust's clamp.
+ */
+export function clamp(value: number, min: number, max: number): number {
+  return Math.max(min, Math.min(value, max));
+}

package/src/clis/apple-podcasts/commands.test.ts

@@ -38,13 +38,14 @@ describe('apple-podcasts search command', () => {
       'https://itunes.apple.com/search?term=machine%20learning&media=podcast&limit=5',
     );
     expect(result).toEqual([
-      {
+      expect.objectContaining({
         id: 42,
         title: 'Machine Learning Guide',
         author: 'OpenCLI',
         episodes: 12,
         genre: 'Technology',
-      },
+        url: '',
+      }),
     ]);
   });
 });
@@ -54,6 +55,30 @@ describe('apple-podcasts top command', () => {
     vi.restoreAllMocks();
   });
 
+  it('adds a timeout signal to chart fetches', async () => {
+    const cmd = getRegistry().get('apple-podcasts/top');
+    expect(cmd?.func).toBeTypeOf('function');
+
+    const fetchMock = vi.fn().mockResolvedValue({
+      ok: true,
+      json: () => Promise.resolve({
+        feed: {
+          results: [
+            { id: '100', name: 'Top Show', artistName: 'Host A' },
+          ],
+        },
+      }),
+    });
+    vi.stubGlobal('fetch', fetchMock);
+
+    await cmd!.func!(null as any, { country: 'US', limit: 1 });
+
+    const [, options] = fetchMock.mock.calls[0] ?? [];
+    expect(options).toBeDefined();
+    expect(options.signal).toBeDefined();
+    expect(options.signal).toHaveProperty('aborted', false);
+  });
+
   it('uses the canonical Apple charts host and maps ranked results', async () => {
     const cmd = getRegistry().get('apple-podcasts/top');
     expect(cmd?.func).toBeTypeOf('function');
@@ -75,6 +100,9 @@ describe('apple-podcasts top command', () => {
 
     expect(fetchMock).toHaveBeenCalledWith(
       'https://rss.marketingtools.apple.com/api/v2/us/podcasts/top/2/podcasts.json',
+      expect.objectContaining({
+        signal: expect.any(Object),
+      }),
     );
     expect(result).toEqual([
       { rank: 1, title: 'Top Show', author: 'Host A', id: '100' },

package/src/clis/apple-podcasts/top.ts

@@ -3,6 +3,7 @@ import { CliError } from '../../errors.js';
 
 // Apple Marketing Tools RSS API — public, no key required
 const CHARTS_URL = 'https://rss.marketingtools.apple.com/api/v2';
+const CHARTS_TIMEOUT_MS = 15_000;
 
 cli({
   site: 'apple-podcasts',
@@ -21,7 +22,9 @@ cli({
     const url = `${CHARTS_URL}/${country}/podcasts/top/${limit}/podcasts.json`;
     let resp: Response;
     try {
-      resp = await fetch(url);
+      resp = await fetch(url, {
+        signal: AbortSignal.timeout(CHARTS_TIMEOUT_MS),
+      });
     } catch (error: any) {
       const reason = error?.cause?.code ?? error?.message ?? 'unknown network error';
       throw new CliError(

package/src/clis/bloomberg/news.ts

@@ -23,7 +23,7 @@ cli({
 
     // Navigate and wait for the page to hydrate before extracting story data.
     await page.goto(url);
-    await page.wait(5);
+    await page.wait({ selector: 'article', timeout: 5 });
 
     const loadStory = async () => page.evaluate(`(() => {
       const isRobot = /Are you a robot/i.test(document.title)

package/src/clis/douban/utils.ts

@@ -4,17 +4,13 @@
 
 import { ArgumentError, CliError, EmptyResultError } from '../../errors.js';
 import type { IPage } from '../../types.js';
+import { clamp } from '../_shared/common.js';
 
 const DOUBAN_PHOTO_PAGE_SIZE = 30;
 const MAX_DOUBAN_PHOTOS = 500;
 
-function clampLimit(limit: number): number {
-  return Math.max(1, Math.min(limit || 20, 50));
-}
-
-function clampPhotoLimit(limit: number): number {
-  return Math.max(1, Math.min(limit || 120, MAX_DOUBAN_PHOTOS));
-}
+const clampLimit = (limit: number) => clamp(limit || 20, 1, 50);
+const clampPhotoLimit = (limit: number) => clamp(limit || 120, 1, MAX_DOUBAN_PHOTOS);
 
 async function ensureDoubanReady(page: IPage): Promise<void> {
   const state = await page.evaluate(`

package/src/clis/medium/utils.ts

@@ -16,7 +16,7 @@ export function buildMediumUserUrl(username: string): string {
 export async function loadMediumPosts(page: IPage, url: string, limit: number): Promise<any[]> {
   if (!page) throw new CommandExecutionError('Browser session required for medium posts');
   await page.goto(url);
-  await page.wait(5);
+  await page.wait({ selector: 'article', timeout: 5 });
   const data = await page.evaluate(`
     (async () => {
       await new Promise((resolve) => setTimeout(resolve, 3000));

package/src/clis/producthunt/browse.ts

@@ -32,7 +32,7 @@ cli({
 
     await page.installInterceptor('producthunt.com');
     await page.goto(`https://www.producthunt.com/categories/${slug}`);
-    await page.wait(5);
+    await page.waitForCapture(5);
 
     const domItems: any = await page.evaluate(`
       (() => {

package/src/clis/producthunt/hot.ts

@@ -23,7 +23,7 @@ cli({
 
     await page.installInterceptor('producthunt.com');
     await page.goto('https://www.producthunt.com');
-    await page.wait(5);
+    await page.waitForCapture(5);
 
     const domItems: any = await page.evaluate(`
       (() => {

package/src/clis/sinablog/utils.ts

@@ -1,8 +1,7 @@
 import type { IPage } from '../../types.js';
+import { clamp } from '../_shared/common.js';
 
-function clampLimit(limit: number): number {
-  return Math.max(1, Math.min(limit || 20, 50));
-}
+const clampLimit = (limit: number) => clamp(limit || 20, 1, 50);
 
 export function buildSinaBlogSearchUrl(keyword: string): string {
   return `https://search.sina.com.cn/search?q=${encodeURIComponent(keyword)}&tp=mix`;
@@ -14,7 +13,7 @@ export function buildSinaBlogUserUrl(uid: string): string {
 
 export async function loadSinaBlogArticle(page: IPage, url: string): Promise<any> {
   await page.goto(url);
-  await page.wait(3);
+  await page.wait({ selector: 'h1', timeout: 3 });
   return page.evaluate(`
     (async () => {
       await new Promise((resolve) => setTimeout(resolve, 1500));
@@ -52,7 +51,7 @@ export async function loadSinaBlogArticle(page: IPage, url: string): Promise<any
 export async function loadSinaBlogHot(page: IPage, limit: number): Promise<any[]> {
   const safeLimit = clampLimit(limit);
   await page.goto('https://blog.sina.com.cn/');
-  await page.wait(3);
+  await page.wait({ selector: 'h1', timeout: 3 });
   const data = await page.evaluate(`
     (async () => {
       await new Promise((resolve) => setTimeout(resolve, 1500));
@@ -122,7 +121,7 @@ export async function loadSinaBlogHot(page: IPage, limit: number): Promise<any[]
 export async function loadSinaBlogSearch(page: IPage, keyword: string, limit: number): Promise<any[]> {
   const safeLimit = clampLimit(limit);
   await page.goto(buildSinaBlogSearchUrl(keyword));
-  await page.wait(5);
+  await page.wait({ selector: '.result-item', timeout: 5 });
   const data = await page.evaluate(`
     (async () => {
       const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
@@ -159,7 +158,7 @@ export async function loadSinaBlogSearch(page: IPage, keyword: string, limit: nu
 export async function loadSinaBlogUser(page: IPage, uid: string, limit: number): Promise<any[]> {
   const safeLimit = clampLimit(limit);
   await page.goto(buildSinaBlogUserUrl(uid));
-  await page.wait(3);
+  await page.wait({ selector: 'h1', timeout: 3 });
   const data = await page.evaluate(`
     (async () => {
       await new Promise((resolve) => setTimeout(resolve, 1000));

package/src/clis/substack/utils.ts

@@ -10,7 +10,7 @@ export function buildSubstackBrowseUrl(category?: string): string {
 export async function loadSubstackFeed(page: IPage, url: string, limit: number): Promise<any[]> {
   if (!page) throw new CommandExecutionError('Browser session required for substack feed');
   await page.goto(url);
-  await page.wait(5);
+  await page.wait({ selector: 'article', timeout: 5 });
   const data = await page.evaluate(`
     (async () => {
       await new Promise((resolve) => setTimeout(resolve, 3000));
@@ -79,7 +79,7 @@ export async function loadSubstackFeed(page: IPage, url: string, limit: number):
 export async function loadSubstackArchive(page: IPage, baseUrl: string, limit: number): Promise<any[]> {
   if (!page) throw new CommandExecutionError('Browser session required for substack archive');
   await page.goto(`${baseUrl}/archive`);
-  await page.wait(5);
+  await page.wait({ selector: 'article', timeout: 5 });
   const data = await page.evaluate(`
     (async () => {
       await new Promise((resolve) => setTimeout(resolve, 3000));

package/src/clis/twitter/block.ts

@@ -18,7 +18,7 @@ cli({
     const username = kwargs.username.replace(/^@/, '');
 
     await page.goto(`https://x.com/${username}`);
-    await page.wait(5);
+    await page.wait({ selector: '[data-testid="primaryColumn"]' });
 
     const result = await page.evaluate(`(async () => {
         try {

package/src/clis/twitter/bookmark.ts

@@ -17,7 +17,7 @@ cli({
     if (!page) throw new CommandExecutionError('Browser session required for twitter bookmark');
 
     await page.goto(kwargs.url);
-    await page.wait(5);
+    await page.wait({ selector: '[data-testid="primaryColumn"]' });
 
     const result = await page.evaluate(`(async () => {
         try {

package/src/clis/twitter/delete.ts

@@ -17,7 +17,7 @@ cli({
     if (!page) throw new CommandExecutionError('Browser session required for twitter delete');
 
     await page.goto(kwargs.url);
-    await page.wait(5); // Wait for tweet to load completely
+    await page.wait({ selector: '[data-testid="primaryColumn"]' }); // Wait for tweet to load completely
 
     const result = await page.evaluate(`(async () => {
         try {

package/src/clis/twitter/follow.ts

@@ -18,7 +18,7 @@ cli({
     const username = kwargs.username.replace(/^@/, '');
 
     await page.goto(`https://x.com/${username}`);
-    await page.wait(5);
+    await page.wait({ selector: '[data-testid="primaryColumn"]' });
 
     const result = await page.evaluate(`(async () => {
         try {

package/src/clis/twitter/followers.ts

@@ -19,7 +19,7 @@ cli({
     // If no user is specified, figure out the logged-in user's handle
     if (!targetUser) {
         await page.goto('https://x.com/home');
-        await page.wait(5);
+        await page.wait({ selector: '[data-testid="primaryColumn"]' });
 
         const href = await page.evaluate(`() => {
             const link = document.querySelector('a[data-testid="AppTabBar_Profile_Link"]');
@@ -58,7 +58,7 @@ cli({
     if (!clicked) {
         throw new SelectorError('Twitter followers link', 'Twitter may have changed the layout.');
     }
-    await page.wait(5);
+    await page.waitForCapture(5);
 
     // 4. Scroll to trigger pagination API calls
     await page.autoScroll({ times: Math.ceil(kwargs.limit / 20), delayMs: 2000 });

package/src/clis/twitter/following.ts

@@ -19,7 +19,7 @@ cli({
     // If no user is specified, figure out the logged-in user's handle
     if (!targetUser) {
         await page.goto('https://x.com/home');
-        await page.wait(5);
+        await page.wait({ selector: '[data-testid="primaryColumn"]' });
 
         const href = await page.evaluate(`() => {
             const link = document.querySelector('a[data-testid="AppTabBar_Profile_Link"]');
@@ -51,7 +51,7 @@ cli({
     if (!clicked) {
         throw new SelectorError('Twitter following link', 'Twitter may have changed the layout.');
     }
-    await page.wait(5);
+    await page.waitForCapture(5);
 
     // 4. Scroll to trigger pagination API calls
     await page.autoScroll({ times: Math.ceil(kwargs.limit / 20), delayMs: 2000 });

package/src/clis/twitter/hide-reply.ts

@@ -17,7 +17,7 @@ cli({
     if (!page) throw new CommandExecutionError('Browser session required for twitter hide-reply');
 
     await page.goto(kwargs.url);
-    await page.wait(5);
+    await page.wait({ selector: '[data-testid="primaryColumn"]' });
 
     const result = await page.evaluate(`(async () => {
         try {

package/src/clis/twitter/like.ts

@@ -17,7 +17,7 @@ cli({
     if (!page) throw new CommandExecutionError('Browser session required for twitter like');
 
     await page.goto(kwargs.url);
-    await page.wait(5); // Wait for tweet to load completely
+    await page.wait({ selector: '[data-testid="primaryColumn"]' }); // Wait for tweet to load completely
 
     const result = await page.evaluate(`(async () => {
         try {

package/src/clis/twitter/notifications.ts

@@ -25,7 +25,7 @@ cli({
         window.history.pushState({}, '', '/notifications');
         window.dispatchEvent(new PopStateEvent('popstate', { state: {} }));
     }`);
-    await page.wait(5);
+    await page.waitForCapture(5);
 
     // Verify SPA navigation succeeded
     const currentUrl = await page.evaluate('() => window.location.pathname');

package/src/clis/twitter/profile.ts

@@ -21,7 +21,7 @@ cli({
     // If no username, detect the logged-in user
     if (!username) {
       await page.goto('https://x.com/home');
-      await page.wait(5);
+      await page.wait({ selector: '[data-testid="primaryColumn"]' });
       const href = await page.evaluate(`() => {
         const link = document.querySelector('a[data-testid="AppTabBar_Profile_Link"]');
         return link ? link.getAttribute('href') : null;

package/src/clis/twitter/reply-dm.ts

@@ -27,7 +27,7 @@ cli({
 
     // Step 1: Navigate to messages to get conversation list
     await page.goto('https://x.com/messages');
-    await page.wait(5);
+    await page.wait({ selector: '[data-testid="primaryColumn"]' });
 
     // Step 2: Collect conversations with scroll-to-load
     const needed = maxSend + 10; // extra buffer for skips

package/src/clis/twitter/reply.ts

@@ -19,7 +19,7 @@ cli({
 
     // 1. Navigate to the tweet page
     await page.goto(kwargs.url);
-    await page.wait(5); // Wait for the react application to hydrate
+    await page.wait({ selector: '[data-testid="primaryColumn"]' });
 
     // 2. Automate typing the reply and clicking reply
     const result = await page.evaluate(`(async () => {

package/src/clis/twitter/search.ts

@@ -20,7 +20,7 @@ async function navigateToSearch(page: Pick<IPage, 'evaluate' | 'wait'>, query: s
         window.dispatchEvent(new PopStateEvent('popstate', { state: {} }));
       })()
     `);
-    await page.wait(5);
+    await page.wait({ selector: '[data-testid="primaryColumn"]' });
 
     lastPath = String(await page.evaluate('() => window.location.pathname') || '');
     if (lastPath.startsWith('/search')) {

package/src/clis/twitter/unblock.ts

@@ -18,7 +18,7 @@ cli({
     const username = kwargs.username.replace(/^@/, '');
 
     await page.goto(`https://x.com/${username}`);
-    await page.wait(5);
+    await page.wait({ selector: '[data-testid="primaryColumn"]' });
 
     const result = await page.evaluate(`(async () => {
         try {

package/src/clis/twitter/unbookmark.ts

@@ -17,7 +17,7 @@ cli({
     if (!page) throw new CommandExecutionError('Browser session required for twitter unbookmark');
 
     await page.goto(kwargs.url);
-    await page.wait(5);
+    await page.wait({ selector: '[data-testid="primaryColumn"]' });
 
     const result = await page.evaluate(`(async () => {
         try {

package/src/clis/twitter/unfollow.ts

@@ -18,7 +18,7 @@ cli({
     const username = kwargs.username.replace(/^@/, '');
 
     await page.goto(`https://x.com/${username}`);
-    await page.wait(5);
+    await page.wait({ selector: '[data-testid="primaryColumn"]' });
 
     const result = await page.evaluate(`(async () => {
         try {

package/src/clis/v2ex/hot.yaml

@@ -3,7 +3,7 @@ name: hot
 description: V2EX 热门话题
 domain: www.v2ex.com
 strategy: public
-browser: true
+browser: false
 
 args:
   limit:
@@ -12,22 +12,8 @@ args:
     description: Number of topics
 
 pipeline:
-  - navigate: https://www.v2ex.com/
-
-  - evaluate: |
-      (async () => {
-        const response = await fetch('/api/topics/hot.json', {
-          credentials: 'include',
-          headers: {
-            accept: 'application/json, text/plain, */*',
-            'x-requested-with': 'XMLHttpRequest',
-          },
-        });
-        if (!response.ok) {
-          throw new Error(`V2EX hot API request failed: ${response.status}`);
-        }
-        return await response.json();
-      })()
+  - fetch:
+      url: https://www.v2ex.com/api/topics/hot.json
 
   - map:
       rank: ${{ index + 1 }}