publishport-opencli 1.8.5-pp.2 → 1.8.5-pp.21

package/clis/zhihu/article-transform.js

@@ -1,100 +1 @@
-/**
- * 知乎正文 HTML 微调（移植自 Wechatsync 的 zhihu 适配器 transformContent/transformTables）
- *
- * 知乎专栏编辑器（Draft.js）对 HTML 有自己的口味：图片要用 <figure> 包裹、代码块用
- * <pre lang>、表格要带 data-draft-* 标记并塞进 <tbody>。这里把这些「平台专属口味」收成
- * 一个纯字符串函数，供发布编排器在图片转存之后、调发布 API 之前调用。
- *
- * 纯函数、无依赖，可在 Node 直接测。
- */
-
-/**
- * 把 markdown-it / 通用 HTML 里的 <table> 转成知乎 Draft.js 期望的结构。
- * @param {string} html
- * @returns {string}
- */
-export function transformTables(html) {
-    // 1. 解包 figure 里的 table（知乎表格不该被 figure 包着）
-    let result = html.replace(
-        /<figure[^>]*>\s*(<table[\s\S]*?<\/table>)\s*<\/figure>/gi,
-        '$1',
-    );
-
-    // 2. 转换每个 table 结构
-    result = result.replace(/<table[^>]*>([\s\S]*?)<\/table>/gi, (_match, tableContent) => {
-        const theadMatch = tableContent.match(/<thead[^>]*>([\s\S]*?)<\/thead>/i);
-        const tbodyMatch = tableContent.match(/<tbody[^>]*>([\s\S]*?)<\/tbody>/i);
-
-        let headerRows = '';
-        let bodyRows = '';
-
-        if (theadMatch) {
-            // 表头行确保用 <th>
-            headerRows = theadMatch[1]
-                .replace(/<td([^>]*)>/gi, '<th$1>')
-                .replace(/<\/td>/gi, '</th>');
-        }
-
-        if (tbodyMatch) {
-            bodyRows = tbodyMatch[1];
-        } else {
-            // 没有 tbody：整段作为 body（排除 thead）
-            bodyRows = tableContent
-                .replace(/<thead[^>]*>[\s\S]*?<\/thead>/gi, '')
-                .replace(/<\/?tbody[^>]*>/gi, '');
-        }
-
-        // 没有 thead 时，若首行全是 th 则当表头
-        if (!theadMatch) {
-            const firstRowMatch = bodyRows.match(/<tr[^>]*>([\s\S]*?)<\/tr>/i);
-            if (firstRowMatch) {
-                const firstRowContent = firstRowMatch[1];
-                if (/<th[^>]*>/i.test(firstRowContent) && !/<td[^>]*>/i.test(firstRowContent)) {
-                    headerRows = firstRowMatch[0];
-                    bodyRows = bodyRows.replace(firstRowMatch[0], '');
-                }
-            }
-        }
-
-        return `<table data-draft-node="block" data-draft-type="table" data-size="normal" data-row-style="normal"><tbody>${headerRows}${bodyRows}</tbody></table>`;
-    });
-
-    return result;
-}
-
-/**
- * 知乎正文整体微调。
- * @param {string} content 已完成图片转存的 HTML
- * @returns {string}
- */
-export function transformZhihuHtml(content) {
-    let result = content;
-
-    // 1. 表格 → 知乎 Draft.js 格式
-    result = transformTables(result);
-
-    // 2. 图片用 <figure> 包裹（避免重复包裹已在 figure 里的）
-    result = result.replace(
-        /<img([^>]+)src="([^"]+)"([^>]*?)\/?>/gi,
-        (match, pre, src, post) => `<figure><img${pre}src="${src}"${post}></figure>`,
-    );
-    // 解包可能出现的 figure 套 figure
-    result = result.replace(/<figure>\s*(<figure>[\s\S]*?<\/figure>)\s*<\/figure>/gi, '$1');
-
-    // 3. 代码块：<pre><code class="language-x"> → <pre lang="x"><code>
-    result = result.replace(
-        /<pre><code class="language-(\w+)">/gi,
-        '<pre lang="$1"><code>',
-    );
-
-    // 4. 去掉非 data-draft 的 data-* 属性与内联 style（清掉外站/markdown 残留样式）
-    result = result.replace(/\s*data-(?!draft)[a-z-]+="[^"]*"/gi, '');
-    result = result.replace(/\s*style="[^"]*"/gi, '');
-
-    return result;
-}
-
-export const __test__ = {
-    transformTables,
-    transformZhihuHtml,
-};
+export function transformTables(A){let g=A.replace(/<figure[^>]*>\s*(<table[\s\S]*?<\/table>)\s*<\/figure>/gi,"$1");g=g.replace(/<table[^>]*>([\s\S]*?)<\/table>/gi,(E,q)=>{const v=q.match(/<thead[^>]*>([\s\S]*?)<\/thead>/i),x=q.match(/<tbody[^>]*>([\s\S]*?)<\/tbody>/i);let B="",j="";if(v)B=v[1].replace(/<td([^>]*)>/gi,"<th$1>").replace(/<\/td>/gi,"</th>");if(x)j=x[1];else j=q.replace(/<thead[^>]*>[\s\S]*?<\/thead>/gi,"").replace(/<\/?tbody[^>]*>/gi,"");if(!v){const z=j.match(/<tr[^>]*>([\s\S]*?)<\/tr>/i);if(z){const D=z[1];if(/<th[^>]*>/i.test(D)&&!/<td[^>]*>/i.test(D)){B=z[0];j=j.replace(z[0],"")}}}return`<table data-draft-node="block" data-draft-type="table" data-size="normal" data-row-style="normal"><tbody>${B}${j}</tbody></table>`});return g}export function transformZhihuHtml(A){let g=A;g=transformTables(g);g=g.replace(/<img([^>]+)src="([^"]+)"([^>]*?)\/?>/gi,(E,q,v,x)=>`<figure><img${q}src="${v}"${x}></figure>`);g=g.replace(/<figure>\s*(<figure>[\s\S]*?<\/figure>)\s*<\/figure>/gi,"$1");g=g.replace(/<pre><code class="language-(\w+)">/gi,'<pre lang="$1"><code>');g=g.replace(/\s*data-(?!draft)[a-z-]+="[^"]*"/gi,"");g=g.replace(/\s*style="[^"]*"/gi,"");return g}export const __test__={transformTables,transformZhihuHtml};

