feat(script): 新增推送下载任务至服务器功能

source/application/app.py

@@ -368,13 +368,10 @@ class XHS:
                 ids.append(j.group(1))
         return ids
 
-    async def __deal_extract(
+    async def _get_html_data(
         self,
         url: str,
-        download: bool,
-        index: list | tuple | None,
         log,
-        bar,
         data: bool,
         cookie: str = None,
         proxy: str = None,
@@ -402,12 +399,34 @@ class XHS:
             logging(log, _("{0} 获取数据失败").format(i), ERROR)
             count.fail += 1
             return {}
+        return i, namespace
+
+    def _extract_data(
+        self,
+        namespace: Namespace,
+        id_: str,
+        log,
+        count,
+    ):
         data = self.explore.run(namespace)
         # logging(log, data)  # 调试代码
         if not data:
-            logging(log, _("{0} 提取数据失败").format(i), ERROR)
+            logging(log, _("{0} 提取数据失败").format(id_), ERROR)
             count.fail += 1
             return {}
+        return data
+
+    async def _deal_download_tasks(
+        self,
+        data: dict,
+        namespace: Namespace,
+        id_: str,
+        download: bool,
+        index: list | tuple | None,
+        log,
+        bar,
+        count: SimpleNamespace,
+    ):
         if data["作品类型"] == _("视频"):
             self.__extract_video(data, namespace)
         elif data["作品类型"] in {
@@ -416,7 +435,7 @@ class XHS:
         }:
             self.__extract_image(data, namespace)
         else:
-            logging(log, _("未知的作品类型：{0}").format(i), WARNING)
+            logging(log, _("未知的作品类型：{0}").format(id_), WARNING)
             data["下载地址"] = []
             data["动图地址"] = []
         await self.update_author_nickname(data, log)
@@ -428,10 +447,97 @@ class XHS:
             bar,
             count,
         )
-        logging(log, _("作品处理完成：{0}").format(i))
         # await sleep_time()
         return data
 
+    async def __deal_extract(
+        self,
+        url: str,
+        download: bool,
+        index: list | tuple | None,
+        log,
+        bar,
+        data: bool,
+        cookie: str = None,
+        proxy: str = None,
+        count=SimpleNamespace(
+            all=0,
+            success=0,
+            fail=0,
+            skip=0,
+        ),
+    ):
+        id_, namespace = await self._get_html_data(
+            url,
+            log,
+            data,
+            cookie,
+            proxy,
+            count,
+        )
+        if not namespace:
+            return namespace
+        if not (
+            data := self._extract_data(
+                namespace,
+                id_,
+                log,
+                count,
+            )
+        ):
+            return data
+        data = await self._deal_download_tasks(
+            data,
+            namespace,
+            id_,
+            download,
+            index,
+            log,
+            bar,
+            count,
+        )
+        logging(log, _("作品处理完成：{0}").format(id_))
+        return data
+
+    async def deal_script_tasks(
+        self,
+        data: dict,
+        index: list | tuple | None,
+        log=None,
+        bar=None,
+        count=SimpleNamespace(
+            all=0,
+            success=0,
+            fail=0,
+            skip=0,
+        ),
+    ):
+        namespace = self.json_to_namespace(data)
+        id_ = namespace.safe_extract("noteId", "")
+        if not (
+            data := self._extract_data(
+                namespace,
+                id_,
+                log,
+                count,
+            )
+        ):
+            return data
+        return await self._deal_download_tasks(
+            data,
+            namespace,
+            id_,
+            True,
+            index,
+            log,
+            bar,
+            count,
+        )
+
+    @staticmethod
+    def json_to_namespace(data: dict) -> Namespace:
+        return Namespace(data)
+
     async def update_author_nickname(
         self,
         container: dict,

source/module/script.py

@@ -1,5 +1,5 @@
 from contextlib import suppress
-
+from json import loads
 from websockets import ConnectionClosed, serve
 from typing import TYPE_CHECKING
 
@@ -22,8 +22,8 @@ class ScriptServer:
     async def handler(self, websocket):
         with suppress(ConnectionClosed):
             async for message in websocket:
-                print(f"收到消息: {message}")
+                data = loads(message)
-                await websocket.send("消息已接收")
+                await self.core.deal_script_tasks(**data)
 
     async def start(self):
         """启动服务器"""

static/Release_Notes.md

@@ -1,14 +1,16 @@
 **项目更新内容：**
 
 1. 修复 MCP 模式无法下载文件的问题
-2. 新增作品处理统计功能
+2. 新增连接用户脚本下载作品功能
-3. 调整内置延时机制
+3. 新增作品处理统计功能
+4. 调整内置延时机制
 
 *****
 
 **用户脚本更新内容：**
 
-**版本号：2.1.15**
+**版本号：2.2.0**
 
 1. 新增链接提取/图片下载选择模式开关
 2. 修复合辑作品链接提取失败的问题
+3. 新增推送下载任务至服务器功能

static/XHS-Downloader.js

@@ -2,7 +2,7 @@
 // @name           XHS-Downloader
 // @namespace      xhs_downloader
 // @homepage       https://github.com/JoeanAmier/XHS-Downloader
-// @version        2.1.15
+// @version        2.2.0
 // @tag            小红书
 // @tag            RedNote
 // @description    提取小红书作品/用户链接，下载小红书无水印图文/视频作品文件
@@ -40,6 +40,8 @@
         keepMenuVisible: GM_getValue("keepMenuVisible", false),
         linkCheckboxSwitch: GM_getValue("linkCheckboxSwitch", true),
         imageCheckboxSwitch: GM_getValue("imageCheckboxSwitch", true),
+        scriptServerURL: GM_getValue("scriptServerURL", "ws://127.0.0.1:5558"),
+        scriptServerSwitch: GM_getValue("scriptServerSwitch", false),
         fileNameFormat: undefined,
         imageFileFormat: undefined,
         icon: {
@@ -101,13 +103,15 @@
 `
 
         await showTextModal({
-            title: 'XHS-Downloader 脚本说明', text: instructions, mode: 'info',           // info: 仅关闭
+                                title: 'XHS-Downloader 脚本说明', text: instructions, mode: 'info', closeText: '关闭'
-            closeText: '关闭'
                             });
         if (!config.disclaimer) {
             showTextModal({
-                title: 'XHS-Downloader 免责声明', text: disclaimer_content, mode: 'confirm',        // confirm: 确认+关闭
+                              title: 'XHS-Downloader 免责声明',
-                confirmText: '我已知晓', closeText: '关闭'
+                              text: disclaimer_content,
+                              mode: 'confirm',
+                              confirmText: '我已知晓',
+                              closeText: '关闭'
                           }).then(answer => {
                 GM_setValue("disclaimer", answer);
                 config.disclaimer = answer;
@@ -160,6 +164,21 @@
         GM_setValue("imageCheckboxSwitch", config.imageCheckboxSwitch);
     }
 
+    const updateScriptServerURL = (value) => {
+        config.scriptServerURL = value;
+        GM_setValue("scriptServerURL", config.scriptServerURL);
+    }
+
+    const updateScriptServerSwitch = (value) => {
+        webSocket.disconnect();
+        if (value) {
+            webSocket.url = config.scriptServerURL;
+            webSocket.connect();
+        }
+        config.scriptServerSwitch = value;
+        GM_setValue("scriptServerSwitch", config.scriptServerSwitch);
+    }
+
     const updateFileNameFormat = (value) => {
         config.fileNameFormat = value;
         GM_setValue("fileNameFormat", config.fileNameFormat);
@@ -173,15 +192,14 @@
         showTextModal({
                           title: '发生异常',
                           text: `${text}请向作者反馈！\n项目开源地址：https://github.com/JoeanAmier/XHS-Downloader`,
-            mode: 'info',           // info: 仅关闭
+                          mode: 'info',
                           closeText: '关闭'
                       });
     };
 
     const runTips = (text) => {
         showTextModal({
-            title: '脚本提示', text: text, mode: 'info',           // info: 仅关闭
+                          title: '脚本提示', text: text, mode: 'info', closeText: '关闭'
-            closeText: '关闭'
                       });
     }
 
