koishi-plugin-video-parser-all 1.0.8 → 1.0.9

package/lib/index.d.ts

@@ -32,6 +32,7 @@ export declare const Config: Schema<{
     customApis?: ({
         platform?: "bilibili" | "douyin" | "kuaishou" | "xiaohongshu" | "weibo" | "xigua" | "youtube" | "tiktok" | "acfun" | "zhihu" | "weishi" | "huya" | "haokan" | "meipai" | "twitter" | "instagram" | "doubao" | null | undefined;
         apiUrl?: string | null | undefined;
+        useDedicatedFirst?: boolean | null | undefined;
     } & import("cosmokit").Dict)[] | null | undefined;
 } & {
     waitingTipText?: string | null | undefined;
@@ -71,6 +72,7 @@ export declare const Config: Schema<{
     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">;
         apiUrl: Schema<string, string>;
+        useDedicatedFirst: Schema<boolean, boolean>;
     }>[];
 } & {
     waitingTipText: string;

package/lib/index.js

@@ -48,29 +48,30 @@ exports.Config = koishi_1.Schema.intersect([
     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/即梦）'),
-        useDedicatedApiFirst: koishi_1.Schema.boolean().default(false).description('优先使用平台专属 API，失败后回退到通用 API'),
+        useDedicatedApiFirst: koishi_1.Schema.boolean().default(false).description('全局默认：是否优先使用平台专属 API（各平台可单独覆盖）'),
         customApis: koishi_1.Schema.array(koishi_1.Schema.object({
             platform: koishi_1.Schema.union([
-                'bilibili',
-                'douyin',
-                'kuaishou',
-                'xiaohongshu',
-                'weibo',
-                'xigua',
-                'youtube',
-                'tiktok',
-                'acfun',
-                'zhihu',
-                'weishi',
-                'huya',
-                'haokan',
-                'meipai',
-                'twitter',
-                'instagram',
-                'doubao',
+                koishi_1.Schema.const('bilibili').description('哔哩哔哩'),
+                koishi_1.Schema.const('douyin').description('抖音'),
+                koishi_1.Schema.const('kuaishou').description('快手'),
+                koishi_1.Schema.const('xiaohongshu').description('小红书'),
+                koishi_1.Schema.const('weibo').description('微博'),
+                koishi_1.Schema.const('xigua').description('西瓜视频'),
+                koishi_1.Schema.const('youtube').description('YouTube'),
+                koishi_1.Schema.const('tiktok').description('TikTok'),
+                koishi_1.Schema.const('acfun').description('AcFun'),
+                koishi_1.Schema.const('zhihu').description('知乎'),
+                koishi_1.Schema.const('weishi').description('微视'),
+                koishi_1.Schema.const('huya').description('虎牙'),
+                koishi_1.Schema.const('haokan').description('好看视频'),
+                koishi_1.Schema.const('meipai').description('美拍'),
+                koishi_1.Schema.const('twitter').description('Twitter/X'),
+                koishi_1.Schema.const('instagram').description('Instagram'),
+                koishi_1.Schema.const('doubao').description('豆包'),
             ]).description('选择平台'),
             apiUrl: koishi_1.Schema.string().description('API 地址'),
-        })).default([]).description('自定义平台专属 API，可覆盖默认专属 API'),
+            useDedicatedFirst: koishi_1.Schema.boolean().default(false).description('该平台优先使用此专属 API'),
+        })).default([]).description('自定义平台专属 API，可覆盖默认专属 API，并可单独设定优先策略'),
     }).description('API 选择设置'),
     koishi_1.Schema.object({
         waitingTipText: koishi_1.Schema.string().default('正在解析视频，请稍候...').description('解析等待提示'),
@@ -99,6 +100,11 @@ function debugLog(level, ...args) {
     }).join(' ')}`;
     logger.info(message);
 }
+const urlCache = new lru_cache_1.LRUCache({
+    max: 500,
+    ttl: 10 * 60 * 1000,
+    updateAgeOnGet: false,
+});
 function linkTypeParser(content) {
     content = content.replace(/\\\//g, '/');
     const rules = [
@@ -147,7 +153,54 @@ function linkTypeParser(content) {
 }
 function extractAllUrlsFromMessage(session) {
     const content = session.content?.trim() || '';
-    return linkTypeParser(content);
+    const rawUrls = [];
+    const textMatch = content.match(/https?:\/\/[^\s<>"'(){}[\]]+/gi);
+    if (textMatch)
+        rawUrls.push(...textMatch);
+    if (session.elements) {
+        for (const elem of session.elements) {
+            if (elem.type === 'xml' && elem.data) {
+                const matches = elem.data.match(/https?:\/\/[^\s<>"'(){}[\]]+/gi);
+                if (matches)
+                    rawUrls.push(...matches);
+            }
+            else if (elem.type === 'json' && elem.data) {
+                try {
+                    const json = JSON.parse(elem.data);
+                    const extract = (obj) => {
+                        if (!obj || typeof obj !== 'object')
+                            return;
+                        for (const val of Object.values(obj)) {
+                            if (typeof val === 'string') {
+                                const matches = val.match(/https?:\/\/[^\s<>"'(){}[\]]+/gi);
+                                if (matches)
+                                    rawUrls.push(...matches);
+                            }
+                            else if (typeof val === 'object')
+                                extract(val);
+                        }
+                    };
+                    extract(json);
+                }
+                catch { }
+            }
+        }
+    }
+    const seen = new Set();
+    const result = [];
+    for (const rawUrl of rawUrls) {
+        const cleanedUrl = rawUrl.replace(/&amp;/g, '&').replace(/[.,;:!?)]+$/, '');
+        if (seen.has(cleanedUrl))
+            continue;
+        const matches = linkTypeParser(cleanedUrl);
+        for (const match of matches) {
+            if (!seen.has(match.url)) {
+                seen.add(match.url);
+                result.push(match);
+            }
+        }
+    }
+    return result;
 }
 function cleanUrl(url) {
     try {
@@ -385,11 +438,6 @@ function buildForwardNode(session, content, botName) {
         }
     }, messageContent);
 }
-const urlCache = new lru_cache_1.LRUCache({
-    max: 500,
-    ttl: 10 * 60 * 1000,
-    updateAgeOnGet: false,
-});
 async function downloadVideoFile(videoUrl, tempDir, timeout, maxSizeMB) {
     if (!videoUrl)
         throw new Error('视频链接为空');
@@ -483,13 +531,13 @@ function apply(ctx, config) {
         zuiyou: 'https://api.bugpk.com/api/zuiyou',
     };
     const backupSupportedPlatforms = new Set(['douyin', 'xiaohongshu', 'instagram', 'jimeng']);
-    function getDedicatedApiUrl(type) {
-        if (config.customApis && Array.isArray(config.customApis)) {
-            const found = config.customApis.find((item) => item.platform === type);
-            if (found && found.apiUrl)
-                return found.apiUrl;
+    function getPlatformConfig(type) {
+        const custom = config.customApis?.find((item) => item.platform === type);
+        if (custom && custom.apiUrl) {
+            return { apiUrl: custom.apiUrl, dedicatedFirst: custom.useDedicatedFirst ?? false };
         }
-        return defaultDedicatedApis[type] || null;
+        const defaultUrl = defaultDedicatedApis[type] || null;
+        return { apiUrl: defaultUrl, dedicatedFirst: config.useDedicatedApiFirst ?? false };
     }
     async function fetchApi(url, type) {
         const cacheKey = url;
@@ -498,14 +546,13 @@ function apply(ctx, config) {
             debugLog('DEBUG', `使用缓存: ${url}`);
             return cached.data;
         }
-        const dedicatedApiUrl = getDedicatedApiUrl(type);
+        const { apiUrl: dedicatedUrl, dedicatedFirst } = 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 (config.useDedicatedApiFirst) {
-            if (dedicatedApiUrl)
-                apiList.push({ url: dedicatedApiUrl, label: `专属API(${type})` });
+        if (dedicatedFirst && dedicatedUrl) {
+            apiList.push({ url: dedicatedUrl, label: `专属API(${type})` });
             apiList.push({ url: primaryApi, label: '默认主API' });
             if (backupAllowed)
                 apiList.push({ url: backupApi, label: '备用主API' });
@@ -514,8 +561,8 @@ function apply(ctx, config) {
             apiList.push({ url: primaryApi, label: '默认主API' });
             if (backupAllowed)
                 apiList.push({ url: backupApi, label: '备用主API' });
-            if (dedicatedApiUrl)
-                apiList.push({ url: dedicatedApiUrl, label: `专属API(${type})` });
+            if (dedicatedUrl)
+                apiList.push({ url: dedicatedUrl, label: `专属API(${type})` });
         }
         let lastError = null;
         for (const api of apiList) {

package/package.json

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