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

package/dist/index.mjs

@@ -2963,7 +2963,7 @@ async function handleToutiaoData(params) {
             articleCell,
             ...onlySuccess ? {
                 pagination: {
-                    total: api_base_info_json.total_count || -1,
+                    total: api_base_info_json.total_count,
                     pageNum,
                     pageSize
                 }
@@ -3072,19 +3072,6 @@ async function handleWeixinData(params) {
                 if (parsed.publish_list.length < currentPageSize) break;
                 nextPage++;
             }
-            articleCell = articlesInfo.publish_list.map((item)=>({
-                    title: item.publish_info.appmsg_info[0].title,
-                    imageUrl: item.publish_info.appmsg_info[0].cover,
-                    createTime: item.publish_info.appmsg_info[0].line_info.send_time,
-                    redirectUrl: item.publish_info.appmsg_info[0].content_url,
-                    readNum: item.publish_info.appmsg_info[0].read_num,
-                    likeNum: item.publish_info.appmsg_info[0].old_like_num,
-                    shareNum: item.publish_info.appmsg_info[0].share_num,
-                    recommendNum: item.publish_info.appmsg_info[0].like_num,
-                    ...showOriginalData ? {
-                        originalData: item
-                    } : {}
-                }));
         }
         let nextPage = false;
         if (onlySuccess) {
@@ -3134,6 +3121,19 @@ async function handleWeixinData(params) {
                 }
             }, "微信文章文章获取成功");
         }
+        articleCell = articlesInfo.publish_list.map((item)=>({
+                title: item.publish_info.appmsg_info[0].title,
+                imageUrl: item.publish_info.appmsg_info[0].cover,
+                createTime: item.publish_info.appmsg_info[0].line_info.send_time,
+                redirectUrl: item.publish_info.appmsg_info[0].content_url,
+                readNum: item.publish_info.appmsg_info[0].read_num,
+                likeNum: item.publish_info.appmsg_info[0].old_like_num,
+                shareNum: item.publish_info.appmsg_info[0].share_num,
+                recommendNum: item.publish_info.appmsg_info[0].like_num,
+                ...showOriginalData ? {
+                    originalData: item
+                } : {}
+            }));
         return (0, __WEBPACK_EXTERNAL_MODULE__iflyrpa_share_f7afdc8c__.success)({
             articleCell
         }, "微信文章文章获取成功");
@@ -4907,33 +4907,40 @@ const xiaohongshuPublish_mock_mockAction = async (task, params)=>{
         }
     });
     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, __WEBPACK_EXTERNAL_MODULE__iflyrpa_share_f7afdc8c__.getFilenameFromUrl)(url);
         const localUrl = await (0, __WEBPACK_EXTERNAL_MODULE__iflyrpa_share_f7afdc8c__.downloadImage)(url, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__["default"].join(tmpCachePath, fileName));
         const fileBuffer = __WEBPACK_EXTERNAL_MODULE_node_fs_5ea92f0c__["default"].readFileSync(localUrl);
-        const tryUpload = async (uploadIndex)=>{
-            if (uploadIndex >= uploadInfos.length) {
-                __WEBPACK_EXTERNAL_MODULE_node_fs_5ea92f0c__["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 {
@@ -4951,10 +4958,13 @@ const xiaohongshuPublish_mock_mockAction = async (task, params)=>{
                     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);
@@ -5299,7 +5309,7 @@ const xiaohongshuPublish = async (task, params)=>{
     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.5"}');
 class Action {
     constructor(task){
         this.task = task;