@iflyrpa/actions 1.2.16-beta.4 → 1.2.16-beta.5

package/dist/index.js

@@ -3014,7 +3014,7 @@ var __webpack_exports__ = {};
                 articleCell,
                 ...onlySuccess ? {
                     pagination: {
-                        total: api_base_info_json.total_count || -1,
+                        total: api_base_info_json.total_count,
                         pageNum,
                         pageSize
                     }
@@ -4958,33 +4958,40 @@ var __webpack_exports__ = {};
             }
         });
         let uploadInfos = [];
-        coverIdInfo.data.uploadTempPermits.map((item)=>{
-            uploadInfos.push({
-                bucket: "",
-                uploadAddr: item.uploadAddr,
-                fileIds: item.fileIds,
-                token: item.token
+        coverIdInfo.data.uploadTempPermits.forEach((item)=>{
+            item.fileIds.forEach((fileId)=>{
+                uploadInfos.push({
+                    bucket: item.bucket || "",
+                    uploadAddr: item.uploadAddr || "",
+                    fileIds: fileId,
+                    token: item.token || ""
+                });
             });
         });
+        if (uploadInfos.length < params.banners.length) return {
+            code: 200,
+            message: "可用 OSS bucket 数量不足，无法上传所有图片！",
+            data: ""
+        };
         if (0 === uploadInfos.length) return {
             code: 200,
             message: "图片上传失败，请稍后重试！",
             data: ""
         };
-        const uploadFile = async (url, index, infoIndex = 0)=>{
+        const availableBuckets = Array.from({
+            length: uploadInfos.length
+        }, (_, i)=>i);
+        const uploadFile = async (url, index)=>{
             const fileName = (0, share_namespaceObject.getFilenameFromUrl)(url);
             const localUrl = await (0, share_namespaceObject.downloadImage)(url, external_node_path_default().join(tmpCachePath, fileName));
             const fileBuffer = external_node_fs_default().readFileSync(localUrl);
-            const tryUpload = async (uploadIndex)=>{
-                if (uploadIndex >= uploadInfos.length) {
-                    external_node_fs_default().unlinkSync(localUrl);
-                    return {
-                        ossFileId: "",
-                        ossToken: ""
-                    };
-                }
-                const currentInfo = uploadInfos[uploadIndex];
-                const ossFileId = currentInfo.fileIds[0];
+            const MAX_RETRIES = uploadInfos.length;
+            let attempt = 0;
+            while(attempt < MAX_RETRIES){
+                const ossBucketIndex = availableBuckets.shift();
+                if (void 0 === ossBucketIndex) break;
+                const currentInfo = uploadInfos[ossBucketIndex];
+                const ossFileId = currentInfo.fileIds;
                 const ossToken = currentInfo.token;
                 const ossDomain = currentInfo.uploadAddr;
                 try {
@@ -5002,10 +5009,13 @@ var __webpack_exports__ = {};
                         ossToken
                     };
                 } catch (error) {
-                    return tryUpload(uploadIndex + 1);
+                    attempt++;
                 }
+            }
+            return {
+                ossFileId: "",
+                ossToken: ""
             };
-            return tryUpload(infoIndex);
         };
         const coverInfos = await Promise.all(params.banners.map((it, idx)=>uploadFile(it, idx)));
         const invalidUpload = coverInfos.find((it)=>"" === it.ossToken || "" == it.ossFileId);
@@ -5350,7 +5360,7 @@ var __webpack_exports__ = {};
         if ("mockApi" === params.actionType) return xiaohongshuPublish_mock_mockAction(task, params);
         return executeAction(xiaohongshuPublish_mock_mockAction, xiaohongshuPublish_rpa_rpaAction)(task, params);
     };
-    var package_namespaceObject = JSON.parse('{"i8":"1.2.16-beta.3"}');
+    var package_namespaceObject = JSON.parse('{"i8":"1.2.16-beta.4"}');
     class Action {
         constructor(task){
             this.task = task;