Merge branch 'main' of https://github.com/NapNeko/NapCatQQ

* refactor: kill any stage 1

* refactor: kill any stage 2

* refactor: kill any stage 3

README.md

@@ -25,7 +25,6 @@ NapCatQQ (aka 猫猫框架) 是现代化的基于 NTQQ 的 Bot 协议端实现
 **首次使用**请务必查看如下文档看使用教程
 
 ### 文档地址
-[Github.IO](https://napneko.github.io/)
 
 [Cloudflare.Worker](https://doc.napneko.icu/)
 
@@ -33,6 +32,7 @@ NapCatQQ (aka 猫猫框架) 是现代化的基于 NTQQ 的 Bot 协议端实现
 
 [Cloudflare.Pages](https://napneko.pages.dev/)
 
+[Github.IO](https://napneko.github.io/)
 ## 回家旅途
 [QQ Group](https://qm.qq.com/q/VfjAq5HIMS)
 

manifest.json

@@ -4,7 +4,7 @@
   "name": "NapCatQQ",
   "slug": "NapCat.Framework",
   "description": "高性能的 OneBot 11 协议实现",
-  "version": "3.3.20",
+  "version": "3.4.2",
   "icon": "./logo.png",
   "authors": [
     {

package.json

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

src/common/event.ts

@@ -9,6 +9,15 @@ interface InternalMapKey {
     checker: ((...args: any[]) => boolean) | undefined;
 }
 
+type EnsureFunc<T> = T extends (...args: any) => any ? T : never;
+
+type FuncKeys<T> = Extract<
+    {
+        [K in keyof T]: EnsureFunc<T[K]> extends never ? never : K;
+    }[keyof T],
+    string
+>;
+
 export type ListenerClassBase = Record<string, string>;
 
 export class NTEventWrapper {
@@ -43,10 +52,8 @@ export class NTEventWrapper {
 
     createEventFunction<
         Service extends keyof ServiceNamingMapping,
-        ServiceMethod extends Exclude<keyof ServiceNamingMapping[Service], symbol>,
+        ServiceMethod extends FuncKeys<ServiceNamingMapping[Service]>,
-        // eslint-disable-next-line
+        T extends (...args: any) => any = EnsureFunc<ServiceNamingMapping[Service][ServiceMethod]>,
-        // @ts-ignore
-        T extends (...args: any) => any = ServiceNamingMapping[Service][ServiceMethod],
     >(eventName: `${Service}/${ServiceMethod}`): T | undefined {
         const eventNameArr = eventName.split('/');
         type eventType = {
@@ -98,10 +105,8 @@ export class NTEventWrapper {
 
     async callNoListenerEvent<
         Service extends keyof ServiceNamingMapping,
-        ServiceMethod extends Exclude<keyof ServiceNamingMapping[Service], symbol>,
+        ServiceMethod extends FuncKeys<ServiceNamingMapping[Service]>,
-        // eslint-disable-next-line
+        EventType extends (...args: any) => any = EnsureFunc<ServiceNamingMapping[Service][ServiceMethod]>,
-        // @ts-ignore
-        EventType extends (...args: any) => any = ServiceNamingMapping[Service][ServiceMethod],
     >(
         serviceAndMethod: `${Service}/${ServiceMethod}`,
         ...args: Parameters<EventType>
@@ -111,10 +116,8 @@ export class NTEventWrapper {
 
     async registerListen<
         Listener extends keyof ListenerNamingMapping,
-        ListenerMethod extends Exclude<keyof ListenerNamingMapping[Listener], symbol>,
+        ListenerMethod extends FuncKeys<ListenerNamingMapping[Listener]>,
-        // eslint-disable-next-line
+        ListenerType extends (...args: any) => any = EnsureFunc<ListenerNamingMapping[Listener][ListenerMethod]>,
-        // @ts-ignore
-        ListenerType extends (...args: any) => any = ListenerNamingMapping[Listener][ListenerMethod],
     >(
         listenerAndMethod: `${Listener}/${ListenerMethod}`,
         waitTimes = 1,
@@ -164,15 +167,11 @@ export class NTEventWrapper {
 
     async callNormalEventV2<
         Service extends keyof ServiceNamingMapping,
-        ServiceMethod extends Exclude<keyof ServiceNamingMapping[Service], symbol>,
+        ServiceMethod extends FuncKeys<ServiceNamingMapping[Service]>,
         Listener extends keyof ListenerNamingMapping,
-        ListenerMethod extends Exclude<keyof ListenerNamingMapping[Listener], symbol>,
+        ListenerMethod extends FuncKeys<ListenerNamingMapping[Listener]>,
-        // eslint-disable-next-line
+        EventType extends (...args: any) => any = EnsureFunc<ServiceNamingMapping[Service][ServiceMethod]>,
-        // @ts-ignore
+        ListenerType extends (...args: any) => any = EnsureFunc<ListenerNamingMapping[Listener][ListenerMethod]>
-        EventType extends (...args: any) => any = ServiceNamingMapping[Service][ServiceMethod],
-        // eslint-disable-next-line
-        // @ts-ignore
-        ListenerType extends (...args: any) => any = ListenerNamingMapping[Listener][ListenerMethod]
     >(
         serviceAndMethod: `${Service}/${ServiceMethod}`,
         listenerAndMethod: `${Listener}/${ListenerMethod}`,

src/common/helper.ts

@@ -52,7 +52,7 @@ export class FileNapCatOneBotUUID {
         const [, , chatType, peerUid, modelId, fileId, fileUUID = undefined] = data;
         return {
             peer: {
-                chatType: chatType as any,
+                chatType: +chatType,
                 peerUid: peerUid,
             },
             modelId,
@@ -89,7 +89,7 @@ export class FileNapCatOneBotUUID {
         const [, , chatType, peerUid, msgId, elementId, fileUUID = undefined] = data;
         return {
             peer: {
-                chatType: chatType as any,
+                chatType: +chatType,
                 peerUid: peerUid,
             },
             msgId,
@@ -245,3 +245,36 @@ export function stringifyWithBigInt(obj: any) {
         typeof value === 'bigint' ? value.toString() : value
     );
 }
+
+export function parseAppidFromMajor(nodeMajor: string): string | undefined {
+    const hexSequence = "A4 09 00 00 00 35";
+    const sequenceBytes = Buffer.from(hexSequence.replace(/ /g, ""), "hex");
+    const filePath = path.resolve(nodeMajor);
+    const fileContent = fs.readFileSync(filePath);
+
+    let searchPosition = 0;
+    while (true) {
+        const index = fileContent.indexOf(sequenceBytes, searchPosition);
+        if (index === -1) {
+            break;
+        }
+
+        const start = index + sequenceBytes.length - 1;
+        const end = fileContent.indexOf(0x00, start);
+        if (end === -1) {
+            break;
+        }
+        const content = fileContent.subarray(start, end);
+        if (!content.every(byte => byte === 0x00)) {
+            try {
+                return content.toString("utf-8");
+            } catch (error) {
+                break;
+            }
+        }
+
+        searchPosition = end + 1;
+    }
+
+    return undefined;
+}

src/common/message-unique.ts

@@ -23,10 +23,10 @@ export class LimitedHashTable<K, V> {
         }
         while (this.keyToValue.size > this.maxSize || this.valueToKey.size > this.maxSize) {
             const oldestKey = this.keyToValue.keys().next().value;
-            // @ts-ignore
+            if (oldestKey !== undefined) {
-            this.valueToKey.delete(this.keyToValue.get(oldestKey)!);
+                this.valueToKey.delete(this.keyToValue.get(oldestKey) as V);
-            // @ts-ignore
+                this.keyToValue.delete(oldestKey);
-            this.keyToValue.delete(oldestKey);
+            }
         }
     }
 

src/common/qq-basic-info.ts

@@ -1,8 +1,9 @@
 import fs from 'node:fs';
 import { systemPlatform } from '@/common/system';
-import { getDefaultQQVersionConfigInfo, getQQPackageInfoPath, getQQVersionConfigPath } from './helper';
+import { getDefaultQQVersionConfigInfo, getQQPackageInfoPath, getQQVersionConfigPath, parseAppidFromMajor } from './helper';
 import AppidTable from '@/core/external/appid.json';
 import { LogWrapper } from './log';
+import { getMajorPath } from '@/core';
 
 export class QQBasicInfoWrapper {
     QQMainPath: string | undefined;
@@ -72,6 +73,7 @@ export class QQBasicInfoWrapper {
     }
 
     getAppidV2(): { appid: string; qua: string } {
+        // 通过已有表 性能好
         const appidTbale = AppidTable as unknown as QQAppidTableType;
         const fullVersion = this.getFullQQVesion();
         if (fullVersion) {
@@ -80,10 +82,25 @@ export class QQBasicInfoWrapper {
                 return data;
             }
         }
-
+        // 通过Major拉取 性能差
-        // else
+        try {
+            let majorAppid = this.getAppidV2ByMajor(fullVersion);
+            if (majorAppid) {
+                this.context.logger.log(`[QQ版本兼容性检测] 当前版本Appid未内置 通过Major获取 为了更好的性能请尝试更新NapCat`);
+                return { appid: majorAppid, qua: this.getQUAFallback() };
+            }
+        } catch (error) {
+            this.context.logger.log(`[QQ版本兼容性检测] 通过Major 获取Appid异常 请检测NapCat/QQNT是否正常`);
+        }
+        // 最终兜底为老版本
         this.context.logger.log(`[QQ版本兼容性检测] 获取Appid异常 请检测NapCat/QQNT是否正常`);
         this.context.logger.log(`[QQ版本兼容性检测] ${fullVersion} 版本兼容性不佳，可能会导致一些功能无法正常使用`,);
         return { appid: this.getAppIdFallback(), qua: this.getQUAFallback() };
     }
+    getAppidV2ByMajor(QQVersion: string) {
+        let majorPath = getMajorPath(QQVersion);
+        let appid = parseAppidFromMajor(majorPath);
+        return appid;
+    }
+
 }

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '3.3.20';
+export const napCatVersion = '3.4.2';

src/core/apis/group.ts

@@ -54,7 +54,9 @@ export class NTQQGroupApi {
         }, pskey);
     }
     async getGroupShutUpMemberList(groupCode: string) {
-        return this.context.session.getGroupService().getGroupShutUpMemberList(groupCode);
+        let data = this.core.eventWrapper.registerListen('NodeIKernelGroupListener/onShutUpMemberListChanged', 1, 1000, (group_id) => group_id === groupCode);
+        this.context.session.getGroupService().getGroupShutUpMemberList(groupCode);
+        return (await data)[1];
     }
     async clearGroupNotifiesUnreadCount(uk: boolean) {
         return this.context.session.getGroupService().clearGroupNotifiesUnreadCount(uk);
@@ -320,10 +322,10 @@ export class NTQQGroupApi {
         infos: Map<string, GroupMember>;
         finish: boolean;
         hasNext: boolean | undefined;
-    }>{
+    }> {
         const sceneId = this.context.session.getGroupService().createMemberListScene(groupQQ, 'groupMemberList_MainWindow_1');
         const once = this.core.eventWrapper.registerListen('NodeIKernelGroupListener/onMemberListChange', 0, timeout, (params) => params.sceneId === sceneId)
-            .catch(() => {});
+            .catch(() => { });
         const result = await this.context.session.getGroupService().getNextMemberList(sceneId, undefined, num);
         if (result.errCode !== 0) {
             throw new Error('获取群成员列表出错,' + result.errMsg);
@@ -337,21 +339,55 @@ export class NTQQGroupApi {
         }
         this.context.session.getGroupService().destroyMemberListScene(sceneId);
         return {
-            infos: resMode2?.infos || result.result.infos,
+            infos: new Map([...(resMode2?.infos ?? []), ...result.result.infos]),
             finish: result.result.finish,
             hasNext: resMode2?.hasNext,
         };
     }
 
+    async GetGroupMembersV3(groupQQ: string, num = 3000, timeout = 2500): Promise<{
+        infos: Map<string, GroupMember>;
+        finish: boolean;
+        hasNext: boolean | undefined;
+        listenerMode: boolean;
+    }> {
+        const sceneId = this.context.session.getGroupService().createMemberListScene(groupQQ, 'groupMemberList_MainWindow_1');
+        const once = this.core.eventWrapper.registerListen('NodeIKernelGroupListener/onMemberListChange', 0, timeout, (params) => params.sceneId === sceneId)
+            .catch(() => { });
+        const result = await this.context.session.getGroupService().getNextMemberList(sceneId, undefined, num);
+        if (result.errCode !== 0) {
+            throw new Error('获取群成员列表出错,' + result.errMsg);
+        }
+        let resMode2;
+        if (result.result.finish && result.result.infos.size === 0) {
+            const ret = (await once)?.[0];
+            if (ret) {
+                resMode2 = ret;
+            }
+        }
+        this.context.session.getGroupService().destroyMemberListScene(sceneId);
+        //console.log('GetGroupMembersV3 len :', result.result.infos.size, resMode2?.infos.size, groupQQ);
+        return {
+            infos: new Map([...(resMode2?.infos ?? []), ...result.result.infos]),
+            finish: result.result.finish,
+            hasNext: resMode2?.hasNext,
+            listenerMode: resMode2?.hasNext !== undefined ? true : false
+        };
+    }
+
     async getGroupMembersV2(groupQQ: string, num = 3000): Promise<Map<string, GroupMember>> {
-        let res = await this.tryGetGroupMembersV2(true, groupQQ);
+        //console.log('getGroupMembers -->', groupQQ);
-        if (res.hasNext || !res.finish || res.infos.size === 0) {
+        let res = await this.GetGroupMembersV3(groupQQ, num);
-            res = await this.tryGetGroupMembersV2(false, groupQQ, num);
+        let ret = res.infos;
+        if (res.infos.size === 0 && !res.listenerMode) {
+            res = await this.GetGroupMembersV3(groupQQ, num);
+            ret = res.infos;
         }
-        if ((res.infos.size === 0 || res.infos.size === 30) && res.finish) {
+        if (res.infos.size === 0) {
-            res = await this.tryGetGroupMembersV2(true, groupQQ, num);
+            ret = (await this.getGroupMemberAll(groupQQ)).result.infos;
         }
-        return res.infos;
+        //console.log("<---------------")
+        return ret;
     }
 
     async getGroupMembers(groupQQ: string, num = 3000): Promise<Map<string, GroupMember>> {

src/core/apis/msg.ts

@@ -3,6 +3,9 @@ import { InstanceContext, NapCatCore } from '@/core';
 import { GeneralCallResult } from '@/core/services/common';
 
 export class NTQQMsgApi {
+    getMsgByClientSeqAndTime(peer: Peer, replyMsgClientSeq: string, replyMsgTime: string) {
+        return this.context.session.getMsgService().getMsgByClientSeqAndTime(peer, replyMsgClientSeq, replyMsgTime);
+    }
     // nt_qq//global//nt_data//Emoji//emoji-resource//sysface_res/apng/ 下可以看到所有QQ表情预览
     // nt_qq\global\nt_data\Emoji\emoji-resource\face_config.json 里面有所有表情的id, 自带表情id是QSid, 标准emoji表情id是QCid
     // 其实以官方文档为准是最好的，https://bot.q.qq.com/wiki/develop/api-v2/openapi/emoji/model.html#EmojiType
@@ -22,7 +25,9 @@ export class NTQQMsgApi {
     async sendShowInputStatusReq(peer: Peer, eventType: number) {
         return this.context.session.getMsgService().sendShowInputStatusReq(peer.chatType, eventType, peer.peerUid);
     }
-
+    async getSourceOfReplyMsgV2(peer: Peer, clientSeq: string, time: string) {
+        return this.context.session.getMsgService().getSourceOfReplyMsgV2(peer, clientSeq, time);
+    }
     async getMsgEmojiLikesList(peer: Peer, msgSeq: string, emojiId: string, emojiType: string, count: number = 20) {
         //注意此处emojiType 可选值一般为1-2 2好像是unicode表情dec值 大部分情况 Taged Mlikiowa
         return this.context.session.getMsgService().getMsgEmojiLikesList(peer, msgSeq, emojiId, emojiType, '', false, count);
@@ -106,9 +111,9 @@ export class NTQQMsgApi {
             pageLimit: 1,
         });
     }
-    //@deprecated
+    // 客户端还在用别慌 
-    async getMsgsBySeqAndCount(peer: Peer, seq: string, count: number, desc: boolean, z: boolean) {
+    async getMsgsBySeqAndCount(peer: Peer, seq: string, count: number, desc: boolean, isReverseOrder: boolean) {
-        return await this.context.session.getMsgService().getMsgsBySeqAndCount(peer, seq, count, desc, z);
+        return await this.context.session.getMsgService().getMsgsBySeqAndCount(peer, seq, count, desc, isReverseOrder);
     }
     async getMsgExBySeq(peer: Peer, msgSeq: string) {
         const DateNow = Math.floor(Date.now() / 1000);

src/core/apis/packet.ts

@@ -191,7 +191,7 @@ export class NTQQPacketApi {
     async sendMiniAppShareInfoReq(param: MiniAppReqParams) {
         const data = this.packetSession?.packer.packMiniAppAdaptShareInfo(param);
         const ret = await this.sendPacket("LightAppSvc.mini_app_share.AdaptShareInfo", data!, true);
-        const body = new NapProtoMsg(MiniAppAdaptShareInfoResp).decode(Buffer.from(ret.hex_data, 'hex'))
+        const body = new NapProtoMsg(MiniAppAdaptShareInfoResp).decode(Buffer.from(ret.hex_data, 'hex'));
         return JSON.parse(body.content.jsonContent) as MiniAppRawData;
     }
 }

src/core/apis/user.ts

@@ -18,7 +18,7 @@ export class NTQQUserApi {
     async getStatusByUid(uid: string) {
         return this.context.session.getProfileService().getStatus(uid);
     }
-    async getProfileLike(uid: string) {
+    async getProfileLike(uid: string, start: number, count: number) {
         return this.context.session.getProfileLikeService().getBuddyProfileLike({
             friendUids: [uid],
             basic: 1,
@@ -26,8 +26,8 @@ export class NTQQUserApi {
             favorite: 0,
             userProfile: 1,
             type: 2,
-            start: 0,
+            start: start,
-            limit: 20,
+            limit: count,
         });
     }
     async fetchOtherProfileLike(uid: string) {

src/core/entities/msg.ts

@@ -64,7 +64,7 @@ type ElementFullBase = Omit<MessageElement, 'elementType' | 'elementId' | 'extBu
 
 type ElementBase<
     K extends keyof ElementFullBase,
-    S extends Partial<{ [P in K]: keyof NonNullable<ElementFullBase[P]> | Array<keyof NonNullable<ElementFullBase[P]>> }> = {}
+    S extends Partial<{ [P in K]: keyof NonNullable<ElementFullBase[P]> | Array<keyof NonNullable<ElementFullBase[P]>> }> = object
 > = {
     [P in K]:
     S[P] extends Array<infer U>

src/core/entities/notify.ts

@@ -43,6 +43,50 @@ export enum GroupInviteType {
     BYGROUPMEMBER,
     BYDISCUSSMEMBER
 }
+export interface ShutUpGroupHonor {
+    [key: string]: number;
+}
+
+export interface ShutUpGroupMember {
+    uid: string;
+    qid: string;
+    uin: string;
+    nick: string;
+    remark: string;
+    cardType: number;
+    cardName: string;
+    role: number;
+    avatarPath: string;
+    shutUpTime: number;
+    isDelete: boolean;
+    isSpecialConcerned: boolean;
+    isSpecialShield: boolean;
+    isRobot: boolean;
+    groupHonor: ShutUpGroupHonor;
+    memberRealLevel: number;
+    memberLevel: number;
+    globalGroupLevel: number;
+    globalGroupPoint: number;
+    memberTitleId: number;
+    memberSpecialTitle: string;
+    specialTitleExpireTime: string;
+    userShowFlag: number;
+    userShowFlagNew: number;
+    richFlag: number;
+    mssVipType: number;
+    bigClubLevel: number;
+    bigClubFlag: number;
+    autoRemark: string;
+    creditLevel: number;
+    joinTime: number;
+    lastSpeakTime: number;
+    memberFlag: number;
+    memberFlagExt: number;
+    memberMobileFlag: number;
+    memberFlagExt2: number;
+    isSpecialShielded: boolean;
+    cardNameId: number;
+}
 
 export interface GroupNotify {
     seq: string; // 通知序列号

src/core/external/appid.json

@@ -58,5 +58,9 @@
     "3.2.13-28971": {
         "appid": 537249848,
         "qua": "V1_LNX_NQ_3.2.13_28971_GW_B"
+    },
+    "6.9.58-28971": {
+        "appid": 537249826,
+        "qua": "V1_MAC_NQ_6.9.58_28971_GW_B"
     }
 }

src/core/index.ts

@@ -62,7 +62,26 @@ export function loadQQWrapper(QQVersion: string): WrapperNodeApi {
     process.dlopen(nativemodule, wrapperNodePath);
     return nativemodule.exports;
 }
-
+export function getMajorPath(QQVersion: string): string {
+    // major.node
+    let appPath;
+    if (os.platform() === 'darwin') {
+        appPath = path.resolve(path.dirname(process.execPath), '../Resources/app');
+    } else if (os.platform() === 'linux') {
+        appPath = path.resolve(path.dirname(process.execPath), './resources/app');
+    } else {
+        appPath = path.resolve(path.dirname(process.execPath), `./versions/${QQVersion}/`);
+    }
+    let majorPath = path.resolve(appPath, 'major.node');
+    if (!fs.existsSync(majorPath)) {
+        majorPath = path.join(appPath, `./resources/app/major.node`);
+    }
+    //老版本兼容 未来去掉
+    if (!fs.existsSync(majorPath)) {
+        majorPath = path.join(path.dirname(process.execPath), `./resources/app/versions/${QQVersion}/major.node`);
+    }
+    return majorPath;
+}
 export class NapCatCore {
     readonly context: InstanceContext;
     readonly apis: StableNTApiWrapper;
@@ -140,7 +159,7 @@ export class NapCatCore {
         };
         //await sleep(2500);
         this.context.session.getMsgService().addKernelMsgListener(
-            proxiedListenerOf(msgListener, this.context.logger) as any,
+            proxiedListenerOf(msgListener, this.context.logger),
         );
 
         const profileListener = new NodeIKernelProfileListener();
@@ -236,7 +255,7 @@ export class NapCatCore {
             }
         };
         this.context.session.getGroupService().addKernelGroupListener(
-            proxiedListenerOf(groupListener, this.context.logger) as any,
+            proxiedListenerOf(groupListener, this.context.logger),
         );
     }
 

src/core/listeners/NodeIKernelGroupListener.ts

@@ -1,4 +1,4 @@
-import { DataSource, Group, GroupListUpdateType, GroupMember, GroupNotify } from '@/core/entities';
+import { DataSource, Group, GroupListUpdateType, GroupMember, GroupNotify, ShutUpGroupMember } from '@/core/entities';
 
 export class NodeIKernelGroupListener {
     onGroupListInited(listEmpty: boolean): void { }
@@ -80,6 +80,6 @@ export class NodeIKernelGroupListener {
     onSearchMemberChange(...args: unknown[]) {
     }
 
-    onShutUpMemberListChanged(...args: unknown[]) {
+    onShutUpMemberListChanged(groupCode: string, members: Array<ShutUpGroupMember>) {
     }
 }

src/core/packet/helper/miniAppHelper.ts

@@ -38,7 +38,7 @@ export abstract class MiniAppInfo {
             });
             MiniAppInfo.appMap.set("bili", this);
         }
-    }
+    };
 
     static WeiBo = new class extends MiniAppInfo {
         constructor() {
@@ -56,7 +56,7 @@ export abstract class MiniAppInfo {
             });
             MiniAppInfo.appMap.set("weibo", this);
         }
-    }
+    };
 }
 
 export class MiniAppInfoHelper {

src/core/packet/packer.ts

@@ -742,6 +742,6 @@ export class PacketPacker {
                     }
                 }
             )
-        )
+        );
     }
 }

src/core/packet/proto/NapProto.ts

@@ -61,35 +61,35 @@ export function ProtoField(no: number, type: ScalarType | (() => ProtoMessageTyp
     }
 }
 
-type ProtoFieldReturnType<T extends unknown, E extends boolean> = NonNullable<T> extends ScalarProtoFieldType<infer S, infer O, infer R>
+type ProtoFieldReturnType<T, E extends boolean> = NonNullable<T> extends ScalarProtoFieldType<infer S, infer O, infer R>
     ? ScalarTypeToTsType<S>
     : T extends NonNullable<MessageProtoFieldType<infer S, infer O, infer R>>
     ? NonNullable<NapProtoStructType<ReturnType<S>, E>>
     : never;
 
-type RequiredFieldsBaseType<T extends unknown, E extends boolean> = {
+type RequiredFieldsBaseType<T, E extends boolean> = {
     [K in keyof T as T[K] extends { optional: true } ? never : LowerCamelCase<K & string>]:
     T[K] extends { repeat: true }
     ? ProtoFieldReturnType<T[K], E>[]
     : ProtoFieldReturnType<T[K], E>
 }
 
-type OptionalFieldsBaseType<T extends unknown, E extends boolean> = {
+type OptionalFieldsBaseType<T, E extends boolean> = {
     [K in keyof T as T[K] extends { optional: true } ? LowerCamelCase<K & string> : never]?:
     T[K] extends { repeat: true }
     ? ProtoFieldReturnType<T[K], E>[]
     : ProtoFieldReturnType<T[K], E>
 }
 
-type RequiredFieldsType<T extends unknown, E extends boolean> = E extends true ? Partial<RequiredFieldsBaseType<T, E>> : RequiredFieldsBaseType<T, E>;
+type RequiredFieldsType<T, E extends boolean> = E extends true ? Partial<RequiredFieldsBaseType<T, E>> : RequiredFieldsBaseType<T, E>;
 
-type OptionalFieldsType<T extends unknown, E extends boolean> = E extends true ? Partial<OptionalFieldsBaseType<T, E>> : OptionalFieldsBaseType<T, E>;
+type OptionalFieldsType<T, E extends boolean> = E extends true ? Partial<OptionalFieldsBaseType<T, E>> : OptionalFieldsBaseType<T, E>;
 
-type NapProtoStructType<T extends unknown, E extends boolean> = RequiredFieldsType<T, E> & OptionalFieldsType<T, E>;
+type NapProtoStructType<T, E extends boolean> = RequiredFieldsType<T, E> & OptionalFieldsType<T, E>;
 
-export type NapProtoEncodeStructType<T extends unknown> = NapProtoStructType<T, true>;
+export type NapProtoEncodeStructType<T> = NapProtoStructType<T, true>;
 
-export type NapProtoDecodeStructType<T extends unknown> = NapProtoStructType<T, false>;
+export type NapProtoDecodeStructType<T> = NapProtoStructType<T, false>;
 
 const NapProtoMsgCache = new Map<ProtoMessageType, MessageType<NapProtoStructType<ProtoMessageType, boolean>>>();
 

src/core/services/NodeIKernelGroupService.ts

@@ -105,13 +105,13 @@ export interface NodeIKernelGroupService {
                 uid: string,
                 index: number//0
             }>,
-            infos: unknown,
+            infos: Map<string, GroupMember>,
             finish: true,
             hasRobot: false
         }
     }>;
 
-    setHeader(uid: string, path: string): unknown;
+    setHeader(uid: string, path: string): Promise<GeneralCallResult>;
 
     addKernelGroupListener(listener: NodeIKernelGroupListener): number;
 

src/core/services/NodeIKernelMsgService.ts

@@ -172,7 +172,7 @@ export interface NodeIKernelMsgService {
         msgList: RawMessage[]
     }>;
     //@deprecated
-    getMsgsBySeqAndCount(peer: Peer, seq: string, count: number, desc: boolean, unknownArg: boolean): Promise<GeneralCallResult & {
+    getMsgsBySeqAndCount(peer: Peer, seq: string, count: number, desc: boolean, isReverseOrder: boolean): Promise<GeneralCallResult & {
         msgList: RawMessage[]
     }>;
 
@@ -186,27 +186,29 @@ export interface NodeIKernelMsgService {
 
     getSingleMsg(Peer: Peer, msgSeq: string): Promise<GeneralCallResult & { msgList: RawMessage[] }>;
 
-    getSourceOfReplyMsg(peer: Peer, MsgId: string, SourceSeq: string): unknown;
+    // 下面的msgid全部不真实
+    getSourceOfReplyMsg(peer: Peer, msgId: string, sourceSeq: string): Promise<GeneralCallResult & { msgList: RawMessage[] }>;
 
-    getSourceOfReplyMsgV2(peer: Peer, RootMsgId: string, ReplyMsgId: string): unknown;
+    //用法和聊天记录一样
+    getSourceOfReplyMsgV2(peer: Peer, rootMsgId: string, replyMsgId: string): Promise<GeneralCallResult & { msgList: RawMessage[] }>;
 
-    getMsgByClientSeqAndTime(peer: Peer, clientSeq: string, time: string): unknown;
+    getMsgByClientSeqAndTime(peer: Peer, clientSeq: string, time: string): Promise<GeneralCallResult & { msgList: RawMessage[] }>;
 
-    getSourceOfReplyMsgByClientSeqAndTime(peer: Peer, clientSeq: string, time: string): unknown;
+    getSourceOfReplyMsgByClientSeqAndTime(peer: Peer, clientSeq: string, time: string, replyMsgId: string): Promise<GeneralCallResult & { msgList: RawMessage[] }>;
 
     getMsgsByTypeFilter(peer: Peer, msgId: string, cnt: unknown, queryOrder: boolean, typeFilter: {
         type: number,
         subtype: Array<number>
-    }): unknown;
+    }): Promise<GeneralCallResult & { msgList: RawMessage[] }>;
 
     getMsgsByTypeFilters(peer: Peer, msgId: string, cnt: unknown, queryOrder: boolean, typeFilters: Array<{
         type: number,
         subtype: Array<number>
-    }>): unknown;
+    }>): Promise<GeneralCallResult & { msgList: RawMessage[] }>;
 
-    getMsgWithAbstractByFilterParam(...args: unknown[]): unknown;
+    getMsgWithAbstractByFilterParam(...args: unknown[]): Promise<GeneralCallResult & { msgList: RawMessage[] }>;
 
-    queryMsgsWithFilter(...args: unknown[]): unknown;
+    queryMsgsWithFilter(...args: unknown[]): Promise<GeneralCallResult & { msgList: RawMessage[] }>;
 
     //queryMsgsWithFilterVer2(MsgId: string, MsgTime: string, param: QueryMsgsParams): Promise<unknown>;
 

src/framework/napcat.ts

@@ -41,7 +41,7 @@ export async function NCoreInitFramework(
                 online: true,
             });
         };
-        loginService.addKernelLoginListener(proxiedListenerOf(loginListener, logger) as any);
+        loginService.addKernelLoginListener(proxiedListenerOf(loginListener, logger));
     });
     // 过早进入会导致addKernelMsgListener等Listener添加失败
     // await sleep(2500);

src/onebot/action/extends/GetMiniAppArk.ts

@@ -1,8 +1,8 @@
-import {ActionName} from '../types';
+import { ActionName } from '../types';
-import {FromSchema, JSONSchema} from 'json-schema-to-ts';
+import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import {GetPacketStatusDepends} from "@/onebot/action/packet/GetPacketStatus";
+import { GetPacketStatusDepends } from "@/onebot/action/packet/GetPacketStatus";
-import {MiniAppData, MiniAppRawData, MiniAppReqCustomParams, MiniAppReqParams} from "@/core/packet/entities/miniApp";
+import { MiniAppData, MiniAppRawData, MiniAppReqCustomParams, MiniAppReqParams } from "@/core/packet/entities/miniApp";
-import {MiniAppInfo, MiniAppInfoHelper} from "@/core/packet/helper/miniAppHelper";
+import { MiniAppInfo, MiniAppInfoHelper } from "@/core/packet/helper/miniAppHelper";
 
 const SchemaData = {
     type: 'object',
@@ -11,21 +11,21 @@ const SchemaData = {
             type: 'string',
             enum: ['bili', 'weibo']
         },
-        title: {type: 'string'},
+        title: { type: 'string' },
-        desc: {type: 'string'},
+        desc: { type: 'string' },
-        picUrl: {type: 'string'},
+        picUrl: { type: 'string' },
-        jumpUrl: {type: 'string'},
+        jumpUrl: { type: 'string' },
-        iconUrl: {type: 'string'},
+        iconUrl: { type: 'string' },
-        sdkId: {type: 'string'},
+        sdkId: { type: 'string' },
-        appId: {type: 'string'},
+        appId: { type: 'string' },
-        scene: {type: ['number', 'string']},
+        scene: { type: ['number', 'string'] },
-        templateType: {type: ['number', 'string']},
+        templateType: { type: ['number', 'string'] },
-        businessType: {type: ['number', 'string']},
+        businessType: { type: ['number', 'string'] },
-        verType: {type: ['number', 'string']},
+        verType: { type: ['number', 'string'] },
-        shareType: {type: ['number', 'string']},
+        shareType: { type: ['number', 'string'] },
-        versionId: {type: 'string'},
+        versionId: { type: 'string' },
-        withShareTicket: {type: ['number', 'string']},
+        withShareTicket: { type: ['number', 'string'] },
-        rawArkData: {type: ['boolean', 'string']}
+        rawArkData: { type: ['boolean', 'string'] }
     },
     oneOf: [
         {
@@ -75,11 +75,11 @@ export class GetMiniAppArk extends GetPacketStatusDepends<Payload, {
                     versionId: versionId,
                     withShareTicket: +withShareTicket
                 }
-            )
+            );
         }
         const arkData = await this.core.apis.PacketApi.sendMiniAppShareInfoReq(reqParam);
         return {
-            data: Boolean(payload.rawArkData) ? arkData : MiniAppInfoHelper.RawToSend(arkData)
+            data: payload.rawArkData ? arkData : MiniAppInfoHelper.RawToSend(arkData)
-        }
+        };
     }
 }

src/onebot/action/extends/GetProfileLike.ts

@@ -1,15 +1,22 @@
 import BaseAction from '../BaseAction';
-import { ActionName } from '../types';
+import { ActionName, BaseCheckResult } from '../types';
 
-export class GetProfileLike extends BaseAction<void, any> {
+interface Payload {
+    start: number,
+    count: number
+}
+
+export class GetProfileLike extends BaseAction<Payload, any> {
     actionName = ActionName.GetProfileLike;
 
-    async _handle(payload: void) {
+    async _handle(payload: Payload) {
-        const ret = await this.core.apis.UserApi.getProfileLike(this.core.selfInfo.uid);
+        const start = payload.start ? Number(payload.start) : 0;
-        const listdata: any[] = ret.info.userLikeInfos[0].favoriteInfo.userInfos;
+        const count = payload.count ? Number(payload.count) : 10;
+        const ret = await this.core.apis.UserApi.getProfileLike(this.core.selfInfo.uid, start, count);
+        const listdata: any[] = ret.info.userLikeInfos[0].voteInfo.userInfos;
         for (let i = 0; i < listdata.length; i++) {
             listdata[i].uin = parseInt((await this.core.apis.UserApi.getUinByUidV2(listdata[i].uid)) || '');
         }
-        return listdata;
+        return ret.info.userLikeInfos[0].voteInfo;
     }
 }

src/onebot/action/extends/SetInputStatus.ts

@@ -1,16 +1,15 @@
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import BaseAction from '../BaseAction';
-import { ActionName } from '../types';
+import { ActionName, BaseCheckResult } from '../types';
 import { ChatType, Peer } from '@/core';
 
 const SchemaData = {
     type: 'object',
     properties: {
-        eventType: { type: 'string' },
+        event_type: { type: 'number' },
-        group_id: { type: 'string' },
+        user_id: { type: ['number', 'string'] },
-        user_id: { type: 'string' },
     },
-    required: ['eventType'],
+    required: ['event_type','user_id'],
 } as const satisfies JSONSchema;
 
 type Payload = FromSchema<typeof SchemaData>;
@@ -19,23 +18,12 @@ export class SetInputStatus extends BaseAction<Payload, any> {
     actionName = ActionName.SetInputStatus;
 
     async _handle(payload: Payload) {
-        let peer: Peer;
+        const uid = await this.core.apis.UserApi.getUidByUinV2(payload.user_id.toString());
-        if (payload.group_id) {
+        if (!uid) throw new Error('uid is empty');
-            peer = {
+        const peer = {
-                chatType: ChatType.KCHATTYPEGROUP,
+            chatType: ChatType.KCHATTYPEC2C,
-                peerUid: payload.group_id,
+            peerUid: uid,
-            };
+        };
-        } else if (payload.user_id) {
+        return await this.core.apis.MsgApi.sendShowInputStatusReq(peer, payload.event_type);
-            const uid = await this.core.apis.UserApi.getUidByUinV2(payload.user_id);
-            if (!uid) throw new Error('uid is empty');
-            peer = {
-                chatType: ChatType.KCHATTYPEC2C,
-                peerUid: uid,
-            };
-        } else {
-            throw new Error('请指定 group_id 或 user_id');
-        }
-
-        return await this.core.apis.MsgApi.sendShowInputStatusReq(peer, parseInt(payload.eventType));
     }
 }

src/onebot/action/extends/SetQQAvatar.ts

@@ -38,11 +38,10 @@ export default class SetAvatar extends BaseAction<Payload, null> {
                 throw `头像${payload.file}设置失败,api无返回`;
             }
             // log(`头像设置返回：${JSON.stringify(ret)}`)
-            // @ts-ignore
+            if (ret.result as number == 1004022) {
-            if (ret['result'] == 1004022) {
                 throw `头像${payload.file}设置失败，文件可能不是图片格式`;
-            } else if (ret['result'] != 0) {
+            } else if (ret.result != 0) {
-                throw `头像${payload.file}设置失败,未知的错误,${ret['result']}:${ret['errMsg']}`;
+                throw `头像${payload.file}设置失败,未知的错误,${ret.result}:${ret.errMsg}`;
             }
         } else {
             fs.unlink(path, () => { });

src/onebot/action/file/GetRecord.ts

@@ -5,9 +5,11 @@ import { promises as fs } from 'fs';
 import { decode } from 'silk-wasm';
 const FFMPEG_PATH = process.env.FFMPEG_PATH || 'ffmpeg';
 
-interface Payload extends GetFilePayload {
+const out_format = ['mp3' , 'amr' , 'wma' , 'm4a' , 'spx' , 'ogg' , 'wav' , 'flac'];
-    out_format: 'mp3' | 'amr' | 'wma' | 'm4a' | 'spx' | 'ogg' | 'wav' | 'flac';
+
-}
+type Payload = {
+    out_format : string
+} & GetFilePayload
 
 export default class GetRecord extends GetFileBase {
     actionName = ActionName.GetRecord;
@@ -17,12 +19,19 @@ export default class GetRecord extends GetFileBase {
         if (payload.out_format && typeof payload.out_format === 'string') {
             const inputFile = res.file;
             if (!inputFile) throw new Error('file not found');
+            if (!out_format.includes(payload.out_format)) {
+                throw new Error('转换失败 out_format 字段可能格式不正确');
+            }
             const pcmFile = `${inputFile}.pcm`;
             const outputFile = `${inputFile}.${payload.out_format}`;
             try {
                 await fs.access(inputFile);
-                await this.decodeFile(inputFile, pcmFile);
+                try {
-                await this.convertFile(pcmFile, outputFile, payload.out_format);
+                    await fs.access(outputFile);
+                } catch (error) {
+                    await this.decodeFile(inputFile, pcmFile);
+                    await this.convertFile(pcmFile, outputFile, payload.out_format);
+                }
                 const base64Data = await fs.readFile(outputFile, { encoding: 'base64' });
                 res.file = outputFile;
                 res.url = outputFile;
@@ -48,7 +57,8 @@ export default class GetRecord extends GetFileBase {
 
     private convertFile(inputFile: string, outputFile: string, format: string): Promise<void> {
         return new Promise((resolve, reject) => {
-            const ffmpeg = spawn(FFMPEG_PATH, ['-f', 's16le', '-ar', '24000', '-ac', '1', '-i', inputFile, outputFile]);
+            const params = format === 'amr' ? ['-f', 's16le', '-ar', '24000', '-ac', '1', '-i', inputFile, '-ar', '8000', '-b:a', '12.2k', outputFile] : ['-f', 's16le', '-ar', '24000', '-ac', '1', '-i', inputFile, outputFile];
+            const ffmpeg = spawn(FFMPEG_PATH, params);
 
             ffmpeg.on('close', (code) => {
                 if (code === 0) {

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

@@ -25,6 +25,11 @@ export default class GoCQHTTPGetStrangerInfo extends BaseAction<Payload, OB11Use
         if (!uid) uid = extendData.detail.uid;
         const info = (await this.core.apis.UserApi.getUserDetailInfo(uid));
         return {
+            ...extendData.detail.simpleInfo.coreInfo,
+            ...extendData.detail.commonExt ?? {},
+            ...extendData.detail.simpleInfo.baseInfo,
+            ...extendData.detail.simpleInfo.relationFlags ?? {},
+            ...extendData.detail.simpleInfo.status ?? {},
             user_id: parseInt(extendData.detail.uin) ?? 0,
             uid: info.uid ?? uid,
             nickname: extendData.detail.simpleInfo.coreInfo.nick,
@@ -33,7 +38,7 @@ export default class GoCQHTTPGetStrangerInfo extends BaseAction<Payload, OB11Use
             qqLevel: calcQQLevel(extendData.detail.commonExt?.qqLevel ?? info.qqLevel),
             sex: OB11Entities.sex(extendData.detail.simpleInfo.baseInfo.sex) ?? OB11UserSex.unknown,
             long_nick: extendData.detail.simpleInfo.baseInfo.longNick ?? info.longNick,
-            reg_time: extendData.detail.commonExt.regTime ?? info.regTime,
+            reg_time: extendData.detail.commonExt?.regTime ?? info.regTime,
             is_vip: extendData.detail.simpleInfo.vasInfo?.svipFlag,
             is_years_vip: extendData.detail.simpleInfo.vasInfo?.yearVipFlag,
             vip_level: extendData.detail.simpleInfo.vasInfo?.vipLevel,

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

@@ -31,15 +31,15 @@ export default class SetGroupPortrait extends BaseAction<Payload, any> {
         }
         if (path) {
             await checkFileReceived(path, 5000); // 文件不存在QQ会崩溃，需要提前判断
-            const ret = await this.core.apis.GroupApi.setGroupAvatar(payload.group_id.toString(), path) as any;
+            const ret = await this.core.apis.GroupApi.setGroupAvatar(payload.group_id.toString(), path);
             fs.unlink(path, () => { });
             if (!ret) {
                 throw `头像${payload.file}设置失败,api无返回`;
             }
-            if (ret['result'] == 1004022) {
+            if (ret.result as number == 1004022) {
                 throw `头像${payload.file}设置失败，文件可能不是图片格式或权限不足`;
-            } else if (ret['result'] != 0) {
+            } else if (ret.result != 0) {
-                throw `头像${payload.file}设置失败,未知的错误,${ret['result']}:${ret['errMsg']}`;
+                throw `头像${payload.file}设置失败,未知的错误,${ret.result}:${ret.errMsg}`;
             }
             return ret;
         } else {

src/onebot/action/group/GetGroupShutList.ts

@@ -13,7 +13,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export class GetGroupShutList extends BaseAction<Payload, OB11Group> {
+export class GetGroupShutList extends BaseAction<Payload, any> {
     actionName = ActionName.GetGroupShutList;
     payloadSchema = SchemaData;
 

src/onebot/action/msg/SendMsg.ts

@@ -236,12 +236,11 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
         message: RawMessage | null,
         res_id?: string
     }> {
-        let returnMsg: RawMessage | undefined, res_id: string | undefined;
         const uploadReturnData = await this.uploadForwardedNodesPacket(msgPeer, messageNodes, source, news, summary, prompt);
-        res_id = uploadReturnData?.res_id;
+        const res_id = uploadReturnData?.res_id;
         const finallySendElements = uploadReturnData?.finallySendElements;
         if (!finallySendElements) throw Error('转发消息失败，生成节点为空');
-        returnMsg = await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(msgPeer, [finallySendElements], [], true).catch(_ => undefined);
+        const returnMsg = await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(msgPeer, [finallySendElements], [], true).catch(_ => undefined);
         return { message: returnMsg ?? null, res_id };
     }
 
@@ -276,7 +275,6 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                             logger.logError.bind(this.core.context.logger)('子消息中包含非node消息 跳过不合法部分');
                             continue;
                         }
-                        // @ts-ignore
                         const nodeMsg = await this.handleForwardedNodes(selfPeer, OB11Data.filter(e => e.type === OB11MessageDataType.node));
                         if (nodeMsg) {
                             nodeMsgIds.push(nodeMsg.message!.msgId);

src/onebot/api/msg.ts

@@ -24,7 +24,6 @@ import {
     OB11MessageData,
     OB11MessageDataType,
     OB11MessageFileBase,
-    OB11MessageForward,
 } from '@/onebot';
 import { OB11Entities } from '@/onebot/entities';
 import { EventType } from '@/onebot/event/OB11BaseEvent';
@@ -218,20 +217,34 @@ export class OneBotMsgApi {
             if (records.peerUin === '284840486' || records.peerUin === '1094950020') {
                 return createReplyData(records.msgId);
             }
-            let replyMsgList = (await this.core.apis.MsgApi.queryMsgsWithFilterExWithSeqV2(peer, element.replayMsgSeq, element.replyMsgTime, [element.senderUidStr])).msgList;
+            let replyMsgList = (await this.core.apis.MsgApi.queryMsgsWithFilterExWithSeqV2(peer, element.replayMsgSeq, records.msgTime, [element.senderUidStr])).msgList;
             let replyMsg = replyMsgList.find(msg => msg.msgRandom === records.msgRandom);
+
             if (!replyMsg || records.msgRandom !== replyMsg.msgRandom) {
-                // 我猜测可能是时间参数未对上 导致找不到引用消息 或者msgList 存在问题
+                this.core.context.logger.logError.bind(this.core.context.logger)(
-                this.core.context.logger.logWarn.bind(this.core.context.logger)(
+                    '筛选结果,筛选消息失败,将使用Fallback-1 Seq: ',
-                    '初次筛选消息失败,获取不到引用的消息 Seq:',
+                    element.replayMsgSeq,
+                    ',消息长度:',
+                    replyMsgList.length
+                );
+                replyMsgList = (await this.core.apis.MsgApi.getMsgsBySeqAndCount(peer, element.replayMsgSeq, 1, true, true)).msgList;
+                replyMsg = replyMsgList.find(msg => msg.msgRandom === records.msgRandom);
+            }
+
+            if (!replyMsg || records.msgRandom !== replyMsg.msgRandom) {
+                this.core.context.logger.logWarn.bind(this.core.context.logger)(
+                    '筛选消息失败,将使用Fallback-2 Seq:',
                     element.replayMsgSeq,
                     ',消息长度:',
                     replyMsgList.length
                 );
-                // 再次筛选
                 replyMsgList = (await this.core.apis.MsgApi.queryMsgsWithFilterExWithSeqV3(peer, element.replayMsgSeq, [element.senderUidStr])).msgList;
                 replyMsg = replyMsgList.find(msg => msg.msgRandom === records.msgRandom);
             }
+
+
+
+            // 丢弃该消息段
             if (!replyMsg || records.msgRandom !== replyMsg.msgRandom) {
                 this.core.context.logger.logError.bind(this.core.context.logger)(
                     '最终筛选结果,筛选消息失败,获取不到引用的消息 Seq: ',
@@ -327,11 +340,11 @@ export class OneBotMsgApi {
         },
 
         multiForwardMsgElement: async (_, msg) => {
-            const message_data: OB11MessageForward = {
+            // const message_data: OB11MessageForward = {
-                data: {} as any,
+            //     data: {} as any,
-                type: OB11MessageDataType.forward,
+            //     type: OB11MessageDataType.forward,
-            };
+            // };
-            message_data.data.id = msg.msgId;
+            // message_data.data.id = msg.msgId;
             const parentMsgPeer = msg.parentMsgPeer ?? {
                 chatType: msg.chatType,
                 guildId: '',
@@ -743,9 +756,12 @@ export class OneBotMsgApi {
             async (element) => {
                 for (const key in element) {
                     if (keyCanBeParsed(key, this.rawToOb11Converters) && element[key]) {
-                        const parsedElement = await this.rawToOb11Converters[key]?.(
+                        const converters = this.rawToOb11Converters[key] as (
-                            // eslint-disable-next-line
+                            element: Exclude<MessageElement[keyof RawToOb11Converters], null | undefined>,
-                            // @ts-ignore
+                            msg: RawMessage,
+                            elementWrapper: MessageElement,
+                        ) => PromiseLike<OB11MessageData | null>;
+                        const parsedElement = await converters?.(
                             element[key],
                             msg,
                             element,
@@ -794,9 +810,11 @@ export class OneBotMsgApi {
             if (ignoreTypes.includes(sendMsg.type)) {
                 continue;
             }
-            const callResult = this.ob11ToRawConverters[sendMsg.type](
+            const converter = this.ob11ToRawConverters[sendMsg.type] as (
-                // eslint-disable-next-line
+                sendMsg: Extract<OB11MessageData, { type: OB11MessageData['type'] }>,
-                // @ts-ignore
+                context: MessageContext,
+            ) => Promise<SendMessageElement | undefined>;
+            const callResult = converter(
                 sendMsg,
                 { peer, deleteAfterSentFiles },
             )?.catch(undefined);

src/onebot/cqcode.ts

@@ -68,13 +68,13 @@ export function encodeCQCode(data: OB11MessageData) {
 
     let result = '[CQ:' + data.type;
     for (const name in data.data) {
-        const value = (data.data as any)[name];
+        const value = (data.data as Record<string, unknown>)[name];
         if (value === undefined) {
             continue;
         }
         try {
-            const text = value.toString();
+            const text = value?.toString();
-            result += `,${name}=${CQCodeEscape(text)}`;
+            if (text) result += `,${name}=${CQCodeEscape(text)}`;
         } catch (error) {
             // If it can't be converted, skip this name-value pair
         }

src/onebot/index.ts

@@ -341,7 +341,7 @@ export class NapCatOneBot11Adapter {
         };
 
         this.context.session.getMsgService().addKernelMsgListener(
-            proxiedListenerOf(msgListener, this.context.logger) as any,
+            proxiedListenerOf(msgListener, this.context.logger),
         );
     }
 
@@ -370,7 +370,7 @@ export class NapCatOneBot11Adapter {
         };
 
         this.context.session.getBuddyService().addKernelBuddyListener(
-            proxiedListenerOf(buddyListener, this.context.logger) as any,
+            proxiedListenerOf(buddyListener, this.context.logger),
         );
     }
 

src/onebot/network/passive-http.ts

@@ -64,9 +64,9 @@ export class OB11PassiveHttpAdapter implements IOB11NetworkAdapter {
         });
 
         this.app.use((req, res, next) => this.authorize(this.token, req, res, next));
-        // @ts-ignore
+        this.app.use(async (req, res, _) => {
-        this.app.use((req, res) => this.handleRequest(req, res));
+            await this.handleRequest(req, res);
-
+        });
         this.server.listen(this.port, () => {
             this.core.context.logger.log(`[OneBot] [HTTP Server Adapter] Start On Port ${this.port}`);
         });

src/onebot/network/passive-websocket.ts

@@ -143,7 +143,7 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
     private registerHeartBeat() {
         this.heartbeatIntervalId = setInterval(() => {
             this.wsClientsMutex.runExclusive(async () => {
-                this.wsClients.forEach((wsClient) => {
+                this.wsClientWithEvent.forEach((wsClient) => {
                     if (wsClient.readyState === WebSocket.OPEN) {
                         wsClient.send(JSON.stringify(new OB11HeartbeatEvent(this.core, this.heartbeatInterval, this.core.selfInfo.online, true)));
                     }

src/shell/napcat.ts

@@ -165,7 +165,7 @@ export async function NCoreInitShell() {
             logger.logError.bind(logger)('[Core] [Login] Login Error , ErrInfo: ', args);
         };
 
-        loginService.addKernelLoginListener(proxiedListenerOf(loginListener, logger) as any);
+        loginService.addKernelLoginListener(proxiedListenerOf(loginListener, logger));
         const isConnect = loginService.connect();
         if (!isConnect) {
             logger.logError.bind(logger)('核心登录服务连接失败!');

static/assets/renderer.js

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