node-karin 0.12.13 → 0.12.15

package/lib/cli/index.js

@@ -41,7 +41,7 @@ export class KarinCli {
     getConfigPath(name) {
         const filePath = `./config/config/${name}.yaml`;
         if (!fs.existsSync(filePath))
-            return `${this.karinDir}/config/config/${name}.yaml`;
+            return `${this.karinDir}/config/defSet/${name}.yaml`;
         return filePath;
     }
     /**
@@ -131,7 +131,7 @@ export class KarinCli {
                 fs.writeFileSync(filePath, yaml.stringify(data));
             }
         }
-        const cmd = `pm2 start ${filePath} --env ${JSON.stringify(process.env)}`;
+        const cmd = `pm2 start ${filePath}`;
         await this.exec(cmd);
         console.log('pm2服务已启动 可执行 【npx karin log】 查看日志');
         process.exit(0);

package/lib/core/init/config.js

@@ -177,7 +177,7 @@ export class KarinCfgInit {
         }
         /** 检查是否为官方源 如果不是则生成.npmrc */
         const registry = await this.shell('npm config get registry');
-        if (registry !== 'https://registry.npmjs.org/') {
+        if (!registry || !registry?.includes('registry.npmjs.org')) {
             const text = `node_sqlite3_binary_host_mirror=https://registry.npmmirror.com/-/binary/sqlite3
 better_sqlite3_binary_host_mirror=https://registry.npmmirror.com/-/binary/better-sqlite3
 sass_binary_site=https://registry.npmmirror.com/-/binary/node-sass

package/lib/core/karin/karin.d.ts

@@ -1,12 +1,10 @@
-import { Contact, KarinElement, KarinMessage, KarinRenderType, RenderResult, AllMessageSubType, CommandInfo, TaskInfo, HandlerInfo, AcceptInfo, UseInfo, AllNoticeSubType, AllRequestSubType, UseMapType, ButtonInfo, Permission } from '../../types/index.js';
+import { Contact, KarinElement, KarinMessage, KarinRenderType, RenderResult, AllMessageSubType, CommandInfo, TaskInfo, HandlerInfo, UseInfo, UseMapType, AppType, ButtonInfo, Permission, AcceptDict } from '../../types/index.js';
 import { Listeners } from '../listener/listener.js';
 export type FncFunction = (e: KarinMessage) => Promise<boolean>;
 export type FncElement = string | KarinElement | Array<KarinElement>;
 export type UseFnType<K extends keyof UseMapType> = UseMapType[K];
 export interface Options {
-    /**
-     * - 插件名称 不传则使用 插件名称:函数名
-     */
+    /** 插件名称 不传则使用 插件名称:函数名 */
     name?: string;
     /**
      * - 插件优先级 数字越小优先级越高
@@ -20,9 +18,7 @@ export interface Options {
     log?: boolean | Function;
 }
 export interface OptionsCommand extends Options {
-    /**
-     * - 监听事件
-     */
+    /** 监听事件 */
     event?: `${AllMessageSubType}`;
     /**
      * - 权限
@@ -41,9 +37,7 @@ export interface OptionsElement extends OptionsCommand {
      * @default false
      */
     reply?: boolean;
-    /**
-     * - 延迟回复 单位毫秒
-     */
+    /** 延迟回复 单位毫秒 */
     delay?: number;
     /**
      * - 发送是否撤回消息 单位秒
@@ -92,9 +86,9 @@ export declare class Karin extends Listeners {
      * 构建contact
      * @param scene - 场景
      * @param peer - 群号或者用户id
-     * @param sub_peer - 子id
+     * @param subPeer - 子id
      */
-    contact(scene: Contact['scene'], peer: Contact['peer'], sub_peer?: Contact['sub_peer']): Contact;
+    contact(scene: Contact['scene'], peer: Contact['peer'], subPeer?: Contact['sub_peer']): Contact;
     /**
      * 构建group_contact
      * @param peer - 群号
@@ -108,9 +102,9 @@ export declare class Karin extends Listeners {
     /**
      * 构建guild_contact
      * @param peer - 频道id
-     * @param sub_peer - 子频道id
+     * @param subPeer - 子频道id
      */
-    contactGuild(peer: Contact['peer'], sub_peer: string): Contact;
+    contactGuild(peer: Contact['peer'], subPeer: string): Contact;
     /**
      * 快速渲染
      * @param file - 文件路径、http地址
@@ -132,21 +126,13 @@ export declare class Karin extends Listeners {
      * @param options - 上下文选项
      */
     ctx(e: KarinMessage, options?: {
-        /**
-         * - 指定用户id触发下文 不指定则使用默认e.user_id
-         */
+        /** 指定用户id触发下文 不指定则使用默认e.user_id */
         userId?: string;
-        /**
-         * - 超时时间 默认120秒
-         */
+        /** 超时时间 默认120秒 */
         time?: number;
-        /**
-         * - 超时后是否回复
-         */
+        /** 超时后是否回复 */
         reply?: boolean;
-        /**
-         * - 超时回复文本 默认为'操作超时已取消'
-         */
+        /** 超时回复文本 默认为'操作超时已取消' */
         replyMsg?: string;
     }): Promise<KarinMessage>;
     /**
@@ -154,7 +140,14 @@ export declare class Karin extends Listeners {
      * @param event - 监听事件
      * @param fn - 实现函数
      */
-    accept(event: AllNoticeSubType | AllRequestSubType, fn: AcceptInfo['fn'], options?: Options): AcceptInfo;
+    accept<T extends keyof AcceptDict>(event: T, fn: (e: AcceptDict[T]) => boolean, options?: Options): {
+        event: T;
+        fn: (e: AcceptDict[T]) => boolean;
+        log: (id: string, text: string) => void;
+        name: string;
+        rank: number;
+        type: AppType;
+    };
     /**
      * 中间件
      * @param type 中间件类型
@@ -168,9 +161,7 @@ export declare class Karin extends Listeners {
      * @param fn - 函数
      */
     button(reg: RegExp | string, fn: ButtonInfo['fn'], options?: Omit<Options, 'log'>): ButtonInfo;
-    /**
-     * - 启动
-     */
+    /** 启动 */
     run(): Promise<void>;
 }
 export declare const karin: Karin;

package/lib/core/karin/karin.js

@@ -102,10 +102,10 @@ export class Karin extends Listeners {
      * 构建contact
      * @param scene - 场景
      * @param peer - 群号或者用户id
-     * @param sub_peer - 子id
+     * @param subPeer - 子id
      */
-    contact(scene, peer, sub_peer) {
-        return { scene, peer, sub_peer };
+    contact(scene, peer, subPeer) {
+        return { scene, peer, sub_peer: subPeer };
     }
     /**
      * 构建group_contact
@@ -124,10 +124,10 @@ export class Karin extends Listeners {
     /**
      * 构建guild_contact
      * @param peer - 频道id
-     * @param sub_peer - 子频道id
+     * @param subPeer - 子频道id
      */
-    contactGuild(peer, sub_peer) {
-        return { scene: "guild" /* Scene.Guild */, peer, sub_peer };
+    contactGuild(peer, subPeer) {
+        return { scene: "guild" /* Scene.Guild */, peer, sub_peer: subPeer };
     }
     /**
      * - 渲染
@@ -216,9 +216,7 @@ export class Karin extends Listeners {
             type: "button" /* AppType.Button */,
         };
     }
-    /**
-     * - 启动
-     */
+    /** 启动 */
     async run() {
         if (this.#start)
             return;

package/lib/core/listener/listener.js

@@ -87,7 +87,7 @@ export class Listeners extends EventEmitter {
         const options = await level.get(key);
         if (!options)
             return;
-        const { id, contact, time, message_id } = options;
+        const { id, contact, time, message_id: messageId } = options;
         /** 重启花费时间 保留2位小数 */
         const restartTime = ((Date.now() - time) / 1000).toFixed(2);
         /** 超过2分钟不发 */
@@ -96,7 +96,7 @@ export class Listeners extends EventEmitter {
             return false;
         }
         const element = [
-            segment.reply(message_id),
+            segment.reply(messageId),
             segment.text(`\nKarin 重启成功：${restartTime}秒`),
         ];
         await this.sendMsg(id, contact, element);
@@ -231,26 +231,26 @@ export class Listeners extends EventEmitter {
         const bot = this.getBot(uid);
         if (!bot)
             throw new Error('发送消息失败: 未找到对应Bot实例');
-        const { recallMsg, retry_count } = options;
+        const { recallMsg, retry_count: retryCount } = options;
         /** 标准化 */
         const NewElements = common.makeMessage(elements);
-        const reply_log = common.makeMessageLog(NewElements);
-        const self_id = bot.account.uid || bot.account.uin;
+        const replyLog = common.makeMessageLog(NewElements);
+        const selfId = bot.account.uid || bot.account.uin;
         if (contact.scene === 'group') {
-            logger.bot('info', self_id, `${logger.green('Send Proactive Group')} ${contact.peer}: ${reply_log}`);
+            logger.bot('info', selfId, `${logger.green('Send Proactive Group')} ${contact.peer}: ${replyLog}`);
         }
         else {
-            logger.bot('info', self_id, `${logger.green('Send Proactive private')} ${contact.peer}: ${reply_log}`);
+            logger.bot('info', selfId, `${logger.green('Send Proactive private')} ${contact.peer}: ${replyLog}`);
         }
         try {
             this.emit('karin:count:send', 1);
             /** 取结果 */
-            result = await bot.SendMessage(contact, NewElements, retry_count);
-            logger.bot('debug', self_id, `主动消息结果:${JSON.stringify(result, null, 2)}`);
+            result = await bot.SendMessage(contact, NewElements, retryCount);
+            logger.bot('debug', selfId, `主动消息结果:${JSON.stringify(result, null, 2)}`);
         }
         catch (error) {
-            logger.bot('error', self_id, `主动消息发送失败:${reply_log}`);
-            logger.bot('error', self_id, error);
+            logger.bot('error', selfId, `主动消息发送失败:${replyLog}`);
+            logger.bot('error', selfId, error);
         }
         /** 快速撤回 */
         if (recallMsg && bot.RecallMessage && recallMsg > 0 && result?.message_id) {

package/lib/core/plugin/base.d.ts

@@ -42,30 +42,20 @@ export declare class Plugin implements PluginType {
      */
     timeout: PluginType['timeout'];
     constructor({ name, desc, event, priority, task, rule, handler, }: {
-        /**
-         * - 插件名称
-         */
+        /** 插件名称 */
         name: string;
-        /**
-         * - 插件描述 没有则默认为插件名称
-         */
+        /** 插件描述 没有则默认为插件名称 */
         desc?: string;
-        /**
-         * - 监听事件 默认为message
-         */
+        /** 监听事件 默认为message */
         event?: PluginType['event'];
-        /**
-         * - 优先级 默认为10000
-         */
+        /** 优先级 默认为10000 */
         priority?: PluginType['priority'];
         /**
          * - 定时任务 即将废弃 请使用karin.task
          * @deprecated
          */
         task?: PluginType['task'];
-        /**
-         * - 命令规则
-         */
+        /** 命令规则 */
         rule?: PluginType['rule'];
         /**
          * - handler 已废弃 请使用karin.handler
@@ -73,9 +63,7 @@ export declare class Plugin implements PluginType {
          */
         handler?: PluginType['handler'];
     });
-    /**
-     * - 快速回复
-     */
+    /** 快速回复 */
     reply(msg?: string | KarinElement | Array<KarinElement | string>, options?: {
         /**
          * @param at - 是否at用户
@@ -103,9 +91,7 @@ export declare class Plugin implements PluginType {
          */
         retry_count?: number;
     }): Promise<ReplyReturn>;
-    /**
-     * - 快速回复合并转发
-     */
+    /** 快速回复合并转发 */
     replyForward(msg: NodeElement[]): Promise<{
         message_id: string;
     }>;

package/lib/core/plugin/base.js

@@ -49,15 +49,11 @@ export class Plugin {
         this.rule = rule;
         this.handler = handler;
     }
-    /**
-     * - 快速回复
-     */
+    /** 快速回复 */
     reply(msg = '', options = { reply: false, recallMsg: 0, at: false, button: false, retry_count: 1 }) {
         return this.e.reply(msg, options);
     }
-    /**
-     * - 快速回复合并转发
-     */
+    /** 快速回复合并转发 */
     async replyForward(msg) {
         const result = await this.e.bot.sendForwardMessage(this.e.contact, msg);
         return result;

package/lib/core/plugin/loader.d.ts

@@ -15,27 +15,17 @@ export interface AppFile {
 }
 declare class PluginLoader {
     dir: './plugins';
-    /**
-     * - 插件索引ID
-     */
+    /** 插件索引ID */
     index: number;
-    /**
-     * - 定时任务
-     */
-    /**
-     * - 监听器
-     */
+    /** 定时任务 */
+    /** 监听器 */
     watcher: Map<string, chokidar.FSWatcher>;
-    /**
-     * - 热更新列表
-     */
+    /** 热更新列表 */
     watchList: Array<{
         plugin: string;
         path: string;
     }>;
-    /**
-     * - 依赖缺失收集
-     */
+    /** 依赖缺失收集 */
     dependErr: {
         [key: string]: {
             plugin: string;

package/lib/core/plugin/loader.js

@@ -8,25 +8,15 @@ import { karin } from '../karin/karin.js';
 import { common, logger } from '../../utils/index.js';
 class PluginLoader {
     dir;
-    /**
-     * - 插件索引ID
-     */
+    /** 插件索引ID */
     index;
-    /**
-     * - 定时任务
-     */
+    /** 定时任务 */
     // task: Array<PluginTask & { App: NewMessagePlugin, schedule?: schedule.Job, file: { dir: dirName, name: fileName } }>
-    /**
-     * - 监听器
-     */
+    /** 监听器 */
     watcher;
-    /**
-     * - 热更新列表
-     */
+    /** 热更新列表 */
     watchList;
-    /**
-     * - 依赖缺失收集
-     */
+    /** 依赖缺失收集 */
     dependErr;
     /** accept */
     accept;

package/lib/core/server/server.js

@@ -176,12 +176,12 @@ export const server = new (class Server {
                     .replace(/^\.\//, '');
                 /** 判断是否为html文件且路径存在 */
                 if (!html.endsWith('.html') || !fs.existsSync(html)) {
-                    const not_found = config.Server.HttpRender.not_found;
-                    if (not_found.startsWith('http')) {
-                        return res.redirect(not_found);
+                    const notFound = config.Server.HttpRender.not_found;
+                    if (notFound.startsWith('http')) {
+                        return res.redirect(notFound);
                     }
                     else {
-                        return res.status(404).send(JSON.stringify({ code: 404, msg: not_found || '?' }));
+                        return res.status(404).send(JSON.stringify({ code: 404, msg: notFound || '?' }));
                     }
                 }
                 let content = fs.readFileSync(html, 'utf-8');

package/lib/event/handler/base.d.ts

@@ -3,9 +3,7 @@ export declare class EventBaseHandler {
     e: KarinEventTypes;
     /** 仅在群聊下存在 */
     config: GroupCfg;
-    /**
-     * - 是否打印群消息日志
-     */
+    /** 是否打印群消息日志 */
     GroupMsgPrint: boolean;
     /**
      * 处理事件，加入自定义字段

package/lib/event/handler/base.js

@@ -5,9 +5,7 @@ export class EventBaseHandler {
     e;
     /** 仅在群聊下存在 */
     config;
-    /**
-     * - 是否打印群消息日志
-     */
+    /** 是否打印群消息日志 */
     GroupMsgPrint;
     /**
      * 处理事件，加入自定义字段

package/lib/event/handler/message.js

@@ -163,12 +163,12 @@ export class MessageHandler extends EventBaseHandler {
             /** 管理员 */
             this.e.isAdmin = true;
         }
-        if (this.e.contact.scene === 'friend') {
+        if (this.e.contact.scene === "friend" /* Scene.Private */) {
             this.e.isPrivate = true;
             this.e.logText = `[Private:${this.e.sender.nick || ''}(${this.e.user_id})]`;
             logger.bot('info', this.e.self_id, `私聊：[${this.e.user_id}(${this.e.sender.nick || ''})] ${this.e.raw_message}`);
         }
-        else if (this.e.contact.scene === 'group') {
+        else if (this.e.contact.scene === "group" /* Scene.Group */) {
             this.e.isGroup = true;
             this.e.logText = `[Group:${this.e.group_id}-${this.e.user_id}(${this.e.sender.nick || ''})]`;
             this.GroupMsgPrint = review.GroupMsgPrint(this.e);
@@ -176,11 +176,17 @@ export class MessageHandler extends EventBaseHandler {
             this.e.group_id && review.alias(this.e, this.config);
             this.GroupMsgPrint && logger.bot('info', this.e.self_id, `群消息：[${this.e.group_id}-${this.e.user_id}(${this.e.sender.nick || ''})] ${this.e.raw_message}`);
         }
-        else if (this.e.contact.scene === 'guild') {
+        else if (this.e.contact.scene === "guild" /* Scene.Guild */) {
             this.e.isGuild = true;
             this.e.logText = `[Guild:${this.e.contact.peer}-${this.e.contact.sub_peer}-${this.e.user_id}(${this.e.sender.nick || ''})]`;
             logger.bot('info', this.e.self_id, `频道消息：[${this.e.contact.peer}-${this.e.contact.sub_peer}-${this.e.user_id}(${this.e.sender.nick || ''})] ${this.e.raw_message}`);
         }
+        else if (this.e.contact.scene === "guild_direct" /* Scene.GuildDirect */) {
+            this.e.isGuild = true;
+            this.e.isPrivate = true;
+            this.e.logText = `[GuildDirect:${this.e.contact.peer}-${this.e.contact.sub_peer}-${this.e.user_id}(${this.e.sender.nick || ''})]`;
+            logger.bot('info', this.e.self_id, `频道私信：[${this.e.contact.peer}-${this.e.contact.sub_peer}-${this.e.user_id}(${this.e.sender.nick || ''})] ${this.e.raw_message}`);
+        }
         else {
             logger.bot('info', this.e.self_id, `未知消息：${JSON.stringify(this.e)}`);
         }

package/lib/event/handler/notice.js

@@ -108,52 +108,52 @@ export class NoticeHandler extends EventBaseHandler {
             /** 私聊文件上传 */
             case "private_file_uploaded" /* NoticeSubType.PrivateFileUploaded */: {
                 const content = this.e.content;
-                const { file_url } = content;
-                this.e.raw_message = `[私聊文件上传]: ${file_url}`;
+                const { file_url: fileUrl } = content;
+                this.e.raw_message = `[私聊文件上传]: ${fileUrl}`;
                 break;
             }
             /** 群头像戳一戳 */
             case "group_poke" /* NoticeSubType.GroupPoke */: {
-                const { operator_uid, operator_uin, target_uid, target_uin } = this.e.content;
-                this.e.raw_message = `[群戳一戳]: ${operator_uid || operator_uin} 戳了戳 ${target_uid || target_uin}`;
+                const { operator_uid: operatorUid, operator_uin: operatorUin, target_uid: targetUid, target_uin: targetUin } = this.e.content;
+                this.e.raw_message = `[群戳一戳]: ${operatorUid || operatorUin} 戳了戳 ${targetUid || targetUin}`;
                 break;
             }
             /** 群消息撤回 */
             case "group_recall" /* NoticeSubType.GroupRecall */: {
-                const { operator_uid, operator_uin, message_id } = this.e.content;
-                this.e.raw_message = `[群消息撤回]: ${operator_uid || operator_uin} 撤回了一条消息 ${message_id}`;
+                const { operator_uid: operatorUid, operator_uin: operatorUin, message_id: messageId } = this.e.content;
+                this.e.raw_message = `[群消息撤回]: ${operatorUid || operatorUin} 撤回了一条消息 ${messageId}`;
                 break;
             }
             /** 群文件上传 */
             case "group_file_uploaded" /* NoticeSubType.GroupFileUploaded */: {
-                const { file_url, operator_uid, operator_uin } = this.e.content;
-                this.e.raw_message = `[群文件上传]: ${operator_uid || operator_uin} 上传了 ${file_url}`;
+                const { file_url: fileUrl, operator_uid: operatorUid, operator_uin: operatorUin } = this.e.content;
+                this.e.raw_message = `[群文件上传]: ${operatorUid || operatorUin} 上传了 ${fileUrl}`;
                 break;
             }
             /** 群成员增加 */
             case "group_member_increase" /* NoticeSubType.GroupMemberIncrease */: {
-                const { operator_uid, operator_uin, target_uid, target_uin, type } = this.e.content;
-                this.e.raw_message = `[群成员新增]: ${operator_uid || operator_uin} ${type === 'invite' ? '邀请' : '同意'} ${target_uid || target_uin} 加入群聊`;
+                const { operator_uid: operatorUid, operator_uin: operatorUin, target_uid: targetUid, target_uin: targetUin, type } = this.e.content;
+                this.e.raw_message = `[群成员新增]: ${operatorUid || operatorUin} ${type === 'invite' ? '邀请' : '同意'} ${targetUid || targetUin} 加入群聊`;
                 break;
             }
             /** 群成员减少 */
             case "group_member_decrease" /* NoticeSubType.GroupMemberDecrease */: {
                 switch (this.e.content.type) {
                     case 'leave': {
-                        const { target_uid, target_uin } = this.e.content;
-                        this.e.raw_message = `[群成员减少]: ${target_uid || target_uin} 主动退出群聊`;
+                        const { target_uid: targetUid, target_uin: targetUin } = this.e.content;
+                        this.e.raw_message = `[群成员减少]: ${targetUid || targetUin} 主动退出群聊`;
                         break;
                     }
                     // 群成员被踢
                     case 'kick': {
-                        const { operator_uid, operator_uin, target_uid, target_uin } = this.e.content;
-                        this.e.raw_message = `[群成员减少]: ${operator_uid || operator_uin} 将 ${target_uid || target_uin} 踢出群聊`;
+                        const { operator_uid: operatorUid, operator_uin: operatorUin, target_uid: targetUid, target_uin: targetUin } = this.e.content;
+                        this.e.raw_message = `[群成员减少]: ${operatorUid || operatorUin} 将 ${targetUid || targetUin} 踢出群聊`;
                         break;
                     }
                     // bot被踢
                     case 'kick_me': {
-                        const { operator_uid, operator_uin } = this.e.content;
-                        this.e.raw_message = `[群成员减少]: 机器人被移除群聊，操作人：${operator_uid || operator_uin}`;
+                        const { operator_uid: operatorUid, operator_uin: operatorUin } = this.e.content;
+                        this.e.raw_message = `[群成员减少]: 机器人被移除群聊，操作人：${operatorUid || operatorUin}`;
                         break;
                     }
                 }
@@ -161,50 +161,56 @@ export class NoticeHandler extends EventBaseHandler {
             }
             /** 群管理员变动 */
             case "group_admin_changed" /* NoticeSubType.GroupAdminChanged */: {
-                const { target_uid, target_uin, is_admin } = this.e.content;
-                this.e.raw_message = `[群管理员变动]: ${target_uid || target_uin} 被${is_admin ? '设置' : '取消'}群管理员`;
+                const { target_uid: targetUid, target_uin: targetUin, is_admin: isAdmin } = this.e.content;
+                this.e.raw_message = `[群管理员变动]: ${targetUid || targetUin} 被${isAdmin ? '设置' : '取消'}群管理员`;
                 break;
             }
             /** 群成员被禁言 */
             case "group_member_ban" /* NoticeSubType.GroupMemberBan */: {
-                const { operator_uid, operator_uin, target_uid, target_uin, type } = this.e.content;
-                this.e.raw_message = `[群成员禁言]: ${operator_uid || operator_uin} ${type === 'ban' ? '禁言' : '解禁'}了 ${target_uid || target_uin}`;
+                const { operator_uid: operatorUid, operator_uin: operatorUin, target_uid: targetUid, target_uin: targetUin, type } = this.e.content;
+                this.e.raw_message = `[群成员禁言]: ${operatorUid || operatorUin} ${type === 'ban' ? '禁言' : '解禁'}了 ${targetUid || targetUin}`;
                 break;
             }
             /** 群签到 */
             case "group_sign_in" /* NoticeSubType.GroupSignIn */: {
-                const { target_uid, target_uin } = this.e.content;
-                this.e.raw_message = `[群签到]: ${target_uid || target_uin}`;
+                const { target_uid: targetUid, target_uin: targetUin } = this.e.content;
+                this.e.raw_message = `[群签到]: ${targetUid || targetUin}`;
                 break;
             }
             /** 群全员禁言 */
             case "group_whole_ban" /* NoticeSubType.GroupWholeBan */: {
-                const { operator_uid, operator_uin, is_ban } = this.e.content;
-                this.e.raw_message = `[群全员禁言]: ${operator_uid || operator_uin} ${is_ban ? '开启全员禁言' : '解除全员禁言'}`;
+                const { operator_uid: operatorUid, operator_uin: operatorUin, is_ban: isBan } = this.e.content;
+                this.e.raw_message = `[群全员禁言]: ${operatorUid || operatorUin} ${isBan ? '开启全员禁言' : '解除全员禁言'}`;
                 break;
             }
             /** 群名片改变 */
             case "group_card_changed" /* NoticeSubType.GroupCardChanged */: {
-                const { operator_uid, operator_uin, target_uid, target_uin, new_card } = this.e.content;
-                this.e.raw_message = `[群名片改变]: ${operator_uid || operator_uin} 修改了 ${target_uid || target_uin} 的名片为 ${new_card}`;
+                const { operator_uid: operatorUid, operator_uin: operatorUin, target_uid: targetUid, target_uin: targetUin, new_card: newCard } = this.e.content;
+                this.e.raw_message = `[群名片改变]: ${operatorUid || operatorUin} 修改了 ${targetUid || targetUin} 的名片为 ${newCard}`;
                 break;
             }
             /** 群成员专属头衔改变 */
             case "group_member_unique_title_changed" /* NoticeSubType.GroupMemberUniqueTitleChanged */: {
-                const { target_uid, target_uin, title } = this.e.content;
-                this.e.raw_message = `[群头衔更改]: ${target_uid || target_uin} 的专属头衔改变为 ${title}`;
+                const { target_uid: targetUid, target_uin: targetUin, title } = this.e.content;
+                this.e.raw_message = `[群头衔更改]: ${targetUid || targetUin} 的专属头衔改变为 ${title}`;
                 break;
             }
             /** 群精华消息改变 */
             case "group_essence_changed" /* NoticeSubType.GroupEssenceChanged */: {
-                const { operator_uid, operator_uin, target_uid, target_uin, message_id, is_set } = this.e.content;
-                this.e.raw_message = `[群精华消息]: ${operator_uid || operator_uin} ${is_set ? `将${target_uid || target_uin}的消息${message_id}设置为精华消息` : `取消了${target_uid || target_uin}精华消息 ${message_id}`}`;
+                const { operator_uid: operatorUid, operator_uin: operatorUin, target_uid: targetUid, target_uin: targetUin, message_id: messageId, is_set: isSet } = this.e.content;
+                this.e.raw_message = `[群精华消息]: ${operatorUid || operatorUin} ${isSet ? `将${targetUid || targetUin}的消息${messageId}设置为精华消息` : `取消了${targetUid || targetUin}精华消息 ${messageId}`}`;
                 break;
             }
             /** 群表情回应 */
             case "group_message_reaction" /* NoticeSubType.GroupMessageReaction */: {
-                const { message_id, face_id } = this.e.content;
-                this.e.raw_message = `[群表情回应]: ${this.e.user_id} 给消息 ${message_id} 回应了一个${face_id}的表情`;
+                const { message_id: messageId, face_id: faceId } = this.e.content;
+                this.e.raw_message = `[群表情回应]: ${this.e.user_id} 给消息 ${messageId} 回应了一个${faceId}的表情`;
+                break;
+            }
+            /** 好友新增 */
+            case "friend_increase" /* NoticeSubType.FriendIncrease */: {
+                const { target_uid: targetUid, target_uin: targetUin } = this.e.content;
+                this.e.raw_message = `[新增好友]: ${targetUid || targetUin}`;
                 break;
             }
             default: {

package/lib/event/handler/request.js

@@ -92,20 +92,20 @@ export class RequestHandler extends EventBaseHandler {
         switch (this.e.sub_event) {
             /** 好友申请 */
             case "private_apply" /* RequestSubType.PrivateApply */: {
-                const { applier_uid, applier_uin, message } = this.e.content;
-                this.e.raw_message = `[好友申请]: ${applier_uid || applier_uin} 申请理由: ${message}`;
+                const { applier_uid: applierUid, applier_uin: applierUin, message } = this.e.content;
+                this.e.raw_message = `[好友申请]: ${applierUid || applierUin} 申请理由: ${message}`;
                 break;
             }
             /** 群申请 */
             case "group_apply" /* RequestSubType.GroupApply */: {
-                const { group_id, applier_uid, applier_uin, inviter_uid, inviter_uin, reason } = this.e.content;
-                this.e.raw_message = `[群申请]: ${group_id} 申请人: ${applier_uid || applier_uin} 邀请人: ${inviter_uid || inviter_uin} 理由: ${reason}`;
+                const { group_id: groupId, applier_uid: applierUid, applier_uin: applierUin, inviter_uid: inviterUid, inviter_uin: inviterUin, reason } = this.e.content;
+                this.e.raw_message = `[群申请]: ${groupId} 申请人: ${applierUid || applierUin} 邀请人: ${inviterUid || inviterUin} 理由: ${reason}`;
                 break;
             }
             /** 邀请入群 */
             case "invited_group" /* RequestSubType.InvitedGroup */: {
-                const { group_id, inviter_uid, inviter_uin } = this.e.content;
-                this.e.raw_message = `[邀请入群]: ${group_id} 邀请人: ${inviter_uid || inviter_uin}`;
+                const { group_id: groupId, inviter_uid: inviterUid, inviter_uin: inviterUin } = this.e.content;
+                this.e.raw_message = `[邀请入群]: ${groupId} 邀请人: ${inviterUid || inviterUin}`;
                 break;
             }
             default: {

package/lib/index.d.ts

@@ -1,3 +1,8 @@
+import yaml from 'yaml';
+import axios from 'axios';
+import moment from 'moment';
+import lodash from 'lodash';
+import express from 'express';
 export * from './core/index.js';
 export * from './event/index.js';
 export * from './db/index.js';
@@ -6,3 +11,4 @@ export * from './utils/index.js';
 export * from './types/index.js';
 export * from './adapter/index.js';
 export { karin as default } from './core/index.js';
+export { axios, moment, lodash, express, yaml };