publishport-opencli 1.0.6 → 1.0.8

package/clis/toutiao/utils.js

@@ -1,2 +1,2 @@
-import{ArgumentError as V}from"@jackwener/opencli/errors";const W=1,Y=4,Z=1,$=50;export function parseArticlesPage(q,z=1){if(q===void 0||q===null||q==="")return z;const B=Number(q);if(!Number.isFinite(B)||!Number.isInteger(B))throw new V(`--page must be an integer between ${W} and ${Y}, got ${JSON.stringify(q)}`);if(B<W||B>Y)throw new V(`--page must be between ${W} and ${Y}, got ${B}`);return B}export function parseHotLimit(q,z=30){if(q===void 0||q===null||q==="")return z;const B=Number(q);if(!Number.isFinite(B)||!Number.isInteger(B))throw new V(`--limit must be an integer between ${Z} and ${$}, got ${JSON.stringify(q)}`);if(B<Z||B>$)throw new V(`--limit must be between ${Z} and ${$}, got ${B}`);return B}const x=new Set(["展现","阅读","点赞","评论","查看数据","查看评论","修改","更多","首发","已发布","定时发布","定时发布中","由文章生成","审核中"]),C=/展现\s*([\d,]+)\s*阅读\s*([\d,]+)\s*点赞\s*([\d,]+)\s*评论\s*([\d,]*)/;export function parseToutiaoArticlesText(q){const z=String(q||"").split(`
-`).map((D)=>D.trim()).filter(Boolean),B=[];for(let D=0;D<z.length;D++){const y=z[D];if(!/^\d{2}-\d{2}\s+\d{2}:\d{2}$/.test(y))continue;const h=y;let U=null,j=null,g=null;for(let J=3;J>=1;J--){const F=z[D-J]||"";if(!F||F.length>=100||/^\d+$/.test(F)||x.has(F))continue;U=F;break}for(let J=1;J<8;J++){const F=z[D+J]||"";if(F==="已发布"||F==="定时发布中"||F==="审核中"||F==="由文章生成")j=F;if(F.includes("展现")&&F.includes("阅读")){const K=F.match(C);if(K)g={"展现":K[1],"阅读":K[2],"点赞":K[3],"评论":K[4]||"0"}}}if(!U)continue;if(g)B.push({title:U,date:h,status:j,...g});else B.push({title:U,date:h,status:j,"展现":null,"阅读":null,"点赞":null,"评论":null})}return B}function Q(q){const z=String(q??"").trim();return z?z:null}function G(q){const z=q?.Image?.url;if(typeof z==="string"&&z)return z;return(Array.isArray(q?.Image?.url_list)?q.Image.url_list.map((D)=>typeof D==="string"?D:D?.url).find((D)=>typeof D==="string"&&D):null)||null}function X(q){const z=Number(q);return Number.isFinite(z)&&z>=0?z:null}export function mapHotRow(q,z){if(!q||typeof q!=="object")return null;const B=Q(q.ClusterIdStr||(q.ClusterId!=null?String(q.ClusterId):null)),D=Q(q.Title);if(!D)return null;return{rank:z+1,group_id:B,title:D,query:Q(q.QueryWord)||D,hot_value:X(q.HotValue),label:Q(q.Label),url:Q(q.Url),image_url:G(q)}}export const HOT_BOARD_URL="https://www.toutiao.com/hot-event/hot-board/?origin=toutiao_pc";export function looksToutiaoAuthWallText(q){const z=String(q||"").replace(/\s+/g," ").trim().toLowerCase();if(!z)return!1;return/登录|请登录|账号登录|扫码登录|安全验证|验证码|captcha/.test(z)||/\b(login|sign in|captcha|verification required)\b/.test(z)||/mp\.toutiao\.com\/profile_v4\/login/.test(z)}export const __test__={ARTICLES_MIN_PAGE:W,ARTICLES_MAX_PAGE:Y,HOT_MIN_LIMIT:Z,HOT_MAX_LIMIT:$};
+import{ArgumentError as Z,CommandExecutionError as B}from"@jackwener/opencli/errors";const U=1,D=4,H=1,y=50,P=1,X=50;export function parseArticlesPage(q,z=1){if(q===void 0||q===null||q==="")return z;const J=Number(q);if(!Number.isFinite(J)||!Number.isInteger(J))throw new Z(`--page must be an integer between ${U} and ${D}, got ${JSON.stringify(q)}`);if(J<U||J>D)throw new Z(`--page must be between ${U} and ${D}, got ${J}`);return J}export function parseRecommendLimit(q,z=20){if(q===void 0||q===null||q==="")return z;const J=Number(q);if(!Number.isFinite(J)||!Number.isInteger(J))throw new Z(`--limit must be an integer between ${P} and ${X}, got ${JSON.stringify(q)}`);if(J<P||J>X)throw new Z(`--limit must be between ${P} and ${X}, got ${J}`);return J}export function parseRecommendCategory(q,z="__all__"){if(q===void 0||q===null||q==="")return z;const J=String(q).trim();if(!RECOMMEND_CATEGORIES.includes(J))throw new Z(`--category must be one of ${RECOMMEND_CATEGORIES.join(", ")}, got ${JSON.stringify(q)}`);return J}export function parseHotLimit(q,z=30){if(q===void 0||q===null||q==="")return z;const J=Number(q);if(!Number.isFinite(J)||!Number.isInteger(J))throw new Z(`--limit must be an integer between ${H} and ${y}, got ${JSON.stringify(q)}`);if(J<H||J>y)throw new Z(`--limit must be between ${H} and ${y}, got ${J}`);return J}const b=new Set(["展现","阅读","点赞","评论","查看数据","查看评论","修改","更多","首发","已发布","定时发布","定时发布中","由文章生成","审核中"]),g=/展现\s*([\d,]+)\s*阅读\s*([\d,]+)\s*点赞\s*([\d,]+)\s*评论\s*([\d,]*)/;export function parseToutiaoArticlesText(q){const z=String(q||"").split(`
+`).map((K)=>K.trim()).filter(Boolean),J=[];for(let K=0;K<z.length;K++){const $=z[K];if(!/^\d{2}-\d{2}\s+\d{2}:\d{2}$/.test($))continue;const W=$;let F=null,h=null,k=null;for(let Y=3;Y>=1;Y--){const Q=z[K-Y]||"";if(!Q||Q.length>=100||/^\d+$/.test(Q)||b.has(Q))continue;F=Q;break}for(let Y=1;Y<8;Y++){const Q=z[K+Y]||"";if(Q==="已发布"||Q==="定时发布中"||Q==="审核中"||Q==="由文章生成")h=Q;if(Q.includes("展现")&&Q.includes("阅读")){const j=Q.match(g);if(j)k={"展现":j[1],"阅读":j[2],"点赞":j[3],"评论":j[4]||"0"}}}if(!F)continue;if(k)J.push({title:F,date:W,status:h,...k});else J.push({title:F,date:W,status:h,"展现":null,"阅读":null,"点赞":null,"评论":null})}return J}function V(q){const z=String(q??"").trim();return z?z:null}function v(q){const z=q?.Image?.url;if(typeof z==="string"&&z)return z;return(Array.isArray(q?.Image?.url_list)?q.Image.url_list.map((K)=>typeof K==="string"?K:K?.url).find((K)=>typeof K==="string"&&K):null)||null}function S(q){const z=Number(q);return Number.isFinite(z)&&z>=0?z:null}export function mapHotRow(q,z){if(!q||typeof q!=="object")return null;const J=V(q.ClusterIdStr||(q.ClusterId!=null?String(q.ClusterId):null)),K=V(q.Title);if(!K)return null;return{rank:z+1,group_id:J,title:K,query:V(q.QueryWord)||K,hot_value:S(q.HotValue),label:V(q.Label),url:V(q.Url),image_url:v(q)}}export const HOT_BOARD_URL="https://www.toutiao.com/hot-event/hot-board/?origin=toutiao_pc",RECOMMEND_URL="https://www.toutiao.com/api/pc/feed/",RECOMMEND_CATEGORIES=["__all__","news_tech","news_finance","news_world","news_sports","news_entertainment","news_military"];function G(q){const z=V(q?.image_url)||V(q?.middle_image?.url);if(!z)return null;return z.startsWith("//")?`https:${z}`:z}function x(q){const z=V(q);if(!z)return null;try{const J=z.startsWith("/")?new URL(z,"https://www.toutiao.com"):new URL(z);if(!/^https?:$/i.test(J.protocol)||!/(^|\.)toutiao\.com$/i.test(J.hostname))throw new B(`Malformed toutiao recommend row: off-domain source_url ${JSON.stringify(z)}.`);return J}catch(J){if(J instanceof B)throw J;throw new B(`Malformed toutiao recommend row: invalid source_url ${JSON.stringify(z)}.`)}}function R(q){return String(q||"").match(/^\/(?:group|article)\/([A-Za-z0-9_-]+)\/?$/)?.[1]||""}function f(q,z){const J=x(q),K=J?R(J.pathname):"",$=V(z),W=$||V(K);if(!W)throw new B("Malformed toutiao recommend row: missing group_id and article source_url.");if(!/^[A-Za-z0-9_-]+$/.test(W))throw new B(`Malformed toutiao recommend row: invalid group_id ${JSON.stringify(z)}.`);if(K&&$&&$!==K)throw new B(`Malformed toutiao recommend row: group_id/source_url mismatch for ${JSON.stringify(z)}.`);return{groupId:W,url:`https://www.toutiao.com/group/${W}/`}}function C(q){const z=Number(q);if(!Number.isFinite(z)||z<=0)return null;return`${new Date(z*1000).toISOString().slice(0,19)}Z`}export function mapRecommendRow(q,z){if(!q||typeof q!=="object")return null;if(q.is_feed_ad)return null;const J=V(q.title);if(!J)return null;const K=f(q.source_url,q.group_id!=null?String(q.group_id):null);return{rank:z+1,group_id:K.groupId,title:J,abstract:V(q.abstract),source:V(q.source),tag:V(q.chinese_tag),comments:S(q.comments_count),published_at:C(q.behot_time),url:K.url,image_url:G(q)}}export function looksToutiaoAuthWallText(q){const z=String(q||"").replace(/\s+/g," ").trim().toLowerCase();if(!z)return!1;return/登录|请登录|账号登录|扫码登录|安全验证|验证码|captcha/.test(z)||/\b(login|sign in|captcha|verification required)\b/.test(z)||/mp\.toutiao\.com\/profile_v4\/login/.test(z)}export const __test__={ARTICLES_MIN_PAGE:U,ARTICLES_MAX_PAGE:D,HOT_MIN_LIMIT:H,HOT_MAX_LIMIT:y,RECOMMEND_MIN_LIMIT:P,RECOMMEND_MAX_LIMIT:X};

