koishi-plugin-music-parser-all 0.0.7 → 0.0.9

package/lib/index.d.ts

@@ -34,10 +34,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;
@@ -135,10 +131,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;
@@ -230,3 +222,6 @@ export declare const Config: Schema<{
     parseErrorItemFormat: string;
 }>;
 export declare function apply(ctx: Context, config: any): void;
+export declare namespace apply {
+    var inject: string[];
+}

package/lib/index.js

@@ -99,13 +99,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)'),
@@ -503,20 +499,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 {
-            aria2 = ctx.aria2;
-            if (aria2) {
-                logger.info('已获取 aria2 服务实例 (koishi-plugin-aria2-plus)');
-            }
-            else {
-                logger.warn('aria2 服务不可用，将回退到内置下载');
-            }
-        }
-        catch (e) {
-            logger.warn('获取 aria2 服务失败，将回退到内置下载');
-        }
+    if (downloadEngine === 'aria2' && !ctx.aria2) {
+        logger.warn('选择了 aria2 下载引擎，但未检测到 koishi-plugin-aria2-plus 服务，将回退到内置下载');
     }
     const customPlatforms = (config.customPlatforms || []).map((p) => ({
         name: p.name,
@@ -624,9 +608,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.addUri([url], {
+                const gid = await ctx.aria2.addUri([url], {
                     dir: cacheDir,
                     out: fileName,
                     split: 4,
@@ -642,10 +626,10 @@ function apply(ctx, config) {
                 const ariaStartTime = Date.now();
                 while (!completed) {
                     if (Date.now() - ariaStartTime > timeout) {
-                        await aria2.remove(gid).catch(() => { });
+                        await ctx.aria2.remove(gid).catch(() => { });
                         throw new Error('aria2下载超时');
                     }
-                    const status = await aria2.tellStatus(gid);
+                    const status = await ctx.aria2.tellStatus(gid);
                     if (status.status === 'complete') {
                         completed = true;
                     }
@@ -1091,3 +1075,4 @@ function apply(ctx, config) {
     });
     debugLog('INFO', '音乐解析插件初始化完成');
 }
+apply.inject = ['aria2', 'downloads'];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-music-parser-all",
   "description": "Koishi 全平台音乐解析插件，支持网易云音乐/酷我音乐/QQ音乐/汽水音乐等平台",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [