fix: #918

launcher/qqnt.json

@@ -1,9 +1,9 @@
 {
   "name": "qq-chat",
-  "version": "9.9.18-32793",
+  "version": "9.9.18-32869",
-  "verHash": "d43f097e",
+  "verHash": "e735296c",
-  "linuxVersion": "3.2.16-32793",
+  "linuxVersion": "3.2.16-32869",
-  "linuxVerHash": "ee4bd910",
+  "linuxVerHash": "4c192ba9",
   "private": true,
   "description": "QQ",
   "productName": "QQ",
@@ -34,9 +34,9 @@
       "vuex@4.1.0": "patches/vuex@4.1.0.patch"
     }
   },
-  "buildVersion": "32793",
+  "buildVersion": "32869",
   "isPureShell": true,
   "isByteCodeShell": true,
   "platform": "win32",
   "eleArch": "x64"
-}
+}

manifest.json

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

napcat.webui/src/pages/web_login.tsx

@@ -79,6 +79,7 @@ export default function WebLoginPage() {
             <CardBody className="flex gap-5 py-5 px-5 md:px-10">
               <Input
                 isClearable
+                type="password"
                 classNames={{
                   label: 'text-black/50 dark:text-white/90',
                   input: [

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.7.8",
+  "version": "4.7.11",
   "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",

src/common/clean-task.ts

@@ -0,0 +1,229 @@
+import fs from 'fs';
+// generate Claude 3.7 Sonet Thinking
+
+interface FileRecord {
+    filePath: string;
+    addedTime: number;
+    retries: number;
+}
+
+interface CleanupTask {
+    fileRecord: FileRecord;
+    timer: NodeJS.Timeout;
+}
+
+class CleanupQueue {
+    private tasks: Map<string, CleanupTask> = new Map();
+    private readonly MAX_RETRIES = 3;
+    private isProcessing: boolean = false;
+    private pendingOperations: Array<() => void> = [];
+
+    /**
+     * 执行队列中的待处理操作，确保异步安全
+     */
+    private executeNextOperation(): void {
+        if (this.pendingOperations.length === 0) {
+            this.isProcessing = false;
+            return;
+        }
+
+        this.isProcessing = true;
+        const operation = this.pendingOperations.shift();
+        operation?.();
+
+        // 使用 setImmediate 允许事件循环继续，防止阻塞
+        setImmediate(() => this.executeNextOperation());
+    }
+
+    /**
+     * 安全执行操作，防止竞态条件
+     * @param operation 要执行的操作
+     */
+    private safeExecute(operation: () => void): void {
+        this.pendingOperations.push(operation);
+        if (!this.isProcessing) {
+            this.executeNextOperation();
+        }
+    }
+
+    /**
+     * 检查文件是否存在
+     * @param filePath 文件路径
+     * @returns 文件是否存在
+     */
+    private fileExists(filePath: string): boolean {
+        try {
+            return fs.existsSync(filePath);
+        } catch (error) {
+            //console.log(`检查文件存在出错: ${filePath}`, error);
+            return false;
+        }
+    }
+
+    /**
+     * 添加文件到清理队列
+     * @param filePath 文件路径
+     * @param cleanupDelay 清理延迟时间(毫秒)
+     */
+    addFile(filePath: string, cleanupDelay: number): void {
+        this.safeExecute(() => {
+            // 如果文件已在队列中，取消原来的计时器
+            if (this.tasks.has(filePath)) {
+                this.cancelCleanup(filePath);
+            }
+
+            // 创建新的文件记录
+            const fileRecord: FileRecord = {
+                filePath,
+                addedTime: Date.now(),
+                retries: 0
+            };
+
+            // 设置计时器
+            const timer = setTimeout(() => {
+                this.cleanupFile(fileRecord, cleanupDelay);
+            }, cleanupDelay);
+
+            // 添加到任务队列
+            this.tasks.set(filePath, { fileRecord, timer });
+        });
+    }
+
+    /**
+     * 批量添加文件到清理队列
+     * @param filePaths 文件路径数组
+     * @param cleanupDelay 清理延迟时间(毫秒)
+     */
+    addFiles(filePaths: string[], cleanupDelay: number): void {
+        this.safeExecute(() => {
+            for (const filePath of filePaths) {
+                // 内部直接处理，不通过 safeExecute 以保证批量操作的原子性
+                if (this.tasks.has(filePath)) {
+                    // 取消已有的计时器，但不使用 cancelCleanup 方法以避免重复的安全检查
+                    const existingTask = this.tasks.get(filePath);
+                    if (existingTask) {
+                        clearTimeout(existingTask.timer);
+                    }
+                }
+
+                const fileRecord: FileRecord = {
+                    filePath,
+                    addedTime: Date.now(),
+                    retries: 0
+                };
+
+                const timer = setTimeout(() => {
+                    this.cleanupFile(fileRecord, cleanupDelay);
+                }, cleanupDelay);
+
+                this.tasks.set(filePath, { fileRecord, timer });
+            }
+        });
+    }
+
+    /**
+     * 清理文件
+     * @param record 文件记录
+     * @param delay 延迟时间，用于重试
+     */
+    private cleanupFile(record: FileRecord, delay: number): void {
+        this.safeExecute(() => {
+            // 首先检查文件是否存在，不存在则视为清理成功
+            if (!this.fileExists(record.filePath)) {
+                //console.log(`文件已不存在，跳过清理: ${record.filePath}`);
+                this.tasks.delete(record.filePath);
+                return;
+            }
+
+            try {
+                // 尝试删除文件
+                fs.unlinkSync(record.filePath);
+                // 删除成功，从队列中移除任务
+                this.tasks.delete(record.filePath);
+            } catch (error) {
+                const err = error as NodeJS.ErrnoException;
+
+                // 明确处理文件不存在的情况
+                if (err.code === 'ENOENT') {
+                    //console.log(`文件在删除时不存在，视为清理成功: ${record.filePath}`);
+                    this.tasks.delete(record.filePath);
+                    return;
+                }
+
+                // 文件没有访问权限等情况
+                if (err.code === 'EACCES' || err.code === 'EPERM') {
+                    //console.error(`没有权限删除文件: ${record.filePath}`, err);
+                }
+
+                // 其他删除失败情况，考虑重试
+                if (record.retries < this.MAX_RETRIES - 1) {
+                    // 还有重试机会，增加重试次数
+                    record.retries++;
+                    //console.log(`清理文件失败，将重试(${record.retries}/${this.MAX_RETRIES}): ${record.filePath}`);
+
+                    // 设置相同的延迟时间再次尝试
+                    const timer = setTimeout(() => {
+                        this.cleanupFile(record, delay);
+                    }, delay);
+
+                    // 更新任务
+                    this.tasks.set(record.filePath, { fileRecord: record, timer });
+                } else {
+                    // 已达到最大重试次数，从队列中移除任务
+                    this.tasks.delete(record.filePath);
+                    //console.error(`清理文件失败，已达最大重试次数(${this.MAX_RETRIES}): ${record.filePath}`, error);
+                }
+            }
+        });
+    }
+
+    /**
+     * 取消文件的清理任务
+     * @param filePath 文件路径
+     * @returns 是否成功取消
+     */
+    cancelCleanup(filePath: string): boolean {
+        let cancelled = false;
+        this.safeExecute(() => {
+            const task = this.tasks.get(filePath);
+            if (task) {
+                clearTimeout(task.timer);
+                this.tasks.delete(filePath);
+                cancelled = true;
+            }
+        });
+        return cancelled;
+    }
+
+    /**
+     * 获取队列中的文件数量
+     * @returns 文件数量
+     */
+    getQueueSize(): number {
+        return this.tasks.size;
+    }
+
+    /**
+     * 获取所有待清理的文件
+     * @returns 文件路径数组
+     */
+    getPendingFiles(): string[] {
+        return Array.from(this.tasks.keys());
+    }
+
+    /**
+     * 清空所有清理任务
+     */
+    clearAll(): void {
+        this.safeExecute(() => {
+            // 取消所有定时器
+            for (const task of this.tasks.values()) {
+                clearTimeout(task.timer);
+            }
+            this.tasks.clear();
+            //console.log('已清空所有清理任务');
+        });
+    }
+}
+
+export const cleanTaskQueue = new CleanupQueue();

src/common/ffmpeg-worker.ts

@@ -16,6 +16,9 @@ export function recvTask<T>(cb: (taskData: T) => Promise<unknown>) {
         }
     });
 }
+export function sendLog(_log: string) {
+    //parentPort?.postMessage({ log });
+}
 class FFmpegService {
     public static async extractThumbnail(videoPath: string, thumbnailPath: string): Promise<void> {
         const ffmpegInstance = await FFmpeg.create({ core: '@ffmpeg.wasm/core-mt' });
@@ -107,35 +110,175 @@ class FFmpegService {
             }
         }
     }
-
     public static async getVideoInfo(videoPath: string, thumbnailPath: string): Promise<VideoInfo> {
-        await FFmpegService.extractThumbnail(videoPath, thumbnailPath);
+        const startTime = Date.now();
-        const fileType = (await fileTypeFromFile(videoPath))?.ext ?? 'mp4';
+        sendLog(`开始获取视频信息: ${videoPath}`);
-        const inputFileName = `${randomUUID()}.${fileType}`;
+
-        const ffmpegInstance = await FFmpeg.create({ core: '@ffmpeg.wasm/core-mt' });
+        // 创建一个超时包装函数
-        ffmpegInstance.fs.writeFile(inputFileName, readFileSync(videoPath));
+        const withTimeout = <T>(promise: Promise<T>, timeoutMs: number, taskName: string): Promise<T> => {
-        ffmpegInstance.setLogging(true);
+            return Promise.race([
-        let duration = 60;
+                promise,
-        ffmpegInstance.setLogger((_level, ...msg) => {
+                new Promise<T>((_, reject) => {
-            const message = msg.join(' ');
+                    setTimeout(() => reject(new Error(`任务超时: ${taskName} (${timeoutMs}ms)`)), timeoutMs);
-            const durationMatch = message.match(/Duration: (\d+):(\d+):(\d+\.\d+)/);
+                })
-            if (durationMatch) {
+            ]);
-                const hours = parseInt(durationMatch[1] ?? '0', 10);
+        };
-                const minutes = parseInt(durationMatch[2] ?? '0', 10);
+
-                const seconds = parseFloat(durationMatch[3] ?? '0');
+        // 并行执行多个任务
-                duration = hours * 3600 + minutes * 60 + seconds;
+        const [fileInfo, durationInfo] = await Promise.all([
-            }
+            // 任务1: 获取文件信息和提取缩略图
-        });
+            (async () => {
-        await ffmpegInstance.run('-i', inputFileName);
+                sendLog(`开始任务1: 获取文件信息和提取缩略图`);
-        const image = imageSize(thumbnailPath);
+
-        ffmpegInstance.fs.unlink(inputFileName);
+                // 获取文件信息 (并行)
-        const fileSize = statSync(videoPath).size;
+                const fileInfoStartTime = Date.now();
+                const [fileType, fileSize] = await Promise.all([
+                    withTimeout(fileTypeFromFile(videoPath), 10000, '获取文件类型')
+                        .then(result => {
+                            sendLog(`获取文件类型完成，耗时: ${Date.now() - fileInfoStartTime}ms`);
+                            return result;
+                        }),
+                    (async () => {
+                        const result = statSync(videoPath).size;
+                        sendLog(`获取文件大小完成，耗时: ${Date.now() - fileInfoStartTime}ms`);
+                        return result;
+                    })()
+                ]);
+
+                // 直接实现缩略图提取 (不调用extractThumbnail方法)
+                const thumbStartTime = Date.now();
+                sendLog(`开始提取缩略图`);
+
+                const ffmpegInstance = await withTimeout(
+                    FFmpeg.create({ core: '@ffmpeg.wasm/core-mt' }),
+                    15000,
+                    '创建FFmpeg实例(缩略图)'
+                );
+
+                const videoFileName = `${randomUUID()}.mp4`;
+                const outputFileName = `${randomUUID()}.jpg`;
+
+                try {
+                    // 写入视频文件到FFmpeg
+                    const writeFileStartTime = Date.now();
+                    ffmpegInstance.fs.writeFile(videoFileName, readFileSync(videoPath));
+                    sendLog(`写入视频文件到FFmpeg完成，耗时: ${Date.now() - writeFileStartTime}ms`);
+
+                    // 提取缩略图
+                    const extractStartTime = Date.now();
+                    const code = await withTimeout(
+                        ffmpegInstance.run('-i', videoFileName, '-ss', '00:00:01.000', '-vframes', '1', outputFileName),
+                        30000,
+                        '提取缩略图'
+                    );
+                    sendLog(`FFmpeg提取缩略图命令执行完成，耗时: ${Date.now() - extractStartTime}ms`);
+
+                    if (code !== 0) {
+                        throw new Error('Error extracting thumbnail: FFmpeg process exited with code ' + code);
+                    }
+
+                    // 读取并保存缩略图
+                    const saveStartTime = Date.now();
+                    const thumbnail = ffmpegInstance.fs.readFile(outputFileName);
+                    writeFileSync(thumbnailPath, thumbnail);
+                    sendLog(`读取并保存缩略图完成，耗时: ${Date.now() - saveStartTime}ms`);
+
+                    // 获取缩略图尺寸
+                    const imageSizeStartTime = Date.now();
+                    const image = imageSize(thumbnailPath);
+                    sendLog(`获取缩略图尺寸完成，耗时: ${Date.now() - imageSizeStartTime}ms`);
+
+                    sendLog(`提取缩略图完成，总耗时: ${Date.now() - thumbStartTime}ms`);
+
+                    return {
+                        format: fileType?.ext ?? 'mp4',
+                        size: fileSize,
+                        width: image.width ?? 100,
+                        height: image.height ?? 100
+                    };
+                } finally {
+                    // 清理资源
+                    try {
+                        ffmpegInstance.fs.unlink(outputFileName);
+                    } catch (error) {
+                        sendLog(`清理输出文件失败: ${(error as Error).message}`);
+                    }
+
+                    try {
+                        ffmpegInstance.fs.unlink(videoFileName);
+                    } catch (error) {
+                        sendLog(`清理视频文件失败: ${(error as Error).message}`);
+                    }
+                }
+            })(),
+
+            // 任务2: 获取视频时长
+            (async () => {
+                const task2StartTime = Date.now();
+                sendLog(`开始任务2: 获取视频时长`);
+
+                // 创建FFmpeg实例
+                const ffmpegCreateStartTime = Date.now();
+                const ffmpegInstance = await withTimeout(
+                    FFmpeg.create({ core: '@ffmpeg.wasm/core-mt' }),
+                    15000,
+                    '创建FFmpeg实例(时长)'
+                );
+                sendLog(`创建FFmpeg实例完成，耗时: ${Date.now() - ffmpegCreateStartTime}ms`);
+
+                const inputFileName = `${randomUUID()}.mp4`;
+
+                try {
+                    // 写入文件
+                    const writeStartTime = Date.now();
+                    ffmpegInstance.fs.writeFile(inputFileName, readFileSync(videoPath));
+                    sendLog(`写入文件到FFmpeg完成，耗时: ${Date.now() - writeStartTime}ms`);
+
+                    ffmpegInstance.setLogging(true);
+                    let duration = 60; // 默认值
+
+                    ffmpegInstance.setLogger((_level, ...msg) => {
+                        const message = msg.join(' ');
+                        const durationMatch = message.match(/Duration: (\d+):(\d+):(\d+\.\d+)/);
+                        if (durationMatch) {
+                            const hours = parseInt(durationMatch[1] ?? '0', 10);
+                            const minutes = parseInt(durationMatch[2] ?? '0', 10);
+                            const seconds = parseFloat(durationMatch[3] ?? '0');
+                            duration = hours * 3600 + minutes * 60 + seconds;
+                        }
+                    });
+
+                    // 执行FFmpeg
+                    const runStartTime = Date.now();
+                    await withTimeout(
+                        ffmpegInstance.run('-i', inputFileName),
+                        20000,
+                        '获取视频时长'
+                    );
+                    sendLog(`执行FFmpeg命令完成，耗时: ${Date.now() - runStartTime}ms`);
+
+                    sendLog(`任务2(获取视频时长)完成，总耗时: ${Date.now() - task2StartTime}ms`);
+                    return { time: duration };
+                } finally {
+                    try {
+                        ffmpegInstance.fs.unlink(inputFileName);
+                    } catch (error) {
+                        sendLog(`清理输入文件失败: ${(error as Error).message}`);
+                    }
+                }
+            })()
+        ]);
+
+        // 合并结果并返回
+        const totalDuration = Date.now() - startTime;
+        sendLog(`获取视频信息完成，总耗时: ${totalDuration}ms`);
+
         return {
-            width: image.width ?? 100,
+            width: fileInfo.width,
-            height: image.height ?? 100,
+            height: fileInfo.height,
-            time: duration,
+            time: durationInfo.time,
-            format: fileType,
+            format: fileInfo.format,
-            size: fileSize,
+            size: fileInfo.size,
             filePath: videoPath
         };
     }

src/common/ffmpeg.ts

@@ -30,7 +30,7 @@ export class FFmpegService {
     }
 
     public static async getVideoInfo(videoPath: string, thumbnailPath: string): Promise<VideoInfo> {
-        const result = await await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'getVideoInfo', args: [videoPath, thumbnailPath] });
+        const result = await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'getVideoInfo', args: [videoPath, thumbnailPath] });
         return result;
     }
 }

