@jackwener/opencli 1.3.1 → 1.3.3

package/dist/clis/xiaohongshu/download.js

@@ -4,11 +4,9 @@
  * Usage:
  *   opencli xiaohongshu download --note_id abc123 --output ./xhs
  */
-import * as fs from 'node:fs';
-import * as path from 'node:path';
 import { cli, Strategy } from '../../registry.js';
-import { httpDownload, formatCookieHeader, } from '../../download/index.js';
-import { DownloadProgressTracker, formatBytes } from '../../download/progress.js';
+import { formatCookieHeader } from '../../download/index.js';
+import { downloadMedia } from '../../download/media-download.js';
 cli({
     site: 'xiaohongshu',
     name: 'download',
@@ -50,7 +48,7 @@ cli({
           '.note-slider img',
           '.note-image img',
           '.image-wrapper img',
-          '#noteContainer img[src*="xhscdn"]',
+          '#noteContainer .media-container img[src*="xhscdn"]',
           'img[src*="ci.xiaohongshu.com"]'
         ];
 
@@ -61,7 +59,6 @@ cli({
             if (src && (src.includes('xhscdn') || src.includes('xiaohongshu'))) {
               // Convert to high quality URL (remove resize parameters)
               src = src.split('?')[0];
-              // Try to get original size
               src = src.replace(/\\/imageView\\d+\\/\\d+\\/w\\/\\d+/, '');
               imageUrls.add(src);
             }
@@ -80,20 +77,14 @@ cli({
           document.querySelectorAll(selector).forEach(v => {
             const src = v.src || v.getAttribute('src') || '';
             if (src) {
-              result.media.push({
-                type: 'video',
-                url: src
-              });
+              result.media.push({ type: 'video', url: src });
             }
           });
         }
 
         // Add images to media
         imageUrls.forEach(url => {
-          result.media.push({
-            type: 'image',
-            url: url
-          });
+          result.media.push({ type: 'image', url: url });
         });
 
         return result;
@@ -104,51 +95,12 @@ cli({
         }
         // Extract cookies for authenticated downloads
         const cookies = formatCookieHeader(await page.getCookies({ domain: 'xiaohongshu.com' }));
-        // Create output directory
-        const outputDir = path.join(output, noteId);
-        fs.mkdirSync(outputDir, { recursive: true });
-        // Download all media files
-        const tracker = new DownloadProgressTracker(data.media.length, true);
-        const results = [];
-        for (let i = 0; i < data.media.length; i++) {
-            const media = data.media[i];
-            const ext = media.type === 'video' ? 'mp4' : 'jpg';
-            const filename = `${noteId}_${i + 1}.${ext}`;
-            const destPath = path.join(outputDir, filename);
-            const progressBar = tracker.onFileStart(filename, i);
-            try {
-                const result = await httpDownload(media.url, destPath, {
-                    cookies,
-                    timeout: 60000,
-                    onProgress: (received, total) => {
-                        if (progressBar)
-                            progressBar.update(received, total);
-                    },
-                });
-                if (progressBar) {
-                    progressBar.complete(result.success, result.success ? formatBytes(result.size) : undefined);
-                }
-                tracker.onFileComplete(result.success);
-                results.push({
-                    index: i + 1,
-                    type: media.type,
-                    status: result.success ? 'success' : 'failed',
-                    size: result.success ? formatBytes(result.size) : (result.error || 'unknown error'),
-                });
-            }
-            catch (err) {
-                if (progressBar)
-                    progressBar.fail(err.message);
-                tracker.onFileComplete(false);
-                results.push({
-                    index: i + 1,
-                    type: media.type,
-                    status: 'failed',
-                    size: err.message,
-                });
-            }
-        }
-        tracker.finish();
-        return results;
+        return downloadMedia(data.media, {
+            output,
+            subdir: noteId,
+            cookies,
+            filenamePrefix: noteId,
+            timeout: 60000,
+        });
     },
 });

package/dist/clis/xiaohongshu/publish.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Xiaohongshu 图文笔记 publisher — creator center UI automation.
+ *
+ * Flow:
+ *   1. Navigate to creator publish page
+ *   2. Upload images via DataTransfer injection into the file input
+ *   3. Fill title and body text
+ *   4. Add topic hashtags
+ *   5. Publish (or save as draft)
+ *
+ * Requires: logged into creator.xiaohongshu.com in Chrome.
+ *
+ * Usage:
+ *   opencli xiaohongshu publish --title "标题" "正文内容" \
+ *     --images /path/a.jpg,/path/b.jpg \
+ *     --topics 生活,旅行
+ */
+export {};

package/dist/clis/xiaohongshu/publish.js

@@ -0,0 +1,352 @@
+/**
+ * Xiaohongshu 图文笔记 publisher — creator center UI automation.
+ *
+ * Flow:
+ *   1. Navigate to creator publish page
+ *   2. Upload images via DataTransfer injection into the file input
+ *   3. Fill title and body text
+ *   4. Add topic hashtags
+ *   5. Publish (or save as draft)
+ *
+ * Requires: logged into creator.xiaohongshu.com in Chrome.
+ *
+ * Usage:
+ *   opencli xiaohongshu publish --title "标题" "正文内容" \
+ *     --images /path/a.jpg,/path/b.jpg \
+ *     --topics 生活,旅行
+ */
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import { cli, Strategy } from '../../registry.js';
+const PUBLISH_URL = 'https://creator.xiaohongshu.com/publish/publish?from=menu_left';
+const MAX_IMAGES = 9;
+const MAX_TITLE_LEN = 20;
+const UPLOAD_SETTLE_MS = 3000;
+/**
+ * Read a local image and return the name, MIME type, and base64 content.
+ * Throws if the file does not exist or the extension is unsupported.
+ */
+function readImageFile(filePath) {
+    const absPath = path.resolve(filePath);
+    if (!fs.existsSync(absPath))
+        throw new Error(`Image file not found: ${absPath}`);
+    const ext = path.extname(absPath).toLowerCase();
+    const mimeMap = {
+        '.jpg': 'image/jpeg',
+        '.jpeg': 'image/jpeg',
+        '.png': 'image/png',
+        '.gif': 'image/gif',
+        '.webp': 'image/webp',
+    };
+    const mimeType = mimeMap[ext];
+    if (!mimeType)
+        throw new Error(`Unsupported image format "${ext}". Supported: jpg, png, gif, webp`);
+    const base64 = fs.readFileSync(absPath).toString('base64');
+    return { name: path.basename(absPath), mimeType, base64 };
+}
+/**
+ * Inject images into the page's file input using DataTransfer.
+ * Converts base64 payloads to File objects in the browser context, then dispatches
+ * a synthetic 'change' event on the input element.
+ *
+ * Returns { ok, count, error }.
+ */
+async function injectImages(page, images) {
+    const payload = JSON.stringify(images);
+    return page.evaluate(`
+    (async () => {
+      const images = ${payload};
+
+      // Prefer image/* file inputs; fall back to the first available input.
+      const inputs = Array.from(document.querySelectorAll('input[type="file"]'));
+      const input = inputs.find(el => {
+        const accept = el.getAttribute('accept') || '';
+        return accept.includes('image') || accept.includes('.jpg') || accept.includes('.png');
+      }) || inputs[0];
+
+      if (!input) return { ok: false, count: 0, error: 'No file input found on page' };
+
+      const dt = new DataTransfer();
+      for (const img of images) {
+        try {
+          const binary = atob(img.base64);
+          const bytes = new Uint8Array(binary.length);
+          for (let i = 0; i < binary.length; i++) bytes[i] = binary.charCodeAt(i);
+          const blob = new Blob([bytes], { type: img.mimeType });
+          dt.items.add(new File([blob], img.name, { type: img.mimeType }));
+        } catch (e) {
+          return { ok: false, count: 0, error: 'Failed to create File: ' + e.message };
+        }
+      }
+
+      Object.defineProperty(input, 'files', { value: dt.files, writable: false });
+      input.dispatchEvent(new Event('change', { bubbles: true }));
+      input.dispatchEvent(new Event('input', { bubbles: true }));
+
+      return { ok: true, count: dt.files.length };
+    })()
+  `);
+}
+/**
+ * Wait until all upload progress indicators have disappeared (up to maxWaitMs).
+ */
+async function waitForUploads(page, maxWaitMs = 30_000) {
+    const pollMs = 2_000;
+    const maxAttempts = Math.ceil(maxWaitMs / pollMs);
+    for (let i = 0; i < maxAttempts; i++) {
+        const uploading = await page.evaluate(`
+      () => !!document.querySelector(
+        '[class*="upload"][class*="progress"], [class*="uploading"], [class*="loading"][class*="image"]'
+      )
+    `);
+        if (!uploading)
+            return;
+        await page.wait({ time: pollMs / 1_000 });
+    }
+}
+/**
+ * Fill a visible text input or contenteditable with the given text.
+ * Tries multiple selectors in priority order.
+ * Returns { ok, sel }.
+ */
+async function fillField(page, selectors, text, fieldName) {
+    const result = await page.evaluate(`
+    (function(selectors, text) {
+      for (const sel of selectors) {
+        const candidates = document.querySelectorAll(sel);
+        for (const el of candidates) {
+          if (!el || el.offsetParent === null) continue;
+          el.focus();
+          if (el.tagName === 'INPUT' || el.tagName === 'TEXTAREA') {
+            el.value = '';
+            document.execCommand('selectAll', false);
+            document.execCommand('insertText', false, text);
+            el.dispatchEvent(new Event('input', { bubbles: true }));
+            el.dispatchEvent(new Event('change', { bubbles: true }));
+          } else {
+            // contenteditable
+            el.textContent = '';
+            document.execCommand('selectAll', false);
+            document.execCommand('insertText', false, text);
+            el.dispatchEvent(new Event('input', { bubbles: true }));
+          }
+          return { ok: true, sel };
+        }
+      }
+      return { ok: false };
+    })(${JSON.stringify(selectors)}, ${JSON.stringify(text)})
+  `);
+    if (!result.ok) {
+        await page.screenshot({ path: `/tmp/xhs_publish_${fieldName}_debug.png` });
+        throw new Error(`Could not find ${fieldName} input. Debug screenshot: /tmp/xhs_publish_${fieldName}_debug.png`);
+    }
+}
+cli({
+    site: 'xiaohongshu',
+    name: 'publish',
+    description: '小红书发布图文笔记 (creator center UI automation)',
+    domain: 'creator.xiaohongshu.com',
+    strategy: Strategy.COOKIE,
+    browser: true,
+    args: [
+        { name: 'title', required: true, help: '笔记标题 (最多20字)' },
+        { name: 'content', required: true, positional: true, help: '笔记正文' },
+        { name: 'images', required: false, help: '图片路径，逗号分隔，最多9张 (jpg/png/gif/webp)' },
+        { name: 'topics', required: false, help: '话题标签，逗号分隔，不含 # 号' },
+        { name: 'draft', type: 'bool', default: false, help: '保存为草稿，不直接发布' },
+    ],
+    columns: ['status', 'detail'],
+    func: async (page, kwargs) => {
+        if (!page)
+            throw new Error('Browser page required');
+        const title = String(kwargs.title ?? '').trim();
+        const content = String(kwargs.content ?? '').trim();
+        const imagePaths = kwargs.images
+            ? String(kwargs.images).split(',').map((s) => s.trim()).filter(Boolean)
+            : [];
+        const topics = kwargs.topics
+            ? String(kwargs.topics).split(',').map((s) => s.trim()).filter(Boolean)
+            : [];
+        const isDraft = Boolean(kwargs.draft);
+        // ── Validate inputs ────────────────────────────────────────────────────────
+        if (!title)
+            throw new Error('--title is required');
+        if (title.length > MAX_TITLE_LEN)
+            throw new Error(`Title is ${title.length} chars — must be ≤ ${MAX_TITLE_LEN}`);
+        if (!content)
+            throw new Error('Positional argument <content> is required');
+        if (imagePaths.length > MAX_IMAGES)
+            throw new Error(`Too many images: ${imagePaths.length} (max ${MAX_IMAGES})`);
+        // Read images in Node.js context before navigating (fast-fail on bad paths)
+        const imageData = imagePaths.map(readImageFile);
+        // ── Step 1: Navigate to publish page ──────────────────────────────────────
+        await page.goto(PUBLISH_URL);
+        await page.wait({ time: 3 });
+        // Verify we landed on the creator site (not redirected to login)
+        const pageUrl = await page.evaluate('() => location.href');
+        if (!pageUrl.includes('creator.xiaohongshu.com')) {
+            throw new Error('Redirected away from creator center — session may have expired. ' +
+                'Re-capture browser login via: opencli xiaohongshu creator-profile');
+        }
+        // ── Step 2: Select 图文 (image+text) note type if tabs are present ─────────
+        const tabClicked = await page.evaluate(`
+      () => {
+        const allEls = document.querySelectorAll('[class*="tab"], [class*="note-type"], [class*="type-item"]');
+        for (const el of allEls) {
+          const text = el.innerText || el.textContent || '';
+          if ((text.includes('图文') || text.includes('图片')) && el.offsetParent !== null) {
+            el.click();
+            return true;
+          }
+        }
+        return false;
+      }
+    `);
+        if (tabClicked)
+            await page.wait({ time: 1 });
+        // ── Step 3: Upload images ──────────────────────────────────────────────────
+        if (imageData.length > 0) {
+            const upload = await injectImages(page, imageData);
+            if (!upload.ok) {
+                await page.screenshot({ path: '/tmp/xhs_publish_upload_debug.png' });
+                throw new Error(`Image injection failed: ${upload.error ?? 'unknown'}. ` +
+                    'Debug screenshot: /tmp/xhs_publish_upload_debug.png');
+            }
+            // Allow XHS to process and upload images to its CDN
+            await page.wait({ time: UPLOAD_SETTLE_MS / 1_000 });
+            await waitForUploads(page);
+        }
+        // ── Step 4: Fill title ─────────────────────────────────────────────────────
+        await fillField(page, [
+            'input[maxlength="20"]',
+            'input[class*="title"]',
+            'input[placeholder*="标题"]',
+            'input[placeholder*="title" i]',
+            '.title-input input',
+            '.note-title input',
+            'input[maxlength]',
+        ], title, 'title');
+        await page.wait({ time: 0.5 });
+        // ── Step 5: Fill content / body ────────────────────────────────────────────
+        await fillField(page, [
+            '[contenteditable="true"][class*="content"]',
+            '[contenteditable="true"][class*="editor"]',
+            '[contenteditable="true"][placeholder*="描述"]',
+            '[contenteditable="true"][placeholder*="正文"]',
+            '[contenteditable="true"][placeholder*="内容"]',
+            '.note-content [contenteditable="true"]',
+            '.editor-content [contenteditable="true"]',
+            // Broad fallback — last resort; filter out any title contenteditable
+            '[contenteditable="true"]:not([placeholder*="标题"]):not([placeholder*="title" i])',
+        ], content, 'content');
+        await page.wait({ time: 0.5 });
+        // ── Step 6: Add topic hashtags ─────────────────────────────────────────────
+        for (const topic of topics) {
+            // Click the "添加话题" button
+            const btnClicked = await page.evaluate(`
+        () => {
+          const candidates = document.querySelectorAll('*');
+          for (const el of candidates) {
+            const text = (el.innerText || el.textContent || '').trim();
+            if (
+              (text === '添加话题' || text === '# 话题' || text.startsWith('添加话题')) &&
+              el.offsetParent !== null &&
+              el.children.length === 0
+            ) {
+              el.click();
+              return true;
+            }
+          }
+          // fallback: look for a hashtag icon button
+          const hashBtn = document.querySelector('[class*="topic"][class*="btn"], [class*="hashtag"][class*="btn"]');
+          if (hashBtn) { hashBtn.click(); return true; }
+          return false;
+        }
+      `);
+            if (!btnClicked)
+                continue; // Skip topic if UI not found — non-fatal
+            await page.wait({ time: 1 });
+            // Type into the topic search input
+            const typed = await page.evaluate(`
+        (topicName => {
+          const input = document.querySelector(
+            '[class*="topic"] input, [class*="hashtag"] input, input[placeholder*="搜索话题"]'
+          );
+          if (!input || input.offsetParent === null) return false;
+          input.focus();
+          document.execCommand('insertText', false, topicName);
+          input.dispatchEvent(new Event('input', { bubbles: true }));
+          return true;
+        })(${JSON.stringify(topic)})
+      `);
+            if (!typed)
+                continue;
+            await page.wait({ time: 1.5 }); // Wait for autocomplete suggestions
+            // Click the first suggestion
+            await page.evaluate(`
+        () => {
+          const item = document.querySelector(
+            '[class*="topic-item"], [class*="hashtag-item"], [class*="suggest-item"], [class*="suggestion"] li'
+          );
+          if (item) item.click();
+        }
+      `);
+            await page.wait({ time: 0.5 });
+        }
+        // ── Step 7: Publish or save draft ─────────────────────────────────────────
+        const actionLabel = isDraft ? '存草稿' : '发布';
+        const btnClicked = await page.evaluate(`
+      (label => {
+        const buttons = document.querySelectorAll('button, [role="button"]');
+        for (const btn of buttons) {
+          const text = (btn.innerText || btn.textContent || '').trim();
+          if (
+            (text === label || text.includes(label) || text === '发布笔记') &&
+            btn.offsetParent !== null &&
+            !btn.disabled
+          ) {
+            btn.click();
+            return true;
+          }
+        }
+        return false;
+      })(${JSON.stringify(actionLabel)})
+    `);
+        if (!btnClicked) {
+            await page.screenshot({ path: '/tmp/xhs_publish_submit_debug.png' });
+            throw new Error(`Could not find "${actionLabel}" button. ` +
+                'Debug screenshot: /tmp/xhs_publish_submit_debug.png');
+        }
+        // ── Step 8: Verify success ─────────────────────────────────────────────────
+        await page.wait({ time: 4 });
+        const finalUrl = await page.evaluate('() => location.href');
+        const successMsg = await page.evaluate(`
+      () => {
+        for (const el of document.querySelectorAll('*')) {
+          const text = (el.innerText || '').trim();
+          if (
+            el.children.length === 0 &&
+            (text.includes('发布成功') || text.includes('草稿已保存') || text.includes('上传成功'))
+          ) return text;
+        }
+        return '';
+      }
+    `);
+        const navigatedAway = !finalUrl.includes('/publish/publish');
+        const isSuccess = successMsg.length > 0 || navigatedAway;
+        const verb = isDraft ? '草稿已保存' : '发布成功';
+        return [
+            {
+                status: isSuccess ? `✅ ${verb}` : '⚠️ 操作完成，请在浏览器中确认',
+                detail: [
+                    `"${title}"`,
+                    imageData.length ? `${imageData.length}张图片` : '无图',
+                    topics.length ? `话题: ${topics.join(' ')}` : '',
+                    successMsg || finalUrl || '',
+                ]
+                    .filter(Boolean)
+                    .join(' · '),
+            },
+        ];
+    },
+});

package/dist/clis/xiaohongshu/search.js

@@ -6,6 +6,7 @@
  * Ref: https://github.com/jackwener/opencli/issues/10
  */
 import { cli, Strategy } from '../../registry.js';
+import { AuthRequiredError } from '../../errors.js';
 cli({
     site: 'xiaohongshu',
     name: 'search',
@@ -16,41 +17,72 @@ cli({
         { name: 'query', required: true, positional: true, help: 'Search keyword' },
         { name: 'limit', type: 'int', default: 20, help: 'Number of results' },
     ],
-    columns: ['rank', 'title', 'author', 'likes'],
+    columns: ['rank', 'title', 'author', 'likes', 'url'],
     func: async (page, kwargs) => {
         const keyword = encodeURIComponent(kwargs.query);
         await page.goto(`https://www.xiaohongshu.com/search_result?keyword=${keyword}&source=web_search_result_notes`);
         await page.wait(3);
         // Scroll a couple of times to load more results
         await page.autoScroll({ times: 2 });
-        const data = await page.evaluate(`
+        const payload = await page.evaluate(`
       (() => {
-        const notes = document.querySelectorAll('section.note-item');
+        const loginWall = /登录后查看搜索结果/.test(document.body.innerText || '');
+
+        const normalizeUrl = (href) => {
+          if (!href) return '';
+          if (href.startsWith('http://') || href.startsWith('https://')) return href;
+          if (href.startsWith('/')) return 'https://www.xiaohongshu.com' + href;
+          return '';
+        };
+
+        const cleanText = (value) => (value || '').replace(/\\s+/g, ' ').trim();
+
         const results = [];
-        notes.forEach(el => {
+        const seen = new Set();
+
+        document.querySelectorAll('section.note-item').forEach(el => {
           // Skip "related searches" sections
           if (el.classList.contains('query-note-item')) return;
 
-          const titleEl = el.querySelector('.title, .note-title, a.title');
-          const nameEl = el.querySelector('.name, .author-name, .nick-name');
+          const titleEl = el.querySelector('.title, .note-title, a.title, .footer .title span');
+          const nameEl = el.querySelector('a.author .name, .name, .author-name, .nick-name, a.author');
           const likesEl = el.querySelector('.count, .like-count, .like-wrapper .count');
-          const linkEl = el.querySelector('a[href*="/explore/"], a[href*="/search_result/"], a[href*="/note/"]');
+          // Prefer search_result link (preserves xsec_token) over generic /explore/ link
+          const detailLinkEl =
+            el.querySelector('a.cover.mask') ||
+            el.querySelector('a[href*="/search_result/"]') ||
+            el.querySelector('a[href*="/explore/"]') ||
+            el.querySelector('a[href*="/note/"]');
+          const authorLinkEl = el.querySelector('a.author, a[href*="/user/profile/"]');
+
+          const url = normalizeUrl(detailLinkEl?.getAttribute('href') || '');
+          if (!url) return;
 
-          const href = linkEl?.getAttribute('href') || '';
-          const noteId = href.match(/\\/(?:explore|note)\\/([a-zA-Z0-9]+)/)?.[1] || '';
+          const key = url;
+          if (seen.has(key)) return;
+          seen.add(key);
 
           results.push({
-            title: (titleEl?.textContent || '').trim(),
-            author: (nameEl?.textContent || '').trim(),
-            likes: (likesEl?.textContent || '0').trim(),
-            url: noteId ? 'https://www.xiaohongshu.com/explore/' + noteId : '',
+            title: cleanText(titleEl?.textContent || ''),
+            author: cleanText(nameEl?.textContent || ''),
+            likes: cleanText(likesEl?.textContent || '0'),
+            url,
+            author_url: normalizeUrl(authorLinkEl?.getAttribute('href') || ''),
           });
         });
-        return results;
+
+        return {
+          loginWall,
+          results,
+        };
       })()
     `);
-        if (!Array.isArray(data))
+        if (!payload || typeof payload !== 'object')
             return [];
+        if (payload.loginWall) {
+            throw new AuthRequiredError('www.xiaohongshu.com', 'Xiaohongshu search results are blocked behind a login wall');
+        }
+        const data = Array.isArray(payload.results) ? payload.results : [];
         return data
             .filter((item) => item.title)
             .slice(0, kwargs.limit)

package/dist/clis/xiaohongshu/search.test.d.ts

@@ -0,0 +1 @@
+import './search.js';