@qcplay/cli 1.0.16 → 1.0.17

package/lib/platform-publish.js

@@ -225,6 +225,9 @@ const BROWSER_PLATFORM_SPECS = {
     collection: [
       'input[placeholder*="搜索合集"]',
       'input[placeholder*="合集"]',
+      '[role="dialog"] input:not([type="file"]):not([type="hidden"])',
+      '[class*="modal"] input:not([type="file"]):not([type="hidden"])',
+      '[class*="dialog"] input:not([type="file"]):not([type="hidden"])',
       '[class*="collection"] input',
       '[class*="album"] input'
     ],
@@ -242,6 +245,10 @@ function normalizeText(value) {
   return String(value ?? "").trim();
 }
 
+function escapeRegExp(value) {
+  return String(value ?? "").replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+
 function normalizeKey(value) {
   return normalizeText(value).toLowerCase().replace(/\s+/g, "");
 }
@@ -6150,7 +6157,7 @@ async function publishXiaohongshu(page, entry, article, spec, options, promptUse
   }
   let imageInput = await firstExisting(page, spec.imageInputs);
   if (!imageInput) {
-    if (options.keepOpen && !isInteractiveTerminal(options.streams)) {
+    if (shouldWaitForXiaohongshuLogin(options)) {
       await openPlatformLogin(page, entry, spec);
       options.onProgress?.("小红书尚未登录，请在已打开的浏览器中扫码；登录完成后将自动继续上传图片");
       imageInput = await waitForXiaohongshuUploadInput(page, spec, 600000);
@@ -6187,13 +6194,22 @@ async function publishXiaohongshu(page, entry, article, spec, options, promptUse
   await fillLocator(titleInput, article.title);
   await fillLocator(bodyInput, body);
   if (publishing.collection) {
-    const collectionTrigger = await waitForVisibleButton(page, [/添加合集/, /^合集$/], 3000);
+    const collectionTrigger =
+      (await waitForVisibleButton(page, [/添加(?:到)?合集/, /选择合集/, /加入合集/, /^合集$/], 3000)) ||
+      (await waitForVisibleTextAcrossFrames(page, /添加(?:到)?合集|选择合集|加入合集|^合集$/, 3000, false));
     if (!collectionTrigger) throw new Error("小红书页面未找到“添加合集”控件");
     await collectionTrigger.click();
     const collectionInput = await waitForVisible(page, spec.collection, 5000);
-    if (!collectionInput) throw new Error("小红书合集选择面板未找到搜索控件");
-    await fillLocator(collectionInput, publishing.collection);
-    const collectionOption = await waitForVisibleButton(page, [new RegExp(`^${escapeRegExp(publishing.collection)}$`)], 5000);
+    if (collectionInput) {
+      await fillLocator(collectionInput, publishing.collection);
+      if (typeof collectionInput.press === "function") {
+        await collectionInput.press("Enter").catch(() => {});
+      }
+    }
+    await page.waitForTimeout(500);
+    const collectionOption =
+      (await waitForVisibleButton(page, [new RegExp(`^${escapeRegExp(publishing.collection)}$`)], 8000)) ||
+      (await waitForVisibleTextAcrossFrames(page, publishing.collection, 8000));
     if (!collectionOption) throw new Error(`小红书未找到精确合集: ${publishing.collection}`);
     await collectionOption.click();
   }
@@ -6206,7 +6222,7 @@ async function publishXiaohongshu(page, entry, article, spec, options, promptUse
     options.onProgress?.("小红书待发布内容已准备完成，请在浏览器中核对后手动点击“发布”；程序将等待并验证发布结果");
     return waitForManualXiaohongshuSubmission(page, 600000);
   }
-  await reviewPreparedDraft(page, entry, { ...options, reviewDraft: true });
+  await reviewPreparedDraft(page, entry, options);
   const initialUrl = page.url();
   const mutationPromise =
     typeof page.waitForResponse === "function"
@@ -6223,6 +6239,10 @@ function isInteractiveTerminal(streams = {}) {
   return Boolean(input.isTTY && output.isTTY);
 }
 
+export function shouldWaitForXiaohongshuLogin(options = {}) {
+  return !isInteractiveTerminal(options.streams);
+}
+
 async function waitForXiaohongshuUploadInput(page, spec, timeoutMs) {
   const deadline = Date.now() + timeoutMs;
   do {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qcplay/cli",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "description": "QCPlay CLI",
   "type": "module",
   "bin": {