@sovovs/bycli 2.1.35 → 2.1.37

package/cli-manifest.json

@@ -25493,6 +25493,54 @@
     "modulePath": "toutiao/hot.js",
     "sourceFile": "toutiao/hot.js"
   },
+  {
+    "site": "toutiao",
+    "name": "search",
+    "description": "搜索今日头条公开站内内容",
+    "access": "read",
+    "domain": "www.toutiao.com",
+    "strategy": "public",
+    "browser": false,
+    "args": [
+      {
+        "name": "query",
+        "type": "string",
+        "required": false,
+        "positional": true,
+        "help": "搜索关键词"
+      },
+      {
+        "name": "type",
+        "type": "string",
+        "default": "synthesis",
+        "required": false,
+        "help": "搜索类型 (synthesis/information/video/atlas/user/xiaoshipin/weitoutiao/music)"
+      },
+      {
+        "name": "limit",
+        "type": "int",
+        "default": 20,
+        "required": false,
+        "help": "返回条数 (1-50)"
+      }
+    ],
+    "columns": [
+      "rank",
+      "title",
+      "url",
+      "source",
+      "publish_time",
+      "summary",
+      "image_url",
+      "like_count",
+      "comment_count",
+      "share_count",
+      "read_count"
+    ],
+    "type": "js",
+    "modulePath": "toutiao/search.js",
+    "sourceFile": "toutiao/search.js"
+  },
   {
     "site": "tvmaze",
     "name": "search",
@@ -28297,7 +28345,7 @@
     "example": "bycli weixin create-draft --title \"文章标题\" --content-file article.html --content-format html --cover-image cover.jpg",
     "domain": "mp.weixin.qq.com",
     "strategy": "cookie",
-    "browser": true,
+    "browser": "conditional",
     "args": [
       {
         "name": "title",

package/clis/toutiao/search.js

@@ -0,0 +1,63 @@
+/**
+ * Toutiao public site search — extracts rich result cards from the rendered
+ * public search page. No authentication required.
+ */
+import { cli, Strategy } from '@sovovs/bycli/registry';
+import { CommandExecutionError, EmptyResultError } from '@sovovs/bycli/errors';
+import { parseSearchLimit, parseSearchType, parseToutiaoSearchHtml, TOUTIAO_SEARCH_URL } from './utils.js';
+
+cli({
+    site: 'toutiao',
+    name: 'search',
+    access: 'read',
+    description: '搜索今日头条公开站内内容',
+    domain: 'www.toutiao.com',
+    strategy: Strategy.PUBLIC,
+    browser: false,
+    args: [
+        { name: 'query', type: 'string', positional: true, help: '搜索关键词' },
+        { name: 'type', type: 'string', default: 'synthesis', help: '搜索类型 (synthesis/information/video/atlas/user/xiaoshipin/weitoutiao/music)' },
+        { name: 'limit', type: 'int', default: 20, help: '返回条数 (1-50)' },
+    ],
+    columns: [
+        'rank', 'title', 'url', 'source', 'publish_time', 'summary', 'image_url',
+        'like_count', 'comment_count', 'share_count', 'read_count',
+    ],
+    func: async (_page, kwargs) => {
+        const query = String(kwargs?.query ?? '').trim();
+        if (!query) throw new CommandExecutionError('toutiao search requires a non-empty query');
+        const type = parseSearchType(kwargs?.type, 'synthesis');
+        const limit = parseSearchLimit(kwargs?.limit, 20);
+        const url = new URL(TOUTIAO_SEARCH_URL);
+        url.searchParams.set('keyword', query);
+        url.searchParams.set('pd', type);
+        url.searchParams.set('page_num', '0');
+
+        let resp;
+        try {
+            resp = await fetch(url, {
+                headers: {
+                    'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36',
+                    Accept: 'text/html,application/xhtml+xml',
+                    Referer: 'https://www.toutiao.com/',
+                },
+            });
+        } catch (error) {
+            throw new CommandExecutionError(`toutiao search request failed: ${error?.message || error}`);
+        }
+        if (!resp.ok) {
+            throw new CommandExecutionError(`toutiao search failed: HTTP ${resp.status}`);
+        }
+        let html;
+        try {
+            html = await resp.text();
+        } catch (error) {
+            throw new CommandExecutionError(`toutiao search response read failed: ${error?.message || error}`);
+        }
+        const rows = parseToutiaoSearchHtml(html, limit);
+        if (rows.length === 0) {
+            throw new EmptyResultError('toutiao search', `未找到与「${query}」相关的公开内容。`);
+        }
+        return rows;
+    },
+});

package/clis/toutiao/utils.js

@@ -7,6 +7,9 @@ const ARTICLES_MIN_PAGE = 1;
 const ARTICLES_MAX_PAGE = 4;
 const HOT_MIN_LIMIT = 1;
 const HOT_MAX_LIMIT = 50;
+const SEARCH_MIN_LIMIT = 1;
+const SEARCH_MAX_LIMIT = 50;
+const SEARCH_TYPES = ['synthesis', 'information', 'video', 'atlas', 'user', 'xiaoshipin', 'weitoutiao', 'music'];
 
 export function parseArticlesPage(raw, fallback = 1) {
     if (raw === undefined || raw === null || raw === '') return fallback;
@@ -32,6 +35,27 @@ export function parseHotLimit(raw, fallback = 30) {
     return parsed;
 }
 
+export function parseSearchLimit(raw, fallback = 20) {
+    if (raw === undefined || raw === null || raw === '') return fallback;
+    const parsed = Number(raw);
+    if (!Number.isFinite(parsed) || !Number.isInteger(parsed)) {
+        throw new ArgumentError(`--limit must be an integer between ${SEARCH_MIN_LIMIT} and ${SEARCH_MAX_LIMIT}, got ${JSON.stringify(raw)}`);
+    }
+    if (parsed < SEARCH_MIN_LIMIT || parsed > SEARCH_MAX_LIMIT) {
+        throw new ArgumentError(`--limit must be between ${SEARCH_MIN_LIMIT} and ${SEARCH_MAX_LIMIT}, got ${parsed}`);
+    }
+    return parsed;
+}
+
+export function parseSearchType(raw, fallback = 'synthesis') {
+    if (raw === undefined || raw === null || raw === '') return fallback;
+    const value = String(raw).trim();
+    if (!SEARCH_TYPES.includes(value)) {
+        throw new ArgumentError(`--type must be one of ${SEARCH_TYPES.join(', ')}, got ${JSON.stringify(raw)}`);
+    }
+    return value;
+}
+
 const NON_TITLE_LINES = new Set([
     '展现', '阅读', '点赞', '评论',
     '查看数据', '查看评论', '修改', '更多', '首发',
@@ -149,6 +173,83 @@ export function mapHotRow(item, index) {
 }
 
 export const HOT_BOARD_URL = 'https://www.toutiao.com/hot-event/hot-board/?origin=toutiao_pc';
+export const TOUTIAO_SEARCH_URL = 'https://www.toutiao.com/search/';
+
+function parseSearchNumber(value) {
+    if (value === undefined || value === null || value === '') return null;
+    const parsed = Number(String(value).replace(/,/g, ''));
+    return Number.isFinite(parsed) && parsed >= 0 ? Math.trunc(parsed) : null;
+}
+
+function absoluteSearchUrl(value) {
+    const url = trimOrNull(value);
+    if (!url) return null;
+    try {
+        return new URL(url, 'https://www.toutiao.com/').toString();
+    } catch {
+        return null;
+    }
+}
+
+function searchImage(item) {
+    const candidates = [
+        item?.image_url,
+        item?.large_image_url,
+        item?.other_image_url,
+        ...(Array.isArray(item?.image_list) ? item.image_list.map((image) => image?.url || image) : []),
+        ...(Array.isArray(item?.detail_image_list) ? item.detail_image_list.map((image) => image?.url || image) : []),
+    ];
+    return candidates.map(trimOrNull).find(Boolean) || null;
+}
+
+function searchRowFromCard(item, index) {
+    if (!item || typeof item !== 'object') return null;
+    const title = trimOrNull(item.title);
+    const url = absoluteSearchUrl(
+        item.article_url || item.open_url || item.source_url || item.item_source_url || item?.display?.info?.url,
+    );
+    if (!title || !url) return null;
+    return {
+        rank: index + 1,
+        title,
+        url,
+        source: trimOrNull(item.source || item.media_name),
+        publish_time: trimOrNull(item.datetime || item.publish_time || item.display_time),
+        summary: trimOrNull(item.abstract || item.summary || item?.emphasized?.summary),
+        image_url: searchImage(item),
+        like_count: parseSearchNumber(item.like_count ?? item.digg_count),
+        comment_count: parseSearchNumber(item.comment_count),
+        share_count: parseSearchNumber(item.share_count ?? item.repin_count ?? item.forward_count),
+        read_count: parseSearchNumber(item.read_count),
+    };
+}
+
+/**
+ * Extract search result cards embedded in the public Toutiao search page.
+ * The page currently serializes each result as an application/json script.
+ */
+export function parseToutiaoSearchHtml(html, limit = 20) {
+    const source = String(html || '');
+    const rows = [];
+    const seenUrls = new Set();
+    const scriptPattern = /<script\b[^>]*type=["']application\/json["'][^>]*>([\s\S]*?)<\/script>/gi;
+    let match;
+    while ((match = scriptPattern.exec(source))) {
+        let payload;
+        try {
+            payload = JSON.parse(match[1]);
+        } catch {
+            continue;
+        }
+        const candidate = payload?.data;
+        const row = searchRowFromCard(candidate, rows.length);
+        if (!row || seenUrls.has(row.url)) continue;
+        seenUrls.add(row.url);
+        rows.push(row);
+        if (rows.length >= limit) break;
+    }
+    return rows.map((row, index) => ({ ...row, rank: index + 1 }));
+}
 
 export function looksToutiaoAuthWallText(value) {
     const text = String(value || '').replace(/\s+/g, ' ').trim().toLowerCase();
@@ -158,4 +259,12 @@ export function looksToutiaoAuthWallText(value) {
         /mp\.toutiao\.com\/profile_v4\/login/.test(text);
 }
 
-export const __test__ = { ARTICLES_MIN_PAGE, ARTICLES_MAX_PAGE, HOT_MIN_LIMIT, HOT_MAX_LIMIT };
+export const __test__ = {
+    ARTICLES_MIN_PAGE,
+    ARTICLES_MAX_PAGE,
+    HOT_MIN_LIMIT,
+    HOT_MAX_LIMIT,
+    SEARCH_MIN_LIMIT,
+    SEARCH_MAX_LIMIT,
+    SEARCH_TYPES,
+};

package/clis/weixin/create-draft.js

@@ -41,6 +41,20 @@ function validateCoverImage(value) {
     return coverPath;
 }
 
+function readApiCredentials(kwargs) {
+    const appid = kwargs.appid == null ? '' : String(kwargs.appid).trim();
+    const appsecret = kwargs.appsecret == null ? '' : String(kwargs.appsecret).trim();
+    if (Boolean(appid) !== Boolean(appsecret)) {
+        throw new ArgumentError('appid and appsecret must be provided together');
+    }
+    return { appid: appid || null, appsecret: appsecret || null };
+}
+
+function requiresBrowser(kwargs) {
+    const { appid, appsecret } = readApiCredentials(kwargs);
+    return !(appid && appsecret);
+}
+
 function normalizeCreateDraftArgs(kwargs) {
     const title = requiredText(kwargs.title, 'title');
     if (codePointLength(title) > MAX_TITLE_LENGTH) {
@@ -55,11 +69,7 @@ function normalizeCreateDraftArgs(kwargs) {
         contentFile: kwargs['content-file'],
         contentFormat: kwargs['content-format'],
     });
-    const appid = kwargs.appid == null ? '' : String(kwargs.appid).trim();
-    const appsecret = kwargs.appsecret == null ? '' : String(kwargs.appsecret).trim();
-    if (Boolean(appid) !== Boolean(appsecret)) {
-        throw new ArgumentError('appid and appsecret must be provided together');
-    }
+    const { appid, appsecret } = readApiCredentials(kwargs);
     return {
         title,
         ...draftContent,
@@ -67,8 +77,8 @@ function normalizeCreateDraftArgs(kwargs) {
         summary: kwargs.summary == null ? null : String(kwargs.summary).trim(),
         coverImage: validateCoverImage(kwargs['cover-image']),
         dryRun: kwargs['dry-run'] === true,
-        appid: appid || null,
-        appsecret: appsecret || null,
+        appid,
+        appsecret,
     };
 }
 
@@ -361,7 +371,7 @@ export const createDraftCommand = cli({
     example: 'bycli weixin create-draft --title "文章标题" --content-file article.html --content-format html --cover-image cover.jpg',
     domain: WEIXIN_DOMAIN,
     strategy: Strategy.COOKIE,
-    browser: true,
+    browser: requiresBrowser,
     navigateBefore: false,
     args: [
         { name: 'title', required: true, help: '文章标题（最长 64 字）' },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sovovs/bycli",
-  "version": "2.1.35",
+  "version": "2.1.37",
   "publishConfig": {
     "access": "public"
   },