fix

This reverts commit 79aa1dc67f.

.vscode/settings.json

@@ -6,5 +6,7 @@
         "tsconfig.json": "tsconfig.*.json, env.d.ts, vite.config.ts",
         "package.json": "package-lock.json, eslint*, .prettier*, .editorconfig, manifest.json, logo.png, .gitignore, LICENSE"
     },
-    "css.customData": [".vscode/tailwindcss.json"],
+    "css.customData": [
+        ".vscode/tailwindcss.json"
+    ],
 }

manifest.json

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

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.7.0",
+  "version": "4.7.8",
   "scripts": {
     "build:universal": "npm run build:webui && vite build --mode universal || exit 1",
     "build:framework": "npm run build:webui && vite build --mode framework || exit 1",
@@ -45,7 +45,7 @@
     "cors": "^2.8.5",
     "esbuild": "0.25.0",
     "eslint": "^9.14.0",
-    "eslint-import-resolver-typescript": "^3.6.1",
+    "eslint-import-resolver-typescript": "^4.0.0",
     "eslint-plugin-import": "^2.29.1",
     "express-rate-limit": "^7.5.0",
     "fast-xml-parser": "^4.3.6",

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.7.0';
+export const napCatVersion = '4.7.8';

src/common/worker.ts

@@ -5,6 +5,9 @@ export async function runTask<T, R>(workerScript: string, taskData: T): Promise<
     try {
         return await new Promise<R>((resolve, reject) => {
             worker.on('message', (result: R) => {
+                if ((result as any)?.error) {
+                    reject(new Error((result as { error: string }).error));
+                }
                 resolve(result);
             });
 

src/core/apis/group.ts

@@ -44,13 +44,22 @@ export class NTQQGroupApi {
     }
 
     async initApi() {
-        this.initCache().then().catch(e => this.context.logger.logError(e));
+        await this.initCache().then().catch(e => this.context.logger.logError(e));
     }
 
     async initCache() {
+        let promises: Promise<void>[] = [];
         for (const group of await this.getGroups(true)) {
-            this.refreshGroupMemberCache(group.groupCode, false).then().catch(e => this.context.logger.logError(e));
+            let user = await this.refreshGroupMemberCache(group.groupCode, false).then().catch(e => this.context.logger.logError(e));
+            if (user) {
+                for (const member of user) {
+                    let promise = this.core.apis.UserApi.fetchUserDetailInfoV3(member[1].uid).then(_ => void 0).catch(e => this.context.logger.logError(e));
+                    promises.push(promise);
+                }
+            }
         }
+        await Promise.all(promises);
+        this.context.logger.logDebug('[NapCat] [Mark] 群成员缓存初始化完成');
     }
 
     async fetchGroupEssenceList(groupCode: string) {

src/core/apis/user.ts

@@ -1,4 +1,4 @@
-import { ModifyProfileParams, User, UserDetailSource } from '@/core/types';
+import { ModifyProfileParams, UserDetailSource } from '@/core/types';
 import { RequestUtil } from '@/common/request';
 import { InstanceContext, NapCatCore, ProfileBizType } from '..';
 import { solveAsyncProblem } from '@/common/helper';
@@ -77,7 +77,7 @@ export class NTQQUserApi {
         return this.context.session.getGroupService().setHeader(gc, filePath);
     }
 
-    async fetchUserDetailInfo(uid: string, mode: UserDetailSource = UserDetailSource.KDB) {
+    async fetchUserDetailInfoV2(uid: string, mode: UserDetailSource = UserDetailSource.KDB) {
         const [, profile] = await this.core.eventWrapper.callNormalEventV2(
             'NodeIKernelProfileService/fetchUserDetailInfo',
             'NodeIKernelProfileListener/onUserDetailInfoChanged',
@@ -90,46 +90,31 @@ export class NTQQUserApi {
             () => true,
             (profile) => profile.uid === uid,
         );
-        const RetUser: User = {
-            ...profile.simpleInfo.status,
-            ...profile.simpleInfo.vasInfo,
-            ...profile.commonExt,
-            ...profile.simpleInfo.baseInfo,
-            ...profile.simpleInfo.coreInfo,
-            qqLevel: profile.commonExt?.qqLevel,
-            age: profile.simpleInfo.baseInfo.age,
-            pendantId: '',
-            nick: profile.simpleInfo.coreInfo.nick || '',
-        };
-        return RetUser;
+        return profile;
     }
 
-    async getUserDetailInfo(uid: string): Promise<User> {
-        let retUser = await solveAsyncProblem(async (uid) => this.fetchUserDetailInfo(uid, UserDetailSource.KDB), uid);
+    async fetchUserDetailInfoV3(uid: string) {
+        let cache = await this.fetchUserDetailInfoV2(uid, UserDetailSource.KDB);
+        if (!cache.commonExt) {
+            cache = await this.fetchUserDetailInfoV2(uid, UserDetailSource.KSERVER);
+        }
+        return cache;
+    }
+
+
+    async getUserDetailInfoV2(uid: string) {
+        let retUser = await solveAsyncProblem(async (uid) => this.fetchUserDetailInfoV2(uid, UserDetailSource.KDB), uid);
         if (retUser && retUser.uin !== '0') {
             return retUser;
         }
         this.context.logger.logDebug('[NapCat] [Mark] getUserDetailInfo Mode1 Failed.');
-        retUser = await this.fetchUserDetailInfo(uid, UserDetailSource.KSERVER);
+        retUser = await this.fetchUserDetailInfoV2(uid, UserDetailSource.KSERVER);
         if (retUser && retUser.uin === '0') {
             retUser.uin = await this.core.apis.UserApi.getUidByUinV2(uid) ?? '0';
         }
         return retUser;
     }
 
-    async getUserDetailInfoV2(uid: string): Promise<User> {
-        const fallback = new Fallback<User>((user) => FallbackUtil.boolchecker(user, user !== undefined && user.uin !== '0'))
-            .add(() => this.fetchUserDetailInfo(uid, UserDetailSource.KDB))
-            .add(() => this.fetchUserDetailInfo(uid, UserDetailSource.KSERVER));
-        const retUser = await fallback.run().then(async (user) => {
-            if (user && user.uin === '0') {
-                user.uin = await this.core.apis.UserApi.getUidByUinV2(uid) ?? '0';
-            }
-            return user;
-        });
-        return retUser;
-    }
-
     async modifySelfProfile(param: ModifyProfileParams) {
         return this.context.session.getProfileService().modifyDesktopMiniProfile(param);
     }
@@ -216,7 +201,7 @@ export class NTQQUserApi {
             .add(() => this.context.session.getUixConvertService().getUin([uid]).then((data) => data.uinInfo.get(uid)))
             .add(() => this.context.session.getProfileService().getUinByUid('FriendsServiceImpl', [uid]).get(uid))
             .add(() => this.context.session.getGroupService().getUinByUids([uid]).then((data) => data.uins.get(uid)))
-            .add(() => this.getUserDetailInfo(uid).then((data) => data.uin));
+            .add(() => this.fetchUserDetailInfoV2(uid).then((data) => data.uin));
 
         const uin = await fallback.run().catch(() => '0');
         return uin ?? '0';

src/core/external/appid.json

@@ -218,5 +218,13 @@
     "9.9.18-32869": {
         "appid": 537271294,
         "qua": "V1_WIN_NQ_9.9.18_32869_GW_B"
+    },
+    "3.2.16-33139": {
+        "appid": 537273909,
+        "qua": "V1_LNX_NQ_3.2.16_33139_GW_B"
+    },
+    "9.9.18-33139": {
+        "appid": 537273874,
+        "qua": "V1_WIN_NQ_9.9.18_33139_GW_B"
     }
 }

src/core/external/offset.json

@@ -290,5 +290,17 @@
     "3.2.16-32869-arm64": {
         "send": "7226630",
         "recv": "7229F60"
+    },
+    "9.9.18-33139-x64": {
+        "send": "39F5870",
+        "recv": "39FA070"
+    },
+    "3.2.16-33139-x64": {
+        "send": "A634F60",
+        "recv": "A638980"
+    },
+    "3.2.16-33139-arm64": {
+        "send": "7262BB0",
+        "recv": "72664E0"
     }
 }

src/core/listeners/NodeIKernelProfileListener.ts

@@ -1,71 +1,71 @@
 import { User, UserDetailInfoListenerArg } from '@/core/types';
 
 export class NodeIKernelProfileListener {
-    onUserDetailInfoChanged(arg: UserDetailInfoListenerArg): void {
+    onUserDetailInfoChanged(_arg: UserDetailInfoListenerArg): void {
 
     }
 
-    onProfileSimpleChanged(...args: unknown[]): any {
+    onProfileSimpleChanged(..._args: unknown[]): any {
 
     }
 
-    onProfileDetailInfoChanged(profile: User): any {
+    onProfileDetailInfoChanged(_profile: User): any {
 
     }
 
-    onStatusUpdate(...args: unknown[]): any {
+    onStatusUpdate(..._args: unknown[]): any {
 
     }
 
-    onSelfStatusChanged(...args: unknown[]): any {
+    onSelfStatusChanged(..._args: unknown[]): any {
 
     }
 
-    onStrangerRemarkChanged(...args: unknown[]): any {
+    onStrangerRemarkChanged(..._args: unknown[]): any {
 
     }
 
-    onMemberListChange(...args: unknown[]): any {
+    onMemberListChange(..._args: unknown[]): any {
 
     }
 
-    onMemberInfoChange(...args: unknown[]): any {
+    onMemberInfoChange(..._args: unknown[]): any {
 
     }
 
-    onGroupListUpdate(...args: unknown[]): any {
+    onGroupListUpdate(..._args: unknown[]): any {
 
     }
 
-    onGroupAllInfoChange(...args: unknown[]): any {
+    onGroupAllInfoChange(..._args: unknown[]): any {
 
     }
 
-    onGroupDetailInfoChange(...args: unknown[]): any {
+    onGroupDetailInfoChange(..._args: unknown[]): any {
 
     }
 
-    onGroupConfMemberChange(...args: unknown[]): any {
+    onGroupConfMemberChange(..._args: unknown[]): any {
 
     }
 
-    onGroupExtListUpdate(...args: unknown[]): any {
+    onGroupExtListUpdate(..._args: unknown[]): any {
 
     }
 
-    onGroupNotifiesUpdated(...args: unknown[]): any {
+    onGroupNotifiesUpdated(..._args: unknown[]): any {
 
     }
 
-    onGroupNotifiesUnreadCountUpdated(...args: unknown[]): any {
+    onGroupNotifiesUnreadCountUpdated(..._args: unknown[]): any {
 
     }
 
-    onGroupMemberLevelInfoChange(...args: unknown[]): any {
+    onGroupMemberLevelInfoChange(..._args: unknown[]): any {
 
     }
 
-    onGroupBulletinChange(...args: unknown[]): any {
+    onGroupBulletinChange(..._args: unknown[]): any {
 
     }
 }

src/core/packet/client/nativeClient.ts

@@ -38,12 +38,12 @@ export class NativePacketClient extends IPacketClient {
         return true;
     }
 
-    async init(pid: number, recv: string, send: string): Promise<void> {
+    async init(_pid: number, recv: string, send: string): Promise<void> {
         const platform = process.platform + '.' + process.arch;
         const moehoo_path = path.join(dirname(fileURLToPath(import.meta.url)), './moehoo/MoeHoo.' + platform + '.node');
         process.dlopen(this.MoeHooExport, moehoo_path, constants.dlopen.RTLD_LAZY);
-        
-        this.MoeHooExport.exports.InitHook?.(send, recv, (type: number, uin: string, cmd: string, seq: number, hex_data: string) => {
+
+        this.MoeHooExport.exports.InitHook?.(send, recv, (type: number, _uin: string, cmd: string, seq: number, hex_data: string) => {
             const trace_id = createHash('md5').update(Buffer.from(hex_data, 'hex')).digest('hex');
             if (type === 0 && this.cb.get(trace_id + 'recv')) {
                 //此时为send 提取seq

src/core/packet/client/wsClient.ts

@@ -1,113 +0,0 @@
-import { Data, WebSocket, ErrorEvent } from 'ws';
-import { IPacketClient, RecvPacket } from '@/core/packet/client/baseClient';
-import { LogStack } from '@/core/packet/context/clientContext';
-import { NapCoreContext } from '@/core/packet/context/napCoreContext';
-import { PacketLogger } from '@/core/packet/context/loggerContext';
-
-export class WsPacketClient extends IPacketClient {
-    private websocket: WebSocket | null = null;
-    private reconnectAttempts: number = 0;
-    private readonly maxReconnectAttempts: number = 60; // 现在暂时不可配置
-    private readonly clientUrl: string;
-    private readonly clientUrlWrap: (url: string) => string = (url: string) => `ws://${url}/ws`;
-
-    private isInitialized: boolean = false;
-    private initPayload: { pid: number, recv: string, send: string } | null = null;
-
-    constructor(napCore: NapCoreContext, logger: PacketLogger, logStack: LogStack) {
-        super(napCore, logger, logStack);
-        this.clientUrl = this.napcore.config.packetServer
-            ? this.clientUrlWrap(this.napcore.config.packetServer)
-            : this.clientUrlWrap('127.0.0.1:8083');
-    }
-
-    check(): boolean {
-        if (!this.napcore.config.packetServer) {
-            this.logStack.pushLogWarn('wsPacketClient 未配置服务器地址');
-            return false;
-        }
-        return true;
-    }
-
-    async init(pid: number, recv: string, send: string): Promise<void> {
-        this.initPayload = { pid, recv, send };
-        await this.connectWithRetry();
-    }
-
-    sendCommandImpl(cmd: string, data: string, trace_id: string): void {
-        if (this.websocket && this.websocket.readyState === WebSocket.OPEN) {
-            this.websocket.send(JSON.stringify({
-                action: 'send',
-                cmd,
-                data,
-                trace_id
-            }));
-        } else {
-            this.logStack.pushLogWarn(`WebSocket 未连接，无法发送命令: ${cmd}`);
-        }
-    }
-
-    private async connectWithRetry(): Promise<void> {
-        while (this.reconnectAttempts < this.maxReconnectAttempts) {
-            try {
-                await this.connect();
-                return;
-            } catch {
-                this.reconnectAttempts++;
-                this.logStack.pushLogWarn(`第 ${this.reconnectAttempts}/${this.maxReconnectAttempts} 次尝试重连失败！`);
-                await this.delay(5000);
-            }
-        }
-        this.logStack.pushLogError(`wsPacketClient 在 ${this.clientUrl} 达到最大重连次数 (${this.maxReconnectAttempts})！`);
-        throw new Error(`无法连接到 WebSocket 服务器：${this.clientUrl}`);
-    }
-
-    private connect(): Promise<void> {
-        return new Promise((resolve, reject) => {
-            this.websocket = new WebSocket(this.clientUrl);
-            this.websocket.onopen = () => {
-                this.available = true;
-                this.reconnectAttempts = 0;
-                this.logger.info(`wsPacketClient 已连接到 ${this.clientUrl}`);
-                if (!this.isInitialized && this.initPayload) {
-                    this.websocket!.send(JSON.stringify({
-                        action: 'init',
-                        ...this.initPayload
-                    }));
-                    this.isInitialized = true;
-                }
-                resolve();
-            };
-            this.websocket.onclose = () => {
-                this.available = false;
-                this.logger.warn('WebSocket 连接关闭，尝试重连...');
-                reject(new Error('WebSocket 连接关闭'));
-            };
-            this.websocket.onmessage = (event) => this.handleMessage(event.data).catch(err => {
-                this.logger.error(`处理消息时出错: ${err}`);
-            });
-            this.websocket.onerror = (event: ErrorEvent) => {
-                this.available = false;
-                this.logger.error(`WebSocket 出错: ${event.message}`);
-                this.websocket?.close();
-                reject(new Error(`WebSocket 出错: ${event.message}`));
-            };
-        });
-    }
-
-    private delay(ms: number): Promise<void> {
-        return new Promise(resolve => setTimeout(resolve, ms));
-    }
-
-    private async handleMessage(message: Data): Promise<void> {
-        try {
-            const json: RecvPacket = JSON.parse(message.toString());
-            const trace_id_md5 = json.trace_id_md5;
-            const action = json?.type ?? 'init';
-            const event = this.cb.get(`${trace_id_md5}${action}`);
-            if (event) await event(json.data);
-        } catch (error) {
-            this.logger.error(`解析ws消息时出错: ${(error as Error).message}`);
-        }
-    }
-}

src/core/packet/context/clientContext.ts

@@ -1,6 +1,5 @@
 import { IPacketClient } from '@/core/packet/client/baseClient';
 import { NativePacketClient } from '@/core/packet/client/nativeClient';
-import { WsPacketClient } from '@/core/packet/client/wsClient';
 import { OidbPacket } from '@/core/packet/transformer/base';
 import { PacketLogger } from '@/core/packet/context/loggerContext';
 import { NapCoreContext } from '@/core/packet/context/napCoreContext';
@@ -10,8 +9,7 @@ type clientPriorityType = {
 }
 
 const clientPriority: clientPriorityType = {
-    10: (napCore: NapCoreContext, logger: PacketLogger, logStack: LogStack) => new NativePacketClient(napCore, logger, logStack),
-    1: (napCore: NapCoreContext, logger: PacketLogger, logStack: LogStack) => new WsPacketClient(napCore, logger, logStack),
+    10: (napCore: NapCoreContext, logger: PacketLogger, logStack: LogStack) => new NativePacketClient(napCore, logger, logStack)
 };
 
 export class LogStack {
@@ -88,10 +86,6 @@ export class PacketClientContext {
             this.logger.info('使用指定的 NativePacketClient 作为后端');
             client = new NativePacketClient(this.napCore, this.logger, this.logStack);
             break;
-        case 'frida':
-            this.logger.info('[Core] [Packet] 使用指定的 FridaPacketClient 作为后端');
-            client = new WsPacketClient(this.napCore, this.logger, this.logStack);
-            break;
         case 'auto':
         case undefined:
             client = this.judgeClient();

src/core/packet/transformer/action/SetSpecialTitle.ts

@@ -9,15 +9,14 @@ class SetSpecialTitle extends PacketTransformer<typeof proto.OidbSvcTrpcTcpBase>
     }
 
     build(groupCode: number, uid: string, tittle: string): OidbPacket {
-        const oidb_0x8FC_2_body = new NapProtoMsg(proto.OidbSvcTrpcTcp0X8FC_2_Body).encode({
-            targetUid: uid,
-            specialTitle: tittle,
-            expiredTime: -1,
-            uinName: tittle
-        });
         const oidb_0x8FC_2 = new NapProtoMsg(proto.OidbSvcTrpcTcp0X8FC_2).encode({
             groupUin: +groupCode,
-            body: oidb_0x8FC_2_body
+            body: {
+                targetUid: uid,
+                specialTitle: tittle,
+                expiredTime: -1,
+                uinName: tittle
+            }
         });
         return OidbBase.build(0x8FC, 2, oidb_0x8FC_2, false, false);
     }

src/core/packet/transformer/proto/oidb/Oidb.0x8FC_2.ts

@@ -4,12 +4,12 @@ import { ProtoField, ScalarType } from '@napneko/nap-proto-core';
 //设置群头衔 OidbSvcTrpcTcp.0x8fc_2
 export const OidbSvcTrpcTcp0X8FC_2_Body = {
     targetUid: ProtoField(1, ScalarType.STRING),
-    specialTitle: ProtoField(5, ScalarType.STRING),
-    expiredTime: ProtoField(6, ScalarType.SINT32),
-    uinName: ProtoField(7, ScalarType.STRING),
+    specialTitle: ProtoField(5, ScalarType.STRING, true),
+    expiredTime: ProtoField(6, ScalarType.INT32),
+    uinName: ProtoField(7, ScalarType.STRING, true),
     targetName: ProtoField(8, ScalarType.STRING),
 };
 export const OidbSvcTrpcTcp0X8FC_2 = {
     groupUin: ProtoField(1, ScalarType.UINT32),
-    body: ProtoField(3, ScalarType.BYTES),
+    body: ProtoField(3, () => OidbSvcTrpcTcp0X8FC_2_Body),
 };

src/core/services/NodeIKernelBuddyService.ts

@@ -16,7 +16,7 @@ export interface NodeIKernelBuddyService {
 
     getBuddyListFromCache(reqType: BuddyListReqType): Promise<Array<
         {
-            categoryId: number,//9999应该跳过 那是兜底数据吧
+            categoryId: number,//9999为特别关心
             categorySortId: number,//排序方式
             categroyName: string,//分类名
             categroyMbCount: number,//不懂

src/core/types/group.ts

@@ -1,5 +1,3 @@
-import { QQLevel, NTSex } from './user';
-
 export interface KickMemberInfo {
     optFlag: number;
     optOperate: number;
@@ -274,24 +272,42 @@ export enum NTGroupMemberRole {
     KOWNER = 4
 }
 export interface GroupMember {
-    memberRealLevel: number | undefined;
-    memberSpecialTitle?: string;
-    avatarPath: string;
-    cardName: string;
-    cardType: number;
-    isDelete: boolean;
-    nick: string;
-    qid: string;
-    remark: string;
-    role: NTGroupMemberRole;
-    shutUpTime: number; // 禁言时间(S)
     uid: string;
+    qid: string;
     uin: string;
+    nick: string;
+    remark: string;
+    cardType: number;
+    cardName: string;
+    role: NTGroupMemberRole;
+    avatarPath: string;
+    shutUpTime: number;
+    isDelete: boolean;
+    isSpecialConcerned: boolean;
+    isSpecialShield: boolean;
     isRobot: boolean;
-    sex?: NTSex;
-    age?: number;
-    qqLevel?: QQLevel;
-    isChangeRole: boolean;
-    joinTime: string;
-    lastSpeakTime: string;
+    groupHonor: Uint8Array;
+    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;
 }

src/core/types/user.ts

@@ -207,8 +207,8 @@ interface PhotoWall {
 
 // 简单信息
 export interface SimpleInfo {
-    uid?: string;
-    uin?: string;
+    uid: string;
+    uin: string;
     coreInfo: CoreInfo;
     baseInfo: BaseInfo;
     status: UserStatus | null;
@@ -233,13 +233,15 @@ export interface SelfStatusInfo {
     setTime: string;
 }
 
+export type UserV2 = UserDetailInfoListenerArg;
+
 // 用户详细信息监听参数
 export interface UserDetailInfoListenerArg {
     uid: string;
     uin: string;
-    simpleInfo: SimpleInfo;
-    commonExt: CommonExt;
-    photoWall: PhotoWall;
+    simpleInfo?: SimpleInfo;
+    commonExt?: CommonExt;
+    photoWall?: PhotoWall;
 }
 
 // 修改个人资料参数
@@ -332,13 +334,12 @@ export interface User {
 }
 
 // 自身信息
-export interface SelfInfo extends User {
-    online?: boolean;
+export interface SelfInfo extends Partial<UserV2> {
+    uid: string;
+    uin: string;
+    online: boolean;
 }
 
-// 好友类型
-export type Friend = User;
-
 // 业务键枚举
 export enum BizKey {
     KPRIVILEGEICON = 0,

src/framework/napcat.ts

@@ -46,7 +46,6 @@ export async function NCoreInitFramework(
             resolveSelfInfo({
                 uid: loginResult.uid,
                 uin: loginResult.uin,
-                nick: '', // 获取不到
                 online: true,
             });
         };

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

@@ -19,7 +19,7 @@ export default class GoCQHTTPGetStrangerInfo extends OneBotAction<Payload, OB11U
         const extendData = await this.core.apis.UserApi.getUserDetailInfoByUin(user_id);
         let uid = (await this.core.apis.UserApi.getUidByUinV2(user_id));
         if (!uid) uid = extendData.detail.uid;
-        const info = (await this.core.apis.UserApi.getUserDetailInfo(uid));
+        const info = (await this.core.apis.UserApi.fetchUserDetailInfoV2(uid));
         return {
             ...extendData.detail.simpleInfo.coreInfo,
             ...extendData.detail.commonExt ?? {},
@@ -29,17 +29,17 @@ export default class GoCQHTTPGetStrangerInfo extends OneBotAction<Payload, OB11U
             user_id: parseInt(extendData.detail.uin) ?? 0,
             uid: info.uid ?? uid,
             nickname: extendData.detail.simpleInfo.coreInfo.nick ?? '',
-            age: extendData.detail.simpleInfo.baseInfo.age ?? info.age,
+            age: extendData.detail.simpleInfo.baseInfo.age ?? info.simpleInfo?.baseInfo.age,
             qid: extendData.detail.simpleInfo.baseInfo.qid,
-            qqLevel: calcQQLevel(extendData.detail.commonExt?.qqLevel ?? info.qqLevel),
+            qqLevel: calcQQLevel(extendData.detail.commonExt?.qqLevel ?? info.commonExt?.qqLevel),
             sex: OB11Construct.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,
+            long_nick: extendData.detail.simpleInfo.baseInfo.longNick ?? info.simpleInfo?.baseInfo.longNick,
+            reg_time: extendData.detail.commonExt?.regTime ?? info.commonExt?.regTime,
             is_vip: extendData.detail.simpleInfo.vasInfo?.svipFlag,
             is_years_vip: extendData.detail.simpleInfo.vasInfo?.yearVipFlag,
             vip_level: extendData.detail.simpleInfo.vasInfo?.vipLevel,
-            remark: extendData.detail.simpleInfo.coreInfo.remark ?? info.remark,
-            status: extendData.detail.simpleInfo.status?.status ?? info.status,
+            remark: extendData.detail.simpleInfo.coreInfo.remark ?? info.simpleInfo?.coreInfo.remark,
+            status: extendData.detail.simpleInfo.status?.status ?? info.simpleInfo?.status?.status,
             login_days: 0,//失效
         };
     }

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

@@ -16,15 +16,15 @@ export class SetQQProfile extends OneBotAction<Payload, Awaited<ReturnType<NTQQU
 
     async _handle(payload: Payload) {
         const self = this.core.selfInfo;
-        const OldProfile = await this.core.apis.UserApi.getUserDetailInfo(self.uid);
+        const OldProfile = await this.core.apis.UserApi.fetchUserDetailInfoV2(self.uid);
         return await this.core.apis.UserApi.modifySelfProfile({
             nick: payload.nickname,
-            longNick: (payload?.personal_note ?? OldProfile?.longNick) || '',
-            sex: parseInt(payload?.sex ? payload?.sex.toString() : OldProfile?.sex!.toString()),
+            longNick: (payload?.personal_note ?? OldProfile?.simpleInfo!.baseInfo.longNick) || '',
+            sex: parseInt(payload?.sex ? payload?.sex.toString() : OldProfile?.simpleInfo!.baseInfo.sex!.toString()),
             birthday: {
-                birthday_year: OldProfile?.birthday_year!.toString(),
-                birthday_month: OldProfile?.birthday_month!.toString(),
-                birthday_day: OldProfile?.birthday_day!.toString(),
+                birthday_year: OldProfile?.simpleInfo!.baseInfo.birthday_year!.toString(),
+                birthday_month: OldProfile?.simpleInfo!.baseInfo.birthday_month!.toString(),
+                birthday_day: OldProfile?.simpleInfo!.baseInfo.birthday_day!.toString(),
             },
             location: undefined,
         });

src/onebot/action/group/GetGroupInfo.ts

@@ -20,6 +20,7 @@ class GetGroupInfo extends OneBotAction<Payload, OB11Group> {
             const data = await this.core.apis.GroupApi.fetchGroupDetail(payload.group_id.toString());
             return {
                 ...data,
+                group_remark: '',
                 group_id: +payload.group_id,
                 group_name: data.groupName,
                 member_count: data.memberNum,

src/onebot/action/group/GetGroupMemberInfo.ts

@@ -32,24 +32,20 @@ class GetGroupMemberInfo extends OneBotAction<Payload, OB11GroupMember> {
 
         const [member, info] = await Promise.all([
             this.core.apis.GroupApi.getGroupMemberEx(payload.group_id.toString(), uid, isNocache),
-            this.core.apis.UserApi.getUserDetailInfo(uid),
+            this.core.apis.UserApi.fetchUserDetailInfoV2(uid),
         ]);
 
         if (!member || !groupMember) throw new Error(`群(${payload.group_id})成员${payload.user_id}不存在`);
 
-        return info ? { ...groupMember, ...member, ...info } : member;
+        return { member, info, groupMember };
     }
 
     async _handle(payload: Payload) {
         const isNocache = this.parseBoolean(payload.no_cache ?? true);
         const uid = await this.getUid(payload.user_id);
-        const member = await this.getGroupMemberInfo(payload, uid, isNocache);
-
-        if (!member) {
-            this.core.context.logger.logDebug('获取群成员详细信息失败, 只能返回基础信息');
-        }
-
-        return OB11Construct.groupMember(payload.group_id.toString(), member);
+        const { member, info } = await this.getGroupMemberInfo(payload, uid, isNocache);
+        console.log('member', JSON.stringify(member, null, 2), 'info', JSON.stringify(info, null, 2));
+        return OB11Construct.groupMember(payload.group_id.toString(), member, info);
     }
 }
 

src/onebot/action/group/GetGroupMemberList.ts

@@ -16,16 +16,35 @@ export class GetGroupMemberList extends OneBotAction<Payload, OB11GroupMember[]>
     override actionName = ActionName.GetGroupMemberList;
     override payloadSchema = SchemaData;
 
+    /**
+     * 处理获取群成员列表请求
+     */
     async _handle(payload: Payload) {
         const groupIdStr = payload.group_id.toString();
         const noCache = this.parseBoolean(payload.no_cache ?? false);
+
+        // 获取群成员基本信息
         const groupMembers = await this.getGroupMembers(groupIdStr, noCache);
-        const _groupMembers = await Promise.all(
-            Array.from(groupMembers.values()).map(item =>
-                OB11Construct.groupMember(groupIdStr, item)
-            )
+        const memberArray = Array.from(groupMembers.values());
+
+        // 批量并行获取用户详情
+        const userDetailsPromises = memberArray.map(member =>
+            this.core.apis.UserApi.fetchUserDetailInfoV2(member.uid)
+                .catch(_ => {
+                    return { uin: member.uin, uid: member.uid };
+                })
         );
-        return Array.from(new Map(_groupMembers.map(member => [member.user_id, member])).values());
+        const userDetails = await Promise.all(userDetailsPromises);
+
+        // 并行构建 OneBot 格式的群成员数据
+        const groupMembersList = memberArray.map((member, index) => {
+            // 确保用户详情不会是undefined
+            const userDetail = userDetails[index] || { uin: member.uin, uid: member.uid };
+            return OB11Construct.groupMember(groupIdStr, member, userDetail);
+        });
+
+        // 直接返回处理后的成员列表，不进行去重
+        return groupMembersList;
     }
 
     private parseBoolean(value: boolean | string): boolean {
@@ -37,13 +56,18 @@ export class GetGroupMemberList extends OneBotAction<Payload, OB11GroupMember[]>
         let groupMembers = memberCache.get(groupIdStr);
 
         if (noCache || !groupMembers) {
-            const data = this.core.apis.GroupApi.refreshGroupMemberCache(groupIdStr, true).then().catch();
-            groupMembers = memberCache.get(groupIdStr) || (await data);
-            if (!groupMembers) {
-                throw new Error(`Failed to get group member list for group ${groupIdStr}`);
+            try {
+                const refreshPromise = this.core.apis.GroupApi.refreshGroupMemberCache(groupIdStr, true);
+
+                groupMembers = memberCache.get(groupIdStr) || (await refreshPromise);
+
+                if (!groupMembers) {
+                    throw new Error(`无法获取群 ${groupIdStr} 的成员列表`);
+                }
+            } catch (error) {
+                throw new Error(`获取群 ${groupIdStr} 成员列表失败: ${error instanceof Error ? error.message : String(error)}`);
             }
         }
-
         return groupMembers;
     }
 }

src/onebot/action/user/GetFriendList.ts

@@ -14,8 +14,25 @@ export default class GetFriendList extends OneBotAction<Payload, OB11User[]> {
     override actionName = ActionName.GetFriendList;
     override payloadSchema = SchemaData;
 
-    async _handle(payload: Payload) {
-        //全新逻辑
-        return OB11Construct.friends(await this.core.apis.FriendApi.getBuddy(typeof payload.no_cache === 'string' ? payload.no_cache === 'true' : !!payload.no_cache));
+    async _handle(_payload: Payload) {
+        // 获取好友列表
+        let buddyList = await this.core.apis.FriendApi.getBuddyV2SimpleInfoMap();
+        const buddyArray = Array.from(buddyList.values());
+
+        // 批量并行获取用户详情
+        const userDetailsPromises = buddyArray.map(member =>
+            this.core.apis.UserApi.fetchUserDetailInfoV2(member.uid)
+                .catch(_ => {
+                    return { uin: member.uin, uid: member.uid };
+                })
+        );
+        const userDetails = await Promise.all(userDetailsPromises);
+
+        const friendList = buddyArray.map((friend, index) => {
+            const userDetail = userDetails[index] || { uin: friend.uin, uid: friend.uid };
+            return OB11Construct.friend(friend, userDetail);
+        });
+
+        return friendList;
     }
-}
+}

src/onebot/api/msg.ts

@@ -444,8 +444,8 @@ export class OneBotMsgApi {
             }
             const uid = await this.core.apis.UserApi.getUidByUinV2(`${atQQ}`);
             if (!uid) throw new Error('Get Uid Error');
-            const info = await this.core.apis.UserApi.getUserDetailInfo(uid);
-            return at(atQQ, uid, NTMsgAtType.ATTYPEONE, info.nick || '');
+            const info = await this.core.apis.UserApi.fetchUserDetailInfoV2(uid);
+            return at(atQQ, uid, NTMsgAtType.ATTYPEONE, info.simpleInfo?.coreInfo.nick || '');
         },
 
         [OB11MessageDataType.reply]: async ({ data: { id } }) => {
@@ -845,7 +845,7 @@ export class OneBotMsgApi {
                 return;
             }
         }
-        resMsg.sender.nickname = (await this.core.apis.UserApi.getUserDetailInfo(msg.senderUid)).nick;
+        resMsg.sender.nickname = (await this.core.apis.UserApi.fetchUserDetailInfoV2(msg.senderUid)).simpleInfo?.coreInfo.nick || '';
     }
 
     private async handleTempGroupMessage(resMsg: OB11Message, msg: RawMessage) {

src/onebot/helper/data.ts

@@ -1,6 +1,6 @@
 import { calcQQLevel } from '@/common/helper';
 import { FileNapCatOneBotUUID } from '@/common/file-uuid';
-import { FriendV2, Group, GroupFileInfoUpdateParamType, GroupMember, SelfInfo, NTSex } from '@/core';
+import { FriendV2, Group, GroupFileInfoUpdateParamType, GroupMember, SelfInfo, NTSex, UserV2 } from '@/core';
 import {
     OB11Group,
     OB11GroupFile,
@@ -14,22 +14,43 @@ export class OB11Construct {
     static selfInfo(selfInfo: SelfInfo): OB11User {
         return {
             user_id: +selfInfo.uin,
-            nickname: selfInfo.nick,
+            nickname: selfInfo.simpleInfo?.coreInfo.nick ?? '',
         };
     }
 
     static friends(friends: FriendV2[]): OB11User[] {
         return friends.map(rawFriend => ({
-            ...rawFriend.baseInfo,
-            ...rawFriend.coreInfo,
+            birthday_year: rawFriend.baseInfo.birthday_year,
+            birthday_month: rawFriend.baseInfo.birthday_month,
+            birthday_day: rawFriend.baseInfo.birthday_day,
             user_id: parseInt(rawFriend.coreInfo.uin),
+            age: rawFriend.baseInfo.age,
+            phone_num: rawFriend.baseInfo.phoneNum,
+            email: rawFriend.baseInfo.eMail,
+            category_id: rawFriend.baseInfo.categoryId,
             nickname: rawFriend.coreInfo.nick ?? '',
             remark: rawFriend.coreInfo.remark ?? rawFriend.coreInfo.nick,
             sex: this.sex(rawFriend.baseInfo.sex),
             level: 0,
         }));
     }
-
+    static friend(friends: FriendV2,info:UserV2): OB11User {
+        return {
+            birthday_year: friends.baseInfo.birthday_year,
+            birthday_month: friends.baseInfo.birthday_month,
+            birthday_day: friends.baseInfo.birthday_day,
+            user_id: parseInt(friends.coreInfo.uin),
+            age: friends.baseInfo.age,
+            phone_num: friends.baseInfo.phoneNum,
+            email: friends.baseInfo.eMail,
+            category_id: friends.baseInfo.categoryId,
+            nickname: friends.coreInfo.nick ?? '',
+            remark: friends.coreInfo.remark ?? friends.coreInfo.nick,
+            sex: this.sex(friends.baseInfo.sex),
+            level: calcQQLevel(info?.commonExt?.qqLevel) || 0,
+            qid: friends.baseInfo.qid,
+        };
+    }
     static groupMemberRole(role: number): OB11GroupMemberRole | undefined {
         return {
             4: OB11GroupMemberRole.owner,
@@ -48,20 +69,20 @@ export class OB11Construct {
         }[sex] || OB11UserSex.unknown;
     }
 
-    static groupMember(group_id: string, member: GroupMember): OB11GroupMember {
+    static groupMember(group_id: string, member: GroupMember, info: UserV2): OB11GroupMember {
         return {
             group_id: +group_id,
             user_id: +member.uin,
             nickname: member.nick,
             card: member.cardName,
-            sex: this.sex(member.sex),
-            age: member.age ?? 0,
-            area: '',
+            sex: this.sex(info?.simpleInfo?.baseInfo.sex),
+            age: info?.simpleInfo?.baseInfo.age ?? 0,
+            area: info?.commonExt?.address,
             level: member.memberRealLevel?.toString() ?? '0',
-            qq_level: member.qqLevel && calcQQLevel(member.qqLevel) || 0,
+            qq_level: info?.commonExt?.qqLevel && calcQQLevel(info.commonExt.qqLevel) || 0,
             join_time: +member.joinTime,
             last_sent_time: +member.lastSpeakTime,
-            title_expire_time: 0,
+            title_expire_time: +member.specialTitleExpireTime,
             unfriendly: false,
             card_changeable: true,
             is_robot: member.isRobot,
@@ -73,6 +94,7 @@ export class OB11Construct {
 
     static group(group: Group): OB11Group {
         return {
+            group_remark: group.remarkName,
             group_id: +group.groupCode,
             group_name: group.groupName,
             member_count: group.memberCount,

src/onebot/index.ts

@@ -97,13 +97,13 @@ export class NapCatOneBot11Adapter {
         return log;
     }
     async InitOneBot() {
-        const selfInfo = this.core.selfInfo;
+
         const ob11Config = this.configLoader.configData;
 
-        this.core.apis.UserApi.getUserDetailInfo(selfInfo.uid)
+        this.core.apis.UserApi.fetchUserDetailInfoV2(this.core.selfInfo.uid)
             .then((user) => {
-                selfInfo.nick = user.nick;
-                this.context.logger.setLogSelfInfo(selfInfo);
+                this.core.selfInfo = { ...user, online: this.core.selfInfo.online };
+                this.context.logger.setLogSelfInfo({ nick: this.core.selfInfo.simpleInfo?.coreInfo.nick ?? '', uid: this.core.selfInfo.uid });
             })
             .catch(e => this.context.logger.logError(e));
 
@@ -170,7 +170,7 @@ export class NapCatOneBot11Adapter {
         this.initGroupListener();
 
         WebUiDataRuntime.setQQVersion(this.core.context.basicInfoWrapper.getFullQQVesion());
-        WebUiDataRuntime.setQQLoginInfo(selfInfo);
+        WebUiDataRuntime.setQQLoginInfo(this.core.selfInfo);
         WebUiDataRuntime.setQQLoginStatus(true);
         WebUiDataRuntime.setOnOB11ConfigChanged(async (newConfig) => {
             const prev = this.configLoader.configData;

src/onebot/types/data.ts

@@ -1,4 +1,10 @@
 export interface OB11User {
+    birthday_year?: number;
+    birthday_month?: number;
+    birthday_day?: number;
+    phone_num?: string; // 手机号
+    email?: string; // 邮箱
+    category_id?: number; // 分组ID
     user_id: number; // 用户ID
     nickname: string; // 昵称
     remark?: string; // 备注
@@ -57,6 +63,7 @@ export interface OB11GroupMember {
 }
 
 export interface OB11Group {
+    group_remark: string; // 群备注
     group_id: number; // 群ID
     group_name: string; // 群名称
     member_count?: number; // 成员数量

src/shell/base.ts

@@ -31,6 +31,7 @@ import { WebUiDataRuntime } from '@/webui/src/helper/Data';
 import { napCatVersion } from '@/common/version';
 import { NodeIO3MiscListener } from '@/core/listeners/NodeIO3MiscListener';
 import { sleep } from '@/common/helper';
+
 // NapCat Shell App ES 入口文件
 async function handleUncaughtExceptions(logger: LogWrapper) {
     process.on('uncaughtException', (err) => {
@@ -114,27 +115,31 @@ async function handleLogin(
     quickLoginUin: string | undefined,
     historyLoginList: LoginListItem[]
 ): Promise<SelfInfo> {
+    let context = { isLogined: false };
     let inner_resolve: (value: SelfInfo) => void;
     let selfInfo: Promise<SelfInfo> = new Promise((resolve) => {
         inner_resolve = resolve;
     });
     // 连接服务
-    let isLogined = false;
+
     const loginListener = new NodeIKernelLoginListener();
     loginListener.onUserLoggedIn = (userid: string) => {
         logger.logError(`当前账号(${userid})已登录,无法重复登录`);
     };
     loginListener.onQRCodeLoginSucceed = async (loginResult) => {
-        isLogined = true;
+        context.isLogined = true;
         inner_resolve({
             uid: loginResult.uid,
             uin: loginResult.uin,
-            nick: '',
             online: true,
         });
 
     };
-
+    loginListener.onLoginConnected = () => {
+        waitForNetworkConnection(loginService, logger).then(() => {
+            handleLoginInner(context, logger, loginService, quickLoginUin, historyLoginList).then().catch(e => logger.logError(e));
+        });
+    }
     loginListener.onQRCodeGetPicture = ({ pngBase64QrcodeData, qrcodeUrl }) => {
         WebUiDataRuntime.setQQLoginQrcodeURL(qrcodeUrl);
 
@@ -156,7 +161,7 @@ async function handleLogin(
     };
 
     loginListener.onQRCodeSessionFailed = (errType: number, errCode: number) => {
-        if (!isLogined) {
+        if (!context.isLogined) {
             logger.logError('[Core] [Login] Login Error,ErrType: ', errType, ' ErrCode:', errCode);
             if (errType == 1 && errCode == 3) {
                 // 二维码过期刷新
@@ -168,10 +173,12 @@ async function handleLogin(
     loginListener.onLoginFailed = (...args) => {
         logger.logError('[Core] [Login] Login Error , ErrInfo: ', JSON.stringify(args));
     };
+
     loginService.addKernelLoginListener(proxiedListenerOf(loginListener, logger));
     loginService.connect();
-    await waitForNetworkConnection(loginService, logger);
-    // 等待网络
+    return await selfInfo;
+}
+async function handleLoginInner(context: { isLogined: boolean }, logger: LogWrapper, loginService: NodeIKernelLoginService, quickLoginUin: string | undefined, historyLoginList: LoginListItem[]) {
     WebUiDataRuntime.setQuickLoginCall(async (uin: string) => {
         return await new Promise((resolve) => {
             if (uin) {
@@ -197,13 +204,13 @@ async function handleLogin(
                 .then(result => {
                     if (result.loginErrorInfo.errMsg) {
                         logger.logError('快速登录错误：', result.loginErrorInfo.errMsg);
-                        if (!isLogined) loginService.getQRCodePicture();
+                        if (!context.isLogined) loginService.getQRCodePicture();
                     }
                 })
                 .catch();
         } else {
             logger.logError('快速登录失败，未找到该 QQ 历史登录记录，将使用二维码登录方式');
-            if (!isLogined) loginService.getQRCodePicture();
+            if (!context.isLogined) loginService.getQRCodePicture();
         }
     } else {
         logger.log('没有 -q 指令指定快速登录，将使用二维码登录方式');
@@ -222,8 +229,6 @@ async function handleLogin(
         WebUiDataRuntime.setQQQuickLoginList(list.map((item) => item.uin.toString()));
         WebUiDataRuntime.setQQNewLoginList(list);
     });
-
-    return await selfInfo;
 }
 
 async function initializeSession(
@@ -285,7 +290,7 @@ async function waitForNetworkConnection(loginService: NodeIKernelLoginService, l
     let network_ok = false;
     let tryCount = 0;
     while (!network_ok) {
-        network_ok = loginService.getMsfStatus() === 0;
+        network_ok = loginService.getMsfStatus() !== 3;// win 11 0连接 1未连接
         logger.log('等待网络连接...');
         await sleep(500);
         tryCount++;
@@ -340,8 +345,8 @@ export async function NCoreInitShell() {
         guid,
         basicInfoWrapper.QQVersionAppid,
         basicInfoWrapper.getFullQQVesion(),
-        selfInfo.uin,
-        selfInfo.uid,
+        selfInfo.uin ?? '',
+        selfInfo.uid ?? '',
         dataPath,
     );
 
@@ -374,7 +379,6 @@ export async function NCoreInitShell() {
 export class NapCatShell {
     readonly core: NapCatCore;
     readonly context: InstanceContext;
-
     constructor(
         wrapper: WrapperNodeApi,
         session: NodeIQQNTWrapperSession,