@sovovs/bycli 2.1.7 → 2.1.9

package/cli-manifest.json

@@ -28107,49 +28107,6 @@
     "sourceFile": "weixin/save-articles.js",
     "navigateBefore": "https://mp.weixin.qq.com"
   },
-  {
-    "site": "weixin",
-    "name": "search",
-    "description": "使用搜狗微信搜索公众号文章；如需导出正文 Markdown，请使用 weixin download 处理公众号文章链接",
-    "access": "read",
-    "domain": "weixin.sogou.com",
-    "strategy": "public",
-    "browser": true,
-    "args": [
-      {
-        "name": "query",
-        "type": "str",
-        "required": true,
-        "positional": true,
-        "help": "搜索关键词；如需正文 Markdown，请使用 weixin download 处理公众号文章链接"
-      },
-      {
-        "name": "page",
-        "type": "int",
-        "default": 1,
-        "required": false,
-        "help": "结果页码，从 1 开始"
-      },
-      {
-        "name": "limit",
-        "type": "int",
-        "default": 10,
-        "required": false,
-        "help": "返回条数，最大 10"
-      }
-    ],
-    "columns": [
-      "rank",
-      "page",
-      "title",
-      "url",
-      "summary",
-      "publish_time"
-    ],
-    "type": "js",
-    "modulePath": "weixin/search.js",
-    "sourceFile": "weixin/search.js"
-  },
   {
     "site": "weread",
     "name": "ai-outline",

package/clis/weixin/_wechat/auth-session.js

@@ -1,14 +1,12 @@
-import { AuthRequiredError, BrowserConnectError, TimeoutError } from '@sovovs/bycli/errors';
+import { AuthRequiredError, BrowserConnectError } from '@sovovs/bycli/errors';
 
 const DOMAIN = 'mp.weixin.qq.com';
 const LOGIN_URL = `https://${DOMAIN}/`;
-const DEFAULT_TIMEOUT_MS = 180_000;
-const POLL_INTERVAL_MS = 500;
 
 /**
  * @typedef {{token: string, cookie: string, fingerprint?: string}} WechatCredentials
  * @typedef {{url: string | null, hasLoginUi: boolean}} PreflightState
- * @typedef {{timeoutMs?: number, now?: () => number}} ResolveBrowserCredentialsOptions
+ * @typedef {{now?: () => number}} ResolveBrowserCredentialsOptions
  * @typedef {Pick<import('@sovovs/bycli/types').IPage, 'evaluate' | 'getCookies' | 'goto' | 'wait' | 'focusWindow'>} AuthPage
  */
 
@@ -94,9 +92,7 @@ export async function resolveBrowserCredentials(page, options = {}) {
     throw new BrowserConnectError('No browser page is connected for WeChat authentication');
   }
 
-  const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
   const now = options.now ?? Date.now;
-  const startedAt = now();
   let state = await readPreflight(page);
 
   if (!isLoggedInPreflight(state)) {
@@ -110,14 +106,10 @@ export async function resolveBrowserCredentials(page, options = {}) {
     await page.goto(LOGIN_URL);
     await page.focusWindow();
 
-    while (!isLoggedInPreflight(state)) {
-      const remainingMs = timeoutMs - (now() - startedAt);
-      if (remainingMs <= 0) {
-        throw new TimeoutError('WeChat login', timeoutMs / 1000);
-      }
-      await page.wait(Math.min(POLL_INTERVAL_MS, remainingMs) / 1000);
-      state = await readPreflight(page);
-    }
+    throw new AuthRequiredError(
+      DOMAIN,
+      'WeChat login is required. The login tab is open; complete QR-code login and run the command again.',
+    );
   }
 
   const finalUrl = state.url;

package/clis/weixin/_wechat/save-service.js

@@ -1,6 +1,6 @@
 import * as defaultFs from 'node:fs';
 import path from 'node:path';
-import { ArgumentError, CommandExecutionError } from '@sovovs/bycli/errors';
+import { ArgumentError, AuthRequiredError, CommandExecutionError } from '@sovovs/bycli/errors';
 import { cleanMarkdownFilename, wechatArticleToMarkdown } from './markdown.js';
 
 export const MAX_FILENAME_ATTEMPTS = 100;
@@ -121,7 +121,8 @@ export async function saveArticles({ articles, accountName, outputDir, fetchArti
       let articleHtml;
       try {
         articleHtml = await fetchArticleHtml(article);
-      } catch {
+      } catch (error) {
+        if (error instanceof AuthRequiredError) throw error;
         rows.push({ title: article.title || '', url: article.url || '', status: 'failed', stage: 'download', saved: '', error: 'article download failed' });
         continue;
       }

package/clis/weixin/download.js

@@ -8,6 +8,7 @@
  */
 import { cli, Strategy } from '@sovovs/bycli/registry';
 import { downloadArticle } from '@sovovs/bycli/download/article-download';
+import { AuthRequiredError } from '@sovovs/bycli/errors';
 import { buildExtractWechatArticleContentJs } from './_wechat/article-content.js';
 export { extractWechatArticleContent } from './_wechat/article-content.js';
 // ============================================================
@@ -249,14 +250,10 @@ cli({
       })()
     `);
         if (data?.errorHint === 'environment verification required') {
-            return [{
-                    title: 'Error',
-                    author: '-',
-                    publish_time: '-',
-                    status: 'failed — verification required in WeChat browser page',
-                    size: '-',
-                    saved: '-',
-                }];
+            throw new AuthRequiredError(
+                'mp.weixin.qq.com',
+                'WeChat article page requires environment verification. Complete it in the open browser tab and run the command again.',
+            );
         }
         return downloadArticle({
             title: data?.title || '',

package/clis/weixin/save-articles.js

@@ -1,4 +1,4 @@
-import { ArgumentError, CommandExecutionError } from '@sovovs/bycli/errors';
+import { ArgumentError, AuthRequiredError, CommandExecutionError } from '@sovovs/bycli/errors';
 import { MAX_WECHAT_HTML_BYTES } from '@sovovs/bycli/download/wechat-article';
 import { cli, Strategy } from '@sovovs/bycli/registry';
 import { readEnvironmentCredentials, resolveBrowserCredentials } from './_wechat/auth-session.js';
@@ -107,7 +107,12 @@ export async function fetchArticleHtmlInBrowser(article, page) {
         html: byteLength > maxBytes ? '' : html,
       };
     }, { maxBytes: MAX_WECHAT_HTML_BYTES });
-    if (result?.accessIssue) throw new CommandExecutionError('Article browser page requires environment verification');
+    if (result?.accessIssue) {
+      throw new AuthRequiredError(
+        DOMAIN,
+        'WeChat article page requires environment verification. Complete it in the open browser tab and run the command again.',
+      );
+    }
     if (!isTrustedWechatArticleUrl(result?.finalUrl)) {
       throw new CommandExecutionError('Article browser navigation left the trusted article path');
     }
@@ -123,7 +128,7 @@ export async function fetchArticleHtmlInBrowser(article, page) {
     }
     return result.html;
   } catch (error) {
-    if (error instanceof CommandExecutionError) throw error;
+    if (error instanceof CommandExecutionError || error instanceof AuthRequiredError) throw error;
     throw new CommandExecutionError('Article browser request failed');
   }
 }

package/package.json

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

package/clis/weixin/search.js

@@ -1,157 +0,0 @@
-import { ArgumentError, CommandExecutionError, EmptyResultError } from '@sovovs/bycli/errors';
-import { cli, Strategy } from '@sovovs/bycli/registry';
-
-const SOGOU_WEIXIN_DOMAIN = 'weixin.sogou.com';
-const DEFAULT_PAGE = 1;
-const DEFAULT_LIMIT = 10;
-const MAX_LIMIT = 10;
-
-function normalizePositiveInteger(value, name, defaultValue, maxValue) {
-    if (value === undefined || value === null)
-        return defaultValue;
-    const text = String(value).trim();
-    if (!/^\d+$/.test(text)) {
-        throw new ArgumentError(`weixin search --${name} must be a positive integer`, `Pass --${name} as a whole number${maxValue ? ` from 1 to ${maxValue}` : ' greater than 0'}.`);
-    }
-    const parsed = Number(text);
-    if (!Number.isSafeInteger(parsed) || parsed < 1 || (maxValue && parsed > maxValue)) {
-        throw new ArgumentError(`weixin search --${name} is out of range`, `Pass --${name} as a whole number${maxValue ? ` from 1 to ${maxValue}` : ' greater than 0'}.`);
-    }
-    return parsed;
-}
-
-function normalizePage(page) {
-    return normalizePositiveInteger(page, 'page', DEFAULT_PAGE);
-}
-
-function normalizeLimit(limit) {
-    return normalizePositiveInteger(limit, 'limit', DEFAULT_LIMIT, MAX_LIMIT);
-}
-
-function buildSearchUrl(query, pageNo) {
-    const searchUrl = new URL('https://weixin.sogou.com/weixin');
-    searchUrl.searchParams.set('query', query);
-    searchUrl.searchParams.set('type', '2');
-    searchUrl.searchParams.set('page', String(pageNo));
-    searchUrl.searchParams.set('ie', 'utf8');
-    return searchUrl.toString();
-}
-
-function buildExtractSearchResultsEvaluate() {
-    return String.raw`(() => {
-        const clean = (value) => {
-            return (value || '')
-                .replace(/\s+/g, ' ')
-                .replace(/<!--red_beg-->|<!--red_end-->/g, '')
-                .replace(/document\.write\(timeConvert\('\d+'\)\)/g, '')
-                .trim();
-        };
-
-        const absolutize = (href) => {
-            if (!href) return '';
-            try {
-                return new URL(href, window.location.origin).toString();
-            } catch {
-                return href;
-            }
-        };
-
-        const bodyText = clean(document.body && document.body.innerText);
-        const blocked = /验证码|安全验证|异常访问|访问过于频繁|请输入验证码/.test(bodyText);
-        const empty = /没有找到相关的微信文章|未找到相关|暂无相关|没有找到/.test(bodyText)
-            || Boolean(document.querySelector('.no-result, .no_result, .s-noresult'));
-        const cards = Array.from(document.querySelectorAll('.news-list li'));
-        const extracted = cards.map((item) => {
-            const linkEl = item.querySelector('h3 a[href]');
-            const summaryEl = item.querySelector('p.txt-info');
-            const timeEl = item.querySelector('.s-p .s2');
-            return {
-                title: clean(linkEl && linkEl.textContent),
-                url: absolutize(linkEl && linkEl.getAttribute('href')),
-                summary: clean(summaryEl && summaryEl.textContent),
-                publish_time: clean(timeEl && timeEl.textContent),
-            };
-        });
-        const rows = extracted.filter((row) => row.title && row.url);
-
-        return {
-            blocked,
-            empty,
-            cardCount: cards.length,
-            invalidCount: extracted.length - rows.length,
-            rows,
-        };
-    })()`;
-}
-
-cli({
-    site: 'weixin',
-    name: 'search',
-    access: 'read',
-    description: '使用搜狗微信搜索公众号文章；如需导出正文 Markdown，请使用 weixin download 处理公众号文章链接',
-    domain: SOGOU_WEIXIN_DOMAIN,
-    strategy: Strategy.PUBLIC,
-    browser: true,
-    args: [
-        { name: 'query', positional: true, required: true, help: '搜索关键词；如需正文 Markdown，请使用 weixin download 处理公众号文章链接' },
-        { name: 'page', type: 'int', default: 1, help: '结果页码，从 1 开始' },
-        { name: 'limit', type: 'int', default: 10, help: '返回条数，最大 10' },
-    ],
-    columns: ['rank', 'page', 'title', 'url', 'summary', 'publish_time'],
-    func: async (page, kwargs) => {
-        const query = String(kwargs.query ?? '').trim();
-        if (!query) {
-            throw new ArgumentError('A search query is required.', 'Pass a non-empty keyword to search Weixin articles via Sogou.');
-        }
-
-        const pageNo = normalizePage(kwargs.page);
-        const limit = normalizeLimit(kwargs.limit);
-        const searchUrl = buildSearchUrl(query, pageNo);
-
-        let payload;
-        try {
-            await page.goto(searchUrl);
-            await page.wait(2);
-            payload = await page.evaluate(buildExtractSearchResultsEvaluate());
-        }
-        catch (error) {
-            const detail = error instanceof Error ? error.message : String(error);
-            throw new CommandExecutionError('weixin search failed while loading Sogou results', detail);
-        }
-
-        if (!payload || typeof payload !== 'object' || !Array.isArray(payload.rows)) {
-            throw new CommandExecutionError('weixin search returned an unreadable browser payload', 'Sogou Weixin may have changed its result page structure.');
-        }
-        if (payload.blocked) {
-            throw new CommandExecutionError('Sogou Weixin blocked this search request', 'Open weixin.sogou.com in Chrome and complete any verification before retrying.');
-        }
-        if (payload.invalidCount > 0) {
-            throw new CommandExecutionError('Sogou Weixin returned article cards without required title or URL', 'The result page structure may have changed; refusing to return a partial result set.');
-        }
-
-        const rows = payload.rows;
-        if (rows.length === 0 && payload.empty) {
-            throw new EmptyResultError('weixin search', 'Try a different keyword or a different page number.');
-        }
-        if (rows.length === 0) {
-            throw new CommandExecutionError('weixin search did not expose article result cards', 'Sogou Weixin may have changed its selectors or returned a transient shell page.');
-        }
-
-        return rows.slice(0, limit).map((row, index) => ({
-            rank: (pageNo - 1) * 10 + index + 1,
-            page: pageNo,
-            title: row.title,
-            url: row.url,
-            summary: row.summary,
-            publish_time: row.publish_time,
-        }));
-    },
-});
-
-export const __test__ = {
-    MAX_LIMIT,
-    normalizePage,
-    normalizeLimit,
-    buildSearchUrl,
-    buildExtractSearchResultsEvaluate,
-};