@jackwener/opencli 1.5.6 → 1.5.8

package/src/clis/ctrip/search.test.ts

@@ -0,0 +1,73 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { getRegistry } from '../../registry.js';
+import './search.js';
+
+describe('ctrip search', () => {
+  const command = getRegistry().get('ctrip/search');
+
+  beforeEach(() => {
+    vi.unstubAllGlobals();
+  });
+
+  it('maps live endpoint results into ranked rows', async () => {
+    vi.stubGlobal('fetch', vi.fn().mockResolvedValue(new Response(JSON.stringify({
+      Response: {
+        searchResults: [
+          {
+            displayName: '苏州, 江苏, 中国',
+            displayType: '城市',
+            commentScore: 0,
+            price: '',
+          },
+          {
+            word: '姑苏区',
+            type: '行政区',
+            cStar: 4.8,
+            minPrice: 320,
+          },
+        ],
+      },
+    }), { status: 200 })));
+
+    const result = await command!.func!(null as any, { query: '苏州', limit: 3 });
+    expect(result).toEqual([
+      {
+        rank: 1,
+        name: '苏州, 江苏, 中国',
+        type: '城市',
+        score: 0,
+        price: '',
+        url: '',
+      },
+      {
+        rank: 2,
+        name: '姑苏区',
+        type: '行政区',
+        score: 4.8,
+        price: 320,
+        url: '',
+      },
+    ]);
+  });
+
+  it('rejects empty queries', async () => {
+    await expect(command!.func!(null as any, { query: '   ', limit: 3 })).rejects.toThrow('Search keyword cannot be empty');
+  });
+
+  it('surfaces fetch failures as CliError', async () => {
+    vi.stubGlobal('fetch', vi.fn().mockResolvedValue(new Response('{}', { status: 503 })));
+
+    await expect(command!.func!(null as any, { query: '苏州', limit: 3 })).rejects.toMatchObject({
+      code: 'FETCH_ERROR',
+      message: 'ctrip search failed with status 503',
+    });
+  });
+
+  it('surfaces empty results as EmptyResultError', async () => {
+    vi.stubGlobal('fetch', vi.fn().mockResolvedValue(new Response(JSON.stringify({
+      Response: { searchResults: [] },
+    }), { status: 200 })));
+
+    await expect(command!.func!(null as any, { query: '苏州', limit: 3 })).rejects.toThrow('ctrip search returned no data');
+  });
+});

package/src/clis/ctrip/search.ts

@@ -1,61 +1,111 @@
 /**
- * 携程旅行搜索 — browser cookie, multi-strategy.
+ * 携程旅行搜索 — public destination and hotel suggestion lookup.
  */
+import { ArgumentError, CliError, EmptyResultError } from '../../errors.js';
 import { cli, Strategy } from '../../registry.js';
 
