@zhin.js/plugin-music 1.0.25 → 1.1.0

package/src/sources/qq.ts

@@ -1,148 +1,180 @@
-// plugins/utils/music/src/sources/qq.ts
-import type { MusicSearchService, MusicDetail,MusicInfo, MusicQQ } from '../types.js'
+import * as crypto from 'node:crypto';
+import type { MusicSearchService, MusicDetail, MusicInfo } from '../types.js';
+import { getCredential } from '../credential-store.js';
+
+const md5 = (text: string) => crypto.createHash('md5').update(text).digest('hex');
+
+const MUSICU_API = 'https://u.y.qq.com/cgi-bin/musicu.fcg';
+
+function getHeaders(cookie?: string | null) {
+  return {
+    Referer: 'https://y.qq.com',
+    Cookie: cookie ?? '',
+    'Content-Type': 'application/json; charset=UTF-8',
+  };
+}
 
-/** QQ 音乐搜索服务 */
 export class QQMusicService implements MusicSearchService {
   async search(keyword: string, limit = 10): Promise<MusicInfo[]> {
     try {
-      const url = new URL('https://c.y.qq.com/splcloud/fcgi-bin/smartbox_new.fcg')
-      url.searchParams.set('key', keyword)
-      url.searchParams.set('format', 'json')
-      
-      const response = await fetch(url, { method: 'GET' })
-      const data = await response.json() as { data: { song: { itemlist: MusicQQ[] } } }
-      
-      const items = data.data?.song?.itemlist || []
-      return items.slice(0, limit).map(music => ({
-        id: music.id,
-        source: 'qq' as const,
-        title: music.name,
-        url: `https://y.qq.com/n/yqq/song/${music.mid}.html`
-      }))
-    } catch (error) {
-      console.error('QQ Music search failed:', error)
-      return []
-    }
-  }
+      const cookie = await getCredential('qq', 'cookie');
+      const response = await fetch(MUSICU_API, {
+        method: 'POST',
+        headers: getHeaders(cookie),
+        body: JSON.stringify({
+          comm: { uin: '0', authst: '', ct: 29 },
+          search: {
+            method: 'DoSearchForQQMusicMobile',
+            module: 'music.search.SearchCgiService',
+            param: {
+              query: keyword,
+              grp: 1,
+              num_per_page: limit,
+              page_num: 1,
+              search_type: 0,
+              searchid: String(Date.now()),
+            },
+          },
+        }),
+      });
 
-  async getCover(id: string): Promise<string | null> {
-    try {
-      const url = new URL('https://u.y.qq.com/cgi-bin/musicu.fcg')
-      url.searchParams.set('format', 'json')
-      url.searchParams.set('inCharset', 'utf8')
-      url.searchParams.set('outCharset', 'utf-8')
-      url.searchParams.set('notice', '0')
-      url.searchParams.set('platform', 'yqq.json')
-      url.searchParams.set('needNewCode', '0')
-      url.searchParams.set('data', JSON.stringify({
-        comm: { ct: 24, cv: 0 },
-        songinfo: {
-          method: 'get_song_detail_yqq',
-          param: { song_type: 0, song_mid: '', song_id: parseInt(id) },
-          module: 'music.pf_song_detail_svr'
-        }
-      }))
-
-      const response = await fetch(url, { method: 'GET' })
-      const result = await response.json()
-      
-      const albumMid = result?.songinfo?.data?.track_info?.album?.mid
-      if (!albumMid) return null
-      
-      return `https://y.gtimg.cn/music/photo_new/T002R300x300M000${albumMid}.jpg`
+      const data = (await response.json()) as { code?: number; search?: { data?: { body?: { song?: { list?: any[] }; item_song?: any[] } } } };
+      if (data.code !== undefined && +data.code !== 0) return [];
+
+      const body = data.search?.data?.body ?? {};
+      const list = (body.song?.list ?? body.item_song ?? []) as any[];
+
+      return list.slice(0, limit).map((e) => {
+        const mid = e?.mid ?? '';
+        const albumMid = e?.album?.pmid ?? e?.album?.mid ?? '';
+        const singerMid = e?.singer?.[0]?.pmid ?? e?.singer?.[0]?.mid ?? '';
+        const cover = albumMid
+          ? `https://y.gtimg.cn/music/photo_new/T002R300x300M000${albumMid}.jpg`
+          : singerMid
+            ? `https://y.qq.com/music/photo_new/T001R300x300M000${singerMid}.jpg`
+            : '';
+
+        return {
+          id: String(e.id),
+          source: 'qq' as const,
+          title: e.name,
+          artist: (e.singer ?? []).map((s: any) => s.name).join('/'),
+          album: e.album?.name,
+          url: `https://y.qq.com/n/ryqq/songDetail/${mid}`,
+          image: cover,
+          duration: e.interval,
+          _mid: mid,
+          _mediaMid: e.file?.media_mid,
+        };
+      });
     } catch (error) {
-      console.error('QQ Music get cover failed:', error)
-      return null
+      console.error('QQ Music search failed:', error);
+      return [];
     }
   }
 
   async getDetail(id: string): Promise<MusicDetail> {
-    const url = new URL('https://u.y.qq.com/cgi-bin/musicu.fcg')
-      url.searchParams.set('format', 'json')
-      url.searchParams.set('data', JSON.stringify({
-        comm: { ct: 24, cv: 0 },
-        songinfo: {
-          method: 'get_song_detail_yqq',
-          param: { song_type: 0, song_mid: '', song_id: parseInt(id) },
-          module: 'music.pf_song_detail_svr'
-        }
-      }))
-
-      const response = await fetch(url, { method: 'GET' })
-      const result = await response.json()
-      
-      const trackInfo = result?.songinfo?.data?.track_info
-      if (!trackInfo) throw new Error('Music not found')
-
-      const albumMid = trackInfo.album?.mid
-      const image = albumMid 
-        ? `https://y.gtimg.cn/music/photo_new/T002R300x300M000${albumMid}.jpg`
-        : undefined
-
-      return {
-        id,
-        source: 'qq',
-        title: trackInfo.name,
-        url: `https://y.qq.com/n/yqq/song/${trackInfo.mid}.html`,
-        audio: await this.getAudioUrl(id),
-        image: image || '',
-        duration: trackInfo.interval,
-      }
+    const url = new URL(MUSICU_API);
+    url.searchParams.set('format', 'json');
+    url.searchParams.set('data', JSON.stringify({
+      comm: { ct: 24, cv: 0 },
+      songinfo: {
+        method: 'get_song_detail_yqq',
+        param: { song_type: 0, song_mid: '', song_id: parseInt(id) },
+        module: 'music.pf_song_detail_svr',
+      },
+    }));
+
+    const response = await fetch(url, { method: 'GET' });
+    const result = await response.json() as any;
+
+    const trackInfo = result?.songinfo?.data?.track_info;
+    if (!trackInfo) throw new Error('Music not found');
+
+    const albumMid = trackInfo.album?.mid;
+    const image = albumMid
+      ? `https://y.gtimg.cn/music/photo_new/T002R300x300M000${albumMid}.jpg`
+      : '';
+
+    return {
+      id,
+      source: 'qq',
+      title: trackInfo.name,
+      url: `https://y.qq.com/n/ryqq/songDetail/${trackInfo.mid}`,
+      audio: await this.getAudioUrl(id, trackInfo.mid, trackInfo.file?.media_mid),
+      image,
+      duration: trackInfo.interval,
+    };
   }
 
-  /**
-   * 获取音频直链（需要第三方 API）
-   * @param id 音乐 ID
-   * @param metingAPI Meting API 地址（可选）
-   * @returns 音频直链 URL
-   */
-  async getAudioUrl(id: string, metingAPI?: string): Promise<string> {
-    // QQ 音乐需要使用第三方 API
-      const apiUrl = metingAPI || 'https://api.injahow.cn/meting/'
-      const url = `${apiUrl}?type=url&id=${id}&source=qq`
-      
-      const response = await fetch(url, { method: 'GET' })
-      const data = await response.json() as { url?: string, data?: { url?: string } }
-      if(!data.url && !data.data?.url) {
-        throw new Error('Audio URL not found')
+  async getAudioUrl(id: string, mid?: string, mediaMid?: string): Promise<string> {
+    const cookie = await getCredential('qq', 'cookie');
+    if (cookie) {
+      try {
+        const uin = /uin=o?(\d+)/.exec(cookie)?.[1] ?? '0';
+        const songMid = mid ?? id;
+        const response = await fetch(MUSICU_API, {
+          method: 'POST',
+          headers: getHeaders(cookie),
+          body: JSON.stringify({
+            comm: {
+              ct: 19,
+              cv: '1891',
+              uin: '0',
+              guid: md5(`${uin}music`),
+              tmeAppID: 'qqmusic',
+              tmeLoginType: 2,
+            },
+            vkey: {
+              module: 'vkey.GetVkeyServer',
+              method: 'CgiGetVkey',
+              param: {
+                guid: md5(String(Date.now())),
+                songmid: [songMid],
+                songtype: [0],
+                uin: '0',
+                ctx: 1,
+                filename: [`C400${id}${mediaMid ?? songMid}.m4a`],
+              },
+            },
+          }),
+        });
+
+        const result = await response.json() as any;
+        if (result.vkey && +result.vkey.code === 0) {
+          const purl = result.vkey.data?.midurlinfo?.[0]?.purl;
+          if (purl) return `https://ws.stream.qqmusic.qq.com/${purl}`;
+        }
+      } catch {
+        // fall through to public fallback
       }
-      return data.url || data.data?.url!
+    }
+
+    // 无 cookie 的公开 fallback：md5 签名直链
+    const songMid = mid ?? id;
+    const code = md5(`${songMid}q;z(&l~sdf2!nK`).substring(0, 5).toUpperCase();
+    return `https://c6.y.qq.com/rsc/fcgi-bin/fcg_pyq_play.fcg?songmid=${songMid}&code=${code}`;
   }
 
-  /**
-   * 获取歌词
-   * @param id 音乐 ID
-   * @returns 歌词文本
-   */
   async getLyric(id: string): Promise<string | null> {
     try {
-      const url = new URL('https://c.y.qq.com/lyric/fcgi-bin/fcg_query_lyric_new.fcg')
-      url.searchParams.set('songmid', id)
-      url.searchParams.set('g_tk', '5381')
-      url.searchParams.set('format', 'json')
-      url.searchParams.set('inCharset', 'utf8')
-      url.searchParams.set('outCharset', 'utf-8')
-      url.searchParams.set('nobase64', '1')
-
-      const response = await fetch(url, { 
+      const url = new URL('https://c.y.qq.com/lyric/fcgi-bin/fcg_query_lyric_new.fcg');
+      url.searchParams.set('songmid', id);
+      url.searchParams.set('g_tk', '5381');
+      url.searchParams.set('format', 'json');
+      url.searchParams.set('inCharset', 'utf8');
+      url.searchParams.set('outCharset', 'utf-8');
+      url.searchParams.set('nobase64', '1');
+
+      const response = await fetch(url, {
         method: 'GET',
-        headers: {
-          'Referer': 'https://y.qq.com'
-        }
-      })
-      const data = await response.json() as { lyric?: string }
-      
-      if (!data.lyric) return null
-      
-      // QQ 音乐返回的歌词需要 base64 解码
-      try {
-        return Buffer.from(data.lyric, 'base64').toString('utf-8')
-      } catch {
-        return data.lyric
-      }
+        headers: { Referer: 'https://y.qq.com' },
+      });
+      const data = (await response.json()) as { lyric?: string };
+      return data.lyric ?? null;
     } catch (error) {
-      console.error('QQ Music get lyric failed:', error)
-      return null
+      console.error('QQ Music get lyric failed:', error);
+      return null;
     }
   }
 }

package/src/types.ts

@@ -1,24 +1,20 @@
-// plugins/utils/music/src/types.ts
+export type MusicSource = 'qq' | 'netease' | 'kuwo' | 'kugou';
 
-/** 音乐源类型 */
-export type MusicSource = "qq" | "netease";
-
-/** 音乐分享内容 */
 export interface MusicInfo {
   id: string;
   source: MusicSource;
-  /** 跳转链接 */
   url: string;
-  /** 音乐标题 */
   title: string;
+  artist?: string;
+  album?: string;
+  duration?: number;
 }
+
 export interface MusicDetail extends MusicInfo {
   image: string;
-  audio:string;
-  duration?: number;
+  audio: string;
 }
 
-/** 音乐源配置 */
 export interface MusicSourceConfig {
   appid: number;
   package: string;
@@ -27,21 +23,6 @@ export interface MusicSourceConfig {
   version: string;
 }
 
-/** QQ 音乐 API 响应 */
-export interface MusicQQ {
-  id: string;
-  mid: string;
-  name: string;
-  docid: string;
-  singer: string;
-  album?: {
-    mid: string;
-    name: string;
-  };
-  interval?: number;
-}
-
-/** 网易云音乐 API 响应 */
 export interface Music163 {
   id: string;
   name: string;
@@ -58,10 +39,7 @@ export interface Music163 {
   };
 }
 
-/** 音乐搜索服务接口 */
 export interface MusicSearchService {
-  /** 搜索音乐 */
   search(keyword: string, limit?: number): Promise<MusicInfo[]>;
-  /** 获取音乐详情 */
   getDetail(id: string): Promise<MusicDetail>;
 }

package/tools/music-search.js

@@ -0,0 +1,21 @@
+// Generated by build-plugin-runtime-entries.mjs. Do not edit.
+import { defineAgentTool } from '@zhin.js/tool';
+import { searchMusic } from "../lib/music-lib.js";
+export default defineAgentTool({
+    description: '搜索音乐并返回结果列表（支持QQ/网易云/酷我/酷狗）',
+    inputSchema: {
+        type: 'object',
+        properties: {
+            keyword: { type: 'string', description: '搜索关键词' },
+            source: {
+                type: 'string',
+                enum: ['qq', 'netease', 'kuwo', 'kugou'],
+                description: '音乐源（默认 qq）',
+            },
+            limit: { type: 'number', description: '返回结果数量（默认 5）' },
+        },
+        required: ['keyword'],
+    },
+    approval: 'never',
+    execute: ({ keyword, source, limit }) => searchMusic(String(keyword), source, typeof limit === 'number' ? limit : 5),
+});

package/tools/music-search.ts

@@ -0,0 +1,27 @@
+import { defineAgentTool } from '@zhin.js/tool';
+import { searchMusic } from '../src/music-lib.js';
+import type { MusicSource } from '../src/types.js';
+
+export default defineAgentTool<{
+  keyword: string;
+  source?: MusicSource;
+  limit?: number;
+}>({
+  description: '搜索音乐并返回结果列表（支持QQ/网易云/酷我/酷狗）',
+  inputSchema: {
+    type: 'object',
+    properties: {
+      keyword: { type: 'string', description: '搜索关键词' },
+      source: {
+        type: 'string',
+        enum: ['qq', 'netease', 'kuwo', 'kugou'],
+        description: '音乐源（默认 qq）',
+      },
+      limit: { type: 'number', description: '返回结果数量（默认 5）' },
+    },
+    required: ['keyword'],
+  },
+  approval: 'never',
+  execute: ({ keyword, source, limit }) =>
+    searchMusic(String(keyword), source, typeof limit === 'number' ? limit : 5),
+});

package/tools/music-share.js

@@ -0,0 +1,20 @@
+// Generated by build-plugin-runtime-entries.mjs. Do not edit.
+import { defineAgentTool } from '@zhin.js/tool';
+import { shareMusicDetail } from "../lib/music-lib.js";
+export default defineAgentTool({
+    description: '分享指定的音乐（支持QQ/网易云/酷我/酷狗）',
+    inputSchema: {
+        type: 'object',
+        properties: {
+            id: { type: 'string', description: '音乐 ID' },
+            source: {
+                type: 'string',
+                enum: ['qq', 'netease', 'kuwo', 'kugou'],
+                description: '音乐源',
+            },
+        },
+        required: ['id', 'source'],
+    },
+    approval: 'never',
+    execute: ({ id, source }) => shareMusicDetail(String(id), source),
+});

package/tools/music-share.ts

@@ -0,0 +1,24 @@
+import { defineAgentTool } from '@zhin.js/tool';
+import { shareMusicDetail } from '../src/music-lib.js';
+import type { MusicSource } from '../src/types.js';
+
+export default defineAgentTool<{
+  id: string;
+  source: MusicSource;
+}>({
+  description: '分享指定的音乐（支持QQ/网易云/酷我/酷狗）',
+  inputSchema: {
+    type: 'object',
+    properties: {
+      id: { type: 'string', description: '音乐 ID' },
+      source: {
+        type: 'string',
+        enum: ['qq', 'netease', 'kuwo', 'kugou'],
+        description: '音乐源',
+      },
+    },
+    required: ['id', 'source'],
+  },
+  approval: 'never',
+  execute: ({ id, source }) => shareMusicDetail(String(id), source),
+});

package/lib/async-jsx.d.ts

@@ -1,19 +0,0 @@
-import { SendContent } from "zhin.js";
-/**
- * 异步组件包装器
- * 类似 Next.js 的异步组件支持
- */
-export declare function AsyncComponent<P = any>(Component: (props: P) => Promise<SendContent>): (props: P) => SendContent;
-/**
- * 渲染异步内容
- * 检查是否是异步标记，如果是则执行
- */
-export declare function renderAsync(content: any): Promise<SendContent>;
-/**
- * Suspense 组件工厂
- * 用于包装异步组件并提供 fallback
- */
-export declare function createSuspense(fallback?: string): (props: {
-    children: any;
-}) => Promise<SendContent>;
-//# sourceMappingURL=async-jsx.d.ts.map

package/lib/async-jsx.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"async-jsx.d.ts","sourceRoot":"","sources":["../src/async-jsx.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC;;;GAGG;AACH,wBAAgB,cAAc,CAAC,CAAC,GAAG,GAAG,EACpC,SAAS,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,WAAW,CAAC,GAC5C,CAAC,KAAK,EAAE,CAAC,KAAK,WAAW,CAc3B;AAED;;;GAGG;AACH,wBAAsB,WAAW,CAAC,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,WAAW,CAAC,CAQpE;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,QAAQ,GAAE,MAAiB,IACzB,OAAO;IAAE,QAAQ,EAAE,GAAG,CAAA;CAAE,KAAG,OAAO,CAAC,WAAW,CAAC,CAQ/E"}

package/lib/async-jsx.js

@@ -1,48 +0,0 @@
-// async-jsx.ts - 异步 JSX 增强工具
-/**
- * 异步组件包装器
- * 类似 Next.js 的异步组件支持
- */
-export function AsyncComponent(Component) {
-    // 返回一个同步函数，但内部处理是异步的
-    return (props) => {
-        // 创建一个特殊的标记对象
-        const asyncMarker = {
-            __async: true,
-            component: Component,
-            props,
-            execute: () => Component(props)
-        };
-        // TypeScript 类型断言
-        return asyncMarker;
-    };
-}
-/**
- * 渲染异步内容
- * 检查是否是异步标记，如果是则执行
- */
-export async function renderAsync(content) {
-    if (content && typeof content === 'object' && content.__async) {
-        return await content.execute();
-    }
-    if (content && typeof content.then === 'function') {
-        return await content;
-    }
-    return content;
-}
-/**
- * Suspense 组件工厂
- * 用于包装异步组件并提供 fallback
- */
-export function createSuspense(fallback = '加载中...') {
-    return async function Suspense(props) {
-        try {
-            return await renderAsync(props.children);
-        }
-        catch (error) {
-            console.error('Suspense error:', error);
-            return fallback;
-        }
-    };
-}
-//# sourceMappingURL=async-jsx.js.map

package/lib/async-jsx.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"async-jsx.js","sourceRoot":"","sources":["../src/async-jsx.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAI7B;;;GAGG;AACH,MAAM,UAAU,cAAc,CAC5B,SAA6C;IAE7C,qBAAqB;IACrB,OAAO,CAAC,KAAQ,EAAE,EAAE;QAClB,cAAc;QACd,MAAM,WAAW,GAAG;YAClB,OAAO,EAAE,IAAI;YACb,SAAS,EAAE,SAAS;YACpB,KAAK;YACL,OAAO,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC;SAChC,CAAC;QAEF,kBAAkB;QAClB,OAAO,WAAiC,CAAC;IAC3C,CAAC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,OAAY;IAC5C,IAAI,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QAC9D,OAAO,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;IACjC,CAAC;IACD,IAAI,OAAO,IAAI,OAAO,OAAO,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAClD,OAAO,MAAM,OAAO,CAAC;IACvB,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,WAAmB,QAAQ;IACxD,OAAO,KAAK,UAAU,QAAQ,CAAC,KAAwB;QACrD,IAAI,CAAC;YACH,OAAO,MAAM,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC3C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;YACxC,OAAO,QAAQ,CAAC;QAClB,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}

package/src/async-jsx.ts

@@ -1,54 +0,0 @@
-// async-jsx.ts - 异步 JSX 增强工具
-
-import { SendContent } from "zhin.js";
-
-/**
- * 异步组件包装器
- * 类似 Next.js 的异步组件支持
- */
-export function AsyncComponent<P = any>(
-  Component: (props: P) => Promise<SendContent>
-): (props: P) => SendContent {
-  // 返回一个同步函数，但内部处理是异步的
-  return (props: P) => {
-    // 创建一个特殊的标记对象
-    const asyncMarker = {
-      __async: true,
-      component: Component,
-      props,
-      execute: () => Component(props)
-    };
-    
-    // TypeScript 类型断言
-    return asyncMarker as any as SendContent;
-  };
-}
-
-/**
- * 渲染异步内容
- * 检查是否是异步标记，如果是则执行
- */
-export async function renderAsync(content: any): Promise<SendContent> {
-  if (content && typeof content === 'object' && content.__async) {
-    return await content.execute();
-  }
-  if (content && typeof content.then === 'function') {
-    return await content;
-  }
-  return content;
-}
-
-/**
- * Suspense 组件工厂
- * 用于包装异步组件并提供 fallback
- */
-export function createSuspense(fallback: string = '加载中...') {
-  return async function Suspense(props: { children: any }): Promise<SendContent> {
-    try {
-      return await renderAsync(props.children);
-    } catch (error) {
-      console.error('Suspense error:', error);
-      return fallback;
-    }
-  };
-}