fix: handleQuickOperation

style: 规范代码

src/common/qq-basic-info.ts

@@ -60,20 +60,17 @@ export class QQBasicInfoWrapper {
 
     getAppidV2(): { appid: string; qua: string } {
         const appidTbale = AppidTable as unknown as QQAppidTableType;
-        try {
         const fullVersion = this.getFullQQVesion();
-            if (!fullVersion) throw new Error('QQ版本获取失败');
+        if (fullVersion) {
             const data = appidTbale[fullVersion];
             if (data) {
                 return data;
             }
-        } catch (e) {
-            this.context.logger.log(`[QQ版本兼容性检测] 获取Appid异常 请检测NapCat/QQNT是否正常`);
         }
-        // 以下是兜底措施
-        this.context.logger.log(
-            `[QQ版本兼容性检测] ${this.getFullQQVesion()} 版本兼容性不佳，可能会导致一些功能无法正常使用`,
-        );
+
+        // else
+        this.context.logger.log(`[QQ版本兼容性检测] 获取Appid异常 请检测NapCat/QQNT是否正常`);
+        this.context.logger.log(`[QQ版本兼容性检测] ${fullVersion} 版本兼容性不佳，可能会导致一些功能无法正常使用`,);
         return { appid: systemPlatform === 'linux' ? '537240795' : '537240709', qua: this.getQUAInternal() };
     }
 }

src/core/apis/file.ts

@@ -21,7 +21,6 @@ import { InstanceContext, NapCatCore } from '@/core';
 import * as fileType from 'file-type';
 import imageSize from 'image-size';
 import { ISizeCalculationResult } from 'image-size/dist/types/interface';
-import { NodeIKernelSearchService } from '../services/NodeIKernelSearchService';
 import { RkeyManager } from '../helper/rkey';
 import { calculateFileMD5, isGIF } from '@/common/file';
 import pathLib from 'node:path';

src/core/apis/friend.ts

@@ -1,5 +1,5 @@
 import { FriendV2 } from '@/core/entities';
-import { BuddyListReqType, InstanceContext, NapCatCore, NodeIKernelProfileService } from '@/core';
+import { BuddyListReqType, InstanceContext, NapCatCore } from '@/core';
 import { LimitedHashTable } from '@/common/message-unique';
 
 export class NTQQFriendApi {

src/core/apis/group.ts

@@ -9,9 +9,8 @@ import {
     KickMemberV2Req,
     MemberExtSourceType,
     NapCatCore,
-    NodeIKernelGroupService,
 } from '@/core';
-import { isNumeric, runAllWithTimeout, sleep } from '@/common/helper';
+import { isNumeric, runAllWithTimeout } from '@/common/helper';
 
 export class NTQQGroupApi {
     context: InstanceContext;
@@ -23,17 +22,13 @@ export class NTQQGroupApi {
     constructor(context: InstanceContext, core: NapCatCore) {
         this.context = context;
         this.core = core;
-        sleep(1000).then(() => {
         this.initCache().then().catch(context.logger.logError);
-        });
     }
 
     async initCache() {
         this.groups = await this.getGroups();
         for (const group of this.groups) {
             this.groupCache.set(group.groupCode, group);
-            const data = await this.getGroupMembers(group.groupCode, 3000);
-            this.groupMemberCache.set(group.groupCode, data);
         }
         this.context.logger.logDebug(`加载${this.groups.length}个群组缓存完成`);
     }
@@ -175,7 +170,7 @@ export class NTQQGroupApi {
         let members = this.groupMemberCache.get(groupCodeStr);
         if (!members) {
             try {
-                members = await this.getGroupMembers(groupCodeStr);
+                members = await this.getGroupMembersV2(groupCodeStr);
                 // 更新群成员列表
                 this.groupMemberCache.set(groupCodeStr, members);
             } catch (e) {
@@ -196,7 +191,7 @@ export class NTQQGroupApi {
 
         let member = getMember();
         if (!member) {
-            members = await this.getGroupMembers(groupCodeStr);
+            members = await this.getGroupMembersV2(groupCodeStr);
             member = getMember();
         }
         return member;
@@ -307,7 +302,6 @@ export class NTQQGroupApi {
     }
 
     async getGroupMemberV2(GroupCode: string, uid: string, forced = false) {
-        type EventType = NodeIKernelGroupService['getMemberInfo'];
         const Listener = this.core.eventWrapper.registerListen(
             'NodeIKernelGroupListener/onMemberInfoChange',
             1,
@@ -330,6 +324,38 @@ export class NTQQGroupApi {
         return member;
     }
 
+    async getGroupMembersV2(groupQQ: string, num = 3000): Promise<Map<string, GroupMember>> {
+        const groupService = this.context.session.getGroupService();
+        const sceneId = groupService.createMemberListScene(groupQQ, 'groupMemberList_MainWindow');
+        const listener = this.core.eventWrapper.registerListen(
+            'NodeIKernelGroupListener/onMemberListChange',
+            1,
+            500,
+            (params) => params.sceneId === sceneId,
+        );
+        try {
+            const [membersFromFunc, membersFromListener] = await Promise.allSettled([
+                groupService.getNextMemberList(sceneId, undefined, num),
+                listener,
+            ]);
+            if (membersFromFunc.status === 'fulfilled' && membersFromListener.status === 'fulfilled') {
+                return new Map([
+                    ...membersFromFunc.value.result.infos, 
+                    ...membersFromListener.value[0].infos
+                ]);
+            }
+            if (membersFromFunc.status === 'fulfilled') {
+                return membersFromFunc.value.result.infos;
+            }
+            if (membersFromListener.status === 'fulfilled') {
+                return membersFromListener.value[0].infos;
+            }
+            throw new Error('获取群成员列表失败');
+        } finally {
+            groupService.destroyMemberListScene(sceneId);
+        }
+    }
+    
     async getGroupMembers(groupQQ: string, num = 3000): Promise<Map<string, GroupMember>> {
         const groupService = this.context.session.getGroupService();
         const sceneId = groupService.createMemberListScene(groupQQ, 'groupMemberList_MainWindow');

src/core/apis/system.ts

@@ -1,4 +1,4 @@
-import { GeneralCallResult, InstanceContext, NapCatCore } from '@/core';
+import { InstanceContext, NapCatCore } from '@/core';
 
 export class NTQQSystemApi {
     context: InstanceContext;

src/core/apis/user.ts

@@ -1,4 +1,4 @@
-import type { ModifyProfileParams, User, UserDetailInfoByUinV2 } from '@/core/entities';
+import type { ModifyProfileParams, User } from '@/core/entities';
 import { RequestUtil } from '@/common/request';
 import { ProfileBizType, UserDetailSource } from '@/core/services';
 import { InstanceContext, NapCatCore } from '..';

src/core/apis/webapi.ts

@@ -184,11 +184,8 @@ export class NTQQWebApi {
         const HonorInfo: any = { group_id: groupCode };
 
         if (getType === WebHonorType.TALKATIVE || getType === WebHonorType.ALL) {
-            try {
             const RetInternal = await getDataInternal(groupCode, 1);
-                if (!RetInternal) {
-                    throw new Error('获取龙王信息失败');
-                }
+            if (RetInternal) {
                 HonorInfo.current_talkative = {
                     user_id: RetInternal[0]?.uin,
                     avatar: RetInternal[0]?.avatar,
@@ -206,16 +203,13 @@ export class NTQQWebApi {
                         nickname: talkative_ele?.name,
                     });
                 }
-            } catch (e) {
-                this.context.logger.logDebug(e);
+            } else {
+                this.context.logger.logError('获取龙王信息失败');
             }
         }
         if (getType === WebHonorType.PERFORMER || getType === WebHonorType.ALL) {
-            try {
             const RetInternal = await getDataInternal(groupCode, 2);
-                if (!RetInternal) {
-                    throw new Error('获取群聊之火失败');
-                }
+            if (RetInternal) {
                 HonorInfo.performer_list = [];
                 for (const performer_ele of RetInternal) {
                     HonorInfo.performer_list.push({
@@ -225,16 +219,13 @@ export class NTQQWebApi {
                         description: performer_ele?.desc,
                     });
                 }
-            } catch (e) {
-                this.context.logger.logDebug(e);
+            } else {
+                this.context.logger.logError('获取群聊之火失败');
             }
         }
         if (getType === WebHonorType.PERFORMER || getType === WebHonorType.ALL) {
-            try {
             const RetInternal = await getDataInternal(groupCode, 3);
-                if (!RetInternal) {
-                    throw new Error('获取群聊炽焰失败');
-                }
+            if (RetInternal) {
                 HonorInfo.legend_list = [];
                 for (const legend_ele of RetInternal) {
                     HonorInfo.legend_list.push({
@@ -244,16 +235,13 @@ export class NTQQWebApi {
                         desc: legend_ele?.description,
                     });
                 }
-            } catch (e) {
-                this.context.logger.logDebug('获取群聊炽焰失败', e);
+            } else {
+                this.context.logger.logError('获取群聊炽焰失败');
             }
         }
         if (getType === WebHonorType.EMOTION || getType === WebHonorType.ALL) {
-            try {
             const RetInternal = await getDataInternal(groupCode, 6);
-                if (!RetInternal) {
-                    throw new Error('获取快乐源泉失败');
-                }
+            if (RetInternal) {
                 HonorInfo.emotion_list = [];
                 for (const emotion_ele of RetInternal) {
                     HonorInfo.emotion_list.push({
@@ -263,11 +251,11 @@ export class NTQQWebApi {
                         desc: emotion_ele.description,
                     });
                 }
-            } catch (e) {
-                this.context.logger.logDebug('获取快乐源泉失败', e);
+            } else {
+                this.context.logger.logError('获取快乐源泉失败');
             }
         }
-        //冒尖小春笋好像已经被tx扬了
+        // 冒尖小春笋好像已经被tx扬了 R.I.P.
         if (getType === WebHonorType.EMOTION || getType === WebHonorType.ALL) {
             HonorInfo.strong_newbie_list = [];
         }

src/core/core.ts

@@ -130,12 +130,13 @@ export class NapCatCore {
                     // 获取群成员
                 }
                 const sceneId = this.context.session.getGroupService().createMemberListScene(g.groupCode, 'groupMemberList_MainWindow');
-                this.context.session.getGroupService().getNextMemberList(sceneId!, undefined, 3000).then( /* r => {
+                this.context.session.getGroupService().getNextMemberList(sceneId, undefined, 3000).then( /* r => {
                     // console.log(`get group ${g.groupCode} members`, r);
                     // r.result.infos.forEach(member => {
                     // });
                     // groupMembers.set(g.groupCode, r.result.infos);
                 } */);
+                this.context.session.getGroupService().destroyMemberListScene(sceneId);
             });
         };
         groupListener.onMemberListChange = (arg) => {
@@ -159,10 +160,8 @@ export class NapCatCore {
             } else {
                 this.apis.GroupApi.groupMemberCache.set(groupCode, arg.infos);
             }
-            // console.log('onMemberListChange', groupCode, arg);
         };
         groupListener.onMemberInfoChange = (groupCode, dataSource, members) => {
-            //console.log('onMemberInfoChange', groupCode, changeType, members);
             if (dataSource === DataSource.LOCAL && members.get(this.selfInfo.uid)?.isDelete) {
                 // 自身退群或者被踢退群 5s用于Api操作 之后不再出现
                 setTimeout(() => {

src/core/listeners/index.ts

@@ -19,10 +19,10 @@ import type {
     NodeIKernelMsgListener,
     NodeIKernelProfileListener,
     NodeIKernelRobotListener,
+    NodeIKernelSearchListener_Polyfill,
     NodeIKernelSessionListener,
     NodeIKernelStorageCleanListener,
     NodeIKernelTicketListener,
-    NodeIKernelSearchListener_Polyfill,
 } from '.';
 
 export type ListenerNamingMapping = {

src/core/services/NodeIKernelProfileService.ts

@@ -1,6 +1,5 @@
 import { AnyCnameRecord } from 'node:dns';
-import { BizKey, ModifyProfileParams, SimpleInfo, UserDetailInfoByUin, UserDetailInfoByUinV2 } from '@/core';
-import { NodeIKernelProfileListener } from '@/core';
+import { BizKey, ModifyProfileParams, NodeIKernelProfileListener, SimpleInfo, UserDetailInfoByUinV2 } from '@/core';
 import { GeneralCallResult } from '@/core/services/common';
 
 export enum UserDetailSource {

src/core/services/index.ts

@@ -20,6 +20,7 @@ export * from './NodeIKernelCollectionService';
 import type {
     NodeIKernelAvatarService,
     NodeIKernelBuddyService,
+    NodeIKernelCollectionService,
     NodeIKernelDbToolsService,
     NodeIKernelFileAssistantService,
     NodeIKernelGroupService,
@@ -30,11 +31,10 @@ import type {
     NodeIKernelProfileService,
     NodeIKernelRichMediaService,
     NodeIKernelRobotService,
+    NodeIKernelSearchService,
     NodeIKernelStorageCleanService,
     NodeIKernelTicketService,
     NodeIKernelTipOffService,
-    NodeIKernelSearchService,
-    NodeIKernelCollectionService,
 } from '.';
 
 export type ServiceNamingMapping = {

src/core/wrapper/wrapper.ts

@@ -1,5 +1,4 @@
 import { NodeIDependsAdapter, NodeIDispatcherAdapter, NodeIGlobalAdapter } from '../adapters';
-import { NodeIKernelSessionListener } from '@/core';
 import {
     NodeIKernelAvatarService,
     NodeIKernelBuddyService,
@@ -9,11 +8,12 @@ import {
     NodeIKernelProfileLikeService,
     NodeIKernelProfileService,
     NodeIKernelRichMediaService,
+    NodeIKernelRobotService,
+    NodeIKernelSessionListener,
+    NodeIKernelStorageCleanService,
     NodeIKernelTicketService,
     NodeIKernelTipOffService,
 } from '@/core';
-import { NodeIKernelStorageCleanService } from '@/core';
-import { NodeIKernelRobotService } from '@/core';
 import { NodeIKernelNodeMiscService } from '../services/NodeIKernelNodeMiscService';
 import { NodeIKernelUixConvertService } from '../services/NodeIKernelUixConvertService';
 import { NodeIKernelMsgBackupService } from '../services/NodeIKernelMsgBackupService';

src/nekodoge/Readme.md

@@ -0,0 +1,4 @@
+# nekodoge
+此协议为替代QQ平台 OnebotV11长期不可靠问题
+
+# 规划路线

src/nekodoge/network/socket.ts

@@ -0,0 +1,18 @@
+import { createServer } from 'node:net';
+export class NewAdapterNetwork {
+    constructor(public host: number, public port: number) { }
+    async open() {
+        const server = createServer((socket) => {
+            socket.on('data', (data) => {
+
+            });
+            socket.on('end', () => {
+
+            });
+            socket.on('connect', () => {
+
+            })
+        });
+        server.listen(this.port, this.host);
+    }
+}

src/onebot/action/file/GetFile.ts

@@ -2,7 +2,7 @@ import BaseAction from '../BaseAction';
 import fs from 'fs/promises';
 import { UUIDConverter } from '@/common/helper';
 import { ActionName } from '../types';
-import { ChatType, ElementType, FileElement, Peer, RawMessage, VideoElement } from '@/core/entities';
+import { ChatType, ElementType, Peer, RawMessage } from '@/core/entities';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
 export interface GetFilePayload {
@@ -34,15 +34,10 @@ export class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
         const NTQQMsgApi = this.core.apis.MsgApi;
         const NTQQGroupApi = this.core.apis.GroupApi;
         const NTQQFileApi = this.core.apis.FileApi;
-        let UuidData: {
-            high: string;
-            low: string;
-        } | undefined;
         try {
-            UuidData = UUIDConverter.decode(payload.file);
-            if (UuidData) {
-                const peerUin = UuidData.high;
-                const msgId = UuidData.low;
+            const uuidData = UUIDConverter.decode(payload.file);
+            const peerUin = uuidData.high;
+            const msgId = uuidData.low;
             const isGroup: boolean = !!(await NTQQGroupApi.getGroups(false)).find(e => e.groupCode == peerUin);
             let peer: Peer | undefined;
             //识别Peer
@@ -79,7 +74,7 @@ export class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
                 file_size: fileSize,
                 file_name: fileName,
             };
-                if (true/*enableLocalFile2Url*/ && downloadPath) {
+            if (/* enableLocalFile2Url && */ downloadPath) {
                 try {
                     res.base64 = await fs.readFile(downloadPath, 'base64');
                 } catch (e) {
@@ -88,7 +83,6 @@ export class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
             }
             //不手动删除？文件持久化了
             return res;
-            }
         } catch {
             this.core.context.logger.logDebug('GetFileBase Mode - 1 Error');
         }
@@ -119,7 +113,7 @@ export class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
                 file_size: NTSearchNameResult[0].fileSize.toString(),
                 file_name: NTSearchNameResult[0].fileName,
             };
-            if (true/*enableLocalFile2Url*/ && downloadPath) {
+            if (/* enableLocalFile2Url && */ downloadPath) {
                 try {
                     res.base64 = await fs.readFile(downloadPath, 'base64');
                 } catch (e) {
@@ -130,66 +124,6 @@ export class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
             return res;
         }
         throw new Error('file not found');
-        // let cache = await dbUtil.getFileCacheByName(payload.file);
-        // if (!cache) {
-        //   cache = await dbUtil.getFileCacheByUuid(payload.file);
-        // }
-        // if (!cache) {
-        //   throw new Error('file not found');
-        // }
-        // const { enableLocalFile2Url } = ob11Config;
-        // try {
-        //   await fs.access(cache.path, fs.constants.F_OK);
-        // } catch (e) {
-        //   logDebug('local file not found, start download...');
-        //   // if (cache.url) {
-        //   //   const downloadResult = await uri2local(cache.url);
-        //   //   if (downloadResult.success) {
-        //   //     cache.path = downloadResult.path;
-        //   //     dbUtil.updateFileCache(cache).then();
-        //   //   } else {
-        //   //     throw new Error('file download failed. ' + downloadResult.errMsg);
-        //   //   }
-        //   // } else {
-        //   //   // 没有url的可能是私聊文件或者群文件，需要自己下载
-        //   //   log('需要调用 NTQQ 下载文件api');
-        //   let peer = MessageUnique.getPeerByMsgId(cache.msgId);
-        //   let msg = await NTQQMsgApi.getMsgsByMsgId(peer?.Peer!,cache.msgId);
-        //   // log('文件 msg', msg);
-        //   if (msg) {
-        //     // 构建下载函数
-        //     const downloadPath = await NTQQFileApi.downloadMedia(msg.msgId, msg.chatType, msg.peerUid,
-        //       cache.elementId, '', '');
-        //     // await sleep(1000);
-
-        //     // log('download result', downloadPath);
-        //     let peer = MessageUnique.getPeerByMsgId(cache.msgId);
-        //     msg = await NTQQMsgApi.getMsgsByMsgId(peer?.Peer!,cache.msgId);
-        //     // log('下载完成后的msg', msg);
-        //     cache.path = downloadPath!;
-        //     dbUtil.updateFileCache(cache).then();
-        //     // log('下载完成后的msg', msg);
-        //     // }
-        //   }
-
-        // }
-        // // log('file found', cache);
-        // const res: GetFileResponse = {
-        //   file: cache.path,
-        //   url: cache.url,
-        //   file_size: cache.size.toString(),
-        //   file_name: cache.name
-        // };
-        // if (enableLocalFile2Url) {
-        //   if (!cache.url) {
-        //     try {
-        //       res.base64 = await fs.readFile(cache.path, 'base64');
-        //     } catch (e) {
-        //       throw new Error('文件下载失败. ' + e);
-        //     }
-        //   }
-        // }
-        //return res;
     }
 }
 

src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts

@@ -1,7 +1,7 @@
 import BaseAction from '../BaseAction';
 import { OB11Message } from '@/onebot';
 import { ActionName } from '../types';
-import { ChatType, Peer, RawMessage } from '@/core/entities';
+import { ChatType } from '@/core/entities';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import { MessageUnique } from '@/common/message-unique';
 
@@ -40,7 +40,7 @@ export default class GetFriendMsgHistory extends BaseAction<Payload, Response> {
         const hasMessageSeq = !payload.message_seq ? !!payload.message_seq : !(payload.message_seq?.toString() === '' || payload.message_seq?.toString() === '0');
         //拉取消息
         const startMsgId = hasMessageSeq ? (MessageUnique.getMsgIdAndPeerByShortId(+payload.message_seq!)?.MsgId ?? payload.message_seq!.toString()) : '0';
-        let msgList = hasMessageSeq ?
+        const msgList = hasMessageSeq ?
             (await NTQQMsgApi.getMsgHistory(peer, startMsgId, MsgCount)).msgList : (await NTQQMsgApi.getAioFirstViewLatestMsgs(peer, MsgCount)).msgList;
         if (msgList.length === 0) throw `消息${payload.message_seq}不存在`;
         //翻转消息

src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts

@@ -1,7 +1,7 @@
 import BaseAction from '../BaseAction';
 import { OB11Message } from '@/onebot';
 import { ActionName } from '../types';
-import { ChatType, Peer, RawMessage } from '@/core/entities';
+import { ChatType, Peer } from '@/core/entities';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import { MessageUnique } from '@/common/message-unique';
 
@@ -35,7 +35,7 @@ export default class GoCQHTTPGetGroupMsgHistory extends BaseAction<Payload, Resp
         const hasMessageSeq = !payload.message_seq ? !!payload.message_seq : !(payload.message_seq?.toString() === '' || payload.message_seq?.toString() === '0');
         //拉取消息
         const startMsgId = hasMessageSeq ? (MessageUnique.getMsgIdAndPeerByShortId(+payload.message_seq!)?.MsgId ?? payload.message_seq!.toString()) : '0';
-        let msgList = hasMessageSeq ?
+        const msgList = hasMessageSeq ?
             (await NTQQMsgApi.getMsgHistory(peer, startMsgId, MsgCount)).msgList : (await NTQQMsgApi.getAioFirstViewLatestMsgs(peer, MsgCount)).msgList;
         if (msgList.length === 0) throw `消息${payload.message_seq}不存在`;
         //翻转消息

src/onebot/action/go-cqhttp/QuickAction.ts

@@ -13,7 +13,7 @@ export class GoCQHTTPHandleQuickAction extends BaseAction<Payload, null> {
     async _handle(payload: Payload): Promise<null> {
         this.obContext.apis.QuickActionApi
             .handleQuickOperation(payload.context, payload.operation)
-            .catch(this.core.context.logger.logError);
+            .catch(this.core.context.logger.logError.bind(this.core.context.logger));
         return null;
     }
 }

src/onebot/action/go-cqhttp/SendGroupNotice.ts

@@ -27,7 +27,6 @@ export class SendGroupNotice extends BaseAction<Payload, null> {
         if (payload.image) {
             //公告图逻辑
             const {
-                errMsg,
                 path,
                 isLocal,
                 success,
@@ -49,8 +48,8 @@ export class SendGroupNotice extends BaseAction<Payload, null> {
             }
             UploadImage = ImageUploadResult.picInfo;
         }
-        let noticePinned = +(payload.pinned ?? 0);
-        let noticeConfirmRequired = +(payload.confirm_required ?? 0);
+        const noticePinned = +(payload.pinned ?? 0);
+        const noticeConfirmRequired = +(payload.confirm_required ?? 0);
         const publishGroupBulletinResult = await NTQQGroupApi.publishGroupBulletin(payload.group_id.toString(), payload.content, UploadImage, noticePinned, noticeConfirmRequired);
 
         if (publishGroupBulletinResult.result != 0) {

src/onebot/action/go-cqhttp/SetGroupPortrait.ts

@@ -53,6 +53,5 @@ export default class SetGroupPortrait extends BaseAction<Payload, any> {
             }
             throw `头像${payload.file}设置失败,无法获取头像,文件可能不存在`;
         }
-        return null;
     }
 }

src/onebot/action/group/GetGroupMemberList.ts

@@ -22,7 +22,7 @@ class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
     async _handle(payload: Payload) {
         const NTQQGroupApi = this.core.apis.GroupApi;
         const NTQQWebApi = this.core.apis.WebApi;
-        const groupMembers = await NTQQGroupApi.getGroupMembers(payload.group_id.toString());
+        const groupMembers = await NTQQGroupApi.getGroupMembersV2(payload.group_id.toString());
         const groupMembersArr = Array.from(groupMembers.values());
 
         let _groupMembers = groupMembersArr.map(item => {

src/onebot/action/msg/DeleteMsg.ts

@@ -2,7 +2,6 @@ import { ActionName } from '../types';
 import BaseAction from '../BaseAction';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import { MessageUnique } from '@/common/message-unique';
-import { NodeIKernelMsgListener } from '@/core';
 
 const SchemaData = {
     type: 'object',

src/onebot/action/msg/SendMsg.ts

@@ -30,7 +30,7 @@ export function normalize(message: OB11MessageMixType, autoEscape = false): OB11
     ) : Array.isArray(message) ? message : [message];
 }
 
-async function createContext(core: NapCatCore, payload: OB11PostSendMsg, contextMode: ContextMode): Promise<Peer> {
+export async function createContext(core: NapCatCore, payload: OB11PostSendMsg, contextMode: ContextMode): Promise<Peer> {
     // This function determines the type of message by the existence of user_id / group_id,
     // not message_type.
     // This redundant design of Ob11 here should be blamed.

src/onebot/action/user/SendLike.ts

@@ -20,16 +20,12 @@ export default class SendLike extends BaseAction<Payload, null> {
     async _handle(payload: Payload): Promise<null> {
         const NTQQUserApi = this.core.apis.UserApi;
         //logDebug('点赞参数', payload);
-        try {
         const qq = payload.user_id.toString();
         const uid: string = await NTQQUserApi.getUidByUinV2(qq) || '';
         const result = await NTQQUserApi.like(uid, parseInt(payload.times?.toString()) || 1);
         //logDebug('点赞结果', result);
         if (result.result !== 0) {
-                throw Error(result.errMsg);
-            }
-        } catch (e) {
-            throw `点赞失败 ${e}`;
+            throw `点赞失败 ${result.errMsg}`;
         }
         return null;
     }

src/onebot/api/group.ts

@@ -78,7 +78,7 @@ export class OneBotGroupApi {
         const NTQQGroupApi = this.core.apis.GroupApi;
         const groupElement = grayTipElement?.groupElement;
         if (!groupElement) return undefined;
-        const member = await NTQQGroupApi.getGroupMemberV2(GroupCode, groupElement.memberUid);
+        const member = await NTQQGroupApi.getGroupMember(GroupCode, groupElement.memberUid);
         const memberUin = member?.uin;
         const adminMember = await NTQQGroupApi.getGroupMember(GroupCode, groupElement.adminUid);
         if (memberUin) {
@@ -89,9 +89,10 @@ export class OneBotGroupApi {
                 parseInt(memberUin),
                 parseInt(operatorUin),
             );
-        }
+        } else {
             return undefined;
         }
+    }
 
     async parseGroupKickEvent(GroupCode: string, grayTipElement: GrayTipElement) {
         const NTQQGroupApi = this.core.apis.GroupApi;
@@ -118,7 +119,6 @@ export class OneBotGroupApi {
             attributeNamePrefix: '',
         }).parse(grayTipElement.xmlElement.content);
         this.core.context.logger.logDebug('收到表情回应我的消息', emojiLikeData);
-        try {
         const senderUin = emojiLikeData.gtip.qq.jp;
         const msgSeq = emojiLikeData.gtip.url.msgseq;
         const emojiId = emojiLikeData.gtip.face.id;
@@ -133,7 +133,10 @@ export class OneBotGroupApi {
         }
         const replyMsg = replyMsgList.filter(e => e.msgSeq == msgSeq).sort((a, b) => parseInt(a.msgTime) - parseInt(b.msgTime))[0];
         //console.log("表情回应消息长度检测", msgSeq, replyMsg.elements);
-            if (!replyMsg) throw new Error('找不到回应消息');
+        if (!replyMsg) {
+            this.core.context.logger.logError('解析表情回应消息失败: 未找到回应消息');
+            return undefined;
+        }
         return new OB11GroupMsgEmojiLikeEvent(
             this.core,
             parseInt(GroupCode),
@@ -144,9 +147,5 @@ export class OneBotGroupApi {
                 count: 1,
             }],
         );
-        } catch (e: any) {
-            this.core.context.logger.logError('解析表情回应消息失败', e.stack);
-        }
-        return undefined;
     }
 }

src/onebot/api/quick-action.ts

@@ -13,9 +13,9 @@ import {
 import { ChatType, GroupRequestOperateTypes, NapCatCore, Peer } from '@/core';
 import { OB11FriendRequestEvent } from '@/onebot/event/request/OB11FriendRequest';
 import { OB11GroupRequestEvent } from '@/onebot/event/request/OB11GroupRequest';
-import { normalize } from '@/onebot/action/msg/SendMsg';
+import { ContextMode, normalize } from '@/onebot/action/msg/SendMsg';
 import { isNull } from '@/common/helper';
-
+import { createContext } from '@/onebot/action/msg/SendMsg';
 export class OneBotQuickActionApi {
     constructor(
         public obContext: NapCatOneBot11Adapter,
@@ -24,37 +24,34 @@ export class OneBotQuickActionApi {
     }
 
     async handleQuickOperation(eventContext: QuickActionEvent, quickAction: QuickAction) {
+        const logger = this.core.context.logger;
         if (eventContext.post_type === 'message') {
             await this.handleMsg(eventContext as OB11Message, quickAction)
-                .catch(this.core.context.logger.logError);
+                .catch(logger.logError.bind(logger));
         }
         if (eventContext.post_type === 'request') {
             const friendRequest = eventContext as OB11FriendRequestEvent;
             const groupRequest = eventContext as OB11GroupRequestEvent;
             if ((friendRequest).request_type === 'friend') {
                 await this.handleFriendRequest(friendRequest, quickAction)
-                    .catch(this.core.context.logger.logError);
+                    .catch(logger.logError.bind(logger));
             } else if (groupRequest.request_type === 'group') {
                 await this.handleGroupRequest(groupRequest, quickAction)
-                    .catch(this.core.context.logger.logError);
+                    .catch(logger.logError.bind(logger));
             }
         }
     }
 
     async handleMsg(msg: OB11Message, quickAction: QuickAction) {
         const reply = quickAction.reply;
-        const peer: Peer = {
-            chatType: ChatType.KCHATTYPEC2C,
-            peerUid: await this.core.apis.UserApi.getUidByUinV2(msg.user_id.toString()) as string,
-        };
-        if (msg.message_type == 'private') {
-            if (msg.sub_type === 'group') {
-                peer.chatType = ChatType.KCHATTYPETEMPC2CFROMGROUP;
-            }
-        } else {
-            peer.chatType = ChatType.KCHATTYPETEMPC2CFROMGROUP;
-            peer.peerUid = msg.group_id!.toString();
-        }
+        const peerContextMode = msg.message_type == 'private' ? ContextMode.Private : ContextMode.Group;
+
+        const peer: Peer = await createContext(this.core, {
+            message: "",
+            group_id: msg.group_id?.toString(),
+            user_id: msg.user_id?.toString(),
+        }, peerContextMode);
+        
         if (reply) {
             // let group: Group | undefined;
             let replyMessage: OB11MessageData[] = [];

src/onebot/event/OB11BaseEvent.ts

@@ -1,4 +1,4 @@
-import { InstanceContext, NapCatCore } from '@/core';
+import { NapCatCore } from '@/core';
 
 export enum EventType {
     META = 'meta_event',

src/onebot/external/onebot11.json

@@ -1,6 +1,6 @@
 {
     "http": {
-        "enable": false,
+        "enable": true,
         "host": "",
         "port": 3000,
         "secret": "",

src/onebot/helper/event.ts

@@ -9,7 +9,7 @@ import { OB11GroupPokeEvent } from '../event/notice/OB11PokeEvent';
 import { OB11GroupEssenceEvent } from '../event/notice/OB11GroupEssenceEvent';
 import { MessageUnique } from '@/common/message-unique';
 import { OB11GroupTitleEvent } from '../event/notice/OB11GroupTitleEvent';
-import { NapCatCore, RawMessage, ChatType, NTGrayTipElementSubTypeV2, TipGroupElementType, Peer } from '@/core';
+import { ChatType, NapCatCore, NTGrayTipElementSubTypeV2, Peer, RawMessage, TipGroupElementType } from '@/core';
 
 export async function NT2PrivateEvent(core: NapCatCore, obContext: NapCatOneBot11Adapter, msg: RawMessage): Promise<OB11BaseNoticeEvent | undefined> {
     if (msg.chatType !== ChatType.KCHATTYPEC2C) {

src/onebot/index.ts

@@ -1,17 +1,17 @@
 import {
-    NodeIKernelBuddyListener,
     BuddyReqType,
     ChatType,
+    DataSource,
+    GroupMemberRole,
+    GroupNotifyMsgStatus,
+    GroupNotifyMsgType,
     InstanceContext,
-    NodeIKernelMsgListener,
     NapCatCore,
+    NodeIKernelBuddyListener,
+    NodeIKernelGroupListener,
+    NodeIKernelMsgListener,
     RawMessage,
     SendStatusType,
-    GroupMemberRole,
-    GroupNotifyMsgType,
-    GroupNotifyMsgStatus,
-    DataSource,
-    NodeIKernelGroupListener,
 } from '@/core';
 import { OB11Config, OB11ConfigLoader } from '@/onebot/helper/config';
 import {

src/onebot/network/index.ts

@@ -1,4 +1,3 @@
-import BaseAction from '@/onebot/action/BaseAction';
 import { OB11BaseEvent } from '@/onebot/event/OB11BaseEvent';
 import { OB11Message } from '@/onebot';
 import { ActionMap } from '@/onebot/action';