@zhin.js/plugin-music 1.0.26 → 1.1.2

package/package.json

@@ -1,23 +1,27 @@
 {
   "name": "@zhin.js/plugin-music",
-  "version": "1.0.26",
-  "description": "Music search and sharing plugin for Zhin.js",
+  "version": "1.1.2",
+  "description": "Music search and sharing plugin for Zhin.js (Plugin Runtime)",
   "type": "module",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "exports": {
     ".": {
       "types": "./lib/index.d.ts",
-      "development": "./src/index.tsx",
+      "development": "./src/index.ts",
       "import": "./lib/index.js"
     },
     "./package.json": "./package.json"
   },
   "files": [
+    "plugin.js",
+    "schema.json",
+    "commands",
+    "middlewares",
+    "components",
     "src",
     "lib",
-    "client",
-    "dist",
+    "tools",
     "skills",
     "README.md"
   ],
@@ -38,19 +42,35 @@
     "url": "https://github.com/lc-cn"
   },
   "license": "MIT",
-  "dependencies": {},
+  "dependencies": {
+    "@zhin.js/core": "1.1.37",
+    "@zhin.js/tool": "1.1.1",
+    "@zhin.js/skill": "1.1.1"
+  },
   "devDependencies": {
     "typescript": "^6.0.3",
-    "zhin.js": "1.0.81",
-    "@zhin.js/adapter-icqq": "2.0.26"
+    "vitest": "^4.1.10",
+    "zhin.js": "1.1.2"
   },
   "peerDependencies": {
-    "@zhin.js/adapter-icqq": "2.0.26",
-    "zhin.js": "1.0.81"
+    "@zhin.js/adapter-icqq": "^1.1.2",
+    "@zhin.js/command": "^1.1.1",
+    "@zhin.js/component": "^1.1.1",
+    "@zhin.js/middleware": "^1.1.1",
+    "zhin.js": "^1.1.2"
   },
   "peerDependenciesMeta": {
     "@zhin.js/adapter-icqq": {
       "optional": true
+    },
+    "@zhin.js/command": {
+      "optional": true
+    },
+    "@zhin.js/component": {
+      "optional": true
+    },
+    "@zhin.js/middleware": {
+      "optional": true
     }
   },
   "repository": {
@@ -62,8 +82,42 @@
     "access": "public",
     "registry": "https://registry.npmjs.org"
   },
+  "engines": {
+    "node": "^20.19.0 || >=22.12.0"
+  },
+  "zhin": {
+    "protocol": 1,
+    "type": "plugin",
+    "entry": "./plugin.js",
+    "engine": "^1.0.0",
+    "runtime": "trusted",
+    "features": [
+      {
+        "package": "@zhin.js/command",
+        "api": "^1.0.0"
+      },
+      {
+        "package": "@zhin.js/middleware",
+        "api": "^1.0.0"
+      },
+      {
+        "package": "@zhin.js/component",
+        "api": "^1.0.0"
+      },
+      {
+        "package": "@zhin.js/tool",
+        "api": "^1.0.0"
+      },
+      {
+        "package": "@zhin.js/skill",
+        "api": "^1.0.0"
+      }
+    ],
+    "plugins": []
+  },
   "scripts": {
-    "build": "tsc --build",
-    "clean": "rimraf lib"
+    "build": "tsc",
+    "clean": "rimraf lib",
+    "test": "NODE_OPTIONS=--experimental-strip-types vitest run --root ../../.. plugins/utils/music/tests"
   }
 }

package/plugin.js