src/common/file.ts

@@ -76,7 +76,7 @@ export function calculateFileMD5(filePath: string): Promise<string> {
         const stream = fs.createReadStream(filePath);
         const hash = crypto.createHash('md5');
 
-        stream.on('data', (data: Buffer) => {
+        stream.on('data', (data) => {
             // 当读取到数据时，更新哈希对象的状态
             hash.update(data);
         });
@@ -182,28 +182,28 @@ export async function uriToLocalFile(dir: string, uri: string, filename: string
     const filePath = path.join(dir, filename);
 
     switch (UriType) {
-    case FileUriType.Local: {
+        case FileUriType.Local: {
-        const fileExt = path.extname(HandledUri);
+            const fileExt = path.extname(HandledUri);
-        const localFileName = path.basename(HandledUri, fileExt) + fileExt;
+            const localFileName = path.basename(HandledUri, fileExt) + fileExt;
-        const tempFilePath = path.join(dir, filename + fileExt);
+            const tempFilePath = path.join(dir, filename + fileExt);
-        fs.copyFileSync(HandledUri, tempFilePath);
+            fs.copyFileSync(HandledUri, tempFilePath);
-        return { success: true, errMsg: '', fileName: localFileName, path: tempFilePath };
+            return { success: true, errMsg: '', fileName: localFileName, path: tempFilePath };
-    }
+        }
 
-    case FileUriType.Remote: {
+        case FileUriType.Remote: {
-        const buffer = await httpDownload({ url: HandledUri, headers: headers ?? {} });
+            const buffer = await httpDownload({ url: HandledUri, headers: headers ?? {} });
-        fs.writeFileSync(filePath, buffer);
+            fs.writeFileSync(filePath, buffer);
-        return { success: true, errMsg: '', fileName: filename, path: filePath };
+            return { success: true, errMsg: '', fileName: filename, path: filePath };
-    }
+        }
 
-    case FileUriType.Base64: {
+        case FileUriType.Base64: {
-        const base64 = HandledUri.replace(/^base64:\/\//, '');
+            const base64 = HandledUri.replace(/^base64:\/\//, '');
-        const base64Buffer = Buffer.from(base64, 'base64');
+            const base64Buffer = Buffer.from(base64, 'base64');
-        fs.writeFileSync(filePath, base64Buffer);
+            fs.writeFileSync(filePath, base64Buffer);
-        return { success: true, errMsg: '', fileName: filename, path: filePath };
+            return { success: true, errMsg: '', fileName: filename, path: filePath };
-    }
+        }
 
-    default:
+        default:
-        return { success: false, errMsg: `识别URL失败, uri= ${uri}`, fileName: '', path: '' };
+            return { success: false, errMsg: `识别URL失败, uri= ${uri}`, fileName: '', path: '' };
     }
 }

src/common/version.ts

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

src/common/worker.ts

@@ -5,8 +5,11 @@ 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)?.log) {
+                    console.error('Worker Log--->:', (result as { log: string }).log);
+                }
                 if ((result as any)?.error) {
-                    reject(new Error((result as { error: string }).error));
+                    reject(new Error("Worker error: " + (result as { error: string }).error));
                 }
                 resolve(result);
             });

src/core/apis/file.ts

@@ -44,7 +44,7 @@ export class NTQQFileApi {
             'https://ss.xingzhige.com/music_card/rkey', // 国内
             'https://secret-service.bietiaop.com/rkeys',//国内
         ],
-        this.context.logger
+            this.context.logger
         );
     }
 
