@iflyrpa/actions 1.2.31 → 1.2.32-beta.0

package/dist/actions/douyinLogin/index.d.ts

@@ -0,0 +1,5 @@
+import { CommonAction } from "@iflyrpa/share";
+import { ActionParams } from "../../types";
+export type DouyinLoginParams = ActionParams;
+export type SteelAction = CommonAction<ActionParams, Record<string, unknown>>;
+export declare const douyinLogin: SteelAction;

package/dist/actions/douyinLogin/rpa-server.d.ts

@@ -0,0 +1,2 @@
+import type { SteelAction } from "./index";
+export declare const rpaServer: SteelAction;

package/dist/bundle.js

@@ -7637,8 +7637,8 @@ var __webpack_exports__ = {};
                     const redirectUrl = response.headers.location;
                     if (redirectUrl) external_node_https_namespaceObject.get(redirectUrl, handleResponse).on("error", handleError);
                     else reject({
-                        code: 200,
-                        message: "图片下载失败: 跳转地址无效"
+                        code: 414,
+                        message: `图片下载失败: 跳转地址 Url：${url} 无效`
                     });
                 } else if (200 === response.statusCode) {
                     const fileStream = external_node_fs_namespaceObject.createWriteStream(savePath);
@@ -7655,18 +7655,17 @@ var __webpack_exports__ = {};
                         });
                     });
                 } else {
-                    console.log("图片下载失败:", response.statusCode);
                     response.resume();
                     reject({
                         code: 500,
-                        message: `图片下载失败，状态码: ${response.statusCode} Url：${url}`
+                        message: `图片下载失败 Url：${url}，状态码: ${response.statusCode}`
                     });
                 }
             };
             const handleError = (error)=>{
                 let customMessage = {
                     code: 500,
-                    message: "请求图片时发生未知错误，请检查网络连接或稍后重试!"
+                    message: "发生未知错误，请检查网络连接或稍后重试!"
                 };
                 switch(error.code){
                     case "ECONNRESET":
@@ -7702,7 +7701,7 @@ var __webpack_exports__ = {};
                     default:
                         break;
                 }
-                customMessage.message = `请求图片时${customMessage.message}`;
+                customMessage.message = `请求图片 Url：${url} 时 ${customMessage.message}`;
                 customMessage.extra = {
                     url
                 };
@@ -27147,6 +27146,10 @@ var __webpack_exports__ = {};
         articleId: classic_schemas_string().optional(),
         saveType: classic_schemas_string().optional()
     });
+    ActionCommonParamsSchema.extend({
+        id: classic_schemas_string().optional(),
+        userAgent: classic_schemas_string().optional()
+    });
     var types_ExecutionState = /*#__PURE__*/ function(ExecutionState) {
         ExecutionState["RUNNING"] = "RUNNING";
         ExecutionState["SCAN_WAITING"] = "SCAN_WAITING";
@@ -27163,13 +27166,31 @@ var __webpack_exports__ = {};
             message,
             data: null
         });
+    const MockPublish = false;
     const rpa_server_scanRetryMaxCount = 60;
     const rpa_server_waitQrcodeResultMaxTime = 2000 * rpa_server_scanRetryMaxCount;
