@iflyrpa/actions 1.2.24-beta.6 → 1.2.24-beta.8

package/dist/index.js

@@ -2926,7 +2926,7 @@ var __webpack_exports__ = {};
         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
             },
@@ -2936,8 +2936,10 @@ var __webpack_exports__ = {};
                 }
             } : null
         });
-        console.log("代理获取状态：", ProxyInfo.msg, "代理返回信息：", JSON.stringify(ProxyInfo.data[0]));
-        return 0 === ProxyInfo.code && ProxyInfo.data.length > 0 ? new dist.HttpsProxyAgent(`http://${ProxyData.api}:${ProxyData.akey}@${ProxyInfo.data[0].proxyAddress}`) : null;
+        return 0 === ProxyInfo.code && ProxyInfo.data.length > 0 ? new dist.HttpsProxyAgent(`http://${ProxyData.api}:${ProxyData.akey}@${ProxyInfo.data[0].proxyAddress}`) : ProxyInfo.msg ? Promise.reject({
+            code: ProxyInfo.code,
+            message: "获取代理IP失败，" + ProxyInfo.msg
+        }) : null;
     };
     class Http {
         static handleApiError(error) {
@@ -2999,15 +3001,6 @@ var __webpack_exports__ = {};
                         httpsAgent: agent
                     } : {}
                 });
-                let proxyInfo;
-                if (agent && agent.proxy) {
-                    const proxy = agent.proxy;
-                    proxyInfo = {
-                        host: proxy.host,
-                        port: proxy.port
-                    };
-                }
-                if (this.adr && agent) response.data.proxyInfo = proxyInfo;
                 return response.data;
             } catch (error) {
                 return Promise.reject(Http.handleApiError(error));
@@ -3374,7 +3367,7 @@ var __webpack_exports__ = {};
             },
             defaultErrorMsg: isDraft ? "文章同步出现异常，请稍后重试。" : "文章发布出现异常，请稍后重试。"
         });
-        return (0, share_namespaceObject.success)(0 == res.errno ? res?.ret?.article_id || '' : "", 0 == res.errno ? `文章发布成功！${res.proxyInfo ? JSON.stringify(res.proxyInfo) : null}` : res.errmsg || '文章发布失败，请稍后重试。');
+        return (0, share_namespaceObject.success)(0 == res.errno ? res?.ret?.article_id || '' : "", 0 == res.errno ? `文章发布成功！` : res.errmsg ?? '文章发布失败，请稍后重试。');
     };
     const rpaAction = async (task, params)=>{
         const tmpCachePath = task.getTmpPath();
@@ -4414,7 +4407,7 @@ var __webpack_exports__ = {};
             headers
         }, params.proxyLoc, params.huiwenToken) : http;
         const publishResult = await proxyHttp.api(publishOption);
-        return (0, share_namespaceObject.success)(publishResult.data.pgc_id, `文章发布成功！${JSON.stringify(publishResult.proxyInfo)}`);
+        return (0, share_namespaceObject.success)(publishResult.data.pgc_id, `文章发布成功！`);
     };
     const rpa_GenAB = __webpack_require__("./src/utils/ttABEncrypt.js");
     const rpa_rpaAction = async (task, params)=>{
@@ -6349,7 +6342,7 @@ var __webpack_exports__ = {};
         const proxyHttp = task?.isBeta ?? false ? new Http({
             headers
         }, params.proxyLoc, params.huiwenToken) : http;
-        const massData = await proxyHttp.api({
+        await proxyHttp.api({
             method: "post",
             url: "https://mp.weixin.qq.com/cgi-bin/masssend",
             params: {
@@ -6398,7 +6391,7 @@ var __webpack_exports__ = {};
             }),
             defaultErrorMsg: params.masssend ? "文章群发异常，请尝试关闭群发或稍后重试。" : "文章发布异常，请稍后重试。"
         });
-        return (0, share_namespaceObject.success)(appMsgId, `微信公众号发布完成。${JSON.stringify(massData.proxyInfo)}`);
+        return (0, share_namespaceObject.success)(appMsgId, `微信公众号发布完成！`);
     };
     const waitQrcodeResultMaxTime = 2000 * scanRetryMaxCount;
     const weixinPublish_rpa_rpaAction = async (task, params)=>{
@@ -7301,7 +7294,7 @@ var __webpack_exports__ = {};
             },
             defaultErrorMsg: "文章发布异常，请稍后重试。"
         });
-        return (0, share_namespaceObject.success)(publishResult.data?.id, `文章发布成功！${JSON.stringify(publishResult.proxyInfo)}`);
+        return (0, share_namespaceObject.success)(publishResult.data?.id, `文章发布成功！`);
     };
     const rpa_GenXSCommon = __webpack_require__("./src/utils/XhsXsCommonEnc.js");
     const rpa_xsEncrypt = new Xhshow();
@@ -7522,7 +7515,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.24-beta.5"}');
+    var package_namespaceObject = JSON.parse('{"i8":"1.2.24-beta.7"}');
     const BetaFlag = "HuiwenCanary";
     class Action {
         constructor(task){
@@ -7530,7 +7523,7 @@ var __webpack_exports__ = {};
         }
         async bindTask(func, params) {
             let responseData;
-            this.task.isBeta = this.task?.isFeatOn(BetaFlag) || false;
+            this.task.isBeta = this.task?.isFeatOn ? this.task?.isFeatOn(BetaFlag) : false;
             this.task._timerRecord = {
                 ActionStart: Date.now()
             };