@@ -188,17 +188,23 @@ export class NTQQFileApi {
         const thumbDir = path.replace(`${pathLib.sep}Ori${pathLib.sep}`, `${pathLib.sep}Thumb${pathLib.sep}`);
         fs.mkdirSync(pathLib.dirname(thumbDir), { recursive: true });
         const thumbPath = pathLib.join(pathLib.dirname(thumbDir), `${md5}_0.png`);
-        try {
-            videoInfo = await FFmpegService.getVideoInfo(filePath, thumbPath);
-        } catch {
-            fs.writeFileSync(thumbPath, Buffer.from(defaultVideoThumbB64, 'base64'));
-        }
         if (_diyThumbPath) {
             try {
                 await this.copyFile(_diyThumbPath, thumbPath);
             } catch (e) {
                 this.context.logger.logError('复制自定义缩略图失败', e);
             }
+        } else {
+            try {
+                videoInfo = await FFmpegService.getVideoInfo(filePath, thumbPath);
+                if (!fs.existsSync(thumbPath)) {
+                    this.context.logger.logError('获取视频缩略图失败', new Error('缩略图不存在'));
+                    throw new Error('获取视频缩略图失败');
+                }
+            } catch (e) {
+                this.context.logger.logError('获取视频信息失败', e);
+                fs.writeFileSync(thumbPath, Buffer.from(defaultVideoThumbB64, 'base64'));
+            }
         }
         context.deleteAfterSentFiles.push(thumbPath);
         const thumbSize = (await fsPromises.stat(thumbPath)).size;
@@ -301,18 +307,18 @@ export class NTQQFileApi {
                     element.elementType === ElementType.FILE
                 ) {
                     switch (element.elementType) {
-                    case ElementType.PIC:
+                        case ElementType.PIC:
                             element.picElement!.sourcePath = elementResults?.[elementIndex] ?? '';
-                        break;
+                            break;
-                    case ElementType.VIDEO:
+                        case ElementType.VIDEO:
                             element.videoElement!.filePath = elementResults?.[elementIndex] ?? '';
-                        break;
+                            break;
-                    case ElementType.PTT:
+                        case ElementType.PTT:
                             element.pttElement!.filePath = elementResults?.[elementIndex] ?? '';
-                        break;
+                            break;
-                    case ElementType.FILE:
+                        case ElementType.FILE:
                             element.fileElement!.filePath = elementResults?.[elementIndex] ?? '';
-                        break;
+                            break;
                     }
                     elementIndex++;
                 }

src/core/apis/group.ts

@@ -44,22 +44,13 @@ export class NTQQGroupApi {
     }
 
     async initApi() {
-        await this.initCache().then().catch(e => this.context.logger.logError(e));
+        this.initCache().then().catch(e => this.context.logger.logError(e));
     }
 
     async initCache() {
-        let promises: Promise<void>[] = [];
         for (const group of await this.getGroups(true)) {
-            let user = await this.refreshGroupMemberCache(group.groupCode, false).then().catch(e => this.context.logger.logError(e));
+            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, UserDetailSource } from '@/core/types';
+import { ModifyProfileParams, User, 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 fetchUserDetailInfoV2(uid: string, mode: UserDetailSource = UserDetailSource.KDB) {
+    async fetchUserDetailInfo(uid: string, mode: UserDetailSource = UserDetailSource.KDB) {
         const [, profile] = await this.core.eventWrapper.callNormalEventV2(
             'NodeIKernelProfileService/fetchUserDetailInfo',
             'NodeIKernelProfileListener/onUserDetailInfoChanged',
@@ -93,26 +93,37 @@ export class NTQQUserApi {
         return profile;
     }
 
-    async fetchUserDetailInfoV3(uid: string) {
+    async getUserDetailInfo(uid: string, no_cache: boolean = false): Promise<User> {
-        let cache = await this.fetchUserDetailInfoV2(uid, UserDetailSource.KDB);
+        let profile = await solveAsyncProblem(async (uid) => this.fetchUserDetailInfo(uid, no_cache ? UserDetailSource.KSERVER : UserDetailSource.KDB), uid);
-        if (!cache.commonExt) {
+        if (profile && profile.uin !== '0' && profile.commonExt) {
-            cache = await this.fetchUserDetailInfoV2(uid, UserDetailSource.KSERVER);
+            return {
-        }
+                ...profile.simpleInfo.status,
-        return cache;
+                ...profile.simpleInfo.vasInfo,
-    }
+                ...profile.commonExt,
-
+                ...profile.simpleInfo.baseInfo,
-
+                ...profile.simpleInfo.coreInfo,
-    async getUserDetailInfoV2(uid: string) {
+                qqLevel: profile.commonExt?.qqLevel,
-        let retUser = await solveAsyncProblem(async (uid) => this.fetchUserDetailInfoV2(uid, UserDetailSource.KDB), uid);
+                age: profile.simpleInfo.baseInfo.age,
-        if (retUser && retUser.uin !== '0') {
+                pendantId: '',
-            return retUser;
+                nick: profile.simpleInfo.coreInfo.nick || '',
+            };
         }
         this.context.logger.logDebug('[NapCat] [Mark] getUserDetailInfo Mode1 Failed.');
-        retUser = await this.fetchUserDetailInfoV2(uid, UserDetailSource.KSERVER);
+        profile = await this.fetchUserDetailInfo(uid, UserDetailSource.KSERVER);
-        if (retUser && retUser.uin === '0') {
+        if (profile && profile.uin === '0') {
-            retUser.uin = await this.core.apis.UserApi.getUidByUinV2(uid) ?? '0';
+            profile.uin = await this.core.apis.UserApi.getUidByUinV2(uid) ?? '0';
         }
-        return retUser;
+        return {
+            ...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 || '',
+        };
     }
 
     async modifySelfProfile(param: ModifyProfileParams) {
@@ -201,7 +212,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.fetchUserDetailInfoV2(uid).then((data) => data.uin));
+            .add(() => this.getUserDetailInfo(uid).then((data) => data.uin));
 
         const uin = await fallback.run().catch(() => '0');
         return uin ?? '0';

src/core/external/appid.json

@@ -226,5 +226,13 @@
     "9.9.18-33139": {
         "appid": 537273874,
         "qua": "V1_WIN_NQ_9.9.18_33139_GW_B"
+    },
+    "9.9.18-33800": {
+        "appid": 537273974,
+        "qua": "V1_WIN_NQ_9.9.18_33800_GW_B"
+    },
+    "3.2.16-33800": {
+        "appid": 537274009,
+        "qua": "V1_LNX_NQ_3.2.16_33800_GW_B"
     }
 }

src/core/external/offset.json

@@ -302,5 +302,17 @@
     "3.2.16-33139-arm64": {
         "send": "7262BB0",
         "recv": "72664E0"
+    },
+    "9.9.18-33800-x64": {
+        "send": "39F5870",
+        "recv": "39FA070"
+    },
+    "3.2.16-33800-x64": {
+        "send": "A634F60",
+        "recv": "A638980"
+    },
+    "3.2.16-33800-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/types/group.ts

@@ -1,3 +1,5 @@
+import { QQLevel, NTSex } from './user';
+
 export interface KickMemberInfo {
     optFlag: number;
     optOperate: number;
@@ -272,42 +274,24 @@ export enum NTGroupMemberRole {
     KOWNER = 4
 }
 export interface GroupMember {
-    uid: string;
+    memberRealLevel: number | undefined;
-    qid: string;
+    memberSpecialTitle?: string;
-    uin: string;
-    nick: string;
-    remark: string;
-    cardType: number;
-    cardName: string;
-    role: NTGroupMemberRole;
     avatarPath: string;
-    shutUpTime: number;
+    cardName: string;
+    cardType: number;
     isDelete: boolean;
-    isSpecialConcerned: boolean;
+    nick: string;
-    isSpecialShield: boolean;
+    qid: string;
+    remark: string;
+    role: NTGroupMemberRole;
+    shutUpTime: number; // 禁言时间(S)
+    uid: string;
+    uin: string;
     isRobot: boolean;
-    groupHonor: Uint8Array;
+    sex?: NTSex;
-    memberRealLevel: number;
+    age?: number;
-    memberLevel: number;
+    qqLevel?: QQLevel;
-    globalGroupLevel: number;
+    isChangeRole: boolean;
-    globalGroupPoint: number;
+    joinTime: string;
-    memberTitleId: number;
+    lastSpeakTime: string;
-    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,9 @@ interface PhotoWall {
 
 // 简单信息
 export interface SimpleInfo {
-    uid: string;
+    qqLevel?: QQLevel;//临时添加
-    uin: string;
+    uid?: string;
+    uin?: string;
     coreInfo: CoreInfo;
     baseInfo: BaseInfo;
     status: UserStatus | null;
@@ -233,15 +234,13 @@ export interface SelfStatusInfo {
     setTime: string;
 }
 
-export type UserV2 = UserDetailInfoListenerArg;
-
 // 用户详细信息监听参数
 export interface UserDetailInfoListenerArg {
     uid: string;
     uin: string;
-    simpleInfo?: SimpleInfo;
+    simpleInfo: SimpleInfo;
-    commonExt?: CommonExt;
+    commonExt: CommonExt;
-    photoWall?: PhotoWall;
+    photoWall: PhotoWall;
 }
 
 // 修改个人资料参数
@@ -334,12 +333,13 @@ export interface User {
 }
 
 // 自身信息
-export interface SelfInfo extends Partial<UserV2> {
+export interface SelfInfo extends User {
-    uid: string;
+    online?: boolean;
-    uin: string;
-    online: boolean;
 }
 
+// 好友类型
+export type Friend = User;
+
 // 业务键枚举
 export enum BizKey {
     KPRIVILEGEICON = 0,

src/framework/napcat.ts

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

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

@@ -7,6 +7,7 @@ import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
     user_id: Type.Union([Type.Number(), Type.String()]),
+    no_cache: Type.Union([Type.Boolean(), Type.String()], { default: false }),
 });
 
 type Payload = Static<typeof SchemaData>;
@@ -16,10 +17,11 @@ export default class GoCQHTTPGetStrangerInfo extends OneBotAction<Payload, OB11U
     override payloadSchema = SchemaData;
     async _handle(payload: Payload) {
         const user_id = payload.user_id.toString();
+        const isNocache = typeof payload.no_cache === 'string' ? payload.no_cache === 'true' : !!payload.no_cache;
         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.fetchUserDetailInfoV2(uid));
+        const info = (await this.core.apis.UserApi.getUserDetailInfo(uid, isNocache));
         return {
             ...extendData.detail.simpleInfo.coreInfo,
             ...extendData.detail.commonExt ?? {},
@@ -29,17 +31,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.simpleInfo?.baseInfo.age,
+            age: extendData.detail.simpleInfo.baseInfo.age ?? info.age,
             qid: extendData.detail.simpleInfo.baseInfo.qid,
-            qqLevel: calcQQLevel(extendData.detail.commonExt?.qqLevel ?? info.commonExt?.qqLevel),
+            qqLevel: calcQQLevel(extendData.detail.commonExt?.qqLevel ?? info.qqLevel),
             sex: OB11Construct.sex(extendData.detail.simpleInfo.baseInfo.sex) ?? OB11UserSex.unknown,
-            long_nick: extendData.detail.simpleInfo.baseInfo.longNick ?? info.simpleInfo?.baseInfo.longNick,
+            long_nick: extendData.detail.simpleInfo.baseInfo.longNick ?? info.longNick,
-            reg_time: extendData.detail.commonExt?.regTime ?? info.commonExt?.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,
-            remark: extendData.detail.simpleInfo.coreInfo.remark ?? info.simpleInfo?.coreInfo.remark,
+            remark: extendData.detail.simpleInfo.coreInfo.remark ?? info.remark,
-            status: extendData.detail.simpleInfo.status?.status ?? info.simpleInfo?.status?.status,
+            status: extendData.detail.simpleInfo.status?.status ?? info.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.fetchUserDetailInfoV2(self.uid);
+        const OldProfile = await this.core.apis.UserApi.getUserDetailInfo(self.uid);
         return await this.core.apis.UserApi.modifySelfProfile({
             nick: payload.nickname,
-            longNick: (payload?.personal_note ?? OldProfile?.simpleInfo!.baseInfo.longNick) || '',
+            longNick: (payload?.personal_note ?? OldProfile?.longNick) || '',
-            sex: parseInt(payload?.sex ? payload?.sex.toString() : OldProfile?.simpleInfo!.baseInfo.sex!.toString()),
+            sex: parseInt(payload?.sex ? payload?.sex.toString() : OldProfile?.sex!.toString()),
             birthday: {
-                birthday_year: OldProfile?.simpleInfo!.baseInfo.birthday_year!.toString(),
+                birthday_year: OldProfile?.birthday_year!.toString(),
-                birthday_month: OldProfile?.simpleInfo!.baseInfo.birthday_month!.toString(),
+                birthday_month: OldProfile?.birthday_month!.toString(),
-                birthday_day: OldProfile?.simpleInfo!.baseInfo.birthday_day!.toString(),
+                birthday_day: OldProfile?.birthday_day!.toString(),
             },
             location: undefined,
         });

src/onebot/action/group/GetGroupMemberInfo.ts

@@ -32,20 +32,24 @@ 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.fetchUserDetailInfoV2(uid),
+            this.core.apis.UserApi.getUserDetailInfo(uid, isNocache),
         ]);
 
         if (!member || !groupMember) throw new Error(`群(${payload.group_id})成员${payload.user_id}不存在`);
 
-        return { member, info, groupMember };
+        return info ? { ...groupMember, ...member, ...info } : member;
     }
 
     async _handle(payload: Payload) {
         const isNocache = this.parseBoolean(payload.no_cache ?? true);
         const uid = await this.getUid(payload.user_id);
-        const { member, info } = await this.getGroupMemberInfo(payload, uid, isNocache);
+        const member = 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);
+        if (!member) {
+            this.core.context.logger.logDebug('获取群成员详细信息失败, 只能返回基础信息');
+        }
+
+        return OB11Construct.groupMember(payload.group_id.toString(), member);
     }
 }
 

src/onebot/action/group/GetGroupMemberList.ts

@@ -16,35 +16,16 @@ 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 memberArray = Array.from(groupMembers.values());
+        const _groupMembers = await Promise.all(
-
+            Array.from(groupMembers.values()).map(item =>
-        // 批量并行获取用户详情
+                OB11Construct.groupMember(groupIdStr, item)
-        const userDetailsPromises = memberArray.map(member =>
+            )
-            this.core.apis.UserApi.fetchUserDetailInfoV2(member.uid)
-                .catch(_ => {
-                    return { uin: member.uin, uid: member.uid };
-                })
         );
-        const userDetails = await Promise.all(userDetailsPromises);
+        return Array.from(new Map(_groupMembers.map(member => [member.user_id, member])).values());
-
-        // 并行构建 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 {
@@ -56,18 +37,13 @@ export class GetGroupMemberList extends OneBotAction<Payload, OB11GroupMember[]>
         let groupMembers = memberCache.get(groupIdStr);
 
         if (noCache || !groupMembers) {
-            try {
+            const data = this.core.apis.GroupApi.refreshGroupMemberCache(groupIdStr, true).then().catch();
-                const refreshPromise = this.core.apis.GroupApi.refreshGroupMemberCache(groupIdStr, true);
+            groupMembers = memberCache.get(groupIdStr) || (await data);
-
+            if (!groupMembers) {
-                groupMembers = memberCache.get(groupIdStr) || (await refreshPromise);
+                throw new Error(`Failed to get group member list for group ${groupIdStr}`);
-
-                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

@@ -15,24 +15,21 @@ export default class GetFriendList extends OneBotAction<Payload, OB11User[]> {
     override payloadSchema = SchemaData;
 
     async _handle(_payload: Payload) {
-        // 获取好友列表
+        const buddyMap = await this.core.apis.FriendApi.getBuddyV2SimpleInfoMap();
-        let buddyList = await this.core.apis.FriendApi.getBuddyV2SimpleInfoMap();
+        const isNocache = typeof _payload.no_cache === 'string' ? _payload.no_cache === 'true' : !!_payload.no_cache;
-        const buddyArray = Array.from(buddyList.values());
+        await Promise.all(
-
+            Array.from(buddyMap.values()).map(async (buddyInfo) => {
-        // 批量并行获取用户详情
+                try {
-        const userDetailsPromises = buddyArray.map(member =>
+                    const userDetail = await this.core.apis.UserApi.getUserDetailInfo(buddyInfo.coreInfo.uid, isNocache);
-            this.core.apis.UserApi.fetchUserDetailInfoV2(member.uid)
+                    const data = buddyMap.get(buddyInfo.coreInfo.uid);
-                .catch(_ => {
+                    if (data) {
-                    return { uin: member.uin, uid: member.uid };
+                        data.qqLevel = userDetail.qqLevel;
-                })
+                    }
+                } catch (error) {
+                    this.core.context.logger.logError('获取好友详细信息失败', error);
+                }
+            })
         );
-        const userDetails = await Promise.all(userDetailsPromises);
+        return OB11Construct.friends(Array.from(buddyMap.values()));
-
-        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

@@ -34,7 +34,7 @@ import { EventType } from '@/onebot/event/OneBotEvent';
 import { encodeCQCode } from '@/onebot/helper/cqcode';
 import { uriToLocalFile } from '@/common/file';
 import { RequestUtil } from '@/common/request';
-import fsPromise, { constants } from 'node:fs/promises';
+import fsPromise from 'node:fs/promises';
 import { OB11FriendAddNoticeEvent } from '@/onebot/event/notice/OB11FriendAddNoticeEvent';
 import { ForwardMsgBuilder } from '@/common/forward-msg-builder';
 import { NapProtoMsg } from '@napneko/nap-proto-core';
@@ -45,6 +45,7 @@ import { OB11GroupAdminNoticeEvent } from '../event/notice/OB11GroupAdminNoticeE
 import { GroupChange, GroupChangeInfo, GroupInvite, PushMsgBody } from '@/core/packet/transformer/proto';
 import { OB11GroupRequestEvent } from '../event/request/OB11GroupRequest';
 import { LRUCache } from '@/common/lru-cache';
+import { cleanTaskQueue } from '@/common/clean-task';
 
 type RawToOb11Converters = {
     [Key in keyof MessageElement as Key extends `${string}Element` ? Key : never]: (
@@ -444,8 +445,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.fetchUserDetailInfoV2(uid);
+            const info = await this.core.apis.UserApi.getUserDetailInfo(uid);
-            return at(atQQ, uid, NTMsgAtType.ATTYPEONE, info.simpleInfo?.coreInfo.nick || '');
+            return at(atQQ, uid, NTMsgAtType.ATTYPEONE, info.nick || '');
         },
 
         [OB11MessageDataType.reply]: async ({ data: { id } }) => {
@@ -845,7 +846,7 @@ export class OneBotMsgApi {
                 return;
             }
         }
-        resMsg.sender.nickname = (await this.core.apis.UserApi.fetchUserDetailInfoV2(msg.senderUid)).simpleInfo?.coreInfo.nick || '';
+        resMsg.sender.nickname = (await this.core.apis.UserApi.getUserDetailInfo(msg.senderUid)).nick;
     }
 
     private async handleTempGroupMessage(resMsg: OB11Message, msg: RawMessage) {
@@ -970,7 +971,6 @@ export class OneBotMsgApi {
         });
 
         const timeout = 10000 + (totalSize / 1024 / 256 * 1000);
-
         try {
             const returnMsg = await this.core.apis.MsgApi.sendMsg(peer, sendElements, timeout);
             if (!returnMsg) throw new Error('发送消息失败');
@@ -983,18 +983,19 @@ export class OneBotMsgApi {
         } catch (error) {
             throw new Error((error as Error).message);
         } finally {
-            setTimeout(async () => {
+            cleanTaskQueue.addFiles(deleteAfterSentFiles, timeout);
-                const deletePromises = deleteAfterSentFiles.map(async file => {
+            // setTimeout(async () => {
-                    try {
+            //     const deletePromises = deleteAfterSentFiles.map(async file => {
-                        if (await fsPromise.access(file, constants.W_OK).then(() => true).catch(() => false)) {
+            //         try {
-                            await fsPromise.unlink(file);
+            //             if (await fsPromise.access(file, constants.W_OK).then(() => true).catch(() => false)) {
-                        }
+            //                 await fsPromise.unlink(file);
-                    } catch (e) {
+            //             }
-                        this.core.context.logger.logError('发送消息删除文件失败', e);
+            //         } catch (e) {
-                    }
+            //             this.core.context.logger.logError('发送消息删除文件失败', e);
-                });
+            //         }
-                await Promise.all(deletePromises);
+            //     });
-            }, 60000);
+            //     await Promise.all(deletePromises);
+            // }, 60000);
         }
     }
 

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, UserV2 } from '@/core';
+import { FriendV2, Group, GroupFileInfoUpdateParamType, GroupMember, SelfInfo, NTSex } from '@/core';
 import {
     OB11Group,
     OB11GroupFile,
@@ -14,7 +14,7 @@ export class OB11Construct {
     static selfInfo(selfInfo: SelfInfo): OB11User {
         return {
             user_id: +selfInfo.uin,
-            nickname: selfInfo.simpleInfo?.coreInfo.nick ?? '',
+            nickname: selfInfo.nick,
         };
     }
 
@@ -31,10 +31,10 @@ export class OB11Construct {
             nickname: rawFriend.coreInfo.nick ?? '',
             remark: rawFriend.coreInfo.remark ?? rawFriend.coreInfo.nick,
             sex: this.sex(rawFriend.baseInfo.sex),
-            level: 0,
+            level: rawFriend.qqLevel && calcQQLevel(rawFriend.qqLevel) || 0,
         }));
     }
-    static friend(friends: FriendV2,info:UserV2): OB11User {
+    static friend(friends: FriendV2): OB11User {
         return {
             birthday_year: friends.baseInfo.birthday_year,
             birthday_month: friends.baseInfo.birthday_month,
@@ -47,8 +47,7 @@ export class OB11Construct {
             nickname: friends.coreInfo.nick ?? '',
             remark: friends.coreInfo.remark ?? friends.coreInfo.nick,
             sex: this.sex(friends.baseInfo.sex),
-            level: calcQQLevel(info?.commonExt?.qqLevel) || 0,
+            level: 0,
-            qid: friends.baseInfo.qid,
         };
     }
     static groupMemberRole(role: number): OB11GroupMemberRole | undefined {
@@ -69,20 +68,20 @@ export class OB11Construct {
         }[sex] || OB11UserSex.unknown;
     }
 
-    static groupMember(group_id: string, member: GroupMember, info: UserV2): OB11GroupMember {
+    static groupMember(group_id: string, member: GroupMember): OB11GroupMember {
         return {
             group_id: +group_id,
             user_id: +member.uin,
             nickname: member.nick,
             card: member.cardName,
-            sex: this.sex(info?.simpleInfo?.baseInfo.sex),
+            sex: this.sex(member.sex),
-            age: info?.simpleInfo?.baseInfo.age ?? 0,
+            age: member.age ?? 0,
-            area: info?.commonExt?.address,
+            area: '',
             level: member.memberRealLevel?.toString() ?? '0',
-            qq_level: info?.commonExt?.qqLevel && calcQQLevel(info.commonExt.qqLevel) || 0,
+            qq_level: member.qqLevel && calcQQLevel(member.qqLevel) || 0,
             join_time: +member.joinTime,
             last_sent_time: +member.lastSpeakTime,
-            title_expire_time: +member.specialTitleExpireTime,
+            title_expire_time: 0,
             unfriendly: false,
             card_changeable: true,
             is_robot: member.isRobot,

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.fetchUserDetailInfoV2(this.core.selfInfo.uid)
+        this.core.apis.UserApi.getUserDetailInfo(selfInfo.uid, false)
             .then((user) => {
-                this.core.selfInfo = { ...user, online: this.core.selfInfo.online };
+                selfInfo.nick = user.nick;
-                this.context.logger.setLogSelfInfo({ nick: this.core.selfInfo.simpleInfo?.coreInfo.nick ?? '', uid: this.core.selfInfo.uid });
+                this.context.logger.setLogSelfInfo(selfInfo);
             })
             .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(this.core.selfInfo);
+        WebUiDataRuntime.setQQLoginInfo(selfInfo);
         WebUiDataRuntime.setQQLoginStatus(true);
         WebUiDataRuntime.setOnOB11ConfigChanged(async (newConfig) => {
             const prev = this.configLoader.configData;

src/onebot/network/websocket-client.ts

@@ -37,7 +37,13 @@ export class OB11WebSocketClientAdapter extends IOB11NetworkAdapter<WebsocketCli
             }, this.config.heartInterval);
         }
         this.isEnable = true;
-        await this.tryConnect();
+        try {
+            await this.tryConnect();
+        } catch (error) {
+            this.logger.logError('[OneBot] [WebSocket Client] TryConnect Error , info -> ', error);
+
+        }
+
     }
 
     close() {

src/onebot/types/data.ts

@@ -1,7 +1,7 @@
 export interface OB11User {
-    birthday_year?: number;
+    birthday_year?: number; // 生日
-    birthday_month?: number;
+    birthday_month?: number; // 生日
-    birthday_day?: number;
+    birthday_day?: number; // 生日
     phone_num?: string; // 手机号
     email?: string; // 邮箱
     category_id?: number; // 分组ID

src/shell/base.ts

@@ -131,6 +131,7 @@ async function handleLogin(
         inner_resolve({
             uid: loginResult.uid,
             uin: loginResult.uin,
+            nick: '',
             online: true,
         });
 
@@ -138,6 +139,7 @@ async function handleLogin(
     loginListener.onLoginConnected = () => {
         waitForNetworkConnection(loginService, logger).then(() => {
             handleLoginInner(context, logger, loginService, quickLoginUin, historyLoginList).then().catch(e => logger.logError(e));
+            loginListener.onLoginConnected = () => { };
         });
     }
     loginListener.onQRCodeGetPicture = ({ pngBase64QrcodeData, qrcodeUrl }) => {
@@ -221,6 +223,11 @@ async function handleLoginInner(context: { isLogined: boolean }, logger: LogWrap
                 }`);
         }
         loginService.getQRCodePicture();
+        try {
+            await WebUiDataRuntime.runWebUiConfigQuickFunction();
+        } catch (error) {
+            logger.logError('WebUi 快速登录失败 执行失败', error);
+        }
     }
 
     loginService.getLoginList().then((res) => {
@@ -345,8 +352,8 @@ export async function NCoreInitShell() {
         guid,
         basicInfoWrapper.QQVersionAppid,
         basicInfoWrapper.getFullQQVesion(),
-        selfInfo.uin ?? '',
+        selfInfo.uin,
-        selfInfo.uid ?? '',
+        selfInfo.uid,
         dataPath,
     );
 
@@ -379,6 +386,7 @@ export async function NCoreInitShell() {
 export class NapCatShell {
     readonly core: NapCatCore;
     readonly context: InstanceContext;
+
     constructor(
         wrapper: WrapperNodeApi,
         session: NodeIQQNTWrapperSession,

src/webui/index.ts

@@ -50,20 +50,21 @@ export async function InitWebUi(logger: LogWrapper, pathWrapper: NapCatPathWrapp
         logger.log('[NapCat] [WebUi] Current WebUi is not run.');
         return;
     }
-    setTimeout(async () => {
+    WebUiDataRuntime.setWebUiConfigQuickFunction(
-        let autoLoginAccount = process.env['NAPCAT_QUICK_ACCOUNT'] || WebUiConfig.getAutoLoginAccount();
+        async () => {
-        if (autoLoginAccount) {
+            let autoLoginAccount = process.env['NAPCAT_QUICK_ACCOUNT'] || WebUiConfig.getAutoLoginAccount();
-            try {
+            if (autoLoginAccount) {
-                const { result, message } = await WebUiDataRuntime.requestQuickLogin(autoLoginAccount);
+                try {
-                if (!result) {
+                    const { result, message } = await WebUiDataRuntime.requestQuickLogin(autoLoginAccount);
-                    throw new Error(message);
+                    if (!result) {
+                        throw new Error(message);
+                    }
+                    console.log(`[NapCat] [WebUi] Auto login account: ${autoLoginAccount}`);
+                } catch (error) {
+                    console.log(`[NapCat] [WebUi] Auto login account failed.` + error);
                 }
-                console.log(`[NapCat] [WebUi] Auto login account: ${autoLoginAccount}`);
-            } catch (error) {
-                console.log(`[NapCat] [WebUi] Auto login account failed.` + error);
             }
-        }
+        });
-    }, 30000);
     // ------------注册中间件------------
     // 使用express的json中间件
     app.use(express.json());

src/webui/src/helper/Data.ts

@@ -25,6 +25,9 @@ const LoginRuntime: LoginRuntimeType = {
         NewQQLoginList: [],
     },
     packageJson: packageJson,
+    WebUiConfigQuickFunction: async () => {
+        return;
+    }
 };
 
 export const WebUiDataRuntime = {
@@ -118,4 +121,11 @@ export const WebUiDataRuntime = {
     getQQVersion() {
         return LoginRuntime.QQVersion;
     },
+
+    setWebUiConfigQuickFunction(func: LoginRuntimeType['WebUiConfigQuickFunction']): void {
+        LoginRuntime.WebUiConfigQuickFunction = func;
+    },
+    runWebUiConfigQuickFunction: async function () {
+        await LoginRuntime.WebUiConfigQuickFunction();
+    }
 };

src/webui/src/types/data.d.ts

@@ -9,6 +9,7 @@ interface LoginRuntimeType {
     QQLoginUin: string;
     QQLoginInfo: SelfInfo;
     QQVersion: string;
+    WebUiConfigQuickFunction: () => Promise<void>;
     NapCatHelper: {
         onQuickLoginRequested: (uin: string) => Promise<{ result: boolean; message: string }>;
         onOB11ConfigChanged: (ob11: OneBotConfig) => Promise<void>;