release: 2.0.21

typo: OB11InputStatusEvent event_type

manifest.json

@@ -1,10 +1,10 @@
 {
   "manifest_version": 4,
   "type": "extension",
-  "name": "NapCat",
-  "slug": "NapCat",
-  "description": "现代化的 OneBot 11 协议实现",
-  "version": "2.0.20",
+  "name": "NapCatQQ",
+  "slug": "NapCat.Framework",
+  "description": "高性能的 OneBot 11 协议实现",
+  "version": "2.0.21",
   "icon": "./logo.png",
   "authors": [
     {

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "2.0.20",
+  "version": "2.0.21",
   "scripts": {
     "build:framework": "vite build --mode framework",
     "build:shell": "vite build --mode shell",

src/common/framework/napcat.ts

@@ -2,7 +2,7 @@ import path, { dirname } from 'path';
 import { fileURLToPath } from 'url';
 import fs from 'fs';
 
-export const napcat_version = '2.0.20';
+export const napcat_version = '2.0.21';
 
 export class NapCatPathWrapper {
     binaryPath: string;

src/core/apis/friend.ts

@@ -26,10 +26,6 @@ export class NTQQFriendApi {
         return Array.from(data.values());
     }
 
-    async getBuddyIdMapCache(refresh = false): Promise<LimitedHashTable<string, string>> {
-        return await this.getBuddyIdMap(refresh);
-    }
-
     async getBuddyIdMap(refresh = false): Promise<LimitedHashTable<string, string>> {
         const uids: string[] = [];
         const retMap: LimitedHashTable<string, string> = new LimitedHashTable<string, string>(5000);

src/core/apis/msg.ts

@@ -37,7 +37,6 @@ export class NTQQMsgApi {
         emojiId = emojiId.toString();
         return this.context.session.getMsgService().setMsgEmojiLikes(peer, msgSeq, emojiId, emojiId.length > 3 ? '2' : '1', set);
     }
-
     async getMultiMsg(peer: Peer, rootMsgId: string, parentMsgId: string): Promise<GeneralCallResult & {
         msgList: RawMessage[]
     } | undefined> {
@@ -129,61 +128,6 @@ export class NTQQMsgApi {
             peerUid: peer.peerUid,
         }, msgIds);
     }
-
-    async sendMsgV2(peer: Peer, msgElements: SendMessageElement[], waitComplete = true, timeout = 10000) {
-        function generateMsgId() {
-            const timestamp = Math.floor(Date.now() / 1000);
-            const random = Math.floor(Math.random() * Math.pow(2, 32));
-            const buffer = Buffer.alloc(8);
-            buffer.writeUInt32BE(timestamp, 0);
-            buffer.writeUInt32BE(random, 4);
-            const msgId = BigInt('0x' + buffer.toString('hex')).toString();
-            return msgId;
-        }
-
-        // 此处有采用Hack方法 利用数据返回正确得到对应消息
-        // 与之前 Peer队列 MsgSeq队列 真正的MsgId并发不同
-        // 谨慎采用 目前测试暂无问题  Developer.Mlikiowa
-        let msgId: string;
-        try {
-            msgId = await this.getMsgUnique(peer.chatType, await this.getServerTime());
-        } catch (error) {
-            //if (!napCatCore.session.getMsgService()['generateMsgUniqueId'])
-            //兜底识别策略V2
-            msgId = generateMsgId().toString();
-        }
-        const data = await this.core.eventWrapper.CallNormalEvent<
-            (msgId: string, peer: Peer, msgElements: SendMessageElement[], map: Map<any, any>) => Promise<unknown>,
-            (msgList: RawMessage[]) => void
-                >(
-                'NodeIKernelMsgService/sendMsg',
-                'NodeIKernelMsgListener/onMsgInfoListUpdate',
-                1,
-                timeout,
-                (msgRecords: RawMessage[]) => {
-                    for (const msgRecord of msgRecords) {
-                        if (msgRecord.msgId === msgId && msgRecord.sendStatus === 2) {
-                            return true;
-                        }
-                    }
-                    return false;
-                },
-                msgId,
-                peer,
-                msgElements,
-                new Map(),
-                );
-        const retMsg = data[1].find(msgRecord => {
-            if (msgRecord.msgId === msgId) {
-                return true;
-            }
-        });
-        return retMsg;
-    }
-
-    sendMsgEx(peer: Peer, msgElements: SendMessageElement[], waitComplete = true, timeout = 10000) {
-        //return NTQQMsgApi.sendMsgV1(peer, msgElements, waitComplete, timeout);
-    }
     async PrepareTempChat(toUserUid: string, GroupCode: string, nickname: string) {
         //By Jadx/Ida Mlikiowa
         const TempGameSession = {
@@ -215,7 +159,7 @@ export class NTQQMsgApi {
                 await this.PrepareTempChat(peer.peerUid, peer.guildId, member.nick);
             }
         }
-        const msgId = await this.getMsgUnique(peer.chatType, await this.getServerTime());
+        const msgId = await this.generateMsgUniqueId(peer.chatType, await this.getServerTime());
         peer.guildId = msgId;
         const data = await this.core.eventWrapper.CallNormalEvent<
             (msgId: string, peer: Peer, msgElements: SendMessageElement[], map: Map<any, any>) => Promise<unknown>,
@@ -246,21 +190,14 @@ export class NTQQMsgApi {
         return retMsg;
     }
 
-    async getMsgUnique(chatType: number, time: string) {
-        if (this.context.basicInfoWrapper.requireMinNTQQBuild('26702')) {
+    async generateMsgUniqueId(chatType: number, time: string) {
         return this.context.session.getMsgService().generateMsgUniqueId(chatType, time);
     }
-        return this.context.session.getMsgService().getMsgUniqueId(time);
-    }
 
     async getServerTime() {
         return this.context.session.getMSFService().getServerTime();
     }
 
-    async getServerTimeV2() {
-        return this.core.eventWrapper.callNoListenerEvent<() => string>('NodeIKernelMsgService/getServerTime', 5000);
-    }
-
     async forwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {
         return this.context.session.getMsgService().forwardMsg(msgIds, srcPeer, [destPeer], new Map());
     }

src/core/apis/user.ts

@@ -203,26 +203,6 @@ export class NTQQUserApi {
         return skey;
     }
 
-    /**
-     * @deprecated
-     */
-    async getUidByUin(Uin: string) {
-        if (this.context.basicInfoWrapper.requireMinNTQQBuild('26702')) {
-            return await this.getUidByUinV2(Uin);
-        }
-        return await this.getUidByUinV1(Uin);
-    }
-
-    /**
-     * @deprecated
-     */
-    async getUinByUid(Uid: string) {
-        if (this.context.basicInfoWrapper.requireMinNTQQBuild('26702')) {
-            return await this.getUinByUidV2(Uid);
-        }
-        return await this.getUinByUidV1(Uid);
-    }
-
     //后期改成流水线处理
     async getUidByUinV2(Uin: string) {
         let uid = (await this.context.session.getProfileService().getUidByUin('FriendsServiceImpl', [Uin])).get(Uin);
@@ -231,11 +211,6 @@ export class NTQQUserApi {
         if (uid) return uid;
         uid = (await this.context.session.getUixConvertService().getUid([Uin])).uidInfo.get(Uin);
         if (uid) return uid;
-        // console.log((await this.core.getApiContext().FriendApi.getBuddyIdMapCache(true)));
-        uid = (await this.core.apis.FriendApi.getBuddyIdMapCache(true)).getValue(Uin);//从Buddy缓存获取Uid
-        if (uid) return uid;
-        uid = (await this.core.apis.FriendApi.getBuddyIdMap(true)).getValue(Uin);
-        if (uid) return uid;
         const unveifyUid = (await this.getUserDetailInfoByUinV2(Uin)).detail.uid;//从QQ Native 特殊转换
         if (unveifyUid.indexOf('*') == -1) uid = unveifyUid;
         //if (uid) return uid;
@@ -250,44 +225,12 @@ export class NTQQUserApi {
         if (uin) return uin;
         uin = (await this.context.session.getUixConvertService().getUin([Uid])).uinInfo.get(Uid);
         if (uin) return uin;
-        uin = (await this.core.apis.FriendApi.getBuddyIdMapCache(true)).getKey(Uid);//从Buddy缓存获取Uin
-        if (uin) return uin;
         uin = (await this.core.apis.FriendApi.getBuddyIdMap(true)).getKey(Uid);
         if (uin) return uin;
         uin = (await this.getUserDetailInfo(Uid)).uin; //从QQ Native 转换
         return uin;
     }
 
-    async getUidByUinV1(Uin: string) {
-        // 通用转换开始尝试
-        let uid = (await this.context.session.getUixConvertService().getUid([Uin])).uidInfo.get(Uin);
-        if (!uid) {
-            const unveifyUid = (await this.getUserDetailInfoByUin(Uin)).info.uid;//从QQ Native 特殊转换 方法三
-            if (unveifyUid.indexOf('*') == -1) {
-                uid = unveifyUid;
-            }
-        }
-        return uid;
-    }
-
-    async getUinByUidV1(Uid: string) {
-        const ret = await this.core.eventWrapper.callNoListenerEvent<(Uin: string[]) => Promise<{
-            uinInfo: Map<string, string>
-        }>>
-            ('NodeIKernelUixConvertService/getUin', 5000, [Uid]);
-        let uin = ret.uinInfo.get(Uid);
-        if (!uin) {
-            uin = (await this.getUserDetailInfo(Uid)).uin; //从QQ Native 转换
-        }
-        // if (!uin) {
-        //   uin = (await NTQQFriendApi.getFriends(false)).find((t) => { t.uid == Uid })?.uin;  //从QQ Native 缓存转换
-        // }
-        // if (!uin) {
-        //   uin = (await NTQQFriendApi.getFriends(true)).find((t) => { t.uid == Uid })?.uin;  //从QQ Native 非缓存转换
-        // }
-        return uin;
-    }
-
     async getRecentContactListSnapShot(count: number) {
         return await this.context.session.getRecentContactService().getRecentContactListSnapShot(count);
     }

src/core/core.ts

@@ -93,6 +93,9 @@ export class NapCatCore {
         msgListener.onRecvMsg = (msgs) => {
             msgs.forEach(msg => this.context.logger.logMessage(msg, this.selfInfo));
         };
+        msgListener.onAddSendMsg = (msg) => {
+            this.context.logger.logMessage(msg, this.selfInfo);
+        };
         //await sleep(2500);
         this.context.session.getMsgService().addKernelMsgListener(
             new this.context.wrapper.NodeIKernelMsgListener(proxiedListenerOf(msgListener, this.context.logger)),

src/onebot/action/extends/FetchCustomFace.ts

@@ -5,7 +5,7 @@ import { ActionName } from '../types';
 const SchemaData = {
     type: 'object',
     properties: {
-        count: { type: 'number' },
+        count: { type: ['number', 'string'] },
     },
 } as const satisfies JSONSchema;
 
@@ -17,7 +17,7 @@ export class FetchCustomFace extends BaseAction<Payload, string[]> {
 
     async _handle(payload: Payload) {
         //48 可能正好是QQ需要的一个页面的数量 Tagged Mlikiowa
-        const ret = await this.CoreContext.apis.MsgApi.fetchFavEmojiList(payload.count || 48);
+        const ret = await this.CoreContext.apis.MsgApi.fetchFavEmojiList(parseInt((payload.count || '0').toString()) || 48);
         return ret.emojiInfoList.map(e => e.url);
     }
 }

src/onebot/action/extends/FetchEmojiLike.ts

@@ -12,7 +12,7 @@ const SchemaData = {
         emojiId: { type: 'string' },
         emojiType: { type: 'string' },
         message_id: { type: ['string', 'number'] },
-        count: { type: 'number' },
+        count: { type: ['string', 'number'] },
     },
     required: ['emojiId', 'emojiType', 'message_id'],
 } as const satisfies JSONSchema;
@@ -22,12 +22,11 @@ type Payload = FromSchema<typeof SchemaData>;
 export class FetchEmojiLike extends BaseAction<Payload, any> {
     actionName = ActionName.FetchEmojiLike;
     PayloadSchema = SchemaData;
-
     async _handle(payload: Payload) {
         const NTQQMsgApi = this.CoreContext.apis.MsgApi;
         const msgIdPeer = MessageUnique.getMsgIdAndPeerByShortId(parseInt(payload.message_id.toString()));
         if (!msgIdPeer) throw new Error('消息不存在');
         const msg = (await NTQQMsgApi.getMsgsByMsgId(msgIdPeer.Peer, [msgIdPeer.MsgId])).msgList[0];
-        return await NTQQMsgApi.getMsgEmojiLikesList(msgIdPeer.Peer, msg.msgSeq, payload.emojiId, payload.emojiType, payload.count);
+        return await NTQQMsgApi.getMsgEmojiLikesList(msgIdPeer.Peer, msg.msgSeq, payload.emojiId, payload.emojiType, parseInt((payload.count || '0').toString()) || 20);
     }
 }

src/onebot/action/extends/GetCollectionList.ts

@@ -5,8 +5,8 @@ import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 const SchemaData = {
     type: 'object',
     properties: {
-        category: { type: 'number' },
-        count: { type: 'number' },
+        category: { type: ['number', 'string'] },
+        count: { type: ['number', 'string'] },
     },
     required: ['category', 'count'],
 } as const satisfies JSONSchema;
@@ -16,9 +16,8 @@ type Payload = FromSchema<typeof SchemaData>;
 export class GetCollectionList extends BaseAction<Payload, any> {
     actionName = ActionName.GetCollectionList;
     PayloadSchema = SchemaData;
-
     async _handle(payload: Payload) {
         const NTQQCollectionApi = this.CoreContext.apis.CollectionApi;
-        return await NTQQCollectionApi.getAllCollection(payload.category, payload.count);
+        return await NTQQCollectionApi.getAllCollection(parseInt(payload.category.toString()), parseInt(payload.count.toString()));
     }
 }

src/onebot/action/extends/GetFriendWithCategory.ts

@@ -4,7 +4,6 @@ import { ActionName } from '../types';
 
 export class GetFriendWithCategory extends BaseAction<void, any> {
     actionName = ActionName.GetFriendsWithCategory;
-
     async _handle(payload: void) {
         return (await this.CoreContext.apis.FriendApi.getBuddyV2ExWithCate(true)).map(category => ({
             ...category,

src/onebot/action/extends/GetProfileLike.ts

@@ -9,7 +9,7 @@ export class GetProfileLike extends BaseAction<void, any> {
         const ret = await NTQQUserApi.getProfileLike(this.CoreContext.selfInfo.uid);
         const listdata: any[] = ret.info.userLikeInfos[0].favoriteInfo.userInfos;
         for (let i = 0; i < listdata.length; i++) {
-            listdata[i].uin = parseInt((await NTQQUserApi.getUinByUid(listdata[i].uid)) || '');
+            listdata[i].uin = parseInt((await NTQQUserApi.getUinByUidV2(listdata[i].uid)) || '');
         }
         return listdata;
     }

src/onebot/action/extends/OCRImage.ts

@@ -3,7 +3,6 @@ import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import { checkFileReceived, uri2local } from '@/common/utils/file';
 import fs from 'fs';
-
 const SchemaData = {
     type: 'object',
     properties: {

src/onebot/action/extends/SetOnlineStatus.ts

@@ -6,9 +6,9 @@ import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 const SchemaData = {
     type: 'object',
     properties: {
-        status: { type: 'number' },
-        extStatus: { type: 'number' },
-        batteryStatus: { type: 'number' },
+        status: { type: ['number', 'string'] },
+        extStatus: { type: ['number', 'string'] },
+        batteryStatus: { type: ['number', 'string'] },
     },
     required: ['status', 'extStatus', 'batteryStatus'],
 } as const satisfies JSONSchema;
@@ -20,14 +20,12 @@ export class SetOnlineStatus extends BaseAction<Payload, null> {
     PayloadSchema = SchemaData;
 
     async _handle(payload: Payload) {
-        // 可设置状态
-        // { status: 10, extStatus: 1027, batteryStatus: 0 }
-        // { status: 30, extStatus: 0, batteryStatus: 0 }
-        // { status: 50, extStatus: 0, batteryStatus: 0 }
-        // { status: 60, extStatus: 0, batteryStatus: 0 }
-        // { status: 70, extStatus: 0, batteryStatus: 0 }
         const NTQQUserApi = this.CoreContext.apis.UserApi;
-        const ret = await NTQQUserApi.setSelfOnlineStatus(payload.status, payload.extStatus, payload.batteryStatus);
+        const ret = await NTQQUserApi.setSelfOnlineStatus(
+            parseInt(payload.status.toString()),
+            parseInt(payload.extStatus.toString()),
+            parseInt(payload.batteryStatus.toString())
+        );
         if (ret.result !== 0) {
             throw new Error('设置在线状态失败');
         }

src/onebot/action/extends/SetSelfProfile.ts

@@ -7,7 +7,7 @@ const SchemaData = {
     properties: {
         nick: { type: 'string' },
         longNick: { type: 'string' },
-        sex: { type: 'number' },//传Sex值？建议传0
+        sex: { type: ['number', 'string'] },//传Sex值？建议传0
     },
     required: ['nick', 'longNick', 'sex'],
 } as const satisfies JSONSchema;
@@ -23,7 +23,7 @@ export class SetSelfProfile extends BaseAction<Payload, any | null> {
         const ret = await NTQQUserApi.modifySelfProfile({
             nick: payload.nick,
             longNick: payload.longNick,
-            sex: payload.sex,
+            sex: parseInt(payload.sex.toString()),
             birthday: { birthday_year: '', birthday_month: '', birthday_day: '' },
             location: undefined,
         });

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

@@ -13,7 +13,7 @@ interface FileResponse {
 const SchemaData = {
     type: 'object',
     properties: {
-        thread_count: { type: 'number' },
+        thread_count: { type: ['number', 'string'] },
         url: { type: 'string' },
         base64: { type: 'string' },
         name: { type: 'string' },

src/onebot/action/group/GetGroupInfo.ts

@@ -21,11 +21,8 @@ class GetGroupInfo extends BaseAction<Payload, OB11Group> {
     async _handle(payload: Payload) {
         const NTQQGroupApi = this.CoreContext.apis.GroupApi;
         const group = (await NTQQGroupApi.getGroups()).find(e => e.groupCode == payload.group_id.toString());
-        if (group) {
+        if (!group) throw `群${payload.group_id}不存在`;
         return OB11Constructor.group(group);
-        } else {
-            throw `群${payload.group_id}不存在`;
-        }
     }
 }
 

src/onebot/action/group/GetGroupList.ts

@@ -20,7 +20,7 @@ class GetGroupList extends BaseAction<Payload, OB11Group[]> {
 
     async _handle(payload: Payload) {
         const NTQQGroupApi = this.CoreContext.apis.GroupApi;
-        const groupList: Group[] = await NTQQGroupApi.getGroups(payload?.no_cache === true || payload.no_cache === 'true');
+        const groupList: Group[] = await NTQQGroupApi.getGroups(typeof payload.no_cache === 'string' ? payload.no_cache === 'true' : !!payload.no_cache);
         return OB11Constructor.groups(groupList);
     }
 }

src/onebot/action/group/GetGroupMemberInfo.ts

@@ -24,15 +24,11 @@ class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
         const NTQQUserApi = this.CoreContext.apis.UserApi;
         const NTQQGroupApi = this.CoreContext.apis.GroupApi;
         const NTQQWebApi = this.CoreContext.apis.WebApi;
-        const isNocache = payload.no_cache == true || payload.no_cache === 'true';
+        const isNocache = typeof payload.no_cache === 'string' ? payload.no_cache === 'true' : !!payload.no_cache;
         const uid = await NTQQUserApi.getUidByUinV2(payload.user_id.toString());
-        if (!uid) {
-            throw (`Uin2Uid Error ${payload.user_id}不存在`);
-        }
+        if (!uid) throw (`Uin2Uid Error ${payload.user_id}不存在`);
         const member = await NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), uid, isNocache);
-        if (!member) {
-            throw (`群(${payload.group_id})成员${payload.user_id}不存在`);
-        }
+        if (!member) throw (`群(${payload.group_id})成员${payload.user_id}不存在`);
         try {
             const info = (await NTQQUserApi.getUserDetailInfo(member.uid));
             this.CoreContext.context.logger.logDebug('群成员详细信息结果', info);
@@ -42,7 +38,6 @@ class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
         }
         const date = Math.round(Date.now() / 1000);
         const retMember = OB11Constructor.groupMember(payload.group_id.toString(), member);
-        if (!this.CoreContext.context.basicInfoWrapper.requireMinNTQQBuild('26702')) {
         const SelfInfoInGroup = await NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), this.CoreContext.selfInfo.uid, isNocache);
         let isPrivilege = false;
         if (SelfInfoInGroup) {
@@ -58,21 +53,9 @@ class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
                     retMember.level = webGroupMembers[i]?.lv.level.toString();
                 }
             }
-            } else {
-                const LastestMsgList = await NTQQGroupApi.getLatestMsg(payload.group_id.toString(), [payload.user_id.toString()]);
-                if (LastestMsgList?.msgList?.length && LastestMsgList?.msgList?.length > 0) {
-                    const last_send_time = LastestMsgList.msgList[0].msgTime;
-                    if (last_send_time && last_send_time != '0' && last_send_time != '') {
-                        retMember.last_sent_time = parseInt(last_send_time);
-                        retMember.join_time = Math.round(Date.now() / 1000);//兜底数据 防止群管乱杀
-                    }
-                }
-            }
-        } else {
-            // Mlikiowa V2.0.20 Refactor Todo
-            // retMember.last_sent_time = parseInt((await getGroupMember(payload.group_id.toString(), retMember.user_id))?.lastSpeakTime || date.toString());
-            // retMember.join_time = parseInt((await getGroupMember(payload.group_id.toString(), retMember.user_id))?.joinTime || date.toString());
         }
+        retMember.last_sent_time = parseInt((await this.CoreContext.apis.GroupApi.getGroupMember(payload.group_id.toString(), retMember.user_id))?.lastSpeakTime || date.toString());
+        retMember.join_time = parseInt((await this.CoreContext.apis.GroupApi.getGroupMember(payload.group_id.toString(), retMember.user_id))?.joinTime || date.toString());
         return retMember;
     }
 }

src/onebot/action/group/GetGroupMemberList.ts

@@ -22,23 +22,16 @@ class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
     async _handle(payload: Payload) {
         const NTQQGroupApi = this.CoreContext.apis.GroupApi;
         const NTQQWebApi = this.CoreContext.apis.WebApi;
-        const isNocache = payload.no_cache == true || payload.no_cache === 'true';
-        // const GroupList = await NTQQGroupApi.getGroups(isNocache);
-        // const group = GroupList.find(item => item.groupCode == payload.group_id);
-        // if (!group) {
-        //     throw (`群${payload.group_id}不存在`);
-        // }
         const groupMembers = await NTQQGroupApi.getGroupMembers(payload.group_id.toString());
         const groupMembersArr = Array.from(groupMembers.values());
-        const groupMembersUids = groupMembersArr.map(e => e.uid);
+
         let _groupMembers = groupMembersArr.map(item => {
             return OB11Constructor.groupMember(payload.group_id.toString(), item);
         });
 
         const MemberMap: Map<number, OB11GroupMember> = new Map<number, OB11GroupMember>();
-        // 转为Map 方便索引
-        const GroupMemberUids: string[] = [];
         const date = Math.round(Date.now() / 1000);
+
         for (let i = 0, len = _groupMembers.length; i < len; i++) {
             // 保证基础数据有这个 同时避免群管插件过于依赖这个杀了
             _groupMembers[i].join_time = date;
@@ -46,10 +39,14 @@ class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
             MemberMap.set(_groupMembers[i].user_id, _groupMembers[i]);
         }
 
-        if (!this.CoreContext.context.basicInfoWrapper.requireMinNTQQBuild('26702')) {
         const selfRole = groupMembers.get(this.CoreContext.selfInfo.uid)?.role;
         const isPrivilege = selfRole === 3 || selfRole === 4;
 
+        _groupMembers.forEach(item => {
+            item.last_sent_time = date;
+            item.join_time = date;
+        });
+
         if (isPrivilege) {
             const webGroupMembers = await NTQQWebApi.getGroupMembers(payload.group_id.toString());
             for (let i = 0, len = webGroupMembers.length; i < len; i++) {
@@ -65,39 +62,7 @@ class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
                     MemberMap.set(webGroupMembers[i]?.uin, MemberData);
                 }
             }
-            } else {
-                if (isNocache) {
-                    const DateMap = await NTQQGroupApi.getGroupMemberLatestSendTimeCache(payload.group_id.toString(), groupMembersUids);//开始从本地拉取
-                    for (const DateUin of DateMap.keys()) {
-                        const MemberData = MemberMap.get(parseInt(DateUin));
-                        if (MemberData) {
-                            MemberData.last_sent_time = parseInt(DateMap.get(DateUin)!);
-                            //join_time 有基础数据兜底
         }
-                    }
-                } else {
-                    _groupMembers.forEach(item => {
-                        item.last_sent_time = date;
-                        item.join_time = date;
-                    });
-                }
-            }
-        } else {
-            // Mlikiowa V2.0.20 Refactor Todo
-            // _groupMembers.forEach(async item => {
-            //   item.last_sent_time = parseInt((await getGroupMember(payload.group_id.toString(), item.user_id))?.lastSpeakTime || date.toString());
-            //   item.join_time = parseInt((await getGroupMember(payload.group_id.toString(), item.user_id))?.joinTime || date.toString());
-            // });
-        }
-        // 还原索引到Array 一同返回
-
-        // let retData: any[] = [];
-        // for (let retMem of MemberMap.values()) {
-        //   retMem.level = TypeConvert.toString(retMem.level) as any;
-        //   retData.push(retMem)
-        // }
-
-        // _groupMembers = Array.from(retData);
         
         _groupMembers = Array.from(MemberMap.values());
         return _groupMembers;

src/onebot/action/group/GetGroupSystemMsg.ts

@@ -24,22 +24,22 @@ export class GetGroupSystemMsg extends BaseAction<void, any> {
             if (SSNotify.type == 1) {
                 retData.InvitedRequest.push({
                     request_id: SSNotify.seq,
-                    invitor_uin: await NTQQUserApi.getUinByUid(SSNotify.user1?.uid),
+                    invitor_uin: await NTQQUserApi.getUinByUidV2(SSNotify.user1?.uid),
                     invitor_nick: SSNotify.user1?.nickName,
                     group_id: SSNotify.group?.groupCode,
                     group_name: SSNotify.group?.groupName,
                     checked: SSNotify.status === 1 ? false : true,
-                    actor: await NTQQUserApi.getUinByUid(SSNotify.user2?.uid) || 0,
+                    actor: await NTQQUserApi.getUinByUidV2(SSNotify.user2?.uid) || 0,
                 });
             } else if (SSNotify.type == 7) {
                 retData.join_requests.push({
                     request_id: SSNotify.seq,
-                    requester_uin: await NTQQUserApi.getUinByUid(SSNotify.user1?.uid),
+                    requester_uin: await NTQQUserApi.getUinByUidV2(SSNotify.user1?.uid),
                     requester_nick: SSNotify.user1?.nickName,
                     group_id: SSNotify.group?.groupCode,
                     group_name: SSNotify.group?.groupName,
                     checked: SSNotify.status === 1 ? false : true,
-                    actor: await NTQQUserApi.getUinByUid(SSNotify.user2?.uid) || 0,
+                    actor: await NTQQUserApi.getUinByUidV2(SSNotify.user2?.uid) || 0,
                 });
             }
         }

src/onebot/action/group/SetGroupAdmin.ts

@@ -8,7 +8,7 @@ const SchemaData = {
     properties: {
         group_id: { type: ['number', 'string'] },
         user_id: { type: ['number', 'string'] },
-        enable: { type: 'boolean' },
+        enable: { type: ['boolean', 'string'] },
     },
     required: ['group_id', 'user_id'],
 } as const satisfies JSONSchema;
@@ -20,11 +20,12 @@ export default class SetGroupAdmin extends BaseAction<Payload, null> {
     PayloadSchema = SchemaData;
 
     async _handle(payload: Payload): Promise<null> {
+        const enable = typeof payload.enable === 'string' ? payload.enable === 'true' : !!payload.enable;
         const NTQQGroupApi = this.CoreContext.apis.GroupApi;
         const NTQQUserApi = this.CoreContext.apis.UserApi;
         const uid = await NTQQUserApi.getUidByUinV2(payload.user_id.toString());
         if (!uid) throw new Error('get Uid Error');
-        await NTQQGroupApi.setMemberRole(payload.group_id.toString(), uid, payload.enable ? GroupMemberRole.admin : GroupMemberRole.normal);
+        await NTQQGroupApi.setMemberRole(payload.group_id.toString(), uid, enable ? GroupMemberRole.admin : GroupMemberRole.normal);
         return null;
     }
 }

src/onebot/action/group/SetGroupLeave.ts

@@ -6,7 +6,7 @@ const SchemaData = {
     type: 'object',
     properties: {
         group_id: { type: ['number', 'string'] },
-        is_dismiss: { type: 'boolean' },
+        is_dismiss: { type: ['boolean', 'string'] },
     },
     required: ['group_id'],
 } as const satisfies JSONSchema;

src/onebot/action/msg/ForwardSingleMsg.ts

@@ -7,7 +7,7 @@ import { MessageUnique } from '@/common/utils/MessageUnique';
 const SchemaData = {
     type: 'object',
     properties: {
-        message_id: { type: 'number' },
+        message_id: { type: ['number', 'string'] },
         group_id: { type: ['number', 'string'] },
         user_id: { type: ['number', 'string'] },
     },
@@ -31,7 +31,7 @@ class ForwardSingleMsg extends BaseAction<Payload, null> {
 
     async _handle(payload: Payload): Promise<null> {
         const NTQQMsgApi = this.CoreContext.apis.MsgApi;
-        const msg = MessageUnique.getMsgIdAndPeerByShortId(payload.message_id);
+        const msg = MessageUnique.getMsgIdAndPeerByShortId(parseInt(payload.message_id.toString()));
         if (!msg) {
             throw new Error(`无法找到消息${payload.message_id}`);
         }

src/onebot/action/msg/SendMsg/create-send-elements.ts

@@ -56,7 +56,7 @@ const _handlers: {
         if (atQQ === 'all') return SendMsgElementConstructor.at(coreContext, atQQ, atQQ, AtType.atAll, '全体成员');
 
         // then the qq is a group member
-        // Mlikiowa V2.0.19 Refactor Todo
+        // Mlikiowa V2.0.21 Refactor Todo
         const uid = await coreContext.apis.UserApi.getUidByUinV2(`${atQQ}`);
         if (!uid) throw new Error('Get Uid Error');
         return SendMsgElementConstructor.at(coreContext, atQQ, uid, AtType.atUser, '');
@@ -161,7 +161,7 @@ const _handlers: {
         } else {
             postData = data;
         }
-        // Mlikiowa V2.0.19 Refactor Todo
+        // Mlikiowa V2.0.21 Refactor Todo
         const signUrl = obContext.configLoader.configData.musicSignUrl;
         if (!signUrl) {
             if (data.type === 'qq') {

src/onebot/action/msg/SendMsg/index.ts

@@ -153,7 +153,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
 
         const messages = normalize(
             payload.message,
-            payload.auto_escape === true || payload.auto_escape === 'true',
+            typeof payload.auto_escape === 'string' ? payload.auto_escape === 'true' : !!payload.auto_escape
         );
 
         if (getSpecialMsgNum(payload, OB11MessageDataType.node)) {

src/onebot/action/user/GetFriendList.ts

@@ -20,6 +20,6 @@ export default class GetFriendList extends BaseAction<Payload, OB11User[]> {
     async _handle(payload: Payload) {
         //全新逻辑
         const NTQQFriendApi = this.CoreContext.apis.FriendApi;
-        return OB11Constructor.friendsV2(await NTQQFriendApi.getBuddyV2(payload?.no_cache === true || payload?.no_cache === 'true'));
+        return OB11Constructor.friendsV2(await NTQQFriendApi.getBuddyV2(typeof payload.no_cache === 'string' ? payload.no_cache === 'true' : !!payload.no_cache));
     }
 }

src/onebot/event/notice/OB11InputStatusEvent.ts

@@ -6,14 +6,14 @@ export class OB11InputStatusEvent extends OB11BaseNoticeEvent {
     notice_type = 'notify';
     sub_type = 'input_status';
     status_text = '对方正在输入...';
-    eventType = 1;
+    event_type = 1;
     user_id = 0;
     group_id = 0;
 
     constructor(core: NapCatCore, user_id: number, eventType: number, status_text: string) {
         super(core);
         this.user_id = user_id;
-        this.eventType = eventType;
+        this.event_type = eventType;
         this.status_text = status_text;
     }
 }

src/onebot/helper/data.ts

@@ -119,7 +119,7 @@ export class OB11Constructor {
                     const { atNtUid, content } = element.textElement;
                     let atQQ = element.textElement.atUid;
                     if (!atQQ || atQQ === '0') {
-                        atQQ = await NTQQUserApi.getUinByUid(atNtUid);
+                        atQQ = await NTQQUserApi.getUinByUidV2(atNtUid);
                     }
                     if (atQQ) {
                         qq = atQQ as `${number}`;
@@ -417,7 +417,7 @@ export class OB11Constructor {
             return;
         }
         //log("group msg", msg);
-        // Mlikiowa V2.0.20 Refactor Todo
+        // Mlikiowa V2.0.21 Refactor Todo
         // if (msg.senderUin && msg.senderUin !== '0') {
         //   const member = await getGroupMember(msg.peerUid, msg.senderUin);
         //   if (member && member.cardName !== msg.sendMemberName) {

src/onebot/network/active-http.ts

@@ -44,14 +44,16 @@ export class OB11ActiveHttpAdapter implements IOB11NetworkAdapter {
                 resJson = await res.json();
                 //logDebug('新消息事件HTTP上报返回快速操作: ', JSON.stringify(resJson));
             } catch (e) {
-                this.logger.logDebug('新消息事件HTTP上报没有返回快速操作，不需要处理');
+                this.logger.logDebug('[OneBot] [Http Client] 新消息事件HTTP上报没有返回快速操作，不需要处理');
                 return;
             }
             try {
                 handleQuickOperation(this.coreContext, this.obContext, event as QuickActionEvent, resJson).then().catch(this.logger.logError);
             } catch (e: any) {
-                this.logger.logError('新消息事件HTTP上报返回快速操作失败', e);
+                this.logger.logError('[OneBot] [Http Client] 新消息事件HTTP上报返回快速操作失败', e);
             }
+        }).catch((e) => {
+            this.logger.logError('[OneBot] [Http Client] 新消息事件HTTP上报失败', e);
         });
     }
 

src/onebot/network/active-websocket.ts

@@ -135,6 +135,7 @@ export class OB11ActiveWebSocketAdapter implements IOB11NetworkAdapter {
             const packet = Object.assign({}, retdata);
             this.checkStateAndReply<any>(packet);
         } catch (e) {
+            this.logger.logError('[OneBot] [WebSocket Client] 发生错误', e);
             this.checkStateAndReply<any>(OB11Response.error('不支持的api ' + receiveData.action, 1404, echo));
         }
     }

src/onebot/network/passive-http.ts

@@ -43,13 +43,34 @@ export class OB11PassiveHttpAdapter implements IOB11NetworkAdapter {
         this.server?.close();
         this.app = undefined;
     }
-
+    cors(): any {
+        return (req: Request, res: Response, next: any) => {
+            if (req.method === 'OPTIONS') {
+                res.setHeader('Access-Control-Allow-Origin', '*');
+                res.setHeader('Access-Control-Allow-Methods', 'GET, POST, OPTIONS');
+                res.setHeader('Access-Control-Allow-Headers', 'Content-Type, Authorization');
+            }
+            next();
+        };
+    }
     private initializeServer() {
         this.app = express();
         this.server = http.createServer(this.app);
 
-        this.app.use(express.json());
-        this.app.use(express.urlencoded({ extended: false }));
+        this.app.use(this.cors());
+        this.app.use(express.urlencoded({ extended: true, limit: '5000mb' }));
+        this.app.use((req, res, next) => {
+            // 兼容处理没有带content-type的请求
+            req.headers['content-type'] = 'application/json';
+            const originalJson = express.json({ limit: '5000mb' });
+            originalJson(req, res, (err) => {
+                if (err) {
+                    return res.status(400).send('Invalid JSON');
+                }
+                next();
+            });
+        });
+        
         this.app.use((req, res, next) => this.authorize(this.token, req, res, next));
         this.app.use((req, res) => this.handleRequest(req, res));
 

src/webui/ui/NapCat.ts

@@ -30,7 +30,7 @@ async function onSettingWindowCreated(view: Element) {
                 SettingItem(
                     '<span id="napcat-update-title">Napcat</span>',
                     undefined,
-                    SettingButton('V2.0.20', 'napcat-update-button', 'secondary'),
+                    SettingButton('V2.0.21', 'napcat-update-button', 'secondary'),
                 ),
             ]),
             SettingList([

static/assets/renderer.js

@@ -164,7 +164,7 @@ async function onSettingWindowCreated(view) {
         SettingItem(
           '<span id="napcat-update-title">Napcat</span>',
           void 0,
-          SettingButton("V2.0.20", "napcat-update-button", "secondary")
+          SettingButton("V2.0.21", "napcat-update-button", "secondary")
         )
       ]),
       SettingList([