@iflyrpa/actions 4.0.4-beta.6 → 4.0.4-beta.7

package/dist/index.js

@@ -1,5 +1,3 @@
-
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="c84bf1c2-549b-54ff-9b48-f44dd094326b")}catch(e){}}();
 var __webpack_modules__ = {
     "./src/utils/XhsXsCommonEnc.js": function(module) {
         var encrypt_lookup = [
@@ -4402,7 +4400,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.4-beta.6"}');
+    var package_namespaceObject = JSON.parse('{"i8":"4.0.4-beta.7"}');
     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);
@@ -13591,8 +13589,8 @@ var __webpack_exports__ = {};
                 if (!response || !response.data) return;
                 const responseData = response.data;
                 if (response && responseData?.status_code && 0 !== responseData.status_code) {
-                    const errorCode = 4 === responseData.status_code ? 500 : responseData.status_code;
-                    if (4 === responseData.status_code) task.logger.warn(`[douyinPublish] 抖音服务器错误 status_code: 4，映射为 500 触发重试。原始响应: ${JSON.stringify(responseData)}`);
+                    const errorCode = 4 === responseData.status_code ? 590 : responseData.status_code;
+                    if (4 === responseData.status_code) task.logger.warn(`[douyinPublish] status_code:4（ticket-guard 伪装拒绝），映射为 590 触发重新签名重试。原始响应: ${JSON.stringify(responseData)}`);
                     return {
                         code: errorCode,
                         message: responseData.status_msg || "文章发布异常，请稍后重试。",
@@ -13659,132 +13657,141 @@ var __webpack_exports__ = {};
                 return (0, share_namespaceObject.response)(414, "安全参数 certificate 解析失败，请重新获取后重试", "");
             }
             const ree_public_key = webProtectData.client_cert.replace("pub.", "");
-            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(`[douyinPublish] bdTicketGuardClientData 生成失败或不完整: ${JSON.stringify(bdTicketGuardClientData)}`);
-                    return (0, share_namespaceObject.response)(414, "安全参数 bdTicketGuardClientData 生成失败，请重新获取后重试", "");
+            const MAX_SIGN_RETRIES = 3;
+            const SIGN_RETRY_DELAY = 2000;
+            const signAndPublish = async ()=>{
+                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(`[douyinPublish] bdTicketGuardClientData 生成失败或不完整: ${JSON.stringify(bdTicketGuardClientData)}`);
+                        throw (0, share_namespaceObject.response)(414, "安全参数 bdTicketGuardClientData 生成失败，请重新获取后重试", "");
+                    }
+                } catch (error) {
+                    if (error && "object" == typeof error && "code" in error) throw error;
+                    task.logger.error(`[douyinPublish] 生成 bdTicketGuardClientData 失败: ${error}`);
+                    throw (0, share_namespaceObject.response)(414, "安全参数 bdTicketGuardClientData 生成异常，请重新获取后重试", "");
                 }
-            } catch (error) {
-                task.logger.error(`[douyinPublish] 生成 bdTicketGuardClientData 失败: ${error}`);
-                return (0, share_namespaceObject.response)(414, "安全参数 bdTicketGuardClientData 生成异常，请重新获取后重试", "");
-            }
-            task.logger.info("[douyinPublish] bdTicketGuardClientData 生成成功");
-            const publishQuery = {
-                ...publishParams,
-                a_bogus: ""
-            };
-            const queryString = new URLSearchParams(publishQuery).toString();
-            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(`[douyinPublish] a_bogus 生成异常，长度过短: ${aBogus}`);
-                    return (0, share_namespaceObject.response)(414, "安全参数 a_bogus 生成失败，请重试", "");
+                task.logger.info("[douyinPublish] bdTicketGuardClientData 生成成功");
+                const publishQuery = {
+                    ...publishParams,
+                    a_bogus: ""
+                };
+                const queryString = new URLSearchParams(publishQuery).toString();
+                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(`[douyinPublish] a_bogus 生成异常，长度过短: ${aBogus}`);
+                        throw (0, share_namespaceObject.response)(414, "安全参数 a_bogus 生成失败，请重试", "");
+                    }
+                } catch (error) {
+                    if (error && "object" == typeof error && "code" in error) throw error;
+                    task.logger.error(`[douyinPublish] 生成 a_bogus 失败: ${error}`);
+                    throw (0, share_namespaceObject.response)(414, "安全参数 a_bogus 生成异常，请重试", "");
                 }
