mirror of
https://github.com/jackwener/OpenCLI.git
synced 2026-09-14 18:25:42 +08:00
4fe9a73ebc
* refactor: migrate adapter imports to package exports Replace all relative imports (../../src/registry.js, ../../browser/cdp.js, etc.) with package exports (@jackwener/opencli/registry, @jackwener/opencli/errors, etc.) across all 484 adapter files. This decouples adapter import resolution from directory structure: - User CLIs in ~/.opencli/clis/ resolve via node_modules symlink - Internal adapters resolve via Node.js self-referencing - No more shim files needed for import resolution Changes: - package.json: add sub-path exports for all public modules - clis/**: replace relative imports with @jackwener/opencli/... - discovery.ts: simplify ensureUserCliCompatShims to symlink-only - registry-api.ts: export CommandArgs type - Remove root-level shim directories (browser/, download/, pipeline/) - Remove shim entries from tsconfig.json include and package.json files * test: add regression tests for package exports Prevents regressions like #788/#791 by: 1. Scanning all adapter files for forbidden relative imports (../../src/, ../../browser/, etc.) — fails if any remain 2. Verifying every package.json export maps to an existing source file 18 new test cases. * fix: use junction on Windows + broaden test patterns - discovery.ts: use 'junction' symlink type on Windows (no admin required) - package-exports.test.ts: generalize forbidden patterns to catch any depth of ../ traversal (not just ../../ and ../../../) * fix: update stale vi.mock/importActual paths in adapter tests Test files still used old relative paths for vi.mock() and vi.importActual() calls. Updated 5 test files to use package exports. Also broadened regression test patterns to catch mock/importActual paths. * fix: use rm instead of unlink for symlink cleanup, add warn on failure Addresses review feedback from Astro-Han: - rm() handles both symlinks and stale directories (unlink fails on dirs) - Log a warning when symlink creation fails instead of silent catch * docs: update import examples to use package exports Update all documentation, contributing guides, and skills to use @jackwener/opencli/registry instead of ../../src/registry.js. Without this, users following the docs would write adapters with broken imports since the old shim files are no longer created.
129 lines
4.3 KiB
TypeScript
129 lines
4.3 KiB
TypeScript
import { CommandExecutionError } from '@jackwener/opencli/errors';
|
|
import { cli, Strategy } from '@jackwener/opencli/registry';
|
|
import type { IPage } from '@jackwener/opencli/types';
|
|
import {
|
|
buildProvenance,
|
|
buildSearchUrl,
|
|
cleanText,
|
|
extractAsin,
|
|
normalizeProductUrl,
|
|
parsePriceText,
|
|
parseRatingValue,
|
|
parseReviewCount,
|
|
assertUsableState,
|
|
gotoAndReadState,
|
|
} from './shared.js';
|
|
|
|
interface SearchPayload {
|
|
href?: string;
|
|
cards?: Array<{
|
|
asin?: string;
|
|
title?: string;
|
|
href?: string;
|
|
price_text?: string | null;
|
|
rating_text?: string | null;
|
|
review_count_text?: string | null;
|
|
sponsored?: boolean;
|
|
badge_texts?: string[];
|
|
}>;
|
|
}
|
|
|
|
function normalizeSearchCandidate(
|
|
candidate: NonNullable<SearchPayload['cards']>[number],
|
|
rank: number,
|
|
sourceUrl: string,
|
|
): Record<string, unknown> {
|
|
const productUrl = normalizeProductUrl(candidate.href);
|
|
const asin = extractAsin(candidate.asin ?? '') ?? extractAsin(productUrl ?? '') ?? null;
|
|
const price = parsePriceText(candidate.price_text);
|
|
const ratingText = cleanText(candidate.rating_text) || null;
|
|
const reviewCountText = cleanText(candidate.review_count_text) || null;
|
|
const provenance = buildProvenance(sourceUrl);
|
|
|
|
return {
|
|
rank,
|
|
asin,
|
|
title: cleanText(candidate.title) || null,
|
|
product_url: productUrl,
|
|
...provenance,
|
|
price_text: price.price_text,
|
|
price_value: price.price_value,
|
|
currency: price.currency,
|
|
rating_text: ratingText,
|
|
rating_value: parseRatingValue(ratingText),
|
|
review_count_text: reviewCountText,
|
|
review_count: parseReviewCount(reviewCountText),
|
|
is_sponsored: candidate.sponsored === true,
|
|
badges: (candidate.badge_texts ?? []).map((value) => cleanText(value)).filter(Boolean),
|
|
};
|
|
}
|
|
|
|
async function readSearchPayload(page: IPage, query: string): Promise<SearchPayload> {
|
|
const url = buildSearchUrl(query);
|
|
const state = await gotoAndReadState(page, url, 2500, 'search');
|
|
assertUsableState(state, 'search');
|
|
|
|
return await page.evaluate(`
|
|
(() => ({
|
|
href: window.location.href,
|
|
cards: Array.from(document.querySelectorAll('[data-component-type="s-search-result"]'))
|
|
.map((card) => ({
|
|
asin: card.getAttribute('data-asin') || '',
|
|
title: card.querySelector('h2')?.textContent || '',
|
|
href: card.querySelector('a.a-link-normal[href*="/dp/"]')?.href || '',
|
|
price_text: card.querySelector('.a-price .a-offscreen')?.textContent || '',
|
|
rating_text: card.querySelector('[aria-label*="out of 5 stars"]')?.getAttribute('aria-label') || '',
|
|
review_count_text: card.querySelector('a[href*="#customerReviews"]')?.textContent || '',
|
|
sponsored: /sponsored/i.test(card.innerText || ''),
|
|
badge_texts: Array.from(card.querySelectorAll('.a-badge-text')).map((node) => node.textContent || ''),
|
|
})),
|
|
}))()
|
|
`) as SearchPayload;
|
|
}
|
|
|
|
cli({
|
|
site: 'amazon',
|
|
name: 'search',
|
|
description: 'Amazon search results for product discovery and coarse filtering',
|
|
domain: 'amazon.com',
|
|
strategy: Strategy.COOKIE,
|
|
navigateBefore: false,
|
|
args: [
|
|
{
|
|
name: 'query',
|
|
required: true,
|
|
positional: true,
|
|
help: 'Search query, for example "desk shelf organizer"',
|
|
},
|
|
{
|
|
name: 'limit',
|
|
type: 'int',
|
|
default: 20,
|
|
help: 'Maximum number of results to return (default 20)',
|
|
},
|
|
],
|
|
columns: ['rank', 'asin', 'title', 'price_text', 'rating_value', 'review_count'],
|
|
func: async (page, kwargs) => {
|
|
const query = String(kwargs.query ?? '');
|
|
const limit = Math.max(1, Number(kwargs.limit) || 20);
|
|
const payload = await readSearchPayload(page, query);
|
|
const sourceUrl = cleanText(payload.href) || buildSearchUrl(query);
|
|
const cards = (payload.cards ?? [])
|
|
.filter((card) => cleanText(card.asin) && cleanText(card.title))
|
|
.slice(0, limit);
|
|
|
|
if (cards.length === 0) {
|
|
throw new CommandExecutionError(
|
|
'amazon search did not expose any product cards',
|
|
'The search page may have changed or hit a robot check. Open the same query in Chrome, verify the page is visible, and retry.',
|
|
);
|
|
}
|
|
|
|
return cards.map((card, index) => normalizeSearchCandidate(card, index + 1, sourceUrl));
|
|
},
|
|
});
|
|
|
|
export const __test__ = {
|
|
normalizeSearchCandidate,
|
|
};
|