package/clis/zhihu/article.js

@@ -1,130 +1,7 @@
-import { CliError, CommandExecutionError } from '@jackwener/opencli/errors';
-import { cli, Strategy } from '@jackwener/opencli/registry';
-import { buildResultRow, requireExecute, resolvePayload } from './write-shared.js';
-import { publishArticle } from '../_shared/article/publish.js';
+import{CliError as H,CommandExecutionError as m}from"@jackwener/opencli/errors";import{cli as v,Strategy as R}from"@jackwener/opencli/registry";import{buildResultRow as h,requireExecute as f,resolvePayload as T}from"./write-shared.js";import{publishArticle as x}from"../_shared/article/publish.js";export const zhihuProfile={home:"https://zhuanlan.zhihu.com",outputFormat:"html",preprocessConfig:{removeSpecialTags:!0,removeSpecialTagsWithParent:!0,processCodeBlocks:!0,convertSectionToDiv:!0,removeTrailingBr:!0,unwrapSingleChildContainers:!0,unwrapNestedFigures:!0,compactHtml:!0,removeEmptyLines:!0,removeEmptyDivs:!0,removeNestedEmptyContainers:!0},image:{skip:["zhimg.com"],uploadFn:async(J,M)=>{if(J.indexOf("data:")!==0){const V=await fetch("https://zhuanlan.zhihu.com/api/uploaded_images",{method:"POST",credentials:"include",headers:{"Content-Type":"application/x-www-form-urlencoded","x-requested-with":"fetch","x-xsrftoken":M.xsrf()},body:new URLSearchParams({url:J,source:"article"})}),S=await V.text();let $=null;try{$=JSON.parse(S)}catch(N){}if(!V.ok||!$||!$.src)throw Error("URL 转存失败: HTTP "+V.status+" "+S.slice(0,150));return{url:$.src}}const W=M.dataUriToBlob(J),Z=await W.arrayBuffer(),O=M.md5(Z),Y=await fetch("https://api.zhihu.com/images",{method:"POST",credentials:"include",headers:{"Content-Type":"application/json","x-requested-with":"fetch"},body:JSON.stringify({image_hash:O,source:"article"})}),L=await Y.text();let U=null;try{U=JSON.parse(L)}catch(V){}if(!Y.ok||!U||!U.upload_file)throw Error("获取上传凭证失败: HTTP "+Y.status+" "+L.slice(0,150));const Q=U.upload_file;if(Q.state===1){for(let V=0;V<10;V++){const $=await(await fetch("https://api.zhihu.com/images/"+Q.image_id,{credentials:"include",headers:{"x-requested-with":"fetch"}})).json();if($&&($.status==="completed"||$.original_hash))return{url:"https://pic4.zhimg.com/"+$.original_hash};await new Promise((N)=>setTimeout(N,1000))}throw Error("图片处理超时（image_id="+Q.image_id+"）")}const G=U.upload_token;if(!G||!G.access_id||!G.access_key||!G.access_token)throw Error("上传凭证响应无效: "+L.slice(0,150));const X=W.type||"application/octet-stream",q=new Date().toUTCString(),A={"x-oss-date":q,"x-oss-security-token":G.access_token,"x-oss-user-agent":"aliyun-sdk-js/6.8.0"},_=Object.keys(A).sort().map((V)=>V+":"+A[V]).join(`
+`),B=`PUT
 
-// 知乎专栏 profile —— 接入共享发布编排器（归一 → 预处理 → 图片转存 → 单次 evaluate 发布）。
-// 知乎只吃 HTML，所以 Markdown 会先转 HTML；正文里的外链图自动转存到知乎图床。
-// 这份 profile 同时是「接新平台怎么写」的参考样板：声明 outputFormat / preprocessConfig /
-// 图片 spec + 一个页面内 publish 函数即可，脏活（预处理、转存、防漂移）由基建包办。
-const zhihuProfile = {
-    home: 'https://zhuanlan.zhihu.com',
-    outputFormat: 'html',
-    // 预处理开关移植自 Wechatsync zhihu 适配器 preprocessConfig（Draft.js 口味）。
-    preprocessConfig: {
-        removeSpecialTags: true,
-        removeSpecialTagsWithParent: true,
-        processCodeBlocks: true,
-        convertSectionToDiv: true,
-        removeTrailingBr: true,
-        unwrapSingleChildContainers: true,
-        unwrapNestedFigures: true,
-        compactHtml: true,
-        removeEmptyLines: true,
-        removeEmptyDivs: true,
-        removeNestedEmptyContainers: true,
-    },
-    // 图片转存：知乎「传 URL」式——把外链图 URL 交给服务端自拉转存（不下载字节）。
-    image: {
-        spec: {
-            url: 'https://zhuanlan.zhihu.com/api/uploaded_images',
-            method: 'POST',
-            bodyType: 'form',
-            body: { url: '{src}', source: 'article' },
-            responsePath: 'src',
-            xsrf: true,
-        },
-        skip: ['zhimg.com'],
-    },
-    // 页面内发布：建草稿 → 写入 → 发布。沿用原适配器验证过的 in-page 流程，仅参数化正文。
-    // I = { title, content, draftOnly }，content 已完成预处理 + 图片转存。
-    publish: async (I, PP) => {
-        let html = I.content;
-        // 知乎口味：每张图用 <figure> 包裹。
-        html = html.replace(/<img([^>]+?)\/?>/gi, '<figure><img$1></figure>');
-
-        const xsrf = PP.xsrf();
-        const H = { 'Content-Type': 'application/json', 'x-requested-with': 'fetch', 'x-xsrftoken': xsrf };
-        const base = 'https://zhuanlan.zhihu.com/api/articles';
-
-        const cr = await fetch(base + '/drafts', { method: 'POST', credentials: 'include', headers: H, body: JSON.stringify({ title: I.title }) });
-        const crText = await cr.text();
-        let crData = null; try { crData = JSON.parse(crText); } catch (e) {}
-        if (!cr.ok || !crData || !crData.id) {
-            return { ok: false, stage: 'create', status: cr.status, message: crText.slice(0, 300) };
-        }
-        const id = String(crData.id);
-
-        const up = await fetch(base + '/' + id + '/draft', {
-            method: 'PATCH', credentials: 'include', headers: H,
-            body: JSON.stringify({ title: I.title, content: html, table_of_contents: false, delta_time: 30 }),
-        });
-        if (!up.ok) {
-            const upText = await up.text();
-            return { ok: false, stage: 'update', status: up.status, message: upText.slice(0, 300), id: id };
-        }
-
-        if (I.draftOnly) {
-            return { ok: true, draft: true, id: id, url: 'https://zhuanlan.zhihu.com/p/' + id + '/edit' };
-        }
-
-        const pub = await fetch(base + '/' + id + '/publish', { method: 'PUT', credentials: 'include', headers: H, body: JSON.stringify({}) });
-        const pubText = await pub.text();
-        let pubData = null; try { pubData = JSON.parse(pubText); } catch (e) {}
-        if (!pub.ok) {
-            return { ok: false, stage: 'publish', status: pub.status, message: pubText.slice(0, 300), id: id };
-        }
-        return { ok: true, draft: false, id: id, url: (pubData && pubData.url) || ('https://zhuanlan.zhihu.com/p/' + id) };
-    },
-};
-
-cli({
-    site: 'zhihu',
-    name: 'article',
-    access: 'write',
-    description: 'Publish a Zhihu article (文章/专栏). Body is Markdown by default; images are auto-rehosted to Zhihu.',
-    domain: 'zhuanlan.zhihu.com',
-    strategy: Strategy.COOKIE,
-    browser: true,
-    args: [
-        { name: 'title', positional: true, required: true, help: 'Article title' },
-        { name: 'text', positional: true, help: 'Article body (Markdown by default; pass --html for raw HTML)' },
-        { name: 'file', help: 'Article body file path (UTF-8, Markdown by default)' },
-        { name: 'html', type: 'boolean', help: 'Treat body as raw HTML instead of Markdown' },
-        { name: 'draft', type: 'boolean', help: 'Save as draft only; do not publish' },
-        { name: 'execute', type: 'boolean', help: 'Actually create/publish. Without it the command refuses to write.' },
-    ],
-    columns: ['status', 'outcome', 'message', 'target_type', 'target', 'created_target', 'created_url'],
-    func: async (page, kwargs) => {
-        if (!page)
-            throw new CommandExecutionError('Browser session required for zhihu article');
-        requireExecute(kwargs);
-        const title = String(kwargs.title ?? '').trim();
-        if (!title)
-            throw new CliError('INVALID_INPUT', 'Article title cannot be empty');
-        const body = await resolvePayload(kwargs);
-        const draftOnly = Boolean(kwargs.draft);
-
-        const result = await publishArticle(page, {
-            title,
-            body,
-            format: kwargs.html ? 'html' : 'markdown',
-            draftOnly,
-            profile: zhihuProfile,
-        });
-
-        const upN = result.images.uploaded.length | 0;
-        const failN = result.images.failed.length | 0;
-        let message = result.draft ? 'Saved article draft' : 'Published article';
-        if (upN || failN) {
-            message += ` · images: ${upN} rehosted${failN ? `, ${failN} failed` : ''}`;
-        }
-        return buildResultRow(
-            message,
-            'article',
-            '',
-            result.draft ? 'draft' : 'created',
-            { created_target: 'article:' + result.id, created_url: result.url },
-        );
-    },
-});
+`+X+`
+`+q+`
+`+_+`
+/zhihu-pics/`+Q.object_key,z=new TextEncoder().encode(G.access_key),C=await crypto.subtle.importKey("raw",z,{name:"HMAC",hash:"SHA-1"},!1,["sign"]),F=await crypto.subtle.sign("HMAC",C,new TextEncoder().encode(B)),j=btoa(String.fromCharCode.apply(null,Array.from(new Uint8Array(F)))),E=await fetch("https://zhihu-pics-upload.zhimg.com/"+Q.object_key,{method:"PUT",headers:{"Content-Type":X,Authorization:"OSS "+G.access_id+":"+j,"x-oss-date":q,"x-oss-security-token":G.access_token,"x-oss-user-agent":"aliyun-sdk-js/6.8.0"},body:W});if(!E.ok){const V=await E.text();throw Error("OSS 上传失败: HTTP "+E.status+" "+V.slice(0,150))}let K=Q.object_key;if(W.type==="image/gif")K=K+".gif";return{url:"https://pic4.zhimg.com/"+K}}},publish:async(J,M)=>{let W=J.content;W=W.replace(/<img([^>]+?)\/?>/gi,"<figure><img$1></figure>");const Z=J.params&&typeof J.params.cover==="string"?J.params.cover.trim():"";if(Z&&Z.indexOf("zhimg.com")===-1)return{ok:!1,stage:"cover",message:"题图必须是知乎图床（zhimg.com）地址，转存未生效："+Z.slice(0,120)};const Y={"Content-Type":"application/json","x-requested-with":"fetch","x-xsrftoken":M.xsrf()},L="https://zhuanlan.zhihu.com/api/articles",U=await fetch(L+"/drafts",{method:"POST",credentials:"include",headers:Y,body:JSON.stringify({title:J.title})}),Q=await U.text();let G=null;try{G=JSON.parse(Q)}catch(C){}if(!U.ok||!G||!G.id)return{ok:!1,stage:"create",status:U.status,message:Q.slice(0,300)};const X=String(G.id),q={title:J.title,content:W,table_of_contents:!1,delta_time:30};if(Z){q.titleImage=Z;q.isTitleImageFullScreen=!1}const A=await fetch(L+"/"+X+"/draft",{method:"PATCH",credentials:"include",headers:Y,body:JSON.stringify(q)});if(!A.ok){const C=await A.text();return{ok:!1,stage:"update",status:A.status,message:C.slice(0,300),id:X}}if(J.draftOnly)return{ok:!0,draft:!0,id:X,url:"https://zhuanlan.zhihu.com/p/"+X+"/edit"};const _=await fetch(L+"/"+X+"/publish",{method:"PUT",credentials:"include",headers:Y,body:JSON.stringify({})}),B=await _.text();let z=null;try{z=JSON.parse(B)}catch(C){}if(!_.ok)return{ok:!1,stage:"publish",status:_.status,message:B.slice(0,300),id:X};return{ok:!0,draft:!1,id:X,url:z&&z.url||"https://zhuanlan.zhihu.com/p/"+X}}};v({site:"zhihu",name:"article",access:"write",description:"Publish a Zhihu article (文章/专栏). Body is Markdown by default; images (incl. local paths) and --cover are auto-rehosted to Zhihu.",domain:"zhuanlan.zhihu.com",strategy:R.COOKIE,browser:!0,args:[{name:"title",positional:!0,required:!0,help:"Article title"},{name:"text",positional:!0,help:"Article body (Markdown by default; pass --html for raw HTML)"},{name:"file",help:"Article body file path (UTF-8, Markdown by default)"},{name:"html",type:"boolean",help:"Treat body as raw HTML instead of Markdown"},{name:"cover",help:"Cover image (题图): local file path or image URL; auto-rehosted to Zhihu (zhimg.com)"},{name:"draft",type:"boolean",help:"Save as draft only; do not publish"},{name:"execute",type:"boolean",help:"Actually create/publish. Without it the command refuses to write."}],columns:["status","outcome","message","target_type","target","created_target","created_url"],func:async(J,M)=>{if(!J)throw new m("Browser session required for zhihu article");f(M);const W=String(M.title??"").trim();if(!W)throw new H("INVALID_INPUT","Article title cannot be empty");const Z=await T(M),O=Boolean(M.draft),Y=typeof M.cover==="string"?M.cover.trim():"",L=await x(J,{title:W,body:Z,format:M.html?"html":"markdown",draftOnly:O,profile:zhihuProfile,publishParams:Y?{cover:Y}:null}),U=L.images.uploaded.length|0,Q=L.images.failed.length|0;let G=L.draft?"Saved article draft":"Published article";if(U||Q)G+=` · images: ${U} rehosted${Q?`, ${Q} failed`:""}`;return h(G,"article","",L.draft?"draft":"created",{created_target:"article:"+L.id,created_url:L.url})}});

