@iflyrpa/actions 4.0.0-beta.6 → 5.0.0-beta.1

package/dist/index.js

@@ -5489,7 +5489,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":"4.0.0-beta.5"}');
+    var package_namespaceObject = JSON.parse('{"i8":"4.0.1-beta.0"}');
     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);
@@ -5590,7 +5590,8 @@ var __webpack_exports__ = {};
                         url: error.config?.url,
                         isProxyRequest: !!(error.config && (error.config.httpAgent || error.config.httpsAgent)),
                         params: error.config?.params,
-                        data: error.config?.data
+                        data: error.config?.data,
+                        serverDate: error.response?.headers?.date
                     }
                 };
                 if (foundError) Object.assign(errorResponse, foundError);
@@ -5668,7 +5669,7 @@ var __webpack_exports__ = {};
                 try {
                     this.proxyInfo = agent ? `${agent.ip}:${agent.port}` : void 0;
                     const controller = new AbortController();
-                    const timeoutId = setTimeout(()=>controller.abort(), reqTimeout);
+                    const timeoutId = setTimeout(()=>controller.abort(), reqTimeout + 500);
                     const response = await this.apiClient({
                         ...config,
                         timeout: reqTimeout,
@@ -5692,7 +5693,7 @@ var __webpack_exports__ = {};
                         599
                     ].includes(handledError.code);
                     if (Rtimes < retries && isRetry) {
-                        this.logger?.info(`进入第${Rtimes + 1}次重试！`);
+                        this.logger?.info(`进入第${Rtimes + 1}次重试！错误码: ${handledError.code}`);
                         await new Promise((resolve)=>setTimeout(resolve, retryDelay));
                         return sessionRt(Rtimes + 1);
                     }
@@ -9909,23 +9910,26 @@ var __webpack_exports__ = {};
                     };
                 }
             case types_ExecutionState.SUCCESS:
-                await updateTaskState?.({
-                    state: share_namespaceObject.TaskState.SUCCESS,
-                    result: {
-                        cookie: JSON.stringify(await task.steelBrowserContext?.cookies()).replace(/\\"/g, ""),
-                        token,
-                        userInfo: userInfo
-                    }
-                });
-                return {
-                    code: 0,
-                    message: "成功",
-                    data: {
-                        cookie: JSON.stringify(await task.steelBrowserContext?.cookies()).replace(/\\"/g, ""),
-                        token,
-                        userInfo
-                    }
-                };
+                {
+                    const cookie = JSON.stringify(await task.steelBrowserContext?.cookies());
+                    await updateTaskState?.({
+                        state: share_namespaceObject.TaskState.SUCCESS,
+                        result: {
+                            cookie,
+                            token,
+                            userInfo: userInfo
+                        }
+                    });
+                    return {
+                        code: 0,
+                        message: "成功",
+                        data: {
+                            cookie,
+                            token,
+                            userInfo
+                        }
+                    };
+                }
             default:
                 return {
                     code: 500,
@@ -10284,20 +10288,11 @@ var __webpack_exports__ = {};
     };
     const rpa_rpaAction = async (task, params)=>{
         const tmpCachePath = task.getTmpPath();
-        const commonCookies = {
-            path: "/",
-            secure: true,
-            domain: "baijiahao.baidu.com",
-            url: "https://baijiahao.baidu.com",
-            httpOnly: true
-        };
+        const validCookies = (params.cookies || []).filter((it)=>it.name && it.value && "undefined" !== it.value);
         const page = await task.createPage({
             show: task.debug,
             url: params.url || "https://baijiahao.baidu.com/builder/rc/edit?type=news&is_from_cms=1",
-            cookies: params.cookies?.map((it)=>({
-                    ...it,
-                    ...commonCookies
-                })) || []
+            cookies: validCookies
         });
         page.setDefaultTimeout(60000);
         page.setDefaultNavigationTimeout(60000);
@@ -11832,6 +11827,8 @@ var __webpack_exports__ = {};
     }
     new Xhshow();
     const sessionCheck_xsEncrypt = new Xhshow();
+    let lastEnvLogTime = 0;
+    const ENV_LOG_INTERVAL_MS = 5000;
     const SessionCheckResultSchema = schemas_object({
         isValidSession: schemas_boolean()
     });
@@ -11896,6 +11893,23 @@ var __webpack_exports__ = {};
         }, "微信账号有效性检测完成！");
     };
     const XhsSessionCheck = async (_task, params)=>{
+        const now = Date.now();
+        const shouldLogEnv = now - lastEnvLogTime >= ENV_LOG_INTERVAL_MS;
+        if (shouldLogEnv) {
+            lastEnvLogTime = now;
+            _task.logger?.debug("[XhsSessionCheck] 环境信息", {
+                processType: process.type,
+                pid: process.pid,
+                nodeVersion: process.version,
+                platform: process.platform,
+                memoryUsage: {
+                    heapUsed: `${Math.round(process.memoryUsage().heapUsed / 1024 / 1024)} MB`,
+                    heapTotal: `${Math.round(process.memoryUsage().heapTotal / 1024 / 1024)} MB`
+                },
+                accountId: params.accountId,
+                hasProxy: !!(params.proxyLoc || params.localIP)
+            });
+        }
         const check = {
             isValidSession: false,
             isValidWebSession: false
@@ -11932,7 +11946,32 @@ var __webpack_exports__ = {};
             if (cookie.name && cookie.value) acc[cookie.name] = cookie.value;
             return acc;
         }, {});