-    const rpaServer = async (task, _params)=>{
+    const rpaServer = async (task, params)=>{
         const updateTaskState = task.taskStageStore?.update?.bind(task.taskStageStore, task.taskId || "");
         let executionState;
+        let proxyUrl;
+        if (params.localIP) {
+            const args = [
+                params.localIP,
+                params.proxyLoc,
+                params.accountId
+            ];
+            task.logger?.info(`==> 开始获取代理信息：${args}`);
+            const ProxyAgentWithLogger = ProxyAgent.bind({
+                logger: task.logger
+            });
+            const ProxyAgentResult = await ProxyAgentWithLogger(...args);
+            task.logger?.info("==> 代理信息获取成功！");
+            proxyUrl = ProxyAgentResult ? `http://${ProxyAgentResult.ip}:${ProxyAgentResult.port}` : void 0;
+        }
         const page = await task.createPage({
-            url: "https://passport.baidu.com/v2/?login"
+            url: "https://passport.baidu.com/v2/?login",
+            proxyUrl,
+            userAgent: params.userAgent
         });
         task.steelBrowser?.on("disconnected", ()=>{
             executionState = types_ExecutionState.BROWSER_CLOSED;
@@ -27622,6 +27643,18 @@ var __webpack_exports__ = {};
         const isDraft = "draft" === params.saveType;
         const saveUrl = isDraft ? "https://baijiahao.baidu.com/pcui/article/save?callback=bjhdraft" : "https://baijiahao.baidu.com/pcui/article/publish?callback=bjhpublish";
         task._timerRecord.PrePublish = Date.now();
+        const updateTaskState = task.taskStageStore?.update?.bind(task.taskStageStore, task.taskId || "");
+        if (MockPublish) {
+            const message = `文章模拟发布成功 ${http.proxyInfo}`;
+            const data = "123456789";
+            await updateTaskState?.({
+                state: types_TaskState.SUCCESS,
+                result: {
+                    response: data
+                }
+            });
+            return success(data, message);
+        }
         const res = await proxyHttp.api({
             method: "post",
             url: saveUrl,
@@ -27640,7 +27673,6 @@ var __webpack_exports__ = {};
         const isSuccess = 0 === res.errno;
         const data = res?.ret?.article_id;
         const message = isSuccess ? isDraft ? "文章同步成功！" : `文章发布成功！${res.proxyInfo || ""}` : res.errmsg || (isDraft ? "文章同步失败，请稍后重试。" : "文章发布失败，请稍后重试。");
-        const updateTaskState = task.taskStageStore?.update?.bind(task.taskStageStore, task.taskId || "");
         if (!isSuccess) {
             await updateTaskState?.({
                 state: types_TaskState.FAILED,
@@ -29179,6 +29211,214 @@ var __webpack_exports__ = {};
         };
         return success(data, message);
     };
+    const douyinLogin_rpa_server_scanRetryMaxCount = 60;
+    const douyinLogin_rpa_server_waitQrcodeResultMaxTime = 2000 * douyinLogin_rpa_server_scanRetryMaxCount;
+    const rpa_server_rpaServer = async (task, params)=>{
+        const updateTaskState = task.taskStageStore?.update?.bind(task.taskStageStore, task.taskId || "");
+        let executionState;
+        let proxyUrl;
+        if (params.localIP) {
+            const args = [
+                params.localIP,
+                params.proxyLoc,
+                params.accountId
+            ];
+            task.logger?.info(`==> 开始获取代理信息：${args}`);
+            const ProxyAgentWithLogger = ProxyAgent.bind({
+                logger: task.logger
+            });
+            const ProxyAgentResult = await ProxyAgentWithLogger(...args);
+            task.logger?.info("==> 代理信息获取成功！");
+            proxyUrl = ProxyAgentResult ? `http://${ProxyAgentResult.ip}:${ProxyAgentResult.port}` : void 0;
+        }
+        const page = await task.createPage({
+            url: "https://www.douyin.com/aisearch",
+            proxyUrl,
+            userAgent: params.userAgent
+        });
+        await page.waitForLoadState("domcontentloaded");
+        await page.goto("about:blank");
+        await page.goBack();
+        task.steelBrowser?.on("disconnected", ()=>{
+            executionState = types_ExecutionState.BROWSER_CLOSED;
+        });
+        await updateTaskState?.({
+            state: types_TaskState.WAIT_SCAN,
+            connectAddress: task.steelConnector?.getProxyUrl(task.sessionId || "", "v1/sessions/debug"),
+            sessionId: task.sessionId
+        });
+        const userInfo = {
+            uniqueId: "",
+            avatar: "",
+            name: ""
+        };
+        await new Promise((resolve, reject)=>{
+            let finished = false;
+            const timer = setTimeout(async ()=>{
+                cleanup();
+                executionState = types_ExecutionState.TIMEOUT;
+                await updateTaskState?.({
+                    state: types_TaskState.TIMEOUT,
+                    error: "等待扫码登录超时"
+                });
+                resolve();
+            }, douyinLogin_rpa_server_waitQrcodeResultMaxTime);
+            const cleanup = ()=>{
+                if (finished) return;
+                finished = true;
+                clearTimeout(timer);
+                page.off("response", handleWebCommon);
+                page.off("response", handleCheckQR);
+                task.steelBrowser?.off("disconnected", handleBrowserClosed);
+            };
+            const handleBrowserClosed = ()=>{
+                cleanup();
+                executionState = types_ExecutionState.BROWSER_CLOSED;
+                resolve();
+            };
+            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
+                            ]);
+                            await updateTaskState?.({
+                                state: types_TaskState.CONFIRMED
+                            });
+                        }
+                        executionState = types_ExecutionState.SUCCESS;
+                        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 ?? "";
+                    } catch (e) {
+                        task.logger.warn("无法解析用户信息:", {
+                            url,
+                            error: e
+                        });
+                    }
+                } catch (err) {
+                    cleanup();
+                    reject(err);
+                }
+            };
+            const handleCheckQR = async (response)=>{
+                try {
+                    const url = response.url();
+                    if (!url.includes("/check_qrconnect/")) return;
+                    let jsonResponse;
+                    try {
+                        const text = await response.text();
+                        if (!text) {
+                            task.logger.warn("Empty response body:", {
+                                url
+                            });
+                            return;
+                        }
+                        jsonResponse = JSON.parse(text);
+                    } catch (e) {
+                        task.logger.warn("Failed to parse json:", {
+                            url,
+                            error: e
+                        });
+                        return;
+                    }
+                    if ("scanned" === jsonResponse.data.status) await updateTaskState?.({
+                        state: types_TaskState.SCANNED
+                    });
+                    if (jsonResponse.data?.status === "confirmed") {
+                        userInfo.uniqueId = jsonResponse.data.user_data?.user_id_str || "";
+                        page.off("response", handleCheckQR);
+                        page.on("response", handleWebCommon);
+                    }
+                } catch (err) {
+                    cleanup();
+                    reject(err);
+                }
+            };
+            task.steelBrowser?.on("disconnected", handleBrowserClosed);
+            page.on("response", handleCheckQR);
+        });
+        if (void 0 === executionState) return {
+            code: 500,
+            message: "未知错误",
+            data: {}
+        };
+        switch(executionState){
+            case types_ExecutionState.BROWSER_CLOSED:
+                {
+                    const msg = "浏览器已关闭，任务中断!";
+                    await updateTaskState?.({
+                        state: types_TaskState.FAILED,
+                        error: "浏览器已关闭"
+                    });
+                    return {
+                        code: 414,
+                        message: msg,
+                        data: {}
+                    };
+                }
+            case types_ExecutionState.TIMEOUT:
+                {
+                    const msg = "等待用户扫码登录超时!";
+                    await updateTaskState?.({
+                        state: types_TaskState.TIMEOUT,
+                        error: msg
+                    });
+                    task.logger.info(msg);
+                    return {
+                        code: 414,
+                        message: msg,
+                        data: {}
+                    };
+                }
+            case types_ExecutionState.SUCCESS:
+                await updateTaskState?.({
+                    state: types_TaskState.SUCCESS,
+                    result: {
+                        cookie: JSON.stringify(await task.steelBrowserContext?.cookies()),
+                        userInfo: userInfo
+                    }
+                });
+                return {
+                    code: 0,
+                    message: "成功",
+                    data: {
+                        cookie: JSON.stringify(await task.steelBrowserContext?.cookies()),
+                        userInfo
+                    }
+                };
+            default:
+                return {
+                    code: 500,
+                    message: "任务执行中断",
+                    data: {}
+                };
+        }
+    };
+    const douyinLogin = async (task, params)=>{
+        if ("mockApi" === params.actionType) return success({}, "暂不支持mockApi");
+        if ("server" === params.actionType) return rpa_server_rpaServer(task, params);
+        return executeAction(rpa_server_rpaServer)(task, params);
+    };
     const getBaijiahaoActivity = async (_task, params)=>{
         const cookies = params.cookies ?? [];
         const http = new Http({
@@ -31081,11 +31321,28 @@ var __webpack_exports__ = {};
     };
     const toutiaoLogin_rpa_server_scanRetryMaxCount = 60;
     const toutiaoLogin_rpa_server_waitQrcodeResultMaxTime = 2000 * toutiaoLogin_rpa_server_scanRetryMaxCount;
-    const rpa_server_rpaServer = async (task, _params)=>{
+    const toutiaoLogin_rpa_server_rpaServer = async (task, params)=>{
         const updateTaskState = task.taskStageStore?.update?.bind(task.taskStageStore, task.taskId || "");
         let executionState;
+        let proxyUrl;
+        if (params.localIP) {
+            const args = [
+                params.localIP,
+                params.proxyLoc,
+                params.accountId
+            ];
+            task.logger?.info(`==> 开始获取代理信息：${args}`);
+            const ProxyAgentWithLogger = ProxyAgent.bind({
+                logger: task.logger
+            });
+            const ProxyAgentResult = await ProxyAgentWithLogger(...args);
+            task.logger?.info("==> 代理信息获取成功！");
+            proxyUrl = ProxyAgentResult ? `http://${ProxyAgentResult.ip}:${ProxyAgentResult.port}` : void 0;
+        }
         const page = await task.createPage({
-            url: "https://mp.toutiao.com/auth/page/login"
+            url: "https://mp.toutiao.com/auth/page/login",
+            proxyUrl,
+            userAgent: params.userAgent
         });
         task.steelBrowser?.on("disconnected", ()=>{
             executionState = types_ExecutionState.BROWSER_CLOSED;
@@ -31267,7 +31524,7 @@ var __webpack_exports__ = {};
     const toutiaoLogin = async (task, params)=>{
         if ("rpa" === params.actionType) return toutiaoLogin_rpa_rpaAction(task, params);
         if ("mockApi" === params.actionType) return success({}, "暂不支持mockApi");
-        if ("server" === params.actionType) return rpa_server_rpaServer(task, params);
+        if ("server" === params.actionType) return toutiaoLogin_rpa_server_rpaServer(task, params);
         return executeAction(toutiaoLogin_rpa_rpaAction)(task, params);
     };
     const GenAB = __webpack_require__("./src/utils/ttABEncrypt.js");
@@ -31484,6 +31741,18 @@ var __webpack_exports__ = {};
             },
             defaultErrorMsg: "draft" === params.saveType ? "文章同步异常，请稍后重试。" : "文章发布异常，请稍后重试。"
         };
+        const updateTaskState = task.taskStageStore?.update?.bind(task.taskStageStore, task.taskId || "");
+        if (MockPublish) {
+            const message = `文章模拟发布成功 ${http.proxyInfo}`;
+            const data = "123456789";
+            await updateTaskState?.({
+                state: types_TaskState.SUCCESS,
+                result: {
+                    response: data
+                }
+            });
+            return success(data, message);
+        }
         const publishResult = await proxyHttp.api(publishOption, {
             retries: 3,
             retryDelay: 500,
@@ -31492,7 +31761,6 @@ var __webpack_exports__ = {};
         const isSuccess = 0 === publishResult.code;
         const data = publishResult.data?.pgc_id;
         const message = publishResult.message || (isSuccess ? "文章发布成功！" : "文章发布失败，未知错误。");
-        const updateTaskState = task.taskStageStore?.update?.bind(task.taskStageStore, task.taskId || "");
         if (!isSuccess) {
             await updateTaskState?.({
                 state: types_TaskState.FAILED,
@@ -31518,7 +31786,7 @@ var __webpack_exports__ = {};
         const commonCookies = {
             path: "/",
             secure: true,
-            domain: ".toutiao.com",
+            domain: "toutiao.com",
             url: "https://mp.toutiao.com",
             httpOnly: true
         };
@@ -32084,11 +32352,28 @@ var __webpack_exports__ = {};
     };
     const weixinLogin_rpa_server_scanRetryMaxCount = 60;
     const weixinLogin_rpa_server_waitQrcodeResultMaxTime = 2000 * weixinLogin_rpa_server_scanRetryMaxCount;
-    const weixinLogin_rpa_server_rpaServer = async (task, _params)=>{
+    const weixinLogin_rpa_server_rpaServer = async (task, params)=>{
         const updateTaskState = task.taskStageStore?.update?.bind(task.taskStageStore, task.taskId || "");
         let executionState;
+        let proxyUrl;
+        if (params.localIP) {
+            const args = [
+                params.localIP,
+                params.proxyLoc,
+                params.accountId
+            ];
+            task.logger?.info(`==> 开始获取代理信息：${args}`);
+            const ProxyAgentWithLogger = ProxyAgent.bind({
+                logger: task.logger
+            });
+            const ProxyAgentResult = await ProxyAgentWithLogger(...args);
+            task.logger?.info("==> 代理信息获取成功！");
+            proxyUrl = ProxyAgentResult ? `http://${ProxyAgentResult.ip}:${ProxyAgentResult.port}` : void 0;
+        }
         const page = await task.createPage({
-            url: "https://mp.weixin.qq.com/cgi-bin/loginpage"
+            url: "https://mp.weixin.qq.com/cgi-bin/loginpage",
+            proxyUrl,
+            userAgent: params.userAgent
         });
         task.steelBrowser?.on("disconnected", ()=>{
             executionState = types_ExecutionState.BROWSER_CLOSED;
@@ -33974,8 +34259,25 @@ var __webpack_exports__ = {};
     const xiaohongshuLogin_rpa_server_rpaServer = async (task, params)=>{
         const updateTaskState = task.taskStageStore?.update?.bind(task.taskStageStore, task.taskId || "");
         let executionState;
+        let proxyUrl;
+        if (params.localIP) {
+            const args = [
+                params.localIP,
+                params.proxyLoc,
+                params.accountId
+            ];
+            task.logger?.info(`==> 开始获取代理信息：${args}`);
+            const ProxyAgentWithLogger = ProxyAgent.bind({
+                logger: task.logger
+            });
+            const ProxyAgentResult = await ProxyAgentWithLogger(...args);
+            task.logger?.info("==> 代理信息获取成功！");
+            proxyUrl = ProxyAgentResult ? `http://${ProxyAgentResult.ip}:${ProxyAgentResult.port}` : void 0;
+        }
         const page = await task.createPage({
-            url: "https://www.xiaohongshu.com/login"
+            url: "https://www.xiaohongshu.com/login",
+            proxyUrl,
+            userAgent: params.userAgent
         });
         task.steelBrowser?.on("disconnected", ()=>{
             executionState = types_ExecutionState.BROWSER_CLOSED;
@@ -34507,6 +34809,18 @@ var __webpack_exports__ = {};
         publishData.common.business_binds = JSON.stringify(business_binds);
         const publishXsHeader = mock_xsEncrypt.signHeadersPost("/web_api/sns/v2/note", recordCookie, "ugc", publishData);
         task._timerRecord.PrePublish = Date.now();
+        const updateTaskState = task.taskStageStore?.update?.bind(task.taskStageStore, task.taskId || "");
+        if (MockPublish) {
+            const message = `文章模拟发布成功 ${http.proxyInfo}`;
+            const data = "123456789";
+            await updateTaskState?.({
+                state: types_TaskState.SUCCESS,
+                result: {
+                    response: data
+                }
+            });
+            return success(data, message);
+        }
         const publishResult = await proxyHttp.api({
             method: "post",
             url: "https://edith.xiaohongshu.com/web_api/sns/v2/note",
@@ -34521,7 +34835,6 @@ var __webpack_exports__ = {};
         const isSuccess = publishResult.success;
         const message = `文章发布${isSuccess ? "成功" : `失败，原因：${publishResult.msg}`}${task.debug ? ` ${http.proxyInfo}` : ""}`;
         const data = isSuccess ? publishResult.data?.id || "" : "";
-        const updateTaskState = task.taskStageStore?.update?.bind(task.taskStageStore, task.taskId || "");
         if (!isSuccess) {
             await updateTaskState?.({
                 state: types_TaskState.FAILED,
@@ -35054,6 +35367,17 @@ var __webpack_exports__ = {};
         } catch (error) {
             throw new Error("上传图片超时，请重试！");
         }
+        if (MockPublish) {
+            const message = "文章模拟发布成功";
+            const data = "123456789";
+            await updateTaskState?.({
+                state: types_TaskState.SUCCESS,
+                result: {
+                    response: data
+                }
+            });
+            return success(data, message);
+        }
         const response = await new Promise((resolve)=>{
             const handleResponse = async (response)=>{
                 if (response.url().includes("/web_api/sns/v2/note")) {
@@ -35470,6 +35794,17 @@ var __webpack_exports__ = {};
         });
         publishXsHeader["x-s"] = rpa_server_mock_encode_mnsv2(ticket_mnsv2, "Windows", "object");
         publishXsHeader["x-t"] = Date.now().toString();
+        if (MockPublish) {
+            const message = `文章模拟发布成功 ${http.proxyInfo}`;
+            const data = "123456789";
+            await updateTaskState?.({
+                state: types_TaskState.SUCCESS,
+                result: {
+                    response: data
+                }
+            });
+            return success(data, message);
+        }
         const publishResult = await proxyHttp.api({
             method: "post",
             url: "https://edith.xiaohongshu.com/web_api/sns/v2/note",
@@ -36061,7 +36396,7 @@ var __webpack_exports__ = {};
         return utils_response(isSuccess ? 0 : 414, message, data);
     };
     var package_namespaceObject = {
-        i8: "1.2.30"
+        i8: "1.2.31"
     };
     const ttConfigDataSchema = classic_schemas_object({
         fansNum: classic_schemas_number(),
@@ -36188,6 +36523,9 @@ var __webpack_exports__ = {};
         ToutiaoLogin(params) {
             return this.bindTask(toutiaoLogin, params);
         }
+        DouyinLogin(params) {
+            return this.bindTask(douyinLogin, params);
+        }
         XhsLogin(params) {
             return this.bindTask(xiaohongshuLogin, params);
         }