@jackwener/opencli 1.1.0 → 1.2.0

package/src/clis/boss/recommend.ts

@@ -1,11 +1,8 @@
 /**
  * BOSS直聘 recommend — view recommended candidates (新招呼/greet sort list).
- *
- * Uses /wapi/zprelation/friend/greetRecSortList to get system-recommended candidates.
- * These are candidates who have greeted or been recommended by the system.
  */
 import { cli, Strategy } from '../../registry.js';
-import type { IPage } from '../../types.js';
+import { requirePage, navigateToChat, bossFetch, fetchRecommendList, verbose } from './common.js';
 
 cli({
   site: 'boss',
@@ -13,39 +10,22 @@ cli({
   description: 'BOSS直聘查看推荐候选人（新招呼列表）',
   domain: 'www.zhipin.com',
   strategy: Strategy.COOKIE,
+  navigateBefore: false,
   browser: true,
   args: [
     { name: 'limit', type: 'int', default: 20, help: 'Number of results to return' },
   ],
   columns: ['name', 'job_name', 'last_time', 'labels', 'encrypt_uid', 'security_id', 'encrypt_job_id'],
-  func: async (page: IPage | null, kwargs) => {
-    if (!page) throw new Error('Browser page required');
+  func: async (page, kwargs) => {
+    requirePage(page);
+    verbose('Fetching recommended candidates...');
 
-    const limit = kwargs.limit || 20;
-
-    if (process.env.OPENCLI_VERBOSE) {
-      console.error('[opencli:boss] Fetching recommended candidates...');
-    }
-
-    await page.goto('https://www.zhipin.com/web/chat/index');
-    await page.wait({ time: 2 });
+    await navigateToChat(page);
 
     // Get label definitions for mapping
-    const labelData: any = await page.evaluate(`
-      async () => {
-        return new Promise((resolve, reject) => {
-          const xhr = new XMLHttpRequest();
-          xhr.open('GET', 'https://www.zhipin.com/wapi/zprelation/friend/label/get', true);
-          xhr.withCredentials = true;
-          xhr.timeout = 10000;
-          xhr.setRequestHeader('Accept', 'application/json');
-          xhr.onload = () => { try { resolve(JSON.parse(xhr.responseText)); } catch(e) { resolve({}); } };
-          xhr.onerror = () => resolve({});
-          xhr.send();
-        });
-      }
-    `);
-
+    const labelData = await bossFetch(page, 'https://www.zhipin.com/wapi/zprelation/friend/label/get', {
+      allowNonZero: true,
+    });
     const labelMap: Record<number, string> = {};
     if (labelData.code === 0 && labelData.zpData?.labels) {
       for (const l of labelData.zpData.labels) {
@@ -53,35 +33,10 @@ cli({
       }
     }
 
-    // Get recommended candidates
-    const targetUrl = 'https://www.zhipin.com/wapi/zprelation/friend/greetRecSortList';
-
-    const data: any = await page.evaluate(`
-      async () => {
-        return new Promise((resolve, reject) => {
-          const xhr = new XMLHttpRequest();
-          xhr.open('GET', '${targetUrl}', true);
-          xhr.withCredentials = true;
-          xhr.timeout = 15000;
-          xhr.setRequestHeader('Accept', 'application/json');
-          xhr.onload = () => { try { resolve(JSON.parse(xhr.responseText)); } catch(e) { reject(new Error('JSON parse failed')); } };
-          xhr.onerror = () => reject(new Error('Network Error'));
-          xhr.ontimeout = () => reject(new Error('Timeout'));
-          xhr.send();
-        });
-      }
-    `);
-
-    if (data.code !== 0) {
-      if (data.code === 7 || data.code === 37) {
-        throw new Error('Cookie 已过期！请在当前 Chrome 浏览器中重新登录 BOSS 直聘。');
-      }
-      throw new Error(`API error: ${data.message} (code=${data.code})`);
-    }
-
-    const friends = (data.zpData?.friendList || []).slice(0, limit);
+    const friends = await fetchRecommendList(page);
+    const limit = kwargs.limit || 20;
 
-    return friends.map((f: any) => ({
+    return friends.slice(0, limit).map((f: any) => ({
       name: f.name || '',
       job_name: f.jobName || '',
       last_time: f.lastTime || '',

package/src/clis/boss/resume.ts

@@ -2,17 +2,15 @@
  * BOSS直聘 resume — view candidate resume/profile via chat page UI scraping (boss side).
  *
  * Flow: navigate to chat page → click on candidate → scrape the right panel info.
- * The chat page loads candidate basic info, work experience, and education
- * in the right panel when a candidate is selected.
  *
- * HTML structure (right panel):
+ * Right panel HTML structure:
  *  .base-info-single-detial → name, gender, age, experience, degree
  *  .experience-content.time-list → time ranges (icon-base-info-work / icon-base-info-edu)
  *  .experience-content.detail-list → details (company·position / school·major·degree)
  *  .position-content → job being discussed + expectation
  */
 import { cli, Strategy } from '../../registry.js';
-import type { IPage } from '../../types.js';
+import { requirePage, navigateToChat, findFriendByUid, clickCandidateInList } from './common.js';
 
 cli({
   site: 'boss',
@@ -20,119 +18,42 @@ 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 (from chatlist)' },
+    { name: 'uid', required: true, positional: true, help: 'Encrypted UID of the candidate (from chatlist)' },
   ],
   columns: [
     'name', 'gender', 'age', 'experience', 'degree', 'active_time',
     'work_history', 'education',
     'job_chatting', 'expect',
   ],
-  func: async (page: IPage | null, kwargs) => {
-    if (!page) throw new Error('Browser page required');
-
-    const uid = kwargs.uid;
-
-    // Step 1: Navigate to chat page
-    await page.goto('https://www.zhipin.com/web/chat/index');
-    await page.wait({ time: 3 });
-
-    // Step 2: Get friend list to find candidate's numeric 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();
-        });
-      }
-    `);
+  func: async (page, kwargs) => {
+    requirePage(page);
 
-    if (friendData.code !== 0) {
-      if (friendData.code === 7 || friendData.code === 37) {
-        throw new Error('Cookie 已过期！请在当前 Chrome 浏览器中重新登录 BOSS 直聘。');
-      }
-      throw new Error('获取好友列表失败: ' + (friendData.message || friendData.code));
-    }
-
-    let friend: any = null;
-    const allFriends = friendData.zpData?.friendList || [];
-    friend = allFriends.find((f: any) => f.encryptUid === uid);
-
-    if (!friend) {
-      for (let p = 2; p <= 5; p++) {
-        const moreUrl = `https://www.zhipin.com/wapi/zprelation/friend/getBossFriendListV2.json?page=${p}&status=0&jobId=0`;
-        const moreData: any = await page.evaluate(`
-          async () => {
-            return new Promise((resolve, reject) => {
-              const xhr = new XMLHttpRequest();
-              xhr.open('GET', '${moreUrl}', 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 (moreData.code === 0) {
-          const list = moreData.zpData?.friendList || [];
-          friend = list.find((f: any) => f.encryptUid === uid);
-          if (friend) break;
-          if (list.length === 0) break;
-        }
-      }
-    }
+    await navigateToChat(page, 3);
 
+    const friend = await findFriendByUid(page, kwargs.uid, { maxPages: 5 });
     if (!friend) throw new Error('未找到该候选人，请确认 uid 是否正确');
 
     const numericUid = friend.uid;
 
-    // Step 3: Click on candidate in chat list
-    const clicked: any = await page.evaluate(`
-      async () => {
-        const item = document.querySelector('#_${numericUid}-0') || document.querySelector('[id^="_${numericUid}"]');
-        if (item) {
-          item.click();
-          return { clicked: true };
-        }
-        const items = document.querySelectorAll('.geek-item');
-        for (const el of items) {
-          if (el.id && el.id.startsWith('_${numericUid}')) {
-            el.click();
-            return { clicked: true };
-          }
-        }
-        return { clicked: false };
-      }
-    `);
-
-    if (!clicked.clicked) {
+    const clicked = await clickCandidateInList(page, numericUid);
+    if (!clicked) {
       throw new Error('无法在聊天列表中找到该用户，请确认聊天列表中有此人');
     }
 
-    // Step 4: Wait for right panel to load
     await page.wait({ time: 2 });
 
-    // Step 5: Scrape the right panel
+    // Scrape the right panel
     const resumeInfo: any = await page.evaluate(`
       (() => {
         const container = document.querySelector('.base-info-single-container') || document.querySelector('.base-info-content');
         if (!container) return { error: 'no container found' };
 
-        // === Basic Info ===
         const nameEl = container.querySelector('.base-name');
         const name = nameEl ? nameEl.textContent.trim() : '';
 
-        // Gender
         let gender = '';
         const detailDiv = container.querySelector('.base-info-single-detial');
         if (detailDiv) {
@@ -144,11 +65,9 @@ cli({
           }
         }
 
-        // Active time
         const activeEl = container.querySelector('.active-time');
         const activeTime = activeEl ? activeEl.textContent.trim() : '';
 
-        // Age, experience, degree — direct child divs of .base-info-single-detial
         let age = '', experience = '', degree = '';
         if (detailDiv) {
           for (const el of detailDiv.children) {
@@ -163,50 +82,32 @@ cli({
           }
         }
 
-        // === Work & Education ===
-        // Structure: two .experience-content divs
-        //   1. .time-list → <li> items with icon (work/edu) and time span
-        //   2. .detail-list → <li> items with icon (work/edu) and detail text
-        // Each <li> has a <use> with xlink:href "#icon-base-info-work" or "#icon-base-info-edu"
-
-        const workTimes = [];
-        const eduTimes = [];
-        const workDetails = [];
-        const eduDetails = [];
+        const workTimes = [], eduTimes = [], workDetails = [], eduDetails = [];
 
         const timeList = container.querySelector('.experience-content.time-list');
         if (timeList) {
-          const lis = timeList.querySelectorAll('li');
-          for (const li of lis) {
+          for (const li of timeList.querySelectorAll('li')) {
             const useEl = li.querySelector('use');
             const href = useEl ? (useEl.getAttribute('xlink:href') || useEl.getAttribute('href') || '') : '';
             const timeSpan = li.querySelector('.time');
             const timeText = timeSpan ? timeSpan.textContent.trim() : li.textContent.trim();
-            if (href.includes('base-info-edu')) {
-              eduTimes.push(timeText);
-            } else {
-              workTimes.push(timeText);
-            }
+            if (href.includes('base-info-edu')) eduTimes.push(timeText);
+            else workTimes.push(timeText);
           }
         }
 
         const detailList = container.querySelector('.experience-content.detail-list');
         if (detailList) {
-          const lis = detailList.querySelectorAll('li');
-          for (const li of lis) {
+          for (const li of detailList.querySelectorAll('li')) {
             const useEl = li.querySelector('use');
             const href = useEl ? (useEl.getAttribute('xlink:href') || useEl.getAttribute('href') || '') : '';
             const valueSpan = li.querySelector('.value');
             const valueText = valueSpan ? valueSpan.textContent.trim() : li.textContent.trim();
-            if (href.includes('base-info-edu')) {
-              eduDetails.push(valueText);
-            } else {
-              workDetails.push(valueText);
-            }
+            if (href.includes('base-info-edu')) eduDetails.push(valueText);
+            else workDetails.push(valueText);
           }
         }
 
-        // Combine times and details
         const workHistory = [];
         for (let i = 0; i < Math.max(workTimes.length, workDetails.length); i++) {
           const parts = [];
@@ -223,22 +124,16 @@ cli({
           if (parts.length) education.push(parts.join('  '));
         }
 
-        // === Job Chatting & Expect ===
         const positionContent = container.querySelector('.position-content');
         let jobChatting = '', expect = '';
         if (positionContent) {
           const posNameEl = positionContent.querySelector('.position-name');
           if (posNameEl) jobChatting = posNameEl.textContent.trim();
-
           const expectEl = positionContent.querySelector('.position-item.expect .value');
           if (expectEl) expect = expectEl.textContent.trim();
         }
 
-        return {
-          name, gender, age, experience, degree, activeTime,
-          workHistory, education,
-          jobChatting, expect,
-        };
+        return { name, gender, age, experience, degree, activeTime, workHistory, education, jobChatting, expect };
       })()
     `);
 

package/src/clis/boss/search.ts

@@ -2,7 +2,7 @@
  * BOSS直聘 job search — browser cookie API.
  */
 import { cli, Strategy } from '../../registry.js';
-import type { IPage } from '../../types.js';
+import { requirePage, navigateTo, bossFetch, assertOk, verbose } from './common.js';
 
 /** City name → BOSS Zhipin city code mapping */
 const CITY_CODES: Record<string, string> = {
@@ -69,10 +69,10 @@ cli({
   description: 'BOSS直聘搜索职位',
   domain: 'www.zhipin.com',
   strategy: Strategy.COOKIE,
-
+  navigateBefore: false,
   browser: true,
   args: [
-    { name: 'query', required: true, help: 'Search keyword (e.g. AI agent, 前端)' },
+    { name: 'query', required: true, positional: true, help: 'Search keyword (e.g. AI agent, 前端)' },
     { name: 'city', default: '北京', help: 'City name or code (e.g. 杭州, 上海, 101010100)' },
     { name: 'experience', default: '', help: 'Experience: 应届/1年以内/1-3年/3-5年/5-10年/10年以上' },
     { name: 'degree', default: '', help: 'Degree: 大专/本科/硕士/博士' },
@@ -82,19 +82,13 @@ cli({
     { name: 'limit', type: 'int', default: 15, help: 'Number of results' },
   ],
   columns: ['name', 'salary', 'company', 'area', 'experience', 'degree', 'skills', 'boss', 'security_id', 'url'],
-  func: async (page: IPage | null, kwargs) => {
-    if (!page) throw new Error('Browser page required');
+  func: async (page, kwargs) => {
+    requirePage(page);
 
     const cityCode = resolveCity(kwargs.city);
-    
-    if (process.env.OPENCLI_VERBOSE || process.env.DEBUG?.includes('opencli')) {
-      console.error(`[opencli:boss] Navigating to set referrer context...`);
-    }
-    // Navigate to the Web search view first to establish proper referrer context
-    // This is a lesson learned from boss-cli: referrer is important
-    await page.goto(`https://www.zhipin.com/web/geek/job?query=${encodeURIComponent(kwargs.query)}&city=${cityCode}`);
-    
-    // Give the page a tiny bit of time to settle to avoid immediate 403s
+    verbose('Navigating to set referrer context...');
+
+    await navigateTo(page, `https://www.zhipin.com/web/geek/job?query=${encodeURIComponent(kwargs.query)}&city=${cityCode}`);
     await new Promise(r => setTimeout(r, 1000));
 
     const expVal = resolveMap(kwargs.experience, EXP_MAP);
@@ -109,7 +103,6 @@ cli({
 
     while (allJobs.length < limit) {
       if (allJobs.length > 0) {
-        // Human-like pause between page fetches (1-3 seconds)
         await new Promise(r => setTimeout(r, 1000 + Math.random() * 2000));
       }
 
@@ -126,62 +119,19 @@ cli({
       if (industryVal) qs.set('industry', industryVal);
 
       const targetUrl = `https://www.zhipin.com/wapi/zpgeek/search/joblist.json?${qs.toString()}`;
+      verbose(`Fetching page ${currentPage}... (current jobs: ${allJobs.length})`);
 
-      if (process.env.OPENCLI_VERBOSE || process.env.DEBUG?.includes('opencli')) {
-        console.error(`[opencli:boss] Fetching page ${currentPage}... (current jobs: ${allJobs.length})`);
-      }
-
-      const evaluateScript = `
-        async () => {
-          return new Promise((resolve, reject) => {
-            const xhr = new window.XMLHttpRequest();
-            xhr.open('GET', '${targetUrl}', true);
-            xhr.withCredentials = true;
-            xhr.timeout = 15000; // 15s timeout
-            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})\nRaw data: ${JSON.stringify(data)}`);
-      }
+      const data = await bossFetch(page, targetUrl);
 
       const zpData = data.zpData || {};
       const batch = zpData.jobList || [];
-      if (batch.length === 0) {
-        break; // No more results
-      }
+      if (batch.length === 0) break;
 
       let addedInBatch = 0;
       for (const j of batch) {
         if (!j.encryptJobId || seenIds.has(j.encryptJobId)) continue;
         seenIds.add(j.encryptJobId);
-        
+
         allJobs.push({
           name: j.jobName,
           salary: j.salaryDesc,
@@ -199,14 +149,11 @@ cli({
       }
 
       if (addedInBatch === 0) {
-        // Boss API is repeating identical pages, we've hit the pagination limit
-        if (process.env.OPENCLI_VERBOSE) console.error(`[opencli:boss] API returned duplicate page, stopping pagination at ${allJobs.length} items`);
+        verbose(`API returned duplicate page, stopping pagination at ${allJobs.length} items`);
         break;
       }
 
-      if (!zpData.hasMore) {
-        break; // API says no more pages
-      }
+      if (!zpData.hasMore) break;
       currentPage++;
     }