@jackwener/opencli 1.5.1 → 1.5.2

package/dist/weread-private-api-regression.test.js

@@ -44,6 +44,21 @@ describe('weread private API regression', () => {
         }));
         await expect(fetchPrivateApi(mockPage, '/book/info')).rejects.toThrow('Not logged in');
     });
+    it('maps auth-expired API error codes to AUTH_REQUIRED even on HTTP 200', async () => {
+        const mockPage = {
+            getCookies: vi.fn().mockResolvedValue([]),
+            evaluate: vi.fn(),
+        };
+        vi.stubGlobal('fetch', vi.fn().mockResolvedValue({
+            ok: true,
+            status: 200,
+            json: () => Promise.resolve({ errcode: -2012, errmsg: '登录超时' }),
+        }));
+        await expect(fetchPrivateApi(mockPage, '/book/info')).rejects.toMatchObject({
+            code: 'AUTH_REQUIRED',
+            message: 'Not logged in to WeRead',
+        });
+    });
     it('maps non-auth API errors to API_ERROR', async () => {
         const mockPage = {
             getCookies: vi.fn().mockResolvedValue([]),
@@ -119,4 +134,174 @@ describe('weread private API regression', () => {
             },
         ]);
     });
+    it('falls back to structured shelf cache when the private API reports AUTH_REQUIRED', async () => {
+        const command = getRegistry().get('weread/shelf');
+        expect(command?.func).toBeTypeOf('function');
+        const mockPage = {
+            getCookies: vi.fn()
+                .mockResolvedValueOnce([
+                { name: 'wr_skey', value: 'skey123', domain: '.weread.qq.com' },
+            ])
+                .mockResolvedValueOnce([
+                { name: 'wr_vid', value: 'vid-current', domain: '.weread.qq.com' },
+            ]),
+            goto: vi.fn().mockResolvedValue(undefined),
+            evaluate: vi.fn().mockImplementation(async (source) => {
+                expect(source).toContain('shelf:rawBooks:vid-current');
+                expect(source).toContain('shelf:shelfIndexes:vid-current');
+                return {
+                    cacheFound: true,
+                    rawBooks: [
+                        {
+                            bookId: '40055543',
+                            title: '置身事内：中国政府与经济发展',
+                            author: '兰小欢',
+                        },
+                        {
+                            bookId: '29196155',
+                            title: '文明、现代化、价值投资与中国',
+                            author: '李录',
+                        },
+                    ],
+                    shelfIndexes: [
+                        { bookId: '29196155', idx: 0, role: 'book' },
+                        { bookId: '40055543', idx: 1, role: 'book' },
+                    ],
+                    lastChapters: {
+                        '29196155': 40,
+                        '40055543': 60,
+                    },
+                };
+            }),
+        };
+        vi.stubGlobal('fetch', vi.fn().mockResolvedValue({
+            ok: false,
+            status: 401,
+            json: () => Promise.resolve({ errcode: -2012, errmsg: '登录超时' }),
+        }));
+        const result = await command.func(mockPage, { limit: 1 });
+        expect(mockPage.goto).toHaveBeenCalledWith('https://weread.qq.com/web/shelf');
+        expect(mockPage.getCookies).toHaveBeenCalledWith({ domain: 'weread.qq.com' });
+        expect(mockPage.evaluate).toHaveBeenCalledTimes(1);
+        expect(result).toEqual([
+            {
+                title: '文明、现代化、价值投资与中国',
+                author: '李录',
+                progress: '-',
+                bookId: '29196155',
+            },
+        ]);
+    });
+    it('rethrows AUTH_REQUIRED when the current session has no structured shelf cache', async () => {
+        const command = getRegistry().get('weread/shelf');
+        expect(command?.func).toBeTypeOf('function');
+        const mockPage = {
+            getCookies: vi.fn()
+                .mockResolvedValueOnce([
+                { name: 'wr_skey', value: 'skey123', domain: '.weread.qq.com' },
+            ])
+                .mockResolvedValueOnce([
+                { name: 'wr_vid', value: 'vid-current', domain: '.weread.qq.com' },
+            ]),
+            goto: vi.fn().mockResolvedValue(undefined),
+            evaluate: vi.fn().mockResolvedValue({
+                cacheFound: false,
+                rawBooks: [],
+                shelfIndexes: [],
+                lastChapters: {},
+            }),
+        };
+        vi.stubGlobal('fetch', vi.fn().mockResolvedValue({
+            ok: false,
+            status: 401,
+            json: () => Promise.resolve({ errcode: -2012, errmsg: '登录超时' }),
+        }));
+        await expect(command.func(mockPage, { limit: 20 })).rejects.toMatchObject({
+            code: 'AUTH_REQUIRED',
+            message: 'Not logged in to WeRead',
+        });
+        expect(mockPage.goto).toHaveBeenCalledWith('https://weread.qq.com/web/shelf');
+        expect(mockPage.getCookies).toHaveBeenCalledWith({ domain: 'weread.qq.com' });
+    });
+    it('returns an empty list when the current session cache is confirmed but empty', async () => {
+        const command = getRegistry().get('weread/shelf');
+        expect(command?.func).toBeTypeOf('function');
+        const mockPage = {
+            getCookies: vi.fn()
+                .mockResolvedValueOnce([
+                { name: 'wr_skey', value: 'skey123', domain: '.weread.qq.com' },
+            ])
+                .mockResolvedValueOnce([
+                { name: 'wr_vid', value: 'vid-current', domain: '.weread.qq.com' },
+            ]),
+            goto: vi.fn().mockResolvedValue(undefined),
+            evaluate: vi.fn().mockResolvedValue({
+                cacheFound: true,
+                rawBooks: [],
+                shelfIndexes: [],
+                lastChapters: {},
+            }),
+        };
+        vi.stubGlobal('fetch', vi.fn().mockResolvedValue({
+            ok: false,
+            status: 401,
+            json: () => Promise.resolve({ errcode: -2012, errmsg: '登录超时' }),
+        }));
+        const result = await command.func(mockPage, { limit: 20 });
+        expect(mockPage.goto).toHaveBeenCalledWith('https://weread.qq.com/web/shelf');
+        expect(mockPage.getCookies).toHaveBeenCalledWith({ domain: 'weread.qq.com' });
+        expect(result).toEqual([]);
+    });
+    it('falls back to raw book cache order when shelf indexes are unavailable', async () => {
+        const command = getRegistry().get('weread/shelf');
+        expect(command?.func).toBeTypeOf('function');
+        const mockPage = {
+            getCookies: vi.fn()
+                .mockResolvedValueOnce([
+                { name: 'wr_skey', value: 'skey123', domain: '.weread.qq.com' },
+            ])
+                .mockResolvedValueOnce([
+                { name: 'wr_vid', value: 'vid-current', domain: '.weread.qq.com' },
+            ]),
+            goto: vi.fn().mockResolvedValue(undefined),
+            evaluate: vi.fn().mockResolvedValue({
+                cacheFound: true,
+                rawBooks: [
+                    {
+                        bookId: '40055543',
+                        title: '置身事内：中国政府与经济发展',
+                        author: '兰小欢',
+                    },
+                    {
+                        bookId: '29196155',
+                        title: '文明、现代化、价值投资与中国',
+                        author: '李录',
+                    },
+                ],
+                shelfIndexes: [],
+            }),
+        };
+        vi.stubGlobal('fetch', vi.fn().mockResolvedValue({
+            ok: false,
+            status: 401,
+            json: () => Promise.resolve({ errcode: -2012, errmsg: '登录超时' }),
+        }));
+        const result = await command.func(mockPage, { limit: 2 });
+        expect(mockPage.getCookies).toHaveBeenCalledWith({ url: 'https://i.weread.qq.com/shelf/sync?synckey=0&lectureSynckey=0' });
+        expect(mockPage.getCookies).toHaveBeenCalledWith({ domain: 'weread.qq.com' });
+        expect(result).toEqual([
+            {
+                title: '置身事内：中国政府与经济发展',
+                author: '兰小欢',
+                progress: '-',
+                bookId: '40055543',
+            },
+            {
+                title: '文明、现代化、价值投资与中国',
+                author: '李录',
+                progress: '-',
+                bookId: '29196155',
+            },
+        ]);
+    });
 });

