koishi-plugin-music-parser-all 0.0.4 → 0.0.5

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 = "music-parser-all";

package/lib/index.js

@@ -506,19 +506,16 @@ function apply(ctx, config) {
     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 连接成功');
+            aria2 = ctx.aria2;
+            if (aria2) {
+                logger.info('已获取 aria2 服务实例 (koishi-plugin-aria2-plus)');
+            }
+            else {
+                logger.warn('aria2 服务不可用，将回退到内置下载');
+            }
         }
         catch (e) {
-            logger.warn('aria2 连接失败，回退到内置下载');
+            logger.warn('获取 aria2 服务失败，将回退到内置下载');
         }
     }
     const customPlatforms = (config.customPlatforms || []).map((p) => ({
@@ -629,7 +626,7 @@ function apply(ctx, config) {
         }
         else if (downloadEngine === 'aria2' && aria2 && config.resumeDownload) {
             try {
-                const gid = await aria2.call('aria2.addUri', [url], {
+                const gid = await aria2.addUri([url], {
                     dir: cacheDir,
                     out: fileName,
                     split: 4,
@@ -645,10 +642,10 @@ function apply(ctx, config) {
                 const ariaStartTime = Date.now();
                 while (!completed) {
                     if (Date.now() - ariaStartTime > timeout) {
-                        await aria2.call('aria2.remove', gid).catch(() => { });
+                        await aria2.remove(gid).catch(() => { });
                         throw new Error('aria2下载超时');
                     }
-                    const status = await aria2.call('aria2.tellStatus', gid);
+                    const status = await aria2.tellStatus(gid);
                     if (status.status === 'complete') {
                         completed = true;
                     }
@@ -1073,8 +1070,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-music-parser-all",
   "description": "Koishi 全平台音乐解析插件，支持网易云音乐/酷我音乐/QQ音乐/汽水音乐等平台",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -46,7 +46,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": {
@@ -58,7 +58,7 @@
     "koishi-plugin-ffmpeg": {
       "optional": true
     },
-    "aria2": {
+    "koishi-plugin-aria2-plus": {
       "optional": true
     }
   },