@@ -237,9 +255,22 @@
         }
     };
 
-    const download = async (urls, note) => {
+    const download = async (urls, note, server = false,) => {
         const name = extractName();
-        console.info(`文件名称 ${name}`);
+        if (server) {
+            let data = {data: note, index: null,};
+            if (note.type === "normal") {
+                let items = extractImageWebpUrls(note, urls);
+                if (items.length === 0) {
+                    console.error("解析图文作品数据失败", note)
+                    abnormal("解析图文作品数据发生异常！")
+                } else if (urls.length > 1 && config.imageCheckboxSwitch) {
+                    data.index = await showImageSelectionModal(items, name, server,);
+                }
+            }
+            webSocket.send(JSON.stringify(data));
+        } else {
+            console.debug(`文件名称 ${name}`);
             if (note.type === "video") {
                 showToast("正在下载文件，请稍等...");
                 await downloadVideo(urls[0], name);
@@ -249,15 +280,16 @@
                     console.error("解析图文作品数据失败", note)
                     abnormal("解析图文作品数据发生异常！")
                 } else if (urls.length > 1 && config.imageCheckboxSwitch) {
-                showImageSelectionModal(items, name,)
+                    await showImageSelectionModal(items, name,);
                 } else {
                     showToast("正在下载文件，请稍等...");
                     await downloadImage(items, name);
                 }
             }
+        }
     };
 
