@zhin.js/plugin-music 0.0.44 → 0.0.46

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/plugin-music",
-  "version": "0.0.44",
+  "version": "0.0.46",
   "description": "Music search and sharing plugin for Zhin.js",
   "type": "module",
   "main": "./lib/index.js",
@@ -13,7 +13,11 @@
     "./package.json": "./package.json"
   },
   "files": [
+    "src",
     "lib",
+    "client",
+    "dist",
+    "skills",
     "README.md"
   ],
   "keywords": [
@@ -35,12 +39,12 @@
   "dependencies": {},
   "devDependencies": {
     "typescript": "^5.3.3",
-    "zhin.js": "1.0.51",
-    "@zhin.js/adapter-icqq": "1.0.63"
+    "zhin.js": "1.0.52",
+    "@zhin.js/adapter-icqq": "1.0.65"
   },
   "peerDependencies": {
-    "@zhin.js/adapter-icqq": "1.0.63",
-    "zhin.js": "1.0.51"
+    "@zhin.js/adapter-icqq": "1.0.65",
+    "zhin.js": "1.0.52"
   },
   "peerDependenciesMeta": {
     "@zhin.js/adapter-icqq": {

package/src/async-jsx.ts

@@ -0,0 +1,54 @@
+// 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;
+    }
+  };
+}

package/src/config.ts

@@ -0,0 +1,54 @@
+// plugins/utils/music/src/config.ts
+import type { MusicSourceConfig,MusicSource } from './types.js'
+
+/** 音乐源配置映射 */
+export const sourceConfigMap: Record<MusicSource, MusicSourceConfig> = {
+  qq: {
+    appid: 100497308,
+    package: 'com.tencent.qqmusic',
+    icon: 'https://p.qpic.cn/qqconnect/0/app_100497308_1626060999/100?max-age=2592000&t=0',
+    sign: 'cbd27cd7c861227d013a25b2d10f0799',
+    version: '13.11.0.8',
+  },
+  netease: {
+    appid: 100495085,
+    package: 'com.netease.cloudmusic',
+    icon: 'https://i.gtimg.cn/open/app_icon/00/49/50/85/100495085_100_m.png',
+    sign: 'da6b069da1e2982db3e386233f68d76d',
+    version: '9.1.92',
+  },
+}
+
+/** 格式化时长 */
+export function formatDuration(seconds?: number): string {
+  if (!seconds) return '未知'
+  
+  const minutes = Math.floor(seconds / 60)
+  const secs = seconds % 60
+  return `${minutes}:${secs.toString().padStart(2, '0')}`
+}
+
+/** 格式化音乐信息 */
+export function formatMusicInfo(music: {
+  title: string
+  artist?: string
+  album?: string
+  duration?: number
+  source: string
+}): string {
+  const parts = [music.title]
+  
+  if (music.artist) {
+    parts.push(music.artist)
+  }
+  
+  if (music.album) {
+    parts.push(music.album)
+  }
+  
+  const info = parts.join(' - ')
+  const duration = formatDuration(music.duration)
+  const source = music.source.toUpperCase()
+  
+  return `${info} [${duration}] [${source}]`
+}

package/src/index.tsx