package/clis/zhihu/auth.js

@@ -1,18 +1,4 @@
-import { AuthRequiredError, CommandExecutionError } from '@jackwener/opencli/errors';
-import { registerSiteAuthCommands } from '../_shared/site-auth.js';
-
-async function hasZhihuAuthCookie(page) {
-  const cookies = await page.getCookies({ url: 'https://www.zhihu.com' });
-  return cookies.some(c => c.name === 'z_c0' && c.value);
-}
-
-async function verifyZhihuIdentity(page) {
-  if (!await hasZhihuAuthCookie(page)) {
-    throw new AuthRequiredError('www.zhihu.com', 'Zhihu z_c0 cookie missing — anonymous');
-  }
-  await page.goto('https://www.zhihu.com/');
-  await page.wait(2);
-  const data = await page.evaluate(`
+import{AuthRequiredError as F,CommandExecutionError as H}from"@jackwener/opencli/errors";import{registerSiteAuthCommands as L}from"../_shared/site-auth.js";async function G(B){return(await B.getCookies({url:"https://www.zhihu.com"})).some((D)=>D.name==="z_c0"&&D.value)}async function J(B){await B.goto("https://www.zhihu.com/");await B.wait(2);return B.evaluate(`
     (async () => {
       try {
         const r = await fetch('https://www.zhihu.com/api/v4/me?include=url_token', { credentials: 'include' });
@@ -22,38 +8,4 @@ async function verifyZhihuIdentity(page) {
         return { __exception: String(e && e.message || e) };
       }
     })()
-  `);
-  if (data?.__exception) {
-    throw new CommandExecutionError(`Zhihu whoami failed: ${data.__exception}`);
-  }
-  if (!data || data.__httpError) {
-    const status = data?.__httpError;
-    if (status === 401 || status === 403) {
-      throw new AuthRequiredError('www.zhihu.com', `Zhihu /api/v4/me returned HTTP ${status} — anonymous`);
-    }
-    throw new CommandExecutionError(`Zhihu identity probe failed (HTTP ${status ?? 'unknown'})`);
-  }
-  if (!data.url_token) {
-    throw new AuthRequiredError('www.zhihu.com', 'Zhihu /api/v4/me returned no url_token — anonymous session');
-  }
-  return {
-    url_token: String(data.url_token),
-    name: String(data.name ?? ''),
-    uid: String(data.uid ?? data.id ?? ''),
-  };
-}
-
-registerSiteAuthCommands({
-  site: 'zhihu',
-  domain: 'www.zhihu.com',
-  loginUrl: 'https://www.zhihu.com/signin',
-  columns: ['url_token', 'name', 'uid'],
-  quickCheck: hasZhihuAuthCookie,
-  verify: verifyZhihuIdentity,
-  poll: async (page) => {
-    if (!await hasZhihuAuthCookie(page)) {
-      throw new AuthRequiredError('www.zhihu.com', 'Waiting for Zhihu z_c0 cookie');
-    }
-    return verifyZhihuIdentity(page);
-  },
-});
+  `)}async function K(B){if(!await G(B))throw new F("www.zhihu.com","Zhihu z_c0 cookie missing — anonymous");let z=await J(B);if(z&&(z.__httpError===401||z.__httpError===403)){await B.wait(2);z=await J(B)}if(z?.__exception)throw new H(`Zhihu whoami failed: ${z.__exception}`);if(!z||z.__httpError){const D=z?.__httpError;if(D===401||D===403)throw new F("www.zhihu.com",`Zhihu /api/v4/me returned HTTP ${D} — anonymous`);throw new H(`Zhihu identity probe failed (HTTP ${D??"unknown"})`)}if(!z.url_token)throw new F("www.zhihu.com","Zhihu /api/v4/me returned no url_token — anonymous session");return{url_token:String(z.url_token),name:String(z.name??""),uid:String(z.uid??z.id??"")}}L({site:"zhihu",domain:"www.zhihu.com",loginUrl:"https://www.zhihu.com/signin",columns:["url_token","name","uid"],quickCheck:G,verify:K,poll:async(B)=>{if(!await G(B))throw new F("www.zhihu.com","Waiting for Zhihu z_c0 cookie");return K(B)}});

package/clis/zhihu/collection.js

@@ -1,199 +1,7 @@
-import { cli, Strategy } from '@jackwener/opencli/registry';
-import { ArgumentError, AuthRequiredError, CommandExecutionError, EmptyResultError } from '@jackwener/opencli/errors';
-import { log } from '@jackwener/opencli/logger';
-import { stripHtml } from './text.js';
-
-function validatePositiveInt(value, name) {
-  const n = Number(value);
-  if (!Number.isInteger(n) || n <= 0) {
-    throw new ArgumentError(`zhihu collection --${name} must be a positive integer`, 'Example: opencli zhihu collection 83283292 --limit 20');
-  }
-  return n;
-}
-
-function validateNonNegativeInt(value, name) {
-  const n = Number(value);
-  if (!Number.isInteger(n) || n < 0) {
-    throw new ArgumentError(`zhihu collection --${name} must be a non-negative integer`, 'Example: opencli zhihu collection 83283292 --offset 0');
-  }
-  return n;
-}
-
-async function fetchCollectionPage(page, collectionId, offset, limit) {
-  const url = `https://www.zhihu.com/api/v4/collections/${collectionId}/items?offset=${offset}&limit=${limit}`;
-  const data = await page.evaluate(`
+import{cli as y,Strategy as I}from"@jackwener/opencli/registry";import{ArgumentError as R,AuthRequiredError as L,CommandExecutionError as j,EmptyResultError as v}from"@jackwener/opencli/errors";import{log as w}from"@jackwener/opencli/logger";import{stripHtml as _}from"./text.js";function H(M,D){const z=Number(M);if(!Number.isInteger(z)||z<=0)throw new R(`zhihu collection --${D} must be a positive integer`,"Example: opencli zhihu collection 83283292 --limit 20");return z}function C(M,D){const z=Number(M);if(!Number.isInteger(z)||z<0)throw new R(`zhihu collection --${D} must be a non-negative integer`,"Example: opencli zhihu collection 83283292 --offset 0");return z}async function O(M,D,z,T){const V=`https://www.zhihu.com/api/v4/collections/${D}/items?offset=${z}&limit=${T}`,G=await M.evaluate(`
     (async () => {
-      const r = await fetch(${JSON.stringify(url)}, { credentials: 'include' });
+      const r = await fetch(${JSON.stringify(V)}, { credentials: 'include' });
       if (!r.ok) return { __httpError: r.status };
       return await r.json();
     })()
-  `);
-
-  if (!data || data.__httpError) {
-    const status = data?.__httpError;
-    if (status === 401 || status === 403) {
-      throw new AuthRequiredError('www.zhihu.com', 'Failed to fetch collection data from Zhihu. Please ensure you are logged in.');
-    }
-    throw new CommandExecutionError(
-      status ? `Zhihu collection request failed (HTTP ${status})` : 'Zhihu collection request failed',
-      'Try again later or rerun with -v for more detail',
-    );
-  }
-  return data;
-}
-
-function itemKey(item) {
-  const content = item?.content || {};
-  return `${content.type || ''}:${content.id || content.url || JSON.stringify(content).slice(0, 80)}`;
-}
-
-function mapCollectionItem(item, rank) {
-  const content = item.content || {};
-  const type = content.type || '';
-  if (!['answer', 'article', 'pin'].includes(type)) {
-    throw new CommandExecutionError(
-      `Zhihu collection returned unsupported content type: ${type || 'missing'}`,
-      'Collection items require a supported content.type so the row identity, title, and URL are not silently blank.',
-    );
-  }
-
-  let title = '';
-  let excerpt = '';
-  let url = '';
-  let author = '';
-  let votes = 0;
-
-  if (type === 'answer') {
-    const question = content.question || {};
-    title = question.title || '';
-    excerpt = stripHtml(content.content || '').substring(0, 150);
-    url = content.url || `https://www.zhihu.com/question/${question.id}/answer/${content.id}`;
-    author = content.author?.name || '匿名用户';
-    votes = content.voteup_count || 0;
-  } else if (type === 'article') {
-    title = content.title || '';
-    excerpt = stripHtml(content.content || '').substring(0, 150);
-    url = content.url || `https://zhuanlan.zhihu.com/p/${content.id}`;
-    author = content.author?.name || '匿名用户';
-    votes = content.voteup_count || 0;
-  } else if (type === 'pin') {
-    title = '想法';
-    excerpt = stripHtml((content.content || []).map((c) => c.content || '').join(' ')).substring(0, 150);
-    url = content.url || `https://www.zhihu.com/pin/${content.id}`;
-    author = content.author?.name || '匿名用户';
-    votes = content.reaction_count || 0;
-  }
-
-  if (!String(title || '').trim() || !String(url || '').trim() || url.includes('undefined')) {
-    throw new CommandExecutionError(
-      'Zhihu collection returned a malformed item without title or URL identity',
-      'Collection item rows require type, title, and URL so malformed payloads do not become blank listing rows.',
-    );
-  }
-
-  return {
-    rank,
-    type,
-    title: stripHtml(title).substring(0, 100),
-    author,
-    votes,
-    excerpt,
-    url,
-  };
-}
-
-cli({
-  site: 'zhihu',
-  name: 'collection',
-    access: 'read',
-  description: '知乎收藏夹内容列表（需要登录）',
-  domain: 'www.zhihu.com',
-  strategy: Strategy.COOKIE,
-  browser: true,
-  args: [
-    { name: 'id', positional: true, required: true, help: '收藏夹 ID (数字，可从收藏夹 URL 中获取)' },
-    { name: 'offset', type: 'int', default: 0, help: '起始偏移量（用于分页）' },
-    { name: 'limit', type: 'int', default: 20, help: '每页数量（最大 20）' },
-  ],
-  columns: ['rank', 'type', 'title', 'author', 'votes', 'excerpt', 'url'],
-  func: async (page, kwargs) => {
-    const { id, offset = 0, limit = 20 } = kwargs;
-
-    const collectionId = String(id);
-
-    // 验证收藏夹 ID 为数字
-    if (!/^\d+$/.test(collectionId)) {
-      throw new ArgumentError('Collection ID must be numeric', 'Example: opencli zhihu collection 83283292');
-    }
-
-    const pageOffset = validateNonNegativeInt(offset, 'offset');
-    const requestedLimit = validatePositiveInt(limit, 'limit');
-    const pageLimit = Math.min(requestedLimit, 20); // 知乎 API 限制每页最大 20
-
-    // 先访问知乎主页建立 session
-    await page.goto('https://www.zhihu.com');
-
-    const collected = [];
-    const seen = new Set();
-    let totals = 0;
-    let nextOffset = pageOffset;
-    const maxPages = Math.ceil(requestedLimit / pageLimit) + 2;
-    for (let pageIndex = 0; pageIndex < maxPages && collected.length < requestedLimit; pageIndex += 1) {
-      const currentFetchLimit = Math.min(pageLimit, requestedLimit - collected.length);
-      const data = await fetchCollectionPage(page, collectionId, nextOffset, currentFetchLimit);
-      const items = Array.isArray(data.data) ? data.data : [];
-      const paging = data.paging || {};
-      totals = Number(paging.totals || totals || 0);
-
-      for (const item of items) {
-        const key = itemKey(item);
-        if (!seen.has(key)) {
-          seen.add(key);
-          collected.push(item);
-        }
-        if (collected.length >= requestedLimit) break;
-      }
-
-      if (items.length === 0 || paging.is_end || collected.length >= requestedLimit) break;
-      if (typeof paging.next === 'string') {
-        try {
-          const nextUrl = new URL(paging.next);
-          const parsedOffset = Number(nextUrl.searchParams.get('offset'));
-          if (Number.isInteger(parsedOffset) && parsedOffset > nextOffset) {
-            nextOffset = parsedOffset;
-            continue;
-          }
-        } catch {}
-      }
-      if (items.length < currentFetchLimit) break;
-      const fallbackOffset = nextOffset + items.length;
-      if (fallbackOffset <= nextOffset) break;
-      nextOffset = fallbackOffset;
-      if (totals && nextOffset >= totals) break;
-    }
-    
-    // 计算总页数
-    const totalPages = Math.ceil(totals / pageLimit);
-    const currentPage = Math.floor(pageOffset / pageLimit) + 1;
-    
-    // 输出统计信息
-    if (totals > 0) {
-      log.info(`收藏夹共有 ${totals} 条内容，共 ${totalPages} 页`);
-      log.info(`当前第 ${currentPage} 页，显示第 ${pageOffset + 1} - ${Math.min(pageOffset + collected.length, totals)} 条`);
-    }
-
-    if (collected.length === 0) {
-      throw new EmptyResultError('zhihu collection', `No items found for collection ${collectionId}. The collection may be empty, private, or the offset may be out of range.`);
-    }
-
-    return collected.slice(0, requestedLimit).map((item, i) => mapCollectionItem(item, pageOffset + i + 1));
-  },
-});
-
-export const __test__ = {
-  stripHtml,
-  validatePositiveInt,
-  validateNonNegativeInt,
-  itemKey,
-  mapCollectionItem,
-};
+  `);if(!G||G.__httpError){const B=G?.__httpError;if(B===401||B===403)throw new L("www.zhihu.com","Failed to fetch collection data from Zhihu. Please ensure you are logged in.");throw new j(B?`Zhihu collection request failed (HTTP ${B})`:"Zhihu collection request failed","Try again later or rerun with -v for more detail")}return G}function P(M){const D=M?.content||{};return`${D.type||""}:${D.id||D.url||JSON.stringify(D).slice(0,80)}`}function h(M,D){const z=M.content||{},T=z.type||"";if(!["answer","article","pin"].includes(T))throw new j(`Zhihu collection returned unsupported content type: ${T||"missing"}`,"Collection items require a supported content.type so the row identity, title, and URL are not silently blank.");let V="",G="",B="",Q="",W=0;if(T==="answer"){const J=z.question||{};V=J.title||"";G=_(z.content||"").substring(0,150);B=z.url||`https://www.zhihu.com/question/${J.id}/answer/${z.id}`;Q=z.author?.name||"匿名用户";W=z.voteup_count||0}else if(T==="article"){V=z.title||"";G=_(z.content||"").substring(0,150);B=z.url||`https://zhuanlan.zhihu.com/p/${z.id}`;Q=z.author?.name||"匿名用户";W=z.voteup_count||0}else if(T==="pin"){V="想法";G=_((z.content||[]).map((J)=>J.content||"").join(" ")).substring(0,150);B=z.url||`https://www.zhihu.com/pin/${z.id}`;Q=z.author?.name||"匿名用户";W=z.reaction_count||0}if(!String(V||"").trim()||!String(B||"").trim()||B.includes("undefined"))throw new j("Zhihu collection returned a malformed item without title or URL identity","Collection item rows require type, title, and URL so malformed payloads do not become blank listing rows.");return{rank:D,type:T,title:_(V).substring(0,100),author:Q,votes:W,excerpt:G,url:B}}y({site:"zhihu",name:"collection",access:"read",description:"知乎收藏夹内容列表（需要登录）",domain:"www.zhihu.com",strategy:I.COOKIE,browser:!0,args:[{name:"id",positional:!0,required:!0,help:"收藏夹 ID (数字，可从收藏夹 URL 中获取)"},{name:"offset",type:"int",default:0,help:"起始偏移量（用于分页）"},{name:"limit",type:"int",default:20,help:"每页数量（最大 20）"}],columns:["rank","type","title","author","votes","excerpt","url"],func:async(M,D)=>{const{id:z,offset:T=0,limit:V=20}=D,G=String(z);if(!/^\d+$/.test(G))throw new R("Collection ID must be numeric","Example: opencli zhihu collection 83283292");const B=C(T,"offset"),Q=H(V,"limit"),W=Math.min(Q,20);await M.goto("https://www.zhihu.com");const J=[],A=new Set;let X=0,Y=B;const q=Math.ceil(Q/W)+2;for(let $=0;$<q&&J.length<Q;$+=1){const S=Math.min(W,Q-J.length),K=await O(M,G,Y,S),U=Array.isArray(K.data)?K.data:[],b=K.paging||{};X=Number(b.totals||X||0);for(const F of U){const Z=P(F);if(!A.has(Z)){A.add(Z);J.push(F)}if(J.length>=Q)break}if(U.length===0||b.is_end||J.length>=Q)break;if(typeof b.next==="string")try{const F=new URL(b.next),Z=Number(F.searchParams.get("offset"));if(Number.isInteger(Z)&&Z>Y){Y=Z;continue}}catch{}if(U.length<S)break;const N=Y+U.length;if(N<=Y)break;Y=N;if(X&&Y>=X)break}const k=Math.ceil(X/W),E=Math.floor(B/W)+1;if(X>0){w.info(`收藏夹共有 ${X} 条内容，共 ${k} 页`);w.info(`当前第 ${E} 页，显示第 ${B+1} - ${Math.min(B+J.length,X)} 条`)}if(J.length===0)throw new v("zhihu collection",`No items found for collection ${G}. The collection may be empty, private, or the offset may be out of range.`);return J.slice(0,Q).map(($,S)=>h($,B+S+1))}});export const __test__={stripHtml:_,validatePositiveInt:H,validateNonNegativeInt:C,itemKey:P,mapCollectionItem:h};

package/clis/zhihu/collections.js

@@ -1,128 +1,7 @@
-import { cli, Strategy } from '@jackwener/opencli/registry';
-import { ArgumentError, AuthRequiredError, CommandExecutionError, EmptyResultError } from '@jackwener/opencli/errors';
-import { log } from '@jackwener/opencli/logger';
-
-function validatePositiveInt(value, name) {
-  const n = Number(value);
-  if (!Number.isInteger(n) || n <= 0) {
-    throw new ArgumentError(`zhihu collections --${name} must be a positive integer`, 'Example: opencli zhihu collections --limit 20');
-  }
-  return n;
-}
-
-async function fetchJson(page, url, errorLabel) {
-  const data = await page.evaluate(`
+import{cli as P,Strategy as I}from"@jackwener/opencli/registry";import{ArgumentError as h,AuthRequiredError as w,CommandExecutionError as F,EmptyResultError as O}from"@jackwener/opencli/errors";import{log as v}from"@jackwener/opencli/logger";function J(B,V){const D=Number(B);if(!Number.isInteger(D)||D<=0)throw new h(`zhihu collections --${V} must be a positive integer`,"Example: opencli zhihu collections --limit 20");return D}async function K(B,V,D){const z=await B.evaluate(`
     (async () => {
-      const r = await fetch(${JSON.stringify(url)}, { credentials: 'include' });
+      const r = await fetch(${JSON.stringify(V)}, { credentials: 'include' });
       if (!r.ok) return { __httpError: r.status };
       return await r.json();
     })()
-  `);
-
-  if (!data || data.__httpError) {
-    const status = data?.__httpError;
-    if (status === 401 || status === 403) {
-      throw new AuthRequiredError('www.zhihu.com', `${errorLabel} from Zhihu failed. Please ensure you are logged in.`);
-    }
-    throw new CommandExecutionError(
-      status ? `${errorLabel} from Zhihu failed (HTTP ${status})` : `${errorLabel} from Zhihu failed`,
-      'Try again later or rerun with -v for more detail',
-    );
-  }
-  return data;
-}
-
-function collectionKey(item) {
-  return String(item?.id || item?.url || item?.title || '');
-}
-
-cli({
-  site: 'zhihu',
-  name: 'collections',
-    access: 'read',
-  description: '知乎收藏夹列表（需要登录）',
-  domain: 'www.zhihu.com',
-  strategy: Strategy.COOKIE,
-  browser: true,
-  args: [
-    { name: 'limit', type: 'int', default: 20, help: '每页数量（最大 20）' },
-  ],
-  columns: ['rank', 'title', 'item_count', 'description', 'collection_id'],
-  func: async (page, kwargs) => {
-    const { limit = 20 } = kwargs;
-    const requestedLimit = validatePositiveInt(limit, 'limit');
-
-    // 先访问知乎主页建立 session
-    await page.goto('https://www.zhihu.com');
-    // 获取当前用户的 url_token
-    const meData = await fetchJson(page, 'https://www.zhihu.com/api/v4/me?include=url_token', 'Zhihu user info request');
-
-    const urlToken = meData.url_token;
-    if (!urlToken) {
-      throw new CommandExecutionError('Failed to get user url_token from Zhihu', 'Please ensure you are logged in.');
-    }
-
-    const collected = [];
-    const seen = new Set();
-    let totals = 0;
-    let offset = 0;
-    const pageLimit = Math.min(requestedLimit, 20);
-    const maxPages = Math.ceil(requestedLimit / pageLimit) + 2;
-
-    for (let pageIndex = 0; pageIndex < maxPages && collected.length < requestedLimit; pageIndex += 1) {
-      const currentFetchLimit = Math.min(pageLimit, requestedLimit - collected.length);
-      const url = `https://www.zhihu.com/api/v4/people/${urlToken}/collections?include=data%5B*%5D.updated_time&offset=${offset}&limit=${currentFetchLimit}`;
-      const data = await fetchJson(page, url, 'Zhihu favorite collections request');
-      const items = Array.isArray(data.data) ? data.data : [];
-      const paging = data.paging || {};
-      totals = Number(paging.totals || totals || 0);
-
-      for (const item of items) {
-        const key = collectionKey(item);
-        if (key && !seen.has(key)) {
-          seen.add(key);
-          collected.push(item);
-        }
-        if (collected.length >= requestedLimit) break;
-      }
-
-      if (items.length === 0 || paging.is_end || collected.length >= requestedLimit) break;
-      if (typeof paging.next === 'string') {
-        try {
-          const nextUrl = new URL(paging.next);
-          const parsedOffset = Number(nextUrl.searchParams.get('offset'));
-          if (Number.isInteger(parsedOffset) && parsedOffset > offset) {
-            offset = parsedOffset;
-            continue;
-          }
-        } catch {}
-      }
-      if (items.length < currentFetchLimit) break;
-      const fallbackOffset = offset + items.length;
-      if (fallbackOffset <= offset) break;
-      offset = fallbackOffset;
-      if (totals && offset >= totals) break;
-    }
-
-    if (totals > 0) {
-      log.info(`共有 ${totals} 个收藏夹`);
-    }
-
-    if (collected.length === 0) {
-      throw new EmptyResultError('zhihu collections', 'No favorite collections were returned for the logged-in user.');
-    }
-
-    return collected.slice(0, requestedLimit).map((item, i) => ({
-      rank: i + 1,
-      title: item.title || '未命名',
-      item_count: item.item_count ?? item.answer_count ?? 0,
-      description: item.description || '',
-      collection_id: String(item.id || ''),
-    }));
-  },
-});
-
-export const __test__ = {
-  validatePositiveInt,
-  collectionKey,
-};
+  `);if(!z||z.__httpError){const W=z?.__httpError;if(W===401||W===403)throw new w("www.zhihu.com",`${D} from Zhihu failed. Please ensure you are logged in.`);throw new F(W?`${D} from Zhihu failed (HTTP ${W})`:`${D} from Zhihu failed`,"Try again later or rerun with -v for more detail")}return z}function R(B){return String(B?.id||B?.url||B?.title||"")}P({site:"zhihu",name:"collections",access:"read",description:"知乎收藏夹列表（需要登录）",domain:"www.zhihu.com",strategy:I.COOKIE,browser:!0,args:[{name:"limit",type:"int",default:20,help:"每页数量（最大 20）"}],columns:["rank","title","item_count","description","collection_id"],func:async(B,V)=>{const{limit:D=20}=V,z=J(D,"limit");await B.goto("https://www.zhihu.com");const U=(await K(B,"https://www.zhihu.com/api/v4/me?include=url_token","Zhihu user info request")).url_token;if(!U)throw new F("Failed to get user url_token from Zhihu","Please ensure you are logged in.");const H=[],_=new Set;let Q=0,M=0;const A=Math.min(z,20),T=Math.ceil(z/A)+2;for(let G=0;G<T&&H.length<z;G+=1){const X=Math.min(A,z-H.length),j=`https://www.zhihu.com/api/v4/people/${U}/collections?include=data%5B*%5D.updated_time&offset=${M}&limit=${X}`,S=await K(B,j,"Zhihu favorite collections request"),Y=Array.isArray(S.data)?S.data:[],Z=S.paging||{};Q=Number(Z.totals||Q||0);for(const $ of Y){const N=R($);if(N&&!_.has(N)){_.add(N);H.push($)}if(H.length>=z)break}if(Y.length===0||Z.is_end||H.length>=z)break;if(typeof Z.next==="string")try{const $=new URL(Z.next),N=Number($.searchParams.get("offset"));if(Number.isInteger(N)&&N>M){M=N;continue}}catch{}if(Y.length<X)break;const C=M+Y.length;if(C<=M)break;M=C;if(Q&&M>=Q)break}if(Q>0)v.info(`共有 ${Q} 个收藏夹`);if(H.length===0)throw new O("zhihu collections","No favorite collections were returned for the logged-in user.");return H.slice(0,z).map((G,X)=>({rank:X+1,title:G.title||"未命名",item_count:G.item_count??G.answer_count??0,description:G.description||"",collection_id:String(G.id||"")}))}});export const __test__={validatePositiveInt:J,collectionKey:R};