koishi-plugin-video-parser-all 1.2.5 → 1.2.7

package/lib/index.d.ts

@@ -48,10 +48,15 @@ export declare const Config: Schema<{
         twitter?: boolean | null | undefined;
         instagram?: boolean | null | undefined;
         doubao?: boolean | null | undefined;
+        oasis?: boolean | null | undefined;
+        wechat_channel?: boolean | null | undefined;
     } & import("cosmokit").Dict) | null | undefined;
     customApis?: ({
-        platform?: "bilibili" | "douyin" | "kuaishou" | "xiaohongshu" | "weibo" | "xigua" | "youtube" | "tiktok" | "acfun" | "zhihu" | "weishi" | "huya" | "haokan" | "meipai" | "twitter" | "instagram" | "doubao" | null | undefined;
+        platform?: "bilibili" | "douyin" | "kuaishou" | "xiaohongshu" | "weibo" | "xigua" | "youtube" | "tiktok" | "acfun" | "zhihu" | "weishi" | "huya" | "haokan" | "meipai" | "twitter" | "instagram" | "doubao" | "oasis" | "wechat_channel" | null | undefined;
         apiUrl?: string | null | undefined;
+        apiKey?: string | null | undefined;
+        authHeaderType?: "Bearer" | "X-API-Key" | "Custom" | null | undefined;
+        customHeaderName?: string | null | undefined;
     } & import("cosmokit").Dict)[] | null | undefined;
 } & {
     waitingTipText?: string | null | undefined;
@@ -107,10 +112,15 @@ export declare const Config: Schema<{
         twitter: Schema<boolean, boolean>;
         instagram: Schema<boolean, boolean>;
         doubao: Schema<boolean, boolean>;
+        oasis: Schema<boolean, boolean>;
+        wechat_channel: Schema<boolean, boolean>;
     }>;
     customApis: Schemastery.ObjectT<{
-        platform: Schema<"bilibili" | "douyin" | "kuaishou" | "xiaohongshu" | "weibo" | "xigua" | "youtube" | "tiktok" | "acfun" | "zhihu" | "weishi" | "huya" | "haokan" | "meipai" | "twitter" | "instagram" | "doubao", "bilibili" | "douyin" | "kuaishou" | "xiaohongshu" | "weibo" | "xigua" | "youtube" | "tiktok" | "acfun" | "zhihu" | "weishi" | "huya" | "haokan" | "meipai" | "twitter" | "instagram" | "doubao">;
+        platform: Schema<"bilibili" | "douyin" | "kuaishou" | "xiaohongshu" | "weibo" | "xigua" | "youtube" | "tiktok" | "acfun" | "zhihu" | "weishi" | "huya" | "haokan" | "meipai" | "twitter" | "instagram" | "doubao" | "oasis" | "wechat_channel", "bilibili" | "douyin" | "kuaishou" | "xiaohongshu" | "weibo" | "xigua" | "youtube" | "tiktok" | "acfun" | "zhihu" | "weishi" | "huya" | "haokan" | "meipai" | "twitter" | "instagram" | "doubao" | "oasis" | "wechat_channel">;
         apiUrl: Schema<string, string>;
+        apiKey: Schema<string, string>;
+        authHeaderType: Schema<"Bearer" | "X-API-Key" | "Custom", "Bearer" | "X-API-Key" | "Custom">;
+        customHeaderName: Schema<string, string>;
     }>[];
 } & {
     waitingTipText: string;

package/lib/index.js

@@ -38,7 +38,9 @@ class SimpleLRUCache {
         }
         this.map.set(key, { value, expireAt: Date.now() + this.ttlMs });
     }