-        const loginBaseXsHeader = sessionCheck_xsEncrypt.signHeadersGet(loginBasePath, recordCookie, "xhs-pc-web", null);
+        let loginBaseXsHeader;
+        try {
+            loginBaseXsHeader = sessionCheck_xsEncrypt.signHeadersGet(loginBasePath, recordCookie, "xhs-pc-web", null);
+        } catch (signError) {
+            _task.logger?.error("[XhsSessionCheck] 签名生成失败 - 环境快照", {
+                accountId: params.accountId,
+                error: signError instanceof Error ? signError.message : String(signError),
+                stack: _task.debug ? signError instanceof Error ? signError.stack : void 0 : void 0,
+                hasA1: !!recordCookie.a1,
+                env: {
+                    processType: process.type,
+                    memoryUsage: {
+                        heapUsed: `${Math.round(process.memoryUsage().heapUsed / 1024 / 1024)} MB`,
+                        heapTotal: `${Math.round(process.memoryUsage().heapTotal / 1024 / 1024)} MB`
+                    },
+                    hasProxy: !!(params.proxyLoc || params.localIP),
+                    timeSinceLastLog: Date.now() - lastEnvLogTime
+                }
+            });
+            return {
+                code: 500,
+                message: "账号签名生成失败，请稍后重试。",
+                data: check
+            };
+        }
+        const baseInfoStart = Date.now();
         const _baseInfo = http.api({
             method: "get",
             baseURL: "https://creator.xiaohongshu.com",
@@ -11941,23 +11980,43 @@ var __webpack_exports__ = {};
         }, {
             retries: 3,
             retryDelay: 20,
-            timeout: 3000
-        }).catch((e)=>e.data);
+            timeout: 5000
+        }).catch((e)=>{
+            const clientTimestamp = Date.now();
+            const serverDate = e?.extra?.serverDate;
+            const serverTimestamp = serverDate ? new Date(serverDate).getTime() : null;
+            const timeDriftMs = serverTimestamp ? clientTimestamp - serverTimestamp : null;
+            _task.logger?.warn("[XhsSessionCheck] creator base 接口请求失败", {
+                accountId: params.accountId,
+                duration: Date.now() - baseInfoStart,
+                code: e?.code,
+                message: e?.message,
+                data: e?.data,
+                extra: e?.extra,
+                proxyInfo: http.proxyInfo,
+                clientTimestamp,
+                serverDate,
+                serverTimestamp,
+                timeDriftMs,
+                isLikelyClockDrift: null !== timeDriftMs && Math.abs(timeDriftMs) > 300000
+            });
+            return e.data;
+        });
         const _web_session = http.api({
             method: "get",
             url: "https://edith.xiaohongshu.com/api/sns/web/unread_count"
         }, {
             retries: 3,
             retryDelay: 20,
-            timeout: 3000
+            timeout: 5000
         });
         const [baseInfo, web_session] = await Promise.all([
             _baseInfo,
             _web_session
         ]);
         if (baseInfo?.code === 0) check.isValidSession = true;
-        if (0 === web_session.code) check.isValidWebSession = true;
-        baseInfo?.code, web_session.code;
+        if (web_session?.code === 0) check.isValidWebSession = true;
+        baseInfo?.code, web_session?.code;
         const message = `小红书账号有效性检测成功${_task.debug ? ` ${http.proxyInfo}` : ""}`;
         return (0, share_namespaceObject.success)(check, message);
     };
@@ -14492,7 +14551,10 @@ var __webpack_exports__ = {};
             task.logger.info(`拦截器收到响应response.data: ${JSON.stringify(response.data)} `);
             decision = parseVerifyPassportDecision(response.headers["x-tt-verify-passport-decision"]);
             if (needsVerification(decision)) {
-                task.logger.info(`需要验证: ${JSON.stringify(decision)}`);
+                task.logger.warn(`检测到需要验证: ${JSON.stringify(decision)}`);
+                task.logger.warn(`验证类型: ${decision?.verify_ways?.join(", ")}`);
+                task.logger.warn(`验证标题: ${decision?.verify_title}`);
+                task.logger.warn(`验证描述: ${decision?.verify_desc}`);
                 return;
             }
             if (!response || !response.data) return;
@@ -14519,38 +14581,116 @@ var __webpack_exports__ = {};
             });
             return (0, share_namespaceObject.response)(0, message, data);
         }
-        const webProtectData = JSON.parse(JSON.parse(params.extraParam["security-sdk/s_sdk_sign_data_key/web_protect"] || "{}").data || "{}");
-        const ticket = webProtectData.ticket;
-        const ts_sign = webProtectData.ts_sign;
-        const ec_privateKey = JSON.parse(JSON.parse(params.extraParam["security-sdk/s_sdk_crypt_sdk"] || "{}").data || "{}").ec_privateKey;
-        const certificate = JSON.parse(params.extraParam["security-sdk/s_sdk_server_cert_key"] || "{}").cert;
+        let webProtectData;
+        try {
+            webProtectData = JSON.parse(JSON.parse(params.extraParam["security-sdk/s_sdk_sign_data_key/web_protect"] || "{}").data || "{}");
+            if (!webProtectData.ticket || !webProtectData.ts_sign || !webProtectData.client_cert) {
+                task.logger.error(`webProtectData 关键字段缺失: ${JSON.stringify(webProtectData)}`);
+                return (0, share_namespaceObject.response)(414, "安全参数 webProtectData 不完整，请重新获取后重试", "");
+            }
+        } catch (error) {
+            task.logger.error(`解析 webProtectData 失败: ${error}`);
+            return (0, share_namespaceObject.response)(414, "安全参数 webProtectData 解析失败，请重新获取后重试", "");
+        }
+        let ticket = webProtectData.ticket;
+        let ts_sign = webProtectData.ts_sign;
+        const serverDataCookie = params.cookies.find((it)=>"bd_ticket_guard_server_data" === it.name)?.value;
+        if (serverDataCookie) try {
+            const decoded = JSON.parse(Buffer.from(decodeURIComponent(serverDataCookie), "base64").toString("utf8"));
+            if (decoded.ticket && decoded.ts_sign) {
+                if (decoded.ticket !== ticket) task.logger.info("使用 cookie 中的最新 ticket（web_protect 已过期）");
+                ticket = decoded.ticket;
+                ts_sign = decoded.ts_sign;
+            }
+        } catch (error) {
+            task.logger.warn(`解析 bd_ticket_guard_server_data 失败，回退到 web_protect: ${error}`);
+        }
+        let ec_privateKey;
+        try {
+            ec_privateKey = JSON.parse(JSON.parse(params.extraParam["security-sdk/s_sdk_crypt_sdk"] || "{}").data || "{}").ec_privateKey;
+            if (!ec_privateKey) {
+                task.logger.error("ec_privateKey 为空");
+                return (0, share_namespaceObject.response)(414, "安全参数 ec_privateKey 缺失，请重新获取后重试", "");
+            }
+        } catch (error) {
+            task.logger.error(`解析 ec_privateKey 失败: ${error}`);
+            return (0, share_namespaceObject.response)(414, "安全参数 ec_privateKey 解析失败，请重新获取后重试", "");
+        }
+        let certificate;
+        try {
+            certificate = JSON.parse(params.extraParam["security-sdk/s_sdk_server_cert_key"] || "{}").cert;
+            if (!certificate) {
+                task.logger.error("certificate 为空");
+                return (0, share_namespaceObject.response)(414, "安全参数 certificate 缺失，请重新获取后重试", "");
+            }
+        } catch (error) {
+            task.logger.error(`解析 certificate 失败: ${error}`);
+            return (0, share_namespaceObject.response)(414, "安全参数 certificate 解析失败，请重新获取后重试", "");
+        }
         const ree_public_key = webProtectData.client_cert.replace("pub.", "");
