mirror of
https://github.com/jackwener/OpenCLI.git
synced 2026-09-14 18:25:42 +08:00
80eef46b4e
* refactor: move adapters from src/clis/ to root clis/ for monorepo separation Separates CLI adapters from the core runtime to prepare for independent adapter distribution via postinstall fetch. Key changes: - Move src/clis/ → clis/ (adapters at repo root) - Change tsconfig rootDir from "src" to "." so tsc compiles both - Create root-level shim files (registry.ts, errors.ts, etc.) so adapter relative imports (../../registry.js) resolve correctly - Update build-manifest.ts, main.ts paths for new dist/src/ structure - Expand ensureUserCliCompatShims() to cover all adapter import targets (types, utils, logger, launcher, browser/*, download/*, pipeline/*) - Add scripts/fetch-adapters.js postinstall for ~/.opencli/clis/ sync - Update vitest.config.ts adapter test paths - Add package.json files field to exclude adapters from npm package Official adapter files are unconditionally overwritten on update; user-created files not in the manifest are preserved. * fix: add dist/clis/ and cli-manifest.json to npm files, harden fetch-adapters - Add dist/clis/ and dist/cli-manifest.json to package.json files field so built-in adapters and manifest ship with the npm package - Replace execSync with execFileSync to prevent command injection - Add version check to skip redundant adapter fetches - Track tmpRoot explicitly for reliable cleanup * fix: address review blockers — manifest-based updates, global-only fetch, first-run fallback 1. Manifest-based update strategy: - Read old manifest to identify previously-official files - Clean up files removed upstream (in old manifest but not new) - User-created files (never in any manifest) remain untouched 2. Only run fetch-adapters on global install (npm_config_global=true) or explicit OPENCLI_FETCH=1, preventing heavy side effects for local/dev installs 3. First-run fallback in discovery.ts: - ensureUserAdapters() checks for adapter-manifest.json - If missing and ~/.opencli/clis/ is empty, spawns fetch-adapters.js - Guarantees adapters are available even with --ignore-scripts * fix: remove OPENCLI_FETCH env var, use internal _OPENCLI_FIRST_RUN instead * feat: also support OPENCLI_FETCH=1 for explicit adapter fetch trigger * simplify: replace git clone with local copy from dist/clis/ Adapters already ship in the npm package (dist/clis/), so there's no need to clone from GitHub. Copy directly from the installed package: - Eliminates git, curl, tar dependencies - No network calls in postinstall - No timeout/offline issues - Version always matches the installed CLI - ~65 lines of clone/download code replaced by one cpSync loop
109 lines
3.4 KiB
TypeScript
109 lines
3.4 KiB
TypeScript
import { EmptyResultError } from '../../errors.js';
|
|
import { cli, Strategy, type CommandArgs } from '../../registry.js';
|
|
import type { IPage } from '../../types.js';
|
|
import {
|
|
buildTiebaPostCardsFromPagePc,
|
|
buildTiebaPostItems,
|
|
normalizeTiebaLimit,
|
|
signTiebaPcParams,
|
|
type RawTiebaPagePcFeedEntry,
|
|
} from './utils.js';
|
|
|
|
interface TiebaPagePcResponse {
|
|
error_code?: number;
|
|
page_data?: {
|
|
feed_list?: RawTiebaPagePcFeedEntry[];
|
|
};
|
|
}
|
|
|
|
function getForumPageNumber(kwargs: CommandArgs): number {
|
|
return Math.max(1, Number(kwargs.page || 1));
|
|
}
|
|
|
|
function getForumUrl(kwargs: CommandArgs): string {
|
|
const forum = String(kwargs.forum || '');
|
|
return `https://tieba.baidu.com/f?kw=${encodeURIComponent(forum)}&ie=utf-8&pn=${(getForumPageNumber(kwargs) - 1) * 50}`;
|
|
}
|
|
|
|
/**
|
|
* Rebuild the signed page_pc request instead of scraping only the visible thread cards.
|
|
*/
|
|
function buildTiebaPagePcParams(kwargs: CommandArgs, limit: number): Record<string, string> {
|
|
return {
|
|
kw: encodeURIComponent(String(kwargs.forum || '')),
|
|
pn: String(getForumPageNumber(kwargs)),
|
|
sort_type: '-1',
|
|
is_newfrs: '1',
|
|
is_newfeed: '1',
|
|
rn: '30',
|
|
rn_need: String(Math.min(Math.max(limit + 10, 10), 30)),
|
|
tbs: '',
|
|
subapp_type: 'pc',
|
|
_client_type: '20',
|
|
};
|
|
}
|
|
|
|
/**
|
|
* Tieba expects the signed forum-list request to be replayed with the browser's cookies.
|
|
*/
|
|
async function fetchTiebaPagePc(page: IPage, kwargs: CommandArgs, limit: number): Promise<TiebaPagePcResponse> {
|
|
await page.goto(getForumUrl(kwargs), { waitUntil: 'none' });
|
|
await page.wait(2);
|
|
|
|
const params = buildTiebaPagePcParams(kwargs, limit);
|
|
const cookies = await page.getCookies({ domain: 'tieba.baidu.com' });
|
|
const cookieHeader = cookies.map((item) => `${item.name}=${item.value}`).join('; ');
|
|
const body = new URLSearchParams({
|
|
...params,
|
|
sign: signTiebaPcParams(params),
|
|
}).toString();
|
|
|
|
const response = await fetch('https://tieba.baidu.com/c/f/frs/page_pc', {
|
|
method: 'POST',
|
|
headers: {
|
|
'content-type': 'application/x-www-form-urlencoded;charset=UTF-8',
|
|
cookie: cookieHeader,
|
|
'x-requested-with': 'XMLHttpRequest',
|
|
referer: getForumUrl(kwargs),
|
|
'user-agent': 'Mozilla/5.0',
|
|
},
|
|
body,
|
|
});
|
|
|
|
const text = await response.text();
|
|
try {
|
|
return JSON.parse(text) as TiebaPagePcResponse;
|
|
} catch {
|
|
return {};
|
|
}
|
|
}
|
|
|
|
cli({
|
|
site: 'tieba',
|
|
name: 'posts',
|
|
description: 'Browse posts in a tieba forum',
|
|
domain: 'tieba.baidu.com',
|
|
strategy: Strategy.COOKIE,
|
|
browser: true,
|
|
navigateBefore: false,
|
|
args: [
|
|
{ name: 'forum', positional: true, required: true, type: 'string', help: 'Forum name in Chinese' },
|
|
{ name: 'page', type: 'int', default: 1, help: 'Page number' },
|
|
{ name: 'limit', type: 'int', default: 20, help: 'Number of items to return' },
|
|
],
|
|
columns: ['rank', 'title', 'author', 'replies'],
|
|
func: async (page, kwargs) => {
|
|
const limit = normalizeTiebaLimit(kwargs.limit);
|
|
const payload = await fetchTiebaPagePc(page, kwargs, limit);
|
|
const rawFeeds = Array.isArray(payload.page_data?.feed_list) ? payload.page_data.feed_list : [];
|
|
const rawCards = buildTiebaPostCardsFromPagePc(rawFeeds);
|
|
const items = buildTiebaPostItems(rawCards, limit);
|
|
|
|
if (!items.length || payload.error_code) {
|
|
throw new EmptyResultError('tieba posts', 'Tieba may have blocked the forum page, or the DOM structure may have changed');
|
|
}
|
|
|
|
return items;
|
|
},
|
|
});
|