package/clis/twitter/article.js

@@ -1,4 +1,4 @@
-import{AuthRequiredError as Z,CommandExecutionError as G}from"@jackwener/opencli/errors";import{cli as $,Strategy as b}from"@jackwener/opencli/registry";import{resolveTwitterQueryId as K,describeTwitterApiError as L}from"./shared.js";import{TWITTER_BEARER_TOKEN as N}from"./utils.js";const O="7xflPyRiUxGVbJd4uWmbfg";$({site:"twitter",name:"article",access:"read",description:"Fetch a Twitter Article (long-form content) and export as Markdown",domain:"x.com",strategy:b.COOKIE,browser:!0,args:[{name:"tweet-id",type:"string",positional:!0,required:!0,help:"Tweet ID or URL containing the article"}],columns:["title","author","content","url"],func:async(f,P)=>{let j=P["tweet-id"];const V=/\/article\/\d+/.test(j),H=j.match(/\/(?:status|article)\/(\d+)/);if(H)j=H[1];if(V){await f.goto(`https://x.com/i/article/${j}`);await f.wait(3);const F=await f.evaluate(`
+import{AuthRequiredError as Z,CommandExecutionError as H}from"@jackwener/opencli/errors";import{cli as N,Strategy as P}from"@jackwener/opencli/registry";import{resolveTwitterQueryId as b,describeTwitterApiError as k,unwrapBrowserResult as $}from"./shared.js";import{TWITTER_BEARER_TOKEN as B}from"./utils.js";const D="7xflPyRiUxGVbJd4uWmbfg";function M(f){return Boolean(f&&typeof f==="object"&&!Array.isArray(f))}N({site:"twitter",name:"article",access:"read",description:"Fetch a Twitter Article (long-form content) and export as Markdown",domain:"x.com",strategy:P.COOKIE,browser:!0,args:[{name:"tweet-id",type:"string",positional:!0,required:!0,help:"Tweet ID or URL containing the article"}],columns:["title","author","content","url"],func:async(f,j)=>{let F=j["tweet-id"];const K=/\/article\/\d+/.test(F),V=F.match(/\/(?:status|article)\/(\d+)/);if(V)F=V[1];if(K){await f.goto(`https://x.com/i/article/${F}`);await f.wait(3);const G=await f.evaluate(`
         (function() {
           var links = document.querySelectorAll('a[href*="/status/"]');
           for (var i = 0; i < links.length; i++) {
@@ -12,12 +12,12 @@ import{AuthRequiredError as Z,CommandExecutionError as G}from"@jackwener/opencli
           }
           return null;
         })()
-      `);if(!F||typeof F!=="string")throw new G(`Could not resolve article ${j} to a tweet ID. The article page may not contain a linked tweet.`);j=F}await f.goto(`https://x.com/i/status/${j}`);await f.wait(3);const J=(await f.getCookies({url:"https://x.com"})).find((F)=>F.name==="ct0")?.value||null;if(!J)throw new Z("x.com","Not logged into x.com (no ct0 cookie)");const X=await K(f,"TweetResultByRestId",O),z=await f.evaluate(`
+      `),J=$(G);if(!J||typeof J!=="string")throw new H(`Could not resolve article ${F} to a tweet ID. The article page may not contain a linked tweet.`);F=J}await f.goto(`https://x.com/i/status/${F}`);await f.wait(3);const X=(await f.getCookies({url:"https://x.com"})).find((G)=>G.name==="ct0")?.value||null;if(!X)throw new Z("x.com","Not logged into x.com (no ct0 cookie)");const L=await b(f,"TweetResultByRestId",D),z=$(await f.evaluate(`
       async () => {
-        const tweetId = "${j}";
-        const ct0 = ${JSON.stringify(J)};
+        const tweetId = ${JSON.stringify(F)};
+        const ct0 = ${JSON.stringify(X)};
 
-        const bearer = ${JSON.stringify(N)};
+        const bearer = ${JSON.stringify(B)};
         const headers = {
           'Authorization': 'Bearer ' + decodeURIComponent(bearer),
           'X-Csrf-Token': ct0,
@@ -45,23 +45,54 @@ import{AuthRequiredError as Z,CommandExecutionError as G}from"@jackwener/opencli
           withArticlePlainText: true,
         });
 
-        const url = '/i/api/graphql/' + ${JSON.stringify(X)} + '/TweetResultByRestId?variables='
+        const url = '/i/api/graphql/' + ${JSON.stringify(L)} + '/TweetResultByRestId?variables='
           + encodeURIComponent(variables)
           + '&features=' + encodeURIComponent(features)
           + '&fieldToggles=' + encodeURIComponent(fieldToggles);
 
-        const resp = await fetch(url, {headers, credentials: 'include'});
+        let resp;
+        try {
+          resp = await fetch(url, {headers, credentials: 'include'});
+        } catch (error) {
+          return {error: 'Twitter article request failed: ' + String(error && error.message || error)};
+        }
         if (!resp.ok) return {httpStatus: resp.status};
-        const d = await resp.json();
+        let d;
+        try {
+          d = await resp.json();
+        } catch {
+          return {error: 'Twitter API response was not valid JSON', hint: 'You may be logged out or the request was blocked'};
+        }
+        if (!d || typeof d !== 'object' || Array.isArray(d)) {
+          return {error: 'Twitter API response payload was malformed'};
+        }
 
-        const result = d.data?.tweetResult?.result;
-        if (!result) return {error: 'Article not found'};
+        const result = d?.data?.tweetResult?.result;
+        if (!result) {
+          if (Array.isArray(d.errors) && d.errors.length > 0) {
+            return {error: 'Twitter TweetResultByRestId returned GraphQL errors: ' + JSON.stringify(d.errors).slice(0, 200)};
+          }
+          return {error: 'Article not found'};
+        }
 
         // Unwrap TweetWithVisibilityResults
+        if (!result || typeof result !== 'object' || Array.isArray(result)) {
+          return {error: 'Twitter API response tweet result was malformed'};
+        }
         const tw = result.tweet || result;
+        if (!tw || typeof tw !== 'object' || Array.isArray(tw)) {
+          return {error: 'Twitter API response tweet result was malformed'};
+        }
         const legacy = tw.legacy || {};
         const user = tw.core?.user_results?.result;
-        const screenName = user?.legacy?.screen_name || user?.core?.screen_name || 'unknown';
+        const returnedTweetId = tw.rest_id || legacy.id_str;
+        if (typeof returnedTweetId !== 'string' || returnedTweetId !== tweetId) {
+          return {error: 'Twitter API response did not match requested tweet ' + tweetId};
+        }
+        const screenName = user?.legacy?.screen_name || user?.core?.screen_name || '';
+        if (typeof screenName !== 'string' || !/^[A-Za-z0-9_]{1,15}$/.test(screenName)) {
+          return {error: 'Twitter API response did not include a valid author screen name for tweet ' + tweetId};
+        }
 
         // Extract article content
         const articleResults = tw.article?.article_results?.result;
@@ -78,15 +109,25 @@ import{AuthRequiredError as Z,CommandExecutionError as G}from"@jackwener/opencli
           }
           return {error: 'Tweet ' + tweetId + ' has no article content'};
         }
+        if (!articleResults || typeof articleResults !== 'object' || Array.isArray(articleResults)) {
+          return {error: 'Twitter API response article result was malformed'};
+        }
 
         const title = articleResults.title || '(Untitled)';
         const contentState = articleResults.content_state || {};
+        if (!contentState || typeof contentState !== 'object' || Array.isArray(contentState)) {
+          return {error: 'Twitter API response article content was malformed'};
+        }
         const blocks = contentState.blocks || [];
+        if (!Array.isArray(blocks)) {
+          return {error: 'Twitter API response article blocks were malformed'};
+        }
 
         // Convert draft.js blocks to Markdown
         const parts = [];
         let orderedCounter = 0;
         for (const block of blocks) {
+          if (!block || typeof block !== 'object' || Array.isArray(block)) continue;
           const blockType = block.type || 'unstyled';
           if (blockType === 'atomic') continue;
           const text = block.text || '';
@@ -113,4 +154,4 @@ import{AuthRequiredError as Z,CommandExecutionError as G}from"@jackwener/opencli
           url: 'https://x.com/' + screenName + '/status/' + tweetId,
         }];
       }
-    `);if(z?.httpStatus)throw new G(L("TweetResultByRestId",z.httpStatus));if(z?.error)throw new G(z.error+(z.hint?` (${z.hint})`:""));return z||[]}});
+    `));if(!Array.isArray(z)&&!M(z))throw new H("Twitter article response payload is malformed");if(z?.httpStatus){const G=k("TweetResultByRestId",z.httpStatus);if(z.httpStatus===401||z.httpStatus===403)throw new Z("x.com",G);throw new H(G)}if(z?.error)throw new H(z.error+(z.hint?` (${z.hint})`:""));if(!Array.isArray(z))throw new H("Twitter article response payload is malformed");return z}});

