@zhin.js/core 1.0.7 → 1.0.8

package/src/app.ts

@@ -1,11 +1,13 @@
 import path from "path";
 import { SideEffect, GlobalContext, Models } from "@zhin.js/types";
+import { Schema } from '@zhin.js/hmr';
 import {
   HMR,
   Context,
   Logger,
   getCallerFile,
   getCallerFiles,
+  mergeConfig,
 } from "@zhin.js/hmr";
 import {
   AdapterMessage,
@@ -15,6 +17,7 @@ import {
   SendOptions,
   MessageMiddleware,
 } from "./types.js";
+import { Config } from "./config.js";
 import { Message } from "./message.js";
 import { fileURLToPath } from "url";
 import { generateEnvTypes } from "./types-generator.js";
@@ -27,15 +30,21 @@ import { Plugin } from "./plugin.js";
 import { Adapter } from "./adapter";
 import { MessageCommand } from "./command";
 import { Component } from "./component";
-import { RelatedDatabase, DocumentDatabase, KeyValueDatabase, Schema, Registry } from "@zhin.js/database";
+import {
+  RelatedDatabase,
+  DocumentDatabase,
+  KeyValueDatabase,
+  Definition,
+  Registry,
+} from "@zhin.js/database";
 import { DatabaseLogTransport } from "./log-transport.js";
-import { SystemLog, SystemLogSchema } from "./models/system-log.js";
-import { User, UserSchema } from './models/user.js'
+import { SystemLog, SystemLogDefinition } from "./models/system-log.js";
+import { User, UserDefinition } from "./models/user.js";
 import { addTransport, removeTransport } from "@zhin.js/logger";
 declare module "@zhin.js/types" {
   interface Models {
     SystemLog: SystemLog;
-    User: User
+    User: User;
   }
 }
 
@@ -48,45 +57,47 @@ declare module "@zhin.js/types" {
  */
 export class App extends HMR<Plugin> {
   static currentPlugin: Plugin;
-  private config: AppConfig;
   middlewares: MessageMiddleware[] = [];
   adapters: string[] = [];
-  database?: RelatedDatabase<any, Models> | DocumentDatabase<any, Models> | KeyValueDatabase<any, Models>;
+  #config: Config<AppConfig>;
+  database?:
+    | RelatedDatabase<any, Models>
+    | DocumentDatabase<any, Models>
+    | KeyValueDatabase<any, Models>;
   permissions: Permissions = new Permissions(this);
   private logTransport?: DatabaseLogTransport;
+  /** 配置变更处理锁 */
+  private configChangeLock: Promise<void> | null = null;
   /**
    * 构造函数：初始化应用，加载配置，注册全局异常处理
-   * @param config 可选的应用配置，若为空则自动查找配置文件
+   * @param config 可选，应用配置，若为空则自动查找配置文件
    */
-  constructor(config?: Partial<AppConfig>) {
-    // 如果没有传入配置或配置为空对象，尝试自动加载配置文件
-    let finalConfig: AppConfig;
-    if (!config || Object.keys(config).length === 0) {
-      try {
-        // 异步加载配置，这里需要改为同步初始化
-        logger.info("🔍 正在查找配置文件...");
-        finalConfig = App.loadConfigSync();
-        logger.info("✅ 配置文件加载成功");
-      } catch (error) {
-        logger.warn("⚠️  配置文件加载失败，使用默认配置", {
-          error: error instanceof Error ? error.message : String(error),
-        });
-        finalConfig = Object.assign({}, App.defaultConfig);
-      }
-    } else {
-      // 合并默认配置和传入的配置
-      finalConfig = Object.assign({}, App.defaultConfig, config);
-    }
-
+  constructor(config: AppConfig);
+  /**
+   * 构造函数：初始化应用，加载配置，注册全局异常处理
+   * @param config_file 可选，配置文件路径，默认为 'zhin.config.yml'
+   */
+  constructor(config_file?: string);
+  constructor(config_param: string | AppConfig = "zhin.config.yml") {
+    const config_file =
+      typeof config_param === "string" ? config_param : "zhin.config.yml";
+    const config_obj =
+      typeof config_param === "object" ? config_param : App.defaultConfig;
+    const config = new Config<AppConfig>(
+      config_file,
+      App.schema,
+      mergeConfig(App.defaultConfig, config_obj)
+    );
     // 调用父类构造函数
-    super("Zhin", {
+    super({
       logger,
-      dirs: finalConfig.plugin_dirs || [],
+      dirs: config.get("plugin_dirs") || [],
       extensions: new Set([".js", ".ts", ".jsx", ".tsx"]),
-      debug: finalConfig.debug,
+      debug: config.get("debug"),
     });
+    this.watching(config.filepath,()=>config.reload());
     this.on("message.send", this.sendMessage.bind(this));
-    this.on('message.receive',this.receiveMessage.bind(this))
+    this.on("message.receive", this.receiveMessage.bind(this));
     process.on("uncaughtException", (e) => {
       const args = e instanceof Error ? [e.message, { stack: e.stack }] : [e];
       this.logger.error(...args);
@@ -95,17 +106,175 @@ export class App extends HMR<Plugin> {
       const args = e instanceof Error ? [e.message, { stack: e.stack }] : [e];
       this.logger.error(...args);
     });
-    this.config = finalConfig;
-    setLevel(finalConfig.log_level);
-    this.middleware(this.messageMiddleware.bind(this))
+    this.#config = config;
+    // 监听配置变更
+    config.on("change", (before, after) => {
+      this.handleConfigChange(before, after);
+      this.broadcast("config.change", before, after);
+    });
+    this.defineSchema(App.schema);
+    setLevel(config.get("log_level") || LogLevel.INFO);
+    this.middleware(this.messageMiddleware.bind(this));
   }
-  async receiveMessage<P extends RegisteredAdapter>(message: Message<AdapterMessage<P>>) {
-    const middlewares=this.dependencyList.reduce((result, plugin) => {
-      result.push(...plugin.middlewares as MessageMiddleware<P>[]);
-      return result;
-    }, [...this.middlewares] as MessageMiddleware<P>[]);
-    const handle=compose(middlewares)
-    await handle(message)
+
+  /**
+   * 处理配置变更
+   * 如果上一次变更未完成，等待其完成后再处理新的变更
+   */
+  private async handleConfigChange(
+    before: AppConfig,
+    after: AppConfig
+  ): Promise<void> {
+    this.logger.info("configuration changed");
+    // 等待上一次配置变更处理完成
+    if (this.configChangeLock) {
+      this.logger.info("Waiting for previous config change to complete...");
+      await this.configChangeLock;
+    }
+
+    // 创建新的锁
+    this.configChangeLock = this.applyConfigChanges(before, after);
+
+    try {
+      await this.configChangeLock;
+    } finally {
+      this.configChangeLock = null;
+    }
+  }
+
+  /**
+   * 应用配置变更
+   */
+  private async applyConfigChanges(
+    before: AppConfig,
+    after: AppConfig
+  ): Promise<void> {
+    try {
+      // 1. 更新日志级别
+      if (after.log_level !== before.log_level) {
+        setLevel(after.log_level || LogLevel.INFO);
+      }
+
+      // 2. 更新监听目录
+      await this.updateWatchDirs(
+        before.plugin_dirs || [],
+        after.plugin_dirs || []
+      );
+
+      // 3. 更新插件加载
+      await this.updatePlugins(before.plugins || [], after.plugins || []);
+    } catch (error) {
+      this.logger.error("Failed to apply configuration changes:", error);
+      throw error;
+    }
+    // 4. 更新数据库连接
+    if (JSON.stringify(before.database) !== JSON.stringify(after.database)) {
+      this.database?.stop();
+      if (after.database) {
+        this.database = Registry.create(
+          (this.config.database as any).dialect,
+          this.config.database,
+          Object.fromEntries(this.definitions)
+        );
+        await this.database!.start();
+      }
+    }
+  }
+
+  /**
+   * 更新监听目录
+   */
+  private async updateWatchDirs(
+    oldDirs: string[],
+    newDirs: string[]
+  ): Promise<void> {
+    const oldResolved = oldDirs.map((dir) => path.resolve(process.cwd(), dir));
+    const newResolved = newDirs.map((dir) => path.resolve(process.cwd(), dir));
+
+    // 找出需要移除的目录
+    const dirsToRemove = oldResolved.filter(
+      (dir) => !newResolved.includes(dir)
+    );
+    // 找出需要添加的目录
+    const dirsToAdd = newResolved.filter((dir) => !oldResolved.includes(dir));
+
+    // 移除过时的监听目录
+    for (const dir of dirsToRemove) {
+      this.removeWatchDir(dir);
+    }
+
+    // 添加新的监听目录
+    for (const dir of dirsToAdd) {
+      this.addWatchDir(dir);
+    }
+  }
+
+  /**
+   * 更新插件加载
+   */
+  private async updatePlugins(
+    oldPlugins: string[],
+    newPlugins: string[]
+  ): Promise<void> {
+    // 找出需要卸载的插件
+    const pluginsToUnload = oldPlugins.filter(
+      (plugin) => !newPlugins.includes(plugin)
+    );
+    // 找出需要加载的插件
+    const pluginsToLoad = newPlugins.filter(
+      (plugin) => !oldPlugins.includes(plugin)
+    );
+
+    // 卸载不再需要的插件
+    for (const pluginName of pluginsToUnload) {
+      await this.unloadPlugin(pluginName);
+    }
+
+    // 加载新插件
+    for (const pluginName of pluginsToLoad) {
+      this.use(pluginName);
+    }
+
+    // 等待新插件加载完成
+    if (pluginsToLoad.length > 0) {
+      await sleep(200);
+      await this.waitForReady();
+    }
+  }
+
+  /**
+   * 卸载插件
+   */
+  private async unloadPlugin(pluginName: string): Promise<void> {
+    // 尝试找到插件 (使用 HMR 提供的方法)
+    const plugin = this.findPluginByName<Plugin>(pluginName);
+    if (plugin) {
+      // 找到插件的文件路径
+      const filePath = plugin.filename;
+
+      // 销毁插件
+      plugin.dispose();
+
+      // 从依赖映射中移除
+      this.dependencies.delete(filePath);
+
+      this.logger.info(`Plugin ${pluginName} unloaded successfully`);
+    } else {
+      this.logger.warn(`Plugin ${pluginName} not found, skipping unload`);
+    }
+  }
+  async receiveMessage<P extends RegisteredAdapter>(
+    message: Message<AdapterMessage<P>>
+  ) {
+    const middlewares = this.dependencyList.reduce(
+      (result, plugin) => {
+        result.push(...(plugin.middlewares as MessageMiddleware<P>[]));
+        return result;
+      },
+      [...this.middlewares] as MessageMiddleware<P>[]
+    );
+    const handle = compose(middlewares);
+    await handle(message);
   }
   async messageMiddleware(message: Message, next: () => Promise<void>) {
     for (const command of this.commands) {
@@ -130,13 +299,13 @@ export class App extends HMR<Plugin> {
    */
   static defaultConfig: AppConfig = {
     log_level: LogLevel.INFO,
-    plugin_dirs: ["./plugins"],
+    plugin_dirs: [],
     plugins: [],
     bots: [],
     debug: false,
   };
   middleware(middleware: MessageMiddleware) {
-    this.middlewares.push(middleware)
+    this.middlewares.push(middleware);
   }
   /**
    * 发送消息到指定适配器和机器人
@@ -181,30 +350,54 @@ export class App extends HMR<Plugin> {
    * @param filePath 插件文件路径
    */
   createDependency(name: string, filePath: string): Plugin {
-    return new Plugin(this, name, filePath)
+    return new Plugin(this, name, filePath);
   }
 
   /** 获取App配置 */
   /**
    * 获取App配置（只读）
    */
-  getConfig(): Readonly<AppConfig> {
-    return { ...this.config };
+  getConfig(): Readonly<AppConfig>;
+  getConfig<T extends Config.Paths<AppConfig>>(
+    key: T
+  ): Readonly<Config.Value<AppConfig, T>>;
+  getConfig<T extends Config.Paths<AppConfig>>(key?: T) {
+    if (key === undefined) {
+      return this.#config.config;
+    }
+    return this.#config.get(key);
   }
-
-  /** 更新App配置 */
-  /**
-   * 更新App配置
-   * @param config 部分配置项，将与现有配置合并
-   */
-  updateConfig(config: Partial<AppConfig>): void {
-    this.config = { ...this.config, ...config };
-
-    // 更新HMR配置
-    if (config.plugin_dirs) {
+  setConfig(value: AppConfig): void;
+  setConfig<T extends Config.Paths<AppConfig>>(
+    key: T,
+    value: Config.Value<AppConfig, T>
+  ): void;
+  setConfig<T extends Config.Paths<AppConfig>>(
+    key: T | AppConfig,
+    value?: Config.Value<AppConfig, T>
+  ): void {
+    if (typeof key === "object") {
+      this.#config.config = key;
+    } else if (value !== undefined) {
+      this.#config.set(key, value);
+    }
+  }
+  changeSchema(key: string, value: Schema) {
+    if (!App.schema.options.object) {
+      App.schema.options.object = {};
+    }
+    App.schema.options.object[key] = value;
+    this.#config.reload();
+  }
+  get config() {
+    return this.#config.config;
+  }
+  set config(newConfig: AppConfig) {
+    this.#config.config = newConfig;
+    if (newConfig.plugin_dirs) {
       // 动态更新监听目录
       const currentDirs = this.getWatchDirs();
-      const newDirs = config.plugin_dirs;
+      const newDirs = newConfig.plugin_dirs;
 
       // 移除不再需要的目录
       for (const dir of currentDirs) {
@@ -220,52 +413,61 @@ export class App extends HMR<Plugin> {
         }
       }
     }
-
     this.logger.info("App configuration updated", this.config);
   }
-  get schemas() {
-    return this.dependencyList.reduce((result, plugin) => {
-      plugin.schemas.forEach((schema, name) => {
-        result.set(name, schema);
-      });
-      return result;
-    }, new Map<string, Schema<any>>([
-      ['SystemLog', SystemLogSchema],
-      ['User', UserSchema]
-    ]));
+  get definitions() {
+    return this.dependencyList.reduce(
+      (result, plugin) => {
+        plugin.definitions.forEach((definition, name) => {
+          result.set(name, definition);
+        });
+        return result;
+      },
+      new Map<string, Definition<any>>([
+        ["SystemLog", SystemLogDefinition],
+        ["User", UserDefinition],
+      ])
+    );
   }
   /** 使用插件 */
   use(filePath: string): void {
     this.emit("internal.add", filePath);
   }
-
-  /** 启动App */
-  async start(mode: "dev" | "prod" = "prod"): Promise<void> {
-    await generateEnvTypes(process.cwd());
-    // 加载插件
-    for (const pluginName of this.config.plugins || []) {
-      this.use(pluginName);
-    }
-    await sleep(200);
-    const schemas: Record<string, Schema> = {};
-    for (const [name, schema] of this.schemas) {
-      schemas[name] = schema;
+  async #init() {
+    // 首次初始化时，执行配置应用逻辑
+    await this.handleConfigChange(App.defaultConfig, this.config);
+
+    // 初始化数据库
+    const definitions: Record<string, Definition> = {};
+    for (const [name, schema] of this.definitions) {
+      definitions[name] = schema;
     }
     if (this.config.database) {
-      this.database = Registry.create((this.config.database as any).dialect, this.config.database, schemas);
+      this.database = Registry.create(
+        (this.config.database as any).dialect,
+        this.config.database,
+        definitions
+      );
+      this.logger.info(`database init...`);
       await this.database?.start();
       this.logger.info(`database init success`);
-
-      // 初始化日志传输器
-      this.logTransport = new DatabaseLogTransport(this);
-      addTransport(this.logTransport);
-      this.logger.info(`database log transport registered`);
+      this.dispatch("database.ready", this.database);
     } else {
       this.logger.info(`database not configured, skipping database init`);
     }
-    this.dispatch("database.ready", this.database);
     // 等待所有插件就绪
     await this.waitForReady();
+  }
+  /** 启动App */
+  async start(mode: "dev" | "prod" = "prod"): Promise<void> {
+    await generateEnvTypes(process.cwd());
+    await this.#init();
+    if (this.database) {
+      // 初始化日志传输器
+      this.logTransport = new DatabaseLogTransport(this);
+      addTransport(this.logTransport);
+      this.logger.info(`database log transport registered`);
+    }
     this.logger.info("started successfully");
     this.dispatch("app.ready");
   }
@@ -313,6 +515,50 @@ export class App extends HMR<Plugin> {
     return options;
   }
 }
+export namespace App {
+  export const schema = Schema.object({
+    database: Schema.any().description("数据库配置"),
+    bots: Schema.list(Schema.any()).default([]).description("机器人配置列表"),
+    log_level: Schema.number()
+      .default(LogLevel.INFO)
+      .description("日志级别 (0=DEBUG, 1=INFO, 2=WARN, 3=ERROR, 4=SILENT)")
+      .min(0)
+      .max(4),
+    log: Schema.object({
+      maxDays: Schema.number().default(7).description("日志最大保存天数"),
+      maxRecords: Schema.number().default(10000).description("日志最大记录数"),
+      cleanupInterval: Schema.number()
+        .default(24)
+        .description("日志清理间隔（小时）"),
+    })
+      .description("日志配置")
+      .default({
+        maxDays: 7,
+        maxRecords: 10000,
+        cleanupInterval: 24,
+      }),
+    plugin_dirs: Schema.list(Schema.string())
+      .default(["node_modules"])
+      .description("插件目录列表"),
+
+    plugins: Schema.list(Schema.string())
+      .default([])
+      .description("需要加载的插件列表"),
+    debug: Schema.boolean()
+      .default(false)
+      .description("是否启用调试模式"),
+  }).default({
+    log_level: LogLevel.INFO,
+    log: {
+      maxDays: 7,
+      maxRecords: 10000,
+      cleanupInterval: 24,
+    },
+    plugin_dirs: ["node_modules"],
+    plugins: [],
+    debug: false,
+  });
+}
 
 // ============================================================================
 // Hooks API
@@ -347,14 +593,17 @@ export function useApp(): App {
 }
 export function defineModel<T extends Record<string, any>>(
   name: string,
-  schema: Schema<T>,
+  schema: Definition<T>
 ) {
   const plugin = usePlugin();
   return plugin.defineModel(name, schema);
 }
-export function addPermit<T extends RegisteredAdapter>(name: string | RegExp, checker: PermissionChecker<T>) {
-  const plugin = usePlugin()
-  return plugin.addPermit(name, checker)
+export function addPermit<T extends RegisteredAdapter>(
+  name: string | RegExp,
+  checker: PermissionChecker<T>
+) {
+  const plugin = usePlugin();
+  return plugin.addPermit(name, checker);
 }
 /** 获取当前插件实例 */
 export function usePlugin(): Plugin {
@@ -388,16 +637,15 @@ export function registerAdapter<T extends Adapter>(adapter: T) {
     name: adapter.name,
     description: `adapter for ${adapter.name}`,
     async mounted(plugin) {
-      await adapter.start(plugin);
+      await adapter.mounted(plugin);
       return adapter;
     },
     dispose() {
-      return adapter.stop(plugin);
+      return adapter.dispose(plugin);
     },
   });
 }
 
-
 /** 标记必需的Context */
 export function useContext<T extends (keyof GlobalContext)[]>(
   ...args: [...T, sideEffect: SideEffect<T>]
@@ -411,7 +659,14 @@ export function addMiddleware(middleware: MessageMiddleware): void {
   const plugin = usePlugin();
   plugin.addMiddleware(middleware);
 }
-export function onDatabaseReady(callback: (database: RelatedDatabase<any, Models> | DocumentDatabase<any, Models> | KeyValueDatabase<any, Models>) => PromiseLike<void>) {
+export function onDatabaseReady(
+  callback: (
+    database:
+      | RelatedDatabase<any, Models>
+      | DocumentDatabase<any, Models>
+      | KeyValueDatabase<any, Models>
+  ) => PromiseLike<void>
+) {
   const plugin = usePlugin();
   if (plugin.app.database?.isStarted) callback(plugin.app.database);
   plugin.on("database.ready", callback);
@@ -432,9 +687,7 @@ export function addCommand(command: MessageCommand): void {
 }
 
 /** 添加组件 */
-export function addComponent<P = any>(
-  component: Component<P>
-): void {
+export function addComponent<P = any>(component: Component<P>): void {
   const plugin = usePlugin();
   plugin.addComponent(component);
 }
@@ -497,7 +750,10 @@ export async function sendMessage(options: SendOptions): Promise<void> {
   const app = useApp();
   await app.sendMessage(options);
 }
-
+export function defineSchema<S extends Schema>(rules: S): S {
+  const plugin = usePlugin();
+  return plugin.defineSchema(rules);
+}
 /** 获取App实例（用于高级操作） */
 export function getAppInstance(): App {
   return useApp();
@@ -510,8 +766,8 @@ export function useLogger(): Logger {
 }
 
 /** 创建App实例的工厂函数 */
-export async function createApp(config?: Partial<AppConfig>): Promise<App> {
-  const app = new App(config);
+export async function createApp(config_file?: string): Promise<App> {
+  const app = new App(config_file);
   await app.start();
   return app;
 }

package/src/bot.ts

@@ -1,32 +1,34 @@
-import type { SendOptions} from "./types.js";
-import {Message} from "./message.js";
+import type { SendOptions } from "./types.js";
+import { Message } from "./message.js";
 /**
  * Bot接口：所有平台机器人需实现的统一接口。
  * 负责消息格式化、连接、断开、消息发送等。
  * @template M 消息类型
  * @template T 配置类型
  */
-export interface Bot<M extends object={},T extends BotConfig=BotConfig> {
-    /** 机器人配置 */
-    $config: T;
-    /** 是否已连接 */
-    $connected?: boolean;
-    /** 格式化平台消息为标准Message结构 */
-    $formatMessage(message:M):Message<M>
-    /** 连接机器人 */
-    $connect():Promise<void>
-    /** 断开机器人 */
-    $disconnect():Promise<void>
-    /** 撤回消息 */
-    $recallMessage(id:string):Promise<void>
-    /** 发送消息返回消息id */
-    $sendMessage(options: SendOptions): Promise<string>
+export interface Bot<M extends object = {}, T extends Bot.Config = Bot.Config> {
+  /** 机器人配置 */
+  $config: T;
+  /** 是否已连接 */
+  $connected?: boolean;
+  /** 格式化平台消息为标准Message结构 */
+  $formatMessage(message: M): Message<M>;
+  /** 连接机器人 */
+  $connect(): Promise<void>;
+  /** 断开机器人 */
+  $disconnect(): Promise<void>;
+  /** 撤回消息 */
+  $recallMessage(id: string): Promise<void>;
+  /** 发送消息返回消息id */
+  $sendMessage(options: SendOptions): Promise<string>;
+}
+export namespace Bot {
+  /**
+   * Bot配置类型，所有平台机器人通用
+   */
+  export interface Config {
+    context: string;
+    name: string;
+    [key: string]: any;
+  }
 }
-/**
- * Bot配置类型，所有平台机器人通用
- */
-export interface BotConfig{
-    context:string
-    name:string
-    [key:string]:any
-}