@@ -0,0 +1,45 @@
+// Generated by build-plugin-runtime-entries.mjs. Do not edit.
+import { definePlugin, databaseHostToken } from 'zhin.js';
+import { MusicSearchSessions } from "./lib/session.js";
+import { QrLoginRuntime } from "./lib/login/index.js";
+import { CredentialStore, createInMemoryCredentialDb, MUSIC_CREDENTIALS_TABLE, } from "./lib/credential-store.js";
+import { createMusicServices } from "./lib/sources/index.js";
+import { musicRuntimeToken } from "./lib/runtime.js";
+function defineCredentialTable(db) {
+    db.define(MUSIC_CREDENTIALS_TABLE, {
+        source: { type: 'text', nullable: false },
+        key: { type: 'text', nullable: false },
+        value: { type: 'text', nullable: false },
+        updated_at: { type: 'text', default: '' },
+    });
+}
+export default definePlugin({
+    name: 'music',
+    metadata: {
+        displayName: 'Music',
+    },
+    setup(context) {
+        const db = context.resources.has(databaseHostToken) ? (() => {
+            const host = context.resources.use(databaseHostToken);
+            defineCredentialTable(host);
+            return host;
+        })() : createInMemoryCredentialDb();
+        const credentials = new CredentialStore(db);
+        const runtime = Object.freeze({
+            credentials,
+            services: Object.freeze(createMusicServices(credentials)),
+            sessions: new MusicSearchSessions(),
+            logins: new QrLoginRuntime(credentials),
+        });
+        context.resources.provide(musicRuntimeToken, runtime);
+        const timer = setInterval(() => {
+            runtime.sessions.pruneExpired();
+            runtime.logins.pruneExpired();
+        }, 60_000);
+        return () => {
+            clearInterval(timer);
+            runtime.sessions.dispose();
+            runtime.logins.dispose();
+        };
+    },
+});

package/schema.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "type": "object",
+  "additionalProperties": false,
+  "properties": {}
+}

package/skills/music/SKILL.md

@@ -19,8 +19,8 @@ tags:
   - entertainment
   - media
 tools:
-  - music_search
-  - music_share
+  - music-search
+  - music-share
 ---
 
 # 音乐搜索分享技能

package/skills/music/tools/music-search/index.js

@@ -0,0 +1,22 @@
+// Generated by build-plugin-runtime-entries.mjs. Do not edit.
+import { defineAgentTool } from '@zhin.js/tool';
+import { searchMusic } from "../../../../lib/music-lib.js";
+import { musicRuntimeToken } from "../../../../lib/runtime.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'],
+    },
+    requiresApproval: 'never',
+    execute: ({ keyword, source, limit }, context) => searchMusic(context.use(musicRuntimeToken), String(keyword), source, typeof limit === 'number' ? limit : 5),
+});

package/skills/music/tools/music-search/index.ts

@@ -0,0 +1,33 @@
+import { defineAgentTool } from '@zhin.js/tool';
+import { searchMusic } from '../../../../src/music-lib.js';
+import type { MusicSource } from '../../../../src/types.js';
+import { musicRuntimeToken } from '../../../../src/runtime.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'],
+  },
+  requiresApproval: 'never',
+  execute: ({ keyword, source, limit }, context) =>
+    searchMusic(
+      context.use(musicRuntimeToken),
+      String(keyword),
+      source,
+      typeof limit === 'number' ? limit : 5,
+    ),
+});

package/skills/music/tools/music-share/index.js

@@ -0,0 +1,21 @@
+// Generated by build-plugin-runtime-entries.mjs. Do not edit.
+import { defineAgentTool } from '@zhin.js/tool';
+import { shareMusicDetail } from "../../../../lib/music-lib.js";
+import { musicRuntimeToken } from "../../../../lib/runtime.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'],
+    },
+    requiresApproval: 'never',
+    execute: ({ id, source }, context) => shareMusicDetail(context.use(musicRuntimeToken), String(id), source),
+});

package/skills/music/tools/music-share/index.ts

@@ -0,0 +1,26 @@
+import { defineAgentTool } from '@zhin.js/tool';
+import { shareMusicDetail } from '../../../../src/music-lib.js';
+import type { MusicSource } from '../../../../src/types.js';
+import { musicRuntimeToken } from '../../../../src/runtime.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'],
+  },
+  requiresApproval: 'never',
+  execute: ({ id, source }, context) =>
+    shareMusicDetail(context.use(musicRuntimeToken), String(id), source),
+});

