@iflyrpa/actions 1.2.24-beta.0 → 1.2.24-beta.10

package/dist/index.js

@@ -2922,14 +2922,19 @@ var __webpack_exports__ = {};
         md5akey: "6ec8d333e85044b7",
         akey: "91709114"
     };
-    const ProxyAgent = async (adr)=>{
+    const ProxyAgent = async (adr, huiwenToken)=>{
         const http = new Http({});
         let ProxyInfo = await http.api({
             method: "GET",
-            url: "https://fetdev.iflysec.com/api/publish/zdy/ip",
+            url: "https://preview.huiwen.top/api/publish/zdy/ip",
             params: {
                 addr: adr
-            }
+            },
+            ...huiwenToken ? {
+                headers: {
+                    token: huiwenToken
+                }
+            } : null
         });
         return 0 === ProxyInfo.code && ProxyInfo.data.length > 0 ? new dist.HttpsProxyAgent(`http://${ProxyData.api}:${ProxyData.akey}@${ProxyInfo.data[0].proxyAddress}`) : null;
     };
@@ -2942,11 +2947,12 @@ var __webpack_exports__ = {};
                 data: error
             };
         }
-        constructor(config, adr){
+        constructor(config, adr, huiwenToken){
             this.apiClient = external_axios_default().create({
                 ...config
             });
             this.adr = adr;
+            this.heiwenToken = huiwenToken;
         }
         addResponseInterceptor(findError) {
             this.apiClient.interceptors.response.use((response)=>{
@@ -2980,7 +2986,12 @@ var __webpack_exports__ = {};
         }
         async api(config) {
             try {
-                const agent = this.adr ? await ProxyAgent(this.adr) : void 0;
+                const agent = this.adr ? await ProxyAgent(this.adr, this.heiwenToken) : void 0;
+                if (this.adr && null == agent) return Promise.reject({
+                    code: 200,
+                    message: "当前发文IP地址暂不支持!"
+                });
+                this.proxyInfo = agent?.proxy.host;
                 const response = await this.apiClient({
                     ...config,
                     ...agent ? {
@@ -3340,9 +3351,9 @@ var __webpack_exports__ = {};
         const isDraft = "draft" === params.saveType;
         const saveUrl = isDraft ? "https://baijiahao.baidu.com/pcui/article/save?callback=bjhdraft" : "https://baijiahao.baidu.com/pcui/article/publish?callback=bjhpublish";
         task._timerRecord['PrePublish'] = Date.now();
-        const proxyHttp = new Http({
+        const proxyHttp = task?.isBeta ?? false ? new Http({
             headers
-        }, params.proxyLoc);
+        }, params.proxyLoc, params.huiwenToken) : http;
         const res = await proxyHttp.api({
             method: "post",
             url: saveUrl,
@@ -3354,7 +3365,7 @@ var __webpack_exports__ = {};
             },
             defaultErrorMsg: isDraft ? "文章同步出现异常，请稍后重试。" : "文章发布出现异常，请稍后重试。"
         });
-        return (0, share_namespaceObject.success)(res.ret.article_id, "百家号发布完成。");
+        return (0, share_namespaceObject.success)(0 == res.errno ? res?.ret?.article_id || '' : "", 0 == res.errno ? `文章发布成功！` + (proxyHttp.proxyInfo || "") : res.errmsg ?? '文章发布失败，请稍后重试。');
     };
     const rpaAction = async (task, params)=>{
         const tmpCachePath = task.getTmpPath();
@@ -4305,11 +4316,14 @@ var __webpack_exports__ = {};
                 device_platform: "mp",
                 is_message: 0
             },
-            tuwen_wtt_trans_flag: "0",
+            tuwen_wtt_trans_flag: params.settingInfo?.toutiaoTransWtt ? "2" : "0",
             info_source: sourceData,
             ...location ? {
                 city: location.label,
                 city_code: location.value
+            } : null,
+            ...params.settingInfo?.toutiaoCollectionId ? {
+                want_join_collection_id: params.settingInfo.toutiaoCollectionId
             } : null
         };
         const publishData = {
@@ -4387,11 +4401,11 @@ var __webpack_exports__ = {};
             },
             defaultErrorMsg: "draft" === params.saveType ? "文章同步异常，请稍后重试。" : "文章发布异常，请稍后重试。"
         };
-        const proxyHttp = new Http({
+        const proxyHttp = task?.isBeta ?? false ? new Http({
             headers
-        }, params.proxyLoc);
+        }, params.proxyLoc, params.huiwenToken) : http;
         const publishResult = await proxyHttp.api(publishOption);
-        return (0, share_namespaceObject.success)(publishResult.data.pgc_id);
+        return (0, share_namespaceObject.success)(publishResult.data.pgc_id, `文章发布成功！` + (proxyHttp.proxyInfo || ""));
     };
     const rpa_GenAB = __webpack_require__("./src/utils/ttABEncrypt.js");
     const rpa_rpaAction = async (task, params)=>{
@@ -5344,10 +5358,10 @@ var __webpack_exports__ = {};
             }
             const final = filtered.slice(0, pageSize);
             const articleCell = final.map((item)=>({
-                    title: item.title,
-                    imageUrl: JSON.parse(item.cover_images)[0].src,
+                    title: item?.is_transfer ?? false ? item.content || "" : item.title,
+                    imageUrl: JSON.parse(item.cover_images)[0]?.src || "",
                     createTime: Math.floor(new Date(item.publish_at.replace(/-/g, "/")).getTime() / 1000),
-                    redirectUrl: item.url,
+                    redirectUrl: item.url || item.share_url,
                     recommendNum: item.rec_amount | item.forward_num,
                     collectNum: item.collection_amount,
                     readNum: item.read_amount | item.read_num,
@@ -6249,9 +6263,6 @@ var __webpack_exports__ = {};
         };
         const uuid = getUuidResult.uuid;
         await (0, share_namespaceObject.sleep)(1000);
-        new Http({
-            headers
-        }, params.proxyLoc);
         const qrcodeResult = await http.api({
             method: "get",
             url: "https://mp.weixin.qq.com/safe/safeqrcode",
@@ -6326,7 +6337,10 @@ var __webpack_exports__ = {};
                 uuid
             })
         });
-        await http.api({
+        const proxyHttp = task?.isBeta ?? false ? new Http({
+            headers
+        }, params.proxyLoc, params.huiwenToken) : http;
+        await proxyHttp.api({
             method: "post",
             url: "https://mp.weixin.qq.com/cgi-bin/masssend",
             params: {
@@ -6375,7 +6389,7 @@ var __webpack_exports__ = {};
             }),
             defaultErrorMsg: params.masssend ? "文章群发异常，请尝试关闭群发或稍后重试。" : "文章发布异常，请稍后重试。"
         });
-        return (0, share_namespaceObject.success)(appMsgId, params.settingInfo.timer ? "微信公众号文章定时发布成功。" : "微信公众号发布完成。");
+        return (0, share_namespaceObject.success)(appMsgId, `微信公众号发布完成！` + (proxyHttp.proxyInfo || ""));
     };
     const waitQrcodeResultMaxTime = 2000 * scanRetryMaxCount;
     const weixinPublish_rpa_rpaAction = async (task, params)=>{
@@ -7263,9 +7277,9 @@ var __webpack_exports__ = {};
         const publishXt = Date.now().toString();
         const publishXs = mock_xsEncrypt.signXsPost("/web_api/sns/v2/note", a1Cookie, "xhs-pc-web", publishData);
         const xscommon = GenXSCommon(a1Cookie, publishXt, publishXs);
-        const proxyHttp = new Http({
+        const proxyHttp = task?.isBeta ?? false ? new Http({
             headers
-        }, params.proxyLoc);
+        }, params.proxyLoc, params.huiwenToken) : http;
         task._timerRecord['PrePublish'] = Date.now();
         const publishResult = await proxyHttp.api({
             method: "post",
@@ -7278,7 +7292,7 @@ var __webpack_exports__ = {};
             },
             defaultErrorMsg: "文章发布异常，请稍后重试。"
         });
-        return (0, share_namespaceObject.success)(publishResult.data?.id);
+        return (0, share_namespaceObject.success)(publishResult.data?.id, `文章发布成功！` + (proxyHttp.proxyInfo || ""));
     };
     const rpa_GenXSCommon = __webpack_require__("./src/utils/XhsXsCommonEnc.js");
     const rpa_xsEncrypt = new Xhshow();
@@ -7499,9 +7513,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 = {
-        i8: "1.2.23"
-    };
+    var package_namespaceObject = JSON.parse('{"i8":"1.2.24-beta.9"}');
     const BetaFlag = "HuiwenCanary";
     class Action {
         constructor(task){
@@ -7509,13 +7521,13 @@ var __webpack_exports__ = {};
         }
         async bindTask(func, params) {
             let responseData;
-            this.task.isBeta = this.task.isFeatOn(BetaFlag);
+            this.task.isBeta = this.task?.isFeatOn ? this.task?.isFeatOn(BetaFlag) : false;
             this.task._timerRecord = {
                 ActionStart: Date.now()
             };
-            if (this.task.setArticleId) this.task.setArticleId(params.articleId ?? "");
-            if (this.task.setSaveType) this.task.setSaveType(params.saveType ?? "");
-            if (void 0 !== this.task.isInitializedGB) this.task.setGbInitType(this.task.isInitializedGB);
+            if (this.task?.setArticleId) this.task.setArticleId(params.articleId ?? "");
+            if (this.task?.setSaveType ?? false) this.task.setSaveType(params.saveType ?? "");
+            if (this.task?.isInitializedGB !== void 0) this.task.setGbInitType(this.task.isInitializedGB);
             if ("object" == typeof params) params.cookies = params?.cookies ?? [];
             try {
                 responseData = await func(this.task, params);