release: olpush remove

feat: poke oidb.0xed3_1
release: v2.6.24
2024-10-11 23:06:18 +08:00 · 2024-10-10 19:04:29 +08:00 · 2024-10-09 20:50:00 +08:00 · 2024-10-09 20:14:42 +08:00 · 2024-10-09 14:12:13 +08:00 · 2024-10-08 14:26:03 +08:00
200 changed files with 2956 additions and 3982 deletions
@@ -17,5 +17,8 @@ charset = utf-8
 indent_style = space
 indent_size = 4

+[*.bat]
+charset = latin1
+
 # Unfortunately, EditorConfig doesn't support space configuration inside import braces directly.
 # You'll need to rely on your linter/formatter like ESLint or Prettier for that.
@@ -10,6 +10,7 @@ body:
        在提交新的 Bug 反馈前，请确保您：
        * 已经搜索了现有的 issues，并且没有找到可以解决您问题的方法
        * 不与现有的某一 issue 重复
+        * 不涉及[已经停止维护的特性](https://github.com/NapNeko/NapCatQQ?tab=readme-ov-file#挥别昨日)，例如 CQ 码
  - type: input
    id: system-version
    attributes:
@@ -78,4 +79,4 @@ body:
    attributes:
      label: OneBot 客户端运行日志
      description: 粘贴 OneBot 客户端的相关日志内容到此处
-      render: shell
+      render: shell
@@ -1,15 +1,11 @@
 name: "Build Action"
 on:
  workflow_dispatch:
-  push:
-    branches:
-      - main

 permissions: write-all

 jobs:
  Build-LiteLoader:
-    if: ${{ startsWith(github.event.head_commit.message, 'build:') }}
    runs-on: ubuntu-latest
    steps:
    - name: Clone Main Repository
@@ -37,7 +33,6 @@ jobs:
        name: NapCat.Framework
        path: dist
  Build-Shell:
-    if: ${{ startsWith(github.event.head_commit.message, 'build:') }}
    runs-on: ubuntu-latest
    steps:
        - name: Clone Main Repository
@@ -63,4 +58,4 @@ jobs:
          uses: actions/upload-artifact@v4
          with:
              name: NapCat.Shell
-              path: dist
+              path: dist
@@ -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
@@ -4,19 +4,23 @@

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

 ## 猫猫技能
- [x] **多种启动方式**：支持以无头、LiteLoader 插件、仅 QQ GUI 三种方式启动
- [x] **低占用**：无头模式占用资源极低，适合在服务器上运行
- [x] **超多接口**：在实现大部分Onebot接口上扩展了一套私有API
- [x] **WebUI**：自带 WebUI 支持，远程管理更加便捷
+- [x] **超高性能**：轻松数千群聊 独创消息队列
+- [x] **启动方式**：支持以无头、LiteLoader 插件、仅 QQ GUI 三种方式启动
+- [x] **覆盖平台**: 覆盖 Windows / Linux (可选 Docker) / Android Termux / MacOS
+- [x] **安装简单**: 支持一键脚本/程序自动部署/镜像部署等多种覆盖范围
+- [x] **超低占用**：无头模式占用资源极低，适合在服务器上运行
+- [x] **超多接口**：实现大部分 OneBot 和 go-cqhttp 接口，超多扩展 API
+- [x] **远程管理**：自带 WebUI 支持，远程管理更加便捷
+- [x] **扩展支持**：基于 MoeHoo 的Native 可实现发包与收包

 ## 使用猫猫

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

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

 ## 回家旅途
 [QQ Group](https://qm.qq.com/q/VfjAq5HIMS)
@@ -24,10 +28,12 @@ NapCatQQ (aka 猫猫框架) 是现代化的基于 NTQQ 的 Bot 协议端实现
 [Telegram Link](https://t.me/+nLZEnpne-pQ1OWFl)

 ## 猫猫朋友
-感谢 [LLOneBot](https://github.com/LLOneBot/LLOneBot) 提供初始版本基础
+感谢 [LLOneBot](https://github.com/LLOneBot/LLOneBot)

 感谢 [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持

+不过最最重要的 还是需要感谢屏幕前的你哦~
+
 ---

 ## 约法三章
@@ -0,0 +1,40 @@
+@echo off
+chcp 65001
+net session >nul 2>&1
+if %errorLevel% == 0 (
+    echo Administrator mode detected.
+) else (
+    echo Please run this script in administrator mode.
+    powershell -Command "Start-Process 'cmd.exe' -ArgumentList '/c cd /d \"%cd%\" && \"%~f0\" %1' -Verb runAs" 
+    exit
+)
+
+set NAPCAT_PATCH_PACKAGE=%cd%\qqnt.json
+set NAPCAT_LOAD_PATH=%cd%\loadNapCat.js
+set NAPCAT_INJECT_PATH=%cd%\NapCatWinBootHook.dll
+set NAPCAT_LAUNCHER_PATH=%cd%\NapCatWinBootMain.exe
+set NAPCAT_MAIN_PATH=%cd%\napcat.mjs
+:loop_read
+for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
+    set RetString=%%b
+    goto :napcat_boot
+)
+
+:napcat_boot
+for %%a in ("%RetString%") do (
+    set "pathWithoutUninstall=%%~dpa"
+)
+
+SET QQPath=%pathWithoutUninstall%QQ.exe
+
+if not exist "%QQpath%" (
+    echo provided QQ path is invalid: %QQpath%
+    pause
+    exit /b
+)
+set NAPCAT_MAIN_PATH=%NAPCAT_MAIN_PATH:\=/%
+echo (async () =^> {await import("file:///%NAPCAT_MAIN_PATH%")})() > "%NAPCAT_LOAD_PATH%"
+
+"%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" %1
+
+REM "%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" 123456
@@ -0,0 +1,39 @@
+@echo off
+chcp 65001
+net session >nul 2>&1
+if %errorLevel% == 0 (
+    echo Administrator mode detected.
+) else (
+    echo Please run this script in administrator mode.
+    powershell -Command "Start-Process 'wt.exe' -ArgumentList 'cmd /c cd /d \"%cd%\" && \"%~f0\" %1' -Verb runAs"
+    exit
+)
+
+set NAPCAT_PATCH_PACKAGE=%cd%\qqnt.json
+set NAPCAT_LOAD_PATH=%cd%\loadNapCat.js
+set NAPCAT_INJECT_PATH=%cd%\NapCatWinBootHook.dll
+set NAPCAT_LAUNCHER_PATH=%cd%\NapCatWinBootMain.exe
+set NAPCAT_MAIN_PATH=%cd%\napcat.mjs
+:loop_read
+for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
+    set RetString=%%b
+    goto :napcat_boot
+)
+
+:napcat_boot
+for %%a in ("%RetString%") do (
+    set "pathWithoutUninstall=%%~dpa"
+)
+
+SET QQPath=%pathWithoutUninstall%QQ.exe
+
+if not exist "%QQpath%" (
+    echo provided QQ path is invalid: %QQpath%
+    pause
+    exit /b
+)
+
+set NAPCAT_MAIN_PATH=%NAPCAT_MAIN_PATH:\=/%
+echo (async () =^> {await import("file:///%NAPCAT_MAIN_PATH%")})() > "%NAPCAT_LOAD_PATH%"
+
+"%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" %1
@@ -0,0 +1,5 @@
+const path = require('path');
+const CurrentPath = path.dirname(__filename);
+(async () => {
+    await import("file://" + path.join(CurrentPath, './napcat/napcat.mjs'));
+})();
@@ -0,0 +1,26 @@
+{
+  "name": "qq-chat",
+  "version": "9.9.15-28418",
+  "verHash": "206bfa62",
+  "linuxVersion": "3.2.12-28418",
+  "linuxVerHash": "0256c948",
+  "type": "module",
+  "private": true,
+  "description": "QQ",
+  "productName": "QQ",
+  "author": {
+    "name": "Tencent",
+    "email": "QQ-Team@tencent.com"
+  },
+  "homepage": "https://im.qq.com",
+  "sideEffects": true,
+  "bin": {
+    "qd": "externals/devtools/cli/index.js"
+  },
+  "main": "./loadNapCat.js",
+  "buildVersion": "28418",
+  "isPureShell": true,
+  "isByteCodeShell": true,
+  "platform": "win32",
+  "eleArch": "x64"
+}
@@ -0,0 +1,4 @@
+@echo off
+REM ./launcher.bat 123456
+REM ./launcher-win10.bat 123456
+REM 带有REM的为注释 删掉你需要的系统的那行REM这三个单词 修改QQ本脚本启动即可
@@ -4,7 +4,7 @@
  "name": "NapCatQQ",
  "slug": "NapCat.Framework",
  "description": "高性能的 OneBot 11 协议实现",
-  "version": "2.2.22",
+  "version": "2.6.26",
  "icon": "./logo.png",
  "authors": [
    {
@@ -1,65 +1,52 @@
-{
-  "name": "napcat",
-  "private": true,
-  "type": "module",
-  "version": "2.2.22",
-  "scripts": {
-    "build:framework": "vite build --mode framework",
-    "build:shell": "vite build --mode shell",
-    "build:webui": "cd ./src/webui && vite build",
-    "lint": "eslint --fix src/**/*.{js,ts}",
-    "depend": "cd dist && npm install --omit=dev"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.24.7",
-    "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-proposal-decorators": "^7.24.7",
-    "@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/figlet": "^1.5.8",
-    "@types/fluent-ffmpeg": "^2.1.24",
-    "@types/jest": "^29.5.12",
-    "@types/node": "^22.0.1",
-    "@types/qrcode-terminal": "^0.12.2",
-    "@types/ws": "^8.5.12",
-    "@typescript-eslint/eslint-plugin": "^8.3.0",
-    "@typescript-eslint/parser": "^8.3.0",
-    "eslint": "^8.57.0",
-    "eslint-import-resolver-typescript": "^3.6.1",
-    "eslint-plugin-import": "^2.29.1",
-    "i": "^0.3.7",
-    "javascript-obfuscator": "^4.1.0",
-    "rollup": "^4.13.2",
-    "rollup-plugin-dts": "^6.1.0",
-    "rollup-plugin-obfuscator": "^1.1.0",
-    "typescript": "^5.3.3",
-    "vite": "^5.2.6",
-    "vite-plugin-babel": "^1.2.0",
-    "vite-plugin-cp": "^4.0.8",
-    "vite-plugin-dts": "^3.8.2",
-    "vite-tsconfig-paths": "^4.3.2"
-  },
-  "dependencies": {
-    "ajv": "^8.13.0",
-    "async-mutex": "^0.5.0",
-    "chalk": "^5.3.0",
-    "commander": "^12.1.0",
-    "cors": "^2.8.5",
-    "express": "^5.0.0-beta.2",
-    "fast-xml-parser": "^4.3.6",
-    "file-type": "^19.0.0",
-    "fluent-ffmpeg": "^2.1.2",
-    "image-size": "^1.1.1",
-    "json-schema-to-ts": "^3.1.0",
-    "log4js": "^6.9.1",
-    "qrcode-terminal": "^0.12.0",
-    "silk-wasm": "^3.6.1",
-    "strtok3": "8.0.1",
-    "ws": "^8.18.0"
-  }
-}
+{
+  "name": "napcat",
+  "private": true,
+  "type": "module",
+  "version": "2.6.26",
+  "scripts": {
+    "build:framework": "vite build --mode framework",
+    "build:shell": "vite build --mode shell",
+    "build:webui": "cd ./src/webui && vite build",
+    "lint": "eslint --fix src/**/*.{js,ts}",
+    "depend": "cd dist && npm install --omit=dev"
+  },
+  "devDependencies": {
+    "@babel/preset-typescript": "^7.24.7",
+    "@log4js-node/log4js-api": "^1.0.2",
+    "@rollup/plugin-node-resolve": "^15.2.3",
+    "@rollup/plugin-typescript": "^11.1.6",
+    "@types/cors": "^2.8.17",
+    "@types/express": "^5.0.0",
+    "@types/fluent-ffmpeg": "^2.1.24",
+    "@types/node": "^22.0.1",
+    "@types/qrcode-terminal": "^0.12.2",
+    "@types/ws": "^8.5.12",
+    "@typescript-eslint/eslint-plugin": "^8.3.0",
+    "@typescript-eslint/parser": "^8.3.0",
+    "eslint": "^8.57.0",
+    "eslint-import-resolver-typescript": "^3.6.1",
+    "eslint-plugin-import": "^2.29.1",
+    "typescript": "^5.3.3",
+    "vite": "^5.2.6",
+    "vite-plugin-cp": "^4.0.8",
+    "vite-tsconfig-paths": "^4.3.2",
+    "@protobuf-ts/runtime": "^2.9.4",
+    "ajv": "^8.13.0",
+    "fast-xml-parser": "^4.3.6",
+    "chalk": "^5.3.0",
+    "commander": "^12.1.0",
+    "async-mutex": "^0.5.0",
+    "file-type": "^19.0.0",
+    "json-schema-to-ts": "^3.1.0",
+    "image-size": "^1.1.1",
+    "cors": "^2.8.5"
+  },
+  "dependencies": {
+    "qrcode-terminal": "^0.12.0",
+    "fluent-ffmpeg": "^2.1.2",
+    "express": "^5.0.0-beta.2",
+    "log4js": "^6.9.1",
+    "silk-wasm": "^3.6.1",
+    "ws": "^8.18.0"
+  }
+}
@@ -1,45 +0,0 @@
-# Dont Use This Script
-# 2024.7.3
-function Get-QQpath {
-    try {
-        $key = Get-ItemProperty -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ"
-        $uninstallString = $key.UninstallString
-        return [System.IO.Path]::GetDirectoryName($uninstallString) + "\QQ.exe"
-    }
-    catch {
-        throw "get QQ path error: $_"
-    }
-}
-function Select-QQPath {
-    Add-Type -AssemblyName System.Windows.Forms
-    [System.Windows.Forms.Application]::EnableVisualStyles()
-
-    $dialogTitle = "Select QQ.exe"
-
-    $filePicker = New-Object System.Windows.Forms.OpenFileDialog
-    $filePicker.Title = $dialogTitle
-    $filePicker.Filter = "Executable Files (*.exe)|*.exe|All Files (*.*)|*.*"
-    $filePicker.FilterIndex = 1
-    $null = $filePicker.ShowDialog()
-    if (-not ($filePicker.FileName)) {
-        throw "User did not select an .exe file."
-    }
-    return $filePicker.FileName
-}
-
-$params = $args -join " "
-Try {
-    $QQpath = Get-QQpath
-}
-Catch {
-    $QQpath = Select-QQPath
-}
-
-if (!(Test-Path $QQpath)) {
-    throw "provided QQ path is invalid: $QQpath"
-}
-
-$Bootfile = Join-Path $PSScriptRoot "napcat.mjs"
-$env:ELECTRON_RUN_AS_NODE = 1
-$commandInfo = Get-Command $QQpath -ErrorAction Stop
-Start-Process powershell -ArgumentList "-noexit", "-noprofile", "-command &{& chcp 65001;& '$($commandInfo.Path)' --enable-logging }"
@@ -1,90 +0,0 @@
-@echo off
-REM 检查当前会话是否具有管理员权限
-openfiles >nul 2>&1
-if %errorlevel% neq 0 (
-    REM 如果不是管理员，则重新启动脚本以管理员模式运行
-    echo 请求管理员权限...
-    powershell -Command "Start-Process cmd -ArgumentList '/c %~f0 %*' -Verb RunAs"
-    exit /b
-)
-
-REM 设置当前工作目录
-cd /d %~dp0
-
-REM 获取当前目录路径
-set currentPath=%cd%
-set currentPath=%currentPath:\=/%
-
-REM 生成JavaScript代码
-set "jsCode=(async () =^>await import('file:///%currentPath%/napcat.mjs'))();"
-
-REM 将JavaScript代码保存到文件中
-echo %jsCode% > loadScript.js
-echo JavaScript code has been generated and saved to loadScript.js
-
-REM 设置NAPCAT_PATH环境变量为 当前目录的loadScript.js地址
-set NAPCAT_PATH=%cd%\loadScript.js
-
-REM 获取QQ路径
-
-
-:loop_read
-for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
-    set RetString=%%b
-    goto :napcat_boot
-)
-
-:napcat_boot
-for %%a in (%RetString%) do (
-    set "pathWithoutUninstall=%%~dpa"
-)
-
-SET QQPath=%pathWithoutUninstall%QQ.exe
-
-REM 拿不到QQ路径则退出
-if not exist "%QQpath%" (
-    echo provided QQ path is invalid: %QQpath%
-    pause
-    exit /b
-)
-
-REM 收集dbghelp.dll路径和HASH信息
-set QQdir=%~dp0
-set oldDllPath=%QQdir%dbghelp.dll
-set newDllPath=%currentPath%\dbghelp.dll
-
-for /f "tokens=*" %%A in ('certutil -hashfile "%oldDllPath%" MD5') do (
-    if not defined oldDllHash set oldDllHash=%%A
-)
-for /f "tokens=*" %%A in ('certutil -hashfile "%newDllPath%" MD5') do (
-    if not defined newDllHash set newDllHash=%%A
-)
-
-REM 如果文件一致则跳过
-if "%oldDllHash%" neq "%newDllHash%" (
-    tasklist /fi "imagename eq QQ.exe" 2>nul | find /i "QQ.exe" >nul
-    if %errorlevel% equ 0 (
-        REM 文件占用则退出
-        echo dbghelp.dll is in use, cannot continue.
-    ) else (
-        REM 文件未占用则尝试覆盖
-        copy /y "%newDllPath%" "%oldDllPath%"
-        if %errorlevel% neq 0 (
-            echo Failed to copy dbghelp.dll
-            pause
-            exit /b
-        ) else (
-            echo dbghelp.dll has been copied to %QQdir%
-        )
-    )
-)
-
-REM 带参数启动QQ
-REM 判断wt是否存在，存在则通过wt启动，不存在则通过cmd启动
-REM %QQPath% --enable-logging  %*
-where wt >nul 2>nul
-if %errorlevel% equ 0 (
-    wt "cmd" /c "%QQPath%" --enable-logging  %* 
-) else (
-    "%QQPath%" --enable-logging  %*
-)
@@ -1,123 +0,0 @@
-# 检查当前会话是否具有管理员权限
-function Test-Administrator {
-    $user = [Security.Principal.WindowsIdentity]::GetCurrent()
-    (New-Object Security.Principal.WindowsPrincipal $user).IsInRole([Security.Principal.WindowsBuiltinRole]::Administrator)
-}
-
-if (-not (Test-Administrator)) {
-    # 如果不是管理员，则重新启动脚本以管理员模式运行
-    $scriptPath = $myInvocation.MyCommand.Path
-    if (-not $scriptPath) {
-        $scriptPath = $PSCommandPath
-    }
-    $newProcess = New-Object System.Diagnostics.ProcessStartInfo "powershell";
-    $newProcess.Arguments = "-File `"$scriptPath`" $args"
-    $newProcess.Verb = "runas";
-    [System.Diagnostics.Process]::Start($newProcess);
-    exit
-}
-
-function Get-QQpath {
-    try {
-        $key = Get-ItemProperty -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ"
-        $uninstallString = $key.UninstallString
-        return [System.IO.Path]::GetDirectoryName($uninstallString) + "\QQ.exe"
-    }
-    catch {
-        throw "get QQ path error: $_"
-    }
-}
-function Select-QQPath {
-    Add-Type -AssemblyName System.Windows.Forms
-    [System.Windows.Forms.Application]::EnableVisualStyles()
-
-    $dialogTitle = "Select QQ.exe"
-
-    $filePicker = New-Object System.Windows.Forms.OpenFileDialog
-    $filePicker.Title = $dialogTitle
-    $filePicker.Filter = "Executable Files (*.exe)|*.exe|All Files (*.*)|*.*"
-    $filePicker.FilterIndex = 1
-    $null = $filePicker.ShowDialog()
-    if (-not ($filePicker.FileName)) {
-        throw "User did not select an .exe file."
-    }
-    return $filePicker.FileName
-}
-
-# 设置当前工作目录
-$scriptDirectory = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
-Set-Location $scriptDirectory
-
-# 获取当前目录路径
-$currentPath = Get-Location
-
-# 替换\为/
-$currentPath = $currentPath -replace '\\', '/'
-
-# 生成JavaScript代码
-$jsCode = @"
-(async () => {
-    await import('file:///$currentPath/napcat.mjs');
-})();
-"@
-
-# 将JavaScript代码保存到文件中
-$jsFilePath = Join-Path $currentPath "loadScript.js"
-$jsCode | Out-File -FilePath $jsFilePath -Encoding UTF8
-
-Write-Output "JavaScript code has been generated and saved to $jsFilePath"
-# 设置NAPCAT_PATH环境变量为 当前目录的loadScript.js地址
-$env:NAPCAT_PATH = $jsFilePath
-
-$params = $args -join " "
-Try {
-    $QQpath = Get-QQpath
-}
-Catch {
-    $QQpath = Select-QQPath
-}
-# 拿不到QQ路径则退出
-if (!(Test-Path $QQpath)) {
-    Write-Output "provided QQ path is invalid: $QQpath"
-    Read-Host "Press any key to continue..."
-    exit
-}
-
-$commandInfo = Get-Command $QQpath -ErrorAction Stop
-
-# 收集dbghelp.dll路径和HASH信息
-$QQpath = Split-Path $QQpath
-$oldDllPath = Join-Path $QQpath "dbghelp.dll"
-$oldDllHash = Get-FileHash $oldDllPath -Algorithm MD5
-$newDllPath = Join-Path $currentPath "dbghelp.dll"
-$newDllHash = Get-FileHash $newDllPath -Algorithm MD5
-# 如果文件一致则跳过
-if ($oldDllHash.Hash -ne $newDllHash.Hash) {
-    $processes = Get-Process -Name QQ -ErrorAction SilentlyContinue
-    if ($processes) {
-        # 文件占用则退出
-        Write-Output "dbghelp.dll is in use by the following processes:"
-        $processes | ForEach-Object { Write-Output "$($_.Id) $($_.Name) $($_.Path)" }
-        Write-Output "dbghelp.dll is in use, cannot continue."
-        Read-Host "Press any key to continue..."
-        exit
-    } else {
-        # 文件未占用则尝试覆盖
-        try {
-            Copy-Item -Path "$newDllPath" -Destination "$oldDllPath" -Force
-            Write-Output "dbghelp.dll has been copied to $QQpath"
-        } catch {
-            Write-Output "Failed to copy dbghelp.dll: $_"
-            Read-Host "Press any key to continue..."
-            exit
-        }
-    }
-}
-
-# 带参数启动QQ
-try {
-    Start-Process powershell -ArgumentList '-noexit', '-noprofile', "-command &{& chcp 65001;& '$($commandInfo.Path)' --enable-logging $params}" -NoNewWindow -ErrorAction Stop
-} catch {
-    Write-Output "Failed to start process as administrator: $_"
-    Read-Host "Press any key to continue..."
-}
@@ -1,93 +0,0 @@
-@echo off
-REM 检查当前会话是否具有管理员权限
-openfiles >nul 2>&1
-if %errorlevel% neq 0 (
-    REM 如果不是管理员，则重新启动脚本以管理员模式运行
-    echo 请求管理员权限...
-    where wt >nul 2>nul
-    if %errorlevel% equ 0 (
-        powershell -Command "Start-Process cmd -ArgumentList ' /c %~f0 %*' -Verb RunAs"
-    ) else (
-        powershell -Command "Start-Process wt -ArgumentList 'cmd /c %~f0 %*' -Verb RunAs"
-    )
-
-    REM wt "cmd" /c  "%~f0 %*"
-    exit /b
-)
-
-REM 设置当前工作目录
-cd /d %~dp0
-
-REM 获取当前目录路径
-set currentPath=%cd%
-set currentPath=%currentPath:\=/%
-
-REM 生成JavaScript代码
-set "jsCode=(async () =^>await import('file:///%currentPath%/napcat.mjs'))();"
-
-REM 将JavaScript代码保存到文件中
-echo %jsCode% > loadScript.js
-echo JavaScript code has been generated and saved to loadScript.js
-
-REM 设置NAPCAT_PATH环境变量为 当前目录的loadScript.js地址
-set NAPCAT_PATH=%cd%\loadScript.js
-
-REM 获取QQ路径
-
-
-:loop_read
-for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
-    set RetString=%%b
-    goto :napcat_boot
-)
-
-:napcat_boot
-for %%a in (%RetString%) do (
-    set "pathWithoutUninstall=%%~dpa"
-)
-
-SET QQPath=%pathWithoutUninstall%QQ.exe
-
-REM 拿不到QQ路径则退出
-if not exist "%QQpath%" (
-    echo provided QQ path is invalid: %QQpath%
-    pause
-    exit /b
-)
-
-REM 收集dbghelp.dll路径和HASH信息
-set QQdir=%~dp0
-set oldDllPath=%QQdir%dbghelp.dll
-set newDllPath=%currentPath%\dbghelp.dll
-
-for /f "tokens=*" %%A in ('certutil -hashfile "%oldDllPath%" MD5') do (
-    if not defined oldDllHash set oldDllHash=%%A
-)
-for /f "tokens=*" %%A in ('certutil -hashfile "%newDllPath%" MD5') do (
-    if not defined newDllHash set newDllHash=%%A
-)
-
-REM 如果文件一致则跳过
-if "%oldDllHash%" neq "%newDllHash%" (
-    tasklist /fi "imagename eq QQ.exe" 2>nul | find /i "QQ.exe" >nul
-    if %errorlevel% equ 0 (
-        REM 文件占用则退出
-        echo dbghelp.dll is in use, cannot continue.
-    ) else (
-        REM 文件未占用则尝试覆盖
-        copy /y "%newDllPath%" "%oldDllPath%"
-        if %errorlevel% neq 0 (
-            echo Failed to copy dbghelp.dll
-            pause
-            exit /b
-        ) else (
-            echo dbghelp.dll has been copied to %QQdir%
-        )
-    )
-)
-
-REM 带参数启动QQ
-REM 判断wt是否存在，存在则通过wt启动，不存在则通过cmd启动
-REM %QQPath% --enable-logging  %*
-chcp 65001
-"%QQPath%" --enable-logging  %*
@@ -1,77 +0,0 @@
-@echo off
-REM Check if the script is running as administrator
-openfiles >nul 2>&1
-if %errorlevel% neq 0 (
-    REM If not, restart the script in administrator mode
-    echo Requesting administrator privileges...
-    powershell -Command "Start-Process cmd -ArgumentList '/c %~f0 %*' -Verb RunAs"
-    exit /b
-)
-
-cd /d %~dp0
-
-set currentPath=%cd%
-set currentPath=%currentPath:\=/%
-
-REM Generate JavaScript code
-set "jsCode=(async () =^>await import('file:///%currentPath%/napcat.mjs'))();"
-
-REM Save JavaScript code to a file
-echo %jsCode% > loadScript.js
-echo JavaScript code has been generated and saved to loadScript.js
-
-REM Set NAPCAT_PATH environment variable to the address of loadScript.js in the current directory
-set NAPCAT_PATH=%cd%\loadScript.js
-
-REM Get QQ path and cache it
-:loop_read
-for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
-    set "RetString=%%b"
-)
-
-set "pathWithoutUninstall=%RetString:Uninstall.exe=%"
-
-SET QQPath=%pathWithoutUninstall%QQ.exe
-echo %QQPath%>qq_path_cache.txt
-echo QQ path %QQPath% has been cached to qq_path_cache.txt
-
-REM Exit if QQ path is invalid
-if not exist "%QQpath%" (
-    echo provided QQ path is invalid: %QQpath%
-    pause
-    exit /b
-)
-
-REM Collect dbghelp.dll path and HASH information
-set QQdir=%~dp0
-set oldDllPath=%QQdir%dbghelp.dll
-set newDllPath=%currentPath%\dbghelp.dll
-
-for /f "tokens=*" %%A in ('certutil -hashfile "%oldDllPath%" MD5') do (
-    if not defined oldDllHash set oldDllHash=%%A
-)
-for /f "tokens=*" %%A in ('certutil -hashfile "%newDllPath%" MD5') do (
-    if not defined newDllHash set newDllHash=%%A
-)
-
-REM Compare the HASH of the old and new dbghelp.dll, and replace the old one if they are different
-if "%oldDllHash%" neq "%newDllHash%" (
-    tasklist /fi "imagename eq QQ.exe" 2>nul | find /i "QQ.exe" >nul
-    if %errorlevel% equ 0 (
-        REM If the file is in use, prompt the user to close QQ
-        echo dbghelp.dll is in use, please close QQ first.
-    ) else (
-        copy /y "%newDllPath%" "%oldDllPath%"
-        if %errorlevel% neq 0 (
-            echo Copy dbghelp.dll failed, please check and try again.
-            pause
-            exit /b
-        ) else (
-            echo dbghelp.dll has been updated.
-            echo Please run BootWay05_run.bat to start QQ.
-            echo If you update QQ in the future, please run BootWay05_init.bat again.
-            pause
-            exit /b
-        )
-    )
-)
@@ -1,10 +0,0 @@
-@echo off
-set /p QQPath=<qq_path_cache.txt
-echo QQ path %QQPath% has been read from qq_path_cache.txt
-echo If failed to start QQ, please try running this script in administrator mode.
-
-set NAPCAT_PATH=%cd%\loadScript.js
-
-REM Launch QQ.exe with params provided
-
-"%QQPath%" --enable-logging  %*
@@ -1,13 +0,0 @@
-@echo off
-
-chcp 65001
-
-set /p QQPath=<qq_path_cache.txt
-echo QQ path %QQPath% has been read from qq_path_cache.txt
-echo If failed to start QQ, please try running this script in administrator mode.
-
-set NAPCAT_PATH=%cd%\loadScript.js
-
-REM Launch QQ.exe with params provided
-
-"%QQPath%" --enable-logging  %*
@@ -1,66 +1,67 @@
-import fs from 'fs';
-import { encode, getDuration, getWavFileInfo, isSilk, isWav } from 'silk-wasm';
 import fsPromise from 'fs/promises';
 import path from 'node:path';
 import { randomUUID } from 'crypto';
 import { spawn } from 'node:child_process';
+import { encode, getDuration, getWavFileInfo, isSilk, isWav } from 'silk-wasm';
 import { LogWrapper } from './log';

-export async function encodeSilk(filePath: string, TEMP_DIR: string, logger: LogWrapper) {
-    async function guessDuration(pttPath: string) {
-        const pttFileInfo = await fsPromise.stat(pttPath);
-        let duration = pttFileInfo.size / 1024 / 3;  // 3kb/s
-        duration = Math.floor(duration);
-        duration = Math.max(1, duration);
-        logger.log('通过文件大小估算语音的时长:', duration);
-        return duration;
-    }
+const ALLOW_SAMPLE_RATE = [8000, 12000, 16000, 24000, 32000, 44100, 48000];
+const EXIT_CODES = [0, 255];
+const FFMPEG_PATH = process.env.FFMPEG_PATH || 'ffmpeg';

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

    getConfigPath(pathName: string | undefined): string {
-        const suffix = pathName ? `_${pathName}` : '';
-        const filename = `${this.name}${suffix}.json`;
-        return path.join(this.configPath, filename);
+        if (!pathName) {
+            const filename = `${this.name}.json`;
+            const mainPath = this.core.context.pathWrapper.binaryPath;
+            return path.join(mainPath, 'config', filename);
+        } else {
+            const filename = `${this.name}_${pathName}.json`;
+            return path.join(this.configPath, filename);
+        }
    }

    read(): T {
@@ -35,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 {
@@ -44,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;
        }
@@ -61,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);
        }
    }
 }
@@ -1,133 +0,0 @@
-import type { NodeIQQNTWrapperSession, WrapperNodeApi } from '@/core/wrapper';
-import EventEmitter from 'node:events';
-
-export type ListenerClassBase = Record<string, string>;
-
-export interface ListenerIBase {
-    // eslint-disable-next-line @typescript-eslint/no-misused-new
-    new(listener: any): ListenerClassBase;
-
-    [key: string]: any;
-}
-
-export class NTEventWrapperV2 extends EventEmitter {
-    private wrapperApi: WrapperNodeApi;
-    private wrapperSession: NodeIQQNTWrapperSession;
-    private listenerRefStorage = new Map<string, ListenerIBase>();
-
-    constructor(WrapperApi: WrapperNodeApi, WrapperSession: NodeIQQNTWrapperSession) {
-        super();
-        this.on('error', () => {
-        });
-        this.wrapperApi = WrapperApi;
-        this.wrapperSession = WrapperSession;
-    }
-
-    dispatcherListener(ListenerEvent: string, ...args: any[]) {
-        this.emit(ListenerEvent, ...args);
-    }
-
-    createProxyDispatch(ListenerMainName: string) {
-        const dispatcherListener = this.dispatcherListener.bind(this);
-        return new Proxy({}, {
-            get(_target: any, prop: any, _receiver: any) {
-                return (...args: any[]) => {
-                    dispatcherListener(ListenerMainName + '/' + prop, ...args);
-                };
-            },
-        });
-    }
-
-    async getOrInitListener<T>(listenerMainName: string): Promise<T> {
-        const ListenerType = this.wrapperApi[listenerMainName];
-        //获取NTQQ 外部 Listener包装
-        if (!ListenerType) throw new Error('Init Listener not found');
-        let Listener = this.listenerRefStorage.get(listenerMainName);
-        //判断是否已创建 创建则跳过
-        if (!Listener && ListenerType) {
-            Listener = new ListenerType(this.createProxyDispatch(listenerMainName));
-            if (!Listener) throw new Error('Init Listener failed');
-            //实例化NTQQ Listener外包装
-            const ServiceSubName = /^NodeIKernel(.*?)Listener$/.exec(listenerMainName)![1];
-            const Service = 'NodeIKernel' + ServiceSubName + 'Service/addKernel' + ServiceSubName + 'Listener';
-            const addfunc = this.createEventFunction<(listener: T) => number>(Service);
-            //添加Listener到NTQQ
-            addfunc!(Listener as T);
-            this.listenerRefStorage.set(listenerMainName, Listener);
-            //保存Listener实例
-        }
-        return Listener as T;
-    }
-
-    async createEventWithListener<EventType extends (...args: any) => any, ListenerType extends (...args: any) => any>
-    (
-        eventName: string,
-        listenerName: string,
-        waitTimes = 1,
-        timeout: number = 3000,
-        checker: (...args: Parameters<ListenerType>) => boolean,
-        ...eventArg: Parameters<EventType>
-    ) {
-        return new Promise<[EventRet: Awaited<ReturnType<EventType>>, ...Parameters<ListenerType>]>(async (resolve, reject) => {
-            const ListenerNameList = listenerName.split('/');
-            const ListenerMainName = ListenerNameList[0];
-            //const ListenerSubName = ListenerNameList[1];
-            this.getOrInitListener<ListenerType>(ListenerMainName);
-            let complete = 0;
-            const retData: Parameters<ListenerType> | undefined = undefined;
-            let retEvent: any = {};
-            const databack = () => {
-                if (complete == 0) {
-                    reject(new Error('Timeout: NTEvent EventName:' + eventName + ' ListenerName:' + listenerName + ' EventRet:\n' + JSON.stringify(retEvent, null, 4) + '\n'));
-                } else {
-                    resolve([retEvent as Awaited<ReturnType<EventType>>, ...retData!]);
-                }
-            };
-            const Timeouter = setTimeout(databack, timeout);
-            const callback = (...args: Parameters<ListenerType>) => {
-                if (checker(...args)) {
-                    complete++;
-                    if (complete >= waitTimes) {
-                        clearTimeout(Timeouter);
-                        this.removeListener(listenerName, callback);
-                        databack();
-                    }
-                }
-            };
-            this.on(listenerName, callback);
-            const EventFunc = this.createEventFunction<EventType>(eventName);
-            retEvent = await EventFunc!(...(eventArg as any[]));
-        });
-    }
-
-    private createEventFunction<T extends (...args: any) => any>(eventName: string): T | undefined {
-        const eventNameArr = eventName.split('/');
-        type eventType = {
-            [key: string]: () => { [key: string]: (...params: Parameters<T>) => Promise<ReturnType<T>> }
-        }
-        if (eventNameArr.length > 1) {
-            const serviceName = 'get' + eventNameArr[0].replace('NodeIKernel', '');
-            const eventName = eventNameArr[1];
-            //getNodeIKernelGroupListener,GroupService
-            //console.log('2', eventName);
-            const services = (this.wrapperSession as unknown as eventType)[serviceName]();
-            const event = services[eventName]
-                //重新绑定this
-                .bind(services);
-            if (event) {
-                return event as T;
-            }
-            return undefined;
-        }
-    }
-
-    async callEvent<EventType extends (...args: any[]) => Promise<any> | any>(
-        EventName = '', timeout: number = 3000, ...args: Parameters<EventType>) {
-        return new Promise<Awaited<ReturnType<EventType>>>((resolve) => {
-            const EventFunc = this.createEventFunction<EventType>(EventName);
-            EventFunc!(...args).then((retData: Awaited<ReturnType<EventType>> | PromiseLike<Awaited<ReturnType<EventType>>>) => resolve(retData));
-        });
-    }
-}
-
-//NTEvent2.0
@@ -236,7 +236,7 @@ export class NTEventWrapper {
                this.createListenerFunction(ListenerMainName);
                const eventFunction = this.createEventFunction(serviceAndMethod);
                retEvent = await eventFunction!(...(args));
-                if (!checkerEvent(retEvent)) {
+                if (!checkerEvent(retEvent) && timeoutRef.hasRef()) {
                    clearTimeout(timeoutRef);
                    reject(
                        new Error(
@@ -250,86 +250,8 @@ export class NTEventWrapper {
                        ),
                    );
                }
+
            },
        );
    }
-
-    /*
-    async callNormalEvent<
-        Service extends keyof ServiceNamingMapping,
-        ServiceMethod extends Exclude<keyof ServiceNamingMapping[Service], symbol>,
-        Listener extends keyof ListenerNamingMapping,
-        ListenerMethod extends Exclude<keyof ListenerNamingMapping[Listener], symbol>,
-        // eslint-disable-next-line
-        // @ts-ignore
-        EventType extends (...args: any) => any = ServiceNamingMapping[Service][ServiceMethod],
-        // eslint-disable-next-line
-        // @ts-ignore
-        ListenerType extends (...args: any) => any = ListenerNamingMapping[Listener][ListenerMethod]
-    >(
-        serviceAndMethod: `${Service}/${ServiceMethod}`,
-        listenerAndMethod: `${Listener}/${ListenerMethod}`,
-        waitTimes = 1,
-        timeout: number = 3000,
-        checker: (...args: Parameters<ListenerType>) => boolean,
-        ...args: Parameters<EventType>
-    ) {
-        return new Promise<[EventRet: Awaited<ReturnType<EventType>>, ...Parameters<ListenerType>]>(
-            async (resolve, reject) => {
-                const id = randomUUID();
-                let complete = 0;
-                let retData: Parameters<ListenerType> | undefined = undefined;
-                let retEvent: any = {};
-                const databack = () => {
-                    if (complete == 0) {
-                        reject(
-                            new Error(
-                                'Timeout: NTEvent EventName:' +
-                                serviceAndMethod +
-                                ' ListenerName:' +
-                                listenerAndMethod +
-                                ' EventRet:\n' +
-                                JSON.stringify(retEvent, null, 4) +
-                                '\n',
-                            ),
-                        );
-                    } else {
-                        resolve([retEvent as Awaited<ReturnType<EventType>>, ...retData!]);
-                    }
-                };
-
-                const ListenerNameList = listenerAndMethod.split('/');
-                const ListenerMainName = ListenerNameList[0];
-                const ListenerSubName = ListenerNameList[1];
-
-                const Timeouter = setTimeout(databack, timeout);
-
-                const eventCallbak = {
-                    timeout: timeout,
-                    createtime: Date.now(),
-                    checker: checker,
-                    func: (...args: any[]) => {
-                        complete++;
-                        //console.log('func', ...args);
-                        retData = args as Parameters<ListenerType>;
-                        if (complete >= waitTimes) {
-                            clearTimeout(Timeouter);
-                            databack();
-                        }
-                    },
-                };
-                if (!this.EventTask.get(ListenerMainName)) {
-                    this.EventTask.set(ListenerMainName, new Map());
-                }
-                if (!this.EventTask.get(ListenerMainName)?.get(ListenerSubName)) {
-                    this.EventTask.get(ListenerMainName)?.set(ListenerSubName, new Map());
-                }
-                this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.set(id, eventCallbak);
-                this.createListenerFunction(ListenerMainName);
-                const EventFunc = this.createEventFunction<EventType>(serviceAndMethod);
-                retEvent = await EventFunc!(...(args as any[]));
-            },
-        );
-    }
-     */
 }
@@ -123,7 +123,7 @@ export interface HttpDownloadOptions {
    headers?: Record<string, string> | string;
 }

-export async function httpDownload(options: string | HttpDownloadOptions): Promise<Buffer> {
+async function tryDownload(options: string | HttpDownloadOptions, useReferer: boolean = false): Promise<Response> {
    // const chunks: Buffer[] = [];
    let url: string;
    let headers: Record<string, string> = {
@@ -142,15 +142,26 @@ export async function httpDownload(options: string | HttpDownloadOptions): Promi
            }
        }
    }
+    if (useReferer && !headers['Referer']) {
+        headers['Referer'] = url;
+    }
    const fetchRes = await fetch(url, { headers }).catch((err) => {
        if (err.cause) {
            throw err.cause;
        }
        throw err;
    });
-    if (!fetchRes.ok) throw new Error(`下载文件失败: ${fetchRes.statusText}`);
+    return fetchRes;
+}

-    const blob = await fetchRes.blob();
+export async function httpDownload(options: string | HttpDownloadOptions): Promise<Buffer> {
+    const useReferer = typeof options === 'string';
+    let resp = await tryDownload(options);
+    if (resp.status === 403 && useReferer) {
+        resp = await tryDownload(options, true);
+    }
+    if (!resp.ok) throw new Error(`下载文件失败: ${resp.statusText}`);
+    const blob = await resp.blob();
    const buffer = await blob.arrayBuffer();
    return Buffer.from(buffer);
 }
@@ -160,8 +171,7 @@ type Uri2LocalRes = {
    errMsg: string,
    fileName: string,
    ext: string,
-    path: string,
-    isLocal: boolean
+    path: string
 }

 export async function checkFileV2(filePath: string) {
@@ -194,7 +204,6 @@ export async function checkUriType(Uri: string) {
        return undefined;
    }, Uri);
    if (LocalFileRet) return LocalFileRet;
-
    const OtherFileRet = await solveProblem((uri: string) => {
        //再判断是否是Http
        if (uri.startsWith('http://') || uri.startsWith('https://')) {
@@ -206,15 +215,19 @@ export async function checkUriType(Uri: string) {
        }
        if (uri.startsWith('file://')) {
            let filePath: string;
-            // await fs.copyFile(url.pathname, filePath);
            const pathname = decodeURIComponent(new URL(uri).pathname);
            if (process.platform === 'win32') {
                filePath = pathname.slice(1);
            } else {
                filePath = pathname;
            }
+
            return { Uri: filePath, Type: FileUriType.Local };
        }
+        if (uri.startsWith('data:')) {
+            const data = uri.split(',')[1];
+            if (data) return { Uri: data, Type: FileUriType.Base64 };
+        }
    }, Uri);
    if (OtherFileRet) return OtherFileRet;

@@ -224,34 +237,42 @@ export async function checkUriType(Uri: string) {
 export async function uri2local(dir: string, uri: string, filename: string | undefined = undefined): Promise<Uri2LocalRes> {
    const { Uri: HandledUri, Type: UriType } = await checkUriType(uri);
    //解析失败
+    const tempName = randomUUID();
+    if (!filename) filename = randomUUID();
+    //解析Http和Https协议

    if (UriType == FileUriType.Unknown) {
-        return { success: false, errMsg: '未知文件类型', fileName: '', ext: '', path: '', isLocal: false };
+        return { success: false, errMsg: '未知文件类型', fileName: '', ext: '', path: '' };
    }
    //解析File协议和本地文件
    if (UriType == FileUriType.Local) {
        const fileExt = path.extname(HandledUri);
-        const filename = path.basename(HandledUri, fileExt);
-        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: HandledUri, isLocal: true };
+        let filename = path.basename(HandledUri, fileExt);
+        filename += fileExt;
+        //复制文件到临时文件并保持后缀
+        const filenameTemp = tempName + fileExt;
+        const filePath = path.join(dir, filenameTemp);
+        fs.copyFileSync(HandledUri, filePath);
+        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: filePath };
    }
    //接下来都要有文件名
-    if (!filename) filename = randomUUID();
-    //解析Http和Https协议

    if (UriType == FileUriType.Remote) {
        const pathInfo = path.parse(decodeURIComponent(new URL(HandledUri).pathname));
        if (pathInfo.name) {
-            filename = pathInfo.name;
+            const pathlen = 200 - dir.length - pathInfo.name.length;
+            filename = pathlen > 0 ? pathInfo.name.substring(0, pathlen) : pathInfo.name.substring(pathInfo.name.length, pathInfo.name.length - 10);//过长截断
            if (pathInfo.ext) {
                filename += pathInfo.ext;
            }
        }
        filename = filename.replace(/[/\\:*?"<>|]/g, '_');
-        const fileExt = path.extname(HandledUri);
-        const filePath = path.join(dir, filename);
+        const fileExt = path.extname(HandledUri).replace(/[/\\:*?"<>|]/g, '_').substring(0, 10);
+        const filePath = path.join(dir, tempName + fileExt);
        const buffer = await httpDownload(HandledUri);
-        fs.writeFileSync(filePath, buffer);
-        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: filePath, isLocal: true };
+        //没有文件就创建
+        fs.writeFileSync(filePath, buffer, { flag: 'wx' });
+        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: filePath };
    }
    //解析Base64
    if (UriType == FileUriType.Base64) {
@@ -266,7 +287,7 @@ export async function uri2local(dir: string, uri: string, filename: string | und
            fileExt = ext;
            filename = filename + '.' + ext;
        }
-        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: filePath, isLocal: true };
+        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: filePath };
    }
-    return { success: false, errMsg: '未知文件类型', fileName: '', ext: '', path: '', isLocal: false };
+    return { success: false, errMsg: '未知文件类型', fileName: '', ext: '', path: '' };
 }
@@ -23,48 +23,78 @@ export async function solveAsyncProblem<T extends (...args: any[]) => Promise<an
        });
    });
 }
+
 export class FileNapCatOneBotUUID {
-    static encodeModelId(peer: Peer, modelId: string): string {
-        return `NapCatOneBot-ModeldFile-${peer.chatType}-${peer.peerUid}-${modelId}`;
+    static encodeModelId(peer: Peer, modelId: string, fileId: string, endString: string = ""): string {
+        const data = `NapCatOneBot|ModelIdFile|${peer.chatType}|${peer.peerUid}|${modelId}|${fileId}`;
+        //前四个字节塞data长度
+        const length = Buffer.alloc(4 + data.length);
+        length.writeUInt32BE(data.length * 2, 0);//储存data的hex长度
+        length.write(data, 4);
+        return length.toString('hex') + endString;
    }
+
    static decodeModelId(uuid: string): undefined | {
        peer: Peer,
-        modelId: string
+        modelId: string,
+        fileId: string
    } {
-        if (!uuid.startsWith('NapCatOneBot-ModeldFile-')) return undefined;
-        const data = uuid.split('-');
-        if (data.length !== 5) return undefined;
-        const [, , chatType, peerUid, modelId] = data;
+        //前四个字节是data长度
+        const length = Buffer.from(uuid.slice(0, 8), 'hex').readUInt32BE(0);
+        //根据length计算需要读取的长度
+        const dataId = uuid.slice(8, 8 + length);
+        //hex还原为string
+        const realData = Buffer.from(dataId, 'hex').toString();
+        if (!realData.startsWith('NapCatOneBot|ModelIdFile|')) return undefined;
+        const data = realData.split('|');
+        if (data.length !== 6) return undefined;
+        const [, , chatType, peerUid, modelId, fileId] = data;
        return {
            peer: {
                chatType: chatType as any,
-                peerUid: peerUid
+                peerUid: peerUid,
            },
            modelId,
+            fileId
        };
    }
-    static encode(peer: Peer, msgId: string, elementId: string): string {
-        return `NapCatOneBot-MsgFile-${peer.chatType}-${peer.peerUid}-${msgId}-${elementId}`;
+
+    static encode(peer: Peer, msgId: string, elementId: string, endString: string = ""): string {
+        const data = `NapCatOneBot|MsgFile|${peer.chatType}|${peer.peerUid}|${msgId}|${elementId}`;
+        //前四个字节塞data长度
+        //一个字节8位 一个ascii字符1字节 一个hex字符4位 表示一个ascii字符需要两个hex字符
+        const length = Buffer.alloc(4 + data.length);
+        length.writeUInt32BE(data.length * 2, 0);
+        length.write(data, 4);
+        return length.toString('hex') + endString;
    }
+
    static decode(uuid: string): undefined | {
        peer: Peer,
        msgId: string,
        elementId: string
    } {
-        if (!uuid.startsWith('NapCatOneBot-File-')) return undefined;
-        const data = uuid.split('-');
+        //前四个字节是data长度
+        const length = Buffer.from(uuid.slice(0, 8), 'hex').readUInt32BE(0);
+        //根据length计算需要读取的长度
+        const dataId = uuid.slice(8, 8 + length);
+        //hex还原为string
+        const realData = Buffer.from(dataId, 'hex').toString();
+        if (!realData.startsWith('NapCatOneBot|MsgFile|')) return undefined;
+        const data = realData.split('|');
        if (data.length !== 6) return undefined;
        const [, , chatType, peerUid, msgId, elementId] = data;
        return {
            peer: {
                chatType: chatType as any,
-                peerUid: peerUid
+                peerUid: peerUid,
            },
            msgId,
            elementId,
        };
    }
 }
+
 export function sleep(ms: number): Promise<void> {
    return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -133,26 +163,55 @@ export function isEqual(obj1: any, obj2: any) {
 export function getDefaultQQVersionConfigInfo(): QQVersionConfigType {
    if (os.platform() === 'linux') {
        return {
-            baseVersion: '3.2.12-27254',
-            curVersion: '3.2.12-27254',
+            baseVersion: '3.2.12.28060',
+            curVersion: '3.2.12.28060',
            prevVersion: '',
            onErrorVersions: [],
            buildId: '27254',
        };
    }
+    if (os.platform() === 'darwin') {
+        return {
+            baseVersion: '6.9.53.28060',
+            curVersion: '6.9.53.28060',
+            prevVersion: '',
+            onErrorVersions: [],
+            buildId: '28060',
+        };
+    }
    return {
-        baseVersion: '9.9.15-27391',
-        curVersion: '9.9.15-27391',
+        baseVersion: '9.9.15-28131',
+        curVersion: '9.9.15-28131',
        prevVersion: '',
        onErrorVersions: [],
-        buildId: '27391',
+        buildId: '28131',
    };
 }

+export function getQQPackageInfoPath(exePath: string = '', version?: string): string {
+    let packagePath;
+    if (os.platform() === 'darwin') {
+        packagePath = path.join(path.dirname(exePath), '..', 'Resources', 'app', 'package.json');
+    } else if (os.platform() === 'linux') {
+        packagePath = path.join(path.dirname(exePath), './resources/app/package.json');
+    } else {
+        packagePath = path.join(path.dirname(exePath), './versions/' + version + '/resources/app/package.json');
+    }
+    //下面是老版本兼容 未来去掉
+    if (!fs.existsSync(packagePath)) {
+        packagePath = path.join(path.dirname(exePath), './resources/app/versions/' + version + '/package.json');
+    }
+    return packagePath;
+}
+
 export function getQQVersionConfigPath(exePath: string = ''): string | undefined {
    let configVersionInfoPath;
-    if (os.platform() !== 'linux') {
-        configVersionInfoPath = path.join(path.dirname(exePath), 'resources', 'app', 'versions', 'config.json');
+    if (os.platform() === 'win32') {
+        configVersionInfoPath = path.join(path.dirname(exePath), 'versions', 'config.json');
+    } else if (os.platform() === 'darwin') {
+        const userPath = os.homedir();
+        const appDataPath = path.resolve(userPath, './Library/Application Support/QQ');
+        configVersionInfoPath = path.resolve(appDataPath, './versions/config.json');
    } else {
        const userPath = os.homedir();
        const appDataPath = path.resolve(userPath, './.config/QQ');
@@ -161,13 +220,18 @@ export function getQQVersionConfigPath(exePath: string = ''): string | undefined
    if (typeof configVersionInfoPath !== 'string') {
        return undefined;
    }
+    //老版本兼容 未来去掉
+    if (!fs.existsSync(configVersionInfoPath)) {
+        configVersionInfoPath = path.join(path.dirname(exePath), './resources/app/versions/config.json');
+    }
    if (!fs.existsSync(configVersionInfoPath)) {
        return undefined;
    }
    return configVersionInfoPath;
 }

-export function calcQQLevel(level: QQLevel) {
+export function calcQQLevel(level?: QQLevel) {
+    if (!level) return 0;
    const { crownNum, sunNum, moonNum, starNum } = level;
    return crownNum * 64 + sunNum * 16 + moonNum * 4 + starNum;
 }
@@ -139,9 +139,13 @@ export class LogWrapper {

    logMessage(msg: RawMessage, selfInfo: SelfInfo) {
        const isSelfSent = msg.senderUin === selfInfo.uin;
-        this.log(`${
-            isSelfSent ? '发送 ->' : '接收 <-'
-        } ${rawMessageToText(msg)}`);
+
+        // Intercept grey tip
+        if (msg.elements[0]?.elementType === ElementType.GreyTip) {
+            return;
+        }
+
+        this.log(`${isSelfSent ? '发送 ->' : '接收 <-' } ${rawMessageToText(msg)}`);
    }
 }

@@ -155,7 +159,12 @@ export function rawMessageToText(msg: RawMessage, recursiveLevel = 0): string {
    if (msg.chatType == ChatType.KCHATTYPEC2C) {
        tokens.push(`私聊 (${msg.peerUin})`);
    } else if (msg.chatType == ChatType.KCHATTYPEGROUP) {
-        tokens.push(`群聊 (群 ${msg.peerUin} 的 ${msg.senderUin})`);
+        if (recursiveLevel < 1) {
+            tokens.push(`群聊 [${msg.peerName}(${msg.peerUin})]`);
+        }
+        if (msg.senderUin !== '0') {
+            tokens.push(`[${msg.sendMemberName || msg.sendRemarkName || msg.sendNickName}(${msg.senderUin})]`);
+        }
    } else if (msg.chatType == ChatType.KCHATTYPEDATALINE) {
        tokens.push('移动设备');
    } else /* temp */ {
@@ -167,7 +176,8 @@ export function rawMessageToText(msg: RawMessage, recursiveLevel = 0): string {
    function msgElementToText(element: MessageElement) {
        if (element.textElement) {
            if (element.textElement.atType === AtType.notAt) {
-                return element.textElement.content;
+                const originalContentLines = element.textElement.content.split('\n');
+                return `${originalContentLines[0]}${originalContentLines.length > 1 ? ' ...' : ''}`;
            } else if (element.textElement.atType === AtType.atAll) {
                return `@全体成员`;
            } else if (element.textElement.atType === AtType.atUser) {
@@ -179,17 +189,16 @@ 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})`
            }]`;
        }

        if (element.picElement) {
-            return `[图片 ${element.picElement.fileName}]`;
+            return '[图片]';
        }

        if (element.fileElement) {
@@ -197,7 +206,7 @@ export function rawMessageToText(msg: RawMessage, recursiveLevel = 0): string {
        }

        if (element.videoElement) {
-            return `[视频 ${element.videoElement.fileName}]`;
+            return '[视频]';
        }

        if (element.pttElement) {
@@ -205,7 +214,7 @@ export function rawMessageToText(msg: RawMessage, recursiveLevel = 0): string {
        }

        if (element.arkElement) {
-            return `[卡片消息 ${element.arkElement.bytesData}]`;
+            return '[卡片消息]';
        }

        if (element.faceElement) {
@@ -213,19 +222,19 @@ export function rawMessageToText(msg: RawMessage, recursiveLevel = 0): string {
        }

        if (element.marketFaceElement) {
-            return `[商城表情 ${element.marketFaceElement.faceName}]`;
+            return element.marketFaceElement.faceName;
        }

        if (element.markdownElement) {
-            return `[Markdown ${element.markdownElement.content}]`;
+            return '[Markdown 消息]';
        }

        if (element.multiForwardMsgElement) {
-            return `[转发消息]`;
+            return '[转发消息]';
        }

        if (element.elementType === ElementType.GreyTip) {
-            return `[灰条消息]`; // TODO: resolve the text
+            return '[灰条消息]';
        }

        return `[未实现 (ElementType = ${element.elementType})]`;
@@ -1,6 +1,7 @@
 import path, { dirname } from 'path';
 import { fileURLToPath } from 'url';
 import fs from 'fs';
+import os from 'os';

 export class NapCatPathWrapper {
    binaryPath: string;
@@ -11,17 +12,23 @@ export class NapCatPathWrapper {

    constructor(mainPath: string = dirname(fileURLToPath(import.meta.url))) {
        this.binaryPath = mainPath;
-        this.logsPath = path.join(this.binaryPath, 'logs');
-        this.configPath = path.join(this.binaryPath, 'config');
-        this.cachePath = path.join(this.binaryPath, 'cache');
+        let writePath: string;
+        if (os.platform() === 'darwin') {
+            writePath = path.join(os.homedir(), 'Library', 'Application Support', 'QQ', 'NapCat');
+        } else {
+            writePath = this.binaryPath;
+        }
+        this.logsPath = path.join(writePath, 'logs');
+        this.configPath = path.join(writePath, 'config');
+        this.cachePath = path.join(writePath, 'cache');
        this.staticPath = path.join(this.binaryPath, 'static');
-        if (fs.existsSync(this.logsPath)) {
+        if (!fs.existsSync(this.logsPath)) {
            fs.mkdirSync(this.logsPath, { recursive: true });
        }
-        if (fs.existsSync(this.configPath)) {
+        if (!fs.existsSync(this.configPath)) {
            fs.mkdirSync(this.configPath, { recursive: true });
        }
-        if (fs.existsSync(this.cachePath)) {
+        if (!fs.existsSync(this.cachePath)) {
            fs.mkdirSync(this.cachePath, { recursive: true });
        }
    }
@@ -1,7 +1,6 @@
-import path from 'node:path';
 import fs from 'node:fs';
 import { systemPlatform } from '@/common/system';
-import { getDefaultQQVersionConfigInfo, getQQVersionConfigPath } from './helper';
+import { getDefaultQQVersionConfigInfo, getQQPackageInfoPath, getQQVersionConfigPath } from './helper';
 import AppidTable from '@/core/external/appid.json';
 import { LogWrapper } from './log';

@@ -20,14 +19,16 @@ export class QQBasicInfoWrapper {
        //基础目录获取
        this.context = context;
        this.QQMainPath = process.execPath;
-        this.QQPackageInfoPath = path.join(path.dirname(this.QQMainPath), 'resources', 'app', 'package.json');
        this.QQVersionConfigPath = getQQVersionConfigPath(this.QQMainPath);

+
        //基础信息获取 无快更则启用默认模板填充
        this.isQuickUpdate = !!this.QQVersionConfigPath;
        this.QQVersionConfig = this.isQuickUpdate
            ? JSON.parse(fs.readFileSync(this.QQVersionConfigPath!).toString())
            : getDefaultQQVersionConfigInfo();
+
+        this.QQPackageInfoPath = getQQPackageInfoPath(this.QQMainPath, this.QQVersionConfig?.curVersion);
        this.QQPackageInfo = JSON.parse(fs.readFileSync(this.QQPackageInfoPath).toString());
        const { appid: IQQVersionAppid, qua: IQQVersionQua } = this.getAppidV2();
        this.QQVersionAppid = IQQVersionAppid;
@@ -52,10 +53,22 @@ export class QQBasicInfoWrapper {
    }

    //此方法不要直接使用
-    getQUAInternal() {
-        return systemPlatform === 'linux'
-            ? `V1_LNX_NQ_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`
-            : `V1_WIN_NQ_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;
+    getQUAFallback() {
+        const platformMapping: Partial<Record<NodeJS.Platform, string>> = {
+            win32: `V1_WIN_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`,
+            darwin: `V1_MAC_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`,
+            linux: `V1_LNX_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`,
+        };
+        return platformMapping[systemPlatform] ?? (platformMapping.win32)!;
+    }
+
+    getAppIdFallback() {
+        const platformMapping: Partial<Record<NodeJS.Platform, string>> = {
+            win32: '537246092',
+            darwin: '537246140',
+            linux: '537246140',
+        };
+        return platformMapping[systemPlatform] ?? '537246092';
    }

    getAppidV2(): { appid: string; qua: string } {
@@ -71,6 +84,6 @@ export class QQBasicInfoWrapper {
        // else
        this.context.logger.log(`[QQ版本兼容性检测] 获取Appid异常 请检测NapCat/QQNT是否正常`);
        this.context.logger.log(`[QQ版本兼容性检测] ${fullVersion} 版本兼容性不佳，可能会导致一些功能无法正常使用`,);
-        return { appid: systemPlatform === 'linux' ? '537240795' : '537240709', qua: this.getQUAInternal() };
+        return { appid: this.getAppIdFallback(), qua: this.getQUAFallback() };
    }
 }
@@ -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();

@@ -1 +1 @@
-export const napCatVersion = '2.2.22';
+export const napCatVersion = '2.6.26';
@@ -16,7 +16,8 @@ export async function getVideoInfo(filePath: string, logger: LogWrapper) {
        filePath: string
    }>((resolve, reject) => {
        const ffmpegPath = process.env.FFMPEG_PATH;
-        ffmpegPath && ffmpeg.setFfmpegPath(ffmpegPath);
+        if (ffmpegPath)
+            ffmpeg.setFfmpegPath(ffmpegPath);
        ffmpeg(filePath).ffprobe((err: any, metadata: ffmpeg.FfprobeData) => {
            if (err) {
                reject(err);
@@ -1,9 +1,8 @@
+import { MsfChangeReasonType, MsfStatusType } from "../entities/adapter";
+
 export class NodeIDependsAdapter {
-    onMSFStatusChange(arg1: number, arg2: number) {
-        // console.log(arg1, arg2);
-        // if (arg1 == 2 && arg2 == 2) {
-        //   log("NapCat丢失网络连接,请检查网络")
-        // }
+    onMSFStatusChange(statusType: MsfStatusType, changeReasonType: MsfChangeReasonType) {
+
    }

    onMSFSsoError(args: unknown) {
@@ -10,7 +10,7 @@ export class NTQQCollectionApi {
    }

    async createCollection(authorUin: string, authorUid: string, authorName: string, brief: string, rawData: string) {
-        const param = {
+        return this.context.session.getCollectionService().createNewCollectionItem({
            commInfo: {
                bid: 1,
                category: 2,
@@ -43,12 +43,11 @@ export class NTQQCollectionApi {
                fileList: [],
            },
            need_share_url: false,
-        };
-        return this.context.session.getCollectionService().createNewCollectionItem(param);
+        });
    }

    async getAllCollection(category: number = 0, count: number = 50) {
-        const param = {
+        return this.context.session.getCollectionService().getCollectionItemList({
            category: category,
            groupId: -1,
            forceSync: true,
@@ -56,7 +55,6 @@ export class NTQQCollectionApi {
            timeStamp: '0',
            count: count,
            searchDown: true,
-        };
-        return this.context.session.getCollectionService().getCollectionItemList(param);
+        });
    }
 }
@@ -1,7 +1,4 @@
 import {
-    CacheFileListItem,
-    CacheFileType,
-    ChatCacheListItemBasic,
    ChatType,
    ElementType,
    IMAGE_HTTP_HOST,
@@ -17,7 +14,7 @@ import {
 import path from 'path';
 import fs from 'fs';
 import fsPromises from 'fs/promises';
-import { InstanceContext, NapCatCore } from '@/core';
+import { InstanceContext, NapCatCore, SearchResultItem } from '@/core';
 import * as fileType from 'file-type';
 import imageSize from 'image-size';
 import { ISizeCalculationResult } from 'image-size/dist/types/interface';
@@ -26,9 +23,8 @@ import { calculateFileMD5, isGIF } from '@/common/file';
 import pathLib from 'node:path';
 import { defaultVideoThumbB64, getVideoInfo } from '@/common/video';
 import ffmpeg from 'fluent-ffmpeg';
-import fsnormal from 'node:fs';
 import { encodeSilk } from '@/common/audio';
-
+import { MessageContext } from '@/onebot/api';

 export class NTQQFileApi {
    context: InstanceContext;
@@ -38,11 +34,7 @@ export class NTQQFileApi {
    constructor(context: InstanceContext, core: NapCatCore) {
        this.context = context;
        this.core = core;
-        this.rkeyManager = new RkeyManager('http://napcat-sign.wumiao.wang:2082/rkey', this.context.logger);
-    }
-
-    async getFileType(filePath: string) {
-        return fileType.fileTypeFromFile(filePath);
+        this.rkeyManager = new RkeyManager(['https://llob.linyuchen.net/rkey', 'http://napcat-sign.wumiao.wang:2082/rkey'], this.context.logger);
    }

    async copyFile(filePath: string, destPath: string) {
@@ -60,18 +52,15 @@ export class NTQQFileApi {
        })).urlResult.domainUrl;
    }

-    // 上传文件到QQ的文件夹
    async uploadFile(filePath: string, elementType: ElementType = ElementType.PIC, elementSubType: number = 0) {
-        // napCatCore.wrapper.util.
        const fileMd5 = await calculateFileMD5(filePath);
-        let ext: string = (await this.getFileType(filePath))?.ext as string || '';
-        if (ext) {
-            ext = '.' + ext;
-        }
+        const extOrEmpty = (await fileType.fileTypeFromFile(filePath))?.ext;
+        const ext = extOrEmpty ? `.${extOrEmpty}` : '';
        let fileName = `${path.basename(filePath)}`;
        if (fileName.indexOf('.') === -1) {
            fileName += ext;
        }
+
        const mediaPath = this.context.session.getMsgService().getRichMediaFilePathForGuild({
            md5HexStr: fileMd5,
            fileName: fileName,
@@ -82,7 +71,8 @@ export class NTQQFileApi {
            downloadType: 1,
            file_uuid: '',
        });
-        await this.copyFile(filePath, mediaPath!);
+
+        await this.copyFile(filePath, mediaPath);
        const fileSize = await this.getFileSize(filePath);
        return {
            md5: fileMd5,
@@ -93,11 +83,7 @@ export class NTQQFileApi {
        };
    }

-    async createValidSendFileElement(
-        filePath: string,
-        fileName: string = '',
-        folderId: string = '',
-    ): Promise<SendFileElement> {
+    async createValidSendFileElement(context: MessageContext, filePath: string, fileName: string = '', folderId: string = '',): Promise<SendFileElement> {
        const {
            fileName: _fileName,
            path,
@@ -106,6 +92,7 @@ export class NTQQFileApi {
        if (fileSize === 0) {
            throw new Error('文件异常，大小为0');
        }
+        context.deleteAfterSentFiles.push(path);
        return {
            elementType: ElementType.FILE,
            elementId: '',
@@ -118,73 +105,70 @@ export class NTQQFileApi {
        };
    }

-    async createValidSendPicElement(
-        picPath: string,
-        summary: string = '',
-        subType: 0 | 1 = 0,
-    ): Promise<SendPicElement> {
-        const {
-            md5,
-            fileName,
-            path,
-            fileSize,
-        } = await this.core.apis.FileApi.uploadFile(picPath, ElementType.PIC, subType);
+    async createValidSendPicElement(context: MessageContext, picPath: string, summary: string = '', subType: 0 | 1 = 0,): Promise<SendPicElement> {
+        const { md5, fileName, path, fileSize } = await this.core.apis.FileApi.uploadFile(picPath, ElementType.PIC, subType);
        if (fileSize === 0) {
            throw new Error('文件异常，大小为0');
        }
        const imageSize = await this.core.apis.FileApi.getImageSize(picPath);
-        const picElement: any = {
-            md5HexStr: md5,
-            fileSize: fileSize.toString(),
-            picWidth: imageSize?.width,
-            picHeight: imageSize?.height,
-            fileName: fileName,
-            sourcePath: path,
-            original: true,
-            picType: isGIF(picPath) ? PicType.gif : PicType.jpg,
-            picSubType: subType,
-            fileUuid: '',
-            fileSubId: '',
-            thumbFileSize: 0,
-            summary,
-        };
+        context.deleteAfterSentFiles.push(path);
        return {
            elementType: ElementType.PIC,
            elementId: '',
-            picElement,
+            picElement: {
+                md5HexStr: md5,
+                fileSize: fileSize.toString(),
+                picWidth: imageSize.width,
+                picHeight: imageSize.height,
+                fileName: fileName,
+                sourcePath: path,
+                original: true,
+                picType: isGIF(picPath) ? PicType.gif : PicType.jpg,
+                picSubType: subType,
+                fileUuid: '',
+                fileSubId: '',
+                thumbFileSize: 0,
+                summary,
+            } as PicElement,
        };
    }

-    async createValidSendVideoElement(
-        filePath: string,
-        fileName: string = '',
-        diyThumbPath: string = '',
-    ): Promise<SendVideoElement> {
+    async createValidSendVideoElement(context: MessageContext, filePath: string, fileName: string = '', diyThumbPath: string = ''): Promise<SendVideoElement> {
        const logger = this.core.context.logger;
-        const {
-            fileName: _fileName,
-            path,
-            fileSize,
-            md5,
-        } = await this.core.apis.FileApi.uploadFile(filePath, ElementType.VIDEO);
-        if (fileSize === 0) {
-            throw new Error('文件异常，大小为0');
-        }
-        let thumb = path.replace(`${pathLib.sep}Ori${pathLib.sep}`, `${pathLib.sep}Thumb${pathLib.sep}`);
-        thumb = pathLib.dirname(thumb);
        let videoInfo = {
            width: 1920, height: 1080,
            time: 15,
            format: 'mp4',
-            size: fileSize,
+            size: 0,
            filePath,
        };
        try {
-            videoInfo = await getVideoInfo(path, logger);
+            videoInfo = await getVideoInfo(filePath, logger);
        } catch (e) {
-            logger.logError('获取视频信息失败', e);
+            logger.logError.bind(logger)('获取视频信息失败，将使用默认值', e);
        }
-        const createThumb = new Promise<string | undefined>((resolve, reject) => {
+
+        let fileExt = 'mp4';
+        try {
+            const tempExt = (await fileType.fileTypeFromFile(filePath))?.ext;
+            if (tempExt) fileExt = tempExt;
+        } catch (e) {
+            this.context.logger.logError.bind(logger)('获取文件类型失败', e);
+        }
+        const newFilePath = filePath + '.' + fileExt;
+        fs.copyFileSync(filePath, newFilePath);
+        context.deleteAfterSentFiles.push(newFilePath);
+        filePath = newFilePath;
+        const { fileName: _fileName, path, fileSize, md5 } = await this.core.apis.FileApi.uploadFile(filePath, ElementType.VIDEO);
+        if (fileSize === 0) {
+            throw new Error('文件异常，大小为0');
+        }
+        videoInfo.size = fileSize;
+        let thumb = path.replace(`${pathLib.sep}Ori${pathLib.sep}`, `${pathLib.sep}Thumb${pathLib.sep}`);
+        thumb = pathLib.dirname(thumb);
+
+        const thumbPath = new Map();
+        const _thumbPath = await new Promise<string | undefined>((resolve, reject) => {
            const thumbFileName = `${md5}_0.png`;
            const thumbPath = pathLib.join(thumb, thumbFileName);
            ffmpeg(filePath)
@@ -195,7 +179,7 @@ export class NTQQFileApi {
                            resolve(thumbPath);
                        }).catch(reject);
                    } else {
-                        fsnormal.writeFileSync(thumbPath, Buffer.from(defaultVideoThumbB64, 'base64'));
+                        fs.writeFileSync(thumbPath, Buffer.from(defaultVideoThumbB64, 'base64'));
                        resolve(thumbPath);
                    }
                })
@@ -204,36 +188,21 @@ export class NTQQFileApi {
                    filename: thumbFileName,
                    folder: thumb,
                    size: videoInfo.width + 'x' + videoInfo.height,
-                }).on('end', () => {
+                })
+                .on('end', () => {
                    resolve(thumbPath);
                });
        });
-        const thumbPath = new Map();
-        const _thumbPath = await createThumb;
        const thumbSize = _thumbPath ? (await fsPromises.stat(_thumbPath)).size : 0;
-        // log("生成缩略图", _thumbPath)
        thumbPath.set(0, _thumbPath);
        const thumbMd5 = _thumbPath ? await calculateFileMD5(_thumbPath) : '';
-        // "fileElement": {
-        //     "fileMd5": "",
-        //     "fileName": "1.mp4",
-        //     "filePath": "C:\\Users\\nanae\\OneDrive\\Desktop\\1.mp4",
-        //     "fileSize": "1847007",
-        //     "picHeight": 1280,
-        //     "picWidth": 720,
-        //     "picThumbPath": {},
-        //     "file10MMd5": "",
-        //     "fileSha": "",
-        //     "fileSha3": "",
-        //     "fileUuid": "",
-        //     "fileSubId": "",
-        //     "thumbFileSize": 750
-        // }
+        context.deleteAfterSentFiles.push(path);
+        const uploadName = (fileName || _fileName).toLocaleLowerCase().endsWith('.' + fileExt.toLocaleLowerCase()) ? (fileName || _fileName) : (fileName || _fileName) + '.' + fileExt;
        return {
            elementType: ElementType.VIDEO,
            elementId: '',
            videoElement: {
-                fileName: fileName || _fileName,
+                fileName: uploadName,
                filePath: path,
                videoMd5: md5,
                thumbMd5,
@@ -243,28 +212,12 @@ export class NTQQFileApi {
                thumbWidth: videoInfo.width,
                thumbHeight: videoInfo.height,
                fileSize: '' + fileSize,
-                // fileFormat: videotype
-                // fileUuid: "",
-                // transferStatus: 0,
-                // progress: 0,
-                // invalidState: 0,
-                // fileSubId: "",
-                // fileBizId: null,
-                // originVideoMd5: "",
-                // fileFormat: 2,
-                // import_rich_media_context: null,
-                // sourceVideoCodecFormat: 2
            },
        };
    }

    async createValidSendPttElement(pttPath: string): Promise<SendPttElement> {
-        const {
-            converted,
-            path: silkPath,
-            duration,
-        } = await encodeSilk(pttPath, this.core.NapCatTempPath, this.core.context.logger);
-        // 生成语音 Path: silkPath Time: duration
+        const { converted, path: silkPath, duration } = await encodeSilk(pttPath, this.core.NapCatTempPath, this.core.context.logger);
        if (!silkPath) {
            throw new Error('语音转换失败, 请检查语音文件是否正常');
        }
@@ -273,7 +226,9 @@ export class NTQQFileApi {
            throw new Error('文件异常，大小为0');
        }
        if (converted) {
-            fsPromises.unlink(silkPath);
+            fsPromises.unlink(silkPath).then().catch(
+                (e) => this.context.logger.logError.bind(this.context.logger)('删除临时文件失败', e)
+            );
        }
        return {
            elementType: ElementType.PTT,
@@ -283,7 +238,6 @@ export class NTQQFileApi {
                filePath: path,
                md5HexStr: md5,
                fileSize: fileSize,
-                // duration: Math.max(1, Math.round(fileSize / 1024 / 3)), // 一秒钟大概是3kb大小, 小于1秒的按1秒算
                duration: duration ?? 1,
                formatType: 1,
                voiceType: 1,
@@ -299,14 +253,11 @@ export class NTQQFileApi {
        };
    }

-    async downloadMediaByUuid() {
-        //napCatCore.session.getRichMediaService().downloadFileForFileUuid();
-    }
-    async downloadFileForModelId(peer: Peer, modelId: string, timeout = 1000 * 60 * 2) {
+    async downloadFileForModelId(peer: Peer, modelId: string, unknown: string, timeout = 1000 * 60 * 2) {
        const [, fileTransNotifyInfo] = await this.core.eventWrapper.callNormalEventV2(
            'NodeIKernelRichMediaService/downloadFileForModelId',
            'NodeIKernelMsgListener/onRichMediaDownloadComplete',
-            [peer, [modelId]],
+            [peer, [modelId], unknown],
            () => true,
            (arg) => arg?.commonFileInfo?.fileModelId === modelId,
            1,
@@ -314,8 +265,8 @@ export class NTQQFileApi {
        );
        return fileTransNotifyInfo.filePath;
    }
+
    async downloadMedia(msgId: string, chatType: ChatType, peerUid: string, elementId: string, thumbPath: string, sourcePath: string, timeout = 1000 * 60 * 2, force: boolean = false) {
-        //logDebug('receive downloadMedia task', msgId, chatType, peerUid, elementId, thumbPath, sourcePath, timeout, force);
        // 用于下载收到的消息中的图片等
        if (sourcePath && fs.existsSync(sourcePath)) {
            if (force) {
@@ -328,7 +279,7 @@ export class NTQQFileApi {
                return sourcePath;
            }
        }
-        const [, fileTransNotifyInfo] = await this.core.eventWrapper.callNormalEventV2(
+        const [, completeRetData] = await this.core.eventWrapper.callNormalEventV2(
            'NodeIKernelMsgService/downloadRichMedia',
            'NodeIKernelMsgListener/onRichMediaDownloadComplete',
            [{
@@ -348,196 +299,111 @@ export class NTQQFileApi {
            1,
            timeout,
        );
-        const msg = await this.core.apis.MsgApi.getMsgsByMsgId({
-            guildId: '',
-            chatType: chatType,
-            peerUid: peerUid,
-        }, [msgId]);
-        if (msg.msgList.length === 0) {
-            return fileTransNotifyInfo.filePath;
-        }
-        //获取原始消息
-        const FileElements = msg?.msgList[0]?.elements?.find(e => e.elementId === elementId);
-        if (!FileElements) {
-            //失败则就乱来 Todo
-            return fileTransNotifyInfo.filePath;
-        }
-        //从原始消息获取文件路径
-        return FileElements?.fileElement?.filePath ??
-            FileElements?.pttElement?.filePath ??
-            FileElements?.videoElement?.filePath ??
-            FileElements?.picElement?.sourcePath;
+        return completeRetData.filePath;
    }

-    async getImageSize(filePath: string): Promise<ISizeCalculationResult | undefined> {
+    async getImageSize(filePath: string): Promise<ISizeCalculationResult> {
        return new Promise((resolve, reject) => {
            imageSize(filePath, (err, dimensions) => {
                if (err) {
                    reject(err);
                } else {
-                    resolve(dimensions);
+                    if (!dimensions) {
+                        reject(new Error('获取图片尺寸失败'));
+                    } else {
+                        resolve(dimensions);
+                    }
                }
            });
        });
    }

-    async addFileCache(peer: Peer, msgId: string, msgSeq: string, senderUid: string, elemId: string, elemType: string, fileSize: string, fileName: string) {
-        let GroupData;
-        let BuddyData;
-        if (peer.chatType === ChatType.KCHATTYPEGROUP) {
-            GroupData =
-                [{
-                    groupCode: peer.peerUid,
-                    isConf: false,
-                    hasModifyConfGroupFace: true,
-                    hasModifyConfGroupName: true,
-                    groupName: 'NapCat.Cached',
-                    remark: 'NapCat.Cached',
-                }];
-        } else if (peer.chatType === ChatType.KCHATTYPEC2C) {
-            BuddyData = [{
-                category_name: 'NapCat.Cached',
-                peerUid: peer.peerUid,
-                peerUin: peer.peerUid,
-                remark: 'NapCat.Cached',
-            }];
-        } else {
-            return undefined;
-        }
-
-        return this.context.session.getSearchService().addSearchHistory({
-            type: 4,
-            contactList: [],
-            id: -1,
-            groupInfos: [],
-            msgs: [],
-            fileInfos: [
-                {
-                    chatType: peer.chatType,
-                    buddyChatInfo: BuddyData || [],
-                    discussChatInfo: [],
-                    groupChatInfo: GroupData || [],
-                    dataLineChatInfo: [],
-                    tmpChatInfo: [],
-                    msgId: msgId,
-                    msgSeq: msgSeq,
-                    msgTime: Math.floor(Date.now() / 1000).toString(),
-                    senderUid: senderUid,
-                    senderNick: 'NapCat.Cached',
-                    senderRemark: 'NapCat.Cached',
-                    senderCard: 'NapCat.Cached',
-                    elemId: elemId,
-                    elemType: elemType,
-                    fileSize: fileSize,
-                    filePath: '',
-                    fileName: fileName,
-                    hits: [{
-                        start: 12,
-                        end: 14,
-                    }],
-                },
+    async searchForFile(keys: string[]): Promise<SearchResultItem | undefined> {
+        const randomResultId = 100000 + Math.floor(Math.random() * 10000);
+        let searchId = 0;
+        const [, searchResult] = await this.core.eventWrapper.callNormalEventV2(
+            'NodeIKernelFileAssistantService/searchFile',
+            'NodeIKernelFileAssistantListener/onFileSearch',
+            [
+                keys,
+                { resultType: 2, pageLimit: 1 },
+                randomResultId,
            ],
-        });
+            (ret) => {
+                searchId = ret;
+                return true;
+            },
+            result => result.searchId === searchId && result.resultId === randomResultId,
+        );
+        return searchResult.resultItems[0];
    }

-    async searchfile(keys: string[]) {
-        const Event = this.core.eventWrapper.createEventFunction('NodeIKernelSearchService/searchFileWithKeywords');
-        const id = await Event!(keys, 12);
-        const Listener = this.core.eventWrapper.registerListen(
-            'NodeIKernelSearchListener/onSearchFileKeywordsResult',
+    async downloadFileById(
+        fileId: string,
+        fileSize: number = 1024576,
+        estimatedTime: number = (fileSize * 1000 / 1024576) + 5000,
+    ) {
+        const [, fileData] = await this.core.eventWrapper.callNormalEventV2(
+            'NodeIKernelFileAssistantService/downloadFile',
+            'NodeIKernelFileAssistantListener/onFileStatusChanged',
+            [[fileId]],
+            ret => ret.result === 0,
+            status => status.fileStatus === 2 && status.fileProgress === '0',
            1,
-            20000,
-            (params) => id !== '' && params.searchId == id,
+            estimatedTime, // estimate 1MB/s
        );
-        const [ret] = (await Listener);
-        return ret;
+        return fileData.filePath!;
    }

    async getImageUrl(element: PicElement) {
        if (!element) {
            return '';
        }
-        const url: string = element.originImageUrl!;  // 没有域名
+        const url: string = element.originImageUrl ?? '';
        const md5HexStr = element.md5HexStr;
        const fileMd5 = element.md5HexStr;
-        // const fileUuid = element.fileUuid;

        if (url) {
-            const UrlParse = new URL(IMAGE_HTTP_HOST + url);//临时解析拼接
-            const imageAppid = UrlParse.searchParams.get('appid');
-            const isNewPic = imageAppid && ['1406', '1407'].includes(imageAppid);
-            if (isNewPic) {
-                let UrlRkey = UrlParse.searchParams.get('rkey');
-                if (UrlRkey) {
-                    return IMAGE_HTTP_HOST_NT + url;
-                }
-                const rkeyData = await this.rkeyManager.getRkey();
-                UrlRkey = imageAppid === '1406' ? rkeyData.private_rkey : rkeyData.group_rkey;
-                return IMAGE_HTTP_HOST_NT + url + `${UrlRkey}`;
-            } else {
-                // 老的图片url，不需要rkey
-                return IMAGE_HTTP_HOST + url;
+            const parsedUrl = new URL(IMAGE_HTTP_HOST + url);
+            const urlRkey = parsedUrl.searchParams.get('rkey');
+            const imageAppid = parsedUrl.searchParams.get('appid');
+            const isNTV2 = imageAppid && ['1406', '1407'].includes(imageAppid);
+            const imageFileId = parsedUrl.searchParams.get('fileid');
+
+            let rkeyData = {
+                private_rkey: 'CAQSKAB6JWENi5LM_xp9vumLbuThJSaYf-yzMrbZsuq7Uz2qEc3Rbib9LP4',
+                group_rkey: 'CAQSKAB6JWENi5LM_xp9vumLbuThJSaYf-yzMrbZsuq7Uz2qffcqm614gds',
+                online_rkey: false
+            };
+
+            try {
+                let tempRkeyData = await this.rkeyManager.getRkey();
+                rkeyData.group_rkey = tempRkeyData.group_rkey;
+                rkeyData.private_rkey = tempRkeyData.private_rkey;
+                rkeyData.online_rkey = tempRkeyData.expired_time > Date.now() / 1000;
+            } catch (e) {
+                this.context.logger.logError.bind(this.context.logger)('获取rkey失败 Fallback Old Mode', e);
            }
-        } else if (fileMd5 || md5HexStr) {
-            // 没有url，需要自己拼接
+
+
+            if (isNTV2 && urlRkey) {
+                return IMAGE_HTTP_HOST_NT + urlRkey;
+            } else if (isNTV2 && rkeyData.online_rkey) {
+                let rkey = imageAppid === '1406' ? rkeyData.private_rkey : rkeyData.group_rkey;
+                return IMAGE_HTTP_HOST_NT + url + `&rkey=${rkey}`;
+            } else if (isNTV2 && imageFileId) {
+                let rkey = imageAppid === '1406' ? rkeyData.private_rkey : rkeyData.group_rkey;
+                return IMAGE_HTTP_HOST + `/download?appid=${imageAppid}&fileid=${imageFileId}&rkey=${rkey}`;
+            }
+
+        }
+        //到这里说明可能是旧客户端
+        if (fileMd5 || md5HexStr) {
            return `${IMAGE_HTTP_HOST}/gchatpic_new/0/0-0-${(fileMd5 ?? md5HexStr)!.toUpperCase()}/0`;
        }
+
        this.context.logger.logDebug('图片url获取失败', element);
        return '';
    }
 }

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

-    // friends: Map<string, Friend> = new Map<string, FriendV2>();
-
    constructor(context: InstanceContext, core: NapCatCore) {
        this.context = context;
        this.core = core;
-        // if (!this.context.basicInfoWrapper.requireMinNTQQBuild('26702')) {
-        //     this.getFriends(true);
-        // }
+    }
+
+    async getBuddyV2SimpleInfoMap(refresh = false) {
+        const buddyService = this.context.session.getBuddyService();
+        const buddyListV2 = refresh ? await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL) : await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL);
+        const uids = buddyListV2.data.flatMap(item => item.buddyUids);
+        return await this.core.eventWrapper.callNoListenerEvent(
+            'NodeIKernelProfileService/getCoreAndBaseInfo',
+            'nodeStore',
+            uids,
+        );
    }

    async getBuddyV2(refresh = false): Promise<FriendV2[]> {
-        const uids: string[] = [];
-        const buddyService = this.context.session.getBuddyService();
-        const buddyListV2 = refresh ? await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL) : await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL);
-        uids.push(...buddyListV2.data.flatMap(item => item.buddyUids));
-        const data = await this.core.eventWrapper.callNoListenerEvent(
-            'NodeIKernelProfileService/getCoreAndBaseInfo', 'nodeStore', uids,
-        );
-        return Array.from(data.values());
+        return Array.from((await this.getBuddyV2SimpleInfoMap(refresh)).values());
    }

    async getBuddyIdMap(refresh = false): Promise<LimitedHashTable<string, string>> {
-        const uids: string[] = [];
        const retMap: LimitedHashTable<string, string> = new LimitedHashTable<string, string>(5000);
-        const buddyService = this.context.session.getBuddyService();
-        const buddyListV2 = refresh ? await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL) : await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL);
-        uids.push(...buddyListV2.data.flatMap(item => item.buddyUids));
-        const data = await this.core.eventWrapper.callNoListenerEvent(
-            'NodeIKernelProfileService/getCoreAndBaseInfo', 'nodeStore', uids,
-        );
-        data.forEach((value) => {
-            retMap.set(value.uin!, value.uid!);
-        });
-        //console.log('getBuddyIdMap', retMap.getValue);
+        const data = await this.getBuddyV2SimpleInfoMap(refresh);
+        data.forEach((value) => retMap.set(value.uin!, value.uid!));
        return retMap;
    }

    async getBuddyV2ExWithCate(refresh = false) {
-        const uids: string[] = [];
        const categoryMap: Map<string, any> = new Map();
        const buddyService = this.context.session.getBuddyService();
        const buddyListV2 = refresh ? (await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL)).data : (await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL)).data;
-        uids.push(
-            ...buddyListV2.flatMap(item => {
-                item.buddyUids.forEach(uid => {
-                    categoryMap.set(uid, { categoryId: item.categoryId, categoryName: item.categroyName });
-                });
-                return item.buddyUids;
-            }));
+        const uids = buddyListV2.flatMap(item => {
+            item.buddyUids.forEach(uid => {
+                categoryMap.set(uid, { categoryId: item.categoryId, categoryName: item.categroyName });
+            });
+            return item.buddyUids;
+        });
        const data = await this.core.eventWrapper.callNoListenerEvent(
-            'NodeIKernelProfileService/getCoreAndBaseInfo', 'nodeStore', uids,
+            'NodeIKernelProfileService/getCoreAndBaseInfo',
+            'nodeStore',
+            uids,
        );
        return buddyListV2.map(category => ({
            categoryId: category.categoryId,
@@ -1,8 +1,6 @@
 import {
-    ChatType,
    GeneralCallResult,
    Group,
-    GroupInfoSource,
    GroupMember,
    GroupMemberRole,
    GroupRequestOperateTypes,
@@ -11,8 +9,9 @@ import {
    MemberExtSourceType,
    NapCatCore,
 } from '@/core';
-import { isNumeric, runAllWithTimeout } from '@/common/helper';
+import { isNumeric, solveAsyncProblem } from '@/common/helper';
 import { LimitedHashTable } from '@/common/message-unique';
+import { NTEventWrapper } from '@/common/event';

 export class NTQQGroupApi {
    context: InstanceContext;
@@ -25,7 +24,7 @@ export class NTQQGroupApi {
    constructor(context: InstanceContext, core: NapCatCore) {
        this.context = context;
        this.core = core;
-        this.initCache().then().catch(context.logger.logError);
+        this.initCache().then().catch(context.logger.logError.bind(context.logger));
    }

    async initCache() {
@@ -35,17 +34,26 @@ export class NTQQGroupApi {
        }
        this.context.logger.logDebug(`加载${this.groups.length}个群组缓存完成`);
    }
+    async getCoreAndBaseInfo(uids: string[]) {
+        return await this.core.eventWrapper.callNoListenerEvent(
+            'NodeIKernelProfileService/getCoreAndBaseInfo',
+            'nodeStore',
+            uids,
+        );
+    }
    async fetchGroupEssenceList(groupCode: string) {
        const pskey = (await this.core.apis.UserApi.getPSkey(['qun.qq.com'])).domainPskeyMap.get('qun.qq.com')!;
        return this.context.session.getGroupService().fetchGroupEssenceList({
            groupCode: groupCode,
            pageStart: 0,
-            pageLimit: 300
+            pageLimit: 300,
        }, pskey);
    }
-    async clearGroupNotifiesUnreadCount(unk: boolean) {
-        return this.context.session.getGroupService().clearGroupNotifiesUnreadCount(unk);
+
+    async clearGroupNotifiesUnreadCount(uk: boolean) {
+        return this.context.session.getGroupService().clearGroupNotifiesUnreadCount(uk);
    }
+
    async setGroupAvatar(gc: string, filePath: string) {
        return this.context.session.getGroupService().setHeader(gc, filePath);
    }
@@ -58,9 +66,10 @@ export class NTQQGroupApi {
        );
        return groupList;
    }
-    async getGroupExtFE0Info(GroupCode: string[], forced = true) {
+
+    async getGroupExtFE0Info(groupCode: string[], forced = true) {
        return this.context.session.getGroupService().getGroupExt0xEF0Info(
-            GroupCode,
+            groupCode,
            [],
            {
                bindGuildId: 1,
@@ -94,11 +103,12 @@ export class NTQQGroupApi {
                showPlayTogetherSwitch: 1,
                starId: 1,
                todoSeq: 1,
-                viewedMsgDisappearTime: 1
+                viewedMsgDisappearTime: 1,
            },
-            forced
+            forced,
        );
    }
+
    async getGroup(groupCode: string, forced = false) {
        let group = this.groupCache.get(groupCode.toString());
        if (!group) {
@@ -117,64 +127,8 @@ export class NTQQGroupApi {
        return group;
    }

-    async getGroupMemberLatestSendTimeCache(GroupCode: string, uids: string[]) {
-        return this.getGroupMemberLatestSendTime(GroupCode, uids);
-    }
-
-    /**
-     * 通过QQ自带数据库获取群成员最后发言时间(仅返回有效数据 且消耗延迟大 需要进行缓存)
-     * @param GroupCode 群号
-     * @param uids QQ号
-     * @returns Map<string, string> key: uin value: sendTime
-     * @example
-     * let ret = await NTQQGroupApi.getGroupMemberLastestSendTime('123456');
-     * for (let [uin, sendTime] of ret) {
-     *  console.log(uin, sendTime);
-     * }
-     */
-    async getGroupMemberLatestSendTime(GroupCode: string, uids: string[]) {
-        const getdata = async (uid: string) => {
-            const NTRet = await this.getLatestMsgByUids(GroupCode, [uid]);
-            if (NTRet.result != 0 && NTRet.msgList.length < 1) {
-                return undefined;
-            }
-            return { sendUin: NTRet.msgList[0].senderUin, sendTime: NTRet.msgList[0].msgTime };
-        };
-        const PromiseData: Promise<({
-            sendUin: string;
-            sendTime: string;
-        } | undefined)>[] = [];
-        const ret: Map<string, string> = new Map();
-        for (const uid of uids) {
-            PromiseData.push(getdata(uid).catch(() => undefined));
-        }
-        const allRet = await runAllWithTimeout(PromiseData, 2500);
-        for (const PromiseDo of allRet) {
-            if (PromiseDo) {
-                ret.set(PromiseDo.sendUin, PromiseDo.sendTime);
-            }
-        }
-        return ret;
-    }
-
-    async getLatestMsgByUids(GroupCode: string, uids: string[]) {
-        return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', '0', {
-            chatInfo: {
-                peerUid: GroupCode,
-                chatType: ChatType.KCHATTYPEGROUP,
-            },
-            filterMsgType: [],
-            filterSendersUid: uids,
-            filterMsgToTime: '0',
-            filterMsgFromTime: '0',
-            isReverseOrder: false,
-            isIncludeCurrent: true,
-            pageLimit: 1,
-        });
-    }
-
-    async getGroupMemberAll(GroupCode: string, forced = false) {
-        return this.context.session.getGroupService().getAllMemberList(GroupCode, forced);
+    async getGroupMemberAll(groupCode: string, forced = false) {
+        return this.context.session.getGroupService().getAllMemberList(groupCode, forced);
    }

    async getGroupMember(groupCode: string | number, memberUinOrUid: string | number) {
@@ -209,32 +163,8 @@ export class NTQQGroupApi {
        }
        return member;
    }
-
-    async getLatestMsg(GroupCode: string, uins: string[]) {
-        const uids: Array<string> = [];
-        for (const uin of uins) {
-            const uid = await this.core.apis.UserApi.getUidByUinV2(uin);
-            if (uid) {
-                uids.push(uid);
-            }
-        }
-        return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', '0', {
-            chatInfo: {
-                peerUid: GroupCode,
-                chatType: ChatType.KCHATTYPEGROUP,
-            },
-            filterMsgType: [],
-            filterSendersUid: uids,
-            filterMsgToTime: '0',
-            filterMsgFromTime: '0',
-            isReverseOrder: false,
-            isIncludeCurrent: true,
-            pageLimit: 1,
-        });
-    }
-
-    async getGroupRecommendContactArkJson(GroupCode: string) {
-        return this.context.session.getGroupService().getGroupRecommendContactArkJson(GroupCode);
+    async getGroupRecommendContactArkJson(groupCode: string) {
+        return this.context.session.getGroupService().getGroupRecommendContactArkJson(groupCode);
    }

    async CreatGroupFileFolder(groupCode: string, folderName: string) {
@@ -250,8 +180,6 @@ export class NTQQGroupApi {
    }

    async addGroupEssence(GroupCode: string, msgId: string) {
-        // 代码没测过
-        // 需要 ob11msgid->msgId + (peer) -> msgSeq + msgRandom
        const MsgData = await this.context.session.getMsgService().getMsgsIncludeSelf({
            chatType: 2,
            guildId: '',
@@ -262,7 +190,6 @@ export class NTQQGroupApi {
            msgRandom: parseInt(MsgData.msgList[0].msgRandom),
            msgSeq: parseInt(MsgData.msgList[0].msgSeq),
        };
-        // GetMsgByShoretID(ShoretID); -> MsgService.getMsgs(Peer,MsgId,1,false); -> 组出参数
        return this.context.session.getGroupService().addGroupEssence(param);
    }

@@ -271,8 +198,8 @@ export class NTQQGroupApi {
    }

    async deleteGroupBulletin(GroupCode: string, noticeId: string) {
-        const _Pskey = (await this.core.apis.UserApi.getPSkey(['qun.qq.com'])).domainPskeyMap.get('qun.qq.com')!;
-        return this.context.session.getGroupService().deleteGroupBulletin(GroupCode, _Pskey, noticeId);
+        const psKey = (await this.core.apis.UserApi.getPSkey(['qun.qq.com'])).domainPskeyMap.get('qun.qq.com')!;
+        return this.context.session.getGroupService().deleteGroupBulletin(GroupCode, psKey, noticeId);
    }

    async quitGroupV2(GroupCode: string, needDeleteLocalMsg: boolean) {
@@ -280,21 +207,19 @@ export class NTQQGroupApi {
            groupCode: GroupCode,
            needDeleteLocalMsg: needDeleteLocalMsg,
        };
-        //应该是直接返回不需要Listener的 未经测试 需测试再发布
        return this.context.session.getGroupService().quitGroupV2(param);
    }
+
    async removeGroupEssenceBySeq(GroupCode: string, msgRandom: string, msgSeq: string) {
        const param = {
            groupCode: GroupCode,
            msgRandom: parseInt(msgRandom),
            msgSeq: parseInt(msgSeq),
        };
-        // GetMsgByShoretID(ShoretID); -> MsgService.getMsgs(Peer,MsgId,1,false); -> 组出参数
        return this.context.session.getGroupService().removeGroupEssence(param);
    }
+
    async removeGroupEssence(GroupCode: string, msgId: string) {
-        // 代码没测过
-        // 需要 ob11msgid->msgId + (peer) -> msgSeq + msgRandom
        const MsgData = await this.context.session.getMsgService().getMsgsIncludeSelf({
            chatType: 2,
            guildId: '',
@@ -305,16 +230,15 @@ export class NTQQGroupApi {
            msgRandom: parseInt(MsgData.msgList[0].msgRandom),
            msgSeq: parseInt(MsgData.msgList[0].msgSeq),
        };
-        // GetMsgByShoretID(ShoretID); -> MsgService.getMsgs(Peer,MsgId,1,false); -> 组出参数
        return this.context.session.getGroupService().removeGroupEssence(param);
    }

-    async getSingleScreenNotifies(num: number) {
+    async getSingleScreenNotifies(doubt: boolean, num: number) {
        const [, , , notifies] = await this.core.eventWrapper.callNormalEventV2(
            'NodeIKernelGroupService/getSingleScreenNotifies',
            'NodeIKernelGroupListener/onGroupSingleScreenNotifies',
            [
-                false,
+                doubt,
                '',
                num,
            ],
@@ -327,7 +251,7 @@ export class NTQQGroupApi {
            'NodeIKernelGroupListener/onMemberInfoChange',
            1,
            forced ? 5000 : 250,
-            (params) => params === GroupCode,
+            (params, _, members) => params === GroupCode && members.size > 0,
        );
        const retData = await (
            this.core.eventWrapper
@@ -344,14 +268,51 @@ export class NTQQGroupApi {
        }
        return member;
    }
-
+    async searchGroup(groupCode: string) {
+        const [, ret] = await this.core.eventWrapper.callNormalEventV2(
+            'NodeIKernelSearchService/searchGroup',
+            'NodeIKernelSearchListener/onSearchGroupResult',
+            [{
+                keyWords: groupCode,
+                groupNum: 25,
+                exactSearch: false,
+                penetrate: ''
+            }],
+            (ret) => ret.result === 0,
+            (params) => !!params.groupInfos.find(g => g.groupCode === groupCode),
+            1,
+            5000
+        );
+        return ret.groupInfos.find(g => g.groupCode === groupCode);
+    }
+    async getGroupMemberEx(GroupCode: string, uid: string, forced = false, retry = 2) {
+        const data = await solveAsyncProblem((eventWrapper: NTEventWrapper, GroupCode: string, uid: string, forced = false) => {
+            return eventWrapper.callNormalEventV2(
+                'NodeIKernelGroupService/getMemberInfo',
+                'NodeIKernelGroupListener/onMemberInfoChange',
+                [GroupCode, [uid], forced],
+                (ret) => ret.result === 0,
+                (params, _, members) => params === GroupCode && members.size > 0 && members.has(uid),
+                1,
+                forced ? 2500 : 250
+            );
+        }, this.core.eventWrapper, GroupCode, uid, forced);
+        if (data && data[3] instanceof Map && data[3].has(uid)) {
+            return data[3].get(uid);
+        }
+        if (retry > 0) {
+            const trydata = await this.getGroupMemberEx(GroupCode, uid, true, retry - 1) as GroupMember | undefined;
+            if (trydata) return trydata;
+        }
+        return undefined;
+    }
    async getGroupMembersV2(groupQQ: string, num = 3000): Promise<Map<string, GroupMember>> {
        const groupService = this.context.session.getGroupService();
        const sceneId = groupService.createMemberListScene(groupQQ, 'groupMemberList_MainWindow');
        const listener = this.core.eventWrapper.registerListen(
            'NodeIKernelGroupListener/onMemberListChange',
            1,
-            500,
+            5000,
            (params) => params.sceneId === sceneId,
        );
        try {
@@ -362,7 +323,7 @@ export class NTQQGroupApi {
            if (membersFromFunc.status === 'fulfilled' && membersFromListener.status === 'fulfilled') {
                return new Map([
                    ...membersFromFunc.value.result.infos,
-                    ...membersFromListener.value[0].infos
+                    ...membersFromListener.value[0].infos,
                ]);
            }
            if (membersFromFunc.status === 'fulfilled') {
@@ -384,31 +345,14 @@ export class NTQQGroupApi {
        if (result.errCode !== 0) {
            throw new Error('获取群成员列表出错,' + result.errMsg);
        }
-
-        this.context.logger.logDebug(`获取群(${groupQQ})成员列表结果:`, `members: ${result.result.infos.size}`); //, Array.from(result.result.infos.values()));
+        this.context.logger.logDebug(`获取群(${groupQQ})成员列表结果:`, `members: ${result.result.infos.size}`);
        return result.result.infos;
-        /*
-        console.log(sceneId);
-        const result = await napCatCore.getGroupService().getNextMemberList(sceneId, num);
-        console.log(result);
-    
-        return result;
-        */
    }

-    async getGroupNotifies() {
-        // 获取管理员变更
-        // 加群通知，退出通知，需要管理员权限
-
-    }
-
-    async GetGroupFileCount(Gids: Array<string>) {
+    async getGroupFileCount(Gids: Array<string>) {
        return this.context.session.getRichMediaService().batchGetGroupFileCount(Gids);
    }

-    async getGroupIgnoreNotifies() {
-    }
-
    async getArkJsonGroupShare(GroupCode: string) {
        const ret = await this.core.eventWrapper.callNoListenerEvent(
            'NodeIKernelGroupService/getGroupRecommendContactArkJson',
@@ -432,12 +376,12 @@ export class NTQQGroupApi {
        return this.context.session.getGroupService().operateSysNotify(
            false,
            {
-                'operateType': operateType, // 2 拒绝
-                'targetMsg': {
-                    'seq': seq,  // 通知序列号
-                    'type': type,
-                    'groupCode': groupCode,
-                    'postscript': reason ?? ' ', // 仅传空值可能导致处理失败，故默认给个空格
+                operateType: operateType, // 2 拒绝
+                targetMsg: {
+                    seq: seq,  // 通知序列号
+                    type: type,
+                    groupCode: groupCode,
+                    postscript: reason ?? ' ', // 仅传空值可能导致处理失败，故默认给个空格
                },
            });
    }
@@ -471,19 +415,12 @@ export class NTQQGroupApi {
        return this.context.session.getGroupService().modifyGroupName(groupQQ, groupName, false);
    }

-    // 头衔不可用
-    /*
-    async setGroupTitle(groupQQ: string, uid: string, title: string) {
-
-    }
-     */
-
    async publishGroupBulletin(groupQQ: string, content: string, picInfo: {
        id: string,
        width: number,
        height: number
    } | undefined = undefined, pinned: number = 0, confirmRequired: number = 0) {
-        const _Pskey = (await this.core.apis.UserApi.getPSkey(['qun.qq.com'])).domainPskeyMap.get('qun.qq.com');
+        const psKey = (await this.core.apis.UserApi.getPSkey(['qun.qq.com'])).domainPskeyMap.get('qun.qq.com');
        //text是content内容url编码
        const data = {
            text: encodeURI(content),
@@ -492,7 +429,7 @@ export class NTQQGroupApi {
            pinned: pinned,
            confirmRequired: confirmRequired,
        };
-        return this.context.session.getGroupService().publishGroupBulletin(groupQQ, _Pskey!, data);
+        return this.context.session.getGroupService().publishGroupBulletin(groupQQ, psKey!, data);
    }

    async getGroupRemainAtTimes(GroupCode: string) {
@@ -500,7 +437,6 @@ export class NTQQGroupApi {
    }

    async getMemberExtInfo(groupCode: string, uin: string) {
-        // 仅NTQQ 9.9.11 24568测试 容易炸开谨慎使用
        return this.context.session.getGroupService().getMemberExtInfo(
            {
                groupCode: groupCode,
@@ -14,38 +14,21 @@ export class NTQQMsgApi {
        this.context = context;
        this.core = core;
    }
+
    async getAioFirstViewLatestMsgs(peer: Peer, MsgCount: number) {
        return this.context.session.getMsgService().getAioFirstViewLatestMsgs(peer, MsgCount);
    }
-    async getLatestDbMsgs(peer: Peer, MsgCount: number) {
-        return this.context.session.getMsgService().getLatestDbMsgs(peer, MsgCount);
-    }
-    async FetchLongMsg(peer: Peer, msgId: string) {
-        return this.context.session.getMsgService().fetchLongMsg(peer, msgId);
-    }

    async sendShowInputStatusReq(peer: Peer, eventType: number) {
        return this.context.session.getMsgService().sendShowInputStatusReq(peer.chatType, eventType, peer.peerUid);
    }

    async getMsgEmojiLikesList(peer: Peer, msgSeq: string, emojiId: string, emojiType: string, count: number = 20) {
-        //console.log(peer, msgSeq, emojiId, emojiType, count);
-        //注意此处emojiType 可选值一般为1-2 2好像是unicode表情dec值 大部分情况 Taged M likiowa
+        //注意此处emojiType 可选值一般为1-2 2好像是unicode表情dec值 大部分情况 Taged Mlikiowa
        return this.context.session.getMsgService().getMsgEmojiLikesList(peer, msgSeq, emojiId, emojiType, '', false, count);
    }

-    //  napCatCore: NapCatCore | null = null;
-    //   enum BaseEmojiType {
-    //     NORMAL_EMOJI,
-    //     SUPER_EMOJI,
-    //     RANDOM_SUPER_EMOJI,
-    //     CHAIN_SUPER_EMOJI,
-    //     EMOJI_EMOJI
-    // }
    async setEmojiLike(peer: Peer, msgSeq: string, emojiId: string, set: boolean = true) {
-        // nt_qq//global//nt_data//Emoji//emoji-resource//sysface_res/apng/ 下可以看到所有QQ表情预览
-        // nt_qq\global\nt_data\Emoji\emoji-resource\face_config.json 里面有所有表情的id, 自带表情id是QSid, 标准emoji表情id是QCid
-        // 其实以官方文档为准是最好的，https://bot.q.qq.com/wiki/develop/api-v2/openapi/emoji/model.html#EmojiType
        emojiId = emojiId.toString();
        return this.context.session.getMsgService().setMsgEmojiLikes(peer, msgSeq, emojiId, emojiId.length > 3 ? '2' : '1', set);
    }
@@ -60,23 +43,10 @@ export class NTQQMsgApi {
        return this.context.session.getMsgService().forwardMsg(msgIds, peer, [peer], new Map());
    }

-    async getLastestMsgByUids(peer: Peer, count: number = 20, isReverseOrder: boolean = false) {
-        return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', '0', {
-            chatInfo: peer,
-            filterMsgType: [],
-            filterSendersUid: [],
-            filterMsgToTime: '0',
-            filterMsgFromTime: '0',
-            isReverseOrder: isReverseOrder,//此参数有点离谱 注意不是本次查询的排序 而是全部消历史信息的排序 默认false 从新消息拉取到旧消息
-            isIncludeCurrent: true,
-            pageLimit: count,
-        });
-    }
-
    async getMsgsByMsgId(peer: Peer | undefined, msgIds: string[] | undefined) {
        if (!peer) throw new Error('peer is not allowed');
        if (!msgIds) throw new Error('msgIds is not allowed');
-        //Mlikiowa： 参数不合规会导致NC异常崩溃 原因是TX未对进入参数判断 对应Android标记@NotNull AndroidJADX分析可得
+        //MliKiowa: 参数不合规会导致NC异常崩溃 原因是TX未对进入参数判断 对应Android标记@NotNull AndroidJADX分析可得
        return await this.context.session.getMsgService().getMsgsByMsgId(peer, msgIds);
    }

@@ -90,7 +60,7 @@ export class NTQQMsgApi {

    async queryMsgsWithFilterExWithSeq(peer: Peer, msgSeq: string) {
        return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', msgSeq, {
-            chatInfo: peer,//此处为Peer 为关键查询参数 没有啥也没有 by mlik iowa
+            chatInfo: peer,
            filterMsgType: [],
            filterSendersUid: [],
            filterMsgToTime: '0',
@@ -100,11 +70,34 @@ export class NTQQMsgApi {
            pageLimit: 1,
        });
    }
-
+    async queryMsgsWithFilterExWithSeqV2(peer: Peer, msgSeq: string, MsgTime: string, SendersUid: string[]) {
+        return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', msgSeq, {
+            chatInfo: peer,
+            filterMsgType: [],
+            filterSendersUid: SendersUid,
+            filterMsgToTime: MsgTime,
+            filterMsgFromTime: MsgTime,
+            isReverseOrder: false,
+            isIncludeCurrent: true,
+            pageLimit: 1,
+        });
+    }
+    async queryFirstMsgBySeq(peer: Peer, msgSeq: string) {
+        return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', msgSeq, {
+            chatInfo: peer,
+            filterMsgType: [],
+            filterSendersUid: [],
+            filterMsgToTime: '0',
+            filterMsgFromTime: '0',
+            isReverseOrder: true,
+            isIncludeCurrent: true,
+            pageLimit: 1,
+        });
+    }
+    //@deprecated
    async getMsgsBySeqAndCount(peer: Peer, seq: string, count: number, desc: boolean, z: boolean) {
        return await this.context.session.getMsgService().getMsgsBySeqAndCount(peer, seq, count, desc, z);
    }
-
    async getMsgExBySeq(peer: Peer, msgSeq: string) {
        const DateNow = Math.floor(Date.now() / 1000);
        const filterMsgFromTime = (DateNow - 300).toString();
@@ -134,10 +127,7 @@ export class NTQQMsgApi {
                params,
            ],
            () => true,
-            ( /* groupFileListResult: GroupFileInfoUpdateParamType */) => {
-                //Developer Mlikiowa Todo: 此处有问题 无法判断是否成功
-                return true;
-            },
+            () => true, // Todo: 应当通过 groupFileListResult 判断
            1,
            5000,
        );
@@ -149,22 +139,19 @@ export class NTQQMsgApi {
        return this.context.session.getMsgService().getMsgsIncludeSelf(peer, msgId, count, isReverseOrder);
    }

-    async recallMsg(peer: Peer, msgIds: string[]) {
-        await this.context.session.getMsgService().recallMsg({
-            chatType: peer.chatType,
-            peerUid: peer.peerUid,
-        }, msgIds);
+    async recallMsg(peer: Peer, msgId: string) {
+        await this.core.eventWrapper.callNormalEventV2(
+            'NodeIKernelMsgService/recallMsg',
+            'NodeIKernelMsgListener/onMsgInfoListUpdate',
+            [peer, [msgId]],
+            () => true,
+            (updatedList) => updatedList.find(m => m.msgId === msgId && m.recallTime !== '0') !== undefined,
+            1,
+            1000,
+        );
    }

    async PrepareTempChat(toUserUid: string, GroupCode: string, nickname: string) {
-        //By Jadx/Ida Mlikiowa
-        const TempGameSession = {
-            nickname: '',
-            gameAppId: '',
-            selfTinyId: '',
-            peerRoleId: '',
-            peerOpenId: '',
-        };
        return this.context.session.getMsgService().prepareTempChat({
            chatType: ChatType.KCHATTYPETEMPC2CFROMGROUP,
            peerUid: toUserUid,
@@ -173,7 +160,13 @@ export class NTQQMsgApi {
            sig: '',
            selfPhone: '',
            selfUid: this.core.selfInfo.uid,
-            gameSession: TempGameSession,
+            gameSession: {
+                nickname: '',
+                gameAppId: '',
+                selfTinyId: '',
+                peerRoleId: '',
+                peerOpenId: '',
+            },
        });
    }

@@ -182,14 +175,14 @@ export class NTQQMsgApi {
    }

    async sendMsg(peer: Peer, msgElements: SendMessageElement[], waitComplete = true, timeout = 10000) {
-        //唉？ ！我有个想法
+        //唉？！我有个想法
        if (peer.chatType === ChatType.KCHATTYPETEMPC2CFROMGROUP && peer.guildId && peer.guildId !== '') {
            const member = await this.core.apis.GroupApi.getGroupMember(peer.guildId, peer.peerUid!);
            if (member) {
                await this.PrepareTempChat(peer.peerUid, peer.guildId, member.nick);
            }
        }
-        const msgId = await this.generateMsgUniqueId(peer.chatType, await this.getServerTime());
+        const msgId = await this.generateMsgUniqueId(peer.chatType);
        peer.guildId = msgId;
        const [, msgList] = await this.core.eventWrapper.callNormalEventV2(
            'NodeIKernelMsgService/sendMsg',
@@ -212,19 +205,11 @@ export class NTQQMsgApi {
            1,
            timeout,
        );
-        return msgList.find(msgRecord => {
-            if (msgRecord.guildId === msgId) {
-                return true;
-            }
-        });
+        return msgList.find(msgRecord => msgRecord.guildId === msgId);
    }

-    async generateMsgUniqueId(chatType: number, time: string) {
-        return this.context.session.getMsgService().generateMsgUniqueId(chatType, time);
-    }
-
-    async getServerTime() {
-        return this.context.session.getMSFService().getServerTime();
+    async generateMsgUniqueId(chatType: number) {
+        return this.context.session.getMsgService().generateMsgUniqueId(chatType, this.context.session.getMSFService().getServerTime());
    }

    async forwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {
@@ -246,14 +231,10 @@ export class NTQQMsgApi {
                new Map(),
            ],
            () => true,
-            (msgRecords) => {
-                for (const msgRecord of msgRecords) {
-                    if (msgRecord.peerUid == destPeer.peerUid && msgRecord.senderUid == this.core.selfInfo.uid) {
-                        return true;
-                    }
-                }
-                return false;
-            },
+            (msgRecords) => msgRecords.some(
+                msgRecord => msgRecord.peerUid === destPeer.peerUid
+                    && msgRecord.senderUid === this.core.selfInfo.uid
+            ),
        );
        for (const msg of msgList) {
            const arkElement = msg.elements.find(ele => ele.arkElement);
@@ -271,7 +252,7 @@ export class NTQQMsgApi {
        throw new Error('转发消息超时');
    }

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

@@ -13,7 +13,7 @@ export class NTQQSystemApi {
        return this.core.util.hasOtherRunningQQProcess();
    }

-    async ORCImage(filePath: string) {
+    async ocrImage(filePath: string) {
        return this.context.session.getNodeMiscService().wantWinScreenOCR(filePath);
    }

@@ -21,20 +21,16 @@ export class NTQQSystemApi {
        return this.context.session.getRichMediaService().translateEnWordToZn(words);
    }

-    //调用会超时 没灯用 (好像是通知listener的) onLineDev
    async getOnlineDev() {
-        return this.context.session.getMsgService().getOnLineDev();
+        this.context.session.getMsgService().getOnLineDev();
    }

-    //1-2-162b9b42-65b9-4405-a8ed-2e256ec8aa50
    async getArkJsonCollection(cid: string) {
        return await this.core.eventWrapper.callNoListenerEvent('NodeIKernelCollectionService/collectionArkShare', '1717662698058');
    }

-    async BootMiniApp(appfile: string, params: string) {
+    async bootMiniApp(appFile: string, params: string) {
        await this.context.session.getNodeMiscService().setMiniAppVersion('2.16.4');
-        // const c = await this.context.session.getNodeMiscService().getMiniAppPath();
-
-        return this.context.session.getNodeMiscService().startNewMiniApp(appfile, params);
+        return this.context.session.getNodeMiscService().startNewMiniApp(appFile, params);
    }
 }
@@ -1,7 +1,6 @@
-import type { ModifyProfileParams, User } from '@/core/entities';
+import { ModifyProfileParams, User, UserDetailSource } from '@/core/entities';
 import { RequestUtil } from '@/common/request';
-import { ProfileBizType, UserDetailSource } from '@/core/services';
-import { InstanceContext, NapCatCore } from '..';
+import { InstanceContext, NapCatCore, ProfileBizType } from '..';
 import { solveAsyncProblem } from '@/common/helper';

 export class NTQQUserApi {
@@ -12,12 +11,16 @@ export class NTQQUserApi {
        this.context = context;
        this.core = core;
    }
-
+    //self_tind格式
+    async createUidFromTinyId(tinyId: string) {
+        return this.context.session.getMsgService().createUidFromTinyId(this.core.selfInfo.uin, tinyId);
+    }
+    async getStatusByUid(uid: string) {
+        return this.context.session.getProfileService().getStatus(uid);
+    }
    async getProfileLike(uid: string) {
        return this.context.session.getProfileLikeService().getBuddyProfileLike({
-            friendUids: [
-                uid,
-            ],
+            friendUids: [uid],
            basic: 1,
            vote: 1,
            favorite: 0,
@@ -27,7 +30,18 @@ export class NTQQUserApi {
            limit: 20,
        });
    }
-
+    async fetchOtherProfileLike(uid: string) {
+        return this.context.session.getProfileLikeService().getBuddyProfileLike({
+            friendUids: [uid],
+            basic: 1,
+            vote: 1,
+            favorite: 0,
+            userProfile: 0,
+            type: 1,
+            start: 0,
+            limit: 20,
+        });
+    }
    async setLongNick(longNick: string) {
        return this.context.session.getProfileService().setLongNick(longNick);
    }
@@ -63,41 +77,6 @@ export class NTQQUserApi {
        return this.context.session.getGroupService().setHeader(gc, filePath);
    }

-    async fetchUserDetailInfos(uids: string[]) {
-        // TODO: 26702 以上使用新接口 .Dev MliKiowa
-        const retData: User[] = [];
-        const [_retData, _retListener] = await this.core.eventWrapper.callNormalEventV2(
-            'NodeIKernelProfileService/fetchUserDetailInfo',
-            'NodeIKernelProfileListener/onUserDetailInfoChanged',
-            [
-                'BuddyProfileStore',
-                uids,
-                UserDetailSource.KSERVER,
-                [ProfileBizType.KALL],
-            ],
-            () => true,
-            (profile) => {
-                if (uids.includes(profile.uid)) {
-                    const RetUser: User = {
-                        ...profile.simpleInfo.coreInfo,
-                        ...profile.simpleInfo.status,
-                        ...profile.simpleInfo.vasInfo,
-                        ...profile.commonExt,
-                        ...profile.simpleInfo.baseInfo,
-                        qqLevel: profile.commonExt.qqLevel,
-                        pendantId: '',
-                    };
-                    retData.push(RetUser);
-                    return true;
-                }
-                return false;
-            },
-            uids.length,
-        );
-
-        return retData;
-    }
-
    async fetchUserDetailInfo(uid: string, mode: UserDetailSource = UserDetailSource.KDB) {
        const [_retData, profile] = await this.core.eventWrapper.callNormalEventV2(
            'NodeIKernelProfileService/fetchUserDetailInfo',
@@ -112,7 +91,6 @@ export class NTQQUserApi {
            (profile) => profile.uid === uid,
        );
        const RetUser: User = {
-            ...profile.simpleInfo.coreInfo,
            ...profile.simpleInfo.status,
            ...profile.simpleInfo.vasInfo,
            ...profile.commonExt,
@@ -120,29 +98,42 @@ export class NTQQUserApi {
            qqLevel: profile.commonExt?.qqLevel,
            age: profile.simpleInfo.baseInfo.age,
            pendantId: '',
+            ...profile.simpleInfo.coreInfo
        };
        return RetUser;
    }

    async getUserDetailInfo(uid: string): Promise<User> {
-        const retUser = await solveAsyncProblem(async (uid) => this.fetchUserDetailInfo(uid, UserDetailSource.KDB), uid);
+        let retUser = await solveAsyncProblem(async (uid) => this.fetchUserDetailInfo(uid, UserDetailSource.KDB), uid);
        if (retUser && retUser.uin !== '0') {
            return retUser;
        }
        this.context.logger.logDebug('[NapCat] [Mark] getUserDetailInfo Mode1 Failed.');
-        return this.fetchUserDetailInfo(uid, UserDetailSource.KSERVER);
+        retUser = await this.fetchUserDetailInfo(uid, UserDetailSource.KSERVER);
+        if (retUser && retUser.uin === '0') {
+            retUser.uin = await this.core.apis.UserApi.getUidByUinV2(uid) ?? '0';
+        }
+        return retUser;
    }

    async modifySelfProfile(param: ModifyProfileParams) {
        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[]) {
@@ -156,7 +147,6 @@ export class NTQQUserApi {
            version: 0,
            aioKeywordVersion: 0,
        });
-        // console.log(robotUinRanges?.response?.robotUinRanges);
        return robotUinRanges?.response?.robotUinRanges;
    }

@@ -170,7 +160,7 @@ export class NTQQUserApi {

    //需要异常处理

-    async getSkey(): Promise<string | undefined> {
+    async getSKey(): Promise<string | undefined> {
        const ClientKeyData = await this.forceFetchClientKey();
        if (ClientKeyData.result !== 0) {
            throw new Error('getClientKey Error');
@@ -181,7 +171,7 @@ export class NTQQUserApi {
        const cookies: { [key: string]: string; } = await RequestUtil.HttpsGetCookies(requestUrl);
        const skey = cookies['skey'];
        if (!skey) {
-            throw new Error('getSkey Skey is Empty');
+            throw new Error('SKey is Empty');
        }
        return skey;
    }
@@ -194,8 +184,8 @@ export class NTQQUserApi {
        if (uid) return uid;
        uid = (await this.context.session.getUixConvertService().getUid([Uin])).uidInfo.get(Uin);
        if (uid) return uid;
-        const unveifyUid = (await this.getUserDetailInfoByUinV2(Uin)).detail.uid;//从QQ Native 特殊转换
-        if (unveifyUid.indexOf('*') == -1) uid = unveifyUid;
+        const unverifiedUid = (await this.getUserDetailInfoByUin(Uin)).detail.uid;//从QQ Native 特殊转换
+        if (unverifiedUid.indexOf('*') == -1) uid = unverifiedUid;
        //if (uid) return uid;
        return uid;
    }
@@ -230,8 +220,11 @@ export class NTQQUserApi {
        return await this.context.session.getRecentContactService().getRecentContactList();
    }

-    async getUserDetailInfoByUinV2(Uin: string) {
-        return await this.core.eventWrapper.callNoListenerEvent('NodeIKernelProfileService/getUserDetailInfoByUin', Uin);
+    async getUserDetailInfoByUin(Uin: string) {
+        return await this.core.eventWrapper.callNoListenerEvent(
+            'NodeIKernelProfileService/getUserDetailInfoByUin',
+            Uin
+        );
    }

    async forceFetchClientKey() {
@@ -26,33 +26,42 @@ export class NTQQWebApi {
            msg_seq: msgSeq,
            msg_random: msgRandom,
            target_group_code: targetGroupCode,
-        }).toString()
-            }`;
+        }).toString()}`;
        try {
            return RequestUtil.HttpGetText(url, 'GET', '', { 'Cookie': this.cookieToString(cookieObject) });
        } catch (e) {
            return undefined;
        }
    }
-
-    async getGroupEssenceMsg(GroupCode: string) {
+    async getGroupEssenceMsgAll(GroupCode: string) {
+        const ret: GroupEssenceMsgRet[] = [];
+        for (let i = 0; i < 20; i++) {
+            const data = await this.getGroupEssenceMsg(GroupCode, i, 50);
+            if (!data) break;
+            ret.push(data);
+            if (data.data.is_end) break;
+        }
+        return ret;
+    }
+    async getGroupEssenceMsg(GroupCode: string, page_start: number = 0, page_limit: number = 50) {
        const cookieObject = await this.core.apis.UserApi.getCookies('qun.qq.com');
        const url = `https://qun.qq.com/cgi-bin/group_digest/digest_list?${new URLSearchParams({
            bkn: this.getBknFromCookie(cookieObject),
+            page_start: page_start.toString(),
+            page_limit: page_limit.toString(),
            group_code: GroupCode,
-        }).toString()
-            }`;
-        let ret;
+        }).toString()}`;
        try {
-            ret = await RequestUtil.HttpGetJson<GroupEssenceMsgRet>
-                (url, 'GET', '', { 'Cookie': this.cookieToString(cookieObject) });
+            const ret = await RequestUtil.HttpGetJson<GroupEssenceMsgRet>(
+                url,
+                'GET',
+                '',
+                { 'Cookie': this.cookieToString(cookieObject) }
+            );
+            return ret.retcode === 0 ? ret : undefined;
        } catch {
            return undefined;
        }
-        if (ret.retcode !== 0) {
-            return undefined;
-        }
-        return ret;
    }

    async getGroupMembers(GroupCode: string, cached: boolean = true): Promise<WebApiGroupMember[]> {
@@ -60,15 +69,18 @@ export class NTQQWebApi {
        const memberData: Array<WebApiGroupMember> = new Array<WebApiGroupMember>();
        const cookieObject = await this.core.apis.UserApi.getCookies('qun.qq.com');
        const retList: Promise<WebApiGroupMemberRet>[] = [];
-        const fastRet = await RequestUtil.HttpGetJson<WebApiGroupMemberRet>
-            (`https://qun.qq.com/cgi-bin/qun_mgr/search_group_members?${new URLSearchParams({
+        const fastRet = await RequestUtil.HttpGetJson<WebApiGroupMemberRet>(
+            `https://qun.qq.com/cgi-bin/qun_mgr/search_group_members?${new URLSearchParams({
                st: '0',
                end: '40',
                sort: '1',
                gc: GroupCode,
                bkn: this.getBknFromCookie(cookieObject),
-            }).toString()
-                }`, 'POST', '', { 'Cookie': this.cookieToString(cookieObject) });
+            }).toString()}`,
+            'POST',
+            '',
+            { 'Cookie': this.cookieToString(cookieObject) }
+        );
        if (!fastRet?.count || fastRet?.errcode !== 0 || !fastRet?.mems) {
            return [];
        } else {
@@ -80,15 +92,18 @@ export class NTQQWebApi {
        const PageNum = Math.ceil(fastRet.count / 40);
        //遍历批量请求
        for (let i = 2; i <= PageNum; i++) {
-            const ret = RequestUtil.HttpGetJson<WebApiGroupMemberRet>
-                (`https://qun.qq.com/cgi-bin/qun_mgr/search_group_members?${new URLSearchParams({
+            const ret = RequestUtil.HttpGetJson<WebApiGroupMemberRet>(
+                `https://qun.qq.com/cgi-bin/qun_mgr/search_group_members?${new URLSearchParams({
                    st: ((i - 1) * 40).toString(),
                    end: (i * 40).toString(),
                    sort: '1',
                    gc: GroupCode,
                    bkn: this.getBknFromCookie(cookieObject),
-                }).toString()
-                    }`, 'POST', '', { 'Cookie': this.cookieToString(cookieObject) });
+                }).toString()}`,
+                'POST',
+                '',
+                { 'Cookie': this.cookieToString(cookieObject) }
+            );
            retList.push(ret);
        }
        //批量等待
@@ -116,20 +131,56 @@ export class NTQQWebApi {
    //   return await res.json();
    // }

-    async setGroupNotice(GroupCode: string, Content: string) {
+    async setGroupNotice(
+        GroupCode: string,
+        Content: string,
+        pinned: number = 0,
+        type: number = 1,
+        is_show_edit_card: number = 1,
+        tip_window_type: number = 1,
+        confirm_required: number = 1,
+        picId: string = '',
+        imgWidth: number = 540,
+        imgHeight: number = 300,
+    ) {
+        interface SetNoticeRetSuccess {
+            ec: number;
+            em: string;
+            id: number;
+            ltsm: number;
+            new_fid: string;
+            read_only: number;
+            role: number;
+            srv_code: number;
+        }
+
        const cookieObject = await this.core.apis.UserApi.getCookies('qun.qq.com');
-        let ret: any = undefined;
+
        try {
-            ret = await RequestUtil.HttpGetJson<any>
-                (`https://web.qun.qq.com/cgi-bin/announce/add_qun_notice${new URLSearchParams({
+            const settings = JSON.stringify({
+                is_show_edit_card: is_show_edit_card,
+                tip_window_type: tip_window_type,
+                confirm_required: confirm_required
+            });
+            const externalParam = {
+                pic: picId,
+                imgWidth: imgWidth.toString(),
+                imgHeight: imgHeight.toString(),
+            };
+            const ret: SetNoticeRetSuccess = await RequestUtil.HttpGetJson<SetNoticeRetSuccess>(
+                `https://web.qun.qq.com/cgi-bin/announce/add_qun_notice?${new URLSearchParams({
                    bkn: this.getBknFromCookie(cookieObject),
                    qid: GroupCode,
                    text: Content,
-                    pinned: '0',
-                    type: '1',
-                    settings: '{"is_show_edit_card":1,"tip_window_type":1,"confirm_required":1}',
-                }).toString()
-                    }`, 'GET', '', { 'Cookie': this.cookieToString(cookieObject) });
+                    pinned: pinned.toString(),
+                    type: type.toString(),
+                    settings: settings,
+                    ...(picId === '' ? {} : externalParam)
+                }).toString()}`,
+                'POST',
+                '',
+                { 'Cookie': this.cookieToString(cookieObject) }
+            );
            return ret;
        } catch (e) {
            return undefined;
@@ -138,16 +189,24 @@ export class NTQQWebApi {

    async getGroupNotice(GroupCode: string): Promise<undefined | WebApiGroupNoticeRet> {
        const cookieObject = await this.core.apis.UserApi.getCookies('qun.qq.com');
-        let ret: WebApiGroupNoticeRet | undefined = undefined;
        try {
-            const url = 'https://web.qun.qq.com/cgi-bin/announce/get_t_list?bkn=' +
-                this.getBknFromCookie(cookieObject) + '&qid=' + GroupCode + '&ft=23&ni=1&n=1&i=1&log_read=1&platform=1&s=-1&n=20';
-
-            ret = await RequestUtil.HttpGetJson<WebApiGroupNoticeRet>(url, 'GET', '', { 'Cookie': this.cookieToString(cookieObject) });
-            if (ret?.ec !== 0) {
-                return undefined;
-            }
-            return ret;
+            const ret = await RequestUtil.HttpGetJson<WebApiGroupNoticeRet>(
+                `https://web.qun.qq.com/cgi-bin/announce/get_t_list?${new URLSearchParams({
+                    bkn: this.getBknFromCookie(cookieObject),
+                    qid: GroupCode,
+                    ft: '23',
+                    ni: '1',
+                    n: '1',
+                    i: '1',
+                    log_read: '1',
+                    platform: '1',
+                    s: '-1',
+                }).toString()}&n=20`,
+                'GET',
+                '',
+                { 'Cookie': this.cookieToString(cookieObject) }
+            );
+            return ret?.ec === 0 ? ret : undefined;
        } catch (e) {
            return undefined;
        }
@@ -156,14 +215,17 @@ export class NTQQWebApi {
    async getGroupHonorInfo(groupCode: string, getType: WebHonorType) {
        const cookieObject = await this.core.apis.UserApi.getCookies('qun.qq.com');
        const getDataInternal = async (Internal_groupCode: string, Internal_type: number) => {
-            const url = `https://qun.qq.com/interactive/honorlist?${new URLSearchParams({
-                gc: Internal_groupCode,
-                type: Internal_type.toString(),
-            }).toString()
-                }`;
            let resJson;
            try {
-                const res = await RequestUtil.HttpGetText(url, 'GET', '', { 'Cookie': this.cookieToString(cookieObject) });
+                const res = await RequestUtil.HttpGetText(
+                    `https://qun.qq.com/interactive/honorlist?${new URLSearchParams({
+                        gc: Internal_groupCode,
+                        type: Internal_type.toString(),
+                    }).toString()}`,
+                    'GET',
+                    '',
+                    { 'Cookie': this.cookieToString(cookieObject) }
+                );
                const match = /window\.__INITIAL_STATE__=(.*?);/.exec(res);
                if (match) {
                    resJson = JSON.parse(match[1].trim());
@@ -174,7 +236,7 @@ export class NTQQWebApi {
                    return resJson?.actorList;
                }
            } catch (e) {
-                this.context.logger.logDebug('获取当前群荣耀失败', url, e);
+                this.context.logger.logDebug('获取当前群荣耀失败', e);
            }
            return undefined;
        };
@@ -202,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) {
@@ -218,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) {
@@ -234,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) {
@@ -250,13 +312,15 @@ export class NTQQWebApi {
                    });
                }
            } else {
-                this.context.logger.logError('获取快乐源泉失败');
+                this.context.logger.logError.bind(this.context.logger)('获取快乐源泉失败');
            }
        }
+
        // 冒尖小春笋好像已经被tx扬了 R.I.P.
        if (getType === WebHonorType.EMOTION || getType === WebHonorType.ALL) {
            HonorInfo.strong_newbie_list = [];
        }
+
        return HonorInfo;
    }

@@ -0,0 +1,11 @@
+export enum MsfStatusType {
+    KUNKNOWN,
+    KDISCONNECTED,
+    KCONNECTED
+}
+export enum MsfChangeReasonType {
+    KUNKNOWN,
+    KUSERLOGININ,
+    KUSERLOGINOUT,
+    KAUTO
+}
@@ -0,0 +1,12 @@
+
+export interface FSABRecentContactParams {
+    anchorPointContact: {
+        contactId: string;
+        sortField: string;
+        pos: number;
+    };
+    relativeMoveCount: number;
+    listType: number;
+    count: number;
+    fetchOld: boolean;
+}
@@ -22,6 +22,7 @@ export interface GetFileListParam {
    startIndex: number;
    sortOrder: number;
    showOnlinedocFolder: number;
+    folderId?: string;
 }

 export enum ElementType {
@@ -369,7 +370,8 @@ export interface ReplyElement {
    replayMsgSeq: string;
    replayMsgId: string;
    senderUin: string;
-    senderUinStr: string;
+    senderUidStr?: string;
+    replyMsgTime?: string;
 }

 export interface SendReplyElement {
@@ -593,6 +595,7 @@ export const IMAGE_HTTP_HOST_NT = 'https://multimedia.nt.qq.com.cn';

 export interface PicElement {
    md5HexStr?: string;
+    filePath?: string;
    fileSize: number | string;//number
    picWidth: number;
    picHeight: number;
@@ -656,7 +659,8 @@ export interface GrayTipElement {
 export enum FaceType {
    normal = 1, // 小黄脸
    normal2 = 2, // 新小黄脸, 从faceIndex 222开始？
-    dice = 3  // 骰子
+    dice = 3,  // 骰子
+    poke = 5  // 拍一拍
 }

 export enum FaceIndex {
@@ -905,11 +909,26 @@ export interface RawMessage {
     */
    peerUin: string;

+    /**
+     * 好友备注（如果是好友消息）
+     */
+    remark?: string;
+
+    /**
+     * 群名（如果是群消息）
+     */
+    peerName: string;
+
    /**
     * 发送者昵称（如果是好友消息）
     */
    sendNickName: string;

+    /**
+     * 发送者好友备注（如果是群消息并且有发送者好友）
+     */
+    sendRemarkName: string;
+
    /**
     * 发送者群名片（如果是群消息）
     */
@@ -931,3 +950,43 @@ export interface RawMessage {

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

@@ -153,7 +153,10 @@ interface CommonExt {
    labels: any[];
    qqLevel: QQLevel;
 }
-
+export enum BuddyListReqType {
+    KNOMAL,
+    KLETTER
+}
 interface Pic {
    picId: string;
    picTime: number;
@@ -213,7 +216,7 @@ export interface BuddyProfileLikeReq {
    userProfile: number;
    type: number;
    start: number;
-    limit: number;
+    limit?: number;
 }

 export interface QQLevel {
@@ -294,7 +297,7 @@ export enum BizKey {
    KPHOTOWALL
 }

-export interface UserDetailInfoByUinV2 {
+export interface UserDetailInfoByUin {
    result: number,
    errMsg: string,
    detail: {
@@ -305,62 +308,15 @@ export interface UserDetailInfoByUinV2 {
        photoWall: null
    }
 }
-
-export interface UserDetailInfoByUin {
-    result: number,
-    errMsg: string,
-    info: {
-        uid: string,//这个没办法用
-        qid: string,
-        uin: string,
-        nick: string,
-        remark: string,
-        longNick: string,
-        avatarUrl: string,
-        birthday_year: number,
-        birthday_month: number,
-        birthday_day: number,
-        sex: number,//0
-        topTime: string,
-        constellation: number,
-        shengXiao: number,
-        kBloodType: number,
-        homeTown: string,
-        makeFriendCareer: number,
-        pos: string,
-        eMail: string,
-        phoneNum: string,
-        college: string,
-        country: string,
-        province: string,
-        city: string,
-        postCode: string,
-        address: string,
-        isBlock: boolean,
-        isSpecialCareOpen: boolean,
-        isSpecialCareZone: boolean,
-        ringId: string,
-        regTime: number,
-        interest: string,
-        termType: number,
-        labels: any[],
-        qqLevel: { crownNum: number, sunNum: number, moonNum: number, starNum: number },
-        isHideQQLevel: number,
-        privilegeIcon: { jumpUrl: string, openIconList: any[], closeIconList: any[] },
-        isHidePrivilegeIcon: number,
-        photoWall: { picList: any[] },
-        vipFlag: boolean,
-        yearVipFlag: boolean,
-        svipFlag: boolean,
-        vipLevel: number,
-        status: number,
-        qidianMasterFlag: number,
-        qidianCrewFlag: number,
-        qidianCrewFlag2: number,
-        extStatus: number,
-        recommendImgFlag: number,
-        disableEmojiShortCuts: number,
-        pendantId: string,
-        vipNameColorId: string
-    }
+export enum UserDetailSource {
+    KDB,
+    KSERVER
 }
+
+export enum ProfileBizType {
+    KALL,
+    KBASEEXTEND,
+    KVAS,
+    KQZONE,
+    KOTHER
+}
@@ -1,34 +1,46 @@
 {
-    "3.2.12-27187": {
-        "appid": 537240645,
-        "qua": "V1_LNX_NQ_3.2.12_27187_GW_B"
+    "9.9.15-28060": {
+        "appid": 537246092,
+        "qua": "V1_WIN_NQ_9.9.15_28060_GW_B"
    },
-    "3.2.12-27206": {
-        "appid": 537240645,
-        "qua": "V1_LNX_NQ_3.2.12_27206_GW_B"
+    "9.9.15-28131": {
+        "appid": 537246092,
+        "qua": "V1_WIN_NQ_9.9.15_28131_GW_B"
    },
-    "3.2.12-27254": {
-        "appid": 537240795,
-        "qua": "V1_LNX_NQ_3.2.12_27254_GW_B"
+    "3.2.12-28060": {
+        "appid": 537246140,
+        "qua": "V1_LNX_NQ_3.2.12_28060_GW_B"
    },
-    "9.9.15-27187": {
-        "appid": 537240610,
-        "qua": "V1_WIN_NQ_9.9.15_27187_GW_B"
+    "3.2.12-28131": {
+        "appid": 537246140,
+        "qua": "V1_LNX_NQ_3.2.12_28131_GW_B"
    },
-    "9.9.15-27206": {
-        "appid": 537240610,
-        "qua": "V1_WIN_NQ_9.9.15_27206_GW_B"
+    "6.9.55-28131": {
+        "appid": 537246115,
+        "qua": "V1_MAC_NQ_6.9.55_28131_GW_B"
    },
-    "9.9.15-27254": {
-        "appid": 537240709,
-        "qua": "V1_WIN_NQ_9.9.15_27254_GW_B"
+    "9.9.15-28327":{
+        "appid": 537249321,
+        "qua": "V1_WIN_NQ_9.9.15_28327_GW_B"
    },
-    "9.9.15-27333": {
-        "appid": 537240709,
-        "qua": "V1_WIN_NQ_9.9.15_27333_GW_B"
+    "3.2.12-28327":{
+        "appid": 537249393,
+        "qua": "V1_LNX_NQ_3.2.12_28327_GW_B"
    },
-    "9.9.15-27391": {
-        "appid": 537240709,
-        "qua": "V1_WIN_NQ_9.9.15_27333_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"
+    },
+    "6.9.56-28418": {
+        "appid": 537249367,
+        "qua": "V1_MAC_NQ_6.9.56_28418_GW_B"
+    },
+    "9.9.15-28498":{
+        "appid": 537249321,
+        "qua": "V1_WIN_NQ_9.9.15_28498_GW_B"
    }
 }
@@ -19,6 +19,13 @@ message EmojiLikeToOthersMsgSpec {
 }

 message EmojiLikeToOthersAttributes {
+  enum Operation {
+    FALLBACK = 0;
+    LIKE = 1;
+    UNLIKE = 2;
+  }
+
  string emojiId = 1;
  string senderUid = 4;
+  Operation operation = 5;
 }
@@ -0,0 +1,18 @@
+syntax = "proto3";
+package SysMessage;
+
+message likeDetail {
+    string txt = 1;
+    int64 uin = 3;
+    string nickname = 5;
+}
+
+message likeMsg {
+    int32 times = 1;
+    int32 time = 2;
+    likeDetail detail = 3;
+}
+
+message profileLikeTip {
+    likeMsg msg = 14;
+}
@@ -8,7 +8,7 @@ interface ServerRkeyData {
 }

 export class RkeyManager {
-    serverUrl: string = '';
+    serverUrl: string[] = [];
    logger: LogWrapper;
    private rkeyData: ServerRkeyData = {
        group_rkey: '',
@@ -16,7 +16,7 @@ export class RkeyManager {
        expired_time: 0,
    };

-    constructor(serverUrl: string, logger: LogWrapper) {
+    constructor(serverUrl: string[], logger: LogWrapper) {
        this.logger = logger;
        this.serverUrl = serverUrl;
    }
@@ -26,7 +26,8 @@ export class RkeyManager {
            try {
                await this.refreshRkey();
            } catch (e) {
-                this.logger.logError('获取rkey失败', e);
+                throw new Error(`获取rkey失败: ${e}`);//外抛
+                //this.logger.logError.bind(this.logger)('获取rkey失败', e);
            }
        }
        return this.rkeyData;
@@ -40,6 +41,22 @@ export class RkeyManager {

    async refreshRkey(): Promise<any> {
        //刷新rkey
-        this.rkeyData = await RequestUtil.HttpGetJson<ServerRkeyData>(this.serverUrl, 'GET');
+        for (const url of this.serverUrl) {
+            try {
+                let temp = await RequestUtil.HttpGetJson<ServerRkeyData>(url, 'GET');
+                this.rkeyData = {
+                    group_rkey: temp.group_rkey.slice(6),
+                    private_rkey: temp.private_rkey.slice(6),
+                    expired_time: temp.expired_time
+                };
+            } catch (e) {
+                this.logger.logError.bind(this.logger)(`[Rkey] Get Rkey ${url} Error `, e);
+                //是否为最后一个url
+                if (url === this.serverUrl[this.serverUrl.length - 1]) {
+                    throw new Error(`获取rkey失败: ${e}`);//外抛
+                }
+            }
+        }
+
    }
 }
@@ -22,14 +22,13 @@ import { QQBasicInfoWrapper } from '@/common/qq-basic-info';
 import { NapCatPathWrapper } from '@/common/path';
 import path 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, SelfInfo } from '@/core/entities';
+import { DataSource, GroupMember, KickedOffLineInfo, 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';
@@ -42,9 +41,21 @@ export enum NapCatCoreWorkingEnv {
 }

 export function loadQQWrapper(QQVersion: string): WrapperNodeApi {
-    let wrapperNodePath = path.resolve(path.dirname(process.execPath), './resources/app/wrapper.node');
+    let appPath;
+    if (os.platform() === 'darwin') {
+        appPath = path.resolve(path.dirname(process.execPath), '../Resources/app');
+    } else if (os.platform() === 'linux') {
+        appPath = path.resolve(path.dirname(process.execPath), './resources/app');
+    } else {
+        appPath = path.resolve(path.dirname(process.execPath), `./versions/${QQVersion}/`);
+    }
+    let wrapperNodePath = path.resolve(appPath, 'wrapper.node');
    if (!fs.existsSync(wrapperNodePath)) {
-        wrapperNodePath = path.join(path.dirname(process.execPath), `resources/app/versions/${QQVersion}/wrapper.node`);
+        wrapperNodePath = path.join(appPath, `./resources/app/wrapper.node`);
+    }
+    //老版本兼容 未来去掉
+    if (!fs.existsSync(wrapperNodePath)) {
+        wrapperNodePath = path.join(path.dirname(process.execPath), `./resources/app/versions/${QQVersion}/wrapper.node`);
    }
    const nativemodule: any = { exports: {} };
    process.dlopen(nativemodule, wrapperNodePath);
@@ -87,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,
@@ -113,6 +125,11 @@ export class NapCatCore {
    // Renamed from 'InitDataListener'
    async initNapCatCoreListeners() {
        const msgListener = new NodeIKernelMsgListener();
+        msgListener.onKickedOffLine = (Info: KickedOffLineInfo) => {
+            // 下线通知
+            this.context.logger.logError.bind(this.context.logger)('[KickedOffLine] [' + Info.tipsTitle + '] ' + Info.tipsDesc);
+            this.selfInfo.online = false;
+        };
        msgListener.onRecvMsg = (msgs) => {
            msgs.forEach(msg => this.context.logger.logMessage(msg, this.selfInfo));
        };
@@ -130,10 +147,13 @@ export class NapCatCore {
                Object.assign(this.selfInfo, profile);
            }
        };
-        profileListener.onSelfStatusChanged = (/* Info: SelfStatusInfo */) => {
-            // if (Info.status == 20) {
-            //   log("账号状态变更为离线")
-            // }
+        profileListener.onSelfStatusChanged = (Info: SelfStatusInfo) => {
+            if (Info.status == 20) {
+                this.selfInfo.online = false;
+                this.context.logger.log("账号状态变更为离线");
+            } else {
+                this.selfInfo.online = true;
+            }
        };
        this.context.session.getProfileService().addKernelProfileListener(
            proxiedListenerOf(profileListener, this.context.logger),
@@ -227,22 +247,34 @@ 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
+    const platformMapping: Partial<Record<NodeJS.Platform, PlatformType>> = {
+        win32: PlatformType.KWINDOWS,
+        darwin: PlatformType.KMAC,
+        linux: PlatformType.KLINUX,
+    };
+    const systemPlatform = platformMapping[os.platform()] ?? PlatformType.KWINDOWS;
    return {
        selfUin,
        selfUid,
        desktopPathConfig: {
            account_path, // 可以通过NodeQQNTWrapperUtil().getNTUserDataInfoConfig()获取
        },
-        clientVer: QQVersion,  // 9.9.8-22355
+        clientVer: QQVersion,
        a2: '',
        d2: '',
        d2Key: '',
        machineId: '',
-        platform: PlatformType.KWINDOWS,  // 3是Windows?
+        platform: systemPlatform,  // 3是Windows? 
        platVer: systemVersion,  // 系统版本号, 应该可以固定
        appid: QQVersionAppid,
        rdeliveryConfig: {
@@ -250,7 +282,7 @@ export async function genSessionConfig(QQVersionAppid: string, QQVersion: string
            systemId: 0,
            appId: '',
            logicEnvironment: '',
-            platform: PlatformType.KWINDOWS,
+            platform: systemPlatform,
            language: '',
            sdkVersion: '',
            userId: '',
@@ -1,5 +1,13 @@
 export class NodeIKernelFileAssistantListener {
-    onFileStatusChanged(...args: unknown[]) {
+    onFileStatusChanged(fileStatus: {
+        id: string,
+        fileStatus: number,
+        fileProgress: `${number}`,
+        fileSize: `${number}`,
+        fileSpeed: number,
+        thumbPath: string | null,
+        filePath: string | null,
+    }) {
    }

    onSessionListChanged(...args: unknown[]) {
@@ -11,6 +19,42 @@ export class NodeIKernelFileAssistantListener {
    onFileListChanged(...args: unknown[]) {
    }

-    onFileSearch(...args: unknown[]) {
+    onFileSearch(searchResult: SearchResultWrapper) {
    }
 }
+
+export type SearchResultWrapper = {
+    searchId: number,
+    resultId: number,
+    hasMore: boolean,
+    resultItems: SearchResultItem[],
+};
+
+export type SearchResultItem = {
+    id: string,
+    fileName: string,
+    fileNameHits: string[],
+    fileStatus: number,
+    fileSize: string,
+    isSend: boolean,
+    source: number,
+    fileTime: string,
+    expTime: string,
+    session: {
+        context: null,
+        uid: string,
+        nick: string,
+        remark: string,
+        memberCard: string,
+        groupCode: string,
+        groupName: string,
+        groupRemark: string,
+        count: number,
+    },
+    thumbPath: string,
+    filePath: string,
+    msgId: string,
+    chatType: number,
+    peerUid: string,
+    fileType: number,
+};
@@ -1,25 +1,6 @@
 import { ChatType, RawMessage } from '@/core/entities';
-export interface CommonFileInfo {
-    bizType: null;
-    chatType: number;
-    elemId: string;
-    favId: null;
-    fileModelId: string;
-    fileName: string;
-    fileSize: string;
-    md5: string;
-    md510m: string;
-    msgId: string;
-    msgTime: string;
-    parent: null;
-    peerUid: string;
-    picThumbPath: null;
-    sha: string;
-    sha3: string;
-    subId: string;
-    uuid: string;
-    [property: string]: any;
-}
+import { CommonFileInfo } from '@/core';
+
 export interface OnRichMediaDownloadCompleteParams {
    fileModelId: string,
    msgElementId: string,
@@ -48,7 +29,47 @@ export interface GroupFileInfoUpdateParamType {
    retMsg: string;
    clientWording: string;
    isEnd: boolean;
-    item: Array<any>;
+    item: Array<{
+        peerId: string;
+        type: number;
+        folderInfo?: {
+            folderId: string;
+            parentFolderId: string;
+            folderName: string;
+            createTime: number;
+            modifyTime: number;
+            createUin: string;
+            creatorName: string;
+            totalFileCount: number;
+            modifyUin: string;
+            modifyName: string;
+            usedSpace: string;
+        },
+        fileInfo?: {
+            fileModelId: string;
+            fileId: string;
+            fileName: string;
+            fileSize: string;
+            busId: number;
+            uploadedSize: string;
+            uploadTime: number;
+            deadTime: number;
+            modifyTime: number;
+            downloadTimes: number;
+            sha: string;
+            sha3: string;
+            md5: string;
+            uploaderLocalPath: string;
+            uploaderName: string;
+            uploaderUin: string;
+            parentFolderId: string;
+            localPath: string;
+            transStatus: number;
+            transType: number;
+            elementId: string;
+            isFolder: boolean;
+        },
+    }>;
    allFileCount: string;
    nextIndex: string;
    reqId: string;
@@ -0,0 +1,97 @@
+import { ChatType } from '@/core';
+export interface SearchGroupInfo {
+    groupCode: string;
+    ownerUid: string;
+    groupFlag: number;
+    groupFlagExt: number;
+    maxMemberNum: number;
+    memberNum: number;
+    groupOption: number;
+    classExt: number;
+    groupName: string;
+    fingerMemo: string;
+    groupQuestion: string;
+    certType: number;
+    shutUpAllTimestamp: number;
+    shutUpMeTimestamp: number;
+    groupTypeFlag: number;
+    privilegeFlag: number;
+    groupSecLevel: number;
+    groupFlagExt3: number;
+    isConfGroup: number;
+    isModifyConfGroupFace: number;
+    isModifyConfGroupName: number;
+    noFigerOpenFlag: number;
+    noCodeFingerOpenFlag: number;
+    groupFlagExt4: number;
+    groupMemo: string;
+    cmdUinMsgSeq: number;
+    cmdUinJoinTime: number;
+    cmdUinUinFlag: number;
+    cmdUinMsgMask: number;
+    groupSecLevelInfo: number;
+    cmdUinPrivilege: number;
+    cmdUinFlagEx2: number;
+    appealDeadline: number;
+    remarkName: string;
+    isTop: boolean;
+    richFingerMemo: string;
+    groupAnswer: string;
+    joinGroupAuth: string;
+    isAllowModifyConfGroupName: number;
+}
+
+export interface GroupInfo {
+    groupCode: string;
+    searchGroupInfo: SearchGroupInfo;
+    privilege: number;
+}
+
+export interface GroupSearchResult {
+    keyWord: string;
+    errorCode: number;
+    groupInfos: GroupInfo[];
+    penetrate: string;
+    isEnd: boolean;
+    nextPos: number;
+}
+export interface NodeIKernelSearchListener {
+    
+    onSearchGroupResult(params: GroupSearchResult): void;
+
+    onSearchFileKeywordsResult(params: {
+        searchId: string,
+        hasMore: boolean,
+        resultItems: {
+            chatType: ChatType,
+            buddyChatInfo: any[],
+            discussChatInfo: any[],
+            groupChatInfo: {
+                groupCode: string,
+                isConf: boolean,
+                hasModifyConfGroupFace: boolean,
+                hasModifyConfGroupName: boolean,
+                groupName: string,
+                remark: string
+            }[],
+            dataLineChatInfo: any[],
+            tmpChatInfo: any[],
+            msgId: string,
+            msgSeq: string,
+            msgTime: string,
+            senderUid: string,
+            senderNick: string,
+            senderRemark: string,
+            senderCard: string,
+            elemId: string,
+            elemType: number,
+            fileSize: string,
+            filePath: string,
+            fileName: string,
+            hits: {
+                start: number,
+                end: number
+            }[]
+        }[]
+    }): void;
+}
@@ -1,39 +0,0 @@
-import { ChatType } from '@/core';
-
-export interface NodeIKernelSearchListener_Polyfill {
-    onSearchFileKeywordsResult(params: {
-        searchId: string,
-        hasMore: boolean,
-        resultItems: {
-            chatType: ChatType,
-            buddyChatInfo: any[],
-            discussChatInfo: any[],
-            groupChatInfo: {
-                groupCode: string,
-                isConf: boolean,
-                hasModifyConfGroupFace: boolean,
-                hasModifyConfGroupName: boolean,
-                groupName: string,
-                remark: string
-            }[],
-            dataLineChatInfo: any[],
-            tmpChatInfo: any[],
-            msgId: string,
-            msgSeq: string,
-            msgTime: string,
-            senderUid: string,
-            senderNick: string,
-            senderRemark: string,
-            senderCard: string,
-            elemId: string,
-            elemType: number,
-            fileSize: string,
-            filePath: string,
-            fileName: string,
-            hits: {
-                start: number,
-                end: number
-            }[]
-        }[]
-    }): void;
-}
@@ -0,0 +1,5 @@
+export class NodeIO3MiscListener {
+    getOnAmgomDataPiece(...arg: unknown[]) {
+
+    }
+}
@@ -9,7 +9,7 @@ export * from './NodeIKernelProfileListener';
 export * from './NodeIKernelTicketListener';
 export * from './NodeIKernelStorageCleanListener';
 export * from './NodeIKernelFileAssistantListener';
-export * from './NodeIKernelSearchListener_Polyfill';
+export * from './NodeIKernelSearchListener';

 import type {
    NodeIKernelBuddyListener,
@@ -19,11 +19,11 @@ import type {
    NodeIKernelMsgListener,
    NodeIKernelProfileListener,
    NodeIKernelRobotListener,
-    NodeIKernelSearchListener_Polyfill,
    NodeIKernelSessionListener,
    NodeIKernelStorageCleanListener,
    NodeIKernelTicketListener,
 } from '.';
+import { NodeIKernelSearchListener } from './NodeIKernelSearchListener';

 export type ListenerNamingMapping = {
    NodeIKernelSessionListener: NodeIKernelSessionListener;
@@ -36,5 +36,5 @@ export type ListenerNamingMapping = {
    NodeIKernelTicketListener: NodeIKernelTicketListener;
    NodeIKernelStorageCleanListener: NodeIKernelStorageCleanListener;
    NodeIKernelFileAssistantListener: NodeIKernelFileAssistantListener;
-    NodeIKernelSearchListener: NodeIKernelSearchListener_Polyfill;
+    NodeIKernelSearchListener: NodeIKernelSearchListener;
 };
@@ -1,312 +0,0 @@
-// @generated by protobuf-ts 2.9.4
-// @generated from protobuf file "EmojiLikeToOthers.proto" (package "SysMessage", syntax proto3)
-// tslint:disable
-import type { BinaryWriteOptions } from "@protobuf-ts/runtime";
-import type { IBinaryWriter } from "@protobuf-ts/runtime";
-import { WireType } from "@protobuf-ts/runtime";
-import type { BinaryReadOptions } from "@protobuf-ts/runtime";
-import type { IBinaryReader } from "@protobuf-ts/runtime";
-import { UnknownFieldHandler } from "@protobuf-ts/runtime";
-import type { PartialMessage } from "@protobuf-ts/runtime";
-import { reflectionMergePartial } from "@protobuf-ts/runtime";
-import { MessageType } from "@protobuf-ts/runtime";
-/**
- * @generated from protobuf message SysMessage.EmojiLikeToOthersWrapper1
- */
-export interface EmojiLikeToOthersWrapper1 {
-    /**
-     * @generated from protobuf field: SysMessage.EmojiLikeToOthersWrapper2 wrapper = 1;
-     */
-    wrapper?: EmojiLikeToOthersWrapper2;
-}
-/**
- * @generated from protobuf message SysMessage.EmojiLikeToOthersWrapper2
- */
-export interface EmojiLikeToOthersWrapper2 {
-    /**
-     * @generated from protobuf field: SysMessage.EmojiLikeToOthersWrapper3 body = 1;
-     */
-    body?: EmojiLikeToOthersWrapper3;
-}
-/**
- * @generated from protobuf message SysMessage.EmojiLikeToOthersWrapper3
- */
-export interface EmojiLikeToOthersWrapper3 {
-    /**
-     * @generated from protobuf field: SysMessage.EmojiLikeToOthersMsgSpec msgSpec = 2;
-     */
-    msgSpec?: EmojiLikeToOthersMsgSpec;
-    /**
-     * @generated from protobuf field: SysMessage.EmojiLikeToOthersAttributes attributes = 3;
-     */
-    attributes?: EmojiLikeToOthersAttributes;
-}
-/**
- * @generated from protobuf message SysMessage.EmojiLikeToOthersMsgSpec
- */
-export interface EmojiLikeToOthersMsgSpec {
-    /**
-     * @generated from protobuf field: uint32 msgSeq = 1;
-     */
-    msgSeq: number;
-}
-/**
- * @generated from protobuf message SysMessage.EmojiLikeToOthersAttributes
- */
-export interface EmojiLikeToOthersAttributes {
-    /**
-     * @generated from protobuf field: string emojiId = 1;
-     */
-    emojiId: string;
-    /**
-     * @generated from protobuf field: string senderUid = 4;
-     */
-    senderUid: string;
-}
-// @generated message type with reflection information, may provide speed optimized methods
-class EmojiLikeToOthersWrapper1$Type extends MessageType<EmojiLikeToOthersWrapper1> {
-    constructor() {
-        super("SysMessage.EmojiLikeToOthersWrapper1", [
-            { no: 1, name: "wrapper", kind: "message", T: () => EmojiLikeToOthersWrapper2 }
-        ]);
-    }
-    create(value?: PartialMessage<EmojiLikeToOthersWrapper1>): EmojiLikeToOthersWrapper1 {
-        const message = globalThis.Object.create((this.messagePrototype!));
-        if (value !== undefined)
-            reflectionMergePartial<EmojiLikeToOthersWrapper1>(this, message, value);
-        return message;
-    }
-    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: EmojiLikeToOthersWrapper1): EmojiLikeToOthersWrapper1 {
-        let message = target ?? this.create(), end = reader.pos + length;
-        while (reader.pos < end) {
-            let [fieldNo, wireType] = reader.tag();
-            switch (fieldNo) {
-                case /* SysMessage.EmojiLikeToOthersWrapper2 wrapper */ 1:
-                    message.wrapper = EmojiLikeToOthersWrapper2.internalBinaryRead(reader, reader.uint32(), options, message.wrapper);
-                    break;
-                default:
-                    let u = options.readUnknownField;
-                    if (u === "throw")
-                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
-                    let d = reader.skip(wireType);
-                    if (u !== false)
-                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
-            }
-        }
-        return message;
-    }
-    internalBinaryWrite(message: EmojiLikeToOthersWrapper1, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
-        /* SysMessage.EmojiLikeToOthersWrapper2 wrapper = 1; */
-        if (message.wrapper)
-            EmojiLikeToOthersWrapper2.internalBinaryWrite(message.wrapper, writer.tag(1, WireType.LengthDelimited).fork(), options).join();
-        let u = options.writeUnknownFields;
-        if (u !== false)
-            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
-        return writer;
-    }
-}
-/**
- * @generated MessageType for protobuf message SysMessage.EmojiLikeToOthersWrapper1
- */
-export const EmojiLikeToOthersWrapper1 = new EmojiLikeToOthersWrapper1$Type();
-// @generated message type with reflection information, may provide speed optimized methods
-class EmojiLikeToOthersWrapper2$Type extends MessageType<EmojiLikeToOthersWrapper2> {
-    constructor() {
-        super("SysMessage.EmojiLikeToOthersWrapper2", [
-            { no: 1, name: "body", kind: "message", T: () => EmojiLikeToOthersWrapper3 }
-        ]);
-    }
-    create(value?: PartialMessage<EmojiLikeToOthersWrapper2>): EmojiLikeToOthersWrapper2 {
-        const message = globalThis.Object.create((this.messagePrototype!));
-        if (value !== undefined)
-            reflectionMergePartial<EmojiLikeToOthersWrapper2>(this, message, value);
-        return message;
-    }
-    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: EmojiLikeToOthersWrapper2): EmojiLikeToOthersWrapper2 {
-        let message = target ?? this.create(), end = reader.pos + length;
-        while (reader.pos < end) {
-            let [fieldNo, wireType] = reader.tag();
-            switch (fieldNo) {
-                case /* SysMessage.EmojiLikeToOthersWrapper3 body */ 1:
-                    message.body = EmojiLikeToOthersWrapper3.internalBinaryRead(reader, reader.uint32(), options, message.body);
-                    break;
-                default:
-                    let u = options.readUnknownField;
-                    if (u === "throw")
-                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
-                    let d = reader.skip(wireType);
-                    if (u !== false)
-                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
-            }
-        }
-        return message;
-    }
-    internalBinaryWrite(message: EmojiLikeToOthersWrapper2, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
-        /* SysMessage.EmojiLikeToOthersWrapper3 body = 1; */
-        if (message.body)
-            EmojiLikeToOthersWrapper3.internalBinaryWrite(message.body, writer.tag(1, WireType.LengthDelimited).fork(), options).join();
-        let u = options.writeUnknownFields;
-        if (u !== false)
-            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
-        return writer;
-    }
-}
-/**
- * @generated MessageType for protobuf message SysMessage.EmojiLikeToOthersWrapper2
- */
-export const EmojiLikeToOthersWrapper2 = new EmojiLikeToOthersWrapper2$Type();
-// @generated message type with reflection information, may provide speed optimized methods
-class EmojiLikeToOthersWrapper3$Type extends MessageType<EmojiLikeToOthersWrapper3> {
-    constructor() {
-        super("SysMessage.EmojiLikeToOthersWrapper3", [
-            { no: 2, name: "msgSpec", kind: "message", T: () => EmojiLikeToOthersMsgSpec },
-            { no: 3, name: "attributes", kind: "message", T: () => EmojiLikeToOthersAttributes }
-        ]);
-    }
-    create(value?: PartialMessage<EmojiLikeToOthersWrapper3>): EmojiLikeToOthersWrapper3 {
-        const message = globalThis.Object.create((this.messagePrototype!));
-        if (value !== undefined)
-            reflectionMergePartial<EmojiLikeToOthersWrapper3>(this, message, value);
-        return message;
-    }
-    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: EmojiLikeToOthersWrapper3): EmojiLikeToOthersWrapper3 {
-        let message = target ?? this.create(), end = reader.pos + length;
-        while (reader.pos < end) {
-            let [fieldNo, wireType] = reader.tag();
-            switch (fieldNo) {
-                case /* SysMessage.EmojiLikeToOthersMsgSpec msgSpec */ 2:
-                    message.msgSpec = EmojiLikeToOthersMsgSpec.internalBinaryRead(reader, reader.uint32(), options, message.msgSpec);
-                    break;
-                case /* SysMessage.EmojiLikeToOthersAttributes attributes */ 3:
-                    message.attributes = EmojiLikeToOthersAttributes.internalBinaryRead(reader, reader.uint32(), options, message.attributes);
-                    break;
-                default:
-                    let u = options.readUnknownField;
-                    if (u === "throw")
-                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
-                    let d = reader.skip(wireType);
-                    if (u !== false)
-                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
-            }
-        }
-        return message;
-    }
-    internalBinaryWrite(message: EmojiLikeToOthersWrapper3, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
-        /* SysMessage.EmojiLikeToOthersMsgSpec msgSpec = 2; */
-        if (message.msgSpec)
-            EmojiLikeToOthersMsgSpec.internalBinaryWrite(message.msgSpec, writer.tag(2, WireType.LengthDelimited).fork(), options).join();
-        /* SysMessage.EmojiLikeToOthersAttributes attributes = 3; */
-        if (message.attributes)
-            EmojiLikeToOthersAttributes.internalBinaryWrite(message.attributes, writer.tag(3, WireType.LengthDelimited).fork(), options).join();
-        let u = options.writeUnknownFields;
-        if (u !== false)
-            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
-        return writer;
-    }
-}
-/**
- * @generated MessageType for protobuf message SysMessage.EmojiLikeToOthersWrapper3
- */
-export const EmojiLikeToOthersWrapper3 = new EmojiLikeToOthersWrapper3$Type();
-// @generated message type with reflection information, may provide speed optimized methods
-class EmojiLikeToOthersMsgSpec$Type extends MessageType<EmojiLikeToOthersMsgSpec> {
-    constructor() {
-        super("SysMessage.EmojiLikeToOthersMsgSpec", [
-            { no: 1, name: "msgSeq", kind: "scalar", T: 13 /*ScalarType.UINT32*/ }
-        ]);
-    }
-    create(value?: PartialMessage<EmojiLikeToOthersMsgSpec>): EmojiLikeToOthersMsgSpec {
-        const message = globalThis.Object.create((this.messagePrototype!));
-        message.msgSeq = 0;
-        if (value !== undefined)
-            reflectionMergePartial<EmojiLikeToOthersMsgSpec>(this, message, value);
-        return message;
-    }
-    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: EmojiLikeToOthersMsgSpec): EmojiLikeToOthersMsgSpec {
-        let message = target ?? this.create(), end = reader.pos + length;
-        while (reader.pos < end) {
-            let [fieldNo, wireType] = reader.tag();
-            switch (fieldNo) {
-                case /* uint32 msgSeq */ 1:
-                    message.msgSeq = reader.uint32();
-                    break;
-                default:
-                    let u = options.readUnknownField;
-                    if (u === "throw")
-                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
-                    let d = reader.skip(wireType);
-                    if (u !== false)
-                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
-            }
-        }
-        return message;
-    }
-    internalBinaryWrite(message: EmojiLikeToOthersMsgSpec, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
-        /* uint32 msgSeq = 1; */
-        if (message.msgSeq !== 0)
-            writer.tag(1, WireType.Varint).uint32(message.msgSeq);
-        let u = options.writeUnknownFields;
-        if (u !== false)
-            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
-        return writer;
-    }
-}
-/**
- * @generated MessageType for protobuf message SysMessage.EmojiLikeToOthersMsgSpec
- */
-export const EmojiLikeToOthersMsgSpec = new EmojiLikeToOthersMsgSpec$Type();
-// @generated message type with reflection information, may provide speed optimized methods
-class EmojiLikeToOthersAttributes$Type extends MessageType<EmojiLikeToOthersAttributes> {
-    constructor() {
-        super("SysMessage.EmojiLikeToOthersAttributes", [
-            { no: 1, name: "emojiId", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
-            { no: 4, name: "senderUid", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
-        ]);
-    }
-    create(value?: PartialMessage<EmojiLikeToOthersAttributes>): EmojiLikeToOthersAttributes {
-        const message = globalThis.Object.create((this.messagePrototype!));
-        message.emojiId = "";
-        message.senderUid = "";
-        if (value !== undefined)
-            reflectionMergePartial<EmojiLikeToOthersAttributes>(this, message, value);
-        return message;
-    }
-    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: EmojiLikeToOthersAttributes): EmojiLikeToOthersAttributes {
-        let message = target ?? this.create(), end = reader.pos + length;
-        while (reader.pos < end) {
-            let [fieldNo, wireType] = reader.tag();
-            switch (fieldNo) {
-                case /* string emojiId */ 1:
-                    message.emojiId = reader.string();
-                    break;
-                case /* string senderUid */ 4:
-                    message.senderUid = reader.string();
-                    break;
-                default:
-                    let u = options.readUnknownField;
-                    if (u === "throw")
-                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
-                    let d = reader.skip(wireType);
-                    if (u !== false)
-                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
-            }
-        }
-        return message;
-    }
-    internalBinaryWrite(message: EmojiLikeToOthersAttributes, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
-        /* string emojiId = 1; */
-        if (message.emojiId !== "")
-            writer.tag(1, WireType.LengthDelimited).string(message.emojiId);
-        /* string senderUid = 4; */
-        if (message.senderUid !== "")
-            writer.tag(4, WireType.LengthDelimited).string(message.senderUid);
-        let u = options.writeUnknownFields;
-        if (u !== false)
-            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
-        return writer;
-    }
-}
-/**
- * @generated MessageType for protobuf message SysMessage.EmojiLikeToOthersAttributes
- */
-export const EmojiLikeToOthersAttributes = new EmojiLikeToOthersAttributes$Type();
@@ -1,104 +0,0 @@
-// @generated by protobuf-ts 2.9.4
-// @generated from protobuf file "GreyTipWrapper.proto" (package "SysMessage", syntax proto3)
-// tslint:disable
-import type { BinaryWriteOptions } from "@protobuf-ts/runtime";
-import type { IBinaryWriter } from "@protobuf-ts/runtime";
-import { WireType } from "@protobuf-ts/runtime";
-import type { BinaryReadOptions } from "@protobuf-ts/runtime";
-import type { IBinaryReader } from "@protobuf-ts/runtime";
-import { UnknownFieldHandler } from "@protobuf-ts/runtime";
-import type { PartialMessage } from "@protobuf-ts/runtime";
-import { reflectionMergePartial } from "@protobuf-ts/runtime";
-import { MessageType } from "@protobuf-ts/runtime";
-/**
- * @generated from protobuf message SysMessage.GreyTipWrapper
- */
-export interface GreyTipWrapper {
-    /**
-     * @generated from protobuf field: uint32 subTypeId = 1;
-     */
-    subTypeId: number;
-    /**
-     * @generated from protobuf field: uint32 groupCode = 4;
-     */
-    groupCode: number;
-    /**
-     * @generated from protobuf field: uint32 subTypeIdMinusOne = 13;
-     */
-    subTypeIdMinusOne: number;
-    /**
-     * @generated from protobuf field: bytes rest = 44;
-     */
-    rest: Uint8Array;
-}
-// @generated message type with reflection information, may provide speed optimized methods
-class GreyTipWrapper$Type extends MessageType<GreyTipWrapper> {
-    constructor() {
-        super("SysMessage.GreyTipWrapper", [
-            { no: 1, name: "subTypeId", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
-            { no: 4, name: "groupCode", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
-            { no: 13, name: "subTypeIdMinusOne", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
-            { no: 44, name: "rest", kind: "scalar", T: 12 /*ScalarType.BYTES*/ }
-        ]);
-    }
-    create(value?: PartialMessage<GreyTipWrapper>): GreyTipWrapper {
-        const message = globalThis.Object.create((this.messagePrototype!));
-        message.subTypeId = 0;
-        message.groupCode = 0;
-        message.subTypeIdMinusOne = 0;
-        message.rest = new Uint8Array(0);
-        if (value !== undefined)
-            reflectionMergePartial<GreyTipWrapper>(this, message, value);
-        return message;
-    }
-    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: GreyTipWrapper): GreyTipWrapper {
-        let message = target ?? this.create(), end = reader.pos + length;
-        while (reader.pos < end) {
-            let [fieldNo, wireType] = reader.tag();
-            switch (fieldNo) {
-                case /* uint32 subTypeId */ 1:
-                    message.subTypeId = reader.uint32();
-                    break;
-                case /* uint32 groupCode */ 4:
-                    message.groupCode = reader.uint32();
-                    break;
-                case /* uint32 subTypeIdMinusOne */ 13:
-                    message.subTypeIdMinusOne = reader.uint32();
-                    break;
-                case /* bytes rest */ 44:
-                    message.rest = reader.bytes();
-                    break;
-                default:
-                    let u = options.readUnknownField;
-                    if (u === "throw")
-                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
-                    let d = reader.skip(wireType);
-                    if (u !== false)
-                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
-            }
-        }
-        return message;
-    }
-    internalBinaryWrite(message: GreyTipWrapper, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
-        /* uint32 subTypeId = 1; */
-        if (message.subTypeId !== 0)
-            writer.tag(1, WireType.Varint).uint32(message.subTypeId);
-        /* uint32 groupCode = 4; */
-        if (message.groupCode !== 0)
-            writer.tag(4, WireType.Varint).uint32(message.groupCode);
-        /* uint32 subTypeIdMinusOne = 13; */
-        if (message.subTypeIdMinusOne !== 0)
-            writer.tag(13, WireType.Varint).uint32(message.subTypeIdMinusOne);
-        /* bytes rest = 44; */
-        if (message.rest.length)
-            writer.tag(44, WireType.LengthDelimited).bytes(message.rest);
-        let u = options.writeUnknownFields;
-        if (u !== false)
-            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
-        return writer;
-    }
-}
-/**
- * @generated MessageType for protobuf message SysMessage.GreyTipWrapper
- */
-export const GreyTipWrapper = new GreyTipWrapper$Type();
@@ -0,0 +1,21 @@
+import { MessageType, BinaryReader, ScalarType, BinaryWriter } from '@protobuf-ts/runtime';
+
+export const FileId = new MessageType("FileId", [
+    { no: 2, name: "sha1", kind: "scalar", T: ScalarType.BYTES },
+    { no: 4, name: "appid", kind: "scalar", T: ScalarType.UINT32 },
+]);
+
+export function encodePBFileId(message: any) {
+    return FileId.internalBinaryWrite(message, new BinaryWriter(), {
+        writerFactory: () => new BinaryWriter(),
+        writeUnknownFields: false
+    }).finish();
+}
+
+export function decodePBFileId(buffer: Uint8Array): any {
+    const reader = new BinaryReader(buffer);
+    return FileId.internalBinaryRead(reader, reader.len, {
+        readUnknownField: true,
+        readerFactory: () => new BinaryReader(buffer)
+    });
+}
@@ -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) });
+}
@@ -0,0 +1,30 @@
+import { MessageType, ScalarType, BinaryWriter } from '@protobuf-ts/runtime';
+
+export const OidbSvcTrpcTcpBase = new MessageType("oidb_svc_trpctcp_base", [
+    { no: 1, name: "command", kind: "scalar", T: ScalarType.UINT32 },
+    { no: 2, name: "subcommand", kind: "scalar", T: ScalarType.UINT32, opt: true },
+    { no: 4, name: "body", kind: "scalar", T: ScalarType.BYTES, opt: true }
+]);
+
+export const OidbSvcTrpcTcp0XED3_1 = new MessageType("oidb_svc_trpctcp_0xed3_1", [
+    { no: 1, name: "uin", kind: "scalar", T: ScalarType.UINT32 },
+    { no: 2, name: "groupuin", kind: "scalar", T: ScalarType.UINT32, opt: true },
+    { no: 5, name: "frienduin", kind: "scalar", T: ScalarType.UINT32, opt: true },
+    { no: 6, name: "ext", kind: "scalar", T: ScalarType.UINT32 }
+]);
+
+export function encodeGroupPoke(groupUin: string, PeerUin: string) {
+    let Body = OidbSvcTrpcTcp0XED3_1.toBinary
+        ({
+            uin: parseInt(PeerUin),
+            groupuin: parseInt(groupUin),
+            ext: 0
+        });
+    //console.log(Body)
+    return OidbSvcTrpcTcpBase.toBinary
+        ({
+            command: 0xed3,
+            subcommand: 1,
+            body: Body
+        });
+}
@@ -0,0 +1,58 @@
+import { MessageType, BinaryReader, ScalarType, RepeatType } from '@protobuf-ts/runtime';
+
+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 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 function decodeSysMessage(buffer: Uint8Array): any {
+    const reader = new BinaryReader(buffer);
+    return SysMessage.internalBinaryRead(reader, reader.len, { readUnknownField: true, readerFactory: () => new BinaryReader(buffer) });
+}
@@ -1,435 +0,0 @@
-// @generated by protobuf-ts 2.9.4
-// @generated from protobuf file "SysMessage.proto" (package "SysMessage", syntax proto3)
-// tslint:disable
-import type { BinaryWriteOptions } from "@protobuf-ts/runtime";
-import type { IBinaryWriter } from "@protobuf-ts/runtime";
-import { WireType } from "@protobuf-ts/runtime";
-import type { BinaryReadOptions } from "@protobuf-ts/runtime";
-import type { IBinaryReader } from "@protobuf-ts/runtime";
-import { UnknownFieldHandler } from "@protobuf-ts/runtime";
-import type { PartialMessage } from "@protobuf-ts/runtime";
-import { reflectionMergePartial } from "@protobuf-ts/runtime";
-import { MessageType } from "@protobuf-ts/runtime";
-/**
- * @generated from protobuf message SysMessage.SysMessage
- */
-export interface SysMessage {
-    /**
-     * @generated from protobuf field: repeated SysMessage.SysMessageHeader header = 1;
-     */
-    header: SysMessageHeader[];
-    /**
-     * @generated from protobuf field: repeated SysMessage.SysMessageMsgSpec msgSpec = 2;
-     */
-    msgSpec: SysMessageMsgSpec[];
-    /**
-     * @generated from protobuf field: SysMessage.SysMessageBodyWrapper bodyWrapper = 3;
-     */
-    bodyWrapper?: SysMessageBodyWrapper;
-}
-/**
- * @generated from protobuf message SysMessage.SysMessageHeader
- */
-export interface SysMessageHeader {
-    /**
-     * @generated from protobuf field: uint32 PeerNumber = 1 [json_name = "PeerNumber"];
-     */
-    peerNumber: number;
-    /**
-     * @generated from protobuf field: string PeerString = 2 [json_name = "PeerString"];
-     */
-    peerString: string;
-    /**
-     * @generated from protobuf field: uint32 Uin = 5 [json_name = "Uin"];
-     */
-    uin: number;
-    /**
-     * @generated from protobuf field: optional string Uid = 6 [json_name = "Uid"];
-     */
-    uid?: string;
-}
-/**
- * @generated from protobuf message SysMessage.SysMessageMsgSpec
- */
-export interface SysMessageMsgSpec {
-    /**
-     * @generated from protobuf field: uint32 msgType = 1;
-     */
-    msgType: number;
-    /**
-     * @generated from protobuf field: uint32 subType = 2;
-     */
-    subType: number;
-    /**
-     * @generated from protobuf field: uint32 subSubType = 3;
-     */
-    subSubType: number;
-    /**
-     * @generated from protobuf field: uint32 msgSeq = 5;
-     */
-    msgSeq: number;
-    /**
-     * @generated from protobuf field: uint32 time = 6;
-     */
-    time: number;
-    /**
-     * @generated from protobuf field: uint64 msgId = 12;
-     */
-    msgId: bigint;
-    /**
-     * @generated from protobuf field: uint32 other = 13;
-     */
-    other: number;
-}
-/**
- * @generated from protobuf message SysMessage.SysMessageBodyWrapper
- */
-export interface SysMessageBodyWrapper {
-    /**
-     * @generated from protobuf field: bytes wrappedBody = 2;
-     */
-    wrappedBody: Uint8Array; // Find the first [08], or ignore the first 7 bytes?
-    // And it becomes another ProtoBuf message.
-}
-/**
- * @generated from protobuf message SysMessage.KeyValuePair
- */
-export interface KeyValuePair {
-    /**
-     * @generated from protobuf field: string key = 1;
-     */
-    key: string;
-    /**
-     * @generated from protobuf field: string value = 2;
-     */
-    value: string;
-}
-// @generated message type with reflection information, may provide speed optimized methods
-class SysMessage$Type extends MessageType<SysMessage> {
-    constructor() {
-        super("SysMessage.SysMessage", [
-            { no: 1, name: "header", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => SysMessageHeader },
-            { no: 2, name: "msgSpec", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => SysMessageMsgSpec },
-            { no: 3, name: "bodyWrapper", kind: "message", T: () => SysMessageBodyWrapper }
-        ]);
-    }
-    create(value?: PartialMessage<SysMessage>): SysMessage {
-        const message = globalThis.Object.create((this.messagePrototype!));
-        message.header = [];
-        message.msgSpec = [];
-        if (value !== undefined)
-            reflectionMergePartial<SysMessage>(this, message, value);
-        return message;
-    }
-    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: SysMessage): SysMessage {
-        let message = target ?? this.create(), end = reader.pos + length;
-        while (reader.pos < end) {
-            let [fieldNo, wireType] = reader.tag();
-            switch (fieldNo) {
-                case /* repeated SysMessage.SysMessageHeader header */ 1:
-                    message.header.push(SysMessageHeader.internalBinaryRead(reader, reader.uint32(), options));
-                    break;
-                case /* repeated SysMessage.SysMessageMsgSpec msgSpec */ 2:
-                    message.msgSpec.push(SysMessageMsgSpec.internalBinaryRead(reader, reader.uint32(), options));
-                    break;
-                case /* SysMessage.SysMessageBodyWrapper bodyWrapper */ 3:
-                    message.bodyWrapper = SysMessageBodyWrapper.internalBinaryRead(reader, reader.uint32(), options, message.bodyWrapper);
-                    break;
-                default:
-                    let u = options.readUnknownField;
-                    if (u === "throw")
-                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
-                    let d = reader.skip(wireType);
-                    if (u !== false)
-                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
-            }
-        }
-        return message;
-    }
-    internalBinaryWrite(message: SysMessage, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
-        /* repeated SysMessage.SysMessageHeader header = 1; */
-        for (let i = 0; i < message.header.length; i++)
-            SysMessageHeader.internalBinaryWrite(message.header[i], writer.tag(1, WireType.LengthDelimited).fork(), options).join();
-        /* repeated SysMessage.SysMessageMsgSpec msgSpec = 2; */
-        for (let i = 0; i < message.msgSpec.length; i++)
-            SysMessageMsgSpec.internalBinaryWrite(message.msgSpec[i], writer.tag(2, WireType.LengthDelimited).fork(), options).join();
-        /* SysMessage.SysMessageBodyWrapper bodyWrapper = 3; */
-        if (message.bodyWrapper)
-            SysMessageBodyWrapper.internalBinaryWrite(message.bodyWrapper, writer.tag(3, WireType.LengthDelimited).fork(), options).join();
-        let u = options.writeUnknownFields;
-        if (u !== false)
-            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
-        return writer;
-    }
-}
-/**
- * @generated MessageType for protobuf message SysMessage.SysMessage
- */
-export const SysMessage = new SysMessage$Type();
-// @generated message type with reflection information, may provide speed optimized methods
-class SysMessageHeader$Type extends MessageType<SysMessageHeader> {
-    constructor() {
-        super("SysMessage.SysMessageHeader", [
-            { no: 1, name: "PeerNumber", kind: "scalar", jsonName: "PeerNumber", T: 13 /*ScalarType.UINT32*/ },
-            { no: 2, name: "PeerString", kind: "scalar", jsonName: "PeerString", T: 9 /*ScalarType.STRING*/ },
-            { no: 5, name: "Uin", kind: "scalar", jsonName: "Uin", T: 13 /*ScalarType.UINT32*/ },
-            { no: 6, name: "Uid", kind: "scalar", jsonName: "Uid", opt: true, T: 9 /*ScalarType.STRING*/ }
-        ]);
-    }
-    create(value?: PartialMessage<SysMessageHeader>): SysMessageHeader {
-        const message = globalThis.Object.create((this.messagePrototype!));
-        message.peerNumber = 0;
-        message.peerString = "";
-        message.uin = 0;
-        if (value !== undefined)
-            reflectionMergePartial<SysMessageHeader>(this, message, value);
-        return message;
-    }
-    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: SysMessageHeader): SysMessageHeader {
-        let message = target ?? this.create(), end = reader.pos + length;
-        while (reader.pos < end) {
-            let [fieldNo, wireType] = reader.tag();
-            switch (fieldNo) {
-                case /* uint32 PeerNumber = 1 [json_name = "PeerNumber"];*/ 1:
-                    message.peerNumber = reader.uint32();
-                    break;
-                case /* string PeerString = 2 [json_name = "PeerString"];*/ 2:
-                    message.peerString = reader.string();
-                    break;
-                case /* uint32 Uin = 5 [json_name = "Uin"];*/ 5:
-                    message.uin = reader.uint32();
-                    break;
-                case /* optional string Uid = 6 [json_name = "Uid"];*/ 6:
-                    message.uid = reader.string();
-                    break;
-                default:
-                    let u = options.readUnknownField;
-                    if (u === "throw")
-                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
-                    let d = reader.skip(wireType);
-                    if (u !== false)
-                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
-            }
-        }
-        return message;
-    }
-    internalBinaryWrite(message: SysMessageHeader, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
-        /* uint32 PeerNumber = 1 [json_name = "PeerNumber"]; */
-        if (message.peerNumber !== 0)
-            writer.tag(1, WireType.Varint).uint32(message.peerNumber);
-        /* string PeerString = 2 [json_name = "PeerString"]; */
-        if (message.peerString !== "")
-            writer.tag(2, WireType.LengthDelimited).string(message.peerString);
-        /* uint32 Uin = 5 [json_name = "Uin"]; */
-        if (message.uin !== 0)
-            writer.tag(5, WireType.Varint).uint32(message.uin);
-        /* optional string Uid = 6 [json_name = "Uid"]; */
-        if (message.uid !== undefined)
-            writer.tag(6, WireType.LengthDelimited).string(message.uid);
-        let u = options.writeUnknownFields;
-        if (u !== false)
-            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
-        return writer;
-    }
-}
-/**
- * @generated MessageType for protobuf message SysMessage.SysMessageHeader
- */
-export const SysMessageHeader = new SysMessageHeader$Type();
-// @generated message type with reflection information, may provide speed optimized methods
-class SysMessageMsgSpec$Type extends MessageType<SysMessageMsgSpec> {
-    constructor() {
-        super("SysMessage.SysMessageMsgSpec", [
-            { no: 1, name: "msgType", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
-            { no: 2, name: "subType", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
-            { no: 3, name: "subSubType", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
-            { no: 5, name: "msgSeq", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
-            { no: 6, name: "time", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
-            { no: 12, name: "msgId", kind: "scalar", T: 4 /*ScalarType.UINT64*/, L: 0 /*LongType.BIGINT*/ },
-            { no: 13, name: "other", kind: "scalar", T: 13 /*ScalarType.UINT32*/ }
-        ]);
-    }
-    create(value?: PartialMessage<SysMessageMsgSpec>): SysMessageMsgSpec {
-        const message = globalThis.Object.create((this.messagePrototype!));
-        message.msgType = 0;
-        message.subType = 0;
-        message.subSubType = 0;
-        message.msgSeq = 0;
-        message.time = 0;
-        message.msgId = 0n;
-        message.other = 0;
-        if (value !== undefined)
-            reflectionMergePartial<SysMessageMsgSpec>(this, message, value);
-        return message;
-    }
-    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: SysMessageMsgSpec): SysMessageMsgSpec {
-        let message = target ?? this.create(), end = reader.pos + length;
-        while (reader.pos < end) {
-            let [fieldNo, wireType] = reader.tag();
-            switch (fieldNo) {
-                case /* uint32 msgType */ 1:
-                    message.msgType = reader.uint32();
-                    break;
-                case /* uint32 subType */ 2:
-                    message.subType = reader.uint32();
-                    break;
-                case /* uint32 subSubType */ 3:
-                    message.subSubType = reader.uint32();
-                    break;
-                case /* uint32 msgSeq */ 5:
-                    message.msgSeq = reader.uint32();
-                    break;
-                case /* uint32 time */ 6:
-                    message.time = reader.uint32();
-                    break;
-                case /* uint64 msgId */ 12:
-                    message.msgId = reader.uint64().toBigInt();
-                    break;
-                case /* uint32 other */ 13:
-                    message.other = reader.uint32();
-                    break;
-                default:
-                    let u = options.readUnknownField;
-                    if (u === "throw")
-                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
-                    let d = reader.skip(wireType);
-                    if (u !== false)
-                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
-            }
-        }
-        return message;
-    }
-    internalBinaryWrite(message: SysMessageMsgSpec, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
-        /* uint32 msgType = 1; */
-        if (message.msgType !== 0)
-            writer.tag(1, WireType.Varint).uint32(message.msgType);
-        /* uint32 subType = 2; */
-        if (message.subType !== 0)
-            writer.tag(2, WireType.Varint).uint32(message.subType);
-        /* uint32 subSubType = 3; */
-        if (message.subSubType !== 0)
-            writer.tag(3, WireType.Varint).uint32(message.subSubType);
-        /* uint32 msgSeq = 5; */
-        if (message.msgSeq !== 0)
-            writer.tag(5, WireType.Varint).uint32(message.msgSeq);
-        /* uint32 time = 6; */
-        if (message.time !== 0)
-            writer.tag(6, WireType.Varint).uint32(message.time);
-        /* uint64 msgId = 12; */
-        if (message.msgId !== 0n)
-            writer.tag(12, WireType.Varint).uint64(message.msgId);
-        /* uint32 other = 13; */
-        if (message.other !== 0)
-            writer.tag(13, WireType.Varint).uint32(message.other);
-        let u = options.writeUnknownFields;
-        if (u !== false)
-            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
-        return writer;
-    }
-}
-/**
- * @generated MessageType for protobuf message SysMessage.SysMessageMsgSpec
- */
-export const SysMessageMsgSpec = new SysMessageMsgSpec$Type();
-// @generated message type with reflection information, may provide speed optimized methods
-class SysMessageBodyWrapper$Type extends MessageType<SysMessageBodyWrapper> {
-    constructor() {
-        super("SysMessage.SysMessageBodyWrapper", [
-            { no: 2, name: "wrappedBody", kind: "scalar", T: 12 /*ScalarType.BYTES*/ }
-        ]);
-    }
-    create(value?: PartialMessage<SysMessageBodyWrapper>): SysMessageBodyWrapper {
-        const message = globalThis.Object.create((this.messagePrototype!));
-        message.wrappedBody = new Uint8Array(0);
-        if (value !== undefined)
-            reflectionMergePartial<SysMessageBodyWrapper>(this, message, value);
-        return message;
-    }
-    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: SysMessageBodyWrapper): SysMessageBodyWrapper {
-        let message = target ?? this.create(), end = reader.pos + length;
-        while (reader.pos < end) {
-            let [fieldNo, wireType] = reader.tag();
-            switch (fieldNo) {
-                case /* bytes wrappedBody */ 2:
-                    message.wrappedBody = reader.bytes();
-                    break;
-                default:
-                    let u = options.readUnknownField;
-                    if (u === "throw")
-                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
-                    let d = reader.skip(wireType);
-                    if (u !== false)
-                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
-            }
-        }
-        return message;
-    }
-    internalBinaryWrite(message: SysMessageBodyWrapper, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
-        /* bytes wrappedBody = 2; */
-        if (message.wrappedBody.length)
-            writer.tag(2, WireType.LengthDelimited).bytes(message.wrappedBody);
-        let u = options.writeUnknownFields;
-        if (u !== false)
-            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
-        return writer;
-    }
-}
-/**
- * @generated MessageType for protobuf message SysMessage.SysMessageBodyWrapper
- */
-export const SysMessageBodyWrapper = new SysMessageBodyWrapper$Type();
-// @generated message type with reflection information, may provide speed optimized methods
-class KeyValuePair$Type extends MessageType<KeyValuePair> {
-    constructor() {
-        super("SysMessage.KeyValuePair", [
-            { no: 1, name: "key", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
-            { no: 2, name: "value", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
-        ]);
-    }
-    create(value?: PartialMessage<KeyValuePair>): KeyValuePair {
-        const message = globalThis.Object.create((this.messagePrototype!));
-        message.key = "";
-        message.value = "";
-        if (value !== undefined)
-            reflectionMergePartial<KeyValuePair>(this, message, value);
-        return message;
-    }
-    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: KeyValuePair): KeyValuePair {
-        let message = target ?? this.create(), end = reader.pos + length;
-        while (reader.pos < end) {
-            let [fieldNo, wireType] = reader.tag();
-            switch (fieldNo) {
-                case /* string key */ 1:
-                    message.key = reader.string();
-                    break;
-                case /* string value */ 2:
-                    message.value = reader.string();
-                    break;
-                default:
-                    let u = options.readUnknownField;
-                    if (u === "throw")
-                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
-                    let d = reader.skip(wireType);
-                    if (u !== false)
-                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
-            }
-        }
-        return message;
-    }
-    internalBinaryWrite(message: KeyValuePair, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
-        /* string key = 1; */
-        if (message.key !== "")
-            writer.tag(1, WireType.LengthDelimited).string(message.key);
-        /* string value = 2; */
-        if (message.value !== "")
-            writer.tag(2, WireType.LengthDelimited).string(message.value);
-        let u = options.writeUnknownFields;
-        if (u !== false)
-            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
-        return writer;
-    }
-}
-/**
- * @generated MessageType for protobuf message SysMessage.KeyValuePair
- */
-export const KeyValuePair = new KeyValuePair$Type();
@@ -1,4 +1,5 @@
 export interface NodeIKernelAlbumService {
+    
    setAlbumServiceInfo(...args: any[]): unknown;// needs 3 arguments

    getMainPage(...args: any[]): unknown;// needs 2 arguments
@@ -1,7 +1,7 @@
 export interface NodeIKernelAvatarService {
-    addAvatarListener(arg: unknown): unknown;
+    addAvatarListener(listener: unknown): void;

-    removeAvatarListener(arg: unknown): unknown;
+    removeAvatarListener(listenerId: number): void;

    getAvatarPath(arg1: unknown, arg2: unknown): unknown;

@@ -1,13 +1,8 @@
 import { GeneralCallResult } from '@/core/services/common';
 import { NodeIKernelBuddyListener } from '@/core/listeners';
-
-export enum BuddyListReqType {
-    KNOMAL,
-    KLETTER
-}
+import { BuddyListReqType } from '../entities/user';

 export interface NodeIKernelBuddyService {
-    // 26702 以上
    getBuddyListV2(callFrom: string, reqType: BuddyListReqType): Promise<GeneralCallResult & {
        data: Array<{
            categoryId: number,
@@ -19,8 +14,7 @@ export interface NodeIKernelBuddyService {
        }>
    }>;

-    //26702 以上
-    getBuddyListFromCache(callFrom: string): Promise<Array<
+    getBuddyListFromCache(reqType: BuddyListReqType): Promise<Array<
        {
            categoryId: number,//9999应该跳过 那是兜底数据吧
            categorySortId: number,//排序方式
@@ -30,18 +24,13 @@ export interface NodeIKernelBuddyService {
            buddyUids: Array<string>//Uids
        }>>;

-    // 以下为原生方法
    addKernelBuddyListener(listener: NodeIKernelBuddyListener): number;

    getAllBuddyCount(): number;

-    removeKernelBuddyListener(listener: unknown): void;
+    removeKernelBuddyListener(listenerId: number): void;

-    /**
-     * @deprecated
-     * @param nocache 使用缓存
-     */
-    getBuddyList(nocache: boolean): Promise<GeneralCallResult>;
+    //getBuddyList(nocache: boolean): Promise<GeneralCallResult>;

    getBuddyNick(uid: number): string;

@@ -125,7 +114,7 @@ export interface NodeIKernelBuddyService {

    reportDoubtBuddyReqUnread(): void;

-    getBuddyRecommendContactArkJson(uid: string, phoneNumber: string): Promise<unknown>;
+    getBuddyRecommendContactArkJson(uid: string, phoneNumber: string): Promise<GeneralCallResult & { arkMsg: string }>;

    isNull(): boolean;
 }
@@ -1,9 +1,9 @@
 import { GeneralCallResult } from './common';

 export interface NodeIKernelCollectionService {
-    addKernelCollectionListener(...args: any[]): unknown;//needs 1 arguments
+    addKernelCollectionListener(...args: any[]): void;//needs 1 arguments

-    removeKernelCollectionListener(...args: any[]): unknown;//needs 1 arguments
+    removeKernelCollectionListener(listenerId: number): void;

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

    getCollectionContent(...args: any[]): unknown;//needs 5 arguments

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

    backupDatabase(...args: unknown[]): unknown;

    retrieveDatabase(...args: unknown[]): unknown;
+    
 }
@@ -1,3 +1,2 @@
 export interface NodeIKernelECDHService {
-
 }
@@ -1,5 +1,7 @@
+import { NodeIKernelFileAssistantListener } from '@/core';
+
 export interface NodeIKernelFileAssistantService {
-    addKernelFileAssistantListener(arg1: unknown[]): unknown;
+    addKernelFileAssistantListener(listener: NodeIKernelFileAssistantListener): unknown;

    removeKernelFileAssistantListener(arg1: unknown[]): unknown;

@@ -9,7 +11,7 @@ export interface NodeIKernelFileAssistantService {

    getFileSessionList(): unknown;

-    searchFile(arg1: unknown, arg2: unknown, arg3: unknown): unknown;
+    searchFile(keywords: string[], params: { resultType: number, pageLimit: number }, resultId: number): number;

    resetSearchFileSortType(arg1: unknown, arg2: unknown, arg3: unknown): unknown;

@@ -17,7 +19,7 @@ export interface NodeIKernelFileAssistantService {

    cancelSearchFile(arg1: unknown, arg2: unknown, arg3: unknown): unknown;

-    downloadFile(arg1: unknown[]): unknown;
+    downloadFile(fileIds: string[]): { result: number, errMsg: string };

    forwardFile(arg1: unknown, arg2: unknown, arg3: unknown): unknown;

@@ -32,4 +34,4 @@ export interface NodeIKernelFileAssistantService {
    saveAsWithRename(arg1: unknown, arg2: unknown, arg3: unknown): unknown;

    isNull(): boolean;
-}
+}
@@ -11,8 +11,6 @@ import {
 } from '@/core/entities';
 import { GeneralCallResult } from '@/core/services/common';

-//高版本的接口不应该随意使用 使用应该严格进行pr审核 同时部分ipc中未出现的接口不要过于依赖 应该做好数据兜底
-
 export interface NodeIKernelGroupService {
    getGroupExt0xEF0Info(enableGroupCodes: string[], bannedGroupCodes: string[], filter: GroupExt0xEF0InfoFilter, forceFetch: boolean):
        Promise<GeneralCallResult & { result: { groupExtInfos: Map<string, any> } }>;
@@ -82,11 +80,11 @@ export interface NodeIKernelGroupService {
    }): Promise<unknown>;


-    isEssenceMsg(Req: { groupCode: string, msgRandom: number, msgSeq: number }): Promise<unknown>;
+    isEssenceMsg(req: { groupCode: string, msgRandom: number, msgSeq: number }): Promise<unknown>;

-    queryCachedEssenceMsg(Req: { groupCode: string, msgRandom: number, msgSeq: number }): Promise<unknown>;
+    queryCachedEssenceMsg(req: { groupCode: string, msgRandom: number, msgSeq: number }): Promise<unknown>;

-    fetchGroupEssenceList(Req: {
+    fetchGroupEssenceList(req: {
        groupCode: string,
        pageStart: number,
        pageLimit: number
@@ -110,13 +108,12 @@ export interface NodeIKernelGroupService {

    addKernelGroupListener(listener: NodeIKernelGroupListener): number;

-    removeKernelGroupListener(listenerId: unknown): void;
+    removeKernelGroupListener(listenerId: number): void;

    createMemberListScene(groupCode: string, scene: string): string;

    destroyMemberListScene(SceneId: string): void;

-    //About Arg (a) name: lastId 根据手Q来看为object {index:?(number),uid:string}
    getNextMemberList(sceneId: string, a: undefined, num: number): Promise<{
        errCode: number, errMsg: string,
        result: { ids: string[], infos: Map<string, GroupMember>, finish: boolean, hasRobot: boolean }
@@ -182,8 +179,7 @@ export interface NodeIKernelGroupService {

    destroyGroup(groupCode: string): void;

-    //获取单屏群通知列表
-    getSingleScreenNotifies(force: boolean, start_seq: string, num: number): Promise<GeneralCallResult>;
+    getSingleScreenNotifies(doubted: boolean, start_seq: string, num: number): Promise<GeneralCallResult>;

    clearGroupNotifies(groupCode: string): void;

@@ -244,18 +240,21 @@ 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;

-    //需要提前判断是否存在 高版本新增
    addGroupEssence(param: {
        groupCode: string
        msgRandom: number,
        msgSeq: number
    }): Promise<unknown>;

-    //需要提前判断是否存在 高版本新增
    removeGroupEssence(param: {
        groupCode: string
        msgRandom: number,
@@ -1,4 +1,5 @@
 import { NodeIKernelLoginListener } from '@/core/listeners/NodeIKernelLoginListener';
+import { GeneralCallResult } from './common';

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

 export interface NodeIKernelLoginService {
-    // eslint-disable-next-line @typescript-eslint/no-misused-new
-    new(): NodeIKernelLoginService;
+    setLoginMiscData(arg0: string, value: string): unknown;
+    getMachineGuid(): string;
+
+    get(): NodeIKernelLoginService;
+
+    connect(): boolean;

    addKernelLoginListener(listener: NodeIKernelLoginListener): number;

@@ -68,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
@@ -1,7 +1,7 @@
 export interface NodeIKernelMsgBackupService {
-    addKernelMsgBackupListener(...args: any[]): unknown;// needs 1 arguments
+    addKernelMsgBackupListener(listener: unknown): number;

-    removeKernelMsgBackupListener(...args: any[]): unknown;// needs 1 arguments
+    removeKernelMsgBackupListener(listenerId: number): void;

    getMsgBackupLocation(...args: any[]): unknown;// needs 0 arguments

@@ -1,32 +1,7 @@
 import { ElementType, MessageElement, Peer, RawMessage, SendMessageElement } from '@/core/entities';
 import { NodeIKernelMsgListener } from '@/core/listeners/NodeIKernelMsgListener';
 import { GeneralCallResult } from '@/core/services/common';
-
-export interface QueryMsgsParams {
-    chatInfo: Peer,
-    filterMsgType: [],
-    filterSendersUid: string[],
-    filterMsgFromTime: string,
-    filterMsgToTime: string,
-    pageLimit: number,
-    isReverseOrder: boolean,
-    isIncludeCurrent: boolean
-}
-
-export interface TmpChatInfoApi {
-    errMsg: string;
-    result: number;
-    tmpChatInfo?: TmpChatInfo;
-}
-
-export interface TmpChatInfo {
-    chatType: number;
-    fromNick: string;
-    groupCode: string;
-    peerUid: string;
-    sessionType: number;
-    sig: string;
-}
+import { MsgReqType, QueryMsgsParams, TmpChatInfoApi } from '../entities/msg';

 export interface NodeIKernelMsgService {

@@ -76,18 +51,12 @@ export interface NodeIKernelMsgService {

    downloadOnlineStatusCommonByUrl(arg0: string, arg1: string): unknown;

-    // this.tokenType = i2;
-    // this.apnsToken = bArr;
-    // this.voipToken = bArr2;
-    // this.profileId = str;
-
    setToken(arg: unknown): unknown;

    switchForeGround(): unknown;

    switchBackGround(arg: unknown): unknown;

-    //hex
    setTokenForMqq(token: string): unknown;

    switchForeGroundForMqq(...args: unknown[]): unknown;
@@ -124,7 +93,6 @@ export interface NodeIKernelMsgService {

    forwardFile(...args: unknown[]): unknown;

-    //Array<Msg>, Peer from, Peer to
    multiForwardMsg(...args: unknown[]): unknown;

    multiForwardMsgWithComment(...args: unknown[]): unknown;
@@ -179,17 +147,15 @@ export interface NodeIKernelMsgService {
        msgList: RawMessage[]
    }>;

+    //@deprecated
    getMsgs(peer: Peer, msgId: string, count: unknown, queryOrder: boolean): Promise<unknown>;

+    //@deprecated
    getMsgsIncludeSelf(peer: Peer, msgId: string, count: number, queryOrder: boolean): Promise<GeneralCallResult & {
        msgList: RawMessage[]
    }>;

-    // this.$peer = contact;
-    // this.$msgTime = j2;
-    // this.$clientSeq = j3;
-    // this.$cnt = i2;
-
+    //@deprecated
    getMsgsWithMsgTimeAndClientSeqForC2C(...args: unknown[]): Promise<GeneralCallResult & { msgList: RawMessage[] }>;

    getMsgsWithStatus(params: {
@@ -205,7 +171,7 @@ export interface NodeIKernelMsgService {
    getMsgsBySeqRange(peer: Peer, startSeq: string, endSeq: string): Promise<GeneralCallResult & {
        msgList: RawMessage[]
    }>;
-
+    //@deprecated
    getMsgsBySeqAndCount(peer: Peer, seq: string, count: number, desc: boolean, unknownArg: boolean): Promise<GeneralCallResult & {
        msgList: RawMessage[]
    }>;
@@ -216,6 +182,8 @@ export interface NodeIKernelMsgService {

    getMsgsBySeqList(peer: Peer, seqList: string[]): Promise<GeneralCallResult & { msgList: RawMessage[] }>;

+    getMsgsExt(msgReq: MsgReqType): Promise<GeneralCallResult & { msgList: RawMessage[] }>;
+
    getSingleMsg(Peer: Peer, msgSeq: string): Promise<GeneralCallResult & { msgList: RawMessage[] }>;

    getSourceOfReplyMsg(peer: Peer, MsgId: string, SourceSeq: string): unknown;
@@ -226,7 +194,6 @@ export interface NodeIKernelMsgService {

    getSourceOfReplyMsgByClientSeqAndTime(peer: Peer, clientSeq: string, time: string): unknown;

-    //cnt clientSeq?并不是吧
    getMsgsByTypeFilter(peer: Peer, msgId: string, cnt: unknown, queryOrder: boolean, typeFilter: {
        type: number,
        subtype: Array<number>
@@ -241,49 +208,15 @@ export interface NodeIKernelMsgService {

    queryMsgsWithFilter(...args: unknown[]): unknown;

-    /**
-     * @deprecated 该函数已被标记为废弃，请使用新的替代方法。
-     * 使用过滤条件查询消息列表的版本2接口。
-     *
-     * 该函数通过一系列过滤条件来查询特定聊天中的消息列表。这些条件包括消息类型、发送者、时间范围等。
-     * 函数返回一个Promise，解析为查询结果的未知类型对象。
-     *
-     * @param MsgId 消息ID，用于特定消息的查询。
-     * @param MsgTime 消息时间，用于指定消息的时间范围。
-     * @param param 查询参数对象，包含详细的过滤条件和分页信息。
-     * @param param.chatInfo 聊天信息，包括聊天类型和对方用户ID。
-     * @param param.filterMsgType 需要过滤的消息类型数组，留空表示不过滤。
-     * @param param.filterSendersUid 需要过滤的发送者用户ID数组。
-     * @param param.filterMsgFromTime 查询消息的起始时间。
-     * @param param.filterMsgToTime 查询消息的结束时间。
-     * @param param.pageLimit 每页的消息数量限制。
-     * @param param.isReverseOrder 是否按时间顺序倒序返回消息。
-     * @param param.isIncludeCurrent 是否包含当前页码。
-     * @returns 返回一个Promise，解析为查询结果的未知类型对象。
-     */
-    queryMsgsWithFilterVer2(MsgId: string, MsgTime: string, param: QueryMsgsParams): Promise<unknown>;
+    //queryMsgsWithFilterVer2(MsgId: string, MsgTime: string, param: QueryMsgsParams): Promise<unknown>;

-    // this.chatType = i2;
-    // this.peerUid = str;
-
-    // this.chatInfo = new ChatInfo();
-    // this.filterMsgType = new ArrayList<>();
-    // this.filterSendersUid = new ArrayList<>();
-    // this.chatInfo = chatInfo;
-    // this.filterMsgType = arrayList;
-    // this.filterSendersUid = arrayList2;
-    // this.filterMsgFromTime = j2;
-    // this.filterMsgToTime = j3;
-    // this.pageLimit = i2;
-    // this.isReverseOrder = z;
-    // this.isIncludeCurrent = z2;
-    //queryMsgsWithFilterEx(0L, 0L, 0L, new QueryMsgsParams(new ChatInfo(2, str), new ArrayList(), new ArrayList(), 0L, 0L, 250, false, true))
    queryMsgsWithFilterEx(msgId: string, msgTime: string, megSeq: string, param: QueryMsgsParams): Promise<GeneralCallResult & {
        msgList: RawMessage[]
    }>;

-    //queryMsgsWithFilterEx(this.$msgId, this.$msgTime, this.$msgSeq, this.$param)
-    queryFileMsgsDesktop(...args: unknown[]): unknown;
+    queryFileMsgsDesktop(msgId: string, msgTime: string, msgSeq: string, param: QueryMsgsParams): Promise<GeneralCallResult & {
+        msgList: RawMessage[]
+    }>;

    setMsgRichInfoFlag(...args: unknown[]): unknown;

@@ -390,17 +323,11 @@ export interface NodeIKernelMsgService {

    getFileThumbSavePath(...args: unknown[]): unknown;

-    //猜测居多
-    translatePtt2Text(MsgId: string, Peer: Peer, MsgElement: unknown): unknown;
+    translatePtt2Text(msgId: string, peer: Peer, msgElement: MessageElement): unknown;

    setPttPlayedState(...args: unknown[]): unknown;

-    // NodeIQQNTWrapperSession fetchFavEmojiList [
-    //   "",
-    //   48,
-    //   true,
-    //   true
-    // ]
+    //uk1 uk2 true
    fetchFavEmojiList(str: string, num: number, uk1: boolean, uk2: boolean): Promise<GeneralCallResult & {
        emojiInfoList: Array<{
            uin: string,
@@ -469,7 +396,12 @@ export interface NodeIKernelMsgService {

    getEmojiResourcePath(...args: unknown[]): unknown;

-    JoinDragonGroupEmoji(JoinDragonGroupEmojiReq: any/*joinDragonGroupEmojiReq*/): unknown;
+    JoinDragonGroupEmoji(JoinDragonGroupEmojiReq: {
+        latestMsgSeq: string,
+        manageEmojiId: number,
+        manageMsgSeq: string,
+        peerContact: Peer
+    }): Promise<unknown>;

    getMsgAbstracts(...args: unknown[]): unknown;

@@ -496,7 +428,7 @@ export interface NodeIKernelMsgService {
    getFirstUnreadMsgSeq(args: {
        peerUid: string
        guildId: string
-    }): unknown;
+    }): Promise<unknown>;

    getFirstUnreadCommonMsg(...args: unknown[]): unknown;

@@ -590,13 +522,13 @@ export interface NodeIKernelMsgService {

    getFirstUnreadAtMsg(peer: Peer): unknown;

-    clearMsgRecords(...args: unknown[]): unknown;//设置已读后调用我觉得比较好 清理记录 现在别了
+    clearMsgRecords(...args: unknown[]): unknown;

    IsExistOldDb(...args: unknown[]): unknown;

    canImportOldDbMsg(...args: unknown[]): unknown;

-    setPowerStatus(z: boolean): unknown;
+    setPowerStatus(isPowerOn: boolean): unknown;

    canProcessDataMigration(...args: unknown[]): unknown;

@@ -626,25 +558,10 @@ export interface NodeIKernelMsgService {

    enterOrExitAio(...args: unknown[]): unknown;

-    // this.peerUid = "";
-    // this.peerNickname = "";
-    // this.fromGroupCode = "";
-    // this.sig = new byte[0];
-    // this.selfUid = "";
-    // this.selfPhone = "";
-    // this.chatType = i2;
-    // this.peerUid = str;
-    // this.peerNickname = str2;
-    // this.fromGroupCode = str3;
-    // this.sig = bArr;
-    // this.selfUid = str4;
-    // this.selfPhone = str5;
-    // this.gameSession = tempChatGameSession;
-    prepareTempChat(args: unknown): unknown;//主动临时消息 不做
+    prepareTempChat(args: unknown): unknown;

    sendSsoCmdReqByContend(cmd: string, param: string): Promise<unknown>;

-    //chattype,uid->Promise<any>
    getTempChatInfo(ChatType: number, Uid: string): Promise<TmpChatInfoApi>;

    setContactLocalTop(...args: unknown[]): unknown;
@@ -700,7 +617,7 @@ export interface NodeIKernelMsgService {
    setIKernelPublicAccountAdapter(...args: unknown[]): unknown;

    //tempChatGameSession有关
-    createUidFromTinyId(fromTinyId: string, toTinyId: string): unknown;
+    createUidFromTinyId(fromTinyId: string, toTinyId: string): string;

    dataMigrationGetDataAvaiableContactList(...args: unknown[]): unknown;

@@ -708,7 +625,6 @@ export interface NodeIKernelMsgService {

    dataMigrationStopOperation(...args: unknown[]): unknown;

-    //新的希望
    dataMigrationImportMsgPbRecord(DataMigrationMsgInfo: Array<{
        extensionData: string//"Hex"
        extraData: string //""
@@ -760,6 +676,6 @@ export interface NodeIKernelMsgService {

    getGuildMsgAbFlag(...args: unknown[]): unknown;

-    getGroupMsgStorageTime(): unknown;//这是嘛啊
+    getGroupMsgStorageTime(): unknown;

 }
@@ -1,7 +1,8 @@
 import { GeneralCallResult } from './common';

-//没扒干净 因为用不着
 export interface NodeIKernelNodeMiscService {
+    writeVersionToRegistry(version: string): void;
+
    getMiniAppPath(): unknown;

    setMiniAppVersion(version: string): unknown;
@@ -11,7 +12,4 @@ export interface NodeIKernelNodeMiscService {
    SendMiniAppMsg(arg1: string, arg2: string, arg3: string): unknown;

    startNewMiniApp(appfile: string, params: string): unknown;
-
-    // 我的计划是转发给一个新程序避免吃掉Electron_AS_Node的环境 然后重写启动MiniApp 挂载相应JS脚本 这样有个问题
-    // 需要自己转发ipc参数 然后必须处在gui环境 且完成校验破解 才能实现发包 有点抽象了
 }
@@ -1,8 +1,8 @@
 export interface NodeIKernelOnlineStatusService {

-    addKernelOnlineStatusListener(listener: unknown): void;
+    addKernelOnlineStatusListener(listener: unknown): number;

-    removeKernelOnlineStatusListener(listenerId: unknown): void;
+    removeKernelOnlineStatusListener(listenerId: number): void;

    getShouldShowAIOStatusAnimation(arg: unknown): unknown;

@@ -1,17 +1,17 @@
 import { BuddyProfileLikeReq, GeneralCallResult } from '@/core';

 export interface NodeIKernelProfileLikeService {
-    addKernelProfileLikeListener(listener: NodeIKernelProfileLikeService): void;
+    addKernelProfileLikeListener(listener: unknown): number;

-    removeKernelProfileLikeListener(listener: unknown): void;
+    removeKernelProfileLikeListener(listenerId: unknown): void;

    setBuddyProfileLike(...args: unknown[]): { result: number, errMsg: string, succCounts: number };

    getBuddyProfileLike(req: BuddyProfileLikeReq): Promise<GeneralCallResult & {
-        'info': {
-            'userLikeInfos': Array<any>,
-            'friendMaxVotes': number,
-            'start': number
+        info: {
+            userLikeInfos: Array<any>,
+            friendMaxVotes: number,
+            start: number
        }
    }>;

@@ -1,38 +1,21 @@
 import { AnyCnameRecord } from 'node:dns';
-import { BizKey, ModifyProfileParams, NodeIKernelProfileListener, SimpleInfo, UserDetailInfoByUinV2 } from '@/core';
+import { BizKey, ModifyProfileParams, NodeIKernelProfileListener, ProfileBizType, SimpleInfo, UserDetailInfoByUin, UserDetailSource } from '@/core';
 import { GeneralCallResult } from '@/core/services/common';

-export enum UserDetailSource {
-    KDB,
-    KSERVER
-}
-
-export enum ProfileBizType {
-    KALL,
-    KBASEEXTEND,
-    KVAS,
-    KQZONE,
-    KOTHER
-}
-
 export interface NodeIKernelProfileService {
+    getOtherFlag(callfrom: string, uids: string[]): Promise<Map<string, any>>;
+    
+    getVasInfo(callfrom: string, uids: string[]): Promise<Map<string, any>>;

-    getUidByUin(callfrom: string, uin: Array<string>): Promise<Map<string, string>>;//uin->uid
+    getRelationFlag(callfrom: string, uids: string[]): Promise<Map<string, any>>;
+
+    getUidByUin(callfrom: string, uin: Array<string>): Promise<Map<string, string>>;

    getUinByUid(callfrom: string, uid: Array<string>): Promise<Map<string, string>>;

-    // {
-    //   coreInfo: CoreInfo,
-    //   baseInfo: BaseInfo,
-    //   status: null,
-    //   vasInfo: null,
-    //   relationFlags: null,
-    //   otherFlags: null,
-    //   intimate: null
-    // }
    getCoreAndBaseInfo(callfrom: string, uids: string[]): Promise<Map<string, SimpleInfo>>;

-    fetchUserDetailInfo(trace: string, uids: string[], arg2: number, arg3: number[]): Promise<unknown>;
+    fetchUserDetailInfo(trace: string, uids: string[], source: UserDetailSource, bizType: ProfileBizType[]): Promise<GeneralCallResult>;

    addKernelProfileListener(listener: NodeIKernelProfileListener): number;

@@ -44,30 +27,17 @@ export interface NodeIKernelProfileService {

    enumCountryOptions(): Array<string>;

-    enumProvinceOptions(Country: string): Array<string>;
+    enumProvinceOptions(country: string): Array<string>;

-    enumCityOptions(Country: string, Province: string): unknown;
+    enumCityOptions(country: string, province: string): unknown;

    enumAreaOptions(...args: unknown[]): unknown;

-    //SimpleInfo
-    // this.uid = "";
-    // this.uid = str;
-    // this.uin = j2;
-    // this.isBuddy = z;
-    // this.coreInfo = coreInfo;
-    // this.baseInfo = baseInfo;
-    // this.status = statusInfo;
-    // this.vasInfo = vasInfo;
-    // this.relationFlags = relationFlag;
-    // this.otherFlags = otherFlag;
-    // this.intimate = intimate;
-
    modifySelfProfile(...args: unknown[]): Promise<unknown>;

    modifyDesktopMiniProfile(param: ModifyProfileParams): Promise<GeneralCallResult>;

-    setNickName(NickName: string): Promise<unknown>;
+    setNickName(nickName: string): Promise<unknown>;

    setLongNick(longNick: string): Promise<unknown>;

@@ -85,7 +55,7 @@ export interface NodeIKernelProfileService {

    getUserDetailInfoWithBizInfo(uid: string, Biz: BizKey[]): Promise<GeneralCallResult>;

-    getUserDetailInfoByUin(uin: string): Promise<UserDetailInfoByUinV2>;
+    getUserDetailInfoByUin(uin: string): Promise<UserDetailInfoByUin>;

    getZplanAvatarInfos(args: string[]): Promise<unknown>;

@@ -95,14 +65,12 @@ export interface NodeIKernelProfileService {

    getSelfStatus(): Promise<unknown>;

-    //
    setdisableEmojiShortCuts(...args: unknown[]): unknown;

    getProfileQzonePicInfo(uid: string, type: number, force: boolean): Promise<unknown>;

-    //profileService.getCoreInfo("UserRemarkServiceImpl::getStrangerRemarkByUid", arrayList);
-    getCoreInfo(name: string, arg: any[]): unknown;
+    // UserRemarkServiceImpl::getStrangerRemarkByUid []
+    getCoreInfo(sceneId: string, arg: any[]): unknown;

-    //m429253e12.getOtherFlag("FriendListInfoCache_getKernelDataAndPutCache", new ArrayList<>());
    isNull(): boolean;
 }
@@ -1,30 +1,8 @@
 import { ChatType, Peer } from '../entities';
 import { NodeIKernelRecentContactListener } from '../listeners/NodeIKernelRecentContactListener';
 import { GeneralCallResult } from './common';
+import { FSABRecentContactParams } from '../entities/contact';

-export interface FSABRecentContactParams {
-    anchorPointContact: {
-        contactId: string;
-        sortField: string;
-        pos: number;
-    },
-    relativeMoveCount: number;
-    listType: number;
-    count: number;
-    fetchOld: boolean;
-}
-
-// {
-//     "anchorPointContact": {
-//       "contactId": "",
-//       "sortField": "",
-//       "pos": 0
-//     },
-//     "relativeMoveCount": 0,
-//     "listType": 1,
-//     "count": 200,
-//     "fetchOld": true
-//   }
 export interface NodeIKernelRecentContactService {
    setGuildDisplayStatus(...args: unknown[]): unknown; // 2 arguments

@@ -36,7 +14,6 @@ export interface NodeIKernelRecentContactService {

    enterOrExitMsgList(...args: unknown[]): unknown; // 1 arguments

-    /*!---!*/
    getRecentContactListSnapShot(count: number): Promise<GeneralCallResult & {
        info: {
            errCode: number,
@@ -58,7 +35,6 @@ export interface NodeIKernelRecentContactService {

    jumpToSpecifyRecentContact(...args: unknown[]): unknown; // 1 arguments

-    /*!---!*/
    fetchAndSubscribeABatchOfRecentContact(params: FSABRecentContactParams): unknown; // 1 arguments

    addRecentContact(peer: Peer): unknown;
@@ -99,23 +99,6 @@ export interface NodeIKernelRichMediaService {

    getRichMediaFileDir(elementType: number, downType: number, isTemp: boolean): unknown;

-    // this.senderUid = "";
-    // this.peerUid = "";
-    // this.guildId = "";
-    // this.elem = new MsgElement();
-    // this.downloadType = i2;
-    // this.thumbSize = i3;
-    // this.msgId = j2;
-    // this.msgRandom = j3;
-    // this.msgSeq = j4;
-    // this.msgTime = j5;
-    // this.chatType = i4;
-    // this.senderUid = str;
-    // this.peerUid = str2;
-    // this.guildId = str3;
-    // this.elem = msgElement;
-    // this.useHttps = num;
-
    getVideoPlayUrlInVisit(arg: {
        downloadType: number,
        thumbSize: number,
@@ -131,7 +114,6 @@ export interface NodeIKernelRichMediaService {
        useHttps: boolean
    }): Promise<unknown>;

-    //arg双端number
    isFileExpired(arg: number): unknown;

    deleteGroupFolder(GroupCode: string, FolderId: string): Promise<GeneralCallResult & {
@@ -154,8 +136,7 @@ export interface NodeIKernelRichMediaService {
        useHttps: boolean
    }): unknown;

-    //arg3为“”
-    downloadFileForModelId(peer: Peer, ModelId: string[]): Promise<unknown>;
+    downloadFileForModelId(peer: Peer, ModelId: string[], unknown: string): Promise<unknown>;

    //第三个参数 Array<Type>
    // this.fileId = "";
@@ -1,13 +1,20 @@
 import { ChatType } from '../entities';
+import { GeneralCallResult } from './common';

 export interface NodeIKernelSearchService {
-    addKernelSearchListener(...args: any[]): unknown;// needs 1 arguments

-    removeKernelSearchListener(...args: any[]): unknown;// needs 1 arguments
+    addKernelSearchListener(listener: unknown): number;

-    searchStranger(...args: any[]): unknown;// needs 3 arguments
+    removeKernelSearchListener(listenerId: number): void;

-    searchGroup(...args: any[]): unknown;// needs 1 arguments
+    searchStranger(unknown: string, searchStranger: unknown, searchParams: unknown): Promise<unknown>;
+
+    searchGroup(param: {
+        keyWords: string,
+        groupNum: number,
+        exactSearch: boolean,
+        penetrate: string
+    }): Promise<GeneralCallResult>;// needs 1 arguments

    searchLocalInfo(keywords: string, unknown: number/*4*/): unknown;

@@ -125,4 +132,5 @@ export interface NodeIKernelSearchService {
    searchCache(...args: any[]): unknown;// needs 3 arguments

    clearSearchCache(...args: any[]): unknown;// needs 1 arguments
+
 }
@@ -3,9 +3,9 @@ import { GeneralCallResult } from './common';

 export interface NodeIKernelStorageCleanService {

-    addKernelStorageCleanListener(Listener: NodeIKernelStorageCleanListener): number;
+    addKernelStorageCleanListener(listener: NodeIKernelStorageCleanListener): number;

-    removeKernelStorageCleanListener(ListenerId: number): void;
+    removeKernelStorageCleanListener(listenerId: number): void;

    addCacheScanedPaths(arg: unknown): unknown;

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

-    removeKernelTianShuListener(...args: any[]): unknown;// needs 1 arguments
-
-    requesTianShuNumeralRe(...args: any[]): unknown;//d needs 1 arguments
+    removeKernelTianShuListener(listenerId:number): void;

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

@@ -2,9 +2,9 @@ import { ForceFetchClientKeyRetType } from './common';

 export interface NodeIKernelTicketService {

-    addKernelTicketListener(listener: unknown): void;
+    addKernelTicketListener(listener: unknown): number;

-    removeKernelTicketListener(listenerId: unknown): void;
+    removeKernelTicketListener(listenerId: number): void;

    forceFetchClientKey(arg: string): Promise<ForceFetchClientKeyRetType>;

@@ -2,7 +2,7 @@ import { GeneralCallResult } from './common';

 export interface NodeIKernelTipOffService {

-    addKernelTipOffListener(listener: unknown): void;
+    addKernelTipOffListener(listener: unknown): number;

    removeKernelTipOffListener(listenerId: unknown): void;

@@ -10,7 +10,7 @@ export interface NodeIKernelTipOffService {

    getPskey(domainList: string[], nocache: boolean): Promise<GeneralCallResult & {
        domainPskeyMap: Map<string, string>
-    }>;//2
+    }>;

    tipOffSendJsData(args: unknown[]): Promise<unknown>;//2

@@ -1,15 +1,17 @@
 export interface NodeIKernelUnitedConfigService {
-    addKernelUnitedConfigListener(...args: any[]): unknown;// needs 1 arguments

-    removeKernelUnitedConfigListener(...args: any[]): unknown;// needs 1 arguments
+    addKernelUnitedConfigListener(listener:unknown): number;

-    fetchUnitedCommendConfig(...args: any[]): unknown;// needs 1 arguments
+    removeKernelUnitedConfigListener(listenerId:number): void;

    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>
+
 }
@@ -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;
+}
@@ -1,5 +1,5 @@
-// public interface IYellowFaceForManagerService extends QRouteApi {
-//     void download(@NotNull String resourceConfigJson, @NotNull String resourceDir, @NotNull String cacheDir, boolean force, @NotNull IKernelYellowFaceDownloadCallback callback);
+export interface NodeIYellowFaceService {
+    download(resourceConfigJson: string, resourceDir: string, cacheDir: string, force: boolean): void;

-//     void setHistory(@NotNull String fullMd5, @NotNull IOperateCallback callback);
-// }
+    setHistory(fullMd5: string): void;
+}
@@ -1,6 +1,7 @@
 import { MessageElement, Peer } from '../entities';

 export interface NodeIkernelTestPerformanceService {
+
    insertMsg(MsgParam: {
        peer: Peer
        msgTime: string
@@ -1,6 +1,5 @@
 export enum GeneralCallResultStatus {
-    OK = 0,
-    // ERROR = 1,
+    OK = 0
 }

 export interface GeneralCallResult {
@@ -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;
@@ -143,8 +144,7 @@ export interface NodeQQNTWrapperUtil {
 }

 export interface NodeIQQNTWrapperSession {
-    // eslint-disable-next-line @typescript-eslint/no-misused-new
-    new(): NodeIQQNTWrapperSession;
+    create(): NodeIQQNTWrapperSession;

    init(
        wrapperSessionInitConfig: WrapperSessionInitConfig,
@@ -250,11 +250,11 @@ export interface NodeIQQNTWrapperSession {

 export interface EnginInitDesktopConfig {
    base_path_prefix: string;
-    platform_type: 3;
+    platform_type: PlatformType;
    app_type: 4;
    app_version: string;
    os_version: string;
-    use_xlog: true;
+    use_xlog: boolean;
    qua: string;
    global_path_config: {
        desktopGlobalPath: string;
@@ -263,28 +263,26 @@ export interface EnginInitDesktopConfig {
 }

 export interface NodeIQQNTWrapperEngine {
-    // eslint-disable-next-line @typescript-eslint/no-misused-new
-    new(): NodeIQQNTWrapperEngine;
+    get(): NodeIQQNTWrapperEngine;

    initWithDeskTopConfig(config: EnginInitDesktopConfig, nodeIGlobalAdapter: NodeIGlobalAdapter): void;
 }

 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 {
@@ -2,8 +2,7 @@ import { NapCatPathWrapper } from '@/common/path';
 import { LogWrapper } from '@/common/log';
 import { proxiedListenerOf } from '@/common/proxy-handler';
 import { QQBasicInfoWrapper } from '@/common/qq-basic-info';
-import { loadQQWrapper, NapCatCore, NapCatCoreWorkingEnv } from '@/core';
-import { InstanceContext } from '@/core';
+import { InstanceContext, loadQQWrapper, NapCatCore, NapCatCoreWorkingEnv } from '@/core';
 import { SelfInfo } from '@/core/entities';
 import { NodeIKernelLoginListener } from '@/core/listeners';
 import { NodeIKernelLoginService } from '@/core/services';
@@ -50,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);
 }