@zhin.js/core 1.0.46 → 1.0.47

package/lib/request.js

@@ -0,0 +1,11 @@
+export var Request;
+(function (Request) {
+    /**
+     * 工具方法：合并自定义字段与基础请求结构
+     */
+    function from(input, format) {
+        return Object.assign(input, format);
+    }
+    Request.from = from;
+})(Request || (Request = {}));
+//# sourceMappingURL=request.js.map

package/lib/request.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"request.js","sourceRoot":"","sources":["../src/request.ts"],"names":[],"mappings":"AAuFA,MAAM,KAAW,OAAO,CAOvB;AAPD,WAAiB,OAAO;IACtB;;OAEG;IACH,SAAgB,IAAI,CAAmB,KAAQ,EAAE,MAAmB;QAClE,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACtC,CAAC;IAFe,YAAI,OAEnB,CAAA;AACH,CAAC,EAPgB,OAAO,KAAP,OAAO,QAOvB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/core",
-  "version": "1.0.46",
+  "version": "1.0.47",
   "description": "Zhin机器人核心框架",
   "type": "module",
   "main": "./lib/index.js",
@@ -37,11 +37,11 @@
     "segment-matcher": "^1.0.5",
     "smol-toml": "^1.6.0",
     "yaml": "^2.3.4",
-    "@zhin.js/kernel": "0.0.7",
-    "@zhin.js/database": "1.0.33",
-    "@zhin.js/ai": "1.0.7",
-    "@zhin.js/logger": "0.1.30",
-    "@zhin.js/schema": "1.0.30"
+    "@zhin.js/ai": "1.0.8",
+    "@zhin.js/database": "1.0.34",
+    "@zhin.js/kernel": "0.0.8",
+    "@zhin.js/logger": "0.1.31",
+    "@zhin.js/schema": "1.0.31"
   },
   "devDependencies": {
     "@types/node": "^24.3.0",

package/src/adapter.ts

@@ -2,6 +2,8 @@ import { Bot } from "./bot.js";
 import { Plugin } from "./plugin.js";
 import { EventEmitter } from "events";
 import { Message } from "./message.js";
+import { Notice, NoticeType } from "./notice.js";
+import { Request, RequestType } from "./request.js";
 import { BeforeSendHandler, SendOptions, Tool, ToolContext, ToolScope } from "./types.js";
 import { segment } from "./utils.js";
 import { ZhinTool, isZhinTool, type ToolInput } from "./built/tool.js";
@@ -53,6 +55,21 @@ export abstract class Adapter<R extends Bot = Bot> extends EventEmitter<Adapter.
         });
       }
     });
