koishi-plugin-video-parser-all 1.3.7 → 1.3.9

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;
@@ -205,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;

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 端口'),
@@ -810,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' },
@@ -835,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,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-video-parser-all",
   "description": "Koishi 全平台视频/图集解析插件，支持抖音/快手/B站/微博/小红书/剪映/YouTube/TikTok等20+平台",
-  "version": "1.3.7",
+  "version": "1.3.9",
   "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",
+    "koishi-plugin-downloads": "^1.0.0",
     "koishi-plugin-silk": "^1.0.0",
     "koishi-plugin-ffmpeg": "^1.0.0",
     "aria2": "^4.1.2"
   },
   "peerDependenciesMeta": {
+    "koishi-plugin-downloads": {
+      "optional": true
+    },
     "koishi-plugin-silk": {
       "optional": true
     },