@iflyrpa/actions 3.0.1 → 3.0.2

package/dist/index.js

@@ -5490,7 +5490,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 = {
-        i8: "3.0.0"
+        i8: "3.0.1"
     };
     const share_namespaceObject = require("@iflyrpa/share");
     const external_node_fs_namespaceObject = require("node:fs");
@@ -5628,6 +5628,9 @@ var __webpack_exports__ = {};
                         case "ERR_BAD_REQUEST":
                             _message = "请求出现错误，请检查请求参数！";
                             break;
+                        case "ERR_BAD_RESPONSE":
+                            _message = `服务器响应异常 (${error.response?.status ?? "unknown"})，请稍后重试！`;
+                            break;
                         case "ERR_CANCELED":
                             errorResponse.code = 414;
                             _message = "请求连接超时，请稍候重试！";
@@ -5678,6 +5681,9 @@ var __webpack_exports__ = {};
                     const isRetry = [
                         0,
                         500,
+                        502,
+                        503,
+                        504,
                         599
                     ].includes(handledError.code);
                     if (Rtimes < retries && isRetry) {
@@ -14006,7 +14012,7 @@ var __webpack_exports__ = {};
             this.authCache = null;
             this.authExpireTime = 0;
             this.AUTH_REFRESH_BUFFER = 300000;
-            this.CONCURRENT_LIMIT = 5;
+            this.CONCURRENT_LIMIT = 10;
             this.UPLOAD_DELAY = 1000;
             this.UPLOAD_TIMEOUT = 300000;
             this.TOS_UPLOAD_TIMEOUT = 600000;
@@ -14035,16 +14041,17 @@ var __webpack_exports__ = {};
             const aBogus = imageUploader_getABogus(`https://creator.douyin.com/web/api/media/upload/auth/v5/?${queryString}`, {}, this.headers["user-agent"]);
             this.queryParams.a_bogus = aBogus;
             const newQueryString = new URLSearchParams(this.queryParams).toString();
-            const uploadAuth = await this.proxyHttp.api({
-                method: "get",
-                url: `https://creator.douyin.com/web/api/media/upload/auth/v5/?${newQueryString}`,
-                headers: {
-                    ...this.headers,
-                    "Content-Type": "application/json"
-                }
-            }, {
-                timeout: 300000
-            });
+            const uploadAuth = await this.withRetry(()=>this.proxyHttp.api({
+                    method: "get",
+                    url: `https://creator.douyin.com/web/api/media/upload/auth/v5/?${newQueryString}`,
+                    headers: {
+                        ...this.headers,
+                        "Content-Type": "application/json"
+                    }
+                }, {
+                    timeout: 300000,
+                    retries: 0
+                }), 3, 1000, "获取上传凭证");
             if (!uploadAuth.auth) throw new Error(uploadAuth.status_msg || "获取上传权限失败");
             try {
                 const authData = JSON.parse(uploadAuth.auth);
@@ -14084,19 +14091,19 @@ var __webpack_exports__ = {};
             };
             const result = generateAuthorization(addrParamsConfig).authorization;
             const addrParamsQueryString = canonicalQueryString(addrParamsConfig.params);
-            const response = await this.proxyHttp.api({
-                method: "get",
-                url: `https://imagex.bytedanceapi.com/?${addrParamsQueryString}`,
-                headers: {
-                    ...this.headers,
-                    Authorization: result,
-                    "Content-Type": "application/json",
-                    "X-amz-date": amzDate,
-                    "X-amz-security-token": authData.SessionToken
-                }
-            }, {
-                timeout: this.UPLOAD_TIMEOUT
-            });
+            const response = await this.withRetry(()=>this.proxyHttp.api({
+                    method: "get",
+                    url: `https://imagex.bytedanceapi.com/?${addrParamsQueryString}`,
+                    headers: {
+                        ...this.headers,
+                        Authorization: result,
+                        "Content-Type": "application/json",
+                        "X-amz-date": amzDate,
+                        "X-amz-security-token": authData.SessionToken
+                    }
+                }, {
+                    timeout: this.UPLOAD_TIMEOUT
+                }), 3, 1000, "获取上传地址");
             if (!response) throw new Error("获取上传地址失败: 响应为空");
             if (response.ResponseMetadata?.Error) throw new Error(`ImageX错误: ${response.ResponseMetadata.Error.Code} - ${response.ResponseMetadata.Error.Message}`);
             if (!response.Result) {
@@ -14127,23 +14134,24 @@ var __webpack_exports__ = {};
             console.log(`上传至: ${uploadUrl.substring(0, 80)}...`);
             console.log(`文件大小: ${imageInfo.size} bytes, CRC32: ${imageInfo.md5}`);
             try {
-                const uploadImgResp = await this.proxyHttp.api({
-                    method: "post",
-                    url: uploadUrl,
-                    headers: {
-                        ...this.headers,
-                        Authorization: uploadAddr.auth,
-                        "Content-crc32": imageInfo.md5,
-                        "Content-Type": "application/octet-stream",
-                        "Content-Length": imageInfo.size.toString()
-                    },
-                    data: fileBuffer,
-                    httpAgent: this.uploadAgent,
-                    httpsAgent: this.uploadAgent,
-                    timeout: this.TOS_UPLOAD_TIMEOUT,
-                    maxBodyLength: 1 / 0,
-                    maxContentLength: 1 / 0
-                });
+                const uploadImgResp = await this.withRetry(()=>this.proxyHttp.api({
+                        method: "post",
+                        url: uploadUrl,
+                        headers: {
+                            ...this.headers,
+                            Authorization: uploadAddr.auth,
+                            "Content-crc32": imageInfo.md5,
+                            "Content-Type": "application/octet-stream",
+                            "Content-Length": imageInfo.size.toString()
+                        },
+                        data: fileBuffer,
+                        httpAgent: this.uploadAgent,
+                        httpsAgent: this.uploadAgent,
+                        maxBodyLength: 1 / 0,
+                        maxContentLength: 1 / 0
+                    }, {
+                        timeout: this.TOS_UPLOAD_TIMEOUT
+                    }), 5, 3000, "TOS上传");
                 console.log("TOS 上传响应:", uploadImgResp);
                 const isSuccess = uploadImgResp && (2000 === uploadImgResp.code || 200 === uploadImgResp.status || 200 === uploadImgResp.statusCode || uploadImgResp.data && uploadImgResp.data.crc32 || "Success" === uploadImgResp.message);
                 if (!isSuccess) throw new Error(`上传失败: ${JSON.stringify(uploadImgResp)}`);
@@ -14164,20 +14172,22 @@ var __webpack_exports__ = {};
         async processSingleImage(imageUrl, index, total) {
             console.log(`\n[${index + 1}/${total}] 处理图片: ${imageUrl.substring(0, 50)}...`);
             const fileName = (0, share_namespaceObject.getFilenameFromUrl)(imageUrl);
-            const localPath = external_node_path_default().join(this.tmpCachePath, fileName);
+            const localPath = external_node_path_default().resolve(this.tmpCachePath, fileName);
             try {
                 await (0, share_namespaceObject.downloadImage)(imageUrl, localPath);
                 console.log(`图片下载完成: ${localPath}`);
+                const imageInfo = await this.getImageInfo(localPath);
+                console.log(`图片信息: ${imageInfo.width}x${imageInfo.height}, ${imageInfo.size} bytes`);
+                const auth = await this.getValidAuth();
+                const uploadAddr = await this.getUploadAddress(auth);
+                const result = await this.uploadToTOS(imageInfo, uploadAddr);
+                this.safeDeleteFile(localPath);
+                return result;
             } catch (error) {
-                throw new Error(`下载图片失败: ${imageUrl}`);
-            }
-            const imageInfo = await this.getImageInfo(localPath);
-            console.log(`图片信息: ${imageInfo.width}x${imageInfo.height}, ${imageInfo.size} bytes`);
-            const auth = await this.getValidAuth();
-            const uploadAddr = await this.getUploadAddress(auth);
-            const result = await this.uploadToTOS(imageInfo, uploadAddr);
-            this.safeDeleteFile(localPath);
-            return result;
+                console.error(`[${index + 1}/${total}] 图片上传失败，已跳过: ${imageUrl}`, error?.message ?? error);
+                this.safeDeleteFile(localPath);
+                return null;
+            }
         }
         async getImageInfo(localPath) {
             const stats = external_node_fs_default().statSync(localPath);
@@ -14210,13 +14220,11 @@ var __webpack_exports__ = {};
                     const globalIndex = i + idx;
                     return this.processSingleImage(url, globalIndex, total);
                 });
-                try {
-                    const batchResults = await Promise.all(batchPromises);
-                    results.push(...batchResults);
-                } catch (error) {
-                    console.error(`批次 ${batchIndex} 上传失败:`, error);
-                    throw error;
-                }
+                const batchResults = await Promise.all(batchPromises);
+                const successResults = batchResults.filter((r)=>null !== r);
+                results.push(...successResults);
+                const failedCount = batchResults.length - successResults.length;
+                if (failedCount > 0) console.warn(`批次 ${batchIndex} 中有 ${failedCount} 张图片上传失败`);
                 if (i + this.CONCURRENT_LIMIT < total) {
                     console.log(`等待 ${this.UPLOAD_DELAY}ms...`);
                     await this.delay(this.UPLOAD_DELAY);
@@ -14228,6 +14236,7 @@ var __webpack_exports__ = {};
         async uploadCover(coverUrl) {
             console.log("\n========== 上传封面 ==========\n");
             const result = await this.processSingleImage(coverUrl, 0, 1);
+            if (!result) console.error(`封面图上传失败，已跳过: ${coverUrl}`);
             return result;
         }
         safeDeleteFile(filePath) {
@@ -14241,6 +14250,17 @@ var __webpack_exports__ = {};
         delay(ms) {
             return new Promise((resolve)=>setTimeout(resolve, ms));
         }
+        async withRetry(fn, retries = 3, delayMs = 1000, label = "") {
+            for(let attempt = 1; attempt <= retries; attempt++)try {
+                return await fn();
+            } catch (err) {
+                if (attempt === retries) throw err;
+                const waitTime = delayMs * attempt;
+                console.warn(`${label} 第 ${attempt} 次失败，${waitTime}ms 后重试:`, err?.message ?? err);
+                await this.delay(waitTime);
+            }
+            throw new Error("unreachable");
+        }
         destroy() {
             this.uploadAgent.destroy();
         }
@@ -14437,14 +14457,16 @@ var __webpack_exports__ = {};
             const uploader = new DouyinImageUploader(proxyHttp, headers, publishParams, tmpCachePath);
             if (params.coverImage) {
                 const cover = await uploader.uploadCover(params.coverImage);
-                publishData.item.common.images.push({
-                    uri: cover.uri,
-                    width: cover.width,
-                    height: cover.height
-                });
-                publishData.item.cover = {
-                    poster: cover.uri
-                };
+                if (cover) {
+                    publishData.item.common.images.push({
+                        uri: cover.uri,
+                        width: cover.width,
+                        height: cover.height
+                    });
+                    publishData.item.cover = {
+                        poster: cover.uri
+                    };
+                }
             }
             if (params.banners && params.banners.length > 0) {
                 const banners = params.banners.filter((i)=>i !== params.coverImage);
@@ -14470,11 +14492,15 @@ var __webpack_exports__ = {};
             }
             if (!response || !response.data) return;
             const responseData = response.data;
-            if (response && responseData?.status_code && 0 !== responseData.status_code) return {
-                code: responseData?.status_code,
-                message: responseData.status_msg || "文章发布异常，请稍后重试。",
-                data: responseData
-            };
+            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(`抖音服务器错误 status_code: 4，映射为 500 触发重试。原始响应: ${JSON.stringify(responseData)}`);
+                return {
+                    code: errorCode,
+                    message: responseData.status_msg || "文章发布异常，请稍后重试。",
+                    data: responseData
+                };
+            }
         });
         task._timerRecord.PrePublish = Date.now();
         if (MockPublish) {
@@ -14557,7 +14583,9 @@ var __webpack_exports__ = {};
                 "x-tt-session-dtrait": sessionDtrait || ""
             }
         }, {
-            timeout: 60000
+            timeout: 60000,
+            retries: 3,
+            retryDelay: 2000
         });
         reportLogger({
             token: params.huiwenToken || "",
@@ -14570,9 +14598,8 @@ var __webpack_exports__ = {};
             platform: "douyin",
             publishParams: publishData
         });
-        console.log("publishResult", JSON.stringify(publishResult));
-        task.logger.warn("发布数据");
-        task.logger.warn(JSON.stringify(publishData));
+        task.logger.warn("发布结果");
+        task.logger.warn(JSON.stringify(publishResult));
         const isSuccess = 0 === publishResult.status_code;
         const message = `图文发布${isSuccess ? "成功" : `失败，原因：${publishResult.status_msg} ${decision?.verify_title} ${decision?.verify_desc}`}${task.debug ? ` ${http.proxyInfo}` : ""}`;
         const data = isSuccess ? publishResult.item_id || "" : "";