package/clis/twitter/profile.js

@@ -3,7 +3,7 @@ import{ArgumentError as k,AuthRequiredError as z,CommandExecutionError as M,Empt
         return link ? link.getAttribute('href') : null;
       }`));if(!D||typeof D!=="string")throw new z("x.com","Could not detect logged-in user. Are you logged in?");Z=Q(D);if(!Z)throw new z("x.com","Could not detect logged-in user. Are you logged in?")}await G.goto(`https://x.com/${Z}`);await G.wait(3);const $=(await G.getCookies({url:"https://x.com"})).find((D)=>D.name==="ct0")?.value||null;if(!$)throw new z("x.com","Not logged into x.com (no ct0 cookie)");const L=await b(G,"UserByScreenName",S),X=Y(await G.evaluate(`
       async () => {
-        const screenName = "${Z}";
+        const screenName = ${JSON.stringify(Z)};
         const ct0 = ${JSON.stringify($)};
 
         const bearer = ${JSON.stringify(x)};

package/clis/xiaohongshu/comments.js

@@ -1,7 +1,8 @@
-import{cli as A,Strategy as J}from"@jackwener/opencli/registry";import{AuthRequiredError as W,CliError as F,EmptyResultError as N}from"@jackwener/opencli/errors";import{parseNoteId as O,buildNoteUrl as U}from"./note-helpers.js";const j='.author-wrapper a[href*="/user/profile/"], a.name[href*="/user/profile/"], a.user-name[href*="/user/profile/"], a[href*="/user/profile/"]';export function parseXhsProfileHref(z,B="www.xiaohongshu.com"){const D=typeof z==="string"?z.trim():"";if(!D)return"";const M=String(B||"www.xiaohongshu.com").toLowerCase();let K;try{K=new URL(D,`https://${M}`)}catch{return""}if(K.protocol!=="https:")return"";if(K.hostname.toLowerCase()!==M)return"";return K.pathname.match(/^\/user\/profile\/([a-zA-Z0-9]+)\/?$/)?.[1]??""}export function buildXhsProfileUrl(z,B="www.xiaohongshu.com"){const D=parseXhsProfileHref(z,B);if(!D)return"";return`https://${B}/user/profile/${D}`}export function parseCommentLimit(z,B=20){const D=Number(z);if(!Number.isFinite(D))return B;return Math.max(1,Math.min(Math.floor(D),50))}export function parseXhsLikeCountText(z){const B=/^(?:\d+|\d{1,3}(?:[,，]\d{3})+)\+?$/u,D=/^((?:\d+|\d{1,3}(?:[,，]\d{3})+)(?:\.\d+)?)([wWkK万千])\+?$/u,M=String(z??"").replace(/\s+/g,"");if(!M)return 0;if(B.test(M))return Number(M.replace(/[,+，]/g,""));const K=M.match(D);if(!K)return 0;const V=Number(K[1].replace(/[,，]/g,""));if(!Number.isFinite(V))return 0;const Q=K[2].toLowerCase();return Math.round(V*(Q==="w"||Q==="万"?1e4:1000))}export function buildCommentsExtractJs(z){const B=parseXhsLikeCountText.toString();return`
+import{cli as F,Strategy as U}from"@jackwener/opencli/registry";import{AuthRequiredError as j,CliError as T,CommandExecutionError as Z,EmptyResultError as _}from"@jackwener/opencli/errors";import{parseNoteId as y,buildNoteUrl as P}from"./note-helpers.js";const L='.author-wrapper a[href*="/user/profile/"], a.name[href*="/user/profile/"], a.user-name[href*="/user/profile/"], a[href*="/user/profile/"]';export function parseXhsProfileHref(G,D="www.xiaohongshu.com"){const B=typeof G==="string"?G.trim():"";if(!B)return"";const Q=String(D||"www.xiaohongshu.com").toLowerCase();let K;try{K=new URL(B,`https://${Q}`)}catch{return""}if(K.protocol!=="https:")return"";if(K.hostname.toLowerCase()!==Q)return"";return K.pathname.match(/^\/user\/profile\/([a-zA-Z0-9]+)\/?$/)?.[1]??""}export function buildXhsProfileUrl(G,D="www.xiaohongshu.com"){const B=parseXhsProfileHref(G,D);if(!B)return"";return`https://${D}/user/profile/${B}`}export function parseCommentLimit(G,D=20){const B=Number(G);if(!Number.isFinite(B))return D;return Math.max(1,Math.min(Math.floor(B),50))}export function parseXhsLikeCountText(G){const D=/^(?:\d+|\d{1,3}(?:[,，]\d{3})+)\+?$/u,B=/^((?:\d+|\d{1,3}(?:[,，]\d{3})+)(?:\.\d+)?)([wWkK万千])\+?$/u,Q=String(G??"").replace(/\s+/g,"");if(!Q)return 0;if(D.test(Q))return Number(Q.replace(/[,+，]/g,""));const K=Q.match(B);if(!K)return 0;const M=Number(K[1].replace(/[,，]/g,""));if(!Number.isFinite(M))return 0;const Y=K[2].toLowerCase();return Math.round(M*(Y==="w"||Y==="万"?1e4:1000))}function $(G,D,B){if(G==null)return"";if(typeof G!=="string")throw new Z(`${B}: malformed comment row ${D}`);return G}export function normalizeCommentImages(G,D){if(G==null)return[];if(!Array.isArray(G))throw new Z(`${D}: malformed comment row images`);const B=[];for(const Q of G){if(typeof Q!=="string")throw new Z(`${D}: malformed comment row image URL`);const K=Q.trim();let M;try{M=new URL(K)}catch{throw new Z(`${D}: malformed comment row image URL`)}if(M.protocol!=="https:"&&M.protocol!=="http:"||M.username||M.password)throw new Z(`${D}: malformed comment row image URL`);const Y=M.toString();if(!B.includes(Y))B.push(Y)}return B}export function normalizeCommentRows(G,D="xiaohongshu/comments"){if(G==null)return[];if(!Array.isArray(G))throw new Z(`${D}: malformed comments payload`);return G.map((B,Q)=>{if(!B||typeof B!=="object"||Array.isArray(B))throw new Z(`${D}: malformed comment row at index ${Q}`);const K=$(B.text,"text",D);if(!K)throw new Z(`${D}: malformed comment row text`);const M=Number(B.likes);if(!Number.isInteger(M)||M<0)throw new Z(`${D}: malformed comment row likes`);if(typeof B.is_reply!=="boolean")throw new Z(`${D}: malformed comment row is_reply`);return{author:$(B.author,"author",D),authorHrefRaw:$(B.authorHrefRaw,"authorHrefRaw",D),text:K,likes:M,time:$(B.time,"time",D),is_reply:B.is_reply,reply_to:$(B.reply_to,"reply_to",D),images:normalizeCommentImages(B.images,D)}})}export function buildCommentsExtractJs(G,D=20){const B=parseXhsLikeCountText.toString();return`
       (async () => {
         const wait = (ms) => new Promise(r => setTimeout(r, ms))
-        const withReplies = ${z}
+        const withReplies = ${G}
+        const targetCount = ${Number(D)||20}
 
         // Check login state
         const bodyText = document.body?.innerText || ''
@@ -9,15 +10,40 @@ import{cli as A,Strategy as J}from"@jackwener/opencli/registry";import{AuthRequi
         const securityBlock = /安全限制|访问链接异常/.test(bodyText)
           || /website-login\\/error|error_code=300017|error_code=300031/.test(location.href)
 
-        // Scroll the note container to trigger comment loading
+        // Scroll to trigger comment loading. Xiaohongshu loads comments in
+        // small async batches via IntersectionObserver, and depending on the
+        // page layout / viewport the actual scrollable ancestor can be
+        // .note-scroller, .container, or the document itself — so each round
+        // drives all of them plus scrollIntoView on the last loaded comment,
+        // which works regardless of which element actually owns the scrollbar.
+        // A single stalled round doesn't mean the list is exhausted — keep
+        // going until growth stalls for several consecutive rounds, we've
+        // loaded enough top-level comments to satisfy --limit, or we hit the
+        // hard round cap.
         const scroller = document.querySelector('.note-scroller') || document.querySelector('.container')
-        if (scroller) {
-          for (let i = 0; i < 3; i++) {
-            const beforeCount = scroller.querySelectorAll('.parent-comment').length
-            scroller.scrollTo(0, scroller.scrollHeight)
-            await wait(800 + Math.random() * 1200)
-            const afterCount = scroller.querySelectorAll('.parent-comment').length
-            if (afterCount <= beforeCount) break
+        const driveScroll = () => {
+          if (scroller) scroller.scrollTo(0, scroller.scrollHeight)
+          const comments = document.querySelectorAll('.parent-comment')
+          const last = comments[comments.length - 1]
+          if (last && typeof last.scrollIntoView === 'function') last.scrollIntoView({ block: 'end' })
+          if (typeof window !== 'undefined' && typeof window.scrollTo === 'function') {
+            window.scrollTo(0, document.body.scrollHeight)
+          }
+        }
+        {
+          let stall = 0
+          for (let i = 0; i < 60; i++) {
+            const beforeCount = document.querySelectorAll('.parent-comment').length
+            if (beforeCount >= targetCount) break
+            driveScroll()
+            await wait(1000 + Math.random() * 1200)
+            const afterCount = document.querySelectorAll('.parent-comment').length
+            if (afterCount <= beforeCount) {
+              stall++
+              if (stall >= 6) break
+            } else {
+              stall = 0
+            }
           }
         }
 
@@ -26,12 +52,27 @@ import{cli as A,Strategy as J}from"@jackwener/opencli/registry";import{AuthRequi
         const parseLikes = (el) => {
           return parseLikeCountText(clean(el))
         }
-        const HREF_SELECTOR = ${JSON.stringify(j)}
+        const HREF_SELECTOR = ${JSON.stringify(L)}
         const extractAuthorHref = (el) => {
           if (!el) return ''
           const anchor = el.querySelector(HREF_SELECTOR)
           return anchor ? (anchor.getAttribute('href') || '') : ''
         }
+        // Attached comment photos, excluding avatars, inline emoji, badges, and
+        // other UI images. Only images inside comment/reply media containers are
+        // projected as media evidence.
+        const extractImages = (el) => {
+          if (!el) return []
+          const urls = []
+          el.querySelectorAll('img').forEach(img => {
+            if (img.classList.contains('avatar-item')) return
+            if (img.closest('.content, .note-text')) return
+            if (!img.closest('.comment-pic, .reply-pic, .comment-image, .reply-image, .comment-img, .reply-img, [class*="comment-pic"], [class*="reply-pic"], [class*="comment-image"], [class*="reply-image"]')) return
+            const src = img.currentSrc || img.src || img.getAttribute('data-src') || ''
+            if (src && !urls.includes(src)) urls.push(src)
+          })
+          return urls
+        }
         const expandReplyThreads = async (root) => {
           if (!withReplies || !root) return
           const clickedTexts = new Set()
@@ -65,9 +106,10 @@ import{cli as A,Strategy as J}from"@jackwener/opencli/registry";import{AuthRequi
           const text = clean(item.querySelector('.content, .note-text'))
           const likes = parseLikes(item.querySelector('.count'))
           const time = clean(item.querySelector('.date, .time'))
+          const images = extractImages(item)
 
           if (!text) continue
-          results.push({ author, authorHrefRaw, text, likes, time, is_reply: false, reply_to: '' })
+          results.push({ author, authorHrefRaw, text, likes, time, is_reply: false, reply_to: '', images })
 
           // Extract nested replies (楼中楼)
           if (withReplies) {
@@ -78,12 +120,13 @@ import{cli as A,Strategy as J}from"@jackwener/opencli/registry";import{AuthRequi
               const sText = clean(sub.querySelector('.content, .note-text'))
               const sLikes = parseLikes(sub.querySelector('.count'))
               const sTime = clean(sub.querySelector('.date, .time'))
+              const sImages = extractImages(sub)
               if (!sText) return
-              results.push({ author: sAuthor, authorHrefRaw: sAuthorHrefRaw, text: sText, likes: sLikes, time: sTime, is_reply: true, reply_to: author })
+              results.push({ author: sAuthor, authorHrefRaw: sAuthorHrefRaw, text: sText, likes: sLikes, time: sTime, is_reply: true, reply_to: author, images: sImages })
             })
           }
         }
 
         return { pageUrl: location.href, securityBlock, loginWall, results }
       })()
-    `}export const command=A({site:"xiaohongshu",name:"comments",access:"read",description:"获取小红书笔记评论（支持楼中楼子回复）",domain:"www.xiaohongshu.com",strategy:J.COOKIE,navigateBefore:!1,args:[{name:"note-id",required:!0,positional:!0,help:"Full Xiaohongshu note URL with xsec_token"},{name:"limit",type:"int",default:20,help:"Number of top-level comments (max 50)"},{name:"with-replies",type:"boolean",default:!1,help:"Include nested replies (楼中楼)"}],columns:["rank","author","userId","profileUrl","text","likes","time","is_reply","reply_to"],func:async(z,B)=>{const D=parseCommentLimit(B.limit),M=Boolean(B["with-replies"]),K=String(B["note-id"]),V=O(K);await z.goto(U(K,{commandName:"xiaohongshu comments"}));await z.wait({time:2+Math.random()*3});const Q=await z.evaluate(buildCommentsExtractJs(M));if(!Q||typeof Q!=="object")throw new N("xiaohongshu/comments","Unexpected evaluate response");if(Q.securityBlock)throw new F("SECURITY_BLOCK","Xiaohongshu security block: the note detail page was blocked by risk control.",/^https?:\/\//.test(K)?"The page may be temporarily restricted. Try again later or from a different session.":"Try using a full URL from search results (with xsec_token) instead of a bare note ID.");if(Q.loginWall)throw new W("www.xiaohongshu.com","Note comments require login");const Z=Q.results??[],$=(G,Y)=>({rank:Y+1,author:G.author,userId:G.authorHrefRaw?parseXhsProfileHref(G.authorHrefRaw):"",profileUrl:G.authorHrefRaw?buildXhsProfileUrl(G.authorHrefRaw):"",text:G.text,likes:G.likes,time:G.time,is_reply:G.is_reply,reply_to:G.reply_to});if(M){const G=[];let Y=0;for(const q of Z){if(!q.is_reply)Y++;if(Y>D)break;G.push(q)}return G.map($)}return Z.slice(0,D).map($)}});
+    `}export const command=F({site:"xiaohongshu",name:"comments",access:"read",description:"获取小红书笔记评论（支持楼中楼子回复）",domain:"www.xiaohongshu.com",strategy:U.COOKIE,navigateBefore:!1,args:[{name:"note-id",required:!0,positional:!0,help:"Full Xiaohongshu note URL with xsec_token"},{name:"limit",type:"int",default:20,help:"Number of top-level comments (max 50)"},{name:"with-replies",type:"boolean",default:!1,help:"Include nested replies (楼中楼)"}],columns:["rank","author","userId","profileUrl","text","likes","time","is_reply","reply_to","images"],func:async(G,D)=>{const B=parseCommentLimit(D.limit),Q=Boolean(D["with-replies"]),K=String(D["note-id"]),M=y(K);await G.goto(P(K,{commandName:"xiaohongshu comments"}));await G.wait({time:2+Math.random()*3});const Y=await G.evaluate(buildCommentsExtractJs(Q,B));if(!Y||typeof Y!=="object")throw new _("xiaohongshu/comments","Unexpected evaluate response");if(Y.securityBlock)throw new T("SECURITY_BLOCK","Xiaohongshu security block: the note detail page was blocked by risk control.",/^https?:\/\//.test(K)?"The page may be temporarily restricted. Try again later or from a different session.":"Try using a full URL from search results (with xsec_token) instead of a bare note ID.");if(Y.loginWall)throw new j("www.xiaohongshu.com","Note comments require login");const A=normalizeCommentRows(Y.results,"xiaohongshu/comments"),J=(V,q)=>({rank:q+1,author:V.author,userId:V.authorHrefRaw?parseXhsProfileHref(V.authorHrefRaw):"",profileUrl:V.authorHrefRaw?buildXhsProfileUrl(V.authorHrefRaw):"",text:V.text,likes:V.likes,time:V.time,is_reply:V.is_reply,reply_to:V.reply_to,images:V.images??[]});if(Q){const V=[];let q=0;for(const W of A){if(!W.is_reply)q++;if(q>B)break;V.push(W)}return V.map(J)}return A.slice(0,B).map(J)}});

package/clis/xiaohongshu/human.js

@@ -0,0 +1,14 @@
+function E(q,D){return q+Math.random()*(D-q)}function V(q,D=0.4,B=0.02){const A=q*D;return Math.max(B,q-A+Math.random()*A*2)}export async function humanWait(q,D,B=0.4){try{await q.wait({time:V(D,B)})}catch{}}export async function humanType(q,D){const B=String(D);if(!B)return;if(typeof q.insertText!=="function"){try{await q.insertText?.(B)}catch{}return}let A=0;while(A<B.length){const H=Math.max(1,Math.round(E(1,4))),I=B.slice(A,A+H);A+=I.length;try{await q.insertText(I)}catch{try{await q.insertText(B.slice(A-I.length))}catch{}return}const K=Math.random()<0.12?E(0.35,0.8):E(0.04,0.18);try{await q.wait({time:K})}catch{}}}function Y(q){if(!q.__xhsCursor)q.__xhsCursor={x:Math.round(E(80,520)),y:Math.round(E(120,420))};return q.__xhsCursor}function Z(q,D,B){const A=D.x-q.x,H=D.y-q.y,I=Math.hypot(A,H)||1,K=-H/I,N=A/I,J=E(0.05,0.22)*I*(Math.random()<0.5?1:-1),Q={x:q.x+A*E(0.2,0.4)+K*J,y:q.y+H*E(0.2,0.4)+N*J},R={x:q.x+A*E(0.6,0.8)+K*J*E(0.3,0.7),y:q.y+H*E(0.6,0.8)+N*J*E(0.3,0.7)},U=[];for(let O=1;O<=B;O++){const F=O/B,G=1-F,W=G*G*G*q.x+3*G*G*F*Q.x+3*G*F*F*R.x+F*F*F*D.x,X=G*G*G*q.y+3*G*G*F*Q.y+3*G*F*F*R.y+F*F*F*D.y;U.push({x:Math.round(W),y:Math.round(X)})}return U}export async function humanMoveTo(q,D,B){if(typeof q.cdp!=="function")return;const A={x:Math.round(D+E(-3,3)),y:Math.round(B+E(-3,3))},H=Y(q),I=Math.hypot(A.x-H.x,A.y-H.y),K=Math.max(6,Math.min(18,Math.round(I/30))),N=Z(H,A,K);for(const J of N){try{await q.cdp("Input.dispatchMouseEvent",{type:"mouseMoved",x:J.x,y:J.y})}catch{return}try{await q.wait({time:V(0.02,0.6,0.008)})}catch{}}q.__xhsCursor=A}export async function elementViewportCenter(q,D){try{const B=await q.evaluate(`
+      (sels => {
+        const __opencli_xhs_el_center = true;
+        for (const sel of sels) {
+          for (const el of document.querySelectorAll(sel)) {
+            if (!el || el.offsetParent === null) continue;
+            const r = el.getBoundingClientRect();
+            if (r.width <= 0 || r.height <= 0) continue;
+            return { x: Math.round(r.left + r.width / 2), y: Math.round(r.top + r.height / 2) };
+          }
+        }
+        return null;
+      })(${JSON.stringify(D)})
+    `),A=B&&typeof B==="object"&&"data"in B?B.data:B;if(A&&typeof A.x==="number"&&typeof A.y==="number")return A}catch{}return null}