-        task.logger.info(`生成 bdTicketGuardClientData 的参数: ticket: ${ticket}, ts_sign: ${ts_sign}, ec_privateKey: ${ec_privateKey}, certificate: ${certificate}, ree_public_key: ${ree_public_key}`);
-        const bdTicketGuardClientData = getBdV2({
-            ticket,
-            ts_sign: ts_sign,
-            ec_privateKey: ec_privateKey,
-            certificate: certificate,
-            bd_ticket_guard_ree_public_key: ree_public_key
-        });
-        task.logger.info("bdTicketGuardClientData", {
-            bdTicketGuardClientData
-        });
+        task.logger.info(`生成 bdTicketGuardClientData 的参数: ticket: ${ticket?.substring(0, 20)}..., ts_sign: ${ts_sign}, ree_public_key: ${ree_public_key?.substring(0, 20)}...`);
+        let bdTicketGuardClientData;
+        try {
+            bdTicketGuardClientData = getBdV2({
+                ticket,
+                ts_sign: ts_sign,
+                ec_privateKey: ec_privateKey,
+                certificate: certificate,
+                bd_ticket_guard_ree_public_key: ree_public_key
+            });
+            if (!bdTicketGuardClientData || !bdTicketGuardClientData["headers_bd_ticket_guard_client_data"]) {
+                task.logger.error(`bdTicketGuardClientData 生成失败或不完整: ${JSON.stringify(bdTicketGuardClientData)}`);
+                return (0, share_namespaceObject.response)(414, "安全参数 bdTicketGuardClientData 生成失败，请重新获取后重试", "");
+            }
+        } catch (error) {
+            task.logger.error(`生成 bdTicketGuardClientData 失败: ${error}`);
+            return (0, share_namespaceObject.response)(414, "安全参数 bdTicketGuardClientData 生成异常，请重新获取后重试", "");
+        }
+        task.logger.info("bdTicketGuardClientData 生成成功");
         const publishQuery = {
             ...publishParams,
             a_bogus: ""
         };
         const queryString = new URLSearchParams(publishQuery).toString();
