koishi-plugin-video-parser-all 1.3.6 → 1.3.8

package/lib/index.d.ts

@@ -58,7 +58,7 @@ export declare const Config: Schema<{
     downloadConcurrency?: number | null | undefined;
     mediaDownloadTimeout?: number | null | undefined;
     maxMediaSize?: number | null | undefined;
-    downloadEngine?: "internal" | "aria2" | null | undefined;
+    downloadEngine?: "internal" | "aria2" | "downloads" | null | undefined;
     aria2Host?: string | null | undefined;
     aria2Port?: number | null | undefined;
     aria2Secret?: string | null | undefined;
@@ -93,11 +93,6 @@ export declare const Config: Schema<{
 } & {
     primaryApiUrl?: string | null | undefined;
     backupApiUrl?: string | null | undefined;
-    apiKeys?: ({
-        key?: string | null | undefined;
-        weight?: number | null | undefined;
-    } & import("cosmokit").Dict)[] | null | undefined;
-    rotationMode?: "sequential" | "load_balance" | null | undefined;
     platformDedicatedFirst?: ({
         bilibili?: boolean | null | undefined;
         douyin?: boolean | null | undefined;
@@ -210,7 +205,7 @@ export declare const Config: Schema<{
     downloadConcurrency: number;
     mediaDownloadTimeout: number;
     maxMediaSize: number;
-    downloadEngine: "internal" | "aria2";
+    downloadEngine: "internal" | "aria2" | "downloads";
     aria2Host: string;
     aria2Port: number;
     aria2Secret: string;
@@ -248,11 +243,6 @@ export declare const Config: Schema<{
 } & {
     primaryApiUrl: string;
     backupApiUrl: string;
-    apiKeys: Schemastery.ObjectT<{
-        key: Schema<string, string>;
-        weight: Schema<number, number>;
-    }>[];
-    rotationMode: "sequential" | "load_balance";
     platformDedicatedFirst: Schemastery.ObjectT<{
         bilibili: Schema<boolean, boolean>;
         douyin: Schema<boolean, boolean>;

package/lib/index.js

@@ -115,7 +115,7 @@ exports.Config = koishi_1.Schema.intersect([
     }).description('媒体发送'),
     koishi_1.Schema.object({
         showMusicVoice: koishi_1.Schema.boolean().default(false).description('音乐链接以语音形式发送'),
-        showMusicVoiceFile: koishi_1.Schema.boolean().default(true).description('音乐语音是否以文件形式发送（关闭则只发送链接）'),
+        showMusicVoiceFile: koishi_1.Schema.boolean().default(true).description('音乐链接是否以语音形式发送（关闭则只发送链接）'),
         forceDownloadMusicVoice: koishi_1.Schema.boolean().default(false).description('强制下载音乐语音'),
     }).description('音乐语音（需 silk 和 ffmpeg）'),
     koishi_1.Schema.object({
@@ -127,6 +127,7 @@ exports.Config = koishi_1.Schema.intersect([
         downloadEngine: koishi_1.Schema.union([
             koishi_1.Schema.const('internal').description('内置下载'),
             koishi_1.Schema.const('aria2').description('aria2 下载'),
+            koishi_1.Schema.const('downloads').description('downloads 服务下载'),
         ]).default('internal').description('下载引擎'),
         aria2Host: koishi_1.Schema.string().default('127.0.0.1').description('aria2 RPC 地址'),
         aria2Port: koishi_1.Schema.number().default(6800).description('aria2 RPC 端口'),
@@ -169,14 +170,6 @@ exports.Config = koishi_1.Schema.intersect([
     koishi_1.Schema.object({
         primaryApiUrl: koishi_1.Schema.string().default('https://api.bugpk.com/api/short_videos').hidden(),
         backupApiUrl: koishi_1.Schema.string().default('https://api.bugpk.com/api/svparse').hidden(),
-        apiKeys: koishi_1.Schema.array(koishi_1.Schema.object({
-            key: koishi_1.Schema.string().required().description('API Key'),
-            weight: koishi_1.Schema.number().min(1).default(1).description('权重（负载均衡模式）'),
-        })).default([]).description('多 API 密钥（轮换使用）'),
-        rotationMode: koishi_1.Schema.union([
-            koishi_1.Schema.const('sequential').description('顺序模式（无效时切换）'),
-            koishi_1.Schema.const('load_balance').description('负载均衡模式（轮询）'),
-        ]).default('sequential').description('密钥轮换模式'),
         platformDedicatedFirst: koishi_1.Schema.object({
             bilibili: koishi_1.Schema.boolean().default(false).description('哔哩哔哩'),
             douyin: koishi_1.Schema.boolean().default(false).description('抖音'),
@@ -693,8 +686,6 @@ function parseFieldMapping(mappingStr) {
     }
 }
 function apply(ctx, config) {
-    // @ts-expect-error koishi runtime supports optional service dependencies
-    ctx.using(['downloads', 'silk', 'ffmpeg'], { optional: true });
     debugEnabled = config.debug || false;
     debugLog('INFO', 'plugin start');
     const dedupCache = new SimpleLRUCache(1000, config.deduplicationInterval * 1000);
@@ -740,38 +731,6 @@ function apply(ctx, config) {
             logger.warn('aria2 连接失败，回退到内置下载');
         }
     }
-    const apiKeyList = (config.apiKeys || []).map((k) => ({
-        key: k.key,
-        weight: k.weight || 1,
-        lastUsed: 0
-    }));
-    let keyIndex = 0;
-    function getNextApiKey() {
-        if (apiKeyList.length === 0)
-            return '';
-        if (config.rotationMode === 'load_balance') {
-            const totalWeight = apiKeyList.reduce((sum, k) => sum + k.weight, 0);
-            let rand = Math.random() * totalWeight;
-            for (const k of apiKeyList) {
-                rand -= k.weight;
-                if (rand <= 0)
-                    return k.key;
-            }
-            return apiKeyList[0].key;
-        }
-        else {
-            const current = apiKeyList[keyIndex % apiKeyList.length];
-            keyIndex++;
-            return current.key;
-        }
-    }
-    function markApiKeyInvalid(key) {
-        if (config.rotationMode === 'sequential') {
-            const idx = apiKeyList.findIndex(k => k.key === key);
-            if (idx !== -1)
-                apiKeyList.splice(idx, 1);
-        }
-    }
     function getPlatformConfig(type) {
         if (type.startsWith('custom_')) {
             const name = type.slice(7);
@@ -780,7 +739,7 @@ function apply(ctx, config) {
                 return {
                     apiUrl: custom.apiUrl,
                     dedicatedFirst: true,
-                    apiKey: custom.apiKey || getNextApiKey(),
+                    apiKey: custom.apiKey || '',
                     authHeaderType: custom.authHeaderType,
                     customHeaderName: custom.customHeaderName,
                     fieldMapping: custom.fieldMapping,
@@ -812,13 +771,13 @@ function apply(ctx, config) {
         let fieldMapping = undefined;
         if (custom && custom.apiUrl) {
             apiUrl = custom.apiUrl;
-            apiKey = custom.apiKey || getNextApiKey();
+            apiKey = custom.apiKey || '';
             authHeaderType = custom.authHeaderType || 'Bearer';
             customHeaderName = custom.customHeaderName || 'X-API-Key';
             fieldMapping = parseFieldMapping(custom.fieldMapping);
         }
         else {
-            apiKey = getNextApiKey();
+            apiKey = '';
         }
         const dedicatedFirst = config.platformDedicatedFirst?.[type] ?? false;
         if (!fieldMapping) {
@@ -852,18 +811,18 @@ function apply(ctx, config) {
             return cleanUrl(url);
         }
     }
+    const extRegexCache = {};
     async function downloadFile(url, timeout, maxSize, filePrefix, fileExts) {
         if (!url)
             throw new Error('链接为空');
         await promises_1.default.mkdir(cacheDir, { recursive: true });
-        const extRegexCache = {};
         const ext = fileExts.find(e => {
             const r = extRegexCache[e] || (extRegexCache[e] = new RegExp('\\.' + e + '(\\?|$)', 'i'));
             return r.test(url);
         }) || fileExts[0];
         const fileName = `${filePrefix}_${Date.now()}_${(0, crypto_1.randomBytes)(4).toString('hex')}.${ext}`;
         const filePath = path_1.default.resolve(cacheDir, fileName);
-        if (ctx.downloads) {
+        if (downloadEngine === 'downloads' && ctx.downloads) {
             try {
                 const dest = await ctx.downloads.download(url, path_1.default.join(cacheDir, fileName), {
                     headers: { 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36' },
@@ -877,10 +836,10 @@ function apply(ctx, config) {
                 return dest;
             }
             catch (e) {
-                debugLog('ERROR', `downloads 服务下载失败，回退: ${getErrorMessage(e)}`);
+                debugLog('ERROR', `downloads 服务下载失败，回退内置下载: ${getErrorMessage(e)}`);
             }
         }
-        if (aria2 && config.resumeDownload) {
+        else if (downloadEngine === 'aria2' && aria2 && config.resumeDownload) {
             try {
                 const gid = await aria2.call('aria2.addUri', [url], {
                     dir: cacheDir,
@@ -1199,10 +1158,6 @@ function apply(ctx, config) {
                         urlCacheLocal.set(cacheKey, { data: parsed, expire: Date.now() + cacheTTL });
                         return parsed;
                     }
-                    if (res.data?.code === 403 || res.data?.code === 401) {
-                        if (api.apiKey)
-                            markApiKeyInvalid(api.apiKey);
-                    }
                     throw new Error(res.data?.msg || `API返回错误码: ${res.data?.code}`);
                 }
                 catch (error) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-video-parser-all",
   "description": "Koishi 全平台视频/图集解析插件，支持抖音/快手/B站/微博/小红书/剪映/YouTube/TikTok等20+平台",
-  "version": "1.3.6",
+  "version": "1.3.8",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -98,11 +98,15 @@
   "peerDependencies": {
     "@koishijs/plugin-console": "^5.30.4",
     "koishi": "^4.18.7",
+    "@koishijs/plugin-downloads": "^5.30.4",
     "koishi-plugin-silk": "^1.0.0",
     "koishi-plugin-ffmpeg": "^1.0.0",
     "aria2": "^4.1.2"
   },
   "peerDependenciesMeta": {
+    "@koishijs/plugin-downloads": {
+      "optional": true
+    },
     "koishi-plugin-silk": {
       "optional": true
     },