@jackwener/opencli 1.1.0 → 1.2.0

package/src/clis/boss/chatmsg.ts

@@ -1,5 +1,5 @@
 import { cli, Strategy } from '../../registry.js';
-import type { IPage } from '../../types.js';
+import { requirePage, navigateToChat, bossFetch, findFriendByUid } from './common.js';
 
 cli({
   site: 'boss',
@@ -7,54 +7,30 @@ cli({
   description: 'BOSS直聘查看与候选人的聊天消息',
   domain: 'www.zhipin.com',
   strategy: Strategy.COOKIE,
+  navigateBefore: false,
   browser: true,
   args: [
-    { name: 'uid', required: true, help: 'Encrypted UID (from chatlist)' },
+    { name: 'uid', required: true, positional: true, help: 'Encrypted UID (from chatlist)' },
     { name: 'page', type: 'int', default: 1, help: 'Page number' },
   ],
   columns: ['from', 'type', 'text', 'time'],
-  func: async (page: IPage | null, kwargs) => {
-    if (!page) throw new Error('Browser page required');
-    await page.goto('https://www.zhipin.com/web/chat/index');
-    await page.wait({ time: 2 });
-    const uid = kwargs.uid;
-    const friendData: any = await page.evaluate(`
-      async () => {
-        return new Promise((resolve, reject) => {
-          const xhr = new XMLHttpRequest();
-          xhr.open('GET', 'https://www.zhipin.com/wapi/zprelation/friend/getBossFriendListV2.json?page=1&status=0&jobId=0', true);
-          xhr.withCredentials = true;
-          xhr.timeout = 15000;
-          xhr.setRequestHeader('Accept', 'application/json');
-          xhr.onload = () => { try { resolve(JSON.parse(xhr.responseText)); } catch(e) { reject(e); } };
-          xhr.onerror = () => reject(new Error('Network Error'));
-          xhr.send();
-        });
-      }
-    `);
-    if (friendData.code !== 0) throw new Error('获取好友列表失败');
-    const friend = (friendData.zpData?.friendList || []).find((f: any) => f.encryptUid === uid);
+  func: async (page, kwargs) => {
+    requirePage(page);
+    await navigateToChat(page);
+
+    const friend = await findFriendByUid(page, kwargs.uid);
     if (!friend) throw new Error('未找到该候选人');
+
     const gid = friend.uid;
     const securityId = encodeURIComponent(friend.securityId);
     const msgUrl = `https://www.zhipin.com/wapi/zpchat/boss/historyMsg?gid=${gid}&securityId=${securityId}&page=${kwargs.page}&c=20&src=0`;
-    const msgData: any = await page.evaluate(`
-      async () => {
-        return new Promise((resolve, reject) => {
-          const xhr = new XMLHttpRequest();
-          xhr.open('GET', '${msgUrl}', true);
-          xhr.withCredentials = true;
-          xhr.timeout = 15000;
-          xhr.setRequestHeader('Accept', 'application/json');
-          xhr.onload = () => { try { resolve(JSON.parse(xhr.responseText)); } catch(e) { resolve({raw: xhr.responseText.substring(0,500)}); } };
-          xhr.onerror = () => reject(new Error('Network Error'));
-          xhr.send();
-        });
-      }
-    `);
-    if (msgData.raw) throw new Error('Non-JSON: ' + msgData.raw);
-    if (msgData.code !== 0) throw new Error('API error: ' + (msgData.message || msgData.code));
-    const TYPE_MAP: Record<number, string> = {1: '文本', 2: '图片', 3: '招呼', 4: '简历', 5: '系统', 6: '名片', 7: '语音', 8: '视频', 9: '表情'};
+
+    const msgData = await bossFetch(page, msgUrl);
+
+    const TYPE_MAP: Record<number, string> = {
+      1: '文本', 2: '图片', 3: '招呼', 4: '简历', 5: '系统',
+      6: '名片', 7: '语音', 8: '视频', 9: '表情',
+    };
     const messages = msgData.zpData?.messages || msgData.zpData?.historyMsgList || [];
     return messages.map((m: any) => {
       const fromObj = m.from || {};

package/src/clis/boss/common.ts

@@ -0,0 +1,287 @@
+/**
+ * BOSS直聘 common utilities — shared logic for all boss adapters.
+ *
+ * Consolidates:
+ * - Page navigation with cookie context
+ * - XHR-based API calls (GET/POST) with automatic login state detection
+ * - Cookie expiry error codes (code 7, 37)
+ * - Verbose logging
+ */
+import type { IPage } from '../../types.js';
+
+// ── Constants ───────────────────────────────────────────────────────────────
+
+const BOSS_DOMAIN = 'www.zhipin.com';
+const CHAT_URL = `https://${BOSS_DOMAIN}/web/chat/index`;
+const COOKIE_EXPIRED_CODES = new Set([7, 37]);
+const COOKIE_EXPIRED_MSG = 'Cookie 已过期！请在当前 Chrome 浏览器中重新登录 BOSS 直聘。';
+const DEFAULT_TIMEOUT = 15_000;
+
+// ── Types ───────────────────────────────────────────────────────────────────
+
+export interface BossApiResponse {
+  code: number;
+  message?: string;
+  zpData?: any;
+  [key: string]: any;
+}
+
+export interface FetchOptions {
+  /** HTTP method, defaults to 'GET' */
+  method?: 'GET' | 'POST';
+  /** POST body (will be sent as application/x-www-form-urlencoded) */
+  body?: string;
+  /** XHR timeout in ms, defaults to 15000 */
+  timeout?: number;
+  /** If true, don't throw on non-zero code — return the raw response */
+  allowNonZero?: boolean;
+}
+
+// ── Core helpers ────────────────────────────────────────────────────────────
+
+/**
+ * Assert that page is available (non-null).
+ */
+export function requirePage(page: IPage | null): asserts page is IPage {
+  if (!page) throw new Error('Browser page required');
+}
+
+/**
+ * Navigate to BOSS chat page and wait for it to settle.
+ * This establishes the cookie context needed for subsequent API calls.
+ */
+export async function navigateToChat(page: IPage, waitSeconds = 2): Promise<void> {
+  await page.goto(CHAT_URL);
+  await page.wait({ time: waitSeconds });
+}
+
+/**
+ * Navigate to a custom BOSS page (for search/detail that use different pages).
+ */
+export async function navigateTo(page: IPage, url: string, waitSeconds = 1): Promise<void> {
+  await page.goto(url);
+  await page.wait({ time: waitSeconds });
+}
+
+/**
+ * Check if an API response indicates cookie expiry and throw a clear error.
+ * Call this after every BOSS API response with a non-zero code.
+ */
+export function checkAuth(data: BossApiResponse): void {
+  if (COOKIE_EXPIRED_CODES.has(data.code)) {
+    throw new Error(COOKIE_EXPIRED_MSG);
+  }
+}
+
+/**
+ * Throw if the API response is not code 0.
+ * Checks for cookie expiry first, then throws with the provided message.
+ */
+export function assertOk(data: BossApiResponse, errorPrefix?: string): void {
+  if (data.code === 0) return;
+  checkAuth(data);
+  const prefix = errorPrefix ? `${errorPrefix}: ` : '';
+  throw new Error(`${prefix}${data.message || 'Unknown error'} (code=${data.code})`);
+}
+
+/**
+ * Make a credentialed XHR request via page.evaluate().
+ *
+ * This is the single XHR template — no more copy-pasting the same 15-line
+ * XMLHttpRequest boilerplate across every adapter.
+ *
+ * @returns Parsed JSON response
+ * @throws On network error, timeout, JSON parse failure, or cookie expiry
+ */
+export async function bossFetch(
+  page: IPage,
+  url: string,
+  opts: FetchOptions = {},
+): Promise<BossApiResponse> {
+  const method = opts.method ?? 'GET';
+  const timeout = opts.timeout ?? DEFAULT_TIMEOUT;
+  const body = opts.body ?? null;
+
+  // Build the evaluate script. We use JSON.stringify for safe interpolation.
+  const script = `
+    async () => {
+      return new Promise((resolve, reject) => {
+        const xhr = new XMLHttpRequest();
+        xhr.open(${JSON.stringify(method)}, ${JSON.stringify(url)}, true);
+        xhr.withCredentials = true;
+        xhr.timeout = ${timeout};
+        xhr.setRequestHeader('Accept', 'application/json');
+        ${method === 'POST' ? `xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');` : ''}
+        xhr.onload = () => {
+          try { resolve(JSON.parse(xhr.responseText)); }
+          catch(e) { reject(new Error('JSON parse failed: ' + xhr.responseText.substring(0, 200))); }
+        };
+        xhr.onerror = () => reject(new Error('Network Error'));
+        xhr.ontimeout = () => reject(new Error('Timeout'));
+        xhr.send(${body ? JSON.stringify(body) : 'null'});
+      });
+    }
+  `;
+
+  const data = await page.evaluate(script) as BossApiResponse;
+
+  // Auto-check auth unless caller opts out
+  if (!opts.allowNonZero && data.code !== 0) {
+    assertOk(data);
+  }
+
+  return data;
+}
+
+// ── Convenience helpers ─────────────────────────────────────────────────────
+
+/**
+ * Fetch the boss friend (chat) list.
+ */
+export async function fetchFriendList(
+  page: IPage,
+  opts: { pageNum?: number; jobId?: string } = {},
+): Promise<any[]> {
+  const pageNum = opts.pageNum ?? 1;
+  const jobId = opts.jobId ?? '0';
+  const url = `https://${BOSS_DOMAIN}/wapi/zprelation/friend/getBossFriendListV2.json?page=${pageNum}&status=0&jobId=${jobId}`;
+  const data = await bossFetch(page, url);
+  return data.zpData?.friendList || [];
+}
+
+/**
+ * Fetch the recommended candidates (greetRecSortList).
+ */
+export async function fetchRecommendList(page: IPage): Promise<any[]> {
+  const url = `https://${BOSS_DOMAIN}/wapi/zprelation/friend/greetRecSortList`;
+  const data = await bossFetch(page, url);
+  return data.zpData?.friendList || [];
+}
+
+/**
+ * Find a friend by encryptUid, searching through friend list and optionally greet list.
+ * Returns null if not found.
+ */
+export async function findFriendByUid(
+  page: IPage,
+  encryptUid: string,
+  opts: { maxPages?: number; checkGreetList?: boolean } = {},
+): Promise<any | null> {
+  const maxPages = opts.maxPages ?? 1;
+  const checkGreetList = opts.checkGreetList ?? false;
+
+  // Search friend list pages
+  for (let p = 1; p <= maxPages; p++) {
+    const friends = await fetchFriendList(page, { pageNum: p });
+    const found = friends.find((f: any) => f.encryptUid === encryptUid);
+    if (found) return found;
+    if (friends.length === 0) break;
+  }
+
+  // Optionally check greet list
+  if (checkGreetList) {
+    const greetList = await fetchRecommendList(page);
+    const found = greetList.find((f: any) => f.encryptUid === encryptUid);
+    if (found) return found;
+  }
+
+  return null;
+}
+
+// ── UI automation helpers ───────────────────────────────────────────────────
+
+/**
+ * Click on a candidate in the chat list by their numeric UID.
+ * @returns true if clicked, false if not found
+ */
+export async function clickCandidateInList(page: IPage, numericUid: string | number): Promise<boolean> {
+  const uid = String(numericUid).replace(/[^0-9]/g, ''); // sanitize to digits only
+  const result: any = await page.evaluate(`
+    async () => {
+      const uid = ${JSON.stringify(uid)};
+      const item = document.querySelector('#_' + uid + '-0') || document.querySelector('[id^="_' + uid + '"]');
+      if (item) {
+        item.click();
+        return { clicked: true };
+      }
+      const items = document.querySelectorAll('.geek-item');
+      for (const el of items) {
+        if (el.id && el.id.startsWith('_' + uid)) {
+          el.click();
+          return { clicked: true };
+        }
+      }
+      return { clicked: false };
+    }
+  `);
+  return result.clicked;
+}
+
+/**
+ * Type a message into the chat editor and send it.
+ * @returns true if sent successfully
+ */
+export async function typeAndSendMessage(page: IPage, text: string): Promise<boolean> {
+  const typed: any = await page.evaluate(`
+    async () => {
+      const selectors = [
+        '.chat-editor [contenteditable="true"]',
+        '.chat-input [contenteditable="true"]',
+        '.message-editor [contenteditable="true"]',
+        '.chat-conversation [contenteditable="true"]',
+        '[contenteditable="true"]',
+        'textarea',
+      ];
+      for (const sel of selectors) {
+        const el = document.querySelector(sel);
+        if (el && el.offsetParent !== null) {
+          el.focus();
+          if (el.tagName === 'TEXTAREA' || el.tagName === 'INPUT') {
+            el.value = ${JSON.stringify(text)};
+            el.dispatchEvent(new Event('input', { bubbles: true }));
+          } else {
+            el.textContent = '';
+            el.focus();
+            document.execCommand('insertText', false, ${JSON.stringify(text)});
+            el.dispatchEvent(new Event('input', { bubbles: true }));
+          }
+          return { found: true };
+        }
+      }
+      return { found: false };
+    }
+  `);
+
+  if (!typed.found) return false;
+
+  await page.wait({ time: 0.5 });
+
+  // Click send button
+  const sent: any = await page.evaluate(`
+    async () => {
+      const btn = document.querySelector('.conversation-editor .submit')
+               || document.querySelector('.submit-content .submit')
+               || document.querySelector('.conversation-operate .submit');
+      if (btn) {
+        btn.click();
+        return { clicked: true };
+      }
+      return { clicked: false };
+    }
+  `);
+
+  if (!sent.clicked) {
+    await page.pressKey('Enter');
+  }
+
+  return true;
+}
+
+/**
+ * Verbose log helper — prints when OPENCLI_VERBOSE or DEBUG=opencli is set.
+ */
+export function verbose(msg: string): void {
+  if (process.env.OPENCLI_VERBOSE || process.env.DEBUG?.includes('opencli')) {
+    console.error(`[opencli:boss] ${msg}`);
+  }
+}

package/src/clis/boss/detail.ts

@@ -1,11 +1,8 @@
 /**
  * BOSS直聘 job detail — fetch full job posting details via browser cookie API.
- *
- * Uses securityId from search results to call the detail API.
- * Returns: job description, skills, welfare, boss info, company info, address.
  */
 import { cli, Strategy } from '../../registry.js';
-import type { IPage } from '../../types.js';
+import { requirePage, navigateTo, bossFetch, verbose } from './common.js';
 
 cli({
   site: 'boss',
@@ -13,10 +10,10 @@ cli({
   description: 'BOSS直聘查看职位详情',
   domain: 'www.zhipin.com',
   strategy: Strategy.COOKIE,
-
+  navigateBefore: false,
   browser: true,
   args: [
-    { name: 'security_id', required: true, help: 'Security ID from search results (securityId field)' },
+    { name: 'security-id', positional: true, required: true, help: 'Security ID from search results (securityId field)' },
   ],
   columns: [
     'name', 'salary', 'experience', 'degree', 'city', 'district',
@@ -25,60 +22,17 @@ cli({
     'company', 'industry', 'scale', 'stage',
     'address', 'url',
   ],
-  func: async (page: IPage | null, kwargs) => {
-    if (!page) throw new Error('Browser page required');
+  func: async (page, kwargs) => {
+    requirePage(page);
 
-    const securityId = kwargs.security_id;
+    const securityId = kwargs['security-id'];
+    verbose('Fetching job detail...');
 
     // Navigate to zhipin.com first to establish cookie context (referrer + cookies)
-    await page.goto('https://www.zhipin.com/web/geek/job');
-    await page.wait({ time: 1 });
+    await navigateTo(page, 'https://www.zhipin.com/web/geek/job');
 
     const targetUrl = `https://www.zhipin.com/wapi/zpgeek/job/detail.json?securityId=${encodeURIComponent(securityId)}`;
-
-    if (process.env.OPENCLI_VERBOSE || process.env.DEBUG?.includes('opencli')) {
-      console.error(`[opencli:boss] Fetching job detail...`);
-    }
-
-    const evaluateScript = `
-      async () => {
-        return new Promise((resolve, reject) => {
-          const xhr = new window.XMLHttpRequest();
-          xhr.open('GET', ${JSON.stringify(targetUrl)}, true);
-          xhr.withCredentials = true;
-          xhr.timeout = 15000;
-          xhr.setRequestHeader('Accept', 'application/json, text/plain, */*');
-          xhr.onload = () => {
-            if (xhr.status >= 200 && xhr.status < 300) {
-              try {
-                resolve(JSON.parse(xhr.responseText));
-              } catch (e) {
-                reject(new Error('Failed to parse JSON. Raw (200 chars): ' + xhr.responseText.substring(0, 200)));
-              }
-            } else {
-              reject(new Error('XHR HTTP Status: ' + xhr.status));
-            }
-          };
-          xhr.onerror = () => reject(new Error('XHR Network Error'));
-          xhr.ontimeout = () => reject(new Error('XHR Timeout'));
-          xhr.send();
-        });
-      }
-    `;
-
-    let data: any;
-    try {
-      data = await page.evaluate(evaluateScript);
-    } catch (e: any) {
-      throw new Error('API evaluate failed: ' + e.message);
-    }
-
-    if (data.code !== 0) {
-      if (data.code === 37) {
-        throw new Error('Cookie 已过期！请在当前 Chrome 浏览器中重新登录 BOSS 直聘。');
-      }
-      throw new Error(`BOSS API error: ${data.message || 'Unknown'} (code=${data.code})`);
-    }
+    const data = await bossFetch(page, targetUrl);
 
     const zpData = data.zpData || {};
     const jobInfo = zpData.jobInfo || {};

package/src/clis/boss/exchange.ts

@@ -1,10 +1,8 @@
 /**
  * BOSS直聘 exchange — request phone/wechat exchange with a candidate.
- *
- * Uses POST /wapi/zpchat/exchange/request to send an exchange request.
  */
 import { cli, Strategy } from '../../registry.js';
-import type { IPage } from '../../types.js';
+import { requirePage, navigateToChat, bossFetch, findFriendByUid, verbose } from './common.js';
 
 cli({
   site: 'boss',
@@ -12,110 +10,38 @@ cli({
   description: 'BOSS直聘交换联系方式（请求手机/微信）',
   domain: 'www.zhipin.com',
   strategy: Strategy.COOKIE,
+  navigateBefore: false,
   browser: true,
   args: [
-    { name: 'uid', required: true, help: 'Encrypted UID of the candidate' },
+    { name: 'uid', required: true, positional: true, help: 'Encrypted UID of the candidate' },
     { name: 'type', default: 'phone', choices: ['phone', 'wechat'], help: 'Exchange type: phone or wechat' },
   ],
   columns: ['status', 'detail'],
-  func: async (page: IPage | null, kwargs) => {
-    if (!page) throw new Error('Browser page required');
+  func: async (page, kwargs) => {
+    requirePage(page);
 
-    const uid = kwargs.uid;
     const exchangeType = kwargs.type || 'phone';
+    verbose(`Requesting ${exchangeType} exchange for ${kwargs.uid}...`);
 
-    if (process.env.OPENCLI_VERBOSE) {
-      console.error(`[opencli:boss] Requesting ${exchangeType} exchange for ${uid}...`);
-    }
+    await navigateToChat(page);
 
-    await page.goto('https://www.zhipin.com/web/chat/index');
-    await page.wait({ time: 2 });
+    const friend = await findFriendByUid(page, kwargs.uid, { checkGreetList: true });
+    if (!friend) throw new Error('未找到该候选人');
 
-    // Find candidate
-    let friend: any = null;
-
-    // Check greet list
-    const greetData: any = await page.evaluate(`
-      async () => {
-        return new Promise((resolve, reject) => {
-          const xhr = new XMLHttpRequest();
-          xhr.open('GET', 'https://www.zhipin.com/wapi/zprelation/friend/greetRecSortList', true);
-          xhr.withCredentials = true;
-          xhr.timeout = 15000;
-          xhr.setRequestHeader('Accept', 'application/json');
-          xhr.onload = () => { try { resolve(JSON.parse(xhr.responseText)); } catch(e) { reject(e); } };
-          xhr.onerror = () => reject(new Error('Network Error'));
-          xhr.send();
-        });
-      }
-    `);
-
-    if (greetData.code === 0) {
-      friend = (greetData.zpData?.friendList || []).find((f: any) => f.encryptUid === uid);
-    }
-
-    if (!friend) {
-      const friendData: any = await page.evaluate(`
-        async () => {
-          return new Promise((resolve, reject) => {
-            const xhr = new XMLHttpRequest();
-            xhr.open('GET', 'https://www.zhipin.com/wapi/zprelation/friend/getBossFriendListV2.json?page=1&status=0&jobId=0', true);
-            xhr.withCredentials = true;
-            xhr.timeout = 15000;
-            xhr.setRequestHeader('Accept', 'application/json');
-            xhr.onload = () => { try { resolve(JSON.parse(xhr.responseText)); } catch(e) { reject(e); } };
-            xhr.onerror = () => reject(new Error('Network Error'));
-            xhr.send();
-          });
-        }
-      `);
-      if (friendData.code === 0) {
-        friend = (friendData.zpData?.friendList || []).find((f: any) => f.encryptUid === uid);
-      }
-    }
-
-    if (!friend) {
-      throw new Error('未找到该候选人');
-    }
-
-    const numericUid = friend.uid;
     const friendName = friend.name || '候选人';
-    const securityId = friend.securityId || '';
-
-    // type mapping from JS source: 1=phone, 2=wechat, 4=resume
     const typeId = exchangeType === 'wechat' ? 2 : 1;
 
-    // Params from JS: {type, securityId, uniqueId, name}
     const params = new URLSearchParams({
       type: String(typeId),
-      securityId: securityId,
-      uniqueId: String(numericUid),
+      securityId: friend.securityId || '',
+      uniqueId: String(friend.uid),
       name: friendName,
     });
 
-    // POST with form-urlencoded (discovered from 336.js bundle)
-    const data: any = await page.evaluate(`
-      async () => {
-        return new Promise((resolve, reject) => {
-          const xhr = new XMLHttpRequest();
-          xhr.open('POST', 'https://www.zhipin.com/wapi/zpchat/exchange/request', true);
-          xhr.withCredentials = true;
-          xhr.timeout = 15000;
-          xhr.setRequestHeader('Accept', 'application/json');
-          xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
-          xhr.onload = () => { try { resolve(JSON.parse(xhr.responseText)); } catch(e) { reject(new Error('JSON parse failed')); } };
-          xhr.onerror = () => reject(new Error('Network Error'));
-          xhr.send(${JSON.stringify(params.toString())});
-        });
-      }
-    `);
-
-    if (data.code !== 0) {
-      if (data.code === 7 || data.code === 37) {
-        throw new Error('Cookie 已过期！请在当前 Chrome 浏览器中重新登录 BOSS 直聘。');
-      }
-      throw new Error(`交换请求失败: ${data.message} (code=${data.code})`);
-    }
+    await bossFetch(page, 'https://www.zhipin.com/wapi/zpchat/exchange/request', {
+      method: 'POST',
+      body: params.toString(),
+    });
 
     const typeLabel = exchangeType === 'wechat' ? '微信' : '手机号';
     return [{