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

package/dist/index.mjs

@@ -5434,7 +5434,7 @@ function __webpack_require__(moduleId) {
         return module;
     };
 })();
-var package_namespaceObject = JSON.parse('{"i8":"4.0.0-beta.13"}');
+var package_namespaceObject = JSON.parse('{"i8":"4.0.0-beta.16"}');
 var dist = __webpack_require__("../../node_modules/.pnpm/https-proxy-agent@7.0.6/node_modules/https-proxy-agent/dist/index.js");
 async function ProxyAgent(task, ip, adr, accountId, refresh) {
     const http = new Http({
@@ -5520,7 +5520,8 @@ class Http {
                     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);
@@ -5598,7 +5599,7 @@ class Http {
             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,
@@ -11857,6 +11858,7 @@ const XhsSessionCheck = async (_task, params)=>{
         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",
@@ -11865,23 +11867,43 @@ const XhsSessionCheck = async (_task, params)=>{
     }, {
         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, __WEBPACK_EXTERNAL_MODULE__iflyrpa_share_f7afdc8c__.success)(check, message);
 };
@@ -23153,6 +23175,33 @@ const xiaohongshuLogin_rpa_rpaAction = async (task, _params)=>{
 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());
@@ -23353,21 +23402,29 @@ const xiaohongshuLogin_rpa_server_rpaServer = async (task, params)=>{
                 };
             }
         case types_ExecutionState.SUCCESS:
-            await updateTaskState?.({
-                state: __WEBPACK_EXTERNAL_MODULE__iflyrpa_share_f7afdc8c__.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: __WEBPACK_EXTERNAL_MODULE__iflyrpa_share_f7afdc8c__.TaskState.SUCCESS,
+                    result: {
+                        cookie: cookieStr,
+                        userInfo: userInfo
+                    }
+                });
+                return {
+                    code: 0,
+                    message: "成功",
+                    data: {
+                        cookie: cookieStr,
+                        userInfo
+                    }
+                };
+            }
         default:
             return {
                 code: 500,