@jackwener/opencli 1.6.1 → 1.6.2

package/dist/clis/gemini/utils.test.js

@@ -1,5 +1,31 @@
-import { describe, expect, it } from 'vitest';
-import { collectGeminiTranscriptAdditions, sanitizeGeminiResponseText } from './utils.js';
+import { describe, expect, it, vi } from 'vitest';
+import { __test__, collectGeminiTranscriptAdditions, sanitizeGeminiResponseText, sendGeminiMessage, } from './utils.js';
+function createPageMock() {
+    return {
+        goto: vi.fn().mockResolvedValue(undefined),
+        evaluate: vi.fn(),
+        getCookies: vi.fn().mockResolvedValue([]),
+        snapshot: vi.fn().mockResolvedValue(undefined),
+        click: vi.fn().mockResolvedValue(undefined),
+        typeText: vi.fn().mockResolvedValue(undefined),
+        pressKey: vi.fn().mockResolvedValue(undefined),
+        scrollTo: vi.fn().mockResolvedValue(undefined),
+        getFormState: vi.fn().mockResolvedValue({}),
+        wait: vi.fn().mockResolvedValue(undefined),
+        tabs: vi.fn().mockResolvedValue([]),
+        selectTab: vi.fn().mockResolvedValue(undefined),
+        networkRequests: vi.fn().mockResolvedValue([]),
+        consoleMessages: vi.fn().mockResolvedValue([]),
+        scroll: vi.fn().mockResolvedValue(undefined),
+        autoScroll: vi.fn().mockResolvedValue(undefined),
+        installInterceptor: vi.fn().mockResolvedValue(undefined),
+        getInterceptedRequests: vi.fn().mockResolvedValue([]),
+        waitForCapture: vi.fn().mockResolvedValue(undefined),
+        screenshot: vi.fn().mockResolvedValue(''),
+        nativeType: vi.fn().mockResolvedValue(undefined),
+        nativeKeyPress: vi.fn().mockResolvedValue(undefined),
+    };
+}
 describe('sanitizeGeminiResponseText', () => {
     it('strips a prompt echo only when it appears as a prefixed block', () => {
         const prompt = 'Reply with the word opencli';
@@ -28,4 +54,125 @@ describe('collectGeminiTranscriptAdditions', () => {
         const current = ['Previous', 'Tell me a haiku', 'Tell me a haiku\n\nSoft spring rain arrives'];
         expect(collectGeminiTranscriptAdditions(before, current, prompt)).toBe('Soft spring rain arrives');
     });
+    it('keeps a reply line that quotes the prompt inside the answer body', () => {
+        const prompt = '请只回复：OK';
+        const before = ['baseline'];
+        const current = ['baseline', '关于“请只回复：OK”，这里是解释。'];
+        expect(collectGeminiTranscriptAdditions(before, current, prompt)).toBe('关于“请只回复：OK”，这里是解释。');
+    });
+});
+describe('gemini send strategy', () => {
+    it('includes structural composer selectors instead of relying only on english aria labels', () => {
+        expect(__test__.GEMINI_COMPOSER_SELECTORS).toContain('.ql-editor[contenteditable="true"]');
+        expect(__test__.GEMINI_COMPOSER_SELECTORS).toContain('.ql-editor[role="textbox"]');
+    });
+    it('prefers native text insertion before submitting the composer', async () => {
+        const page = createPageMock();
+        const evaluate = vi.mocked(page.evaluate);
+        const nativeType = vi.mocked(page.nativeType);
+        const nativeKeyPress = vi.mocked(page.nativeKeyPress);
+        evaluate
+            .mockResolvedValueOnce('https://gemini.google.com/app')
+            .mockResolvedValueOnce({ ok: true })
+            .mockResolvedValueOnce({ hasText: true })
+            .mockResolvedValueOnce('button');
+        const result = await sendGeminiMessage(page, '你好');
+        expect(nativeType).toHaveBeenCalledWith('你好');
+        expect(nativeKeyPress).not.toHaveBeenCalled();
+        expect(result).toBe('button');
+    });
+    it('falls back when native insertion does not update the composer', async () => {
+        const page = createPageMock();
+        const evaluate = vi.mocked(page.evaluate);
+        const nativeType = vi.mocked(page.nativeType);
+        const nativeKeyPress = vi.mocked(page.nativeKeyPress);
+        evaluate
+            .mockResolvedValueOnce('https://gemini.google.com/app')
+            .mockResolvedValueOnce({ ok: true })
+            .mockResolvedValueOnce({ hasText: false })
+            .mockResolvedValueOnce({ hasText: true })
+            .mockResolvedValueOnce('enter');
+        const result = await sendGeminiMessage(page, '你好');
+        expect(nativeType).toHaveBeenCalledWith('你好');
+        expect(nativeKeyPress).toHaveBeenCalledWith('Enter');
+        expect(evaluate).toHaveBeenCalledTimes(5);
+        expect(result).toBe('enter');
+    });
+    it('falls back when native insertion throws', async () => {
+        const page = createPageMock();
+        const evaluate = vi.mocked(page.evaluate);
+        const nativeType = vi.mocked(page.nativeType);
+        nativeType.mockRejectedValueOnce(new Error('Unknown action: cdp'));
+        evaluate
+            .mockResolvedValueOnce('https://gemini.google.com/app')
+            .mockResolvedValueOnce({ ok: true })
+            .mockResolvedValueOnce({ hasText: true })
+            .mockResolvedValueOnce('button');
+        const result = await sendGeminiMessage(page, '你好');
+        expect(nativeType).toHaveBeenCalledWith('你好');
+        expect(result).toBe('button');
+    });
+    it('retries composer preparation until a slow-loading composer appears', async () => {
+        const page = createPageMock();
+        const evaluate = vi.mocked(page.evaluate);
+        const wait = vi.mocked(page.wait);
+        evaluate
+            .mockResolvedValueOnce('https://gemini.google.com/app')
+            .mockResolvedValueOnce({ ok: false, reason: 'Could not find Gemini composer' })
+            .mockResolvedValueOnce({ ok: false, reason: 'Could not find Gemini composer' })
+            .mockResolvedValueOnce({ ok: true })
+            .mockResolvedValueOnce({ hasText: true })
+            .mockResolvedValueOnce('button');
+        const result = await sendGeminiMessage(page, '你好');
+        expect(result).toBe('button');
+        expect(wait.mock.calls.filter(([value]) => value === 1)).toHaveLength(3);
+    });
+    it('keeps retrying until a composer that appears on the fourth attempt is ready', async () => {
+        const page = createPageMock();
+        const evaluate = vi.mocked(page.evaluate);
+        const wait = vi.mocked(page.wait);
+        evaluate
+            .mockResolvedValueOnce('https://gemini.google.com/app')
+            .mockResolvedValueOnce({ ok: false, reason: 'Could not find Gemini composer' })
+            .mockResolvedValueOnce({ ok: false, reason: 'Could not find Gemini composer' })
+            .mockResolvedValueOnce({ ok: false, reason: 'Could not find Gemini composer' })
+            .mockResolvedValueOnce({ ok: true })
+            .mockResolvedValueOnce({ hasText: true })
+            .mockResolvedValueOnce('button');
+        const result = await sendGeminiMessage(page, '你好');
+        expect(result).toBe('button');
+        expect(wait.mock.calls.filter(([value]) => value === 1)).toHaveLength(4);
+    });
+    it('avoids innerHTML in the fallback insertion path for trusted types pages', () => {
+        expect(__test__.insertComposerTextFallbackScript('你好')).not.toContain('innerHTML');
+        expect(__test__.insertComposerTextFallbackScript('你好')).toContain('replaceChildren');
+    });
+    it('keeps a button submit path in the generated submit script', () => {
+        expect(__test__.submitComposerScript()).toContain('.click()');
+    });
+    it('supports localized new chat labels in the generated new-chat script', () => {
+        expect(__test__.clickNewChatScript()).toContain('发起新对话');
+    });
+});
+describe('gemini turn normalization', () => {
+    it('collapses only adjacent duplicate turns so identical replies across rounds remain visible', () => {
+        const turns = [
+            { Role: 'User', Text: '你说\n\n请只回复：OK' },
+            { Role: 'User', Text: '请只回复：OK' },
+            { Role: 'Assistant', Text: 'OK' },
+            { Role: 'Assistant', Text: 'OK' },
+            { Role: 'User', Text: '你说\n\n请只回复：OK' },
+            { Role: 'User', Text: '请只回复：OK' },
+            { Role: 'Assistant', Text: 'OK' },
+            { Role: 'Assistant', Text: 'OK' },
+        ];
+        expect(__test__.collapseAdjacentGeminiTurns(turns)).toEqual([
+            { Role: 'User', Text: '你说\n\n请只回复：OK' },
+            { Role: 'User', Text: '请只回复：OK' },
+            { Role: 'Assistant', Text: 'OK' },
+            { Role: 'User', Text: '你说\n\n请只回复：OK' },
+            { Role: 'User', Text: '请只回复：OK' },
+            { Role: 'Assistant', Text: 'OK' },
+        ]);
+    });
 });

package/dist/clis/hupu/detail.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/clis/hupu/detail.js

@@ -0,0 +1,72 @@
+import { cli, Strategy } from '../../registry.js';
+import { getHupuThreadUrl, readHupuNextData, stripHtml } from './utils.js';
+cli({
+    site: 'hupu',
+    name: 'detail',
+    description: '获取虎扑帖子详情 (使用Next.js JSON数据)',
+    domain: 'bbs.hupu.com',
+    strategy: Strategy.PUBLIC,
+    browser: true,
+    navigateBefore: false,
+    args: [
+        {
+            name: 'tid',
+            required: true,
+            positional: true,
+            help: '帖子ID（9位数字）'
+        },
+        {
+            name: 'replies',
+            type: 'boolean',
+            default: false,
+            help: '是否包含热门回复'
+        }
+    ],
+    columns: ['title', 'author', 'content', 'replies', 'lights', 'url'],
+    func: async (page, kwargs) => {
+        const { tid, replies: includeReplies = false } = kwargs;
+        const url = getHupuThreadUrl(tid).replace(/-1\.html$/, '.html');
+        const data = await readHupuNextData(page, url, 'Read Hupu thread detail', {
+            expectedTid: String(tid),
+        });
+        // 检查错误信息（只有当code不是200时才报错）
+        const errorInfo = data.props.pageProps.detail_error_info;
+        if (errorInfo && errorInfo.code !== 200) {
+            throw new Error(`帖子访问失败: ${errorInfo.message} (code: ${errorInfo.code})`);
+        }
+        // 获取帖子信息
+        const thread = data.props.pageProps.detail?.thread;
+        if (!thread) {
+            throw new Error('帖子不存在或已被删除');
+        }
+        const authorName = thread.author?.puname || '未知作者';
+        const content = stripHtml(thread.content);
+        const contentPreview = content.length > 300 ? content.substring(0, 300) + '...' : content;
+        // 构建结果
+        const result = {
+            title: thread.title,
+            author: authorName,
+            content: contentPreview,
+            replies: thread.replies || 0,
+            lights: thread.lights || 0,
+            url: `https://bbs.hupu.com/${tid}.html`
+        };
+        // 如果需要包含回复，添加回复信息到内容中
+        if (includeReplies) {
+            const replyList = data.props.pageProps.detail?.lights || [];
+            const topReplies = replyList.slice(0, 3);
+            if (topReplies.length > 0) {
+                let replyText = '\n\n【热门回复】\n';
+                topReplies.forEach((reply, index) => {
+                    const userName = reply.author?.puname || '未知用户';
+                    const replyContent = stripHtml(reply.content).substring(0, 100);
+                    const replyLights = reply.allLightCount || 0; // 修复：使用正确的字段名
+                    const replyTime = reply.created_at_format || '未知时间';
+                    replyText += `${index + 1}. ${userName} (亮${replyLights} ${replyTime}):\n   ${replyContent}\n\n`;
+                });
+                result.content = contentPreview + replyText;
+            }
+        }
+        return [result];
+    },
+});

package/dist/clis/hupu/hot.yaml

@@ -0,0 +1,43 @@
+site: hupu
+name: hot
+description: 虎扑热门帖子
+domain: bbs.hupu.com
+
+args:
+  limit:
+    type: int
+    default: 20
+    description: Number of hot posts
+
+pipeline:
+  - navigate: https://bbs.hupu.com/
+
+  - evaluate: |
+      (async () => {
+        // 从HTML中提取帖子信息（适配新的HTML结构）
+        const html = document.documentElement.outerHTML;
+        const posts = [];
+
+        // 匹配当前虎扑页面结构的正则表达式
+        // 结构: <a href="/638249612.html"...><span class="t-title">标题</span></a>
+        const regex = /<a[^>]*href="\/(\d{9})\.html"[^>]*><span[^>]*class="t-title"[^>]*>([^<]+)<\/span><\/a>/g;
+        let match;
+
+        while ((match = regex.exec(html)) !== null && posts.length < ${{ args.limit }}) {
+          posts.push({
+            tid: match[1],
+            title: match[2].trim()
+          });
+        }
+
+        return posts;
+      })()
+
+  - map:
+      rank: ${{ index + 1 }}
+      title: ${{ item.title }}
+      url: https://bbs.hupu.com/${{ item.tid }}.html
+
+  - limit: ${{ args.limit }}
+
+columns: [rank, title, url]

package/dist/clis/hupu/like.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/clis/hupu/like.js

@@ -0,0 +1,75 @@
+import { CliError } from '../../errors.js';
+import { cli, Strategy } from '../../registry.js';
+import { postHupuJson } from './utils.js';
+cli({
+    site: 'hupu',
+    name: 'like',
+    description: '点赞虎扑回复 (需要登录)',
+    domain: 'bbs.hupu.com',
+    strategy: Strategy.COOKIE, // 需要Cookie认证
+    navigateBefore: false,
+    args: [
+        {
+            name: 'tid',
+            required: true,
+            positional: true,
+            help: '帖子ID（9位数字）'
+        },
+        {
+            name: 'pid',
+            required: true,
+            positional: true,
+            help: '回复ID'
+        },
+        {
+            name: 'fid',
+            required: true,
+            help: '板块ID（如278汽车区）'
+        }
+    ],
+    columns: ['status', 'message'],
+    func: async (page, kwargs) => {
+        const { tid, pid, fid } = kwargs;
+        const url = 'https://bbs.hupu.com/pcmapi/pc/bbs/v1/reply/light';
+        // 构建请求体
+        const body = {
+            tid,
+            pid,
+            puid: '',
+            fid,
+            shumei_id: '',
+            deviceid: ''
+        };
+        try {
+            const result = await postHupuJson(page, tid, url, body, 'Like Hupu reply');
+            // 处理响应
+            if (result.code === 1) {
+                return [{
+                        status: '✅ 点赞成功',
+                        message: ''
+                    }];
+            }
+            else if (result.code === 0 && result.msg === '你已经点亮过这个回帖了') {
+                return [{
+                        status: '⚠️ 已经点赞过了',
+                        message: result.msg || ''
+                    }];
+            }
+            else if (result.code === 0) {
+                return [{
+                        status: '⚠️ 操作未执行',
+                        message: result.msg || result.message || ''
+                    }];
+            }
+            else {
+                throw new Error(`接口错误 code=${result.code}: ${result.msg || result.message}`);
+            }
+        }
+        catch (error) {
+            if (error instanceof CliError)
+                throw error;
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            throw new Error(`点赞失败: ${errorMessage}`);
+        }
+    },
+});

package/dist/clis/hupu/reply.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/clis/hupu/reply.js

@@ -0,0 +1,71 @@
+import { CliError } from '../../errors.js';
+import { cli, Strategy } from '../../registry.js';
+import { postHupuJson } from './utils.js';
+cli({
+    site: 'hupu',
+    name: 'reply',
+    description: '回复虎扑帖子 (需要登录)',
+    domain: 'bbs.hupu.com',
+    strategy: Strategy.COOKIE, // 需要Cookie认证
+    navigateBefore: false,
+    args: [
+        {
+            name: 'tid',
+            required: true,
+            positional: true,
+            help: '帖子ID（9位数字）'
+        },
+        {
+            name: 'topic_id',
+            required: true,
+            help: '板块ID，即接口中的 topicId（如 502 篮球资讯）'
+        },
+        {
+            name: 'text',
+            required: true,
+            positional: true,
+            help: '回复内容'
+        },
+        {
+            name: 'quote_id',
+            help: '被引用回复的 pid；填写后会以“回复某条热门回复”的方式发言'
+        }
+    ],
+    columns: ['status', 'message'],
+    func: async (page, kwargs) => {
+        const { tid, topic_id, text, quote_id } = kwargs;
+        const url = 'https://bbs.hupu.com/pcmapi/pc/bbs/v1/createReply';
+        // 虎扑内容用 <p> 包裹
+        const content = `<p>${text}</p>`;
+        // 构建请求体
+        const body = {
+            topicId: topic_id,
+            content,
+            shumeiId: '',
+            deviceid: '',
+            tid
+        };
+        // 如果有引用回复ID，添加到请求体
+        if (quote_id) {
+            body.quoteId = quote_id;
+        }
+        try {
+            const result = await postHupuJson(page, tid, url, body, 'Reply to Hupu thread', 'reply');
+            if (result.code === 1) {
+                return [{
+                        status: '✅ 回复成功',
+                        message: result.msg || result.message || ''
+                    }];
+            }
+            else {
+                throw new Error(`接口错误 code=${result.code}: ${result.msg || result.message}`);
+            }
+        }
+        catch (error) {
+            if (error instanceof CliError)
+                throw error;
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            throw new Error(`回复失败: ${errorMessage}`);
+        }
+    },
+});

package/dist/clis/hupu/search.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/clis/hupu/search.js

@@ -0,0 +1,59 @@
+import { cli, Strategy } from '../../registry.js';
+import { decodeHtmlEntities, getHupuSearchUrl, readHupuSearchData, stripHtml } from './utils.js';
+cli({
+    site: 'hupu',
+    name: 'search',
+    description: '搜索虎扑帖子 (使用官方API)',
+    domain: 'bbs.hupu.com',
+    strategy: Strategy.PUBLIC, // 公开API，不需要Cookie
+    browser: true,
+    navigateBefore: false,
+    args: [
+        {
+            name: 'query',
+            required: true,
+            positional: true,
+            help: '搜索关键词'
+        },
+        {
+            name: 'page',
+            type: 'int',
+            default: 1,
+            help: '结果页码'
+        },
+        {
+            name: 'limit',
+            type: 'int',
+            default: 20,
+            help: '返回结果数量'
+        },
+        {
+            name: 'forum',
+            help: '板块ID过滤 (可选)'
+        },
+        {
+            name: 'sort',
+            default: 'general',
+            help: '排序方式: general/createtime/replytime/light/reply'
+        }
+    ],
+    columns: ['rank', 'title', 'author', 'replies', 'lights', 'forum', 'url'],
+    func: async (page, kwargs) => {
+        const { query, page: pageNum = 1, limit = 20, forum, sort = 'general' } = kwargs;
+        const searchUrl = getHupuSearchUrl(query, pageNum, forum, sort);
+        const data = await readHupuSearchData(page, searchUrl, 'Search Hupu threads');
+        // 提取搜索结果
+        const results = data.searchRes?.data || [];
+        // 处理结果：清理HTML标签，解码HTML实体
+        const processedResults = results.slice(0, Number(limit)).map((item, index) => ({
+            rank: index + 1,
+            title: decodeHtmlEntities(stripHtml(item.title)),
+            author: item.username || '未知用户',
+            replies: item.replies || '0',
+            lights: item.lights || '0',
+            forum: item.forum_name || '未知板块',
+            url: `https://bbs.hupu.com/${item.id}.html`
+        }));
+        return processedResults;
+    },
+});

package/dist/clis/hupu/unlike.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/clis/hupu/unlike.js

@@ -0,0 +1,75 @@
+import { CliError } from '../../errors.js';
+import { cli, Strategy } from '../../registry.js';
+import { postHupuJson } from './utils.js';
+cli({
+    site: 'hupu',
+    name: 'unlike',
+    description: '取消点赞虎扑回复 (需要登录)',
+    domain: 'bbs.hupu.com',
+    strategy: Strategy.COOKIE, // 需要Cookie认证
+    navigateBefore: false,
+    args: [
+        {
+            name: 'tid',
+            required: true,
+            positional: true,
+            help: '帖子ID（9位数字）'
+        },
+        {
+            name: 'pid',
+            required: true,
+            positional: true,
+            help: '回复ID'
+        },
+        {
+            name: 'fid',
+            required: true,
+            help: '板块ID（如278汽车区）'
+        }
+    ],
+    columns: ['status', 'message'],
+    func: async (page, kwargs) => {
+        const { tid, pid, fid } = kwargs;
+        const url = 'https://bbs.hupu.com/pcmapi/pc/bbs/v1/reply/cancelLight';
+        // 构建请求体（与点赞相同）
+        const body = {
+            tid,
+            pid,
+            puid: '',
+            fid,
+            shumei_id: '',
+            deviceid: ''
+        };
+        try {
+            const result = await postHupuJson(page, tid, url, body, 'Unlike Hupu reply');
+            // 处理响应
+            if (result.code === 1) {
+                return [{
+                        status: '✅ 取消点赞成功',
+                        message: ''
+                    }];
+            }
+            else if (result.code === 0 && result.msg === '你还没有点亮过这个回帖') {
+                return [{
+                        status: '⚠️ 你还没点赞过',
+                        message: result.msg || ''
+                    }];
+            }
+            else if (result.code === 0) {
+                return [{
+                        status: '⚠️ 操作未执行',
+                        message: result.msg || result.message || ''
+                    }];
+            }
+            else {
+                throw new Error(`接口错误 code=${result.code}: ${result.msg || result.message}`);
+            }
+        }
+        catch (error) {
+            if (error instanceof CliError)
+                throw error;
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            throw new Error(`取消点赞失败: ${errorMessage}`);
+        }
+    },
+});

package/dist/clis/hupu/utils.d.ts

@@ -0,0 +1,20 @@
+import type { IPage } from '../../types.js';
+export interface HupuApiResponse {
+    code?: number;
+    msg?: string;
+    message?: string;
+}
+export declare function stripHtml(html: string): string;
+export declare function decodeHtmlEntities(html: string): string;
+export declare function getHupuThreadUrl(tid: unknown): string;
+export declare function getHupuSearchUrl(query: unknown, page: unknown, forum?: unknown, sort?: unknown): string;
+export declare function readHupuNextData<T>(page: IPage, url: string, actionLabel: string, options?: {
+    expectedTid?: string;
+    timeoutMs?: number;
+}): Promise<T>;
+export declare function readHupuSearchData<T>(page: IPage, url: string, actionLabel: string): Promise<T>;
+/**
+ * Execute authenticated Hupu JSON requests inside the browser page so
+ * cookies and the thread referer come from the live logged-in session.
+ */
+export declare function postHupuJson(page: IPage, tid: unknown, apiUrl: string, body: Record<string, unknown>, actionLabel: string, mode?: 'default' | 'reply'): Promise<HupuApiResponse>;