release: v2.6.20

fix: protobuf #417
fix
2025-07-19 12:03:37 +00:00 · 2024-09-30 17:05:02 +08:00 · 2024-09-30 08:30:39 +08:00 · 2024-09-30 08:18:02 +08:00 · 2024-09-29 20:11:30 +08:00 · 2024-09-29 20:10:14 +08:00
53 changed files with 616 additions and 428 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -93,15 +93,18 @@ jobs:
    needs: [Build-LiteLoader,Build-Shell]
    runs-on: ubuntu-latest
    steps:
+
+    - name: Clone Main Repository
+      uses: actions/checkout@v4
+      with:
+            repository: 'NapNeko/NapCatQQ'
+            submodules: true
+            ref: main
+            token: ${{ secrets.NAPCAT_BUILD }}
+
    - name: Download All Artifact
      uses: actions/download-artifact@v4
-    # - name: Compress subdirectories
-    #   run: |
-    #     cd ./NapCat.Shell/
-    #     zip -q -r NapCat.Shell.zip *
-    #     cd ..
-    #     rm ./NapCat.Shell.zip -rf
-    #     mv ./NapCat.Shell/NapCat.Shell.zip ./
+      
    - name: Compress subdirectories
      run: |
        cd ./NapCat.Shell/
@@ -114,6 +117,16 @@ jobs:
        rm ./NapCat.Framework.zip -rf
        mv ./NapCat.Shell/NapCat.Shell.zip ./
        mv ./NapCat.Framework/NapCat.Framework.zip ./
+
+        mkdir ./NapCat.Framework.Windows.Once
+        unzip -q ./external/LiteLoaderWrapper.zip -d ./NapCat.Framework.Windows.Once
+        cd ./NapCat.Framework.Windows.Once
+        ls 
+        mkdir -p ./LL/plugins/NapCatQQ
+        unzip -q ../NapCat.Framework.zip -d ./LL/plugins/NapCatQQ
+        zip -q -r NapCat.Framework.Windows.Once.zip *
+        cd ..
+        mv ./NapCat.Framework.Windows.Once/NapCat.Framework.Windows.Once.zip ./
    - name: Extract version from tag
      run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
      
@@ -129,4 +142,5 @@ jobs:
        files: |
          NapCat.Framework.zip
          NapCat.Shell.zip
+          NapCat.Framework.Windows.Once.zip
        draft: true
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@

 ---
 ## 欢迎回来
-NapCatQQ (aka 猫猫框架) 是现代化的基于 NTQQ 的 Bot 协议端实现。
+NapCatQQ (aka 猫猫框架) 是现代化的基于 NTQQ 的 Bot 协议端实现

 ## 猫猫技能
 - [x] **高性能**：1K+ 群聊数目、20 线程并行发送消息毫无压力 
@@ -20,7 +20,7 @@ NapCatQQ (aka 猫猫框架) 是现代化的基于 NTQQ 的 Bot 协议端实现

 可前往 [Release](https://github.com/NapNeko/NapCatQQ/releases/) 页面下载最新版本

-**首次使用**请务必前往[官方文档](https://napneko.github.io/)查看使用教程。
+**首次使用**请务必前往[官方文档](https://napneko.github.io/)查看使用教程

 ## 回家旅途
 [QQ Group](https://qm.qq.com/q/VfjAq5HIMS)
@@ -40,4 +40,4 @@ NapCatQQ (aka 猫猫框架) 是现代化的基于 NTQQ 的 Bot 协议端实现
 > [!CAUTION]\
 > **请不要在 QQ 官方群聊和任何影响力较大的简中互联网平台（包括但不限于: 哔哩哔哩，微博，知乎，抖音等）发布和讨论*任何*与本项目存在相关性的信息**

-任何使用本仓库代码的地方，都应当严格遵守[本仓库开源许可](./LICENSE)。**此外，禁止任何项目未经授权二次分发或基于 NapCat 代码开发。**
+任何使用本仓库代码的地方，都应当严格遵守[本仓库开源许可](./LICENSE)。**此外，禁止任何项目未经授权二次分发或基于 NapCat 代码开发。**
--- a/external/LiteLoaderWrapper.zip
+++ b/external/LiteLoaderWrapper.zip
--- a/launcher/NapCatWinBootHook.dll
+++ b/launcher/NapCatWinBootHook.dll
--- a/launcher/NapCatWinBootMain.exe
+++ b/launcher/NapCatWinBootMain.exe
--- a/launcher/launcher.bat
+++ b/launcher/launcher.bat
@@ -34,6 +34,6 @@ if not exist "%QQpath%" (
 )

 set NAPCAT_MAIN_PATH=%NAPCAT_MAIN_PATH:\=/%
-echo (async () =^> {await import("file:///%NAPCAT_MAIN_PATH%")})() > %NAPCAT_LOAD_PATH%
+echo (async () =^> {await import("file:///%NAPCAT_MAIN_PATH%")})() > "%NAPCAT_LOAD_PATH%"

 "%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" %1
--- a/launcher/qqnt.json
+++ b/launcher/qqnt.json
@@ -1,6 +1,9 @@
 {
  "name": "qq-chat",
-  "version": "9.9.15-28060",
+  "version": "9.9.15-28418",
+  "verHash": "206bfa62",
+  "linuxVersion": "3.2.12-28327",
+  "linuxVerHash": "f60e8252",
  "type": "module",
  "private": true,
  "description": "QQ",
@@ -15,7 +18,7 @@
    "qd": "externals/devtools/cli/index.js"
  },
  "main": "./loadNapCat.js",
-  "buildVersion": "28060",
+  "buildVersion": "28418",
  "isPureShell": true,
  "isByteCodeShell": true,
  "platform": "win32",
--- a/manifest.json
+++ b/manifest.json
@@ -4,7 +4,7 @@
  "name": "NapCatQQ",
  "slug": "NapCat.Framework",
  "description": "高性能的 OneBot 11 协议实现",
-  "version": "2.6.4",
+  "version": "2.6.20",
  "icon": "./logo.png",
  "authors": [
    {
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "name": "napcat",
  "private": true,
  "type": "module",
-  "version": "2.6.4",
+  "version": "2.6.20",
  "scripts": {
    "build:framework": "vite build --mode framework",
    "build:shell": "vite build --mode shell",
@@ -13,11 +13,10 @@
  "devDependencies": {
    "@babel/preset-typescript": "^7.24.7",
    "@log4js-node/log4js-api": "^1.0.2",
-    "@protobuf-ts/plugin": "^2.9.4",
    "@rollup/plugin-node-resolve": "^15.2.3",
    "@rollup/plugin-typescript": "^11.1.6",
    "@types/cors": "^2.8.17",
-    "@types/express": "^4.17.21",
+    "@types/express": "^5.0.0",
    "@types/fluent-ffmpeg": "^2.1.24",
    "@types/node": "^22.0.1",
    "@types/qrcode-terminal": "^0.12.2",
@@ -30,11 +29,11 @@
    "typescript": "^5.3.3",
    "vite": "^5.2.6",
    "vite-plugin-cp": "^4.0.8",
-    "vite-plugin-dts": "^3.8.2",
    "vite-tsconfig-paths": "^4.3.2"
  },
  "dependencies": {
    "ajv": "^8.13.0",
+    "@protobuf-ts/plugin": "^2.9.4",
    "async-mutex": "^0.5.0",
    "chalk": "^5.3.0",
    "commander": "^12.1.0",
@@ -46,10 +45,8 @@
    "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",
    "ws": "^8.18.0"
  }
-}
+}
--- a/src/common/audio.ts
+++ b/src/common/audio.ts
@@ -83,7 +83,7 @@ export async function encodeSilk(filePath: string, TEMP_DIR: string, logger: Log
            };
        }
    } catch (error: any) {
-        logger.logError('convert silk failed', error.stack);
+        logger.logError.bind(logger)('convert silk failed', error.stack);
        return {};
    }
 }
--- a/src/common/config-base.ts
+++ b/src/common/config-base.ts
@@ -40,7 +40,7 @@ export abstract class ConfigBase<T> {
                fs.writeFileSync(configPath, fs.readFileSync(this.getConfigPath(undefined), 'utf-8'));
                logger.log(`[Core] [Config] 配置文件创建成功!\n`);
            } catch (e: any) {
-                logger.logError(`[Core] [Config] 创建配置文件时发生错误:`, e.message);
+                logger.logError.bind(logger)(`[Core] [Config] 创建配置文件时发生错误:`, e.message);
            }
        }
        try {
@@ -49,9 +49,9 @@ export abstract class ConfigBase<T> {
            return this.configData;
        } catch (e: any) {
            if (e instanceof SyntaxError) {
-                logger.logError(`[Core] [Config] 配置文件格式错误，请检查配置文件:`, e.message);
+                logger.logError.bind(logger)(`[Core] [Config] 配置文件格式错误，请检查配置文件:`, e.message);
            } else {
-                logger.logError(`[Core] [Config] 读取配置文件时发生错误:`, e.message);
+                logger.logError.bind(logger)(`[Core] [Config] 读取配置文件时发生错误:`, e.message);
            }
            return {} as T;
        }
@@ -66,7 +66,7 @@ export abstract class ConfigBase<T> {
        try {
            fs.writeFileSync(configPath, JSON.stringify(newConfigData, this.getKeys(), 2));
        } catch (e: any) {
-            logger.logError(`保存配置文件 ${configPath} 时发生错误:`, e.message);
+            logger.logError.bind(logger)(`保存配置文件 ${configPath} 时发生错误:`, e.message);
        }
    }
 }
--- a/src/common/event.ts
+++ b/src/common/event.ts
@@ -183,11 +183,11 @@ export class NTEventWrapper {
        timeout = 5000,
    ) {
        return new Promise<[EventRet: Awaited<ReturnType<EventType>>, ...Parameters<ListenerType>]>(
-            (resolve, reject) => {
+            async (resolve, reject) => {
                const id = randomUUID();
                let complete = 0;
                let retData: Parameters<ListenerType> | undefined = undefined;
-                const retEvent: any = {};
+                let retEvent: any = {};

                function sendDataCallback() {
                    if (complete == 0) {
@@ -235,22 +235,22 @@ export class NTEventWrapper {
                this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.set(id, eventCallback);
                this.createListenerFunction(ListenerMainName);
                const eventFunction = this.createEventFunction(serviceAndMethod);
-                if (eventFunction) eventFunction(...(args)).then((retEvent: Awaited<ReturnType<EventType>>) => {
-                    if (!checkerEvent(retEvent) && timeoutRef.hasRef()) {
-                        clearTimeout(timeoutRef);
-                        reject(
-                            new Error(
-                                'EventChecker Failed: NTEvent serviceAndMethod:' +
-                                serviceAndMethod +
-                                ' ListenerName:' +
-                                listenerAndMethod +
-                                ' EventRet:\n' +
-                                JSON.stringify(retEvent, null, 4) +
-                                '\n',
-                            ),
-                        );
-                    }
-                });
+                retEvent = await eventFunction!(...(args));
+                if (!checkerEvent(retEvent) && timeoutRef.hasRef()) {
+                    clearTimeout(timeoutRef);
+                    reject(
+                        new Error(
+                            'EventChecker Failed: NTEvent serviceAndMethod:' +
+                            serviceAndMethod +
+                            ' ListenerName:' +
+                            listenerAndMethod +
+                            ' EventRet:\n' +
+                            JSON.stringify(retEvent, null, 4) +
+                            '\n',
+                        ),
+                    );
+                }
+
            },
        );
    }
--- a/src/common/helper.ts
+++ b/src/common/helper.ts
@@ -180,11 +180,11 @@ export function getDefaultQQVersionConfigInfo(): QQVersionConfigType {
        };
    }
    return {
-        baseVersion: '9.9.15-28060',
-        curVersion: '9.9.15-28060',
+        baseVersion: '9.9.15-28131',
+        curVersion: '9.9.15-28131',
        prevVersion: '',
        onErrorVersions: [],
-        buildId: '28060',
+        buildId: '28131',
    };
 }

--- a/src/common/log.ts
+++ b/src/common/log.ts
@@ -139,8 +139,7 @@ export class LogWrapper {

    logMessage(msg: RawMessage, selfInfo: SelfInfo) {
        const isSelfSent = msg.senderUin === selfInfo.uin;
-        this.log(`${
-            isSelfSent ? '发送 ->' : '接收 <-'
+        this.log(`${isSelfSent ? '发送 ->' : '接收 <-'
        } ${rawMessageToText(msg)}`);
    }
 }
@@ -180,12 +179,11 @@ export function rawMessageToText(msg: RawMessage, recursiveLevel = 0): string {
            const recordMsgOrNull = msg.records.find(
                record => element.replyElement!.sourceMsgIdInRecords === record.msgId,
            );
-            return `[回复消息 ${
-                recordMsgOrNull &&
-                recordMsgOrNull.peerUin != '284840486' // 非转发消息; 否则定位不到
-                    ?
-                    rawMessageToText(recordMsgOrNull, recursiveLevel + 1) :
-                    `未找到消息记录 (MsgId = ${element.replyElement.sourceMsgIdInRecords})`
+            return `[回复消息 ${recordMsgOrNull &&
+                    recordMsgOrNull.peerUin != '284840486' && recordMsgOrNull.peerUin != '1094950020'// 非转发消息; 否则定位不到
+                ?
+                rawMessageToText(recordMsgOrNull, recursiveLevel + 1) :
+                `未找到消息记录 (MsgId = ${element.replyElement.sourceMsgIdInRecords})`
            }]`;
        }

--- a/src/common/system.ts
+++ b/src/common/system.ts
@@ -1,12 +1,8 @@
 import os from 'node:os';
 import path from 'node:path';
-import { networkInterfaces } from 'os';
-import { randomUUID } from 'crypto';

 // 缓解Win7设备兼容性问题
 let osName: string;
-// 设备ID
-let machineId: Promise<string>;

 try {
    osName = os.hostname();
@@ -14,54 +10,6 @@ try {
    osName = 'NapCat'; // + crypto.randomUUID().substring(0, 4);
 }

-const invalidMacAddresses = new Set([
-    '00:00:00:00:00:00',
-    'ff:ff:ff:ff:ff:ff',
-    'ac:de:48:00:11:22',
-]);
-
-function validateMacAddress(candidate: string): boolean {
-    // eslint-disable-next-line no-useless-escape
-    const tempCandidate = candidate.replace(/\-/g, ':').toLowerCase();
-    return !invalidMacAddresses.has(tempCandidate);
-}
-
-export async function getMachineId(): Promise<string> {
-    if (!machineId) {
-        machineId = (async () => {
-            const id = await getMacMachineId();
-            return id ?? randomUUID(); // fallback, generate a UUID
-        })();
-    }
-
-    return machineId;
-}
-
-export function getMac(): string {
-    const ifaces = networkInterfaces();
-    for (const name in ifaces) {
-        const networkInterface = ifaces[name];
-        if (networkInterface) {
-            for (const { mac } of networkInterface) {
-                if (validateMacAddress(mac)) {
-                    return mac;
-                }
-            }
-        }
-    }
-
-    throw new Error('Unable to retrieve mac address (unexpected format)');
-}
-
-async function getMacMachineId(): Promise<string | undefined> {
-    try {
-        const crypto = await import('crypto');
-        const macAddress = getMac();
-        return crypto.createHash('sha256').update(macAddress, 'utf8').digest('hex');
-    } catch (err) {
-        return undefined;
-    }
-}

 const homeDir = os.homedir();

--- a/src/common/version.ts
+++ b/src/common/version.ts
@@ -1 +1 @@
-export const napCatVersion = '2.6.4';
+export const napCatVersion = '2.6.20';
--- a/src/core/apis/file.ts
+++ b/src/core/apis/file.ts
@@ -145,7 +145,7 @@ export class NTQQFileApi {
        try {
            videoInfo = await getVideoInfo(filePath, logger);
        } catch (e) {
-            logger.logError('获取视频信息失败，将使用默认值', e);
+            logger.logError.bind(logger)('获取视频信息失败，将使用默认值', e);
        }

        let fileExt = 'mp4';
@@ -153,7 +153,7 @@ export class NTQQFileApi {
            const tempExt = (await fileType.fileTypeFromFile(filePath))?.ext;
            if (tempExt) fileExt = tempExt;
        } catch (e) {
-            this.context.logger.logError('获取文件类型失败', e);
+            this.context.logger.logError.bind(logger)('获取文件类型失败', e);
        }
        const newFilePath = filePath + '.' + fileExt;
        fs.copyFileSync(filePath, newFilePath);
@@ -227,7 +227,7 @@ export class NTQQFileApi {
        }
        if (converted) {
            fsPromises.unlink(silkPath).then().catch(
-                (e) => this.context.logger.logError('删除临时文件失败', e)
+                (e) => this.context.logger.logError.bind(this.context.logger)('删除临时文件失败', e)
            );
        }
        return {
--- a/src/core/apis/user.ts
+++ b/src/core/apis/user.ts
@@ -120,12 +120,20 @@ export class NTQQUserApi {
        return this.context.session.getProfileService().modifyDesktopMiniProfile(param);
    }

-    //需要异常处理
    async getCookies(domain: string) {
        const ClientKeyData = await this.forceFetchClientKey();
        const requestUrl = 'https://ssl.ptlogin2.qq.com/jump?ptlang=1033&clientuin=' + this.core.selfInfo.uin +
            '&clientkey=' + ClientKeyData.clientKey + '&u1=https%3A%2F%2F' + domain + '%2F' + this.core.selfInfo.uin + '%2Finfocenter&keyindex=19%27';
-        return await RequestUtil.HttpsGetCookies(requestUrl);
+        let data = await RequestUtil.HttpsGetCookies(requestUrl);
+        if (!data.p_skey || data.p_skey.length == 0) {
+            try {
+                let pskey = (await this.getPSkey([domain])).domainPskeyMap.get(domain);
+                if (pskey) data.p_skey = pskey;
+            } catch {
+                return data;
+            }
+        }
+        return data;
    }

    async getPSkey(domainList: string[]) {
--- a/src/core/apis/webapi.ts
+++ b/src/core/apis/webapi.ts
@@ -264,7 +264,7 @@ export class NTQQWebApi {
                    });
                }
            } else {
-                this.context.logger.logError('获取龙王信息失败');
+                this.context.logger.logError.bind(this.context.logger)('获取龙王信息失败');
            }
        }
        if (getType === WebHonorType.PERFORMER || getType === WebHonorType.ALL) {
@@ -280,7 +280,7 @@ export class NTQQWebApi {
                    });
                }
            } else {
-                this.context.logger.logError('获取群聊之火失败');
+                this.context.logger.logError.bind(this.context.logger)('获取群聊之火失败');
            }
        }
        if (getType === WebHonorType.PERFORMER || getType === WebHonorType.ALL) {
@@ -296,7 +296,7 @@ export class NTQQWebApi {
                    });
                }
            } else {
-                this.context.logger.logError('获取群聊炽焰失败');
+                this.context.logger.logError.bind(this.context.logger)('获取群聊炽焰失败');
            }
        }
        if (getType === WebHonorType.EMOTION || getType === WebHonorType.ALL) {
@@ -312,7 +312,7 @@ export class NTQQWebApi {
                    });
                }
            } else {
-                this.context.logger.logError('获取快乐源泉失败');
+                this.context.logger.logError.bind(this.context.logger)('获取快乐源泉失败');
            }
        }

