@iflyrpa/actions 4.0.0-beta.2 → 4.0.0-beta.6

package/dist/index.js

@@ -5489,7 +5489,7 @@ var __webpack_exports__ = {};
     });
     const package_json_namespaceObject = require("@iflyrpa/share/package.json");
     var package_json_default = /*#__PURE__*/ __webpack_require__.n(package_json_namespaceObject);
-    var package_namespaceObject = JSON.parse('{"i8":"4.0.0-beta.1"}');
+    var package_namespaceObject = JSON.parse('{"i8":"4.0.0-beta.5"}');
     const share_namespaceObject = require("@iflyrpa/share");
     const external_node_fs_namespaceObject = require("node:fs");
     var external_node_fs_default = /*#__PURE__*/ __webpack_require__.n(external_node_fs_namespaceObject);
@@ -5594,6 +5594,13 @@ var __webpack_exports__ = {};
                     }
                 };
                 if (foundError) Object.assign(errorResponse, foundError);
+                if (error.response?.status === 403) {
+                    this.logger?.warn(`[403 详细信息] URL: ${error.config?.url}`);
+                    this.logger?.warn(`[403 响应头] ${JSON.stringify(error.response?.headers || {})}`);
+                    this.logger?.warn(`[403 响应体] ${JSON.stringify(error.response?.data || null)}`);
+                    const verifyDecision = error.response?.headers?.["x-tt-verify-passport-decision"];
+                    if (verifyDecision) this.logger?.warn(`[403 验证决策] x-tt-verify-passport-decision: ${verifyDecision}`);
+                }
                 if (error.response?.data) {
                     if ("object" == typeof error.response.data) {
                         const serverError = error.response.data;
@@ -14483,21 +14490,13 @@ var __webpack_exports__ = {};
             console.log("拦截器收到响应:", JSON.stringify(response.data));
             task.logger.info(`拦截器收到响应response.headers: ${JSON.stringify(response.headers)} `);
             task.logger.info(`拦截器收到响应response.data: ${JSON.stringify(response.data)} `);
-            task.logger.info(`拦截器收到响应response.data类型: ${typeof response.data}, 值: ${JSON.stringify(response.data)}`);
             decision = parseVerifyPassportDecision(response.headers["x-tt-verify-passport-decision"]);
-            task.logger.info(`解析后的decision: ${JSON.stringify(decision)}`);
             if (needsVerification(decision)) {
-                task.logger.info(`检测到需要验证，decision.account_flow: ${decision?.account_flow}`);
-                task.logger.info("拦截器即将return，不抛错");
-                return;
-            }
-            task.logger.info("不需要验证，继续检查response.data");
-            if (!response || !response.data) {
-                task.logger.info("response或response.data为空，拦截器return");
+                task.logger.info(`需要验证: ${JSON.stringify(decision)}`);
                 return;
             }
+            if (!response || !response.data) return;
             const responseData = response.data;
-            task.logger.info(`responseData.status_code: ${responseData?.status_code}`);
             if (response && responseData?.status_code && 0 !== responseData.status_code) {
                 const errorCode = 4 === responseData.status_code ? 500 : responseData.status_code;
                 if (4 === responseData.status_code) task.logger.warn(`抖音服务器错误 status_code: 4，映射为 500 触发重试。原始响应: ${JSON.stringify(responseData)}`);
@@ -14594,9 +14593,33 @@ var __webpack_exports__ = {};
             retryDelay: 2000
         });
         task.logger.info("========== api调用完成 ==========");
-        task.logger.info(`publishResult类型: ${typeof publishResult}, 值: ${JSON.stringify(publishResult)}`);
-        task.logger.info(`decision值: ${JSON.stringify(decision)}`);
-        task.logger.info(`needsVerification(decision): ${needsVerification(decision)}`);
+        task.logger.info(`decision值: ${JSON.stringify(decision)}, needsVerification(decision): ${needsVerification(decision)}`);
+        if (needsVerification(decision)) {
+            const details = [
+                publishResult.status_msg,
+                decision?.verify_title,
+                decision?.verify_desc
+            ].filter(Boolean).join(" ");
+            const message = `图文发布失败，原因：${details}${task.debug ? ` ${http.proxyInfo}` : ""}`;
+            task.logger.warn(`TaskId：${task.taskId}，检测到需要验证，准备返回验证信息`);
+            let decisionObj = {};
+            if (decision) decisionObj = decision;
+            const mockData = {
+                state: share_namespaceObject.TaskState.FAILED,
+                error: message,
+                result: {
+                    ...decisionObj,
+                    data: decision,
+                    uploadedImgList: JSON.stringify(publishData.item.common.images)
+                }
+            };
+            await updateTaskState?.(mockData);
+            return {
+                code: 0,
+                data: mockData,
+                message: "操作成功"
+            };
+        }
         task.logger.info("不需要验证，继续正常流程");
         reportLogger({
             token: params.huiwenToken || "",
@@ -14615,10 +14638,13 @@ var __webpack_exports__ = {};
         const message = `图文发布${isSuccess ? "成功" : `失败，原因：${publishResult.status_msg} ${decision?.verify_title} ${decision?.verify_desc}`}${task.debug ? ` ${http.proxyInfo}` : ""}`;
         const data = isSuccess ? publishResult.item_id || "" : "";
         if (!isSuccess) {
+            let decisionObj = {};
+            if (decision) decisionObj = decision;
             await updateTaskState?.({
                 state: share_namespaceObject.TaskState.FAILED,
                 error: message,
                 result: {
+                    ...decisionObj,
                     data: decision,
                     uploadedImgList: JSON.stringify(publishData.item.common.images)
                 }
@@ -15293,15 +15319,41 @@ var __webpack_exports__ = {};
         }
         task.logger?.info("准备发布...");
         await page.waitForTimeout(1000);
-        const response = await new Promise((resolve, reject)=>{
+        const result = await new Promise((resolve, reject)=>{
             const handleResponse = async (res)=>{
                 if (res.url().includes("/web/api/media/aweme/create_v2")) {
                     task.logger?.info("匹配到发布接口响应");
+                    let decision = null;
+                    try {
+                        const headers = await res.allHeaders();
+                        decision = parseVerifyPassportDecision(headers["x-tt-verify-passport-decision"]);
+                    } catch (error) {
+                        task.logger?.warn(`解析验证决策头失败: ${error}`);
+                    }
                     const jsonResponse = await res.json();
                     task.logger?.info(`发布接口响应数据: ${JSON.stringify(jsonResponse)}`);
                     page.off("response", handleResponse);
-                    if (jsonResponse?.status_code === 0) resolve(jsonResponse?.data?.item_id || jsonResponse?.item_id || "");
-                    else reject(new Error(jsonResponse?.status_msg || "发布失败"));
+                    if (needsVerification(decision)) {
+                        task.logger?.warn("检测到需要二次验证，文章未真正发布");
+                        resolve({
+                            itemId: "",
+                            decision
+                        });
+                        return;
+                    }
+                    if (jsonResponse?.status_code !== 0) {
+                        reject(new Error(jsonResponse?.status_msg || "发布失败"));
+                        return;
+                    }
+                    const itemId = jsonResponse?.data?.item_id || jsonResponse?.item_id || "";
+                    if (!itemId) {
+                        reject(new Error(jsonResponse?.status_msg || "发布异常：未返回作品ID，文章可能未真正发布"));
+                        return;
+                    }
+                    resolve({
+                        itemId,
+                        decision: null
+                    });
                 }
             };
             page.on("response", handleResponse);
@@ -15323,20 +15375,42 @@ var __webpack_exports__ = {};
             await page.close();
             return null;
         });
-        if (!response && "" !== response) return {
+        if (!result) return {
             code: 414,
             message: "发布失败",
             data: ""
         };
-        task.logger?.info(`✓ 发布成功，item_id: ${response}`);
+        if (needsVerification(result.decision)) {
+            const decision = result.decision;
+            const details = [
+                decision?.verify_title,
+                decision?.verify_desc
+            ].filter(Boolean).join(" ");
+            const message = `发布失败，需要二次验证${details ? `：${details}` : ""}`;
+            task.logger?.warn(message);
+            await updateTaskState?.({
+                state: share_namespaceObject.TaskState.FAILED,
+                error: message,
+                result: {
+                    data: decision
+                }
+            });
+            await page.close();
+            return {
+                code: 414,
+                message,
+                data: ""
+            };
+        }
+        task.logger?.info(`✓ 发布成功，item_id: ${result.itemId}`);
         await updateTaskState?.({
             state: share_namespaceObject.TaskState.SUCCESS,
             result: {
-                response
+                response: result.itemId
             }
         });
         await page.close();
-        return (0, share_namespaceObject.success)(response);
+        return (0, share_namespaceObject.success)(result.itemId);
     };
     const DouyinPublishParamsSchema = ActionCommonParamsSchema.extend({
         title: schemas_string(),
@@ -16116,26 +16190,26 @@ var __webpack_exports__ = {};
         const http = new Http({
             headers: {
                 cookie: params.cookies.map((it)=>`${it.name}=${it.value}`).join(";"),
-                referer: "https://mp.toutiao.com/profile_v4/graphic/publish"
+                referer: "https://mp.toutiao.com/profile_v4/graphic/publish",
+                "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36"
+            }
+        });
+        const totalData = await http.api({
+            method: "get",
+            url: "https://mp.toutiao.com/mp/fe_api/home/merge_v2",
+            params: {
+                app_id: 1231
+            }
+        });
+        await new Promise((r)=>setTimeout(r, 1000));
+        const contentDataYesterday = await http.api({
+            method: "get",
+            url: "https://mp.toutiao.com/mp/agw/statistic/v2/content_stat",
+            params: {
+                type: 0,
+                app_id: 1231
             }
         });
-        const [totalData, contentDataYesterday] = await Promise.all([
-            http.api({
-                method: "get",
-                url: "https://mp.toutiao.com/mp/fe_api/home/merge_v2",
-                params: {
-                    app_id: 1231
-                }
-            }),
-            http.api({
-                method: "get",
-                url: "https://mp.toutiao.com/mp/agw/statistic/v2/content_stat",
-                params: {
-                    type: 0,
-                    app_id: 1231
-                }
-            })
-        ]);
         const isSuccess = !!(totalData?.data?.statistic && contentDataYesterday?.author_stat);
         if (!isSuccess || !totalData?.data || !contentDataYesterday?.author_stat) return types_errorResponse(totalData?.message || contentDataYesterday?.message || "头条号数据获取失败，请检查Cookie是否有效", 414);
         const ttData = {
@@ -20312,8 +20386,10 @@ var __webpack_exports__ = {};
             tuwen_wtt_trans_flag: params.settingInfo?.toutiaoTransWtt ? "2" : "0",
             info_source: sourceData,
             ...location ? {
-                city: location.label,
-                city_code: location.value
+                manual_selected_city: JSON.stringify({
+                    city: location.label,
+                    city_code: location.value
+                })
             } : null,
             ...params.settingInfo?.toutiaoCollectionId ? {
                 want_join_collection_id: params.settingInfo.toutiaoCollectionId
@@ -20363,6 +20439,12 @@ var __webpack_exports__ = {};
             claim_exclusive: toutiaoExclusive ? toutiaoExclusive : toutiaoOriginal?.includes("exclusive") ? 1 : 0
         };
         task._timerRecord.PrePublish = Date.now();
+        task.logger.info(`[toutiaoPublish] ${"draft" === params.saveType ? "同步草稿" : "发布文章"}参数`, {
+            saveType: params.saveType,
+            title: params.title,
+            extra: extraData,
+            publishData
+        });
         const msToken = params.cookies.find((it)=>"msToken" === it.name)?.value;
         let publishOption = {};
         if (msToken) {
@@ -21558,8 +21640,8 @@ var __webpack_exports__ = {};
             headers
         });
         const proxyHttp = new Http(...args);
-        proxyHttp.addResponseInterceptor((response)=>{
-            const responseData = response.data;
+        const baseRespFinder = (response)=>{
+            const responseData = response?.data;
             const msgType = "draft" === params.saveType ? "同步" : "发布";
             if (response && responseData?.base_resp && 0 !== responseData.base_resp.ret && !ignoreErrno.includes(responseData.base_resp.ret)) {
                 const errmsg = weixinPublish_mock_errnoMap[responseData.base_resp.ret] || response.config.defaultErrorMsg || responseData.base_resp.err_msg || `文章${msgType}异常，请稍后重试。`;
@@ -21569,7 +21651,9 @@ var __webpack_exports__ = {};
                     data: responseData
                 };
             }
-        });
+        };
+        http.addResponseInterceptor(baseRespFinder);
+        proxyHttp.addResponseInterceptor(baseRespFinder);
         await http.api({
             method: "get",
             url: "https://mp.weixin.qq.com/cgi-bin/appmsgpublish",