-            } catch (error) {
-                task.logger.error(`[douyinPublish] 生成 a_bogus 失败: ${error}`);
-                return (0, share_namespaceObject.response)(414, "安全参数 a_bogus 生成异常，请重试", "");
-            }
-            publishQuery.a_bogus = aBogus;
-            const publishQueryParams = new URLSearchParams(publishQuery).toString();
-            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(`[douyinPublish] csrfToken 生成异常，长度过短: ${csrfToken}`);
-                    return (0, share_namespaceObject.response)(414, "安全参数 csrfToken 生成失败，请重试", "");
+                publishQuery.a_bogus = aBogus;
+                const publishQueryParams = new URLSearchParams(publishQuery).toString();
+                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(`[douyinPublish] csrfToken 生成异常，长度过短: ${csrfToken}`);
+                        throw (0, share_namespaceObject.response)(414, "安全参数 csrfToken 生成失败，请重试", "");
+                    }
+                    task.logger.info(`[douyinPublish] csrfToken 生成成功: ${csrfToken.substring(0, 20)}...`);
+                } catch (error) {
+                    if (error && "object" == typeof error && "code" in error) throw error;
+                    task.logger.error(`[douyinPublish] 生成 csrfToken 失败: ${error}`);
+                    throw (0, share_namespaceObject.response)(414, "安全参数 csrfToken 生成异常，请重试", "");
                 }
