@web-auto/webauto 0.1.17 → 0.1.19

package/dist/modules/xiaohongshu/app/src/blocks/ReplyInteractBlock.js

@@ -1,14 +1,15 @@
 /**
- * Block: ReplyInteract（开发态：模拟回复）
+ * Block: ReplyInteract（回复评论）
  *
  * 职责：
- * 1) 在指定评论上点击“回复”
- * 2) 定位回复输入框并输入内容（系统级键盘）
- * 3) 截图留证（包含高亮与 DEV 叠加文案）
+ * 1. 在指定评论上点击"回复"
+ * 2. 定位回复输入框并输入内容（系统级键盘）
+ * 3. 点击发送按钮或按回车提交回复
+ * 4. 截图留证（包含高亮与 DEV 叠加文案）
  *
  * 约束：
  * - 点击必须走坐标点击（mouse:click），禁止 DOM click
- * - 不提交（不发送真正回复）
+ * - dryRun 模式下不提交（仅输入不发送）
  */
 import path from 'node:path';
 import { controllerAction, delay } from '../utils/controllerAction.js';
@@ -31,7 +32,7 @@ async function findReplyButtonTarget(sessionId, apiUrl, commentVisibleIndex) {
         const raw = candidates.find(el => textEq(el, '回复')) || null;
         if (!raw) return { ok: false, reason: 'reply-button-not-found' };
 
-        const target = raw.closest && (raw.closest('button,a,[role=\"button\"]') || raw) || raw;
+        const target = raw.closest && (raw.closest('button,a,[role="button"]') || raw) || raw;
         const r = target.getBoundingClientRect();
         if (!r || !r.width || !r.height) return { ok: false, reason: 'reply-rect-empty' };
 
@@ -96,7 +97,7 @@ async function findReplyInputTarget(sessionId, apiUrl) {
           return { ok: true, rect: { x: Math.round(r.left), y: Math.round(r.top), width: Math.round(r.width), height: Math.round(r.height) }, clickPoint: { x: mx, y: my } };
         }
 
-        const all = Array.from(document.querySelectorAll('textarea, input[type=\"text\"], input:not([type]), [contenteditable=\"true\"], [contenteditable=\"plaintext-only\"]'))
+        const all = Array.from(document.querySelectorAll('textarea, input[type="text"], input:not([type]), [contenteditable="true"], [contenteditable="plaintext-only"]'))
           .filter(isVisible);
         if (!all.length) return { ok: false, reason: 'no-visible-input' };
 
@@ -113,6 +114,55 @@ async function findReplyInputTarget(sessionId, apiUrl) {
     const payload = res?.result || res?.data?.result || res;
     return payload;
 }
+/**
+ * 查找发送按钮
+ */
+async function findSendButtonTarget(sessionId, apiUrl) {
+    const res = await controllerAction('browser:execute', {
+        profile: sessionId,
+        script: `(() => {
+        const isVisible = (el) => {
+          const r = el.getBoundingClientRect();
+          return r.width > 0 && r.height > 0 && r.bottom > 0 && r.top < window.innerHeight;
+        };
+        
+        // 查找发送按钮 - 多种策略
+        const strategies = [
+          // 1. 查找包含"发送"文本的按钮
+          () => Array.from(document.querySelectorAll('button, a, div, span')).find(el => 
+            isVisible(el) && /发送|submit|send/i.test(el.textContent || '')
+          ),
+          // 2. 查找发送图标按钮
+          () => document.querySelector('button[class*="send"], button[class*="submit"], [data-type="send"]'),
+          // 3. 查找输入框旁边的按钮
+          () => {
+            const input = document.querySelector('textarea, input[type="text"], [contenteditable="true"]');
+            if (!input) return null;
+            const parent = input.closest('.comment-form, .reply-form, form, [class*="comment"]');
+            if (!parent) return null;
+            return parent.querySelector('button, [role="button"]');
+          },
+        ];
+        
+        for (const strategy of strategies) {
+          const btn = strategy();
+          if (btn && isVisible(btn)) {
+            const r = btn.getBoundingClientRect();
+            const mx = Math.round((r.left + r.right) / 2);
+            const my = Math.round((r.top + r.bottom) / 2);
+            return {
+              ok: true,
+              rect: { x: Math.round(r.left), y: Math.round(r.top), width: Math.round(r.width), height: Math.round(r.height) },
+              clickPoint: { x: mx, y: my },
+            };
+          }
+        }
+        
+        return { ok: false, reason: 'send-button-not-found' };
+      })()`,
+    }, apiUrl);
+    return (res?.result || res?.data?.result || res);
+}
 async function drawOverlay(sessionId, apiUrl, opts) {
     const ttlMs = typeof opts.ttlMs === 'number' ? Math.max(600, Math.min(15000, Math.floor(opts.ttlMs))) : 4000;
     await controllerAction('browser:execute', {
@@ -197,11 +247,67 @@ async function verifyTyped(sessionId, apiUrl, expected) {
     const payload = res?.result || res?.data?.result || res;
     return Boolean(payload?.contains);
 }
+async function stillContainsReplyInput(sessionId, apiUrl, expected) {
+    const normalized = String(expected || '').replace(/\s+/g, ' ').trim();
+    const prefix = normalized.slice(0, 8);
+    if (!prefix)
+        return false;
+    const res = await controllerAction('browser:execute', {
+        profile: sessionId,
+        script: `(() => {
+        const needle = ${JSON.stringify(prefix)};
+        const norm = (s) => String(s || '').replace(/\\s+/g, ' ').trim();
+        const values = [];
+        const nodes = Array.from(document.querySelectorAll('textarea, input[type="text"], input:not([type]), [contenteditable="true"], [contenteditable="plaintext-only"]'));
+        for (const node of nodes) {
+          if (!node || !node.getBoundingClientRect) continue;
+          const r = node.getBoundingClientRect();
+          if (!(r.width > 0 && r.height > 0 && r.bottom > 0 && r.top < window.innerHeight)) continue;
+          let v = '';
+          if (node instanceof HTMLInputElement || node instanceof HTMLTextAreaElement) v = node.value || '';
+          else v = node.textContent || '';
+          const text = norm(v);
+          if (text) values.push(text);
+        }
+        const contains = values.some((v) => v.includes(needle));
+        return { ok: true, contains };
+      })()`,
+    }, apiUrl).catch(() => null);
+    const payload = res?.result || res?.data?.result || res;
+    return Boolean(payload?.contains);
+}
+/**
+ * 提交回复 - 点击发送按钮或按回车
+ */
+async function submitReply(sessionId, apiUrl, expectedReplyText) {
+    const verifyAfterSubmit = async (method) => {
+        await delay(600);
+        const hasPendingInput = await stillContainsReplyInput(sessionId, apiUrl, expectedReplyText);
+        if (!hasPendingInput)
+            return { ok: true, method };
+        return { ok: false, method, error: 'submit_not_confirmed' };
+    };
+    // 首先尝试找发送按钮
+    const sendBtn = await findSendButtonTarget(sessionId, apiUrl);
+    if (sendBtn.ok && sendBtn.clickPoint) {
+        await controllerAction('mouse:click', { profileId: sessionId, x: Math.round(sendBtn.clickPoint.x), y: Math.round(sendBtn.clickPoint.y) }, apiUrl);
+        const checked = await verifyAfterSubmit('button');
+        if (checked.ok)
+            return checked;
+    }
+    // 如果没有找到按钮，尝试按回车
+    await controllerAction('keyboard:press', { profileId: sessionId, key: 'Enter' }, apiUrl);
+    const checked = await verifyAfterSubmit('enter');
+    if (checked.ok)
+        return checked;
+    return { ok: false, method: 'none', error: checked.error || 'submit_failed' };
+}
 export async function execute(input) {
     const { sessionId, noteId, commentVisibleIndex, replyText, dryRun = false, unifiedApiUrl = 'http://127.0.0.1:7701', env = 'debug', keyword = 'unknown', dev = true, } = input;
     let screenshot = null;
     let replyButtonRect = undefined;
     let replyInputRect = undefined;
+    let sendButtonRect = undefined;
     try {
         const btn = await findReplyButtonTarget(sessionId, unifiedApiUrl, commentVisibleIndex);
         if (!btn.ok || !btn.clickPoint || !btn.rect) {
@@ -215,14 +321,9 @@ export async function execute(input) {
             ttlMs: 6000,
         });
         await delay(350);
-        if (!dryRun) {
-            // ✅ 坐标点击（系统点击）
-            await controllerAction('mouse:click', { profileId: sessionId, x: Math.round(btn.clickPoint.x), y: Math.round(btn.clickPoint.y) }, unifiedApiUrl);
-            await delay(700);
-        }
-        else {
-            await delay(450);
-        }
+        // ✅ 坐标点击（系统点击）打开回复框
+        await controllerAction('mouse:click', { profileId: sessionId, x: Math.round(btn.clickPoint.x), y: Math.round(btn.clickPoint.y) }, unifiedApiUrl);
+        await delay(700);
         const inputTarget = await findReplyInputTarget(sessionId, unifiedApiUrl);
         if (inputTarget.ok && inputTarget.clickPoint && inputTarget.rect) {
             replyInputRect = inputTarget.rect;
@@ -233,32 +334,42 @@ export async function execute(input) {
                 ttlMs: 6000,
             });
             await delay(250);
-            if (!dryRun) {
-                // ✅ 坐标点击聚焦输入框
-                await controllerAction('mouse:click', { profileId: sessionId, x: Math.round(inputTarget.clickPoint.x), y: Math.round(inputTarget.clickPoint.y) }, unifiedApiUrl);
-                await delay(220);
-                // 清空（可选）：dev 模式仍执行，避免误拼接
-                const isMac = process.platform === 'darwin';
-                await controllerAction('keyboard:press', { profileId: sessionId, key: isMac ? 'Meta+A' : 'Control+A' }, unifiedApiUrl).catch(() => { });
-                await delay(80);
-                await controllerAction('keyboard:press', { profileId: sessionId, key: 'Backspace' }, unifiedApiUrl).catch(() => { });
-                await delay(120);
-                // ✅ 系统级输入（不提交）
-                await controllerAction('keyboard:type', { profileId: sessionId, text: String(replyText || ''), delay: 90, submit: false }, unifiedApiUrl);
-                await delay(260);
-            }
-            else {
-                await delay(180);
-            }
+            // ✅ 坐标点击聚焦输入框
+            await controllerAction('mouse:click', { profileId: sessionId, x: Math.round(inputTarget.clickPoint.x), y: Math.round(inputTarget.clickPoint.y) }, unifiedApiUrl);
+            await delay(220);
+            // 清空（可选）
+            const isMac = process.platform === 'darwin';
+            await controllerAction('keyboard:press', { profileId: sessionId, key: isMac ? 'Meta+A' : 'Control+A' }, unifiedApiUrl).catch(() => { });
+            await delay(80);
+            await controllerAction('keyboard:press', { profileId: sessionId, key: 'Backspace' }, unifiedApiUrl).catch(() => { });
+            await delay(120);
+            // ✅ 系统级输入
+            await controllerAction('keyboard:type', { profileId: sessionId, text: String(replyText || ''), delay: 90, submit: false }, unifiedApiUrl);
+            await delay(260);
         }
-        const typed = !dryRun && replyInputRect
+        const typed = replyInputRect
             ? await verifyTyped(sessionId, unifiedApiUrl, String(replyText || '').slice(0, 6))
             : false;
+        // ✅ 提交回复（如果不是 dryRun）
+        let submitted = false;
+        let submitError;
+        if (!dryRun && typed) {
+            const submitResult = await submitReply(sessionId, unifiedApiUrl, replyText);
+            submitted = submitResult.ok;
+            if (!submitResult.ok) {
+                submitError = submitResult.error;
+            }
+            // 尝试获取发送按钮位置用于截图
+            const sendBtn = await findSendButtonTarget(sessionId, unifiedApiUrl);
+            if (sendBtn.ok && sendBtn.rect) {
+                sendButtonRect = sendBtn.rect;
+            }
+        }
         if (dev || dryRun) {
             await drawOverlay(sessionId, unifiedApiUrl, {
                 id: 'webauto-dev-reply-label',
                 color: '#00ff00',
-                label: `[${dryRun ? 'DRYRUN' : 'DEV'}] note=${noteId} commentIdx=${commentVisibleIndex}\nreply: ${String(replyText || '').slice(0, 80)}`,
+                label: `[${dryRun ? 'DRYRUN' : submitted ? 'SENT' : 'TYPED'}] note=${noteId} commentIdx=${commentVisibleIndex}\nreply: ${String(replyText || '').slice(0, 80)}`,
                 ttlMs: 9000,
             });
             await delay(180);
@@ -266,15 +377,16 @@ export async function execute(input) {
         const base64 = await takeScreenshotBase64(sessionId, unifiedApiUrl);
         if (base64) {
             const outDir = path.join(resolveDownloadRoot(), 'xiaohongshu', env, keyword, 'smart-reply', noteId);
-            const name = `reply-dev-${String(commentVisibleIndex).padStart(3, '0')}-${Date.now()}.png`;
+            const name = `reply-${dryRun ? 'dryrun' : submitted ? 'sent' : 'typed'}-${String(commentVisibleIndex).padStart(3, '0')}-${Date.now()}.png`;
             screenshot = await savePngBase64(base64, path.join(outDir, name));
         }
         return {
             success: true,
             noteId,
             typed,
+            submitted: dryRun ? false : submitted,
             evidence: { screenshot },
-            debug: { replyButtonRect, replyInputRect },
+            debug: { replyButtonRect, replyInputRect, sendButtonRect },
         };
     }
     catch (e) {
@@ -282,8 +394,9 @@ export async function execute(input) {
             success: false,
             noteId,
             typed: false,
+            submitted: false,
             evidence: { screenshot },
-            debug: { replyButtonRect, replyInputRect },
+            debug: { replyButtonRect, replyInputRect, sendButtonRect },
             error: e?.message || String(e),
         };
     }