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

package/dist/index.mjs

@@ -5434,7 +5434,7 @@ function __webpack_require__(moduleId) {
         return module;
     };
 })();
-var package_namespaceObject = JSON.parse('{"i8":"4.0.0-beta.9"}');
+var package_namespaceObject = JSON.parse('{"i8":"4.0.0-beta.13"}');
 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({
@@ -11820,35 +11820,16 @@ const WxSessionCheck = async (_task, params)=>{
     }, "微信账号有效性检测完成！");
 };
 const XhsSessionCheck = async (_task, params)=>{
-    const logger = _task.logger;
-    const startedAt = Date.now();
     const check = {
         isValidSession: false,
         isValidWebSession: false
     };
-    const cookieNames = params.cookies.map((it)=>it.name);
-    logger?.info("[XhsSessionCheck] 开始执行小红书账号有效性检测", {
-        accountId: params.accountId,
-        proxyLoc: params.proxyLoc,
-        localIP: params.localIP,
-        willUseProxyAgent: !!params.localIP,
-        cookieCount: params.cookies.length,
-        cookieNames,
-        hasA1: cookieNames.includes("a1"),
-        hasWebSession: cookieNames.includes("web_session")
-    });
     const a1Cookie = params.cookies.find((it)=>"a1" === it.name)?.value;
-    if (!a1Cookie) {
-        logger?.warn("[XhsSessionCheck] 缺失关键 cookie a1，提前返回", {
-            accountId: params.accountId,
-            cookieNames
-        });
-        return {
-            code: 414,
-            message: "账号数据异常，请重新绑定账号后重试。",
-            data: check
-        };
-    }
+    if (!a1Cookie) return {
+        code: 414,
+        message: "账号数据异常，请重新绑定账号后重试。",
+        data: check
+    };
     const headers = {
         cookie: params.cookies.map((it)=>`${it.name}=${it.value}`).join(";"),
         referer: "https://creator.xiaohongshu.com/new/home?source=official"
@@ -11876,7 +11857,6 @@ 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",
@@ -11886,28 +11866,7 @@ const XhsSessionCheck = async (_task, params)=>{
         retries: 3,
         retryDelay: 20,
         timeout: 3000
-    }).then((res)=>{
-        logger?.info("[XhsSessionCheck] creator base 接口请求成功", {
-            accountId: params.accountId,
-            duration: Date.now() - baseInfoStart,
-            code: res?.code,
-            msg: res?.msg,
-            proxyInfo: http.proxyInfo
-        });
-        return res;
-    }).catch((e)=>{
-        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
-        });
-        return e.data;
-    });
-    const webSessionStart = Date.now();
+    }).catch((e)=>e.data);
     const _web_session = http.api({
         method: "get",
         url: "https://edith.xiaohongshu.com/api/sns/web/unread_count"
@@ -11915,26 +11874,6 @@ const XhsSessionCheck = async (_task, params)=>{
         retries: 3,
         retryDelay: 20,
         timeout: 3000
-    }).then((res)=>{
-        logger?.info("[XhsSessionCheck] edith unread_count 接口请求成功", {
-            accountId: params.accountId,
-            duration: Date.now() - webSessionStart,
-            code: res?.code,
-            msg: res?.msg,
-            proxyInfo: http.proxyInfo
-        });
-        return res;
-    }).catch((e)=>{
-        logger?.warn("[XhsSessionCheck] edith unread_count 接口请求失败", {
-            accountId: params.accountId,
-            duration: Date.now() - webSessionStart,
-            code: e?.code,
-            message: e?.message,
-            data: e?.data,
-            extra: e?.extra,
-            proxyInfo: http.proxyInfo
-        });
-        throw e;
     });
     const [baseInfo, web_session] = await Promise.all([
         _baseInfo,
@@ -11942,18 +11881,8 @@ const XhsSessionCheck = async (_task, params)=>{
     ]);
     if (baseInfo?.code === 0) check.isValidSession = true;
     if (0 === web_session.code) check.isValidWebSession = true;
-    const _isSuccess = baseInfo?.code === web_session.code;
+    baseInfo?.code, web_session.code;
     const message = `小红书账号有效性检测成功${_task.debug ? ` ${http.proxyInfo}` : ""}`;
-    logger?.info("[XhsSessionCheck] 检测完成", {
-        accountId: params.accountId,
-        totalDuration: Date.now() - startedAt,
-        baseInfoCode: baseInfo?.code,
-        webSessionCode: web_session?.code,
-        isValidSession: check.isValidSession,
-        isValidWebSession: check.isValidWebSession,
-        codeAligned: _isSuccess,
-        proxyInfo: http.proxyInfo
-    });
     return (0, __WEBPACK_EXTERNAL_MODULE__iflyrpa_share_f7afdc8c__.success)(check, message);
 };
 const BjhSessionCheck = async (_task, params)=>{
@@ -14523,8 +14452,19 @@ const mock_mockAction = async (task, params)=>{
         task.logger.error(`解析 webProtectData 失败: ${error}`);
         return (0, __WEBPACK_EXTERNAL_MODULE__iflyrpa_share_f7afdc8c__.response)(414, "安全参数 webProtectData 解析失败，请重新获取后重试", "");
     }
-    const ticket = webProtectData.ticket;
-    const ts_sign = webProtectData.ts_sign;
+    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;