koishi-plugin-video-parser-all 1.4.5 → 1.4.6

package/lib/index.d.ts

@@ -4,6 +4,7 @@ declare module 'koishi' {
         downloads?: {
             download(url: string, dest: string, options?: Record<string, unknown>): Promise<string>;
         };
+        aria2?: any;
     }
 }
 export declare const name = "video-parser-all";
@@ -60,10 +61,6 @@ export declare const Config: Schema<{
     mediaDownloadTimeout?: number | null | undefined;
     maxMediaSize?: number | null | undefined;
     downloadEngine?: "internal" | "aria2" | "downloads" | null | undefined;
-    aria2Host?: string | null | undefined;
-    aria2Port?: number | null | undefined;
-    aria2Secret?: string | null | undefined;
-    resumeDownload?: boolean | null | undefined;
 } & {
     timeout?: number | null | undefined;
     videoSendTimeout?: number | null | undefined;
@@ -209,10 +206,6 @@ export declare const Config: Schema<{
     mediaDownloadTimeout: number;
     maxMediaSize: number;
     downloadEngine: "internal" | "aria2" | "downloads";
-    aria2Host: string;
-    aria2Port: number;
-    aria2Secret: string;
-    resumeDownload: boolean;
 } & {
     timeout: number;
     videoSendTimeout: number;

package/lib/index.js

@@ -127,13 +127,9 @@ exports.Config = koishi_1.Schema.intersect([
         maxMediaSize: koishi_1.Schema.number().min(0).step(1).default(0).description('最大下载文件大小 (MB)，0 为不限制'),
         downloadEngine: koishi_1.Schema.union([
             koishi_1.Schema.const('internal').description('内置下载'),
-            koishi_1.Schema.const('aria2').description('aria2 下载'),
+            koishi_1.Schema.const('aria2').description('aria2 下载（需 koishi-plugin-aria2-plus）'),
             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 端口'),
-        aria2Secret: koishi_1.Schema.string().default('').description('aria2 RPC 密钥'),
-        resumeDownload: koishi_1.Schema.boolean().default(true).description('启用断点续传（仅 aria2 模式）'),
     }).description('性能与限制'),
     koishi_1.Schema.object({
         timeout: koishi_1.Schema.number().min(0).step(1).default(180000).description('API 请求超时 (ms)'),
@@ -740,23 +736,8 @@ function apply(ctx, config) {
     const mediaDownloadTimeout = config.mediaDownloadTimeout ?? 120000;
     const maxMediaSize = config.maxMediaSize ?? 0;
     const downloadEngine = config.downloadEngine || 'internal';
-    let aria2 = null;
-    if (downloadEngine === 'aria2') {
-        try {
-            const Aria2 = require('aria2');
-            aria2 = new Aria2({
-                host: config.aria2Host || '127.0.0.1',
-                port: config.aria2Port || 6800,
-                secure: false,
-                secret: config.aria2Secret || '',
-                path: '/jsonrpc'
-            });
-            aria2.open();
-            logger.info('aria2 连接成功');
-        }
-        catch (e) {
-            logger.warn('aria2 连接失败，回退到内置下载');
-        }
+    if (downloadEngine === 'aria2' && !ctx.aria2) {
+        logger.warn('选择了 aria2 下载引擎，但未检测到 koishi-plugin-aria2-plus 服务，将回退到内置下载');
     }
     function getPlatformConfig(type) {
         if (type.startsWith('custom_')) {
@@ -852,9 +833,9 @@ function apply(ctx, config) {
                 debugLog('ERROR', `downloads 服务下载失败，回退内置下载: ${getErrorMessage(e)}`);
             }
         }
-        else if (downloadEngine === 'aria2' && aria2 && config.resumeDownload) {
+        else if (downloadEngine === 'aria2' && ctx.aria2) {
             try {
-                const gid = await aria2.call('aria2.addUri', [url], {
+                const gid = await ctx.aria2.addUri([url], {
                     dir: cacheDir,
                     out: fileName,
                     split: 4,
@@ -870,10 +851,10 @@ function apply(ctx, config) {
                 const ariaStartTime = Date.now();
                 while (!completed) {
                     if (Date.now() - ariaStartTime > timeout) {
-                        await aria2.call('aria2.remove', gid).catch(() => { });
+                        await ctx.aria2.remove(gid).catch(() => { });
                         throw new Error('aria2下载超时');
                     }
-                    const status = await aria2.call('aria2.tellStatus', gid);
+                    const status = await ctx.aria2.tellStatus(gid);
                     if (status.status === 'complete') {
                         completed = true;
                     }
@@ -1339,8 +1320,6 @@ function apply(ctx, config) {
     }, 3600000);
     ctx.on('dispose', () => {
         clearInterval(tempCleanupInterval);
-        if (aria2)
-            aria2.close();
         urlCacheLocal.clear();
         dedupCache.clear();
         debugLog('INFO', '插件已卸载');

package/package.json

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

package/readme.md

@@ -61,10 +61,6 @@ This is a **multi-platform video/image parsing plugin** developed for the Koishi
 | `mediaDownloadTimeout` | number | 120000 | 统一下载超时 (ms) |
 | `maxMediaSize` | number | 0 | 最大下载文件大小 (MB)，0 为不限制 |
 | `downloadEngine` | string | internal | 下载引擎（internal / aria2 / downloads） |
-| `aria2Host` | string | 127.0.0.1 | aria2 RPC 地址 |
-| `aria2Port` | number | 6800 | aria2 RPC 端口 |
-| `aria2Secret` | string |  | aria2 RPC 密钥 |
-| `resumeDownload` | boolean | true | 启用断点续传（仅 aria2） |
 
 ### 网络与请求
 | 配置项 | 类型 | 默认值 | 说明 |
@@ -134,11 +130,7 @@ This is a **multi-platform video/image parsing plugin** developed for the Koishi
 - `koishi-plugin-silk`：silk 编解码
 - `koishi-plugin-ffmpeg`：音频重采样
 ### aria2 下载引擎（可选）
-若启用 `downloadEngine: 'aria2'`，请安装并启动 aria2 服务，并安装 npm 包 `aria2`：
-- 安装 aria2 服务端：https://github.com/aria2/aria2
-- 安装 npm 客户端：`npm install aria2`
-- 启动 RPC：`aria2c --enable-rpc --rpc-listen-all=true --rpc-allow-origin-all`
-未满足条件时自动降级为内置下载，不影响正常使用。
+若启用 `downloadEngine: 'aria2'`，请安装可选依赖 `koishi-plugin-aria2-plus` 并配置该插件连接 aria2 服务。插件启动时会自动检测该服务，未安装或不可用时将降级为内置下载，不影响正常使用。
 ### downloads 服务（可选）
 若启用 `downloadEngine: 'downloads'`，请安装可选依赖 `koishi-plugin-downloads`，失败时回退到内置下载。