@zhin.js/core 1.0.25 → 1.0.27

package/src/built/ai-trigger.ts

@@ -106,8 +106,9 @@ export const DEFAULT_AI_TRIGGER_CONFIG: Required<AITriggerConfig> = {
  * 检查消息是否 @ 了机器人
  */
 export function isAtBot<T extends object>(message: Message<T>): boolean {
+  const botId = String(message.$bot);
   return message.$content.some(seg =>  {
-    return seg.data?.qq === message.$bot || seg.data?.user_id === message.$bot;
+    return String(seg.data?.qq) === botId || String(seg.data?.user_id) === botId;
   });
 }
 
@@ -142,10 +143,12 @@ export function parseRichMediaContent(content: string): MessageElement[] {
  * 移除 @ 机器人的部分
  */
 export function removeAtBot<T extends object>(message: Message<T>): MessageElement[] {
+  const botId = String(message.$bot);
   return message.$content.filter(seg => {
     const { type, data } = seg;
-    const userId = data?.user_id || data?.qq;
-    return type !== "at" && userId !== message.$bot;
+    if (type !== "at") return true; // 非 at 段全部保留
+    const userId = String(data?.user_id || data?.qq);
+    return userId !== botId; // 只移除 @机器人 的段，保留 @其他人
   });
 }
 

package/src/built/command.ts

@@ -1,10 +1,11 @@
 /**
- * Command Context
- * 管理所有插件注册的命令
+ * CommandFeature
+ * 管理所有插件注册的命令，继承自 Feature 抽象类
  */
+import { Feature, FeatureJSON } from "../feature.js";
 import { MessageCommand } from "../command.js";
 import { Message } from "../message.js";
-import { Context, Plugin, getPlugin } from "../plugin.js";
+import { Plugin, getPlugin } from "../plugin.js";
 import type { RegisteredAdapter, AdapterMessage } from "../types.js";
 
 /**
@@ -20,83 +21,88 @@ declare module "../plugin.js" {
   namespace Plugin {
     interface Extensions extends CommandContextExtensions {}
     interface Contexts {
-      command: CommandService;
+      command: CommandFeature;
     }
   }
 }
 
 /**
- * 命令服务数据
+ * 命令服务 Feature
  */
-export interface CommandService {
-  /** 命令列表（保持顺序） */
-  readonly items: MessageCommand<RegisteredAdapter>[];
+export class CommandFeature extends Feature<MessageCommand<RegisteredAdapter>> {
+  readonly name = 'command' as const;
+  readonly icon = 'Terminal';
+  readonly desc = '命令';
+
   /** 按 pattern 索引 */
-  readonly byName: Map<string, MessageCommand<RegisteredAdapter>>;
-  /** 添加命令 */
-  add(command: MessageCommand<RegisteredAdapter>, pluginName: string): () => void;
-  /** 移除命令 */
-  remove(command: MessageCommand<RegisteredAdapter>): boolean;
-  /** 按名称获取 */
-  get(pattern: string): MessageCommand<RegisteredAdapter> | undefined;
-  /** 处理消息 */
-  handle(message: Message<AdapterMessage<RegisteredAdapter>>, plugin: Plugin): Promise<any>;
-}
+  readonly byName = new Map<string, MessageCommand<RegisteredAdapter>>();
 
-/**
- * 创建命令 Context
- */
-export function createCommandService(): Context<'command', CommandContextExtensions> {
-  const items: MessageCommand<RegisteredAdapter>[] = [];
-  const byName = new Map<string, MessageCommand<RegisteredAdapter>>();
-  const pluginMap = new Map<MessageCommand<RegisteredAdapter>, string>();
-  
-  const value: CommandService = {
-    items,
-    byName,
-    
-    add(command, pluginName) {
-      items.push(command);
-      byName.set(command.pattern, command);
-      pluginMap.set(command, pluginName);
-      return () => value.remove(command);
-    },
-    
-    remove(command) {
-      const index = items.indexOf(command);
-      if (index !== -1) {
-        items.splice(index, 1);
-        byName.delete(command.pattern);
-        pluginMap.delete(command);
-        return true;
-      }
-      return false;
-    },
-    
-    get(pattern) {
-      return byName.get(pattern);
-    },
-    
-    async handle(message, plugin) {
-      for (const command of items) {
-        const result = await command.handle(message, plugin);
-        if (result) return result;
-      }
-      return null;
+  /**
+   * 添加命令
+   */
+  add(command: MessageCommand<RegisteredAdapter>, pluginName: string): () => void {
+    this.byName.set(command.pattern, command);
+    return super.add(command, pluginName);
+  }
+
+  /**
+   * 移除命令
+   */
+  remove(command: MessageCommand<RegisteredAdapter>): boolean {
+    this.byName.delete(command.pattern);
+    return super.remove(command);
+  }
+
+  /**
+   * 按 pattern 获取命令
+   */
+  get(pattern: string): MessageCommand<RegisteredAdapter> | undefined {
+    return this.byName.get(pattern);
+  }
+
+  /**
+   * 处理消息，依次尝试匹配命令
+   */
+  async handle(message: Message<AdapterMessage<RegisteredAdapter>>, plugin: Plugin): Promise<any> {
+    for (const command of this.items) {
+      const result = await command.handle(message, plugin);
+      if (result) return result;
     }
-  };
-  
-  return {
-    name: 'command',
-    description: '命令服务',
-    value,
-    extensions: {
+    return null;
+  }
+
+  /**
+   * 序列化为 JSON
+   */
+  toJSON(pluginName?: string): FeatureJSON {
+    const list = pluginName ? this.getByPlugin(pluginName) : this.items;
+    return {
+      name: this.name,
+      icon: this.icon,
+      desc: this.desc,
+      count: list.length,
+      items: list.map(c => ({
+        name: c.pattern,
+        desc: c.helpInfo?.desc,
+        usage: c.helpInfo?.usage,
+        examples: c.helpInfo?.examples,
+      })),
+    };
+  }
+
+  /**
+   * 提供给 Plugin.prototype 的扩展方法
+   */
+  get extensions() {
+    const feature = this;
+    return {
       addCommand<T extends RegisteredAdapter>(command: MessageCommand<T>) {
         const plugin = getPlugin();
-        const dispose = value.add(command as MessageCommand<RegisteredAdapter>, plugin.name);
+        const dispose = feature.add(command as MessageCommand<RegisteredAdapter>, plugin.name);
+        plugin.recordFeatureContribution(feature.name, command.pattern);
         plugin.onDispose(dispose);
         return dispose;
-      }
-    }
-  };
+      },
+    };
+  }
 }

package/src/built/component.ts

@@ -1,10 +1,11 @@
 /**
- * Component Context
- * 管理所有插件注册的组件
+ * ComponentFeature
+ * 管理所有插件注册的组件，继承自 Feature 抽象类
  */
+import { Feature, FeatureJSON } from "../feature.js";
 import { Component, renderComponents } from "../component.js";
 import { SendOptions, MaybePromise } from "../types.js";
-import { Context, Plugin, getPlugin } from "../plugin.js";
+import { Plugin, getPlugin } from "../plugin.js";
 
 type Listener = (options: SendOptions) => MaybePromise<SendOptions>;
 
@@ -21,90 +22,107 @@ declare module "../plugin.js" {
   namespace Plugin {
     interface Extensions extends ComponentContextExtensions {}
     interface Contexts {
-      component: ComponentService;
+      component: ComponentFeature;
     }
   }
 }
 
 /**
- * 组件服务数据
+ * 组件服务 Feature
  */
-export interface ComponentService {
+export class ComponentFeature extends Feature<Component<any>> {
+  readonly name = 'component' as const;
+  readonly icon = 'Box';
+  readonly desc = '组件';
+
   /** 按名称索引 */
-  readonly byName: Map<string, Component<any>>;
-  /** 添加组件 */
-  add(component: Component<any>, pluginName: string): () => void;
-  /** 获取所有组件名称 */
-  getAllNames(): string[];
-  /** 移除组件 */
-  remove(component: Component<any>): boolean;
-  /** 按名称获取 */
-  get(name: string): Component<any> | undefined;
-}
+  readonly byName = new Map<string, Component<any>>();
 
-/**
- * 创建组件 Context
- */
-export function createComponentService(): Context<'component', ComponentContextExtensions> {
-  const byName = new Map<string, Component<any>>();
-  const pluginMap = new Map<Component<any>, string>();
-  let listener: Listener | undefined;
-  let rootPlugin: Plugin | undefined;
-  
-  const value: ComponentService = {
-    byName,
-    
-    add(component, pluginName) {
-      byName.set(component.name, component);
-      pluginMap.set(component, pluginName);
-      return () => value.remove(component);
-    },
-    getAllNames() {
-      return Array.from(byName.keys());
-    },
-    remove(component) {
-      if (byName.has(component.name)) {
-        byName.delete(component.name);
-        pluginMap.delete(component);
-        return true;
-      }
-      return false;
-    },
-    
-    get(name) {
-      return byName.get(name);
+  /** 内部状态：消息渲染监听器 & 宿主插件 */
+  #listener?: Listener;
+  #rootPlugin?: Plugin;
+
+  /**
+   * 添加组件
+   */
+  add(component: Component<any>, pluginName: string): () => void {
+    this.byName.set(component.name, component);
+    return super.add(component, pluginName);
+  }
+
+  /**
+   * 移除组件
+   */
+  remove(component: Component<any>): boolean {
+    this.byName.delete(component.name);
+    return super.remove(component);
+  }
+
+  /**
+   * 获取所有组件名称
+   */
+  getAllNames(): string[] {
+    return Array.from(this.byName.keys());
+  }
+
+  /**
+   * 按名称获取组件
+   */
+  get(name: string): Component<any> | undefined {
+    return this.byName.get(name);
+  }
+
+  /**
+   * 生命周期: 挂载时注册消息渲染监听器
+   */
+  mounted(plugin: Plugin): void {
+    this.#rootPlugin = plugin;
+    this.#listener = (options: SendOptions) => {
+      return renderComponents(this.byName, options);
+    };
+    plugin.root.on('before.sendMessage', this.#listener);
+  }
+
+  /**
+   * 生命周期: 销毁时移除监听器
+   */
+  dispose(): void {
+    if (this.#listener && this.#rootPlugin) {
+      this.#rootPlugin.root.off('before.sendMessage', this.#listener);
+      this.#listener = undefined;
     }
-  };
-  
-  return {
-    name: 'component',
-    description: '组件服务',
-    
-    mounted(plugin: Plugin) {
-      rootPlugin = plugin;
-      // 创建消息渲染监听器
-      listener = (options: SendOptions) => {
-        return renderComponents(byName, options);
-      };
-      plugin.root.on('before.sendMessage', listener);
-      return value;
-    },
-    
-    dispose() {
-      if (listener && rootPlugin) {
-        rootPlugin.root.off('before.sendMessage', listener);
-        listener = undefined;
-      }
-    },
-    
-    extensions: {
+  }
+
+  /**
+   * 序列化为 JSON
+   */
+  toJSON(pluginName?: string): FeatureJSON {
+    const list = pluginName ? this.getByPlugin(pluginName) : this.items;
+    return {
+      name: this.name,
+      icon: this.icon,
+      desc: this.desc,
+      count: list.length,
+      items: list.map(c => ({
+        name: c.name,
+        type: 'component',
+      })),
+    };
+  }
+
+  /**
+   * 提供给 Plugin.prototype 的扩展方法
+   */
+  get extensions() {
+    const feature = this;
+    return {
       addComponent<T extends Component<any>>(component: T) {
         const plugin = getPlugin();
-        const dispose = value.add(component, plugin.name);
+        const dispose = feature.add(component, plugin.name);
+        plugin.recordFeatureContribution(feature.name, component.name);
         plugin.onDispose(dispose);
         return dispose;
-      }
-    }
-  };
+      },
+    };
+  }
 }
-