@iflyrpa/actions 2.0.0-beta.2 → 2.0.0-beta.3

package/dist/index.js

@@ -4993,7 +4993,7 @@ var __webpack_exports__ = {};
     });
     const package_json_namespaceObject = require("@iflyrpa/share/package.json");
     var package_json_default = /*#__PURE__*/ __webpack_require__.n(package_json_namespaceObject);
-    var package_namespaceObject = JSON.parse('{"i8":"2.0.0-beta.1"}');
+    var package_namespaceObject = JSON.parse('{"i8":"2.0.0-beta.2"}');
     const share_namespaceObject = require("@iflyrpa/share");
     const external_node_fs_namespaceObject = require("node:fs");
     var external_node_fs_default = /*#__PURE__*/ __webpack_require__.n(external_node_fs_namespaceObject);
@@ -5010,7 +5010,7 @@ var __webpack_exports__ = {};
     const external_axios_namespaceObject = require("axios");
     var external_axios_default = /*#__PURE__*/ __webpack_require__.n(external_axios_namespaceObject);
     var dist = __webpack_require__("../../node_modules/.pnpm/https-proxy-agent@7.0.6/node_modules/https-proxy-agent/dist/index.js");
-    async function ProxyAgent(ip, adr, accountId, refresh) {
+    async function ProxyAgent(task, ip, adr, accountId, refresh) {
         const http = new Http({
             headers: {
                 "content-type": "application/json"
@@ -5036,7 +5036,7 @@ var __webpack_exports__ = {};
                 data: ProxyInfo.data
             }
         };
-        this.logger?.info(`请求代理：区域：${params.addr}, IP：${params.ip}, AccountId：${params.accountId}, 返回代理信息: ${ProxyInfo.data ? `${ProxyInfo.data.proxyIp}:${ProxyInfo.data.proxyPort}` : "无可用代理"}`, loggerInfo);
+        task.logger?.info(`请求代理：区域：${params.addr}, IP：${params.ip}, AccountId：${params.accountId}, 返回代理信息: ${ProxyInfo.data ? `${ProxyInfo.data.proxyIp}:${ProxyInfo.data.proxyPort}` : "无可用代理"}`, loggerInfo);
         return "000000" === ProxyInfo.code && ProxyInfo.data ? {
             ip: ProxyInfo.data.proxyIp,
             port: ProxyInfo.data.proxyPort,
@@ -5058,7 +5058,7 @@ var __webpack_exports__ = {};
                 ...config
             });
             this.logger = logger;
-            if (ip) this.agentPromise = ProxyAgent.call({
+            if (ip) this.agentPromise = ProxyAgent({
                 logger
             }, ip, adr, accountId);
             this.addResponseInterceptor(()=>void 0);
@@ -9136,10 +9136,9 @@ var __webpack_exports__ = {};
                 params.accountId
             ];
             task.logger?.info(`==> 开始获取代理信息：${args}`);
-            const ProxyAgentWithLogger = ProxyAgent.bind({
+            const ProxyAgentResult = await ProxyAgent({
                 logger: task.logger
-            });
-            const ProxyAgentResult = await ProxyAgentWithLogger(...args);
+            }, ...args);
             task.logger?.info("==> 代理信息获取成功！");
             proxyUrl = ProxyAgentResult ? `http://${ProxyAgentResult.ip}:${ProxyAgentResult.port}` : void 0;
         }
@@ -11297,7 +11296,7 @@ var __webpack_exports__ = {};
         const http = new Http(...args);
         const hotParams = {
             query: params.query || "",
-            count: "50",
+            count: params.count?.toString() || "20",
             aid: "1128",
             cookie_enabled: "0",
             screen_width: "1920",
@@ -11314,11 +11313,17 @@ var __webpack_exports__ = {};
         };
         const aBogus = douyinGetHot_sign_reply(hotParams, "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/137.0.0.0 Safari/537.36");
         hotParams.a_bogus = aBogus;
+        if (!params.query) {
+            delete hotParams.query;
+            delete hotParams.count;
+        }
         const queryString = new URLSearchParams(hotParams).toString();
         console.log("抖音获取热点参数:", queryString);
+        const url = `https://creator.douyin.com/aweme/v1/hotspot/${params.query ? "search" : "recommend"}/?${queryString}`;
+        console.log("抖音获取热点URL:", url);
         const res = await http.api({
             method: "get",
-            url: `https://creator.douyin.com/aweme/v1/hotspot/search/?${queryString}`,
+            url,
             headers: {
                 ...headers,
                 "Content-Type": "application/json"
@@ -11331,8 +11336,8 @@ var __webpack_exports__ = {};
         const isSuccess = 0 === res.status_code;
         const message = `抖音获取热点${isSuccess ? "成功" : `失败，原因：${res.status_msg}`}${_task.debug ? ` ${http.proxyInfo}` : ""}`;
         const data = isSuccess ? {
-            hot: res?.sentences || [],
-            total: res?.sentences?.length || 0
+            hot: res?.sentences || res?.all_sentences || [],
+            total: (res?.sentences || res?.all_sentences)?.length || 0
         } : {
             hot: [],
             total: 0
@@ -11517,8 +11522,8 @@ var __webpack_exports__ = {};
         return (0, share_namespaceObject.response)(isSuccess ? 0 : 414, message, data);
     };
     const DouyinGetMusicByCategoryParamsSchema = ActionCommonParamsSchema.extend({
-        category_id: schemas_string().optional(),
-        type: schemas_string().optional(),
+        category_id: schemas_string(),
+        type: schemas_string(),
         count: schemas_number().optional()
     });
     const { sign_datail: douyinGetMusicByCategory_sign_datail, sign_reply: douyinGetMusicByCategory_sign_reply } = __webpack_require__("./src/utils/douyin/douyin.js");
@@ -11665,7 +11670,7 @@ var __webpack_exports__ = {};
             params.accountId
         ];
         const http = new Http(...args);
-        const keyword = params.keyword || "";
+        const keyword = params.keyword || "热点";
         const topicParams = {
             keyword: keyword,
             source: "challenge_create",
@@ -11711,6 +11716,272 @@ var __webpack_exports__ = {};
         };
         return (0, share_namespaceObject.response)(isSuccess ? 0 : 414, message, data);
     };
+    const rpa_scanRetryMaxCount = 60;
+    const rpa_waitQrcodeResultMaxTime = 2000 * rpa_scanRetryMaxCount;
+    const douyinLogin_rpa_rpaAction = async (task, params)=>{
+        const reporter = task.reportService?.reportLoginStatus ?? (()=>Promise.resolve());
+        let page;
+        let statusMachine = "new";
+        let isSelfClosing = false;
+        try {
+            page = await task.createPage({
+                url: "https://creator.douyin.com/"
+            });
+            if (!task._session?.id) throw new Error("Session ID 不存在");
+            task._steelBrowser?.on("disconnected", ()=>{
+                if (task.debug && isSelfClosing) task.logger.info("执行结束，关闭浏览器！");
+                else task.logger.info("浏览器被手动释放或意外关闭！");
+            });
+        } catch (e) {
+            task.logger.error("浏览器启动失败", e);
+            return {
+                code: 500,
+                message: `浏览器启动失败: ${e}`,
+                data: {}
+            };
+        }
+        await page.route("**/*.mp4", (route)=>route.abort());
+        await page.route("**/*.png", (route)=>route.abort());
+        await page.route("**/*.ttf", (route)=>route.abort());
+        await page.addInitScript(()=>{
+            window.requestAnimationFrame = ()=>0;
+        });
+        await page.addInitScript(()=>{
+            const removeEventBlockers = ()=>{
+                try {
+                    const blockers = document.querySelectorAll('[style*="pointer-events: none"]');
+                    blockers.forEach((el)=>{
+                        el.style.pointerEvents = "auto";
+                    });
+                    document.body.style.pointerEvents = "auto";
+                    if (window.__DOUYIN_ANTI_DEBUG__) delete window.__DOUYIN_ANTI_DEBUG__;
+                } catch (e) {}
+            };
+            removeEventBlockers();
+            setInterval(removeEventBlockers, 1000);
+            if ("undefined" != typeof MutationObserver) {
+                const observer = new MutationObserver(removeEventBlockers);
+                observer.observe(document.documentElement, {
+                    childList: true,
+                    subtree: true,
+                    attributes: true,
+                    attributeFilter: [
+                        "style"
+                    ]
+                });
+            }
+        });
+        task.logger.info("页面创建成功，开始Bypass页面事件屏蔽...");
+        try {
+            await page.waitForResponse((response)=>response.url().includes("/272.6591d0af.js") && 200 === response.status(), {
+                timeout: 15000
+            });
+            await page.waitForLoadState("networkidle");
+            await page.goto("about:blank");
+            await page.goBack({
+                waitUntil: "domcontentloaded"
+            });
+            task.logger.info("已返回登录页面，页面事件屏蔽Bypass完成...");
+        } catch (e) {
+            task.logger.warn("Bypass 超时，继续执行...", {
+                error: e
+            });
+        }
+        await page.waitForTimeout(2000);
+        try {
+            const loginButtonSelector = ".douyin-creator-master-icon-default.douyin-creator-master-icon-user_circle";
+            await page.waitForSelector(loginButtonSelector, {
+                state: "visible",
+                timeout: 10000
+            });
+            const clicked = await page.evaluate((selector)=>{
+                const btn = document.querySelector(selector);
+                if (btn) {
+                    btn.click();
+                    return true;
+                }
+                return false;
+            }, loginButtonSelector);
+            if (clicked) task.logger.info("✅ 登录按钮点击成功（使用 JavaScript）");
+            else {
+                await page.locator(loginButtonSelector).click({
+                    force: true,
+                    timeout: 5000
+                });
+                task.logger.info("✅ 登录按钮点击成功（使用 Playwright force）");
+            }
+        } catch (e) {
+            task.logger.error("❌ 点击登录按钮失败", e);
+            return {
+                code: 500,
+                message: "无法点击登录按钮，页面可能已被屏蔽",
+                data: {}
+            };
+        }
+        await page.waitForTimeout(3000);
+        const pageInfo = await task._client?.sessions.liveDetails(task._session.id);
+        const pageId = pageInfo?.pages[0].id ?? "";
+        const baseHost = task._session.websocketUrl?.replace(/^wss?:\/\//, "") ?? "";
+        const debugParams = new URLSearchParams({
+            baseHost,
+            pageId
+        });
+        const connectAddress = debugParams.toString();
+        task.reportService?.settingSessionID?.(task._session?.id || "");
+        task.logger.info("🔗 远程调试地址已生成，现在可以安全访问远程页面");
+        await reporter(0, "浏览器启动成功，请使用抖音App扫码登录......", {
+            connectAddress
+        });
+        const userInfo = {
+            uniqueId: "",
+            avatar: "",
+            name: ""
+        };
+        try {
+            await new Promise((resolve, reject)=>{
+                let finished = false;
+                const timer = setTimeout(()=>{
+                    cleanup(statusMachine);
+                }, rpa_waitQrcodeResultMaxTime);
+                const cleanup = (status)=>{
+                    if (finished) return;
+                    finished = true;
+                    clearTimeout(timer);
+                    page.off("response", handleWebCommon);
+                    page.off("response", handleCheckQR);
+                    if (void 0 !== status) reject(status);
+                };
+                const handleWebCommon = async (resp)=>{
+                    try {
+                        const url = resp.url();
+                        if (url.includes("/web/common")) {
+                            cleanup();
+                            const headers = resp.headers();
+                            const xmst = headers["x-ms-token"];
+                            const date = headers["x-tt-timestamp"];
+                            if (xmst && date) {
+                                const mstExpirDate = new Date(1000 * Number(date) + 604800000);
+                                const msToken = {
+                                    name: "msToken",
+                                    value: xmst,
+                                    domain: ".bytedance.com",
+                                    expires: mstExpirDate.getTime() / 1000,
+                                    httpOnly: true,
+                                    path: "/",
+                                    sameSite: "None",
+                                    secure: true
+                                };
+                                await page.context().addCookies([
+                                    msToken
+                                ]);
+                                task.debug && task.logger.info("msToken 添加成功");
+                                task.debug && task.logger.info("msToken 检测成功:", {
+                                    token: xmst.substring(0, 20) + "...",
+                                    timestamp: date
+                                });
+                            }
+                            await reporter(0, "扫码成功!", {
+                                stage: "scanQrcode",
+                                connectAddress
+                            });
+                            resolve();
+                        } else if (url.includes("aweme/v1/creator/user/info")) try {
+                            const jsonUserInfo = await resp.json();
+                            userInfo.name = jsonUserInfo.user_profile.nick_name ?? "";
+                            userInfo.avatar = jsonUserInfo.user_profile.avatar_url ?? "";
+                            task.debug && task.logger.info("用户信息获取成功", userInfo);
+                        } catch (e) {
+                            task.logger.warn("无法解析用户信息:", {
+                                url,
+                                error: e
+                            });
+                        }
+                    } catch (err) {
+                        task.logger.error("监听登录结果出现异常", err);
+                        cleanup(err);
+                    }
+                };
+                const handleCheckQR = async (response)=>{
+                    try {
+                        const url = response.url();
+                        if (!url.includes("/check_qrconnect")) return;
+                        let jsonResponse;
+                        try {
+                            jsonResponse = await response.json();
+                        } catch (e) {
+                            task.logger.warn("Response body unavailable (likely navigation happened)", {
+                                url
+                            });
+                            return;
+                        }
+                        const status = jsonResponse?.data?.status;
+                        task.logger.info("check_qrconnect 状态:", {
+                            status
+                        });
+                        if ("scanned" === status) {
+                            task.logger.info("用户已扫码，等待确认...");
+                            page.on("response", handleWebCommon);
+                        }
+                        if ("confirmed" === status) {
+                            userInfo.uniqueId = jsonResponse.data?.user_data?.user_id_str || "";
+                            task.logger.info("扫码确认，开始监听登录完成...");
+                            page.off("response", handleCheckQR);
+                        }
+                        statusMachine = status || "new";
+                        if ("expired" === status) {
+                            task.logger.warn("二维码已过期");
+                            cleanup("expired");
+                        }
+                    } catch (err) {
+                        task.logger.error("handleCheckQR 异常:", err);
+                    }
+                };
+                page.on("response", handleCheckQR);
+            });
+        } catch (e) {
+            const errMap = {
+                new: "用户扫码已超时，请重试！",
+                scanned: "用户扫码后未点击确认，请重试！",
+                expired: "二维码已过期，请重试！"
+            };
+            isSelfClosing = true;
+            const errorMessage = "string" == typeof e && errMap[e] ? errMap[e] : e instanceof Error ? e.message : String(e);
+            return {
+                code: 500,
+                message: errorMessage,
+                data: {
+                    stage: "scanQrcode",
+                    connectAddress
+                }
+            };
+        }
+        let securityData = {};
+        try {
+            securityData = await page.evaluate(()=>({
+                    "security-sdk/s_sdk_pri_key": localStorage.getItem("security-sdk/s_sdk_pri_key") || "",
+                    "security-sdk/s_sdk_pub_key": localStorage.getItem("security-sdk/s_sdk_pub_key") || "",
+                    "security-sdk/s_sdk_sign_data_key": localStorage.getItem("security-sdk/s_sdk_sign_data_key/web_protect") || ""
+                }));
+            task.debug && task.logger.info("Security SDK 数据提取成功:", {
+                "security-sdk/s_sdk_pri_key": !!securityData["security-sdk/s_sdk_pri_key"],
+                "security-sdk/s_sdk_pub_key": !!securityData["security-sdk/s_sdk_pub_key"],
+                "security-sdk/s_sdk_sign_data_key": !!securityData["security-sdk/s_sdk_sign_data_key"]
+            });
+        } catch (error) {
+            task.logger.warn("提取 Security SDK 数据失败:", {
+                error: error instanceof Error ? error.message : String(error)
+            });
+        }
+        const cookie = JSON.stringify(await task._steelBrowserContext?.cookies());
+        isSelfClosing = true;
+        await page.close();
+        return (0, share_namespaceObject.success)({
+            connectAddress,
+            cookie,
+            userInfo,
+            ...securityData
+        }, "登陆成功！");
+    };
     const douyinLogin_rpa_server_scanRetryMaxCount = 60;
     const douyinLogin_rpa_server_waitQrcodeResultMaxTime = 2000 * douyinLogin_rpa_server_scanRetryMaxCount;
     const rpa_server_rpaServer = async (task, params)=>{
@@ -11724,10 +11995,9 @@ var __webpack_exports__ = {};
                 params.accountId
             ];
             task.logger?.info(`==> 开始获取代理信息：${args}`);
-            const ProxyAgentWithLogger = ProxyAgent.bind({
+            const ProxyAgentResult = await ProxyAgent({
                 logger: task.logger
-            });
-            const ProxyAgentResult = await ProxyAgentWithLogger(...args);
+            }, ...args);
             task.logger?.info("==> 代理信息获取成功！");
             proxyUrl = ProxyAgentResult ? `http://${ProxyAgentResult.ip}:${ProxyAgentResult.port}` : void 0;
         }
@@ -11857,13 +12127,15 @@ var __webpack_exports__ = {};
                             return;
                         }
                         const status = jsonResponse?.data?.status;
-                        if ("scanned" === status) await updateTaskState?.({
-                            state: share_namespaceObject.TaskState.SCANNED
-                        });
+                        if ("scanned" === status) {
+                            await updateTaskState?.({
+                                state: share_namespaceObject.TaskState.SCANNED
+                            });
+                            page.on("response", handleWebCommon);
+                        }
                         if ("confirmed" === status) {
                             userInfo.uniqueId = jsonResponse.data?.user_data?.user_id_str || "";
                             page.off("response", handleCheckQR);
-                            page.on("response", handleWebCommon);
                         }
                     } catch (err) {
                         cleanup();
@@ -11955,6 +12227,7 @@ var __webpack_exports__ = {};
         }
     };
     const douyinLogin = async (task, params)=>{
+        if ("rpa" === params.actionType) return douyinLogin_rpa_rpaAction(task, params);
         if ("mockApi" === params.actionType) return (0, share_namespaceObject.success)({}, "暂不支持mockApi");
         if ("server" === params.actionType) return rpa_server_rpaServer(task, params);
         return executeAction(rpa_server_rpaServer)(task, params);
@@ -12028,32 +12301,28 @@ var __webpack_exports__ = {};
         const publishData = {
             item: {
                 common: {
-                    text: params.title || "32234。sdsadadasda",
-                    text_extra: '[{"start":0,"end":5,"hashtag_id":0,"hashtag_name":"","type":7},{"start":5,"end":6,"hashtag_id":0,"hashtag_name":"","type":8}]',
+                    text: `${params.title}。${params.content}`,
+                    text_extra: params.textExtra,
                     activity: "[]",
-                    challenges: "[]",
-                    hashtag_source: "",
+                    challenges: params.challengeIds,
+                    hashtag_source: params.hashtagSource || "",
                     mentions: "[]",
-                    music_id: "",
-                    music_end_time: 0,
-                    hot_sentence: "",
-                    visibility_type: 0,
-                    download: 0,
-                    timing: -1,
-                    media_type: 2,
+                    music_id: params.musicId,
+                    music_end_time: 1000 * (params.musicDuration || 0),
+                    hot_sentence: params.hotSentence || "",
+                    visibility_type: params.visibleRange || 0,
+                    download: params.allowSave ? 1 : 0,
+                    timing: params.isImmediatelyPublish ? -1 : params.scheduledPublish,
+                    media_type: params.publishType || 2,
                     images: []
                 },
                 cover: {
                     poster: ""
                 },
-                mix: {},
-                anchor: {
-                    poi_name: "",
-                    poi_id: "",
-                    anchor_content: "{}"
-                },
+                mix: params.mix || {},
+                anchor: {},
                 declare: {
-                    user_declare_info: "{}"
+                    user_declare_info: params.selfDeclaration || "{}"
                 }
             }
         };
@@ -12384,6 +12653,13 @@ var __webpack_exports__ = {};
         content: schemas_string(),
         coverImage: schemas_string().optional(),
         videoFile: schemas_string().optional(),
+        musicId: schemas_string(),
+        musicDuration: schemas_number().optional(),
+        textExtra: schemas_string(),
+        challengeIds: schemas_string(),
+        hashtagSource: schemas_string(),
+        hotSentence: schemas_string(),
+        mix: custom().optional(),
         address: schemas_object({
             id: schemas_string(),
             name: schemas_string(),
@@ -12405,8 +12681,7 @@ var __webpack_exports__ = {};
         isImmediatelyPublish: schemas_boolean().optional(),
         scheduledPublish: schemas_string().optional(),
         isOriginal: schemas_boolean().optional(),
-        allowCoProduce: schemas_boolean().optional(),
-        allowCopy: schemas_boolean().optional(),
+        allowSave: schemas_boolean().optional(),
         publishType: schemas_enum([
             "1",
             "2",
@@ -14193,8 +14468,8 @@ var __webpack_exports__ = {};
         const message = `用户文章信息获取${isSuccess ? "成功！" : "失败，请检查！"}${_task.debug ? ` ${http.proxyInfo}` : ""}`;
         return (0, share_namespaceObject.response)(isSuccess ? 0 : 414, message, INITIAL_STATE);
     };
-    const rpa_scanRetryMaxCount = 60;
-    const rpa_waitQrcodeResultMaxTime = 2000 * rpa_scanRetryMaxCount;
+    const toutiaoLogin_rpa_scanRetryMaxCount = 60;
+    const toutiaoLogin_rpa_waitQrcodeResultMaxTime = 2000 * toutiaoLogin_rpa_scanRetryMaxCount;
     const toutiaoLogin_rpa_rpaAction = async (task, _params)=>{
         const reporter = task.reportService?.reportLoginStatus ?? (()=>Promise.resolve());
         let page;
@@ -14239,7 +14514,7 @@ var __webpack_exports__ = {};
                 let finished = false;
                 const timer = setTimeout(()=>{
                     cleanup(statusMachine);
-                }, rpa_waitQrcodeResultMaxTime);
+                }, toutiaoLogin_rpa_waitQrcodeResultMaxTime);
                 const cleanup = (status)=>{
                     if (finished) return;
                     finished = true;
@@ -14338,10 +14613,9 @@ var __webpack_exports__ = {};
                 params.accountId
             ];
             task.logger?.info(`==> 开始获取代理信息：${args}`);
-            const ProxyAgentWithLogger = ProxyAgent.bind({
+            const ProxyAgentResult = await ProxyAgent({
                 logger: task.logger
-            });
-            const ProxyAgentResult = await ProxyAgentWithLogger(...args);
+            }, ...args);
             task.logger?.info("==> 代理信息获取成功！");
             proxyUrl = ProxyAgentResult ? `http://${ProxyAgentResult.ip}:${ProxyAgentResult.port}` : void 0;
         }
@@ -15381,10 +15655,9 @@ var __webpack_exports__ = {};
                 params.accountId
             ];
             task.logger?.info(`==> 开始获取代理信息：${args}`);
-            const ProxyAgentWithLogger = ProxyAgent.bind({
+            const ProxyAgentResult = await ProxyAgent({
                 logger: task.logger
-            });
-            const ProxyAgentResult = await ProxyAgentWithLogger(...args);
+            }, ...args);
             task.logger?.info("==> 代理信息获取成功！");
             proxyUrl = ProxyAgentResult ? `http://${ProxyAgentResult.ip}:${ProxyAgentResult.port}` : void 0;
         }
