node-karin 0.12.16 → 0.12.19

package/lib/adapter/input/index.d.ts

@@ -1,7 +1,5 @@
 import { KarinAdapter, Contact, KarinElement, LoggerLevel } from '../../types/index.js';
-/**
- * 标准输入输出适配器
- */
+/** 标准输入输出适配器 */
 export declare class AdapterInput implements KarinAdapter {
     #private;
     token: string;

package/lib/adapter/input/index.js

@@ -4,9 +4,7 @@ import { listener } from '../../core/index.js';
 import { config, common, YamlEditor, logger } from '../../utils/index.js';
 import { KarinMessage } from '../../types/index.js';
 const { enable, msgToFile, token: oldToken, ip } = config.Config.AdapterInput;
-/**
- * 标准输入输出适配器
- */
+/** 标准输入输出适配器 */
 export class AdapterInput {
     token;
     socket;
@@ -88,7 +86,7 @@ export class AdapterInput {
             contact: {
                 scene: "friend" /* Scene.Private */,
                 peer: 'input',
-                sub_peer: '',
+                sub_peer: null,
             },
             raw_event: { data: elements },
         };

package/lib/adapter/onebot/11/event.d.ts

@@ -8,17 +8,11 @@ export declare class OB11Event {
      * - @param data ob11相关标准数据
      */
     event(data: OB11EventAll): void;
-    /**
-     * 元事件
-     */
+    /** 元事件 */
     metaEvent(data: OB11MetaEvent): void;
-    /**
-     * 消息事件
-     */
+    /** 消息事件 */
     messageEvent(data: OB11MessageEvent): void;
-    /**
-     * 通知事件
-     */
+    /** 通知事件 */
     noticeEvent(data: OB11NoticeEvent): void;
     /** 请求事件 */
     requestEvent(data: OB11RequestEvent): void;

package/lib/adapter/onebot/11/event.js

@@ -28,9 +28,7 @@ export class OB11Event {
                 this.adapter.logger('info', `未知事件：${JSON.stringify(data)}`);
         }
     }
-    /**
-     * 元事件
-     */
+    /** 元事件 */
     metaEvent(data) {
         if (data.meta_event_type === 'heartbeat') {
             this.adapter.logger('trace', `[心跳]：${JSON.stringify(data.status)}`);
@@ -45,9 +43,7 @@ export class OB11Event {
             this.adapter.logger('debug', `[生命周期]：${typeMap[subType]}`);
         }
     }
-    /**
-     * 消息事件
-     */
+    /** 消息事件 */
     messageEvent(data) {
         const message = {
             event: "message" /* EventType.Message */,
@@ -70,7 +66,7 @@ export class OB11Event {
             contact: {
                 scene: data.message_type === 'private' ? "friend" /* Scene.Private */ : "group" /* Scene.Group */,
                 peer: data.message_type === 'private' ? data.sender.user_id : data.group_id,
-                sub_peer: '',
+                sub_peer: null,
             },
             group_id: data.message_type === 'group' ? data.group_id : '',
             raw_message: '',
@@ -80,9 +76,7 @@ export class OB11Event {
         e.replyCallback = async (elements) => await this.adapter.SendMessage(e.contact, elements);
         karin.emit('adapter.message', e);
     }
-    /**
-     * 通知事件
-     */
+    /** 通知事件 */
     noticeEvent(data) {
         const time = data.time;
         const selfId = data.self_id + '';
@@ -99,7 +93,7 @@ export class OB11Event {
         const contact = {
             scene: 'group_id' in data ? "group" /* Scene.Group */ : "friend" /* Scene.Private */,
             peer: 'group_id' in data ? data.group_id : data.user_id,
-            sub_peer: '',
+            sub_peer: null,
         };
         switch (data.notice_type) {
             // 群文件上传
@@ -410,7 +404,7 @@ export class OB11Event {
                     contact: {
                         scene: "friend" /* Scene.Private */,
                         peer: data.user_id + '',
-                        sub_peer: '',
+                        sub_peer: null,
                     },
                     sender: {
                         uid: data.user_id + '',
@@ -441,7 +435,7 @@ export class OB11Event {
                     contact: {
                         scene: "group" /* Scene.Group */,
                         peer: data.group_id + '',
-                        sub_peer: '',
+                        sub_peer: null,
                     },
                     sender: {
                         uid: data.user_id + '',

package/lib/adapter/onebot/11/index.d.ts

@@ -15,9 +15,7 @@ export declare class AdapterOneBot11 implements KarinAdapter {
     adapter: KarinAdapter['adapter'];
     version: KarinAdapter['version'];
     constructor();
-    /**
-     * 反向ws初始化
-     */
+    /** 反向ws初始化 */
     server(socket: WebSocket, request: IncomingMessage): Promise<void>;
     /**
      * 正向ws初始化
@@ -26,9 +24,7 @@ export declare class AdapterOneBot11 implements KarinAdapter {
     client(connect: string): Promise<void>;
     init(data: OB11EventAll): boolean;
     get self_id(): string;
-    /**
-     * 获取当前登录号信息
-     */
+    /** 获取当前登录号信息 */
     getSelf(): Promise<void>;
     /**
      * onebot11转karin
@@ -40,9 +36,7 @@ export declare class AdapterOneBot11 implements KarinAdapter {
      * @param data karin格式消息
      */
     KarinConvertAdapter(data: Array<KarinElement>): OB11Segment[];
-    /**
-     * 专属当前Bot的日志打印方法
-     */
+    /** 专属当前Bot的日志打印方法 */
     logger(level: LoggerLevel, ...args: any[]): void;
     /**
      * 获取头像url
@@ -104,6 +98,7 @@ export declare class AdapterOneBot11 implements KarinAdapter {
         contact: {
             scene: Scene;
             peer: string;
+            sub_peer: null;
         };
         sender: {
             uid: string;
@@ -124,7 +119,7 @@ export declare class AdapterOneBot11 implements KarinAdapter {
         contact: {
             scene: Scene;
             peer: string;
-            sub_peer: string;
+            sub_peer: null;
         };
         sender: {
             uid: string;
@@ -194,9 +189,7 @@ export declare class AdapterOneBot11 implements KarinAdapter {
      * @param special_title - 专属头衔
      */
     SetGroupUniqueTitle(groupId: string, targetId: string, uniqueTitle: string): Promise<false | undefined>;
-    /**
-     * 获取登录号信息
-     */
+    /** 获取登录号信息 */
     GetCurrentAccount(): Promise<{
         account_uid: string;
         account_uin: string;
@@ -238,31 +231,19 @@ export declare class AdapterOneBot11 implements KarinAdapter {
        */
         sex: "unknown" | "male" | "female";
         ext: {
-            /**
-             * 大会员
-             */
+            /** 大会员 */
             big_vip: undefined;
-            /**
-           * 好莱坞/腾讯视频会员
-           */
+            /** 好莱坞/腾讯视频会员 */
             hollywood_vip: undefined;
-            /**
-           * QQ会员
-           */
+            /** QQ会员 */
             qq_vip: undefined;
-            /**
-           * QQ超级会员
-           */
+            /** QQ超级会员 */
             super_vip: undefined;
-            /**
-           * 是否已经赞过
-           */
+            /** 是否已经赞过 */
             voted: undefined;
         };
     }[]>;
-    /**
-     * 获取好友列表
-     */
+    /** 获取好友列表 */
     GetFriendList(): Promise<{
         /** 用户UID */
         uid: string;
@@ -295,25 +276,15 @@ export declare class AdapterOneBot11 implements KarinAdapter {
        */
         sex: "unknown" | "male" | "female";
         ext: {
-            /**
-             * 大会员
-             */
+            /** 大会员 */
             big_vip: undefined;
-            /**
-           * 好莱坞/腾讯视频会员
-           */
+            /** 好莱坞/腾讯视频会员 */
             hollywood_vip: undefined;
-            /**
-           * QQ会员
-           */
+            /** QQ会员 */
             qq_vip: undefined;
-            /**
-           * QQ超级会员
-           */
+            /** QQ超级会员 */
             super_vip: undefined;
-            /**
-           * 是否已经赞过
-           */
+            /** 是否已经赞过 */
             voted: undefined;
         };
     }[]>;
@@ -323,9 +294,7 @@ export declare class AdapterOneBot11 implements KarinAdapter {
      * @param noCache - 是否不使用缓存
      */
     GetGroupInfo(_groupId: string, noCache?: boolean): Promise<GroupInfo>;
-    /**
-     * 获取群列表
-     */
+    /** 获取群列表 */
     GetGroupList(): Promise<{
         group_id: string;
         group_name: string;
@@ -383,9 +352,7 @@ export declare class AdapterOneBot11 implements KarinAdapter {
         unfriendly: boolean;
         card_changeable: boolean;
     }[]>;
-    /**
-     * 获取群荣誉信息
-     */
+    /** 获取群荣誉信息 */
     GetGroupHonor(groupId: string, refresh?: boolean): Promise<GroupHonorInfo[]>;
     /**
      * 对消息进行表情回应
@@ -394,9 +361,7 @@ export declare class AdapterOneBot11 implements KarinAdapter {
      * @param faceId - 表情ID
      */
     ReactMessageWithEmoji(contact: Contact, messageId: string, faceId: number, isSet?: boolean): Promise<boolean>;
-    /**
-     * 获取版本信息
-     */
+    /** 获取版本信息 */
     GetVersion(): Promise<{
         name: string;
         app_name: string;
@@ -404,9 +369,7 @@ export declare class AdapterOneBot11 implements KarinAdapter {
         protocol: string;
     }>;
     DownloadForwardMessage(resId: string): Promise<any>;
-    /**
-     * 精华消息
-     */
+    /** 精华消息 */
     GetEssenceMessageList(groupId: string, page: number, pageSize: number): Promise<EssenceMessageBody[]>;
     /**
      * 上传群文件

package/lib/adapter/onebot/11/index.js

@@ -21,9 +21,7 @@ export class AdapterOneBot11 {
         this.adapter = { id: 'QQ', name: 'OneBot11', type: 'ws', sub_type: 'internal', start_time: Date.now(), connect: '', index: 0 };
         this.version = { name: '', app_name: '', version: '' };
     }
-    /**
-     * 反向ws初始化
-     */
+    /** 反向ws初始化 */
     async server(socket, request) {
         this.socket = socket;
         const selfId = String(request.headers['x-self-id']);
@@ -96,9 +94,7 @@ export class AdapterOneBot11 {
     get self_id() {
         return this.account.uid || this.account.uin;
     }
-    /**
-     * 获取当前登录号信息
-     */
+    /** 获取当前登录号信息 */
     async getSelf() {
         const data = await this.GetCurrentAccount();
         try {
@@ -137,9 +133,7 @@ export class AdapterOneBot11 {
     KarinConvertAdapter(data) {
         return KarinConvertAdapter(data, this);
     }
-    /**
-     * 专属当前Bot的日志打印方法
-     */
+    /** 专属当前Bot的日志打印方法 */
     logger(level, ...args) {
         logger.bot(level, this.account.uid || this.account.uin, ...args);
     }
@@ -272,6 +266,7 @@ export class AdapterOneBot11 {
             contact: {
                 scene: res.message_type === 'group' ? "group" /* Scene.Group */ : "friend" /* Scene.Private */,
                 peer: contact.peer, // 这里可能不准确 传入是什么就返回什么
+                sub_peer: null,
             },
             sender: {
                 uid: res.sender.user_id,
@@ -316,7 +311,7 @@ export class AdapterOneBot11 {
                 contact: {
                     scene,
                     peer: '',
-                    sub_peer: '',
+                    sub_peer: null,
                 },
                 sender: {
                     uid: '',
@@ -467,9 +462,7 @@ export class AdapterOneBot11 {
             return false;
         }
     }
-    /**
-     * 获取登录号信息
-     */
+    /** 获取登录号信息 */
     async GetCurrentAccount() {
         const res = await this.SendApi("get_login_info" /* OB11Api.getLoginInfo */);
         return {
@@ -518,33 +511,21 @@ export class AdapterOneBot11 {
                */
                 sex: res.sex,
                 ext: {
-                    /**
-                     * 大会员
-                     */
+                    /** 大会员 */
                     big_vip: undefined,
-                    /**
-                   * 好莱坞/腾讯视频会员
-                   */
+                    /** 好莱坞/腾讯视频会员 */
                     hollywood_vip: undefined,
-                    /**
-                   * QQ会员
-                   */
+                    /** QQ会员 */
                     qq_vip: undefined,
-                    /**
-                   * QQ超级会员
-                   */
+                    /** QQ超级会员 */
                     super_vip: undefined,
-                    /**
-                   * 是否已经赞过
-                   */
+                    /** 是否已经赞过 */
                     voted: undefined,
                 },
             },
         ];
     }
-    /**
-     * 获取好友列表
-     */
+    /** 获取好友列表 */
     async GetFriendList() {
         const friendList = await this.SendApi("get_friend_list" /* OB11Api.getFriendList */);
         return friendList.map(v => {
@@ -581,25 +562,15 @@ export class AdapterOneBot11 {
                */
                 sex: v.sex,
                 ext: {
-                    /**
-                     * 大会员
-                     */
+                    /** 大会员 */
                     big_vip: undefined,
-                    /**
-                   * 好莱坞/腾讯视频会员
-                   */
+                    /** 好莱坞/腾讯视频会员 */
                     hollywood_vip: undefined,
-                    /**
-                   * QQ会员
-                   */
+                    /** QQ会员 */
                     qq_vip: undefined,
-                    /**
-                   * QQ超级会员
-                   */
+                    /** QQ超级会员 */
                     super_vip: undefined,
-                    /**
-                   * 是否已经赞过
-                   */
+                    /** 是否已经赞过 */
                     voted: undefined,
                 },
             };
@@ -626,9 +597,7 @@ export class AdapterOneBot11 {
             owner: '',
         };
     }
-    /**
-     * 获取群列表
-     */
+    /** 获取群列表 */
     async GetGroupList() {
         const groupList = await this.SendApi("get_group_list" /* OB11Api.getGroupList */);
         return groupList.map(v => {
@@ -703,9 +672,7 @@ export class AdapterOneBot11 {
             };
         });
     }
-    /**
-     * 获取群荣誉信息
-     */
+    /** 获取群荣誉信息 */
     async GetGroupHonor(groupId, refresh = false) {
         const groupHonor = await this.SendApi("get_group_honor_info" /* OB11Api.getGroupHonorInfo */, { group_id: Number(groupId), type: 'all' });
         const result = [];
@@ -786,9 +753,7 @@ export class AdapterOneBot11 {
             return false;
         }
     }
-    /**
-     * 获取版本信息
-     */
+    /** 获取版本信息 */
     async GetVersion() {
         const res = await this.SendApi("get_version_info" /* OB11Api.getVersionInfo */);
         return {
@@ -801,14 +766,12 @@ export class AdapterOneBot11 {
     async DownloadForwardMessage(resId) {
         throw new Error('Method not implemented.');
     }
-    /**
-     * 精华消息
-     */
+    /** 精华消息 */
     async GetEssenceMessageList(groupId, page, pageSize) {
         const list = [];
         const res = await this.SendApi("get_essence_msg_list" /* OB11Api.getEssenceMsgList */, { group_id: Number(groupId) });
         for (const v of res) {
-            const { message_seq: messageSeq, elements } = await this.GetMessage({ scene: "group" /* Scene.Group */, peer: groupId }, v.message_id + '');
+            const { message_seq: messageSeq, elements } = await this.GetMessage({ scene: "group" /* Scene.Group */, peer: groupId, sub_peer: null }, v.message_id + '');
             list.push({
                 /** 群ID */
                 group_id: groupId,

package/lib/cli/index.d.ts

@@ -40,25 +40,15 @@ export declare class KarinCli {
      * @param runner - 运行器
      */
     start(mode: Mode, lang: Lang, runner: Runner): void;
-    /**
-     * pm2重启
-     */
+    /** pm2重启 */
     restart(): Promise<void>;
-    /**
-     * pm2启动
-     */
+    /** pm2启动 */
     pm2(): Promise<void>;
-    /**
-     * pm2结束进程
-     */
+    /** pm2结束进程 */
     stop(): Promise<void>;
-    /**
-     * pm2查看日志
-     */
+    /** pm2查看日志 */
     log(): Promise<void>;
-    /**
-     * 更新依赖
-     */
+    /** 更新依赖 */
     update(): Promise<void>;
     /**
      * 获取指定包的本地版本

package/lib/cli/index.js

@@ -98,9 +98,7 @@ export class KarinCli {
             return this.start(mode, lang, runner);
         });
     }
-    /**
-     * pm2重启
-     */
+    /** pm2重启 */
     async restart() {
         const pm2Cfg = this.getConfigData('pm2');
         const serverCfg = this.getConfigData('server');
@@ -116,9 +114,7 @@ export class KarinCli {
         console.log('pm2服务已重启');
         process.exit(0);
     }
-    /**
-     * pm2启动
-     */
+    /** pm2启动 */
     async pm2() {
         console.log('pm2启动中...');
         const filePath = this.getConfigPath('pm2');
@@ -136,9 +132,7 @@ export class KarinCli {
         console.log('pm2服务已启动 可执行 【npx karin log】 查看日志');
         process.exit(0);
     }
-    /**
-     * pm2结束进程
-     */
+    /** pm2结束进程 */
     async stop() {
         console.log('pm2服务停止中...');
         const pm2Cfg = this.getConfigData('pm2');
@@ -154,9 +148,7 @@ export class KarinCli {
         console.log('pm2服务已停止');
         process.exit(0);
     }
-    /**
-     * pm2查看日志
-     */
+    /** pm2查看日志 */
     async log() {
         const pm2Cfg = this.getConfigData('pm2');
         const serverCfg = this.getConfigData('server');
@@ -167,9 +159,7 @@ export class KarinCli {
         const type = res ? res.pm_id : pm2Cfg?.apps[0]?.name || 'Karin';
         spawn(cmd, ['logs', type, '--lines', lines], { stdio: 'inherit', shell: true, cwd: process.cwd() });
     }
-    /**
-     * 更新依赖
-     */
+    /** 更新依赖 */
     async update() {
         const list = await getNpmPlugins(false);
         list.push('node-karin');
@@ -186,7 +176,7 @@ export class KarinCli {
                     return;
                 }
                 console.log(`[依赖更新] ${item} 当前版本: ${local} 最新版本: ${remote}`);
-                await this.exec(`${cmd} ${item}@latest`);
+                await this.exec(`${cmd} ${item}@${remote}`);
                 console.log(`[依赖更新] ${item} 更新完成~`);
             }
             catch (error) {

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

@@ -1,4 +1,4 @@
-import { Contact, KarinElement, KarinMessage, KarinRenderType, RenderResult, AllMessageSubType, CommandInfo, TaskInfo, HandlerInfo, UseInfo, UseMapType, AppType, ButtonInfo, Permission, AcceptDict } from '../../types/index.js';
+import { Scene, Contact, KarinElement, KarinMessage, KarinRenderType, RenderResult, AllMessageSubType, CommandInfo, TaskInfo, HandlerInfo, UseInfo, UseMapType, AppType, ButtonInfo, Permission, AcceptDict, KarinAdapter } from '../../types/index.js';
 import { Listeners } from '../listener/listener.js';
 export type FncFunction = (e: KarinMessage) => Promise<boolean>;
 export type FncElement = string | KarinElement | Array<KarinElement>;
@@ -16,6 +16,10 @@ export interface Options {
      * @default false
      */
     log?: boolean | Function;
+    /** 只有对应的适配器才会生效 */
+    adapter?: Array<KarinAdapter['adapter']['name']>;
+    /** 指定的适配器无效 */
+    notAdapter?: Array<KarinAdapter['adapter']['name']>;
 }
 export interface OptionsCommand extends Options {
     /** 监听事件 */
@@ -104,7 +108,7 @@ export declare class Karin extends Listeners {
      * @param peer - 频道id
      * @param subPeer - 子频道id
      */
-    contactGuild(peer: Contact['peer'], subPeer: string): Contact;
+    contactGuild(peer: string, subPeer: string): Contact<Scene.Guild>;
     /**
      * 快速渲染
      * @param file - 文件路径、http地址
@@ -140,13 +144,15 @@ export declare class Karin extends Listeners {
      * @param event - 监听事件
      * @param fn - 实现函数
      */
-    accept<T extends keyof AcceptDict>(event: T, fn: (e: AcceptDict[T]) => boolean, options?: Options): {
+    accept<T extends keyof AcceptDict>(event: T, fn: (e: AcceptDict[T]) => Promise<boolean>, options?: Options): {
         event: T;
-        fn: (e: AcceptDict[T]) => boolean;
+        fn: (e: AcceptDict[T]) => Promise<boolean>;
         log: (id: string, text: string) => void;
         name: string;
         rank: number;
         type: AppType;
+        adapter: string[];
+        notAdapter: string[];
     };
     /**
      * 中间件

package/lib/core/karin/karin.js

@@ -53,6 +53,8 @@ export class Karin extends Listeners {
             rank: options.priority || 10000,
             reg,
             type: "command" /* AppType.Command */,
+            adapter: options.adapter || [],
+            notAdapter: options.notAdapter || [],
         };
     }
     /**
@@ -104,7 +106,7 @@ export class Karin extends Listeners {
      * @param peer - 群号或者用户id
      * @param subPeer - 子id
      */
-    contact(scene, peer, subPeer) {
+    contact(scene, peer, subPeer = null) {
         return { scene, peer, sub_peer: subPeer };
     }
     /**
@@ -112,14 +114,14 @@ export class Karin extends Listeners {
      * @param peer - 群号
      */
     contactGroup(peer) {
-        return { scene: "group" /* Scene.Group */, peer };
+        return { scene: "group" /* Scene.Group */, peer, sub_peer: null };
     }
     /**
      * 构建friend_contact
      * @param peer - 用户id
      */
     contactFriend(peer) {
-        return { scene: "friend" /* Scene.Private */, peer };
+        return { scene: "friend" /* Scene.Private */, peer, sub_peer: null };
     }
     /**
      * 构建guild_contact
@@ -185,6 +187,8 @@ export class Karin extends Listeners {
             name: options?.name || "accept" /* AppType.Accept */,
             rank: options?.priority || 10000,
             type: "accept" /* AppType.Accept */,
+            adapter: options?.adapter || [],
+            notAdapter: options?.notAdapter || [],
         };
     }
     /**