package/src/config.ts

@@ -1,7 +1,5 @@
-// plugins/utils/music/src/config.ts
-import type { MusicSourceConfig,MusicSource } from './types.js'
+import type { MusicSourceConfig, MusicSource } from './types.js';
 
-/** 音乐源配置映射 */
 export const sourceConfigMap: Record<MusicSource, MusicSourceConfig> = {
   qq: {
     appid: 100497308,
@@ -17,38 +15,64 @@ export const sourceConfigMap: Record<MusicSource, MusicSourceConfig> = {
     sign: 'da6b069da1e2982db3e386233f68d76d',
     version: '9.1.92',
   },
+  kuwo: {
+    appid: 100243533,
+    package: 'cn.kuwo.player',
+    icon: 'https://p.qpic.cn/qqconnect/0/app_100243533_1636498875/100?max-age=2592000&t=0',
+    sign: 'bf9ff4ffb4c558a34ee3fd52c223ebf5',
+    version: '10.1.3.5',
+  },
+  kugou: {
+    appid: 205141,
+    package: 'com.kugou.android',
+    icon: 'https://open.gtimg.cn/open/app_icon/00/20/51/41/205141_100_m.png',
+    sign: '5a84ee451a90ca88a1ea0ad2bef9e69c',
+    version: '12.2.8',
+  },
+};
+
+export const SOURCE_ALIASES: Record<string, MusicSource> = {
+  'qq': 'qq',
+  'QQ': 'qq',
+  'QQ音乐': 'qq',
+  'qq音乐': 'qq',
+  '网易': 'netease',
+  '网易云': 'netease',
+  '163': 'netease',
+  '酷我': 'kuwo',
+  '酷狗': 'kugou',
+};
+
+export const SOURCE_DISPLAY_NAME: Record<MusicSource, string> = {
+  qq: 'QQ音乐',
+  netease: '网易云',
+  kuwo: '酷我',
+  kugou: '酷狗',
+};
+
+export function resolveSourceAlias(input: string): MusicSource | undefined {
+  return SOURCE_ALIASES[input.trim()];
 }
 
-/** 格式化时长 */
 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')}`
+  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
+  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}]`
+  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/credential-store.ts

@@ -0,0 +1,125 @@
+import type { MusicSource } from './types.js';
+
+export const MUSIC_CREDENTIALS_TABLE = 'music_credentials';
+
+export interface CredentialRow {
+  source: MusicSource;
+  key: string;
+  value: string;
+  updated_at: string;
+}
+
+export interface CredentialModel {
+  select(...fields: string[]): {
+    where(query: Record<string, unknown>): PromiseLike<Record<string, unknown>[]>;
+    then<TResult1 = Record<string, unknown>[], TResult2 = never>(
+      onfulfilled?:
+        | ((value: Record<string, unknown>[]) => TResult1 | PromiseLike<TResult1>)
+        | null,
+      onrejected?: ((reason: unknown) => TResult2 | PromiseLike<TResult2>) | null,
+    ): Promise<TResult1 | TResult2>;
+  };
+  insert(row: Record<string, unknown>): Promise<unknown>;
+  delete(): { where(query: Record<string, unknown>): Promise<unknown> };
+  update(patch: Record<string, unknown>): {
+    where(query: Record<string, unknown>): Promise<unknown>;
+  };
+}
+
+export interface CredentialDb {
+  models: { get(name: string): CredentialModel | undefined };
+}
+
+function createMemoryModel(): CredentialModel {
+  const rows: Record<string, unknown>[] = [];
+
+  function matches(
+    row: Record<string, unknown>,
+    query: Record<string, unknown>,
+  ): boolean {
+    return Object.entries(query).every(([k, v]) => row[k] === v);
+  }
+
+  return {
+    select: () => {
+      const all = rows.map((r) => ({ ...r }));
+      return {
+        where: async (query) =>
+          rows.filter((r) => matches(r, query)).map((r) => ({ ...r })),
+        then: (onfulfilled, onrejected) =>
+          Promise.resolve(all).then(onfulfilled, onrejected),
+      };
+    },
+    insert: async (row) => {
+      rows.push({ ...row });
+    },
+    delete: () => ({
+      where: async (query) => {
+        for (let i = rows.length - 1; i >= 0; i--) {
+          if (matches(rows[i]!, query)) rows.splice(i, 1);
+        }
+      },
+    }),
+    update: (patch) => ({
+      where: async (query) => {
+        for (const row of rows) {
+          if (matches(row, query)) Object.assign(row, patch);
+        }
+      },
+    }),
+  };
+}
+
+export function createInMemoryCredentialDb(): CredentialDb {
+  const model = createMemoryModel();
+  return {
+    models: {
+      get: (name) => name === MUSIC_CREDENTIALS_TABLE ? model : undefined,
+    },
+  };
+}
+
+export class CredentialStore {
+  readonly #db: CredentialDb;
+
+  constructor(db: CredentialDb) {
+    this.#db = db;
+  }
+
+  private get model(): CredentialModel | null {
+    return this.#db.models.get(MUSIC_CREDENTIALS_TABLE) ?? null;
+  }
+
+  async get(source: MusicSource, key: string): Promise<string | null> {
+    const rows = await this.model?.select().where({ source, key });
+    if (!rows?.length) return null;
+    return String(rows[0]!.value ?? '');
+  }
+
+  async set(source: MusicSource, key: string, value: string): Promise<void> {
+    const model = this.model;
+    if (!model) return;
+    const existing = await model.select().where({ source, key });
+    if (existing.length > 0) {
+      await model.update({ value, updated_at: new Date().toISOString() }).where({ source, key });
+      return;
+    }
+    await model.insert({ source, key, value, updated_at: new Date().toISOString() });
+  }
+
+  async delete(source: MusicSource, key: string): Promise<void> {
+    await this.model?.delete().where({ source, key });
+  }
+
+  async list(source?: MusicSource): Promise<CredentialRow[]> {
+    const model = this.model;
+    if (!model) return [];
+    const rows = source ? await model.select().where({ source }) : await model.select();
+    return rows.map((row) => ({
+      source: String(row.source) as MusicSource,
+      key: String(row.key),
+      value: String(row.value),
+      updated_at: String(row.updated_at ?? ''),
+    }));
+  }
+}

package/src/index.ts

@@ -0,0 +1,37 @@
+export {
+  formatDuration,
+  formatMusicInfo,
+  sourceConfigMap,
+  SOURCE_ALIASES,
+  SOURCE_DISPLAY_NAME,
+  resolveSourceAlias,
+} from './config.js';
+export {
+  searchMusic,
+  shareMusicDetail,
+  formatSearchResults,
+  buildMusicShareSegment,
+} from './music-lib.js';
+export { createMusicServices } from './sources/index.js';
+export {
+  sessionKey,
+  resolveMessageIds,
+  MusicSearchSessions,
+  type PendingSearch,
+} from './session.js';
+export {
+  CredentialStore,
+  createInMemoryCredentialDb,
+  MUSIC_CREDENTIALS_TABLE,
+  type CredentialDb,
+  type CredentialRow,
+} from './credential-store.js';
+export { musicRuntimeToken, type MusicRuntime } from './runtime.js';
+export {
+  QrLoginRuntime,
+  loginSessionKey,
+  type QrLoginSource,
+  type QrLoginSession,
+  type QrPollResult,
+} from './login/index.js';
+export type { MusicDetail, MusicInfo, MusicSource, MusicSourceConfig } from './types.js';