+    this.on('notice.receive', (notice) => {
+      this.logger.info(`${notice.$bot} notice ${notice.$type}${notice.$subType ? '.' + notice.$subType : ''} ${notice.$channel.type}(${notice.$channel.id})`);
+      const rootPlugin = this.plugin?.root || this.plugin;
+      rootPlugin?.dispatch('notice.receive', notice);
+      // 分发细粒度事件: notice.{type} 和 notice.{channelType}.{type}
+      rootPlugin?.dispatch(`notice.${notice.$type}` as 'notice.receive', notice);
+      rootPlugin?.dispatch(`notice.${notice.$channel.type}.${notice.$type}` as 'notice.receive', notice);
+    });
+    this.on('request.receive', (request) => {
+      this.logger.info(`${request.$bot} request ${request.$type}${request.$subType ? '.' + request.$subType : ''} from ${request.$sender.id}`);
+      const rootPlugin = this.plugin?.root || this.plugin;
+      rootPlugin?.dispatch('request.receive', request);
+      // 分发细粒度事件: request.{type}
+      rootPlugin?.dispatch(`request.${request.$type}` as 'request.receive', request);
+    });
   }
   abstract createBot(config: Adapter.BotConfig<R>): R;
   get logger() {
@@ -322,6 +339,14 @@ export namespace Adapter {
     'message.private.receive': [Message];
     'message.group.receive': [Message];
     'message.channel.receive': [Message];
+    'notice.receive': [Notice];
+    'notice.private.receive': [Notice];
+    'notice.group.receive': [Notice];
+    'notice.channel.receive': [Notice];
+    'request.receive': [Request];
+    'request.friend_add': [Request];
+    'request.group_add': [Request];
+    'request.group_invite': [Request];
     'call.recallMessage': [string, string];
   }
   /**

package/src/bot.ts

@@ -1,11 +1,13 @@
 import type { SendOptions } from "./types.js";
 import { Message } from "./message.js";
+import { Notice } from "./notice.js";
+import { Request } from "./request.js";
 import { Adapter, Adapters } from "./adapter.js";
 /**
  * Bot接口：所有平台机器人需实现的统一接口。
  * 负责消息格式化、连接、断开、消息发送等。
- * @template M 消息类型
- * @template T 配置类型
+ * @template Config 配置类型
+ * @template Event 消息事件类型
  */
 export interface Bot<Config extends object= {},Event extends object = {}> {
   $id:string
@@ -15,6 +17,10 @@ export interface Bot<Config extends object= {},Event extends object = {}> {
   $connected: boolean;
   /** 格式化平台消息为标准Message结构 */
   $formatMessage(event: Event): Message<Event>;
+  /** 格式化平台通知为标准Notice结构（适配器可选实现） */
+  $formatNotice?(event: any): Notice<any>;
+  /** 格式化平台请求为标准Request结构（适配器可选实现） */
+  $formatRequest?(event: any): Request<any>;
   /** 连接机器人 */
   $connect(): Promise<void>;
   /** 断开机器人 */

package/src/built/message-filter.ts

@@ -370,10 +370,10 @@ export class MessageFilterFeature extends Feature<FilterRule> {
     if (rule.bots?.length && !this.#matchAny(rule.bots, String(message.$bot))) {
       return false;
     }
-    if (rule.channels?.length && !this.#matchAny(rule.channels, message.$channel.id)) {
+    if (rule.channels?.length && !this.#matchAny(rule.channels, String(message.$channel.id))) {
       return false;
     }
-    if (rule.senders?.length && !this.#matchAny(rule.senders, message.$sender.id)) {
+    if (rule.senders?.length && !this.#matchAny(rule.senders, String(message.$sender.id))) {
       return false;
     }
     return true;

package/src/index.ts

@@ -6,6 +6,8 @@ export * from './command.js'
 export * from './component.js'
 export * from './adapter.js'
 export * from './message.js'
+export * from './notice.js'
+export * from './request.js'
 export * from './prompt.js'
 // Models
 export * from './models/system-log.js'

package/src/notice.ts

@@ -0,0 +1,98 @@
+import { Adapters } from './adapter.js';
+import type { MessageSender } from './types.js';
+
+/**
+ * 通知类型枚举
+ *
+ * 常见 IM 通知事件分类：
+ * - group_member_increase: 群成员增加（入群）
+ * - group_member_decrease: 群成员减少（退群/被踢）
+ * - group_admin_change:    群管理员变动
+ * - group_ban:             群禁言
+ * - group_recall:          群消息撤回
+ * - friend_recall:         好友消息撤回
+ * - friend_add:            新增好友
+ * - group_poke:            群戳一戳
+ * - friend_poke:           好友戳一戳
+ * - group_transfer:        群转让
+ *
+ * 适配器可自行扩展更多子类型
+ */
+export type NoticeType =
+  | 'group_member_increase'
+  | 'group_member_decrease'
+  | 'group_admin_change'
+  | 'group_ban'
+  | 'group_recall'
+  | 'friend_recall'
+  | 'friend_add'
+  | 'group_poke'
+  | 'friend_poke'
+  | 'group_transfer'
+  | (string & {}); // 允许适配器扩展自定义类型
+
+/**
+ * 通知频道信息
+ */
+export interface NoticeChannel {
+  id: string;
+  type: 'group' | 'private' | 'channel';
+}
+
+/**
+ * 通知基础结构
+ *
+ * 与 MessageBase 同构设计，所有通知共享以下字段。
+ * 适配器通过 `Notice.from(raw, base)` 合并平台原始数据和标准字段。
+ *
+ * @example
+ * ```typescript
+ * // 适配器中格式化通知
+ * const notice = Notice.from(rawEvent, {
+ *   $id: rawEvent.id,
+ *   $adapter: 'icqq',
+ *   $bot: botName,
+ *   $type: 'group_member_decrease',
+ *   $subType: 'kick',
+ *   $channel: { id: groupId, type: 'group' },
+ *   $operator: { id: operatorId, name: '管理员' },
+ *   $target: { id: userId, name: '被踢者' },
+ *   $timestamp: Date.now(),
+ * });
+ * this.adapter.emit('notice.receive', notice);
+ * ```
+ */
+export interface NoticeBase {
+  /** 通知唯一 ID（平台提供或自生成） */
+  $id: string;
+  /** 适配器名称 */
+  $adapter: keyof Adapters;
+  /** Bot 名称 */
+  $bot: string;
+  /** 通知类型 */
+  $type: NoticeType;
+  /** 通知子类型（如 leave/kick、set/unset） */
+  $subType?: string;
+  /** 通知发生的频道/群/会话 */
+  $channel: NoticeChannel;
+  /** 操作者信息（如管理员） */
+  $operator?: MessageSender;
+  /** 被操作目标信息（如被踢的成员） */
+  $target?: MessageSender;
+  /** 通知时间戳 */
+  $timestamp: number;
+}
+
+/**
+ * 完整通知类型，支持平台原始数据扩展
+ */
+export type Notice<T extends object = {}> = NoticeBase & T;
+
+export namespace Notice {
+  /**
+   * 工具方法：合并自定义字段与基础通知结构
+   */
+  export function from<T extends object>(input: T, format: NoticeBase): Notice<T> {
+    return Object.assign(input, format);
+  }
+}

package/src/plugin.ts

@@ -18,6 +18,8 @@ import { MessageMiddleware, RegisteredAdapter, MaybePromise, ArrayItem, SendOpti
 import type { ConfigFeature } from "./built/config.js";
 import type { PermissionFeature } from "./built/permission.js";
 import { Adapter, Adapters } from "./adapter.js";
+import { Notice } from "./notice.js";
+import { Request } from "./request.js";
 import { Feature, FeatureJSON } from "./feature.js";
 import { createHash } from "crypto";
 const contextsKey = Symbol("contexts");
@@ -1024,6 +1026,12 @@ export namespace Plugin {
     'before.sendMessage': [SendOptions];
     "context.mounted": [keyof Plugin.Contexts];
     "context.dispose": [keyof Plugin.Contexts];
+    // Notice 事件
+    'notice.receive': [Notice];
+    [key: `notice.${string}`]: [Notice];
+    // Request 事件
+    'request.receive': [Request];
+    [key: `request.${string}`]: [Request];
   }
 
   /**

package/src/request.ts

@@ -0,0 +1,95 @@
+import { Adapters } from './adapter.js';
+import type { MessageSender, MaybePromise } from './types.js';
+
+/**
+ * 请求类型枚举
+ *
+ * 常见 IM 请求事件分类：
+ * - friend_add:  好友添加请求
+ * - group_add:   主动申请入群
+ * - group_invite: 邀请入群请求
+ *
+ * 适配器可自行扩展更多子类型
+ */
+export type RequestType =
+  | 'friend_add'
+  | 'group_add'
+  | 'group_invite'
+  | (string & {}); // 允许适配器扩展自定义类型
+
+/**
+ * 请求频道信息
+ */
+export interface RequestChannel {
+  id: string;
+  type: 'group' | 'private' | 'channel';
+}
+
+/**
+ * 请求基础结构
+ *
+ * 与 MessageBase / NoticeBase 同构设计。
+ * 核心区别：Request 提供 `$approve()` 和 `$reject()` 方法，用于快速处理请求。
+ *
+ * @example
+ * ```typescript
+ * // 适配器中格式化请求
+ * const request = Request.from(rawEvent, {
+ *   $id: rawEvent.flag,
+ *   $adapter: 'icqq',
+ *   $bot: botName,
+ *   $type: 'group_invite',
+ *   $channel: { id: groupId, type: 'group' },
+ *   $sender: { id: userId, name: '邀请者' },
+ *   $comment: '请求加群消息',
+ *   $timestamp: Date.now(),
+ *   $approve: async (remark?) => { await api.approve(flag, remark); },
+ *   $reject: async (reason?) => { await api.reject(flag, reason); },
+ * });
+ * this.adapter.emit('request.receive', request);
+ * ```
+ */
+export interface RequestBase {
+  /** 请求唯一 ID / flag（平台提供的请求标识，用于后续处理） */
+  $id: string;
+  /** 适配器名称 */
+  $adapter: keyof Adapters;
+  /** Bot 名称 */
+  $bot: string;
+  /** 请求类型 */
+  $type: RequestType;
+  /** 请求子类型 */
+  $subType?: string;
+  /** 请求发生的频道/群/会话 */
+  $channel: RequestChannel;
+  /** 请求发送者 */
+  $sender: MessageSender;
+  /** 请求附言/验证消息 */
+  $comment?: string;
+  /** 请求时间戳 */
+  $timestamp: number;
+  /**
+   * 同意请求
+   * @param remark 备注信息（如好友备注）
+   */
+  $approve(remark?: string): MaybePromise<void>;
+  /**
+   * 拒绝请求
+   * @param reason 拒绝原因
+   */
+  $reject(reason?: string): MaybePromise<void>;
+}
+
+/**
+ * 完整请求类型，支持平台原始数据扩展
+ */
+export type Request<T extends object = {}> = RequestBase & T;
+
+export namespace Request {
+  /**
+   * 工具方法：合并自定义字段与基础请求结构
+   */
+  export function from<T extends object>(input: T, format: RequestBase): Request<T> {
+    return Object.assign(input, format);
+  }
+}