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

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.3"}');
+    var package_namespaceObject_0 = JSON.parse('{"i8":"2.0.0-beta.5"}');
     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");
@@ -30137,7 +30137,7 @@ var __webpack_exports__ = {};
         const musicParams = {
             keyword: keyword || "11",
             search_source: "normal_search",
-            cout: "20",
+            count: params.count?.toString() || "20",
             aid: "1128",
             cursor: "0",
             cookie_enabled: "true",
@@ -31023,11 +31023,12 @@ var __webpack_exports__ = {};
                     music_id: params.musicId,
                     music_end_time: 1000 * (params.musicDuration || 0),
                     hot_sentence: params.hotSentence || "",
-                    visibility_type: params.visibleRange || 0,
+                    visibility_type: Number(params.visibleRange) || 0,
                     download: params.allowSave ? 1 : 0,
                     timing: params.isImmediatelyPublish ? -1 : params.scheduledPublish,
-                    media_type: params.publishType || 2,
-                    images: []
+                    media_type: Number(params.publishType) || 2,
+                    images: [],
+                    creation_id: ""
                 },
                 cover: {
                     poster: ""
@@ -36163,14 +36164,25 @@ var __webpack_exports__ = {};
                                 }
                             });
                             if (createrLogin.ok()) {
-                                userInfo = await page.evaluate(()=>{
-                                    const raw = window.__INITIAL_STATE__?.user?.userInfo?._rawValue;
-                                    return {
-                                        name: raw?.nickname ?? raw?.nickname ?? "",
-                                        avatar: raw?.images ?? raw?.images ?? "",
-                                        uniqueId: raw?.userId ?? raw?.userId ?? ""
-                                    };
-                                });
+                                let num = 30;
+                                async function getUserInfo() {
+                                    userInfo = await page.evaluate(()=>{
+                                        const raw = window.__INITIAL_STATE__?.user?.userInfo?._rawValue;
+                                        return {
+                                            name: raw?.nickname ?? raw?.nickname ?? "",
+                                            avatar: raw?.images ?? raw?.images ?? "",
+                                            uniqueId: raw?.userId ?? raw?.userId ?? ""
+                                        };
+                                    });
+                                    await reporter(0, `第${30 - num + 1}次抓取用户信息!`, {
+                                        userInfo
+                                    });
+                                    if (userInfo.uniqueId || num <= 0) return;
+                                    num--;
+                                    await new Promise((resolve)=>setTimeout(resolve, 1000));
+                                    await getUserInfo();
+                                }
+                                await getUserInfo();
                                 await reporter(0, "扫码成功!", {
                                     stage: "scanQrcode",
                                     connectAddress
@@ -36245,6 +36257,7 @@ var __webpack_exports__ = {};
     const xiaohongshuLogin_rpa_server_waitQrcodeResultMaxTime = 2000 * xiaohongshuLogin_rpa_server_scanRetryMaxCount;
     const xiaohongshuLogin_rpa_server_rpaServer = async (task, params)=>{
         const updateTaskState = task.taskStageStore?.update?.bind(task.taskStageStore, task.taskId || "");
+        const reporter = task.reportService?.reportLoginStatus ?? (()=>Promise.resolve());
         let executionState;
         let proxyUrl;
         if (params.localIP) {
@@ -36263,22 +36276,14 @@ var __webpack_exports__ = {};
         const page = await task.createPage({
             url: "https://www.xiaohongshu.com/login",
             proxyUrl,
-            userAgent: params.userAgent,
-            ...params.viewport ? {
-                viewport: params.viewport
-            } : {}
+            userAgent: params.userAgent
         });
-        task.steelBrowser?.on("disconnected", async ()=>{
-            const browserContext = task.steelBrowserContext;
-            const browser = task.steelBrowser;
+        task.steelBrowser?.on("disconnected", ()=>{
             executionState = types_ExecutionState.BROWSER_CLOSED;
-            await page.close();
-            if (browserContext) await browserContext.close();
-            if (browser) await browser.close();
         });
         await updateTaskState?.({
             state: types_TaskState.WAIT_SCAN,
-            connectAddress: await task.steelConnector?.getLive(task.sessionId || ""),
+            connectAddress: task.steelConnector?.getProxyUrl(task.sessionId || "", "v1/sessions/debug"),
             sessionId: task.sessionId
         });
         let userInfo = {
@@ -36286,125 +36291,136 @@ var __webpack_exports__ = {};
             avatar: "",
             name: ""
         };
-        try {
-            await new Promise((resolve, reject)=>{
-                let finished = false;
-                const timer = setTimeout(async ()=>{
-                    if (finished) return;
-                    cleanup();
-                    executionState = types_ExecutionState.TIMEOUT;
-                    await updateTaskState?.({
-                        state: types_TaskState.TIMEOUT,
-                        error: "等待扫码登录超时"
-                    });
-                    resolve();
-                }, xiaohongshuLogin_rpa_server_waitQrcodeResultMaxTime);
-                const cleanup = ()=>{
-                    if (finished) return;
-                    finished = true;
-                    clearTimeout(timer);
-                    page.off("response", handleWebCommon);
-                    page.off("response", handleCheckQR);
-                    task.steelBrowser?.off("disconnected", handleBrowserClosed);
-                };
-                const handleBrowserClosed = ()=>{
-                    cleanup();
-                    executionState = types_ExecutionState.BROWSER_CLOSED;
-                    resolve();
-                };
-                const handleWebCommon = async (resp)=>{
-                    try {
-                        const url = resp.url();
-                        if (url.includes("/explore") && "GET" === resp.request().method() && 200 === resp.status()) {
-                            cleanup();
-                            await updateTaskState?.({
-                                state: types_TaskState.CONFIRMED
-                            });
-                            await page.waitForFunction(()=>"function" == typeof window.mnsv2, {
-                                timeout: 10000
-                            });
-                            const ticket_mnsv2 = await page.evaluate(({ c, d })=>{
-                                if ("function" == typeof window.mnsv2) return window.mnsv2(c, d);
-                                return "mnsv2 未定义";
-                            }, {
-                                c: '/api/cas/customer/web/service-ticket{"service":"https://creator.xiaohongshu.com","source":"official","type":"tgt"}',
-                                d: "71bcd9dc89f6c256ead6cbe2b0a9793c"
-                            });
-                            const XS = rpa_server_encode_mnsv2(ticket_mnsv2, "Windows", "object");
-                            const createrLogin = await page.request.post("https://customer.xiaohongshu.com/api/cas/customer/web/service-ticket", {
-                                headers: {
-                                    "x-s": XS,
-                                    "x-t": Date.now().toString(),
-                                    referer: "https://creator.xiaohongshu.com/",
-                                    origin: "https://creator.xiaohongshu.com",
-                                    cookie: (await task.steelBrowserContext?.cookies())?.map((c)=>`${c.name}=${c.value}`).join(";") || ""
-                                },
-                                data: {
-                                    service: "https://creator.xiaohongshu.com",
-                                    source: "official",
-                                    type: "tgt"
-                                }
-                            });
-                            if (createrLogin.ok()) userInfo = await page.evaluate(()=>{
-                                const raw = window.__INITIAL_STATE__?.user?.userInfo?._rawValue;
-                                return {
-                                    name: raw?.nickname ?? raw?.nickname ?? "",
-                                    avatar: raw?.images ?? raw?.images ?? "",
-                                    uniqueId: raw?.userId ?? raw?.userId ?? ""
-                                };
-                            });
-                            executionState = types_ExecutionState.SUCCESS;
-                            resolve();
-                        }
-                    } catch (err) {
+        await new Promise((resolve, reject)=>{
+            let finished = false;
+            const timer = setTimeout(async ()=>{
+                if (finished) return;
+                cleanup();
+                executionState = types_ExecutionState.TIMEOUT;
+                await updateTaskState?.({
+                    state: types_TaskState.TIMEOUT,
+                    error: "等待扫码登录超时"
+                });
+                resolve();
+            }, xiaohongshuLogin_rpa_server_waitQrcodeResultMaxTime);
+            const cleanup = ()=>{
+                if (finished) return;
+                finished = true;
+                clearTimeout(timer);
+                page.off("response", handleWebCommon);
+                page.off("response", handleCheckQR);
+                task.steelBrowser?.off("disconnected", handleBrowserClosed);
+            };
+            const handleBrowserClosed = ()=>{
+                cleanup();
+                executionState = types_ExecutionState.BROWSER_CLOSED;
+                resolve();
+            };
+            const handleWebCommon = async (resp)=>{
+                try {
+                    const url = resp.url();
+                    if (url.includes("/explore") && "GET" === resp.request().method() && 200 === resp.status()) {
                         cleanup();
-                        reject(err);
-                    }
-                };
-                const handleCheckQR = async (response)=>{
-                    try {
-                        const url = response.url();
-                        if (!url.includes("/login/qrcode/status") || "GET" !== response.request().method()) return;
-                        let jsonResponse;
-                        try {
-                            const text = await response.text();
-                            if (!text) {
-                                task.logger.warn("Empty response body:", {
-                                    url
+                        await updateTaskState?.({
+                            state: types_TaskState.CONFIRMED
+                        });
+                        await page.waitForFunction(()=>"function" == typeof window.mnsv2, {
+                            timeout: 10000
+                        });
+                        const ticket_mnsv2 = await page.evaluate(({ c, d })=>{
+                            if ("function" == typeof window.mnsv2) return window.mnsv2(c, d);
+                            return "mnsv2 未定义";
+                        }, {
+                            c: '/api/cas/customer/web/service-ticket{"service":"https://creator.xiaohongshu.com","source":"official","type":"tgt"}',
+                            d: "71bcd9dc89f6c256ead6cbe2b0a9793c"
+                        });
+                        const XS = rpa_server_encode_mnsv2(ticket_mnsv2, "Windows", "object");
+                        const createrLogin = await page.request.post("https://customer.xiaohongshu.com/api/cas/customer/web/service-ticket", {
+                            headers: {
+                                "x-s": XS,
+                                "x-t": Date.now().toString(),
+                                referer: "https://creator.xiaohongshu.com/",
+                                origin: "https://creator.xiaohongshu.com",
+                                cookie: (await task._steelBrowserContext?.cookies())?.map((c)=>`${c.name}=${c.value}`).join(";") || ""
+                            },
+                            data: {
+                                service: "https://creator.xiaohongshu.com",
+                                source: "official",
+                                type: "tgt"
+                            }
+                        });
+                        task.logger.info(`createrLogin------- ${createrLogin.ok()}`);
+                        if (createrLogin.ok()) {
+                            let num = 30;
+                            async function getUserInfo() {
+                                userInfo = await page.evaluate(()=>{
+                                    const raw = window.__INITIAL_STATE__?.user?.userInfo?._rawValue;
+                                    return {
+                                        name: raw?.nickname ?? raw?.nickname ?? "",
+                                        avatar: raw?.images ?? raw?.images ?? "",
+                                        uniqueId: raw?.userId ?? raw?.userId ?? ""
+                                    };
                                 });
-                                return;
+                                await reporter(0, `第${30 - num + 1}次抓取用户信息!`, {
+                                    userInfo
+                                });
+                                if (userInfo.uniqueId || num <= 0) return;
+                                num--;
+                                await new Promise((resolve)=>setTimeout(resolve, 1000));
+                                await getUserInfo();
                             }
-                            jsonResponse = JSON.parse(text);
-                        } catch (e) {
-                            task.logger.warn("Failed to parse json:", {
-                                url,
-                                erroe: e
-                            });
-                            return;
+                            await getUserInfo();
+                            task.logger.info(`userInfo------- ${JSON.stringify(userInfo)}`);
                         }
-                        const codeStatus = jsonResponse.data?.code_status;
-                        if (0 === jsonResponse.code && (1 === codeStatus || 2 === codeStatus)) {
-                            if (2 === codeStatus) userInfo.uniqueId = jsonResponse.data.login_info.user_id;
-                            await updateTaskState?.({
-                                state: types_TaskState.SCANNED,
-                                result: {
-                                    userInfo
-                                }
+                        executionState = types_ExecutionState.SUCCESS;
+                        resolve();
+                    }
+                } catch (err) {
+                    cleanup();
+                    reject(err);
+                }
+            };
+            const handleCheckQR = async (response)=>{
+                try {
+                    const url = response.url();
+                    if (!url.includes("/login/qrcode/status") || "GET" !== response.request().method()) return;
+                    let jsonResponse;
+                    try {
+                        const text = await response.text();
+                        if (!text) {
+                            task.logger.warn("Empty response body:", {
+                                url
                             });
-                            page.off("response", handleCheckQR);
-                            page.on("response", handleWebCommon);
+                            return;
                         }
-                    } catch (err) {
-                        cleanup();
-                        reject(err);
+                        jsonResponse = JSON.parse(text);
+                    } catch (e) {
+                        task.logger.warn("Failed to parse json:", {
+                            url,
+                            erroe: e
+                        });
+                        return;
                     }
-                };
-                task.steelBrowser?.on("disconnected", handleBrowserClosed);
-                page.on("response", handleCheckQR);
-            });
-        } finally{
-            await page.close();
-        }
+                    const codeStatus = jsonResponse.data?.code_status;
+                    if (0 === jsonResponse.code && (1 === codeStatus || 2 === codeStatus)) {
+                        if (2 === codeStatus) userInfo.uniqueId = jsonResponse.data.login_info.user_id;
+                        await updateTaskState?.({
+                            state: types_TaskState.SCANNED,
+                            result: {
+                                userInfo
+                            }
+                        });
+                        page.off("response", handleCheckQR);
+                        page.on("response", handleWebCommon);
+                    }
+                } catch (err) {
+                    cleanup();
+                    reject(err);
+                }
+            };
+            task.steelBrowser?.on("disconnected", handleBrowserClosed);
+            page.on("response", handleCheckQR);
+        });
         if (void 0 === executionState) return {
             code: 500,
             message: "未知错误",
@@ -36581,25 +36597,54 @@ var __webpack_exports__ = {};
             source: "web"
         };
         const fetchCoverXsHeader = mock_xsEncrypt.signHeadersGet(fetchCoverUrl, recordCookie, "ugc", fetchCoverParams);
-        const coverIdInfo = await proxyHttp.api({
-            method: "get",
-            baseURL: "https://creator.xiaohongshu.com",
-            url: fetchCoverUrl,
-            defaultErrorMsg: "获取小红书用户信息失败，请稍后重试发布。",
-            headers: fetchCoverXsHeader,
-            params: fetchCoverParams
-        }, {
-            retries: 3,
-            retryDelay: 20,
-            timeout: 3000
-        });
         const uploadInfos = [];
-        for (const item of coverIdInfo.data.uploadTempPermits)for (const fileId of item.fileIds)uploadInfos.push({
-            bucket: item.bucket || "",
-            uploadAddr: item.uploadAddr || "",
-            fileIds: fileId,
-            token: item.token || ""
-        });
+        if (params.banners.length > 18) {
+            let num = Math.ceil(params.banners.length / 14);
+            for(let i = 0; i < num; i++){
+                const start = 14 * i;
+                params.banners.length;
+                ({
+                    ...fetchCoverParams
+                });
+                const batchCoverIdInfo = await proxyHttp.api({
+                    method: "get",
+                    baseURL: "https://creator.xiaohongshu.com",
+                    url: fetchCoverUrl,
+                    defaultErrorMsg: "获取小红书用户信息失败，请稍后重试发布。",
+                    headers: fetchCoverXsHeader,
+                    params: fetchCoverParams
+                }, {
+                    retries: 3,
+                    retryDelay: 20,
+                    timeout: 3000
+                });
+                for (const item of batchCoverIdInfo.data.uploadTempPermits)for (const fileId of item.fileIds)uploadInfos.push({
+                    bucket: item.bucket || "",
+                    uploadAddr: item.uploadAddr || "",
+                    fileIds: fileId,
+                    token: item.token || ""
+                });
+            }
+        } else {
+            const coverIdInfo = await proxyHttp.api({
+                method: "get",
+                baseURL: "https://creator.xiaohongshu.com",
+                url: fetchCoverUrl,
+                defaultErrorMsg: "获取小红书用户信息失败，请稍后重试发布。",
+                headers: fetchCoverXsHeader,
+                params: fetchCoverParams
+            }, {
+                retries: 3,
+                retryDelay: 20,
+                timeout: 3000
+            });
+            for (const item of coverIdInfo.data.uploadTempPermits)for (const fileId of item.fileIds)uploadInfos.push({
+                bucket: item.bucket || "",
+                uploadAddr: item.uploadAddr || "",
+                fileIds: fileId,
+                token: item.token || ""
+            });
+        }
         if (uploadInfos.length < params.banners.length) return {
             code: 414,
             message: "可用 OSS bucket 数量不足，无法上传所有图片！",
@@ -37547,25 +37592,54 @@ var __webpack_exports__ = {};
             source: "web"
         };
         const fetchCoverXsHeader = rpa_server_mock_xsEncrypt.signHeadersGet(fetchCoverUrl, recordCookie, "ugc", fetchCoverParams);
-        const coverIdInfo = await proxyHttp.api({
-            method: "get",
-            baseURL: "https://creator.xiaohongshu.com",
-            url: fetchCoverUrl,
-            defaultErrorMsg: "获取小红书用户信息失败，请稍后重试发布。",
-            headers: fetchCoverXsHeader,
-            params: fetchCoverParams
-        }, {
-            retries: 3,
-            retryDelay: 20,
-            timeout: 3000
-        });
         const uploadInfos = [];
-        for (const item of coverIdInfo.data.uploadTempPermits)for (const fileId of item.fileIds)uploadInfos.push({
-            bucket: item.bucket || "",
-            uploadAddr: item.uploadAddr || "",
-            fileIds: fileId,
-            token: item.token || ""
-        });
+        if (params.banners.length > 18) {
+            let num = Math.ceil(params.banners.length / 14);
+            for(let i = 0; i < num; i++){
+                const start = 14 * i;
+                params.banners.length;
+                ({
+                    ...fetchCoverParams
+                });
+                const batchCoverIdInfo = await proxyHttp.api({
+                    method: "get",
+                    baseURL: "https://creator.xiaohongshu.com",
+                    url: fetchCoverUrl,
+                    defaultErrorMsg: "获取小红书用户信息失败，请稍后重试发布。",
+                    headers: fetchCoverXsHeader,
+                    params: fetchCoverParams
+                }, {
+                    retries: 3,
+                    retryDelay: 20,
+                    timeout: 3000
+                });
+                for (const item of batchCoverIdInfo.data.uploadTempPermits)for (const fileId of item.fileIds)uploadInfos.push({
+                    bucket: item.bucket || "",
+                    uploadAddr: item.uploadAddr || "",
+                    fileIds: fileId,
+                    token: item.token || ""
+                });
+            }
+        } else {
+            const coverIdInfo = await proxyHttp.api({
+                method: "get",
+                baseURL: "https://creator.xiaohongshu.com",
+                url: fetchCoverUrl,
+                defaultErrorMsg: "获取小红书用户信息失败，请稍后重试发布。",
+                headers: fetchCoverXsHeader,
+                params: fetchCoverParams
+            }, {
+                retries: 3,
+                retryDelay: 20,
+                timeout: 3000
+            });
+            for (const item of coverIdInfo.data.uploadTempPermits)for (const fileId of item.fileIds)uploadInfos.push({
+                bucket: item.bucket || "",
+                uploadAddr: item.uploadAddr || "",
+                fileIds: fileId,
+                token: item.token || ""
+            });
+        }
         if (uploadInfos.length < params.banners.length) return {
             code: 414,
             message: "可用 OSS bucket 数量不足，无法上传所有图片！",