+interface CtripSearchResultItem {
+  displayName?: string;
+  word?: string;
+  cityName?: string;
+  displayType?: string;
+  type?: string;
+  commentScore?: number | string;
+  cStar?: number | string;
+  price?: number | string;
+  minPrice?: number | string;
+}
+
+function clampLimit(raw: unknown, fallback = 15): number {
+  const parsed = Number(raw);
+  if (!Number.isFinite(parsed)) return fallback;
+  return Math.max(1, Math.min(Math.floor(parsed), 50));
+}
+
+function mapSearchResults(results: unknown[], limit: number) {
+  return results
+    .filter((item): item is CtripSearchResultItem => !!item && typeof item === 'object')
+    .slice(0, limit)
+    .map((item, index) => ({
+      rank: index + 1,
+      name: String(item.displayName || item.word || item.cityName || '').replace(/\s+/g, ' ').trim(),
+      type: String(item.displayType || item.type || '').replace(/\s+/g, ' ').trim(),
+      score: item.commentScore ?? item.cStar ?? '',
+      price: item.price ?? item.minPrice ?? '',
+      url: '',
+    }))
+    .filter((item) => item.name);
+}
+
 cli({
   site: 'ctrip',
   name: 'search',
-  description: '携程旅行搜索',
-  domain: 'www.ctrip.com',
-  strategy: Strategy.COOKIE,
+  description: '搜索携程目的地、景区和酒店联想结果',
+  strategy: Strategy.PUBLIC,
+  browser: false,
   args: [
     { name: 'query', required: true, positional: true, help: 'Search keyword (city or attraction)' },
     { name: 'limit', type: 'int', default: 15, help: 'Number of results' },
   ],
   columns: ['rank', 'name', 'type', 'score', 'price', 'url'],
-  func: async (page, kwargs) => {
-    const limit = kwargs.limit || 15;
-    await page.goto('https://www.ctrip.com');
-    await page.wait(2);
-    const data = await page.evaluate(`
-      (async () => {
-        const query = '${kwargs.query.replace(/'/g, "\\'")}';
-        const limit = ${limit};
-
-        // Strategy 1: Suggestion API
-        try {
-          const suggestUrl = 'https://m.ctrip.com/restapi/h5api/searchapp/search?action=onekeyali&keyword=' + encodeURIComponent(query);
-          const resp = await fetch(suggestUrl, {credentials: 'include'});
-          if (resp.ok) {
-            const d = await resp.json();
-            const raw = d.data || d.result || d;
-            if (raw && typeof raw === 'object') {
-              // Flatten all result categories
-              const items = [];
-              for (const key of Object.keys(raw)) {
-                const list = Array.isArray(raw[key]) ? raw[key] : [];
-                for (const item of list) {
-                  if (items.length >= limit) break;
-                  items.push({
-                    rank: items.length + 1,
-                    name: item.word || item.name || item.title || '',
-                    type: item.type || item.tpName || key,
-                    score: item.score || '',
-                    price: item.price || item.minPrice || '',
-                    url: item.url || item.surl || '',
-                  });
-                }
-              }
-              if (items.length > 0) return items;
-            }
-          }
-        } catch(e) {}
-
-        return {error: 'No results for: ' + query};
-      })()
-    `);
-    if (!Array.isArray(data)) return [];
-    return data;
+  func: async (_page, kwargs) => {
+    const query = String(kwargs.query || '').trim();
+    if (!query) {
+      throw new ArgumentError('Search keyword cannot be empty');
+    }
+
+    const limit = clampLimit(kwargs.limit);
+    const response = await fetch('https://m.ctrip.com/restapi/soa2/21881/json/gaHotelSearchEngine', {
+      method: 'POST',
+      headers: {
+        'content-type': 'application/json',
+      },
+      body: JSON.stringify({
+        keyword: query,
+        searchType: 'D',
+        platform: 'online',
+        pageID: '102001',
+        head: {
+          Locale: 'zh-CN',
+          LocaleController: 'zh_cn',
+          Currency: 'CNY',
+          PageId: '102001',
+          clientID: 'opencli-ctrip-search',
+          group: 'ctrip',
+          Frontend: {
+            sessionID: 1,
+            pvid: 1,
+          },
+          HotelExtension: {
+            group: 'CTRIP',
+            WebpSupport: false,
+          },
+        },
+      }),
+    });
+
+    if (!response.ok) {
+      throw new CliError(
+        'FETCH_ERROR',
+        `ctrip search failed with status ${response.status}`,
+        'Retry the command or verify ctrip.com is reachable',
+      );
+    }
+
+    const payload = await response.json();
+    const rawResults = Array.isArray(payload?.Response?.searchResults) ? payload.Response.searchResults : [];
+    const results = mapSearchResults(rawResults, limit);
+    if (!results.length) {
+      throw new EmptyResultError(
+        'ctrip search',
+        'Try a destination, scenic spot, or hotel keyword such as "苏州" or "朱家尖"',
+      );
+    }
+    return results;
   },
 });
+
+export const __test__ = {
+  clampLimit,
+  mapSearchResults,
+};

package/src/clis/douyin/_shared/sts2.test.ts

@@ -0,0 +1,31 @@
+import { describe, expect, it } from 'vitest';
+import { AuthRequiredError } from '../../../errors.js';
+import { getSts2Credentials } from './sts2.js';
+
+describe('douyin sts2 credentials', () => {
+  it('accepts top-level credential fields returned by creator center', async () => {
+    const page = {
+      evaluate: async () => ({
+        access_key_id: 'ak',
+        secret_access_key: 'sk',
+        session_token: 'token',
+        expired_time: 1_234_567_890,
+      }),
+    };
+
+    await expect(getSts2Credentials(page as never)).resolves.toEqual({
+      access_key_id: 'ak',
+      secret_access_key: 'sk',
+      session_token: 'token',
+      expired_time: 1_234_567_890,
+    });
+  });
+
+  it('still rejects responses without credential fields', async () => {
+    const page = {
+      evaluate: async () => ({ status_code: 8 }),
+    };
+
+    await expect(getSts2Credentials(page as never)).rejects.toBeInstanceOf(AuthRequiredError);
+  });
+});

package/src/clis/douyin/_shared/sts2.ts

@@ -12,9 +12,17 @@ const STS2_URL =
  */
 export async function getSts2Credentials(page: IPage): Promise<Sts2Credentials> {
   const js = `fetch(${JSON.stringify(STS2_URL)}, { credentials: 'include' }).then(r => r.json())`;
-  const res = await page.evaluate(js) as { data: Sts2Credentials };
-  if (!res?.data?.access_key_id) {
+  const res = await page.evaluate(js) as Sts2Credentials | { data?: Sts2Credentials };
+  const credentials = (
+    typeof res === 'object' &&
+    res !== null &&
+    'data' in res &&
+    res.data
+  )
+    ? res.data
+    : (res as Sts2Credentials);
+  if (!credentials?.access_key_id) {
     throw new AuthRequiredError('creator.douyin.com', 'STS2 credentials missing');
   }
-  return res.data;
+  return credentials;
 }

package/src/clis/douyin/activities.test.ts

@@ -1,8 +1,21 @@
-import { describe, expect, it } from 'vitest';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+const { browserFetchMock } = vi.hoisted(() => ({
+  browserFetchMock: vi.fn(),
+}));
+
+vi.mock('./_shared/browser-fetch.js', () => ({
+  browserFetch: browserFetchMock,
+}));
+
 import { getRegistry } from '../../registry.js';
 import './activities.js';
 
 describe('douyin activities registration', () => {
+  beforeEach(() => {
+    browserFetchMock.mockReset();
+  });
+
   it('registers the activities command', () => {
     const registry = getRegistry();
     const cmd = [...registry.values()].find(c => c.site === 'douyin' && c.name === 'activities');
@@ -22,4 +35,31 @@ describe('douyin activities registration', () => {
     const cmd = [...registry.values()].find(c => c.site === 'douyin' && c.name === 'activities');
     expect(cmd?.strategy).toBe('cookie');
   });
+
+  it('maps the current activity payload shape returned by creator center', async () => {
+    const registry = getRegistry();
+    const cmd = [...registry.values()].find(c => c.site === 'douyin' && c.name === 'activities');
+    expect(cmd?.func).toBeDefined();
+    if (!cmd?.func) throw new Error('douyin activities command not registered');
+
+    browserFetchMock.mockResolvedValueOnce({
+      activity_list: [
+        {
+          activity_id: '200',
+          activity_name: '超会玩派对',
+          show_end_time: '2026.05.31',
+        },
+      ],
+    });
+
+    const rows = await cmd.func({} as never, {});
+
+    expect(rows).toEqual([
+      {
+        activity_id: '200',
+        title: '超会玩派对',
+        end_time: '2026.05.31',
+      },
+    ]);
+  });
 });

package/src/clis/douyin/activities.ts

@@ -12,12 +12,21 @@ cli({
   func: async (page, _kwargs) => {
     const url = 'https://creator.douyin.com/web/api/media/activity/get/?aid=1128';
     const res = await browserFetch(page, 'GET', url) as {
-      activity_list: Array<{ activity_id: string; title: string; end_time: number }>
+      activity_list: Array<{
+        activity_id: string;
+        title?: string;
+        activity_name?: string;
+        end_time?: number;
+        show_end_time?: string;
+      }>
     };
     return (res.activity_list ?? []).map(a => ({
       activity_id: a.activity_id,
-      title: a.title,
-      end_time: new Date(a.end_time * 1000).toLocaleString('zh-CN', { timeZone: 'Asia/Tokyo' }),
+      title: a.title ?? a.activity_name ?? '',
+      end_time:
+        typeof a.end_time === 'number'
+          ? new Date(a.end_time * 1000).toLocaleString('zh-CN', { timeZone: 'Asia/Tokyo' })
+          : (a.show_end_time ?? ''),
     }));
   },
 });

package/src/clis/douyin/collections.test.ts

@@ -1,8 +1,21 @@
-import { describe, expect, it } from 'vitest';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+const { browserFetchMock } = vi.hoisted(() => ({
+  browserFetchMock: vi.fn(),
+}));
+
+vi.mock('./_shared/browser-fetch.js', () => ({
+  browserFetch: browserFetchMock,
+}));
+
 import { getRegistry } from '../../registry.js';
 import './collections.js';
 
-describe('douyin collections registration', () => {
+describe('douyin collections', () => {
+  beforeEach(() => {
+    browserFetchMock.mockReset();
+  });
+
   it('registers the collections command', () => {
     const registry = getRegistry();
     const cmd = [...registry.values()].find(c => c.site === 'douyin' && c.name === 'collections');
@@ -23,4 +36,24 @@ describe('douyin collections registration', () => {
     const cmd = [...registry.values()].find(c => c.site === 'douyin' && c.name === 'collections');
     expect(cmd?.strategy).toBe('cookie');
   });
+
+  it('uses the current mix list request shape', async () => {
+    const registry = getRegistry();
+    const command = [...registry.values()].find((cmd) => cmd.site === 'douyin' && cmd.name === 'collections');
+    expect(command?.func).toBeDefined();
+    if (!command?.func) throw new Error('douyin collections command not registered');
+
+    browserFetchMock.mockResolvedValueOnce({
+      mix_list: [],
+    });
+
+    const rows = await command.func({} as any, { limit: 12 });
+
+    expect(browserFetchMock).toHaveBeenCalledWith(
+      {},
+      'GET',
+      'https://creator.douyin.com/web/api/mix/list/?status=0,1,2,3,6&count=12&cursor=0&should_query_new_mix=1&device_platform=web&aid=1128',
+    );
+    expect(rows).toEqual([]);
+  });
 });

package/src/clis/douyin/collections.ts

@@ -12,7 +12,7 @@ cli({
   ],
   columns: ['mix_id', 'name', 'item_count'],
   func: async (page, kwargs) => {
-    const url = `https://creator.douyin.com/web/api/mix/list/?aid=1128&count=${kwargs.limit}`;
+    const url = `https://creator.douyin.com/web/api/mix/list/?status=0,1,2,3,6&count=${kwargs.limit}&cursor=0&should_query_new_mix=1&device_platform=web&aid=1128`;
     const res = await browserFetch(page, 'GET', url) as {
       mix_list: Array<{ mix_id: string; mix_name: string; item_count: number }>
     };