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

fix: 下载文件失败

launcher/launcher-win10.bat

@@ -5,11 +5,11 @@ if %errorLevel% == 0 (
     echo Administrator mode detected.
 ) else (
     echo Please run this script in administrator mode.
-    powershell -Command "Start-Process 'cmd.exe' -ArgumentList '/c cd /d \"%cd%\" && \"%~f0\"' -Verb runAs" 
+    powershell -Command "Start-Process 'cmd.exe' -ArgumentList '/c cd /d \"%cd%\" && \"%~f0\" %1' -Verb runAs" 
     exit
 )
 
-set NAPCAT_PATCH_PATH=%cd%\patchNapCat.js
+set NAPCAT_PATCH_PACKAGE=%cd%\qqnt.json
 set NAPCAT_LOAD_PATH=%cd%\loadNapCat.js
 set NAPCAT_INJECT_PATH=%cd%\NapCatWinBootHook.dll
 set NAPCAT_LAUNCHER_PATH=%cd%\NapCatWinBootMain.exe
@@ -35,6 +35,6 @@ if not exist "%QQpath%" (
 set NAPCAT_MAIN_PATH=%NAPCAT_MAIN_PATH:\=/%
 echo (async () =^> {await import("file:///%NAPCAT_MAIN_PATH%")})() > %NAPCAT_LOAD_PATH%
 
-"%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%"
+"%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" %1
 
 REM "%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" 123456

launcher/launcher.bat

@@ -5,11 +5,11 @@ if %errorLevel% == 0 (
     echo Administrator mode detected.
 ) else (
     echo Please run this script in administrator mode.
-    powershell -Command "Start-Process 'wt.exe' -ArgumentList 'cmd /c cd /d \"%cd%\" && \"%~f0\"' -Verb runAs"
+    powershell -Command "Start-Process 'wt.exe' -ArgumentList 'cmd /c cd /d \"%cd%\" && \"%~f0\" %1' -Verb runAs"
     exit
 )
 
-set NAPCAT_PATCH_PATH=%cd%\patchNapCat.js
+set NAPCAT_PATCH_PACKAGE=%cd%\qqnt.json
 set NAPCAT_LOAD_PATH=%cd%\loadNapCat.js
 set NAPCAT_INJECT_PATH=%cd%\NapCatWinBootHook.dll
 set NAPCAT_LAUNCHER_PATH=%cd%\NapCatWinBootMain.exe
@@ -36,6 +36,4 @@ if not exist "%QQpath%" (
 set NAPCAT_MAIN_PATH=%NAPCAT_MAIN_PATH:\=/%
 echo (async () =^> {await import("file:///%NAPCAT_MAIN_PATH%")})() > %NAPCAT_LOAD_PATH%
 
-"%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%"
-
-REM "%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" 123456
+"%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" %1

launcher/patchNapCat.js

@@ -1 +0,0 @@
-require('./launcher.node').load('external_index', module);

launcher/qqnt.json

@@ -0,0 +1,23 @@
+{
+  "name": "qq-chat",
+  "version": "9.9.15-28060",
+  "type": "module",
+  "private": true,
+  "description": "QQ",
+  "productName": "QQ",
+  "author": {
+    "name": "Tencent",
+    "email": "QQ-Team@tencent.com"
+  },
+  "homepage": "https://im.qq.com",
+  "sideEffects": true,
+  "bin": {
+    "qd": "externals/devtools/cli/index.js"
+  },
+  "main": "./loadNapCat.js",
+  "buildVersion": "28060",
+  "isPureShell": true,
+  "isByteCodeShell": true,
+  "platform": "win32",
+  "eleArch": "x64"
+}

launcher/quickLoginExample.bat

@@ -0,0 +1,4 @@
+@echo off
+REM ./launcher.bat 123456
+REM ./launcher-win10.bat 123456
+REM 带有REM的为注释 删掉你需要的系统的那行REM这三个单词 修改QQ本脚本启动即可

manifest.json

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

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "2.3.7",
+  "version": "2.5.5",
   "scripts": {
     "build:framework": "vite build --mode framework",
     "build:shell": "vite build --mode shell",
@@ -57,6 +57,7 @@
     "image-size": "^1.1.1",
     "json-schema-to-ts": "^3.1.0",
     "log4js": "^6.9.1",
+    "protobufjs": "~7.4.0",
     "qrcode-terminal": "^0.12.0",
     "silk-wasm": "^3.6.1",
     "strtok3": "8.0.1",

src/common/audio.ts

@@ -1,66 +1,67 @@
-import fs from 'fs';
-import { encode, getDuration, getWavFileInfo, isSilk, isWav } from 'silk-wasm';
 import fsPromise from 'fs/promises';
 import path from 'node:path';
 import { randomUUID } from 'crypto';
 import { spawn } from 'node:child_process';
+import { encode, getDuration, getWavFileInfo, isSilk, isWav } from 'silk-wasm';
 import { LogWrapper } from './log';
 
-export async function encodeSilk(filePath: string, TEMP_DIR: string, logger: LogWrapper) {
-    async function guessDuration(pttPath: string) {
-        const pttFileInfo = await fsPromise.stat(pttPath);
-        let duration = pttFileInfo.size / 1024 / 3;  // 3kb/s
-        duration = Math.floor(duration);
-        duration = Math.max(1, duration);
-        logger.log('通过文件大小估算语音的时长:', duration);
-        return duration;
-    }
+const ALLOW_SAMPLE_RATE = [8000, 12000, 16000, 24000, 32000, 44100, 48000];
+const EXIT_CODES = [0, 255];
+const FFMPEG_PATH = process.env.FFMPEG_PATH || 'ffmpeg';
 
+async function guessDuration(pttPath: string, logger: LogWrapper) {
+    const pttFileInfo = await fsPromise.stat(pttPath);
+    const duration = Math.max(1, Math.floor(pttFileInfo.size / 1024 / 3));  // 3kb/s
+    logger.log('通过文件大小估算语音的时长:', duration);
+    return duration;
+}
+
+async function convert(filePath: string, pcmPath: string, logger: LogWrapper): Promise<Buffer> {
+    return new Promise<Buffer>((resolve, reject) => {
+        const cp = spawn(FFMPEG_PATH, ['-y', '-i', filePath, '-ar', '24000', '-ac', '1', '-f', 's16le', pcmPath]);
+        cp.on('error', (err: Error) => {
+            logger.log('FFmpeg处理转换出错: ', err.message);
+            reject(err);
+        });
+        cp.on('exit', async (code, signal) => {
+            if (code == null || EXIT_CODES.includes(code)) {
+                try {
+                    const data = await fsPromise.readFile(pcmPath);
+                    await fsPromise.unlink(pcmPath);
+                    resolve(data);
+                } catch (err) {
+                    reject(err);
+                }
+            } else {
+                logger.log(`FFmpeg exit: code=${code ?? 'unknown'} sig=${signal ?? 'unknown'}`);
+                reject(new Error('FFmpeg处理转换失败'));
+            }
+        });
+    });
+}
+
+async function handleWavFile(
+    file: Buffer, filePath: string, pcmPath: string, logger: LogWrapper
+): Promise<{input: Buffer, sampleRate: number}> {
+    const { fmt } = getWavFileInfo(file);
+    if (!ALLOW_SAMPLE_RATE.includes(fmt.sampleRate)) {
+        return {input: await convert(filePath, pcmPath, logger), sampleRate: 24000};
+    }
+    return {input: file, sampleRate: fmt.sampleRate};
+}
+
+export async function encodeSilk(filePath: string, TEMP_DIR: string, logger: LogWrapper) {
     try {
         const file = await fsPromise.readFile(filePath);
         const pttPath = path.join(TEMP_DIR, randomUUID());
         if (!isSilk(file)) {
             logger.log(`语音文件${filePath}需要转换成silk`);
-            const _isWav = isWav(file);
-            const pcmPath = pttPath + '.pcm';
-            let sampleRate = 0;
-            const convert = () => {
-                return new Promise<Buffer>((resolve, reject) => {
-                    // todo: 通过配置文件获取ffmpeg路径
-                    const ffmpegPath = process.env.FFMPEG_PATH || 'ffmpeg';
-                    const cp = spawn(ffmpegPath, ['-y', '-i', filePath, '-ar', '24000', '-ac', '1', '-f', 's16le', pcmPath]);
-                    cp.on('error', err => {
-                        logger.log('FFmpeg处理转换出错: ', err.message);
-                        return reject(err);
-                    });
-                    cp.on('exit', (code, signal) => {
-                        const EXIT_CODES = [0, 255];
-                        if (code == null || EXIT_CODES.includes(code)) {
-                            sampleRate = 24000;
-                            const data = fs.readFileSync(pcmPath);
-                            fs.unlink(pcmPath, (err) => {
-                            });
-                            return resolve(data);
-                        }
-                        logger.log(`FFmpeg exit: code=${code ?? 'unknown'} sig=${signal ?? 'unknown'}`);
-                        reject(Error('FFmpeg处理转换失败'));
-                    });
-                });
-            };
-            let input: Buffer;
-            if (!_isWav) {
-                input = await convert();
-            } else {
-                input = file;
-                const allowSampleRate = [8000, 12000, 16000, 24000, 32000, 44100, 48000];
-                const { fmt } = getWavFileInfo(input);
-                // log(`wav文件信息`, fmt)
-                if (!allowSampleRate.includes(fmt.sampleRate)) {
-                    input = await convert();
-                }
-            }
+            const pcmPath = `${pttPath}.pcm`;
+            const { input, sampleRate } = isWav(file)
+                ? (await handleWavFile(file, filePath, pcmPath, logger))
+                : {input: await convert(filePath, pcmPath, logger), sampleRate: 24000};
             const silk = await encode(input, sampleRate);
-            fs.writeFileSync(pttPath, silk.data);
+            await fsPromise.writeFile(pttPath, silk.data);
             logger.log(`语音文件${filePath}转换成功!`, pttPath, '时长:', silk.duration);
             return {
                 converted: true,
@@ -68,15 +69,13 @@ export async function encodeSilk(filePath: string, TEMP_DIR: string, logger: Log
                 duration: silk.duration / 1000,
             };
         } else {
-            const silk = file;
             let duration = 0;
             try {
-                duration = getDuration(silk) / 1000;
+                duration = getDuration(file) / 1000;
             } catch (e: any) {
                 logger.log('获取语音文件时长失败, 使用文件大小推测时长', filePath, e.stack);
-                duration = await guessDuration(filePath);
+                duration = await guessDuration(filePath, logger);
             }
-
             return {
                 converted: false,
                 path: filePath,
@@ -87,4 +86,4 @@ export async function encodeSilk(filePath: string, TEMP_DIR: string, logger: Log
         logger.logError('convert silk failed', error.stack);
         return {};
     }
-}
+}

src/common/file.ts

@@ -123,7 +123,7 @@ export interface HttpDownloadOptions {
     headers?: Record<string, string> | string;
 }
 
-export async function httpDownload(options: string | HttpDownloadOptions): Promise<Buffer> {
+async function tryDownload(options: string | HttpDownloadOptions, useReferer: boolean = false): Promise<Response> {
     // const chunks: Buffer[] = [];
     let url: string;
     let headers: Record<string, string> = {
@@ -142,15 +142,26 @@ export async function httpDownload(options: string | HttpDownloadOptions): Promi
             }
         }
     }
+    if (useReferer && !headers['Referer']) {
+        headers['Referer'] = url;
+    };
     const fetchRes = await fetch(url, { headers }).catch((err) => {
         if (err.cause) {
             throw err.cause;
         }
         throw err;
     });
-    if (!fetchRes.ok) throw new Error(`下载文件失败: ${fetchRes.statusText}`);
+    return fetchRes;
+}
 
-    const blob = await fetchRes.blob();
+export async function httpDownload(options: string | HttpDownloadOptions): Promise<Buffer> {
+    const useReferer = typeof options === 'string';
+    let resp = await tryDownload(options);
+    if (resp.status === 403 && useReferer) {
+        resp = await tryDownload(options, true);
+    }
+    if (!resp.ok) throw new Error(`下载文件失败: ${resp.statusText}`);
+    const blob = await resp.blob();
     const buffer = await blob.arrayBuffer();
     return Buffer.from(buffer);
 }
@@ -160,8 +171,7 @@ type Uri2LocalRes = {
     errMsg: string,
     fileName: string,
     ext: string,
-    path: string,
-    isLocal: boolean
+    path: string
 }
 
 export async function checkFileV2(filePath: string) {
@@ -194,7 +204,6 @@ export async function checkUriType(Uri: string) {
         return undefined;
     }, Uri);
     if (LocalFileRet) return LocalFileRet;
-
     const OtherFileRet = await solveProblem((uri: string) => {
         //再判断是否是Http
         if (uri.startsWith('http://') || uri.startsWith('https://')) {
@@ -206,15 +215,19 @@ export async function checkUriType(Uri: string) {
         }
         if (uri.startsWith('file://')) {
             let filePath: string;
-            // await fs.copyFile(url.pathname, filePath);
             const pathname = decodeURIComponent(new URL(uri).pathname);
             if (process.platform === 'win32') {
                 filePath = pathname.slice(1);
             } else {
                 filePath = pathname;
             }
+
             return { Uri: filePath, Type: FileUriType.Local };
         }
+        if (uri.startsWith('data:')) {
+            const data = uri.split(',')[1];
+            if (data) return { Uri: data, Type: FileUriType.Base64 };
+        }
     }, Uri);
     if (OtherFileRet) return OtherFileRet;
 
@@ -224,34 +237,42 @@ export async function checkUriType(Uri: string) {
 export async function uri2local(dir: string, uri: string, filename: string | undefined = undefined): Promise<Uri2LocalRes> {
     const { Uri: HandledUri, Type: UriType } = await checkUriType(uri);
     //解析失败
+    const tempName = randomUUID();
+    if (!filename) filename = randomUUID();
+    //解析Http和Https协议
 
     if (UriType == FileUriType.Unknown) {
-        return { success: false, errMsg: '未知文件类型', fileName: '', ext: '', path: '', isLocal: false };
+        return { success: false, errMsg: '未知文件类型', fileName: '', ext: '', path: '' };
     }
     //解析File协议和本地文件
     if (UriType == FileUriType.Local) {
         const fileExt = path.extname(HandledUri);
-        const filename = path.basename(HandledUri, fileExt);
-        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: HandledUri, isLocal: true };
+        let filename = path.basename(HandledUri, fileExt);
+        filename += fileExt;
+        //复制文件到临时文件并保持后缀
+        const filenameTemp = tempName + fileExt;
+        const filePath = path.join(dir, filenameTemp);
+        fs.copyFileSync(HandledUri, filePath);
+        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: filePath };
     }
     //接下来都要有文件名
-    if (!filename) filename = randomUUID();
-    //解析Http和Https协议
 
     if (UriType == FileUriType.Remote) {
         const pathInfo = path.parse(decodeURIComponent(new URL(HandledUri).pathname));
         if (pathInfo.name) {
-            filename = pathInfo.name;
+            const pathlen = 200 - dir.length - pathInfo.name.length;
+            filename = pathlen > 0 ? pathInfo.name.substring(0, pathlen) : pathInfo.name.substring(pathInfo.name.length, pathInfo.name.length - 10);//过长截断
             if (pathInfo.ext) {
                 filename += pathInfo.ext;
             }
         }
         filename = filename.replace(/[/\\:*?"<>|]/g, '_');
-        const fileExt = path.extname(HandledUri);
-        const filePath = path.join(dir, filename);
+        const fileExt = path.extname(HandledUri).replace(/[/\\:*?"<>|]/g, '_').substring(0, 10);
+        const filePath = path.join(dir, tempName + fileExt);
         const buffer = await httpDownload(HandledUri);
-        fs.writeFileSync(filePath, buffer);
-        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: filePath, isLocal: true };
+        //没有文件就创建
+        fs.writeFileSync(filePath, buffer, { flag: 'wx' });
+        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: filePath };
     }
     //解析Base64
     if (UriType == FileUriType.Base64) {
@@ -266,7 +287,7 @@ export async function uri2local(dir: string, uri: string, filename: string | und
             fileExt = ext;
             filename = filename + '.' + ext;
         }
-        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: filePath, isLocal: true };
+        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: filePath };
     }
-    return { success: false, errMsg: '未知文件类型', fileName: '', ext: '', path: '', isLocal: false };
+    return { success: false, errMsg: '未知文件类型', fileName: '', ext: '', path: '' };
 }

src/common/helper.ts

@@ -25,8 +25,13 @@ export async function solveAsyncProblem<T extends (...args: any[]) => Promise<an
 }
 
 export class FileNapCatOneBotUUID {
-    static encodeModelId(peer: Peer, modelId: string, fileId: string): string {
-        return `NapCatOneBot|ModelIdFile|${peer.chatType}|${peer.peerUid}|${modelId}|${fileId}`;
+    static encodeModelId(peer: Peer, modelId: string, fileId: string, endString: string = ""): string {
+        const data = `NapCatOneBot|ModelIdFile|${peer.chatType}|${peer.peerUid}|${modelId}|${fileId}`;
+        //前四个字节塞data长度
+        const length = Buffer.alloc(4 + data.length);
+        length.writeUInt32BE(data.length * 2, 0);//储存data的hex长度
+        length.write(data, 4);
+        return length.toString('hex') + endString;
     }
 
     static decodeModelId(uuid: string): undefined | {
@@ -34,8 +39,14 @@ export class FileNapCatOneBotUUID {
         modelId: string,
         fileId: string
     } {
-        if (!uuid.startsWith('NapCatOneBot|ModelIdFile|')) return undefined;
-        const data = uuid.split('|');
+        //前四个字节是data长度
+        const length = Buffer.from(uuid.slice(0, 8), 'hex').readUInt32BE(0);
+        //根据length计算需要读取的长度
+        const dataId = uuid.slice(8, 8 + length);
+        //hex还原为string
+        const realData = Buffer.from(dataId, 'hex').toString();
+        if (!realData.startsWith('NapCatOneBot|ModelIdFile|')) return undefined;
+        const data = realData.split('|');
         if (data.length !== 6) return undefined;
         const [, , chatType, peerUid, modelId, fileId] = data;
         return {
@@ -48,8 +59,14 @@ export class FileNapCatOneBotUUID {
         };
     }
 
-    static encode(peer: Peer, msgId: string, elementId: string): string {
-        return `NapCatOneBot|MsgFile|${peer.chatType}|${peer.peerUid}|${msgId}|${elementId}`;
+    static encode(peer: Peer, msgId: string, elementId: string, endString: string = ""): string {
+        const data = `NapCatOneBot|MsgFile|${peer.chatType}|${peer.peerUid}|${msgId}|${elementId}`;
+        //前四个字节塞data长度
+        //一个字节8位 一个ascii字符1字节 一个hex字符4位 表示一个ascii字符需要两个hex字符
+        const length = Buffer.alloc(4 + data.length);
+        length.writeUInt32BE(data.length * 2, 0);
+        length.write(data, 4);
+        return length.toString('hex') + endString;
     }
 
     static decode(uuid: string): undefined | {
@@ -57,8 +74,14 @@ export class FileNapCatOneBotUUID {
         msgId: string,
         elementId: string
     } {
-        if (!uuid.startsWith('NapCatOneBot|MsgFile|')) return undefined;
-        const data = uuid.split('|');
+        //前四个字节是data长度
+        const length = Buffer.from(uuid.slice(0, 8), 'hex').readUInt32BE(0);
+        //根据length计算需要读取的长度
+        const dataId = uuid.slice(8, 8 + length);
+        //hex还原为string
+        const realData = Buffer.from(dataId, 'hex').toString();
+        if (!realData.startsWith('NapCatOneBot|MsgFile|')) return undefined;
+        const data = realData.split('|');
         if (data.length !== 6) return undefined;
         const [, , chatType, peerUid, msgId, elementId] = data;
         return {
@@ -140,34 +163,45 @@ export function isEqual(obj1: any, obj2: any) {
 export function getDefaultQQVersionConfigInfo(): QQVersionConfigType {
     if (os.platform() === 'linux') {
         return {
-            baseVersion: '3.2.12-27597',
-            curVersion: '3.2.12-27597',
+            baseVersion: '3.2.12.28060',
+            curVersion: '3.2.12.28060',
             prevVersion: '',
             onErrorVersions: [],
-            buildId: '27597',
+            buildId: '27254',
+        };
+    }
+    if (os.platform() === 'darwin') {
+        return {
+            baseVersion: '6.9.53.28060',
+            curVersion: '6.9.53.28060',
+            prevVersion: '',
+            onErrorVersions: [],
+            buildId: '28060',
         };
     }
     return {
-        baseVersion: '9.9.15-27597',
-        curVersion: '9.9.15-27597',
+        baseVersion: '9.9.15-28060',
+        curVersion: '9.9.15-28060',
         prevVersion: '',
         onErrorVersions: [],
-        buildId: '27597',
+        buildId: '28060',
     };
 }
 
-export function getQQPackageInfoPath(exePath: string = ''): string {
+export function getQQPackageInfoPath(exePath: string = '', version: string): string {
     if (os.platform() === 'darwin') {
         return path.join(path.dirname(exePath), '..', 'Resources', 'app', 'package.json');
+    } else if (os.platform() === 'linux') {
+        return path.join(path.dirname(exePath), './resources/app/package.json');
     } else {
-        return path.join(path.dirname(exePath), 'resources', 'app', 'package.json');
+        return path.join(path.dirname(exePath), './versions/' + version + '/resources/app/package.json');
     }
 }
 
 export function getQQVersionConfigPath(exePath: string = ''): string | undefined {
     let configVersionInfoPath;
     if (os.platform() === 'win32') {
-        configVersionInfoPath = path.join(path.dirname(exePath), 'resources', 'app', 'versions', 'config.json');
+        configVersionInfoPath = path.join(path.dirname(exePath), 'versions', 'config.json');
     } else if (os.platform() === 'darwin') {
         const userPath = os.homedir();
         const appDataPath = path.resolve(userPath, './Library/Application Support/QQ');
@@ -186,7 +220,8 @@ export function getQQVersionConfigPath(exePath: string = ''): string | undefined
     return configVersionInfoPath;
 }
 
-export function calcQQLevel(level: QQLevel) {
+export function calcQQLevel(level?: QQLevel) {
+    if (!level) return 0;
     const { crownNum, sunNum, moonNum, starNum } = level;
     return crownNum * 64 + sunNum * 16 + moonNum * 4 + starNum;
 }

src/common/qq-basic-info.ts

@@ -19,14 +19,16 @@ export class QQBasicInfoWrapper {
         //基础目录获取
         this.context = context;
         this.QQMainPath = process.execPath;
-        this.QQPackageInfoPath = getQQPackageInfoPath(this.QQMainPath);
         this.QQVersionConfigPath = getQQVersionConfigPath(this.QQMainPath);
 
+
         //基础信息获取 无快更则启用默认模板填充
         this.isQuickUpdate = !!this.QQVersionConfigPath;
         this.QQVersionConfig = this.isQuickUpdate
             ? JSON.parse(fs.readFileSync(this.QQVersionConfigPath!).toString())
             : getDefaultQQVersionConfigInfo();
+
+        this.QQPackageInfoPath = getQQPackageInfoPath(this.QQMainPath, this.QQVersionConfig?.curVersion!);
         this.QQPackageInfo = JSON.parse(fs.readFileSync(this.QQPackageInfoPath).toString());
         const { appid: IQQVersionAppid, qua: IQQVersionQua } = this.getAppidV2();
         this.QQVersionAppid = IQQVersionAppid;
@@ -56,7 +58,7 @@ export class QQBasicInfoWrapper {
             case 'linux':
                 return `V1_LNX_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;
             case 'darwin':
-                return `V1_MAC_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;                
+                return `V1_MAC_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;
             default:
                 return `V1_WIN_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;
         }
@@ -65,11 +67,11 @@ export class QQBasicInfoWrapper {
     getAppidInternal() {
         switch (systemPlatform) {
             case 'linux':
-                return '537243600';
+                return '537246140';
             case 'darwin':
-                return '537243441';
+                return '537246140';
             default:
-                return '537243538';
+                return '537246092';
         }
     }
 

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '2.3.7';
+export const napCatVersion = '2.5.5';

src/core/adapters/NodeIDependsAdapter.ts

@@ -1,9 +1,8 @@
+import { MsfChangeReasonType, MsfStatusType } from "../entities/adapter";
+
 export class NodeIDependsAdapter {
-    onMSFStatusChange(arg1: number, arg2: number) {
-        // console.log(arg1, arg2);
-        // if (arg1 == 2 && arg2 == 2) {
-        //   log("NapCat丢失网络连接,请检查网络")
-        // }
+    onMSFStatusChange(statusType: MsfStatusType, changeReasonType: MsfChangeReasonType) {
+
     }
 
     onMSFSsoError(args: unknown) {

src/core/apis/cache.ts

@@ -1,63 +0,0 @@
-import {
-    CacheFileListItem,
-    CacheFileType,
-    ChatCacheListItemBasic,
-    ChatType,
-    InstanceContext,
-    NapCatCore,
-} from '@/core';
-
-export class NTQQCacheApi {
-    context: InstanceContext;
-    core: NapCatCore;
-
-    constructor(context: InstanceContext, core: NapCatCore) {
-        this.context = context;
-        this.core = core;
-    }
-
-    async setCacheSilentScan(isSilent: boolean = true) {
-        return '';
-    }
-
-    getCacheSessionPathList() {
-        return '';
-    }
-
-    clearCache(cacheKeys: Array<string> = ['tmp', 'hotUpdate']) {
-        // 参数未验证
-        return this.context.session.getStorageCleanService().clearCacheDataByKeys(cacheKeys);
-    }
-
-    addCacheScannedPaths(pathMap: object = {}) {
-        return this.context.session.getStorageCleanService().addCacheScanedPaths(pathMap);
-    }
-
-    scanCache() {
-        //return (await this.context.session.getStorageCleanService().scanCache()).size;
-    }
-
-    getHotUpdateCachePath() {
-        // 未实现
-        return '';
-    }
-
-    getDesktopTmpPath() {
-        // 未实现
-        return '';
-    }
-
-    getChatCacheList(type: ChatType, pageSize: number = 1000, pageIndex: number = 0) {
-        return this.context.session.getStorageCleanService().getChatCacheInfo(type, pageSize, 1, pageIndex);
-    }
-
-    getFileCacheInfo(fileType: CacheFileType, pageSize: number = 1000, lastRecord?: CacheFileListItem) {
-        // const _lastRecord = lastRecord ? lastRecord : { fileType: fileType };
-        // 需要五个参数
-        // return napCatCore.session.getStorageCleanService().getFileCacheInfo();
-    }
-
-    async clearChatCache(chats: ChatCacheListItemBasic[] = [], fileKeys: string[] = []) {
-        return this.context.session.getStorageCleanService().clearChatCacheInfo(chats, fileKeys);
-    }
-}

src/core/apis/file.ts

@@ -24,6 +24,7 @@ import pathLib from 'node:path';
 import { defaultVideoThumbB64, getVideoInfo } from '@/common/video';
 import ffmpeg from 'fluent-ffmpeg';
 import { encodeSilk } from '@/common/audio';
+import { MessageContext } from '@/onebot/api';
 
 export class NTQQFileApi {
     context: InstanceContext;
@@ -33,7 +34,7 @@ export class NTQQFileApi {
     constructor(context: InstanceContext, core: NapCatCore) {
         this.context = context;
         this.core = core;
-        this.rkeyManager = new RkeyManager('http://napcat-sign.wumiao.wang:2082/rkey', this.context.logger);
+        this.rkeyManager = new RkeyManager(['https://llob.linyuchen.net/rkey', 'http://napcat-sign.wumiao.wang:2082/rkey'], this.context.logger);
     }
 
     async copyFile(filePath: string, destPath: string) {
@@ -71,7 +72,7 @@ export class NTQQFileApi {
             file_uuid: '',
         });
 
-        await this.copyFile(filePath, mediaPath!);
+        await this.copyFile(filePath, mediaPath);
         const fileSize = await this.getFileSize(filePath);
         return {
             md5: fileMd5,
@@ -82,7 +83,7 @@ export class NTQQFileApi {
         };
     }
 
-    async createValidSendFileElement(filePath: string, fileName: string = '', folderId: string = '',): Promise<SendFileElement> {
+    async createValidSendFileElement(context: MessageContext, filePath: string, fileName: string = '', folderId: string = '',): Promise<SendFileElement> {
         const {
             fileName: _fileName,
             path,
@@ -91,6 +92,7 @@ export class NTQQFileApi {
         if (fileSize === 0) {
             throw new Error('文件异常，大小为0');
         }
+        context.deleteAfterSentFiles.push(path);
         return {
             elementType: ElementType.FILE,
             elementId: '',
@@ -103,12 +105,13 @@ export class NTQQFileApi {
         };
     }
 
-    async createValidSendPicElement(picPath: string, summary: string = '', subType: 0 | 1 = 0,): Promise<SendPicElement> {
+    async createValidSendPicElement(context: MessageContext, picPath: string, summary: string = '', subType: 0 | 1 = 0,): Promise<SendPicElement> {
         const { md5, fileName, path, fileSize } = await this.core.apis.FileApi.uploadFile(picPath, ElementType.PIC, subType);
         if (fileSize === 0) {
             throw new Error('文件异常，大小为0');
         }
         const imageSize = await this.core.apis.FileApi.getImageSize(picPath);
+        context.deleteAfterSentFiles.push(path);
         return {
             elementType: ElementType.PIC,
             elementId: '',
@@ -130,26 +133,40 @@ export class NTQQFileApi {
         };
     }
 
-    async createValidSendVideoElement(filePath: string, fileName: string = '', diyThumbPath: string = ''): Promise<SendVideoElement> {
+    async createValidSendVideoElement(context: MessageContext, filePath: string, fileName: string = '', diyThumbPath: string = ''): Promise<SendVideoElement> {
         const logger = this.core.context.logger;
-        const { fileName: _fileName, path, fileSize, md5 } = await this.core.apis.FileApi.uploadFile(filePath, ElementType.VIDEO);
-        if (fileSize === 0) {
-            throw new Error('文件异常，大小为0');
-        }
-        let thumb = path.replace(`${pathLib.sep}Ori${pathLib.sep}`, `${pathLib.sep}Thumb${pathLib.sep}`);
-        thumb = pathLib.dirname(thumb);
         let videoInfo = {
             width: 1920, height: 1080,
             time: 15,
             format: 'mp4',
-            size: fileSize,
+            size: 0,
             filePath,
         };
         try {
-            videoInfo = await getVideoInfo(path, logger);
+            videoInfo = await getVideoInfo(filePath, logger);
         } catch (e) {
             logger.logError('获取视频信息失败，将使用默认值', e);
         }
+
+        let fileExt = 'mp4';
+        try {
+            const tempExt = (await fileType.fileTypeFromFile(filePath))?.ext;
+            if (tempExt) fileExt = tempExt;
+        } catch (e) {
+            this.context.logger.logError('获取文件类型失败', e);
+        }
+        const newFilePath = filePath + '.' + fileExt;
+        fs.copyFileSync(filePath, newFilePath);
+        context.deleteAfterSentFiles.push(newFilePath);
+        filePath = newFilePath;
+        const { fileName: _fileName, path, fileSize, md5 } = await this.core.apis.FileApi.uploadFile(filePath, ElementType.VIDEO);
+        if (fileSize === 0) {
+            throw new Error('文件异常，大小为0');
+        }
+        videoInfo.size = fileSize;
+        let thumb = path.replace(`${pathLib.sep}Ori${pathLib.sep}`, `${pathLib.sep}Thumb${pathLib.sep}`);
+        thumb = pathLib.dirname(thumb);
+
         const thumbPath = new Map();
         const _thumbPath = await new Promise<string | undefined>((resolve, reject) => {
             const thumbFileName = `${md5}_0.png`;
@@ -179,11 +196,13 @@ export class NTQQFileApi {
         const thumbSize = _thumbPath ? (await fsPromises.stat(_thumbPath)).size : 0;
         thumbPath.set(0, _thumbPath);
         const thumbMd5 = _thumbPath ? await calculateFileMD5(_thumbPath) : '';
+        context.deleteAfterSentFiles.push(path);
+        const uploadName = (fileName || _fileName).toLocaleLowerCase().endsWith('.' + fileExt.toLocaleLowerCase()) ? (fileName || _fileName) : (fileName || _fileName) + '.' + fileExt;
         return {
             elementType: ElementType.VIDEO,
             elementId: '',
             videoElement: {
-                fileName: fileName || _fileName,
+                fileName: uploadName,
                 filePath: path,
                 videoMd5: md5,
                 thumbMd5,
@@ -207,7 +226,9 @@ export class NTQQFileApi {
             throw new Error('文件异常，大小为0');
         }
         if (converted) {
-            fsPromises.unlink(silkPath);
+            fsPromises.unlink(silkPath).then().catch(
+                (e) => this.context.logger.logError('删除临时文件失败', e)
+            );
         }
         return {
             elementType: ElementType.PTT,
@@ -246,7 +267,6 @@ export class NTQQFileApi {
     }
 
     async downloadMedia(msgId: string, chatType: ChatType, peerUid: string, elementId: string, thumbPath: string, sourcePath: string, timeout = 1000 * 60 * 2, force: boolean = false) {
-        //logDebug('receive downloadMedia task', msgId, chatType, peerUid, elementId, thumbPath, sourcePath, timeout, force);
         // 用于下载收到的消息中的图片等
         if (sourcePath && fs.existsSync(sourcePath)) {
             if (force) {
@@ -339,15 +359,15 @@ export class NTQQFileApi {
         if (!element) {
             return '';
         }
-        const url: string = element.originImageUrl!;  // 没有域名
+        const url: string = element.originImageUrl ?? '';
         const md5HexStr = element.md5HexStr;
         const fileMd5 = element.md5HexStr;
 
         if (url) {
-            const parsedUrl = new URL(IMAGE_HTTP_HOST + url);//临时解析拼接
+            const parsedUrl = new URL(IMAGE_HTTP_HOST + url);
             const imageAppid = parsedUrl.searchParams.get('appid');
-            const isNTFlavoredPic = imageAppid && ['1406', '1407'].includes(imageAppid);
-            if (isNTFlavoredPic) {
+            const isNTV2 = imageAppid && ['1406', '1407'].includes(imageAppid);
+            if (isNTV2) {
                 let rkey = parsedUrl.searchParams.get('rkey');
                 if (rkey) {
                     return IMAGE_HTTP_HOST_NT + url;
@@ -356,11 +376,9 @@ export class NTQQFileApi {
                 rkey = imageAppid === '1406' ? rkeyData.private_rkey : rkeyData.group_rkey;
                 return IMAGE_HTTP_HOST_NT + url + `${rkey}`;
             } else {
-                // 老的图片url，不需要rkey
                 return IMAGE_HTTP_HOST + url;
             }
         } else if (fileMd5 || md5HexStr) {
-            // 没有url，需要自己拼接
             return `${IMAGE_HTTP_HOST}/gchatpic_new/0/0-0-${(fileMd5 ?? md5HexStr)!.toUpperCase()}/0`;
         }
         this.context.logger.logDebug('图片url获取失败', element);

src/core/apis/friend.ts

@@ -6,14 +6,9 @@ export class NTQQFriendApi {
     context: InstanceContext;
     core: NapCatCore;
 
-    // friends: Map<string, Friend> = new Map<string, FriendV2>();
-
     constructor(context: InstanceContext, core: NapCatCore) {
         this.context = context;
         this.core = core;
-        // if (!this.context.basicInfoWrapper.requireMinNTQQBuild('26702')) {
-        //     this.getFriends(true);
-        // }
     }
 
     async getBuddyV2SimpleInfoMap(refresh = false) {

src/core/apis/group.ts

@@ -24,7 +24,7 @@ export class NTQQGroupApi {
     constructor(context: InstanceContext, core: NapCatCore) {
         this.context = context;
         this.core = core;
-        this.initCache().then().catch(context.logger.logError);
+        this.initCache().then().catch(context.logger.logError.bind(context.logger));
     }
 
     async initCache() {
@@ -34,7 +34,13 @@ export class NTQQGroupApi {
         }
         this.context.logger.logDebug(`加载${this.groups.length}个群组缓存完成`);
     }
-
+    async getCoreAndBaseInfo(uids: string[]) {
+        return await this.core.eventWrapper.callNoListenerEvent(
+            'NodeIKernelProfileService/getCoreAndBaseInfo',
+            'nodeStore',
+            uids,
+        );
+    }
     async fetchGroupEssenceList(groupCode: string) {
         const pskey = (await this.core.apis.UserApi.getPSkey(['qun.qq.com'])).domainPskeyMap.get('qun.qq.com')!;
         return this.context.session.getGroupService().fetchGroupEssenceList({
@@ -44,8 +50,8 @@ export class NTQQGroupApi {
         }, pskey);
     }
 
-    async clearGroupNotifiesUnreadCount(unk: boolean) {
-        return this.context.session.getGroupService().clearGroupNotifiesUnreadCount(unk);
+    async clearGroupNotifiesUnreadCount(uk: boolean) {
+        return this.context.session.getGroupService().clearGroupNotifiesUnreadCount(uk);
     }
 
     async setGroupAvatar(gc: string, filePath: string) {
@@ -61,9 +67,9 @@ export class NTQQGroupApi {
         return groupList;
     }
 
-    async getGroupExtFE0Info(GroupCode: string[], forced = true) {
+    async getGroupExtFE0Info(groupCode: string[], forced = true) {
         return this.context.session.getGroupService().getGroupExt0xEF0Info(
-            GroupCode,
+            groupCode,
             [],
             {
                 bindGuildId: 1,
@@ -121,8 +127,8 @@ export class NTQQGroupApi {
         return group;
     }
 
-    async getGroupMemberAll(GroupCode: string, forced = false) {
-        return this.context.session.getGroupService().getAllMemberList(GroupCode, forced);
+    async getGroupMemberAll(groupCode: string, forced = false) {
+        return this.context.session.getGroupService().getAllMemberList(groupCode, forced);
     }
 
     async getGroupMember(groupCode: string | number, memberUinOrUid: string | number) {
@@ -157,8 +163,8 @@ export class NTQQGroupApi {
         }
         return member;
     }
-    async getGroupRecommendContactArkJson(GroupCode: string) {
-        return this.context.session.getGroupService().getGroupRecommendContactArkJson(GroupCode);
+    async getGroupRecommendContactArkJson(groupCode: string) {
+        return this.context.session.getGroupService().getGroupRecommendContactArkJson(groupCode);
     }
 
     async CreatGroupFileFolder(groupCode: string, folderName: string) {
@@ -174,7 +180,6 @@ export class NTQQGroupApi {
     }
 
     async addGroupEssence(GroupCode: string, msgId: string) {
-        // 需要 ob11msgId -> msgId + (peer) -> msgSeq + msgRandom
         const MsgData = await this.context.session.getMsgService().getMsgsIncludeSelf({
             chatType: 2,
             guildId: '',
@@ -185,7 +190,6 @@ export class NTQQGroupApi {
             msgRandom: parseInt(MsgData.msgList[0].msgRandom),
             msgSeq: parseInt(MsgData.msgList[0].msgSeq),
         };
-        // GetMsgByShortID(shortID); -> MsgService.getMsgs(Peer,MsgId,1,false); -> 组出参数
         return this.context.session.getGroupService().addGroupEssence(param);
     }
 
@@ -203,7 +207,6 @@ export class NTQQGroupApi {
             groupCode: GroupCode,
             needDeleteLocalMsg: needDeleteLocalMsg,
         };
-        //应该是直接返回不需要Listener的 未经测试 需测试再发布
         return this.context.session.getGroupService().quitGroupV2(param);
     }
 
@@ -265,8 +268,25 @@ export class NTQQGroupApi {
         }
         return member;
     }
+    async searchGroup(groupCode: string) {
+        const [, ret] = await this.core.eventWrapper.callNormalEventV2(
+            'NodeIKernelSearchService/searchGroup',
+            'NodeIKernelSearchListener/onSearchGroupResult',
+            [{
+                keyWords: groupCode,
+                groupNum: 25,
+                exactSearch: false,
+                penetrate: ''
+            }],
+            (ret) => ret.result === 0,
+            (params) => !!params.groupInfos.find(g => g.groupCode === groupCode),
+            1,
+            5000
+        );
+        return ret.groupInfos.find(g => g.groupCode === groupCode);
+    }
     async getGroupMemberEx(GroupCode: string, uid: string, forced = false, retry = 2) {
-        let data = await solveAsyncProblem((eventWrapper: NTEventWrapper, GroupCode: string, uid: string, forced = false) => {
+        const data = await solveAsyncProblem((eventWrapper: NTEventWrapper, GroupCode: string, uid: string, forced = false) => {
             return eventWrapper.callNormalEventV2(
                 'NodeIKernelGroupService/getMemberInfo',
                 'NodeIKernelGroupListener/onMemberInfoChange',
@@ -281,7 +301,7 @@ export class NTQQGroupApi {
             return data[3].get(uid);
         }
         if (retry > 0) {
-            let trydata = await this.getGroupMemberEx(GroupCode, uid, true, retry - 1) as GroupMember | undefined;
+            const trydata = await this.getGroupMemberEx(GroupCode, uid, true, retry - 1) as GroupMember | undefined;
             if (trydata) return trydata;
         }
         return undefined;
@@ -325,8 +345,7 @@ export class NTQQGroupApi {
         if (result.errCode !== 0) {
             throw new Error('获取群成员列表出错,' + result.errMsg);
         }
-
-        this.context.logger.logDebug(`获取群(${groupQQ})成员列表结果:`, `members: ${result.result.infos.size}`); //, Array.from(result.result.infos.values()));
+        this.context.logger.logDebug(`获取群(${groupQQ})成员列表结果:`, `members: ${result.result.infos.size}`);
         return result.result.infos;
     }
 
@@ -357,12 +376,12 @@ export class NTQQGroupApi {
         return this.context.session.getGroupService().operateSysNotify(
             false,
             {
-                'operateType': operateType, // 2 拒绝
-                'targetMsg': {
-                    'seq': seq,  // 通知序列号
-                    'type': type,
-                    'groupCode': groupCode,
-                    'postscript': reason ?? ' ', // 仅传空值可能导致处理失败，故默认给个空格
+                operateType: operateType, // 2 拒绝
+                targetMsg: {
+                    seq: seq,  // 通知序列号
+                    type: type,
+                    groupCode: groupCode,
+                    postscript: reason ?? ' ', // 仅传空值可能导致处理失败，故默认给个空格
                 },
             });
     }
@@ -418,7 +437,6 @@ export class NTQQGroupApi {
     }
 
     async getMemberExtInfo(groupCode: string, uin: string) {
-        // 仅NTQQ 9.9.11 24568测试 容易炸开谨慎使用
         return this.context.session.getGroupService().getMemberExtInfo(
             {
                 groupCode: groupCode,

src/core/apis/index.ts

@@ -5,5 +5,4 @@ export * from './msg';
 export * from './user';
 export * from './webapi';
 export * from './sign';
-export * from './system';
-export * from './cache';
+export * from './system';

src/core/apis/msg.ts

@@ -19,27 +19,16 @@ export class NTQQMsgApi {
         return this.context.session.getMsgService().getAioFirstViewLatestMsgs(peer, MsgCount);
     }
 
-    async getLatestDbMsgs(peer: Peer, MsgCount: number) {
-        return this.context.session.getMsgService().getLatestDbMsgs(peer, MsgCount);
-    }
-
-    async FetchLongMsg(peer: Peer, msgId: string) {
-        return this.context.session.getMsgService().fetchLongMsg(peer, msgId);
-    }
-
     async sendShowInputStatusReq(peer: Peer, eventType: number) {
         return this.context.session.getMsgService().sendShowInputStatusReq(peer.chatType, eventType, peer.peerUid);
     }
 
     async getMsgEmojiLikesList(peer: Peer, msgSeq: string, emojiId: string, emojiType: string, count: number = 20) {
-        //注意此处emojiType 可选值一般为1-2 2好像是unicode表情dec值 大部分情况 Taged M likiowa
+        //注意此处emojiType 可选值一般为1-2 2好像是unicode表情dec值 大部分情况 Taged Mlikiowa
         return this.context.session.getMsgService().getMsgEmojiLikesList(peer, msgSeq, emojiId, emojiType, '', false, count);
     }
 
     async setEmojiLike(peer: Peer, msgSeq: string, emojiId: string, set: boolean = true) {
-        // nt_qq//global//nt_data//Emoji//emoji-resource//sysface_res/apng/ 下可以看到所有QQ表情预览
-        // nt_qq\global\nt_data\Emoji\emoji-resource\face_config.json 里面有所有表情的id, 自带表情id是QSid, 标准emoji表情id是QCid
-        // 其实以官方文档为准是最好的，https://bot.q.qq.com/wiki/develop/api-v2/openapi/emoji/model.html#EmojiType
         emojiId = emojiId.toString();
         return this.context.session.getMsgService().setMsgEmojiLikes(peer, msgSeq, emojiId, emojiId.length > 3 ? '2' : '1', set);
     }
@@ -105,17 +94,10 @@ export class NTQQMsgApi {
             pageLimit: 1,
         });
     }
+    //@deprecated
     async getMsgsBySeqAndCount(peer: Peer, seq: string, count: number, desc: boolean, z: boolean) {
         return await this.context.session.getMsgService().getMsgsBySeqAndCount(peer, seq, count, desc, z);
     }
-    async getMsgBySeqList(peer: Peer, msgSeqList: string[]) {
-        //坏的
-        return await this.context.session.getMsgService().getMsgsBySeqList(peer, msgSeqList);
-    }
-    async getMsgBySeqExFirstMsg(peer: Peer, rootMsgId: string, replyMsgId: string) {
-        const reply = await this.context.session.getMsgService().getSourceOfReplyMsgV2(peer, rootMsgId, replyMsgId);
-        console.log(reply);
-    }
     async getMsgExBySeq(peer: Peer, msgSeq: string) {
         const DateNow = Math.floor(Date.now() / 1000);
         const filterMsgFromTime = (DateNow - 300).toString();
@@ -157,14 +139,7 @@ export class NTQQMsgApi {
         return this.context.session.getMsgService().getMsgsIncludeSelf(peer, msgId, count, isReverseOrder);
     }
 
-    async recallMsg(peer: Peer, msgIds: string[]) {
-        await this.context.session.getMsgService().recallMsg({
-            chatType: peer.chatType,
-            peerUid: peer.peerUid,
-        }, msgIds);
-    }
-
-    async recallMsgV2(peer: Peer, msgId: string) {
+    async recallMsg(peer: Peer, msgId: string) {
         await this.core.eventWrapper.callNormalEventV2(
             'NodeIKernelMsgService/recallMsg',
             'NodeIKernelMsgListener/onMsgInfoListUpdate',
@@ -207,7 +182,7 @@ export class NTQQMsgApi {
                 await this.PrepareTempChat(peer.peerUid, peer.guildId, member.nick);
             }
         }
-        const msgId = await this.generateMsgUniqueId(peer.chatType, await this.getServerTime());
+        const msgId = await this.generateMsgUniqueId(peer.chatType);
         peer.guildId = msgId;
         const [, msgList] = await this.core.eventWrapper.callNormalEventV2(
             'NodeIKernelMsgService/sendMsg',
@@ -233,12 +208,8 @@ export class NTQQMsgApi {
         return msgList.find(msgRecord => msgRecord.guildId === msgId);
     }
 
-    async generateMsgUniqueId(chatType: number, time: string) {
-        return this.context.session.getMsgService().generateMsgUniqueId(chatType, time);
-    }
-
-    async getServerTime() {
-        return this.context.session.getMSFService().getServerTime();
+    async generateMsgUniqueId(chatType: number) {
+        return this.context.session.getMsgService().generateMsgUniqueId(chatType, this.context.session.getMSFService().getServerTime());
     }
 
     async forwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {

src/core/apis/sign.ts

@@ -214,11 +214,6 @@ export class NTQQMusicSignApi {
         //console.log(MusicReal);
         return { ...MusicReal.data, mid: signedMid };
     }
-
-    async CreateMusicThirdWay1(id: string = '', mid: string = '') {
-
-    }
-
     //转换外域名为 https://qq.ugcimg.cn/v1/cpqcbu4b8870i61bde6k7cbmjgejq8mr3in82qir4qi7ielffv5slv8ck8g42novtmev26i233ujtuab6tvu2l2sjgtupfr389191v00s1j5oh5325j5eqi40774jv1i/khovifoh7jrqd6eahoiv7koh8o
     //https://cgi.connect.qq.com/qqconnectopen/openapi/change_image_url?url=https://th.bing.com/th?id=OSK.b8ed36f1fb1889de6dc84fd81c187773&w=46&h=46&c=11&rs=1&qlt=80&o=6&dpr=2&pid=SANGAM
 

src/core/apis/system.ts

@@ -22,7 +22,7 @@ export class NTQQSystemApi {
     }
 
     async getOnlineDev() {
-        return this.context.session.getMsgService().getOnLineDev();
+        this.context.session.getMsgService().getOnLineDev();
     }
 
     async getArkJsonCollection(cid: string) {

src/core/apis/user.ts

@@ -1,7 +1,6 @@
-import type { ModifyProfileParams, User } from '@/core/entities';
+import { ModifyProfileParams, User, UserDetailSource } from '@/core/entities';
 import { RequestUtil } from '@/common/request';
-import { ProfileBizType, UserDetailSource } from '@/core/services';
-import { InstanceContext, NapCatCore } from '..';
+import { InstanceContext, NapCatCore, ProfileBizType } from '..';
 import { solveAsyncProblem } from '@/common/helper';
 
 export class NTQQUserApi {
@@ -12,7 +11,13 @@ export class NTQQUserApi {
         this.context = context;
         this.core = core;
     }
-
+    //self_tind格式
+    async createUidFromTinyId(tinyId: string) {
+        return this.context.session.getMsgService().createUidFromTinyId(this.core.selfInfo.uin, tinyId);
+    }
+    async getStatusByUid(uid: string) {
+        return this.context.session.getProfileService().getStatus(uid);
+    }
     async getProfileLike(uid: string) {
         return this.context.session.getProfileLikeService().getBuddyProfileLike({
             friendUids: [uid],
@@ -25,7 +30,18 @@ export class NTQQUserApi {
             limit: 20,
         });
     }
-
+    async fetchOtherProfileLike(uid: string) {
+        return this.context.session.getProfileLikeService().getBuddyProfileLike({
+            friendUids: [uid],
+            basic: 1,
+            vote: 1,
+            favorite: 0,
+            userProfile: 0,
+            type: 1,
+            start: 0,
+            limit: 20,
+        });
+    }
     async setLongNick(longNick: string) {
         return this.context.session.getProfileService().setLongNick(longNick);
     }
@@ -160,7 +176,7 @@ export class NTQQUserApi {
         if (uid) return uid;
         uid = (await this.context.session.getUixConvertService().getUid([Uin])).uidInfo.get(Uin);
         if (uid) return uid;
-        const unverifiedUid = (await this.getUserDetailInfoByUinV2(Uin)).detail.uid;//从QQ Native 特殊转换
+        const unverifiedUid = (await this.getUserDetailInfoByUin(Uin)).detail.uid;//从QQ Native 特殊转换
         if (unverifiedUid.indexOf('*') == -1) uid = unverifiedUid;
         //if (uid) return uid;
         return uid;
@@ -196,7 +212,7 @@ export class NTQQUserApi {
         return await this.context.session.getRecentContactService().getRecentContactList();
     }
 
-    async getUserDetailInfoByUinV2(Uin: string) {
+    async getUserDetailInfoByUin(Uin: string) {
         return await this.core.eventWrapper.callNoListenerEvent(
             'NodeIKernelProfileService/getUserDetailInfoByUin',
             Uin

src/core/apis/webapi.ts

@@ -157,7 +157,7 @@ export class NTQQWebApi {
         const cookieObject = await this.core.apis.UserApi.getCookies('qun.qq.com');
 
         try {
-            let settings = JSON.stringify({
+            const settings = JSON.stringify({
                 is_show_edit_card: is_show_edit_card,
                 tip_window_type: tip_window_type,
                 confirm_required: confirm_required
@@ -167,7 +167,7 @@ export class NTQQWebApi {
                 imgWidth: imgWidth.toString(),
                 imgHeight: imgHeight.toString(),
             };
-            let ret: SetNoticeRetSuccess = await RequestUtil.HttpGetJson<SetNoticeRetSuccess>(
+            const ret: SetNoticeRetSuccess = await RequestUtil.HttpGetJson<SetNoticeRetSuccess>(
                 `https://web.qun.qq.com/cgi-bin/announce/add_qun_notice?${new URLSearchParams({
                     bkn: this.getBknFromCookie(cookieObject),
                     qid: GroupCode,

src/core/entities/adapter.ts

@@ -0,0 +1,11 @@
+export enum MsfStatusType {
+    KUNKNOWN,
+    KDISCONNECTED,
+    KCONNECTED
+}
+export enum MsfChangeReasonType {
+    KUNKNOWN,
+    KUSERLOGININ,
+    KUSERLOGINOUT,
+    KAUTO
+}

src/core/entities/contact.ts

@@ -0,0 +1,12 @@
+
+export interface FSABRecentContactParams {
+    anchorPointContact: {
+        contactId: string;
+        sortField: string;
+        pos: number;
+    };
+    relativeMoveCount: number;
+    listType: number;
+    count: number;
+    fetchOld: boolean;
+}

src/core/entities/msg.ts

@@ -934,3 +934,43 @@ export interface RawMessage {
 
     elements: MessageElement[];
 }
+export interface QueryMsgsParams {
+    chatInfo: Peer;
+    filterMsgType: [];
+    filterSendersUid: string[];
+    filterMsgFromTime: string;
+    filterMsgToTime: string;
+    pageLimit: number;
+    isReverseOrder: boolean;
+    isIncludeCurrent: boolean;
+}
+
+export interface TmpChatInfoApi {
+    errMsg: string;
+    result: number;
+    tmpChatInfo?: TmpChatInfo;
+}
+
+export interface TmpChatInfo {
+    chatType: number;
+    fromNick: string;
+    groupCode: string;
+    peerUid: string;
+    sessionType: number;
+    sig: string;
+}
+export interface MsgReqType {
+    peer: Peer,
+    byType: number,
+    msgId: string,
+    msgSeq: string,
+    msgTime: string,
+    clientSeq: string,
+    cnt: number,
+    queryOrder: boolean,
+    includeSelf: boolean,
+    includeDeleteMsg: boolean,
+    extraCnt: number
+}
+//getMsgsIncludeSelf Peer必须 byType 1
+//getMsgsWithMsgTimeAndClientSeqForC2C Peer必须 byType 3

src/core/entities/user.ts

@@ -153,7 +153,10 @@ interface CommonExt {
     labels: any[];
     qqLevel: QQLevel;
 }
-
+export enum BuddyListReqType {
+    KNOMAL,
+    KLETTER
+}
 interface Pic {
     picId: string;
     picTime: number;
@@ -213,7 +216,7 @@ export interface BuddyProfileLikeReq {
     userProfile: number;
     type: number;
     start: number;
-    limit: number;
+    limit?: number;
 }
 
 export interface QQLevel {
@@ -294,7 +297,7 @@ export enum BizKey {
     KPHOTOWALL
 }
 
-export interface UserDetailInfoByUinV2 {
+export interface UserDetailInfoByUin {
     result: number,
     errMsg: string,
     detail: {
@@ -305,62 +308,15 @@ export interface UserDetailInfoByUinV2 {
         photoWall: null
     }
 }
-
-export interface UserDetailInfoByUin {
-    result: number,
-    errMsg: string,
-    info: {
-        uid: string,//这个没办法用
-        qid: string,
-        uin: string,
-        nick: string,
-        remark: string,
-        longNick: string,
-        avatarUrl: string,
-        birthday_year: number,
-        birthday_month: number,
-        birthday_day: number,
-        sex: number,//0
-        topTime: string,
-        constellation: number,
-        shengXiao: number,
-        kBloodType: number,
-        homeTown: string,
-        makeFriendCareer: number,
-        pos: string,
-        eMail: string,
-        phoneNum: string,
-        college: string,
-        country: string,
-        province: string,
-        city: string,
-        postCode: string,
-        address: string,
-        isBlock: boolean,
-        isSpecialCareOpen: boolean,
-        isSpecialCareZone: boolean,
-        ringId: string,
-        regTime: number,
-        interest: string,
-        termType: number,
-        labels: any[],
-        qqLevel: { crownNum: number, sunNum: number, moonNum: number, starNum: number },
-        isHideQQLevel: number,
-        privilegeIcon: { jumpUrl: string, openIconList: any[], closeIconList: any[] },
-        isHidePrivilegeIcon: number,
-        photoWall: { picList: any[] },
-        vipFlag: boolean,
-        yearVipFlag: boolean,
-        svipFlag: boolean,
-        vipLevel: number,
-        status: number,
-        qidianMasterFlag: number,
-        qidianCrewFlag: number,
-        qidianCrewFlag2: number,
-        extStatus: number,
-        recommendImgFlag: number,
-        disableEmojiShortCuts: number,
-        pendantId: string,
-        vipNameColorId: string
-    }
+export enum UserDetailSource {
+    KDB,
+    KSERVER
 }
+
+export enum ProfileBizType {
+    KALL,
+    KBASEEXTEND,
+    KVAS,
+    KQZONE,
+    KOTHER
+}

src/core/external/appid.json

@@ -1,14 +1,10 @@
 {
-    "3.2.12-27597": {
-        "appid": 537243600,
-        "qua": "V1_LNX_NQ_3.2.12_27597_GW_B"
+    "9.9.15-28060":{
+        "appid": 537246092,
+        "qua": "V1_WIN_NQ_9.9.15_28060_GW_B"
     },
-    "9.9.15-27597": {
-        "appid": 537243441,
-        "qua": "V1_WIN_NQ_9.9.15_27597_GW_B"
-    },
-    "6.9.53-27597": {
-        "appid": 537243538,
-        "qua": "V1_MAC_NQ_6.9.53_27597_GW_B" 
+    "3.2.12-28060":{
+        "appid": 537246140,
+        "qua": "V1_LNX_NQ_3.2.12_28060_GW_B"
     }
 }

src/core/external/proto/ProfileLikeTip.proto

@@ -0,0 +1,18 @@
+syntax = "proto3";
+package SysMessage;
+
+message likeDetail {
+    string txt = 1;
+    int64 uin = 3;
+    string nickname = 5;
+}
+
+message likeMsg {
+    int32 times = 1;
+    int32 time = 2;
+    likeDetail detail = 3;
+}
+
+message profileLikeTip {
+    likeMsg msg = 14;
+}

src/core/helper/rkey.ts

@@ -8,7 +8,7 @@ interface ServerRkeyData {
 }
 
 export class RkeyManager {
-    serverUrl: string = '';
+    serverUrl: string[] = [];
     logger: LogWrapper;
     private rkeyData: ServerRkeyData = {
         group_rkey: '',
@@ -16,7 +16,7 @@ export class RkeyManager {
         expired_time: 0,
     };
 
-    constructor(serverUrl: string, logger: LogWrapper) {
+    constructor(serverUrl: string[], logger: LogWrapper) {
         this.logger = logger;
         this.serverUrl = serverUrl;
     }
@@ -40,6 +40,13 @@ export class RkeyManager {
 
     async refreshRkey(): Promise<any> {
         //刷新rkey
-        this.rkeyData = await RequestUtil.HttpGetJson<ServerRkeyData>(this.serverUrl, 'GET');
+        for (const url of this.serverUrl) {
+            try {
+                this.rkeyData = await RequestUtil.HttpGetJson<ServerRkeyData>(url, 'GET');
+            } catch (e) {
+                this.logger.logError(`[Rkey] Get Rkey ${url} Error `, e);
+            }
+        }
+
     }
 }

src/core/index.ts

@@ -45,12 +45,14 @@ export function loadQQWrapper(QQVersion: string): WrapperNodeApi {
     let appPath;
     if (os.platform() === 'darwin') {
         appPath = path.resolve(path.dirname(process.execPath), '../Resources/app');
-    } else {
+    } else if (os.platform() === 'linux') {
         appPath = path.resolve(path.dirname(process.execPath), './resources/app');
+    } else {
+        appPath = path.resolve(path.dirname(process.execPath), `./versions/${QQVersion}/`);
     }
     let wrapperNodePath = path.resolve(appPath, 'wrapper.node');
     if (!fs.existsSync(wrapperNodePath)) {
-        wrapperNodePath = path.join(appPath, `versions/${QQVersion}/wrapper.node`);
+        wrapperNodePath = path.join(appPath, `./resources/app/wrapper.node`);
     }
     const nativemodule: any = { exports: {} };
     process.dlopen(nativemodule, wrapperNodePath);
@@ -145,8 +147,9 @@ export class NapCatCore {
             if (Info.status == 20) {
                 this.selfInfo.online = false;
                 this.context.logger.log("账号状态变更为离线");
+            } else {
+                this.selfInfo.online = true;
             }
-            this.selfInfo.online = true;
         };
         this.context.session.getProfileService().addKernelProfileListener(
             proxiedListenerOf(profileListener, this.context.logger),

src/core/listeners/NodeIKernelSearchListener.ts

@@ -0,0 +1,97 @@
+import { ChatType } from '@/core';
+export interface SearchGroupInfo {
+    groupCode: string;
+    ownerUid: string;
+    groupFlag: number;
+    groupFlagExt: number;
+    maxMemberNum: number;
+    memberNum: number;
+    groupOption: number;
+    classExt: number;
+    groupName: string;
+    fingerMemo: string;
+    groupQuestion: string;
+    certType: number;
+    shutUpAllTimestamp: number;
+    shutUpMeTimestamp: number;
+    groupTypeFlag: number;
+    privilegeFlag: number;
+    groupSecLevel: number;
+    groupFlagExt3: number;
+    isConfGroup: number;
+    isModifyConfGroupFace: number;
+    isModifyConfGroupName: number;
+    noFigerOpenFlag: number;
+    noCodeFingerOpenFlag: number;
+    groupFlagExt4: number;
+    groupMemo: string;
+    cmdUinMsgSeq: number;
+    cmdUinJoinTime: number;
+    cmdUinUinFlag: number;
+    cmdUinMsgMask: number;
+    groupSecLevelInfo: number;
+    cmdUinPrivilege: number;
+    cmdUinFlagEx2: number;
+    appealDeadline: number;
+    remarkName: string;
+    isTop: boolean;
+    richFingerMemo: string;
+    groupAnswer: string;
+    joinGroupAuth: string;
+    isAllowModifyConfGroupName: number;
+}
+
+export interface GroupInfo {
+    groupCode: string;
+    searchGroupInfo: SearchGroupInfo;
+    privilege: number;
+}
+
+export interface GroupSearchResult {
+    keyWord: string;
+    errorCode: number;
+    groupInfos: GroupInfo[];
+    penetrate: string;
+    isEnd: boolean;
+    nextPos: number;
+}
+export interface NodeIKernelSearchListener {
+    
+    onSearchGroupResult(params: GroupSearchResult): void;
+
+    onSearchFileKeywordsResult(params: {
+        searchId: string,
+        hasMore: boolean,
+        resultItems: {
+            chatType: ChatType,
+            buddyChatInfo: any[],
+            discussChatInfo: any[],
+            groupChatInfo: {
+                groupCode: string,
+                isConf: boolean,
+                hasModifyConfGroupFace: boolean,
+                hasModifyConfGroupName: boolean,
+                groupName: string,
+                remark: string
+            }[],
+            dataLineChatInfo: any[],
+            tmpChatInfo: any[],
+            msgId: string,
+            msgSeq: string,
+            msgTime: string,
+            senderUid: string,
+            senderNick: string,
+            senderRemark: string,
+            senderCard: string,
+            elemId: string,
+            elemType: number,
+            fileSize: string,
+            filePath: string,
+            fileName: string,
+            hits: {
+                start: number,
+                end: number
+            }[]
+        }[]
+    }): void;
+}

src/core/listeners/NodeIKernelSearchListener_Polyfill.ts

@@ -1,39 +0,0 @@
-import { ChatType } from '@/core';
-
-export interface NodeIKernelSearchListener_Polyfill {
-    onSearchFileKeywordsResult(params: {
-        searchId: string,
-        hasMore: boolean,
-        resultItems: {
-            chatType: ChatType,
-            buddyChatInfo: any[],
-            discussChatInfo: any[],
-            groupChatInfo: {
-                groupCode: string,
-                isConf: boolean,
-                hasModifyConfGroupFace: boolean,
-                hasModifyConfGroupName: boolean,
-                groupName: string,
-                remark: string
-            }[],
-            dataLineChatInfo: any[],
-            tmpChatInfo: any[],
-            msgId: string,
-            msgSeq: string,
-            msgTime: string,
-            senderUid: string,
-            senderNick: string,
-            senderRemark: string,
-            senderCard: string,
-            elemId: string,
-            elemType: number,
-            fileSize: string,
-            filePath: string,
-            fileName: string,
-            hits: {
-                start: number,
-                end: number
-            }[]
-        }[]
-    }): void;
-}

src/core/listeners/index.ts

@@ -9,7 +9,7 @@ export * from './NodeIKernelProfileListener';
 export * from './NodeIKernelTicketListener';
 export * from './NodeIKernelStorageCleanListener';
 export * from './NodeIKernelFileAssistantListener';
-export * from './NodeIKernelSearchListener_Polyfill';
+export * from './NodeIKernelSearchListener';
 
 import type {
     NodeIKernelBuddyListener,
@@ -19,11 +19,11 @@ import type {
     NodeIKernelMsgListener,
     NodeIKernelProfileListener,
     NodeIKernelRobotListener,
-    NodeIKernelSearchListener_Polyfill,
     NodeIKernelSessionListener,
     NodeIKernelStorageCleanListener,
     NodeIKernelTicketListener,
 } from '.';
+import { NodeIKernelSearchListener } from './NodeIKernelSearchListener';
 
 export type ListenerNamingMapping = {
     NodeIKernelSessionListener: NodeIKernelSessionListener;
@@ -36,5 +36,5 @@ export type ListenerNamingMapping = {
     NodeIKernelTicketListener: NodeIKernelTicketListener;
     NodeIKernelStorageCleanListener: NodeIKernelStorageCleanListener;
     NodeIKernelFileAssistantListener: NodeIKernelFileAssistantListener;
-    NodeIKernelSearchListener: NodeIKernelSearchListener_Polyfill;
+    NodeIKernelSearchListener: NodeIKernelSearchListener;
 };

src/core/proto/EmojiLikeToOthers.ts

@@ -1,341 +0,0 @@
-// @generated by protobuf-ts 2.9.4
-// @generated from protobuf file "EmojiLikeToOthers.proto" (package "SysMessage", syntax proto3)
-// tslint:disable
-import type {
-    BinaryReadOptions,
-    BinaryWriteOptions,
-    IBinaryReader,
-    IBinaryWriter,
-    PartialMessage,
-} from '@protobuf-ts/runtime';
-import { MessageType, reflectionMergePartial, UnknownFieldHandler, WireType } from '@protobuf-ts/runtime';
-
-/**
- * @generated from protobuf message SysMessage.EmojiLikeToOthersWrapper1
- */
-export interface EmojiLikeToOthersWrapper1 {
-    /**
-     * @generated from protobuf field: SysMessage.EmojiLikeToOthersWrapper2 wrapper = 1;
-     */
-    wrapper?: EmojiLikeToOthersWrapper2;
-}
-/**
- * @generated from protobuf message SysMessage.EmojiLikeToOthersWrapper2
- */
-export interface EmojiLikeToOthersWrapper2 {
-    /**
-     * @generated from protobuf field: SysMessage.EmojiLikeToOthersWrapper3 body = 1;
-     */
-    body?: EmojiLikeToOthersWrapper3;
-}
-/**
- * @generated from protobuf message SysMessage.EmojiLikeToOthersWrapper3
- */
-export interface EmojiLikeToOthersWrapper3 {
-    /**
-     * @generated from protobuf field: SysMessage.EmojiLikeToOthersMsgSpec msgSpec = 2;
-     */
-    msgSpec?: EmojiLikeToOthersMsgSpec;
-    /**
-     * @generated from protobuf field: SysMessage.EmojiLikeToOthersAttributes attributes = 3;
-     */
-    attributes?: EmojiLikeToOthersAttributes;
-}
-/**
- * @generated from protobuf message SysMessage.EmojiLikeToOthersMsgSpec
- */
-export interface EmojiLikeToOthersMsgSpec {
-    /**
-     * @generated from protobuf field: uint32 msgSeq = 1;
-     */
-    msgSeq: number;
-}
-/**
- * @generated from protobuf message SysMessage.EmojiLikeToOthersAttributes
- */
-export interface EmojiLikeToOthersAttributes {
-    /**
-     * @generated from protobuf field: string emojiId = 1;
-     */
-    emojiId: string;
-    /**
-     * @generated from protobuf field: string senderUid = 4;
-     */
-    senderUid: string;
-    /**
-     * @generated from protobuf field: SysMessage.EmojiLikeToOthersAttributes.Operation operation = 5;
-     */
-    operation: EmojiLikeToOthersAttributes_Operation;
-}
-/**
- * @generated from protobuf enum SysMessage.EmojiLikeToOthersAttributes.Operation
- */
-export enum EmojiLikeToOthersAttributes_Operation {
-    /**
-     * @generated from protobuf enum value: FALLBACK = 0;
-     */
-    FALLBACK = 0,
-    /**
-     * @generated from protobuf enum value: LIKE = 1;
-     */
-    LIKE = 1,
-    /**
-     * @generated from protobuf enum value: UNLIKE = 2;
-     */
-    UNLIKE = 2
-}
-// @generated message type with reflection information, may provide speed optimized methods
-class EmojiLikeToOthersWrapper1$Type extends MessageType<EmojiLikeToOthersWrapper1> {
-    constructor() {
-        super("SysMessage.EmojiLikeToOthersWrapper1", [
-            { no: 1, name: "wrapper", kind: "message", T: () => EmojiLikeToOthersWrapper2 }
-        ]);
-    }
-    create(value?: PartialMessage<EmojiLikeToOthersWrapper1>): EmojiLikeToOthersWrapper1 {
-        const message = globalThis.Object.create((this.messagePrototype!));
-        if (value !== undefined)
-            reflectionMergePartial<EmojiLikeToOthersWrapper1>(this, message, value);
-        return message;
-    }
-    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: EmojiLikeToOthersWrapper1): EmojiLikeToOthersWrapper1 {
-        let message = target ?? this.create(), end = reader.pos + length;
-        while (reader.pos < end) {
-            let [fieldNo, wireType] = reader.tag();
-            switch (fieldNo) {
-                case /* SysMessage.EmojiLikeToOthersWrapper2 wrapper */ 1:
-                    message.wrapper = EmojiLikeToOthersWrapper2.internalBinaryRead(reader, reader.uint32(), options, message.wrapper);
-                    break;
-                default:
-                    let u = options.readUnknownField;
-                    if (u === "throw")
-                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
-                    let d = reader.skip(wireType);
-                    if (u !== false)
-                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
-            }
-        }
-        return message;
-    }
-    internalBinaryWrite(message: EmojiLikeToOthersWrapper1, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
-        /* SysMessage.EmojiLikeToOthersWrapper2 wrapper = 1; */
-        if (message.wrapper)
-            EmojiLikeToOthersWrapper2.internalBinaryWrite(message.wrapper, writer.tag(1, WireType.LengthDelimited).fork(), options).join();
-        let u = options.writeUnknownFields;
-        if (u !== false)
-            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
-        return writer;
-    }
-}
-/**
- * @generated MessageType for protobuf message SysMessage.EmojiLikeToOthersWrapper1
- */
-export const EmojiLikeToOthersWrapper1 = new EmojiLikeToOthersWrapper1$Type();
-// @generated message type with reflection information, may provide speed optimized methods
-class EmojiLikeToOthersWrapper2$Type extends MessageType<EmojiLikeToOthersWrapper2> {
-    constructor() {
-        super("SysMessage.EmojiLikeToOthersWrapper2", [
-            { no: 1, name: "body", kind: "message", T: () => EmojiLikeToOthersWrapper3 }
-        ]);
-    }
-    create(value?: PartialMessage<EmojiLikeToOthersWrapper2>): EmojiLikeToOthersWrapper2 {
-        const message = globalThis.Object.create((this.messagePrototype!));
-        if (value !== undefined)
-            reflectionMergePartial<EmojiLikeToOthersWrapper2>(this, message, value);
-        return message;
-    }
-    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: EmojiLikeToOthersWrapper2): EmojiLikeToOthersWrapper2 {
-        let message = target ?? this.create(), end = reader.pos + length;
-        while (reader.pos < end) {
-            let [fieldNo, wireType] = reader.tag();
-            switch (fieldNo) {
-                case /* SysMessage.EmojiLikeToOthersWrapper3 body */ 1:
-                    message.body = EmojiLikeToOthersWrapper3.internalBinaryRead(reader, reader.uint32(), options, message.body);
-                    break;
-                default:
-                    let u = options.readUnknownField;
-                    if (u === "throw")
-                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
-                    let d = reader.skip(wireType);
-                    if (u !== false)
-                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
-            }
-        }
-        return message;
-    }
-    internalBinaryWrite(message: EmojiLikeToOthersWrapper2, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
-        /* SysMessage.EmojiLikeToOthersWrapper3 body = 1; */
-        if (message.body)
-            EmojiLikeToOthersWrapper3.internalBinaryWrite(message.body, writer.tag(1, WireType.LengthDelimited).fork(), options).join();
-        let u = options.writeUnknownFields;
-        if (u !== false)
-            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
-        return writer;
-    }
-}
-/**
- * @generated MessageType for protobuf message SysMessage.EmojiLikeToOthersWrapper2
- */
-export const EmojiLikeToOthersWrapper2 = new EmojiLikeToOthersWrapper2$Type();
-// @generated message type with reflection information, may provide speed optimized methods
-class EmojiLikeToOthersWrapper3$Type extends MessageType<EmojiLikeToOthersWrapper3> {
-    constructor() {
-        super("SysMessage.EmojiLikeToOthersWrapper3", [
-            { no: 2, name: "msgSpec", kind: "message", T: () => EmojiLikeToOthersMsgSpec },
-            { no: 3, name: "attributes", kind: "message", T: () => EmojiLikeToOthersAttributes }
-        ]);
-    }
-    create(value?: PartialMessage<EmojiLikeToOthersWrapper3>): EmojiLikeToOthersWrapper3 {
-        const message = globalThis.Object.create((this.messagePrototype!));
-        if (value !== undefined)
-            reflectionMergePartial<EmojiLikeToOthersWrapper3>(this, message, value);
-        return message;
-    }
-    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: EmojiLikeToOthersWrapper3): EmojiLikeToOthersWrapper3 {
-        let message = target ?? this.create(), end = reader.pos + length;
-        while (reader.pos < end) {
-            let [fieldNo, wireType] = reader.tag();
-            switch (fieldNo) {
-                case /* SysMessage.EmojiLikeToOthersMsgSpec msgSpec */ 2:
-                    message.msgSpec = EmojiLikeToOthersMsgSpec.internalBinaryRead(reader, reader.uint32(), options, message.msgSpec);
-                    break;
-                case /* SysMessage.EmojiLikeToOthersAttributes attributes */ 3:
-                    message.attributes = EmojiLikeToOthersAttributes.internalBinaryRead(reader, reader.uint32(), options, message.attributes);
-                    break;
-                default:
-                    let u = options.readUnknownField;
-                    if (u === "throw")
-                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
-                    let d = reader.skip(wireType);
-                    if (u !== false)
-                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
-            }
-        }
-        return message;
-    }
-    internalBinaryWrite(message: EmojiLikeToOthersWrapper3, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
-        /* SysMessage.EmojiLikeToOthersMsgSpec msgSpec = 2; */
-        if (message.msgSpec)
-            EmojiLikeToOthersMsgSpec.internalBinaryWrite(message.msgSpec, writer.tag(2, WireType.LengthDelimited).fork(), options).join();
-        /* SysMessage.EmojiLikeToOthersAttributes attributes = 3; */
-        if (message.attributes)
-            EmojiLikeToOthersAttributes.internalBinaryWrite(message.attributes, writer.tag(3, WireType.LengthDelimited).fork(), options).join();
-        let u = options.writeUnknownFields;
-        if (u !== false)
-            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
-        return writer;
-    }
-}
-/**
- * @generated MessageType for protobuf message SysMessage.EmojiLikeToOthersWrapper3
- */
-export const EmojiLikeToOthersWrapper3 = new EmojiLikeToOthersWrapper3$Type();
-// @generated message type with reflection information, may provide speed optimized methods
-class EmojiLikeToOthersMsgSpec$Type extends MessageType<EmojiLikeToOthersMsgSpec> {
-    constructor() {
-        super("SysMessage.EmojiLikeToOthersMsgSpec", [
-            { no: 1, name: "msgSeq", kind: "scalar", T: 13 /*ScalarType.UINT32*/ }
-        ]);
-    }
-    create(value?: PartialMessage<EmojiLikeToOthersMsgSpec>): EmojiLikeToOthersMsgSpec {
-        const message = globalThis.Object.create((this.messagePrototype!));
-        message.msgSeq = 0;
-        if (value !== undefined)
-            reflectionMergePartial<EmojiLikeToOthersMsgSpec>(this, message, value);
-        return message;
-    }
-    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: EmojiLikeToOthersMsgSpec): EmojiLikeToOthersMsgSpec {
-        let message = target ?? this.create(), end = reader.pos + length;
-        while (reader.pos < end) {
-            let [fieldNo, wireType] = reader.tag();
-            switch (fieldNo) {
-                case /* uint32 msgSeq */ 1:
-                    message.msgSeq = reader.uint32();
-                    break;
-                default:
-                    let u = options.readUnknownField;
-                    if (u === "throw")
-                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
-                    let d = reader.skip(wireType);
-                    if (u !== false)
-                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
-            }
-        }
-        return message;
-    }
-    internalBinaryWrite(message: EmojiLikeToOthersMsgSpec, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
-        /* uint32 msgSeq = 1; */
-        if (message.msgSeq !== 0)
-            writer.tag(1, WireType.Varint).uint32(message.msgSeq);
-        let u = options.writeUnknownFields;
-        if (u !== false)
-            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
-        return writer;
-    }
-}
-/**
- * @generated MessageType for protobuf message SysMessage.EmojiLikeToOthersMsgSpec
- */
-export const EmojiLikeToOthersMsgSpec = new EmojiLikeToOthersMsgSpec$Type();
-// @generated message type with reflection information, may provide speed optimized methods
-class EmojiLikeToOthersAttributes$Type extends MessageType<EmojiLikeToOthersAttributes> {
-    constructor() {
-        super("SysMessage.EmojiLikeToOthersAttributes", [
-            { no: 1, name: "emojiId", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
-            { no: 4, name: "senderUid", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
-            { no: 5, name: "operation", kind: "enum", T: () => ["SysMessage.EmojiLikeToOthersAttributes.Operation", EmojiLikeToOthersAttributes_Operation] }
-        ]);
-    }
-    create(value?: PartialMessage<EmojiLikeToOthersAttributes>): EmojiLikeToOthersAttributes {
-        const message = globalThis.Object.create((this.messagePrototype!));
-        message.emojiId = "";
-        message.senderUid = "";
-        message.operation = 0;
-        if (value !== undefined)
-            reflectionMergePartial<EmojiLikeToOthersAttributes>(this, message, value);
-        return message;
-    }
-    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: EmojiLikeToOthersAttributes): EmojiLikeToOthersAttributes {
-        let message = target ?? this.create(), end = reader.pos + length;
-        while (reader.pos < end) {
-            let [fieldNo, wireType] = reader.tag();
-            switch (fieldNo) {
-                case /* string emojiId */ 1:
-                    message.emojiId = reader.string();
-                    break;
-                case /* string senderUid */ 4:
-                    message.senderUid = reader.string();
-                    break;
-                case /* SysMessage.EmojiLikeToOthersAttributes.Operation operation */ 5:
-                    message.operation = reader.int32();
-                    break;
-                default:
-                    let u = options.readUnknownField;
-                    if (u === "throw")
-                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
-                    let d = reader.skip(wireType);
-                    if (u !== false)
-                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
-            }
-        }
-        return message;
-    }
-    internalBinaryWrite(message: EmojiLikeToOthersAttributes, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
-        /* string emojiId = 1; */
-        if (message.emojiId !== "")
-            writer.tag(1, WireType.LengthDelimited).string(message.emojiId);
-        /* string senderUid = 4; */
-        if (message.senderUid !== "")
-            writer.tag(4, WireType.LengthDelimited).string(message.senderUid);
-        /* SysMessage.EmojiLikeToOthersAttributes.Operation operation = 5; */
-        if (message.operation !== 0)
-            writer.tag(5, WireType.Varint).int32(message.operation);
-        let u = options.writeUnknownFields;
-        if (u !== false)
-            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
-        return writer;
-    }
-}
-/**
- * @generated MessageType for protobuf message SysMessage.EmojiLikeToOthersAttributes
- */
-export const EmojiLikeToOthersAttributes = new EmojiLikeToOthersAttributes$Type();

src/core/proto/GreyTipWrapper.ts

@@ -1,104 +0,0 @@
-// @generated by protobuf-ts 2.9.4
-// @generated from protobuf file "GreyTipWrapper.proto" (package "SysMessage", syntax proto3)
-// tslint:disable
-import type {
-    BinaryReadOptions,
-    BinaryWriteOptions,
-    IBinaryReader,
-    IBinaryWriter,
-    PartialMessage,
-} from '@protobuf-ts/runtime';
-import { MessageType, reflectionMergePartial, UnknownFieldHandler, WireType } from '@protobuf-ts/runtime';
-
-/**
- * @generated from protobuf message SysMessage.GreyTipWrapper
- */
-export interface GreyTipWrapper {
-    /**
-     * @generated from protobuf field: uint32 subTypeId = 1;
-     */
-    subTypeId: number;
-    /**
-     * @generated from protobuf field: uint32 groupCode = 4;
-     */
-    groupCode: number;
-    /**
-     * @generated from protobuf field: uint32 subTypeIdMinusOne = 13;
-     */
-    subTypeIdMinusOne: number;
-    /**
-     * @generated from protobuf field: bytes rest = 44;
-     */
-    rest: Uint8Array;
-}
-// @generated message type with reflection information, may provide speed optimized methods
-class GreyTipWrapper$Type extends MessageType<GreyTipWrapper> {
-    constructor() {
-        super("SysMessage.GreyTipWrapper", [
-            { no: 1, name: "subTypeId", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
-            { no: 4, name: "groupCode", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
-            { no: 13, name: "subTypeIdMinusOne", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
-            { no: 44, name: "rest", kind: "scalar", T: 12 /*ScalarType.BYTES*/ }
-        ]);
-    }
-    create(value?: PartialMessage<GreyTipWrapper>): GreyTipWrapper {
-        const message = globalThis.Object.create((this.messagePrototype!));
-        message.subTypeId = 0;
-        message.groupCode = 0;
-        message.subTypeIdMinusOne = 0;
-        message.rest = new Uint8Array(0);
-        if (value !== undefined)
-            reflectionMergePartial<GreyTipWrapper>(this, message, value);
-        return message;
-    }
-    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: GreyTipWrapper): GreyTipWrapper {
-        let message = target ?? this.create(), end = reader.pos + length;
-        while (reader.pos < end) {
-            let [fieldNo, wireType] = reader.tag();
-            switch (fieldNo) {
-                case /* uint32 subTypeId */ 1:
-                    message.subTypeId = reader.uint32();
-                    break;
-                case /* uint32 groupCode */ 4:
-                    message.groupCode = reader.uint32();
-                    break;
-                case /* uint32 subTypeIdMinusOne */ 13:
-                    message.subTypeIdMinusOne = reader.uint32();
-                    break;
-                case /* bytes rest */ 44:
-                    message.rest = reader.bytes();
-                    break;
-                default:
-                    let u = options.readUnknownField;
-                    if (u === "throw")
-                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
-                    let d = reader.skip(wireType);
-                    if (u !== false)
-                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
-            }
-        }
-        return message;
-    }
-    internalBinaryWrite(message: GreyTipWrapper, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
-        /* uint32 subTypeId = 1; */
-        if (message.subTypeId !== 0)
-            writer.tag(1, WireType.Varint).uint32(message.subTypeId);
-        /* uint32 groupCode = 4; */
-        if (message.groupCode !== 0)
-            writer.tag(4, WireType.Varint).uint32(message.groupCode);
-        /* uint32 subTypeIdMinusOne = 13; */
-        if (message.subTypeIdMinusOne !== 0)
-            writer.tag(13, WireType.Varint).uint32(message.subTypeIdMinusOne);
-        /* bytes rest = 44; */
-        if (message.rest.length)
-            writer.tag(44, WireType.LengthDelimited).bytes(message.rest);
-        let u = options.writeUnknownFields;
-        if (u !== false)
-            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
-        return writer;
-    }
-}
-/**
- * @generated MessageType for protobuf message SysMessage.GreyTipWrapper
- */
-export const GreyTipWrapper = new GreyTipWrapper$Type();

src/core/proto/ProfileLike.ts

@@ -0,0 +1,95 @@
+import * as pb from 'protobufjs';
+
+// Proto: from src/core/proto/ProfileLike.proto
+// Author: Mlikiowa
+
+export interface LikeDetailType {
+    txt: string;
+    uin: pb.Long;
+    nickname: string;
+}
+export interface LikeMsgType {
+    times: number;
+    time: number;
+    detail: LikeDetailType;
+}
+
+export interface profileLikeSubTipType {
+    msg: LikeMsgType;
+}
+
+export interface ProfileLikeTipType {
+    msgType: number;
+    subType: number;
+    content: profileLikeSubTipType;
+}
+export interface SysMessageHeaderType {
+    id: string;
+    timestamp: number;
+    sender: string;
+}
+
+export interface SysMessageMsgSpecType {
+    msgType: number;
+    subType: number;
+    subSubType: number;
+    msgSeq: number;
+    time: number;
+    msgId: pb.Long;
+    other: number;
+}
+export interface SysMessageBodyWrapperType {
+    wrappedBody: Uint8Array;
+}
+export interface SysMessageType {
+    header: SysMessageHeaderType[];
+    msgSpec: SysMessageMsgSpecType[];
+    bodyWrapper: SysMessageBodyWrapperType;
+}
+
+export const SysMessageHeader = new pb.Type("SysMessageHeader")
+    .add(new pb.Field("PeerNumber", 1, "uint32"))
+    .add(new pb.Field("PeerString", 2, "string"))
+    .add(new pb.Field("Uin", 5, "uint32"))
+    .add(new pb.Field("Uid", 6, "string", "optional"));
+
+export const SysMessageMsgSpec = new pb.Type("SysMessageMsgSpec")
+    .add(new pb.Field("msgType", 1, "uint32"))
+    .add(new pb.Field("subType", 2, "uint32"))
+    .add(new pb.Field("subSubType", 3, "uint32"))
+    .add(new pb.Field("msgSeq", 5, "uint32"))
+    .add(new pb.Field("time", 6, "uint32"))
+    .add(new pb.Field("msgId", 12, "uint64"))
+    .add(new pb.Field("other", 13, "uint32"));
+
+export const SysMessageBodyWrapper = new pb.Type("SysMessageBodyWrapper")
+    .add(new pb.Field("wrappedBody", 2, "bytes"));
+
+export const SysMessage = new pb.Type("SysMessage")
+    .add(SysMessageHeader)
+    .add(SysMessageMsgSpec)
+    .add(SysMessageBodyWrapper)
+    .add(new pb.Field("header", 1, "SysMessageHeader", "repeated"))
+    .add(new pb.Field("msgSpec", 2, "SysMessageMsgSpec", "repeated"))
+    .add(new pb.Field("bodyWrapper", 3, "SysMessageBodyWrapper"));
+
+export const likeDetail = new pb.Type("likeDetail")
+    .add(new pb.Field("txt", 1, "string"))
+    .add(new pb.Field("uin", 3, "int64"))
+    .add(new pb.Field("nickname", 5, "string"));
+
+export const likeMsg = new pb.Type("likeMsg")
+    .add(likeDetail)
+    .add(new pb.Field("times", 1, "int32"))
+    .add(new pb.Field("time", 2, "int32"))
+    .add(new pb.Field("detail", 3, "likeDetail"));
+
+export const profileLikeSubTip = new pb.Type("profileLikeSubTip")
+    .add(likeMsg)
+    .add(new pb.Field("msg", 14, "likeMsg"))
+
+export const profileLikeTip = new pb.Type("profileLikeTip")
+    .add(profileLikeSubTip)
+    .add(new pb.Field("msgType", 1, "int32"))
+    .add(new pb.Field("subType", 2, "int32"))
+    .add(new pb.Field("content", 203, "profileLikeSubTip"));

src/core/proto/SysMessage.ts

@@ -1,435 +0,0 @@
-// @generated by protobuf-ts 2.9.4
-// @generated from protobuf file "SysMessage.proto" (package "SysMessage", syntax proto3)
-// tslint:disable
-import type {
-    BinaryReadOptions,
-    BinaryWriteOptions,
-    IBinaryReader,
-    IBinaryWriter,
-    PartialMessage,
-} from '@protobuf-ts/runtime';
-import { MessageType, reflectionMergePartial, UnknownFieldHandler, WireType } from '@protobuf-ts/runtime';
-
-/**
- * @generated from protobuf message SysMessage.SysMessage
- */
-export interface SysMessage {
-    /**
-     * @generated from protobuf field: repeated SysMessage.SysMessageHeader header = 1;
-     */
-    header: SysMessageHeader[];
-    /**
-     * @generated from protobuf field: repeated SysMessage.SysMessageMsgSpec msgSpec = 2;
-     */
-    msgSpec: SysMessageMsgSpec[];
-    /**
-     * @generated from protobuf field: SysMessage.SysMessageBodyWrapper bodyWrapper = 3;
-     */
-    bodyWrapper?: SysMessageBodyWrapper;
-}
-/**
- * @generated from protobuf message SysMessage.SysMessageHeader
- */
-export interface SysMessageHeader {
-    /**
-     * @generated from protobuf field: uint32 PeerNumber = 1 [json_name = "PeerNumber"];
-     */
-    peerNumber: number;
-    /**
-     * @generated from protobuf field: string PeerString = 2 [json_name = "PeerString"];
-     */
-    peerString: string;
-    /**
-     * @generated from protobuf field: uint32 Uin = 5 [json_name = "Uin"];
-     */
-    uin: number;
-    /**
-     * @generated from protobuf field: optional string Uid = 6 [json_name = "Uid"];
-     */
-    uid?: string;
-}
-/**
- * @generated from protobuf message SysMessage.SysMessageMsgSpec
- */
-export interface SysMessageMsgSpec {
-    /**
-     * @generated from protobuf field: uint32 msgType = 1;
-     */
-    msgType: number;
-    /**
-     * @generated from protobuf field: uint32 subType = 2;
-     */
-    subType: number;
-    /**
-     * @generated from protobuf field: uint32 subSubType = 3;
-     */
-    subSubType: number;
-    /**
-     * @generated from protobuf field: uint32 msgSeq = 5;
-     */
-    msgSeq: number;
-    /**
-     * @generated from protobuf field: uint32 time = 6;
-     */
-    time: number;
-    /**
-     * @generated from protobuf field: uint64 msgId = 12;
-     */
-    msgId: bigint;
-    /**
-     * @generated from protobuf field: uint32 other = 13;
-     */
-    other: number;
-}
-/**
- * @generated from protobuf message SysMessage.SysMessageBodyWrapper
- */
-export interface SysMessageBodyWrapper {
-    /**
-     * @generated from protobuf field: bytes wrappedBody = 2;
-     */
-    wrappedBody: Uint8Array; // Find the first [08], or ignore the first 7 bytes?
-    // And it becomes another ProtoBuf message.
-}
-/**
- * @generated from protobuf message SysMessage.KeyValuePair
- */
-export interface KeyValuePair {
-    /**
-     * @generated from protobuf field: string key = 1;
-     */
-    key: string;
-    /**
-     * @generated from protobuf field: string value = 2;
-     */
-    value: string;
-}
-// @generated message type with reflection information, may provide speed optimized methods
-class SysMessage$Type extends MessageType<SysMessage> {
-    constructor() {
-        super("SysMessage.SysMessage", [
-            { no: 1, name: "header", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => SysMessageHeader },
-            { no: 2, name: "msgSpec", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => SysMessageMsgSpec },
-            { no: 3, name: "bodyWrapper", kind: "message", T: () => SysMessageBodyWrapper }
-        ]);
-    }
-    create(value?: PartialMessage<SysMessage>): SysMessage {
-        const message = globalThis.Object.create((this.messagePrototype!));
-        message.header = [];
-        message.msgSpec = [];
-        if (value !== undefined)
-            reflectionMergePartial<SysMessage>(this, message, value);
-        return message;
-    }
-    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: SysMessage): SysMessage {
-        let message = target ?? this.create(), end = reader.pos + length;
-        while (reader.pos < end) {
-            let [fieldNo, wireType] = reader.tag();
-            switch (fieldNo) {
-                case /* repeated SysMessage.SysMessageHeader header */ 1:
-                    message.header.push(SysMessageHeader.internalBinaryRead(reader, reader.uint32(), options));
-                    break;
-                case /* repeated SysMessage.SysMessageMsgSpec msgSpec */ 2:
-                    message.msgSpec.push(SysMessageMsgSpec.internalBinaryRead(reader, reader.uint32(), options));
-                    break;
-                case /* SysMessage.SysMessageBodyWrapper bodyWrapper */ 3:
-                    message.bodyWrapper = SysMessageBodyWrapper.internalBinaryRead(reader, reader.uint32(), options, message.bodyWrapper);
-                    break;
-                default:
-                    let u = options.readUnknownField;
-                    if (u === "throw")
-                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
-                    let d = reader.skip(wireType);
-                    if (u !== false)
-                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
-            }
-        }
-        return message;
-    }
-    internalBinaryWrite(message: SysMessage, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
-        /* repeated SysMessage.SysMessageHeader header = 1; */
-        for (let i = 0; i < message.header.length; i++)
-            SysMessageHeader.internalBinaryWrite(message.header[i], writer.tag(1, WireType.LengthDelimited).fork(), options).join();
-        /* repeated SysMessage.SysMessageMsgSpec msgSpec = 2; */
-        for (let i = 0; i < message.msgSpec.length; i++)
-            SysMessageMsgSpec.internalBinaryWrite(message.msgSpec[i], writer.tag(2, WireType.LengthDelimited).fork(), options).join();
-        /* SysMessage.SysMessageBodyWrapper bodyWrapper = 3; */
-        if (message.bodyWrapper)
-            SysMessageBodyWrapper.internalBinaryWrite(message.bodyWrapper, writer.tag(3, WireType.LengthDelimited).fork(), options).join();
-        let u = options.writeUnknownFields;
-        if (u !== false)
-            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
-        return writer;
-    }
-}
-/**
- * @generated MessageType for protobuf message SysMessage.SysMessage
- */
-export const SysMessage = new SysMessage$Type();
-// @generated message type with reflection information, may provide speed optimized methods
-class SysMessageHeader$Type extends MessageType<SysMessageHeader> {
-    constructor() {
-        super("SysMessage.SysMessageHeader", [
-            { no: 1, name: "PeerNumber", kind: "scalar", jsonName: "PeerNumber", T: 13 /*ScalarType.UINT32*/ },
-            { no: 2, name: "PeerString", kind: "scalar", jsonName: "PeerString", T: 9 /*ScalarType.STRING*/ },
-            { no: 5, name: "Uin", kind: "scalar", jsonName: "Uin", T: 13 /*ScalarType.UINT32*/ },
-            { no: 6, name: "Uid", kind: "scalar", jsonName: "Uid", opt: true, T: 9 /*ScalarType.STRING*/ }
-        ]);
-    }
-    create(value?: PartialMessage<SysMessageHeader>): SysMessageHeader {
-        const message = globalThis.Object.create((this.messagePrototype!));
-        message.peerNumber = 0;
-        message.peerString = "";
-        message.uin = 0;
-        if (value !== undefined)
-            reflectionMergePartial<SysMessageHeader>(this, message, value);
-        return message;
-    }
-    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: SysMessageHeader): SysMessageHeader {
-        let message = target ?? this.create(), end = reader.pos + length;
-        while (reader.pos < end) {
-            let [fieldNo, wireType] = reader.tag();
-            switch (fieldNo) {
-                case /* uint32 PeerNumber = 1 [json_name = "PeerNumber"];*/ 1:
-                    message.peerNumber = reader.uint32();
-                    break;
-                case /* string PeerString = 2 [json_name = "PeerString"];*/ 2:
-                    message.peerString = reader.string();
-                    break;
-                case /* uint32 Uin = 5 [json_name = "Uin"];*/ 5:
-                    message.uin = reader.uint32();
-                    break;
-                case /* optional string Uid = 6 [json_name = "Uid"];*/ 6:
-                    message.uid = reader.string();
-                    break;
-                default:
-                    let u = options.readUnknownField;
-                    if (u === "throw")
-                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
-                    let d = reader.skip(wireType);
-                    if (u !== false)
-                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
-            }
-        }
-        return message;
-    }
-    internalBinaryWrite(message: SysMessageHeader, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
-        /* uint32 PeerNumber = 1 [json_name = "PeerNumber"]; */
-        if (message.peerNumber !== 0)
-            writer.tag(1, WireType.Varint).uint32(message.peerNumber);
-        /* string PeerString = 2 [json_name = "PeerString"]; */
-        if (message.peerString !== "")
-            writer.tag(2, WireType.LengthDelimited).string(message.peerString);
-        /* uint32 Uin = 5 [json_name = "Uin"]; */
-        if (message.uin !== 0)
-            writer.tag(5, WireType.Varint).uint32(message.uin);
-        /* optional string Uid = 6 [json_name = "Uid"]; */
-        if (message.uid !== undefined)
-            writer.tag(6, WireType.LengthDelimited).string(message.uid);
-        let u = options.writeUnknownFields;
-        if (u !== false)
-            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
-        return writer;
-    }
-}
-/**
- * @generated MessageType for protobuf message SysMessage.SysMessageHeader
- */
-export const SysMessageHeader = new SysMessageHeader$Type();
-// @generated message type with reflection information, may provide speed optimized methods
-class SysMessageMsgSpec$Type extends MessageType<SysMessageMsgSpec> {
-    constructor() {
-        super("SysMessage.SysMessageMsgSpec", [
-            { no: 1, name: "msgType", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
-            { no: 2, name: "subType", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
-            { no: 3, name: "subSubType", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
-            { no: 5, name: "msgSeq", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
-            { no: 6, name: "time", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
-            { no: 12, name: "msgId", kind: "scalar", T: 4 /*ScalarType.UINT64*/, L: 0 /*LongType.BIGINT*/ },
-            { no: 13, name: "other", kind: "scalar", T: 13 /*ScalarType.UINT32*/ }
-        ]);
-    }
-    create(value?: PartialMessage<SysMessageMsgSpec>): SysMessageMsgSpec {
-        const message = globalThis.Object.create((this.messagePrototype!));
-        message.msgType = 0;
-        message.subType = 0;
-        message.subSubType = 0;
-        message.msgSeq = 0;
-        message.time = 0;
-        message.msgId = 0n;
-        message.other = 0;
-        if (value !== undefined)
-            reflectionMergePartial<SysMessageMsgSpec>(this, message, value);
-        return message;
-    }
-    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: SysMessageMsgSpec): SysMessageMsgSpec {
-        let message = target ?? this.create(), end = reader.pos + length;
-        while (reader.pos < end) {
-            let [fieldNo, wireType] = reader.tag();
-            switch (fieldNo) {
-                case /* uint32 msgType */ 1:
-                    message.msgType = reader.uint32();
-                    break;
-                case /* uint32 subType */ 2:
-                    message.subType = reader.uint32();
-                    break;
-                case /* uint32 subSubType */ 3:
-                    message.subSubType = reader.uint32();
-                    break;
-                case /* uint32 msgSeq */ 5:
-                    message.msgSeq = reader.uint32();
-                    break;
-                case /* uint32 time */ 6:
-                    message.time = reader.uint32();
-                    break;
-                case /* uint64 msgId */ 12:
-                    message.msgId = reader.uint64().toBigInt();
-                    break;
-                case /* uint32 other */ 13:
-                    message.other = reader.uint32();
-                    break;
-                default:
-                    let u = options.readUnknownField;
-                    if (u === "throw")
-                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
-                    let d = reader.skip(wireType);
-                    if (u !== false)
-                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
-            }
-        }
-        return message;
-    }
-    internalBinaryWrite(message: SysMessageMsgSpec, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
-        /* uint32 msgType = 1; */
-        if (message.msgType !== 0)
-            writer.tag(1, WireType.Varint).uint32(message.msgType);
-        /* uint32 subType = 2; */
-        if (message.subType !== 0)
-            writer.tag(2, WireType.Varint).uint32(message.subType);
-        /* uint32 subSubType = 3; */
-        if (message.subSubType !== 0)
-            writer.tag(3, WireType.Varint).uint32(message.subSubType);
-        /* uint32 msgSeq = 5; */
-        if (message.msgSeq !== 0)
-            writer.tag(5, WireType.Varint).uint32(message.msgSeq);
-        /* uint32 time = 6; */
-        if (message.time !== 0)
-            writer.tag(6, WireType.Varint).uint32(message.time);
-        /* uint64 msgId = 12; */
-        if (message.msgId !== 0n)
-            writer.tag(12, WireType.Varint).uint64(message.msgId);
-        /* uint32 other = 13; */
-        if (message.other !== 0)
-            writer.tag(13, WireType.Varint).uint32(message.other);
-        let u = options.writeUnknownFields;
-        if (u !== false)
-            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
-        return writer;
-    }
-}
-/**
- * @generated MessageType for protobuf message SysMessage.SysMessageMsgSpec
- */
-export const SysMessageMsgSpec = new SysMessageMsgSpec$Type();
-// @generated message type with reflection information, may provide speed optimized methods
-class SysMessageBodyWrapper$Type extends MessageType<SysMessageBodyWrapper> {
-    constructor() {
-        super("SysMessage.SysMessageBodyWrapper", [
-            { no: 2, name: "wrappedBody", kind: "scalar", T: 12 /*ScalarType.BYTES*/ }
-        ]);
-    }
-    create(value?: PartialMessage<SysMessageBodyWrapper>): SysMessageBodyWrapper {
-        const message = globalThis.Object.create((this.messagePrototype!));
-        message.wrappedBody = new Uint8Array(0);
-        if (value !== undefined)
-            reflectionMergePartial<SysMessageBodyWrapper>(this, message, value);
-        return message;
-    }
-    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: SysMessageBodyWrapper): SysMessageBodyWrapper {
-        let message = target ?? this.create(), end = reader.pos + length;
-        while (reader.pos < end) {
-            let [fieldNo, wireType] = reader.tag();
-            switch (fieldNo) {
-                case /* bytes wrappedBody */ 2:
-                    message.wrappedBody = reader.bytes();
-                    break;
-                default:
-                    let u = options.readUnknownField;
-                    if (u === "throw")
-                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
-                    let d = reader.skip(wireType);
-                    if (u !== false)
-                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
-            }
-        }
-        return message;
-    }
-    internalBinaryWrite(message: SysMessageBodyWrapper, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
-        /* bytes wrappedBody = 2; */
-        if (message.wrappedBody.length)
-            writer.tag(2, WireType.LengthDelimited).bytes(message.wrappedBody);
-        let u = options.writeUnknownFields;
-        if (u !== false)
-            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
-        return writer;
-    }
-}
-/**
- * @generated MessageType for protobuf message SysMessage.SysMessageBodyWrapper
- */
-export const SysMessageBodyWrapper = new SysMessageBodyWrapper$Type();
-// @generated message type with reflection information, may provide speed optimized methods
-class KeyValuePair$Type extends MessageType<KeyValuePair> {
-    constructor() {
-        super("SysMessage.KeyValuePair", [
-            { no: 1, name: "key", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
-            { no: 2, name: "value", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
-        ]);
-    }
-    create(value?: PartialMessage<KeyValuePair>): KeyValuePair {
-        const message = globalThis.Object.create((this.messagePrototype!));
-        message.key = "";
-        message.value = "";
-        if (value !== undefined)
-            reflectionMergePartial<KeyValuePair>(this, message, value);
-        return message;
-    }
-    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: KeyValuePair): KeyValuePair {
-        let message = target ?? this.create(), end = reader.pos + length;
-        while (reader.pos < end) {
-            let [fieldNo, wireType] = reader.tag();
-            switch (fieldNo) {
-                case /* string key */ 1:
-                    message.key = reader.string();
-                    break;
-                case /* string value */ 2:
-                    message.value = reader.string();
-                    break;
-                default:
-                    let u = options.readUnknownField;
-                    if (u === "throw")
-                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
-                    let d = reader.skip(wireType);
-                    if (u !== false)
-                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
-            }
-        }
-        return message;
-    }
-    internalBinaryWrite(message: KeyValuePair, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
-        /* string key = 1; */
-        if (message.key !== "")
-            writer.tag(1, WireType.LengthDelimited).string(message.key);
-        /* string value = 2; */
-        if (message.value !== "")
-            writer.tag(2, WireType.LengthDelimited).string(message.value);
-        let u = options.writeUnknownFields;
-        if (u !== false)
-            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
-        return writer;
-    }
-}
-/**
- * @generated MessageType for protobuf message SysMessage.KeyValuePair
- */
-export const KeyValuePair = new KeyValuePair$Type();

src/core/services/NodeIKernelAlbumService.ts

@@ -1,4 +1,5 @@
 export interface NodeIKernelAlbumService {
+    
     setAlbumServiceInfo(...args: any[]): unknown;// needs 3 arguments
 
     getMainPage(...args: any[]): unknown;// needs 2 arguments

src/core/services/NodeIKernelAvatarService.ts

@@ -1,7 +1,7 @@
 export interface NodeIKernelAvatarService {
-    addAvatarListener(arg: unknown): unknown;
+    addAvatarListener(listener: unknown): void;
 
-    removeAvatarListener(arg: unknown): unknown;
+    removeAvatarListener(listenerId: number): void;
 
     getAvatarPath(arg1: unknown, arg2: unknown): unknown;
 

src/core/services/NodeIKernelBuddyService.ts

@@ -1,13 +1,8 @@
 import { GeneralCallResult } from '@/core/services/common';
 import { NodeIKernelBuddyListener } from '@/core/listeners';
-
-export enum BuddyListReqType {
-    KNOMAL,
-    KLETTER
-}
+import { BuddyListReqType } from '../entities/user';
 
 export interface NodeIKernelBuddyService {
-    // 26702 以上
     getBuddyListV2(callFrom: string, reqType: BuddyListReqType): Promise<GeneralCallResult & {
         data: Array<{
             categoryId: number,
@@ -19,8 +14,7 @@ export interface NodeIKernelBuddyService {
         }>
     }>;
 
-    //26702 以上
-    getBuddyListFromCache(callFrom: string): Promise<Array<
+    getBuddyListFromCache(reqType: BuddyListReqType): Promise<Array<
         {
             categoryId: number,//9999应该跳过 那是兜底数据吧
             categorySortId: number,//排序方式
@@ -30,18 +24,13 @@ export interface NodeIKernelBuddyService {
             buddyUids: Array<string>//Uids
         }>>;
 
-    // 以下为原生方法
     addKernelBuddyListener(listener: NodeIKernelBuddyListener): number;
 
     getAllBuddyCount(): number;
 
-    removeKernelBuddyListener(listener: unknown): void;
+    removeKernelBuddyListener(listenerId: number): void;
 
-    /**
-     * @deprecated
-     * @param nocache 使用缓存
-     */
-    getBuddyList(nocache: boolean): Promise<GeneralCallResult>;
+    //getBuddyList(nocache: boolean): Promise<GeneralCallResult>;
 
     getBuddyNick(uid: number): string;
 
@@ -125,7 +114,7 @@ export interface NodeIKernelBuddyService {
 
     reportDoubtBuddyReqUnread(): void;
 
-    getBuddyRecommendContactArkJson(uid: string, phoneNumber: string): Promise<unknown>;
+    getBuddyRecommendContactArkJson(uid: string, phoneNumber: string): Promise<GeneralCallResult & { arkMsg: string }>;
 
     isNull(): boolean;
 }

src/core/services/NodeIKernelCollectionService.ts

@@ -1,9 +1,9 @@
 import { GeneralCallResult } from './common';
 
 export interface NodeIKernelCollectionService {
-    addKernelCollectionListener(...args: any[]): unknown;//needs 1 arguments
+    addKernelCollectionListener(...args: any[]): void;//needs 1 arguments
 
-    removeKernelCollectionListener(...args: any[]): unknown;//needs 1 arguments
+    removeKernelCollectionListener(listenerId: number): void;
 
     getCollectionItemList(param: {
         category: number,
@@ -14,46 +14,46 @@ export interface NodeIKernelCollectionService {
         count: number,
         searchDown: boolean
     }): Promise<GeneralCallResult &
-        {
-            collectionSearchList: {
-                collectionItemList: Array<
-                    {
-                        cid: string,
+    {
+        collectionSearchList: {
+            collectionItemList: Array<
+                {
+                    cid: string,
+                    type: number,
+                    status: number,
+                    author: {
                         type: number,
-                        status: number,
-                        author: {
-                            type: number,
-                            numId: string,
-                            strId: string,
-                            groupId: string,
-                            groupName: string,
-                            uid: string
-                        },
-                        bid: number,
-                        category: number,
-                        createTime: string,
-                        collectTime: string,
-                        modifyTime: string,
-                        sequence: string,
-                        shareUrl: string,
-                        customGroupId: number,
-                        securityBeat: boolean,
-                        summary: {
-                            textSummary: unknown,
-                            linkSummary: unknown,
-                            gallerySummary: unknown,
-                            audioSummary: unknown,
-                            videoSummary: unknown,
-                            fileSummary: unknown,
-                            locationSummary: unknown,
-                            richMediaSummary: unknown,
-                        }
-                    }>,
-                hasMore: boolean,
-                bottomTimeStamp: string
-            }
+                        numId: string,
+                        strId: string,
+                        groupId: string,
+                        groupName: string,
+                        uid: string
+                    },
+                    bid: number,
+                    category: number,
+                    createTime: string,
+                    collectTime: string,
+                    modifyTime: string,
+                    sequence: string,
+                    shareUrl: string,
+                    customGroupId: number,
+                    securityBeat: boolean,
+                    summary: {
+                        textSummary: unknown,
+                        linkSummary: unknown,
+                        gallerySummary: unknown,
+                        audioSummary: unknown,
+                        videoSummary: unknown,
+                        fileSummary: unknown,
+                        locationSummary: unknown,
+                        richMediaSummary: unknown,
+                    }
+                }>,
+            hasMore: boolean,
+            bottomTimeStamp: string
         }
-    >;//needs 1 arguments
+    }
+    >;
 
     getCollectionContent(...args: any[]): unknown;//needs 5 arguments
 

src/core/services/NodeIKernelDbToolsService.ts

@@ -1,7 +1,9 @@
 export interface NodeIKernelDbToolsService {
+
     depositDatabase(...args: unknown[]): unknown;
 
     backupDatabase(...args: unknown[]): unknown;
 
     retrieveDatabase(...args: unknown[]): unknown;
+    
 }

src/core/services/NodeIKernelECDHService.ts

@@ -1,3 +1,2 @@
 export interface NodeIKernelECDHService {
-
 }

src/core/services/NodeIKernelGroupService.ts

@@ -11,8 +11,6 @@ import {
 } from '@/core/entities';
 import { GeneralCallResult } from '@/core/services/common';
 
-//高版本的接口不应该随意使用 使用应该严格进行pr审核 同时部分ipc中未出现的接口不要过于依赖 应该做好数据兜底
-
 export interface NodeIKernelGroupService {
     getGroupExt0xEF0Info(enableGroupCodes: string[], bannedGroupCodes: string[], filter: GroupExt0xEF0InfoFilter, forceFetch: boolean):
         Promise<GeneralCallResult & { result: { groupExtInfos: Map<string, any> } }>;
@@ -82,11 +80,11 @@ export interface NodeIKernelGroupService {
     }): Promise<unknown>;
 
 
-    isEssenceMsg(Req: { groupCode: string, msgRandom: number, msgSeq: number }): Promise<unknown>;
+    isEssenceMsg(req: { groupCode: string, msgRandom: number, msgSeq: number }): Promise<unknown>;
 
-    queryCachedEssenceMsg(Req: { groupCode: string, msgRandom: number, msgSeq: number }): Promise<unknown>;
+    queryCachedEssenceMsg(req: { groupCode: string, msgRandom: number, msgSeq: number }): Promise<unknown>;
 
-    fetchGroupEssenceList(Req: {
+    fetchGroupEssenceList(req: {
         groupCode: string,
         pageStart: number,
         pageLimit: number
@@ -110,13 +108,12 @@ export interface NodeIKernelGroupService {
 
     addKernelGroupListener(listener: NodeIKernelGroupListener): number;
 
-    removeKernelGroupListener(listenerId: unknown): void;
+    removeKernelGroupListener(listenerId: number): void;
 
     createMemberListScene(groupCode: string, scene: string): string;
 
     destroyMemberListScene(SceneId: string): void;
 
-    //About Arg (a) name: lastId 根据手Q来看为object {index:?(number),uid:string}
     getNextMemberList(sceneId: string, a: undefined, num: number): Promise<{
         errCode: number, errMsg: string,
         result: { ids: string[], infos: Map<string, GroupMember>, finish: boolean, hasRobot: boolean }
@@ -247,14 +244,12 @@ export interface NodeIKernelGroupService {
 
     modifyGroupExtInfo(groupCode: string, arg: unknown): void;
 
-    //需要提前判断是否存在 高版本新增
     addGroupEssence(param: {
         groupCode: string
         msgRandom: number,
         msgSeq: number
     }): Promise<unknown>;
 
-    //需要提前判断是否存在 高版本新增
     removeGroupEssence(param: {
         groupCode: string
         msgRandom: number,

src/core/services/NodeIKernelLoginService.ts

@@ -59,6 +59,7 @@ export interface QuickLoginResult {
 }
 
 export interface NodeIKernelLoginService {
+    connect(): boolean;
     // eslint-disable-next-line @typescript-eslint/no-misused-new
     new(): NodeIKernelLoginService;
 

src/core/services/NodeIKernelMsgBackupService.ts

@@ -1,7 +1,7 @@
 export interface NodeIKernelMsgBackupService {
-    addKernelMsgBackupListener(...args: any[]): unknown;// needs 1 arguments
+    addKernelMsgBackupListener(listener: unknown): number;
 
-    removeKernelMsgBackupListener(...args: any[]): unknown;// needs 1 arguments
+    removeKernelMsgBackupListener(listenerId: number): void;
 
     getMsgBackupLocation(...args: any[]): unknown;// needs 0 arguments
 

src/core/services/NodeIKernelMsgService.ts

@@ -1,32 +1,7 @@
 import { ElementType, MessageElement, Peer, RawMessage, SendMessageElement } from '@/core/entities';
 import { NodeIKernelMsgListener } from '@/core/listeners/NodeIKernelMsgListener';
 import { GeneralCallResult } from '@/core/services/common';
-
-export interface QueryMsgsParams {
-    chatInfo: Peer,
-    filterMsgType: [],
-    filterSendersUid: string[],
-    filterMsgFromTime: string,
-    filterMsgToTime: string,
-    pageLimit: number,
-    isReverseOrder: boolean,
-    isIncludeCurrent: boolean
-}
-
-export interface TmpChatInfoApi {
-    errMsg: string;
-    result: number;
-    tmpChatInfo?: TmpChatInfo;
-}
-
-export interface TmpChatInfo {
-    chatType: number;
-    fromNick: string;
-    groupCode: string;
-    peerUid: string;
-    sessionType: number;
-    sig: string;
-}
+import { MsgReqType, QueryMsgsParams, TmpChatInfoApi } from '../entities/msg';
 
 export interface NodeIKernelMsgService {
 
@@ -76,18 +51,12 @@ export interface NodeIKernelMsgService {
 
     downloadOnlineStatusCommonByUrl(arg0: string, arg1: string): unknown;
 
-    // this.tokenType = i2;
-    // this.apnsToken = bArr;
-    // this.voipToken = bArr2;
-    // this.profileId = str;
-
     setToken(arg: unknown): unknown;
 
     switchForeGround(): unknown;
 
     switchBackGround(arg: unknown): unknown;
 
-    //hex
     setTokenForMqq(token: string): unknown;
 
     switchForeGroundForMqq(...args: unknown[]): unknown;
@@ -124,7 +93,6 @@ export interface NodeIKernelMsgService {
 
     forwardFile(...args: unknown[]): unknown;
 
-    //Array<Msg>, Peer from, Peer to
     multiForwardMsg(...args: unknown[]): unknown;
 
     multiForwardMsgWithComment(...args: unknown[]): unknown;
@@ -179,17 +147,15 @@ export interface NodeIKernelMsgService {
         msgList: RawMessage[]
     }>;
 
+    //@deprecated
     getMsgs(peer: Peer, msgId: string, count: unknown, queryOrder: boolean): Promise<unknown>;
 
+    //@deprecated
     getMsgsIncludeSelf(peer: Peer, msgId: string, count: number, queryOrder: boolean): Promise<GeneralCallResult & {
         msgList: RawMessage[]
     }>;
 
-    // this.$peer = contact;
-    // this.$msgTime = j2;
-    // this.$clientSeq = j3;
-    // this.$cnt = i2;
-
+    //@deprecated
     getMsgsWithMsgTimeAndClientSeqForC2C(...args: unknown[]): Promise<GeneralCallResult & { msgList: RawMessage[] }>;
 
     getMsgsWithStatus(params: {
@@ -205,7 +171,7 @@ export interface NodeIKernelMsgService {
     getMsgsBySeqRange(peer: Peer, startSeq: string, endSeq: string): Promise<GeneralCallResult & {
         msgList: RawMessage[]
     }>;
-
+    //@deprecated
     getMsgsBySeqAndCount(peer: Peer, seq: string, count: number, desc: boolean, unknownArg: boolean): Promise<GeneralCallResult & {
         msgList: RawMessage[]
     }>;
@@ -216,6 +182,8 @@ export interface NodeIKernelMsgService {
 
     getMsgsBySeqList(peer: Peer, seqList: string[]): Promise<GeneralCallResult & { msgList: RawMessage[] }>;
 
+    getMsgsExt(msgReq: MsgReqType): Promise<GeneralCallResult & { msgList: RawMessage[] }>;
+
     getSingleMsg(Peer: Peer, msgSeq: string): Promise<GeneralCallResult & { msgList: RawMessage[] }>;
 
     getSourceOfReplyMsg(peer: Peer, MsgId: string, SourceSeq: string): unknown;
@@ -226,7 +194,6 @@ export interface NodeIKernelMsgService {
 
     getSourceOfReplyMsgByClientSeqAndTime(peer: Peer, clientSeq: string, time: string): unknown;
 
-    //cnt clientSeq?并不是吧
     getMsgsByTypeFilter(peer: Peer, msgId: string, cnt: unknown, queryOrder: boolean, typeFilter: {
         type: number,
         subtype: Array<number>
@@ -241,49 +208,15 @@ export interface NodeIKernelMsgService {
 
     queryMsgsWithFilter(...args: unknown[]): unknown;
 
-    /**
-     * @deprecated 该函数已被标记为废弃，请使用新的替代方法。
-     * 使用过滤条件查询消息列表的版本2接口。
-     *
-     * 该函数通过一系列过滤条件来查询特定聊天中的消息列表。这些条件包括消息类型、发送者、时间范围等。
-     * 函数返回一个Promise，解析为查询结果的未知类型对象。
-     *
-     * @param MsgId 消息ID，用于特定消息的查询。
-     * @param MsgTime 消息时间，用于指定消息的时间范围。
-     * @param param 查询参数对象，包含详细的过滤条件和分页信息。
-     * @param param.chatInfo 聊天信息，包括聊天类型和对方用户ID。
-     * @param param.filterMsgType 需要过滤的消息类型数组，留空表示不过滤。
-     * @param param.filterSendersUid 需要过滤的发送者用户ID数组。
-     * @param param.filterMsgFromTime 查询消息的起始时间。
-     * @param param.filterMsgToTime 查询消息的结束时间。
-     * @param param.pageLimit 每页的消息数量限制。
-     * @param param.isReverseOrder 是否按时间顺序倒序返回消息。
-     * @param param.isIncludeCurrent 是否包含当前页码。
-     * @returns 返回一个Promise，解析为查询结果的未知类型对象。
-     */
-    queryMsgsWithFilterVer2(MsgId: string, MsgTime: string, param: QueryMsgsParams): Promise<unknown>;
+    //queryMsgsWithFilterVer2(MsgId: string, MsgTime: string, param: QueryMsgsParams): Promise<unknown>;
 
-    // this.chatType = i2;
-    // this.peerUid = str;
-
-    // this.chatInfo = new ChatInfo();
-    // this.filterMsgType = new ArrayList<>();
-    // this.filterSendersUid = new ArrayList<>();
-    // this.chatInfo = chatInfo;
-    // this.filterMsgType = arrayList;
-    // this.filterSendersUid = arrayList2;
-    // this.filterMsgFromTime = j2;
-    // this.filterMsgToTime = j3;
-    // this.pageLimit = i2;
-    // this.isReverseOrder = z;
-    // this.isIncludeCurrent = z2;
-    //queryMsgsWithFilterEx(0L, 0L, 0L, new QueryMsgsParams(new ChatInfo(2, str), new ArrayList(), new ArrayList(), 0L, 0L, 250, false, true))
     queryMsgsWithFilterEx(msgId: string, msgTime: string, megSeq: string, param: QueryMsgsParams): Promise<GeneralCallResult & {
         msgList: RawMessage[]
     }>;
 
-    //queryMsgsWithFilterEx(this.$msgId, this.$msgTime, this.$msgSeq, this.$param)
-    queryFileMsgsDesktop(...args: unknown[]): unknown;
+    queryFileMsgsDesktop(msgId: string, msgTime: string, msgSeq: string, param: QueryMsgsParams): Promise<GeneralCallResult & {
+        msgList: RawMessage[]
+    }>;
 
     setMsgRichInfoFlag(...args: unknown[]): unknown;
 
@@ -390,17 +323,11 @@ export interface NodeIKernelMsgService {
 
     getFileThumbSavePath(...args: unknown[]): unknown;
 
-    //猜测居多
-    translatePtt2Text(MsgId: string, Peer: Peer, MsgElement: unknown): unknown;
+    translatePtt2Text(msgId: string, peer: Peer, msgElement: MessageElement): unknown;
 
     setPttPlayedState(...args: unknown[]): unknown;
 
-    // NodeIQQNTWrapperSession fetchFavEmojiList [
-    //   "",
-    //   48,
-    //   true,
-    //   true
-    // ]
+    //uk1 uk2 true
     fetchFavEmojiList(str: string, num: number, uk1: boolean, uk2: boolean): Promise<GeneralCallResult & {
         emojiInfoList: Array<{
             uin: string,
@@ -469,7 +396,12 @@ export interface NodeIKernelMsgService {
 
     getEmojiResourcePath(...args: unknown[]): unknown;
 
-    JoinDragonGroupEmoji(JoinDragonGroupEmojiReq: any/*joinDragonGroupEmojiReq*/): unknown;
+    JoinDragonGroupEmoji(JoinDragonGroupEmojiReq: {
+        latestMsgSeq: string,
+        manageEmojiId: number,
+        manageMsgSeq: string,
+        peerContact: Peer
+    }): Promise<unknown>;
 
     getMsgAbstracts(...args: unknown[]): unknown;
 
@@ -496,7 +428,7 @@ export interface NodeIKernelMsgService {
     getFirstUnreadMsgSeq(args: {
         peerUid: string
         guildId: string
-    }): unknown;
+    }): Promise<unknown>;
 
     getFirstUnreadCommonMsg(...args: unknown[]): unknown;
 
@@ -590,13 +522,13 @@ export interface NodeIKernelMsgService {
 
     getFirstUnreadAtMsg(peer: Peer): unknown;
 
-    clearMsgRecords(...args: unknown[]): unknown;//设置已读后调用我觉得比较好 清理记录 现在别了
+    clearMsgRecords(...args: unknown[]): unknown;
 
     IsExistOldDb(...args: unknown[]): unknown;
 
     canImportOldDbMsg(...args: unknown[]): unknown;
 
-    setPowerStatus(z: boolean): unknown;
+    setPowerStatus(isPowerOn: boolean): unknown;
 
     canProcessDataMigration(...args: unknown[]): unknown;
 
@@ -626,25 +558,10 @@ export interface NodeIKernelMsgService {
 
     enterOrExitAio(...args: unknown[]): unknown;
 
-    // this.peerUid = "";
-    // this.peerNickname = "";
-    // this.fromGroupCode = "";
-    // this.sig = new byte[0];
-    // this.selfUid = "";
-    // this.selfPhone = "";
-    // this.chatType = i2;
-    // this.peerUid = str;
-    // this.peerNickname = str2;
-    // this.fromGroupCode = str3;
-    // this.sig = bArr;
-    // this.selfUid = str4;
-    // this.selfPhone = str5;
-    // this.gameSession = tempChatGameSession;
-    prepareTempChat(args: unknown): unknown;//主动临时消息 不做
+    prepareTempChat(args: unknown): unknown;
 
     sendSsoCmdReqByContend(cmd: string, param: string): Promise<unknown>;
 
-    //chattype,uid->Promise<any>
     getTempChatInfo(ChatType: number, Uid: string): Promise<TmpChatInfoApi>;
 
     setContactLocalTop(...args: unknown[]): unknown;
@@ -700,7 +617,7 @@ export interface NodeIKernelMsgService {
     setIKernelPublicAccountAdapter(...args: unknown[]): unknown;
 
     //tempChatGameSession有关
-    createUidFromTinyId(fromTinyId: string, toTinyId: string): unknown;
+    createUidFromTinyId(fromTinyId: string, toTinyId: string): string;
 
     dataMigrationGetDataAvaiableContactList(...args: unknown[]): unknown;
 
@@ -708,7 +625,6 @@ export interface NodeIKernelMsgService {
 
     dataMigrationStopOperation(...args: unknown[]): unknown;
 
-    //新的希望
     dataMigrationImportMsgPbRecord(DataMigrationMsgInfo: Array<{
         extensionData: string//"Hex"
         extraData: string //""
@@ -760,6 +676,6 @@ export interface NodeIKernelMsgService {
 
     getGuildMsgAbFlag(...args: unknown[]): unknown;
 
-    getGroupMsgStorageTime(): unknown;//这是嘛啊
+    getGroupMsgStorageTime(): unknown;
 
 }

src/core/services/NodeIKernelNodeMiscService.ts

@@ -1,6 +1,5 @@
 import { GeneralCallResult } from './common';
 
-//没扒干净 因为用不着
 export interface NodeIKernelNodeMiscService {
     getMiniAppPath(): unknown;
 
@@ -11,7 +10,4 @@ export interface NodeIKernelNodeMiscService {
     SendMiniAppMsg(arg1: string, arg2: string, arg3: string): unknown;
 
     startNewMiniApp(appfile: string, params: string): unknown;
-
-    // 我的计划是转发给一个新程序避免吃掉Electron_AS_Node的环境 然后重写启动MiniApp 挂载相应JS脚本 这样有个问题
-    // 需要自己转发ipc参数 然后必须处在gui环境 且完成校验破解 才能实现发包 有点抽象了
 }

src/core/services/NodeIKernelOnlineStatusService.ts

@@ -1,8 +1,8 @@
 export interface NodeIKernelOnlineStatusService {
 
-    addKernelOnlineStatusListener(listener: unknown): void;
+    addKernelOnlineStatusListener(listener: unknown): number;
 
-    removeKernelOnlineStatusListener(listenerId: unknown): void;
+    removeKernelOnlineStatusListener(listenerId: number): void;
 
     getShouldShowAIOStatusAnimation(arg: unknown): unknown;
 

src/core/services/NodeIKernelProfileLikeService.ts

@@ -1,17 +1,17 @@
 import { BuddyProfileLikeReq, GeneralCallResult } from '@/core';
 
 export interface NodeIKernelProfileLikeService {
-    addKernelProfileLikeListener(listener: NodeIKernelProfileLikeService): void;
+    addKernelProfileLikeListener(listener: unknown): number;
 
-    removeKernelProfileLikeListener(listener: unknown): void;
+    removeKernelProfileLikeListener(listenerId: unknown): void;
 
     setBuddyProfileLike(...args: unknown[]): { result: number, errMsg: string, succCounts: number };
 
     getBuddyProfileLike(req: BuddyProfileLikeReq): Promise<GeneralCallResult & {
-        'info': {
-            'userLikeInfos': Array<any>,
-            'friendMaxVotes': number,
-            'start': number
+        info: {
+            userLikeInfos: Array<any>,
+            friendMaxVotes: number,
+            start: number
         }
     }>;
 

src/core/services/NodeIKernelProfileService.ts

@@ -1,38 +1,21 @@
 import { AnyCnameRecord } from 'node:dns';
-import { BizKey, ModifyProfileParams, NodeIKernelProfileListener, SimpleInfo, UserDetailInfoByUinV2 } from '@/core';
+import { BizKey, ModifyProfileParams, NodeIKernelProfileListener, ProfileBizType, SimpleInfo, UserDetailInfoByUin, UserDetailSource } from '@/core';
 import { GeneralCallResult } from '@/core/services/common';
 
-export enum UserDetailSource {
-    KDB,
-    KSERVER
-}
-
-export enum ProfileBizType {
-    KALL,
-    KBASEEXTEND,
-    KVAS,
-    KQZONE,
-    KOTHER
-}
-
 export interface NodeIKernelProfileService {
+    getOtherFlag(callfrom: string, uids: string[]): Promise<Map<string, any>>;
+    
+    getVasInfo(callfrom: string, uids: string[]): Promise<Map<string, any>>;
 
-    getUidByUin(callfrom: string, uin: Array<string>): Promise<Map<string, string>>;//uin->uid
+    getRelationFlag(callfrom: string, uids: string[]): Promise<Map<string, any>>;
+
+    getUidByUin(callfrom: string, uin: Array<string>): Promise<Map<string, string>>;
 
     getUinByUid(callfrom: string, uid: Array<string>): Promise<Map<string, string>>;
 
-    // {
-    //   coreInfo: CoreInfo,
-    //   baseInfo: BaseInfo,
-    //   status: null,
-    //   vasInfo: null,
-    //   relationFlags: null,
-    //   otherFlags: null,
-    //   intimate: null
-    // }
     getCoreAndBaseInfo(callfrom: string, uids: string[]): Promise<Map<string, SimpleInfo>>;
 
-    fetchUserDetailInfo(trace: string, uids: string[], arg2: number, arg3: number[]): Promise<unknown>;
+    fetchUserDetailInfo(trace: string, uids: string[], source: UserDetailSource, bizType: ProfileBizType[]): Promise<GeneralCallResult>;
 
     addKernelProfileListener(listener: NodeIKernelProfileListener): number;
 
@@ -44,30 +27,17 @@ export interface NodeIKernelProfileService {
 
     enumCountryOptions(): Array<string>;
 
-    enumProvinceOptions(Country: string): Array<string>;
+    enumProvinceOptions(country: string): Array<string>;
 
-    enumCityOptions(Country: string, Province: string): unknown;
+    enumCityOptions(country: string, province: string): unknown;
 
     enumAreaOptions(...args: unknown[]): unknown;
 
-    //SimpleInfo
-    // this.uid = "";
-    // this.uid = str;
-    // this.uin = j2;
-    // this.isBuddy = z;
-    // this.coreInfo = coreInfo;
-    // this.baseInfo = baseInfo;
-    // this.status = statusInfo;
-    // this.vasInfo = vasInfo;
-    // this.relationFlags = relationFlag;
-    // this.otherFlags = otherFlag;
-    // this.intimate = intimate;
-
     modifySelfProfile(...args: unknown[]): Promise<unknown>;
 
     modifyDesktopMiniProfile(param: ModifyProfileParams): Promise<GeneralCallResult>;
 
-    setNickName(NickName: string): Promise<unknown>;
+    setNickName(nickName: string): Promise<unknown>;
 
     setLongNick(longNick: string): Promise<unknown>;
 
@@ -85,7 +55,7 @@ export interface NodeIKernelProfileService {
 
     getUserDetailInfoWithBizInfo(uid: string, Biz: BizKey[]): Promise<GeneralCallResult>;
 
-    getUserDetailInfoByUin(uin: string): Promise<UserDetailInfoByUinV2>;
+    getUserDetailInfoByUin(uin: string): Promise<UserDetailInfoByUin>;
 
     getZplanAvatarInfos(args: string[]): Promise<unknown>;
 
@@ -95,14 +65,12 @@ export interface NodeIKernelProfileService {
 
     getSelfStatus(): Promise<unknown>;
 
-    //
     setdisableEmojiShortCuts(...args: unknown[]): unknown;
 
     getProfileQzonePicInfo(uid: string, type: number, force: boolean): Promise<unknown>;
 
-    //profileService.getCoreInfo("UserRemarkServiceImpl::getStrangerRemarkByUid", arrayList);
-    getCoreInfo(name: string, arg: any[]): unknown;
+    // UserRemarkServiceImpl::getStrangerRemarkByUid []
+    getCoreInfo(sceneId: string, arg: any[]): unknown;
 
-    //m429253e12.getOtherFlag("FriendListInfoCache_getKernelDataAndPutCache", new ArrayList<>());
     isNull(): boolean;
 }

src/core/services/NodeIKernelRecentContactService.ts

@@ -1,30 +1,8 @@
 import { ChatType, Peer } from '../entities';
 import { NodeIKernelRecentContactListener } from '../listeners/NodeIKernelRecentContactListener';
 import { GeneralCallResult } from './common';
+import { FSABRecentContactParams } from '../entities/contact';
 
-export interface FSABRecentContactParams {
-    anchorPointContact: {
-        contactId: string;
-        sortField: string;
-        pos: number;
-    },
-    relativeMoveCount: number;
-    listType: number;
-    count: number;
-    fetchOld: boolean;
-}
-
-// {
-//     "anchorPointContact": {
-//       "contactId": "",
-//       "sortField": "",
-//       "pos": 0
-//     },
-//     "relativeMoveCount": 0,
-//     "listType": 1,
-//     "count": 200,
-//     "fetchOld": true
-//   }
 export interface NodeIKernelRecentContactService {
     setGuildDisplayStatus(...args: unknown[]): unknown; // 2 arguments
 
@@ -36,7 +14,6 @@ export interface NodeIKernelRecentContactService {
 
     enterOrExitMsgList(...args: unknown[]): unknown; // 1 arguments
 
-    /*!---!*/
     getRecentContactListSnapShot(count: number): Promise<GeneralCallResult & {
         info: {
             errCode: number,
@@ -58,7 +35,6 @@ export interface NodeIKernelRecentContactService {
 
     jumpToSpecifyRecentContact(...args: unknown[]): unknown; // 1 arguments
 
-    /*!---!*/
     fetchAndSubscribeABatchOfRecentContact(params: FSABRecentContactParams): unknown; // 1 arguments
 
     addRecentContact(peer: Peer): unknown;

src/core/services/NodeIKernelRichMediaService.ts

@@ -99,23 +99,6 @@ export interface NodeIKernelRichMediaService {
 
     getRichMediaFileDir(elementType: number, downType: number, isTemp: boolean): unknown;
 
-    // this.senderUid = "";
-    // this.peerUid = "";
-    // this.guildId = "";
-    // this.elem = new MsgElement();
-    // this.downloadType = i2;
-    // this.thumbSize = i3;
-    // this.msgId = j2;
-    // this.msgRandom = j3;
-    // this.msgSeq = j4;
-    // this.msgTime = j5;
-    // this.chatType = i4;
-    // this.senderUid = str;
-    // this.peerUid = str2;
-    // this.guildId = str3;
-    // this.elem = msgElement;
-    // this.useHttps = num;
-
     getVideoPlayUrlInVisit(arg: {
         downloadType: number,
         thumbSize: number,
@@ -131,7 +114,6 @@ export interface NodeIKernelRichMediaService {
         useHttps: boolean
     }): Promise<unknown>;
 
-    //arg双端number
     isFileExpired(arg: number): unknown;
 
     deleteGroupFolder(GroupCode: string, FolderId: string): Promise<GeneralCallResult & {
@@ -154,7 +136,6 @@ export interface NodeIKernelRichMediaService {
         useHttps: boolean
     }): unknown;
 
-    //arg3为“”
     downloadFileForModelId(peer: Peer, ModelId: string[], unknown: string): Promise<unknown>;
 
     //第三个参数 Array<Type>

src/core/services/NodeIKernelSearchService.ts

@@ -1,13 +1,20 @@
 import { ChatType } from '../entities';
+import { GeneralCallResult } from './common';
 
 export interface NodeIKernelSearchService {
-    addKernelSearchListener(...args: any[]): unknown;// needs 1 arguments
 
-    removeKernelSearchListener(...args: any[]): unknown;// needs 1 arguments
+    addKernelSearchListener(listener: unknown): number;
 
-    searchStranger(...args: any[]): unknown;// needs 3 arguments
+    removeKernelSearchListener(listenerId: number): void;
 
-    searchGroup(...args: any[]): unknown;// needs 1 arguments
+    searchStranger(unknown: string, searchStranger: unknown, searchParams: unknown): Promise<unknown>;
+
+    searchGroup(param: {
+        keyWords: string,
+        groupNum: number,
+        exactSearch: boolean,
+        penetrate: string
+    }): Promise<GeneralCallResult>;// needs 1 arguments
 
     searchLocalInfo(keywords: string, unknown: number/*4*/): unknown;
 
@@ -125,4 +132,5 @@ export interface NodeIKernelSearchService {
     searchCache(...args: any[]): unknown;// needs 3 arguments
 
     clearSearchCache(...args: any[]): unknown;// needs 1 arguments
+
 }

src/core/services/NodeIKernelStorageCleanService.ts

@@ -3,9 +3,9 @@ import { GeneralCallResult } from './common';
 
 export interface NodeIKernelStorageCleanService {
 
-    addKernelStorageCleanListener(Listener: NodeIKernelStorageCleanListener): number;
+    addKernelStorageCleanListener(listener: NodeIKernelStorageCleanListener): number;
 
-    removeKernelStorageCleanListener(ListenerId: number): void;
+    removeKernelStorageCleanListener(listenerId: number): void;
 
     addCacheScanedPaths(arg: unknown): unknown;
 

src/core/services/NodeIKernelTianShuService.ts

@@ -1,9 +1,7 @@
 export interface NodeIKernelTianShuService {
-    addKernelTianShuListener(...args: any[]): unknown;// needs 1 arguments
+    addKernelTianShuListener(listener:unknown): number;
 
-    removeKernelTianShuListener(...args: any[]): unknown;// needs 1 arguments
-
-    requesTianShuNumeralRe(...args: any[]): unknown;//d needs 1 arguments
+    removeKernelTianShuListener(listenerId:number): void;
 
     reportTianShuNumeralRed(...args: any[]): unknown;// needs 1 arguments
 

src/core/services/NodeIKernelTicketService.ts

@@ -2,9 +2,9 @@ import { ForceFetchClientKeyRetType } from './common';
 
 export interface NodeIKernelTicketService {
 
-    addKernelTicketListener(listener: unknown): void;
+    addKernelTicketListener(listener: unknown): number;
 
-    removeKernelTicketListener(listenerId: unknown): void;
+    removeKernelTicketListener(listenerId: number): void;
 
     forceFetchClientKey(arg: string): Promise<ForceFetchClientKeyRetType>;
 

src/core/services/NodeIKernelTipOffService.ts

@@ -2,7 +2,7 @@ import { GeneralCallResult } from './common';
 
 export interface NodeIKernelTipOffService {
 
-    addKernelTipOffListener(listener: unknown): void;
+    addKernelTipOffListener(listener: unknown): number;
 
     removeKernelTipOffListener(listenerId: unknown): void;
 
@@ -10,7 +10,7 @@ export interface NodeIKernelTipOffService {
 
     getPskey(domainList: string[], nocache: boolean): Promise<GeneralCallResult & {
         domainPskeyMap: Map<string, string>
-    }>;//2
+    }>;
 
     tipOffSendJsData(args: unknown[]): Promise<unknown>;//2
 

src/core/services/NodeIKernelUnitedConfigService.ts

@@ -1,7 +1,8 @@
 export interface NodeIKernelUnitedConfigService {
-    addKernelUnitedConfigListener(...args: any[]): unknown;// needs 1 arguments
 
-    removeKernelUnitedConfigListener(...args: any[]): unknown;// needs 1 arguments
+    addKernelUnitedConfigListener(listener:unknown): number;
+
+    removeKernelUnitedConfigListener(listenerId:number): void;
 
     fetchUnitedCommendConfig(...args: any[]): unknown;// needs 1 arguments
 
@@ -12,4 +13,5 @@ export interface NodeIKernelUnitedConfigService {
     isUnitedConfigSwitchOn(...args: any[]): unknown;// needs 1 arguments
 
     registerUnitedConfigPushGroupList(...args: any[]): unknown;// needs 1 arguments
+
 }

src/core/services/NodeIYellowFaceService.ts

@@ -1,5 +1,5 @@
-// public interface IYellowFaceForManagerService extends QRouteApi {
-//     void download(@NotNull String resourceConfigJson, @NotNull String resourceDir, @NotNull String cacheDir, boolean force, @NotNull IKernelYellowFaceDownloadCallback callback);
+export interface NodeIYellowFaceService {
+    download(resourceConfigJson: string, resourceDir: string, cacheDir: string, force: boolean): void;
 
-//     void setHistory(@NotNull String fullMd5, @NotNull IOperateCallback callback);
-// }
+    setHistory(fullMd5: string): void;
+}

src/core/services/NodeIkernelTestPerformanceService.ts

@@ -1,6 +1,7 @@
 import { MessageElement, Peer } from '../entities';
 
 export interface NodeIkernelTestPerformanceService {
+
     insertMsg(MsgParam: {
         peer: Peer
         msgTime: string

src/core/services/common.ts

@@ -1,6 +1,5 @@
 export enum GeneralCallResultStatus {
-    OK = 0,
-    // ERROR = 1,
+    OK = 0
 }
 
 export interface GeneralCallResult {

src/onebot/action/extends/FetchUserProfileLike.ts

@@ -0,0 +1,11 @@
+import BaseAction from '../BaseAction';
+import { ActionName } from '../types';
+
+export class FetchUserProfileLike extends BaseAction<{ qq: number }, any> {
+    actionName = ActionName.FetchUserProfileLike;
+
+    async _handle(payload: { qq: number }) {
+        if (!payload.qq) throw new Error('qq is required');
+        return await this.core.apis.UserApi.getUidByUinV2(payload.qq.toString());
+    }
+}

src/onebot/action/extends/OCRImage.ts

@@ -19,26 +19,21 @@ export class OCRImage extends BaseAction<Payload, any> {
     payloadSchema = SchemaData;
 
     async _handle(payload: Payload) {
-        const { path, isLocal, success } = (await uri2local(this.core.NapCatTempPath, payload.image));
+        const { path, success } = (await uri2local(this.core.NapCatTempPath, payload.image));
         if (!success) {
             throw `OCR ${payload.image}失败,image字段可能格式不正确`;
         }
         if (path) {
             await checkFileReceived(path, 5000); // 文件不存在QQ会崩溃，需要提前判断
             const ret = await this.core.apis.SystemApi.ocrImage(path);
-            if (!isLocal) {
-                fs.unlink(path, () => {
-                });
-            }
+            fs.unlink(path, () => { });
+
             if (!ret) {
                 throw `OCR ${payload.file}失败`;
             }
             return ret.result;
         }
-        if (!isLocal) {
-            fs.unlink(path, () => {
-            });
-        }
+        fs.unlink(path, () => { });
         throw `OCR ${payload.file}失败,文件可能不存在`;
     }
 }

src/onebot/action/extends/SetQQAvatar.ts

@@ -24,17 +24,16 @@ export default class SetAvatar extends BaseAction<Payload, null> {
     }
 
     async _handle(payload: Payload): Promise<null> {
-        const { path, isLocal, success } = (await uri2local(this.core.NapCatTempPath, payload.file));
+        const { path, success } = (await uri2local(this.core.NapCatTempPath, payload.file));
         if (!success) {
             throw `头像${payload.file}设置失败,file字段可能格式不正确`;
         }
         if (path) {
             await checkFileReceived(path, 5000); // 文件不存在QQ会崩溃，需要提前判断
             const ret = await this.core.apis.UserApi.setQQAvatar(path);
-            if (!isLocal) {
-                fs.unlink(path, () => {
-                });
-            }
+            fs.unlink(path, () => {
+            });
+
             if (!ret) {
                 throw `头像${payload.file}设置失败,api无返回`;
             }
@@ -45,10 +44,8 @@ export default class SetAvatar extends BaseAction<Payload, null> {
                 throw `头像${payload.file}设置失败,未知的错误,${ret['result']}:${ret['errMsg']}`;
             }
         } else {
-            if (!isLocal) {
-                fs.unlink(path, () => {
-                });
-            }
+            fs.unlink(path, () => { });
+
             throw `头像${payload.file}设置失败,无法获取头像,文件可能不存在`;
         }
         return null;

src/onebot/action/file/GetFile.ts

@@ -43,12 +43,12 @@ export class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
             const fileName = mixElementInner.fileName ?? '';
             let url = '';
             if (mixElement?.picElement && rawMessage) {
-                let tempData =
+                const tempData =
                     await this.obContext.apis.MsgApi.rawToOb11Converters.picElement?.(mixElement?.picElement, rawMessage, mixElement) as OB11MessageImage | undefined;
                 url = tempData?.data.url ?? '';
             }
             if (mixElement?.videoElement && rawMessage) {
-                let tempData =
+                const tempData =
                     await this.obContext.apis.MsgApi.rawToOb11Converters.videoElement?.(mixElement?.videoElement, rawMessage, mixElement) as OB11MessageVideo | undefined;
                 url = tempData?.data.url ?? '';
             }

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

@@ -7,17 +7,18 @@ const SchemaData = {
     properties: {
         group_id: { type: ['string', 'number'] },
         folder_id: { type: 'string' },
+        folder: { type: 'string' }
     },
-    required: ['group_id', 'folder_id'],
+    required: ['group_id'],
 } as const satisfies JSONSchema;
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export class DeleteGroupFileFolder extends BaseAction<Payload, any>  {
+export class DeleteGroupFileFolder extends BaseAction<Payload, any> {
     actionName = ActionName.GoCQHTTP_DeleteGroupFileFolder;
     payloadSchema = SchemaData;
     async _handle(payload: Payload) {
         return (await this.core.apis.GroupApi.DelGroupFileFolder(
-            payload.group_id.toString(), payload.folder_id)).groupFileCommonResult;
+            payload.group_id.toString(), payload.folder ?? payload.folder_id ?? '')).groupFileCommonResult;
     }
 }

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

@@ -73,7 +73,7 @@ export default class GoCQHTTPDownloadFile extends BaseAction<Payload, FileRespon
                     headers[headerItem] = '';
                 } else {
                     const key = headerItem.substring(0, spilt);
-                    headers[key] = headerItem.substring(0, spilt + 1);
+                    headers[key] = headerItem.substring(spilt + 1);
                 }
             }
         }

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

@@ -8,9 +8,10 @@ const SchemaData = {
     properties: {
         group_id: { type: ['string', 'number'] },
         folder_id: { type: 'string' },
+        folder: { type: 'string' },
         file_count: { type: ['string', 'number'] },
     },
-    required: ['group_id', 'folder_id'],
+    required: ['group_id'],
 } as const satisfies JSONSchema;
 
 type Payload = FromSchema<typeof SchemaData>;
@@ -26,7 +27,7 @@ export class GetGroupFilesByFolder extends BaseAction<any, any> {
             startIndex: 0,
             sortOrder: 2,
             showOnlinedocFolder: 0,
-            folderId: payload.folder_id,
+            folderId: payload.folder ?? payload.folder_id ?? '',
         }).catch(() => []);
         return {
             files: ret.filter(item => item.fileInfo)

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

@@ -20,24 +20,26 @@ export default class GoCQHTTPGetStrangerInfo extends BaseAction<Payload, OB11Use
 
     async _handle(payload: Payload): Promise<OB11User> {
         const user_id = payload.user_id.toString();
-        const extendData = await this.core.apis.UserApi.getUserDetailInfoByUinV2(user_id);
-        const uid = (await this.core.apis.UserApi.getUidByUinV2(user_id))!;
-        if (!uid || uid.indexOf('*') != -1) {
-            return {
-                ...extendData.detail.simpleInfo.coreInfo,
-                ...extendData.detail.commonExt,
-                ...extendData.detail.simpleInfo.baseInfo,
-                ...extendData.detail.simpleInfo.relationFlags,
-                user_id: parseInt(extendData.detail.uin) || 0,
-                nickname: extendData.detail.simpleInfo.coreInfo.nick,
-                sex: OB11UserSex.unknown,
-                age: extendData.detail.simpleInfo.baseInfo.age || 0,
-                qid: extendData.detail.simpleInfo.baseInfo.qid,
-                level: calcQQLevel(extendData.detail.commonExt?.qqLevel ?? 0) || 0,
-                login_days: 0,
-            };
-        }
-        const data = { ...extendData, ...(await this.core.apis.UserApi.getUserDetailInfo(uid)) };
-        return OB11Entities.stranger(data);
+        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));
+        return {
+            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,
+            qid: extendData.detail.simpleInfo.baseInfo.qid,
+            qqLevel: calcQQLevel(extendData.detail.commonExt?.qqLevel ?? info.qqLevel),
+            sex: OB11Entities.sex(extendData.detail.simpleInfo.baseInfo.sex) ?? OB11UserSex.unknown,
+            long_nick: extendData.detail.simpleInfo.baseInfo.longNick ?? info.longNick,
+            reg_time: extendData.detail.commonExt.regTime ?? info.regTime,
+            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,
+            login_days: 0,//失效
+        };
     }
 }

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

@@ -31,7 +31,6 @@ export class SendGroupNotice extends BaseAction<Payload, null> {
             //公告图逻辑
             const {
                 path,
-                isLocal,
                 success,
             } = (await uri2local(this.core.NapCatTempPath, payload.image));
             if (!success) {
@@ -45,10 +44,10 @@ export class SendGroupNotice extends BaseAction<Payload, null> {
             if (ImageUploadResult.errCode != 0) {
                 throw `群公告${payload.image}设置失败,图片上传失败`;
             }
-            if (!isLocal) {
-                unlink(path, () => {
-                });
-            }
+
+            unlink(path, () => {
+            });
+
             UploadImage = ImageUploadResult.picInfo;
         }
 
@@ -58,7 +57,6 @@ export class SendGroupNotice extends BaseAction<Payload, null> {
         const noticeShowEditCard = +(payload.is_show_edit_card ?? 0);
         const noticeTipWindowType = +(payload.tip_window_type ?? 0);
         const noticeConfirmRequired = +(payload.confirm_required ?? 1);
-        //const publishGroupBulletinResult = await this.core.apis.GroupApi.publishGroupBulletin(payload.group_id.toString(), payload.content, UploadImage, noticePinned, noticeConfirmRequired);
         const publishGroupBulletinResult = await this.core.apis.WebApi.setGroupNotice(
             payload.group_id.toString(),
             payload.content,
@@ -72,7 +70,7 @@ export class SendGroupNotice extends BaseAction<Payload, null> {
             UploadImage?.height
         );
         if (!publishGroupBulletinResult || publishGroupBulletinResult.ec != 0) {
-            throw `设置群公告失败,错误信息:${publishGroupBulletinResult?.em}`;
+            throw new Error(`设置群公告失败,错误信息:${publishGroupBulletinResult?.em}`);
         }
         return null;
     }

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

@@ -25,17 +25,14 @@ export default class SetGroupPortrait extends BaseAction<Payload, any> {
     }
 
     async _handle(payload: Payload): Promise<any> {
-        const { path, isLocal, success } = (await uri2local(this.core.NapCatTempPath, payload.file));
+        const { path, success } = (await uri2local(this.core.NapCatTempPath, payload.file));
         if (!success) {
             throw `头像${payload.file}设置失败,file字段可能格式不正确`;
         }
         if (path) {
             await checkFileReceived(path, 5000); // 文件不存在QQ会崩溃，需要提前判断
             const ret = await this.core.apis.GroupApi.setGroupAvatar(payload.group_id.toString(), path) as any;
-            if (!isLocal) {
-                fs.unlink(path, () => {
-                });
-            }
+            fs.unlink(path, () => { });
             if (!ret) {
                 throw `头像${payload.file}设置失败,api无返回`;
             }
@@ -46,10 +43,7 @@ export default class SetGroupPortrait extends BaseAction<Payload, any> {
             }
             return ret;
         } else {
-            if (!isLocal) {
-                fs.unlink(path, () => {
-                });
-            }
+            fs.unlink(path, () => {});
             throw `头像${payload.file}设置失败,无法获取头像,文件可能不存在`;
         }
     }

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

@@ -1,9 +1,10 @@
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { ChatType } from '@/core/entities';
+import { ChatType, Peer } from '@/core/entities';
 import fs from 'fs';
 import { uri2local } from '@/common/file';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+import { MessageContext } from '@/onebot/api';
 
 const SchemaData = {
     type: 'object',
@@ -29,14 +30,19 @@ export default class GoCQHTTPUploadGroupFile extends BaseAction<Payload, null> {
             file = `file://${file}`;
         }
         const downloadResult = await uri2local(this.core.NapCatTempPath, file);
+        const peer: Peer = {
+            chatType: ChatType.KCHATTYPEGROUP,
+            peerUid: payload.group_id.toString(),
+        };
         if (!downloadResult.success) {
             throw new Error(downloadResult.errMsg);
         }
-        const sendFileEle = await this.core.apis.FileApi.createValidSendFileElement(downloadResult.path, payload.name, payload.folder_id);
-        await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId({
-            chatType: ChatType.KCHATTYPEGROUP,
-            peerUid: payload.group_id.toString(),
-        }, [sendFileEle], [], true);
+        const msgContext: MessageContext = {
+            peer: peer,
+            deleteAfterSentFiles: []
+        };
+        const sendFileEle = await this.core.apis.FileApi.createValidSendFileElement(msgContext, downloadResult.path, payload.name, payload.folder ?? payload.folder_id);
+        await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(peer, [sendFileEle], [], true);
         return null;
     }
 }

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

@@ -4,6 +4,8 @@ import { ChatType, Peer, SendFileElement } from '@/core/entities';
 import fs from 'fs';
 import { uri2local } from '@/common/file';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+import { MessageContext } from '@/onebot/api';
+import { ContextMode, createContext } from '../msg/SendMsg';
 
 const SchemaData = {
     type: 'object',
@@ -42,7 +44,15 @@ export default class GoCQHTTPUploadPrivateFile extends BaseAction<Payload, null>
         if (!downloadResult.success) {
             throw new Error(downloadResult.errMsg);
         }
-        const sendFileEle: SendFileElement = await this.core.apis.FileApi.createValidSendFileElement(downloadResult.path, payload.name);
+
+        const msgContext: MessageContext = {
+            peer: await createContext(this.core, {
+                user_id: payload.user_id.toString(),
+                group_id: undefined,
+            }, ContextMode.Private),
+            deleteAfterSentFiles: []
+        };
+        const sendFileEle: SendFileElement = await this.core.apis.FileApi.createValidSendFileElement(msgContext, downloadResult.path, payload.name);
         await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(await this.getPeer(payload), [sendFileEle], [], true);
         return null;
     }

src/onebot/action/group/GetGroupEssence.ts

@@ -51,7 +51,7 @@ export class GetGroupEssence extends BaseAction<Payload, any> {
                     operator_nick: msg.add_digest_nick,
                     message_id: message_id,
                     operator_time: msg.add_digest_time,
-                    content: (await this.obContext.apis.MsgApi.parseMessage(rawMessage, 'array'))?.message
+                    content: (await this.obContext.apis.MsgApi.parseMessage(rawMessage))?.message
                 };
             }
             const msgTempData = JSON.stringify({

src/onebot/action/group/GetGroupInfo.ts

@@ -20,7 +20,17 @@ class GetGroupInfo extends BaseAction<Payload, OB11Group> {
 
     async _handle(payload: Payload) {
         const group = (await this.core.apis.GroupApi.getGroups()).find(e => e.groupCode == payload.group_id.toString());
-        if (!group) throw `群${payload.group_id}不存在`;
+        if (!group) {
+            const data = await this.core.apis.GroupApi.searchGroup(payload.group_id.toString());
+            if (!data) throw new Error('Group not found');
+            return {
+                ...data.searchGroupInfo,
+                group_id: +payload.group_id,
+                group_name: data.searchGroupInfo.groupName,
+                member_count: data.searchGroupInfo.memberNum,
+                max_member_count: data.searchGroupInfo.maxMemberNum,
+            };
+        }
         return OB11Entities.group(group);
     }
 }

src/onebot/action/group/GetGroupMemberList.ts

@@ -3,6 +3,7 @@ import { OB11Entities } from '@/onebot/entities';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+import { calcQQLevel } from '@/common/helper';
 
 const SchemaData = {
     type: 'object',
@@ -22,7 +23,8 @@ class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
     async _handle(payload: Payload) {
         const groupMembers = await this.core.apis.GroupApi.getGroupMembersV2(payload.group_id.toString());
         const groupMembersArr = Array.from(groupMembers.values());
-
+        let uids = groupMembersArr.map(item => item.uid);
+        //let CoreAndBase = await this.core.apis.GroupApi.getCoreAndBaseInfo(uids)
         let _groupMembers = groupMembersArr.map(item => {
             return OB11Entities.groupMember(payload.group_id.toString(), item);
         });
@@ -32,34 +34,38 @@ class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
 
         for (let i = 0, len = _groupMembers.length; i < len; i++) {
             // 保证基础数据有这个 同时避免群管插件过于依赖这个杀了
-            _groupMembers[i].join_time = date;
-            _groupMembers[i].last_sent_time = date;
+            const Member = await this.core.apis.GroupApi.getGroupMember(payload.group_id.toString(), _groupMembers[i].user_id);
+            _groupMembers[i].join_time = +(Member?.joinTime ?? date);
+            _groupMembers[i].last_sent_time = +(Member?.lastSpeakTime ?? date);
             MemberMap.set(_groupMembers[i].user_id, _groupMembers[i]);
         }
 
+
         const selfRole = groupMembers.get(this.core.selfInfo.uid)?.role;
         const isPrivilege = selfRole === 3 || selfRole === 4;
 
-        _groupMembers.forEach(item => {
-            item.last_sent_time = date;
-            item.join_time = date;
-        });
 
         if (isPrivilege) {
-            const webGroupMembers = await this.core.apis.WebApi.getGroupMembers(payload.group_id.toString());
-            for (let i = 0, len = webGroupMembers.length; i < len; i++) {
-                if (!webGroupMembers[i]?.uin) {
-                    continue;
-                }
-                const MemberData = MemberMap.get(webGroupMembers[i]?.uin);
-                if (MemberData) {
-                    MemberData.join_time = webGroupMembers[i]?.join_time;
-                    MemberData.last_sent_time = webGroupMembers[i]?.last_speak_time;
-                    MemberData.qage = webGroupMembers[i]?.qage;
-                    MemberData.level = webGroupMembers[i]?.lv.level.toString();
-                    MemberMap.set(webGroupMembers[i]?.uin, MemberData);
+            try {
+                const webGroupMembers = await this.core.apis.WebApi.getGroupMembers(payload.group_id.toString());
+                for (let i = 0, len = webGroupMembers.length; i < len; i++) {
+                    if (!webGroupMembers[i]?.uin) {
+                        continue;
+                    }
+                    const MemberData = MemberMap.get(webGroupMembers[i]?.uin);
+                    if (MemberData) {
+                        MemberData.join_time = webGroupMembers[i]?.join_time;
+                        MemberData.last_sent_time = webGroupMembers[i]?.last_speak_time;
+                        MemberData.qage = webGroupMembers[i]?.qage;
+                        MemberData.level = webGroupMembers[i]?.lv.level.toString();
+                        MemberMap.set(webGroupMembers[i]?.uin, MemberData);
+                    }
                 }
+            } catch (e) {
+                const logger = this.core.context.logger;
+                logger.logError.bind(logger)('GetGroupMemberList', e);
             }
+
         }
 
         _groupMembers = Array.from(MemberMap.values());

src/onebot/action/index.ts

@@ -68,8 +68,8 @@ import SetGroupPortrait from './go-cqhttp/SetGroupPortrait';
 import { FetchCustomFace } from './extends/FetchCustomFace';
 import GoCQHTTPUploadPrivateFile from './go-cqhttp/UploadPrivateFile';
 import { FetchEmojiLike } from './extends/FetchEmojiLike';
+import { FetchUserProfileLike } from './extends/FetchUserProfileLike';
 import { NapCatCore } from '@/core';
-
 import { NapCatOneBot11Adapter } from '@/onebot';
 import GetGuildProfile from './guild/GetGuildProfile';
 import SetModelShow from './go-cqhttp/SetModelShow';
@@ -83,6 +83,8 @@ import { DeleteGroupFileFolder } from '@/onebot/action/go-cqhttp/DeleteGroupFile
 import { GetGroupFileSystemInfo } from '@/onebot/action/go-cqhttp/GetGroupFileSystemInfo';
 import { GetGroupRootFiles } from '@/onebot/action/go-cqhttp/GetGroupRootFiles';
 import { GetGroupFilesByFolder } from '@/onebot/action/go-cqhttp/GetGroupFilesByFolder';
+import { GetGroupSystemMsg } from './system/GetSystemMsg';
+
 
 export type ActionMap = Map<string, BaseAction<any, any>>;
 
@@ -176,6 +178,8 @@ export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCo
         new DeleteGroupFileFolder(obContext, core),
         new GetGroupFileSystemInfo(obContext, core),
         new GetGroupFilesByFolder(obContext, core),
+        new GetGroupSystemMsg(obContext, core),
+        new FetchUserProfileLike(obContext, core),
     ];
     const actionMap = new Map();
     for (const action of actionHandlers) {

src/onebot/action/msg/DeleteMsg.ts

@@ -25,15 +25,7 @@ class DeleteMsg extends BaseAction<Payload, void> {
     async _handle(payload: Payload) {
         const msg = MessageUnique.getMsgIdAndPeerByShortId(Number(payload.message_id));
         if (msg) {
-            const ret = this.core.eventWrapper.registerListen(
-                'NodeIKernelMsgListener/onMsgInfoListUpdate',
-                1,
-                1000,
-                (msgs) => !!msgs.find(m => m.msgId === msg.MsgId && m.recallTime !== '0'),
-            ).catch(() => undefined);
-            await this.core.apis.MsgApi.recallMsg(msg.Peer, [msg.MsgId]);
-            const data = await ret;
-            if (!data) throw new Error('Recall failed');
+            await this.core.apis.MsgApi.recallMsg(msg.Peer, msg.MsgId);
         } else {
             throw new Error('Recall failed');
         }

src/onebot/action/msg/GetMsg.ts

@@ -35,7 +35,7 @@ class GetMsg extends BaseAction<Payload, OB11Message> {
         const msg = await this.core.apis.MsgApi.getMsgsByMsgId(
             peer,
             [msgIdWithPeer?.MsgId || payload.message_id.toString()]);
-        const retMsg = await this.obContext.apis.MsgApi.parseMessage(msg.msgList[0], 'array');
+        const retMsg = await this.obContext.apis.MsgApi.parseMessage(msg.msgList[0]);
         if (!retMsg) throw Error('消息为空');
         try {
             retMsg.message_id = MessageUnique.createUniqueMsgId(peer, msg.msgList[0].msgId)!;

src/onebot/action/msg/SendMsg.ts

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

src/onebot/action/system/GetSystemMsg.ts

@@ -0,0 +1,50 @@
+import { GroupNotifyMsgStatus } from '@/core';
+import BaseAction from '../BaseAction';
+import { ActionName } from '../types';
+import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+
+const SchemaData = {
+    type: 'object',
+    properties: {
+        group_id: { type: ['number', 'string'] },
+    },
+} as const satisfies JSONSchema;
+
+type Payload = FromSchema<typeof SchemaData>;
+
+export class GetGroupSystemMsg extends BaseAction<void, any> {
+    actionName = ActionName.GetGroupSystemMsg;
+
+    async _handle(payload: void) {
+        const NTQQUserApi = this.core.apis.UserApi;
+        const NTQQGroupApi = this.core.apis.GroupApi;
+        // 默认10条 该api未完整实现 包括响应数据规范化 类型规范化 
+        const SingleScreenNotifies = await NTQQGroupApi.getSingleScreenNotifies(false,10);
+        const retData: any = { InvitedRequest: [], join_requests: [] };
+        for (const SSNotify of SingleScreenNotifies) {
+            if (SSNotify.type == 1) {
+                retData.InvitedRequest.push({
+                    request_id: SSNotify.seq,
+                    invitor_uin: await NTQQUserApi.getUinByUidV2(SSNotify.user1?.uid),
+                    invitor_nick: SSNotify.user1?.nickName,
+                    group_id: SSNotify.group?.groupCode,
+                    group_name: SSNotify.group?.groupName,
+                    checked: SSNotify.status === GroupNotifyMsgStatus.KUNHANDLE ? false : true,
+                    actor: await NTQQUserApi.getUinByUidV2(SSNotify.user2?.uid) || 0,
+                });
+            } else if (SSNotify.type == 7) {
+                retData.join_requests.push({
+                    request_id: SSNotify.seq,
+                    requester_uin: await NTQQUserApi.getUinByUidV2(SSNotify.user1?.uid),
+                    requester_nick: SSNotify.user1?.nickName,
+                    group_id: SSNotify.group?.groupCode,
+                    group_name: SSNotify.group?.groupName,
+                    checked: SSNotify.status === GroupNotifyMsgStatus.KUNHANDLE ? false : true,
+                    actor: await NTQQUserApi.getUinByUidV2(SSNotify.user2?.uid) || 0,
+                });
+            }
+        }
+
+        return retData;
+    }
+}

src/onebot/action/types.ts

@@ -16,8 +16,8 @@ export interface InvalidCheckResult {
 export enum ActionName {
     // 以下为扩展napcat扩展
     Unknown = 'unknown',
-    SharePeer = 'ArkShareGroup',
-    ShareGroupEx = 'ArkSharePeer',
+    SharePeer = 'ArkSharePeer',
+    ShareGroupEx = 'ArkShareGroup',
     RebootNormal = 'reboot_normal',//无快速登录重新启动
     GetRobotUinRange = 'get_robot_uin_range',
     SetOnlineStatus = 'set_online_status',
@@ -116,5 +116,7 @@ export enum ActionName {
     SetInputStatus = 'set_input_status',
     GetCSRF = 'get_csrf_token',
     DelGroupNotice = '_del_group_notice',
-    GetGroupInfoEx = "get_group_info_ex"
+    GetGroupInfoEx = "get_group_info_ex",
+    GetGroupSystemMsg = 'get_group_system_msg',
+    FetchUserProfileLike = "fetch_user_profile_like",
 }

src/onebot/action/user/GetRecentContact.ts

@@ -21,7 +21,7 @@ export default class GetRecentContact extends BaseAction<Payload, any> {
             const FastMsg = await this.core.apis.MsgApi.getMsgsByMsgId({ chatType: t.chatType, peerUid: t.peerUid }, [t.msgId]);
             if (FastMsg.msgList.length > 0) {
                 //扩展ret.info.changedList
-                const lastestMsg = await this.obContext.apis.MsgApi.parseMessage(FastMsg.msgList[0], 'array');
+                const lastestMsg = await this.obContext.apis.MsgApi.parseMessage(FastMsg.msgList[0]);
                 return {
                     lastestMsg: lastestMsg,
                     peerUin: t.peerUin,

src/onebot/api/friend.ts

@@ -18,7 +18,6 @@ export class OneBotFriendApi {
         let pokedetail: any[] = json.items;
         //筛选item带有uid的元素
         pokedetail = pokedetail.filter(item => item.uid);
-        //console.log("[NapCat] 群拍一拍 群:", pokedetail, parseInt(msg.peerUid), " ", await NTQQUserApi.getUinByUid(pokedetail[0].uid), "拍了拍", await NTQQUserApi.getUinByUid(pokedetail[1].uid));
         if (pokedetail.length == 2) {
             return new OB11FriendPokeEvent(
                 this.core,

src/onebot/api/group.ts

@@ -19,6 +19,7 @@ import { OB11GroupPokeEvent } from '@/onebot/event/notice/OB11PokeEvent';
 import { OB11GroupEssenceEvent } from '@/onebot/event/notice/OB11GroupEssenceEvent';
 import { OB11GroupTitleEvent } from '@/onebot/event/notice/OB11GroupTitleEvent';
 import { FileNapCatOneBotUUID } from '@/common/helper';
+import { pathToFileURL } from 'node:url';
 
 export class OneBotGroupApi {
     obContext: NapCatOneBot11Adapter;
@@ -77,7 +78,8 @@ export class OneBotGroupApi {
                         id: FileNapCatOneBotUUID.encode({
                             chatType: ChatType.KCHATTYPEGROUP,
                             peerUid: msg.peerUid,
-                        }, msg.msgId, element.elementId),
+                        }, msg.msgId, element.elementId, "." + element.fileElement.fileName),
+                        url: pathToFileURL(element.fileElement.filePath).href,
                         name: element.fileElement.fileName,
                         size: parseInt(element.fileElement.fileSize),
                         busid: element.fileElement.fileBizId || 0,
@@ -138,15 +140,25 @@ export class OneBotGroupApi {
                     }
                     if (element.grayTipElement.jsonGrayTipElement.busiId == 2407) {
                         //下面得改 上面也是错的grayTipElement.subElementType == GrayTipElementSubType.MEMBER_NEW_TITLE
-                        const memberUin = json.items[1].param[0];
-                        const title = json.items[3].txt;
-                        logger.logDebug('收到群成员新头衔消息', json);
-                        return new OB11GroupTitleEvent(
-                            this.core,
-                            parseInt(msg.peerUid),
-                            parseInt(memberUin),
-                            title,
-                        );
+                        const type = json.items[json.items.length - 1]?.txt;
+                        switch (type) {
+                        case "头衔": {
+                            const memberUin = json.items[1].param[0];
+                            const title = json.items[3].txt;
+                            logger.logDebug('收到群成员新头衔消息', json);
+                            return new OB11GroupTitleEvent(
+                                this.core,
+                                parseInt(msg.peerUid),
+                                parseInt(memberUin),
+                                title,
+                            );
+                        }
+                        case "移出":
+                            logger.logDebug('收到机器人被踢消息', json);
+                            return;
+                        default:
+                            logger.logWarn('收到未知的灰条消息', json);
+                        }
                     }
                 }
             }

src/onebot/api/msg.ts

@@ -1,5 +1,6 @@
 import { FileNapCatOneBotUUID } from '@/common/helper';
 import { MessageUnique } from '@/common/message-unique';
+import { pathToFileURL } from 'node:url';
 import {
     AtType,
     ChatType,
@@ -33,6 +34,7 @@ import { RequestUtil } from '@/common/request';
 import fs from 'node:fs';
 import fsPromise from 'node:fs/promises';
 import { OB11FriendAddNoticeEvent } from '@/onebot/event/notice/OB11FriendAddNoticeEvent';
+import { SysMessage, SysMessageType } from '@/core/proto/ProfileLike';
 
 type RawToOb11Converters = {
     [Key in keyof MessageElement as Key extends `${string}Element` ? Key : never]: (
@@ -106,7 +108,7 @@ export class OneBotMsgApi {
                     peerUid: msg.peerUid,
                     guildId: '',
                 };
-                const encodedFileId = FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId);
+                const encodedFileId = FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, "." + element.fileName);
                 return {
                     type: OB11MessageDataType.image,
                     data: {
@@ -114,6 +116,7 @@ export class OneBotMsgApi {
                         sub_type: element.picSubType,
                         file_id: encodedFileId,
                         url: await this.core.apis.FileApi.getImageUrl(element),
+                        path: element.filePath,
                         file_size: element.fileSize,
                         file_unique: element.fileName
                     },
@@ -135,8 +138,8 @@ export class OneBotMsgApi {
                 data: {
                     file: element.fileName,
                     path: element.filePath,
-                    url: element.filePath,
-                    file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId),
+                    url: pathToFileURL(element.filePath).href,
+                    file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, "." + element.fileName),
                     file_size: element.fileSize,
                     file_unique: element.fileName,
                 },
@@ -175,13 +178,16 @@ export class OneBotMsgApi {
                 peerUid: msg.peerUid,
                 guildId: '',
             };
+            const { emojiId } = _;
+            const dir = emojiId.substring(0, 2);
+            const url = `https://gxh.vip.qq.com/club/item/parcel/item/${dir}/${emojiId}/raw300.gif`;
             return {
                 type: OB11MessageDataType.image,
                 data: {
                     file: 'marketface',
-                    file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId),
-                    path: elementWrapper.elementId,
-                    url: elementWrapper.elementId,
+                    file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, "." + _.key + ".jpg"),
+                    path: url,
+                    url: url,
                     file_unique: _.key
                 },
             };
@@ -209,7 +215,7 @@ export class OneBotMsgApi {
             if (records.peerUin === '284840486') {
                 return createReplyData(records.msgId);
             }
-            let replyMsg = (await this.core.apis.MsgApi.queryMsgsWithFilterExWithSeqV2(peer, element.replayMsgSeq, element.replyMsgTime, [element.senderUidStr]))
+            const replyMsg = (await this.core.apis.MsgApi.queryMsgsWithFilterExWithSeqV2(peer, element.replayMsgSeq, element.replyMsgTime, [element.senderUidStr]))
                 .msgList.find(msg => msg.msgRandom === records.msgRandom);
 
             if (!replyMsg || records.msgRandom !== replyMsg.msgRandom) {
@@ -257,14 +263,14 @@ export class OneBotMsgApi {
             if (!videoDownUrl) {
                 videoDownUrl = element.filePath;
             }
-
+            const fileCode = FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, "." + element.fileName);
             return {
                 type: OB11MessageDataType.video,
                 data: {
-                    file: element.fileName,
+                    file: fileCode,
                     path: videoDownUrl,
-                    url: videoDownUrl,
-                    file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId),
+                    url: videoDownUrl ?? pathToFileURL(element.filePath).href,
+                    file_id: fileCode,
                     file_size: element.fileSize,
                     file_unique: element.fileName,
                 },
@@ -277,13 +283,16 @@ export class OneBotMsgApi {
                 peerUid: msg.peerUid,
                 guildId: '',
             };
+            const fileCode = FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, "." + element.fileName);
             return {
                 type: OB11MessageDataType.voice,
                 data: {
-                    file: element.fileName,
+                    file: fileCode,
                     path: element.filePath,
-                    file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId),
+                    url: pathToFileURL(element.filePath).href,
+                    file_id: fileCode,
                     file_size: element.fileSize,
+                    file_unique: element.fileName
                 },
             };
         },
@@ -452,17 +461,17 @@ export class OneBotMsgApi {
         // File service
         [OB11MessageDataType.image]: async (sendMsg, context) => {
             const sendPicElement = await this.core.apis.FileApi.createValidSendPicElement(
+                context,
                 (await this.handleOb11FileLikeMessage(sendMsg, context)).path,
                 sendMsg.data.summary,
                 sendMsg.data.sub_type,
             );
-            context.deleteAfterSentFiles.push(sendPicElement.picElement.sourcePath);
             return sendPicElement;
         },
 
         [OB11MessageDataType.file]: async (sendMsg, context) => {
             const { path, fileName } = await this.handleOb11FileLikeMessage(sendMsg, context);
-            return await this.core.apis.FileApi.createValidSendFileElement(path, fileName);
+            return await this.core.apis.FileApi.createValidSendFileElement(context, path, fileName);
         },
 
         [OB11MessageDataType.video]: async (sendMsg, context) => {
@@ -473,9 +482,7 @@ export class OneBotMsgApi {
                 const uri2LocalRes = await uri2local(this.core.NapCatTempPath, thumb);
                 if (uri2LocalRes.success) thumb = uri2LocalRes.path;
             }
-            const videoEle = await this.core.apis.FileApi.createValidSendVideoElement(path, fileName, thumb);
-
-            context.deleteAfterSentFiles.push(videoEle.videoElement.filePath);
+            const videoEle = await this.core.apis.FileApi.createValidSendVideoElement(context, path, fileName, thumb);
             return videoEle;
         },
 
@@ -600,6 +607,14 @@ export class OneBotMsgApi {
         }),
 
         [OB11MessageDataType.miniapp]: async () => undefined,
+
+        [OB11MessageDataType.contact]: async ({ data }, context) => {
+            let arkJson = await this.core.apis.UserApi.getBuddyRecommendContactArkJson(data.id.toString(), '');
+            return this.ob11ToRawConverters.json({
+                data: { data: arkJson.arkMsg },
+                type: OB11MessageDataType.json
+            }, context);
+        }
     };
 
     constructor(obContext: NapCatOneBot11Adapter, core: NapCatCore) {
@@ -622,7 +637,7 @@ export class OneBotMsgApi {
                 if (element.grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_XMLMSG) {
                     //好友添加成功事件
                     if (element.grayTipElement.xmlElement.templId === '10229' && msg.peerUin !== '') {
-                        return new OB11FriendAddNoticeEvent(this.core, parseInt(msg.peerUin));
+                        return new OB11FriendAddNoticeEvent(this.core, parseInt(msg.peerUin) || Number(await this.core.apis.UserApi.getUinByUidV2(msg.peerUid)));
                     }
                 }
             }
@@ -790,30 +805,59 @@ export class OneBotMsgApi {
         { data: inputdata }: OB11MessageFileBase,
         { deleteAfterSentFiles }: MessageContext,
     ) {
-        const isBlankUrl = !inputdata.url || inputdata.url === '';
-        const isBlankFile = !inputdata.file || inputdata.file === '';
-        if (isBlankUrl && isBlankFile) {
+        const realUri = inputdata.url || inputdata.file || inputdata.path || '';
+        if (realUri.length === 0) {
             this.core.context.logger.logError('文件消息缺少参数', inputdata);
             throw Error('文件消息缺少参数');
         }
-        const fileOrUrl = (isBlankUrl ? inputdata.file : inputdata.url) ?? '';
         const {
             path,
-            isLocal,
             fileName,
             errMsg,
             success,
-        } = (await uri2local(this.core.NapCatTempPath, fileOrUrl));
+        } = (await uri2local(this.core.NapCatTempPath, realUri));
 
         if (!success) {
             this.core.context.logger.logError('文件下载失败', errMsg);
             throw Error('文件下载失败' + errMsg);
         }
 
-        if (!isLocal) { // 只删除http和base64转过来的文件
-            deleteAfterSentFiles.push(path);
-        }
+        deleteAfterSentFiles.push(path);
 
         return { path, fileName: inputdata.name ?? fileName };
     }
+    async parseSysMessage(msg: number[]) {
+        const sysMsg = SysMessage.decode(Uint8Array.from(msg)) as unknown as SysMessageType;
+        if (sysMsg.msgSpec.length === 0) {
+            return;
+        }
+        const { msgType, subType, subSubType } = sysMsg.msgSpec[0];
+        if (msgType === 528 && subType === 39 && subSubType === 39) {
+            if (!sysMsg.bodyWrapper) return;
+            const event = await this.obContext.apis.UserApi.parseLikeEvent(sysMsg.bodyWrapper.wrappedBody);
+            return event;
+        }
+        /*
+        if (msgType === 732 && subType === 16 && subSubType === 16) {
+            const greyTip = GreyTipWrapper.fromBinary(Uint8Array.from(sysMsg.bodyWrapper!.wrappedBody.slice(7)));
+            if (greyTip.subTypeId === 36) {
+                const emojiLikeToOthers = EmojiLikeToOthersWrapper1
+                    .fromBinary(greyTip.rest)
+                    .wrapper!
+                    .body!;
+                if (emojiLikeToOthers.attributes?.operation !== 1) { // Un-like
+                    return;
+                }
+                const eventOrEmpty = await this.apis.GroupApi.createGroupEmojiLikeEvent(
+                    greyTip.groupCode.toString(),
+                    await this.core.apis.UserApi.getUinByUidV2(emojiLikeToOthers.attributes!.senderUid),
+                    emojiLikeToOthers.msgSpec!.msgSeq.toString(),
+                    emojiLikeToOthers.attributes!.emojiId,
+                );
+                // eslint-disable-next-line @typescript-eslint/no-unused-expressions
+                eventOrEmpty && await this.networkManager.emitEvent(eventOrEmpty);
+            }
+        }
+        */
+    }
 }

src/onebot/api/quick-action.ts

@@ -47,7 +47,7 @@ export class OneBotQuickActionApi {
         const peerContextMode = msg.message_type == 'private' ? ContextMode.Private : ContextMode.Group;
 
         const peer: Peer = await createContext(this.core, {
-            message: "",
+            message_type: undefined,
             group_id: msg.group_id?.toString(),
             user_id: msg.user_id?.toString(),
         }, peerContextMode);

src/onebot/api/user.ts

@@ -1,6 +1,8 @@
 import { NapCatCore } from '@/core';
+import { profileLikeTip, ProfileLikeTipType } from '@/core/proto/ProfileLike';
 
 import { NapCatOneBot11Adapter } from '@/onebot';
+import { OB11ProfileLikeEvent } from '../event/notice/OB11ProfileLikeEvent';
 
 export class OneBotUserApi {
     obContext: NapCatOneBot11Adapter;
@@ -10,4 +12,21 @@ export class OneBotUserApi {
         this.obContext = obContext;
         this.core = core;
     }
+    async parseLikeEvent(wrappedBody: Uint8Array): Promise<OB11ProfileLikeEvent | undefined> {
+        const likeTip = profileLikeTip.decode(Uint8Array.from(wrappedBody)) as unknown as ProfileLikeTipType;
+        if (likeTip?.msgType !== 0 || likeTip?.subType !== 203) return;
+        this.core.context.logger.logDebug("收到点赞通知消息");
+        const likeMsg = likeTip.content.msg;
+        if (!likeMsg) return;
+        const detail = likeMsg.detail;
+        if (!detail) return;
+        const times = detail.txt.match(/\d+/) ?? "0";
+        return new OB11ProfileLikeEvent(
+            this.core,
+            Number(detail.uin),
+            detail.nickname,
+            parseInt(times[0], 10),
+            likeMsg.time,
+        );
+    }
 }

src/onebot/entities.ts

@@ -48,7 +48,8 @@ export class OB11Entities {
         }[role];
     }
 
-    static sex(sex: Sex): OB11UserSex {
+    static sex(sex?: Sex): OB11UserSex {
+        if (!sex) return OB11UserSex.unknown;
         return {
             [Sex.male]: OB11UserSex.male,
             [Sex.female]: OB11UserSex.female,
@@ -109,7 +110,7 @@ export class OB11Entities {
     static file(peerId: string, file: Exclude<GroupFileInfoUpdateParamType['item'][0]['fileInfo'], undefined>): OB11GroupFile {
         return {
             group_id: parseInt(peerId),
-            file_id: FileNapCatOneBotUUID.encodeModelId({ chatType: 2, peerUid: peerId }, file.fileModelId, file.fileId),
+            file_id: FileNapCatOneBotUUID.encodeModelId({ chatType: 2, peerUid: peerId }, file.fileModelId, file.fileId, file.fileName),
             file_name: file.fileName,
             busid: file.busId,
             size: parseInt(file.fileSize),
@@ -126,6 +127,7 @@ export class OB11Entities {
         return {
             group_id: parseInt(peerId),
             folder_id: folder.folderId,
+            folder: folder.folderId,
             folder_name: folder.folderName,
             create_time: folder.createTime,
             creator: parseInt(folder.createUin),

src/onebot/event/notice/OB11GroupUploadNoticeEvent.ts

@@ -6,6 +6,7 @@ export interface GroupUploadFile {
     name: string,
     size: number,
     busid: number,
+    url:string;
 }
 
 export class OB11GroupUploadNoticeEvent extends OB11GroupNoticeEvent {

src/onebot/event/notice/OB11ProfileLikeEvent.ts

@@ -0,0 +1,19 @@
+import { OB11BaseNoticeEvent } from './OB11BaseNoticeEvent';
+import { NapCatCore } from '@/core';
+
+export class OB11ProfileLikeEvent extends OB11BaseNoticeEvent {
+    notice_type = 'notify';
+    sub_type = 'profile_like';
+    operator_id: number;
+    operator_nick: string;
+    times: number;
+    time: number;
+
+    constructor(core: NapCatCore, operatorId: number, operatorNick: string, times: number, time: number) {
+        super(core);
+        this.operator_id = operatorId;
+        this.operator_nick = operatorNick;
+        this.times = times;
+        this.time = time;
+    }
+}

src/onebot/index.ts

@@ -43,7 +43,8 @@ import { OB11FriendRecallNoticeEvent } from '@/onebot/event/notice/OB11FriendRec
 import { OB11GroupRecallNoticeEvent } from '@/onebot/event/notice/OB11GroupRecallNoticeEvent';
 import { LRUCache } from '@/common/lru-cache';
 import { NodeIKernelRecentContactListener } from '@/core/listeners/NodeIKernelRecentContactListener';
-
+import { OB11ProfileLikeEvent } from './event/notice/OB11ProfileLikeEvent';
+import { profileLikeTip, ProfileLikeTipType, SysMessage, SysMessageType } from '@/core/proto/ProfileLike';
 //OneBot实现类
 export class NapCatOneBot11Adapter {
     readonly core: NapCatCore;
@@ -237,36 +238,11 @@ export class NapCatOneBot11Adapter {
 
     private initMsgListener() {
         const msgListener = new NodeIKernelMsgListener();
-
-        /*
-        msgListener.onRecvSysMsg = async () => {
-            const sysMsg = SysMessage.fromBinary(Uint8Array.from(msg));
-            if (sysMsg.msgSpec.length === 0) {
-                return;
-            }
-            const { msgType, subType, subSubType } = sysMsg.msgSpec[0];
-            if (msgType === 732 && subType === 16 && subSubType === 16) {
-                const greyTip = GreyTipWrapper.fromBinary(Uint8Array.from(sysMsg.bodyWrapper!.wrappedBody.slice(7)));
-                if (greyTip.subTypeId === 36) {
-                    const emojiLikeToOthers = EmojiLikeToOthersWrapper1
-                        .fromBinary(greyTip.rest)
-                        .wrapper!
-                        .body!;
-                    if (emojiLikeToOthers.attributes?.operation !== 1) { // Un-like
-                        return;
-                    }
-                    const eventOrEmpty = await this.apis.GroupApi.createGroupEmojiLikeEvent(
-                        greyTip.groupCode.toString(),
-                        await this.core.apis.UserApi.getUinByUidV2(emojiLikeToOthers.attributes!.senderUid),
-                        emojiLikeToOthers.msgSpec!.msgSeq.toString(),
-                        emojiLikeToOthers.attributes!.emojiId,
-                    );
-                    // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-                    eventOrEmpty && await this.networkManager.emitEvent(eventOrEmpty);
-                }
-            }
+        msgListener.onRecvSysMsg = (msg) => {
+            this.apis.MsgApi.parseSysMessage(msg).then((event) => {
+                if (event) this.networkManager.emitEvent(event);
+            }).catch(e => this.context.logger.logError('constructSysMessage error: ', e));
         };
-         */
 
         msgListener.onInputStatusPush = async data => {
             const uin = await this.core.apis.UserApi.getUinByUidV2(data.fromUin);

src/onebot/network/passive-websocket.ts

@@ -21,6 +21,7 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
     core: NapCatCore;
     logger: LogWrapper;
     private heartbeatIntervalId: NodeJS.Timeout | null = null;
+    wsClientWithEvent: WebSocket[] = [];
 
     constructor(
         ip: string,
@@ -46,7 +47,12 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
             }
             //鉴权
             this.authorize(token, wsClient, wsReq);
-            this.connectEvent(core, wsClient);
+            const paramUrl = wsReq.url?.indexOf('?') !== -1 ? wsReq.url?.substring(0, wsReq.url?.indexOf('?')) : wsReq.url;
+            const isEventConnect = paramUrl === '/event' || paramUrl === '' || paramUrl === '/';
+            if (isEventConnect) {
+                this.connectEvent(core, wsClient);
+            }
+
             wsClient.on('error', (err) => this.logger.log('[OneBot] [WebSocket Server] Client Error:', err.message));
             wsClient.on('message', (message) => {
                 this.handleMessage(wsClient, message).then().catch(this.logger.logError);
@@ -59,13 +65,21 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
             });
             wsClient.once('close', () => {
                 this.wsClientsMutex.runExclusive(async () => {
-                    const index = this.wsClients.indexOf(wsClient);
-                    if (index !== -1) {
-                        this.wsClients.splice(index, 1);
+                    const NormolIndex = this.wsClients.indexOf(wsClient);
+                    if (NormolIndex !== -1) {
+                        this.wsClients.splice(NormolIndex, 1);
                     }
+                    const EventIndex = this.wsClientWithEvent.indexOf(wsClient);
+                    if (EventIndex !== -1) {
+                        this.wsClientWithEvent.splice(EventIndex, 1);
+                    }
+
                 });
             });
             await this.wsClientsMutex.runExclusive(async () => {
+                if(isEventConnect){
+                    this.wsClientWithEvent.push(wsClient);
+                }
                 this.wsClients.push(wsClient);
             });
         }).on('error', (err) => this.logger.log('[OneBot] [WebSocket Server] Server Error:', err.message));
@@ -81,7 +95,7 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
 
     onEvent<T extends OB11EmitEventContent>(event: T) {
         this.wsClientsMutex.runExclusive(async () => {
-            this.wsClients.forEach((wsClient) => {
+            this.wsClientWithEvent.forEach((wsClient) => {
                 wsClient.send(JSON.stringify(event));
             });
         });