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

package/clis/huodongxing/events.js

@@ -1,322 +1 @@
-import { cli, Strategy } from '@jackwener/opencli/registry';
-import { ArgumentError, CommandExecutionError, EmptyResultError } from '@jackwener/opencli/errors';
-
-const BASE_URL = 'https://www.huodongxing.com/events';
-const MAX_LIMIT = 50;
-export const EVENTS_COLUMNS = [
-  'rank',
-  'id',
-  'title',
-  'time',
-  'eventType',
-  'city',
-  'location',
-  'organizer',
-  'url',
-];
-
-function cleanText(value) {
-  return String(value ?? '').replace(/\s+/g, ' ').trim();
-}
-
-export function requireLimit(value) {
-  const raw = value ?? 20;
-  const limit = typeof raw === 'number' ? raw : Number(String(raw).trim());
-  if (!Number.isInteger(limit) || limit <= 0) {
-    throw new ArgumentError('huodongxing limit must be a positive integer');
-  }
-  if (limit > MAX_LIMIT) {
-    throw new ArgumentError(`huodongxing limit must be <= ${MAX_LIMIT}`);
-  }
-  return limit;
-}
-
-function appendIfPresent(params, name, value) {
-  const text = cleanText(value);
-  if (text) params.set(name, text);
-}
-
-function dateOrdinal(year, month, day) {
-  return Math.floor(Date.UTC(year, month - 1, day) / 86400000);
-}
-
-function parseYmd(value) {
-  const match = cleanText(value).match(/^(\d{4})-(\d{2})-(\d{2})$/);
-  if (!match) return null;
-  const year = Number(match[1]);
-  const month = Number(match[2]);
-  const day = Number(match[3]);
-  const date = new Date(Date.UTC(year, month - 1, day));
-  if (
-    date.getUTCFullYear() !== year
-    || date.getUTCMonth() !== month - 1
-    || date.getUTCDate() !== day
-  ) {
-    return null;
-  }
-  return dateOrdinal(year, month, day);
-}
-
-function requireYmdArg(value, label) {
-  const text = cleanText(value);
-  if (!text) return '';
-  if (parseYmd(text) == null) {
-    throw new ArgumentError(`huodongxing ${label} must be a valid YYYY-MM-DD date`);
-  }
-  return text;
-}
-
-function requireDateRangeArgs(args = {}) {
-  const date = requireYmdArg(args.date, 'date');
-  const dateTo = requireYmdArg(args.dateTo, 'dateTo');
-  if (date && dateTo && parseYmd(date) > parseYmd(dateTo)) {
-    throw new ArgumentError('huodongxing date must be <= dateTo');
-  }
-  return { date, dateTo };
-}
-
-function unwrapEvaluateResult(payload) {
-  if (payload && !Array.isArray(payload) && typeof payload === 'object' && 'session' in payload && 'data' in payload) {
-    return payload.data;
-  }
-  return payload;
-}
-
-function localDateOrdinal(date) {
-  return dateOrdinal(date.getFullYear(), date.getMonth() + 1, date.getDate());
-}
-
-function parseMonthDayToken(token, year) {
-  const match = cleanText(token).match(/(\d{1,2})\/(\d{1,2})/);
-  if (!match) return null;
-  return {
-    month: Number(match[1]),
-    day: Number(match[2]),
-    ordinal: dateOrdinal(year, Number(match[1]), Number(match[2])),
-  };
-}
-
-function parseEventTimeRange(timeText, options = {}) {
-  const text = cleanText(timeText);
-  if (!text) return null;
-  const filterStart = parseYmd(options.date);
-  const filterEnd = parseYmd(options.dateTo) ?? filterStart;
-  const referenceDate = options.referenceDate instanceof Date ? options.referenceDate : new Date();
-  const referenceOrdinal = localDateOrdinal(referenceDate);
-  if (/今天/.test(text)) return { start: referenceOrdinal, end: referenceOrdinal };
-  if (/明天/.test(text)) return { start: referenceOrdinal + 1, end: referenceOrdinal + 1 };
-  if (/后天/.test(text)) return { start: referenceOrdinal + 2, end: referenceOrdinal + 2 };
-
-  const baseYear = options.year ?? (
-    cleanText(options.date).match(/^(\d{4})-/)?.[1]
-      ? Number(cleanText(options.date).slice(0, 4))
-      : referenceDate.getFullYear()
-  );
-  const tokens = Array.from(text.matchAll(/(\d{1,2}\/\d{1,2})/g)).map((match) => match[1]);
-  if (tokens.length === 0) return null;
-  const start = parseMonthDayToken(tokens[0], baseYear);
-  if (!start) return null;
-  if (tokens.length === 1) return { start: start.ordinal, end: start.ordinal };
-  const endYear = parseMonthDayToken(tokens[1], baseYear)?.month < start.month ? baseYear + 1 : baseYear;
-  const end = parseMonthDayToken(tokens[1], endYear);
-  if (!end) return { start: start.ordinal, end: start.ordinal };
-
-  // If the parsed range is clearly before the requested window, try the next
-  // year. Huodongxing listings omit the year, but searches can cross New Year.
-  if (filterStart != null && end.ordinal < filterStart && start.month >= 10) {
-    const nextStart = parseMonthDayToken(tokens[0], baseYear + 1);
-    const nextEndYear = parseMonthDayToken(tokens[1], baseYear + 1)?.month < nextStart.month ? baseYear + 2 : baseYear + 1;
-    const nextEnd = parseMonthDayToken(tokens[1], nextEndYear);
-    if (nextStart && nextEnd) return { start: nextStart.ordinal, end: nextEnd.ordinal };
-  }
-  return { start: start.ordinal, end: end.ordinal };
-}
-
-export function filterRowsByDateRange(rows, options = {}) {
-  requireDateRangeArgs(options);
-  const filterStart = parseYmd(options.date);
-  const filterEnd = parseYmd(options.dateTo) ?? filterStart;
-  if (filterStart == null && filterEnd == null) return rows;
-  const start = filterStart ?? filterEnd;
-  const end = filterEnd ?? filterStart;
-  const filtered = rows.filter((row) => {
-    const range = parseEventTimeRange(row.time, options);
-    if (!range) return true;
-    return range.start <= end && range.end >= start;
-  });
-  return filtered.map((row, index) => ({ ...row, rank: index + 1 }));
-}
-
-export function buildEventsUrl(args = {}) {
-  const dateRange = requireDateRangeArgs(args);
-  const params = new URLSearchParams();
-  params.set('orderby', 'o');
-  params.set('d', 'ts');
-  appendIfPresent(params, 'date', dateRange.date);
-  appendIfPresent(params, 'dateTo', dateRange.dateTo);
-  appendIfPresent(params, 'tag', args.tag);
-  appendIfPresent(params, 'city', args.city);
-  const eventType = cleanText(args.eventType);
-  if (eventType) {
-    if (eventType !== '1' && eventType !== '2') {
-      throw new ArgumentError('huodongxing eventType must be 1 (offline) or 2 (online)');
-    }
-    params.set('eventType', eventType);
-  }
-  appendIfPresent(params, 'qs', args.qs);
-  return `${BASE_URL}?${params.toString()}`;
-}
-
-export function extractEventRowsPayload(limit = 20) {
-  const maxLimit = 50;
-  const rawLimit = limit ?? 20;
-  const count = typeof rawLimit === 'number' ? rawLimit : Number(String(rawLimit).trim());
-  if (!Number.isInteger(count) || count <= 0 || count > maxLimit) {
-    return {
-      ok: false,
-      code: 'INVALID_LIMIT',
-      message: `huodongxing limit must be a positive integer <= ${maxLimit}`,
-    };
-  }
-  const clean = (value) => String(value ?? '').replace(/\s+/g, ' ').trim();
-  const text = (root, selector) => clean(root.querySelector(selector)?.textContent ?? '');
-  const idFromHref = (href) => {
-    const match = String(href ?? '').match(/\/event\/(\d+)/);
-    return match ? match[1] : '';
-  };
-  const eventUrl = (id) => `https://www.huodongxing.com/event/${id}`;
-  const kind = (card, location) => {
-    if (card.querySelector('.item-live-icon')) return 'online';
-    if (card.querySelector('.item-dress-icon')) return 'offline';
-    if (/线上|在线|直播/.test(location)) return 'online';
-    return '';
-  };
-  const cards = Array.from(document.querySelectorAll('.search-tab-content-item-mesh'));
-  const rows = [];
-  const seen = new Set();
-
-  for (const card of cards) {
-    if (rows.length >= count) break;
-    const link = card.querySelector('a.item-title[href*="/event/"], a[href*="/event/"]');
-    const id = idFromHref(link?.getAttribute('href') ?? '');
-    if (!id || seen.has(id)) continue;
-
-    const title = clean(
-      text(card, 'a.item-title span')
-      || text(card, 'a.item-title')
-      || card.querySelector('img.item-logo')?.getAttribute('alt')
-      || '',
-    );
-    if (!title) continue;
-
-    const time = text(card, '.item-dress p');
-    const location = text(card, '.item-dress-pp');
-    const organizer = clean(
-      text(card, '.item-bottom-left .user-name')
-      || card.querySelector('.item-bottom-left img[title]')?.getAttribute('title')
-      || card.querySelector('.item-bottom-left img[alt]')?.getAttribute('alt')
-      || '',
-    );
-    seen.add(id);
-    rows.push({
-      rank: rows.length + 1,
-      id,
-      title,
-      time,
-      eventType: kind(card, location),
-      city: location,
-      location,
-      organizer,
-      url: eventUrl(id),
-    });
-  }
-
-  if (rows.length === 0) {
-    const pageText = clean(document.body?.textContent ?? '');
-    if (/操作过于频繁|too\s+frequent|rate\s*limit/i.test(pageText)) {
-      return {
-        ok: false,
-        code: 'RATE_LIMIT',
-        message: 'huodongxing events was rate limited by www.huodongxing.com',
-        hint: 'Wait a few minutes and retry from a real browser session.',
-      };
-    }
-    if (cards.length > 0) {
-      return {
-        ok: false,
-        code: 'MALFORMED_RESULT',
-        message: 'huodongxing events cards were found but no stable event rows could be extracted',
-        hint: 'Huodongxing card markup changed: expected event links with /event/<id> and non-empty titles.',
-      };
-    }
-    return {
-      ok: false,
-      code: 'EMPTY_RESULT',
-      message: 'huodongxing events returned no data',
-      hint: 'No Huodongxing event cards were found. The page may be empty or the DOM structure may have changed.',
-    };
-  }
-  return { ok: true, rows };
-}
-
-function requireExtractionRows(result) {
-  const payload = unwrapEvaluateResult(result);
-  if (payload?.ok === true && Array.isArray(payload.rows)) return payload.rows;
-  if (payload?.ok === true) {
-    throw new CommandExecutionError(
-      'huodongxing events returned malformed extraction rows',
-      'Expected browser extraction payload rows to be an array.',
-    );
-  }
-  if (payload?.code === 'RATE_LIMIT') {
-    throw new CommandExecutionError(
-      payload.message || 'huodongxing events was rate limited by www.huodongxing.com',
-      payload.hint || 'Wait a few minutes and retry from a real browser session.',
-    );
-  }
-  if (payload?.code === 'INVALID_LIMIT') {
-    throw new ArgumentError(payload.message || 'huodongxing limit must be a positive integer <= 50');
-  }
-  if (payload?.code === 'EMPTY_RESULT') {
-    throw new EmptyResultError(
-      'huodongxing events',
-      payload.hint || 'No Huodongxing event cards were found. The page may be empty.',
-    );
-  }
-  throw new CommandExecutionError(
-    payload?.message || 'huodongxing events returned malformed extraction data',
-    payload?.hint || 'Huodongxing extraction did not return the expected structured payload.',
-  );
-}
-
-export function extractEventRows(limit = 20) {
-  return requireExtractionRows(extractEventRowsPayload(limit));
-}
-
-cli({
-  site: 'huodongxing',
-  name: 'events',
-  access: 'read',
-  description: '活动行活动搜索（按标签、城市、日期、线上/线下、名称过滤）',
-  domain: 'www.huodongxing.com',
-  strategy: Strategy.PUBLIC,
-  browser: true,
-  args: [
-    { name: 'tag', type: 'string', default: '', help: '活动标签，例如 AI' },
-    { name: 'city', type: 'string', default: '全部', help: '城市名，例如 北京 / 上海 / 全部' },
-    { name: 'date', type: 'string', default: '', help: '开始日期，格式 YYYY-MM-DD' },
-    { name: 'dateTo', type: 'string', default: '', help: '结束日期，格式 YYYY-MM-DD' },
-    { name: 'eventType', type: 'int', default: undefined, help: '活动类型：1 线下，2 线上' },
-    { name: 'qs', type: 'string', default: '', help: '按活动名称关键词过滤' },
-    { name: 'limit', type: 'int', default: 20, help: '返回条数（1-50）' },
-  ],
-  columns: EVENTS_COLUMNS,
-  func: async (page, args) => {
-    const limit = requireLimit(args.limit);
-    const url = buildEventsUrl(args);
-    await page.goto(url);
-    await page.wait(2);
-    const result = await page.evaluate(`(${extractEventRowsPayload.toString()})(${limit})`);
-    return filterRowsByDateRange(requireExtractionRows(result), args);
-  },
-});
+import{cli as Y,Strategy as v}from"@jackwener/opencli/registry";import{ArgumentError as _,CommandExecutionError as L,EmptyResultError as f}from"@jackwener/opencli/errors";const h="https://www.huodongxing.com/events",b=50;export const EVENTS_COLUMNS=["rank","id","title","time","eventType","city","location","organizer","url"];function X(K){return String(K??"").replace(/\s+/g," ").trim()}export function requireLimit(K){const G=K??20,J=typeof G==="number"?G:Number(String(G).trim());if(!Number.isInteger(J)||J<=0)throw new _("huodongxing limit must be a positive integer");if(J>b)throw new _(`huodongxing limit must be <= ${b}`);return J}function P(K,G,J){const W=X(J);if(W)K.set(G,W)}function M(K,G,J){return Math.floor(Date.UTC(K,G-1,J)/86400000)}function C(K){const G=X(K).match(/^(\d{4})-(\d{2})-(\d{2})$/);if(!G)return null;const J=Number(G[1]),W=Number(G[2]),F=Number(G[3]),$=new Date(Date.UTC(J,W-1,F));if($.getUTCFullYear()!==J||$.getUTCMonth()!==W-1||$.getUTCDate()!==F)return null;return M(J,W,F)}function D(K,G){const J=X(K);if(!J)return"";if(C(J)==null)throw new _(`huodongxing ${G} must be a valid YYYY-MM-DD date`);return J}function A(K={}){const G=D(K.date,"date"),J=D(K.dateTo,"dateTo");if(G&&J&&C(G)>C(J))throw new _("huodongxing date must be <= dateTo");return{date:G,dateTo:J}}function w(K){if(K&&!Array.isArray(K)&&typeof K==="object"&&"session"in K&&"data"in K)return K.data;return K}function T(K){return M(K.getFullYear(),K.getMonth()+1,K.getDate())}function q(K,G){const J=X(K).match(/(\d{1,2})\/(\d{1,2})/);if(!J)return null;return{month:Number(J[1]),day:Number(J[2]),ordinal:M(G,Number(J[1]),Number(J[2]))}}function E(K,G={}){const J=X(K);if(!J)return null;const W=C(G.date),F=C(G.dateTo)??W,$=G.referenceDate instanceof Date?G.referenceDate:new Date,B=T($);if(/今天/.test(J))return{start:B,end:B};if(/明天/.test(J))return{start:B+1,end:B+1};if(/后天/.test(J))return{start:B+2,end:B+2};const z=G.year??(X(G.date).match(/^(\d{4})-/)?.[1]?Number(X(G.date).slice(0,4)):$.getFullYear()),Z=Array.from(J.matchAll(/(\d{1,2}\/\d{1,2})/g)).map((Q)=>Q[1]);if(Z.length===0)return null;const V=q(Z[0],z);if(!V)return null;if(Z.length===1)return{start:V.ordinal,end:V.ordinal};const N=q(Z[1],z)?.month<V.month?z+1:z,U=q(Z[1],N);if(!U)return{start:V.ordinal,end:V.ordinal};if(W!=null&&U.ordinal<W&&V.month>=10){const Q=q(Z[0],z+1),j=q(Z[1],z+1)?.month<Q.month?z+2:z+1,H=q(Z[1],j);if(Q&&H)return{start:Q.ordinal,end:H.ordinal}}return{start:V.ordinal,end:U.ordinal}}export function filterRowsByDateRange(K,G={}){A(G);const J=C(G.date),W=C(G.dateTo)??J;if(J==null&&W==null)return K;const F=J??W,$=W??J;return K.filter((z)=>{const Z=E(z.time,G);if(!Z)return!0;return Z.start<=$&&Z.end>=F}).map((z,Z)=>({...z,rank:Z+1}))}export function buildEventsUrl(K={}){const G=A(K),J=new URLSearchParams;J.set("orderby","o");J.set("d","ts");P(J,"date",G.date);P(J,"dateTo",G.dateTo);P(J,"tag",K.tag);P(J,"city",K.city);const W=X(K.eventType);if(W){if(W!=="1"&&W!=="2")throw new _("huodongxing eventType must be 1 (offline) or 2 (online)");J.set("eventType",W)}P(J,"qs",K.qs);return`${h}?${J.toString()}`}export function extractEventRowsPayload(K=20){const G=50,J=K??20,W=typeof J==="number"?J:Number(String(J).trim());if(!Number.isInteger(W)||W<=0||W>G)return{ok:!1,code:"INVALID_LIMIT",message:`huodongxing limit must be a positive integer <= ${G}`};const F=(Q)=>String(Q??"").replace(/\s+/g," ").trim(),$=(Q,j)=>F(Q.querySelector(j)?.textContent??""),B=(Q)=>{const j=String(Q??"").match(/\/event\/(\d+)/);return j?j[1]:""},z=(Q)=>`https://www.huodongxing.com/event/${Q}`,Z=(Q,j)=>{if(Q.querySelector(".item-live-icon"))return"online";if(Q.querySelector(".item-dress-icon"))return"offline";if(/线上|在线|直播/.test(j))return"online";return""},V=Array.from(document.querySelectorAll(".search-tab-content-item-mesh")),N=[],U=new Set;for(const Q of V){if(N.length>=W)break;const j=Q.querySelector('a.item-title[href*="/event/"], a[href*="/event/"]'),H=B(j?.getAttribute("href")??"");if(!H||U.has(H))continue;const O=F($(Q,"a.item-title span")||$(Q,"a.item-title")||Q.querySelector("img.item-logo")?.getAttribute("alt")||"");if(!O)continue;const S=$(Q,".item-dress p"),I=$(Q,".item-dress-pp"),k=F($(Q,".item-bottom-left .user-name")||Q.querySelector(".item-bottom-left img[title]")?.getAttribute("title")||Q.querySelector(".item-bottom-left img[alt]")?.getAttribute("alt")||"");U.add(H);N.push({rank:N.length+1,id:H,title:O,time:S,eventType:Z(Q,I),city:I,location:I,organizer:k,url:z(H)})}if(N.length===0){const Q=F(document.body?.textContent??"");if(/操作过于频繁|too\s+frequent|rate\s*limit/i.test(Q))return{ok:!1,code:"RATE_LIMIT",message:"huodongxing events was rate limited by www.huodongxing.com",hint:"Wait a few minutes and retry from a real browser session."};if(V.length>0)return{ok:!1,code:"MALFORMED_RESULT",message:"huodongxing events cards were found but no stable event rows could be extracted",hint:"Huodongxing card markup changed: expected event links with /event/<id> and non-empty titles."};return{ok:!1,code:"EMPTY_RESULT",message:"huodongxing events returned no data",hint:"No Huodongxing event cards were found. The page may be empty or the DOM structure may have changed."}}return{ok:!0,rows:N}}function R(K){const G=w(K);if(G?.ok===!0&&Array.isArray(G.rows))return G.rows;if(G?.ok===!0)throw new L("huodongxing events returned malformed extraction rows","Expected browser extraction payload rows to be an array.");if(G?.code==="RATE_LIMIT")throw new L(G.message||"huodongxing events was rate limited by www.huodongxing.com",G.hint||"Wait a few minutes and retry from a real browser session.");if(G?.code==="INVALID_LIMIT")throw new _(G.message||"huodongxing limit must be a positive integer <= 50");if(G?.code==="EMPTY_RESULT")throw new f("huodongxing events",G.hint||"No Huodongxing event cards were found. The page may be empty.");throw new L(G?.message||"huodongxing events returned malformed extraction data",G?.hint||"Huodongxing extraction did not return the expected structured payload.")}export function extractEventRows(K=20){return R(extractEventRowsPayload(K))}Y({site:"huodongxing",name:"events",access:"read",description:"活动行活动搜索（按标签、城市、日期、线上/线下、名称过滤）",domain:"www.huodongxing.com",strategy:v.PUBLIC,browser:!0,args:[{name:"tag",type:"string",default:"",help:"活动标签，例如 AI"},{name:"city",type:"string",default:"全部",help:"城市名，例如 北京 / 上海 / 全部"},{name:"date",type:"string",default:"",help:"开始日期，格式 YYYY-MM-DD"},{name:"dateTo",type:"string",default:"",help:"结束日期，格式 YYYY-MM-DD"},{name:"eventType",type:"int",default:void 0,help:"活动类型：1 线下，2 线上"},{name:"qs",type:"string",default:"",help:"按活动名称关键词过滤"},{name:"limit",type:"int",default:20,help:"返回条数（1-50）"}],columns:EVENTS_COLUMNS,func:async(K,G)=>{const J=requireLimit(G.limit),W=buildEventsUrl(G);await K.goto(W);await K.wait(2);const F=await K.evaluate(`(${extractEventRowsPayload.toString()})(${J})`);return filterRowsByDateRange(R(F),G)}});

