@jackwener/opencli 1.7.18 → 1.7.19

package/clis/xiaohongshu/search.test.js

@@ -1,7 +1,11 @@
 import { describe, expect, it, vi } from 'vitest';
 import { getRegistry } from '@jackwener/opencli/registry';
 import { JSDOM } from 'jsdom';
-import { __test__, noteIdToDate } from './search.js';
+import { __test__, buildScrollUntilJs, noteIdToDate } from './search.js';
+
+function markVisible(el) {
+    el.getBoundingClientRect = () => ({ width: 100, height: 100 });
+}
 function createPageMock(evaluateResults) {
     const evaluate = vi.fn();
     for (const result of evaluateResults) {
@@ -31,6 +35,16 @@ function createPageMock(evaluateResults) {
     };
 }
 describe('xiaohongshu search', () => {
+    it('rejects invalid limit before browser navigation', async () => {
+        const cmd = getRegistry().get('xiaohongshu/search');
+        const page = createPageMock([]);
+
+        await expect(cmd.func(page, { query: '特斯拉', limit: 0 })).rejects.toMatchObject({
+            code: 'ARGUMENT',
+            message: expect.stringContaining('--limit'),
+        });
+        expect(page.goto).not.toHaveBeenCalled();
+    });
     it('throws a clear error when the search page is blocked by a login wall', async () => {
         const cmd = getRegistry().get('xiaohongshu/search');
         expect(cmd?.func).toBeTypeOf('function');
@@ -39,7 +53,8 @@ describe('xiaohongshu search', () => {
             'login_wall',
         ]);
         await expect(cmd.func(page, { query: '特斯拉', limit: 5 })).rejects.toThrow('Xiaohongshu search results are blocked behind a login wall');
-        // autoScroll must NOT be called when a login wall is detected early
+        // No scroll-until / autoScroll call when a login wall is detected early.
+        expect(page.evaluate).toHaveBeenCalledTimes(1);
         expect(page.autoScroll).not.toHaveBeenCalled();
     });
     it('returns ranked results with search_result url and author_url preserved', async () => {
@@ -50,7 +65,7 @@ describe('xiaohongshu search', () => {
         const page = createPageMock([
             // First evaluate: MutationObserver wait (content appeared)
             'content',
-            // Second evaluate: main DOM extraction (returns array directly)
+            // Second evaluate: initial DOM extraction (already enough results)
             [
                 {
                     title: '某鱼买FSD被坑了4万',
@@ -82,7 +97,7 @@ describe('xiaohongshu search', () => {
         const page = createPageMock([
             // First evaluate: MutationObserver wait (content appeared)
             'content',
-            // Second evaluate: main DOM extraction (returns array directly)
+            // Second evaluate: initial DOM extraction (already enough valid rows)
             [
                 {
                     title: 'Result A',
@@ -118,15 +133,36 @@ describe('xiaohongshu search', () => {
         const page = createPageMock([
             // First evaluate: MutationObserver wait (content appeared)
             'content',
-            // Second evaluate: extraction (returns empty array)
+            // Second evaluate: initial extraction (no rows rendered)
             [],
         ]);
         const result = (await cmd.func(page, { query: '测试等待', limit: 5 }));
         expect(result).toHaveLength(0);
         // Only one navigation, no retry
         expect(page.goto).toHaveBeenCalledTimes(1);
-        // Two evaluate calls: wait + extraction
-        expect(page.evaluate).toHaveBeenCalledTimes(2);
+        // Four evaluate calls: wait, initial extraction, scroll-until, post-scroll extraction.
+        expect(page.evaluate).toHaveBeenCalledTimes(4);
+    });
+    it('scrolls only when the initial extraction has fewer rows than requested', async () => {
+        const cmd = getRegistry().get('xiaohongshu/search');
+        expect(cmd?.func).toBeTypeOf('function');
+        const page = createPageMock([
+            'content',
+            [
+                { title: 'Result A', author: 'UserA', likes: '10', url: 'https://www.xiaohongshu.com/search_result/aaa', author_url: '' },
+            ],
+            3,
+            [
+                { title: 'Result A', author: 'UserA', likes: '10', url: 'https://www.xiaohongshu.com/search_result/aaa', author_url: '' },
+                { title: 'Result B', author: 'UserB', likes: '5', url: 'https://www.xiaohongshu.com/search_result/bbb', author_url: '' },
+            ],
+        ]);
+
+        const result = (await cmd.func(page, { query: '测试等待', limit: 2 }));
+
+        expect(result).toHaveLength(2);
+        expect(result.map((item) => item.title)).toEqual(['Result A', 'Result B']);
+        expect(page.evaluate).toHaveBeenCalledTimes(4);
     });
     it('separates fallback author text from appended relative date', async () => {
         const cmd = getRegistry().get('xiaohongshu/search');
@@ -141,9 +177,10 @@ describe('xiaohongshu search', () => {
             <span class="count">8</span>
           </section>
         `, { url: 'https://www.xiaohongshu.com/search_result?keyword=test' });
+        markVisible(dom.window.document.querySelector('section.note-item'));
         const page = createPageMock([]);
         page.evaluate.mockImplementationOnce(async () => 'content');
-        page.evaluate.mockImplementationOnce(async (script) => Function('document', `return (${script})`)(dom.window.document));
+        page.evaluate.mockImplementationOnce(async (script) => Function('document', 'getComputedStyle', `return (${script})`)(dom.window.document, dom.window.getComputedStyle.bind(dom.window)));
 
         const result = await cmd.func(page, { query: '测试', limit: 1 });
 
@@ -155,6 +192,43 @@ describe('xiaohongshu search', () => {
         });
     });
 });
+describe('buildScrollUntilJs', () => {
+    it('inlines the target count and default maxScrolls into the generated IIFE', () => {
+        const js = buildScrollUntilJs(40);
+        // Target count must drive the early-exit check (#1471: --limit > 13 was capped).
+        expect(js).toContain('countItems() >= 40');
+        // Default safety cap of 15 to bound runtime on infinite-scroll pages.
+        expect(js).toContain('i < 15');
+        // Plateau detection so the loop exits early when XHS stops lazy-loading
+        // instead of spinning all 15 iterations against an exhausted feed.
+        expect(js).toContain('plateauRounds');
+        // Related-search rows must not count toward the target.
+        expect(js).toContain("classList.contains('query-note-item')");
+    });
+    it('respects a custom maxScrolls override', () => {
+        const js = buildScrollUntilJs(100, 5);
+        expect(js).toContain('countItems() >= 100');
+        expect(js).toContain('i < 5');
+    });
+    it('counts only visible real note rows', async () => {
+        const dom = new JSDOM(`
+          <section class="note-item" id="visible"></section>
+          <section class="note-item query-note-item" id="query"></section>
+          <section class="note-item" id="hidden" style="display:none"></section>
+        `, { url: 'https://www.xiaohongshu.com/search_result?keyword=test' });
+        markVisible(dom.window.document.querySelector('#visible'));
+        markVisible(dom.window.document.querySelector('#query'));
+        markVisible(dom.window.document.querySelector('#hidden'));
+
+        const result = await Function('document', 'window', 'MutationObserver', 'getComputedStyle', `return (${buildScrollUntilJs(1)})`)(dom.window.document, dom.window, dom.window.MutationObserver, dom.window.getComputedStyle.bind(dom.window));
+
+        expect(result).toBe(1);
+    });
+    it('rejects unsafe helper arguments instead of interpolating them into code', () => {
+        expect(() => buildScrollUntilJs(0)).toThrow(/targetCount/);
+        expect(() => buildScrollUntilJs(10, 0)).toThrow(/maxScrolls/);
+    });
+});
 describe('stripXhsAuthorDateSuffix', () => {
     it('only strips trailing date suffixes and preserves date-like author text', () => {
         expect(__test__.stripXhsAuthorDateSuffix('作者名 3天前')).toBe('作者名');

package/clis/xueqiu/earnings-date.js

@@ -1,6 +1,6 @@
 import { cli } from '@jackwener/opencli/registry';
 import { EmptyResultError } from '@jackwener/opencli/errors';
-import { fetchXueqiuJson } from './utils.js';
+import { fetchXueqiuJson, formatChinaDate } from './utils.js';
 cli({
     site: 'xueqiu',
     name: 'earnings-date',
@@ -32,7 +32,7 @@ cli({
             .filter((item) => item.subtype === 2)
             .map((item) => {
             const ts = item.timestamp;
-            const dateStr = ts ? new Date(ts).toISOString().split('T')[0] : null;
+            const dateStr = ts ? formatChinaDate(ts) : null;
             const isFuture = ts && ts > now;
             return { date: dateStr, report: item.message, status: isFuture ? '⏳ 未发布' : '✅ 已发布', _ts: ts, _future: isFuture };
         });

package/clis/xueqiu/kline.js

@@ -1,6 +1,6 @@
 import { cli } from '@jackwener/opencli/registry';
 import { EmptyResultError } from '@jackwener/opencli/errors';
-import { fetchXueqiuJson } from './utils.js';
+import { fetchXueqiuJson, formatChinaDate } from './utils.js';
 cli({
     site: 'xueqiu',
     name: 'kline',
@@ -31,7 +31,7 @@ cli({
         const colIdx = {};
         columns.forEach((name, i) => { colIdx[name] = i; });
         return d.data.item.map(row => ({
-            date: colIdx.timestamp != null ? new Date(row[colIdx.timestamp]).toISOString().split('T')[0] : null,
+            date: colIdx.timestamp != null ? formatChinaDate(row[colIdx.timestamp]) : null,
             open: row[colIdx.open] ?? null,
             high: row[colIdx.high] ?? null,
             low: row[colIdx.low] ?? null,

package/clis/xueqiu/utils.js

@@ -1,4 +1,23 @@
 import { AuthRequiredError, CommandExecutionError } from '@jackwener/opencli/errors';
+
+const CHINA_DATE_FORMATTER = new Intl.DateTimeFormat('en-US', {
+    timeZone: 'Asia/Shanghai',
+    year: 'numeric',
+    month: '2-digit',
+    day: '2-digit',
+});
+
+/** Format a Unix ms timestamp as the matching `YYYY-MM-DD` in Asia/Shanghai (xueqiu's canonical user timezone for all markets). */
+export function formatChinaDate(ts) {
+    if (ts == null) return null;
+    const parts = Object.fromEntries(
+        CHINA_DATE_FORMATTER.formatToParts(new Date(ts))
+            .filter((part) => part.type !== 'literal')
+            .map((part) => [part.type, part.value]),
+    );
+    return `${parts.year}-${parts.month}-${parts.day}`;
+}
+
 /**
  * Fetch a xueqiu JSON API from inside the browser context (credentials included).
  * Page must already be navigated to xueqiu.com before calling this function.

package/clis/xueqiu/utils.test.js

@@ -0,0 +1,26 @@
+import { describe, expect, it } from 'vitest';
+import { formatChinaDate } from './utils.js';
+
+describe('formatChinaDate', () => {
+    it('returns the Asia/Shanghai date for a UTC ms at China midnight', () => {
+        expect(formatChinaDate(Date.UTC(2026, 4, 7, 16, 0, 0))).toBe('2026-05-08');
+    });
+    it('returns the same China date for a moment late in the day', () => {
+        expect(formatChinaDate(Date.UTC(2026, 4, 8, 14, 0, 0))).toBe('2026-05-08');
+    });
+    it('formats representative A-share and US-market bars on xueqiu Beijing dates', () => {
+        expect(formatChinaDate(Date.UTC(2026, 4, 7, 16, 0, 0))).toBe('2026-05-08');
+        expect(formatChinaDate(Date.UTC(2026, 4, 10, 16, 0, 0))).toBe('2026-05-11');
+    });
+    it('crosses the China day boundary at 16:00 UTC', () => {
+        expect(formatChinaDate(Date.UTC(2026, 0, 1, 15, 59, 59))).toBe('2026-01-01');
+        expect(formatChinaDate(Date.UTC(2026, 0, 1, 16, 0, 0))).toBe('2026-01-02');
+    });
+    it('always returns an ISO calendar date string, not a locale-shaped slash date', () => {
+        expect(formatChinaDate(Date.UTC(2026, 0, 1, 16, 0, 0))).toMatch(/^\d{4}-\d{2}-\d{2}$/);
+    });
+    it('returns null for nullish input', () => {
+        expect(formatChinaDate(null)).toBeNull();
+        expect(formatChinaDate(undefined)).toBeNull();
+    });
+});

package/clis/zhihu/answer-detail.js

@@ -0,0 +1,233 @@
+import { cli, Strategy } from '@jackwener/opencli/registry';
+import { ArgumentError, AuthRequiredError, CommandExecutionError, EmptyResultError } from '@jackwener/opencli/errors';
+
+// Light-weight HTML → text, preserving paragraph / heading / list-item
+// line breaks. Zhihu answer `content` is HTML, so we map block-level
+// closing tags + `<br>` to newlines before stripping the rest.
+function stripHtml(html) {
+    if (!html) return '';
+    return html
+        .replace(/<br\s*\/?\s*>/gi, '\n')
+        // Block-level closing tags become paragraph breaks (double
+        // newline) so the stripped text stays readable. The trailing
+        // `\n{3,}` collapse pass below normalizes accidental triples.
+        .replace(/<\/(?:p|div|h[1-6]|li|blockquote)>/gi, '\n\n')
+        .replace(/<[^>]+>/g, '')
+        .replace(/&nbsp;/g, ' ')
+        .replace(/&lt;/g, '<')
+        .replace(/&gt;/g, '>')
+        .replace(/&amp;/g, '&')
+        .replace(/&quot;/g, '"')
+        .replace(/&#39;/g, "'")
+        .replace(/\n{3,}/g, '\n\n')
+        .trim();
+}
+
+const ANSWER_ID_RE = /^\d+$/;
+const ANSWER_TYPED_RE = /^answer:(\d+):(\d+)$/;
+const ANSWER_PATH_RE = /^\/question\/(\d+)\/answer\/(\d+)\/?$/;
+const BARE_ANSWER_PATH_RE = /^\/answer\/(\d+)\/?$/;
+const QUESTION_PATH_RE = /^\/question\/(\d+)\/?$/;
+const QUESTION_API_PATH_RE = /^\/api\/v4\/questions\/(\d+)\/?$/;
+
+// Accepts: bare numeric id (`1937205528846655537`), the typed
+// target form used by the existing zhihu write adapters
+// (`answer:<qid>:<aid>`), or the full Zhihu URL pasted from a
+// browser (`https://www.zhihu.com/question/<qid>/answer/<aid>`).
+// Returns string-safe ids, or null when the input does not resolve to
+// any of those exact shapes.
+function parseAnswerTarget(input) {
+    const value = String(input ?? '').trim();
+    if (!value) return null;
+    if (ANSWER_ID_RE.test(value)) return { answerId: value, questionId: '' };
+    const typed = value.match(ANSWER_TYPED_RE);
+    if (typed) return { questionId: typed[1], answerId: typed[2] };
+    try {
+        const url = new URL(value);
+        if (
+            url.protocol !== 'https:' ||
+            url.username ||
+            url.password ||
+            url.port ||
+            (url.hostname !== 'www.zhihu.com' && url.hostname !== 'zhihu.com')
+        ) {
+            return null;
+        }
+        let m = url.pathname.match(ANSWER_PATH_RE);
+        if (m) return { questionId: m[1], answerId: m[2] };
+        m = url.pathname.match(BARE_ANSWER_PATH_RE);
+        if (m) return { answerId: m[1], questionId: '' };
+    } catch {
+        return null;
+    }
+    return null;
+}
+
+function extractAnswerId(input) {
+    return parseAnswerTarget(input)?.answerId ?? null;
+}
+
+function extractQuestionIdFromAnswerUrl(input) {
+    const value = String(input ?? '').trim();
+    if (!value) return '';
+    try {
+        const url = new URL(value);
+        if (url.protocol !== 'https:' || (url.hostname !== 'www.zhihu.com' && url.hostname !== 'zhihu.com')) {
+            return '';
+        }
+        return url.pathname.match(ANSWER_PATH_RE)?.[1]
+            || url.pathname.match(QUESTION_PATH_RE)?.[1]
+            || url.pathname.match(QUESTION_API_PATH_RE)?.[1]
+            || '';
+    } catch {
+        return '';
+    }
+}
+
+function normalizeCount(value) {
+    return Number.isInteger(value) && value >= 0 ? value : 0;
+}
+
+function normalizeUnixSeconds(value) {
+    return typeof value === 'number' && Number.isFinite(value) && value > 0
+        ? new Date(value * 1000).toISOString()
+        : '';
+}
+
+cli({
+    site: 'zhihu',
+    name: 'answer-detail',
+    access: 'read',
+    description: '知乎单个回答完整内容（按 answer ID 获取）',
+    domain: 'www.zhihu.com',
+    strategy: Strategy.COOKIE,
+    args: [
+        { name: 'id', required: true, positional: true, help: 'Answer ID, full Zhihu answer URL, or typed target (answer:<qid>:<aid>)' },
+        { name: 'max-content', type: 'int', default: 0, help: 'Optional cap on stripped content length in characters (0 = no truncation, return the full answer)' },
+    ],
+    columns: ['id', 'author', 'votes', 'comments', 'question_id', 'question_title', 'url', 'created_at', 'updated_at', 'content'],
+    func: async (page, kwargs) => {
+        const target = parseAnswerTarget(kwargs.id);
+        if (!target) {
+            throw new ArgumentError(
+                'Answer ID must be a numeric id, a Zhihu answer URL, or answer:<qid>:<aid>',
+                'Example: opencli zhihu answer-detail 1937205528846655537',
+            );
+        }
+        const { answerId } = target;
+        // `--max-content 0` (the default) means "no cap, return the
+        // full stripped answer". Any positive value is an opt-in user
+        // cap, mirroring the wikipedia `page` pattern — we never
+        // silently truncate behind the user's back.
+        const rawMaxContent = kwargs['max-content'];
+        const maxContent = rawMaxContent == null ? 0 : Number(rawMaxContent);
+        if (!Number.isInteger(maxContent) || maxContent < 0) {
+            throw new ArgumentError(
+                '--max-content must be a non-negative integer (0 = no cap, full content)',
+                'Example: --max-content 2000',
+            );
+        }
+        // Navigate to the answer page itself: this both seeds the
+        // cookie/anti-bot context and works even when the caller did
+        // not supply the parent question id (Zhihu redirects from
+        // `/answer/<aid>` to the canonical `/question/<qid>/answer/<aid>`).
+        try {
+            await page.goto(`https://www.zhihu.com/answer/${answerId}`);
+        } catch (err) {
+            throw new CommandExecutionError(
+                `Failed to open Zhihu answer ${answerId}: ${err instanceof Error ? err.message : String(err)}`,
+                'Open the answer URL in Chrome and retry after the page is reachable.',
+            );
+        }
+        const currentQuestionId = page.getCurrentUrl
+            ? extractQuestionIdFromAnswerUrl(await page.getCurrentUrl().catch(() => ''))
+            : '';
+        const apiUrl = `https://www.zhihu.com/api/v4/answers/${answerId}?include=content,voteup_count,comment_count,author,created_time,updated_time,question`;
+        const data = await page.evaluate(`
+      (async () => {
+        const r = await fetch(${JSON.stringify(apiUrl)}, { credentials: 'include' });
+        if (!r.ok) return { __httpError: r.status };
+        try {
+          return await r.json();
+        } catch (error) {
+          return { __malformedJson: error instanceof Error ? error.message : String(error) };
+        }
+      })()
+    `).catch((err) => {
+            throw new CommandExecutionError(
+                `Zhihu answer detail request failed: ${err instanceof Error ? err.message : String(err)}`,
+                'Try again later or rerun with -v for more detail.',
+            );
+        });
+        if (!data || data.__httpError) {
+            const status = data?.__httpError;
+            if (status === 401 || status === 403) {
+                throw new AuthRequiredError('www.zhihu.com', 'Failed to fetch Zhihu answer detail');
+            }
+            if (status === 404) {
+                throw new EmptyResultError('zhihu answer-detail', `No Zhihu answer was found for ${answerId}.`);
+            }
+            throw new CommandExecutionError(
+                status
+                    ? `Zhihu answer detail request failed (HTTP ${status})`
+                    : 'Zhihu answer detail request failed',
+                'Try again later or rerun with -v for more detail',
+            );
+        }
+        if (data.__malformedJson) {
+            throw new CommandExecutionError(
+                `Zhihu answer detail returned malformed JSON: ${data.__malformedJson}`,
+                'Try again later or rerun with -v for more detail',
+            );
+        }
+        if (typeof data !== 'object' || Array.isArray(data)) {
+            throw new CommandExecutionError(
+                'Zhihu answer detail returned a malformed payload',
+                'Try again later or rerun with -v for more detail',
+            );
+        }
+        if (data.error || data.error_msg || data.message) {
+            throw new CommandExecutionError(
+                `Zhihu answer detail returned an error payload: ${data.error?.message || data.error_msg || data.message}`,
+                'Try again later or rerun with -v for more detail',
+            );
+        }
+        if (!Object.prototype.hasOwnProperty.call(data, 'content')) {
+            throw new CommandExecutionError(
+                'Zhihu answer detail payload did not include answer content',
+                'Try again later or rerun with -v for more detail',
+            );
+        }
+        const question = data.question || {};
+        // Answer ids and newer question ids can exceed
+        // Number.MAX_SAFE_INTEGER. Prefer ids parsed from user input or
+        // the canonical redirected URL; only fall back to API numeric ids
+        // when no string-safe source is available.
+        const questionId = target.questionId
+            || currentQuestionId
+            || extractQuestionIdFromAnswerUrl(question.url)
+            || (question.id == null ? '' : String(question.id));
+        const stripped = stripHtml(data.content || '');
+        // Truncation is opt-in only; default `maxContent === 0` short-
+        // circuits the conditional so the full stripped body is returned.
+        const content = maxContent > 0 && stripped.length > maxContent
+            ? stripped.substring(0, maxContent)
+            : stripped;
+        return [{
+            id: answerId,
+            author: data.author?.name || 'anonymous',
+            votes: normalizeCount(data.voteup_count),
+            comments: normalizeCount(data.comment_count),
+            question_id: questionId,
+            question_title: question.title || '',
+            url: questionId
+                ? `https://www.zhihu.com/question/${questionId}/answer/${answerId}`
+                : `https://www.zhihu.com/answer/${answerId}`,
+            created_at: normalizeUnixSeconds(data.created_time),
+            updated_at: normalizeUnixSeconds(data.updated_time),
+            content,
+        }];
+    },
+});
+
+export const __test__ = { stripHtml, extractAnswerId, parseAnswerTarget, extractQuestionIdFromAnswerUrl };