mioku-plugin-music 2.3.0 → 2.4.1

package/config.md

@@ -1,6 +1,6 @@
 ---
 title: Music 插件配置
-description: 在这里调整 music 插件的配置项目
+description: 在这里调整 music 插件的配置项目。Token/Cookie、Storefront、语言、音质等请分别在 Apple Music / NetEase 的「服务配置」页面配置。
 fields:
   - key: base.searchLimit
     label: 默认搜索条数
@@ -11,71 +11,20 @@ fields:
   - key: base.defaultProvider
     label: 默认音乐源
     type: select
-    description: 需要安装对应的服务
+    description: 初次安装为「无」，需要选择对应的提供商并安装其服务后使用
     options:
+      - value: ""
+        label: 无（未选择）
       - value: applemusic
         label: Apple Music
       - value: netease
         label: NetEase Cloud Music
-
-  - key: base.applemusic.storefront
-    label: Apple Music Storefront
-    type: text
-    description: 默认地区代码，例如 cn、us、jp。
-    placeholder: cn
-
-  - key: base.applemusic.language
-    label: Apple Music 语言
-    type: text
-    description: 默认语言代码，例如 zh-CN、en-US。
-    placeholder: zh-CN
-
-  - key: base.applemusic.defaultMediaUserToken
-    label: 默认 Media User Token
-    type: secret
-    description: Apple Music 下载高质量 AAC 必需 token，无token仅能下载30s音频
-    placeholder: eyJ...
-
-  - key: base.netease.quality
-    label: NetEase 音质
-    type: select
-    description: 下载音质档位，lossless/hires 需要 VIP cookie
-    options:
-      - value: standard
-        label: 标准 (128k)
-      - value: exhigh
-        label: 极高 (320k，推荐)
-      - value: lossless
-        label: 无损 FLAC
-      - value: hires
-        label: Hi-Res
-
-  - key: base.netease.defaultCookie
-    label: NetEase Cookie
-    type: secret
-    description: 网易云 MUSIC_U cookie，无 cookie 仅能搜索；VIP 音质必须配置
-    placeholder: MUSIC_U=...; os=pc; appver=8.9.75;
 ---
 
+> 默认音乐源初始为「无」。请先在上方选择提供商，**重启 Bot 后会自动下载对应服务**。
+
 ```mioku-fields
 keys:
   - base.searchLimit
   - base.defaultProvider
 ```
-
-### 以下为 Apple Music 的配置区域
-
-```mioku-fields
-keys:
-  - base.applemusic.storefront
-  - base.applemusic.language
-  - base.applemusic.defaultMediaUserToken
-```
-
-### 以下为网易云音乐的配置区域
-
-```mioku-fields
-keys:
-   - base.netease.quality
-   - base.netease.defaultCookie
-```

package/config.ts

@@ -2,14 +2,5 @@ import type { MusicBaseConfig } from "./types";
 
 export const MUSIC_DEFAULTS: MusicBaseConfig = {
   searchLimit: 15,
-  defaultProvider: "applemusic",
-  applemusic: {
-    storefront: "cn",
-    language: "zh-CN",
-    defaultMediaUserToken: "",
-  },
-  netease: {
-    quality: "exhigh",
-    defaultCookie: "",
-  },
+  defaultProvider: "",
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mioku-plugin-music",
-  "version": "2.3.0",
+  "version": "2.4.1",
   "description": "音乐插件：点歌、搜索音乐、听歌语音发送",
   "main": "index.ts",
   "type": "module",

package/runtime-core/service.ts

@@ -348,12 +348,16 @@ export class MusicPluginRuntime {
 
   private createProvider(provider: MusicProviderName, mediaUserToken?: string) {
     const resolvedProvider = this.resolveProviderName(provider);
+
+    const amDefaults = this.deps.applemusicService?.getDefaultOptions();
+    const neDefaults = this.deps.neteaseService?.getDefaultOptions();
+
     const finalMediaUserToken =
       String(mediaUserToken || "").trim() ||
-      String(this.config.applemusic.defaultMediaUserToken || "").trim() ||
+      String(amDefaults?.mediaUserToken || "").trim() ||
       undefined;
     const neteaseCookie =
-      String(this.config.netease?.defaultCookie || "").trim() || undefined;
+      String(neDefaults?.cookie || "").trim() || undefined;
 
     return createMusicProvider(
       resolvedProvider,
@@ -364,9 +368,9 @@ export class MusicPluginRuntime {
       {
         mediaUserToken: finalMediaUserToken,
         neteaseCookie,
-        neteaseQuality: this.config.netease?.quality,
-        storefront: this.config.applemusic.storefront,
-        language: this.config.applemusic.language,
+        neteaseQuality: (neDefaults?.quality || "exhigh") as any,
+        storefront: String(amDefaults?.storefront || "cn"),
+        language: String(amDefaults?.language || "zh-CN"),
       },
     );
   }

package/runtime.ts

@@ -12,11 +12,11 @@ export interface MusicRuntimeState {
 const MUSIC_PLUGIN_NAME = "music";
 
 export function getMusicRuntimeState(): MusicRuntimeState {
-  return getPluginRuntimeState<MusicRuntimeState>(MUSIC_PLUGIN_NAME);
+  return getPluginRuntimeState(MUSIC_PLUGIN_NAME) as MusicRuntimeState;
 }
 
 export function setMusicRuntimeState(nextState: MusicRuntimeState): MusicRuntimeState {
-  return setPluginRuntimeState<MusicRuntimeState>(MUSIC_PLUGIN_NAME, nextState);
+  return setPluginRuntimeState(MUSIC_PLUGIN_NAME, nextState) as MusicRuntimeState;
 }
 
 export function resetMusicRuntimeState(): void {

package/types.ts

@@ -7,15 +7,6 @@ export type MusicProviderQuality = "standard" | "exhigh" | "lossless" | "hires";
 export interface MusicBaseConfig {
   searchLimit: number;
   defaultProvider?: MusicProviderName | string;
-  applemusic: {
-    storefront: string;
-    language: string;
-    defaultMediaUserToken?: string;
-  };
-  netease: {
-    quality: MusicProviderQuality;
-    defaultCookie: string;
-  };
 }
 
 export interface MusicTrack {