@jackwener/opencli 1.5.5 → 1.5.6

package/src/clis/tieba/utils.ts

@@ -0,0 +1,348 @@
+import { createHash } from 'node:crypto';
+
+/**
+ * Shared Tieba parsing helpers used by the browser adapters.
+ */
+
+export const MAX_TIEBA_LIMIT = 20;
+const TIEBA_PC_SIGN_SALT = '36770b1f34c9bbf2e7d1a99d2b82fa9e';
+const TIEBA_TIME_ZONE = 'Asia/Shanghai';
+
+export interface RawTiebaPostCard {
+  title?: string;
+  author?: string;
+  descInfo?: string;
+  actionTexts?: string[];
+  commentCount?: unknown;
+  threadId?: unknown;
+  url?: unknown;
+}
+
+export interface RawTiebaPagePcFeedEntry {
+  layout?: string;
+  feed?: {
+    schema?: unknown;
+    log_param?: Array<{ key?: unknown; value?: unknown }>;
+    business_info_map?: Record<string, unknown>;
+    components?: Array<Record<string, unknown>>;
+  };
+}
+
+export interface TiebaPostItem {
+  rank: number;
+  title: string;
+  author: string;
+  replies: number;
+  last_reply: string;
+  id: string;
+  url: string;
+}
+
+export interface RawTiebaSearchItem {
+  title?: string;
+  forum?: string;
+  author?: string;
+  time?: string;
+  snippet?: string;
+  id?: string;
+  url?: string;
+}
+
+export interface TiebaSearchItem {
+  rank: number;
+  title: string;
+  forum: string;
+  author: string;
+  time: string;
+  snippet: string;
+  id: string;
+  url: string;
+}
+
+export interface RawTiebaMainPost {
+  title?: string;
+  author?: string;
+  fallbackAuthor?: string;
+  contentText?: string;
+  structuredText?: string;
+  visibleTime?: string;
+  structuredTime?: unknown;
+  hasMedia?: boolean;
+}
+
+export interface RawTiebaReply {
+  floor?: unknown;
+  author?: string;
+  content?: string;
+  time?: string;
+}
+
+export interface RawTiebaReadPayload {
+  mainPost?: RawTiebaMainPost | null;
+  replies?: RawTiebaReply[];
+}
+
+export interface TiebaReadItem {
+  floor: number;
+  author: string;
+  content: string;
+  time: string;
+}
+
+export interface TiebaReadBuildOptions {
+  limit?: unknown;
+  includeMainPost?: boolean;
+}
+
+/**
+ * Keep the public CLI limit contract aligned with the real implementation.
+ */
+export function normalizeTiebaLimit(value: unknown, fallback: number = MAX_TIEBA_LIMIT): number {
+  const parsed = Number(value ?? fallback);
+  if (!Number.isFinite(parsed) || parsed < 1) return fallback;
+  return Math.min(Math.trunc(parsed), MAX_TIEBA_LIMIT);
+}
+
+export function normalizeText(value: unknown): string {
+  return typeof value === 'string' ? value.replace(/\s+/g, ' ').trim() : '';
+}
+
+/**
+ * Match Tieba PC's signed request contract so forum list fetching stays stable.
+ */
+export function signTiebaPcParams(params: Record<string, string>): string {
+  const payload = Object.keys(params)
+    .sort((left, right) => left.localeCompare(right))
+    .map((key) => `${key}=${params[key]}`)
+    .join('') + TIEBA_PC_SIGN_SALT;
+  return createHash('md5').update(payload).digest('hex');
+}
+
+export function parseTiebaCount(text: string): number {
+  const value = normalizeText(text).toUpperCase();
+  if (!value) return 0;
+  const compact = value.replace(/[^\d.W万]/g, '');
+  if (compact.endsWith('万')) {
+    return Math.round(parseFloat(compact.slice(0, -1)) * 10000);
+  }
+  if (compact.endsWith('W')) {
+    return Math.round(parseFloat(compact.slice(0, -1)) * 10000);
+  }
+  return parseInt(compact.replace(/[^\d]/g, ''), 10) || 0;
+}
+
+export function parseTiebaLastReply(text: string): string {
+  const normalized = normalizeText(text).replace(/^回复于/, '').trim();
+  const match = normalized.match(/(刚刚|\d+\s*(?:分钟|小时|天)前|\d{2}-\d{2}(?:\s+\d{2}:\d{2})?|\d{4}-\d{2}-\d{2}(?:\s+\d{2}:\d{2})?)/);
+  return match ? match[1].trim() : normalized;
+}
+
+function buildTiebaThreadUrl(id: string, rawUrl?: unknown): string {
+  const explicitUrl = normalizeText(rawUrl);
+  if (explicitUrl) return explicitUrl;
+  return id ? `https://tieba.baidu.com/p/${id}` : '';
+}
+
+function resolveTiebaThreadId(raw: RawTiebaPostCard): string {
+  const direct = normalizeText(raw.threadId);
+  if (direct) return direct;
+
+  const fromUrl = normalizeText(raw.url).match(/\/p\/(\d+)/);
+  return fromUrl ? fromUrl[1] : '';
+}
+
+function getTiebaFeedComponent(feed: RawTiebaPagePcFeedEntry['feed'], name: string): Record<string, unknown> {
+  const components = Array.isArray(feed?.components) ? feed.components : [];
+  const match = components.find((entry) => normalizeText((entry as Record<string, unknown>).component) === name);
+  if (!match) return {};
+  const payload = (match as Record<string, unknown>)[name];
+  return payload && typeof payload === 'object' ? payload as Record<string, unknown> : {};
+}
+
+function extractTiebaFeedAuthor(feed: RawTiebaPagePcFeedEntry['feed']): string {
+  const head = getTiebaFeedComponent(feed, 'feed_head');
+  const mainData = Array.isArray(head.main_data) ? head.main_data : [];
+  for (const item of mainData) {
+    const textRecord = (item as Record<string, unknown>).text as Record<string, unknown> | undefined;
+    const author = normalizeText(textRecord?.text);
+    if (author) return author;
+  }
+  return '';
+}
+
+function extractTiebaFeedTitle(feed: RawTiebaPagePcFeedEntry['feed']): string {
+  const title = getTiebaFeedComponent(feed, 'feed_title');
+  const titleData = Array.isArray(title.data) ? title.data : [];
+  const firstTitle = titleData[0] as Record<string, unknown> | undefined;
+  const textInfo = firstTitle?.text_info as Record<string, unknown> | undefined;
+  return normalizeText(textInfo?.text) || normalizeText(feed?.business_info_map?.title);
+}
+
+function extractTiebaFeedCommentCount(feed: RawTiebaPagePcFeedEntry['feed']): number {
+  const social = getTiebaFeedComponent(feed, 'feed_social');
+  const commentCount = Number(social.comment_num ?? feed?.business_info_map?.comment_num ?? 0);
+  return Number.isFinite(commentCount) ? commentCount : 0;
+}
+
+function extractTiebaFeedThreadId(feed: RawTiebaPagePcFeedEntry['feed']): string {
+  const direct = normalizeText(feed?.business_info_map?.thread_id);
+  if (direct) return direct;
+
+  const logParams = Array.isArray(feed?.log_param) ? feed.log_param : [];
+  const fromLog = normalizeText(logParams.find((item) => normalizeText(item?.key) === 'tid')?.value);
+  if (fromLog) return fromLog;
+
+  const fromSchema = normalizeText(feed?.schema).match(/[?&]tid=(\d+)/);
+  return fromSchema ? fromSchema[1] : '';
+}
+
+function extractTiebaFeedLastReply(feed: RawTiebaPagePcFeedEntry['feed']): string {
+  const head = getTiebaFeedComponent(feed, 'feed_head');
+  const extraData = Array.isArray(head.extra_data) ? head.extra_data : [];
+  const first = extraData[0] as Record<string, unknown> | undefined;
+  const prefix = normalizeText((first?.business_info_map as Record<string, unknown> | undefined)?.time_prefix);
+  const textRecord = first?.text as Record<string, unknown> | undefined;
+  const rawTime = normalizeText(textRecord?.text);
+  const formattedTime = /^\d+$/.test(rawTime) ? formatTiebaUnixTime(rawTime) : rawTime;
+  return [prefix, formattedTime].filter(Boolean).join('');
+}
+
+/**
+ * Convert Tieba's signed `page_pc` feed entries into the stable card shape used by the CLI.
+ */
+export function buildTiebaPostCardsFromPagePc(rawFeeds: RawTiebaPagePcFeedEntry[]): RawTiebaPostCard[] {
+  return rawFeeds
+    .filter((entry) => normalizeText(entry.layout) === 'feed' && entry.feed)
+    .map((entry) => {
+      const feed = entry.feed;
+      const threadId = extractTiebaFeedThreadId(feed);
+      return {
+        title: extractTiebaFeedTitle(feed),
+        author: extractTiebaFeedAuthor(feed),
+        descInfo: extractTiebaFeedLastReply(feed),
+        commentCount: extractTiebaFeedCommentCount(feed),
+        actionTexts: [],
+        threadId,
+        url: buildTiebaThreadUrl(threadId),
+      };
+    })
+    .filter((entry) => normalizeText(entry.title));
+}
+
+export function buildTiebaPostItems(rawCards: RawTiebaPostCard[], requestedLimit: unknown): TiebaPostItem[] {
+  const limit = normalizeTiebaLimit(requestedLimit);
+
+  return rawCards
+    .map((raw) => {
+      const title = normalizeText(raw.title);
+      const id = resolveTiebaThreadId(raw);
+      const actionTexts = Array.isArray(raw.actionTexts) ? raw.actionTexts.map(normalizeText).filter(Boolean) : [];
+      const commentText = actionTexts.find((text) => /评论/.test(text)) || actionTexts[actionTexts.length - 1] || '';
+
+      return {
+        title,
+        author: normalizeText(raw.author),
+        replies: Number.isFinite(Number(raw.commentCount))
+          ? Number(raw.commentCount)
+          : parseTiebaCount(commentText),
+        last_reply: parseTiebaLastReply(String(raw.descInfo ?? '')),
+        id,
+        url: buildTiebaThreadUrl(id, raw.url),
+      };
+    })
+    .filter((item) => item.title)
+    .slice(0, limit)
+    .map((item, index) => ({ rank: index + 1, ...item }));
+}
+
+export function buildTiebaSearchItems(rawItems: RawTiebaSearchItem[], requestedLimit: unknown): TiebaSearchItem[] {
+  const limit = normalizeTiebaLimit(requestedLimit);
+
+  return rawItems
+    .map((raw) => {
+      const url = normalizeText(raw.url);
+      const directId = normalizeText(raw.id);
+      const idFromUrl = url.match(/\/p\/(\d+)/)?.[1] || '';
+
+      return {
+        title: normalizeText(raw.title),
+        forum: normalizeText(raw.forum),
+        author: normalizeText(raw.author),
+        time: normalizeText(raw.time),
+        snippet: normalizeText(raw.snippet).slice(0, 200),
+        id: directId || idFromUrl,
+        url,
+      };
+    })
+    .filter((item) => item.title)
+    .slice(0, limit)
+    .map((item, index) => ({ rank: index + 1, ...item }));
+}
+
+function formatTiebaUnixTime(value: unknown): string {
+  const ts = Number(value || 0);
+  if (!Number.isFinite(ts) || ts <= 0) return '';
+  const parts = new Intl.DateTimeFormat('sv-SE', {
+    timeZone: TIEBA_TIME_ZONE,
+    year: 'numeric',
+    month: '2-digit',
+    day: '2-digit',
+    hour: '2-digit',
+    minute: '2-digit',
+    hour12: false,
+  }).formatToParts(new Date(ts * 1000));
+  const values = Object.fromEntries(parts.map((part) => [part.type, part.value]));
+  return `${values.year}-${values.month}-${values.day} ${values.hour}:${values.minute}`;
+}
+
+function parseTiebaReplyTime(text: string): string {
+  const normalized = normalizeText(text);
+  const withoutFloor = normalized.replace(/^第\d+楼\s+/, '').trim();
+  const match = withoutFloor.match(/^(刚刚|昨天|前天|\d+\s*(?:分钟|小时|天)前|\d{2}-\d{2}(?:\s+\d{2}:\d{2})?|\d{4}-\d{2}-\d{2}(?:\s+\d{2}:\d{2})?)/);
+  return match ? match[1].trim() : withoutFloor;
+}
+
+function buildMainPostItem(mainPost?: RawTiebaMainPost | null): TiebaReadItem | null {
+  if (!mainPost) return null;
+
+  const title = normalizeText(mainPost.title);
+  const author = normalizeText(mainPost.author) || normalizeText(mainPost.fallbackAuthor);
+  const body = normalizeText(mainPost.contentText) || normalizeText(mainPost.structuredText);
+  const hasMedia = Boolean(mainPost.hasMedia);
+  const content = [title, body || (hasMedia ? '[media]' : '')].filter(Boolean).join(' ').trim();
+
+  if (!content) return null;
+
+  return {
+    floor: 1,
+    author,
+    content,
+    time: normalizeText(mainPost.visibleTime) || formatTiebaUnixTime(mainPost.structuredTime),
+  };
+}
+
+export function buildTiebaReadItems(payload: RawTiebaReadPayload, options: TiebaReadBuildOptions = {}): TiebaReadItem[] {
+  const fallback = Number.isFinite(Number(options.limit)) ? Number(options.limit) : 30;
+  const limit = Math.max(1, Math.trunc(fallback));
+  const includeMainPost = options.includeMainPost !== false;
+  const items: TiebaReadItem[] = [];
+  const mainPost = buildMainPostItem(payload.mainPost);
+
+  if (includeMainPost && mainPost) items.push(mainPost);
+
+  const replies = Array.isArray(payload.replies) ? payload.replies : [];
+  const replyItems: TiebaReadItem[] = [];
+  for (const reply of replies) {
+    const floor = Number(reply.floor || 0);
+    const content = normalizeText(reply.content);
+    if (!Number.isFinite(floor) || floor < 1 || !content) continue;
+    replyItems.push({
+      floor,
+      author: normalizeText(reply.author),
+      content,
+      time: parseTiebaReplyTime(String(reply.time ?? '')),
+    });
+  }
+
+  return items.concat(replyItems.slice(0, limit));
+}

package/src/clis/weread/book.ts

@@ -1,6 +1,82 @@
 import { cli, Strategy } from '../../registry.js';
+import { CliError } from '../../errors.js';
 import type { IPage } from '../../types.js';
-import { fetchPrivateApi } from './utils.js';
+import { fetchPrivateApi, resolveShelfReaderUrl } from './utils.js';
+
+interface ReaderFallbackResult {
+  title: string;
+  author: string;
+  publisher: string;
+  intro: string;
+  category: string;
+  rating: string;
+  metadataReady: boolean;
+}
+
+/**
+ * Read visible book metadata from the web reader cover/flyleaf page.
+ * This path is used as a fallback when the private API session has expired.
+ */
+async function loadReaderFallbackResult(page: IPage, readerUrl: string): Promise<ReaderFallbackResult> {
+  await page.goto(readerUrl);
+  await page.wait({ selector: '.horizontalReaderCoverPage_content_bookTitle, .wr_flyleaf_page_bookInfo_bookTitle', timeout: 10 });
+
+  const result = await page.evaluate(`
+    (() => {
+      const text = (node) => node?.textContent?.trim() || '';
+      const bodyText = document.body?.innerText?.replace(/\\s+/g, ' ').trim() || '';
+      const titleSelector = '.horizontalReaderCoverPage_content_bookTitle, .wr_flyleaf_page_bookInfo_bookTitle';
+      const authorSelector = '.horizontalReaderCoverPage_content_author, .wr_flyleaf_page_bookInfo_author';
+      const extractRating = () => {
+        const match = bodyText.match(/微信读书推荐值\\s*([0-9.]+%)/);
+        return match ? match[1] : '';
+      };
+      const extractPublisher = () => {
+        const direct = text(document.querySelector('.introDialog_content_pub_line'));
+        return direct.startsWith('出版社') ? direct.replace(/^出版社\\s*/, '').trim() : '';
+      };
+      const extractIntro = () => {
+        const selectors = [
+          '.horizontalReaderCoverPage_content_bookInfo_intro',
+          '.wr_flyleaf_page_bookIntro_content',
+          '.introDialog_content_intro_para',
+        ];
+        for (const selector of selectors) {
+          const value = text(document.querySelector(selector));
+          if (value) return value;
+        }
+        return '';
+      };
+
+      const categorySource = Array.from(document.scripts)
+        .map((script) => script.textContent || '')
+        .find((scriptText) => scriptText.includes('"category"')) || '';
+      const categoryMatch = categorySource.match(/"category"\\s*:\\s*"([^"]+)"/);
+      const title = text(document.querySelector(titleSelector));
+      const author = text(document.querySelector(authorSelector));
+
+      return {
+        title,
+        author,
+        publisher: extractPublisher(),
+        intro: extractIntro(),
+        category: categoryMatch ? categoryMatch[1].trim() : '',
+        rating: extractRating(),
+        metadataReady: Boolean(title || author),
+      };
+    })()
+  `) as Partial<ReaderFallbackResult>;
+
+  return {
+    title: String(result?.title || '').trim(),
+    author: String(result?.author || '').trim(),
+    publisher: String(result?.publisher || '').trim(),
+    intro: String(result?.intro || '').trim(),
+    category: String(result?.category || '').trim(),
+    rating: String(result?.rating || '').trim(),
+    metadataReady: result?.metadataReady === true,
+  };
+}
 
 cli({
   site: 'weread',
@@ -9,20 +85,47 @@ cli({
   domain: 'weread.qq.com',
   strategy: Strategy.COOKIE,
   args: [
-    { name: 'book-id', positional: true, required: true, help: 'Book ID (numeric, from search or shelf results)' },
+    { name: 'book-id', positional: true, required: true, help: 'Book ID from search or shelf results' },
   ],
   columns: ['title', 'author', 'publisher', 'intro', 'category', 'rating'],
   func: async (page: IPage, args) => {
-    const data = await fetchPrivateApi(page, '/book/info', { bookId: args['book-id'] });
-    // newRating is 0-1000 scale per community docs; needs runtime verification
-    const rating = data.newRating ? `${(data.newRating / 10).toFixed(1)}%` : '-';
-    return [{
-      title: data.title ?? '',
-      author: data.author ?? '',
-      publisher: data.publisher ?? '',
-      intro: data.intro ?? '',
-      category: data.category ?? '',
-      rating,
-    }];
+    const bookId = String(args['book-id'] || '').trim();
+
+    try {
+      const data = await fetchPrivateApi(page, '/book/info', { bookId });
+      // newRating is 0-1000 scale per community docs; needs runtime verification
+      const rating = data.newRating ? `${(data.newRating / 10).toFixed(1)}%` : '-';
+      return [{
+        title: data.title ?? '',
+        author: data.author ?? '',
+        publisher: data.publisher ?? '',
+        intro: data.intro ?? '',
+        category: data.category ?? '',
+        rating,
+      }];
+    } catch (error) {
+      if (!(error instanceof CliError) || error.code !== 'AUTH_REQUIRED') {
+        throw error;
+      }
+
+      const readerUrl = await resolveShelfReaderUrl(page, bookId);
+      if (!readerUrl) {
+        throw error;
+      }
+
+      const data = await loadReaderFallbackResult(page, readerUrl);
+      if (!data.metadataReady || !data.title) {
+        throw error;
+      }
+
+      return [{
+        title: data.title,
+        author: data.author,
+        publisher: data.publisher,
+        intro: data.intro,
+        category: data.category,
+        rating: data.rating,
+      }];
+    }
   },
 });