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

package/dist/index.mjs

@@ -1124,12 +1124,7 @@ class Http {
     }
     constructor(config){
         this.apiClient = __WEBPACK_EXTERNAL_MODULE_axios__["default"].create({
-            ...config,
-            proxy: {
-                host: "localhost",
-                port: 9000,
-                protocol: "http"
-            }
+            ...config
         });
     }
     addResponseInterceptor(findError) {
@@ -2980,7 +2975,7 @@ async function handleToutiaoData(params) {
 }
 async function handleWeixinData(params) {
     try {
-        const { cookies, token, pageNum = 1, pageSize = 10, showOriginalData = false, onlySuccess = false } = params;
+        const { cookies, token, pageNum = 1, pageSize = 10, showOriginalData = false, onlySuccess = false, cursor, lastPage } = params;
         if (!token) return {
             code: 200,
             message: "缺少token",
@@ -3059,9 +3054,11 @@ async function handleWeixinData(params) {
                 }
             });
         }
-        let size = pageSize > 20 ? 20 : pageSize;
-        let rawArticlesInfo = await fetchArticles((pageNum - 1) * size, size, token);
+        let size = onlySuccess ? 10 : pageSize > 20 ? 20 : pageSize;
+        let begin = (lastPage ?? pageNum) - 1;
+        let rawArticlesInfo = await fetchArticles(begin * size, size, token);
         let articlesInfo = ParsePublishPage(rawArticlesInfo);
+        let articleCell = [];
         if (!onlySuccess && pageSize > 20) {
             let totalFetched = articlesInfo.publish_list.length;
             let nextPage = pageNum + 1;
@@ -3075,29 +3072,70 @@ 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
+                    } : {}
+                }));
         }
-        const 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,
-            ...onlySuccess ? {
+        let nextPage = false;
+        if (onlySuccess) {
+            let filteredList = articlesInfo.publish_list.filter((item)=>-1 == item.publish_info.appmsg_info[0].content_url.indexOf("tempkey")).map((item)=>item.publish_info);
+            if (cursor) {
+                const cursorIndex = filteredList.findIndex((item)=>item.msgid === cursor);
+                if (-1 !== cursorIndex) filteredList = filteredList.slice(cursorIndex + 1);
+            }
+            let totalFetched = filteredList.length;
+            while(totalFetched < pageSize && begin * size < articlesInfo.total_count){
+                begin += 1;
+                let nextRawArticlesInfo = await fetchArticles(begin * size, size, token);
+                let nextArticlesInfo = ParsePublishPage(nextRawArticlesInfo);
+                const newFiltered = nextArticlesInfo.publish_list.filter((item)=>-1 == item.publish_info.appmsg_info[0].content_url.indexOf("tempkey")).map((item)=>item.publish_info);
+                filteredList = filteredList.concat(newFiltered);
+                totalFetched = filteredList.length;
+            }
+            filteredList = filteredList.slice(0, pageSize);
+            totalFetched = filteredList.length;
+            if (totalFetched >= pageSize && begin * size < articlesInfo.total_count) {
+                let nextRawArticlesInfo = await fetchArticles((begin + 1) * size, size, token);
+                let nextArticlesInfo = ParsePublishPage(nextRawArticlesInfo);
+                nextPage = nextArticlesInfo.publish_list.length > 0 && nextArticlesInfo.publish_list.some((item)=>-1 == item.publish_info.appmsg_info[0].content_url.indexOf("tempkey"));
+            }
+            const lastMsgId = filteredList.length > 0 ? filteredList[filteredList.length - 1].msgid : void 0;
+            articleCell = filteredList.map((item)=>({
+                    title: item.appmsg_info[0].title,
+                    imageUrl: item.appmsg_info[0].cover,
+                    createTime: item.appmsg_info[0].line_info.send_time,
+                    redirectUrl: item.appmsg_info[0].content_url,
+                    readNum: item.appmsg_info[0].read_num,
+                    likeNum: item.appmsg_info[0].old_like_num,
+                    shareNum: item.appmsg_info[0].share_num,
+                    recommendNum: item.appmsg_info[0].like_num,
+                    ...showOriginalData ? {
+                        originalData: item
+                    } : {}
+                }));
+            return (0, __WEBPACK_EXTERNAL_MODULE__iflyrpa_share_f7afdc8c__.success)({
+                articleCell,
                 pagination: {
-                    total: articlesInfo?.total_count,
+                    nextPage,
                     pageNum,
-                    pageSize
+                    pageSize,
+                    lastPage: begin + 1,
+                    cursor: lastMsgId
                 }
-            } : null
+            }, "微信文章文章获取成功");
+        }
+        return (0, __WEBPACK_EXTERNAL_MODULE__iflyrpa_share_f7afdc8c__.success)({
+            articleCell
         }, "微信文章文章获取成功");
     } catch (error) {
         return searchPublishInfo_types_errorResponse(error instanceof Error ? error.message : "微信文章数据获取失败");
@@ -3154,11 +3192,11 @@ async function handleBaijiahaoData(params) {
                 imageUrl: JSON.parse(item.cover_images)[0].src,
                 createTime: Math.floor(new Date(item.publish_at.replace(/-/g, "/")).getTime() / 1000),
                 redirectUrl: item.url,
-                recommendNum: item.rec_amount,
+                recommendNum: item.rec_amount | item.forward_num,
                 collectNum: item.collection_amount,
-                readNum: item.read_amount,
-                likeNum: item.like_amount,
-                commentNum: item.comment_amount,
+                readNum: item.read_amount | item.read_num,
+                likeNum: item.like_amount | item.praise_num,
+                commentNum: item.comment_amount | item.comment_num,
                 shareNum: item.share_amount,
                 ...showOriginalData ? {
                     originalData: item
@@ -5261,7 +5299,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.1"}');
+var package_namespaceObject = JSON.parse('{"i8":"1.2.16-beta.3"}');
 class Action {
     constructor(task){
         this.task = task;