package/clis/hupu/auth.js

@@ -1,18 +1,4 @@
-import { AuthRequiredError, CommandExecutionError } from '@jackwener/opencli/errors';
-import { registerSiteAuthCommands } from '../_shared/site-auth.js';
-
-async function hasHupuUserCookie(page) {
-  const cookies = await page.getCookies({ url: 'https://my.hupu.com' });
-  return cookies.some(c => c.name === 'u' && c.value);
-}
-
-async function verifyHupuIdentity(page) {
-  if (!await hasHupuUserCookie(page)) {
-    throw new AuthRequiredError('hupu.com', 'Hupu u cookie missing — anonymous');
-  }
-  await page.goto('https://my.hupu.com/');
-  await page.wait(2);
-  const probe = await page.evaluate(`
+import{AuthRequiredError as o,CommandExecutionError as n}from"@jackwener/opencli/errors";import{registerSiteAuthCommands as s}from"../_shared/site-auth.js";async function t(e){return(await e.getCookies({url:"https://my.hupu.com"})).some((i)=>i.name==="u"&&i.value)}async function r(e){if(!await t(e))throw new o("hupu.com","Hupu u cookie missing — anonymous");await e.goto("https://my.hupu.com/");await e.wait(2);const u=await e.evaluate(`
     (() => {
       if (/passport\\.hupu\\.com\\/.*login/.test(location.href)) {
         return { kind: 'auth', detail: 'Hupu my page redirected to passport login' };
@@ -25,23 +11,4 @@ async function verifyHupuIdentity(page) {
       }
       return { ok: true, user_id: uCookie, username };
     })()
-  `);
-  if (probe?.kind === 'auth') throw new AuthRequiredError('hupu.com', probe.detail);
-  if (!probe?.ok) throw new CommandExecutionError(`Unexpected Hupu probe: ${JSON.stringify(probe)}`);
-  return { user_id: probe.user_id, username: probe.username };
-}
-
-registerSiteAuthCommands({
-  site: 'hupu',
-  domain: 'hupu.com',
-  loginUrl: 'https://passport.hupu.com/pc/login',
-  columns: ['user_id', 'username'],
-  quickCheck: hasHupuUserCookie,
-  verify: verifyHupuIdentity,
-  poll: async (page) => {
-    if (!await hasHupuUserCookie(page)) {
-      throw new AuthRequiredError('hupu.com', 'Waiting for Hupu u cookie');
-    }
-    return verifyHupuIdentity(page);
-  },
-});
+  `);if(u?.kind==="auth")throw new o("hupu.com",u.detail);if(!u?.ok)throw new n(`Unexpected Hupu probe: ${JSON.stringify(u)}`);return{user_id:u.user_id,username:u.username}}s({site:"hupu",domain:"hupu.com",loginUrl:"https://passport.hupu.com/pc/login",columns:["user_id","username"],quickCheck:t,verify:r,poll:async(e)=>{if(!await t(e))throw new o("hupu.com","Waiting for Hupu u cookie");return r(e)}});

package/clis/hupu/detail.js

@@ -1,72 +1,7 @@
-import { cli, Strategy } from '@jackwener/opencli/registry';
-import { getHupuThreadUrl, readHupuNextData, stripHtml } from './utils.js';
-cli({
-    site: 'hupu',
-    name: 'detail',
-    access: 'read',
-    description: '获取虎扑帖子详情 (使用Next.js JSON数据)',
-    domain: 'bbs.hupu.com',
-    strategy: Strategy.PUBLIC,
-    browser: true,
-    args: [
-        {
-            name: 'tid',
-            required: true,
-            positional: true,
-            help: '帖子ID（9位数字）'
-        },
-        {
-            name: 'replies',
-            type: 'boolean',
-            default: false,
-            help: '是否包含热门回复'
-        }
-    ],
-    columns: ['title', 'author', 'content', 'replies', 'lights', 'url'],
-    func: async (page, kwargs) => {
-        const { tid, replies: includeReplies = false } = kwargs;
-        const url = getHupuThreadUrl(tid).replace(/-1\.html$/, '.html');
-        const data = await readHupuNextData(page, url, 'Read Hupu thread detail', {
-            expectedTid: String(tid),
-        });
-        // 检查错误信息（只有当code不是200时才报错）
-        const errorInfo = data.props.pageProps.detail_error_info;
-        if (errorInfo && errorInfo.code !== 200) {
-            throw new Error(`帖子访问失败: ${errorInfo.message} (code: ${errorInfo.code})`);
-        }
-        // 获取帖子信息
-        const thread = data.props.pageProps.detail?.thread;
-        if (!thread) {
-            throw new Error('帖子不存在或已被删除');
-        }
-        const authorName = thread.author?.puname || '未知作者';
-        const content = stripHtml(thread.content);
-        const contentPreview = content.length > 300 ? content.substring(0, 300) + '...' : content;
-        // 构建结果
-        const result = {
-            title: thread.title,
-            author: authorName,
-            content: contentPreview,
-            replies: thread.replies || 0,
-            lights: thread.lights || 0,
-            url: `https://bbs.hupu.com/${tid}.html`
-        };
-        // 如果需要包含回复，添加回复信息到内容中
-        if (includeReplies) {
-            const replyList = data.props.pageProps.detail?.lights || [];
-            const topReplies = replyList.slice(0, 3);
-            if (topReplies.length > 0) {
-                let replyText = '\n\n【热门回复】\n';
-                topReplies.forEach((reply, index) => {
-                    const userName = reply.author?.puname || '未知用户';
-                    const replyContent = stripHtml(reply.content).substring(0, 100);
-                    const replyLights = reply.allLightCount || 0; // 修复：使用正确的字段名
-                    const replyTime = reply.created_at_format || '未知时间';
-                    replyText += `${index + 1}. ${userName} (亮${replyLights} ${replyTime}):\n   ${replyContent}\n\n`;
-                });
-                result.content = contentPreview + replyText;
-            }
-        }
-        return [result];
-    },
-});
+import{cli as D,Strategy as L}from"@jackwener/opencli/registry";import{getHupuThreadUrl as S,readHupuNextData as U,stripHtml as M}from"./utils.js";D({site:"hupu",name:"detail",access:"read",description:"获取虎扑帖子详情 (使用Next.js JSON数据)",domain:"bbs.hupu.com",strategy:L.PUBLIC,browser:!0,args:[{name:"tid",required:!0,positional:!0,help:"帖子ID（9位数字）"},{name:"replies",type:"boolean",default:!1,help:"是否包含热门回复"}],columns:["title","author","content","replies","lights","url"],func:async(O,Q)=>{const{tid:A,replies:V=!1}=Q,W=S(A).replace(/-1\.html$/,".html"),B=await U(O,W,"Read Hupu thread detail",{expectedTid:String(A)}),q=B.props.pageProps.detail_error_info;if(q&&q.code!==200)throw Error(`帖子访问失败: ${q.message} (code: ${q.code})`);const b=B.props.pageProps.detail?.thread;if(!b)throw Error("帖子不存在或已被删除");const X=b.author?.puname||"未知作者",E=M(b.content),F=E.length>300?E.substring(0,300)+"...":E,G={title:b.title,author:X,content:F,replies:b.replies||0,lights:b.lights||0,url:`https://bbs.hupu.com/${A}.html`};if(V){const J=(B.props.pageProps.detail?.lights||[]).slice(0,3);if(J.length>0){let K=`
+
+【热门回复】
+`;J.forEach((z,Y)=>{const Z=z.author?.puname||"未知用户",_=M(z.content).substring(0,100),$=z.allLightCount||0,C=z.created_at_format||"未知时间";K+=`${Y+1}. ${Z} (亮${$} ${C}):
+   ${_}
+
+`});G.content=F+K}}return[G]}});

package/clis/hupu/hot.js

@@ -1,111 +1,4 @@
-// Hupu hot/home threads — public SSR HTML scrape via in-page DOM walk.
-//
-// Replaces the legacy `pipeline:[]` + `documentElement.outerHTML` regex,
-// which had two anti-pattern problems:
-//   1. Regex against `outerHTML` is brittle to whitespace / attribute order
-//      shifts and silently drops rows when the markup wobbles.
-//   2. The regex captured every 9-digit thread anchor on the page, not just
-//      the rows inside `.t-info` containers — `.list-item` rows and pure
-//      navigation links got conflated.
-//
-// New behavior:
-//   - `func` form with `Strategy.PUBLIC` + `browser:true` (consistent with
-//     other public hupu adapters).
-//   - Upfront `--limit` validation: must be a positive integer ≤ 100, no
-//     silent clamp; `ArgumentError` on bad input.
-//   - DOM walk via `querySelectorAll('.t-info')` — same scope hupu's web
-//     client renders, so the row count matches what the human sees.
-//   - Enriched columns: `lights` (亮 count, int|null), `replies` (回复
-//     count, int|null), `forum` (sub-section name from sibling `.t-label`),
-//     `is_hot` (whether the page tagged the row with `class=" hot"` —
-//     transparent surfacing of hupu's own hot marker without filtering, so
-//     existing callers see the same row order).
-//   - Empty page → `EmptyResultError`, never silent `[]`.
-//   - Pure extraction (`extractHupuHotRowsFromDoc`) is a Node-side export
-//     so JSDOM-against-frozen-fixture tests can call it directly while the
-//     live IIFE embeds the same function via `${fn.toString()}` (mirrors
-//     dianping #1313 pattern).
-
-import { cli, Strategy } from '@jackwener/opencli/registry';
-import { ArgumentError, CommandExecutionError, EmptyResultError } from '@jackwener/opencli/errors';
-
-export const HUPU_HOST = 'https://bbs.hupu.com';
-export const HOT_LIMIT_DEFAULT = 20;
-export const HOT_LIMIT_MAX = 100;
-
-export function normalizeHotLimit(raw) {
-    if (raw === undefined || raw === null || raw === '') {
-        return HOT_LIMIT_DEFAULT;
-    }
-    const n = typeof raw === 'number' ? raw : Number(raw);
-    if (!Number.isFinite(n) || !Number.isInteger(n) || n < 1 || n > HOT_LIMIT_MAX) {
-        throw new ArgumentError(
-            `--limit must be a positive integer in [1, ${HOT_LIMIT_MAX}], got ${JSON.stringify(raw)}`,
-        );
-    }
-    return n;
-}
-
-// Parse hupu count strings like "50亮", "359回复", "1.2万" → typed int.
-// Returns null when the input does not look like a count we can read.
-// `0` is preserved (real value), `null` means "we could not extract it"
-// — never use `0` as an unknown sentinel here.
-export function parseHupuCount(raw) {
-    if (raw === undefined || raw === null) return null;
-    const text = String(raw).trim();
-    if (!text) return null;
-    const match = text.match(/^([0-9]+(?:\.[0-9]+)?)\s*(万)?/);
-    if (!match) return null;
-    const num = parseFloat(match[1]);
-    if (!Number.isFinite(num)) return null;
-    return Math.round(match[2] === '万' ? num * 10000 : num);
-}
-
-// Pure extractor: walks `.t-info` containers and returns at most `limit`
-// rows. `doc` is a Document (live `document` in browser, JSDOM document
-// in tests). `parseCount` is injected so the same function works in both
-// contexts (in-browser eval embeds it via `${fn.toString()}`, JSDOM tests
-// pass the imported reference).
-export function extractHupuHotRowsFromDoc(doc, limit, parseCount) {
-    const out = [];
-    const items = doc.querySelectorAll('.t-info');
-    for (let i = 0; i < items.length && out.length < limit; i += 1) {
-        const info = items[i];
-        const anchor = info.querySelector('a[href]');
-        if (!anchor) continue;
-        const href = anchor.getAttribute('href') || '';
-        const tidMatch = href.match(/^\/(\d{9})\.html$/);
-        if (!tidMatch) continue;
-        const tid = tidMatch[1];
-        const titleEl = anchor.querySelector('.t-title');
-        const title = titleEl ? (titleEl.textContent || '').trim() : '';
-        if (!title) continue;
-        const classes = (anchor.getAttribute('class') || '').split(/\s+/).filter(Boolean);
-        const isHot = classes.includes('hot');
-        const lightsEl = info.querySelector('.t-lights');
-        const repliesEl = info.querySelector('.t-replies');
-        const lights = parseCount(lightsEl ? lightsEl.textContent : null);
-        const replies = parseCount(repliesEl ? repliesEl.textContent : null);
-        // forum label sits beside `.t-info` inside `.list-item`
-        const listItem = info.parentElement;
-        const labelEl = listItem ? listItem.querySelector('.t-label a') : null;
-        const forum = labelEl ? (labelEl.textContent || '').trim() : '';
-        out.push({
-            rank: out.length + 1,
-            tid,
-            title,
-            lights,
-            replies,
-            forum,
-            is_hot: isHot,
-            url: `${HUPU_HOST}/${tid}.html`,
-        });
-    }
-    return out;
-}
-
-export function buildHotScript(limit) {
-    return `
+import{cli as P,Strategy as X}from"@jackwener/opencli/registry";import{ArgumentError as x,CommandExecutionError as b,EmptyResultError as A}from"@jackwener/opencli/errors";export const HUPU_HOST="https://bbs.hupu.com",HOT_LIMIT_DEFAULT=20,HOT_LIMIT_MAX=100;export function normalizeHotLimit(q){if(q===void 0||q===null||q==="")return HOT_LIMIT_DEFAULT;const B=typeof q==="number"?q:Number(q);if(!Number.isFinite(B)||!Number.isInteger(B)||B<1||B>HOT_LIMIT_MAX)throw new x(`--limit must be a positive integer in [1, ${HOT_LIMIT_MAX}], got ${JSON.stringify(q)}`);return B}export function parseHupuCount(q){if(q===void 0||q===null)return null;const B=String(q).trim();if(!B)return null;const G=B.match(/^([0-9]+(?:\.[0-9]+)?)\s*(万)?/);if(!G)return null;const v=parseFloat(G[1]);if(!Number.isFinite(v))return null;return Math.round(G[2]==="万"?v*1e4:v)}export function extractHupuHotRowsFromDoc(q,B,G){const v=[],J=q.querySelectorAll(".t-info");for(let K=0;K<J.length&&v.length<B;K+=1){const N=J[K],Q=N.querySelector("a[href]");if(!Q)continue;const V=(Q.getAttribute("href")||"").match(/^\/(\d{9})\.html$/);if(!V)continue;const W=V[1],Y=Q.querySelector(".t-title"),Z=Y?(Y.textContent||"").trim():"";if(!Z)continue;const R=(Q.getAttribute("class")||"").split(/\s+/).filter(Boolean).includes("hot"),$=N.querySelector(".t-lights"),z=N.querySelector(".t-replies"),y=G($?$.textContent:null),D=G(z?z.textContent:null),j=N.parentElement,k=j?j.querySelector(".t-label a"):null,F=k?(k.textContent||"").trim():"";v.push({rank:v.length+1,tid:W,title:Z,lights:y,replies:D,forum:F,is_hot:R,url:`${HUPU_HOST}/${W}.html`})}return v}export function buildHotScript(q){return`
 (async () => {
   const HUPU_HOST = ${JSON.stringify(HUPU_HOST)};
   ${parseHupuCount.toString()}
@@ -116,48 +9,6 @@ export function buildHotScript(limit) {
   while (document.querySelectorAll('.t-info').length === 0 && Date.now() - start < 5000) {
     await new Promise(r => setTimeout(r, 100));
   }
-  return extractHupuHotRowsFromDoc(document, ${JSON.stringify(limit)}, parseHupuCount);
+  return extractHupuHotRowsFromDoc(document, ${JSON.stringify(q)}, parseHupuCount);
 })()
-`;
-}
-
-async function getHupuHot(page, args) {
-    const limit = normalizeHotLimit(args.limit);
-    await page.goto(`${HUPU_HOST}/`, { waitUntil: 'load', settleMs: 1000 });
-    let rows;
-    try {
-        rows = await page.evaluate(buildHotScript(limit));
-    } catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        throw new CommandExecutionError(
-            `Failed to read hupu hot threads: ${message}`,
-            'bbs.hupu.com may be unreachable or its markup may have changed',
-        );
-    }
-    if (!Array.isArray(rows) || rows.length === 0) {
-        throw new EmptyResultError(
-            'hupu/hot',
-            'No threads found on bbs.hupu.com — page structure may have changed',
-        );
-    }
-    return rows;
-}
-
-export const hotCommand = cli({
-    site: 'hupu',
-    name: 'hot',
-    access: 'read',
-    description: '虎扑首页热门帖子（含 lights / replies / forum / is_hot 列）',
-    domain: 'bbs.hupu.com',
-    strategy: Strategy.PUBLIC,
-    browser: true,
-    args: [
-        { name: 'limit', type: 'int', default: HOT_LIMIT_DEFAULT, help: `Number of threads (1-${HOT_LIMIT_MAX})` },
-    ],
-    columns: ['rank', 'tid', 'title', 'lights', 'replies', 'forum', 'is_hot', 'url'],
-    func: getHupuHot,
-});
-
-export const __test__ = {
-    buildHotScript,
-};
+`}async function C(q,B){const G=normalizeHotLimit(B.limit);await q.goto(`${HUPU_HOST}/`,{waitUntil:"load",settleMs:1000});let v;try{v=await q.evaluate(buildHotScript(G))}catch(J){const K=J instanceof Error?J.message:String(J);throw new b(`Failed to read hupu hot threads: ${K}`,"bbs.hupu.com may be unreachable or its markup may have changed")}if(!Array.isArray(v)||v.length===0)throw new A("hupu/hot","No threads found on bbs.hupu.com — page structure may have changed");return v}export const hotCommand=P({site:"hupu",name:"hot",access:"read",description:"虎扑首页热门帖子（含 lights / replies / forum / is_hot 列）",domain:"bbs.hupu.com",strategy:X.PUBLIC,browser:!0,args:[{name:"limit",type:"int",default:HOT_LIMIT_DEFAULT,help:`Number of threads (1-${HOT_LIMIT_MAX})`}],columns:["rank","tid","title","lights","replies","forum","is_hot","url"],func:C}),__test__={buildHotScript};