package/extension/dist/background.js

@@ -164,6 +164,7 @@ function connect() {
       clearTimeout(reconnectTimer);
       reconnectTimer = null;
     }
+    ws?.send(JSON.stringify({ type: "hello", version: chrome.runtime.getManifest().version }));
   };
   ws.onmessage = async (event) => {
     try {
@@ -195,7 +196,7 @@ function scheduleReconnect() {
   }, delay);
 }
 const automationSessions = /* @__PURE__ */ new Map();
-const WINDOW_IDLE_TIMEOUT = 12e4;
+const WINDOW_IDLE_TIMEOUT = 3e4;
 function getWorkspaceKey(workspace) {
   return workspace?.trim() || "default";
 }
@@ -230,7 +231,8 @@ async function getAutomationWindow(workspace) {
     focused: false,
     width: 1280,
     height: 900,
-    type: "normal"
+    type: "normal",
+    state: "minimized"
   });
   const session = {
     windowId: win.id,

package/extension/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "OpenCLI",
-  "version": "1.4.1",
+  "version": "1.5.2",
   "description": "Browser automation bridge for the OpenCLI CLI tool. Executes commands in isolated Chrome windows via a local daemon.",
   "permissions": [
     "debugger",
@@ -10,6 +10,9 @@
     "activeTab",
     "alarms"
   ],
+  "host_permissions": [
+    "<all_urls>"
+  ],
   "background": {
     "service_worker": "dist/background.js",
     "type": "module"

package/extension/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "opencli-extension",
-  "version": "0.2.0",
+  "version": "1.5.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "opencli-extension",
-      "version": "0.2.0",
+      "version": "1.5.2",
       "devDependencies": {
         "@types/chrome": "^0.0.287",
         "typescript": "^5.7.0",

package/extension/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencli-extension",
-  "version": "1.4.1",
+  "version": "1.5.2",
   "private": true,
   "type": "module",
   "scripts": {

package/extension/src/background.ts

@@ -106,7 +106,7 @@ type AutomationSession = {
 };
 
 const automationSessions = new Map<string, AutomationSession>();
-const WINDOW_IDLE_TIMEOUT = 120000; // 120s — longer to survive slow pipelines
+const WINDOW_IDLE_TIMEOUT = 30000; // 30s — quick cleanup after command finishes
 
 function getWorkspaceKey(workspace?: string): string {
   return workspace?.trim() || 'default';
@@ -152,6 +152,7 @@ async function getAutomationWindow(workspace: string): Promise<number> {
     width: 1280,
     height: 900,
     type: 'normal',
+    state: 'minimized',
   });
   const session: AutomationSession = {
     windowId: win.id!,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jackwener/opencli",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "publishConfig": {
     "access": "public"
   },

package/src/browser/discover.ts

@@ -22,13 +22,16 @@ export async function checkDaemonStatus(opts?: { timeout?: number }): Promise<{
     const port = parseInt(process.env.OPENCLI_DAEMON_PORT ?? String(DEFAULT_DAEMON_PORT), 10);
     const controller = new AbortController();
     const timer = setTimeout(() => controller.abort(), opts?.timeout ?? 2000);
-    const res = await fetch(`http://127.0.0.1:${port}/status`, {
-      headers: { 'X-OpenCLI': '1' },
-      signal: controller.signal,
-    });
-    const data = await res.json() as { ok: boolean; extensionConnected: boolean; extensionVersion?: string };
-    clearTimeout(timer);
-    return { running: true, extensionConnected: data.extensionConnected, extensionVersion: data.extensionVersion };
+    try {
+      const res = await fetch(`http://127.0.0.1:${port}/status`, {
+        headers: { 'X-OpenCLI': '1' },
+        signal: controller.signal,
+      });
+      const data = await res.json() as { ok: boolean; extensionConnected: boolean; extensionVersion?: string };
+      return { running: true, extensionConnected: data.extensionConnected, extensionVersion: data.extensionVersion };
+    } finally {
+      clearTimeout(timer);
+    }
   } catch {
     return { running: false, extensionConnected: false };
   }

package/src/browser/index.ts

@@ -15,6 +15,7 @@ export type { DomSnapshotOptions } from './dom-snapshot.js';
 
 import { extractTabEntries, diffTabIndexes, appendLimited } from './tabs.js';
 import { __test__ as cdpTest } from './cdp.js';
+import { isRetryableSettleError } from './page.js';
 import { withTimeoutMs } from '../runtime.js';
 
 export const __test__ = {
@@ -24,4 +25,5 @@ export const __test__ = {
   withTimeoutMs,
   selectCDPTarget: cdpTest.selectCDPTarget,
   scoreCDPTarget: cdpTest.scoreCDPTarget,
+  isRetryableSettleError,
 };

package/src/browser/page.ts

@@ -28,6 +28,12 @@ import {
   waitForDomStableJs,
 } from './dom-helpers.js';
 
+export function isRetryableSettleError(err: unknown): boolean {
+  const message = err instanceof Error ? err.message : String(err);
+  return message.includes('Inspected target navigated or closed')
+    || (message.includes('-32000') && message.toLowerCase().includes('target'));
+}
+
 /**
  * Page — implements IPage by talking to the daemon via HTTP.
  */
@@ -75,10 +81,27 @@ export class Page implements IPage {
     // settleMs is now a timeout cap (default 1000ms), not a fixed wait.
     if (options?.waitUntil !== 'none') {
       const maxMs = options?.settleMs ?? 1000;
-      await sendCommand('exec', {
+      const settleOpts = {
         code: waitForDomStableJs(maxMs, Math.min(500, maxMs)),
         ...this._cmdOpts(),
-      });
+      };
+      try {
+        await sendCommand('exec', settleOpts);
+      } catch (err) {
+        if (!isRetryableSettleError(err)) throw err;
+        // SPA client-side redirects can invalidate the CDP target after
+        // chrome.tabs reports 'complete'. Wait briefly for the new document
+        // to load, then retry the settle probe once.
+        try {
+          await new Promise((r) => setTimeout(r, 200));
+          await sendCommand('exec', settleOpts);
+        } catch (retryErr) {
+          if (!isRetryableSettleError(retryErr)) throw retryErr;
+          // Retry also failed — give up silently. Settle is best-effort
+          // after successful navigation; the next real command will surface
+          // any persistent target error immediately.
+        }
+      }
     }
   }
 

package/src/browser.test.ts

@@ -45,6 +45,12 @@ describe('browser helpers', () => {
     await expect(__test__.withTimeoutMs(new Promise(() => {}), 10, 'timeout')).rejects.toThrow('timeout');
   });
 
+  it('retries settle only for target-invalidated errors', () => {
+    expect(__test__.isRetryableSettleError(new Error('{"code":-32000,"message":"Inspected target navigated or closed"}'))).toBe(true);
+    expect(__test__.isRetryableSettleError(new Error('attach failed: target no longer exists'))).toBe(false);
+    expect(__test__.isRetryableSettleError(new Error('malformed exec payload'))).toBe(false);
+  });
+
   it('prefers the real Electron app target over DevTools and blank pages', () => {
     const target = __test__.selectCDPTarget([
       {

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/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 }}