@iflyrpa/actions 2.0.0-beta.3 → 2.0.0-beta.4

package/dist/actions/douyinPublish/index.d.ts

@@ -1,6 +1,5 @@
 import type { CommonAction } from "@iflyrpa/share";
 import { z } from "zod";
-import { Collection } from "../douyinGetCollection/index";
 export declare const DouyinPublishParamsSchema: z.ZodObject<{
     id: z.ZodOptional<z.ZodString>;
     userAgent: z.ZodOptional<z.ZodString>;
@@ -27,69 +26,32 @@ export declare const DouyinPublishParamsSchema: z.ZodObject<{
     huiwenToken: z.ZodOptional<z.ZodString>;
     articleId: z.ZodOptional<z.ZodString>;
     saveType: z.ZodOptional<z.ZodString>;
-    banners: z.ZodArray<z.ZodString>;
     title: z.ZodString;
     content: z.ZodString;
-    coverImage: z.ZodOptional<z.ZodString>;
-    videoFile: z.ZodOptional<z.ZodString>;
-    musicId: z.ZodString;
-    musicDuration: z.ZodOptional<z.ZodNumber>;
     textExtra: z.ZodString;
-    challengeIds: z.ZodString;
-    hashtagSource: z.ZodString;
-    hotSentence: z.ZodString;
-    mix: z.ZodOptional<z.ZodCustom<Collection, Collection>>;
-    address: z.ZodOptional<z.ZodObject<{
-        id: z.ZodString;
-        name: z.ZodString;
-        latitude: z.ZodOptional<z.ZodNumber>;
-        longitude: z.ZodOptional<z.ZodNumber>;
-    }, z.core.$strip>>;
-    selfDeclaration: z.ZodOptional<z.ZodCustom<{
-        type: "fictional-rendition";
-    } | {
-        type: "ai-generated";
-    } | {
-        type: "source-statement";
-        childType: "self-labeling" | "self-shooting" | "transshipment";
-        shootingLocation?: {
-            id: string;
-            name: string;
-            latitude?: number | undefined;
-            longitude?: number | undefined;
-        } | undefined;
-        shootingDate?: string | undefined;
-        sourceMedia?: string | undefined;
-    }, {
-        type: "fictional-rendition";
-    } | {
-        type: "ai-generated";
-    } | {
-        type: "source-statement";
-        childType: "self-labeling" | "self-shooting" | "transshipment";
-        shootingLocation?: {
-            id: string;
-            name: string;
-            latitude?: number | undefined;
-            longitude?: number | undefined;
-        } | undefined;
-        shootingDate?: string | undefined;
-        sourceMedia?: string | undefined;
-    }>>;
     topic: z.ZodOptional<z.ZodArray<z.ZodObject<{
         id: z.ZodString;
         word: z.ZodString;
     }, z.core.$strip>>>;
+    coverImage: z.ZodOptional<z.ZodString>;
+    banners: z.ZodArray<z.ZodString>;
+    mix: z.ZodObject<{
+        mix_id: z.ZodString;
+        mix_order: z.ZodNumber;
+    }, z.core.$strip>;
+    musicId: z.ZodString;
+    musicDuration: z.ZodOptional<z.ZodNumber>;
+    challengeIds: z.ZodString;
+    hotSentence: z.ZodString;
     proxyLoc: z.ZodOptional<z.ZodString>;
     localIP: z.ZodOptional<z.ZodString>;
     visibleRange: z.ZodOptional<z.ZodEnum<{
+        0: "0";
         1: "1";
         2: "2";
-        3: "3";
     }>>;
     isImmediatelyPublish: z.ZodOptional<z.ZodBoolean>;
     scheduledPublish: z.ZodOptional<z.ZodString>;
-    isOriginal: z.ZodOptional<z.ZodBoolean>;
     allowSave: z.ZodOptional<z.ZodBoolean>;
     publishType: z.ZodOptional<z.ZodEnum<{
         1: "1";
@@ -97,12 +59,17 @@ export declare const DouyinPublishParamsSchema: z.ZodObject<{
         3: "3";
         4: "4";
     }>>;
-    publishAction: z.ZodOptional<z.ZodEnum<{
-        draft: "draft";
-        publish: "publish";
-    }>>;
-    isAiCoverImage: z.ZodOptional<z.ZodBoolean>;
-    summary: z.ZodOptional<z.ZodString>;
+    extraParam: z.ZodObject<{
+        "security-sdk/s_sdk_pri_key": z.ZodObject<{
+            data: z.ZodString;
+        }, z.core.$strip>;
+        "security-sdk/s_sdk_pub_key": z.ZodObject<{
+            data: z.ZodString;
+        }, z.core.$strip>;
+        "security-sdk/s_sdk_sign_data_key/web_protect": z.ZodObject<{
+            data: z.ZodString;
+        }, z.core.$strip>;
+    }, z.core.$strip>;
 }, z.core.$strip>;
 export type DouyinPublishParams = z.infer<typeof DouyinPublishParamsSchema>;
 export type PublishAction = CommonAction<DouyinPublishParams, string>;

package/dist/bundle.js

@@ -8238,7 +8238,7 @@ var __webpack_exports__ = {};
         origin: ()=>utils_origin
     });
     var package_namespaceObject = JSON.parse('{"i8":"0.0.18-beta.0"}');
