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

package/dist/index.mjs

@@ -2874,7 +2874,7 @@ 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
         },
@@ -2884,8 +2884,10 @@ const ProxyAgent = async (adr, huiwenToken)=>{
             }
         } : 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) {
@@ -2947,15 +2949,6 @@ class Http {
                     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));
@@ -3319,7 +3312,7 @@ const mockAction = async (task, params)=>{
         },
         defaultErrorMsg: isDraft ? "文章同步出现异常，请稍后重试。" : "文章发布出现异常，请稍后重试。"
     });
-    return (0, __WEBPACK_EXTERNAL_MODULE__iflyrpa_share_f7afdc8c__.success)(0 == res.errno ? res?.ret?.article_id || '' : "", 0 == res.errno ? `文章发布成功！${res.proxyInfo ? JSON.stringify(res.proxyInfo) : null}` : res.errmsg || '文章发布失败，请稍后重试。');
+    return (0, __WEBPACK_EXTERNAL_MODULE__iflyrpa_share_f7afdc8c__.success)(0 == res.errno ? res?.ret?.article_id || '' : "", 0 == res.errno ? `文章发布成功！` : res.errmsg ?? '文章发布失败，请稍后重试。');
 };
 const rpaAction = async (task, params)=>{
     const tmpCachePath = task.getTmpPath();
@@ -4356,7 +4349,7 @@ const mock_mockAction = async (task, params)=>{
         headers
     }, params.proxyLoc, params.huiwenToken) : http;
     const publishResult = await proxyHttp.api(publishOption);
-    return (0, __WEBPACK_EXTERNAL_MODULE__iflyrpa_share_f7afdc8c__.success)(publishResult.data.pgc_id, `文章发布成功！${JSON.stringify(publishResult.proxyInfo)}`);
+    return (0, __WEBPACK_EXTERNAL_MODULE__iflyrpa_share_f7afdc8c__.success)(publishResult.data.pgc_id, `文章发布成功！`);
 };
 const rpa_GenAB = __webpack_require__("./src/utils/ttABEncrypt.js");
 const rpa_rpaAction = async (task, params)=>{
@@ -6291,7 +6284,7 @@ const weixinPublish_mock_mockAction = async (task, params)=>{
     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: {
@@ -6340,7 +6333,7 @@ const weixinPublish_mock_mockAction = async (task, params)=>{
         }),
         defaultErrorMsg: params.masssend ? "文章群发异常，请尝试关闭群发或稍后重试。" : "文章发布异常，请稍后重试。"
     });
-    return (0, __WEBPACK_EXTERNAL_MODULE__iflyrpa_share_f7afdc8c__.success)(appMsgId, `微信公众号发布完成。${JSON.stringify(massData.proxyInfo)}`);
+    return (0, __WEBPACK_EXTERNAL_MODULE__iflyrpa_share_f7afdc8c__.success)(appMsgId, `微信公众号发布完成！`);
 };
 const waitQrcodeResultMaxTime = 2000 * scanRetryMaxCount;
 const weixinPublish_rpa_rpaAction = async (task, params)=>{
@@ -7243,7 +7236,7 @@ const xiaohongshuPublish_mock_mockAction = async (task, params)=>{
         },
         defaultErrorMsg: "文章发布异常，请稍后重试。"
     });
-    return (0, __WEBPACK_EXTERNAL_MODULE__iflyrpa_share_f7afdc8c__.success)(publishResult.data?.id, `文章发布成功！${JSON.stringify(publishResult.proxyInfo)}`);
+    return (0, __WEBPACK_EXTERNAL_MODULE__iflyrpa_share_f7afdc8c__.success)(publishResult.data?.id, `文章发布成功！`);
 };
 const rpa_GenXSCommon = __webpack_require__("./src/utils/XhsXsCommonEnc.js");
 const rpa_xsEncrypt = new Xhshow();
@@ -7464,7 +7457,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.24-beta.5"}');
+var package_namespaceObject = JSON.parse('{"i8":"1.2.24-beta.7"}');
 const BetaFlag = "HuiwenCanary";
 class Action {
     constructor(task){
@@ -7472,7 +7465,7 @@ class Action {
     }
     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()
         };