--- a/src/core/entities/msg.ts
+++ b/src/core/entities/msg.ts
@@ -659,7 +659,8 @@ export interface GrayTipElement {
 export enum FaceType {
    normal = 1, // 小黄脸
    normal2 = 2, // 新小黄脸, 从faceIndex 222开始？
-    dice = 3  // 骰子
+    dice = 3,  // 骰子
+    poke = 5  // 拍一拍
 }

 export enum FaceIndex {
--- a/src/core/entities/sign.ts
+++ b/src/core/entities/sign.ts
@@ -1,14 +1,15 @@
 export interface IdMusicSignPostData {
-    type: 'qq' | '163',
+    type: 'qq' | '163' | 'kugou' | 'migu' | 'kuwo',
    id: string | number,
 }

 export interface CustomMusicSignPostData {
-    type: 'custom',
+    type: 'qq' | '163' | 'kugou' | 'migu' | 'kuwo' | 'custom',
+    id: undefined,
    url: string,
-    audio: string,
-    title: string,
-    image?: string,
+    audio?: string,
+    title?: string,
+    image: string,
    singer?: string
 }

--- a/src/core/external/appid.json
+++ b/src/core/external/appid.json
@@ -1,10 +1,34 @@
 {
-    "9.9.15-28060":{
+    "9.9.15-28060": {
        "appid": 537246092,
        "qua": "V1_WIN_NQ_9.9.15_28060_GW_B"
    },
-    "3.2.12-28060":{
+    "9.9.15-28131": {
+        "appid": 537246092,
+        "qua": "V1_WIN_NQ_9.9.15_28131_GW_B"
+    },
+    "3.2.12-28060": {
        "appid": 537246140,
        "qua": "V1_LNX_NQ_3.2.12_28060_GW_B"
+    },
+    "3.2.12-28131": {
+        "appid": 537246140,
+        "qua": "V1_LNX_NQ_3.2.12_28131_GW_B"
+    },
+    "9.9.15-28327":{
+        "appid": 537249321,
+        "qua": "V1_WIN_NQ_9.9.15_28327_GW_B"
+    },
+    "3.2.12-28327":{
+        "appid": 537249393,
+        "qua": "V1_LNX_NQ_3.2.12_28327_GW_B"
+    },
+    "9.9.15-28418":{
+        "appid": 537249321,
+        "qua": "V1_WIN_NQ_9.9.15_28418_GW_B"
+    },
+    "3.2.12-28418":{
+        "appid": 537249393,
+        "qua": "V1_LNX_NQ_3.2.12_28418_GW_B"
    }
-}
+}
--- a/src/core/helper/rkey.ts
+++ b/src/core/helper/rkey.ts
@@ -26,7 +26,7 @@ export class RkeyManager {
            try {
                await this.refreshRkey();
            } catch (e) {
-                this.logger.logError('获取rkey失败', e);
+                this.logger.logError.bind(this.logger)('获取rkey失败', e);
            }
        }
        return this.rkeyData;
@@ -44,7 +44,7 @@ export class RkeyManager {
            try {
                this.rkeyData = await RequestUtil.HttpGetJson<ServerRkeyData>(url, 'GET');
            } catch (e) {
-                this.logger.logError(`[Rkey] Get Rkey ${url} Error `, e);
+                this.logger.logError.bind(this.logger)(`[Rkey] Get Rkey ${url} Error `, e);
            }
        }

--- a/src/core/index.ts
+++ b/src/core/index.ts
@@ -20,16 +20,15 @@ import { LogLevel, LogWrapper } from '@/common/log';
 import { NodeIKernelLoginService } from '@/core/services';
 import { QQBasicInfoWrapper } from '@/common/qq-basic-info';
 import { NapCatPathWrapper } from '@/common/path';
-import path from 'node:path';
+import path, { resolve } from 'node:path';
 import fs from 'node:fs';
-import { getMachineId, hostname, systemName, systemVersion } from '@/common/system';
+import { hostname, systemName, systemVersion } from '@/common/system';
 import { NTEventWrapper } from '@/common/event';
-import { DataSource, GroupMember, KickedOffLineInfo, SelfInfo, SelfStatusInfo } from '@/core/entities';
+import { ChatType, DataSource, GroupMember, KickedOffLineInfo, Peer, SelfInfo, SelfStatusInfo } from '@/core/entities';
 import { NapCatConfigLoader } from '@/core/helper/config';
 import os from 'node:os';
 import { NodeIKernelGroupListener, NodeIKernelMsgListener, NodeIKernelProfileListener } from '@/core/listeners';
 import { proxiedListenerOf } from '@/common/proxy-handler';
-
 export * from './wrapper';
 export * from './entities';
 export * from './services';
@@ -99,7 +98,8 @@ export class NapCatCore {
        if (!fs.existsSync(this.NapCatTempPath)) {
            fs.mkdirSync(this.NapCatTempPath, { recursive: true });
        }
-        this.initNapCatCoreListeners().then().catch(this.context.logger.logError);
+       
+        this.initNapCatCoreListeners().then().catch(this.context.logger.logError.bind(this.context.logger));

        this.context.logger.setFileLogEnabled(
            this.configLoader.configData.fileLog,
@@ -127,7 +127,7 @@ export class NapCatCore {
        const msgListener = new NodeIKernelMsgListener();
        msgListener.onKickedOffLine = (Info: KickedOffLineInfo) => {
            // 下线通知
-            this.context.logger.logError('[KickedOffLine] [' + Info.tipsTitle + '] ' + Info.tipsDesc);
+            this.context.logger.logError.bind(this.context.logger)('[KickedOffLine] [' + Info.tipsTitle + '] ' + Info.tipsDesc);
            this.selfInfo.online = false;
        };
        msgListener.onRecvMsg = (msgs) => {
@@ -247,10 +247,16 @@ export class NapCatCore {
    }
 }

-export async function genSessionConfig(QQVersionAppid: string, QQVersion: string, selfUin: string, selfUid: string, account_path: string): Promise<WrapperSessionInitConfig> {
+export async function genSessionConfig(
+    guid: string,
+    QQVersionAppid: string,
+    QQVersion: string,
+    selfUin: string,
+    selfUid: string,
+    account_path: string
+): Promise<WrapperSessionInitConfig> {
    const downloadPath = path.join(account_path, 'NapCat', 'temp');
    fs.mkdirSync(downloadPath, { recursive: true });
-    const guid: string = await getMachineId();//26702 支持JS获取guid值 在LoginService中获取 TODO mlikiow a
    //os.platform() 
    let systemPlatform = PlatformType.KWINDOWS;
    switch (os.platform()) {
@@ -261,7 +267,7 @@ export async function genSessionConfig(QQVersionAppid: string, QQVersion: string
            systemPlatform = PlatformType.KMAC;
            break;
        case 'linux':
-            systemPlatform = PlatformType.KANDROID; //Android 怎么不算Linux!
+            systemPlatform = PlatformType.KLINUX;
            break;
    }
    return {
--- a/src/core/listeners/NodeIO3MiscListener.ts
+++ b/src/core/listeners/NodeIO3MiscListener.ts
@@ -0,0 +1,5 @@
+export class NodeIO3MiscListener {
+    getOnAmgomDataPiece(...arg: unknown[]) {
+
+    }
+}
--- a/src/core/proto/Message.ts
+++ b/src/core/proto/Message.ts
@@ -0,0 +1,48 @@
+import { MessageType, BinaryReader, ScalarType } from '@protobuf-ts/runtime';
+
+export const BodyInner = new MessageType("BodyInner", [
+    { no: 1, name: "msgType", kind: "scalar", T: ScalarType.UINT32 /* uint32 */, opt: true },
+    { no: 2, name: "subType", kind: "scalar", T: ScalarType.UINT32 /* uint32 */, opt: true }
+]);
+
+export const NoifyData = new MessageType("NoifyData", [
+    { no: 1, name: "skip", kind: "scalar", T: ScalarType.BYTES /* bytes */, opt: true },
+    { no: 2, name: "innerData", kind: "scalar", T: ScalarType.BYTES /* bytes */, opt: true }
+]);
+
+export const MsgHead = new MessageType("MsgHead", [
+    { no: 2, name: "bodyInner", kind: "message", T: () => BodyInner, opt: true },
+    { no: 3, name: "noifyData", kind: "message", T: () => NoifyData, opt: true }
+]);
+
+export const Message = new MessageType("Message", [
+    { no: 1, name: "msgHead", kind: "message", T: () => MsgHead }
+]);
+
+export const SubDetail = new MessageType("SubDetail", [
+    { no: 1, name: "msgSeq", kind: "scalar", T: ScalarType.UINT32 /* uint32 */ },
+    { no: 2, name: "msgTime", kind: "scalar", T: ScalarType.UINT32 /* uint32 */ },
+    { no: 6, name: "senderUid", kind: "scalar", T: ScalarType.STRING /* string */ }
+]);
+
+export const RecallDetails = new MessageType("RecallDetails", [
+    { no: 1, name: "operatorUid", kind: "scalar", T: ScalarType.STRING /* string */ },
+    { no: 3, name: "subDetail", kind: "message", T: () => SubDetail }
+]);
+
+export const RecallGroup = new MessageType("RecallGroup", [
+    { no: 1, name: "type", kind: "scalar", T: ScalarType.INT32 /* int32 */ },
+    { no: 4, name: "peerUid", kind: "scalar", T: ScalarType.UINT32 /* uint32 */ },
+    { no: 11, name: "recallDetails", kind: "message", T: () => RecallDetails },
+    { no: 37, name: "grayTipsSeq", kind: "scalar", T: ScalarType.UINT32 /* uint32 */ }
+]);
+
+export function decodeMessage(buffer: Uint8Array): any {
+    const reader = new BinaryReader(buffer);
+    return Message.internalBinaryRead(reader, reader.len, { readUnknownField: true, readerFactory: () => new BinaryReader(buffer) });
+}
+
+export function decodeRecallGroup(buffer: Uint8Array): any {
+    const reader = new BinaryReader(buffer);
+    return RecallGroup.internalBinaryRead(reader, reader.len, { readUnknownField: true, readerFactory: () => new BinaryReader(buffer) });
+}
--- a/src/core/proto/ProfileLike.ts
+++ b/src/core/proto/ProfileLike.ts
@@ -1,95 +1,58 @@
-import * as pb from 'protobufjs';
+import { MessageType, BinaryReader, ScalarType, RepeatType } from '@protobuf-ts/runtime';

-// Proto: from src/core/proto/ProfileLike.proto
-// Author: Mlikiowa
+export const LikeDetail = new MessageType("likeDetail", [
+    { no: 1, name: "txt", kind: "scalar", T: ScalarType.STRING /* string */ },
+    { no: 3, name: "uin", kind: "scalar", T: ScalarType.INT64 /* int64 */ },
+    { no: 5, name: "nickname", kind: "scalar", T: ScalarType.STRING /* string */ }
+]);

-export interface LikeDetailType {
-    txt: string;
-    uin: pb.Long;
-    nickname: string;
-}
-export interface LikeMsgType {
-    times: number;
-    time: number;
-    detail: LikeDetailType;
+export const LikeMsg = new MessageType("likeMsg", [
+    { no: 1, name: "times", kind: "scalar", T: ScalarType.INT32 /* int32 */ },
+    { no: 2, name: "time", kind: "scalar", T: ScalarType.INT32 /* int32 */ },
+    { no: 3, name: "detail", kind: "message", T: () => LikeDetail }
+]);
+
+export const ProfileLikeSubTip = new MessageType("profileLikeSubTip", [
+    { no: 14, name: "msg", kind: "message", T: () => LikeMsg }
+]);
+export const ProfileLikeTip = new MessageType("profileLikeTip", [
+    { no: 1, name: "msgType", kind: "scalar", T: ScalarType.INT32 /* int32 */ },
+    { no: 2, name: "subType", kind: "scalar", T: ScalarType.INT32 /* int32 */ },
+    { no: 203, name: "content", kind: "message", T: () => ProfileLikeSubTip }
+]);
+export const SysMessageHeader = new MessageType("SysMessageHeader", [
+    { no: 1, name: "PeerNumber", kind: "scalar", T: ScalarType.UINT32 /* uint32 */ },
+    { no: 2, name: "PeerString", kind: "scalar", T: ScalarType.STRING /* string */ },
+    { no: 5, name: "Uin", kind: "scalar", T: ScalarType.UINT32 /* uint32 */ },
+    { no: 6, name: "Uid", kind: "scalar", T: ScalarType.STRING /* string */, opt: true }
+]);
+
+export const SysMessageMsgSpec = new MessageType("SysMessageMsgSpec", [
+    { no: 1, name: "msgType", kind: "scalar", T: ScalarType.UINT32 /* uint32 */ },
+    { no: 2, name: "subType", kind: "scalar", T: ScalarType.UINT32 /* uint32 */ },
+    { no: 3, name: "subSubType", kind: "scalar", T: ScalarType.UINT32 /* uint32 */ },
+    { no: 5, name: "msgSeq", kind: "scalar", T: ScalarType.UINT32 /* uint32 */ },
+    { no: 6, name: "time", kind: "scalar", T: ScalarType.UINT32 /* uint32 */ },
+    { no: 12, name: "msgId", kind: "scalar", T: ScalarType.UINT64 /* uint64 */ },
+    { no: 13, name: "other", kind: "scalar", T: ScalarType.UINT32 /* uint32 */ }
+]);
+
+export const SysMessageBodyWrapper = new MessageType("SysMessageBodyWrapper", [
+    { no: 2, name: "wrappedBody", kind: "scalar", T: ScalarType.BYTES /* bytes */ }
+]);
+
+export const SysMessage = new MessageType("SysMessage", [
+    { no: 1, name: "header", kind: "message", T: () => SysMessageHeader, repeat: RepeatType.UNPACKED },
+    { no: 2, name: "msgSpec", kind: "message", T: () => SysMessageMsgSpec, repeat: RepeatType.UNPACKED },
+    { no: 3, name: "bodyWrapper", kind: "message", T: () => SysMessageBodyWrapper }
+]);
+
+export function decodeProfileLikeTip(buffer: Uint8Array): any {
+    const reader = new BinaryReader(buffer);
+    return ProfileLikeTip.internalBinaryRead(reader, reader.len, { readUnknownField: true, readerFactory: () => new BinaryReader(buffer) });
 }

-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"));
+export function decodeSysMessage(buffer: Uint8Array): any {
+    const reader = new BinaryReader(buffer);
+    return SysMessage.internalBinaryRead(reader, reader.len, { readUnknownField: true, readerFactory: () => new BinaryReader(buffer) });
+}
--- a/src/core/services/NodeIKernelGroupService.ts
+++ b/src/core/services/NodeIKernelGroupService.ts
@@ -240,7 +240,12 @@ export interface NodeIKernelGroupService {

    getGroupRecommendContactArkJson(groupCode: string): unknown;

-    getJoinGroupLink(groupCode: string): unknown;
+    getJoinGroupLink(param: {
+        groupCode: string,
+        srcId: number,//73
+        needShortUrl: boolean,//true
+        additionalParam: string//''
+    }): Promise<GeneralCallResult & { url?: string }>;

    modifyGroupExtInfo(groupCode: string, arg: unknown): void;

--- a/src/core/services/NodeIKernelLoginService.ts
+++ b/src/core/services/NodeIKernelLoginService.ts
@@ -1,4 +1,5 @@
 import { NodeIKernelLoginListener } from '@/core/listeners/NodeIKernelLoginListener';
+import { GeneralCallResult } from './common';

 export interface LoginInitConfig {
    machineId: '';
@@ -59,6 +60,9 @@ export interface QuickLoginResult {
 }

 export interface NodeIKernelLoginService {
+    setLoginMiscData(arg0: string, value: string): unknown;
+    getMachineGuid(): string;
+
    get(): NodeIKernelLoginService;

    connect(): boolean;
@@ -69,7 +73,7 @@ export interface NodeIKernelLoginService {

    initConfig(config: LoginInitConfig): void;

-    getLoginMiscData(cb: (r: unknown) => void): void;
+    getLoginMiscData(data: string): Promise<GeneralCallResult & { value: string }>;

    getLoginList(): Promise<{
        result: number,  // 0是ok
--- a/src/core/services/NodeIKernelNodeMiscService.ts
+++ b/src/core/services/NodeIKernelNodeMiscService.ts
@@ -1,6 +1,8 @@
 import { GeneralCallResult } from './common';

 export interface NodeIKernelNodeMiscService {
+    writeVersionToRegistry(version: string): void;
+
    getMiniAppPath(): unknown;

    setMiniAppVersion(version: string): unknown;
--- a/src/core/services/NodeIKernelUnitedConfigService.ts
+++ b/src/core/services/NodeIKernelUnitedConfigService.ts
@@ -4,14 +4,14 @@ export interface NodeIKernelUnitedConfigService {

    removeKernelUnitedConfigListener(listenerId:number): void;

-    fetchUnitedCommendConfig(...args: any[]): unknown;// needs 1 arguments
-
    fetchUnitedSwitchConfig(...args: any[]): unknown;// needs 1 arguments

-    loadUnitedConfig(...args: any[]): unknown;// needs 1 arguments
-
    isUnitedConfigSwitchOn(...args: any[]): unknown;// needs 1 arguments

    registerUnitedConfigPushGroupList(...args: any[]): unknown;// needs 1 arguments

+    fetchUnitedCommendConfig(ids: `${string}`[]): void
+
+    loadUnitedConfig(id: string): Promise<unknown>
+
 }
--- a/src/core/services/NodeIO3MiscService.ts
+++ b/src/core/services/NodeIO3MiscService.ts
@@ -0,0 +1,11 @@
+import { NodeIO3MiscListener } from "../listeners/NodeIO3MiscListener";
+
+export interface NodeIO3MiscService {
+    get(): NodeIO3MiscService;
+
+    addO3MiscListener(listeners: NodeIO3MiscListener): number;
+
+    setAmgomDataPiece(appid: string, dataPiece: Uint8Array): void;
+
+    reportAmgomWeather(type: string, uk2: string, arg: Array<string>): void;
+}
--- a/src/core/wrapper.ts
+++ b/src/core/wrapper.ts
@@ -26,6 +26,7 @@ import { NodeIKernelRecentContactService } from './services/NodeIKernelRecentCon
 import { NodeIKernelMSFService } from './services/NodeIKernelMSFService';
 import { NodeIkernelTestPerformanceService } from './services/NodeIkernelTestPerformanceService';
 import { NodeIKernelECDHService } from './services/NodeIKernelECDHService';
+import { NodeIO3MiscService } from './services/NodeIO3MiscService';

 export interface NodeQQNTWrapperUtil {
    get(): unknown;
@@ -253,7 +254,7 @@ export interface EnginInitDesktopConfig {
    app_type: 4;
    app_version: string;
    os_version: string;
-    use_xlog: true;
+    use_xlog: boolean;
    qua: string;
    global_path_config: {
        desktopGlobalPath: string;
@@ -268,21 +269,20 @@ export interface NodeIQQNTWrapperEngine {
 }

 export interface WrapperNodeApi {
-    [key: string]: any;
-
+    NodeIO3MiscService: NodeIO3MiscService;
    NodeQQNTWrapperUtil: NodeQQNTWrapperUtil;
    NodeIQQNTWrapperSession: NodeIQQNTWrapperSession;
    NodeIQQNTWrapperEngine: NodeIQQNTWrapperEngine;
    NodeIKernelLoginService: NodeIKernelLoginService;
-    NodeIKernelProfileService: NodeIKernelProfileService;
-}

+}
 export enum PlatformType {
    KUNKNOWN,
    KANDROID,
    KIOS,
    KWINDOWS,
    KMAC,
+    KLINUX
 }

 export enum DeviceType {
--- a/src/framework/napcat.ts
+++ b/src/framework/napcat.ts
@@ -49,7 +49,7 @@ export async function NCoreInitFramework(
    const loaderObject = new NapCatFramework(wrapper, session, logger, loginService, selfInfo, basicInfoWrapper, pathWrapper);

    //启动WebUi
-    InitWebUi(logger, pathWrapper).then().catch(logger.logError);
+    InitWebUi(logger, pathWrapper).then().catch(logger.logError.bind(logger));
    //初始化LLNC的Onebot实现
    new NapCatOneBot11Adapter(loaderObject.core, loaderObject.context, pathWrapper);
 }
--- a/src/native/external/MoeHoo.win32.node
+++ b/src/native/external/MoeHoo.win32.node
--- a/src/native/index.ts
+++ b/src/native/index.ts
@@ -0,0 +1,40 @@
+import { constants } from "node:os";
+import path from "path";
+import { dlopen } from "process";
+import fs from "fs";
+export class Native {
+    platform: string;
+    supportedPlatforms = ['win32'];
+    MoeHooExport: any = { exports: {} };
+    recallHookEnabled: boolean = false;
+    inited = true;
+    constructor(nodePath: string, platform: string = process.platform) {
+        this.platform = platform;
+        try {
+            if (!this.supportedPlatforms.includes(this.platform)) {
+                throw new Error(`Platform ${this.platform} is not supported`);
+            }
+            let nativeNode = path.join(nodePath, './native/MoeHoo.win32.node');
+            if (fs.existsSync(nativeNode)) {
+                dlopen(this.MoeHooExport, nativeNode, constants.dlopen.RTLD_LAZY);
+            }
+        } catch (error) {
+            this.inited = false;
+        }
+
+    }
+    isSetReCallEnabled(): boolean {
+        return this.recallHookEnabled && this.inited;
+    }
+    registerRecallCallback(callback: (hex: string) => any): void {
+        try {
+            if (!this.inited) throw new Error('Native Not Init');
+            if (this.MoeHooExport.exports?.registMsgPush) {
+                this.MoeHooExport.exports.registMsgPush(callback);
+                this.recallHookEnabled = true;
+            }
+        } catch (error) {
+            this.recallHookEnabled = false;
+        }
+    }
+}
--- a/src/onebot/action/BaseAction.ts
+++ b/src/onebot/action/BaseAction.ts
@@ -46,7 +46,7 @@ abstract class BaseAction<PayloadType, ReturnDataType> {
            const resData = await this._handle(payload);
            return OB11Response.ok(resData);
        } catch (e: any) {
-            this.core.context.logger.logError('发生错误', e);
+            this.core.context.logger.logError.bind(this.core.context.logger)('发生错误', e);
            return OB11Response.error(e?.toString() || e?.stack?.toString() || '未知错误，可能操作超时', 200);
        }
    }
@@ -60,7 +60,7 @@ abstract class BaseAction<PayloadType, ReturnDataType> {
            const resData = await this._handle(payload);
            return OB11Response.ok(resData, echo);
        } catch (e: any) {
-            this.core.context.logger.logError('发生错误', e);
+            this.core.context.logger.logError.bind(this.core.context.logger)('发生错误', e);
            return OB11Response.error(e.stack?.toString() || e.toString(), 1200, echo);
        }
    }
--- a/src/onebot/action/go-cqhttp/GetForwardMsg.ts
+++ b/src/onebot/action/go-cqhttp/GetForwardMsg.ts
@@ -1,9 +1,16 @@
 import BaseAction from '../BaseAction';
-import { OB11ForwardMessage } from '@/onebot';
+import { OB11Message, OB11MessageData, OB11MessageDataType, OB11MessageForward, OB11MessageNode as OriginalOB11MessageNode } from '@/onebot';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import { MessageUnique } from '@/common/message-unique';

+type OB11MessageNode = OriginalOB11MessageNode & {
+    data: {
+        content?: Array<OB11MessageData>;
+        message: Array<OB11MessageData>;
+    };
+};
+
 const SchemaData = {
    type: 'object',
    properties: {
@@ -18,36 +25,69 @@ export class GoCQHTTPGetForwardMsgAction extends BaseAction<Payload, any> {
    actionName = ActionName.GoCQHTTP_GetForwardMsg;
    payloadSchema = SchemaData;

+    private createTemplateNode(message: OB11Message): OB11MessageNode {
+        return {
+            type: OB11MessageDataType.node,
+            data: {
+                user_id: message.user_id,
+                nickname: message.sender.nickname,
+                message: [],
+                content: []
+            }
+        };
+    }
+
+    async parseForward(messages: OB11Message[]): Promise<OB11MessageNode[]> {
+        const retMsg: OB11MessageNode[] = [];
+
+        for (const message of messages) {
+            const templateNode = this.createTemplateNode(message);
+
+            for (const msgdata of message.message) {
+                if ((msgdata as OB11MessageData).type === OB11MessageDataType.forward) {
+                    const newNode = this.createTemplateNode(message);
+                    newNode.data.message = await this.parseForward((msgdata as OB11MessageForward).data.content);
+
+                    templateNode.data.message.push(newNode);
+                } else {
+                    templateNode.data.message.push(msgdata as OB11MessageData);
+                }
+            }
+            retMsg.push(templateNode);
+        }
+
+        return retMsg;
+    }
+
    async _handle(payload: Payload): Promise<any> {
        const msgId = payload.message_id || payload.id;
        if (!msgId) {
-            throw Error('message_id is required');
+            throw new Error('message_id is required');
        }
+
        const rootMsgId = MessageUnique.getShortIdByMsgId(msgId);
        const rootMsg = MessageUnique.getMsgIdAndPeerByShortId(rootMsgId || parseInt(msgId));
        if (!rootMsg) {
-            throw Error('msg not found');
+            throw new Error('msg not found');
        }
-        const data = await this.core.apis.MsgApi.getMultiMsg(rootMsg.Peer, rootMsg.MsgId, rootMsg.MsgId);
+        const data = await this.core.apis.MsgApi.getMsgsByMsgId(rootMsg.Peer, [rootMsg.MsgId]);
+
        if (!data || data.result !== 0) {
-            throw Error('找不到相关的聊天记录' + data?.errMsg);
+            throw new Error('找不到相关的聊天记录' + data?.errMsg);
        }
-        const msgList = data.msgList;
-        const messages = (await Promise.all(msgList.map(async msg => {
-            const resMsg = await this.obContext.apis.MsgApi
-                .parseMessage(msg);
-            if (!resMsg) return;
-            resMsg.message_id = MessageUnique.createUniqueMsgId({
-                guildId: '',
-                chatType: msg.chatType,
-                peerUid: msg.peerUid,
-            }, msg.msgId)!;
-            return resMsg;
-        }))).filter(msg => !!msg);
-        messages.map(msg => {
-            (<OB11ForwardMessage>msg).content = msg.message;
-            delete (<any>msg).message;
-        });
-        return { messages };
+
+        const singleMsg = data.msgList[0];
+        const resMsg = await this.obContext.apis.MsgApi.parseMessage(singleMsg, 'array');//强制array 以便处理
+        if (!resMsg) {
+            throw new Error('找不到相关的聊天记录');
+        }
+        //if (this.obContext.configLoader.configData.messagePostFormat === 'array') {
+        //提取
+        let realmsg = ((await this.parseForward([resMsg]))[0].data.message as OB11MessageNode[])[0].data.message;
+        //里面都是offline消息 id都是0 没得说话
+        return { message: realmsg };
+        //}
+
+        // return { message: resMsg };
    }
-}
+}
--- a/src/onebot/action/msg/GetMsg.ts
+++ b/src/onebot/action/msg/GetMsg.ts
@@ -3,6 +3,7 @@ import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import { MessageUnique } from '@/common/message-unique';
+import { RawMessage } from '@/core';


 export type ReturnDataType = OB11Message
@@ -32,13 +33,17 @@ class GetMsg extends BaseAction<Payload, OB11Message> {
            throw new Error('消息不存在');
        }
        const peer = { guildId: '', peerUid: msgIdWithPeer?.Peer.peerUid, chatType: msgIdWithPeer.Peer.chatType };
-        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]);
+        let orimsg = this.obContext.recallMsgCache.get(msgIdWithPeer.MsgId);
+        let msg: RawMessage;
+        if (orimsg) {
+            msg = orimsg;
+        } else {
+            msg = (await this.core.apis.MsgApi.getMsgsByMsgId(peer, [msgIdWithPeer?.MsgId || payload.message_id.toString()])).msgList[0];
+        }
+        const retMsg = await this.obContext.apis.MsgApi.parseMessage(msg);
        if (!retMsg) throw Error('消息为空');
        try {
-            retMsg.message_id = MessageUnique.createUniqueMsgId(peer, msg.msgList[0].msgId)!;
+            retMsg.message_id = MessageUnique.createUniqueMsgId(peer, msg.msgId)!;
            retMsg.message_seq = retMsg.message_id;
            retMsg.real_id = retMsg.message_id;
        } catch (e) {
--- a/src/onebot/action/msg/SendMsg.ts
+++ b/src/onebot/action/msg/SendMsg.ts
@@ -149,7 +149,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                //对Mgsid和OB11ID混用情况兜底
                const nodeMsg = MessageUnique.getMsgIdAndPeerByShortId(parseInt(nodeId)) || MessageUnique.getPeerByMsgId(nodeId);
                if (!nodeMsg) {
-                    logger.logError('转发消息失败，未找到消息', nodeId);
+                    logger.logError.bind(this.core.context.logger)('转发消息失败，未找到消息', nodeId);
                    continue;
                }
                nodeMsgIds.push(nodeMsg.MsgId);
@@ -161,7 +161,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                    const isNodeMsg = OB11Data.filter(e => e.type === OB11MessageDataType.node).length;//找到子转发消息
                    if (isNodeMsg !== 0) {
                        if (isNodeMsg !== OB11Data.length) {
-                            logger.logError('子消息中包含非node消息 跳过不合法部分');
+                            logger.logError.bind(this.core.context.logger)('子消息中包含非node消息 跳过不合法部分');
                            continue;
                        }
                        const nodeMsg = await this.handleForwardedNodes(selfPeer, OB11Data.filter(e => e.type === OB11MessageDataType.node));
@@ -209,7 +209,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
        for (const msgId of nodeMsgIds) {
            const nodeMsgPeer = MessageUnique.getPeerByMsgId(msgId);
            if (!nodeMsgPeer) {
-                logger.logError('转发消息失败，未找到消息', msgId);
+                logger.logError.bind(this.core.context.logger)('转发消息失败，未找到消息', msgId);
                continue;
            }
            const nodeMsg = (await this.core.apis.MsgApi.getMsgsByMsgId(nodeMsgPeer.Peer, [msgId])).msgList[0];
@@ -238,7 +238,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
            logger.logDebug('开发转发', srcPeer, destPeer, retMsgIds);
            return await this.core.apis.MsgApi.multiForwardMsg(srcPeer!, destPeer, retMsgIds);
        } catch (e) {
-            logger.logError('forward failed', e);
+            logger.logError.bind(this.core.context.logger)('forward failed', e);
            return null;
        }
    }
@@ -262,7 +262,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
        try {
            return await this.core.apis.MsgApi.sendMsg(selfPeer, sendElements, true);
        } catch (e) {
-            logger.logError(e, '克隆转发消息失败,将忽略本条消息', msg);
+            logger.logError.bind(this.core.context.logger)(e, '克隆转发消息失败,将忽略本条消息', msg);
        }
    }
 }
--- a/src/onebot/api/friend.ts
+++ b/src/onebot/api/friend.ts
@@ -15,14 +15,14 @@ export class OneBotFriendApi {
    //使用前预先判断 busiId 1061
    async parsePrivatePokeEvent(grayTipElement: GrayTipElement) {
        const json = JSON.parse(grayTipElement.jsonGrayTipElement.jsonStr);
-        let pokedetail: any[] = json.items;
+        let pokedetail: Array<{ uid: string }> = json.items;
        //筛选item带有uid的元素
        pokedetail = pokedetail.filter(item => item.uid);
        if (pokedetail.length == 2) {
            return new OB11FriendPokeEvent(
                this.core,
-                parseInt((await this.core.apis.UserApi.getUinByUidV2(pokedetail[0].uid))!),
-                parseInt((await this.core.apis.UserApi.getUinByUidV2(pokedetail[1].uid))!),
+                parseInt((await this.core.apis.UserApi.getUinByUidV2(pokedetail[0].uid))),
+                parseInt((await this.core.apis.UserApi.getUinByUidV2(pokedetail[1].uid))),
                pokedetail,
            );
        }
--- a/src/onebot/api/group.ts
+++ b/src/onebot/api/group.ts
@@ -96,7 +96,6 @@ export class OneBotGroupApi {
                    if (GroupIncreaseEvent) return GroupIncreaseEvent;
                }

-                //代码歧义 GrayTipElementSubType.MEMBER_NEW_TITLE
                else if (element.grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_JSON) {
                    const json = JSON.parse(element.grayTipElement.jsonGrayTipElement.jsonStr);
                    if (element.grayTipElement.jsonGrayTipElement.busiId == 1061) {
@@ -139,7 +138,6 @@ export class OneBotGroupApi {
                        // 获取MsgSeq+Peer可获取具体消息
                    }
                    if (element.grayTipElement.jsonGrayTipElement.busiId == 2407) {
-                        //下面得改 上面也是错的grayTipElement.subElementType == GrayTipElementSubType.MEMBER_NEW_TITLE
                        const type = json.items[json.items.length - 1]?.txt;
                        switch (type) {
                        case "头衔": {
@@ -207,7 +205,6 @@ export class OneBotGroupApi {
            while ((match = regex.exec(xmlElement.content)) !== null) {
                matches.push(match[1]);
            }
-            // log("新人进群匹配到的QQ号", matches)
            if (matches.length === 2) {
                const [inviter, invitee] = matches;
                return new OB11GroupIncreaseEvent(
@@ -289,7 +286,7 @@ export class OneBotGroupApi {
        }
        const replyMsg = replyMsgList[0];
        if (!replyMsg) {
-            this.core.context.logger.logError('解析表情回应消息失败: 未找到回应消息');
+            this.core.context.logger.logError.bind(this.core.context.logger)('解析表情回应消息失败: 未找到回应消息');
            return undefined;
        }
        return new OB11GroupMsgEmojiLikeEvent(
--- a/src/onebot/api/msg.ts
+++ b/src/onebot/api/msg.ts
@@ -34,7 +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';
+import { decodeSysMessage } from '@/core/proto/ProfileLike';

 type RawToOb11Converters = {
    [Key in keyof MessageElement as Key extends `${string}Element` ? Key : never]: (
@@ -122,7 +122,7 @@ export class OneBotMsgApi {
                    },
                };
            } catch (e: any) {
-                this.core.context.logger.logError('获取图片url失败', e.stack);
+                this.core.context.logger.logError.bind(this.core.context.logger)('获取图片url失败', e.stack);
                return null;
            }
        },
@@ -201,7 +201,7 @@ export class OneBotMsgApi {
                guildId: '',
            };
            if (!records || !element.replyMsgTime || !element.senderUidStr) {
-                this.core.context.logger.logError('获取不到引用的消息', element.replayMsgSeq);
+                this.core.context.logger.logError.bind(this.core.context.logger)('获取不到引用的消息', element.replayMsgSeq);
                return null;
            }

@@ -212,14 +212,14 @@ export class OneBotMsgApi {
                },
            });

-            if (records.peerUin === '284840486') {
+            if (records.peerUin === '284840486' || records.peerUin === '1094950020') {
                return createReplyData(records.msgId);
            }
            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) {
-                this.core.context.logger.logError('获取不到引用的消息', element.replayMsgSeq);
+                this.core.context.logger.logError.bind(this.core.context.logger)('获取不到引用的消息', element.replayMsgSeq);
                return null;
            }
            return createReplyData(replyMsg.msgId);
@@ -234,19 +234,29 @@ export class OneBotMsgApi {
            //读取视频链接并兜底
            let videoUrlWrappers: Awaited<ReturnType<typeof this.core.apis.FileApi.getVideoUrl>> | undefined;

-            if (msg.peerUin === '284840486') {
-                //TODO: 合并消息内部 应该进行特殊处理 可能需要重写peer 待测试与研究 Mlikiowa Tagged
-            }
-            try {
-                videoUrlWrappers = await this.core.apis.FileApi.getVideoUrl({
-                    chatType: msg.chatType,
-                    peerUid: msg.peerUid,
-                    guildId: '0',
-                }, msg.msgId, elementWrapper.elementId);
-            } catch (error) {
-                this.core.context.logger.logWarn('获取视频 URL 失败');
+            if (msg.peerUin === '284840486' || msg.peerUin === '1094950020') {
+                try {
+                    videoUrlWrappers = await this.core.apis.FileApi.getVideoUrl({
+                        chatType: msg.chatType,
+                        peerUid: msg.peerUid,
+                        guildId: '0',
+                    }, msg.parentMsgIdList[0] ?? msg.msgId, elementWrapper.elementId);
+                } catch (error) {
+                    this.core.context.logger.logWarn('合并获取视频 URL 失败');
+                }
+            } else {
+                try {
+                    videoUrlWrappers = await this.core.apis.FileApi.getVideoUrl({
+                        chatType: msg.chatType,
+                        peerUid: msg.peerUid,
+                        guildId: '0',
+                    }, msg.msgId, elementWrapper.elementId);
+                } catch (error) {
+                    this.core.context.logger.logWarn('获取视频 URL 失败');
+                }
            }

+
            //读取在线URL
            let videoDownUrl: string | undefined;

@@ -421,6 +431,10 @@ export class OneBotMsgApi {
            // 从face_config.json中获取表情名称
            const sysFaces = faceConfig.sysface;
            const face: any = sysFaces.find((systemFace) => systemFace.QSid === parsedFaceId.toString());
+            if (!face) {
+                this.core.context.logger.logError.bind(this.core.context.logger)('不支持的ID', id);
+                return undefined;
+            }
            parsedFaceId = parseInt(parsedFaceId.toString());
            let faceType = 1;
            if (parsedFaceId >= 222) {
@@ -443,7 +457,6 @@ export class OneBotMsgApi {
                },
            };
        },
-
        [OB11MessageDataType.mface]: async ({
            data: {
                emoji_package_id, emoji_id, key, summary,
@@ -506,13 +519,12 @@ export class OneBotMsgApi {
            faceElement: {
                faceIndex: FaceIndex.dice,
                faceType: FaceType.dice,
-                'faceText': '[骰子]',
-                'packId': '1',
-                'stickerId': '33',
-                'sourceType': 1,
-                'stickerType': 2,
-                // resultId: resultId.toString(),
-                'surpriseId': '',
+                faceText: '[骰子]',
+                packId: '1',
+                stickerId: '33',
+                sourceType: 1,
+                stickerType: 2,
+                surpriseId: '',
                // "randomType": 1,
            },
        }),
@@ -521,15 +533,14 @@ export class OneBotMsgApi {
            elementType: ElementType.FACE,
            elementId: '',
            faceElement: {
-                'faceIndex': FaceIndex.RPS,
-                'faceText': '[包剪锤]',
-                'faceType': 3,
-                'packId': '1',
-                'stickerId': '34',
-                'sourceType': 1,
-                'stickerType': 2,
-                // 'resultId': resultId.toString(),
-                'surpriseId': '',
+                faceIndex: FaceIndex.RPS,
+                faceText: '[包剪锤]',
+                faceType: 3,
+                packId: '1',
+                stickerId: '34',
+                sourceType: 1,
+                stickerType: 2,
+                surpriseId: '',
                // "randomType": 1,
            },
        }),
@@ -543,32 +554,28 @@ export class OneBotMsgApi {

        [OB11MessageDataType.music]: async ({ data }, context) => {
            // 保留, 直到...找到更好的解决方案
-            if (data.type === 'custom') {
-                if (!data.url) {
-                    this.core.context.logger.logError('自定义音卡缺少参数url');
-                    return undefined;
-                }
-                if (!data.audio) {
-                    this.core.context.logger.logError('自定义音卡缺少参数audio');
-                    return undefined;
-                }
-                if (!data.title) {
-                    this.core.context.logger.logError('自定义音卡缺少参数title');
+            if (data.id !== undefined) {
+                if (!['qq', '163', 'kugou', 'kuwo', 'migu'].includes(data.type)) {
+                    this.core.context.logger.logError.bind(this.core.context.logger)('音乐卡片type错误, 只支持qq、163、kugou、kuwo、migu，当前type:', data.type);
                    return undefined;
                }
            } else {
-                if (!['qq', '163'].includes(data.type)) {
-                    this.core.context.logger.logError('音乐卡片type错误, 只支持qq、163、custom，当前type:', data.type);
+                if (!['qq', '163', 'kugou', 'kuwo', 'migu', 'custom'].includes(data.type)) {
+                    this.core.context.logger.logError.bind(this.core.context.logger)('音乐卡片type错误, 只支持qq、163、kugou、kuwo、migu、custom，当前type:', data.type);
                    return undefined;
                }
-                if (!data.id) {
-                    this.core.context.logger.logError('音乐卡片缺少参数id');
+                if (!data.url) {
+                    this.core.context.logger.logError.bind(this.core.context.logger)('自定义音卡缺少参数url');
+                    return undefined;
+                }
+                if (!data.image) {
+                    this.core.context.logger.logError.bind(this.core.context.logger)('自定义音卡缺少参数image');
                    return undefined;
                }
            }

            let postData: IdMusicSignPostData | CustomMusicSignPostData;
-            if (data.type === 'custom' && data.content) {
+            if (data.id === undefined && data.content) {
                const { content, ...others } = data;
                postData = { singer: content, ...others };
            } else {
@@ -576,7 +583,7 @@ export class OneBotMsgApi {
            }
            let signUrl = this.obContext.configLoader.configData.musicSignUrl;
            if (!signUrl) {
-                signUrl = 'https://ss.xingzhige.com/music_card/card';//感谢思思！
+                signUrl = 'https://ss.xingzhige.com/music_card/card';//感谢思思！已获思思许可 其余地方使用请自行询问
                //throw Error('音乐消息签名地址未配置');
            }
            try {
@@ -586,7 +593,7 @@ export class OneBotMsgApi {
                    type: OB11MessageDataType.json
                }, context);
            } catch (e) {
-                this.core.context.logger.logError('生成音乐消息失败', e);
+                this.core.context.logger.logError.bind(this.core.context.logger)('生成音乐消息失败', e);
            }
        },

@@ -628,18 +635,14 @@ export class OneBotMsgApi {
            return;
        }
        for (const element of msg.elements) {
-            if (element.grayTipElement) {
-                if (element.grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_JSON) {
-                    if (element.grayTipElement.jsonGrayTipElement.busiId == 1061) {
-                        const PokeEvent = await this.obContext.apis.FriendApi.parsePrivatePokeEvent(element.grayTipElement);
-                        if (PokeEvent) return PokeEvent;
-                    }
+            if (element.grayTipElement && element.grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_JSON) {
+                if (element.grayTipElement.jsonGrayTipElement.busiId == 1061) {
+                    const PokeEvent = await this.obContext.apis.FriendApi.parsePrivatePokeEvent(element.grayTipElement);
+                    if (PokeEvent) return PokeEvent;
                }
-                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) || Number(await this.core.apis.UserApi.getUinByUidV2(msg.peerUid)));
-                    }
+                //好友添加成功事件
+                if (element.grayTipElement.jsonGrayTipElement.busiId == 19324 && msg.peerUid !== '') {
+                    return new OB11FriendAddNoticeEvent(this.core, Number(await this.core.apis.UserApi.getUinByUidV2(msg.peerUid)));
                }
            }
        }
@@ -701,36 +704,46 @@ export class OneBotMsgApi {
            }
        }

-        const msgSegments = (await Promise.allSettled(msg.elements.map(
+        // 处理消息段
+        const msgSegments = await Promise.allSettled(msg.elements.map(
            async (element) => {
                for (const key in element) {
                    if (keyCanBeParsed(key, this.rawToOb11Converters) && element[key]) {
-                        return await this.rawToOb11Converters[key]?.(
+                        const parsedElement = await this.rawToOb11Converters[key]?.(
                            // eslint-disable-next-line
                            // @ts-ignore
                            element[key],
                            msg,
                            element,
                        );
+                        // 对于 face 类型的消息，检查是否存在
+                        if (key === 'faceElement' && !parsedElement) {
+                            return null; // 如果没有找到对应的表情，返回 null
+                        }
+
+                        return parsedElement;
                    }
                }
            },
-        ))).filter(entry => {
+        ));
+
+        // 过滤掉无效的消息段
+        const validSegments = msgSegments.filter(entry => {
            if (entry.status === 'fulfilled') {
                return !!entry.value;
            } else {
-                this.core.context.logger.logError('消息段解析失败', entry.reason);
+                this.core.context.logger.logError.bind(this.core.context.logger)('消息段解析失败', entry.reason);
                return false;
            }
-        }).map((entry) => (<PromiseFulfilledResult<OB11MessageData>>entry).value);
+        }).map((entry) => (<PromiseFulfilledResult<OB11MessageData>>entry).value).filter(value => value != null);

-        const msgAsCQCode = msgSegments.map(msg => encodeCQCode(msg)).join('').trim();
+        const msgAsCQCode = validSegments.map(msg => encodeCQCode(msg)).join('').trim();

        if (messagePostFormat === 'string') {
            resMsg.message = msgAsCQCode;
            resMsg.raw_message = msgAsCQCode;
        } else {
-            resMsg.message = msgSegments;
+            resMsg.message = validSegments;
            resMsg.raw_message = msgAsCQCode;
        }
        return resMsg;
@@ -787,7 +800,7 @@ export class OneBotMsgApi {
                timeout += PredictTime;// 10S Basic Timeout + PredictTime( For File 512kb/s )
            }
        } catch (e) {
-            this.core.context.logger.logError('发送消息计算预计时间异常', e);
+            this.core.context.logger.logError.bind(this.core.context.logger)('发送消息计算预计时间异常', e);
        }
        const returnMsg = await this.core.apis.MsgApi.sendMsg(peer, sendElements, waitComplete, timeout);
        if (!returnMsg) throw new Error('发送消息失败');
@@ -797,7 +810,7 @@ export class OneBotMsgApi {
            peerUid: peer.peerUid,
        }, returnMsg.msgId);
        deleteAfterSentFiles.forEach(file => {
-            fsPromise.unlink(file).then().catch(e => this.core.context.logger.logError('发送消息删除文件失败', e));
+            fsPromise.unlink(file).then().catch(e => this.core.context.logger.logError.bind(this.core.context.logger)('发送消息删除文件失败', e));
        });
        return returnMsg;
    }
@@ -808,7 +821,7 @@ export class OneBotMsgApi {
    ) {
        const realUri = inputdata.url || inputdata.file || inputdata.path || '';
        if (realUri.length === 0) {
-            this.core.context.logger.logError('文件消息缺少参数', inputdata);
+            this.core.context.logger.logError.bind(this.core.context.logger)('文件消息缺少参数', inputdata);
            throw Error('文件消息缺少参数');
        }
        const {
@@ -819,7 +832,7 @@ export class OneBotMsgApi {
        } = (await uri2local(this.core.NapCatTempPath, realUri));

        if (!success) {
-            this.core.context.logger.logError('文件下载失败', errMsg);
+            this.core.context.logger.logError.bind(this.core.context.logger)('文件下载失败', errMsg);
            throw Error('文件下载失败' + errMsg);
        }

@@ -828,7 +841,7 @@ export class OneBotMsgApi {
        return { path, fileName: inputdata.name ?? fileName };
    }
    async parseSysMessage(msg: number[]) {
-        const sysMsg = SysMessage.decode(Uint8Array.from(msg)) as unknown as SysMessageType;
+        const sysMsg = decodeSysMessage(Uint8Array.from(msg));
        if (sysMsg.msgSpec.length === 0) {
            return;
        }
--- a/src/onebot/api/user.ts
+++ b/src/onebot/api/user.ts
@@ -1,5 +1,5 @@
 import { NapCatCore } from '@/core';
-import { profileLikeTip, ProfileLikeTipType } from '@/core/proto/ProfileLike';
+import { decodeProfileLikeTip } from '@/core/proto/ProfileLike';

 import { NapCatOneBot11Adapter } from '@/onebot';
 import { OB11ProfileLikeEvent } from '../event/notice/OB11ProfileLikeEvent';
@@ -13,7 +13,7 @@ export class OneBotUserApi {
        this.core = core;
    }
    async parseLikeEvent(wrappedBody: Uint8Array): Promise<OB11ProfileLikeEvent | undefined> {
-        const likeTip = profileLikeTip.decode(Uint8Array.from(wrappedBody)) as unknown as ProfileLikeTipType;
+        const likeTip = decodeProfileLikeTip(Uint8Array.from(wrappedBody));
        if (likeTip?.msgType !== 0 || likeTip?.subType !== 203) return;
        this.core.context.logger.logDebug("收到点赞通知消息");
        const likeMsg = likeTip.content.msg;
--- a/src/onebot/index.ts
+++ b/src/onebot/index.ts
@@ -10,6 +10,7 @@ import {
    NodeIKernelBuddyListener,
    NodeIKernelGroupListener,
    NodeIKernelMsgListener,
+    Peer,
    RawMessage,
    SendStatusType,
 } from '@/core';
@@ -43,8 +44,9 @@ 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';
+import { Native } from '@/native';
+import { decodeMessage, decodeRecallGroup, Message, RecallGroup } from '@/core/proto/Message';
+
 //OneBot实现类
 export class NapCatOneBot11Adapter {
    readonly core: NapCatCore;
@@ -54,8 +56,9 @@ export class NapCatOneBot11Adapter {
    apis: StableOneBotApiWrapper;
    networkManager: OB11NetworkManager;
    actions: ActionMap;
-
+    nativeCore: Native | undefined;
    private bootTime = Date.now() / 1000;
+    recallMsgCache = new LRUCache<string, RawMessage>(100);

    constructor(core: NapCatCore, context: InstanceContext, pathWrapper: NapCatPathWrapper) {
        this.core = core;
@@ -70,10 +73,41 @@ export class NapCatOneBot11Adapter {
        };
        this.actions = createActionMap(this, core);
        this.networkManager = new OB11NetworkManager();
+        this.registerNative(core, context).then().catch();
        this.InitOneBot()
-            .catch(e => this.context.logger.logError('初始化OneBot失败', e));
-    }
+            .catch(e => this.context.logger.logError.bind(this.context.logger)('初始化OneBot失败', e));

+    }
+    async registerNative(core: NapCatCore, context: InstanceContext) {
+        try {
+            this.nativeCore = new Native(context.pathWrapper.binaryPath);
+            if (!this.nativeCore.inited) throw new Error('Native Not Init');
+            this.nativeCore.registerRecallCallback(async (hex: string) => {
+                try {
+                    let data = decodeMessage(Buffer.from(hex, 'hex')) as any;
+                    //data.MsgHead.BodyInner.MsgType SubType
+                    let bodyInner = data.msgHead?.bodyInner;
+                    //context.logger.log("[appNative] Parse MsgType:" + bodyInner.msgType + " / SubType:" + bodyInner.subType);
+                    if (bodyInner && bodyInner.msgType == 732 && bodyInner.subType == 17) {
+                        let RecallData = Buffer.from(data.msgHead.noifyData.innerData);
+                        //跳过 4字节 群号  + 不知道的1字节 +2字节 长度
+                        let uid = RecallData.readUint32BE();
+                        const buffer = Buffer.from(RecallData.toString('hex').slice(14), 'hex');
+                        let seq: number = decodeRecallGroup(buffer).recallDetails.subDetail.msgSeq;
+                        let peer: Peer = { chatType: ChatType.KCHATTYPEGROUP, peerUid: uid.toString() };
+                        context.logger.log("[Native] 群消息撤回 Peer: " + uid.toString() + " / MsgSeq:" + seq);
+                        let msgs = await core.apis.MsgApi.queryMsgsWithFilterExWithSeq(peer, seq.toString());
+                        this.recallMsgCache.put(msgs.msgList[0].msgId, msgs.msgList[0]);
+                    }
+                } catch (error: any) {
+                    context.logger.logWarn("[Native] Error:", (error as Error).message, ' HEX:', hex);
+                }
+            });
+        } catch (error) {
+            context.logger.logWarn("[Native] Error:", (error as Error).message);
+            return;
+        }
+    }
    async InitOneBot() {
        const selfInfo = this.core.selfInfo;
        const ob11Config = this.configLoader.configData;
@@ -87,7 +121,7 @@ export class NapCatOneBot11Adapter {
        this.core.apis.UserApi.getUserDetailInfo(selfInfo.uid).then(user => {
            selfInfo.nick = user.nick;
            this.context.logger.setLogSelfInfo(selfInfo);
-        }).catch(this.context.logger.logError);
+        }).catch(this.context.logger.logError.bind(this.context.logger));
        this.context.logger.log(`[Notice] [OneBot11] ${serviceInfo}`);

        //创建NetWork服务
@@ -241,7 +275,7 @@ export class NapCatOneBot11Adapter {
        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));
+            }).catch(e => this.context.logger.logError.bind(this.context.logger)('constructSysMessage error: ', e));
        };

        msgListener.onInputStatusPush = async data => {
@@ -270,7 +304,7 @@ export class NapCatOneBot11Adapter {
                    m.msgId,
                );
                await this.emitMsg(m)
-                    .catch(e => this.context.logger.logError('处理消息失败', e));
+                    .catch(e => this.context.logger.logError.bind(this.context.logger)('处理消息失败', e));
            }
        };

@@ -278,7 +312,7 @@ export class NapCatOneBot11Adapter {
        const recallMsgs = new LRUCache<string, boolean>(100);
        msgListener.onMsgInfoListUpdate = async msgList => {
            this.emitRecallMsg(msgList, recallMsgs)
-                .catch(e => this.context.logger.logError('处理消息失败', e));
+                .catch(e => this.context.logger.logError.bind(this.context.logger)('处理消息失败', e));

            for (const msg of msgList.filter(e => e.senderUin == this.core.selfInfo.uin)) {
                if (msg.sendStatus == SendStatusType.KSEND_STATUS_SUCCESS && !msgIdSend.get(msg.msgId)) {
@@ -380,7 +414,7 @@ export class NapCatOneBot11Adapter {
                                ].includes(notify.type) ? 'unset' : 'set',
                            );
                            this.networkManager.emitEvent(groupAdminNoticeEvent)
-                                .catch(e => this.context.logger.logError('处理群管理员变动失败', e));
+                                .catch(e => this.context.logger.logError.bind(this.context.logger)('处理群管理员变动失败', e));
                        } else {
                            this.context.logger.logDebug('获取群通知的成员信息失败', notify, this.core.apis.GroupApi.getGroup(notify.group.groupCode));
                        }
@@ -405,7 +439,7 @@ export class NapCatOneBot11Adapter {
                            subType,
                        );
                        this.networkManager.emitEvent(groupDecreaseEvent)
-                            .catch(e => this.context.logger.logError('处理群成员退出失败', e));
+                            .catch(e => this.context.logger.logError.bind(this.context.logger)('处理群成员退出失败', e));
                        // notify.status == 1 表示未处理 2表示处理完成
                    } else if ([
                        GroupNotifyMsgType.REQUEST_JOIN_NEED_ADMINI_STRATOR_PASS,
@@ -425,9 +459,9 @@ export class NapCatOneBot11Adapter {
                                flag,
                            );
                            this.networkManager.emitEvent(groupRequestEvent)
-                                .catch(e => this.context.logger.logError('处理加群请求失败', e));
+                                .catch(e => this.context.logger.logError.bind(this.context.logger)('处理加群请求失败', e));
                        } catch (e) {
-                            this.context.logger.logError('获取加群人QQ号失败 Uid:', notify.user1.uid, e);
+                            this.context.logger.logError.bind(this.context.logger)('获取加群人QQ号失败 Uid:', notify.user1.uid, e);
                        }
                    } else if (notify.type == GroupNotifyMsgType.INVITED_BY_MEMBER && notify.status == GroupNotifyMsgStatus.KUNHANDLE) {
                        this.context.logger.logDebug(`收到邀请我加群通知:${notify}`);
@@ -440,7 +474,7 @@ export class NapCatOneBot11Adapter {
                            flag,
                        );
                        this.networkManager.emitEvent(groupInviteEvent)
-                            .catch(e => this.context.logger.logError('处理邀请本人加群失败', e));
+                            .catch(e => this.context.logger.logError.bind(this.context.logger)('处理邀请本人加群失败', e));
                    } else if (notify.type == GroupNotifyMsgType.INVITED_NEED_ADMINI_STRATOR_PASS && notify.status == GroupNotifyMsgStatus.KUNHANDLE) {
                        this.context.logger.logDebug(`收到群员邀请加群通知:${notify}`);
                        const groupInviteEvent = new OB11GroupRequestEvent(
@@ -452,7 +486,7 @@ export class NapCatOneBot11Adapter {
                            flag,
                        );
                        this.networkManager.emitEvent(groupInviteEvent)
-                            .catch(e => this.context.logger.logError('处理邀请本人加群失败', e));
+                            .catch(e => this.context.logger.logError.bind(this.context.logger)('处理邀请本人加群失败', e));
                    }
                }
            }
@@ -474,9 +508,9 @@ export class NapCatOneBot11Adapter {
                        member.role === GroupMemberRole.admin ? 'set' : 'unset',
                    );
                    this.networkManager.emitEvent(groupAdminNoticeEvent)
-                        .catch(e => this.context.logger.logError('处理群管理员变动失败', e));
+                        .catch(e => this.context.logger.logError.bind(this.context.logger)('处理群管理员变动失败', e));
                    existMember.isChangeRole = false;
-                    this.context.logger.logDebug('群管理员变动处理完毕');
+                    this.context.logger.logDebug.bind(this.context.logger)('群管理员变动处理完毕');
                });
            }
        };
@@ -499,8 +533,6 @@ export class NapCatOneBot11Adapter {
                    return;
                }
            }
-            // logOB11Message(this.core, ob11Msg)
-            //    .catch(e => this.context.logger.logError('logMessage error: ', e));
            const isSelfMsg = ob11Msg.user_id.toString() == this.core.selfInfo.uin;
            if (isSelfMsg && !reportSelfMessage) {
                return;
@@ -509,23 +541,22 @@ export class NapCatOneBot11Adapter {
                ob11Msg.target_id = parseInt(message.peerUin);
            }
            this.networkManager.emitEvent(ob11Msg);
-        }).catch(e => this.context.logger.logError('constructMessage error: ', e));
+        }).catch(e => this.context.logger.logError.bind(this.context.logger)('constructMessage error: ', e));

        this.apis.GroupApi.parseGroupEvent(message).then(groupEvent => {
            if (groupEvent) {
                // log("post group event", groupEvent);
                this.networkManager.emitEvent(groupEvent);
            }
-        }).catch(e => this.context.logger.logError('constructGroupEvent error: ', e));
+        }).catch(e => this.context.logger.logError.bind(this.context.logger)('constructGroupEvent error: ', e));

        this.apis.MsgApi.parsePrivateMsgEvent(message).then(privateEvent => {
            if (privateEvent) {
                // log("post private event", privateEvent);
                this.networkManager.emitEvent(privateEvent);
            }
-        }).catch(e => this.context.logger.logError('constructPrivateEvent error: ', e));
+        }).catch(e => this.context.logger.logError.bind(this.context.logger)('constructPrivateEvent error: ', e));
    }
-
    private async emitRecallMsg(msgList: RawMessage[], cache: LRUCache<string, boolean>) {
        for (const message of msgList) {
            // log("message update", message.sendStatus, message.msgId, message.msgSeq)
@@ -543,7 +574,7 @@ export class NapCatOneBot11Adapter {
                        oriMessageId,
                    );
                    this.networkManager.emitEvent(friendRecallEvent)
-                        .catch(e => this.context.logger.logError('处理好友消息撤回失败', e));
+                        .catch(e => this.context.logger.logError.bind(this.context.logger)('处理好友消息撤回失败', e));
                } else if (message.chatType == ChatType.KCHATTYPEGROUP) {
                    let operatorId = message.senderUin;
                    for (const element of message.elements) {
@@ -557,10 +588,10 @@ export class NapCatOneBot11Adapter {
                        parseInt(message.peerUin),
                        parseInt(message.senderUin),
                        parseInt(operatorId),
-                        oriMessageId,
+                        oriMessageId
                    );
                    this.networkManager.emitEvent(groupRecallEvent)
-                        .catch(e => this.context.logger.logError('处理群消息撤回失败', e));
+                        .catch(e => this.context.logger.logError.bind(this.context.logger)('处理群消息撤回失败', e));
                }
            }
        }
--- a/src/onebot/network/active-http.ts
+++ b/src/onebot/network/active-http.ts
@@ -49,12 +49,12 @@ export class OB11ActiveHttpAdapter implements IOB11NetworkAdapter {
            try {
                this.obContext.apis.QuickActionApi
                    .handleQuickOperation(event as QuickActionEvent, resJson)
-                    .catch(this.logger.logError);
+                    .catch(this.logger.logError.bind(this.logger));
            } catch (e: any) {
-                this.logger.logError('[OneBot] [Http Client] 新消息事件HTTP上报返回快速操作失败', e);
+                this.logger.logError.bind(this.logger)('[OneBot] [Http Client] 新消息事件HTTP上报返回快速操作失败', e);
            }
        }).catch((e) => {
-            this.logger.logError('[OneBot] [Http Client] 新消息事件HTTP上报失败', e);
+            this.logger.logError.bind(this.logger)('[OneBot] [Http Client] 新消息事件HTTP上报失败', e);
        });
    }

--- a/src/onebot/network/active-websocket.ts
+++ b/src/onebot/network/active-websocket.ts
@@ -91,7 +91,7 @@ export class OB11ActiveWebSocketAdapter implements IOB11NetworkAdapter {
                try {
                    this.connectEvent(this.core);
                } catch (e) {
-                    this.logger.logError('[OneBot] [WebSocket Client] 发送连接生命周期失败', e);
+                    this.logger.logError.bind(this.logger)('[OneBot] [WebSocket Client] 发送连接生命周期失败', e);
                }

            });
@@ -100,8 +100,8 @@ export class OB11ActiveWebSocketAdapter implements IOB11NetworkAdapter {
            });
            this.connection.once('close', () => {
                if (!isClosedByError) {
-                    this.logger.logError(`[OneBot] [WebSocket Client] 反向WebSocket (${this.url}) 连接意外关闭`);
-                    this.logger.logError(`[OneBot] [WebSocket Client] 在 ${Math.floor(this.reconnectIntervalInMillis / 1000)} 秒后尝试重新连接`);
+                    this.logger.logError.bind(this.logger)(`[OneBot] [WebSocket Client] 反向WebSocket (${this.url}) 连接意外关闭`);
+                    this.logger.logError.bind(this.logger)(`[OneBot] [WebSocket Client] 在 ${Math.floor(this.reconnectIntervalInMillis / 1000)} 秒后尝试重新连接`);
                    if (!this.isClosed) {
                        this.connection = null;
                        setTimeout(() => this.tryConnect(), this.reconnectIntervalInMillis);
@@ -110,8 +110,8 @@ export class OB11ActiveWebSocketAdapter implements IOB11NetworkAdapter {
            });
            this.connection.on('error', (err) => {
                isClosedByError = true;
-                this.logger.logError(`[OneBot] [WebSocket Client] 反向WebSocket (${this.url}) 连接错误`, err);
-                this.logger.logError(`[OneBot] [WebSocket Client] 在 ${Math.floor(this.reconnectIntervalInMillis / 1000)} 秒后尝试重新连接`);
+                this.logger.logError.bind(this.logger)(`[OneBot] [WebSocket Client] 反向WebSocket (${this.url}) 连接错误`, err);
+                this.logger.logError.bind(this.logger)(`[OneBot] [WebSocket Client] 在 ${Math.floor(this.reconnectIntervalInMillis / 1000)} 秒后尝试重新连接`);
                if (!this.isClosed) {
                    this.connection = null;
                    setTimeout(() => this.tryConnect(), this.reconnectIntervalInMillis);
@@ -124,7 +124,7 @@ export class OB11ActiveWebSocketAdapter implements IOB11NetworkAdapter {
        try {
            this.checkStateAndReply<any>(new OB11LifeCycleEvent(core, LifeCycleSubType.CONNECT));
        } catch (e) {
-            this.logger.logError('[OneBot] [WebSocket Client] 发送生命周期失败', e);
+            this.logger.logError.bind(this.logger)('[OneBot] [WebSocket Client] 发送生命周期失败', e);
        }
    }

@@ -143,7 +143,7 @@ export class OB11ActiveWebSocketAdapter implements IOB11NetworkAdapter {
        receiveData.params = (receiveData?.params) ? receiveData.params : {};//兼容类型验证
        const action = this.actions.get(receiveData.action);
        if (!action) {
-            this.logger.logError('[OneBot] [WebSocket Client] 发生错误', '不支持的api ' + receiveData.action);
+            this.logger.logError.bind(this.logger)('[OneBot] [WebSocket Client] 发生错误', '不支持的api ' + receiveData.action);
            this.checkStateAndReply<any>(OB11Response.error('不支持的api ' + receiveData.action, 1404, echo));
            return;
        }
--- a/src/onebot/network/passive-websocket.ts
+++ b/src/onebot/network/passive-websocket.ts
@@ -55,7 +55,7 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {

            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);
+                this.handleMessage(wsClient, message).then().catch(this.logger.logError.bind(this.logger));
            });
            wsClient.on('ping', () => {
                wsClient.pong();
@@ -89,7 +89,7 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
        try {
            this.checkStateAndReply<any>(new OB11LifeCycleEvent(core, LifeCycleSubType.CONNECT), wsClient);
        } catch (e) {
-            this.logger.logError('[OneBot] [WebSocket Server] 发送生命周期失败', e);
+            this.logger.logError.bind(this.logger)('[OneBot] [WebSocket Server] 发送生命周期失败', e);
        }
    }

@@ -103,11 +103,11 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {

    open() {
        if (this.isOpen) {
-            this.logger.logError('[OneBot] [WebSocket Server] Cannot open a opened WebSocket server');
+            this.logger.logError.bind(this.logger)('[OneBot] [WebSocket Server] Cannot open a opened WebSocket server');
            return;
        }
        if (this.hasBeenClosed) {
-            this.logger.logError('[OneBot] [WebSocket Server] Cannot open a WebSocket server that has been closed');
+            this.logger.logError.bind(this.logger)('[OneBot] [WebSocket Server] Cannot open a WebSocket server that has been closed');
            return;
        }
        const addressInfo = this.wsServer.address();
@@ -170,7 +170,7 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
        receiveData.params = (receiveData?.params) ? receiveData.params : {};//兼容类型验证
        const action = this.actions.get(receiveData.action);
        if (!action) {
-            this.logger.logError('[OneBot] [WebSocket Client] 发生错误', '不支持的api ' + receiveData.action);
+            this.logger.logError.bind(this.logger)('[OneBot] [WebSocket Client] 发生错误', '不支持的api ' + receiveData.action);
            this.checkStateAndReply<any>(OB11Response.error('不支持的api ' + receiveData.action, 1404, echo), wsClient);
            return;
        }
--- a/src/shell/napcat.ts
+++ b/src/shell/napcat.ts
@@ -28,6 +28,7 @@ import { NapCatOneBot11Adapter } from '@/onebot';
 import { InitWebUi } from '@/webui';
 import { WebUiDataRuntime } from '@/webui/src/helper/Data';
 import { napCatVersion } from '@/common/version';
+import { NodeIO3MiscListener } from '@/core/listeners/NodeIO3MiscListener';

 program.option('-q, --qq [number]', 'QQ号').parse(process.argv);
 const cmdOptions = program.opts();
@@ -40,15 +41,19 @@ export async function NCoreInitShell() {
    const logger = new LogWrapper(pathWrapper.logsPath);
    const basicInfoWrapper = new QQBasicInfoWrapper({ logger });
    const wrapper = loadQQWrapper(basicInfoWrapper.getFullQQVesion());
+
+    const o3Service = wrapper.NodeIO3MiscService.get();
+    o3Service.addO3MiscListener(new NodeIO3MiscListener());
+
    logger.log(`[NapCat] [Core] NapCat.Core Version: ` + napCatVersion);
-    InitWebUi(logger, pathWrapper).then().catch(logger.logError);
+    InitWebUi(logger, pathWrapper).then().catch(logger.logError.bind(logger));

    // from constructor
    const engine = wrapper.NodeIQQNTWrapperEngine.get();
    //const util = wrapper.NodeQQNTWrapperUtil.get();
    const loginService = wrapper.NodeIKernelLoginService.get();
-    const session = wrapper.NodeIQQNTWrapperSession.create();

+    const session = wrapper.NodeIQQNTWrapperSession.create();
    // from get dataPath
    const [dataPath, dataPathGlobal] = (() => {
        if (os.platform() === 'darwin') {
@@ -66,15 +71,15 @@ export async function NCoreInitShell() {
    })();
    let systemPlatform = PlatformType.KWINDOWS;
    switch (os.platform()) {
-        case 'win32':
-            systemPlatform = PlatformType.KWINDOWS;
-            break;
-        case 'darwin':
-            systemPlatform = PlatformType.KMAC;
-            break;
-        case 'linux':
-            systemPlatform = PlatformType.KANDROID; //Android 怎么不算Linux!
-            break;
+    case 'win32':
+        systemPlatform = PlatformType.KWINDOWS;
+        break;
+    case 'darwin':
+        systemPlatform = PlatformType.KMAC;
+        break;
+    case 'linux':
+        systemPlatform = PlatformType.KLINUX;
+        break;
    }
    if (!basicInfoWrapper.QQVersionAppid || !basicInfoWrapper.QQVersionQua) throw new Error('QQVersionAppid or QQVersionQua  is not defined');
    // from initConfig
@@ -85,7 +90,7 @@ export async function NCoreInitShell() {
            app_type: 4,
            app_version: basicInfoWrapper.getFullQQVesion(),
            os_version: systemVersion,
-            use_xlog: true,
+            use_xlog: false,
            qua: basicInfoWrapper.QQVersionQua,
            global_path_config: {
                desktopGlobalPath: dataPathGlobal,
@@ -113,13 +118,14 @@ export async function NCoreInitShell() {
            quickLoginUin = '';
        }
    }
-
+    const dataTimestape = new Date().getTime().toString();
+    o3Service.reportAmgomWeather('login', 'a1', [dataTimestape, '0', '0']);
    const selfInfo = await new Promise<SelfInfo>((resolve) => {
        const loginListener = new NodeIKernelLoginListener();
        let isLogined = false;
        // from constructor
        loginListener.onUserLoggedIn = (userid: string) => {
-            logger.logError(`当前账号(${userid})已登录,无法重复登录`);
+            logger.logError.bind(logger)(`当前账号(${userid})已登录,无法重复登录`);
        };

        loginListener.onQRCodeLoginSucceed = async (loginResult) => {
@@ -153,9 +159,8 @@ export async function NCoreInitShell() {
            });
        };
        loginListener.onQRCodeSessionFailed = (errType: number, errCode: number, errMsg: string) => {
-            //logger.logError('登录失败(onQRCodeSessionFailed)', errCode, errMsg);
            if (!isLogined) {
-                logger.logError('[Core] [Login] Login Error,ErrCode: ', errCode, ' ErrMsg:', errMsg);
+                logger.logError.bind(logger)('[Core] [Login] Login Error,ErrCode: ', errCode, ' ErrMsg:', errMsg);
                if (errType == 1 && errCode == 3) {
                    // 二维码过期刷新
                }
@@ -163,14 +168,13 @@ export async function NCoreInitShell() {
            }
        };
        loginListener.onLoginFailed = (args) => {
-            //logger.logError('登录失败(onLoginFailed)', args);
-            logger.logError('[Core] [Login] Login Error , ErrInfo: ', args);
+            logger.logError.bind(logger)('[Core] [Login] Login Error , ErrInfo: ', args);
        };

        loginService.addKernelLoginListener(proxiedListenerOf(loginListener, logger) as any);
        const isConnect = loginService.connect();
        if (!isConnect) {
-            logger.logError('核心登录服务连接失败!');
+            logger.logError.bind(logger)('核心登录服务连接失败!');
            return;
        }
        logger.log('核心登录服务连接成功!');
@@ -179,18 +183,25 @@ export async function NCoreInitShell() {
            // 遍历 res.LocalLoginInfoList[x].isQuickLogin是否可以 res.LocalLoginInfoList[x].uin 转为string 加入string[] 最后遍历完成调用WebUiDataRuntime.setQQQuickLoginList
            WebUiDataRuntime.setQQQuickLoginList(res.LocalLoginInfoList.filter((item) => item.isQuickLogin).map((item) => item.uin.toString()));
        });
-
+        if (basicInfoWrapper.QQVersionConfig?.curVersion) {
+            loginService.getLoginMiscData('hotUpdateSign').then((res) => {
+                if (res.result === 0) {
+                    loginService.setLoginMiscData('hotUpdateSign', res.value);
+                }
+            });
+            session.getNodeMiscService().writeVersionToRegistry(basicInfoWrapper.QQVersionConfig?.curVersion);
+        }
        WebUiDataRuntime.setQuickLoginCall(async (uin: string) => {
            return await new Promise((resolve) => {
                if (uin) {
-                    logger.log('正在快速登录 ', uin);
+                    logger.log.bind(logger)('正在快速登录 ', uin);
                    loginService.quickLoginWithUin(uin).then(res => {
                        if (res.loginErrorInfo.errMsg) {
                            resolve({ result: false, message: res.loginErrorInfo.errMsg });
                        }
                        resolve({ result: true, message: '' });
                    }).catch((e) => {
-                        logger.logError(e);
+                        logger.logError.bind(logger)(e);
                        resolve({ result: false, message: '快速登录发生错误' });
                    });
                } else {
@@ -206,14 +217,14 @@ export async function NCoreInitShell() {
                    loginService.quickLoginWithUin(quickLoginUin)
                        .then(result => {
                            if (result.loginErrorInfo.errMsg) {
-                                logger.logError('快速登录错误：', result.loginErrorInfo.errMsg);
+                                logger.logError.bind(logger)('快速登录错误：', result.loginErrorInfo.errMsg);
                                if (!isLogined) loginService.getQRCodePicture();
                            }
                        })
                        .catch();
                }, 1000);
            } else {
-                logger.logError('快速登录失败，未找到该 QQ 历史登录记录，将使用二维码登录方式');
+                logger.logError.bind(logger)('快速登录失败，未找到该 QQ 历史登录记录，将使用二维码登录方式');
                if (!isLogined) loginService.getQRCodePicture();
            }
        } else {
@@ -222,18 +233,30 @@ export async function NCoreInitShell() {
                logger.log(`可用于快速登录的 QQ：\n${historyLoginList
                    .map((u, index) => `${index + 1}. ${u.uin} ${u.nickName}`)
                    .join('\n')
-                    }`);
+                }`);
            }
            loginService.getQRCodePicture();
        }
    });
    // BEFORE LOGGING IN
-
+    const amgomDataPiece = 'eb1fd6ac257461580dc7438eb099f23aae04ca679f4d88f53072dc56e3bb1129';
+    o3Service.setAmgomDataPiece(basicInfoWrapper.QQVersionAppid, new Uint8Array(Buffer.from(amgomDataPiece, 'hex')));
    // AFTER LOGGING IN
+    //99b15bdb4c984fc69d5aa1feb9aa16xx --> 99b15bdb-4c98-4fc6-9d5a-a1feb9aa16xx
+    //把guid从左向右转换为guid格式 loginService.getMachineGuid()

+    let guid = loginService.getMachineGuid();
+    guid = guid.slice(0, 8) + '-' + guid.slice(8, 12) + '-' + guid.slice(12, 16) + '-' + guid.slice(16, 20) + '-' + guid.slice(20);
+    //console.log('guid:', guid);
+    //NodeIO3MiscService/reportAmgomWeather  login a6 [ '1726748166943', '184', '329' ]
+    o3Service.reportAmgomWeather('login', 'a6', [dataTimestape, '184', '329']);
+    // if(session.getUnitedConfigService()){
+    //     session.getUnitedConfigService().fetchUnitedCommendConfig([]);
+    // }
    // from initSession
    await new Promise<void>(async (resolve, reject) => {
        const sessionConfig = await genSessionConfig(
+            guid,
            basicInfoWrapper.QQVersionAppid!,
            basicInfoWrapper.getFullQQVesion(),
            selfInfo.uin,
--- a/src/webui/index.ts
+++ b/src/webui/index.ts
@@ -54,7 +54,7 @@ export async function InitWebUi(logger: LogWrapper, pathWrapper: NapCatPathWrapp
        ).then((data) => {
            log(`[NapCat] [WebUi] WebUi Publish Panel Url: http://${data.IP.IP}:${config.port}${config.prefix}/webui/?token=${config.token}`);
        }).catch((err) => {
-            logger.logError(`[NapCat] [WebUi] Get Publish Panel Url Error: ${err}`);
+            logger.logError.bind(logger)(`[NapCat] [WebUi] Get Publish Panel Url Error: ${err}`);
        });

    });
--- a/src/webui/ui/NapCat.ts
+++ b/src/webui/ui/NapCat.ts
@@ -30,7 +30,7 @@ async function onSettingWindowCreated(view: Element) {
                SettingItem(
                    '<span id="napcat-update-title">Napcat</span>',
                    undefined,
-                    SettingButton('V2.6.4', 'napcat-update-button', 'secondary'),
+                    SettingButton('V2.6.20', 'napcat-update-button', 'secondary'),
                ),
            ]),
            SettingList([
--- a/static/assets/renderer.js
+++ b/static/assets/renderer.js
@@ -164,7 +164,7 @@ async function onSettingWindowCreated(view) {
        SettingItem(
          '<span id="napcat-update-title">Napcat</span>',
          void 0,
-          SettingButton("V2.6.4", "napcat-update-button", "secondary")
+          SettingButton("V2.6.20", "napcat-update-button", "secondary")
        )
      ]),
      SettingList([
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -41,6 +41,7 @@ const FrameworkBaseConfigPlugin: PluginOption[] = [
 const ShellBaseConfigPlugin: PluginOption[] = [
    cp({
        targets: [
+            { src: './src/native/external', dest: 'dist/native', flatten: false },
            { src: './static/', dest: 'dist/static/', flatten: false },
            { src: './src/core/external/napcat.json', dest: 'dist/config/' },
            { src: './src/onebot/config/onebot11.json', dest: 'dist/config/' },
Author	SHA1	Message	Date
手瓜一十雪	da90245f7b	release: v2.6.20	2024-09-30 17:05:02 +08:00
手瓜一十雪	410d6a85d7	fix: protobuf #417	2024-09-30 08:30:39 +08:00
手瓜一十雪	b693342e4f	fix	2024-09-30 08:18:02 +08:00
手瓜一十雪	acca361f2e	release: v2.6.18	2024-09-29 20:11:30 +08:00
手瓜一十雪	b663f47713	style: ScalarType	2024-09-29 20:10:14 +08:00
手瓜一十雪	d332b199b5	refactor: protobufjs给我似！	2024-09-29 20:06:11 +08:00
Alen	78bac1dbd1	Merge pull request #416 from cnxysoft/upmain fix: 28418下载HASH	2024-09-29 16:21:52 +08:00
Alen	724ff215f9	fix: 28418下载HASH	2024-09-29 16:20:01 +08:00
手瓜一十雪	68ea146469	release: v2.6.17	2024-09-29 13:07:52 +08:00
手瓜一十雪	82583e616f	fix: #415	2024-09-29 12:57:50 +08:00
手瓜一十雪	bfc339c58d	refactor: #415	2024-09-29 12:53:18 +08:00
手瓜一十雪	fe4427c076	feat: message字段返回 #415	2024-09-29 12:30:29 +08:00
手瓜一十雪	5745f388a9	feat: 简化代码 #415	2024-09-29 12:19:04 +08:00
手瓜一十雪	377e3c253f	feat: parseForward for array	2024-09-29 11:26:45 +08:00
手瓜一十雪	3007a0c00e	feat: nativeNode	2024-09-28 23:00:47 +08:00
手瓜一十雪	f51ffc091d	Merge pull request #410 from NapNeko/hook [Hook] NapcatNative	2024-09-28 21:38:04 +08:00
手瓜一十雪	c37c364a08	release: 2.6.16	2024-09-28 21:37:38 +08:00
手瓜一十雪	331a106e9a	Merge branch 'hook' of https://github.com/NapNeko/NapCatQQ into hook	2024-09-28 21:37:17 +08:00
手瓜一十雪	cd74687b7b	fix: getMsg	2024-09-28 21:36:54 +08:00
Alen	b3e145c1e6	fix: 解析增加字段	2024-09-28 21:29:18 +08:00
Alen	d8e1547736	Merge pull request #414 from NapNeko/hook_test fix: 撤回SEQ	2024-09-28 21:00:32 +08:00
Alen	8617f01924	fix: 撤回SEQ	2024-09-28 20:58:09 +08:00
手瓜一十雪	55f9e75e6a	Merge branch 'main' into hook	2024-09-28 20:17:02 +08:00
手瓜一十雪	b93e7b7ed1	feat: get pskey	2024-09-28 20:16:47 +08:00
手瓜一十雪	89cc79ad60	fix	2024-09-28 19:08:18 +08:00
手瓜一十雪	8dd0e60eea	fix	2024-09-28 19:04:11 +08:00
手瓜一十雪	df6113fdf6	fix:#如好	2024-09-28 17:38:26 +08:00
手瓜一十雪	3a3095d15a	feat:28418	2024-09-28 17:13:06 +08:00
手瓜一十雪	fb4d07391e	Hook: GroupRecall	2024-09-28 15:41:11 +08:00
手瓜一十雪	9bef9c85cf	fix	2024-09-28 15:36:25 +08:00
Alen	b77b3f227f	Merge pull request #411 from cnxysoft/upmain chore: qqnt.json增加linux版本	2024-09-28 14:25:42 +08:00
Alen	6a065f0a34	Merge branch 'main' into upmain	2024-09-28 14:22:10 +08:00
手瓜一十雪	4e1e190797	Merge pull request #409 from Zengfanqiang06/patch-1 Update README.md	2024-09-28 13:28:58 +08:00
手瓜一十雪	1ce8cd2100	napcat native	2024-09-28 13:27:13 +08:00
Alen	c03af6b9ad	Merge branch 'main' into upmain	2024-09-28 13:24:47 +08:00
Alen	adca850075	chore: 增加linux目标QQ版本配置	2024-09-28 13:20:19 +08:00
Qiao	e3616b484e	Update README.md 删除句号让其更统一（	2024-09-28 13:05:03 +08:00
手瓜一十雪	cfd7808169	Merge pull request #404 from NapNeko/dependabot/npm_and_yarn/types/express-5.0.0 chore(deps-dev): bump @types/express from 4.17.21 to 5.0.0	2024-09-27 17:08:57 +08:00
手瓜一十雪	addcedc588	Merge pull request #402 from NapNeko/v3 [Refactor] 推进版本重构	2024-09-27 16:47:48 +08:00
Alen	bfea786088	Merge pull request #405 from cnxysoft/upmain chore: Once去除LL默认config	2024-09-26 17:21:31 +08:00
手瓜一十雪	50e84c3c9e	Revert "feat: FrameWork调整" This reverts commit `652fe8d21e`.	2024-09-26 17:01:18 +08:00
手瓜一十雪	dc92ace85e	Revert "feat: 调整" This reverts commit `1a543928b1`.	2024-09-26 17:01:13 +08:00
手瓜一十雪	1a543928b1	feat: 调整	2024-09-26 16:33:04 +08:00
手瓜一十雪	652fe8d21e	feat: FrameWork调整	2024-09-26 16:22:21 +08:00
dependabot[bot]	199690f45f	chore(deps-dev): bump @types/express from 4.17.21 to 5.0.0 Bumps [@types/express](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/express) from 4.17.21 to 5.0.0. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/express) --- updated-dependencies: - dependency-name: "@types/express" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2024-09-26 08:20:36 +00:00
Alen	37a4dd4b00	chore: Once去除LL默认config	2024-09-26 16:16:46 +08:00
手瓜一十雪	34d4358bfc	feat: 依赖简化	2024-09-26 16:10:52 +08:00
手瓜一十雪	90906b9019	style: lint	2024-09-26 16:08:50 +08:00
手瓜一十雪	1c212ff2b4	feat: new	2024-09-26 15:54:24 +08:00
手瓜一十雪	7d709f44a8	fix: 调整逻辑	2024-09-26 15:37:07 +08:00
手瓜一十雪	ea9e88a18a	fix: 不可抗力	2024-09-26 15:31:50 +08:00
Alen	0be8a9c805	chore: 拉高目标QQ版本	2024-09-26 13:00:49 +08:00
手瓜一十雪	fcf8139afe	release: 2.6.15	2024-09-25 15:51:25 +08:00
手瓜一十雪	62f969b50b	feat: ver28327	2024-09-25 15:33:19 +08:00
Alen	6726062500	Merge pull request #397 from cnxysoft/upmain chore: 增加下载链接HASH	2024-09-24 13:45:59 +08:00
Alen	cf1f4bdcaf	chore: 增加下载链接HASH	2024-09-24 13:44:24 +08:00
手瓜一十雪	b09a14ad4e	fix	2024-09-23 16:52:35 +08:00
手瓜一十雪	1dc62c9ca3	release:2.6.14	2024-09-23 16:46:39 +08:00
手瓜一十雪	beaa89a2dc	release: v2.6.14	2024-09-23 16:42:34 +08:00
手瓜一十雪	f39a000b49	fix	2024-09-23 16:39:26 +08:00
手瓜一十雪	013a74fb14	fix2	2024-09-23 16:35:54 +08:00
手瓜一十雪	7c4964753b	release: 2.6.14	2024-09-23 16:33:02 +08:00
手瓜一十雪	8353533d60	v2.6.13	2024-09-23 15:52:40 +08:00
手瓜一十雪	c06df27424	feat: 修复空格与中文问题	2024-09-23 15:52:16 +08:00
手瓜一十雪	ad82919ddf	fix: 2.6.12	2024-09-23 09:35:08 +08:00
手瓜一十雪	44dbba17e1	rollup	2024-09-23 09:34:44 +08:00
手瓜一十雪	5ba110e1da	feat: bind	2024-09-22 16:59:45 +08:00
手瓜一十雪	b6e392fdb2	release: v2.6.11	2024-09-22 11:42:13 +08:00
手瓜一十雪	2280e83aa2	fix: type	2024-09-21 17:40:42 +08:00
手瓜一十雪	f49b94edb9	Merge pull request #392 from Fripine/feat/more-music-types feat: support more types of music cards	2024-09-21 15:00:59 +08:00
Fripine	2428a12221	chore	2024-09-21 12:30:05 +08:00
Fripine	9c353f3760	feat: support more types of music cards	2024-09-21 12:17:05 +08:00
手瓜一十雪	5b86d25d7f	Merge pull request #389 from Fripine/fix/FriendAdd fix: FriendAddNoticeEvent	2024-09-20 21:18:14 +08:00
Fripine	2b168e8bbc	fix: FriendAdd	2024-09-20 15:50:31 +08:00
手瓜一十雪	537db32847	Merge pull request #388 from NapNeko/revert-387-fix/friendAddEvent Revert "fix: 好友添加成功事件"	2024-09-20 15:36:32 +08:00
手瓜一十雪	498b7f9f2b	Revert "fix: 好友添加成功事件"	2024-09-20 14:33:52 +08:00
手瓜一十雪	9935568597	Merge pull request #387 from Fripine/fix/friendAddEvent fix: 好友添加成功事件	2024-09-20 13:00:13 +08:00
Fripine	467003af8c	chore	2024-09-20 10:24:19 +08:00
Fripine	4c9edcc47b	chore	2024-09-20 10:21:26 +08:00
Fripine	24bf9cf121	chore: 换一种方法	2024-09-20 10:17:30 +08:00
手瓜一十雪	e06f6f39a9	Merge pull request #386 from 123233513/main 增加处理消息段时的检查，过滤无效消息段。	2024-09-20 07:54:52 +08:00
123233513	98ee0c307b	Merge branch 'main' of https://github.com/123233513/NapCatQQ	2024-09-20 04:57:41 +08:00
Fripine	5e53ea0bc3	fix: cant emit FriendAddNoticeEvent	2024-09-20 04:38:09 +08:00
123233513	847d88ea77	Update msg.ts 处理消息段时的检查，过滤无效消息段。	2024-09-19 22:14:18 +08:00
123233513	d5046cc2b3	Merge branch 'main' of https://githubfast.com/123233513/NapCatQQ	2024-09-19 21:36:52 +08:00
123233513	3ad64b7cbb	增加处理消息段时的检查，过滤无效消息段。	2024-09-19 21:31:33 +08:00
手瓜一十雪	0dbfe8ca55	feat: 拦截不合法消息	2024-09-19 20:49:33 +08:00
手瓜一十雪	91b794d66d	release: 2.6.10	2024-09-19 20:45:09 +08:00
手瓜一十雪	0d65e1e314	release: 2.6.9	2024-09-18 21:52:16 +08:00
手瓜一十雪	2d8f58c6d8	feat: close xlog	2024-09-18 20:22:21 +08:00
手瓜一十雪	65888fa816	feat: close log	2024-09-18 20:18:35 +08:00
手瓜一十雪	857e882c6e	release: fk tx	2024-09-18 11:20:58 +08:00
手瓜一十雪	add2931834	remove: debug	2024-09-18 11:19:59 +08:00
手瓜一十雪	cdda5f45ee	refactor: guid fk tx	2024-09-18 11:19:29 +08:00
手瓜一十雪	5f73d6a913	feat: reportAmgomWeather a1 rnm tx	2024-09-18 11:01:12 +08:00
手瓜一十雪	0637882fbc	release: rnm tx	2024-09-18 10:53:37 +08:00
手瓜一十雪	3f785bab20	feat: NodeIO3MiscService	2024-09-18 10:44:35 +08:00
手瓜一十雪	a4ca89bdd6	fi: 2.6.4	2024-09-17 23:40:44 +08:00