@iflyrpa/actions 4.0.0-beta.15 → 4.0.0-beta.17

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.14"}');
+    var package_namespaceObject = JSON.parse('{"i8":"4.0.0-beta.16"}');
     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,
@@ -11933,6 +11934,7 @@ var __webpack_exports__ = {};
             return acc;
         }, {});
         const loginBaseXsHeader = sessionCheck_xsEncrypt.signHeadersGet(loginBasePath, recordCookie, "xhs-pc-web", null);
+        const baseInfoStart = Date.now();
         const _baseInfo = http.api({
             method: "get",
             baseURL: "https://creator.xiaohongshu.com",
@@ -11941,23 +11943,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);
     };
@@ -23238,6 +23260,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());
@@ -23438,21 +23487,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,