koishi-plugin-share-links-analysis 0.13.2 → 0.14.0

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2024 shangxue
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2024 shangxue
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,71 +1,71 @@
-# koishi-plugin-share-links-analysis
-
-# 视频链接解析插件说明 📺✨
-
-本插件为用户提供便捷的分享链接链接解析服务，让聊天体验更加丰富多彩。
-
----
-
-## 鸣谢 💖
-
-本插件的解析能力与稳定运行，离不开以下开源项目及社区文档的强大支撑。特此向这些项目及其维护者致以最诚挚的感谢：
-
-- [koishi-plugin-bilibili-videolink-analysis](https://github.com/shangxueink/koishi-shangxue-apps/tree/main/plugins/bilibili-videolink-analysis)
-- [koishi-plugin-bili-parser](https://github.com/summonhim/koishi-plugin-bili-parser)
-- [bilibili-API-collect](https://github.com/SocialSisterYi/bilibili-API-collect)
-- [koishi-plugin-xiaohongshu](https://www.npmjs.com/package/koishi-plugin-xiaohongshu)
-以及解析方式原作者：[@MuJie](https://mu-jie.cc/)
-- [BetterTwitFix](https://github.com/dylanpdx/BetterTwitFix)
-- [yt-dlp](https://github.com/yt-dlp/yt-dlp)
-- [NeteaseCloudMusicApiEnhanced](https://github.com/NeteaseCloudMusicApiEnhanced/api-enhanced)
-
----
-
-## 🚀 YouTube 解析后端部署指南 (必看)
-
-由于 YouTube 引入了极其严苛的反爬机制，传统的直连解析已全部失效。为了保证解析的稳定，本插件采用了 **“前端 Koishi + 后端 Python 微服务”** 的分离架构。
-
-Python 后端利用 `yt-dlp` 的最新特性，通过调用本地 Node.js 实时计算 YouTube 签名，并已内置自动热更新。
-
-### 部署环境要求
-- **Python 3.8+**
-- **Node.js** (⚠️ 必须安装！`yt-dlp` 需要调用 Node 环境来执行 JS 脚本破解签名)
-- **一个能够正常访问 YouTube 的网络代理** (强烈建议使用流媒体解锁节点)
-
-### 部署步骤
-
-**1. 下载后端脚本**
-将本仓库内的 `yt_server.py` 下载到你的服务器上：
-```bash
-wget https://raw.githubusercontent.com/furryaxw/share-links-analysis/Master/yt_server.py
-```
-
-**2. 安装 Python 依赖**
-```bash
-pip install httpx fastapi uvicorn yt-dlp
-```
-
-**3. 配置网络代理 (重要)**
-请使用编辑器（如 vim 或 nano）打开 `yt_server.py`，在文件顶部找到代理配置区域，**将地址修改为你自己的真实代理**：
-```python
-# =====================================
-# 配置代理
-proxy = "http://127.0.0.1:7890" # 👈 在这里填入你的代理IP和端口
-# =====================================
-```
-
-**4. 启动微服务**
-```bash
-python yt_server.py
-```
-*(注：由于脚本内置了自动更新热重启逻辑，强烈建议直接使用上述命令启动，或者使用 `pm2 start yt_server.py --name yt-api --interpreter python3` 进行后台进程守护。)*
-
-**5. 在 Koishi 中配置**
-确保 Python 服务成功运行（默认监听 `12001` 端口）后，回到 Koishi 控制台的本插件配置页。
-在 `youtube_pythonApiUrl` 配置项中填入你的后端地址：
-```text
-http://127.0.0.1:12001/api/parse
-```
-*(如果你的 Python 服务部署在其他服务器上，请将 `127.0.0.1` 替换为对应的服务器 IP)*
-
-🎉 配置完成！现在你可以尽情享受丝滑的 YouTube 视频与 Shorts 解析了！
+# koishi-plugin-share-links-analysis
+
+# 视频链接解析插件说明 📺✨
+
+本插件为用户提供便捷的分享链接链接解析服务，让聊天体验更加丰富多彩。
+
+---
+
+## 鸣谢 💖
+
+本插件的解析能力与稳定运行，离不开以下开源项目及社区文档的强大支撑。特此向这些项目及其维护者致以最诚挚的感谢：
+
+- [koishi-plugin-bilibili-videolink-analysis](https://github.com/shangxueink/koishi-shangxue-apps/tree/main/plugins/bilibili-videolink-analysis)
+- [koishi-plugin-bili-parser](https://github.com/summonhim/koishi-plugin-bili-parser)
+- [bilibili-API-collect](https://github.com/SocialSisterYi/bilibili-API-collect)
+- [koishi-plugin-xiaohongshu](https://www.npmjs.com/package/koishi-plugin-xiaohongshu)
+以及解析方式原作者：[@MuJie](https://mu-jie.cc/)
+- [BetterTwitFix](https://github.com/dylanpdx/BetterTwitFix)
+- [yt-dlp](https://github.com/yt-dlp/yt-dlp)
+- [NeteaseCloudMusicApiEnhanced](https://github.com/NeteaseCloudMusicApiEnhanced/api-enhanced)
+
+---
+
+## 🚀 YouTube 解析后端部署指南 (必看)
+
+由于 YouTube 引入了极其严苛的反爬机制，传统的直连解析已全部失效。为了保证解析的稳定，本插件采用了 **“前端 Koishi + 后端 Python 微服务”** 的分离架构。
+
+Python 后端利用 `yt-dlp` 的最新特性，通过调用本地 Node.js 实时计算 YouTube 签名，并已内置自动热更新。
+
+### 部署环境要求
+- **Python 3.8+**
+- **Node.js** (⚠️ 必须安装！`yt-dlp` 需要调用 Node 环境来执行 JS 脚本破解签名)
+- **一个能够正常访问 YouTube 的网络代理** (强烈建议使用流媒体解锁节点)
+
+### 部署步骤
+
+**1. 下载后端脚本**
+将本仓库内的 `yt_server.py` 下载到你的服务器上：
+```bash
+wget https://raw.githubusercontent.com/furryaxw/share-links-analysis/Master/yt_server.py
+```
+
+**2. 安装 Python 依赖**
+```bash
+pip install httpx fastapi uvicorn yt-dlp
+```
+
+**3. 配置网络代理 (重要)**
+请使用编辑器（如 vim 或 nano）打开 `yt_server.py`，在文件顶部找到代理配置区域，**将地址修改为你自己的真实代理**：
+```python
+# =====================================
+# 配置代理
+proxy = "http://127.0.0.1:7890" # 👈 在这里填入你的代理IP和端口
+# =====================================
+```
+
+**4. 启动微服务**
+```bash
+python yt_server.py
+```
+*(注：由于脚本内置了自动更新热重启逻辑，强烈建议直接使用上述命令启动，或者使用 `pm2 start yt_server.py --name yt-api --interpreter python3` 进行后台进程守护。)*
+
+**5. 在 Koishi 中配置**
+确保 Python 服务成功运行（默认监听 `12001` 端口）后，回到 Koishi 控制台的本插件配置页。
+在 `youtube_pythonApiUrl` 配置项中填入你的后端地址：
+```text
+http://127.0.0.1:12001/api/parse
+```
+*(如果你的 Python 服务部署在其他服务器上，请将 `127.0.0.1` 替换为对应的服务器 IP)*
+
+🎉 配置完成！现在你可以尽情享受丝滑的 YouTube 视频与 Shorts 解析了！

package/lib/index.js

@@ -301,6 +301,98 @@ function apply(ctx, config) {
         await ctx.database.remove('sla_file_cache', {});
         return '缓存及对应文件已清理。';
     });
+    cmd.subcommand('.checkcache <url:string>', '查看缓存数据状态', { authority: 2 })
+        .action(async ({ session }, url) => {
+        if (!session)
+            return '会话不可用。';
+        if (!config.enableCache)
+            return '缓存功能未启用。';
+        const links = await (0, core_1.resolveLinks)(url, ctx, config);
+        if (links.length === 0)
+            return '未在该链接中识别到支持的内容。';
+        const link = links[0];
+        const cacheKey = `${link.platform}:${link.id}`;
+        const cached = await ctx.database.get('sla_parse_cache', cacheKey);
+        if (cached.length === 0)
+            return `未找到缓存数据: ${cacheKey}`;
+        const entry = cached[0];
+        const ageMs = Date.now() - entry.created_at;
+        const isExpiredL1 = config.cacheExpiration > 0 && (ageMs > config.cacheExpiration * 60 * 60 * 1000);
+        const isExpiredL2 = config.optimisticExpiration > 0 && (ageMs > config.optimisticExpiration * 60 * 60 * 1000);
+        if (isExpiredL2)
+            return `缓存数据已完全过期: ${cacheKey}`;
+        const cacheTimeStr = new Date(entry.created_at).toLocaleString('zh-CN', { hour12: false });
+        const result = { ...entry.data };
+        if (isExpiredL1 && config.optimisticCache) {
+            result.mainbody = (result.mainbody || '') + `\n\n[📦 L2 缓存 | 缓存时间: ${cacheTimeStr}]`;
+        }
+        else {
+            result.mainbody = (result.mainbody || '') + `\n\n[📦 L1 缓存 | 缓存时间: ${cacheTimeStr}]`;
+        }
+        const sendStats = { downloadTime: 0, sendTime: 0, errors: [] };
+        await (0, utils_1.sendResult)(ctx, session, config, result, logger, sendStats);
+        return;
+    });
+    cmd.subcommand('.forceparse <url:string>', '忽略缓存强制解析链接', { authority: 2 })
+        .action(async ({ session }, url) => {
+        if (!session)
+            return '会话不可用。';
+        const links = await (0, core_1.resolveLinks)(url, ctx, config);
+        if (links.length === 0)
+            return '未在该链接中识别到支持的内容。';
+        const link = links[0];
+        if (config.waitTip_Switch)
+            await session.send(config.waitTip_Switch);
+        const result = await (0, core_1.processLink)(ctx, config, link, session);
+        if (!result)
+            return `解析失败: ${link.platform}/${link.type}:${link.id}`;
+        const cacheKey = `${link.platform}:${link.id}`;
+        if (config.enableCache) {
+            await ctx.database.upsert('sla_parse_cache', [{
+                    key: cacheKey,
+                    data: result,
+                    created_at: Date.now()
+                }]);
+        }
+        const sendStats = { downloadTime: 0, sendTime: 0, errors: [] };
+        await (0, utils_1.sendResult)(ctx, session, config, result, logger, sendStats);
+        return;
+    });
+    cmd.subcommand('.directlink <url:string> [quality:string]', '获取视频/音频直链', { authority: 1 })
+        .action(async ({ session }, url, quality) => {
+        if (!session)
+            return '会话不可用。';
+        const links = await (0, core_1.resolveLinks)(url, ctx, config);
+        if (links.length === 0)
+            return '未在该链接中识别到支持的内容。';
+        const link = links[0];
+        let clarity = config.Video_ClarityPriority;
+        if (quality) {
+            const q = quality.trim().toLowerCase();
+            if (q === 'high' || q === 'h' || q === '高' || q === '高清晰度') {
+                clarity = '2';
+            }
+            else if (q === 'low' || q === 'l' || q === '低' || q === '低清晰度') {
+                clarity = '1';
+            }
+            else {
+                return `无效的画质参数: ${quality}。可用: high/h/高清晰度, low/l/低清晰度`;
+            }
+        }
+        const modifiedConfig = { ...config, Video_ClarityPriority: clarity, Max_size: Number.MAX_SAFE_INTEGER };
+        const result = await (0, core_1.processLink)(ctx, modifiedConfig, link, session);
+        if (!result)
+            return `解析失败: ${link.platform}/${link.type}:${link.id}`;
+        if (result.files.length === 0) {
+            return `未获取到直链: ${link.platform}/${link.type}:${link.id}\n该内容类型可能不支持直链获取。`;
+        }
+        const clarityLabel = clarity === '2' ? '高清晰度优先' : '低清晰度优先';
+        let output = `直链结果 (${link.platform}/${link.type}:${link.id}):\n画质策略: ${clarityLabel}\n标题: ${result.title}\n`;
+        for (const [i, file] of result.files.entries()) {
+            output += `\n[${i + 1}] ${file.type}: ${file.url}`;
+        }
+        return output;
+    });
     cmd.subcommand('.refresh', '强制刷新所有 Cookie', { authority: 3 })
         .action(async ({ session }) => {
         await session?.send('🔄 开始执行 Cookie 全量刷新流程...');
@@ -530,9 +622,15 @@ function apply(ctx, config) {
                             }
                         }
                         catch (e) {
+                            let mergeErrDetail = e.message || String(e);
+                            if (e.cause) {
+                                const causeCode = e.cause.code || '';
+                                const causeMsg = e.cause.message || String(e.cause);
+                                mergeErrDetail += ` [cause: ${causeCode ? causeCode + ': ' : ''}${causeMsg}]`;
+                            }
                             // 其他合并请求抛错时触发回退
                             if (optimisticData) {
-                                logger.warn(`合并任务失败，触发乐观缓存回退: ${cacheKey}`);
+                                logger.warn(`合并任务失败，触发乐观缓存回退: ${cacheKey} | Error: ${mergeErrDetail}`);
                                 result = optimisticData;
                                 const cacheTimeStr = new Date(optimisticTime).toLocaleString('zh-CN', { hour12: false });
                                 result.mainbody = (result.mainbody || '') + `\n\n[⚠️ 并发请求异常，回退 L2 乐观缓存 | 缓存时间: ${cacheTimeStr}]`;
@@ -573,15 +671,22 @@ function apply(ctx, config) {
                                 return res;
                             }
                             catch (e) {
+                                // 构建包含根因的详细错误信息
+                                let errDetail = e.message || String(e);
+                                if (e.cause) {
+                                    const causeCode = e.cause.code || '';
+                                    const causeMsg = e.cause.message || String(e.cause);
+                                    errDetail += ` [cause: ${causeCode ? causeCode + ': ' : ''}${causeMsg}]`;
+                                }
                                 // 抛出异常（网络错误/封禁）时触发乐观回退
                                 if (optimisticData) {
-                                    logger.warn(`解析抛出异常，触发乐观缓存回退: ${cacheKey} | Error: ${e.message}`);
+                                    logger.warn(`解析抛出异常，触发乐观缓存回退: ${cacheKey} | Error: ${errDetail}`);
                                     const cacheTimeStr = new Date(optimisticTime).toLocaleString('zh-CN', { hour12: false });
                                     optimisticData.mainbody = (optimisticData.mainbody || '') + `\n\n[⚠️ 接口触发异常，回退 L2 乐观缓存 | 缓存时间: ${cacheTimeStr}]`;
                                     optimisticData._isOptimisticFallback = true;
                                     return optimisticData;
                                 }
-                                logger.warn(`解析任务出错: ${e}`);
+                                logger.warn(`解析任务出错: ${errDetail}`);
                                 throw e;
                             }
                             finally {
@@ -619,9 +724,19 @@ function apply(ctx, config) {
             }
             catch (e) {
                 status = "error";
-                errorMsg = e.message || String(e);
+                // 构建包含根因的详细错误信息
+                let details = e.message || String(e);
+                if (e.cause) {
+                    const causeCode = e.cause.code || '';
+                    const causeMsg = e.cause.message || String(e.cause);
+                    details += ` [cause: ${causeCode ? causeCode + ': ' : ''}${causeMsg}]`;
+                }
+                if (e.response?.status) {
+                    details += ` [HTTP ${e.response.status}]`;
+                }
+                errorMsg = details;
                 errorStack = e.stack || String(e);
-                logger.warn(`处理异常: ${e}`);
+                logger.warn(`处理异常: ${details}`);
             }
             finally {
                 // 4. 上报针对性排障数据
@@ -665,7 +780,7 @@ function apply(ctx, config) {
                     ...resultFeatures,
                     // === 6. 错误追踪 ===
                     error_msg: errorMsg,
-                    error_stack: status === 'error' ? truncatedStack : "",
+                    error_stack: truncatedStack,
                     // === 7. 耗时拆解 (性能瓶颈定位) ===
                     time_total_ms: totalTime,
                     time_parse_ms: parseTime, // 解析器发请求拉取数据的耗时

package/lib/parsers/twitter.js

@@ -238,7 +238,9 @@ async function handleSyndicationFallback(ctx, config, tweetId, session) {
         const reqOptions = {
             headers: {
                 'User-Agent': config.userAgent,
-                'Accept': '*/*'
+                'Accept': '*/*',
+                'Accept-Language': 'zh-CN,zh;q=0.9,en;q=0.8',
+                'Referer': 'https://platform.twitter.com/'
             }
         };
         if (config.proxy)
@@ -298,7 +300,10 @@ async function handleSyndicationFallback(ctx, config, tweetId, session) {
         };
     }
     catch (e) {
-        logger.error(`Syndication fallback failed: ${e.message}`);
+        const causeDetail = e.cause ? ` (cause: ${e.cause.code || e.cause.message || e.cause})` : '';
+        logger.error(`Syndication fallback failed: ${e.message}${causeDetail}`);
+        if (e.response?.status)
+            logger.error(`  HTTP status: ${e.response.status}`);
         // 抛出错误让外部统一处理 404 等信息
         throw e;
     }
@@ -372,16 +377,21 @@ async function process(ctx, config, link, session) {
         // 404 通常意味着推文真的没了
         const isNotFound = error.response?.status === 404;
         if (!isNotFound) {
-            logger.warn(`VxTwitter API 失败 (${error.message})，尝试 Syndication API Fallback...`);
+            const causeDetail = error.cause ? ` (cause: ${error.cause.code || error.cause.message || error.cause})` : '';
+            logger.warn(`VxTwitter API 失败 (${error.message}${causeDetail})，尝试 Syndication API Fallback...`);
             try {
                 return await handleSyndicationFallback(ctx, config, tweetId, session);
             }
             catch (fallbackError) {
-                logger.error(`Fallback 失败: ${fallbackError.message}`);
+                const fbCauseDetail = fallbackError.cause ? ` (cause: ${fallbackError.cause.code || fallbackError.cause.message || fallbackError.cause})` : '';
+                logger.error(`Fallback 失败: ${fallbackError.message}${fbCauseDetail}`);
+                logger.error(`Twitter 解析失败: 主 API 和 Fallback 均失败`);
             }
         }
+        else {
+            logger.error(`Twitter 解析失败: ${error.message}`);
+        }
         // 最终错误处理
-        logger.error(`Twitter 解析失败: ${error.message}`);
         if (error.response?.status === 404) {
             await session.send('推文不存在或已被删除');
         }

package/lib/parsers/xiaoheihe.js

@@ -9,11 +9,11 @@ const utils_1 = require("../utils");
 exports.name = "xiaoheihe";
 const linkRules = [
     {
-        pattern: /https?:\/\/api\.xiaoheihe\.cn\/v3\/bbs\/app\/api\/web\/share\?[^"'\s]*?\blink_id=(\d+)/gi,
+        pattern: /https?:\/\/api\.xiaoheihe\.cn\/v3\/bbs\/app\/api\/web\/share\?[^"'\s]*?\blink_id=([a-zA-Z0-9]+)/gi,
         type: "bbs_api",
     },
     {
-        pattern: /https?:\/\/www\.xiaoheihe\.cn\/app\/bbs\/link\/(\d+)/gi,
+        pattern: /https?:\/\/www\.xiaoheihe\.cn\/app\/bbs\/link\/([a-zA-Z0-9]+)/gi,
         type: "bbs",
     }
 ];

package/lib/utils.js

@@ -641,7 +641,7 @@ async function isUserAdmin(session, userId) {
         if (!memberInfo)
             return false;
         const adminRoles = ["owner", "admin", "administrator"];
-        const memberRoles = [...(memberInfo.roles || [])].flat().filter(Boolean);
+        const memberRoles = (memberInfo.roles || []).map(r => r.name).filter((n) => !!n);
         for (const role of memberRoles) {
             if (adminRoles.includes(role.toLowerCase()))
                 return true;

package/package.json

@@ -2,7 +2,7 @@
   "name": "koishi-plugin-share-links-analysis",
   "description": "自用插件",
   "license": "MIT",
-  "version": "0.13.2",
+  "version": "0.14.0",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [