node-karin 0.5.1 → 0.6.2

package/lib/adapter/onebot/onebot11.d.ts

@@ -1,12 +1,12 @@
 import WebSocket from 'ws';
 import { IncomingMessage } from 'http';
-import { KarinAdapter } from '../../types/adapter.js';
+import { KarinAdapter } from '../../types/index.js';
 import { contact, OneBot11Api, KarinElement, OneBot11Segment, CustomNodeSegment, OneBot11ApiParamsType, GroupInfo, KarinNodeElement } from '../../types/index.js';
 /**
  * @class OneBot11
  * @extends KarinAdapter
  */
-export declare class OneBot11 implements KarinAdapter {
+export declare class AdapterOneBot11 implements KarinAdapter {
     #private;
     /**
      * - 重连次数 仅正向ws使用
@@ -106,7 +106,6 @@ export declare class OneBot11 implements KarinAdapter {
      * 撤回消息
      * @param _contact - ob11无需提供contact参数
      * @param message_id - 消息ID
-     * @returns {Promise<null>}
      */
     RecallMessage(_contact: contact, message_id: string): Promise<any>;
     /**
@@ -152,9 +151,9 @@ export declare class OneBot11 implements KarinAdapter {
     /**
      * 群组全员禁言
      * @param group_id - 群号
-     * @param enable - 是否全员禁言
+     * @param is_ban - 是否全员禁言
      */
-    SetGroupWholeBan(group_id: string, enable?: boolean): Promise<void>;
+    SetGroupWholeBan(group_id: string, is_ban?: boolean): Promise<void>;
     /**
      * 设置群管理员
      * @param {{
@@ -217,7 +216,6 @@ export declare class OneBot11 implements KarinAdapter {
     GetStrangerProfileCard(target_uid_or_uin: Array<string>): Promise<any[]>;
     /**
      * 获取好友列表
-     * @returns {Promise<Array<IFriendInfo>>} - 好友列表
      */
     GetFriendList(): Promise<any>;
     /**
@@ -279,9 +277,9 @@ export declare class OneBot11 implements KarinAdapter {
     SetEssenceMessage(): Promise<void>;
     DeleteEssenceMessage(): Promise<void>;
     SetFriendApplyResult(): Promise<void>;
-    SetGroupApplyResultRequest(): Promise<void>;
+    SetGroupApplyResult(): Promise<void>;
     SetInvitedJoinGroupResult(): Promise<void>;
-    ReactMessageWithEmojiRequest(): Promise<void>;
+    ReactMessageWithEmoji(): Promise<void>;
     UploadPrivateFile(): Promise<void>;
     UploadGroupFile(): Promise<void>;
     sendForwardMessage(): Promise<{}>;
@@ -296,6 +294,6 @@ export declare class OneBot11 implements KarinAdapter {
 declare const _default: {
     type: string;
     path: string;
-    adapter: typeof OneBot11;
+    adapter: typeof AdapterOneBot11;
 };
 export default _default;

package/lib/adapter/onebot/onebot11.js

@@ -7,7 +7,7 @@ import { KarinMessage, KarinNotice, KarinRequest } from '../../event/index.js';
  * @class OneBot11
  * @extends KarinAdapter
  */
-export class OneBot11 {
+export class AdapterOneBot11 {
     /**
      * 是否初始化
      */
@@ -173,6 +173,7 @@ export class OneBot11 {
             case 'message_sent': {
                 const message = {
                     event: (data.post_type + ''),
+                    event_id: data.message_id + '',
                     self_id: data.self_id + '',
                     user_id: data.sender.user_id + '',
                     time: data.time,
@@ -191,7 +192,7 @@ export class OneBot11 {
                         peer: data.message_type === 'private' ? data.sender.user_id : data.group_id,
                         sub_peer: '',
                     },
-                    group_id: 'group_id' in data ? data.group_id : '',
+                    group_id: data.message_type === 'group' ? data.group_id : '',
                     raw_message: '',
                 };
                 const e = new KarinMessage(message);
@@ -212,10 +213,10 @@ export class OneBot11 {
             }
             case 'notice':
                 this.#notice_event(data);
-                break;
+                return;
             case 'request':
                 this.#request_event(data);
-                break;
+                return;
             default:
                 this.logger('info', `未知事件：${JSON.stringify(data)}`);
         }
@@ -248,12 +249,11 @@ export class OneBot11 {
                     operator_uid: data.user_id + '',
                     operator_uin: data.user_id + '',
                     file_id: data.file.id,
-                    file_sub_id: '',
+                    file_sub_id: 0,
                     file_name: data.file.name,
                     file_size: data.file.size,
-                    bus_id: 0,
                     expire_time: 0,
-                    url: '',
+                    file_url: '',
                 };
                 const options = {
                     time,
@@ -401,7 +401,7 @@ export class OneBot11 {
                     sender,
                     contact,
                     content,
-                    sub_event: 'group_recall',
+                    sub_event: 'private_recall',
                 };
                 notice = new KarinNotice(options);
                 break;
@@ -427,7 +427,7 @@ export class OneBot11 {
                             sender,
                             contact,
                             content,
-                            sub_event: 'group_poke',
+                            sub_event: data.group_id ? 'group_poke' : 'private_poke',
                         };
                         notice = new KarinNotice(options);
                         break;
@@ -488,7 +488,7 @@ export class OneBot11 {
                         nick: '',
                         role: '',
                     },
-                    sub_event: 'friend_apply',
+                    sub_event: 'private_apply',
                     content: {
                         applier_uid: data.user_id + '',
                         applier_uin: data.user_id + '',
@@ -803,7 +803,6 @@ export class OneBot11 {
      * 撤回消息
      * @param _contact - ob11无需提供contact参数
      * @param message_id - 消息ID
-     * @returns {Promise<null>}
      */
     async RecallMessage(_contact, message_id) {
         return await this.SendApi('delete_msg', { message_id });
@@ -887,10 +886,10 @@ export class OneBot11 {
     /**
      * 群组全员禁言
      * @param group_id - 群号
-     * @param enable - 是否全员禁言
+     * @param is_ban - 是否全员禁言
      */
-    async SetGroupWholeBan(group_id, enable = true) {
-        await this.SendApi('set_group_whole_ban', { group_id, enable });
+    async SetGroupWholeBan(group_id, is_ban = true) {
+        await this.SendApi('set_group_whole_ban', { group_id, enable: is_ban });
     }
     /**
      * 设置群管理员
@@ -997,7 +996,6 @@ export class OneBot11 {
     }
     /**
      * 获取好友列表
-     * @returns {Promise<Array<IFriendInfo>>} - 好友列表
      */
     async GetFriendList() {
         /** @type {{
@@ -1217,7 +1215,7 @@ export class OneBot11 {
     //  * @param message_id - 消息ID
     //  * @param face_id - 表情ID
     //  */
-    // async ReactMessageWithEmojiRequest(Contact: any, message_id: any, face_id: any, is_set = true) {
+    // async ReactMessageWithEmoji(Contact: any, message_id: any, face_id: any, is_set = true) {
     //   return await this.SendApi('set_msg_emoji_like', { message_id, emoji_id: face_id, is_set })
     // }
     /**
@@ -1235,9 +1233,9 @@ export class OneBot11 {
     async SetEssenceMessage() { }
     async DeleteEssenceMessage() { }
     async SetFriendApplyResult() { }
-    async SetGroupApplyResultRequest() { }
+    async SetGroupApplyResult() { }
     async SetInvitedJoinGroupResult() { }
-    async ReactMessageWithEmojiRequest() { }
+    async ReactMessageWithEmoji() { }
     async UploadPrivateFile() { }
     async UploadGroupFile() { }
     async sendForwardMessage() {
@@ -1256,8 +1254,13 @@ export class OneBot11 {
         const request = JSON.stringify({ echo, action, params });
         logger.debug(`[API请求] ${action}: ${request}`);
         return new Promise((resolve, reject) => {
+            const timeoutId = setTimeout(() => {
+                reject(new Error('API请求超时'));
+            }, time * 1000);
             this.socket.send(request);
             this.socket.once(echo, data => {
+                /** 停止监听器 */
+                clearTimeout(timeoutId);
                 if (data.status === 'ok') {
                     resolve(data.data);
                 }
@@ -1266,15 +1269,11 @@ export class OneBot11 {
                     reject(data);
                 }
             });
-            /** 设置一个超时计时器 */
-            setTimeout(() => {
-                reject(new Error('API请求超时'));
-            }, time * 1000);
         });
     }
 }
 export default {
     type: 'websocket',
     path: '/onebot/v11/ws',
-    adapter: OneBot11,
+    adapter: AdapterOneBot11,
 };

package/lib/core/dir.d.ts

@@ -1 +1,4 @@
+/**
+ * - 获取当前npm包的根目录
+ */
 export declare const karinDir: string;

package/lib/core/dir.js

@@ -1,4 +1,7 @@
 import path from 'path'
 import { fileURLToPath } from 'url'
 const filename = fileURLToPath(import.meta.url)
+/**
+ * - 获取当前npm包的根目录
+ */
 export const karinDir = path.resolve(filename, '../../../').replace(/\\/g, '/').replace(/\/$/, '')

package/lib/core/plugin.loader.js

@@ -111,7 +111,7 @@ export const pluginLoader = new (class PluginLoader {
              * 一共3种模式
              * 1. npm run dev 开发模式  直接加载ts，js文件，对于同时存在编译产物、源代码的情况，优先加载编译产物而不加载源代码
              * 2. node . 生产模式  只加载js文件
-             * 3. npm run debug 调试模式 在2的基础上，对apps进行热更新
+             * 3. npm run debug 调试模式 利用tsx自身的热更新机制，重启karin
              */
       /** 非插件包 加载该文件夹下全部js 视语言环境加载ts */
       if (!common.isPlugin(PluginPath)) {
@@ -131,6 +131,18 @@ export const pluginLoader = new (class PluginLoader {
         this.watchList.push({ dir, name: index })
         this.FileList.push({ dir, name: index })
       }
+      /** 检查是否存在karin.apps */
+      const pack = common.readJson(`${PluginPath}/package.json`)
+      if (pack && pack?.karin?.apps) {
+        const cfg = pack.karin.apps
+        if (Array.isArray(cfg)) {
+          cfg.forEach((apps) => {
+            /** 路径不存在跳过 */
+            if (!common.isDir(`${PluginPath}/${apps}`)) { return }
+            this.getApps((`${dir}/${apps}`), this.isTs)
+          })
+        }
+      }
       /** ts环境 全部加载  如果存在编译产物 则不加载ts */
       if (this.isTs) {
         /** 编译产物 存在不加载ts */

package/lib/core/server.js

@@ -6,7 +6,7 @@ import { createServer } from 'http'
 import express from 'express'
 import { exec, config, logger, common } from '../utils/index.js'
 import { render, HttpRenderer, Wormhole, RenderClient } from '../render/index.js'
-import { OneBot11 } from '../adapter/onebot/onebot11.js'
+import { AdapterOneBot11 } from '../adapter/onebot/onebot11.js'
 export const server = new (class Server {
   reg
   list
@@ -120,7 +120,7 @@ export const server = new (class Server {
       const Onebot11 = config.Server.websocket.OneBot11Host
       if (Array.isArray(Onebot11) && Onebot11.length) {
         for (const connect of Onebot11) {
-          new OneBot11().client(connect)
+          new AdapterOneBot11().client(connect)
         }
       }
       const { enable, WormholeClient } = config.Server.HttpRender

package/lib/event/index.d.ts

@@ -3,5 +3,7 @@ export * from './event.handler.js';
 export * from './message.js';
 export * from './message.handler.js';
 export * from './notice.js';
+export * from './notice.handler.js';
 export * from './request.js';
+export * from './request.handler.js';
 export * from './review.handler.js';

package/lib/event/index.js

@@ -3,7 +3,7 @@ export * from './event.handler.js'
 export * from './message.js'
 export * from './message.handler.js'
 export * from './notice.js'
-// export * from './notice.handler.js'
+export * from './notice.handler.js'
 export * from './request.js'
-// export * from './request.handler.js'
+export * from './request.handler.js'
 export * from './review.handler.js'

package/lib/event/message.d.ts

@@ -4,11 +4,15 @@ import { contact, Sender, KarinElement } from '../types/index.js';
  * - 消息事件基类
  */
 export declare class KarinMessage extends KarinEvent {
-    constructor({ event, self_id, user_id, time, message_id, message_seq, raw_message, contact, sender, elements, group_id, }: {
+    constructor({ event, event_id, self_id, user_id, time, message_id, message_seq, raw_message, contact, sender, elements, group_id, }: {
         /**
          * - 事件类型
          */
         event: 'message' | 'message_sent';
+        /**
+         * - 事件ID
+         */
+        event_id: string;
         /**
          * - 机器人ID 请尽量使用UID
          */

package/lib/event/message.js

@@ -3,8 +3,8 @@ import { KarinEvent } from './event.js'
  * - 消息事件基类
  */
 export class KarinMessage extends KarinEvent {
-  constructor ({ event = 'message', self_id, user_id, time, message_id, message_seq = '', raw_message = '', contact, sender, elements, group_id = '' }) {
-    super({ event, event_id: message_id, self_id, user_id, group_id, time, contact, sender, sub_event: contact.scene === 'group' ? 'group_message' : 'friend_message' })
+  constructor ({ event = 'message', event_id, self_id, user_id, time, message_id, message_seq = '', raw_message = '', contact, sender, elements, group_id = '' }) {
+    super({ event, event_id: event_id || message_id, self_id, user_id, group_id, time, contact, sender, sub_event: contact.scene === 'group' ? 'group_message' : 'private_message' })
     this.message_id = message_id
     this.message_seq = message_seq
     this.raw_message = raw_message

package/lib/event/notice.handler.js

@@ -84,20 +84,20 @@ export default class NoticeHandler extends EventHandler {
   raw_message () {
     switch (this.e.sub_event) {
       /** 好友头像戳一戳 */
-      case 'friend_poke': {
+      case 'private_poke': {
         this.e.raw_message = '[好友戳一戳]: 戳了你一下'
         break
       }
       /** 好友消息撤回 */
-      case 'friend_recall': {
+      case 'private_recall': {
         this.e.raw_message = `[好友消息撤回]: ${this.e.content.message_id}`
         break
       }
       /** 私聊文件上传 */
-      case 'friend_file_uploaded': {
+      case 'private_file_uploaded': {
         const content = this.e.content
-        const { url } = content
-        this.e.raw_message = `[私聊文件上传]: ${url}`
+        const { file_url } = content
+        this.e.raw_message = `[私聊文件上传]: ${file_url}`
         break
       }
       /** 群头像戳一戳 */
@@ -114,8 +114,8 @@ export default class NoticeHandler extends EventHandler {
       }
       /** 群文件上传 */
       case 'group_file_uploaded': {
-        const { url, operator_uid, operator_uin } = this.e.content
-        this.e.raw_message = `[群文件上传]: ${operator_uid || operator_uin} 上传了 ${url}`
+        const { file_url, operator_uid, operator_uin } = this.e.content
+        this.e.raw_message = `[群文件上传]: ${operator_uid || operator_uin} 上传了 ${file_url}`
         break
       }
       /** 群成员增加 */
@@ -160,7 +160,7 @@ export default class NoticeHandler extends EventHandler {
         break
       }
       /** 群签到 */
-      case 'group_sign': {
+      case 'group_sign_in': {
         const { target_uid, target_uin } = this.e.content
         this.e.raw_message = `[群签到]: ${target_uid || target_uin}`
         break

package/lib/event/request.handler.js

@@ -84,7 +84,7 @@ export default class RequestHandler extends EventHandler {
   raw_message () {
     switch (this.e.sub_event) {
       /** 好友申请 */
-      case 'friend_apply': {
+      case 'private_apply': {
         const { applier_uid, applier_uin, message } = this.e.content
         this.e.raw_message = `[好友申请]: ${applier_uid || applier_uin} 申请理由: ${message}`
         break

package/lib/index.d.ts

@@ -5,6 +5,7 @@ export * from './db/index.js';
 export * from './render/index.js';
 export * from './utils/index.js';
 export * from './types/index.js';
+export * from './adapter/index.js';
 import { Karin, Plugin } from './core/index.js';
 /**
  * @description 即将废弃，请使用 `Plugin`
@@ -36,7 +37,7 @@ export declare const Cfg: {
     logger: import("log4js").Logger;
     initCfg(): Promise<void>;
     getPlugins(): string[];
-    checkPath(path: string): void;
+    mkdir(dirname: string): boolean;
     dirPath(name: string, plugins: string[]): Promise<void>;
     timeout(type?: "ws" | "grpc"): number;
     readonly redis: import("./types/index.js").Redis;

package/lib/index.js

@@ -11,6 +11,7 @@ export * from './db/index.js';
 export * from './render/index.js';
 export * from './utils/index.js';
 export * from './types/index.js';
+export * from './adapter/index.js';
 import { config, update } from './utils/index.js';
 import { render } from './render/index.js';
 import { RenderServer } from './render/index.js';

package/lib/modules.d.ts

@@ -11,4 +11,5 @@ import { Level as level } from 'level';
 import schedule from 'node-schedule';
 import yaml from 'yaml';
 import log4js from 'log4js';
-export { fs, ws, path, axios, lodash, moment, express, chalk, chokidar, level, schedule, yaml, log4js, };
+import art_template from 'art-template';
+export { fs, ws, path, axios, lodash, moment, express, chalk, chokidar, level, schedule, yaml, log4js, art_template, };

package/lib/modules.js

@@ -11,4 +11,5 @@ import { Level as level } from 'level';
 import schedule from 'node-schedule';
 import yaml from 'yaml';
 import log4js from 'log4js';
-export { fs, ws, path, axios, lodash, moment, express, chalk, chokidar, level, schedule, yaml, log4js, };
+import art_template from 'art-template';
+export { fs, ws, path, axios, lodash, moment, express, chalk, chokidar, level, schedule, yaml, log4js, art_template, };

package/lib/tools/init.js

@@ -23,15 +23,13 @@ for (const dir of delList) {
     if (!fs.existsSync(path)) { fs.copyFileSync(pathDef, path) }
   }
 }
-// 判断是否为第一次使用
-if (!fs.existsSync('./index.js')) {
-  // 创建一个index.js文件 以供初次开箱使用，写入默认配置
-  fs.writeFileSync('./index.js', `import { Bot } from 'node-karin'
-console.log(Bot.name + '开始初始化~')
-`)
-}
 // 修改package.json为esm模块
 const pack = JSON.parse(fs.readFileSync('./package.json', 'utf-8'))
-pack.type = 'module'
-fs.writeFileSync('./package.json', JSON.stringify(pack, null, 2))
-console.log('初始化完成~，请通过 node index 启动程序~')
+// 解析包内的package.json文件
+const npmPack = JSON.parse(fs.readFileSync(`${karinDir}/package.json`, 'utf-8'))
+npmPack.main = './node_modules/node-karin/lib/index.js'
+delete npmPack.bin
+delete npmPack.types
+npmPack.dependencies = pack.dependencies
+fs.writeFileSync('./package.json', JSON.stringify(npmPack, null, 2))
+console.log('初始化完成~，请通过 【 node . 】 启动程序~')

package/lib/types/adapter.d.ts

@@ -325,7 +325,7 @@ export interface KarinAdapter {
     /**
      * - 是否开启全员禁言
      */
-    enable: boolean): Promise<void>;
+    is_ban: boolean): Promise<void>;
     /**
      * - 设置群管理员
      */
@@ -520,7 +520,7 @@ export interface KarinAdapter {
     /**
      * - 设置申请加入群请求结果
      */
-    SetGroupApplyResultRequest(
+    SetGroupApplyResult(
     /**
      * - 请求ID
      */
@@ -545,7 +545,6 @@ export interface KarinAdapter {
      * 发送合并转发消息
      * @param contact 联系人信息
      * @param elements 消息元素
-     * @return {Promise<{message_id?}>}
      */
     sendForwardMessage(contact: contact, elements: Array<KarinNodeElement>): Promise<{
         message_id?: string;
@@ -556,7 +555,7 @@ export interface KarinAdapter {
      * @param message_id - 消息ID
      * @param face_id - 表情ID
      */
-    ReactMessageWithEmojiRequest(contact: contact, message_id: string, face_id: number, is_set: boolean): Promise<void>;
+    ReactMessageWithEmoji(contact: contact, message_id: string, face_id: number, is_set: boolean): Promise<void>;
     /**
      * 上传群文件
      * @param group_id - 群号

package/lib/types/element.d.ts

@@ -89,7 +89,7 @@ export interface ImageElement extends Element {
      */
     md5?: string;
     /** 图片子类型 */
-    sub_type?: number;
+    sub_type?: string;
     /**
      * - 图片宽度
      */
@@ -107,6 +107,7 @@ export interface ImageElement extends Element {
 }
 /**
  * - 语音元素
+ * @deprecated 即将废弃 请使用segment.record
  */
 export interface VoiceElement extends Element {
     type: 'voice';
@@ -244,6 +245,7 @@ export interface CustomMusicElemen {
      * - 封面
      */
     pic: string;
+    id: string;
 }
 export interface MusicElement extends Element {
     type: 'music';

package/lib/types/event.d.ts

@@ -13,11 +13,11 @@ export type Scene = 'group' | 'private' | 'guild' | 'nearby' | 'stranger' | 'str
  * - 类型映射
  */
 export type EventToSubEvent = {
-    message: 'group_message' | 'friend_message' | 'guild_message' | 'nearby' | 'stranger' | 'stranger_from_group';
-    notice: 'friend_poke' | 'friend_recall' | 'friend_file_uploaded' | 'group_poke' | 'group_card_changed' | 'group_member_unique_title_changed' | 'group_essence_changed' | 'group_recall' | 'group_member_increase' | 'group_member_decrease' | 'group_admin_changed' | 'group_member_ban' | 'group_sign' | 'group_whole_ban' | 'group_file_uploaded' | 'group_message_reaction';
-    request: 'friend_apply' | 'group_apply' | 'invited_group';
-    meta_event: 'group_message' | 'friend_message' | 'guild_message' | 'nearby' | 'stranger' | 'stranger_from_group';
-    message_sent: 'group_message' | 'friend_message' | 'guild_message' | 'nearby' | 'stranger' | 'stranger_from_group';
+    message: 'group_message' | 'private_message' | 'guild_message' | 'nearby' | 'stranger' | 'stranger_from_group';
+    notice: 'private_poke' | 'private_recall' | 'private_file_uploaded' | 'group_poke' | 'group_card_changed' | 'group_member_unique_title_changed' | 'group_essence_changed' | 'group_recall' | 'group_member_increase' | 'group_member_decrease' | 'group_admin_changed' | 'group_member_ban' | 'group_sign_in' | 'group_whole_ban' | 'group_file_uploaded' | 'group_message_reaction';
+    request: 'private_apply' | 'group_apply' | 'invited_group';
+    meta_event: 'group_message' | 'private_message' | 'guild_message' | 'nearby' | 'stranger' | 'stranger_from_group';
+    message_sent: 'group_message' | 'private_message' | 'guild_message' | 'nearby' | 'stranger' | 'stranger_from_group';
 };
 /**
  * - 事件子类型
@@ -76,7 +76,7 @@ export interface NoticeType {
     /**
      * - 私聊戳一戳
      */
-    friend_poke: {
+    private_poke: {
         /**
          * - 操作者uid
          */
@@ -101,7 +101,7 @@ export interface NoticeType {
     /**
      * - 私聊撤回消息
      */
-    friend_recall: {
+    private_recall: {
         /**
          * - 操作者uid
          */
@@ -123,7 +123,7 @@ export interface NoticeType {
      * - 私聊文件上传
      * - 文件信息最少需要提供一个url
      */
-    friend_file_uploaded: {
+    private_file_uploaded: {
         /**
          * - 操作者uid
          */
@@ -139,7 +139,7 @@ export interface NoticeType {
         /**
          * - 文件子ID 此项没有则为空字符串
          */
-        file_sub_id: string;
+        file_sub_id: number;
         /**
          * - 文件名 此项没有则为空字符串
          */
@@ -155,7 +155,7 @@ export interface NoticeType {
         /**
          * - 文件URL
          */
-        url: string;
+        file_url: string;
     };
     /**
      * - 群聊戳一戳
@@ -239,9 +239,9 @@ export interface NoticeType {
          */
         file_id: string;
         /**
-         * - 文件子ID 此项没有则为空字符串
+         * - 文件子ID 此项没有则为0
          */
-        file_sub_id: string;
+        file_sub_id: number;
         /**
          * - 文件名 此项没有则为空字符串
          */
@@ -250,10 +250,6 @@ export interface NoticeType {
          * - 文件大小 此项没有则为0
          */
         file_size: number;
-        /**
-         * - 目前未知
-         */
-        bus_id: number;
         /**
          * - 过期时间 此项没有则为0
          */
@@ -261,7 +257,7 @@ export interface NoticeType {
         /**
          * - 文件URL
          */
-        url: string;
+        file_url: string;
     };
     /**
      * - 群名片变动
@@ -420,7 +416,7 @@ export interface NoticeType {
     /**
      * - 群打卡
      */
-    group_sign: {
+    group_sign_in: {
         /**
          * - 群ID
          */
@@ -525,7 +521,7 @@ export interface RequestType {
     /**
      * - 好友申请
      */
-    friend_apply: {
+    private_apply: {
         /**
          * - 申请者uid
          */
@@ -759,7 +755,7 @@ export type NoticeEvent<T extends keyof NoticeType> = KarinNoticeEventBase & {
 /**
  * - 通知事件基类
  */
-export type KarinNoticeEvent = NoticeEvent<'friend_poke'> | NoticeEvent<'friend_recall'> | NoticeEvent<'friend_file_uploaded'> | NoticeEvent<'group_poke'> | NoticeEvent<'group_card_changed'> | NoticeEvent<'group_member_unique_title_changed'> | NoticeEvent<'group_essence_changed'> | NoticeEvent<'group_recall'> | NoticeEvent<'group_member_increase'> | NoticeEvent<'group_member_decrease'> | NoticeEvent<'group_admin_changed'> | NoticeEvent<'group_member_ban'> | NoticeEvent<'group_sign'> | NoticeEvent<'group_whole_ban'> | NoticeEvent<'group_file_uploaded'> | NoticeEvent<'group_message_reaction'>;
+export type KarinNoticeEvent = NoticeEvent<'private_poke'> | NoticeEvent<'private_recall'> | NoticeEvent<'private_file_uploaded'> | NoticeEvent<'group_poke'> | NoticeEvent<'group_card_changed'> | NoticeEvent<'group_member_unique_title_changed'> | NoticeEvent<'group_essence_changed'> | NoticeEvent<'group_recall'> | NoticeEvent<'group_member_increase'> | NoticeEvent<'group_member_decrease'> | NoticeEvent<'group_admin_changed'> | NoticeEvent<'group_member_ban'> | NoticeEvent<'group_sign_in'> | NoticeEvent<'group_whole_ban'> | NoticeEvent<'group_file_uploaded'> | NoticeEvent<'group_message_reaction'>;
 /**
  * - 请求事件基类
  */
@@ -776,7 +772,7 @@ export type RequestEvent<T extends keyof RequestType> = KarinRequestEventBase &
 /**
  * - 请求事件基类
  */
-export type KarinRequestEvent = RequestEvent<'friend_apply'> | RequestEvent<'group_apply'> | RequestEvent<'invited_group'>;
+export type KarinRequestEvent = RequestEvent<'private_apply'> | RequestEvent<'group_apply'> | RequestEvent<'invited_group'>;
 export interface EMap {
     message: KarinMessageEvent;
     notice: KarinNoticeEvent;

package/lib/utils/common.d.ts

@@ -57,6 +57,10 @@ export declare const common: {
      * @returns 返回true为存在
      */
     exists(path: string): boolean;
+    /**
+     * - 解析json文件
+     */
+    readJson(file: string): any;
     /**
      * 根据文件后缀名从指定路径下读取符合要求的文件
      * @param path - 路径