-    var package_namespaceObject_0 = JSON.parse('{"i8":"2.0.0-beta.2"}');
+    var package_namespaceObject_0 = JSON.parse('{"i8":"2.0.0-beta.3"}');
     const external_node_fs_namespaceObject = require("node:fs");
     var external_node_fs_default = /*#__PURE__*/ __webpack_require__.n(external_node_fs_namespaceObject);
     const external_node_https_namespaceObject = require("node:https");
@@ -30588,6 +30588,16 @@ var __webpack_exports__ = {};
                                 error: e
                             });
                         }
+                        else if (url.includes("/aweme/v1/creator/pc/user/info/")) try {
+                            const jsonUserInfo = await resp.json();
+                            userInfo.uniqueId = jsonUserInfo.uid ?? "";
+                            task.debug && task.logger.info("用户uniqueId 获取成功", userInfo);
+                        } catch (e) {
+                            task.logger.warn("无法解析用户信息:", {
+                                url,
+                                error: e
+                            });
+                        }
                     } catch (err) {
                         task.logger.error("监听登录结果出现异常", err);
                         cleanup(err);
@@ -30648,21 +30658,21 @@ var __webpack_exports__ = {};
             };
         }
         let securityData = {};
-        try {
+        let retryCount = 0;
+        const maxRetries = 10;
+        while(retryCount < maxRetries){
             securityData = await page.evaluate(()=>({
                     "security-sdk/s_sdk_pri_key": localStorage.getItem("security-sdk/s_sdk_pri_key") || "",
                     "security-sdk/s_sdk_pub_key": localStorage.getItem("security-sdk/s_sdk_pub_key") || "",
-                    "security-sdk/s_sdk_sign_data_key": localStorage.getItem("security-sdk/s_sdk_sign_data_key/web_protect") || ""
+                    "security-sdk/s_sdk_sign_data_key/web_protect": localStorage.getItem("security-sdk/s_sdk_sign_data_key/web_protect") || ""
                 }));
-            task.debug && task.logger.info("Security SDK 数据提取成功:", {
-                "security-sdk/s_sdk_pri_key": !!securityData["security-sdk/s_sdk_pri_key"],
-                "security-sdk/s_sdk_pub_key": !!securityData["security-sdk/s_sdk_pub_key"],
-                "security-sdk/s_sdk_sign_data_key": !!securityData["security-sdk/s_sdk_sign_data_key"]
-            });
-        } catch (error) {
-            task.logger.warn("提取 Security SDK 数据失败:", {
-                error: error instanceof Error ? error.message : String(error)
-            });
+            if (securityData["security-sdk/s_sdk_pri_key"] && securityData["security-sdk/s_sdk_pub_key"] && securityData["security-sdk/s_sdk_sign_data_key/web_protect"]) {
+                task.logger.info("Security SDK 数据已获取");
+                break;
+            }
+            retryCount++;
+            task.logger.info(`等待 Security SDK 数据... (${retryCount}/${maxRetries})`);
+            await page.waitForTimeout(1000);
         }
         const cookie = JSON.stringify(await task._steelBrowserContext?.cookies());
         isSelfClosing = true;
@@ -30671,7 +30681,7 @@ var __webpack_exports__ = {};
             connectAddress,
             cookie,
             userInfo,
-            ...securityData
+            extraParam: securityData
         }, "登陆成功！");
     };
     const douyinLogin_rpa_server_scanRetryMaxCount = 60;