-    const exploreDeal = async note => {
+    const exploreDeal = async (note, server = false,) => {
         try {
             let links;
             if (note.type === "normal") {
@@ -266,8 +298,8 @@
                 links = generateVideoUrl(note);
             }
             if (links.length > 0) {
-                console.info("下载链接", links);
+                // console.debug("下载链接", links);
-                await download(links, note);
+                await download(links, note, server,);
             } else {
                 abnormal("处理下载链接发生异常！")
             }
@@ -287,11 +319,11 @@
         }
     };
 
-    const extractDownloadLinks = async () => {
+    const extractDownloadLinks = async (server = false) => {
         if (currentUrl.includes("https://www.xiaohongshu.com/explore/")) {
             let note = extractNoteInfo();
             if (note.note) {
-                await exploreDeal(note.note);
+                await exploreDeal(note.note, server,);
             } else {
                 abnormal("读取作品数据发生异常！");
             }
@@ -315,7 +347,7 @@
         document.body.removeChild(tempLink); // 从 DOM 中移除临时链接
         URL.revokeObjectURL(blobUrl); // 释放 URL
 
-        console.info(`文件已成功下载: ${name}`);
+        // console.debug(`文件已成功下载: ${name}`);
     }
 
     const downloadFile = async (link, name, trigger = true, retries = 5) => {
@@ -403,7 +435,8 @@
     };
 
     const extractName = () => {
-        let name = document.title.replace(/ - 小红书$/, "").replace(/[^\u4e00-\u9fa5a-zA-Z0-9 ~!@#$%&()_\-+=\[\];"',.！（）【】：“”，。《》？]/g, "");
+        let name = document.title.replace(/ - 小红书$/, "")
+                           .replace(/[^\u4e00-\u9fa5a-zA-Z0-9 ~!@#$%&()_\-+=\[\];"',.！（）【】：“”，。《》？]/g, "");
         name = truncateString(name, 64,);
         let match = currentUrl.match(/\/([0-9a-z]+?)\?/);
         let id = match ? match[1] : null;
@@ -503,7 +536,9 @@
 
     const extractNotesInfo = order => {
         const notesRawValue = unsafeWindow.__INITIAL_STATE__.user.notes._rawValue[order];
-        return notesRawValue.filter(item => item?.noteCard).map(item => [item.id, item.xsecToken, item.noteCard.cover.urlDefault, item.noteCard.user.nickName, item.noteCard.displayTitle,]);
+        return notesRawValue.filter(item => item?.noteCard).map(
+            item => [item.id, item.xsecToken, item.noteCard.cover.urlDefault, item.noteCard.user.nickName,
+                     item.noteCard.displayTitle,]);
     };
 
     const extractBoardInfo = () => {
@@ -519,7 +554,8 @@
             const id = match[1]; // match[0] 是整个匹配的字符串，match[1] 是第一个括号内的匹配
 
             const notesRawValue = unsafeWindow.__INITIAL_STATE__.board.boardFeedsMap._rawValue[id].notes;
-            return notesRawValue.map(item => [item.noteId, item.xsecToken, item.cover.urlDefault, item.user.nickName, item.displayTitle,]);
+            return notesRawValue.map(
+                item => [item.noteId, item.xsecToken, item.cover.urlDefault, item.user.nickName, item.displayTitle,]);
         } else {
             console.error("从链接提取专辑 ID 失败", currentUrl,);
             return [];
@@ -528,12 +564,16 @@
 
     const extractFeedInfo = () => {
         const notesRawValue = unsafeWindow.__INITIAL_STATE__.feed.feeds._rawValue;
-        return notesRawValue.filter(item => item?.noteCard).map(item => [item.id, item.xsecToken, item.noteCard.cover.urlDefault, item.noteCard.user.nickName, item.noteCard.displayTitle,]);
+        return notesRawValue.filter(item => item?.noteCard).map(
+            item => [item.id, item.xsecToken, item.noteCard.cover.urlDefault, item.noteCard.user.nickName,
+                     item.noteCard.displayTitle,]);
     };
 
     const extractSearchNotes = () => {
         const notesRawValue = unsafeWindow.__INITIAL_STATE__.search.feeds._rawValue;
-        return notesRawValue.filter(item => item?.noteCard).map(item => [item.id, item.xsecToken, item.noteCard.cover.urlDefault, item.noteCard.user.nickName, item.noteCard.displayTitle,]);
+        return notesRawValue.filter(item => item?.noteCard).map(
+            item => [item.id, item.xsecToken, item.noteCard.cover.urlDefault, item.noteCard.user.nickName,
+                     item.noteCard.displayTitle,]);
     }
 
     const extractSearchUsers = () => {
@@ -541,7 +581,9 @@
         return notesRawValue.map(item => item.id);
     }
 
-    const generateNoteUrls = data => data.map(([id, token,]) => `https://www.xiaohongshu.com/discovery/item/${id}?source=webshare&xhsshare=pc_web&xsec_token=${token}&xsec_source=pc_share`).join(" ");
+    const generateNoteUrls = data => data.map(
+        ([id, token,]) => `https://www.xiaohongshu.com/discovery/item/${id}?source=webshare&xhsshare=pc_web&xsec_token=${token}&xsec_source=pc_share`)
+                                         .join(" ");
 
     const generateUserUrls = data => data.map(id => `https://www.xiaohongshu.com/user/profile/${id}`).join(" ");
 
@@ -604,7 +646,8 @@
     };
 
     if (typeof JSZip === 'undefined') {
-        runTips("XHS-Downloader 用户脚本依赖库 JSZip 加载失败，作品文件打包下载功能无法使用，请尝试刷新网页或者向作者反馈！");
+        runTips(
+            "XHS-Downloader 用户脚本依赖库 JSZip 加载失败，作品文件打包下载功能无法使用，请尝试刷新网页或者向作者反馈！");
     }
 
     let style = document.createElement('style');
@@ -1035,6 +1078,12 @@
                                                       checked: GM_getValue("keepMenuVisible", false),
                                                   });
 
+        const scriptServerSwitch = createSettingItem({
+                                                         label: '连接服务器',
+                                                         description: '启用后，可以把下载任务推送至服务器',
+                                                         checked: GM_getValue("scriptServerSwitch", false),
+                                                     });
+
         // 名称格式设置
         // const nameFormat = createTextInput({
         //     label: '文件名称格式',
@@ -1056,6 +1105,7 @@
         body.appendChild(linkCheckboxSwitch);
         body.appendChild(imageCheckboxSwitch);
         body.appendChild(keepMenuVisible);
+        body.appendChild(scriptServerSwitch);
         // body.appendChild(nameFormat);
 
         // 创建底部按钮
@@ -1085,6 +1135,7 @@
             updateLinkCheckboxSwitch(linkCheckboxSwitch.querySelector('input').checked);
             updateImageCheckboxSwitch(imageCheckboxSwitch.querySelector('input').checked);
             updateMaxScrollCount(parseInt(scrollCount.querySelector('input').value) || 50)
+            updateScriptServerSwitch(scriptServerSwitch.querySelector('input').checked);
             // updateFileNameFormat(nameFormat.querySelector('.text-input').value.trim() || null);
             closeSettingsModal();
         });
@@ -1184,7 +1235,8 @@
     };
 
     /* ==================== 弹窗逻辑 ==================== */
-    const showImageSelectionModal = (imageUrls, name) => {
+    const showImageSelectionModal = (imageUrls, name, server = false,) => {
+        return new Promise((resolve,) => {
             if (document.getElementById('imageSelectionOverlay')) {
                 return;
             }
@@ -1283,7 +1335,8 @@
 
             // 确认事件
             confirmBtn.addEventListener('click', async () => {
-            const selectedImages = Array.from(document.querySelectorAll('.image-checkbox:checked')).map((checkbox) => {
+                const selectedImages = Array.from(document.querySelectorAll('.image-checkbox:checked'))
+                                            .map((checkbox) => {
                                                 let item = checkbox.parentElement.querySelector('img');
                                                 return {
                                                     index: item.index, url: item.url,
@@ -1294,8 +1347,12 @@
                     return;
                 }
                 closeImagesModal();
+                if (server) {
+                    resolve(selectedImages.map(item => item.index));
+                } else {
                     showToast("正在下载文件，请稍等...");
                     await downloadImage(selectedImages, name)
+                }
             });
 
             // 关闭事件
@@ -1315,6 +1372,7 @@
             // 全选 / 全不选
             selectAllBtn.addEventListener('click', () => setAllChecked(true));
             selectNoneBtn.addEventListener('click', () => setAllChecked(false));
+        })
     };
 
     (() => {
@@ -1568,7 +1626,7 @@
                 container.querySelectorAll('.list-item').forEach((row) => {
                     const checkbox = row.querySelector('.list-checkbox');
                     if (checkbox && checkbox.checked) {
-                        const key = row.dataset.key;
+                        const {key} = row.dataset;
                         if (map.has(key)) selected.push(map.get(key));
                     }
                 });
@@ -1856,7 +1914,8 @@
             menuItems.push({
                                text: 'README', icon: ' 📄 ', action: readme, description: '阅读脚本说明和免责声明'
                            },);
-        } else if (currentUrl === "https://www.xiaohongshu.com/explore" || currentUrl.includes("https://www.xiaohongshu.com/explore?")) {
+        } else if (currentUrl === "https://www.xiaohongshu.com/explore" || currentUrl.includes(
+            "https://www.xiaohongshu.com/explore?")) {
             menuItems.push({
                                text: '提取推荐作品链接',
                                icon: ' ⛓ ',
@@ -1865,8 +1924,19 @@
                            },);
         } else if (currentUrl.includes("https://www.xiaohongshu.com/explore/")) {
             menuItems.push({
-                text: '下载作品文件', icon: ' 📦 ', action: extractDownloadLinks, description: '下载当前作品的无水印文件'
+                               text: '下载作品文件',
+                               icon: ' 📦 ',
+                               action: () => extractDownloadLinks(false),
+                               description: '下载当前作品的无水印文件'
                            },);
+            if (config.scriptServerSwitch) {
+                menuItems.push({
+                                   text: '推送下载任务',
+                                   icon: ' 🌏 ',
+                                   action: () => extractDownloadLinks(true),
+                                   description: '向服务器发送下载请求'
+                               });
+            }
         } else if (currentUrl.includes("https://www.xiaohongshu.com/user/profile/")) {
             menuItems.push({
                                text: '提取发布作品链接',
@@ -1886,9 +1956,15 @@
                            },);
         } else if (currentUrl.includes("https://www.xiaohongshu.com/search_result")) {
             menuItems.push({
-                text: '提取作品链接', icon: ' ⛓ ', action: () => extractAllLinksEvent(3), description: '提取搜索结果的作品链接至剪贴板'
+                               text: '提取作品链接',
+                               icon: ' ⛓ ',
+                               action: () => extractAllLinksEvent(3),
+                               description: '提取搜索结果的作品链接至剪贴板'
                            }, {
-                text: '提取用户链接', icon: ' ⛓ ', action: () => extractAllLinksEvent(4), description: '提取搜索结果的用户链接至剪贴板'
+                               text: '提取用户链接',
+                               icon: ' ⛓ ',
+                               action: () => extractAllLinksEvent(4),
+                               description: '提取搜索结果的用户链接至剪贴板'
                            },);
         } else if (currentUrl.includes("https://www.xiaohongshu.com/board/")) {
             menuItems.push({
@@ -1990,4 +2066,73 @@
     if (config.keepMenuVisible) {
         showMenu();
     }
+
+    class WebSocketManager {
+        constructor(url) {
+            this.url = url;
+            this.ws = null;
+        }
+
+        onOpen() {
+        }
+
+        onMessage(message) {
+
+        }
+
+        onClose(event) {
+
+        }
+
+        onError(error) {
+            console.error('Script Server WebSocket error:', error);
+            showToast('脚本服务器连接出错，请检查网络连接或脚本服务器状态是否正常！',);
+        }
+
+        get isConnected() {
+            return this.ws && this.ws.readyState === WebSocket.OPEN;
+        }
+
+        connect() {
+            if (this.ws && this.ws.readyState !== WebSocket.CLOSED) {
+                return;
+            }
+            try {
+                this.ws = new WebSocket(this.url);
+                this.ws.onopen = (event) => this.onOpen(event);
+                this.ws.onmessage = (event) => this.onMessage(event);
+                this.ws.onclose = (event) => {
+                    this.ws = null;
+                    this.onClose(event);
+                };
+                this.ws.onerror = (event) => {
+                    this.ws = null;
+                    this.onError(event);
+                };
+            } catch (error) {
+                this.onError(error);
+            }
+        }
+
+        disconnect() {
+            if (this.isConnected) {
+                this.ws.close();
+            }
+        }
+
+        send(data) {
+            if (this.isConnected) {
+                this.ws.send(data);
+                showToast("已向服务器发送下载请求");
+            } else {
+                showToast('脚本服务器未连接，请检查网络连接或脚本服务器状态是否正常！',);
+            }
+        }
+    }
+
+    const webSocket = new WebSocketManager(config.scriptServerURL,);
+
+    if (config.scriptServerSwitch) {
+        webSocket.connect();
+    }
 })();