@jackwener/opencli 1.5.0 → 1.5.2

package/src/runtime.ts

@@ -30,11 +30,11 @@ export const DEFAULT_BROWSER_EXPLORE_TIMEOUT = parseEnvTimeout('OPENCLI_BROWSER_
  */
 export async function runWithTimeout<T>(
   promise: Promise<T>,
-  opts: { timeout: number; label?: string },
+  opts: { timeout: number; label?: string; hint?: string },
 ): Promise<T> {
   const label = opts.label ?? 'Operation';
   return withTimeoutMs(promise, opts.timeout * 1000,
-    () => new TimeoutError(label, opts.timeout));
+    () => new TimeoutError(label, opts.timeout, opts.hint));
 }
 
 /**

package/src/types.ts

@@ -66,4 +66,6 @@ export interface IPage {
   getInterceptedRequests(): Promise<any[]>;
   screenshot(options?: ScreenshotOptions): Promise<string>;
   closeWindow?(): Promise<void>;
+  /** Returns the current page URL, or null if unavailable. */
+  getCurrentUrl?(): Promise<string | null>;
 }

package/src/weread-private-api-regression.test.ts

@@ -56,6 +56,24 @@ 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(),
+    } as any;
+
+    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([]),
@@ -147,4 +165,193 @@ 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: string) => {
+        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,
+          },
+        };
+      }),
+    } as any;
+
+    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: {},
+      }),
+    } as any;
+
+    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: {},
+      }),
+    } as any;
+
+    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: [],
+      }),
+    } as any;
+
+    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/tests/e2e/browser-public.test.ts

@@ -35,7 +35,7 @@ function isImdbChallenge(result: CliResult): boolean {
 
 function isBrowserBridgeUnavailable(result: CliResult): boolean {
   const text = `${result.stderr}\n${result.stdout}`;
-  return /Browser Extension is not connected|Browser Bridge extension.*not connected|Daemon is running but the Browser Extension is not connected/i.test(text);
+  return /Browser Bridge.*not connected|Extension.*not connected/i.test(text);
 }
 
 async function expectImdbDataOrChallengeSkip(args: string[], label: string): Promise<any[] | null> {

package/tests/e2e/output-formats.test.ts

@@ -1,6 +1,7 @@
 /**
  * E2E tests for output format rendering.
- * Uses hackernews (public, fast) as a stable data source.
+ * Uses the built-in list command so renderer coverage does not depend on
+ * external network availability.
  */
 
 import { describe, it, expect } from 'vitest';
@@ -10,19 +11,22 @@ const FORMATS = ['json', 'yaml', 'csv', 'md'] as const;
 
 describe('output formats E2E', () => {
   for (const fmt of FORMATS) {
-    it(`hackernews top -f ${fmt} produces valid output`, async () => {
-      const { stdout, code } = await runCli(['hackernews', 'top', '--limit', '2', '-f', fmt]);
+    it(`list -f ${fmt} produces valid output`, async () => {
+      const { stdout, code } = await runCli(['list', '-f', fmt]);
       expect(code).toBe(0);
       expect(stdout.trim().length).toBeGreaterThan(0);
 
       if (fmt === 'json') {
         const data = parseJsonOutput(stdout);
         expect(Array.isArray(data)).toBe(true);
-        expect(data.length).toBe(2);
+        expect(data.length).toBeGreaterThan(50);
+        expect(data[0]).toHaveProperty('command');
+        expect(data[0]).toHaveProperty('site');
       }
 
       if (fmt === 'yaml') {
-        expect(stdout).toContain('title:');
+        expect(stdout).toContain('command:');
+        expect(stdout).toContain('site:');
       }
 
       if (fmt === 'csv') {
@@ -33,16 +37,8 @@ describe('output formats E2E', () => {
 
       if (fmt === 'md') {
         // Markdown table should have pipe characters
-        expect(stdout).toContain('|');
+        expect(stdout).toContain('| command |');
       }
     }, 30_000);
   }
-
-  it('list -f csv produces valid csv', async () => {
-    const { stdout, code } = await runCli(['list', '-f', 'csv']);
-    expect(code).toBe(0);
-    const lines = stdout.trim().split('\n');
-    // Header + many data lines
-    expect(lines.length).toBeGreaterThan(50);
-  });
 });

package/tests/e2e/plugin-management.test.ts

@@ -60,7 +60,10 @@ describe('plugin management E2E', () => {
     const lock = JSON.parse(fs.readFileSync(LOCK_FILE, 'utf-8'));
     expect(lock[PLUGIN_NAME]).toBeDefined();
     expect(lock[PLUGIN_NAME].commitHash).toBeTruthy();
-    expect(lock[PLUGIN_NAME].source).toContain('opencli-plugin-hot-digest');
+    expect(lock[PLUGIN_NAME].source).toMatchObject({
+      kind: 'git',
+    });
+    expect(lock[PLUGIN_NAME].source.url).toContain('opencli-plugin-hot-digest');
     expect(lock[PLUGIN_NAME].installedAt).toBeTruthy();
   }, 60_000);
 

package/tests/e2e/public-commands.test.ts

@@ -21,7 +21,7 @@ function isExpectedChineseSiteRestriction(code: number, stderr: string): boolean
 
 function isExpectedApplePodcastsRestriction(code: number, stderr: string): boolean {
   if (code === 0) return false;
-  return /Error \[FETCH_ERROR\]: (Charts API HTTP \d+|Unable to reach Apple Podcasts charts)/.test(stderr)
+  return /(?:Error \[FETCH_ERROR\]: )?(Charts API HTTP \d+|Unable to reach Apple Podcasts charts)/.test(stderr)
     || stderr === ''; // timeout killed the process before any output
 }
 
@@ -34,6 +34,17 @@ function isExpectedGoogleRestriction(code: number, stderr: string): boolean {
 // Keep old name as alias for existing tests
 const isExpectedXiaoyuzhouRestriction = isExpectedChineseSiteRestriction;
 
+describe('public command restriction detectors', () => {
+  it('treats current Apple Podcasts CliError rendering as an expected restriction', () => {
+    expect(
+      isExpectedApplePodcastsRestriction(
+        1,
+        '⚠️ Unable to reach Apple Podcasts charts for US\n→ Apple charts may be temporarily unavailable (ECONNRESET). Try again later.\n',
+      ),
+    ).toBe(true);
+  });
+});
+
 describe('public commands E2E', () => {
   // ── bloomberg (RSS-backed, browser: false) ──
   it('bloomberg main returns structured headline data', async () => {

package/vitest.config.ts

@@ -16,21 +16,7 @@ export default defineConfig({
       {
         test: {
           name: 'adapter',
-          include: [
-            'src/clis/bilibili/**/*.test.ts',
-            'src/clis/imdb/**/*.test.ts',
-            'src/clis/jd/**/*.test.ts',
-            'src/clis/linux-do/**/*.test.ts',
-            'src/clis/xiaohongshu/**/*.test.ts',
-            'src/clis/twitter/**/*.test.ts',
-            'src/clis/douban/**/*.test.ts',
-            'src/clis/zhihu/**/*.test.ts',
-            'src/clis/v2ex/**/*.test.ts',
-            'src/clis/weread/**/*.test.ts',
-            'src/clis/36kr/**/*.test.ts',
-            'src/clis/producthunt/**/*.test.ts',
-            'src/clis/paperreview/**/*.test.ts',
-          ],
+          include: ['src/clis/**/*.test.ts'],
           sequence: { groupOrder: 1 },
         },
       },