@iflyrpa/actions 2.0.0 → 2.0.1

package/dist/index.mjs

@@ -4951,7 +4951,9 @@ function __webpack_require__(moduleId) {
         return module;
     };
 })();
-var package_namespaceObject = JSON.parse('{"i8":"2.0.0-beta.8"}');
+var package_namespaceObject = {
+    i8: "2.0.0"
+};
 var dist = __webpack_require__("../../node_modules/.pnpm/https-proxy-agent@7.0.6/node_modules/https-proxy-agent/dist/index.js");
 async function ProxyAgent(task, ip, adr, accountId, refresh) {
     const http = new Http({
@@ -9064,7 +9066,7 @@ const types_errorResponse = (message, code = 500)=>({
         message,
         data: null
     });
-const MockPublish = true;
+const MockPublish = false;
 const rpa_server_scanRetryMaxCount = 60;
 const rpa_server_waitQrcodeResultMaxTime = 2000 * rpa_server_scanRetryMaxCount;
 const rpaServer = async (task, params)=>{
@@ -11124,8 +11126,7 @@ const DySessionCheck = async (_task, params)=>{
     const http = new Http({
         headers: {
             cookie: params.cookies.map((it)=>`${it.name}=${it.value}`).join(";"),
-            referer: "https://creator.douyin.com/",
-            "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
+            referer: "https://creator.douyin.com/"
         }
     });
     const res = await http.api({
@@ -12706,7 +12707,7 @@ class DouyinImageUploader {
             const batch = imageUrls.slice(i, i + this.CONCURRENT_LIMIT);
             const batchIndex = Math.floor(i / this.CONCURRENT_LIMIT) + 1;
             const totalBatches = Math.ceil(total / this.CONCURRENT_LIMIT);
-            console.log(`\n--- 批次 ${batchIndex}/${totalBatches} (${batch.length} 张) ---`);
+            console.log(`\n--- 批次 ${batchIndex}/${totalBatches} (${batch?.length} 张) ---`);
             const batchPromises = batch.map((url, idx)=>{
                 const globalIndex = i + idx;
                 return this.processSingleImage(url, globalIndex, total);
@@ -12751,11 +12752,15 @@ const { generateReqSignFromTicket } = __webpack_require__("./src/utils/douyin/re
 const { generateCsrfTokenAdvanced: mock_generateCsrfTokenAdvanced } = __webpack_require__("./src/utils/douyin/csrfToken.js");
 const mock_mockAction = async (task, params)=>{
     if (!params.extraParam || !params.extraParam["security-sdk/s_sdk_pri_key"] || !params.extraParam["security-sdk/s_sdk_pub_key"] || !params.extraParam["security-sdk/s_sdk_sign_data_key/web_protect"]) return (0, __WEBPACK_EXTERNAL_MODULE__iflyrpa_share_f7afdc8c__.response)(400, "extraParam 参数缺失或不完整", "");
+    const userAgent = params.userAgent || "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/145.0.0.0 Safari/537.36";
     const tmpCachePath = task.getTmpPath();
     let bdTicketGuardClientDataV2 = params.cookies.find((e)=>"bd_ticket_guard_client_data" === e.name)?.value || "";
     if (!bdTicketGuardClientDataV2) return (0, __WEBPACK_EXTERNAL_MODULE__iflyrpa_share_f7afdc8c__.response)(400, "bdTicketGuardClientDataV2 不能为空", "");
     bdTicketGuardClientDataV2 = decodeURIComponent(bdTicketGuardClientDataV2);
     console.log("原始 bdTicketGuardClientDataV2:", bdTicketGuardClientDataV2);
+    task.logger.warn("原始 bdTicketGuardClientDataV2", {
+        bdTicketGuardClientDataV2
+    });
     try {
         bdTicketGuardClientDataV2 = atob(bdTicketGuardClientDataV2);
         console.log("解码后 bdTicketGuardClientDataV2:", bdTicketGuardClientDataV2);
@@ -12763,6 +12768,9 @@ const mock_mockAction = async (task, params)=>{
         console.error("bdTicketGuardClientDataV2 解码失败:", error);
         return (0, __WEBPACK_EXTERNAL_MODULE__iflyrpa_share_f7afdc8c__.response)(500, "bdTicketGuardClientDataV2 解码失败", "");
     }
+    task.logger.warn("解码后 bdTicketGuardClientDataV2:", {
+        bdTicketGuardClientDataV2
+    });
     let ree_public_key = "";
     let ts_sign = "";
     try {
@@ -12774,16 +12782,23 @@ const mock_mockAction = async (task, params)=>{
     const publicKey = JSON.parse(params.extraParam["security-sdk/s_sdk_pub_key"] || "{}").data;
     const signData = JSON.parse(JSON.parse(params.extraParam["security-sdk/s_sdk_sign_data_key/web_protect"] || "{}").data || "{}");
     console.log("privateKey:", privateKey);
+    task.logger.warn("privateKey", {
+        privateKey
+    });
     console.log("publicKey:", publicKey);
-    console.log("signData:", signData);
+    task.logger.warn("signData", {
+        signData
+    });
     let bdTicketGuardClientData = {
         ts_sign,
         req_content: "ticket,path,timestamp",
         timestamp: Math.floor(Date.now() / 1000),
         req_sign: generateReqSignFromTicket(signData.ticket, privateKey)
     };
-    console.log("bdTicketGuardClientData:", bdTicketGuardClientData);
     bdTicketGuardClientData = btoa(JSON.stringify(bdTicketGuardClientData));
+    task.logger.warn("bdTicketGuardClientData", {
+        bdTicketGuardClientData
+    });
     const sessionidCookie = params.cookies.find((it)=>"msToken" === it.name)?.value;
     if (!sessionidCookie) return {
         code: 414,
@@ -12794,7 +12809,7 @@ const mock_mockAction = async (task, params)=>{
         cookie: params.cookies.map((it)=>`${it.name}=${it.value}`).join(";"),
         origin: "https://creator.douyin.com",
         referer: "https://creator.douyin.com/",
-        "user-agent": params.userAgent || ""
+        "user-agent": userAgent
     };
     const publishParams = {
         read_aid: "2906",
@@ -12805,13 +12820,16 @@ const mock_mockAction = async (task, params)=>{
         browser_language: "zh-CN",
         browser_platform: "Win32",
         browser_name: "Mozilla",
-        browser_version: params.userAgent || "",
+        browser_version: userAgent,
         browser_online: "true",
         timezone_name: "Asia/Shanghai",
         support_h265: "1",
         msToken: params.cookies.find((e)=>"msToken" === e.name)?.value || "",
         a_bogus: ""
     };
+    task.logger.warn("publishParams", {
+        publishParams
+    });
     const publishData = {
         item: {
             common: {
@@ -12841,7 +12859,10 @@ const mock_mockAction = async (task, params)=>{
             }
         }
     };
-    const aBogus = mock_sign_reply(publishParams, params.userAgent);
+    const aBogus = mock_sign_reply(publishParams, userAgent);
+    task.logger.warn("aBogusaBogusaBogus", {
+        aBogus
+    });
     publishParams.a_bogus = aBogus;
     const queryString = new URLSearchParams(publishParams).toString();
     const args = [
@@ -12857,6 +12878,9 @@ const mock_mockAction = async (task, params)=>{
         headers
     });
     const proxyHttp = new Http(...args);
+    task.logger.warn("queryString", {
+        queryString
+    });
     const uploader = new DouyinImageUploader(proxyHttp, headers, queryString, tmpCachePath);
     if (params.coverImage) {
         const coverUri = await uploader.uploadCover(params.coverImage);
@@ -12874,6 +12898,9 @@ const mock_mockAction = async (task, params)=>{
     }
     proxyHttp.addResponseInterceptor((response)=>{
         console.log("拦截器收到响应:", JSON.stringify(response.data));
+        task.logger.warn("拦截器收到响应", {
+            data: JSON.stringify(response.data)
+        });
         if (!response || !response.data) return;
         const responseData = response.data;
         if (response && responseData?.status_code && 0 !== responseData.status_code) return {
@@ -12887,7 +12914,7 @@ const mock_mockAction = async (task, params)=>{
     const publishQuery = {
         ...publishParams
     };
-    publishQuery.a_bogus = mock_sign_reply(publishQuery, params.userAgent);
+    publishQuery.a_bogus = mock_sign_reply(publishQuery, userAgent);
     const publishQueryParams = new URLSearchParams(publishQuery).toString();
     function generateRandomString(length) {
         const characters = "abcdefghijklmnopqrstuvwxyz0123456789";
@@ -12903,9 +12930,12 @@ const mock_mockAction = async (task, params)=>{
         cookies: params.cookies,
         url: "https://creator.douyin.com/web/api/media/aweme/create_v2/",
         method: "POST",
-        userAgent: headers["user-agent"]
+        userAgent
     });
     console.log("发布数据", JSON.stringify(publishData));
+    task.logger.warn("发布数据", {
+        data: JSON.stringify(publishData)
+    });
     const publishResult = await proxyHttp.api({
         method: "post",
         url: `https://creator.douyin.com/web/api/media/aweme/create_v2/?${publishQueryParams}`,
@@ -12921,15 +12951,16 @@ const mock_mockAction = async (task, params)=>{
             "Bd-ticket-guard-version": "2",
             "Bd-ticket-guard-web-sign-type": "1",
             "Bd-ticket-guard-web-version": "2",
-            "X-secsdk-csrf-token": csrfToken,
-            "X-tt-session-dtrait": params.cookies.find((e)=>"x-tt-session-dtrait" === e.name)?.value || ""
+            "X-secsdk-csrf-token": csrfToken
         }
     }, {
         retries: 2,
         retryDelay: 500,
         timeout: 12000
     });
-    console.log("publishResult", publishResult);
+    console.log("publishResult", JSON.stringify(publishResult));
+    task.logger.warn("发布数据");
+    task.logger.warn(JSON.stringify(publishData));
     const isSuccess = 0 === publishResult.status_code;
     const message = `图文发布${isSuccess ? "成功" : `失败，原因：${publishResult.status_msg}`}${task.debug ? ` ${http.proxyInfo}` : ""}`;
     const data = isSuccess ? publishResult.item_id || "" : "";