@jackwener/opencli 1.5.5 → 1.5.7

package/dist/clis/douyin/draft.test.js

@@ -1,6 +1,86 @@
-import { describe, expect, it } from 'vitest';
+import * as fs from 'node:fs';
+import * as os from 'node:os';
+import * as path from 'node:path';
+import { afterAll, describe, expect, it, vi } from 'vitest';
+import { wrapForEval } from '../../browser/utils.js';
 import { getRegistry } from '../../registry.js';
-import './draft.js';
+import { buildCoverCheckPanelTextJs } from './draft.js';
+// ─── Shared test helpers ────────────────────────────────────────────
+const tempDirs = [];
+function createTempVideo(name = 'demo.mp4') {
+    const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'opencli-douyin-draft-'));
+    tempDirs.push(dir);
+    const filePath = path.join(dir, name);
+    fs.writeFileSync(filePath, Buffer.from([0, 0, 0, 20, 102, 116, 121, 112]));
+    return filePath;
+}
+function createTempCover(videoPath, name = 'cover.jpg') {
+    const filePath = path.join(path.dirname(videoPath), name);
+    fs.writeFileSync(filePath, Buffer.from([0xff, 0xd8, 0xff, 0xd9]));
+    return filePath;
+}
+function getDraftCommand() {
+    const registry = getRegistry();
+    const cmd = [...registry.values()].find(c => c.site === 'douyin' && c.name === 'draft');
+    if (!cmd?.func)
+        throw new Error('douyin draft command not registered');
+    return cmd;
+}
+afterAll(() => {
+    for (const dir of tempDirs) {
+        fs.rmSync(dir, { recursive: true, force: true });
+    }
+});
+function createFakeTree(text, children = []) {
+    const node = {
+        textContent: text,
+        parentElement: null,
+        querySelectorAll: () => [],
+    };
+    node.querySelectorAll = () => {
+        const descendants = [];
+        for (const child of children) {
+            descendants.push(child, ...child.querySelectorAll('*'));
+        }
+        return descendants;
+    };
+    for (const child of children) {
+        child.parentElement = node;
+    }
+    return node;
+}
+function createPageMock(evaluateResults, overrides = {}) {
+    const evaluate = vi.fn();
+    for (const result of evaluateResults) {
+        evaluate.mockResolvedValueOnce(result);
+    }
+    return {
+        goto: vi.fn().mockResolvedValue(undefined),
+        evaluate,
+        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({ forms: [], orphanFields: [] }),
+        wait: vi.fn().mockResolvedValue(undefined),
+        tabs: vi.fn().mockResolvedValue([]),
+        closeTab: vi.fn().mockResolvedValue(undefined),
+        newTab: vi.fn().mockResolvedValue(undefined),
+        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(''),
+        setFileInput: vi.fn().mockResolvedValue(undefined),
+        ...overrides,
+    };
+}
 describe('douyin draft registration', () => {
     it('registers the draft command', () => {
         const registry = getRegistry();
@@ -8,4 +88,279 @@ describe('douyin draft registration', () => {
         const cmd = values.find(c => c.site === 'douyin' && c.name === 'draft');
         expect(cmd).toBeDefined();
     });
+    it('extracts the higher quick-check panel instead of stopping at a header-only ancestor', () => {
+        const marker = createFakeTree('快速检测');
+        const state = createFakeTree('重新检测');
+        const header = createFakeTree('快速检测', [marker]);
+        const status = createFakeTree('重新检测', [state]);
+        const panel = createFakeTree('快速检测重新检测', [header, status]);
+        const body = createFakeTree('body', [panel]);
+        const g = globalThis;
+        const originalDocument = g.document;
+        g.document = {
+            body,
+            querySelectorAll: () => [marker, state],
+        };
+        try {
+            expect(eval(buildCoverCheckPanelTextJs())()).toBe('快速检测重新检测');
+        }
+        finally {
+            g.document = originalDocument;
+        }
+    });
+    it('returns empty when only header text exists and no exact quick-check state node is present', () => {
+        const marker = createFakeTree('快速检测');
+        const note = createFakeTree('检测说明');
+        const header = createFakeTree('快速检测检测说明', [marker, note]);
+        const body = createFakeTree('body', [header]);
+        const g = globalThis;
+        const originalDocument = g.document;
+        g.document = {
+            body,
+            querySelectorAll: () => [marker, note],
+        };
+        try {
+            expect(eval(buildCoverCheckPanelTextJs())()).toBe('');
+        }
+        finally {
+            g.document = originalDocument;
+        }
+    });
+    it('extracts the quick-check panel when busy state is rendered as a single 封面检测中 node', () => {
+        const marker = createFakeTree('快速检测');
+        const busy = createFakeTree('封面检测中');
+        const header = createFakeTree('快速检测', [marker]);
+        const status = createFakeTree('封面检测中', [busy]);
+        const panel = createFakeTree('快速检测封面检测中', [header, status]);
+        const body = createFakeTree('body', [panel]);
+        const g = globalThis;
+        const originalDocument = g.document;
+        g.document = {
+            body,
+            querySelectorAll: () => [marker, busy],
+        };
+        try {
+            expect(eval(buildCoverCheckPanelTextJs())()).toBe('快速检测封面检测中');
+        }
+        finally {
+            g.document = originalDocument;
+        }
+    });
+    it('uploads through the official creator draft page and saves the draft session', async () => {
+        const cmd = getDraftCommand();
+        const videoPath = createTempVideo('demo.mp4');
+        const page = createPageMock([
+            undefined,
+            { href: 'https://creator.douyin.com/creator-micro/content/post/video?enter_from=publish_page', ready: true, bodyText: '' },
+            undefined,
+            true,
+            true,
+            true,
+            { ok: true, text: '暂存离开', creationId: 'creation-001' },
+            {
+                href: 'https://creator.douyin.com/creator-micro/content/upload?enter_from=publish',
+                bodyText: '你还有上次未发布的视频，是否继续编辑？继续编辑放弃',
+            },
+        ]);
+        const rows = await cmd.func(page, {
+            video: videoPath,
+            title: '最小修复验证',
+            caption: 'opencli draft e2e',
+            cover: '',
+            visibility: 'friends',
+        });
+        expect(page.goto).toHaveBeenCalledWith('https://creator.douyin.com/creator-micro/content/upload');
+        expect(page.wait).toHaveBeenCalledWith({
+            selector: 'input[type="file"]',
+            timeout: 20,
+        });
+        expect(page.setFileInput).toHaveBeenCalledWith([videoPath], 'input[type="file"]');
+        const evaluateCalls = page.evaluate.mock.calls.map((args) => String(args[0]));
+        expect(evaluateCalls.some((code) => code.includes('填写作品标题'))).toBe(true);
+        expect(evaluateCalls.some((code) => code.includes('好友可见'))).toBe(true);
+        expect(evaluateCalls.some((code) => code.includes('暂存离开'))).toBe(true);
+        expect(rows).toEqual([
+            {
+                status: '✅ 草稿已保存，可在创作中心继续编辑',
+                draft_id: 'creation-001',
+            },
+        ]);
+    });
+    it('waits for the composer when upload processing is slower than the first few polls', async () => {
+        const cmd = getDraftCommand();
+        const videoPath = createTempVideo('slow.mp4');
+        const page = createPageMock([
+            undefined,
+            { href: 'https://creator.douyin.com/creator-micro/content/upload', ready: false, bodyText: '上传中 42%' },
+            { href: 'https://creator.douyin.com/creator-micro/content/upload', ready: false, bodyText: '转码中' },
+            { href: 'https://creator.douyin.com/creator-micro/content/post/video?enter_from=publish_page', ready: true, bodyText: '' },
+            undefined,
+            true,
+            true,
+            { ok: true, text: '暂存离开', creationId: 'creation-slow' },
+            {
+                href: 'https://creator.douyin.com/creator-micro/content/upload?enter_from=publish',
+                bodyText: '你还有上次未发布的视频，是否继续编辑？继续编辑放弃',
+            },
+        ]);
+        const rows = await cmd.func(page, {
+            video: videoPath,
+            title: '慢上传验证',
+            caption: '',
+            cover: '',
+            visibility: 'public',
+        });
+        expect(rows).toEqual([
+            {
+                status: '✅ 草稿已保存，可在创作中心继续编辑',
+                draft_id: 'creation-slow',
+            },
+        ]);
+        expect(page.wait).toHaveBeenCalledWith({ time: 0.5 });
+        const shortWaitCalls = page.wait.mock.calls.filter(([arg]) => JSON.stringify(arg) === JSON.stringify({ time: 0.5 }));
+        expect(shortWaitCalls).toHaveLength(2);
+    });
+    it('fails fast when the save action does not expose a draft creation id', async () => {
+        const cmd = getDraftCommand();
+        const videoPath = createTempVideo('missing-id.mp4');
+        const page = createPageMock([
+            undefined,
+            { href: 'https://creator.douyin.com/creator-micro/content/post/video?enter_from=publish_page', ready: true, bodyText: '' },
+            undefined,
+            true,
+            true,
+            { ok: true, text: '暂存离开', creationId: '' },
+        ]);
+        await expect(cmd.func(page, {
+            video: videoPath,
+            title: '缺失 creation id',
+            caption: '',
+            cover: '',
+            visibility: 'public',
+        })).rejects.toThrow('点击草稿按钮失败: creation-id-missing');
+    });
+    it('uses the dedicated cover upload input when a custom cover is provided', async () => {
+        const cmd = getDraftCommand();
+        const videoPath = createTempVideo('demo.mp4');
+        const coverPath = createTempCover(videoPath);
+        const page = createPageMock([
+            undefined,
+            { href: 'https://creator.douyin.com/creator-micro/content/post/video?enter_from=publish_page', ready: true, bodyText: '' },
+            undefined,
+            1,
+            { ok: false, reason: 'cover-input-pending' },
+            { ok: true, selector: '[data-opencli-cover-input="1"]' },
+            '快速检测检测中',
+            '快速检测重新检测',
+            true,
+            true,
+            { ok: true, text: '暂存离开', creationId: 'creation-002' },
+            {
+                href: 'https://creator.douyin.com/creator-micro/content/upload?enter_from=publish',
+                bodyText: '你还有上次未发布的视频，是否继续编辑？继续编辑放弃',
+            },
+        ]);
+        const rows = await cmd.func(page, {
+            video: videoPath,
+            title: '封面上传验证',
+            caption: '',
+            cover: coverPath,
+            visibility: 'public',
+        });
+        expect(page.setFileInput).toHaveBeenNthCalledWith(1, [videoPath], 'input[type="file"]');
+        expect(page.setFileInput).toHaveBeenNthCalledWith(2, [coverPath], '[data-opencli-cover-input="1"]');
+        const shortWaitCalls = page.wait.mock.calls.filter(([arg]) => JSON.stringify(arg) === JSON.stringify({ time: 0.5 }));
+        expect(shortWaitCalls).toHaveLength(2);
+        const evaluateCalls = page.evaluate.mock.calls.map((args) => String(args[0]));
+        expect(evaluateCalls.some((code) => code.includes('上传新封面'))).toBe(true);
+        expect(evaluateCalls.some((code) => code.includes("text.includes('快速检测检测')"))).toBe(false);
+        expect(() => {
+            for (const code of evaluateCalls) {
+                new Function(wrapForEval(code));
+            }
+        }).not.toThrow();
+        expect(rows).toEqual([
+            {
+                status: '✅ 草稿已保存，可在创作中心继续编辑',
+                draft_id: 'creation-002',
+            },
+        ]);
+    });
+    it('waits for a late cover-section update before treating the custom cover as ready', async () => {
+        const cmd = getDraftCommand();
+        const videoPath = createTempVideo('cover-race.mp4');
+        const coverPath = createTempCover(videoPath, 'cover-race.jpg');
+        const page = createPageMock([
+            undefined,
+            { href: 'https://creator.douyin.com/creator-micro/content/post/video?enter_from=publish_page', ready: true, bodyText: '' },
+            undefined,
+            1,
+            { ok: true, selector: '[data-opencli-cover-input="1"]' },
+            '快速检测重新检测',
+            '快速检测重新检测',
+            '快速检测重新检测',
+            '快速检测检测中',
+            '快速检测横/竖双封面缺失',
+            true,
+            true,
+            { ok: true, text: '暂存离开', creationId: 'creation-cover-race' },
+            {
+                href: 'https://creator.douyin.com/creator-micro/content/upload?enter_from=publish',
+                bodyText: '你还有上次未发布的视频，是否继续编辑？继续编辑放弃',
+            },
+        ]);
+        const rows = await cmd.func(page, {
+            video: videoPath,
+            title: '封面竞态验证',
+            caption: '',
+            cover: coverPath,
+            visibility: 'public',
+        });
+        expect(rows).toEqual([
+            {
+                status: '✅ 草稿已保存，可在创作中心继续编辑',
+                draft_id: 'creation-cover-race',
+            },
+        ]);
+        const shortWaitCalls = page.wait.mock.calls.filter(([arg]) => JSON.stringify(arg) === JSON.stringify({ time: 0.5 }));
+        expect(shortWaitCalls).toHaveLength(4);
+    });
+    it('accepts the same ready label after cover busy state when the quick-check panel actually transitioned', async () => {
+        const cmd = getDraftCommand();
+        const videoPath = createTempVideo('cover-same-ready.mp4');
+        const coverPath = createTempCover(videoPath, 'cover-same-ready.jpg');
+        const page = createPageMock([
+            undefined,
+            { href: 'https://creator.douyin.com/creator-micro/content/post/video?enter_from=publish_page', ready: true, bodyText: '' },
+            undefined,
+            1,
+            { ok: true, selector: '[data-opencli-cover-input="1"]' },
+            '快速检测重新检测',
+            '快速检测重新检测',
+            '快速检测检测中',
+            '快速检测重新检测',
+            true,
+            true,
+            { ok: true, text: '暂存离开', creationId: 'creation-cover-same-ready' },
+            {
+                href: 'https://creator.douyin.com/creator-micro/content/upload?enter_from=publish',
+                bodyText: '你还有上次未发布的视频，是否继续编辑？继续编辑放弃',
+            },
+        ]);
+        const rows = await cmd.func(page, {
+            video: videoPath,
+            title: '封面同文案验证',
+            caption: '',
+            cover: coverPath,
+            visibility: 'public',
+        });
+        expect(rows).toEqual([
+            {
+                status: '✅ 草稿已保存，可在创作中心继续编辑',
+                draft_id: 'creation-cover-same-ready',
+            },
+        ]);
+        const shortWaitCalls = page.wait.mock.calls.filter(([arg]) => JSON.stringify(arg) === JSON.stringify({ time: 0.5 }));
+        expect(shortWaitCalls).toHaveLength(3);
+    });
 });

package/dist/clis/douyin/hashtag.js

@@ -34,9 +34,16 @@ cli({
             const kw = kwargs.keyword;
             const url = `https://creator.douyin.com/aweme/v1/hotspot/recommend/?${kw ? `keyword=${encodeURIComponent(kw)}&` : ''}aid=1128`;
             const res = await browserFetch(page, 'GET', url);
-            return (res.hotspot_list ?? []).slice(0, kwargs.limit).map(h => ({
+            const items = res.hotspot_list
+                ?? res.all_sentences?.map(h => ({
+                    sentence: h.word ?? '',
+                    hot_value: h.hot_value,
+                    sentence_id: h.sentence_id ?? '',
+                }))
+                ?? [];
+            return items.slice(0, kwargs.limit).map(h => ({
                 name: h.sentence,
-                id: '',
+                id: 'sentence_id' in h ? h.sentence_id : '',
                 view_count: h.hot_value,
             }));
         }

package/dist/clis/douyin/hashtag.test.js

@@ -1,7 +1,16 @@
-import { describe, expect, it } from 'vitest';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+const { browserFetchMock } = vi.hoisted(() => ({
+    browserFetchMock: vi.fn(),
+}));
+vi.mock('./_shared/browser-fetch.js', () => ({
+    browserFetch: browserFetchMock,
+}));
 import { getRegistry } from '../../registry.js';
 import './hashtag.js';
-describe('douyin hashtag registration', () => {
+describe('douyin hashtag', () => {
+    beforeEach(() => {
+        browserFetchMock.mockReset();
+    });
     it('registers the hashtag command', () => {
         const registry = getRegistry();
         const cmd = [...registry.values()].find(c => c.site === 'douyin' && c.name === 'hashtag');
@@ -22,4 +31,28 @@ describe('douyin hashtag registration', () => {
         const cmd = [...registry.values()].find(c => c.site === 'douyin' && c.name === 'hashtag');
         expect(cmd?.strategy).toBe('cookie');
     });
+    it('parses the current hotspot recommendation shape', async () => {
+        const registry = getRegistry();
+        const command = [...registry.values()].find((cmd) => cmd.site === 'douyin' && cmd.name === 'hashtag');
+        expect(command?.func).toBeDefined();
+        if (!command?.func)
+            throw new Error('douyin hashtag command not registered');
+        browserFetchMock.mockResolvedValueOnce({
+            all_sentences: [
+                {
+                    word: '在公园花海里大晒一场',
+                    hot_value: 12141172,
+                    sentence_id: '2448416',
+                },
+            ],
+        });
+        const rows = await command.func({}, { action: 'hot', keyword: '', limit: 5 });
+        expect(rows).toEqual([
+            {
+                name: '在公园花海里大晒一场',
+                id: '2448416',
+                view_count: 12141172,
+            },
+        ]);
+    });
 });

package/dist/clis/douyin/profile.js

@@ -12,7 +12,7 @@ cli({
     func: async (page, _kwargs) => {
         const url = 'https://creator.douyin.com/web/api/media/user/info/?aid=1128';
         const res = (await browserFetch(page, 'GET', url));
-        const u = res.user_info;
+        const u = res.user_info ?? res.user;
         if (!u)
             throw new CommandExecutionError('用户信息获取失败，请确认已登录 creator.douyin.com');
         return [

package/dist/clis/douyin/profile.test.js

@@ -1,11 +1,46 @@
-import { describe, expect, it } from 'vitest';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+const { browserFetchMock } = vi.hoisted(() => ({
+    browserFetchMock: vi.fn(),
+}));
+vi.mock('./_shared/browser-fetch.js', () => ({
+    browserFetch: browserFetchMock,
+}));
 import { getRegistry } from '../../registry.js';
 import './profile.js';
 describe('douyin profile registration', () => {
+    beforeEach(() => {
+        browserFetchMock.mockReset();
+    });
     it('registers the profile command', () => {
         const registry = getRegistry();
         const values = [...registry.values()];
         const cmd = values.find(c => c.site === 'douyin' && c.name === 'profile');
         expect(cmd).toBeDefined();
     });
+    it('maps the current user payload shape returned by creator center', async () => {
+        const registry = getRegistry();
+        const cmd = [...registry.values()].find(c => c.site === 'douyin' && c.name === 'profile');
+        expect(cmd?.func).toBeDefined();
+        if (!cmd?.func)
+            throw new Error('douyin profile command not registered');
+        browserFetchMock.mockResolvedValueOnce({
+            user: {
+                uid: '100',
+                nickname: 'creator',
+                follower_count: 12,
+                following_count: 3,
+                aweme_count: 7,
+            },
+        });
+        const rows = await cmd.func({}, {});
+        expect(rows).toEqual([
+            {
+                uid: '100',
+                nickname: 'creator',
+                follower_count: 12,
+                following_count: 3,
+                aweme_count: 7,
+            },
+        ]);
+    });
 });

package/dist/clis/douyin/user-videos.d.ts

@@ -0,0 +1,5 @@
+export declare const MAX_USER_VIDEOS_LIMIT = 20;
+export declare const USER_VIDEO_COMMENT_CONCURRENCY = 4;
+export declare const DEFAULT_COMMENT_LIMIT = 10;
+export declare function normalizeUserVideosLimit(limit: unknown): number;
+export declare function normalizeCommentLimit(limit: unknown): number;

package/dist/clis/douyin/user-videos.js

@@ -0,0 +1,74 @@
+import { cli, Strategy } from '../../registry.js';
+import { fetchDouyinComments, fetchDouyinUserVideos } from './_shared/public-api.js';
+export const MAX_USER_VIDEOS_LIMIT = 20;
+export const USER_VIDEO_COMMENT_CONCURRENCY = 4;
+export const DEFAULT_COMMENT_LIMIT = 10;
+export function normalizeUserVideosLimit(limit) {
+    const numeric = Number(limit);
+    if (!Number.isFinite(numeric))
+        return MAX_USER_VIDEOS_LIMIT;
+    return Math.min(MAX_USER_VIDEOS_LIMIT, Math.max(1, Math.round(numeric)));
+}
+export function normalizeCommentLimit(limit) {
+    const numeric = Number(limit);
+    if (!Number.isFinite(numeric))
+        return DEFAULT_COMMENT_LIMIT;
+    return Math.min(DEFAULT_COMMENT_LIMIT, Math.max(1, Math.round(numeric)));
+}
+async function mapInBatches(items, concurrency, mapper) {
+    const results = [];
+    for (let index = 0; index < items.length; index += concurrency) {
+        const chunk = items.slice(index, index + concurrency);
+        results.push(...(await Promise.all(chunk.map(mapper))));
+    }
+    return results;
+}
+async function fetchTopComments(page, awemeId, count) {
+    try {
+        return await fetchDouyinComments(page, awemeId, count);
+    }
+    catch {
+        return [];
+    }
+}
+cli({
+    site: 'douyin',
+    name: 'user-videos',
+    description: '获取指定用户的视频列表（含下载地址和热门评论）',
+    domain: 'www.douyin.com',
+    strategy: Strategy.COOKIE,
+    args: [
+        { name: 'sec_uid', type: 'string', required: true, positional: true, help: '用户 sec_uid（URL 末尾部分）' },
+        { name: 'limit', type: 'int', default: 20, help: '获取数量（最大 20）' },
+        { name: 'with_comments', type: 'bool', default: true, help: '包含热门评论（默认: true）' },
+        { name: 'comment_limit', type: 'int', default: 10, help: '每个视频获取多少条评论（最大 10）' },
+    ],
+    columns: ['index', 'aweme_id', 'title', 'duration', 'digg_count', 'play_url', 'top_comments'],
+    func: async (page, kwargs) => {
+        const secUid = kwargs.sec_uid;
+        const limit = normalizeUserVideosLimit(kwargs.limit);
+        const withComments = kwargs.with_comments !== false;
+        const commentLimit = normalizeCommentLimit(kwargs.comment_limit);
+        await page.goto(`https://www.douyin.com/user/${secUid}`);
+        await page.wait(3);
+        const awemeList = (await fetchDouyinUserVideos(page, secUid, limit)).slice(0, limit);
+        const videos = withComments
+            ? await mapInBatches(awemeList, USER_VIDEO_COMMENT_CONCURRENCY, async (video) => ({
+                ...video,
+                top_comments: await fetchTopComments(page, video.aweme_id, commentLimit),
+            }))
+            : awemeList.map((video) => ({ ...video, top_comments: [] }));
+        return videos.map((video, index) => {
+            const playUrl = video.video?.play_addr?.url_list?.[0] ?? '';
+            return {
+                index: index + 1,
+                aweme_id: video.aweme_id,
+                title: video.desc ?? '',
+                duration: Math.round((video.video?.duration ?? 0) / 1000),
+                digg_count: video.statistics?.digg_count ?? 0,
+                play_url: playUrl,
+                top_comments: video.top_comments ?? [],
+            };
+        });
+    },
+});

package/dist/clis/douyin/user-videos.test.d.ts

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