@@ -30800,6 +30810,16 @@ var __webpack_exports__ = {};
                                 error: e
                             });
                         }
+                        else if (url.includes("/aweme/v1/creator/pc/user/info/")) try {
+                            const jsonUserInfo = await resp.json();
+                            userInfo.uniqueId = jsonUserInfo.uid ?? "";
+                            task.debug && task.logger.info("用户uniqueId 获取成功", userInfo);
+                        } catch (e) {
+                            task.logger.warn("无法解析用户信息:", {
+                                url,
+                                error: e
+                            });
+                        }
                     } catch (err) {
                         cleanup();
                         reject(err);
@@ -30876,27 +30896,27 @@ var __webpack_exports__ = {};
             case types_ExecutionState.SUCCESS:
                 {
                     let securityData = {};
-                    try {
+                    let retryCount = 0;
+                    const maxRetries = 10;
+                    while(retryCount < maxRetries){
                         securityData = await page.evaluate(()=>({
                                 "security-sdk/s_sdk_pri_key": localStorage.getItem("security-sdk/s_sdk_pri_key") || "",
                                 "security-sdk/s_sdk_pub_key": localStorage.getItem("security-sdk/s_sdk_pub_key") || "",
-                                "security-sdk/s_sdk_sign_data_key": localStorage.getItem("security-sdk/s_sdk_sign_data_key/web_protect") || ""
+                                "security-sdk/s_sdk_sign_data_key/web_protect": localStorage.getItem("security-sdk/s_sdk_sign_data_key/web_protect") || ""
                             }));
-                        task.logger.info("Security SDK 数据提取成功:", {
-                            "security-sdk/s_sdk_pri_key": !!securityData["security-sdk/s_sdk_pri_key"],
-                            "security-sdk/s_sdk_pub_key": !!securityData["security-sdk/s_sdk_pub_key"],
-                            "security-sdk/s_sdk_sign_data_key": !!securityData["security-sdk/s_sdk_sign_data_key"]
-                        });
-                    } catch (error) {
-                        task.logger.warn("提取 Security SDK 数据失败:", {
-                            error: error instanceof Error ? error.message : String(error)
-                        });
+                        if (securityData["security-sdk/s_sdk_pri_key"] && securityData["security-sdk/s_sdk_pub_key"] && securityData["security-sdk/s_sdk_sign_data_key/web_protect"]) {
+                            task.logger.info("Security SDK 数据已获取");
+                            break;
+                        }
+                        retryCount++;
+                        task.logger.info(`等待 Security SDK 数据... (${retryCount}/${maxRetries})`);
+                        await page.waitForTimeout(1000);
                     }
                     await updateTaskState?.({
                         state: types_TaskState.SUCCESS,
                         result: {
                             cookie: JSON.stringify(await task.steelBrowserContext?.cookies()),
-                            ...securityData,
+                            extraParam: securityData,
                             userInfo: userInfo
                         }
                     });
@@ -30905,7 +30925,7 @@ var __webpack_exports__ = {};
                         message: "成功",
                         data: {
                             cookie: JSON.stringify(await task.steelBrowserContext?.cookies()),
-                            ...securityData,
+                            extraParam: securityData,
                             userInfo
                         }
                     };
@@ -30929,6 +30949,7 @@ var __webpack_exports__ = {};
     const { generateCsrfTokenAdvanced } = __webpack_require__("./src/utils/douyin/csrfToken.js");
     const { generateAuthorization, randomS, canonicalQueryString, calculateFileCrc32 } = __webpack_require__("./src/utils/douyin/douyinSign.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 utils_response(400, "extraParam 参数缺失或不完整", "");
         const tmpCachePath = task.getTmpPath();
         let bdTicketGuardClientDataV2 = params.cookies.find((e)=>"bd_ticket_guard_client_data" === e.name)?.value || "";
         if (!bdTicketGuardClientDataV2) return utils_response(400, "bdTicketGuardClientDataV2 不能为空", "");
@@ -30948,9 +30969,9 @@ var __webpack_exports__ = {};
             ree_public_key = parsed.ree_public_key || "";
             ts_sign = parsed.ts_sign || "";
         } catch  {}
-        const privateKey = params["security-sdk/s_sdk_pri_key"]?.data || "";
-        const publicKey = params["security-sdk/s_sdk_pub_key"]?.data || "";
-        const signData = JSON.parse(params["security-sdk/s_sdk_sign_data_key/web_protect"]?.data || "{}");
+        const privateKey = params.extraParam["security-sdk/s_sdk_pri_key"]?.data || "";
+        const publicKey = params.extraParam["security-sdk/s_sdk_pub_key"]?.data || "";
+        const signData = JSON.parse(params.extraParam["security-sdk/s_sdk_sign_data_key/web_protect"]?.data || "{}");
         console.log("privateKey:", privateKey);
         console.log("publicKey:", publicKey);
         console.log("signData:", signData);
@@ -30993,11 +31014,11 @@ var __webpack_exports__ = {};
         const publishData = {
             item: {
                 common: {
-                    text: `${params.title}。${params.content}`,
+                    text: params.content,
                     text_extra: params.textExtra,
                     activity: "[]",
                     challenges: params.challengeIds,
-                    hashtag_source: params.hashtagSource || "",
+                    hashtag_source: "",
                     mentions: "[]",
                     music_id: params.musicId,
                     music_end_time: 1000 * (params.musicDuration || 0),
@@ -31014,7 +31035,7 @@ var __webpack_exports__ = {};
                 mix: params.mix || {},
                 anchor: {},
                 declare: {
-                    user_declare_info: params.selfDeclaration || "{}"
+                    user_declare_info: "{}"
                 }
             }
         };
@@ -31276,8 +31297,8 @@ var __webpack_exports__ = {};
         const descInstance = page.locator("div[data-placeholder='添加作品描述...']");
         await descInstance.click();
         await descInstance.pressSequentially(params.content.replace(/#.*?\[.*?]#/g, "") || "22222");
-        if ("2" === params.visibleRange) await page.locator("label:has-text('好友可见')").first().click();
-        else if ("3" === params.visibleRange) await page.locator("label:has-text('仅自己可见')").first().click();
+        if ("1" === params.visibleRange) await page.locator("label:has-text('好友可见')").first().click();
+        else if ("2" === params.visibleRange) await page.locator("label:has-text('仅自己可见')").first().click();
         if (!params.isImmediatelyPublish) {
             await await page.locator('label:has-text("定时发布")').first().click();
             await page.waitForTimeout(500);
@@ -31312,67 +31333,33 @@ var __webpack_exports__ = {};
         await page.close();
         return success(response);
     };
-    const FictionalRendition = classic_schemas_object({
-        type: literal("fictional-rendition")
-    });
-    const AIGenerated = classic_schemas_object({
-        type: literal("ai-generated")
-    });
-    const SourceStatement = classic_schemas_object({
-        type: literal("source-statement"),
-        childType: classic_schemas_enum([
-            "self-labeling",
-            "self-shooting",
-            "transshipment"
-        ]),
-        shootingLocation: classic_schemas_object({
-            id: classic_schemas_string(),
-            name: classic_schemas_string(),
-            latitude: classic_schemas_number().optional(),
-            longitude: classic_schemas_number().optional()
-        }).optional(),
-        shootingDate: classic_schemas_string().optional(),
-        sourceMedia: classic_schemas_string().optional()
-    });
-    schemas_union([
-        FictionalRendition,
-        AIGenerated,
-        SourceStatement
-    ]);
     const DouyinPublishParamsSchema = ActionCommonParamsSchema.extend({
-        banners: classic_schemas_array(classic_schemas_string()),
         title: classic_schemas_string(),
         content: classic_schemas_string(),
-        coverImage: classic_schemas_string().optional(),
-        videoFile: classic_schemas_string().optional(),
-        musicId: classic_schemas_string(),
-        musicDuration: classic_schemas_number().optional(),
         textExtra: classic_schemas_string(),
-        challengeIds: classic_schemas_string(),
-        hashtagSource: classic_schemas_string(),
-        hotSentence: classic_schemas_string(),
-        mix: custom().optional(),
-        address: classic_schemas_object({
-            id: classic_schemas_string(),
-            name: classic_schemas_string(),
-            latitude: classic_schemas_number().optional(),
-            longitude: classic_schemas_number().optional()
-        }).optional(),
-        selfDeclaration: custom().optional(),
         topic: classic_schemas_array(classic_schemas_object({
             id: classic_schemas_string(),
             word: classic_schemas_string()
         })).optional(),
+        coverImage: classic_schemas_string().optional(),
+        banners: classic_schemas_array(classic_schemas_string()),
+        mix: classic_schemas_object({
+            mix_id: classic_schemas_string(),
+            mix_order: classic_schemas_number()
+        }),
+        musicId: classic_schemas_string(),
+        musicDuration: classic_schemas_number().optional(),
+        challengeIds: classic_schemas_string(),
+        hotSentence: classic_schemas_string(),
         proxyLoc: classic_schemas_string().optional(),
         localIP: classic_schemas_string().optional(),
         visibleRange: classic_schemas_enum([
+            "0",
             "1",
-            "2",
-            "3"
+            "2"
         ]).optional(),
         isImmediatelyPublish: classic_schemas_boolean().optional(),
         scheduledPublish: classic_schemas_string().optional(),
-        isOriginal: classic_schemas_boolean().optional(),
         allowSave: classic_schemas_boolean().optional(),
         publishType: classic_schemas_enum([
             "1",
@@ -31380,12 +31367,17 @@ var __webpack_exports__ = {};
             "3",
             "4"
         ]).optional(),
-        publishAction: classic_schemas_enum([
-            "publish",
-            "draft"
-        ]).optional(),
-        isAiCoverImage: classic_schemas_boolean().optional(),
-        summary: classic_schemas_string().optional()
+        extraParam: classic_schemas_object({
+            "security-sdk/s_sdk_pri_key": classic_schemas_object({
+                data: classic_schemas_string()
+            }),
+            "security-sdk/s_sdk_pub_key": classic_schemas_object({
+                data: classic_schemas_string()
+            }),
+            "security-sdk/s_sdk_sign_data_key/web_protect": classic_schemas_object({
+                data: classic_schemas_string()
+            })
+        })
     });
     const douyinPublish = async (task, params)=>{
         if ("rpa" === params.actionType) return douyinPublish_rpa_rpaAction(task, params);
@@ -37846,13 +37838,13 @@ var __webpack_exports__ = {};
         });
         return success(data, message);
     };
-    const xiaohongshuPublish_FictionalRendition = classic_schemas_object({
+    const FictionalRendition = classic_schemas_object({
         type: literal("fictional-rendition")
     });
-    const xiaohongshuPublish_AIGenerated = classic_schemas_object({
+    const AIGenerated = classic_schemas_object({
         type: literal("ai-generated")
     });
-    const xiaohongshuPublish_SourceStatement = classic_schemas_object({
+    const SourceStatement = classic_schemas_object({
         type: literal("source-statement"),
         childType: classic_schemas_enum([
             "self-labeling",
@@ -37864,9 +37856,9 @@ var __webpack_exports__ = {};
         sourceMedia: classic_schemas_string().optional()
     });
     schemas_union([
-        xiaohongshuPublish_FictionalRendition,
-        xiaohongshuPublish_AIGenerated,
-        xiaohongshuPublish_SourceStatement
+        FictionalRendition,
+        AIGenerated,
+        SourceStatement
     ]);
     const XiaohongshuPublishParamsSchema = ActionCommonParamsSchema.extend({
         banners: classic_schemas_array(classic_schemas_string()),