-    clear() { this.map.clear(); }
+    clear() {
+        this.map.clear();
+    }
 }
 exports.name = 'video-parser-all';
 exports.Config = koishi_1.Schema.intersect([
@@ -78,25 +80,27 @@ exports.Config = koishi_1.Schema.intersect([
     }).description('去重设置'),
     koishi_1.Schema.object({
         primaryApiUrl: koishi_1.Schema.string().default('https://api.bugpk.com/api/short_videos').description('主 API 地址'),
-        backupApiUrl: koishi_1.Schema.string().default('https://api.bugpk.com/api/svparse').description('备用主 API 地址（仅支持抖音/小红书/ins/即梦）'),
+        backupApiUrl: koishi_1.Schema.string().default('https://api.bugpk.com/api/svparse').description('备用主 API 地址'),
         platformDedicatedFirst: koishi_1.Schema.object({
-            bilibili: koishi_1.Schema.boolean().default(false).description('哔哩哔哩'),
-            douyin: koishi_1.Schema.boolean().default(false).description('抖音'),
-            kuaishou: koishi_1.Schema.boolean().default(false).description('快手'),
-            xiaohongshu: koishi_1.Schema.boolean().default(false).description('小红书'),
-            weibo: koishi_1.Schema.boolean().default(false).description('微博'),
-            xigua: koishi_1.Schema.boolean().default(false).description('西瓜视频'),
-            youtube: koishi_1.Schema.boolean().default(false).description('YouTube'),
-            tiktok: koishi_1.Schema.boolean().default(false).description('TikTok'),
-            acfun: koishi_1.Schema.boolean().default(false).description('AcFun'),
-            zhihu: koishi_1.Schema.boolean().default(false).description('知乎'),
-            weishi: koishi_1.Schema.boolean().default(false).description('微视'),
-            huya: koishi_1.Schema.boolean().default(false).description('虎牙'),
-            haokan: koishi_1.Schema.boolean().default(false).description('好看视频'),
-            meipai: koishi_1.Schema.boolean().default(false).description('美拍'),
-            twitter: koishi_1.Schema.boolean().default(false).description('Twitter/X'),
-            instagram: koishi_1.Schema.boolean().default(false).description('Instagram'),
-            doubao: koishi_1.Schema.boolean().default(false).description('豆包'),
+            bilibili: koishi_1.Schema.boolean().default(false).description('哔哩哔哩 - 优先使用专属 API'),
+            douyin: koishi_1.Schema.boolean().default(false).description('抖音 - 优先使用专属 API'),
+            kuaishou: koishi_1.Schema.boolean().default(false).description('快手 - 优先使用专属 API'),
+            xiaohongshu: koishi_1.Schema.boolean().default(false).description('小红书 - 优先使用专属 API'),
+            weibo: koishi_1.Schema.boolean().default(false).description('微博 - 优先使用专属 API'),
+            xigua: koishi_1.Schema.boolean().default(false).description('西瓜视频 - 优先使用专属 API'),
+            youtube: koishi_1.Schema.boolean().default(false).description('YouTube - 优先使用专属 API'),
+            tiktok: koishi_1.Schema.boolean().default(false).description('TikTok - 优先使用专属 API'),
+            acfun: koishi_1.Schema.boolean().default(false).description('AcFun - 优先使用专属 API'),
+            zhihu: koishi_1.Schema.boolean().default(false).description('知乎 - 优先使用专属 API'),
+            weishi: koishi_1.Schema.boolean().default(false).description('微视 - 优先使用专属 API'),
+            huya: koishi_1.Schema.boolean().default(false).description('虎牙 - 优先使用专属 API'),
+            haokan: koishi_1.Schema.boolean().default(false).description('好看视频 - 优先使用专属 API'),
+            meipai: koishi_1.Schema.boolean().default(false).description('美拍 - 优先使用专属 API'),
+            twitter: koishi_1.Schema.boolean().default(false).description('Twitter/X - 优先使用专属 API'),
+            instagram: koishi_1.Schema.boolean().default(false).description('Instagram - 优先使用专属 API'),
+            doubao: koishi_1.Schema.boolean().default(false).description('豆包 - 优先使用专属 API'),
+            oasis: koishi_1.Schema.boolean().default(false).description('绿洲 - 优先使用专属 API'),
+            wechat_channel: koishi_1.Schema.boolean().default(false).description('视频号 - 优先使用专属 API'),
         }).description('各平台独立开关：是否优先使用专属 API'),
         customApis: koishi_1.Schema.array(koishi_1.Schema.object({
             platform: koishi_1.Schema.union([
@@ -117,16 +121,25 @@ exports.Config = koishi_1.Schema.intersect([
                 koishi_1.Schema.const('twitter').description('Twitter/X'),
                 koishi_1.Schema.const('instagram').description('Instagram'),
                 koishi_1.Schema.const('doubao').description('豆包'),
+                koishi_1.Schema.const('oasis').description('绿洲'),
+                koishi_1.Schema.const('wechat_channel').description('视频号'),
             ]).description('选择平台'),
             apiUrl: koishi_1.Schema.string().description('API 地址'),
+            apiKey: koishi_1.Schema.string().description('API Key（可选）').default(''),
+            authHeaderType: koishi_1.Schema.union([
+                koishi_1.Schema.const('Bearer').description('Bearer Token'),
+                koishi_1.Schema.const('X-API-Key').description('X-API-Key'),
+                koishi_1.Schema.const('Custom').description('自定义 Header 名称'),
+            ]).default('Bearer').description('认证头类型'),
+            customHeaderName: koishi_1.Schema.string().description('自定义 Header 名称（仅当选择 Custom 时有效）').default('X-API-Key'),
         })).default([]).description('自定义平台专属 API 地址，留空则使用内置默认专属 API'),
     }).description('API 选择设置'),
     koishi_1.Schema.object({
-        waitingTipText: koishi_1.Schema.string().default('正在解析视频，请稍候...').description('解析等待提示'),
-        unsupportedPlatformText: koishi_1.Schema.string().default('不支持该平台链接').description('不支持的平台提示'),
+        waitingTipText: koishi_1.Schema.string().default('正在解析视频，请稍候...').description('解析等待提示文字'),
+        unsupportedPlatformText: koishi_1.Schema.string().default('不支持该平台链接').description('不支持的平台提示文字'),
         invalidLinkText: koishi_1.Schema.string().default('无效的视频链接').description('无效链接提示（parse 指令）'),
         parseErrorPrefix: koishi_1.Schema.string().default('❌ 解析失败：').description('解析失败消息前缀'),
-        parseErrorItemFormat: koishi_1.Schema.string().default('【${url}】: ${msg}').description('每条解析失败格式，可用 ${url}（链接）和 ${msg}（错误信息）'),
+        parseErrorItemFormat: koishi_1.Schema.string().default('【${url}】: ${msg}').description('每条解析失败的展示格式，可用 ${url}（链接）和 ${msg}（错误信息）'),
     }).description('界面文字设置'),
 ]);
 const logger = new koishi_1.Logger(exports.name);
@@ -134,19 +147,7 @@ let debugEnabled = false;
 function debugLog(level, ...args) {
     if (!debugEnabled)
         return;
-    const timestamp = new Date().toISOString();
-    const message = `[${timestamp}] [${level}] ${args.map(a => {
-        if (typeof a === 'object') {
-            try {
-                return JSON.stringify(a, null, 2);
-            }
-            catch {
-                return String(a);
-            }
-        }
-        return String(a);
-    }).join(' ')}`;
-    logger.info(message);
+    logger.info(`[${new Date().toISOString()}] [${level}] ${args.map(a => typeof a === 'object' ? JSON.stringify(a) : String(a)).join(' ')}`);
 }
 const urlCache = new SimpleLRUCache(500, 10 * 60 * 1000);
 const LINK_RULES = [
@@ -176,6 +177,8 @@ const LINK_RULES = [
     { pattern: /https?:\/\/x\.com\/\w+\/status\/\d{10,}/gi, type: 'twitter' },
     { pattern: /https?:\/\/(?:www\.)?instagram\.com\/p\/[0-9a-zA-Z_-]{10,}/gi, type: 'instagram' },
     { pattern: /https?:\/\/(?:www\.)?doubao\.com\/video\/\d{10,}/gi, type: 'doubao' },
+    { pattern: /https?:\/\/(?:www\.)?oasis\.weibo\.com\/v\/[0-9a-zA-Z_-]+/gi, type: 'oasis' },
+    { pattern: /https?:\/\/channels\.weixin\.qq\.com\/[0-9a-zA-Z_-]+/gi, type: 'wechat_channel' },
 ];
 function linkTypeParser(content) {
     content = content.replace(/\\\//g, '/');
@@ -200,9 +203,8 @@ function extractAllUrlsFromMessage(session) {
     const cardsContent = [];
     if (session.elements) {
         for (const elem of session.elements) {
-            if (elem.type === 'xml' && elem.data) {
+            if (elem.type === 'xml' && elem.data)
                 cardsContent.push(elem.data);
-            }
             else if (elem.type === 'json' && elem.data) {
                 try {
                     const json = JSON.parse(elem.data);
@@ -210,9 +212,8 @@ function extractAllUrlsFromMessage(session) {
                         if (!obj || typeof obj !== 'object')
                             return;
                         for (const val of Object.values(obj)) {
-                            if (typeof val === 'string') {
+                            if (typeof val === 'string')
                                 cardsContent.push(val);
-                            }
                             else if (typeof val === 'object')
                                 extract(val);
                         }
@@ -224,8 +225,7 @@ function extractAllUrlsFromMessage(session) {
         }
     }
     for (const cardContent of cardsContent) {
-        const cardLinks = linkTypeParser(cardContent);
-        matchedLinks.push(...cardLinks);
+        matchedLinks.push(...linkTypeParser(cardContent));
     }
     const seen = new Set();
     const result = [];
@@ -241,25 +241,19 @@ function cleanUrl(url) {
     try {
         url = url.replace(/&/g, '&');
         const urlObj = new URL(url);
-        if (urlObj.protocol === 'http:') {
+        if (urlObj.protocol === 'http:')
             urlObj.protocol = 'https:';
-        }
         if (urlObj.hostname.includes('douyin.com') || urlObj.hostname.includes('v.douyin.com')) {
-            ['source', 'share_type', 'share_token', 'timestamp', 'from', 'isappinstalled'].forEach(p => {
-                urlObj.searchParams.delete(p);
-            });
+            ['source', 'share_type', 'share_token', 'timestamp', 'from', 'isappinstalled'].forEach(p => urlObj.searchParams.delete(p));
             return urlObj.origin + urlObj.pathname;
         }
         if (urlObj.hostname.includes('bilibili.com') || urlObj.hostname.includes('b23.tv')) {
-            ['share_source', 'share_medium', 'share_plat', 'share_session_id', 'share_tag', 'timestamp'].forEach(p => {
-                urlObj.searchParams.delete(p);
-            });
+            ['share_source', 'share_medium', 'share_plat', 'share_session_id', 'share_tag', 'timestamp'].forEach(p => urlObj.searchParams.delete(p));
             return urlObj.origin + urlObj.pathname;
         }
         return urlObj.toString();
     }
-    catch (e) {
-        debugLog('WARN', '清理URL失败:', e, '原始URL:', url);
+    catch {
         return url.replace(/&/g, '&').replace(/\?.*/, '');
     }
 }
@@ -277,23 +271,24 @@ function formatPublishTime(ms) {
     if (!ms)
         return '';
     const d = new Date(ms);
-    const y = d.getFullYear(), mo = (d.getMonth() + 1).toString().padStart(2, '0'), day = d.getDate().toString().padStart(2, '0'), H = d.getHours().toString().padStart(2, '0'), i = d.getMinutes().toString().padStart(2, '0');
+    const y = d.getFullYear();
+    const mo = (d.getMonth() + 1).toString().padStart(2, '0');
+    const day = d.getDate().toString().padStart(2, '0');
+    const H = d.getHours().toString().padStart(2, '0');
+    const i = d.getMinutes().toString().padStart(2, '0');
     return `${y}年${mo}月${day}日 ${H}:${i}`;
 }
 function pickBestQuality(videoBackup) {
     if (!Array.isArray(videoBackup))
         return [];
-    return videoBackup
-        .filter(v => v && v.url)
-        .map(v => ({
+    return videoBackup.filter(v => v && v.url).map(v => ({
         quality: v.quality || v.label || 'unknown',
         url: v.url,
         bit_rate: Number(v.bit_rate || 0)
-    }))
-        .sort((a, b) => b.bit_rate - a.bit_rate);
+    })).sort((a, b) => b.bit_rate - a.bit_rate);
 }
 function parseApiResponse(raw, maxDescLen) {
-    debugLog('DEBUG', '原始API返回数据:', raw);
+    debugLog('DEBUG', 'API raw response', raw);
     const data = raw?.data || {};
     const extra = data.extra || {};
     let type = data.type || '';
@@ -333,31 +328,18 @@ function parseApiResponse(raw, maxDescLen) {
         const validVideos = data.videos.filter((v) => v && v.url);
         if (validVideos.length) {
             video = validVideos[0].url;
-            videos = validVideos.map((v) => ({
-                quality: v.accept?.[0] || 'unknown',
-                url: v.url
-            }));
+            videos = validVideos.map((v) => ({ quality: v.accept?.[0] || 'unknown', url: v.url }));
         }
     }
-    if (!video && data.url) {
+    if (!video && data.url)
         video = data.url;
-    }
-    if (video && !video.startsWith('http')) {
+    if (video && !video.startsWith('http'))
         video = 'https:' + video;
-    }
-    const images = Array.isArray(data.images)
-        ? data.images.filter((img) => img && typeof img === 'string').map((img) => {
-            if (!img.startsWith('http'))
-                return 'https:' + img;
-            return img;
-        })
-        : [];
-    const live_photo = Array.isArray(data.live_photo)
-        ? data.live_photo.filter((lp) => lp && lp.image).map((lp) => ({
-            image: lp.image.startsWith('http') ? lp.image : 'https:' + lp.image,
-            video: lp.video ? (lp.video.startsWith('http') ? lp.video : 'https:' + lp.video) : ''
-        }))
-        : [];
+    const images = Array.isArray(data.images) ? data.images.filter((img) => img && typeof img === 'string').map((img) => img.startsWith('http') ? img : 'https:' + img) : [];
+    const live_photo = Array.isArray(data.live_photo) ? data.live_photo.filter((lp) => lp && lp.image).map((lp) => ({
+        image: lp.image.startsWith('http') ? lp.image : 'https:' + lp.image,
+        video: lp.video ? (lp.video.startsWith('http') ? lp.video : 'https:' + lp.video) : ''
+    })) : [];
     const music = {
         title: data.music?.title || data.music?.name || '',
         author: data.music?.author || data.music?.artist || '',
@@ -388,12 +370,7 @@ function parseApiResponse(raw, maxDescLen) {
     else if (extra.create_time) {
         publishTime = extra.create_time * 1000;
     }
-    return {
-        type, title, desc, author, uid, avatar, cover,
-        video, videos, images, live_photo, music,
-        like, comment, collect, share, play,
-        duration, publishTime
-    };
+    return { type, title, desc, author, uid, avatar, cover, video, videos, images, live_photo, music, like, comment, collect, share, play, duration, publishTime };
 }
 const formatVarRegex = /\$\{([^}]+)\}/g;
 function generateFormattedText(p, format) {
@@ -414,10 +391,6 @@ function generateFormattedText(p, format) {
         '封面': p.cover,
         '视频链接': p.video,
     };
-    const varReplacements = Object.entries(vars).map(([key, val]) => ({
-        regex: new RegExp(`\\$\\{${key}\\}`, 'g'),
-        value: val,
-    }));
     const lines = format.split('\n');
     const resultLines = [];
     for (const line of lines) {
@@ -436,8 +409,8 @@ function generateFormattedText(p, format) {
                 continue;
         }
         let newLine = line;
-        for (const { regex, value } of varReplacements) {
-            newLine = newLine.replace(regex, value);
+        for (const [key, val] of Object.entries(vars)) {
+            newLine = newLine.replace(new RegExp(`\\$\\{${key}\\}`, 'g'), val);
         }
         resultLines.push(newLine);
     }
@@ -452,12 +425,7 @@ function buildForwardNode(session, content, botName) {
         messageContent = [content];
     else
         messageContent = [koishi_1.h.text(String(content))];
-    return (0, koishi_1.h)('node', {
-        user: {
-            nickname: botName.substring(0, 15),
-            user_id: session.selfId
-        }
-    }, messageContent);
+    return (0, koishi_1.h)('node', { user: { nickname: botName.substring(0, 15), user_id: session.selfId } }, messageContent);
 }
 function getErrorMessage(error) {
     if (error instanceof Error)
@@ -468,7 +436,7 @@ function getErrorMessage(error) {
 }
 function apply(ctx, config) {
     debugEnabled = config.debug || false;
-    debugLog('INFO', '插件初始化开始');
+    debugLog('INFO', 'plugin start');
     const dedupCache = new SimpleLRUCache(1000, config.deduplicationInterval * 1000);
     const texts = {
         waitingTipText: config.waitingTipText || '正在解析视频，请稍候...',
@@ -498,33 +466,47 @@ function apply(ctx, config) {
         pipigx: 'https://api.bugpk.com/api/pipigx',
         pipixia: 'https://api.bugpk.com/api/pipixia',
         zuiyou: 'https://api.bugpk.com/api/zuiyou',
+        wechat_channel: 'https://api.bugpk.com/api/wxsph',
     };
     const backupSupportedPlatforms = new Set(['douyin', 'xiaohongshu', 'instagram', 'jimeng']);
     function getPlatformConfig(type) {
         const custom = config.customApis?.find((item) => item.platform === type);
         let apiUrl = defaultDedicatedApis[type] || null;
+        let apiKey = '';
+        let authHeaderType = 'Bearer';
+        let customHeaderName = 'X-API-Key';
         if (custom && custom.apiUrl) {
             apiUrl = custom.apiUrl;
+            apiKey = custom.apiKey || '';
+            authHeaderType = custom.authHeaderType || 'Bearer';
+            customHeaderName = custom.customHeaderName || 'X-API-Key';
         }
         const dedicatedFirst = config.platformDedicatedFirst?.[type] ?? false;
-        return { apiUrl, dedicatedFirst };
+        return { apiUrl, dedicatedFirst, apiKey, authHeaderType, customHeaderName };
+    }
+    function buildAuthHeaders(apiKey, authHeaderType, customHeaderName) {
+        if (!apiKey)
+            return {};
+        if (authHeaderType === 'Bearer')
+            return { 'Authorization': `Bearer ${apiKey}` };
+        if (authHeaderType === 'X-API-Key')
+            return { 'X-API-Key': apiKey };
+        if (authHeaderType === 'Custom' && customHeaderName)
+            return { [customHeaderName]: apiKey };
+        return {};
     }
     async function resolveShortUrl(url) {
         try {
             const res = await http.get(url, {
                 timeout: 10000,
                 maxRedirects: 10,
-                headers: {
-                    'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36',
-                    'Referer': 'https://www.baidu.com/',
-                },
+                headers: { 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36', 'Referer': 'https://www.baidu.com/' },
                 validateStatus: (status) => status >= 200 && status < 400,
             });
             const finalUrl = res.request?.res?.responseUrl || url;
             return cleanUrl(finalUrl);
         }
-        catch (e) {
-            debugLog('WARN', '解析短链接失败:', e, '原始URL:', url);
+        catch {
             return cleanUrl(url);
         }
     }
@@ -535,8 +517,6 @@ function apply(ctx, config) {
         await promises_1.default.mkdir(tempDir, { recursive: true });
         const fileName = `video_${Date.now()}_${(0, crypto_1.randomBytes)(4).toString('hex')}.mp4`;
         const filePath = path_1.default.resolve(tempDir, fileName);
-        debugLog('INFO', `开始下载视频: ${videoUrl.substring(0, 100)}...`);
-        debugLog('INFO', `临时文件路径: ${filePath}`);
         const writer = (0, fs_1.createWriteStream)(filePath);
         let response;
         try {
@@ -545,10 +525,7 @@ function apply(ctx, config) {
                 url: videoUrl,
                 responseType: 'stream',
                 timeout: config.videoDownloadTimeout || 120000,
-                headers: {
-                    'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36',
-                    'Referer': 'https://www.bilibili.com/',
-                },
+                headers: { 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36', 'Referer': 'https://www.bilibili.com/' },
                 maxRedirects: 5,
                 validateStatus: (status) => status >= 200 && status < 300,
             });
@@ -567,7 +544,6 @@ function apply(ctx, config) {
         }
         try {
             await (0, promises_2.pipeline)(response.data, writer);
-            debugLog('INFO', `视频下载完成`);
             return filePath;
         }
         catch (e) {
@@ -578,17 +554,15 @@ function apply(ctx, config) {
     async function fetchApi(url, type) {
         const cacheKey = url;
         const cached = urlCache.get(cacheKey);
-        if (cached && cached.expire > Date.now()) {
-            debugLog('DEBUG', `使用缓存: ${url}`);
+        if (cached && cached.expire > Date.now())
             return cached.data;
-        }
-        const { apiUrl: dedicatedUrl, dedicatedFirst } = getPlatformConfig(type);
+        const { apiUrl: dedicatedUrl, dedicatedFirst, apiKey, authHeaderType, customHeaderName } = getPlatformConfig(type);
         const primaryApi = config.primaryApiUrl || 'https://api.bugpk.com/api/short_videos';
         const backupApi = config.backupApiUrl || 'https://api.bugpk.com/api/svparse';
         const backupAllowed = backupSupportedPlatforms.has(type);
         const apiList = [];
         if (dedicatedFirst && dedicatedUrl) {
-            apiList.push({ url: dedicatedUrl, label: `专属API(${type})` });
+            apiList.push({ url: dedicatedUrl, label: `专属API(${type})`, apiKey, authHeaderType, customHeaderName });
             apiList.push({ url: primaryApi, label: '默认主API' });
             if (backupAllowed)
                 apiList.push({ url: backupApi, label: '备用主API' });
@@ -598,16 +572,22 @@ function apply(ctx, config) {
             if (backupAllowed)
                 apiList.push({ url: backupApi, label: '备用主API' });
             if (dedicatedUrl)
-                apiList.push({ url: dedicatedUrl, label: `专属API(${type})` });
+                apiList.push({ url: dedicatedUrl, label: `专属API(${type})`, apiKey, authHeaderType, customHeaderName });
         }
         let lastError = null;
         for (const api of apiList) {
             for (let attempt = 0; attempt <= config.retryTimes; attempt++) {
                 try {
-                    const res = await http.get(api.url, {
-                        params: { url },
-                        timeout: config.timeout
-                    });
+                    const headers = {
+                        'User-Agent': config.userAgent,
+                        'Referer': 'https://www.baidu.com/',
+                        'Content-Type': 'application/x-www-form-urlencoded'
+                    };
+                    if (api.apiKey) {
+                        const authHeaders = buildAuthHeaders(api.apiKey, api.authHeaderType || 'Bearer', api.customHeaderName || 'X-API-Key');
+                        Object.assign(headers, authHeaders);
+                    }
+                    const res = await http.get(api.url, { params: { url }, timeout: config.timeout, headers });
                     if (res.data && (res.data.code === 200 || res.data.code === 0)) {
                         const parsed = parseApiResponse(res.data, config.maxDescLength);
                         urlCache.set(cacheKey, { data: parsed, expire: Date.now() + 10 * 60 * 1000 });
@@ -617,81 +597,59 @@ function apply(ctx, config) {
                 }
                 catch (error) {
                     lastError = error instanceof Error ? error : new Error(String(error));
-                    debugLog('ERROR', `${api.label} 第${attempt + 1}次请求失败: ${lastError.message}`);
-                    if (attempt < config.retryTimes) {
+                    debugLog('ERROR', `${api.label} attempt ${attempt + 1} failed: ${lastError.message}`);
+                    if (attempt < config.retryTimes)
                         await delay(config.retryInterval);
-                    }
                 }
             }
-            debugLog('WARN', `${api.label} 所有重试均失败，切换下一个API`);
+            debugLog('WARN', `${api.label} all retries failed`);
         }
         throw lastError || new Error('所有API请求全部失败');
     }
     async function parseUrl(url, type) {
         const realUrl = await resolveShortUrl(url);
-        const candidates = [realUrl, url];
-        for (const candidate of [...new Set(candidates)]) {
+        const candidates = [...new Set([realUrl, url])];
+        for (const candidate of candidates) {
             try {
                 const info = await fetchApi(candidate, type);
-                if (info.video || info.images.length > 0) {
+                if (info.video || info.images.length > 0)
                     return { success: true, data: info };
-                }
-                debugLog('WARN', `解析成功但无有效内容: ${candidate}`);
+                debugLog('WARN', `解析成功但无内容: ${candidate}`);
             }
             catch (error) {
-                debugLog('ERROR', `候选链接解析失败: ${candidate}`, getErrorMessage(error));
+                debugLog('ERROR', `候选链接失败: ${candidate}`, getErrorMessage(error));
             }
         }
         return { success: false, msg: texts.unsupportedPlatformText };
     }
     async function processSingleUrl(url, type) {
         const result = await parseUrl(url, type);
-        if (!result.success) {
+        if (!result.success)
             return { success: false, msg: result.msg, url };
-        }
         const text = generateFormattedText(result.data, config.unifiedMessageFormat);
-        return {
-            success: true,
-            data: {
-                text,
-                parsed: result.data
-            }
-        };
+        return { success: true, data: { text, parsed: result.data } };
     }
     async function sendWithTimeout(session, content, customRetries) {
         const maxRetries = customRetries ?? config.retryTimes ?? 3;
         const retryDelay = config.retryInterval || 1000;
-        let timeoutId = null;
         for (let attempt = 0; attempt <= maxRetries; attempt++) {
             try {
                 let sendPromise = session.send(content);
                 if (config.videoSendTimeout > 0) {
-                    const timeoutPromise = new Promise((_, reject) => {
-                        timeoutId = setTimeout(() => reject(new Error('发送超时')), config.videoSendTimeout);
-                    });
-                    const result = await Promise.race([sendPromise, timeoutPromise]);
-                    if (timeoutId)
-                        clearTimeout(timeoutId);
-                    return result;
+                    const timeoutPromise = new Promise((_, reject) => setTimeout(() => reject(new Error('发送超时')), config.videoSendTimeout));
+                    return await Promise.race([sendPromise, timeoutPromise]);
                 }
                 else {
                     return await sendPromise;
                 }
             }
             catch (err) {
-                if (timeoutId)
-                    clearTimeout(timeoutId);
                 const errMsg = getErrorMessage(err);
-                debugLog('ERROR', `第${attempt + 1}次发送失败: ${errMsg}`);
-                if (attempt < maxRetries) {
-                    debugLog('INFO', `等待 ${retryDelay}ms 后进行第 ${attempt + 2} 次重试`);
+                debugLog('ERROR', `发送失败尝试 ${attempt + 1}: ${errMsg}`);
+                if (attempt < maxRetries)
                     await delay(retryDelay);
-                }
-                else {
-                    if (!config.ignoreSendError)
-                        throw err;
-                    return null;
-                }
+                else if (!config.ignoreSendError)
+                    throw err;
             }
         }
         return null;
@@ -699,47 +657,36 @@ function apply(ctx, config) {
     async function sendVideoFile(session, videoUrl) {
         if (!videoUrl)
             return;
-        if (!config.showVideoFile) {
+        if (!config.showVideoFile)
             return await sendWithTimeout(session, `视频链接：${videoUrl}`);
-        }
-        const sendLink = async () => {
-            await sendWithTimeout(session, `视频链接：${videoUrl}`).catch(() => { });
-        };
+        const sendLink = async () => { await sendWithTimeout(session, `视频链接：${videoUrl}`).catch(() => { }); };
         if (config.forceDownloadVideo) {
             try {
                 const tempFilePath = await downloadVideoFile(videoUrl);
-                const localFile = `file://${tempFilePath}`;
-                await sendWithTimeout(session, koishi_1.h.video(localFile));
+                await sendWithTimeout(session, koishi_1.h.video(`file://${tempFilePath}`));
                 return;
             }
             catch (e) {
-                debugLog('ERROR', '强制下载失败，尝试直接发送URL:', getErrorMessage(e));
+                debugLog('ERROR', '强制下载失败，尝试URL发送:', getErrorMessage(e));
                 try {
                     await sendWithTimeout(session, koishi_1.h.video(videoUrl));
                     return;
                 }
-                catch (urlErr) {
-                    debugLog('ERROR', '发送URL也失败，降级发送链接:', getErrorMessage(urlErr));
+                catch {
                     await sendLink();
                 }
             }
             return;
         }
         try {
-            debugLog('INFO', '尝试直接发送视频URL');
             await sendWithTimeout(session, koishi_1.h.video(videoUrl));
-            return;
         }
-        catch (urlErr) {
-            debugLog('ERROR', '直接发送URL失败，尝试下载:', getErrorMessage(urlErr));
+        catch {
             try {
                 const tempFilePath = await downloadVideoFile(videoUrl);
-                const localFile = `file://${tempFilePath}`;
-                await sendWithTimeout(session, koishi_1.h.video(localFile));
-                return;
+                await sendWithTimeout(session, koishi_1.h.video(`file://${tempFilePath}`));
             }
-            catch (downloadErr) {
-                debugLog('ERROR', '下载失败，降级发送链接:', getErrorMessage(downloadErr));
+            catch {
                 await sendLink();
             }
         }
@@ -755,37 +702,28 @@ function apply(ctx, config) {
                 if (lastTime && (Date.now() - lastTime < config.deduplicationInterval * 1000)) {
                     debugLog('INFO', `跳过重复链接: ${match.url}`);
                     const shortUrl = match.url.length > 50 ? match.url.slice(0, 50) + '...' : match.url;
-                    const skipMsg = `链接 ${shortUrl} 在最近 ${config.deduplicationInterval} 秒内已解析过，已跳过。`;
-                    await sendWithTimeout(session, skipMsg).catch(() => { });
+                    await sendWithTimeout(session, `链接 ${shortUrl} 在最近 ${config.deduplicationInterval} 秒内已解析过，已跳过。`).catch(() => { });
                     continue;
                 }
             }
-            debugLog('INFO', `正在解析第 ${i + 1}/${matches.length} 个链接: ${match.url} (平台: ${match.type})`);
+            debugLog('INFO', `解析第 ${i + 1}/${matches.length} 个链接: ${match.url} (${match.type})`);
             const result = await processSingleUrl(match.url, match.type);
             if (result.success) {
                 items.push(result.data);
-                if (config.deduplicationInterval > 0) {
+                if (config.deduplicationInterval > 0)
                     dedupCache.set(match.url, Date.now());
-                }
             }
             else {
-                const item = texts.parseErrorItemFormat
-                    .replace(/\$\{url\}/g, match.url.length > 50 ? match.url.slice(0, 50) + '...' : match.url)
-                    .replace(/\$\{msg\}/g, result.msg);
+                const item = texts.parseErrorItemFormat.replace(/\$\{url\}/g, match.url.length > 50 ? match.url.slice(0, 50) + '...' : match.url).replace(/\$\{msg\}/g, result.msg);
                 errors.push(item);
             }
-            if (i < matches.length - 1) {
+            if (i < matches.length - 1)
                 await delay(500);
-            }
         }
-        if (errors.length) {
+        if (errors.length)
             await sendWithTimeout(session, `${texts.parseErrorPrefix}\n${errors.join('\n')}`);
-            await delay(500);
-        }
-        if (!items.length) {
-            debugLog('INFO', '没有成功解析的内容');
+        if (!items.length)
             return;
-        }
         const enableForward = config.enableForward && session.platform === 'onebot';
         const botName = config.botName || '视频解析机器人';
         if (enableForward) {
@@ -793,30 +731,24 @@ function apply(ctx, config) {
             for (const item of items) {
                 const p = item.parsed;
                 const text = item.text;
-                if (text && config.showImageText) {
+                if (text && config.showImageText)
                     forwardMessages.push(buildForwardNode(session, text, botName));
-                }
-                if (p.cover && p.type !== 'live_photo' && !(p.type === 'live' && (p.live_photo?.length || p.images?.length))) {
+                if (p.cover && p.type !== 'live_photo' && !(p.type === 'live' && (p.live_photo?.length || p.images?.length)))
                     forwardMessages.push(buildForwardNode(session, koishi_1.h.image(p.cover), botName));
-                }
                 if (p.type === 'image' || p.type === 'live_photo' || (p.type === 'live' && (p.live_photo?.length || p.images?.length))) {
                     const imageUrls = p.images?.length ? p.images : (p.live_photo?.map(lp => lp.image) ?? []);
-                    for (const imgUrl of imageUrls) {
+                    for (const imgUrl of imageUrls)
                         forwardMessages.push(buildForwardNode(session, koishi_1.h.image(imgUrl), botName));
-                    }
                 }
-                if (p.video) {
+                if (p.video)
                     forwardMessages.push(buildForwardNode(session, koishi_1.h.video(p.video), botName));
-                }
             }
             if (forwardMessages.length) {
-                const forwardMsg = (0, koishi_1.h)('message', { forward: true }, forwardMessages.slice(0, 100));
                 try {
-                    debugLog('INFO', `发送合并转发消息，包含 ${forwardMessages.length} 条内容`);
-                    await sendWithTimeout(session, forwardMsg, config.retryTimes);
+                    await sendWithTimeout(session, (0, koishi_1.h)('message', { forward: true }, forwardMessages.slice(0, 100)), config.retryTimes);
                 }
                 catch (err) {
-                    debugLog('ERROR', '合并转发发送失败，降级为逐条发送:', err);
+                    debugLog('ERROR', '合并转发失败，降级逐条发送:', err);
                     for (const node of forwardMessages) {
                         await sendWithTimeout(session, node.data.content).catch(() => { });
                         await delay(300);
@@ -837,17 +769,10 @@ function apply(ctx, config) {
                     await delay(300);
                 }
                 if (p.video && (p.type === 'video' || (p.type === 'live' && !p.live_photo?.length && !p.images?.length))) {
-                    if (config.showVideoFile) {
-                        try {
-                            await sendVideoFile(session, p.video);
-                        }
-                        catch (e) {
-                            debugLog('ERROR', `视频发送失败: ${getErrorMessage(e)}`);
-                        }
-                    }
-                    else {
+                    if (config.showVideoFile)
+                        await sendVideoFile(session, p.video);
+                    else
                         await sendWithTimeout(session, `视频链接：${p.video}`);
-                    }
                     await delay(500);
                 }
                 if (p.type === 'image' || p.type === 'live_photo' || (p.type === 'live' && (p.live_photo?.length || p.images?.length))) {
@@ -859,7 +784,7 @@ function apply(ctx, config) {
                 }
             }
         }
-        debugLog('INFO', '所有内容处理完成');
+        debugLog('INFO', '处理完成');
     }
     ctx.on('message', async (session) => {
         if (!config.enable)
@@ -873,13 +798,13 @@ function apply(ctx, config) {
         const matches = extractAllUrlsFromMessage(session);
         if (!matches.length)
             return;
-        debugLog('INFO', `检测到 ${matches.length} 个链接，开始处理`);
+        debugLog('INFO', `检测到 ${matches.length} 个链接`);
         if (config.showWaitingTip) {
             try {
                 await sendWithTimeout(session, texts.waitingTipText);
             }
             catch (e) {
-                debugLog('WARN', '发送等待提示失败:', e);
+                debugLog('WARN', '等待提示发送失败:', e);
             }
         }
         await flush(session, matches);
@@ -907,20 +832,19 @@ function apply(ctx, config) {
             const tempDir = config.tempDir || './temp_videos';
             const files = await promises_1.default.readdir(tempDir);
             const now = Date.now();
-            let deletedCount = 0;
+            let deleted = 0;
             for (const file of files) {
                 if (file.startsWith('video_') && file.endsWith('.mp4')) {
                     const filePath = path_1.default.join(tempDir, file);
                     const stats = await promises_1.default.stat(filePath);
                     if (now - stats.mtimeMs > 3600000) {
                         await promises_1.default.unlink(filePath).catch(() => { });
-                        deletedCount++;
+                        deleted++;
                     }
                 }
             }
-            if (deletedCount > 0) {
-                debugLog('INFO', `清理了 ${deletedCount} 个过期临时视频文件`);
-            }
+            if (deleted)
+                debugLog('INFO', `清理了 ${deleted} 个过期临时视频文件`);
         }
         catch (e) {
             debugLog('WARN', '清理临时文件失败:', e);
@@ -930,18 +854,16 @@ function apply(ctx, config) {
         clearInterval(tempCleanupInterval);
         urlCache.clear();
         dedupCache.clear();
-        debugLog('INFO', '插件已卸载，资源已清理');
+        debugLog('INFO', '插件已卸载');
     });
     process.on('beforeExit', async () => {
         try {
             const tempDir = config.tempDir || './temp_videos';
             const files = await promises_1.default.readdir(tempDir);
             for (const file of files) {
-                if (file.startsWith('video_') && file.endsWith('.mp4')) {
+                if (file.startsWith('video_') && file.endsWith('.mp4'))
                     await promises_1.default.unlink(path_1.default.join(tempDir, file)).catch(() => { });
-                }
             }
-            debugLog('INFO', '进程退出，已清理所有临时视频文件');
         }
         catch { }
     });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-video-parser-all",
   "description": "Koishi 全平台视频解析插件，支持抖音/快手/B站/微博/小红书/剪映/YouTube/TikTok等20+平台",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

package/readme.md

@@ -3,10 +3,10 @@
 ## 项目介绍 (Project Introduction)
 
 ### 中文
-这是一个为 Koishi 机器人框架开发的**全平台视频/图集解析插件**，使用统一API接口，支持自动识别并解析抖音、快手、B站、小红书、微博、YouTube、TikTok、剪映、AcFun、知乎、虎牙等20+主流平台的短视频/图集/实况链接。
+这是一个为 Koishi 机器人框架开发的**全平台视频/图集解析插件**，使用统一API接口，支持自动识别并解析抖音、快手、B站、小红书、微博、YouTube、TikTok、剪映、AcFun、知乎、虎牙、绿洲、视频号等20+主流平台的短视频/图集/实况链接。
 
 ### English
-This is a **multi-platform video/image parsing plugin** developed for the Koishi bot framework, using a unified API interface to automatically recognize and parse short video/image/live photo links from 20+ mainstream platforms such as Douyin, Kuaishou, Bilibili, Xiaohongshu, Weibo, YouTube, TikTok, Jianying, AcFun, Zhihu, Huya and more. 
+This is a **multi-platform video/image parsing plugin** developed for the Koishi bot framework, using a unified API interface to automatically recognize and parse short video/image/live photo links from 20+ mainstream platforms such as Douyin, Kuaishou, Bilibili, Xiaohongshu, Weibo, YouTube, TikTok, Jianying, AcFun, Zhihu, Huya, Oasis, WeChat Channels and more. 
 
 ## 项目仓库 (Repository)
 - GitHub: `https://github.com/Minecraft-1314/koishi-plugin-video-parser-all`
@@ -56,8 +56,8 @@ This is a **multi-platform video/image parsing plugin** developed for the Koishi
 |--------|------|--------|------|
 | `primaryApiUrl` | string | `https://api.bugpk.com/api/short_videos` | 主 API 地址，解析时优先使用 |
 | `backupApiUrl` | string | `https://api.bugpk.com/api/svparse` | 备用主 API 地址，仅支持抖音、小红书、Instagram、即梦平台解析 |
-| `platformDedicatedFirst` | object | 各平台均为 `false` | 各平台独立开关：是否优先使用平台专属 API。对象键为平台标识（英文），值为布尔值。支持的键：`bilibili`（哔哩哔哩）、`douyin`（抖音）、`kuaishou`（快手）、`xiaohongshu`（小红书）、`weibo`（微博）、`xigua`（西瓜视频）、`youtube`（YouTube）、`tiktok`（TikTok）、`acfun`（AcFun）、`zhihu`（知乎）、`weishi`（微视）、`huya`（虎牙）、`haokan`（好看视频）、`meipai`（美拍）、`twitter`（Twitter/X）、`instagram`（Instagram）、`doubao`（豆包） |
-| `customApis` | array | [] | 自定义平台专属 API 列表。每项包含：`platform`（平台类型）、`apiUrl`（API 地址）。可覆盖内置默认专属 API |
+| `platformDedicatedFirst` | object | 各平台均为 `false` | 各平台独立开关：是否优先使用平台专属 API。对象键为平台标识（英文），值为布尔值。支持的键：`bilibili`、`douyin`、`kuaishou`、`xiaohongshu`、`weibo`、`xigua`、`youtube`、`tiktok`、`acfun`、`zhihu`、`weishi`、`huya`、`haokan`、`meipai`、`twitter`、`instagram`、`doubao`、`oasis`、`wechat_channel` |
+| `customApis` | array | [] | 自定义平台专属 API 列表。每项包含：`platform`（平台类型）、`apiUrl`（API 地址）、`apiKey`（API Key，可选）、`authHeaderType`（认证头类型，可选：`Bearer` / `X-API-Key` / `Custom`）、`customHeaderName`（自定义 Header 名称，仅当 `authHeaderType` 为 `Custom` 时有效）。可覆盖内置默认专属 API |
 
 ### 错误与重试设置
 | 配置项 | 类型 | 默认值 | 说明 |
@@ -133,6 +133,8 @@ This is a **multi-platform video/image parsing plugin** developed for the Koishi
 | 皮皮搞笑 | pipigx, h5.pipigx.com | 短视频 |
 | 皮皮虾 | pipixia, h5.pipix.com | 短视频 |
 | 最右 | zuiyou, xiaochuankeji.cn | 短视频 |
+| 绿洲 (Oasis) | oasis.weibo.com | 视频、图文 |
+| 视频号 (WeChat Channels) | channels.weixin.qq.com | 短视频 |
 
 > 注：部分平台解析能力可能因API限制有所差异，具体以实际解析结果为准。