-        const aBogus = mock_getABogus(`https://creator.douyin.com/web/api/media/aweme/create_v2/?${queryString}`, publishData, userAgent);
+        let aBogus;
+        try {
+            aBogus = mock_getABogus(`https://creator.douyin.com/web/api/media/aweme/create_v2/?${queryString}`, publishData, userAgent);
+            if (!aBogus || aBogus.length < 10) {
+                task.logger.error(`a_bogus 生成异常，长度过短: ${aBogus}`);
+                return (0, share_namespaceObject.response)(414, "安全参数 a_bogus 生成失败，请重试", "");
+            }
+            task.logger.info(`a_bogus 生成成功: ${aBogus.substring(0, 20)}...`);
+        } catch (error) {
+            task.logger.error(`生成 a_bogus 失败: ${error}`);
+            return (0, share_namespaceObject.response)(414, "安全参数 a_bogus 生成异常，请重试", "");
+        }
         publishQuery.a_bogus = aBogus;
         const publishQueryParams = new URLSearchParams(publishQuery).toString();
-        const csrfToken = mock_generateCsrfTokenAdvanced({
-            cookies: params.cookies,
-            url: "https://creator.douyin.com/web/api/media/aweme/create_v2/",
-            method: "POST",
-            userAgent
-        });
-        const sessionDtrait = mock_generateDtrait("/web/api/media/aweme/create_v2/");
+        let csrfToken;
+        try {
+            csrfToken = mock_generateCsrfTokenAdvanced({
+                cookies: params.cookies,
+                url: "https://creator.douyin.com/web/api/media/aweme/create_v2/",
+                method: "POST",
+                userAgent
+            });
+            if (!csrfToken || csrfToken.length < 10) {
+                task.logger.error(`csrfToken 生成异常，长度过短: ${csrfToken}`);
+                return (0, share_namespaceObject.response)(414, "安全参数 csrfToken 生成失败，请重试", "");
+            }
+            task.logger.info(`csrfToken 生成成功: ${csrfToken.substring(0, 20)}...`);
+        } catch (error) {
+            task.logger.error(`生成 csrfToken 失败: ${error}`);
+            return (0, share_namespaceObject.response)(414, "安全参数 csrfToken 生成异常，请重试", "");
+        }
+        let sessionDtrait;
+        try {
+            sessionDtrait = mock_generateDtrait("/web/api/media/aweme/create_v2/");
+            task.logger.info(`sessionDtrait 生成成功: ${sessionDtrait || "(空)"}`);
+        } catch (error) {
+            task.logger.error(`生成 sessionDtrait 失败: ${error}`);
+            return (0, share_namespaceObject.response)(414, "安全参数 sessionDtrait 生成异常，请重试", "");
+        }
         task.logger.info("发布数据", {
             data: JSON.stringify(publishData)
         });
@@ -23157,6 +23297,33 @@ var __webpack_exports__ = {};
     const encode_mnsv2 = __webpack_require__("./src/utils/xhs_ob/x_s.encoder.js");
     const xiaohongshuLogin_rpa_server_scanRetryMaxCount = 60;
     const xiaohongshuLogin_rpa_server_waitQrcodeResultMaxTime = 2000 * xiaohongshuLogin_rpa_server_scanRetryMaxCount;
+    async function collectCookiesWithA1(task) {
+        const hasA1 = (cookies)=>cookies.some((c)=>"a1" === c.name && !!c.value);
+        let cookies = await task.steelBrowserContext?.cookies() ?? [];
+        if (hasA1(cookies)) return cookies;
+        task.logger?.warn("[XhsLogin] 首次抓取缺失 a1，尝试补救……");
+        try {
+            const page = task.steelBrowserContext?.pages?.()[0];
+            if (page) {
+                await page.goto("https://www.xiaohongshu.com", {
+                    waitUntil: "domcontentloaded",
+                    timeout: 15000
+                });
+                for(let i = 0; i < 10; i++){
+                    cookies = await task.steelBrowserContext?.cookies() ?? [];
+                    if (hasA1(cookies)) {
+                        task.logger?.info(`[XhsLogin] a1 补救成功，第 ${i + 1} 次轮询命中`);
+                        return cookies;
+                    }
+                    await new Promise((resolve)=>setTimeout(resolve, 500));
+                }
+            }
+        } catch (err) {
+            task.logger?.warn("[XhsLogin] a1 补救访问主站失败", err);
+        }
+        cookies = await task.steelBrowserContext?.cookies() ?? [];
+        return cookies;
+    }
     const xiaohongshuLogin_rpa_server_rpaServer = async (task, params)=>{
         const updateTaskState = task.taskStageStore?.update?.bind(task.taskStageStore, task.taskId || "");
         const reporter = task.reportService?.reportLoginStatus ?? (()=>Promise.resolve());
@@ -23357,21 +23524,29 @@ var __webpack_exports__ = {};
                     };
                 }
             case types_ExecutionState.SUCCESS:
-                await updateTaskState?.({
-                    state: share_namespaceObject.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
-                    }
-                };
+                {
+                    const cookies = await collectCookiesWithA1(task);
+                    const hasA1 = cookies.some((c)=>"a1" === c.name && !!c.value);
+                    if (!hasA1) task.logger?.warn("[XhsLogin] 登录成功但缺失关键 cookie a1，后续检测可能失败", {
+                        cookieNames: cookies.map((c)=>c.name)
+                    });
+                    const cookieStr = JSON.stringify(cookies);
+                    await updateTaskState?.({
+                        state: share_namespaceObject.TaskState.SUCCESS,
+                        result: {
+                            cookie: cookieStr,
+                            userInfo: userInfo
+                        }
+                    });
+                    return {
+                        code: 0,
+                        message: "成功",
+                        data: {
+                            cookie: cookieStr,
+                            userInfo
+                        }
+                    };
+                }
             default:
                 return {
                     code: 500,
@@ -23572,6 +23747,14 @@ var __webpack_exports__ = {};
             const fileName = (0, share_namespaceObject.getFilenameFromUrl)(url);
             const localUrl = await (0, share_namespaceObject.downloadImage)(url, external_node_path_default().join(tmpCachePath, fileName));
             const fileBuffer = external_node_fs_default().readFileSync(localUrl);
+            let width = 0;
+            let height = 0;
+            try {
+                const dimensions = external_image_size_default()(fileBuffer);
+                width = dimensions.width ?? 0;
+                height = dimensions.height ?? 0;
+            } catch  {}
+            const originSize = fileBuffer.byteLength / 1024;
             const MAX_RETRIES = uploadInfos.length;
             let attempt = 0;
             while(attempt < MAX_RETRIES){
@@ -23593,7 +23776,10 @@ var __webpack_exports__ = {};
                     });
                     return {
                         ossFileId,
-                        ossToken
+                        ossToken,
+                        width,
+                        height,
+                        originSize
                     };
                 } catch (error) {
                     attempt++;
@@ -23601,7 +23787,10 @@ var __webpack_exports__ = {};
             }
             return {
                 ossFileId: "",
-                ossToken: ""
+                ossToken: "",
+                width,
+                height,
+                originSize
             };
         };
         const coverInfos = await Promise.all(params.banners.map((it, idx)=>uploadFile(it, idx)));
@@ -23666,8 +23855,16 @@ var __webpack_exports__ = {};
             },
             image_info: {
                 images: coverInfos.map((it)=>({
-                        extra_info_json: '{"mimeType":"image/png"}',
+                        extra_info_json: JSON.stringify({
+                            mimeType: "image/png",
+                            image_metadata: {
+                                bg_color: "",
+                                origin_size: it.originSize
+                            }
+                        }),
                         file_id: it.ossFileId,
+                        width: it.width,
+                        height: it.height,
                         metadata: {
                             source: -1
                         },