@@ -17297,10 +17570,9 @@ var __webpack_exports__ = {};
                 params.accountId
             ];
             task.logger?.info(`==> 开始获取代理信息：${args}`);
-            const ProxyAgentWithLogger = ProxyAgent.bind({
+            const ProxyAgentResult = await ProxyAgent({
                 logger: task.logger
-            });
-            const ProxyAgentResult = await ProxyAgentWithLogger(...args);
+            }, ...args);
             task.logger?.info("==> 代理信息获取成功！");
             proxyUrl = ProxyAgentResult ? `http://${ProxyAgentResult.ip}:${ProxyAgentResult.port}` : void 0;
         }
@@ -18133,10 +18405,9 @@ var __webpack_exports__ = {};
                 params.accountId
             ];
             task.logger?.info(`==> 开始获取代理信息：${args}`);
-            const ProxyAgentWithLogger = ProxyAgent.bind({
+            const ProxyAgentResult = await ProxyAgent({
                 logger: task.logger
-            });
-            const ProxyAgentResult = await ProxyAgentWithLogger(...args);
+            }, ...args);
             task.logger?.info("==> 代理信息获取成功！");
             proxyUrl = ProxyAgentResult ? `http://${ProxyAgentResult.ip}:${ProxyAgentResult.port}` : void 0;
         }