@@ -0,0 +1,189 @@
+import { usePlugin, defineComponent, Prompt, ZhinTool, type Message } from "zhin.js";
+import type {} from '@zhin.js/adapter-icqq'
+import { musicServices } from "./sources/index.js";
+import { sourceConfigMap } from "./config.js";
+import type { MusicSource } from "./types.js";
+
+const plugin = usePlugin();
+const { logger, useContext, addComponent } = plugin;
+
+// 异步组件：分享音乐
+const ShareMusic = defineComponent(async function ShareMusic({ platform, musicId }: { platform: MusicSource, musicId: string }) {
+  const service = musicServices[platform];
+  if (!service) return 'unsupported music source';
+  const { id, source, ...detail } = await service.getDetail(musicId);
+  return <share {...detail} config={sourceConfigMap[platform]} />
+}, 'ShareMusic')
+addComponent(ShareMusic)
+
+// Suspense 组件 - 用于包装异步组件
+const Suspense = defineComponent(async function Suspense(
+  props: { fallback?: string; children?: any },
+  context
+) {
+  try {
+    // 如果 children 是一个 Promise（异步组件），等待它
+    if (props.children && typeof props.children === 'object' && 'then' in props.children) {
+      return await props.children;
+    }
+    // 否则直接返回
+    return props.children || '';
+  } catch (error) {
+    logger.error('Suspense error:', error);
+    return props.fallback || '加载失败';
+  }
+}, 'Suspense');
+
+addComponent(Suspense);
+
+// ============================================================================
+// 点歌工具 (使用 ZhinTool)
+// ============================================================================
+
+const searchMusicTool = new ZhinTool('music_search')
+  .desc('搜索音乐并返回结果列表')
+  .tag('music', 'entertainment')
+  .param('keyword', { type: 'string', description: '搜索关键词' }, true)
+  .param('source', { 
+    type: 'string', 
+    description: '音乐源: qq, netease（默认两者都搜索）',
+    enum: ['qq', 'netease']
+  })
+  .param('limit', { type: 'number', description: '返回结果数量（默认 5）' })
+  .execute(async ({ keyword, source, limit = 5 }) => {
+    const keywordStr = keyword as string;
+    const limitNum = limit as number;
+    
+    // 确定搜索源
+    const searchSources: MusicSource[] = source 
+      ? [source as MusicSource] 
+      : ['qq', 'netease'];
+
+    logger.info(`AI 搜索音乐: ${keywordStr}, 来源: ${searchSources.join(', ')}`);
+
+    // 并行搜索
+    const searchPromises = searchSources.map(s => 
+      musicServices[s].search(keywordStr, limitNum)
+    );
+
+    const searchResults = await Promise.all(searchPromises);
+    const allMusic = searchResults.flat().filter(Boolean);
+
+    return {
+      success: true,
+      keyword: keywordStr,
+      results: allMusic.map(m => ({
+        id: m.id,
+        title: m.title,
+        source: m.source,
+        url: m.url,
+      })),
+      total: allMusic.length,
+    };
+  })
+  .platform('icqq')  // 限制为 icqq 平台
+  .action(async (message: Message, result: any) => {
+    const keyword = result.params.keyword;
+    const sourcesParam = result.params.sources || [];
+
+    // 解析音乐源
+    const sources: MusicSource[] = [];
+    for (const source of sourcesParam) {
+      const normalized = source.toLowerCase();
+      if (["qq", "netease"].includes(normalized)) {
+        sources.push(normalized as MusicSource);
+      }
+    }
+
+    // 如果没有指定音乐源，默认搜索 QQ 和网易云
+    const searchSources: MusicSource[] =
+      sources.length > 0 ? sources : ["qq", "netease"];
+
+    logger.info(`搜索音乐: ${keyword}, 来源: ${searchSources.join(", ")}`);
+
+    // 并行搜索多个音乐源
+    const searchPromises = searchSources.map((source) =>
+      musicServices[source].search(keyword, 5)
+    );
+
+    const searchResults = await Promise.all(searchPromises);
+    const allMusic = searchResults.flat().filter(Boolean);
+
+    if (allMusic.length === 0) {
+      await message.$reply("没有找到结果");
+      return;
+    }
+
+    // 使用 Prompt 让用户选择
+    const prompt = new Prompt(plugin, message);
+    const musicUrl = await prompt.pick("请选择搜索结果", {
+      type: "text",
+      options: allMusic.map((music) => ({
+        label: `${music.title} [${music.source.toUpperCase()}]`,
+        value: music.url,
+      })),
+    });
+
+    if (!musicUrl) return;
+
+    const music = allMusic.find((m) => m.url === musicUrl)!;
+    
+    // 现在支持直接使用 JSX 语法，异步组件会自动 await
+    return <ShareMusic platform={music.source} musicId={music.id} />
+  });
+
+// 分享音乐工具（直接分享指定音乐）
+const shareMusicTool = new ZhinTool('music_share')
+  .desc('分享指定的音乐')
+  .tag('music', 'entertainment')
+  .param('id', { type: 'string', description: '音乐 ID' }, true)
+  .param('source', { 
+    type: 'string', 
+    description: '音乐源: qq 或 netease',
+    enum: ['qq', 'netease']
+  }, true)
+  .platform('icqq')
+  .execute(async ({ id, source }) => {
+    const service = musicServices[source as MusicSource];
+    if (!service) {
+      return { success: false, error: `不支持的音乐源: ${source}` };
+    }
+    
+    try {
+      const detail = await service.getDetail(id as string);
+      return {
+        success: true,
+        music: {
+          id: detail.id,
+          title: detail.title,
+          source: detail.source,
+          url: detail.url,
+        }
+      };
+    } catch (error) {
+      return { success: false, error: error instanceof Error ? error.message : String(error) };
+    }
+  })
+  .action(async (message: Message, result: any) => {
+    const { id, source } = result.params;
+    
+    if (!musicServices[source as MusicSource]) {
+      return `❌ 不支持的音乐源: ${source}`;
+    }
+    
+    return <ShareMusic platform={source as MusicSource} musicId={id} />;
+  });
+
+// 注册工具
+useContext('tool', (toolService) => {
+  if (!toolService) return;
+  
+  const disposers = [
+    toolService.addTool(searchMusicTool, 'music'),
+    toolService.addTool(shareMusicTool, 'music'),
+  ];
+  
+  logger.debug('音乐工具已注册');
+  
+  return () => disposers.forEach(d => d());
+});

package/src/sources/index.ts

@@ -0,0 +1,13 @@
+// plugins/utils/music/src/sources/index.ts
+import { QQMusicService } from './qq.js'
+import { NeteaseMusicService } from './netease.js'
+import type { MusicSource, MusicSearchService } from '../types.js'
+
+/** 音乐源服务映射 */
+export const musicServices: Record<MusicSource, MusicSearchService> = {
+  qq: new QQMusicService(),
+  netease: new NeteaseMusicService(),
+}
+
+export * from './qq.js'
+export * from './netease.js'

package/src/sources/netease.ts

