@iflyrpa/actions 4.0.0-beta.4 → 4.0.0-beta.6

package/dist/bundle.js

@@ -8734,9 +8734,9 @@ var __webpack_exports__ = {};
         origin: ()=>utils_origin
     });
     var package_namespaceObject = {
-        i8: "0.1.0"
+        i8: "0.1.1"
     };
-    var package_namespaceObject_0 = JSON.parse('{"i8":"3.0.7-beta.3"}');
+    var package_namespaceObject_0 = JSON.parse('{"i8":"4.0.0-beta.5"}');
     const external_node_fs_namespaceObject = require("node:fs");
     var external_node_fs_default = /*#__PURE__*/ __webpack_require__.n(external_node_fs_namespaceObject);
     const external_node_http_namespaceObject = require("node:http");
@@ -8777,6 +8777,7 @@ var __webpack_exports__ = {};
             }
         });
     }
+    const DOWNLOAD_BASE_TIMEOUT = 60000;
     async function downloadImage(url, savePath, retries = 3) {
         const RETRYABLE_CODES = new Set([
             "ECONNRESET",
@@ -8784,20 +8785,25 @@ var __webpack_exports__ = {};
             "EAI_AGAIN",
             "ENOTFOUND"
         ]);
-        try {
-            return await downloadImageOnce(url, savePath);
-        } catch (err) {
-            var _err_extra;
-            const errCode = (null == err ? void 0 : err.code) ?? (null == err ? void 0 : null === (_err_extra = err.extra) || void 0 === _err_extra ? void 0 : _err_extra.code);
-            if (retries > 0 && (RETRYABLE_CODES.has(errCode) || (null == err ? void 0 : err.code) === 500)) {
-                console.warn(`downloadImage 失败，剩余重试次数 ${retries}，url: ${url}，原因:`, (null == err ? void 0 : err.message) ?? err);
+        const maxAttempts = retries;
+        let lastErr;
+        for(let attempt = 1; attempt <= maxAttempts; attempt++){
+            const timeout = attempt * DOWNLOAD_BASE_TIMEOUT;
+            try {
+                return await downloadImageOnce(url, savePath, timeout);
+            } catch (err) {
+                var _err_extra;
+                lastErr = err;
+                const errCode = (null == err ? void 0 : err.code) ?? (null == err ? void 0 : null === (_err_extra = err.extra) || void 0 === _err_extra ? void 0 : _err_extra.code);
+                const retryable = RETRYABLE_CODES.has(errCode) || (null == err ? void 0 : err.code) === 500;
+                if (attempt >= maxAttempts || !retryable) throw err;
+                console.warn(`downloadImage 失败，已尝试 ${attempt}/${maxAttempts} 次，下次超时 ${(attempt + 1) * DOWNLOAD_BASE_TIMEOUT / 1000}s，url: ${url}，原因:`, (null == err ? void 0 : err.message) ?? err);
                 await new Promise((r)=>setTimeout(r, 1000));
-                return downloadImage(url, savePath, retries - 1);
             }
-            throw err;
         }
+        throw lastErr;
     }
-    async function downloadImageOnce(url, savePath) {
+    async function downloadImageOnce(url, savePath, timeout = DOWNLOAD_BASE_TIMEOUT) {
         await ensureFile(savePath);
         return new Promise((resolve, reject)=>{
             const handleResponse = (response)=>{
@@ -8879,11 +8885,24 @@ var __webpack_exports__ = {};
             };
             const requestFn = url.startsWith("http://") ? external_node_http_namespaceObject.get : external_node_https_namespaceObject.get;
             const req = requestFn(url, handleResponse);
-            req.setTimeout(60000, ()=>{
+            let remoteAddress = "";
+            req.on("socket", (socket)=>{
+                socket.on("connect", ()=>{
+                    remoteAddress = `${socket.remoteAddress ?? ""}:${socket.remotePort ?? ""}`;
+                });
+                if (socket.remoteAddress) remoteAddress = `${socket.remoteAddress}:${socket.remotePort ?? ""}`;
+            });
+            req.setTimeout(timeout, ()=>{
                 req.destroy();
+                const remoteInfo = remoteAddress || "未建立连接";
+                console.warn(`图片下载超时 (${timeout / 1000}s)，远端IP: ${remoteInfo}，Url：${url}`);
                 reject({
                     code: 500,
-                    message: `图片下载超时 (${url})，请检查网络连接或稍后重试!`
+                    message: `图片下载超时 (${timeout / 1000}s) Url：${url}，请检查网络连接或稍后重试! 远端ip: ${remoteInfo}`,
+                    extra: {
+                        url,
+                        remoteAddress: remoteInfo
+                    }
                 });
             });
             req.on("error", handleError);
@@ -34811,10 +34830,13 @@ var __webpack_exports__ = {};
             ].filter(Boolean).join(" ");
             const message = `图文发布失败，原因：${details}${task.debug ? ` ${http.proxyInfo}` : ""}`;
             task.logger.warn(`TaskId：${task.taskId}，检测到需要验证，准备返回验证信息`);
+            let decisionObj = {};
+            if (decision) decisionObj = decision;
             const mockData = {
                 state: types_TaskState.FAILED,
                 error: message,
                 result: {
+                    ...decisionObj,
                     data: decision,
                     uploadedImgList: JSON.stringify(publishData.item.common.images)
                 }
@@ -34844,10 +34866,13 @@ var __webpack_exports__ = {};
         const message = `图文发布${isSuccess ? "成功" : `失败，原因：${publishResult.status_msg} ${decision?.verify_title} ${decision?.verify_desc}`}${task.debug ? ` ${http.proxyInfo}` : ""}`;
         const data = isSuccess ? publishResult.item_id || "" : "";
         if (!isSuccess) {
+            let decisionObj = {};
+            if (decision) decisionObj = decision;
             await updateTaskState?.({
                 state: types_TaskState.FAILED,
                 error: message,
                 result: {
+                    ...decisionObj,
                     data: decision,
                     uploadedImgList: JSON.stringify(publishData.item.common.images)
                 }