-                task.logger.info(`[douyinPublish] csrfToken 生成成功: ${csrfToken.substring(0, 20)}...`);
-            } catch (error) {
-                task.logger.error(`[douyinPublish] 生成 csrfToken 失败: ${error}`);
-                return (0, share_namespaceObject.response)(414, "安全参数 csrfToken 生成异常，请重试", "");
-            }
-            let sessionDtrait;
-            try {
-                sessionDtrait = mock_generateDtrait("/web/api/media/aweme/create_v2/");
-                task.logger.info(`[douyinPublish] sessionDtrait 生成成功: ${sessionDtrait || "(空)"}`);
-            } catch (error) {
-                task.logger.error(`[douyinPublish] 生成 sessionDtrait 失败: ${error}`);
-                return (0, share_namespaceObject.response)(414, "安全参数 sessionDtrait 生成异常，请重试", "");
-            }
-            task.logger.info(`[douyinPublish] headers: ${JSON.stringify({
-                ...headers,
-                Referer: "https://creator.douyin.com/creator-micro/content/post/image?default-tab=3&enter_from=publish_page&media_type=image&type=new",
-                "Content-Type": "application/json",
-                Accept: "application/json, text/plain, */*",
-                "bd-ticket-guard-client-data": bdTicketGuardClientData["headers_bd_ticket_guard_client_data"],
-                "bd-ticket-guard-ree-public-key": bdTicketGuardClientData["headers_bd_ticket_guard_ree_public_key"],
-                "bd-ticket-guard-version": "2",
-                "bd-ticket-guard-web-sign-type": "1",
-                "bd-ticket-guard-web-version": "2",
-                "x-secsdk-csrf-token": csrfToken,
-                "x-tt-session-dtrait": sessionDtrait || ""
-            })}`);
-            task.logger.info(`[douyinPublish] url: https://creator.douyin.com/web/api/media/aweme/create_v2/?${publishQueryParams}`);
-            let publishResult;
-            try {
-                publishResult = await proxyHttp.api({
+                let sessionDtrait;
+                try {
+                    sessionDtrait = mock_generateDtrait("/web/api/media/aweme/create_v2/");
+                    task.logger.info(`[douyinPublish] sessionDtrait 生成成功: ${sessionDtrait || "(空)"}`);
+                } catch (error) {
+                    task.logger.error(`[douyinPublish] 生成 sessionDtrait 失败: ${error}`);
+                    throw (0, share_namespaceObject.response)(414, "安全参数 sessionDtrait 生成异常，请重试", "");
+                }
+                const requestHeaders = {
+                    ...headers,
+                    Referer: "https://creator.douyin.com/creator-micro/content/post/image?default-tab=3&enter_from=publish_page&media_type=image&type=new",
+                    "Content-Type": "application/json",
+                    Accept: "application/json, text/plain, */*",
+                    "bd-ticket-guard-client-data": bdTicketGuardClientData["headers_bd_ticket_guard_client_data"],
+                    "bd-ticket-guard-ree-public-key": bdTicketGuardClientData["headers_bd_ticket_guard_ree_public_key"],
+                    "bd-ticket-guard-version": "2",
+                    "bd-ticket-guard-web-sign-type": "1",
+                    "bd-ticket-guard-web-version": "2",
+                    "x-secsdk-csrf-token": csrfToken,
+                    "x-tt-session-dtrait": sessionDtrait || ""
+                };
+                task.logger.info(`[douyinPublish] headers: ${JSON.stringify(requestHeaders)}`);
+                task.logger.info(`[douyinPublish] url: https://creator.douyin.com/web/api/media/aweme/create_v2/?${publishQueryParams}`);
+                return proxyHttp.api({
                     method: "post",
                     url: `https://creator.douyin.com/web/api/media/aweme/create_v2/?${publishQueryParams}`,
                     data: publishData,
                     defaultErrorMsg: "发布异常，请稍后重试。",
-                    headers: {
-                        ...headers,
-                        Referer: "https://creator.douyin.com/creator-micro/content/post/image?default-tab=3&enter_from=publish_page&media_type=image&type=new",
-                        "Content-Type": "application/json",
-                        Accept: "application/json, text/plain, */*",
-                        "bd-ticket-guard-client-data": bdTicketGuardClientData["headers_bd_ticket_guard_client_data"],
-                        "bd-ticket-guard-ree-public-key": bdTicketGuardClientData["headers_bd_ticket_guard_ree_public_key"],
-                        "bd-ticket-guard-version": "2",
-                        "bd-ticket-guard-web-sign-type": "1",
-                        "bd-ticket-guard-web-version": "2",
-                        "x-secsdk-csrf-token": csrfToken,
-                        "x-tt-session-dtrait": sessionDtrait || ""
-                    }
+                    headers: requestHeaders
                 }, {
                     timeout: 60000,
-                    retries: 3,
-                    retryDelay: 2000
+                    retries: 0
                 });
-            } catch (error) {
-                const handledError = Http.handleApiError(error);
-                const isProxyOrNetworkError = [
-                    599,
-                    500,
-                    502,
-                    503,
-                    504
-                ].includes(handledError.code);
-                if (isProxyOrNetworkError) {
-                    const isProxyRequest = handledError.extra?.isProxyRequest === true;
-                    const errorType = 599 === handledError.code || isProxyRequest ? "代理错误" : "网络错误";
-                    const message = `图文发布失败，${errorType}：${handledError.message}${task.debug ? ` ${http.proxyInfo}` : ""}`;
-                    task.logger.error(`[douyinPublish] ${errorType}，直接返回: ${message}`, stringifyError(handledError));
-                    await updateTaskState?.({
-                        state: share_namespaceObject.TaskState.FAILED,
-                        error: message
-                    });
-                    return {
-                        code: 414,
-                        data: "",
-                        message
-                    };
+            };
+            let publishResult;
+            for(let attempt = 0; attempt < MAX_SIGN_RETRIES; attempt++){
+                if (attempt > 0) {
+                    task.logger.warn(`[douyinPublish] 第 ${attempt} 次重新签名后重试（上次为 ticket-guard 拒绝）`);
+                    await new Promise((resolve)=>setTimeout(resolve, SIGN_RETRY_DELAY));
+                }
+                try {
+                    publishResult = await signAndPublish();
+                    break;
+                } catch (error) {
+                    const handledError = Http.handleApiError(error);
+                    if (590 === handledError.code) {
+                        if (attempt < MAX_SIGN_RETRIES - 1) continue;
+                        task.logger.error(`[douyinPublish] ticket-guard 拒绝重试已用尽（${MAX_SIGN_RETRIES} 次），走兜底`);
+                        throw error;
+                    }
+                    const isProxyOrNetworkError = [
+                        599,
+                        500,
+                        502,
+                        503,
+                        504
+                    ].includes(handledError.code);
+                    if (isProxyOrNetworkError) {
+                        const isProxyRequest = handledError.extra?.isProxyRequest === true;
+                        const errorType = 599 === handledError.code || isProxyRequest ? "代理错误" : "网络错误";
+                        const message = `图文发布失败，${errorType}：${handledError.message}${task.debug ? ` ${http.proxyInfo}` : ""}`;
+                        task.logger.error(`[douyinPublish] ${errorType}，直接返回: ${message}`, stringifyError(handledError));
+                        await updateTaskState?.({
+                            state: share_namespaceObject.TaskState.FAILED,
+                            error: message
+                        });
+                        return {
+                            code: 414,
+                            data: "",
+                            message
+                        };
+                    }
+                    throw error;
                 }
-                throw error;
             }
+            if (!publishResult) throw (0, share_namespaceObject.response)(414, "发布异常，请稍后重试。", "");
             task.logger.info(`[douyinPublish] decision值: ${JSON.stringify(decision)}, needsVerification(decision): ${needsVerification(decision)}`);
             if (needsVerification(decision)) {
                 const details = [
@@ -25679,5 +25686,4 @@ if (__webpack_exports__.__esModule) Object.defineProperty(__webpack_export_targe
     value: true
 });
 
-//# sourceMappingURL=index.js.map
-//# debugId=c84bf1c2-549b-54ff-9b48-f44dd094326b
+//# sourceMappingURL=index.js.map