@@ -0,0 +1,84 @@
+// plugins/utils/music/src/sources/netease.ts
+import type { MusicSearchService, MusicDetail,MusicInfo, Music163 } from '../types.js'
+
+/** 网易云音乐搜索服务 */
+export class NeteaseMusicService implements MusicSearchService {
+  async search(keyword: string, limit = 10): Promise<MusicInfo[]> {
+    try {
+      const searchUrl = `http://music.163.com/api/search/get/web?csrf_token=hlpretag=&hlposttag=&s=${encodeURIComponent(keyword)}&type=1&offset=0&total=true&limit=${limit}`
+      
+      const response = await fetch(searchUrl, { method: 'GET' })
+      const data = await response.json() as { result: { songs: Music163[] } }
+      const songs = data.result?.songs || []
+
+      return songs.map(music => ({
+        id: music.id,
+        source: 'netease' as const,
+        title: music.name,
+        artist: music.artists?.map(a => a.name).join('/'),
+        album: music.album.name,
+        url: `https://music.163.com/#/song?id=${music.id}`,
+        image: music.album.picUrl || music.album.img1v1Url,
+        duration: music.duration ? Math.floor(music.duration / 1000) : undefined,
+      }))
+    } catch (error) {
+      console.error('Netease Music search failed:', error)
+      return []
+    }
+  }
+
+  async getCover(id: string): Promise<string | null> {
+    try {
+      const url = new URL(`https://music.163.com/api/song/detail/?ids=[${id}]`)
+      
+      const response = await fetch(url, { method: 'GET' })
+      const data = await response.json() as { songs: Music163[] }
+      
+      const song = data.songs?.[0]
+      if (!song) return null
+      
+      return song.album.picUrl || song.album.img1v1Url || null
+    } catch (error) {
+      console.error('Netease Music get cover failed:', error)
+      return null
+    }
+  }
+
+  async getDetail(id: string): Promise<MusicDetail> {
+    const url = new URL(`https://music.163.com/api/song/detail/?ids=[${id}]`)
+      
+      const response = await fetch(url, { method: 'GET' })
+      const data = await response.json() as { songs: Music163[] }
+      
+      const song = data.songs?.[0]
+      if (!song) throw new Error('Music not found')
+
+      return {
+        id: song.id,
+        source: 'netease',
+        title: song.name,
+        url: `https://music.163.com/#/song?id=${song.id}`,
+        image: song.album.picUrl || song.album.img1v1Url,
+        duration: song.duration ? Math.floor(song.duration / 1000) : undefined,
+        audio: await this.getAudioUrl(id),
+      }
+  }
+
+  /**
+   * 获取音频直链
+   * @param id 音乐 ID
+   * @param metingAPI Meting API 地址（可选）
+   * @returns 音频直链 URL
+   */
+  async getAudioUrl(id: string, metingAPI?: string): Promise<string> {
+    // 默认使用 Meting API
+      const apiUrl = metingAPI || 'https://api.injahow.cn/meting/'
+      const url = `${apiUrl}?type=url&id=${id}`
+      
+      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')
+      // 不同的 Meting API 返回格式可能不同
+      return data.url || data.data?.url!
+  }
+}

package/src/sources/qq.ts

@@ -0,0 +1,148 @@
+// plugins/utils/music/src/sources/qq.ts
+import type { MusicSearchService, MusicDetail,MusicInfo, MusicQQ } from '../types.js'
+
+/** 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 []
+    }
+  }
+
+  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`
+    } catch (error) {
+      console.error('QQ Music get cover failed:', error)
+      return null
+    }
+  }
+
+  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,
+      }
+  }
+
+  /**
+   * 获取音频直链（需要第三方 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')
+      }
+      return data.url || data.data?.url!
+  }
+
+  /**
+   * 获取歌词
+   * @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, { 
+        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
+      }
+    } catch (error) {
+      console.error('QQ Music get lyric failed:', error)
+      return null
+    }
+  }
+}

package/src/types.ts

@@ -0,0 +1,67 @@
+// plugins/utils/music/src/types.ts
+
+/** 音乐源类型 */
+export type MusicSource = "qq" | "netease";
+
+/** 音乐分享内容 */
+export interface MusicInfo {
+  id: string;
+  source: MusicSource;
+  /** 跳转链接 */
+  url: string;
+  /** 音乐标题 */
+  title: string;
+}
+export interface MusicDetail extends MusicInfo {
+  image: string;
+  audio:string;
+  duration?: number;
+}
+
+/** 音乐源配置 */
+export interface MusicSourceConfig {
+  appid: number;
+  package: string;
+  icon: string;
+  sign: string;
+  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;
+  duration?: number;
+  artists?: Array<{
+    id: string;
+    name: string;
+  }>;
+  album: {
+    id: string;
+    name: string;
+    picUrl: string | null;
+    img1v1Url: string;
+  };
+}
+
+/** 音乐搜索服务接口 */
+export interface MusicSearchService {
+  /** 搜索音乐 */
+  search(keyword: string, limit?: number): Promise<MusicInfo[]>;
+  /** 获取音乐详情 */
+  getDetail(id: string): Promise<MusicDetail>;
+}