fix: fluent-ffmpeg

feat: add `emoji_package_id` for MarketFace

.eslintrc.cjs

@@ -1,64 +0,0 @@
-module.exports = {
-    'env': {
-        'browser': true,
-        'es2021': true,
-        'node': true
-    },
-    'ignorePatterns': ['src/core/proto/'],
-    'extends': [
-        'eslint:recommended',
-        'plugin:@typescript-eslint/recommended'
-    ],
-    'overrides': [
-        {
-            'env': {
-                'node': true
-            },
-            'files': [
-                '.eslintrc.{js,cjs}'
-            ],
-            'parserOptions': {
-                'sourceType': 'script'
-            }
-        }
-    ],
-    'parser': '@typescript-eslint/parser',
-    'parserOptions': {
-        'ecmaVersion': 'latest',
-        'sourceType': 'module'
-    },
-    'plugins': [
-        '@typescript-eslint',
-        'import'
-    ],
-    'settings': {
-        'import/parsers': {
-            '@typescript-eslint/parser': ['.ts']
-        },
-        'import/resolver': {
-            'typescript': {
-                'alwaysTryTypes': true
-            }
-        }
-    },
-    'rules': {
-        'indent': [
-            'error',
-            4
-        ],
-        'linebreak-style': [
-            'error',
-            'unix'
-        ],
-        'semi': [
-            'error',
-            'always'
-        ],
-        'no-unused-vars': 'off',
-        'no-async-promise-executor': 'off',
-        '@typescript-eslint/no-explicit-any': 'off',
-        '@typescript-eslint/no-unused-vars': 'off',
-        '@typescript-eslint/no-var-requires': 'off',
-        'object-curly-spacing': ['error', 'always'],
-    }
-};

.github/workflows/build.yml

@@ -1,5 +1,8 @@
 name: "Build Action"
 on:
+  push:
+    branches:
+      - main
   workflow_dispatch:
 
 permissions: write-all

.github/workflows/release.yml

@@ -93,15 +93,18 @@ jobs:
     needs: [Build-LiteLoader,Build-Shell]
     runs-on: ubuntu-latest
     steps:
+
+    - name: Clone Main Repository
+      uses: actions/checkout@v4
+      with:
+            repository: 'NapNeko/NapCatQQ'
+            submodules: true
+            ref: main
+            token: ${{ secrets.NAPCAT_BUILD }}
+
     - name: Download All Artifact
       uses: actions/download-artifact@v4
-    # - name: Compress subdirectories
+      
-    #   run: |
-    #     cd ./NapCat.Shell/
-    #     zip -q -r NapCat.Shell.zip *
-    #     cd ..
-    #     rm ./NapCat.Shell.zip -rf
-    #     mv ./NapCat.Shell/NapCat.Shell.zip ./
     - name: Compress subdirectories
       run: |
         cd ./NapCat.Shell/
@@ -114,6 +117,16 @@ jobs:
         rm ./NapCat.Framework.zip -rf
         mv ./NapCat.Shell/NapCat.Shell.zip ./
         mv ./NapCat.Framework/NapCat.Framework.zip ./
+
+        mkdir ./NapCat.Framework.Windows.Once
+        unzip -q ./external/LiteLoaderWrapper.zip -d ./NapCat.Framework.Windows.Once
+        cd ./NapCat.Framework.Windows.Once
+        ls 
+        mkdir -p ./LL/plugins/NapCatQQ
+        unzip -q ../NapCat.Framework.zip -d ./LL/plugins/NapCatQQ
+        zip -q -r NapCat.Framework.Windows.Once.zip *
+        cd ..
+        mv ./NapCat.Framework.Windows.Once/NapCat.Framework.Windows.Once.zip ./
     - name: Extract version from tag
       run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
       
@@ -129,4 +142,5 @@ jobs:
         files: |
           NapCat.Framework.zip
           NapCat.Shell.zip
+          NapCat.Framework.Windows.Once.zip
         draft: true

README.md

@@ -1,43 +1,50 @@
 <div align="center">
-  <img src="https://socialify.git.ci/NapNeko/NapCatQQ/image?description=1&language=1&logo=https%3A%2F%2Fraw.githubusercontent.com%2FNapNeko%2FNapCatQQ%2Fmain%2Flogo.png&name=1&stargazers=1&theme=Auto" alt="NapCatQQ" width="640" height="320" />
+  
+  ![Logo](https://socialify.git.ci/NapNeko/NapCatQQ/image?font=Jost&logo=https%3A%2F%2Fnapneko.github.io%2Fassets%2Flogo.png&name=1&owner=1&pattern=Diagonal%20Stripes&stargazers=1&theme=Auto)
+  
 </div>
 
 ---
-## 欢迎回来
+## 欢迎回家
-NapCatQQ (aka 猫猫框架) 是现代化的基于 NTQQ 的 Bot 协议端实现。
+NapCatQQ 是现代化的基于 NTQQ 的 Bot 协议端实现
 
-## 猫猫技能
+## 碎碎叨叨
-- [x] **高性能**：1K+ 群聊数目、20 线程并行发送消息毫无压力 
+- [x] **安装简单**：就算是笨蛋也能使用
-- [x] **多种启动方式**：支持以无头、LiteLoader 插件、仅 QQ GUI 三种方式启动
+- [x] **性能友好**：就算是低内存也能使用
-- [x] **多平台支持**: 覆盖 Windows / Linux (可选 Docker) / Android Termux / MacOS
+- [x] **接口丰富**：就算是没有也能使用
-- [x] **安装简单**: 支持一键脚本/程序自动部署/镜像部署等多种覆盖范围
+- [x] **稳定好用**：就算是被捉也能使用
-- [x] **低占用**：无头模式占用资源极低，适合在服务器上运行
-- [x] **超多接口**：实现大部分 OneBot 和 go-cqhttp 接口，超多扩展 API
-- [x] **WebUI**：自带 WebUI 支持，远程管理更加便捷
-- [x] **低故障率**：快速适配最新版本，日常保证 0 Issue
 
-## 使用猫猫
+## 使用框架
 
 可前往 [Release](https://github.com/NapNeko/NapCatQQ/releases/) 页面下载最新版本
 
-**首次使用**请务必前往[官方文档](https://napneko.github.io/)查看使用教程。
+**首次使用**请务必查看如下文档看使用教程
 
+### 文档地址
+
+[Cloudflare.Worker](https://doc.napneko.icu/)
+
+[Cloudflare.HKServer](https://napcat.napneko.icu/)
+
+[Cloudflare.Pages](https://napneko.pages.dev/)
+
+[Server.China](https://napneko.com/)
+
+[Server.Other](https://napcat.cyou/)
+
+[Github.IO](https://napneko.github.io/)
 ## 回家旅途
 [QQ Group](https://qm.qq.com/q/VfjAq5HIMS)
 
-[Telegram Link](https://t.me/+nLZEnpne-pQ1OWFl)
+## 感谢他们
+感谢 [LLOneBot](https://github.com/LLOneBot/LLOneBot) 
 
-## 猫猫朋友
+感谢 [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持 参考部分代码 已获授权
-感谢 [LLOneBot](https://github.com/LLOneBot/LLOneBot) 提供部分参考
-
-感谢 [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持
 
 不过最最重要的 还是需要感谢屏幕前的你哦~
 
 ---
 
-## 约法三章
+## 开源附加
-> [!CAUTION]\
-> **请不要在 QQ 官方群聊和任何影响力较大的简中互联网平台（包括但不限于: 哔哩哔哩，微博，知乎，抖音等）发布和讨论*任何*与本项目存在相关性的信息**
 
-任何使用本仓库代码的地方，都应当严格遵守[本仓库开源许可](./LICENSE)。**此外，禁止任何项目未经授权二次分发或基于 NapCat 代码开发。**
+任何使用本仓库代码的地方，都应当严格遵守[本仓库开源许可](./LICENSE)。**此外，禁止任何项目未经仓库主作者授权二次分发或基于 NapCat 代码开发。**

eslint.config.mjs

@@ -0,0 +1,70 @@
+import typescriptEslint from "@typescript-eslint/eslint-plugin";
+import _import from "eslint-plugin-import";
+import { fixupPluginRules } from "@eslint/compat";
+import globals from "globals";
+import tsParser from "@typescript-eslint/parser";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import js from "@eslint/js";
+import { FlatCompat } from "@eslint/eslintrc";
+
+const filename = fileURLToPath(import.meta.url);
+const dirname = path.dirname(filename);
+const compat = new FlatCompat({
+    baseDirectory: dirname,
+    recommendedConfig: js.configs.recommended,
+    allConfig: js.configs.all
+});
+
+export default [{
+    ignores: ["src/core/proto/"],
+}, ...compat.extends("eslint:recommended", "plugin:@typescript-eslint/recommended"), {
+    plugins: {
+        "@typescript-eslint": typescriptEslint,
+        import: fixupPluginRules(_import),
+    },
+
+    languageOptions: {
+        globals: {
+            ...globals.browser,
+            ...globals.node,
+        },
+
+        parser: tsParser,
+        ecmaVersion: "latest",
+        sourceType: "module",
+    },
+
+    settings: {
+        "import/parsers": {
+            "@typescript-eslint/parser": [".ts"],
+        },
+
+        "import/resolver": {
+            typescript: {
+                alwaysTryTypes: true,
+            },
+        },
+    },
+
+    rules: {
+        indent: ["error", 4],
+        semi: ["error", "always"],
+        "no-unused-vars": "off",
+        "no-async-promise-executor": "off",
+        "@typescript-eslint/no-explicit-any": "off",
+        "@typescript-eslint/no-unused-vars": "off",
+        "@typescript-eslint/no-var-requires": "off",
+        "object-curly-spacing": ["error", "always"],
+    },
+}, {
+    files: ["**/.eslintrc.{js,cjs}"],
+
+    languageOptions: {
+        globals: {
+            ...globals.node,
+        },
+        ecmaVersion: 5,
+        sourceType: "commonjs",
+    },
+}];

launcher/launcher-user.bat

@@ -0,0 +1,32 @@
+@echo off
+chcp 65001
+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
+
+pause

launcher/launcher-win10-user.bat

@@ -0,0 +1,33 @@
+@echo off
+chcp 65001
+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
+
+pause

launcher/launcher-win10.bat

@@ -9,7 +9,7 @@ if %errorLevel% == 0 (
     exit
 )
 
-set NAPCAT_PATCH_PATH=%cd%\patchNapCat.js
+set NAPCAT_PATCH_PACKAGE=%cd%\qqnt.json
 set NAPCAT_LOAD_PATH=%cd%\loadNapCat.js
 set NAPCAT_INJECT_PATH=%cd%\NapCatWinBootHook.dll
 set NAPCAT_LAUNCHER_PATH=%cd%\NapCatWinBootMain.exe
@@ -33,7 +33,7 @@ if not exist "%QQpath%" (
     exit /b
 )
 set NAPCAT_MAIN_PATH=%NAPCAT_MAIN_PATH:\=/%
-echo (async () =^> {await import("file:///%NAPCAT_MAIN_PATH%")})() > %NAPCAT_LOAD_PATH%
+echo (async () =^> {await import("file:///%NAPCAT_MAIN_PATH%")})() > "%NAPCAT_LOAD_PATH%"
 
 "%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" %1
 

launcher/launcher.bat

@@ -9,7 +9,7 @@ if %errorLevel% == 0 (
     exit
 )
 
-set NAPCAT_PATCH_PATH=%cd%\patchNapCat.js
+set NAPCAT_PATCH_PACKAGE=%cd%\qqnt.json
 set NAPCAT_LOAD_PATH=%cd%\loadNapCat.js
 set NAPCAT_INJECT_PATH=%cd%\NapCatWinBootHook.dll
 set NAPCAT_LAUNCHER_PATH=%cd%\NapCatWinBootMain.exe
@@ -34,6 +34,6 @@ if not exist "%QQpath%" (
 )
 
 set NAPCAT_MAIN_PATH=%NAPCAT_MAIN_PATH:\=/%
-echo (async () =^> {await import("file:///%NAPCAT_MAIN_PATH%")})() > %NAPCAT_LOAD_PATH%
+echo (async () =^> {await import("file:///%NAPCAT_MAIN_PATH%")})() > "%NAPCAT_LOAD_PATH%"
 
 "%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" %1

launcher/patchNapCat.js

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

launcher/qqnt.json

@@ -0,0 +1,26 @@
+{
+  "name": "qq-chat",
+  "version": "9.9.16-29456",
+  "verHash": "dd395162",
+  "linuxVersion": "3.2.13-29456",
+  "linuxVerHash": "e379390a",
+  "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": "29456",
+  "isPureShell": true,
+  "isByteCodeShell": true,
+  "platform": "win32",
+  "eleArch": "x64"
+}

manifest.json

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

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "2.4.7",
+  "version": "4.0.0",
   "scripts": {
     "build:framework": "vite build --mode framework",
     "build:shell": "vite build --mode shell",
@@ -11,56 +11,46 @@
     "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",
+    "@eslint/compat": "^1.2.2",
+    "@eslint/eslintrc": "^3.1.0",
+    "@eslint/js": "^9.14.0",
     "@log4js-node/log4js-api": "^1.0.2",
-    "@protobuf-ts/plugin": "^2.9.4",
+    "@napneko/nap-proto-core": "^0.0.4",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-typescript": "^11.1.6",
     "@types/cors": "^2.8.17",
-    "@types/express": "^4.17.21",
+    "@types/express": "^5.0.0",
-    "@types/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",
+    "eslint": "^9.14.0",
+    "eslint-import-resolver-typescript": "^3.6.1",
+    "eslint-plugin-import": "^2.29.1",
     "fast-xml-parser": "^4.3.6",
     "file-type": "^19.0.0",
-    "fluent-ffmpeg": "^2.1.2",
+    "globals": "^15.12.0",
     "image-size": "^1.1.1",
-    "json-schema-to-ts": "^3.1.0",
+    "json-schema-to-ts": "^3.1.1",
-    "log4js": "^6.9.1",
+    "typescript": "^5.3.3",
-    "protobufjs": "~7.4.0",
+    "typescript-eslint": "^8.13.0",
-    "qrcode-terminal": "^0.12.0",
+    "vite": "^5.2.6",
+    "vite-plugin-cp": "^4.0.8",
+    "vite-tsconfig-paths": "^5.1.0",
+    "winston": "^3.17.0"
+  },
+  "dependencies": {
+    "express": "^5.0.0",
     "silk-wasm": "^3.6.1",
-    "strtok3": "8.0.1",
+    "ws": "^8.18.0",
-    "ws": "^8.18.0"
+    "qrcode-terminal": "^0.12.0",
+    "fluent-ffmpeg": "^2.1.2"
   }
 }

script/BootWay.03.ps1

@@ -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 }"

script/BootWay05.bat

@@ -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  %*
-)

script/BootWay05.ps1

@@ -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..."
-}

script/BootWay05.utf8.bat

@@ -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  %*

script/BootWay05_init.bat

@@ -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
-        )
-    )
-)

script/BootWay05_run.bat

@@ -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  %*

script/BootWay05_run.utf8.bat

@@ -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  %*

script/checkVersion.cjs

@@ -4,16 +4,27 @@ const process = require("process");
 console.log("[NapCat] [CheckVersion] 开始检测当前仓库版本...");
 try {
   const packageJson = require("../package.json");
+  const manifsetJson = require("../manifest.json");
+
   const currentVersion = packageJson.version;
   const targetVersion = process.env.VERSION;
 
+  const manifestCurrentVersion = manifsetJson.version;
+  const manifestTargetVersion = process.env.VERSION;
+
   console.log("[NapCat] [CheckVersion] currentVersion:", currentVersion, "targetVersion:", targetVersion);
+  console.log("[NapCat] [CheckVersion] manifestCurrentVersion:", manifestCurrentVersion, "manifestTargetVersion:", manifestTargetVersion);
 
   // 验证 targetVersion 格式
   if (!targetVersion || typeof targetVersion !== 'string') {
     console.log("[NapCat] [CheckVersion] 目标版本格式不正确或未设置！");
     return;
   }
+  // 验证 manifestTargetVersion 格式
+  if (!manifestTargetVersion || typeof manifestTargetVersion !== 'string') {
+    console.log("[NapCat] [CheckVersion] manifest目标版本格式不正确或未设置！");
+    return;
+  }
 
   // 写入脚本文件的统一函数
   const writeScriptToFile = (content) => {
@@ -21,7 +32,7 @@ try {
     console.log("[NapCat] [CheckVersion] checkVersion.sh 文件已更新。");
   };
 
-  if (currentVersion === targetVersion) {
+  if (currentVersion === targetVersion && manifestCurrentVersion === manifestTargetVersion) {
     // 不需要更新版本，写入一个简单的脚本
     const simpleScript = "#!/bin/bash\necho \"CheckVersion Is Done\"";
     writeScriptToFile(simpleScript);
@@ -29,11 +40,14 @@ try {
     // 更新版本，构建安全的sed命令
     const safeScriptContent = `
     #!/bin/bash
-    git config --global user.email "bot@test.wumiao.wang"
+    git config --global user.email "nanaeonn@outlook.com"
-    git config --global user.name "Version"
+    git config --global user.name "Mlikiowa"
-    sed -i "s/\\\"version\\\": \\\"${currentVersion}\\\"/\\\"version\\\": \\\"${targetVersion}\\\"/g" package.json
+    sed -i "s/\\"version\\": \\"${currentVersion}\\"/\\"version\\": \\"${targetVersion}\\"/g" package.json
+    sed -i "s/\\"version\\": \\"${manifestCurrentVersion}\\"/\\"version\\": \\"${targetVersion}\\"/g" manifest.json
+    sed -i "s/napCatVersion = '.*'/napCatVersion = '${targetVersion}'/g" ./src/common/version.ts
+    sed -i "s/SettingButton(\\"V.*\\", \\"napcat-update-button\\", \\"secondary\\")/SettingButton(\\"V${targetVersion}\\", \\"napcat-update-button\\", \\"secondary\\")/g" ./static/assets/renderer.js
     git add .
-    git commit -m "chore:version change"
+    git commit -m "release: v${targetVersion}"
     git push -u origin main`;
     writeScriptToFile(safeScriptContent);
   }

src/common/audio.ts

@@ -40,12 +40,14 @@ async function convert(filePath: string, pcmPath: string, logger: LogWrapper): P
     });
 }
 
-async function handleWavFile(file: Buffer, filePath: string, pcmPath: string, logger: LogWrapper): Promise<Buffer> {
+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 await convert(filePath, pcmPath, logger);
+        return { input: await convert(filePath, pcmPath, logger), sampleRate: 24000 };
     }
-    return file;
+    return { input: file, sampleRate: fmt.sampleRate };
 }
 
 export async function encodeSilk(filePath: string, TEMP_DIR: string, logger: LogWrapper) {
@@ -55,8 +57,10 @@ export async function encodeSilk(filePath: string, TEMP_DIR: string, logger: Log
         if (!isSilk(file)) {
             logger.log(`语音文件${filePath}需要转换成silk`);
             const pcmPath = `${pttPath}.pcm`;
-            const input = isWav(file) ? await handleWavFile(file, filePath, pcmPath, logger) : await convert(filePath, pcmPath, logger);
+            const { input, sampleRate } = isWav(file)
-            const silk = await encode(input, 24000);
+                ? (await handleWavFile(file, filePath, pcmPath, logger))
+                : { input: await convert(filePath, pcmPath, logger), sampleRate: 24000 };
+            const silk = await encode(input, sampleRate);
             await fsPromise.writeFile(pttPath, silk.data);
             logger.log(`语音文件${filePath}转换成功!`, pttPath, '时长:', silk.duration);
             return {
@@ -79,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 {};
     }
 }

src/common/config-base.ts

@@ -40,7 +40,7 @@ export abstract class ConfigBase<T> {
                 fs.writeFileSync(configPath, fs.readFileSync(this.getConfigPath(undefined), 'utf-8'));
                 logger.log(`[Core] [Config] 配置文件创建成功!\n`);
             } catch (e: any) {
-                logger.logError(`[Core] [Config] 创建配置文件时发生错误:`, e.message);
+                logger.logError.bind(logger)(`[Core] [Config] 创建配置文件时发生错误:`, e.message);
             }
         }
         try {
@@ -49,9 +49,9 @@ export abstract class ConfigBase<T> {
             return this.configData;
         } catch (e: any) {
             if (e instanceof SyntaxError) {
-                logger.logError(`[Core] [Config] 配置文件格式错误，请检查配置文件:`, e.message);
+                logger.logError.bind(logger)(`[Core] [Config] 配置文件格式错误，请检查配置文件:`, e.message);
             } else {
-                logger.logError(`[Core] [Config] 读取配置文件时发生错误:`, e.message);
+                logger.logError.bind(logger)(`[Core] [Config] 读取配置文件时发生错误:`, e.message);
             }
             return {} as T;
         }
@@ -66,7 +66,7 @@ export abstract class ConfigBase<T> {
         try {
             fs.writeFileSync(configPath, JSON.stringify(newConfigData, this.getKeys(), 2));
         } catch (e: any) {
-            logger.logError(`保存配置文件 ${configPath} 时发生错误:`, e.message);
+            logger.logError.bind(logger)(`保存配置文件 ${configPath} 时发生错误:`, e.message);
         }
     }
 }

src/common/event-v2.ts

@@ -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

src/common/event.ts

@@ -9,12 +9,21 @@ interface InternalMapKey {
     checker: ((...args: any[]) => boolean) | undefined;
 }
 
+type EnsureFunc<T> = T extends (...args: any) => any ? T : never;
+
+type FuncKeys<T> = Extract<
+    {
+        [K in keyof T]: EnsureFunc<T[K]> extends never ? never : K;
+    }[keyof T],
+    string
+>;
+
 export type ListenerClassBase = Record<string, string>;
 
 export class NTEventWrapper {
-    private WrapperSession: NodeIQQNTWrapperSession | undefined; //WrapperSession
+    private readonly WrapperSession: NodeIQQNTWrapperSession | undefined; //WrapperSession
-    private listenerManager: Map<string, ListenerClassBase> = new Map<string, ListenerClassBase>(); //ListenerName-Unique -> Listener实例
+    private readonly listenerManager: Map<string, ListenerClassBase> = new Map<string, ListenerClassBase>(); //ListenerName-Unique -> Listener实例
-    private EventTask = new Map<string, Map<string, Map<string, InternalMapKey>>>(); //tasks ListenerMainName -> ListenerSubName-> uuid -> {timeout,createtime,func}
+    private readonly EventTask = new Map<string, Map<string, Map<string, InternalMapKey>>>(); //tasks ListenerMainName -> ListenerSubName-> uuid -> {timeout,createtime,func}
 
     constructor(
         wrapperSession: NodeIQQNTWrapperSession,
@@ -43,10 +52,8 @@ export class NTEventWrapper {
 
     createEventFunction<
         Service extends keyof ServiceNamingMapping,
-        ServiceMethod extends Exclude<keyof ServiceNamingMapping[Service], symbol>,
+        ServiceMethod extends FuncKeys<ServiceNamingMapping[Service]>,
-        // eslint-disable-next-line
+        T extends (...args: any) => any = EnsureFunc<ServiceNamingMapping[Service][ServiceMethod]>,
-        // @ts-ignore
-        T extends (...args: any) => any = ServiceNamingMapping[Service][ServiceMethod],
     >(eventName: `${Service}/${ServiceMethod}`): T | undefined {
         const eventNameArr = eventName.split('/');
         type eventType = {
@@ -98,10 +105,8 @@ export class NTEventWrapper {
 
     async callNoListenerEvent<
         Service extends keyof ServiceNamingMapping,
-        ServiceMethod extends Exclude<keyof ServiceNamingMapping[Service], symbol>,
+        ServiceMethod extends FuncKeys<ServiceNamingMapping[Service]>,
-        // eslint-disable-next-line
+        EventType extends (...args: any) => any = EnsureFunc<ServiceNamingMapping[Service][ServiceMethod]>,
-        // @ts-ignore
-        EventType extends (...args: any) => any = ServiceNamingMapping[Service][ServiceMethod],
     >(
         serviceAndMethod: `${Service}/${ServiceMethod}`,
         ...args: Parameters<EventType>
@@ -111,15 +116,13 @@ export class NTEventWrapper {
 
     async registerListen<
         Listener extends keyof ListenerNamingMapping,
-        ListenerMethod extends Exclude<keyof ListenerNamingMapping[Listener], symbol>,
+        ListenerMethod extends FuncKeys<ListenerNamingMapping[Listener]>,
-        // eslint-disable-next-line
+        ListenerType extends (...args: any) => any = EnsureFunc<ListenerNamingMapping[Listener][ListenerMethod]>,
-        // @ts-ignore
-        ListenerType extends (...args: any) => any = ListenerNamingMapping[Listener][ListenerMethod],
     >(
         listenerAndMethod: `${Listener}/${ListenerMethod}`,
+        checker: (...args: Parameters<ListenerType>) => boolean,
         waitTimes = 1,
         timeout = 5000,
-        checker: (...args: Parameters<ListenerType>) => boolean,
     ) {
         return new Promise<Parameters<ListenerType>>((resolve, reject) => {
             const ListenerNameList = listenerAndMethod.split('/');
@@ -164,15 +167,11 @@ export class NTEventWrapper {
 
     async callNormalEventV2<
         Service extends keyof ServiceNamingMapping,
-        ServiceMethod extends Exclude<keyof ServiceNamingMapping[Service], symbol>,
+        ServiceMethod extends FuncKeys<ServiceNamingMapping[Service]>,
         Listener extends keyof ListenerNamingMapping,
-        ListenerMethod extends Exclude<keyof ListenerNamingMapping[Listener], symbol>,
+        ListenerMethod extends FuncKeys<ListenerNamingMapping[Listener]>,
-        // eslint-disable-next-line
+        EventType extends (...args: any) => any = EnsureFunc<ServiceNamingMapping[Service][ServiceMethod]>,
-        // @ts-ignore
+        ListenerType extends (...args: any) => any = EnsureFunc<ListenerNamingMapping[Listener][ListenerMethod]>
-        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}`,
@@ -182,14 +181,12 @@ export class NTEventWrapper {
         callbackTimesToWait = 1,
         timeout = 5000,
     ) {
-        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 = {};
 
-                function sendDataCallback() {
+        function sendDataCallback(resolve: any, reject: any) {
             if (complete == 0) {
                 reject(
                     new Error(
@@ -211,7 +208,9 @@ export class NTEventWrapper {
         const ListenerMainName = ListenerNameList[0];
         const ListenerSubName = ListenerNameList[1];
 
-                const timeoutRef = setTimeout(sendDataCallback, timeout);
+        return new Promise<[EventRet: Awaited<ReturnType<EventType>>, ...Parameters<ListenerType>]>(
+            (resolve, reject) => {
+                const timeoutRef = setTimeout(() => sendDataCallback(resolve, reject), timeout);
 
                 const eventCallback = {
                     timeout: timeout,
@@ -222,7 +221,7 @@ export class NTEventWrapper {
                         retData = args as Parameters<ListenerType>;
                         if (complete >= callbackTimesToWait) {
                             clearTimeout(timeoutRef);
-                            sendDataCallback();
+                            sendDataCallback(resolve, reject);
                         }
                     },
                 };
@@ -234,9 +233,11 @@ export class NTEventWrapper {
                 }
                 this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.set(id, eventCallback);
                 this.createListenerFunction(ListenerMainName);
-                const eventFunction = this.createEventFunction(serviceAndMethod);
+
-                retEvent = await eventFunction!(...(args));
+                this.createEventFunction(serviceAndMethod)!(...(args))
-                if (!checkerEvent(retEvent)) {
+                    .then((eventResult: any) => {
+                        retEvent = eventResult;
+                        if (!checkerEvent(retEvent) && timeoutRef.hasRef()) {
                             clearTimeout(timeoutRef);
                             reject(
                                 new Error(
@@ -250,86 +251,9 @@ export class NTEventWrapper {
                                 ),
                             );
                         }
+                    })
+                    .catch(reject);
             },
         );
     }
-
-    /*
-    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[]));
-            },
-        );
-    }
-     */
 }

src/common/file.ts

@@ -123,7 +123,7 @@ export interface HttpDownloadOptions {
     headers?: Record<string, string> | string;
 }
 
-export async function httpDownload(options: string | HttpDownloadOptions): Promise<Buffer> {
+async function tryDownload(options: string | HttpDownloadOptions, useReferer: boolean = false): Promise<Response> {
     // const chunks: Buffer[] = [];
     let url: string;
     let headers: Record<string, string> = {
@@ -142,15 +142,26 @@ export async function httpDownload(options: string | HttpDownloadOptions): Promi
             }
         }
     }
+    if (useReferer && !headers['Referer']) {
+        headers['Referer'] = url;
+    }
     const fetchRes = await fetch(url, { headers }).catch((err) => {
         if (err.cause) {
             throw err.cause;
         }
         throw err;
     });
-    if (!fetchRes.ok) throw new Error(`下载文件失败: ${fetchRes.statusText}`);
+    return fetchRes;
+}
 
-    const blob = await fetchRes.blob();
+export async function httpDownload(options: string | HttpDownloadOptions): Promise<Buffer> {
+    const useReferer = typeof options === 'string';
+    let resp = await tryDownload(options);
+    if (resp.status === 403 && useReferer) {
+        resp = await tryDownload(options, true);
+    }
+    if (!resp.ok) throw new Error(`下载文件失败: ${resp.statusText}`);
+    const blob = await resp.blob();
     const buffer = await blob.arrayBuffer();
     return Buffer.from(buffer);
 }
@@ -204,7 +215,7 @@ export async function checkUriType(Uri: string) {
         }
         if (uri.startsWith('file://')) {
             let filePath: string;
-            const pathname = decodeURIComponent(new URL(uri).pathname);
+            const pathname = decodeURIComponent(new URL(uri).pathname + new URL(uri).hash);
             if (process.platform === 'win32') {
                 filePath = pathname.slice(1);
             } else {

src/common/forward-msg-builder.ts

@@ -0,0 +1,114 @@
+import * as crypto from "node:crypto";
+import { PacketMsg } from "@/core/packet/message/message";
+
+interface ForwardMsgJson {
+    app: string
+    config: ForwardMsgJsonConfig,
+    desc: string,
+    extra: ForwardMsgJsonExtra,
+    meta: ForwardMsgJsonMeta,
+    prompt: string,
+    ver: string,
+    view: string
+}
+
+interface ForwardMsgJsonConfig {
+    autosize: number,
+    forward: number,
+    round: number,
+    type: string,
+    width: number
+}
+
+interface ForwardMsgJsonExtra {
+    filename: string,
+    tsum: number,
+}
+
+interface ForwardMsgJsonMeta {
+    detail: ForwardMsgJsonMetaDetail
+}
+
+interface ForwardMsgJsonMetaDetail {
+    news: {
+        text: string
+    }[],
+    resid: string,
+    source: string,
+    summary: string,
+    uniseq: string
+}
+
+interface ForwardAdaptMsg {
+    senderName?: string;
+    isGroupMsg?: boolean;
+    msg?: ForwardAdaptMsgElement[];
+}
+
+interface ForwardAdaptMsgElement {
+    preview?: string;
+}
+
+export class ForwardMsgBuilder {
+    private static build(resId: string, msg: ForwardAdaptMsg[], source?: string, news?: ForwardMsgJsonMetaDetail["news"], summary?: string, prompt?: string): ForwardMsgJson {
+        const id = crypto.randomUUID();
+        const isGroupMsg = msg.some(m => m.isGroupMsg);
+        if (!source) {
+            source = isGroupMsg ? "群聊的聊天记录" : msg.map(m => m.senderName).filter((v, i, a) => a.indexOf(v) === i).slice(0, 4).join('和') + '的聊天记录';
+        }
+        if (!news) {
+            news = msg.length === 0 ? [{
+                text: "Nya~ This message is send from NapCat.Packet!",
+            }] : msg.map(m => ({
+                text: `${m.senderName}: ${m.msg?.map(msg => msg.preview).join('')}`,
+            }));
+        }
+        if (!summary) {
+            summary = `查看${msg.length}条转发消息`;
+        }
+        if (!prompt) {
+            prompt = "[聊天记录]";
+        }
+        return {
+            app: "com.tencent.multimsg",
+            config: {
+                autosize: 1,
+                forward: 1,
+                round: 1,
+                type: "normal",
+                width: 300
+            },
+            desc: prompt,
+            extra: {
+                filename: id,
+                tsum: msg.length,
+            },
+            meta: {
+                detail: {
+                    news,
+                    resid: resId,
+                    source,
+                    summary,
+                    uniseq: id,
+                }
+            },
+            prompt,
+            ver: "0.0.0.5",
+            view: "contact",
+        };
+    }
+
+    static fromResId(resId: string): ForwardMsgJson {
+        return this.build(resId, []);
+    }
+
+    static fromPacketMsg(resId: string, packetMsg: PacketMsg[], source?: string, news?: ForwardMsgJsonMetaDetail["news"], summary?: string, prompt?: string): ForwardMsgJson {
+        return this.build(resId, packetMsg.map(msg => ({
+            senderName: msg.senderName,
+            isGroupMsg: msg.groupId !== undefined,
+            msg: msg.msg.map(m => ({
+                preview: m.valid ? m.toPreview() : "[该消息类型暂不支持查看]",
+            }))
+        })), source, news, summary, prompt);
+    }
+}

src/common/helper.ts

@@ -25,8 +25,8 @@ export async function solveAsyncProblem<T extends (...args: any[]) => Promise<an
 }
 
 export class FileNapCatOneBotUUID {
-    static encodeModelId(peer: Peer, modelId: string, fileId: string, endString: string = ""): string {
+    static encodeModelId(peer: Peer, modelId: string, fileId: string, fileUUID: string = "", endString: string = ""): string {
-        const data = `NapCatOneBot|ModelIdFile|${peer.chatType}|${peer.peerUid}|${modelId}|${fileId}`;
+        const data = `NapCatOneBot|ModelIdFile|${peer.chatType}|${peer.peerUid}|${modelId}|${fileId}|${fileUUID}`;
         //前四个字节塞data长度
         const length = Buffer.alloc(4 + data.length);
         length.writeUInt32BE(data.length * 2, 0);//储存data的hex长度
@@ -37,7 +37,8 @@ export class FileNapCatOneBotUUID {
     static decodeModelId(uuid: string): undefined | {
         peer: Peer,
         modelId: string,
-        fileId: string
+        fileId: string,
+        fileUUID?: string
     } {
         //前四个字节是data长度
         const length = Buffer.from(uuid.slice(0, 8), 'hex').readUInt32BE(0);
@@ -47,20 +48,21 @@ export class FileNapCatOneBotUUID {
         const realData = Buffer.from(dataId, 'hex').toString();
         if (!realData.startsWith('NapCatOneBot|ModelIdFile|')) return undefined;
         const data = realData.split('|');
-        if (data.length !== 6) return undefined;
+        if (data.length < 6) return undefined;  // compatibility requirement
-        const [, , chatType, peerUid, modelId, fileId] = data;
+        const [, , chatType, peerUid, modelId, fileId, fileUUID = undefined] = data;
         return {
             peer: {
-                chatType: chatType as any,
+                chatType: +chatType,
                 peerUid: peerUid,
             },
             modelId,
-            fileId
+            fileId,
+            fileUUID
         };
     }
 
-    static encode(peer: Peer, msgId: string, elementId: string, endString: string = ""): string {
+    static encode(peer: Peer, msgId: string, elementId: string, fileUUID: string = "", endString: string = ""): string {
-        const data = `NapCatOneBot|MsgFile|${peer.chatType}|${peer.peerUid}|${msgId}|${elementId}`;
+        const data = `NapCatOneBot|MsgFile|${peer.chatType}|${peer.peerUid}|${msgId}|${elementId}|${fileUUID}`;
         //前四个字节塞data长度
         //一个字节8位 一个ascii字符1字节 一个hex字符4位 表示一个ascii字符需要两个hex字符
         const length = Buffer.alloc(4 + data.length);
@@ -72,7 +74,8 @@ export class FileNapCatOneBotUUID {
     static decode(uuid: string): undefined | {
         peer: Peer,
         msgId: string,
-        elementId: string
+        elementId: string,
+        fileUUID?: string
     } {
         //前四个字节是data长度
         const length = Buffer.from(uuid.slice(0, 8), 'hex').readUInt32BE(0);
@@ -82,15 +85,16 @@ export class FileNapCatOneBotUUID {
         const realData = Buffer.from(dataId, 'hex').toString();
         if (!realData.startsWith('NapCatOneBot|MsgFile|')) return undefined;
         const data = realData.split('|');
-        if (data.length !== 6) return undefined;
+        if (data.length < 6) return undefined;  // compatibility requirement
-        const [, , chatType, peerUid, msgId, elementId] = data;
+        const [, , chatType, peerUid, msgId, elementId, fileUUID = undefined] = data;
         return {
             peer: {
-                chatType: chatType as any,
+                chatType: +chatType,
                 peerUid: peerUid,
             },
             msgId,
             elementId,
+            fileUUID
         };
     }
 }
@@ -163,34 +167,51 @@ export function isEqual(obj1: any, obj2: any) {
 export function getDefaultQQVersionConfigInfo(): QQVersionConfigType {
     if (os.platform() === 'linux') {
         return {
-            baseVersion: '3.2.12-27597',
+            baseVersion: '3.2.12.28060',
-            curVersion: '3.2.12-27597',
+            curVersion: '3.2.12.28060',
             prevVersion: '',
             onErrorVersions: [],
-            buildId: '27597',
+            buildId: '27254',
+        };
+    }
+    if (os.platform() === 'darwin') {
+        return {
+            baseVersion: '6.9.53.28060',
+            curVersion: '6.9.53.28060',
+            prevVersion: '',
+            onErrorVersions: [],
+            buildId: '28060',
         };
     }
     return {
-        baseVersion: '9.9.15-27597',
+        baseVersion: '9.9.15-28131',
-        curVersion: '9.9.15-27597',
+        curVersion: '9.9.15-28131',
         prevVersion: '',
         onErrorVersions: [],
-        buildId: '27597',
+        buildId: '28131',
     };
 }
 
-export function getQQPackageInfoPath(exePath: string = ''): string {
+export function getQQPackageInfoPath(exePath: string = '', version?: string): string {
+    let packagePath;
     if (os.platform() === 'darwin') {
-        return path.join(path.dirname(exePath), '..', 'Resources', 'app', 'package.json');
+        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 {
-        return path.join(path.dirname(exePath), 'resources', 'app', 'package.json');
+        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() === 'win32') {
-        configVersionInfoPath = path.join(path.dirname(exePath), 'resources', 'app', 'versions', 'config.json');
+        configVersionInfoPath = path.join(path.dirname(exePath), 'versions', 'config.json');
     } else if (os.platform() === 'darwin') {
         const userPath = os.homedir();
         const appDataPath = path.resolve(userPath, './Library/Application Support/QQ');
@@ -203,13 +224,57 @@ 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;
 }
+
+export function stringifyWithBigInt(obj: any) {
+    return JSON.stringify(obj, (key, value) =>
+        typeof value === 'bigint' ? value.toString() : value
+    );
+}
+
+export function parseAppidFromMajor(nodeMajor: string): string | undefined {
+    const hexSequence = "A4 09 00 00 00 35";
+    const sequenceBytes = Buffer.from(hexSequence.replace(/ /g, ""), "hex");
+    const filePath = path.resolve(nodeMajor);
+    const fileContent = fs.readFileSync(filePath);
+
+    let searchPosition = 0;
+    while (true) {
+        const index = fileContent.indexOf(sequenceBytes, searchPosition);
+        if (index === -1) {
+            break;
+        }
+
+        const start = index + sequenceBytes.length - 1;
+        const end = fileContent.indexOf(0x00, start);
+        if (end === -1) {
+            break;
+        }
+        const content = fileContent.subarray(start, end);
+        if (!content.every(byte => byte === 0x00)) {
+            try {
+                return content.toString("utf-8");
+            } catch (error) {
+                break;
+            }
+        }
+
+        searchPosition = end + 1;
+    }
+
+    return undefined;
+}

src/common/log.ts

@@ -1,7 +1,7 @@
-import log4js, { Configuration } from 'log4js';
+import winston, { format, transports } from 'winston';
 import { truncateString } from '@/common/helper';
 import path from 'node:path';
-import chalk from 'chalk';
+import fs from 'node:fs';
 import { AtType, ChatType, ElementType, MessageElement, RawMessage, SelfInfo } from '@/core';
 
 export enum LogLevel {
@@ -27,97 +27,137 @@ function getFormattedTimestamp() {
 export class LogWrapper {
     fileLogEnabled = true;
     consoleLogEnabled = true;
-    logConfig: Configuration;
+    logger: winston.Logger;
-    loggerConsole: log4js.Logger;
-    loggerFile: log4js.Logger;
-    loggerDefault: log4js.Logger;
-    // eslint-disable-next-line no-control-regex
-    colorEscape = /\x1B[@-_][0-?]*[ -/]*[@-~]/g;
 
     constructor(logDir: string) {
         const filename = `${getFormattedTimestamp()}.log`;
         const logPath = path.join(logDir, filename);
-        this.logConfig = {
+
-            appenders: {
+        this.logger = winston.createLogger({
-                FileAppender: { // 输出到文件的appender
+            level: 'debug',
-                    type: 'file',
+            format: format.combine(
-                    filename: logPath, // 指定日志文件的位置和文件名
+                format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }),
-                    maxLogSize: 10485760, // 日志文件的最大大小（单位：字节），这里设置为10MB
+                format.printf(({ timestamp, level, message, ...meta }) => {
-                    layout: {
+                    const userInfo = meta.userInfo ? `${meta.userInfo} | ` : '';
-                        type: 'pattern',
+                    return `${timestamp} [${level}] ${userInfo}${message}`;
-                        pattern: '%d{yyyy-MM-dd hh:mm:ss} [%p] %X{userInfo} | %m',
+                })
-                    },
+            ),
-                },
+            transports: [
-                ConsoleAppender: { // 输出到控制台的appender
+                new transports.File({
-                    type: 'console',
+                    filename: logPath,
-                    layout: {
+                    level: 'debug',
-                        type: 'pattern',
+                    maxsize: 5 * 1024 * 1024, // 5MB
-                        pattern: `%d{yyyy-MM-dd hh:mm:ss} [%[%p%]] ${chalk.magenta('%X{userInfo}')} | %m`,
+                    maxFiles: 5
-                    },
+                }),
-                },
+                new transports.Console({
-            },
+                    format: format.combine(
-            categories: {
+                        format.colorize(),
-                default: { appenders: ['FileAppender', 'ConsoleAppender'], level: 'debug' }, // 默认情况下同时输出到文件和控制台
+                        format.printf(({ timestamp, level, message, ...meta }) => {
-                file: { appenders: ['FileAppender'], level: 'debug' },
+                            const userInfo = meta.userInfo ? `${meta.userInfo} | ` : '';
-                console: { appenders: ['ConsoleAppender'], level: 'debug' },
+                            return `${timestamp} [${level}] ${userInfo}${message}`;
-            },
+                        })
-        };
+                    )
-        log4js.configure(this.logConfig);
+                })
-        this.loggerConsole = log4js.getLogger('console');
+            ]
-        this.loggerFile = log4js.getLogger('file');
+        });
-        this.loggerDefault = log4js.getLogger('default');
+
         this.setLogSelfInfo({ nick: '', uin: '', uid: '' });
+        this.cleanOldLogs(logDir);
+    }
+
+    cleanOldLogs(logDir: string) {
+        const oneWeekAgo = Date.now() - 7 * 24 * 60 * 60 * 1000;
+        fs.readdir(logDir, (err, files) => {
+            if (err) {
+                this.logger.error('Failed to read log directory', err);
+                return;
+            }
+            files.forEach(file => {
+                const filePath = path.join(logDir, file);
+                this.deleteOldLogFile(filePath, oneWeekAgo);
+            });
+        });
+    }
+
+    private deleteOldLogFile(filePath: string, oneWeekAgo: number) {
+        fs.stat(filePath, (err, stats) => {
+            if (err) {
+                this.logger.error('Failed to get file stats', err);
+                return;
+            }
+            if (stats.mtime.getTime() < oneWeekAgo) {
+                fs.unlink(filePath, err => {
+                    if (err) {
+                        if (err.code === 'ENOENT') {
+                            this.logger.warn(`File already deleted: ${filePath}`);
+                        } else {
+                            this.logger.error('Failed to delete old log file', err);
+                        }
+                    } else {
+                        this.logger.info(`Deleted old log file: ${filePath}`);
+                    }
+                });
+            }
+        });
     }
 
     setFileAndConsoleLogLevel(fileLogLevel: LogLevel, consoleLogLevel: LogLevel) {
-        this.logConfig.categories.file.level = fileLogLevel;
+        this.logger.transports.forEach((transport) => {
-        this.logConfig.categories.console.level = consoleLogLevel;
+            if (transport instanceof transports.File) {
-        log4js.configure(this.logConfig);
+                transport.level = fileLogLevel;
+            } else if (transport instanceof transports.Console) {
+                transport.level = consoleLogLevel;
+            }
+        });
     }
 
     setLogSelfInfo(selfInfo: { nick: string, uin: string, uid: string }) {
         const userInfo = `${selfInfo.nick}(${selfInfo.uin})`;
-        this.loggerConsole.addContext('userInfo', userInfo);
+        this.logger.defaultMeta = { userInfo };
-        this.loggerFile.addContext('userInfo', userInfo);
-        this.loggerDefault.addContext('userInfo', userInfo);
     }
 
     setFileLogEnabled(isEnabled: boolean) {
         this.fileLogEnabled = isEnabled;
+        this.logger.transports.forEach((transport) => {
+            if (transport instanceof transports.File) {
+                transport.silent = !isEnabled;
+            }
+        });
     }
 
     setConsoleLogEnabled(isEnabled: boolean) {
         this.consoleLogEnabled = isEnabled;
+        this.logger.transports.forEach((transport) => {
+            if (transport instanceof transports.Console) {
+                transport.silent = !isEnabled;
+            }
+        });
     }
 
     formatMsg(msg: any[]) {
-        let logMsg = '';
+        return msg.map(msgItem => {
-        for (const msgItem of msg) {
+            if (msgItem instanceof Error) {
-            if (msgItem instanceof Error) { // 判断是否是错误
+                return msgItem.stack;
-                logMsg += msgItem.stack + ' ';
+            } else if (typeof msgItem === 'object') {
-                continue;
+                return JSON.stringify(truncateString(JSON.parse(JSON.stringify(msgItem, null, 2))));
-            } else if (typeof msgItem === 'object') { // 判断是否是对象
-                const obj = JSON.parse(JSON.stringify(msgItem, null, 2));
-                logMsg += JSON.stringify(truncateString(obj)) + ' ';
-                continue;
             }
-            logMsg += msgItem + ' ';
+            return msgItem;
+        }).join(' ');
     }
-        return logMsg;
-    }
-
 
     _log(level: LogLevel, ...args: any[]) {
-        if (this.consoleLogEnabled) {
+        const message = this.formatMsg(args);
-            this.loggerConsole[level](this.formatMsg(args));
+        if (this.consoleLogEnabled && this.fileLogEnabled) {
-        }
+            this.logger.log(level, message);
-        if (this.fileLogEnabled) {
+        } else if (this.consoleLogEnabled) {
-            this.loggerFile[level](this.formatMsg(args).replace(this.colorEscape, ''));
+            this.logger.log(level, message);
+        } else if (this.fileLogEnabled) {
+            // eslint-disable-next-line no-control-regex
+            this.logger.log(level, message.replace(/\x1B[@-_][0-?]*[ -/]*[@-~]/g, ''));
         }
     }
 
     log(...args: any[]) {
-        // info 等级
         this._log(LogLevel.INFO, ...args);
     }
 
@@ -139,9 +179,12 @@ export class LogWrapper {
 
     logMessage(msg: RawMessage, selfInfo: SelfInfo) {
         const isSelfSent = msg.senderUin === selfInfo.uin;
-        this.log(`${
+
-            isSelfSent ? '发送 ->' : '接收 <-'
+        if (msg.elements[0]?.elementType === ElementType.GreyTip) {
-        } ${rawMessageToText(msg)}`);
+            return;
+        }
+
+        this.log(`${isSelfSent ? '发送 ->' : '接收 <-'} ${rawMessageToText(msg)}`);
     }
 }
 
@@ -155,38 +198,32 @@ 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 */ {
+    } else {
         tokens.push(`临时消息 (${msg.peerUin})`);
     }
 
-    // message content
+    for (const element of msg.elements) {
-
+        tokens.push(msgElementToText(element, msg, recursiveLevel));
-    function msgElementToText(element: MessageElement) {
-        if (element.textElement) {
-            if (element.textElement.atType === AtType.notAt) {
-                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) {
-                return `${element.textElement.content} (${element.textElement.atUid})`;
     }
+
+    return tokens.join(' ');
+}
+
+function msgElementToText(element: MessageElement, msg: RawMessage, recursiveLevel: number): string {
+    if (element.textElement) {
+        return textElementToText(element.textElement);
     }
 
     if (element.replyElement) {
-            const recordMsgOrNull = msg.records.find(
+        return replyElementToText(element.replyElement, msg, recursiveLevel);
-                record => element.replyElement!.sourceMsgIdInRecords === record.msgId,
-            );
-            return `[回复消息 ${
-                recordMsgOrNull &&
-                recordMsgOrNull.peerUin != '284840486' // 非转发消息; 否则定位不到
-                    ?
-                    rawMessageToText(recordMsgOrNull, recursiveLevel + 1) :
-                    `未找到消息记录 (MsgId = ${element.replyElement.sourceMsgIdInRecords})`
-            }]`;
     }
 
     if (element.picElement) {
@@ -230,11 +267,28 @@ export function rawMessageToText(msg: RawMessage, recursiveLevel = 0): string {
     }
 
     return `[未实现 (ElementType = ${element.elementType})]`;
-    }
+}
-
+
-    for (const element of msg.elements) {
+function textElementToText(textElement: any): string {
-        tokens.push(msgElementToText(element));
+    if (textElement.atType === AtType.notAt) {
-    }
+        const originalContentLines = textElement.content.split('\n');
-
+        return `${originalContentLines[0]}${originalContentLines.length > 1 ? ' ...' : ''}`;
-    return tokens.join(' ');
+    } else if (textElement.atType === AtType.atAll) {
+        return `@全体成员`;
+    } else if (textElement.atType === AtType.atUser) {
+        return `${textElement.content} (${textElement.atUid})`;
+    }
+    return '';
+}
+
+function replyElementToText(replyElement: any, msg: RawMessage, recursiveLevel: number): string {
+    const recordMsgOrNull = msg.records.find(
+        record => replyElement.sourceMsgIdInRecords === record.msgId,
+    );
+    return `[回复消息 ${recordMsgOrNull &&
+        recordMsgOrNull.peerUin != '284840486' && recordMsgOrNull.peerUin != '1094950020'
+        ?
+        rawMessageToText(recordMsgOrNull, recursiveLevel + 1) :
+        `未找到消息记录 (MsgId = ${replyElement.sourceMsgIdInRecords})`
+    }]`;
 }

src/common/lru-cache.ts

@@ -1,6 +1,6 @@
 export class LRUCache<K, V> {
     private capacity: number;
-    private cache: Map<K, V>;
+    public cache: Map<K, V>;
 
     constructor(capacity: number) {
         this.capacity = capacity;
@@ -24,8 +24,19 @@ export class LRUCache<K, V> {
         } else if (this.cache.size >= this.capacity) {
             // If the cache is full, remove the least recently used key (the first one in the map)
             const firstKey = this.cache.keys().next().value;
+            if (firstKey !== undefined) {
                 this.cache.delete(firstKey);
             }
+        }
         this.cache.set(key, value);
     }
+    public resetCapacity(newCapacity: number): void {
+        this.capacity = newCapacity;
+        while (this.cache.size > this.capacity) {
+            const firstKey = this.cache.keys().next().value;
+            if (firstKey !== undefined) {
+                this.cache.delete(firstKey);
+            }
+        }
+    }
 }

src/common/message-unique.ts

@@ -2,8 +2,8 @@ import { Peer } from '@/core';
 import crypto from 'crypto';
 
 export class LimitedHashTable<K, V> {
-    private keyToValue: Map<K, V> = new Map();
+    private readonly keyToValue: Map<K, V> = new Map();
-    private valueToKey: Map<V, K> = new Map();
+    private readonly valueToKey: Map<V, K> = new Map();
     private maxSize: number;
 
     constructor(maxSize: number) {
@@ -23,10 +23,12 @@ export class LimitedHashTable<K, V> {
         }
         while (this.keyToValue.size > this.maxSize || this.valueToKey.size > this.maxSize) {
             const oldestKey = this.keyToValue.keys().next().value;
-            this.valueToKey.delete(this.keyToValue.get(oldestKey)!);
+            if (oldestKey !== undefined) {
+                this.valueToKey.delete(this.keyToValue.get(oldestKey) as V);
                 this.keyToValue.delete(oldestKey);
             }
         }
+    }
 
     getValue(key: K): V | undefined {
         return this.keyToValue.get(key);
@@ -73,8 +75,8 @@ export class LimitedHashTable<K, V> {
 }
 
 class MessageUniqueWrapper {
-    private msgDataMap: LimitedHashTable<string, number>;
+    private readonly msgDataMap: LimitedHashTable<string, number>;
-    private msgIdMap: LimitedHashTable<string, number>;
+    private readonly msgIdMap: LimitedHashTable<string, number>;
 
     constructor(maxMap: number = 1000) {
         this.msgIdMap = new LimitedHashTable<string, number>(maxMap);

src/common/qq-basic-info.ts

@@ -1,8 +1,9 @@
 import fs from 'node:fs';
 import { systemPlatform } from '@/common/system';
-import { getDefaultQQVersionConfigInfo, getQQPackageInfoPath, getQQVersionConfigPath } from './helper';
+import { getDefaultQQVersionConfigInfo, getQQPackageInfoPath, getQQVersionConfigPath, parseAppidFromMajor } from './helper';
 import AppidTable from '@/core/external/appid.json';
 import { LogWrapper } from './log';
+import { getMajorPath } from '@/core';
 
 export class QQBasicInfoWrapper {
     QQMainPath: string | undefined;
@@ -19,14 +20,16 @@ export class QQBasicInfoWrapper {
         //基础目录获取
         this.context = context;
         this.QQMainPath = process.execPath;
-        this.QQPackageInfoPath = getQQPackageInfoPath(this.QQMainPath);
         this.QQVersionConfigPath = getQQVersionConfigPath(this.QQMainPath);
 
+
         //基础信息获取 无快更则启用默认模板填充
         this.isQuickUpdate = !!this.QQVersionConfigPath;
         this.QQVersionConfig = this.isQuickUpdate
             ? JSON.parse(fs.readFileSync(this.QQVersionConfigPath!).toString())
             : getDefaultQQVersionConfigInfo();
+
+        this.QQPackageInfoPath = getQQPackageInfoPath(this.QQMainPath, this.QQVersionConfig?.curVersion);
         this.QQPackageInfo = JSON.parse(fs.readFileSync(this.QQPackageInfoPath).toString());
         const { appid: IQQVersionAppid, qua: IQQVersionQua } = this.getAppidV2();
         this.QQVersionAppid = IQQVersionAppid;
@@ -51,29 +54,26 @@ export class QQBasicInfoWrapper {
     }
 
     //此方法不要直接使用
-    getQUAInternal() {
+    getQUAFallback() {
-        switch (systemPlatform) {
+        const platformMapping: Partial<Record<NodeJS.Platform, string>> = {
-        case 'linux':
+            win32: `V1_WIN_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`,
-            return `V1_LNX_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;
+            darwin: `V1_MAC_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`,
-        case 'darwin':
+            linux: `V1_LNX_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`,
-            return `V1_MAC_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;                
+        };
-        default:
+        return platformMapping[systemPlatform] ?? (platformMapping.win32)!;
-            return `V1_WIN_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;
-        }
     }
 
-    getAppidInternal() {
+    getAppIdFallback() {
-        switch (systemPlatform) {
+        const platformMapping: Partial<Record<NodeJS.Platform, string>> = {
-        case 'linux':
+            win32: '537246092',
-            return '537243600';
+            darwin: '537246140',
-        case 'darwin':
+            linux: '537246140',
-            return '537243441';
+        };
-        default:
+        return platformMapping[systemPlatform] ?? '537246092';
-            return '537243538';
-        }
     }
 
     getAppidV2(): { appid: string; qua: string } {
+        // 通过已有表 性能好
         const appidTbale = AppidTable as unknown as QQAppidTableType;
         const fullVersion = this.getFullQQVesion();
         if (fullVersion) {
@@ -82,10 +82,25 @@ export class QQBasicInfoWrapper {
                 return data;
             }
         }
-
+        // 通过Major拉取 性能差
-        // else
+        try {
+            const majorAppid = this.getAppidV2ByMajor(fullVersion);
+            if (majorAppid) {
+                this.context.logger.log(`[QQ版本兼容性检测] 当前版本Appid未内置 通过Major获取 为了更好的性能请尝试更新NapCat`);
+                return { appid: majorAppid, qua: this.getQUAFallback() };
+            }
+        } catch (error) {
+            this.context.logger.log(`[QQ版本兼容性检测] 通过Major 获取Appid异常 请检测NapCat/QQNT是否正常`);
+        }
+        // 最终兜底为老版本
         this.context.logger.log(`[QQ版本兼容性检测] 获取Appid异常 请检测NapCat/QQNT是否正常`);
         this.context.logger.log(`[QQ版本兼容性检测] ${fullVersion} 版本兼容性不佳，可能会导致一些功能无法正常使用`,);
-        return { appid: this.getAppidInternal(), qua: this.getQUAInternal() };
+        return { appid: this.getAppIdFallback(), qua: this.getQUAFallback() };
     }
+    getAppidV2ByMajor(QQVersion: string) {
+        const majorPath = getMajorPath(QQVersion);
+        const appid = parseAppidFromMajor(majorPath);
+        return appid;
+    }
+
 }

src/common/request.ts

@@ -8,34 +8,40 @@ export class RequestUtil {
         const client = url.startsWith('https') ? https : http;
         return new Promise((resolve, reject) => {
             const req = client.get(url, (res) => {
-                let cookies: { [key: string]: string } = {};
+                const cookies: { [key: string]: string } = {};
-                const handleRedirect = (res: http.IncomingMessage) => {
+
-                    //console.log(res.headers.location);
+                res.on('data', () => { }); // Necessary to consume the stream
+                res.on('end', () => {
+                    this.handleRedirect(res, url, cookies)
+                        .then(resolve)
+                        .catch(reject);
+                });
+
+                if (res.headers['set-cookie']) {
+                    this.extractCookies(res.headers['set-cookie'], cookies);
+                }
+            });
+
+            req.on('error', (error: Error) => {
+                reject(error);
+            });
+        });
+    }
+
+    private static async handleRedirect(res: http.IncomingMessage, url: string, cookies: { [key: string]: string }): Promise<{ [key: string]: string }> {
         if (res.statusCode === 301 || res.statusCode === 302) {
             if (res.headers.location) {
                 const redirectUrl = new URL(res.headers.location, url);
-                            RequestUtil.HttpsGetCookies(redirectUrl.href).then((redirectCookies) => {
+                const redirectCookies = await this.HttpsGetCookies(redirectUrl.href);
                 // 合并重定向过程中的cookies
-                                cookies = { ...cookies, ...redirectCookies };
+                return { ...cookies, ...redirectCookies };
-                                resolve(cookies);
-                            }).catch((err) => {
-                                reject(err);
-                            });
-                        } else {
-                            resolve(cookies);
             }
-                    } else {
-                        resolve(cookies);
         }
-                };
+        return cookies;
-                res.on('data', () => {
+    }
-                }); // Necessary to consume the stream
+
-                res.on('end', () => {
+    private static extractCookies(setCookieHeaders: string[], cookies: { [key: string]: string }) {
-                    handleRedirect(res);
+        setCookieHeaders.forEach((cookie) => {
-                });
-                if (res.headers['set-cookie']) {
-                    //console.log(res.headers['set-cookie']);
-                    res.headers['set-cookie'].forEach((cookie) => {
             const parts = cookie.split(';')[0].split('=');
             const key = parts[0];
             const value = parts[1];
@@ -44,13 +50,6 @@ export class RequestUtil {
             }
         });
     }
-            });
-            req.on('error', (error: any) => {
-                reject(error);
-            });
-        });
-    }
-
 
     // 请求和回复都是JSON data传原始内容 自动编码json
     static async HttpGetJson<T>(url: string, method: string = 'GET', data?: any, headers: {
@@ -61,7 +60,7 @@ export class RequestUtil {
         const options = {
             hostname: option.hostname,
             port: option.port,
-            path: option.href,
+            path: option.pathname + option.search,
             method: method,
             headers: headers,
         };
@@ -88,13 +87,13 @@ export class RequestUtil {
                         } else {
                             reject(new Error(`Unexpected status code: ${res.statusCode}`));
                         }
-                    } catch (parseError) {
+                    } catch (parseError: unknown) {
-                        reject(parseError);
+                        reject(new Error((parseError as Error).message));
                     }
                 });
             });
 
-            req.on('error', (error: any) => {
+            req.on('error', (error: Error) => {
                 reject(error);
             });
             if (method === 'POST' || method === 'PUT' || method === 'PATCH') {
@@ -133,62 +132,4 @@ export class RequestUtil {
             Buffer.from(footer, 'utf8'),
         ]);
     }
-
-    static async uploadImageForOpenPlatform(filePath: string, cookies: string): Promise<string> {
-        return new Promise(async (resolve, reject) => {
-            type retType = { retcode: number, result?: { url: string } };
-            try {
-                const options = {
-                    hostname: 'cgi.connect.qq.com',
-                    port: 443,
-                    path: '/qqconnectopen/upload_share_image',
-                    method: 'POST',
-                    headers: {
-                        'Referer': 'https://cgi.connect.qq.com',
-                        'Cookie': cookies,
-                        'Accept': '*/*',
-                        'Connection': 'keep-alive',
-                        'Content-Type': 'multipart/form-data; boundary=----WebKitFormBoundary7MA4YWxkTrZu0gW',
-                    },
-                };
-                const req = https.request(options, async (res) => {
-                    let responseBody = '';
-
-                    res.on('data', (chunk: string | Buffer) => {
-                        responseBody += chunk.toString();
-                    });
-
-                    res.on('end', () => {
-                        try {
-                            if (res.statusCode && res.statusCode >= 200 && res.statusCode < 300) {
-                                const responseJson = JSON.parse(responseBody) as retType;
-                                resolve(responseJson.result!.url!);
-                            } else {
-                                reject(new Error(`Unexpected status code: ${res.statusCode}`));
-                            }
-                        } catch (parseError) {
-                            reject(parseError);
-                        }
-
-                    });
-
-                });
-
-                req.on('error', (error) => {
-                    reject(error);
-                    console.log('Error during upload:', error);
-                });
-
-                const body = await RequestUtil.createFormData('WebKitFormBoundary7MA4YWxkTrZu0gW', filePath);
-                // req.setHeader('Content-Length', Buffer.byteLength(body));
-                // console.log(`Prepared data size: ${Buffer.byteLength(body)} bytes`);
-                req.write(body);
-                req.end();
-                return;
-            } catch (error) {
-                reject(error);
-            }
-            return undefined;
-        });
-    }
 }

src/common/system.ts

@@ -1,12 +1,8 @@
 import os from 'node:os';
 import path from 'node:path';
-import { networkInterfaces } from 'os';
-import { randomUUID } from 'crypto';
 
 // 缓解Win7设备兼容性问题
 let osName: string;
-// 设备ID
-let machineId: Promise<string>;
 
 try {
     osName = os.hostname();
@@ -14,54 +10,6 @@ try {
     osName = 'NapCat'; // + crypto.randomUUID().substring(0, 4);
 }
 
-const invalidMacAddresses = new Set([
-    '00:00:00:00:00:00',
-    'ff:ff:ff:ff:ff:ff',
-    'ac:de:48:00:11:22',
-]);
-
-function validateMacAddress(candidate: string): boolean {
-    // eslint-disable-next-line no-useless-escape
-    const tempCandidate = candidate.replace(/\-/g, ':').toLowerCase();
-    return !invalidMacAddresses.has(tempCandidate);
-}
-
-export async function getMachineId(): Promise<string> {
-    if (!machineId) {
-        machineId = (async () => {
-            const id = await getMacMachineId();
-            return id ?? randomUUID(); // fallback, generate a UUID
-        })();
-    }
-
-    return machineId;
-}
-
-export function getMac(): string {
-    const ifaces = networkInterfaces();
-    for (const name in ifaces) {
-        const networkInterface = ifaces[name];
-        if (networkInterface) {
-            for (const { mac } of networkInterface) {
-                if (validateMacAddress(mac)) {
-                    return mac;
-                }
-            }
-        }
-    }
-
-    throw new Error('Unable to retrieve mac address (unexpected format)');
-}
-
-async function getMacMachineId(): Promise<string | undefined> {
-    try {
-        const crypto = await import('crypto');
-        const macAddress = getMac();
-        return crypto.createHash('sha256').update(macAddress, 'utf8').digest('hex');
-    } catch (err) {
-        return undefined;
-    }
-}
 
 const homeDir = os.homedir();
 

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '2.4.7';
+export const napCatVersion = '4.0.0';

src/common/video.ts

@@ -20,7 +20,7 @@ export async function getVideoInfo(filePath: string, logger: LogWrapper) {
             ffmpeg.setFfmpegPath(ffmpegPath);
         ffmpeg(filePath).ffprobe((err: any, metadata: ffmpeg.FfprobeData) => {
             if (err) {
-                reject(err);
+                reject(new Error('无法获取视频信息。'));
             } else {
                 const videoStream = metadata.streams.find((s: FfprobeStream) => s.codec_type === 'video');
                 if (videoStream) {

src/core/adapters/NodeIDependsAdapter.ts

@@ -6,8 +6,10 @@ export class NodeIDependsAdapter {
     }
 
     onMSFSsoError(args: unknown) {
+
     }
 
     getGroupCode(args: unknown) {
+
     }
 }

src/core/apis/file.ts

@@ -6,6 +6,7 @@ import {
     Peer,
     PicElement,
     PicType,
+    RawMessage,
     SendFileElement,
     SendPicElement,
     SendPttElement,
@@ -30,6 +31,7 @@ export class NTQQFileApi {
     context: InstanceContext;
     core: NapCatCore;
     rkeyManager: RkeyManager;
+    packetRkey: Array<{ rkey: string; time: number; type: number; ttl: bigint }> | undefined;
 
     constructor(context: InstanceContext, core: NapCatCore) {
         this.context = context;
@@ -145,9 +147,17 @@ export class NTQQFileApi {
         try {
             videoInfo = await getVideoInfo(filePath, logger);
         } catch (e) {
-            logger.logError('获取视频信息失败，将使用默认值', e);
+            logger.logError.bind(logger)('获取视频信息失败，将使用默认值', e);
         }
-        const newFilePath = filePath + '.mp4';
+
+        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;
@@ -165,6 +175,7 @@ export class NTQQFileApi {
             const thumbPath = pathLib.join(thumb, thumbFileName);
             ffmpeg(filePath)
                 .on('error', (err) => {
+                    try {
                         logger.logDebug('获取视频封面失败，使用默认封面', err);
                         if (diyThumbPath) {
                             fsPromises.copyFile(diyThumbPath, thumbPath).then(() => {
@@ -174,6 +185,9 @@ export class NTQQFileApi {
                             fs.writeFileSync(thumbPath, Buffer.from(defaultVideoThumbB64, 'base64'));
                             resolve(thumbPath);
                         }
+                    } catch (error) {
+                        logger.logError.bind(logger)('获取视频封面失败，使用默认封面失败', error);
+                    }
                 })
                 .screenshots({
                     timestamps: [0],
@@ -189,11 +203,12 @@ export class NTQQFileApi {
         thumbPath.set(0, _thumbPath);
         const thumbMd5 = _thumbPath ? await calculateFileMD5(_thumbPath) : '';
         context.deleteAfterSentFiles.push(path);
+        const uploadName = (fileName || _fileName).toLocaleLowerCase().endsWith('.' + fileExt.toLocaleLowerCase()) ? (fileName || _fileName) : (fileName || _fileName) + '.' + fileExt;
         return {
             elementType: ElementType.VIDEO,
             elementId: '',
             videoElement: {
-                fileName: fileName || _fileName,
+                fileName: uploadName,
                 filePath: path,
                 videoMd5: md5,
                 thumbMd5,
@@ -218,7 +233,7 @@ export class NTQQFileApi {
         }
         if (converted) {
             fsPromises.unlink(silkPath).then().catch(
-                (e) => this.context.logger.logError('删除临时文件失败', e)
+                (e) => this.context.logger.logError.bind(this.context.logger)('删除临时文件失败', e)
             );
         }
         return {
@@ -228,7 +243,7 @@ export class NTQQFileApi {
                 fileName: fileName,
                 filePath: path,
                 md5HexStr: md5,
-                fileSize: fileSize,
+                fileSize: fileSize.toString(),
                 duration: duration ?? 1,
                 formatType: 1,
                 voiceType: 1,
@@ -257,6 +272,53 @@ export class NTQQFileApi {
         return fileTransNotifyInfo.filePath;
     }
 
+    async downloadRawMsgMedia(msg: RawMessage[]) {
+        const res = await Promise.all(
+            msg.map(m =>
+                Promise.all(
+                    m.elements
+                        .filter(element =>
+                            element.elementType === ElementType.PIC ||
+                            element.elementType === ElementType.VIDEO ||
+                            element.elementType === ElementType.PTT ||
+                            element.elementType === ElementType.FILE
+                        )
+                        .map(element =>
+                            this.downloadMedia(m.msgId, m.chatType, m.peerUid, element.elementId, '', '', 1000 * 60 * 2, true)
+                        )
+                )
+            )
+        );
+        msg.forEach((m, msgIndex) => {
+            const elementResults = res[msgIndex];
+            let elementIndex = 0;
+            m.elements.forEach(element => {
+                if (
+                    element.elementType === ElementType.PIC ||
+                    element.elementType === ElementType.VIDEO ||
+                    element.elementType === ElementType.PTT ||
+                    element.elementType === ElementType.FILE
+                ) {
+                    switch (element.elementType) {
+                    case ElementType.PIC:
+                            element.picElement!.sourcePath = elementResults[elementIndex];
+                        break;
+                    case ElementType.VIDEO:
+                            element.videoElement!.filePath = elementResults[elementIndex];
+                        break;
+                    case ElementType.PTT:
+                            element.pttElement!.filePath = elementResults[elementIndex];
+                        break;
+                    case ElementType.FILE:
+                            element.fileElement!.filePath = elementResults[elementIndex];
+                        break;
+                    }
+                    elementIndex++;
+                }
+            });
+        });
+    }
+
     async downloadMedia(msgId: string, chatType: ChatType, peerUid: string, elementId: string, thumbPath: string, sourcePath: string, timeout = 1000 * 60 * 2, force: boolean = false) {
         // 用于下载收到的消息中的图片等
         if (sourcePath && fs.existsSync(sourcePath)) {
@@ -286,7 +348,7 @@ export class NTQQFileApi {
                 filePath: thumbPath,
             }],
             () => true,
-            (arg) => arg.msgId === msgId,
+            (arg) => arg.msgElementId === elementId && arg.msgId === msgId,
             1,
             timeout,
         );
@@ -295,16 +357,14 @@ export class NTQQFileApi {
 
     async getImageSize(filePath: string): Promise<ISizeCalculationResult> {
         return new Promise((resolve, reject) => {
-            imageSize(filePath, (err, dimensions) => {
+            imageSize(filePath, (err: Error | null, dimensions) => {
                 if (err) {
-                    reject(err);
+                    reject(new Error(err.message));
-                } else {
+                } else if (!dimensions) {
-                    if (!dimensions) {
                     reject(new Error('获取图片尺寸失败'));
                 } else {
                     resolve(dimensions);
                 }
-                }
             });
         });
     }
@@ -346,33 +406,87 @@ export class NTQQFileApi {
         return fileData.filePath!;
     }
 
-    async getImageUrl(element: PicElement) {
+    async getImageUrl(element: PicElement): Promise<string> {
         if (!element) {
             return '';
         }
+    
         const url: string = element.originImageUrl ?? '';
         const md5HexStr = element.md5HexStr;
         const fileMd5 = element.md5HexStr;
     
         if (url) {
             const parsedUrl = new URL(IMAGE_HTTP_HOST + url);
+            const rkeyData = await this.getRkeyData();
+            return this.getImageUrlFromParsedUrl(parsedUrl, rkeyData);
+        }
+    
+        return this.getImageUrlFromMd5(fileMd5, md5HexStr);
+    }
+    
+    private async getRkeyData() {
+        const rkeyData = {
+            private_rkey: 'CAQSKAB6JWENi5LM_xp9vumLbuThJSaYf-yzMrbZsuq7Uz2qEc3Rbib9LP4',
+            group_rkey: 'CAQSKAB6JWENi5LM_xp9vumLbuThJSaYf-yzMrbZsuq7Uz2qffcqm614gds',
+            online_rkey: false
+        };
+    
+        try {
+            if (this.core.apis.PacketApi.available) {
+                const rkey_expired_private = !this.packetRkey || this.packetRkey[0].time + Number(this.packetRkey[0].ttl) < Date.now() / 1000;
+                const rkey_expired_group = !this.packetRkey || this.packetRkey[0].time + Number(this.packetRkey[0].ttl) < Date.now() / 1000;
+                if (rkey_expired_private || rkey_expired_group) {
+                    this.packetRkey = await this.core.apis.PacketApi.pkt.operation.FetchRkey();
+                }
+                if (this.packetRkey && this.packetRkey.length > 0) {
+                    rkeyData.group_rkey = this.packetRkey[1].rkey.slice(6);
+                    rkeyData.private_rkey = this.packetRkey[0].rkey.slice(6);
+                    rkeyData.online_rkey = true;
+                }
+            }
+        } catch (error: any) {
+            this.context.logger.logError.bind(this.context.logger)('获取rkey失败', error.message);
+        }
+    
+        if (!rkeyData.online_rkey) {
+            try {
+                const 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);
+            }
+        }
+    
+        return rkeyData;
+    }
+    
+    private getImageUrlFromParsedUrl(parsedUrl: URL, rkeyData: any): string {
+        const urlRkey = parsedUrl.searchParams.get('rkey');
         const imageAppid = parsedUrl.searchParams.get('appid');
         const isNTV2 = imageAppid && ['1406', '1407'].includes(imageAppid);
-            if (isNTV2) {
+        const imageFileId = parsedUrl.searchParams.get('fileid');
-                let rkey = parsedUrl.searchParams.get('rkey');
+    
-                if (rkey) {
+        if (isNTV2 && urlRkey) {
-                    return IMAGE_HTTP_HOST_NT + url;
+            return IMAGE_HTTP_HOST_NT + urlRkey;
+        } else if (isNTV2 && rkeyData.online_rkey) {
+            const rkey = imageAppid === '1406' ? rkeyData.private_rkey : rkeyData.group_rkey;
+            return IMAGE_HTTP_HOST_NT + parsedUrl.pathname + `&rkey=${rkey}`;
+        } else if (isNTV2 && imageFileId) {
+            const rkey = imageAppid === '1406' ? rkeyData.private_rkey : rkeyData.group_rkey;
+            return IMAGE_HTTP_HOST + `/download?appid=${imageAppid}&fileid=${imageFileId}&rkey=${rkey}`;
         }
-                const rkeyData = await this.rkeyManager.getRkey();
+    
-                rkey = imageAppid === '1406' ? rkeyData.private_rkey : rkeyData.group_rkey;
+        return '';
-                return IMAGE_HTTP_HOST_NT + url + `${rkey}`;
-            } else {
-                return IMAGE_HTTP_HOST + url;
     }
-        } else if (fileMd5 || md5HexStr) {
+    
+    private getImageUrlFromMd5(fileMd5: string | undefined, md5HexStr: string | undefined): string {
+        if (fileMd5 || md5HexStr) {
             return `${IMAGE_HTTP_HOST}/gchatpic_new/0/0-0-${(fileMd5 ?? md5HexStr)!.toUpperCase()}/0`;
         }
-        this.context.logger.logDebug('图片url获取失败', element);
+    
+        this.context.logger.logDebug('图片url获取失败', { fileMd5, md5HexStr });
         return '';
     }
 }

src/core/apis/friend.ts

@@ -10,10 +10,12 @@ export class NTQQFriendApi {
         this.context = context;
         this.core = core;
     }
-
+    async setBuddyRemark(uid: string, remark: string) {
+        return this.context.session.getBuddyService().setBuddyRemark({ uid, remark });
+    }
     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 buddyListV2 = await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL);
         const uids = buddyListV2.data.flatMap(item => item.buddyUids);
         return await this.core.eventWrapper.callNoListenerEvent(
             'NodeIKernelProfileService/getCoreAndBaseInfo',
@@ -32,15 +34,17 @@ export class NTQQFriendApi {
         data.forEach((value) => retMap.set(value.uin!, value.uid!));
         return retMap;
     }
-
+    async delBuudy(uid: string, tempBlock = false, tempBothDel = false) {
-    async getBuddyV2ExWithCate(refresh = false) {
+        return this.context.session.getBuddyService().delBuddy({
-        const categoryMap: Map<string, any> = new Map();
+            friendUid: uid,
-        const buddyService = this.context.session.getBuddyService();
+            tempBlock: tempBlock,
-        const buddyListV2 = refresh ? (await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL)).data : (await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL)).data;
+            tempBothDel: tempBothDel
-        const uids = buddyListV2.flatMap(item => {
-            item.buddyUids.forEach(uid => {
-                categoryMap.set(uid, { categoryId: item.categoryId, categoryName: item.categroyName });
         });
+    }
+    async getBuddyV2ExWithCate() {
+        const buddyService = this.context.session.getBuddyService();
+        const buddyListV2 = (await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL)).data;
+        const uids = buddyListV2.flatMap(item => {
             return item.buddyUids;
         });
         const data = await this.core.eventWrapper.callNoListenerEvent(

src/core/apis/group.ts

@@ -20,19 +20,30 @@ export class NTQQGroupApi {
     groupMemberCache: Map<string, Map<string, GroupMember>> = new Map<string, Map<string, GroupMember>>();
     groups: Group[] = [];
     essenceLRU = new LimitedHashTable<number, string>(1000);
+    session: any;
 
     constructor(context: InstanceContext, core: NapCatCore) {
         this.context = context;
         this.core = core;
-        this.initCache().then().catch(context.logger.logError.bind(context.logger));
     }
-
+    async initApi() {
+        this.initCache().then().catch(this.context.logger.logError.bind(this.context.logger));
+    }
     async initCache() {
         this.groups = await this.getGroups();
         for (const group of this.groups) {
             this.groupCache.set(group.groupCode, group);
         }
         this.context.logger.logDebug(`加载${this.groups.length}个群组缓存完成`);
+        // process.pid 调试点
+    }
+
+    async getCoreAndBaseInfo(uids: string[]) {
+        return await this.core.eventWrapper.callNoListenerEvent(
+            'NodeIKernelProfileService/getCoreAndBaseInfo',
+            'nodeStore',
+            uids,
+        );
     }
 
     async fetchGroupEssenceList(groupCode: string) {
@@ -43,7 +54,11 @@ export class NTQQGroupApi {
             pageLimit: 300,
         }, pskey);
     }
-
+    async getGroupShutUpMemberList(groupCode: string) {
+        const data = this.core.eventWrapper.registerListen('NodeIKernelGroupListener/onShutUpMemberListChanged', (group_id) => group_id === groupCode, 1, 1000);
+        this.context.session.getGroupService().getGroupShutUpMemberList(groupCode);
+        return (await data)[1];
+    }
     async clearGroupNotifiesUnreadCount(uk: boolean) {
         return this.context.session.getGroupService().clearGroupNotifiesUnreadCount(uk);
     }
@@ -131,7 +146,7 @@ export class NTQQGroupApi {
         let members = this.groupMemberCache.get(groupCodeStr);
         if (!members) {
             try {
-                members = await this.getGroupMembersV2(groupCodeStr);
+                members = await this.getGroupMembers(groupCodeStr);
                 // 更新群成员列表
                 this.groupMemberCache.set(groupCodeStr, members);
             } catch (e) {
@@ -152,11 +167,12 @@ export class NTQQGroupApi {
 
         let member = getMember();
         if (!member) {
-            members = await this.getGroupMembersV2(groupCodeStr);
+            members = await this.getGroupMembers(groupCodeStr);
             member = getMember();
         }
         return member;
     }
+
     async getGroupRecommendContactArkJson(groupCode: string) {
         return this.context.session.getGroupService().getGroupRecommendContactArkJson(groupCode);
     }
@@ -243,9 +259,9 @@ export class NTQQGroupApi {
     async getGroupMemberV2(GroupCode: string, uid: string, forced = false) {
         const Listener = this.core.eventWrapper.registerListen(
             'NodeIKernelGroupListener/onMemberInfoChange',
+            (params, _, members) => params === GroupCode && members.size > 0,
             1,
             forced ? 5000 : 250,
-            (params, _, members) => params === GroupCode && members.size > 0,
         );
         const retData = await (
             this.core.eventWrapper
@@ -262,6 +278,25 @@ export class NTQQGroupApi {
         }
         return member;
     }
+
+    async searchGroup(groupCode: string) {
+        const [, ret] = await this.core.eventWrapper.callNormalEventV2(
+            'NodeIKernelSearchService/searchGroup',
+            'NodeIKernelSearchListener/onSearchGroupResult',
+            [{
+                keyWords: groupCode,
+                groupNum: 25,
+                exactSearch: false,
+                penetrate: ''
+            }],
+            (ret) => ret.result === 0,
+            (params) => !!params.groupInfos.find(g => g.groupCode === groupCode),
+            1,
+            5000
+        );
+        return ret.groupInfos.find(g => g.groupCode === groupCode);
+    }
+
     async getGroupMemberEx(GroupCode: string, uid: string, forced = false, retry = 2) {
         const data = await solveAsyncProblem((eventWrapper: NTEventWrapper, GroupCode: string, uid: string, forced = false) => {
             return eventWrapper.callNormalEventV2(
@@ -283,42 +318,84 @@ export class NTQQGroupApi {
         }
         return undefined;
     }
-    async getGroupMembersV2(groupQQ: string, num = 3000): Promise<Map<string, GroupMember>> {
+
-        const groupService = this.context.session.getGroupService();
+    async tryGetGroupMembersV2(groupQQ: string, modeListener = false, num = 30, timeout = 100): Promise<{
-        const sceneId = groupService.createMemberListScene(groupQQ, 'groupMemberList_MainWindow');
+        infos: Map<string, GroupMember>;
-        const listener = this.core.eventWrapper.registerListen(
+        finish: boolean;
-            'NodeIKernelGroupListener/onMemberListChange',
+        hasNext: boolean | undefined;
-            1,
+    }> {
-            5000,
+        const sceneId = this.context.session.getGroupService().createMemberListScene(groupQQ, 'groupMemberList_MainWindow_1');
-            (params) => params.sceneId === sceneId,
+        const once = this.core.eventWrapper.registerListen('NodeIKernelGroupListener/onMemberListChange', (params) => params.sceneId === sceneId, 0, timeout)
-        );
+            .catch(() => { });
-        try {
+        const result = await this.context.session.getGroupService().getNextMemberList(sceneId, undefined, num);
-            const [membersFromFunc, membersFromListener] = await Promise.allSettled([
+        if (result.errCode !== 0) {
-                groupService.getNextMemberList(sceneId, undefined, num),
+            throw new Error('获取群成员列表出错,' + result.errMsg);
-                listener,
-            ]);
-            if (membersFromFunc.status === 'fulfilled' && membersFromListener.status === 'fulfilled') {
-                return new Map([
-                    ...membersFromFunc.value.result.infos,
-                    ...membersFromListener.value[0].infos,
-                ]);
         }
-            if (membersFromFunc.status === 'fulfilled') {
+        let resMode2;
-                return membersFromFunc.value.result.infos;
+        if (modeListener) {
+            const ret = (await once)?.[0];
+            if (ret) {
+                resMode2 = ret;
             }
-            if (membersFromListener.status === 'fulfilled') {
-                return membersFromListener.value[0].infos;
         }
-            throw new Error('获取群成员列表失败');
+        this.context.session.getGroupService().destroyMemberListScene(sceneId);
-        } finally {
+        return {
-            groupService.destroyMemberListScene(sceneId);
+            infos: new Map([...(resMode2?.infos ?? []), ...result.result.infos]),
+            finish: result.result.finish,
+            hasNext: resMode2?.hasNext,
+        };
     }
+
+    async GetGroupMembersV3(groupQQ: string, num = 3000, timeout = 2500): Promise<{
+        infos: Map<string, GroupMember>;
+        finish: boolean;
+        hasNext: boolean | undefined;
+        listenerMode: boolean;
+    }> {
+        const sceneId = this.context.session.getGroupService().createMemberListScene(groupQQ, 'groupMemberList_MainWindow_1');
+        const once = this.core.eventWrapper.registerListen('NodeIKernelGroupListener/onMemberListChange', (params) => params.sceneId === sceneId, 0, timeout)
+            .catch(() => { });
+        const result = await this.context.session.getGroupService().getNextMemberList(sceneId, undefined, num);
+        if (result.errCode !== 0) {
+            throw new Error('获取群成员列表出错,' + result.errMsg);
+        }
+        let resMode2;
+        if (result.result.finish && result.result.infos.size === 0) {
+            const ret = (await once)?.[0];
+            if (ret) {
+                resMode2 = ret;
+            }
+        }
+        this.context.session.getGroupService().destroyMemberListScene(sceneId);
+        //console.log('GetGroupMembersV3 len :', result.result.infos.size, resMode2?.infos.size, groupQQ);
+        return {
+            infos: new Map([...(resMode2?.infos ?? []), ...result.result.infos]),
+            finish: result.result.finish,
+            hasNext: resMode2?.hasNext,
+            listenerMode: resMode2?.hasNext !== undefined
+        };
+    }
+
+    async getGroupMembersV2(groupQQ: string, num = 3000, no_cache: boolean = false): Promise<Map<string, GroupMember>> {
+        if (no_cache) {
+            return (await this.getGroupMemberAll(groupQQ, true)).result.infos;
+        }
+        let res = await this.GetGroupMembersV3(groupQQ, num);
+        let ret = res.infos;
+        if (res.infos.size === 0 && !res.listenerMode) {
+            res = await this.GetGroupMembersV3(groupQQ, num);
+            ret = res.infos;
+        }
+        if (res.infos.size === 0) {
+            ret = (await this.getGroupMemberAll(groupQQ)).result.infos;
+        }
+        return ret;
     }
 
     async getGroupMembers(groupQQ: string, num = 3000): Promise<Map<string, GroupMember>> {
         const groupService = this.context.session.getGroupService();
         const sceneId = groupService.createMemberListScene(groupQQ, 'groupMemberList_MainWindow');
-        const result = await groupService.getNextMemberList(sceneId!, undefined, num);
+        const result = await groupService.getNextMemberList(sceneId, undefined, num);
         if (result.errCode !== 0) {
             throw new Error('获取群成员列表出错,' + result.errMsg);
         }
@@ -326,8 +403,8 @@ export class NTQQGroupApi {
         return result.result.infos;
     }
 
-    async getGroupFileCount(Gids: Array<string>) {
+    async getGroupFileCount(group_ids: Array<string>) {
-        return this.context.session.getRichMediaService().batchGetGroupFileCount(Gids);
+        return this.context.session.getRichMediaService().batchGetGroupFileCount(group_ids);
     }
 
     async getArkJsonGroupShare(GroupCode: string) {
@@ -410,7 +487,7 @@ export class NTQQGroupApi {
     }
 
     async getGroupRemainAtTimes(GroupCode: string) {
-        this.context.session.getGroupService().getGroupRemainAtTimes(GroupCode);
+        return this.context.session.getGroupService().getGroupRemainAtTimes(GroupCode);
     }
 
     async getMemberExtInfo(groupCode: string, uin: string) {

src/core/apis/index.ts

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

src/core/apis/msg.ts

@@ -3,6 +3,9 @@ import { InstanceContext, NapCatCore } from '@/core';
 import { GeneralCallResult } from '@/core/services/common';
 
 export class NTQQMsgApi {
+    getMsgByClientSeqAndTime(peer: Peer, replyMsgClientSeq: string, replyMsgTime: string) {
+        return this.context.session.getMsgService().getMsgByClientSeqAndTime(peer, replyMsgClientSeq, replyMsgTime);
+    }
     // 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
@@ -22,7 +25,9 @@ export class NTQQMsgApi {
     async sendShowInputStatusReq(peer: Peer, eventType: number) {
         return this.context.session.getMsgService().sendShowInputStatusReq(peer.chatType, eventType, peer.peerUid);
     }
-
+    async getSourceOfReplyMsgV2(peer: Peer, clientSeq: string, time: string) {
+        return this.context.session.getMsgService().getSourceOfReplyMsgV2(peer, clientSeq, time);
+    }
     async getMsgEmojiLikesList(peer: Peer, msgSeq: string, emojiId: string, emojiType: string, count: number = 20) {
         //注意此处emojiType 可选值一般为1-2 2好像是unicode表情dec值 大部分情况 Taged Mlikiowa
         return this.context.session.getMsgService().getMsgEmojiLikesList(peer, msgSeq, emojiId, emojiType, '', false, count);
@@ -82,6 +87,18 @@ export class NTQQMsgApi {
             pageLimit: 1,
         });
     }
+    async queryMsgsWithFilterExWithSeqV3(peer: Peer, msgSeq: string, SendersUid: string[]) {
+        return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', msgSeq, {
+            chatInfo: peer,
+            filterMsgType: [],
+            filterSendersUid: SendersUid,
+            filterMsgToTime: '0',
+            filterMsgFromTime: '0',
+            isReverseOrder: false,
+            isIncludeCurrent: true,
+            pageLimit: 1,
+        });
+    }
     async queryFirstMsgBySeq(peer: Peer, msgSeq: string) {
         return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', msgSeq, {
             chatInfo: peer,
@@ -94,8 +111,9 @@ export class NTQQMsgApi {
             pageLimit: 1,
         });
     }
-    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 getMsgsBySeqAndCount(peer: Peer, seq: string, count: number, desc: boolean, isReverseOrder: boolean) {
+        return await this.context.session.getMsgService().getMsgsBySeqAndCount(peer, seq, count, desc, isReverseOrder);
     }
     async getMsgExBySeq(peer: Peer, msgSeq: string) {
         const DateNow = Math.floor(Date.now() / 1000);
@@ -126,7 +144,7 @@ export class NTQQMsgApi {
                 params,
             ],
             () => true,
-            () => true, // Todo: 应当通过 groupFileListResult 判断
+            () => true, // 应当通过 groupFileListResult 判断
             1,
             5000,
         );
@@ -176,7 +194,7 @@ 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!);
+            const member = await this.core.apis.GroupApi.getGroupMember(peer.guildId, peer.peerUid);
             if (member) {
                 await this.PrepareTempChat(peer.peerUid, peer.guildId, member.nick);
             }

src/core/apis/packet.ts

@@ -0,0 +1,66 @@
+import * as os from 'os';
+import offset from '@/core/external/offset.json';
+import { InstanceContext, NapCatCore } from "@/core";
+import { LogWrapper } from "@/common/log";
+import { PacketClientSession } from "@/core/packet/clientSession";
+import { napCatVersion } from "@/common/version";
+
+interface OffsetType {
+    [key: string]: {
+        recv: string;
+        send: string;
+    };
+}
+
+const typedOffset: OffsetType = offset;
+
+export class NTQQPacketApi {
+    context: InstanceContext;
+    core: NapCatCore;
+    logger: LogWrapper;
+    qqVersion: string | undefined;
+    pkt!: PacketClientSession;
+    errStack: string[] = [];
+
+    constructor(context: InstanceContext, core: NapCatCore) {
+        this.context = context;
+        this.core = core;
+        this.logger = core.context.logger;
+    }
+    async initApi() {
+        await this.InitSendPacket(this.context.basicInfoWrapper.getFullQQVesion())
+            .then()
+            .catch((err) => {
+                this.logger.logError.bind(this.core.context.logger);
+                this.errStack.push(err);
+            });
+    }
+    get available(): boolean {
+        return this.pkt?.available ?? false;
+    }
+
+    get clientLogStack() {
+        return this.pkt?.clientLogStack + '\n' + this.errStack.join('\n');
+    }
+
+    async InitSendPacket(qqVer: string) {
+        this.qqVersion = qqVer;
+        const table = typedOffset[qqVer + '-' + os.arch()];
+        if (!table) {
+            const err = `[Core] [Packet] PacketBackend 不支持当前QQ版本架构：${qqVer}-${os.arch()}，
+            请参照 https://github.com/NapNeko/NapCatQQ/releases/tag/v${napCatVersion} 配置正确的QQ版本！`;
+            this.logger.logError(err);
+            this.errStack.push(err);
+            return false;
+        }
+        if (this.core.configLoader.configData.packetBackend === 'disable') {
+            const err = '[Core] [Packet] 已禁用PacketBackend，NapCat.Packet将不会加载！';
+            this.logger.logError(err);
+            this.errStack.push(err);
+            return false;
+        }
+        this.pkt = new PacketClientSession(this.core);
+        await this.pkt.init(process.pid, table.recv, table.send);
+        return true;
+    }
+}

src/core/apis/sign.ts

@@ -1,5 +1,3 @@
-import { RequestUtil } from '@/common/request';
-import { MiniAppLuaJsonType } from '@/core';
 import { InstanceContext, NapCatCore } from '..';
 
 export class NTQQMusicSignApi {
@@ -10,210 +8,6 @@ export class NTQQMusicSignApi {
         this.context = context;
         this.core = core;
     }
-
-    async signMiniApp(CardData: MiniAppLuaJsonType) {
-        // {
-        //   "app": "com.tencent.miniapp.lua",
-        //   "bizsrc": "tianxuan.imgJumpArk",
-        //   "view": "miniapp",
-        //   "prompt": "hi! 这里有我的日常故事，只想讲给你听",
-        //   "config": {
-        //     "type": "normal",
-        //     "forward": 1,
-        //     "autosize": 0
-        //   },
-        //   "meta": {
-        //     "miniapp": {
-        //       "title": "hi! 这里有我的日常故事，只想讲给你听",
-        //       "preview": "https:\/\/tianquan.gtimg.cn\/qqAIAgent\/item\/7\/square.png",
-        //       "jumpUrl": "https:\/\/club.vip.qq.com\/transfer?open_kuikly_info=%7B%22version%22%3A%20%221%22%2C%22src_type%22%3A%20%22web%22%2C%22kr_turbo_display%22%3A%20%221%22%2C%22page_name%22%3A%20%22vas_ai_persona_moments%22%2C%22bundle_name%22%3A%20%22vas_ai_persona_moments%22%7D&page_name=vas_ai_persona_moments&enteranceId=share&robot_uin=3889008584",
-        //       "tag": "QQ智能体",
-        //       "tagIcon": "https:\/\/tianquan.gtimg.cn\/shoal\/qqAIAgent\/3e9d70c9-d98c-45b8-80b4-79d82971b514.png",
-        //       "source": "QQ智能体",
-        //       "sourcelogo": "https:\/\/tianquan.gtimg.cn\/shoal\/qqAIAgent\/3e9d70c9-d98c-45b8-80b4-79d82971b514.png"
-        //     }
-        //   }
-        // }
-
-        // token : function(url,skey){
-        //   var str = skey || cookie('skey') || cookie('rv2') || '',
-        //     hash = 5381;
-        //   if(url){
-        //     var hostname = uri(url).hostname;
-        //     if(hostname.indexOf('qun.qq.com') > -1 || (hostname.indexOf('qzone.qq.com') > -1 && hostname.indexOf('qun.qzone.qq.com') === -1)){
-        //       str = cookie('p_skey') || str;
-        //     }
-        //   }
-        //   for(var i = 0, len = str.length; i < len; ++i){
-        //     hash += (hash << 5) + str.charAt(i).charCodeAt();
-        //   }
-        //   return hash & 0x7fffffff;
-        // },
-        // 
-
-        // function signToken(skey: string) {
-        //   let hash = 5381;
-        //   for (let i = 0, len = skey.length; i < len; ++i) {
-        //     hash += (hash << 5) + skey.charCodeAt(i);
-        //   }
-        //   return hash & 0x7fffffff;
-        // }
-        const signCard = {
-            'app': 'com.tencent.miniapp.lua',
-            'bizsrc': 'tianxuan.imgJumpArk',
-            'view': 'miniapp',
-            'prompt': CardData.prompt,
-            'config': {
-                'type': 'normal',
-                'forward': 1,
-                'autosize': 0,
-            },
-            'meta': {
-                'miniapp': {
-                    'title': CardData.title,
-                    'preview': (CardData.preview as string).replace(/\\/g, '\\/\\/'),
-                    'jumpUrl': (CardData.jumpUrl as string).replace(/\\/g, '\\/\\/'),
-                    'tag': CardData.tag,
-                    'tagIcon': (CardData.tagIcon as string).replace(/\\/g, '\\/\\/'),
-                    'source': CardData.source,
-                    'sourcelogo': (CardData.sourcelogo as string).replace(/\\/g, '\\/\\/'),
-                },
-            },
-        };
-        // let signCard = {
-        //   "app": "com.tencent.eventshare.lua",
-        //   "prompt": "Bot Test",
-        //   "bizsrc": "tianxuan.business",
-        //   "meta": {
-        //     "eventshare": {
-        //       "button1URL": "https://www.bilibili.com",
-        //       "button1disable": false,
-        //       "button1title": "点我前往",
-        //       "button2URL": "",
-        //       "button2disable": false,
-        //       "button2title": "",
-        //       "buttonNum": 1,
-        //       "jumpURL": "https://www.bilibili.com",
-        //       "preview": "https://tianquan.gtimg.cn/shoal/card/9930bc4e-4a92-4da3-814f-8094a2421d9c.png",
-        //       "tag": "QQ集卡",
-        //       "tagIcon": "https://tianquan.gtimg.cn/shoal/card/c034854b-102d-40be-a545-5ca90a7c49c9.png",
-        //       "title": "Bot Test"
-        //     }
-        //   },
-        //   "config": {
-        //     "autosize": 0,
-        //     "collect": 0,
-        //     "ctime": 1716568575,
-        //     "forward": 1,
-        //     "height": 336,
-        //     "reply": 0,
-        //     "round": 1,
-        //     "type": "normal",
-        //     "width": 263
-        //   },
-        //   "view": "eventshare",
-        //   "ver": "0.0.0.1"
-        // };
-        const data = (await this.core.apis.UserApi.getQzoneCookies());
-        const Bkn = this.core.apis.WebApi.getBknFromCookie(data.p_skey);
-
-        const CookieValue = 'p_skey=' + data.p_skey + '; skey=' + data.skey + '; p_uin=o' + this.core.selfInfo.uin + '; uin=o' + this.core.selfInfo.uin;
-
-        const signurl = 'https://h5.qzone.qq.com/v2/vip/tx/trpc/ark-share/GenNewSignedArk?g_tk=' + Bkn + '&ark=' + encodeURIComponent(JSON.stringify(signCard));
-        let signed_ark = '';
-        try {
-            const retData = await RequestUtil.HttpGetJson<{
-                code: number,
-                data: { signed_ark: string }
-            }>(signurl, 'GET', undefined, { Cookie: CookieValue });
-            //logDebug('MiniApp JSON 消息生成成功', retData);
-            signed_ark = retData.data.signed_ark;
-        } catch (error) {
-            this.context.logger.logDebug('MiniApp JSON 消息生成失败', error);
-        }
-        return signed_ark;
-    }
-
-    async signInternal(songname: string, singer: string, cover: string, songmid: string, songmusic: string) {
-        //curl -X POST 'https://mqq.reader.qq.com/api/mqq/share/card?accessToken&_csrfToken&source=c0003' -H 'Content-Type: application/json' -H 'Cookie: uin=o10086' -d '{"app":"com.tencent.qqreader.share","config":{"ctime":1718634110,"forward":1,"token":"9a63343c32d5a16bcde653eb97faa25d","type":"normal"},"extra":{"app_type":1,"appid":100497308,"msg_seq":14386738075403815000.0,"uin":1733139081},"meta":{"music":{"action":"","android_pkg_name":"","app_type":1,"appid":100497308,"ctime":1718634110,"desc":"周杰伦","jumpUrl":"https://i.y.qq.com/v8/playsong.html?songmid=0039MnYb0qxYhV&type=0","musicUrl":"http://ws.stream.qqmusic.qq.com/http://isure6.stream.qqmusic.qq.com/M800002202B43Cq4V4.mp3?fromtag=810033622&guid=br_xzg&trace=23fe7bcbe2336bbf&uin=553&vkey=CF0F5CE8B0FA16F3001F8A88D877A217EB5E4F00BDCEF1021EB6C48969CA33C6303987AEECE9CC840122DD2F917A59D6130D8A8CA4577C87","preview":"https://y.qq.com/music/photo_new/T002R800x800M000000MkMni19ClKG.jpg","cover":"https://y.qq.com/music/photo_new/T002R800x800M000000MkMni19ClKG.jpg","sourceMsgId":"0","source_icon":"https://p.qpic.cn/qqconnect/0/app_100497308_1626060999/100?max-age=2592000&t=0","source_url":"","tag":"QQ音乐","title":"晴天","uin":10086}},"prompt":"[分享]晴天","ver":"0.0.0.1","view":"music"}'
-        const signurl = 'https://mqq.reader.qq.com/api/mqq/share/card?accessToken&_csrfToken&source=c0003';
-        //let  = "https://y.qq.com/music/photo_new/T002R800x800M000000MkMni19ClKG.jpg";
-        const signCard = {
-            app: 'com.tencent.qqreader.share',
-            config: {
-                ctime: 1718634110,
-                forward: 1,
-                token: '9a63343c32d5a16bcde653eb97faa25d',
-                type: 'normal',
-            },
-            extra: {
-                app_type: 1,
-                appid: 100497308,
-                msg_seq: 14386738075403815000,
-                uin: 1733139081,
-            },
-            meta: {
-                music: {
-                    action: '',
-                    android_pkg_name: '',
-                    app_type: 1,
-                    appid: 100497308,
-                    ctime: 1718634110,
-                    desc: singer,
-                    jumpUrl: 'https://i.y.qq.com/v8/playsong.html?songmid=' + songmid + '&type=0',
-                    musicUrl: songmusic,
-                    preview: cover,
-                    cover: cover,
-                    sourceMsgId: '0',
-                    source_icon: 'https://p.qpic.cn/qqconnect/0/app_100497308_1626060999/100?max-age=2592000&t=0',
-                    source_url: '',
-                    tag: 'QQ音乐',
-                    title: songname,
-                    uin: 10086,
-                },
-            },
-            prompt: '[分享]' + songname,
-            ver: '0.0.0.1',
-            view: 'music',
-        };
-        //console.log(JSON.stringify(signCard, null, 2));
-        const data = await RequestUtil.HttpGetJson<{ code: number, data: { arkResult: string } }>
-        (signurl, 'POST', signCard, { 'Cookie': 'uin=o10086', 'Content-Type': 'application/json' });
-        return data;
-    }
-
-    //注意处理错误
-    async signWay03(id: string = '', mid: string = '') {
-        let signedMid;
-        if (mid == '') {
-            const MusicInfo = await RequestUtil.HttpGetJson<{
-                songinfo?: {
-                    data?: {
-                        track_info: {
-                            mid: string
-                        }
-                    }
-                }
-            }>(
-                'https://u.y.qq.com/cgi-bin/musicu.fcg?format=json&inCharset=utf8&outCharset=utf-8&notice=0&platform=yqq.json&needNewCode=0&data={"comm":{"ct":24,"cv":0},"songinfo":{"method":"get_song_detail_yqq","param":{"song_type":0,"song_mid":"","song_id":' + id + '},"module":"music.pf_song_detail_svr"}}',
-                'GET',
-                undefined,
-            );
-            signedMid = MusicInfo.songinfo?.data?.track_info.mid;
-        }
-        //第三方接口 存在速率限制 现在勉强用
-        const MusicReal = await RequestUtil.HttpGetJson<{
-            code: number,
-            data?: {
-                name: string,
-                singer: string,
-                url: string,
-                cover: string
-            }
-        }>('https://api.leafone.cn/api/qqmusic?id=' + signedMid + '&type=8', 'GET');
-        //console.log(MusicReal);
-        return { ...MusicReal.data, mid: signedMid };
-    }
     //转换外域名为 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
 
@@ -227,10 +21,5 @@ export class NTQQMusicSignApi {
     //https://y.gtimg.cn/music/photo_new/T002R800x800M000000y5gq7449K9I.jpg?max_age=2592000
 
     //还有一处公告上传可以上传高质量图片 持久为qq域名
-    async SignMusicWrapper(id: string = '') {
-        const MusicInfo = await this.signWay03(id)!;
-        return await this.signInternal(MusicInfo.name!, MusicInfo.singer!, MusicInfo.cover!, MusicInfo.mid!, 'https://ws.stream.qqmusic.qq.com/' + MusicInfo.url!);
-    }
-
 }
 

src/core/apis/user.ts

@@ -11,8 +11,14 @@ export class NTQQUserApi {
         this.context = context;
         this.core = core;
     }
-
+    //self_tind格式
-    async getProfileLike(uid: string) {
+    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, start: number, count: number) {
         return this.context.session.getProfileLikeService().getBuddyProfileLike({
             friendUids: [uid],
             basic: 1,
@@ -20,11 +26,22 @@ export class NTQQUserApi {
             favorite: 0,
             userProfile: 1,
             type: 2,
+            start: start,
+            limit: count,
+        });
+    }
+    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);
     }
@@ -51,8 +68,7 @@ export class NTQQUserApi {
     }
 
     async setQQAvatar(filePath: string) {
-        type setQQAvatarRet = { result: number, errMsg: string };
+        const ret = await this.context.session.getProfileService().setHeader(filePath);
-        const ret = await this.context.session.getProfileService().setHeader(filePath) as setQQAvatarRet;
         return { result: ret?.result, errMsg: ret?.errMsg };
     }
 
@@ -103,12 +119,20 @@ export class NTQQUserApi {
         return this.context.session.getProfileService().modifyDesktopMiniProfile(param);
     }
 
-    //需要异常处理
     async getCookies(domain: string) {
         const ClientKeyData = await this.forceFetchClientKey();
         const requestUrl = 'https://ssl.ptlogin2.qq.com/jump?ptlang=1033&clientuin=' + this.core.selfInfo.uin +
             '&clientkey=' + ClientKeyData.clientKey + '&u1=https%3A%2F%2F' + domain + '%2F' + this.core.selfInfo.uin + '%2Finfocenter&keyindex=19%27';
-        return await RequestUtil.HttpsGetCookies(requestUrl);
+        const data = await RequestUtil.HttpsGetCookies(requestUrl);
+        if (!data.p_skey || data.p_skey.length == 0) {
+            try {
+                const pskey = (await this.getPSkey([domain])).domainPskeyMap.get(domain);
+                if (pskey) data.p_skey = pskey;
+            } catch {
+                return data;
+            }
+        }
+        return data;
     }
 
     async getPSkey(domainList: string[]) {

src/core/apis/webapi.ts

@@ -212,15 +212,13 @@ export class NTQQWebApi {
         }
     }
 
-    async getGroupHonorInfo(groupCode: string, getType: WebHonorType) {
+    private async getDataInternal(cookieObject: any, groupCode: string, type: number) {
-        const cookieObject = await this.core.apis.UserApi.getCookies('qun.qq.com');
-        const getDataInternal = async (Internal_groupCode: string, Internal_type: number) => {
         let resJson;
         try {
             const res = await RequestUtil.HttpGetText(
                 `https://qun.qq.com/interactive/honorlist?${new URLSearchParams({
-                        gc: Internal_groupCode,
+                    gc: groupCode,
-                        type: Internal_type.toString(),
+                    type: type.toString(),
                 }).toString()}`,
                 'GET',
                 '',
@@ -230,90 +228,49 @@ export class NTQQWebApi {
             if (match) {
                 resJson = JSON.parse(match[1].trim());
             }
-                if (Internal_type === 1) {
+            return type === 1 ? resJson?.talkativeList : resJson?.actorList;
-                    return resJson?.talkativeList;
-                } else {
-                    return resJson?.actorList;
-                }
         } catch (e) {
             this.context.logger.logDebug('获取当前群荣耀失败', e);
-            }
             return undefined;
-        };
+        }
+    }
 
+    private async getHonorList(cookieObject: any, groupCode: string, type: number) {
+        const data = await this.getDataInternal(cookieObject, groupCode, type);
+        if (!data) {
+            this.context.logger.logError(`获取类型 ${type} 的荣誉信息失败`);
+            return [];
+        }
+        return data.map((item: any) => ({
+            user_id: item?.uin,
+            nickname: item?.name,
+            avatar: item?.avatar,
+            description: item?.desc,
+        }));
+    }
+
+    async getGroupHonorInfo(groupCode: string, getType: WebHonorType) {
+        const cookieObject = await this.core.apis.UserApi.getCookies('qun.qq.com');
         const HonorInfo: any = { group_id: groupCode };
 
         if (getType === WebHonorType.TALKATIVE || getType === WebHonorType.ALL) {
-            const RetInternal = await getDataInternal(groupCode, 1);
+            const talkativeList = await this.getHonorList(cookieObject, groupCode, 1);
-            if (RetInternal) {
+            if (talkativeList.length > 0) {
-                HonorInfo.current_talkative = {
+                HonorInfo.current_talkative = talkativeList[0];
-                    user_id: RetInternal[0]?.uin,
+                HonorInfo.talkative_list = talkativeList;
-                    avatar: RetInternal[0]?.avatar,
-                    nickname: RetInternal[0]?.name,
-                    day_count: 0,
-                    description: RetInternal[0]?.desc,
-                };
-                HonorInfo.talkative_list = [];
-                for (const talkative_ele of RetInternal) {
-                    HonorInfo.talkative_list.push({
-                        user_id: talkative_ele?.uin,
-                        avatar: talkative_ele?.avatar,
-                        description: talkative_ele?.desc,
-                        day_count: 0,
-                        nickname: talkative_ele?.name,
-                    });
-                }
-            } else {
-                this.context.logger.logError('获取龙王信息失败');
             }
         }
+
         if (getType === WebHonorType.PERFORMER || getType === WebHonorType.ALL) {
-            const RetInternal = await getDataInternal(groupCode, 2);
+            HonorInfo.performer_list = await this.getHonorList(cookieObject, groupCode, 2);
-            if (RetInternal) {
-                HonorInfo.performer_list = [];
-                for (const performer_ele of RetInternal) {
-                    HonorInfo.performer_list.push({
-                        user_id: performer_ele?.uin,
-                        nickname: performer_ele?.name,
-                        avatar: performer_ele?.avatar,
-                        description: performer_ele?.desc,
-                    });
-                }
-            } else {
-                this.context.logger.logError('获取群聊之火失败');
-            }
-        }
-        if (getType === WebHonorType.PERFORMER || getType === WebHonorType.ALL) {
-            const RetInternal = await getDataInternal(groupCode, 3);
-            if (RetInternal) {
-                HonorInfo.legend_list = [];
-                for (const legend_ele of RetInternal) {
-                    HonorInfo.legend_list.push({
-                        user_id: legend_ele?.uin,
-                        nickname: legend_ele?.name,
-                        avatar: legend_ele?.avatar,
-                        desc: legend_ele?.description,
-                    });
-                }
-            } else {
-                this.context.logger.logError('获取群聊炽焰失败');
         }
+
+        if (getType === WebHonorType.LEGEND || getType === WebHonorType.ALL) {
+            HonorInfo.legend_list = await this.getHonorList(cookieObject, groupCode, 3);
         }
+
         if (getType === WebHonorType.EMOTION || getType === WebHonorType.ALL) {
-            const RetInternal = await getDataInternal(groupCode, 6);
+            HonorInfo.emotion_list = await this.getHonorList(cookieObject, groupCode, 6);
-            if (RetInternal) {
-                HonorInfo.emotion_list = [];
-                for (const emotion_ele of RetInternal) {
-                    HonorInfo.emotion_list.push({
-                        user_id: emotion_ele.uin,
-                        nickname: emotion_ele.name,
-                        avatar: emotion_ele.avatar,
-                        desc: emotion_ele.description,
-                    });
-                }
-            } else {
-                this.context.logger.logError('获取快乐源泉失败');
-            }
         }
 
         // 冒尖小春笋好像已经被tx扬了 R.I.P.
@@ -338,4 +295,12 @@ export class NTQQWebApi {
         }
         return (hash & 0x7FFFFFFF).toString();
     }
+    public getBknFromSKey(sKey: string) {
+        let hash = 5381;
+        for (let i = 0; i < sKey.length; i++) {
+            const code = sKey.charCodeAt(i);
+            hash = hash + (hash << 5) + code;
+        }
+        return (hash & 0x7FFFFFFF).toString();
+    }
 }

src/core/entities/cache.ts

@@ -23,7 +23,7 @@ export interface ChatCacheList {
 export interface ChatCacheListItem {
     chatType: ChatType;
     basicChatCacheInfo: ChatCacheListItemBasic;
-    guildChatCacheInfo: unknown[]; // TODO: 没用过频道所以不知道这里边的详细内容
+    guildChatCacheInfo: unknown[]; // work: 没用过频道所以不知道这里边的详细内容
 }
 
 export interface ChatCacheListItemBasic {

src/core/entities/group.ts

@@ -117,6 +117,7 @@ export enum GroupMemberRole {
 }
 
 export interface GroupMember {
+    memberRealLevel: number | undefined;
     memberSpecialTitle?: string;
     avatarPath: string;
     cardName: string;

src/core/entities/msg.ts

@@ -27,94 +27,70 @@ export interface GetFileListParam {
 
 export enum ElementType {
     UNKNOWN = 0,
-
     TEXT = 1,
-
     PIC = 2,
-
     FILE = 3,
-
     PTT = 4,
-
     VIDEO = 5,
-
     FACE = 6,
-
     REPLY = 7,
-
+    GreyTip = 8, // “小灰条”，包括拍一拍 (Poke)、撤回提示等
     WALLET = 9,
-
-    /**
-     * “小灰条”，包括拍一拍 (Poke)、撤回提示等
-     */
-    GreyTip = 8,
-
     ARK = 10,
-
     MFACE = 11,
-
     LIVEGIFT = 12,
-
     STRUCTLONGMSG = 13,
-
     MARKDOWN = 14,
-
     GIPHY = 15,
-
     MULTIFORWARD = 16,
-
     INLINEKEYBOARD = 17,
-
     INTEXTGIFT = 18,
-
     CALENDAR = 19,
-
     YOLOGAMERESULT = 20,
-
     AVRECORD = 21,
-
     FEED = 22,
-
     TOFURECORD = 23,
-
     ACEBUBBLE = 24,
-
     ACTIVITY = 25,
-
     TOFU = 26,
-
     FACEBUBBLE = 27,
-
     SHARELOCATION = 28,
-
     TASKTOPMSG = 29,
-
     RECOMMENDEDMSG = 43,
-
     ACTIONBAR = 44
 }
 
+type ElementFullBase = Omit<MessageElement, 'elementType' | 'elementId' | 'extBufForUI'>;
+
+type ElementBase<
+    K extends keyof ElementFullBase,
+    S extends Partial<{ [P in K]: keyof NonNullable<ElementFullBase[P]> | Array<keyof NonNullable<ElementFullBase[P]>> }> = object
+> = {
+    [P in K]:
+    S[P] extends Array<infer U>
+        ? Pick<NonNullable<ElementFullBase[P]>, U & keyof NonNullable<ElementFullBase[P]>>
+        : S[P] extends keyof NonNullable<ElementFullBase[P]>
+            ? Pick<NonNullable<ElementFullBase[P]>, S[P]>
+            : NonNullable<ElementFullBase[P]>;
+};
+
+export interface SendElementBase<ET extends ElementType> {
+    elementType: ET;
+    elementId: string;
+    extBufForUI?: string;
+}
+
 export interface ActionBarElement {
     rows: InlineKeyboardRow[];
     botAppid: string;
 }
 
-export interface SendActionBarElement {
-    elementType: ElementType.ACTIONBAR;
-    elementId: string;
-    actionBarElement: ActionBarElement;
-}
-
 export interface RecommendedMsgElement {
     rows: InlineKeyboardRow[];
     botAppid: string;
 }
 
-export interface SendRecommendedMsgElement {
+export type SendRecommendedMsgElement = SendElementBase<ElementType.RECOMMENDEDMSG> & ElementBase<'recommendedMsgElement'>;
-    elementType: ElementType.RECOMMENDEDMSG;
-    elementId: string;
-    recommendedMsgElement: RecommendedMsgElement;
-}
 
 export interface InlineKeyboardButton {
     id: string;
@@ -171,11 +147,7 @@ export enum NTMsgType {
     KMSGTYPEWALLET = 10
 }
 
-export interface SendTaskTopMsgElement {
+export type SendTaskTopMsgElement = SendElementBase<ElementType.TASKTOPMSG> & ElementBase<'taskTopMsgElement'>;
-    elementType: ElementType.TASKTOPMSG;
-    elementId: string;
-    taskTopMsgElement: TaskTopMsgElement;
-}
 
 export interface TofuRecordElement {
     type: number;
@@ -194,11 +166,7 @@ export interface TofuRecordElement {
     onscreennotify: boolean;
 }
 
-export interface SendTofuRecordElement {
+export type SendTofuRecordElement = SendElementBase<ElementType.TOFURECORD> & ElementBase<'tofuRecordElement'>;
-    elementType: ElementType.TOFURECORD;
-    elementId: string;
-    tofuRecordElement: TofuRecordElement;
-}
 
 export interface FaceBubbleElement {
     faceCount: number;
@@ -216,12 +184,7 @@ export interface FaceBubbleElement {
     };
 }
 
-export interface SendFaceBubbleElement {
+export type SendFaceBubbleElement = SendElementBase<ElementType.FACEBUBBLE> & ElementBase<'faceBubbleElement'>;
-    elementType: ElementType.FACEBUBBLE;
-    elementId: string;
-    faceBubbleElement: FaceBubbleElement;
-
-}
 
 export interface AvRecordElement {
     type: number;
@@ -232,11 +195,7 @@ export interface AvRecordElement {
     extraType: number;
 }
 
-export interface SendavRecordElement {
+export type SendAvRecordElement = SendElementBase<ElementType.AVRECORD> & ElementBase<'avRecordElement'>;
-    elementType: ElementType.AVRECORD;
-    elementId: string;
-    avRecordElement: AvRecordElement;
-}
 
 export interface YoloUserInfo {
     uid: string;
@@ -245,24 +204,13 @@ export interface YoloUserInfo {
     bizId: string;
 }
 
-export interface SendInlineKeyboardElement {
+export type SendInlineKeyboardElement = SendElementBase<ElementType.INLINEKEYBOARD> & ElementBase<'inlineKeyboardElement'>;
-    elementType: ElementType.INLINEKEYBOARD;
-    elementId: string;
-    inlineKeyboardElement: {
-        rows: number;
-        botAppid: string;
-    };
-
-}
 
 export interface YoloGameResultElement {
     UserInfo: YoloUserInfo[];
 }
 
-export interface SendYoloGameResultElement {
+export type SendYoloGameResultElement = SendElementBase<ElementType.YOLOGAMERESULT> & ElementBase<'yoloGameResultElement'>;
-    elementType: ElementType.YOLOGAMERESULT;
-    yoloGameResultElement: YoloGameResultElement;
-}
 
 export interface GiphyElement {
     id: string;
@@ -271,17 +219,9 @@ export interface GiphyElement {
     height: number;
 }
 
-export interface SendGiphyElement {
+export type SendGiphyElement = SendElementBase<ElementType.GIPHY> & ElementBase<'giphyElement'>;
-    elementType: ElementType.GIPHY;
-    elementId: string;
-    giphyElement: GiphyElement;
-}
 
-export interface SendWalletElement {
+export type SendWalletElement = SendElementBase<ElementType.UNKNOWN> & ElementBase<'walletElement'>;
-    elementType: ElementType.UNKNOWN;//不做 设置位置
-    elementId: string;
-    walletElement: Record<string, never>;
-}
 
 export interface CalendarElement {
     summary: string;
@@ -291,49 +231,16 @@ export interface CalendarElement {
     schema: string;
 }
 
-export interface SendCalendarElement {
+export type SendCalendarElement = SendElementBase<ElementType.CALENDAR> & ElementBase<'calendarElement'>;
-    elementType: ElementType.CALENDAR;
-    elementId: string;
-    calendarElement: CalendarElement;
-}
 
-export interface SendliveGiftElement {
+export type SendLiveGiftElement = SendElementBase<ElementType.LIVEGIFT> & ElementBase<'liveGiftElement'>;
-    elementType: ElementType.LIVEGIFT;
-    elementId: string;
-    liveGiftElement: Record<string, never>;
-}
 
-export interface SendTextElement {
+export type SendTextElement = SendElementBase<ElementType.TEXT> & ElementBase<'textElement'>;
-    elementType: ElementType.TEXT;
-    elementId: string;
-    textElement: {
-        content: string;
-        atType: number;
-        atUid: string;
-        atTinyId: string;
-        atNtUid: string;
-    };
-}
 
-export interface SendPttElement {
+export type SendPttElement = SendElementBase<ElementType.PTT> & ElementBase<'pttElement', {
-    elementType: ElementType.PTT;
+    pttElement: ['fileName', 'filePath', 'md5HexStr', 'fileSize', 'duration', 'formatType', 'voiceType',
-    elementId: string;
+        'voiceChangeType', 'canConvert2Text', 'waveAmplitudes', 'fileSubId', 'playState', 'autoConvertText']
-    pttElement: {
+}>;
-        fileName: string;
-        filePath: string;
-        md5HexStr: string;
-        fileSize: number;
-        duration: number;  // 单位是秒
-        formatType: number;
-        voiceType: number;
-        voiceChangeType: number;
-        canConvert2Text: boolean;
-        waveAmplitudes: number[];
-        fileSubId: string;
-        playState: number;
-        autoConvertText: number;
-    };
-}
 
 export enum PicType {
     gif = 2000,
@@ -359,11 +266,7 @@ export enum NTMsgAtType {
     ATTYPEUNKNOWN = 0
 }
 
-export interface SendPicElement {
+export type SendPicElement = SendElementBase<ElementType.PIC> & ElementBase<'picElement'>;
-    elementType: ElementType.PIC;
-    elementId: string;
-    picElement: PicElement;
-}
 
 export interface ReplyElement {
     sourceMsgIdInRecords?: string;
@@ -372,55 +275,30 @@ export interface ReplyElement {
     senderUin: string;
     senderUidStr?: string;
     replyMsgTime?: string;
+    replyMsgClientSeq?: string;
 }
 
-export interface SendReplyElement {
+export type SendReplyElement = SendElementBase<ElementType.REPLY> & ElementBase<'replyElement'>;
-    elementType: ElementType.REPLY;
-    elementId: string;
-    replyElement: ReplyElement;
-}
 
-export interface SendFaceElement {
+export type SendFaceElement = SendElementBase<ElementType.FACE> & ElementBase<'faceElement'>;
-    elementType: ElementType.FACE;
-    elementId: string;
-    faceElement: FaceElement;
-}
 
-export interface SendMarketFaceElement {
+export type SendMarketFaceElement = SendElementBase<ElementType.MFACE> & ElementBase<'marketFaceElement'>;
-    elementType: ElementType.MFACE;
-    marketFaceElement: MarketFaceElement;
-}
 
-export interface SendstructLongMsgElement {
+export type SendStructLongMsgElement = SendElementBase<ElementType.STRUCTLONGMSG> & ElementBase<'structLongMsgElement'>;
-    elementType: ElementType.STRUCTLONGMSG;
-    elementId: string;
-    structLongMsgElement: StructLongMsgElement;
-}
 
 export interface StructLongMsgElement {
     xmlContent: string;
     resId: string;
 }
 
-export interface SendactionBarElement {
+export type SendActionBarElement = SendElementBase<ElementType.ACTIONBAR> & ElementBase<'actionBarElement'>;
-    elementType: ElementType.ACTIONBAR;
-    elementId: string;
-    actionBarElement: {
-        rows: number;
-        botAppid: string;
-    };
-}
 
 export interface ShareLocationElement {
     text: string;
     ext: string;
 }
 
-export interface SendShareLocationElement {
+export type SendShareLocationElement = SendElementBase<ElementType.SHARELOCATION> & ElementBase<'shareLocationElement'>;
-    elementType: ElementType.SHARELOCATION;
-    elementId: string;
-    shareLocationElement?: ShareLocationElement;
-}
 
 export interface FileElement {
     fileMd5?: string;
@@ -440,29 +318,13 @@ export interface FileElement {
     fileBizId?: number;
 }
 
-export interface SendFileElement {
+export type SendFileElement = SendElementBase<ElementType.FILE> & ElementBase<'fileElement'>;
-    elementType: ElementType.FILE;
-    elementId: string;
-    fileElement: FileElement;
-}
 
-export interface SendVideoElement {
+export type SendVideoElement = SendElementBase<ElementType.VIDEO> & ElementBase<'videoElement'>;
-    elementType: ElementType.VIDEO;
-    elementId: string;
-    videoElement: VideoElement;
-}
 
-export interface SendArkElement {
+export type SendArkElement = SendElementBase<ElementType.ARK> & ElementBase<'arkElement'>;
-    elementType: ElementType.ARK;
-    elementId: string;
-    arkElement: ArkElement;
-}
 
-export interface SendMarkdownElement {
+export type SendMarkdownElement = SendElementBase<ElementType.MARKDOWN> & ElementBase<'markdownElement'>;
-    elementType: ElementType.MARKDOWN;
-    elementId: string;
-    markdownElement: MarkdownElement;
-}
 
 export type SendMessageElement = SendTextElement | SendPttElement |
     SendPicElement | SendReplyElement | SendFaceElement | SendMarketFaceElement | SendFileElement |
@@ -479,7 +341,7 @@ export interface TextElement {
 export interface MessageElement {
     elementType: ElementType,
     elementId: string,
-    extBufForUI: string,//"0x",
+    extBufForUI?: string, //"0x",
     textElement?: TextElement;
     faceElement?: FaceElement,
     marketFaceElement?: MarketFaceElement,
@@ -508,7 +370,6 @@ export interface MessageElement {
     taskTopMsgElement?: TaskTopMsgElement,
     recommendedMsgElement?: RecommendedMsgElement,
     actionBarElement?: ActionBarElement
-
 }
 
 export enum AtType {
@@ -516,6 +377,12 @@ export enum AtType {
     atAll = 1,
     atUser = 2
 }
+export enum MsgSourceType {
+    K_DOWN_SOURCETYPE_AIOINNER = 1,
+    K_DOWN_SOURCETYPE_BIGSCREEN = 2,
+    K_DOWN_SOURCETYPE_HISTORY = 3,
+    K_DOWN_SOURCETYPE_UNKNOWN = 0
+}
 
 // 来自Android分析
 export enum ChatType {
@@ -571,7 +438,7 @@ export interface PttElement {
     fileSize: string; // "4261"
     fileSubId: string; // "0"
     fileUuid: string; // "90j3z7rmRphDPrdVgP9udFBaYar#oK0TWZIV"
-    formatType: string; // 1
+    formatType: number; // 1
     invalidState: number; // 0
     md5HexStr: string; // "e4d09c784d5a2abcb2f9980bdc7acfe6"
     playState: number; // 0
@@ -582,6 +449,7 @@ export interface PttElement {
     voiceChangeType: number; // 0
     voiceType: number; // 0
     waveAmplitudes: number[];
+    autoConvertText: number;
 }
 
 export interface ArkElement {
@@ -659,7 +527,8 @@ export interface GrayTipElement {
 export enum FaceType {
     normal = 1, // 小黄脸
     normal2 = 2, // 新小黄脸, 从faceIndex 222开始？
-    dice = 3  // 骰子
+    dice = 3,  // 骰子
+    poke = 5  // 拍一拍
 }
 
 export enum FaceIndex {
@@ -786,7 +655,8 @@ export interface InlineKeyboardElementRowButton {
 export interface InlineKeyboardElement {
     rows: [{
         buttons: InlineKeyboardElementRowButton[]
-    }];
+    }],
+    botAppid: string;
 }
 
 export interface TipAioOpGrayTipElement {  // 这是什么提示来着？
@@ -872,6 +742,8 @@ export interface RawMessage {
     /**
      * 扩展字段，与 Ob11 msg ID 有关
      */
+
+
     id?: number;
 
     guildId: string;
@@ -908,11 +780,26 @@ export interface RawMessage {
      */
     peerUin: string;
 
+    /**
+     * 好友备注（如果是好友消息）
+     */
+    remark?: string;
+
+    /**
+     * 群名（如果是群消息）
+     */
+    peerName: string;
+
     /**
      * 发送者昵称（如果是好友消息）
      */
     sendNickName: string;
 
+    /**
+     * 发送者好友备注（如果是群消息并且有发送者好友）
+     */
+    sendRemarkName: string;
+
     /**
      * 发送者群名片（如果是群消息）
      */
@@ -933,6 +820,10 @@ export interface RawMessage {
     records: RawMessage[];
 
     elements: MessageElement[];
+
+    sourceType: MsgSourceType;
+
+    isOnlineMsg: boolean;
 }
 export interface QueryMsgsParams {
     chatInfo: Peer;
@@ -959,3 +850,18 @@ export interface TmpChatInfo {
     sessionType: number;
     sig: string;
 }
+export interface MsgReqType {
+    peer: Peer,
+    byType: number,
+    msgId: string,
+    msgSeq: string,
+    msgTime: string,
+    clientSeq: string,
+    cnt: number,
+    queryOrder: boolean,
+    includeSelf: boolean,
+    includeDeleteMsg: boolean,
+    extraCnt: number
+}
+//getMsgsIncludeSelf Peer必须 byType 1
+//getMsgsWithMsgTimeAndClientSeqForC2C Peer必须 byType 3

src/core/entities/notify.ts

@@ -43,6 +43,50 @@ export enum GroupInviteType {
     BYGROUPMEMBER,
     BYDISCUSSMEMBER
 }
+export interface ShutUpGroupHonor {
+    [key: string]: number;
+}
+
+export interface ShutUpGroupMember {
+    uid: string;
+    qid: string;
+    uin: string;
+    nick: string;
+    remark: string;
+    cardType: number;
+    cardName: string;
+    role: number;
+    avatarPath: string;
+    shutUpTime: number;
+    isDelete: boolean;
+    isSpecialConcerned: boolean;
+    isSpecialShield: boolean;
+    isRobot: boolean;
+    groupHonor: ShutUpGroupHonor;
+    memberRealLevel: number;
+    memberLevel: number;
+    globalGroupLevel: number;
+    globalGroupPoint: number;
+    memberTitleId: number;
+    memberSpecialTitle: string;
+    specialTitleExpireTime: string;
+    userShowFlag: number;
+    userShowFlagNew: number;
+    richFlag: number;
+    mssVipType: number;
+    bigClubLevel: number;
+    bigClubFlag: number;
+    autoRemark: string;
+    creditLevel: number;
+    joinTime: number;
+    lastSpeakTime: number;
+    memberFlag: number;
+    memberFlagExt: number;
+    memberMobileFlag: number;
+    memberFlagExt2: number;
+    isSpecialShielded: boolean;
+    cardNameId: number;
+}
 
 export interface GroupNotify {
     seq: string; // 通知序列号

src/core/entities/sign.ts

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

src/core/entities/user.ts

@@ -175,8 +175,8 @@ export interface SimpleInfo {
     status: UserStatus | null;
     vasInfo: VasInfo | null;
     relationFlags: RelationFlags | null;
-    otherFlags: any | null;
+    otherFlags: any;
-    intimate: any | null;
+    intimate: any;
 }
 
 export type FriendV2 = SimpleInfo;
@@ -216,7 +216,7 @@ export interface BuddyProfileLikeReq {
     userProfile: number;
     type: number;
     start: number;
-    limit: number;
+    limit?: number;
 }
 
 export interface QQLevel {
@@ -288,9 +288,9 @@ export interface User {
 export interface SelfInfo extends User {
     online?: boolean;
 }
+export type Friend = User;
 
-export interface Friend extends User {
+// 本来是 Friend extends User  现在用不到
-}
 
 export enum BizKey {
     KPRIVILEGEICON,

src/core/external/appid.json

@@ -1,14 +1,90 @@
 {
-    "3.2.12-27597": {
+    "9.9.15-28060": {
-        "appid": 537243600,
+        "appid": 537246092,
-        "qua": "V1_LNX_NQ_3.2.12_27597_GW_B"
+        "qua": "V1_WIN_NQ_9.9.15_28060_GW_B"
     },
-    "9.9.15-27597": {
+    "9.9.15-28131": {
-        "appid": 537243441,
+        "appid": 537246092,
-        "qua": "V1_WIN_NQ_9.9.15_27597_GW_B"
+        "qua": "V1_WIN_NQ_9.9.15_28131_GW_B"
     },
-    "6.9.53-27597": {
+    "3.2.12-28060": {
-        "appid": 537243538,
+        "appid": 537246140,
-        "qua": "V1_MAC_NQ_6.9.53_27597_GW_B" 
+        "qua": "V1_LNX_NQ_3.2.12_28060_GW_B"
+    },
+    "3.2.12-28131": {
+        "appid": 537246140,
+        "qua": "V1_LNX_NQ_3.2.12_28131_GW_B"
+    },
+    "6.9.55-28131": {
+        "appid": 537246115,
+        "qua": "V1_MAC_NQ_6.9.55_28131_GW_B"
+    },
+    "9.9.15-28327": {
+        "appid": 537249321,
+        "qua": "V1_WIN_NQ_9.9.15_28327_GW_B"
+    },
+    "3.2.12-28327": {
+        "appid": 537249393,
+        "qua": "V1_LNX_NQ_3.2.12_28327_GW_B"
+    },
+    "9.9.15-28418": {
+        "appid": 537249321,
+        "qua": "V1_WIN_NQ_9.9.15_28418_GW_B"
+    },
+    "3.2.12-28418": {
+        "appid": 537249393,
+        "qua": "V1_LNX_NQ_3.2.12_28418_GW_B"
+    },
+    "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"
+    },
+    "3.2.13-28788": {
+        "appid": 537249787,
+        "qua": "V1_LNX_NQ_3.2.13_28788_GW_B"
+    },
+    "9.9.16-28788": {
+        "appid": 537249739,
+        "qua": "V1_WIN_NQ_9.9.16_28788_GW_B"
+    },
+    "9.9.16-28971": {
+        "appid": 537249775,
+        "qua": "V1_WIN_NQ_9.9.16_28971_GW_B"
+    },
+    "3.2.13-28971": {
+        "appid": 537249848,
+        "qua": "V1_LNX_NQ_3.2.13_28971_GW_B"
+    },
+    "6.9.58-28971": {
+        "appid": 537249826,
+        "qua": "V1_MAC_NQ_6.9.58_28971_GW_B"
+    },
+    "9.9.16-29271": {
+        "appid": 537249813,
+        "qua": "V1_WIN_NQ_9.9.16_29271_GW_B"
+    },
+    "3.2.13-29271": {
+        "appid": 537249913,
+        "qua": "V1_LNX_NQ_3.2.13_29271_GW_B"
+    },
+    "6.9.59-29271": {
+        "appid": 537249863,
+        "qua": "V1_MAC_NQ_6.9.59_29271_GW_B"
+    },
+    "9.9.16-29456": {
+        "appid": 537249875,
+        "qua": "V1_WIN_NQ_9.9.16_29456_GW_B"
+    },
+    "3.2.13-29456": {
+        "appid": 537249996,
+        "qua": "V1_LNX_NQ_3.2.13_29456_GW_B"
+    },
+    "6.9.59-29456": {
+        "appid": 537249961,
+        "qua": "V1_MAC_NQ_6.9.59_29456_GW_B"
     }
 }

src/core/external/napcat.json

@@ -2,5 +2,7 @@
     "fileLog": true,
     "consoleLog": true,
     "fileLogLevel": "debug",
-    "consoleLogLevel": "info"
+    "consoleLogLevel": "info",
+    "packetBackend": "auto",
+    "packetServer": ""
 }

src/core/external/offset.json

@@ -0,0 +1,86 @@
+{
+    "3.2.12-28418-x64": {
+        "recv": "A0723E0",
+        "send": "A06EAE0"
+    },
+    "9.9.15-28418-x64": {
+        "recv": "37A9004",
+        "send": "37A4BD0"
+    },
+    "6.9.56-28418-x64": {
+        "send": "4471360",
+        "recv": "4473BCC"
+    },
+    "6.9.56-28418-arm64": {
+        "send": "3FBDBF8",
+        "recv": "3FC0410"
+    },
+    "9.9.15-28498-x64": {
+        "recv": "37A9004",
+        "send": "37A4BD0"
+    },
+    "9.9.16-28788-x64": {
+        "send": "38076D0",
+        "recv": "380BB04"
+    },
+    "3.2.13-28788-x64": {
+        "send": "A0CEC20",
+        "recv": "A0D2520"
+    },
+    "3.2.13-28788-arm64": {
+        "send": "6E91018",
+        "recv": "6E94850"
+    },
+    "9.9.16-28971-x64": {
+        "send": "38079F0",
+        "recv": "380BE24"
+    },
+    "3.2.13-28971-x64": {
+        "send": "A0CEF60",
+        "recv": "A0D2860"
+    },
+    "3.2.12-28971-arm64": {
+        "send": "6E91318",
+        "recv": "6E94B50"
+    },
+    "6.9.58-28971-x64": {
+        "send": "449ACA0",
+        "recv": "449D50C"
+    },
+    "6.9.58-28971-arm64": {
+        "send": "3FE0DB0",
+        "recv": "3FE35C8"
+    },
+    "9.9.16-29271-x64": {
+        "send": "3833510",
+        "recv": "3837944"
+    },
+    "3.2.13-29271-x64": {
+        "send": "A11E680",
+        "recv": "A121F80"
+    },
+    "3.2.13-29271-arm64": {
+        "send": "6ECA098",
+        "recv": "6ECD8D0"
+    },
+    "9.9.16-29456-x64": {
+        "send": "3835CD0",
+        "recv": "383A104"
+    },
+    "3.2.13-29456-x64": {
+        "send": "A11E820",
+        "recv": "A122120"
+    },
+    "3.2.13-29456-arm64": {
+        "send": "6ECA130",
+        "recv": "6ECD968"
+    },
+    "6.9.59-29456-x64": {
+        "send": "44C57A0",
+        "recv": "44C800C"
+    },
+    "6.9.59-29456-arm64": {
+        "send": "4005FE8",
+        "recv": "4008800"
+    }
+}

src/core/external/proto/EmojiLikeToOthers.proto

@@ -1,31 +0,0 @@
-syntax = 'proto3';
-package SysMessage;
-
-message EmojiLikeToOthersWrapper1 {
-  EmojiLikeToOthersWrapper2 wrapper = 1;
-}
-
-message EmojiLikeToOthersWrapper2 {
-  EmojiLikeToOthersWrapper3 body = 1;
-}
-
-message EmojiLikeToOthersWrapper3 {
-  EmojiLikeToOthersMsgSpec msgSpec = 2;
-  EmojiLikeToOthersAttributes attributes = 3;
-}
-
-message EmojiLikeToOthersMsgSpec {
-  uint32 msgSeq = 1;
-}
-
-message EmojiLikeToOthersAttributes {
-  enum Operation {
-    FALLBACK = 0;
-    LIKE = 1;
-    UNLIKE = 2;
-  }
-
-  string emojiId = 1;
-  string senderUid = 4;
-  Operation operation = 5;
-}

src/core/external/proto/GreyTipWrapper.proto

@@ -1,9 +0,0 @@
-syntax = 'proto3';
-package SysMessage;
-
-message GreyTipWrapper {
-  uint32 subTypeId = 1;
-  uint32 groupCode = 4;
-  uint32 subTypeIdMinusOne = 13;
-  bytes rest = 44;
-}

src/core/external/proto/ProfileLikeTip.proto

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

src/core/external/proto/SysMessage.proto

@@ -1,36 +0,0 @@
-syntax = 'proto3';
-package SysMessage;
-
-message SysMessage {
-  repeated SysMessageHeader header = 1;
-  repeated SysMessageMsgSpec msgSpec = 2;
-  SysMessageBodyWrapper bodyWrapper = 3;
-}
-
-message SysMessageHeader {
-  uint32 PeerNumber = 1;
-  string PeerString = 2;
-  uint32 Uin = 5;
-  optional string Uid = 6;
-}
-
-message SysMessageMsgSpec {
-  uint32 msgType = 1;
-  uint32 subType = 2;
-  uint32 subSubType = 3;
-  uint32 msgSeq = 5;
-  uint32 time = 6;
-  uint64 msgId = 12;
-  uint32 other = 13;
-}
-
-message SysMessageBodyWrapper {
-  bytes wrappedBody = 2;
-  // Find the first [08], or ignore the first 7 bytes?
-  // And it becomes another ProtoBuf message.
-}
-
-message KeyValuePair {
-  string key = 1;
-  string value = 2;
-}

src/core/helper/adaptDecoder.ts

@@ -0,0 +1,61 @@
+// work:further refactor in NapCat.Packet v2
+import { NapProtoMsg, ProtoField, ScalarType } from "@napneko/nap-proto-core";
+
+const LikeDetail = {
+    txt: ProtoField(1, ScalarType.STRING),
+    uin: ProtoField(3, ScalarType.INT64),
+    nickname: ProtoField(5, ScalarType.STRING)
+};
+
+const LikeMsg = {
+    times: ProtoField(1, ScalarType.INT32),
+    time: ProtoField(2, ScalarType.INT32),
+    detail: ProtoField(3, () => LikeDetail)
+};
+
+const ProfileLikeSubTip = {
+    msg: ProtoField(14, () => LikeMsg)
+};
+
+const ProfileLikeTip = {
+    msgType: ProtoField(1, ScalarType.INT32),
+    subType: ProtoField(2, ScalarType.INT32),
+    content: ProtoField(203, () => ProfileLikeSubTip)
+};
+
+const SysMessageHeader = {
+    PeerNumber: ProtoField(1, ScalarType.UINT32),
+    PeerString: ProtoField(2, ScalarType.STRING),
+    Uin: ProtoField(5, ScalarType.UINT32),
+    Uid: ProtoField(6, ScalarType.STRING, true)
+};
+
+const SysMessageMsgSpec = {
+    msgType: ProtoField(1, ScalarType.UINT32),
+    subType: ProtoField(2, ScalarType.UINT32),
+    subSubType: ProtoField(3, ScalarType.UINT32),
+    msgSeq: ProtoField(5, ScalarType.UINT32),
+    time: ProtoField(6, ScalarType.UINT32),
+    msgId: ProtoField(12, ScalarType.UINT64),
+    other: ProtoField(13, ScalarType.UINT32)
+};
+
+const SysMessageBodyWrapper = {
+    wrappedBody: ProtoField(2, ScalarType.BYTES)
+};
+
+const SysMessage = {
+    header: ProtoField(1, () => SysMessageHeader, false, true),
+    msgSpec: ProtoField(2, () => SysMessageMsgSpec, false, true),
+    bodyWrapper: ProtoField(3, () => SysMessageBodyWrapper)
+};
+
+export function decodeProfileLikeTip(buffer: Uint8Array) {
+    const msg = new NapProtoMsg(ProfileLikeTip);
+    return msg.decode(buffer);
+}
+
+export function decodeSysMessage(buffer: Uint8Array) {
+    const msg = new NapProtoMsg(SysMessage);
+    return msg.decode(buffer);
+}

src/core/helper/adaptSysMessageDecoder.ts

@@ -0,0 +1,49 @@
+// work:further refactor in NapCat.Packet v2
+import { NapProtoMsg, ProtoField, ScalarType } from "@napneko/nap-proto-core";
+
+const BodyInner = {
+    msgType: ProtoField(1, ScalarType.UINT32, true),
+    subType: ProtoField(2, ScalarType.UINT32, true)
+};
+
+const NoifyData = {
+    skip: ProtoField(1, ScalarType.BYTES, true),
+    innerData: ProtoField(2, ScalarType.BYTES, true)
+};
+
+const MsgHead = {
+    bodyInner: ProtoField(2, () => BodyInner, true),
+    noifyData: ProtoField(3, () => NoifyData, true)
+};
+
+const Message = {
+    msgHead: ProtoField(1, () => MsgHead)
+};
+
+const SubDetail = {
+    msgSeq: ProtoField(1, ScalarType.UINT32),
+    msgTime: ProtoField(2, ScalarType.UINT32),
+    senderUid: ProtoField(6, ScalarType.STRING)
+};
+
+const RecallDetails = {
+    operatorUid: ProtoField(1, ScalarType.STRING),
+    subDetail: ProtoField(3, () => SubDetail)
+};
+
+const RecallGroup = {
+    type: ProtoField(1, ScalarType.INT32),
+    peerUid: ProtoField(4, ScalarType.UINT32),
+    recallDetails: ProtoField(11, () => RecallDetails),
+    grayTipsSeq: ProtoField(37, ScalarType.UINT32)
+};
+
+export function decodeMessage(buffer: Uint8Array) {
+    const msg = new NapProtoMsg(Message);
+    return msg.decode(buffer);
+}
+
+export function decodeRecallGroup(buffer: Uint8Array){
+    const msg = new NapProtoMsg(RecallGroup);
+    return msg.decode(buffer);
+}

src/core/helper/rkey.ts

@@ -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;
@@ -42,9 +43,18 @@ export class RkeyManager {
         //刷新rkey
         for (const url of this.serverUrl) {
             try {
-                this.rkeyData = await RequestUtil.HttpGetJson<ServerRkeyData>(url, 'GET');
+                const 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(`[Rkey] Get Rkey ${url} Error `, 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}`);//外抛
+                }
             }
         }
 

src/core/index.ts

@@ -22,14 +22,14 @@ 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, 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';
-
+import { NTQQPacketApi } from './apis/packet';
 export * from './wrapper';
 export * from './entities';
 export * from './services';
@@ -45,25 +45,49 @@ export function loadQQWrapper(QQVersion: string): WrapperNodeApi {
     let appPath;
     if (os.platform() === 'darwin') {
         appPath = path.resolve(path.dirname(process.execPath), '../Resources/app');
-    } else {
+    } else if (os.platform() === 'linux') {
         appPath = path.resolve(path.dirname(process.execPath), './resources/app');
+    } else {
+        appPath = path.resolve(path.dirname(process.execPath), `./versions/${QQVersion}/`);
     }
     let wrapperNodePath = path.resolve(appPath, 'wrapper.node');
     if (!fs.existsSync(wrapperNodePath)) {
-        wrapperNodePath = path.join(appPath, `versions/${QQVersion}/wrapper.node`);
+        wrapperNodePath = path.join(appPath, `./resources/app/wrapper.node`);
+    }
+    //老版本兼容 未来去掉
+    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);
     return nativemodule.exports;
 }
-
+export function getMajorPath(QQVersion: string): string {
+    // major.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 majorPath = path.resolve(appPath, 'major.node');
+    if (!fs.existsSync(majorPath)) {
+        majorPath = path.join(appPath, `./resources/app/major.node`);
+    }
+    //老版本兼容 未来去掉
+    if (!fs.existsSync(majorPath)) {
+        majorPath = path.join(path.dirname(process.execPath), `./resources/app/versions/${QQVersion}/major.node`);
+    }
+    return majorPath;
+}
 export class NapCatCore {
     readonly context: InstanceContext;
-    readonly apis: StableNTApiWrapper;
     readonly eventWrapper: NTEventWrapper;
-    // readonly eventChannel: NTEventChannel;
+    NapCatDataPath: string = '';
-    NapCatDataPath: string;
+    NapCatTempPath: string = '';
-    NapCatTempPath: string;
+    apis: StableNTApiWrapper;
     // runtime info, not readonly
     selfInfo: SelfInfo;
     util: NodeQQNTWrapperUtil;
@@ -75,17 +99,20 @@ export class NapCatCore {
         this.context = context;
         this.util = this.context.wrapper.NodeQQNTWrapperUtil;
         this.eventWrapper = new NTEventWrapper(context.session);
+        this.configLoader = new NapCatConfigLoader(this, this.context.pathWrapper.configPath);
         this.apis = {
             FileApi: new NTQQFileApi(this.context, this),
             SystemApi: new NTQQSystemApi(this.context, this),
             CollectionApi: new NTQQCollectionApi(this.context, this),
+            PacketApi: new NTQQPacketApi(this.context, this),
             WebApi: new NTQQWebApi(this.context, this),
             FriendApi: new NTQQFriendApi(this.context, this),
             MsgApi: new NTQQMsgApi(this.context, this),
             UserApi: new NTQQUserApi(this.context, this),
             GroupApi: new NTQQGroupApi(this.context, this),
         };
-        this.configLoader = new NapCatConfigLoader(this, this.context.pathWrapper.configPath);
+    }
+    async initCore() {
         this.NapCatDataPath = path.join(this.dataPath, 'NapCat');
         fs.mkdirSync(this.NapCatDataPath, { recursive: true });
         this.NapCatTempPath = path.join(this.NapCatDataPath, 'temp');
@@ -93,7 +120,14 @@ export class NapCatCore {
         if (!fs.existsSync(this.NapCatTempPath)) {
             fs.mkdirSync(this.NapCatTempPath, { recursive: true });
         }
-        this.initNapCatCoreListeners().then().catch(this.context.logger.logError);
+        //遍历this.apis[i].initApi 如果存在该函数进行async 调用 
+        for (const apiKey in this.apis) {
+            const api = this.apis[apiKey as keyof StableNTApiWrapper];
+            if ('initApi' in api && typeof api.initApi === 'function') {
+                await api.initApi();
+            }
+        }
+        this.initNapCatCoreListeners().then().catch(this.context.logger.logError.bind(this.context.logger));
 
         this.context.logger.setFileLogEnabled(
             this.configLoader.configData.fileLog,
@@ -106,7 +140,6 @@ export class NapCatCore {
             this.configLoader.configData.consoleLogLevel as LogLevel,
         );
     }
-
     get dataPath(): string {
         let result = this.context.wrapper.NodeQQNTWrapperUtil.getNTUserDataInfoConfig();
         if (!result) {
@@ -121,7 +154,7 @@ export class NapCatCore {
         const msgListener = new NodeIKernelMsgListener();
         msgListener.onKickedOffLine = (Info: KickedOffLineInfo) => {
             // 下线通知
-            this.context.logger.logError('[KickedOffLine] [' + Info.tipsTitle + '] ' + Info.tipsDesc);
+            this.context.logger.logError.bind(this.context.logger)('[KickedOffLine] [' + Info.tipsTitle + '] ' + Info.tipsDesc);
             this.selfInfo.online = false;
         };
         msgListener.onRecvMsg = (msgs) => {
@@ -132,7 +165,7 @@ export class NapCatCore {
         };
         //await sleep(2500);
         this.context.session.getMsgService().addKernelMsgListener(
-            proxiedListenerOf(msgListener, this.context.logger) as any,
+            proxiedListenerOf(msgListener, this.context.logger),
         );
 
         const profileListener = new NodeIKernelProfileListener();
@@ -177,7 +210,7 @@ export class NapCatCore {
             });
         };
         groupListener.onMemberListChange = (arg) => {
-            // todo: 应该加一个内部自己维护的成员变动callback，用于判断成员变化通知
+            // work:应该加一个内部自己维护的成员变动callback，用于判断成员变化通知
             const groupCode = arg.sceneId.split('_')[0];
             if (this.apis.GroupApi.groupMemberCache.has(groupCode)) {
                 const existMembers = this.apis.GroupApi.groupMemberCache.get(groupCode)!;
@@ -187,7 +220,7 @@ export class NapCatCore {
                     if (existMember) {
                         Object.assign(existMember, member);
                     } else {
-                        existMembers!.set(uid, member);
+                        existMembers.set(uid, member);
                     }
                     //移除成员
                     if (member.isDelete) {
@@ -228,7 +261,7 @@ export class NapCatCore {
             }
         };
         this.context.session.getGroupService().addKernelGroupListener(
-            proxiedListenerOf(groupListener, this.context.logger) as any,
+            proxiedListenerOf(groupListener, this.context.logger),
         );
     }
 
@@ -241,22 +274,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: {
@@ -264,7 +309,7 @@ export async function genSessionConfig(QQVersionAppid: string, QQVersion: string
             systemId: 0,
             appId: '',
             logicEnvironment: '',
-            platform: PlatformType.KWINDOWS,
+            platform: systemPlatform,
             language: '',
             sdkVersion: '',
             userId: '',
@@ -304,6 +349,7 @@ export interface InstanceContext {
 export interface StableNTApiWrapper {
     FileApi: NTQQFileApi,
     SystemApi: NTQQSystemApi,
+    PacketApi: NTQQPacketApi,
     CollectionApi: NTQQCollectionApi,
     WebApi: NTQQWebApi,
     FriendApi: NTQQFriendApi,

src/core/listeners/NodeIKernelBuddyListener.ts

@@ -3,57 +3,57 @@ import { BuddyCategoryType, FriendRequestNotify } from '@/core/entities';
 export type OnBuddyChangeParams = BuddyCategoryType[];
 
 export class NodeIKernelBuddyListener {
-    onBuddyListChangedV2(arg: unknown): void {
+    onBuddyListChangedV2(arg: unknown): any {
     }
 
-    onAddBuddyNeedVerify(arg: unknown) {
+    onAddBuddyNeedVerify(arg: unknown): any {
     }
 
-    onAddMeSettingChanged(arg: unknown) {
+    onAddMeSettingChanged(arg: unknown): any {
     }
 
-    onAvatarUrlUpdated(arg: unknown) {
+    onAvatarUrlUpdated(arg: unknown): any {
     }
 
-    onBlockChanged(arg: unknown) {
+    onBlockChanged(arg: unknown): any {
     }
 
-    onBuddyDetailInfoChange(arg: unknown) {
+    onBuddyDetailInfoChange(arg: unknown): any {
     }
 
-    onBuddyInfoChange(arg: unknown) {
+    onBuddyInfoChange(arg: unknown): any {
     }
 
-    onBuddyListChange(arg: OnBuddyChangeParams): void {
+    onBuddyListChange(arg: OnBuddyChangeParams): any {
     }
 
-    onBuddyRemarkUpdated(arg: unknown): void {
+    onBuddyRemarkUpdated(arg: unknown): any {
     }
 
-    onBuddyReqChange(arg: FriendRequestNotify): void {
+    onBuddyReqChange(arg: FriendRequestNotify): any {
     }
 
-    onBuddyReqUnreadCntChange(arg: unknown): void {
+    onBuddyReqUnreadCntChange(arg: unknown): any {
     }
 
-    onCheckBuddySettingResult(arg: unknown): void {
+    onCheckBuddySettingResult(arg: unknown): any {
     }
 
-    onDelBatchBuddyInfos(arg: unknown): void {
+    onDelBatchBuddyInfos(arg: unknown): any {
     }
 
-    onDoubtBuddyReqChange(arg: unknown): void {
+    onDoubtBuddyReqChange(arg: unknown): any {
     }
 
-    onDoubtBuddyReqUnreadNumChange(arg: unknown): void {
+    onDoubtBuddyReqUnreadNumChange(arg: unknown): any {
     }
 
-    onNickUpdated(arg: unknown): void {
+    onNickUpdated(arg: unknown): any {
     }
 
-    onSmartInfos(arg: unknown): void {
+    onSmartInfos(arg: unknown): any {
     }
 
-    onSpacePermissionInfos(arg: unknown): void {
+    onSpacePermissionInfos(arg: unknown): any {
     }
 }

src/core/listeners/NodeIKernelFileAssistantListener.ts

@@ -7,19 +7,19 @@ export class NodeIKernelFileAssistantListener {
         fileSpeed: number,
         thumbPath: string | null,
         filePath: string | null,
-    }) {
+    }): any {
     }
 
-    onSessionListChanged(...args: unknown[]) {
+    onSessionListChanged(...args: unknown[]): any {
     }
 
-    onSessionChanged(...args: unknown[]) {
+    onSessionChanged(...args: unknown[]): any {
     }
 
-    onFileListChanged(...args: unknown[]) {
+    onFileListChanged(...args: unknown[]): any {
     }
 
-    onFileSearch(searchResult: SearchResultWrapper) {
+    onFileSearch(searchResult: SearchResultWrapper): any {
     }
 }
 

src/core/listeners/NodeIKernelGroupListener.ts

@@ -1,84 +1,85 @@
-import { DataSource, Group, GroupListUpdateType, GroupMember, GroupNotify } from '@/core/entities';
+import { DataSource, Group, GroupListUpdateType, GroupMember, GroupNotify, ShutUpGroupMember } from '@/core/entities';
 
 export class NodeIKernelGroupListener {
-    onGroupListInited(listEmpty: boolean): void { }
+    onGroupListInited(listEmpty: boolean): any { }
     // 发现于Win 9.9.9 23159
-    onGroupMemberLevelInfoChange(...args: unknown[]): void {
+    onGroupMemberLevelInfoChange(...args: unknown[]): any {
 
     }
 
-    onGetGroupBulletinListResult(...args: unknown[]) {
+    onGetGroupBulletinListResult(...args: unknown[]): any {
     }
 
-    onGroupAllInfoChange(...args: unknown[]) {
+    onGroupAllInfoChange(...args: unknown[]): any {
     }
 
-    onGroupBulletinChange(...args: unknown[]) {
+    onGroupBulletinChange(...args: unknown[]): any {
     }
 
-    onGroupBulletinRemindNotify(...args: unknown[]) {
+    onGroupBulletinRemindNotify(...args: unknown[]): any {
     }
 
-    onGroupArkInviteStateResult(...args: unknown[]) {
+    onGroupArkInviteStateResult(...args: unknown[]): any {
     }
 
-    onGroupBulletinRichMediaDownloadComplete(...args: unknown[]) {
+    onGroupBulletinRichMediaDownloadComplete(...args: unknown[]): any {
     }
 
-    onGroupConfMemberChange(...args: unknown[]) {
+    onGroupConfMemberChange(...args: unknown[]): any {
     }
 
-    onGroupDetailInfoChange(...args: unknown[]) {
+    onGroupDetailInfoChange(...args: unknown[]): any {
     }
 
-    onGroupExtListUpdate(...args: unknown[]) {
+    onGroupExtListUpdate(...args: unknown[]): any {
     }
 
-    onGroupFirstBulletinNotify(...args: unknown[]) {
+    onGroupFirstBulletinNotify(...args: unknown[]): any {
     }
 
-    onGroupListUpdate(updateType: GroupListUpdateType, groupList: Group[]) {
+    onGroupListUpdate(updateType: GroupListUpdateType, groupList: Group[]): any {
     }
 
-    onGroupNotifiesUpdated(dboubt: boolean, notifies: GroupNotify[]) {
+    onGroupNotifiesUpdated(dboubt: boolean, notifies: GroupNotify[]): any {
     }
 
-    onGroupBulletinRichMediaProgressUpdate(...args: unknown[]) {
+    onGroupBulletinRichMediaProgressUpdate(...args: unknown[]): any {
     }
 
-    onGroupNotifiesUnreadCountUpdated(...args: unknown[]) {
+    onGroupNotifiesUnreadCountUpdated(...args: unknown[]): any {
     }
 
-    onGroupSingleScreenNotifies(doubt: boolean, seq: string, notifies: GroupNotify[]) {
+    onGroupSingleScreenNotifies(doubt: boolean, seq: string, notifies: GroupNotify[]): any {
     }
 
-    onGroupsMsgMaskResult(...args: unknown[]) {
+    onGroupsMsgMaskResult(...args: unknown[]): any {
     }
 
-    onGroupStatisticInfoChange(...args: unknown[]) {
+    onGroupStatisticInfoChange(...args: unknown[]): any {
     }
 
-    onJoinGroupNotify(...args: unknown[]) {
+    onJoinGroupNotify(...args: unknown[]): any {
     }
 
-    onJoinGroupNoVerifyFlag(...args: unknown[]) {
+    onJoinGroupNoVerifyFlag(...args: unknown[]): any {
     }
 
-    onMemberInfoChange(groupCode: string, dateSource: DataSource, members: Map<string, GroupMember>) {
+    onMemberInfoChange(groupCode: string, dateSource: DataSource, members: Map<string, GroupMember>): any {
     }
 
     onMemberListChange(arg: {
         sceneId: string,
         ids: string[],
         infos: Map<string, GroupMember>, // uid -> GroupMember
-        finish: boolean,
+        hasPrev: boolean,
+        hasNext: boolean,
         hasRobot: boolean
-    }) {
+    }): any {
     }
 
-    onSearchMemberChange(...args: unknown[]) {
+    onSearchMemberChange(...args: unknown[]): any {
     }
 
-    onShutUpMemberListChanged(...args: unknown[]) {
+    onShutUpMemberListChanged(groupCode: string, members: Array<ShutUpGroupMember>): any {
     }
 }

src/core/listeners/NodeIKernelLoginListener.ts

@@ -1,57 +1,57 @@
 export class NodeIKernelLoginListener {
-    onLoginConnected(...args: any[]): void {
+    onLoginConnected(...args: any[]): any {
     }
 
-    onLoginDisConnected(...args: any[]): void {
+    onLoginDisConnected(...args: any[]): any {
     }
 
-    onLoginConnecting(...args: any[]): void {
+    onLoginConnecting(...args: any[]): any {
     }
 
-    onQRCodeGetPicture(arg: { pngBase64QrcodeData: string, qrcodeUrl: string }): void {
+    onQRCodeGetPicture(arg: { pngBase64QrcodeData: string, qrcodeUrl: string }): any {
         // let base64Data: string = arg.pngBase64QrcodeData
         // base64Data = base64Data.split("data:image/png;base64,")[1]
         // let buffer = Buffer.from(base64Data, 'base64')
         // console.log("onQRCodeGetPicture", arg);
     }
 
-    onQRCodeLoginPollingStarted(...args: any[]): void {
+    onQRCodeLoginPollingStarted(...args: any[]): any {
     }
 
-    onQRCodeSessionUserScaned(...args: any[]): void {
+    onQRCodeSessionUserScaned(...args: any[]): any {
     }
 
-    onQRCodeLoginSucceed(arg: QRCodeLoginSucceedResult): void {
+    onQRCodeLoginSucceed(arg: QRCodeLoginSucceedResult): any {
     }
 
-    onQRCodeSessionFailed(...args: any[]): void {
+    onQRCodeSessionFailed(...args: any[]): any {
     }
 
-    onLoginFailed(...args: any[]): void {
+    onLoginFailed(...args: any[]): any {
     }
 
-    onLogoutSucceed(...args: any[]): void {
+    onLogoutSucceed(...args: any[]): any {
     }
 
-    onLogoutFailed(...args: any[]): void {
+    onLogoutFailed(...args: any[]): any {
     }
 
-    onUserLoggedIn(...args: any[]): void {
+    onUserLoggedIn(...args: any[]): any {
     }
 
-    onQRCodeSessionQuickLoginFailed(...args: any[]): void {
+    onQRCodeSessionQuickLoginFailed(...args: any[]): any {
     }
 
-    onPasswordLoginFailed(...args: any[]): void {
+    onPasswordLoginFailed(...args: any[]): any {
     }
 
-    OnConfirmUnusualDeviceFailed(...args: any[]): void {
+    OnConfirmUnusualDeviceFailed(...args: any[]): any {
     }
 
-    onQQLoginNumLimited(...args: any[]): void {
+    onQQLoginNumLimited(...args: any[]): any {
     }
 
-    onLoginState(...args: any[]): void {
+    onLoginState(...args: any[]): any {
     }
 }
 

src/core/listeners/NodeIKernelMsgListener.ts

@@ -1,4 +1,4 @@
-import { ChatType, RawMessage } from '@/core/entities';
+import { ChatType, KickedOffLineInfo, RawMessage } from '@/core/entities';
 import { CommonFileInfo } from '@/core';
 
 export interface OnRichMediaDownloadCompleteParams {
@@ -20,8 +20,8 @@ export interface OnRichMediaDownloadCompleteParams {
     fileSrvErrCode: string,
     clientMsg: string,
     businessId: number,
-    userTotalSpacePerDay: unknown | null,
+    userTotalSpacePerDay: unknown,
-    userUsedSpacePerDay: unknown | null
+    userUsedSpacePerDay: unknown
 }
 
 export interface GroupFileInfoUpdateParamType {
@@ -94,108 +94,108 @@ export interface TempOnRecvParams {
 }
 
 export class NodeIKernelMsgListener {
-    onAddSendMsg(msgRecord: RawMessage) {
+    onAddSendMsg(msgRecord: RawMessage): any {
 
     }
 
-    onBroadcastHelperDownloadComplete(broadcastHelperTransNotifyInfo: unknown) {
+    onBroadcastHelperDownloadComplete(broadcastHelperTransNotifyInfo: unknown): any {
 
     }
 
-    onBroadcastHelperProgressUpdate(broadcastHelperTransNotifyInfo: unknown) {
+    onBroadcastHelperProgressUpdate(broadcastHelperTransNotifyInfo: unknown): any {
 
     }
 
-    onChannelFreqLimitInfoUpdate(contact: unknown, z: unknown, freqLimitInfo: unknown) {
+    onChannelFreqLimitInfoUpdate(contact: unknown, z: unknown, freqLimitInfo: unknown): any {
 
     }
 
-    onContactUnreadCntUpdate(hashMap: unknown) {
+    onContactUnreadCntUpdate(hashMap: unknown): any {
 
     }
 
-    onCustomWithdrawConfigUpdate(customWithdrawConfig: unknown) {
+    onCustomWithdrawConfigUpdate(customWithdrawConfig: unknown): any {
 
     }
 
-    onDraftUpdate(contact: unknown, arrayList: unknown, j2: unknown) {
+    onDraftUpdate(contact: unknown, arrayList: unknown, j2: unknown): any {
 
     }
 
-    onEmojiDownloadComplete(emojiNotifyInfo: unknown) {
+    onEmojiDownloadComplete(emojiNotifyInfo: unknown): any {
 
     }
 
-    onEmojiResourceUpdate(emojiResourceInfo: unknown) {
+    onEmojiResourceUpdate(emojiResourceInfo: unknown): any {
 
     }
 
-    onFeedEventUpdate(firstViewDirectMsgNotifyInfo: unknown) {
+    onFeedEventUpdate(firstViewDirectMsgNotifyInfo: unknown): any {
 
     }
 
-    onFileMsgCome(arrayList: unknown) {
+    onFileMsgCome(arrayList: unknown): any {
 
     }
 
-    onFirstViewDirectMsgUpdate(firstViewDirectMsgNotifyInfo: unknown) {
+    onFirstViewDirectMsgUpdate(firstViewDirectMsgNotifyInfo: unknown): any {
 
     }
 
-    onFirstViewGroupGuildMapping(arrayList: unknown) {
+    onFirstViewGroupGuildMapping(arrayList: unknown): any {
 
     }
 
-    onGrabPasswordRedBag(i2: unknown, str: unknown, i3: unknown, recvdOrder: unknown, msgRecord: unknown) {
+    onGrabPasswordRedBag(i2: unknown, str: unknown, i3: unknown, recvdOrder: unknown, msgRecord: unknown): any {
 
     }
 
-    onGroupFileInfoAdd(groupItem: unknown) {
+    onGroupFileInfoAdd(groupItem: unknown): any {
 
     }
 
-    onGroupFileInfoUpdate(groupFileListResult: GroupFileInfoUpdateParamType) {
+    onGroupFileInfoUpdate(groupFileListResult: GroupFileInfoUpdateParamType): any {
 
     }
 
-    onGroupGuildUpdate(groupGuildNotifyInfo: unknown) {
+    onGroupGuildUpdate(groupGuildNotifyInfo: unknown): any {
 
     }
 
 
-    onGroupTransferInfoAdd(groupItem: unknown) {
+    onGroupTransferInfoAdd(groupItem: unknown): any {
 
     }
 
-    onGroupTransferInfoUpdate(groupFileListResult: unknown) {
+    onGroupTransferInfoUpdate(groupFileListResult: unknown): any {
 
     }
 
-    onGuildInteractiveUpdate(guildInteractiveNotificationItem: unknown) {
+    onGuildInteractiveUpdate(guildInteractiveNotificationItem: unknown): any {
 
     }
 
-    onGuildMsgAbFlagChanged(guildMsgAbFlag: unknown) {
+    onGuildMsgAbFlagChanged(guildMsgAbFlag: unknown): any {
 
     }
 
-    onGuildNotificationAbstractUpdate(guildNotificationAbstractInfo: unknown) {
+    onGuildNotificationAbstractUpdate(guildNotificationAbstractInfo: unknown): any {
 
     }
 
-    onHitCsRelatedEmojiResult(downloadRelateEmojiResultInfo: unknown) {
+    onHitCsRelatedEmojiResult(downloadRelateEmojiResultInfo: unknown): any {
 
     }
 
-    onHitEmojiKeywordResult(hitRelatedEmojiWordsResult: unknown) {
+    onHitEmojiKeywordResult(hitRelatedEmojiWordsResult: unknown): any {
 
     }
 
-    onHitRelatedEmojiResult(relatedWordEmojiInfo: unknown) {
+    onHitRelatedEmojiResult(relatedWordEmojiInfo: unknown): any {
 
     }
 
-    onImportOldDbProgressUpdate(importOldDbMsgNotifyInfo: unknown) {
+    onImportOldDbProgressUpdate(importOldDbMsgNotifyInfo: unknown): any {
 
     }
 
@@ -208,176 +208,176 @@ export class NodeIKernelMsgListener {
         statusText: string;
         timestamp: string;
         toUin: string;
-    }) {
+    }): any {
 
     }
 
-    onKickedOffLine(kickedInfo: unknown) {
+    onKickedOffLine(kickedInfo: KickedOffLineInfo): any {
 
     }
 
-    onLineDev(arrayList: unknown) {
+    onLineDev(arrayList: unknown): any {
 
     }
 
-    onLogLevelChanged(j2: unknown) {
+    onLogLevelChanged(j2: unknown): any {
 
     }
 
-    onMsgAbstractUpdate(arrayList: unknown) {
+    onMsgAbstractUpdate(arrayList: unknown): any {
 
     }
 
-    onMsgBoxChanged(arrayList: unknown) {
+    onMsgBoxChanged(arrayList: unknown): any {
 
     }
 
-    onMsgDelete(contact: unknown, arrayList: unknown) {
+    onMsgDelete(contact: unknown, arrayList: unknown): any {
 
     }
 
-    onMsgEventListUpdate(hashMap: unknown) {
+    onMsgEventListUpdate(hashMap: unknown): any {
 
     }
 
-    onMsgInfoListAdd(arrayList: unknown) {
+    onMsgInfoListAdd(arrayList: unknown): any {
 
     }
 
-    onMsgInfoListUpdate(msgList: RawMessage[]) {
+    onMsgInfoListUpdate(msgList: RawMessage[]): any {
 
     }
 
-    onMsgQRCodeStatusChanged(i2: unknown) {
+    onMsgQRCodeStatusChanged(i2: unknown): any {
 
     }
 
-    onMsgRecall(i2: unknown, str: unknown, j2: unknown) {
+    onMsgRecall(i2: unknown, str: unknown, j2: unknown): any {
 
     }
 
-    onMsgSecurityNotify(msgRecord: unknown) {
+    onMsgSecurityNotify(msgRecord: unknown): any {
 
     }
 
-    onMsgSettingUpdate(msgSetting: unknown) {
+    onMsgSettingUpdate(msgSetting: unknown): any {
 
     }
 
-    onNtFirstViewMsgSyncEnd() {
+    onNtFirstViewMsgSyncEnd(): any {
 
     }
 
-    onNtMsgSyncEnd() {
+    onNtMsgSyncEnd(): any {
 
     }
 
-    onNtMsgSyncStart() {
+    onNtMsgSyncStart(): any {
 
     }
 
-    onReadFeedEventUpdate(firstViewDirectMsgNotifyInfo: unknown) {
+    onReadFeedEventUpdate(firstViewDirectMsgNotifyInfo: unknown): any {
 
     }
 
-    onRecvGroupGuildFlag(i2: unknown) {
+    onRecvGroupGuildFlag(i2: unknown): any {
 
     }
 
-    onRecvMsg(arrayList: RawMessage[]) {
+    onRecvMsg(arrayList: RawMessage[]): any {
 
     }
 
-    onRecvMsgSvrRspTransInfo(j2: unknown, contact: unknown, i2: unknown, i3: unknown, str: unknown, bArr: unknown) {
+    onRecvMsgSvrRspTransInfo(j2: unknown, contact: unknown, i2: unknown, i3: unknown, str: unknown, bArr: unknown): any {
 
     }
 
-    onRecvOnlineFileMsg(arrayList: unknown) {
+    onRecvOnlineFileMsg(arrayList: unknown): any {
 
     }
 
-    onRecvS2CMsg(arrayList: unknown) {
+    onRecvS2CMsg(arrayList: unknown): any {
 
     }
 
-    onRecvSysMsg(arrayList: Array<number>) {
+    onRecvSysMsg(arrayList: Array<number>): any {
 
     }
 
-    onRecvUDCFlag(i2: unknown) {
+    onRecvUDCFlag(i2: unknown): any {
 
     }
 
-    onRichMediaDownloadComplete(fileTransNotifyInfo: OnRichMediaDownloadCompleteParams) {
+    onRichMediaDownloadComplete(fileTransNotifyInfo: OnRichMediaDownloadCompleteParams): any {
     }
 
-    onRichMediaProgerssUpdate(fileTransNotifyInfo: unknown) {
+    onRichMediaProgerssUpdate(fileTransNotifyInfo: unknown): any {
 
     }
 
-    onRichMediaUploadComplete(fileTransNotifyInfo: unknown) {
+    onRichMediaUploadComplete(fileTransNotifyInfo: unknown): any {
 
     }
 
-    onSearchGroupFileInfoUpdate(searchGroupFileResult: unknown) {
+    onSearchGroupFileInfoUpdate(searchGroupFileResult: unknown): any {
 
     }
 
-    onSendMsgError(j2: unknown, contact: unknown, i2: unknown, str: unknown) {
+    onSendMsgError(j2: unknown, contact: unknown, i2: unknown, str: unknown): any {
 
     }
 
-    onSysMsgNotification(i2: unknown, j2: unknown, j3: unknown, arrayList: unknown) {
+    onSysMsgNotification(i2: unknown, j2: unknown, j3: unknown, arrayList: unknown): any {
 
     }
 
-    onTempChatInfoUpdate(tempChatInfo: TempOnRecvParams) {
+    onTempChatInfoUpdate(tempChatInfo: TempOnRecvParams): any {
 
     }
 
-    onUnreadCntAfterFirstView(hashMap: unknown) {
+    onUnreadCntAfterFirstView(hashMap: unknown): any {
 
     }
 
-    onUnreadCntUpdate(hashMap: unknown) {
+    onUnreadCntUpdate(hashMap: unknown): any {
 
     }
 
-    onUserChannelTabStatusChanged(z: unknown) {
+    onUserChannelTabStatusChanged(z: unknown): any {
 
     }
 
-    onUserOnlineStatusChanged(z: unknown) {
+    onUserOnlineStatusChanged(z: unknown): any {
 
     }
 
-    onUserTabStatusChanged(arrayList: unknown) {
+    onUserTabStatusChanged(arrayList: unknown): any {
 
     }
 
-    onlineStatusBigIconDownloadPush(i2: unknown, j2: unknown, str: unknown) {
+    onlineStatusBigIconDownloadPush(i2: unknown, j2: unknown, str: unknown): any {
 
     }
 
-    onlineStatusSmallIconDownloadPush(i2: unknown, j2: unknown, str: unknown) {
+    onlineStatusSmallIconDownloadPush(i2: unknown, j2: unknown, str: unknown): any {
 
     }
 
     // 第一次发现于Linux
-    onUserSecQualityChanged(...args: unknown[]) {
+    onUserSecQualityChanged(...args: unknown[]): any {
 
     }
 
-    onMsgWithRichLinkInfoUpdate(...args: unknown[]) {
+    onMsgWithRichLinkInfoUpdate(...args: unknown[]): any {
 
     }
 
-    onRedTouchChanged(...args: unknown[]) {
+    onRedTouchChanged(...args: unknown[]): any {
 
     }
 
     // 第一次发现于Win 9.9.9-23159
-    onBroadcastHelperProgerssUpdate(...args: unknown[]) {
+    onBroadcastHelperProgerssUpdate(...args: unknown[]): any {
 
     }
 }

src/core/listeners/NodeIKernelProfileListener.ts

@@ -5,67 +5,67 @@ export class NodeIKernelProfileListener {
 
     }
 
-    onProfileSimpleChanged(...args: unknown[]) {
+    onProfileSimpleChanged(...args: unknown[]): any {
 
     }
 
-    onProfileDetailInfoChanged(profile: User) {
+    onProfileDetailInfoChanged(profile: User): any {
 
     }
 
-    onStatusUpdate(...args: unknown[]) {
+    onStatusUpdate(...args: unknown[]): any {
 
     }
 
-    onSelfStatusChanged(...args: unknown[]) {
+    onSelfStatusChanged(...args: unknown[]): any {
 
     }
 
-    onStrangerRemarkChanged(...args: unknown[]) {
+    onStrangerRemarkChanged(...args: unknown[]): any {
 
     }
 
-    onMemberListChange(...args: unknown[]) {
+    onMemberListChange(...args: unknown[]): any {
 
     }
 
-    onMemberInfoChange(...args: unknown[]) {
+    onMemberInfoChange(...args: unknown[]): any {
 
     }
 
-    onGroupListUpdate(...args: unknown[]) {
+    onGroupListUpdate(...args: unknown[]): any {
 
     }
 
-    onGroupAllInfoChange(...args: unknown[]) {
+    onGroupAllInfoChange(...args: unknown[]): any {
 
     }
 
-    onGroupDetailInfoChange(...args: unknown[]) {
+    onGroupDetailInfoChange(...args: unknown[]): any {
 
     }
 
-    onGroupConfMemberChange(...args: unknown[]) {
+    onGroupConfMemberChange(...args: unknown[]): any {
 
     }
 
-    onGroupExtListUpdate(...args: unknown[]) {
+    onGroupExtListUpdate(...args: unknown[]): any {
 
     }
 
-    onGroupNotifiesUpdated(...args: unknown[]) {
+    onGroupNotifiesUpdated(...args: unknown[]): any {
 
     }
 
-    onGroupNotifiesUnreadCountUpdated(...args: unknown[]) {
+    onGroupNotifiesUnreadCountUpdated(...args: unknown[]): any {
 
     }
 
-    onGroupMemberLevelInfoChange(...args: unknown[]) {
+    onGroupMemberLevelInfoChange(...args: unknown[]): any {
 
     }
 
-    onGroupBulletinChange(...args: unknown[]) {
+    onGroupBulletinChange(...args: unknown[]): any {
 
     }
 }

src/core/listeners/NodeIKernelRecentContactListener.ts

@@ -1,25 +1,25 @@
 export class NodeIKernelRecentContactListener {
-    onDeletedContactsNotify(...args: unknown[]) {
+    onDeletedContactsNotify(...args: unknown[]): any {
 
     }
 
-    onRecentContactNotification(msgList: any, arg0: { msgListUnreadCnt: string }, arg1: number) {
+    onRecentContactNotification(msgList: any, arg0: { msgListUnreadCnt: string }, arg1: number): any {
 
     }
 
-    onMsgUnreadCountUpdate(...args: unknown[]) {
+    onMsgUnreadCountUpdate(...args: unknown[]): any {
 
     }
 
-    onGuildDisplayRecentContactListChanged(...args: unknown[]) {
+    onGuildDisplayRecentContactListChanged(...args: unknown[]): any {
 
     }
 
-    onRecentContactListChanged(...args: unknown[]) {
+    onRecentContactListChanged(...args: unknown[]): any {
 
     }
 
-    onRecentContactListChangedVer2(...args: unknown[]) {
+    onRecentContactListChangedVer2(...args: unknown[]): any {
 
     }
 }

src/core/listeners/NodeIKernelRobotListener.ts

@@ -1,13 +1,13 @@
 export class NodeIKernelRobotListener {
-    onRobotFriendListChanged(...args: unknown[]) {
+    onRobotFriendListChanged(...args: unknown[]): any {
 
     }
 
-    onRobotListChanged(...args: unknown[]) {
+    onRobotListChanged(...args: unknown[]): any {
 
     }
 
-    onRobotProfileChanged(...args: unknown[]) {
+    onRobotProfileChanged(...args: unknown[]): any {
 
     }
 }

src/core/listeners/NodeIKernelSearchListener.ts

@@ -0,0 +1,97 @@
+import { ChatType } from '@/core';
+export interface SearchGroupInfo {
+    groupCode: string;
+    ownerUid: string;
+    groupFlag: number;
+    groupFlagExt: number;
+    maxMemberNum: number;
+    memberNum: number;
+    groupOption: number;
+    classExt: number;
+    groupName: string;
+    fingerMemo: string;
+    groupQuestion: string;
+    certType: number;
+    shutUpAllTimestamp: number;
+    shutUpMeTimestamp: number;
+    groupTypeFlag: number;
+    privilegeFlag: number;
+    groupSecLevel: number;
+    groupFlagExt3: number;
+    isConfGroup: number;
+    isModifyConfGroupFace: number;
+    isModifyConfGroupName: number;
+    noFigerOpenFlag: number;
+    noCodeFingerOpenFlag: number;
+    groupFlagExt4: number;
+    groupMemo: string;
+    cmdUinMsgSeq: number;
+    cmdUinJoinTime: number;
+    cmdUinUinFlag: number;
+    cmdUinMsgMask: number;
+    groupSecLevelInfo: number;
+    cmdUinPrivilege: number;
+    cmdUinFlagEx2: number;
+    appealDeadline: number;
+    remarkName: string;
+    isTop: boolean;
+    richFingerMemo: string;
+    groupAnswer: string;
+    joinGroupAuth: string;
+    isAllowModifyConfGroupName: number;
+}
+
+export interface GroupInfo {
+    groupCode: string;
+    searchGroupInfo: SearchGroupInfo;
+    privilege: number;
+}
+
+export interface GroupSearchResult {
+    keyWord: string;
+    errorCode: number;
+    groupInfos: GroupInfo[];
+    penetrate: string;
+    isEnd: boolean;
+    nextPos: number;
+}
+export interface NodeIKernelSearchListener {
+    
+    onSearchGroupResult(params: GroupSearchResult): any;
+
+    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
+            }[]
+        }[]
+    }): any;
+}

src/core/listeners/NodeIKernelSearchListener_Polyfill.ts

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

src/core/listeners/NodeIKernelSessionListener.ts

@@ -1,25 +1,25 @@
 export class NodeIKernelSessionListener {
-    onNTSessionCreate(args: unknown) {
+    onNTSessionCreate(args: unknown): any {
 
     }
 
-    onGProSessionCreate(args: unknown) {
+    onGProSessionCreate(args: unknown): any {
 
     }
 
-    onSessionInitComplete(args: unknown) {
+    onSessionInitComplete(args: unknown): any {
 
     }
 
-    onOpentelemetryInit(args: unknown) {
+    onOpentelemetryInit(args: unknown): any {
 
     }
 
-    onUserOnlineResult(args: unknown) {
+    onUserOnlineResult(args: unknown): any {
 
     }
 
-    onGetSelfTinyId(args: unknown) {
+    onGetSelfTinyId(args: unknown): any {
 
     }
 }

src/core/listeners/NodeIKernelStorageCleanListener.ts

@@ -1,21 +1,21 @@
 export class NodeIKernelStorageCleanListener {
-    onCleanCacheProgressChanged(args: unknown) {
+    onCleanCacheProgressChanged(args: unknown): any {
 
     }
 
-    onScanCacheProgressChanged(args: unknown) {
+    onScanCacheProgressChanged(args: unknown): any {
 
     }
 
-    onCleanCacheStorageChanged(args: unknown) {
+    onCleanCacheStorageChanged(args: unknown): any {
 
     }
 
-    onFinishScan(args: unknown) {
+    onFinishScan(args: unknown): any {
 
     }
 
-    onChatCleanDone(args: unknown) {
+    onChatCleanDone(args: unknown): any {
 
     }
 }

src/core/listeners/NodeIKernelTicketListener.ts

@@ -1,2 +1,5 @@
 export class NodeIKernelTicketListener {
+    listener(): any {
+
+    }
 }

src/core/listeners/NodeIO3MiscListener.ts

@@ -0,0 +1,5 @@
+export class NodeIO3MiscListener {
+    getOnAmgomDataPiece(...arg: unknown[]): any {
+
+    }
+}

src/core/listeners/index.ts

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

src/core/packet/client/baseClient.ts

@@ -0,0 +1,91 @@
+import { LRUCache } from "@/common/lru-cache";
+import crypto, { createHash } from "crypto";
+import { PacketContext } from "@/core/packet/context/packetContext";
+import { OidbPacket, PacketHexStr } from "@/core/packet/transformer/base";
+import { LogStack } from "@/core/packet/context/clientContext";
+
+export interface RecvPacket {
+    type: string, // 仅recv
+    trace_id_md5?: string,
+    data: RecvPacketData
+}
+
+export interface RecvPacketData {
+    seq: number
+    cmd: string
+    hex_data: string
+}
+
+function randText(len: number): string {
+    let text = '';
+    const possible = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+    for (let i = 0; i < len; i++) {
+        text += possible.charAt(Math.floor(Math.random() * possible.length));
+    }
+    return text;
+}
+
+
+export abstract class IPacketClient {
+    protected readonly context: PacketContext;
+    protected readonly cb = new LRUCache<string, (json: RecvPacketData) => Promise<void>>(500); // trace_id-type callback
+    logStack: LogStack;
+    available: boolean = false;
+
+    protected constructor(context: PacketContext, logStack: LogStack) {
+        this.context = context;
+        this.logStack = logStack;
+    }
+
+    abstract check(): boolean;
+
+    abstract init(pid: number, recv: string, send: string): Promise<void>;
+
+    abstract sendCommandImpl(cmd: string, data: string, trace_id: string): void;
+
+    private async registerCallback(trace_id: string, type: string, callback: (json: RecvPacketData) => Promise<void>): Promise<void> {
+        this.cb.put(createHash('md5').update(trace_id).digest('hex') + type, callback);
+    }
+
+    private async sendCommand(cmd: string, data: string, trace_id: string, rsp: boolean = false, timeout: number = 20000, sendcb: (json: RecvPacketData) => void = () => {
+    }): Promise<RecvPacketData> {
+        return new Promise<RecvPacketData>((resolve, reject) => {
+            if (!this.available) {
+                reject(new Error('packetBackend 当前不可用！'));
+            }
+
+            const timeoutHandle = setTimeout(() => {
+                reject(new Error(`sendCommand timed out after ${timeout} ms for ${cmd} with trace_id ${trace_id}`));
+            }, timeout);
+
+            this.registerCallback(trace_id, 'send', async (json: RecvPacketData) => {
+                sendcb(json);
+                if (!rsp) {
+                    clearTimeout(timeoutHandle);
+                    resolve(json);
+                }
+            });
+
+            if (rsp) {
+                this.registerCallback(trace_id, 'recv', async (json: RecvPacketData) => {
+                    clearTimeout(timeoutHandle);
+                    resolve(json);
+                });
+            }
+
+            this.sendCommandImpl(cmd, data, trace_id);
+        });
+    }
+
+    async sendPacket(cmd: string, data: PacketHexStr, rsp = false): Promise<RecvPacketData> {
+        const md5 = crypto.createHash('md5').update(data).digest('hex');
+        const trace_id = (randText(4) + md5 + data).slice(0, data.length / 2);
+        return this.sendCommand(cmd, data, trace_id, rsp, 20000, async () => {
+            await this.context.napcore.sendSsoCmdReqByContend(cmd, trace_id);
+        });
+    }
+
+    async sendOidbPacket(pkt: OidbPacket, rsp = false): Promise<RecvPacketData> {
+        return this.sendPacket(pkt.cmd, pkt.data, rsp);
+    }
+}

src/core/packet/client/nativeClient.ts

@@ -0,0 +1,66 @@
+import { createHash } from "crypto";
+import path, { dirname } from "path";
+import { fileURLToPath } from "url";
+import fs from "fs";
+import { IPacketClient } from "@/core/packet/client/baseClient";
+import { constants } from "node:os";
+import { LRUCache } from "@/common/lru-cache";
+import { PacketContext } from "@/core/packet/context/packetContext";
+import { LogStack } from "@/core/packet/context/clientContext";
+
+// 0 send 1 recv
+export interface NativePacketExportType {
+    InitHook?: (send: string, recv: string, callback: (type: number, uin: string, cmd: string, seq: number, hex_data: string) => void) => boolean;
+    SendPacket?: (cmd: string, data: string, trace_id: string) => void;
+}
+
+export class NativePacketClient extends IPacketClient {
+    private readonly supportedPlatforms = ['win32.x64', 'linux.x64', 'linux.arm64', 'darwin.x64', 'darwin.arm64'];
+    private readonly MoeHooExport: { exports: NativePacketExportType } = { exports: {} };
+    private readonly sendEvent = new LRUCache<number, string>(500); // seq->trace_id
+
+    constructor(context: PacketContext, logStack: LogStack) {
+        super(context, logStack);
+    }
+
+    check(): boolean {
+        const platform = process.platform + '.' + process.arch;
+        if (!this.supportedPlatforms.includes(platform)) {
+            this.logStack.pushLogWarn(`NativePacketClient: 不支持的平台: ${platform}`);
+            return false;
+        }
+        const moehoo_path = path.join(dirname(fileURLToPath(import.meta.url)), './moehoo/MoeHoo.' + platform + '.node');
+        if (!fs.existsSync(moehoo_path)) {
+            this.logStack.pushLogWarn(`NativePacketClient: 缺失运行时文件: ${moehoo_path}`);
+            return false;
+        }
+        return true;
+    }
+
+    async init(pid: number, recv: string, send: string): Promise<void> {
+        const platform = process.platform + '.' + process.arch;
+        const moehoo_path = path.join(dirname(fileURLToPath(import.meta.url)), './moehoo/MoeHoo.' + platform + '.node');
+        process.dlopen(this.MoeHooExport, moehoo_path, constants.dlopen.RTLD_LAZY);
+        this.MoeHooExport.exports.InitHook?.(send, recv, (type: number, uin: string, cmd: string, seq: number, hex_data: string) => {
+            const trace_id = createHash('md5').update(Buffer.from(hex_data, 'hex')).digest('hex');
+            if (type === 0 && this.cb.get(trace_id + 'recv')) {
+                //此时为send 提取seq
+                this.sendEvent.put(seq, trace_id);
+            }
+            if (type === 1 && this.sendEvent.get(seq)) {
+                //此时为recv 调用callback
+                const trace_id = this.sendEvent.get(seq);
+                const callback = this.cb.get(trace_id + 'recv');
+                // console.log('callback:', callback, trace_id);
+                callback?.({ seq, cmd, hex_data });
+            }
+        });
+        this.available = true;
+    }
+
+    sendCommandImpl(cmd: string, data: string, trace_id: string): void {
+        const trace_id_md5 = createHash('md5').update(trace_id).digest('hex');
+        this.MoeHooExport.exports.SendPacket?.(cmd, data, trace_id_md5);
+        this.cb.get(trace_id_md5 + 'send')?.({ seq: 0, cmd, hex_data: '' });
+    }
+}

src/core/packet/client/wsClient.ts

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

src/core/packet/clientSession.ts

@@ -0,0 +1,31 @@
+import { PacketContext } from "@/core/packet/context/packetContext";
+import { NapCatCore } from "@/core";
+
+export class PacketClientSession {
+    private readonly context: PacketContext;
+
+    constructor(core: NapCatCore) {
+        this.context = new PacketContext(core);
+    }
+
+    init(pid: number, recv: string, send: string): Promise<void> {
+        return this.context.client.init(pid, recv, send);
+    }
+
+    get clientLogStack() {
+        return this.context.client.clientLogStack;
+    }
+
+    get available() {
+        return this.context.client.available;
+    }
+
+    get operation() {
+        return this.context.operation;
+    }
+
+    // work: global message element adapter (?
+    get msgConverter() {
+        return this.context.msgConverter;
+    }
+}

src/core/packet/context/clientContext.ts

@@ -0,0 +1,126 @@
+import { PacketContext } from "@/core/packet/context/packetContext";
+import { IPacketClient } from "@/core/packet/client/baseClient";
+import { NativePacketClient } from "@/core/packet/client/nativeClient";
+import { WsPacketClient } from "@/core/packet/client/wsClient";
+import { OidbPacket } from "@/core/packet/transformer/base";
+import { PacketLogger } from "@/core/packet/context/loggerContext";
+
+type clientPriority = {
+    [key: number]: (context: PacketContext, logStack: LogStack) => IPacketClient;
+}
+
+const clientPriority: clientPriority = {
+    10: (context: PacketContext, logStack: LogStack) => new NativePacketClient(context, logStack),
+    1: (context: PacketContext, logStack: LogStack) => new WsPacketClient(context, logStack),
+};
+
+export class LogStack {
+    private stack: string[] = [];
+    private readonly logger: PacketLogger;
+
+    constructor(logger: PacketLogger) {
+        this.logger = logger;
+    }
+
+    push(msg: string) {
+        this.stack.push(msg);
+    }
+
+    pushLogInfo(msg: string) {
+        this.logger.info(msg);
+        this.stack.push(`${new Date().toISOString()} [INFO] ${msg}`);
+    }
+
+    pushLogWarn(msg: string) {
+        this.logger.warn(msg);
+        this.stack.push(`${new Date().toISOString()} [WARN] ${msg}`);
+    }
+
+    pushLogError(msg: string) {
+        this.logger.error(msg);
+        this.stack.push(`${new Date().toISOString()} [ERROR] ${msg}`);
+    }
+
+    clear() {
+        this.stack = [];
+    }
+
+    content() {
+        return this.stack.join('\n');
+    }
+}
+
+export class PacketClientContext {
+    private readonly context: PacketContext;
+    private readonly logStack: LogStack;
+    private readonly _client: IPacketClient;
+
+    constructor(context: PacketContext) {
+        this.context = context;
+        this.logStack = new LogStack(context.logger);
+        this._client = this.newClient();
+    }
+
+    get available(): boolean {
+        return this._client.available;
+    }
+
+    get clientLogStack(): string {
+        return this._client.logStack.content();
+    }
+
+    async init(pid: number, recv: string, send: string): Promise<void> {
+        await this._client.init(pid, recv, send);
+    }
+
+    async sendOidbPacket<T extends boolean = false>(pkt: OidbPacket, rsp?: T): Promise<T extends true ? Buffer : void> {
+        const raw = await this._client.sendOidbPacket(pkt, rsp);
+        return (rsp ? Buffer.from(raw.hex_data, "hex") : undefined) as T extends true ? Buffer : void;
+    }
+
+    private newClient(): IPacketClient {
+        const prefer = this.context.napcore.config.packetBackend;
+        let client: IPacketClient | null;
+        switch (prefer) {
+        case "native":
+            this.context.logger.info("使用指定的 NativePacketClient 作为后端");
+            client = new NativePacketClient(this.context, this.logStack);
+            break;
+        case "frida":
+            this.context.logger.info("[Core] [Packet] 使用指定的 FridaPacketClient 作为后端");
+            client = new WsPacketClient(this.context, this.logStack);
+            break;
+        case "auto":
+        case undefined:
+            client = this.judgeClient();
+            break;
+        default:
+            this.context.logger.error(`未知的PacketBackend ${prefer}，请检查配置文件！`);
+            client = null;
+        }
+        if (!client?.check()) {
+            throw new Error("[Core] [Packet] 无可用的后端，NapCat.Packet将不会加载！");
+        }
+        if (!client) {
+            throw new Error("[Core] [Packet] 后端异常，NapCat.Packet将不会加载！");
+        }
+        return client;
+    }
+
+    private judgeClient(): IPacketClient {
+        const sortedClients = Object.entries(clientPriority)
+            .map(([priority, clientFactory]) => {
+                const client = clientFactory(this.context, this.logStack);
+                const score = +priority * +client.check();
+                return { client, score };
+            })
+            .filter(({ score }) => score > 0)
+            .sort((a, b) => b.score - a.score);
+        const selectedClient = sortedClients[0]?.client;
+        if (!selectedClient) {
+            throw new Error("[Core] [Packet] 无可用的后端，NapCat.Packet将不会加载！");
+        }
+        this.context.logger.info(`自动选择 ${selectedClient.constructor.name} 作为后端`);
+        return selectedClient;
+    }
+}

src/core/packet/context/loggerContext.ts

@@ -0,0 +1,35 @@
+import { LogLevel, LogWrapper } from "@/common/log";
+import { PacketContext } from "@/core/packet/context/packetContext";
+
+// work: check bind?
+export class PacketLogger {
+    private readonly napLogger: LogWrapper;
+
+    constructor(context: PacketContext) {
+        this.napLogger = context.napcore.logger;
+    }
+
+    private _log(level: LogLevel, ...msg: any[]): void {
+        this.napLogger._log(level, "[Core] [Packet] " + msg);
+    }
+
+    debug(...msg: any[]): void {
+        this._log(LogLevel.DEBUG, msg);
+    }
+
+    info(...msg: any[]): void {
+        this._log(LogLevel.INFO, msg);
+    }
+
+    warn(...msg: any[]): void {
+        this._log(LogLevel.WARN, msg);
+    }
+
+    error(...msg: any[]): void {
+        this._log(LogLevel.ERROR, msg);
+    }
+
+    fatal(...msg: any[]): void {
+        this._log(LogLevel.FATAL, msg);
+    }
+}

src/core/packet/context/napCoreContext.ts

@@ -0,0 +1,36 @@
+import { NapCatCore } from "@/core";
+
+export interface NapCoreCompatBasicInfo {
+    readonly uin: number;
+    readonly uid: string;
+    readonly uin2uid: (uin: number) => Promise<string>;
+    readonly uid2uin: (uid: string) => Promise<number>;
+    readonly sendSsoCmdReqByContend: (cmd: string, trace_id: string) => Promise<void>;
+}
+
+export class NapCoreContext {
+    private readonly core: NapCatCore;
+
+    constructor(core: NapCatCore) {
+        this.core = core;
+    }
+
+    get logger() {
+        return this.core.context.logger;
+    }
+
+    get basicInfo() {
+        return {
+            uin: +this.core.selfInfo.uin,
+            uid: this.core.selfInfo.uid,
+            uin2uid: (uin: number) => this.core.apis.UserApi.getUidByUinV2(String(uin)).then(res => res ?? ''),
+            uid2uin: (uid: string) => this.core.apis.UserApi.getUinByUidV2(uid).then(res => +res),
+        } as NapCoreCompatBasicInfo;
+    }
+
+    get config() {
+        return this.core.configLoader.configData;
+    }
+
+    sendSsoCmdReqByContend = (cmd: string, trace_id: string) => this.core.context.session.getMsgService().sendSsoCmdReqByContend(cmd, trace_id);
+}

src/core/packet/context/operationContext.ts

@@ -0,0 +1,151 @@
+import * as crypto from 'crypto';
+import { PacketContext } from "@/core/packet/context/packetContext";
+import * as trans from "@/core/packet/transformer";
+import { PacketMsg } from "@/core/packet/message/message";
+import {
+    PacketMsgFileElement,
+    PacketMsgPicElement,
+    PacketMsgPttElement,
+    PacketMsgVideoElement
+} from "@/core/packet/message/element";
+import { ChatType } from "@/core";
+import { MiniAppRawData, MiniAppReqParams } from "@/core/packet/entities/miniApp";
+import { AIVoiceChatType } from "@/core/packet/entities/aiChat";
+import { NapProtoDecodeStructType, NapProtoEncodeStructType } from "@napneko/nap-proto-core";
+import { IndexNode, MsgInfo } from "@/core/packet/transformer/proto";
+
+export class PacketOperationContext {
+    private readonly context: PacketContext;
+    constructor(context: PacketContext) {
+        this.context = context;
+    }
+
+    async GroupPoke(groupUin: number, uin: number) {
+        const req = trans.SendPoke.build(groupUin, uin);
+        await this.context.client.sendOidbPacket(req);
+    }
+
+    async FriendPoke(uin: number) {
+        const req = trans.SendPoke.build(uin);
+        await this.context.client.sendOidbPacket(req);
+    }
+
+    async FetchRkey() {
+        const req = trans.FetchRkey.build();
+        const resp = await this.context.client.sendOidbPacket(req, true);
+        const res = trans.FetchRkey.parse(resp);
+        return res.data.rkeyList;
+    }
+
+    async GroupSign(groupUin: number) {
+        const req = trans.GroupSign.build(this.context.napcore.basicInfo.uin, groupUin);
+        await this.context.client.sendOidbPacket(req);
+    }
+
+    async GetStrangerStatus(uin: number) {
+        let status = 0;
+        try {
+            const req = trans.GetStrangerInfo.build(uin);
+            const resp = await this.context.client.sendOidbPacket(req, true);
+            const res = trans.GetStrangerInfo.parse(resp);
+            const extBigInt = BigInt(res.data.status.value);
+            if (extBigInt <= 10n) {
+                return { status: Number(extBigInt) * 10, ext_status: 0 };
+            }
+            status = Number((extBigInt & 0xff00n) + ((extBigInt >> 16n) & 0xffn));
+            return { status: 10, ext_status: status };
+        } catch (e) {
+            return undefined;
+        }
+    }
+
+    async SetGroupSpecialTitle(groupUin: number, uid: string, tittle: string) {
+        const req = trans.SetSpecialTitle.build(groupUin, uid, tittle);
+        await this.context.client.sendOidbPacket(req);
+    }
+
+    async UploadResources(msg: PacketMsg[], groupUin: number = 0) {
+        const chatType = groupUin ? ChatType.KCHATTYPEGROUP : ChatType.KCHATTYPEC2C;
+        const peerUid = groupUin ? String(groupUin) : this.context.napcore.basicInfo.uid;
+        const reqList = msg.flatMap(m =>
+            m.msg.map(e => {
+                if (e instanceof PacketMsgPicElement) {
+                    return this.context.highway.uploadImage({ chatType, peerUid }, e);
+                } else if (e instanceof PacketMsgVideoElement) {
+                    return this.context.highway.uploadVideo({ chatType, peerUid }, e);
+                } else if (e instanceof PacketMsgPttElement) {
+                    return this.context.highway.uploadPtt({ chatType, peerUid }, e);
+                } else if (e instanceof PacketMsgFileElement) {
+                    return this.context.highway.uploadFile({ chatType, peerUid }, e);
+                }
+                return null;
+            }).filter(Boolean)
+        );
+        const res = await Promise.allSettled(reqList);
+        this.context.logger.info(`上传资源${res.length}个，失败${res.filter(r => r.status === 'rejected').length}个`);
+        res.forEach((result, index) => {
+            if (result.status === 'rejected') {
+                this.context.logger.error(`上传第${index + 1}个资源失败：${result.reason.stack}`);
+            }
+        });
+    }
+
+    async UploadForwardMsg(msg: PacketMsg[], groupUin: number = 0) {
+        await this.UploadResources(msg, groupUin);
+        const req = trans.UploadForwardMsg.build(this.context.napcore.basicInfo.uid, msg, groupUin);
+        const resp = await this.context.client.sendOidbPacket(req, true);
+        const res = trans.UploadForwardMsg.parse(resp);
+        return res.result.resId;
+    }
+
+    async GetGroupFileUrl(groupUin: number, fileUUID: string) {
+        const req = trans.DownloadGroupFile.build(groupUin, fileUUID);
+        const resp = await this.context.client.sendOidbPacket(req, true);
+        const res = trans.DownloadGroupFile.parse(resp);
+        return `https://${res.download.downloadDns}/ftn_handler/${Buffer.from(res.download.downloadUrl).toString('hex')}/?fname=`;
+    }
+
+    async GetGroupPttUrl(groupUin: number, node: NapProtoEncodeStructType<typeof IndexNode>) {
+        const req = trans.DownloadGroupPtt.build(groupUin, node);
+        const resp = await this.context.client.sendOidbPacket(req, true);
+        const res = trans.DownloadGroupPtt.parse(resp);
+        return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
+    }
+
+    async GetMiniAppAdaptShareInfo(param: MiniAppReqParams) {
+        const req = trans.GetMiniAppAdaptShareInfo.build(param);
+        const resp = await this.context.client.sendOidbPacket(req, true);
+        const res = trans.GetMiniAppAdaptShareInfo.parse(resp);
+        return JSON.parse(res.content.jsonContent) as MiniAppRawData;
+    }
+
+    async FetchAiVoiceList(groupUin: number, chatType: AIVoiceChatType) {
+        const req = trans.FetchAiVoiceList.build(groupUin, chatType);
+        const resp = await this.context.client.sendOidbPacket(req, true);
+        const res = trans.FetchAiVoiceList.parse(resp);
+        if (!res.content) return null;
+        return res.content.map((item) => {
+            return {
+                category: item.category,
+                voices: item.voices
+            };
+        });
+    }
+
+    async GetAiVoice(groupUin: number, voiceId: string, text: string, chatType: AIVoiceChatType): Promise<NapProtoDecodeStructType<typeof MsgInfo>> {
+        let reqTime = 0;
+        const reqMaxTime = 30;
+        const sessionId = crypto.randomBytes(4).readUInt32BE(0);
+        while (true) {
+            if (reqTime >= reqMaxTime) {
+                throw new Error(`sendAiVoiceChatReq failed after ${reqMaxTime} times`);
+            }
+            reqTime++;
+            const req = trans.GetAiVoice.build(groupUin, voiceId, text, sessionId, chatType);
+            const resp = await this.context.client.sendOidbPacket(req, true);
+            const res = trans.GetAiVoice.parse(resp);
+            if (!res.msgInfo) continue;
+            return res.msgInfo;
+        }
+    }
+}

src/core/packet/context/packetContext.ts

@@ -0,0 +1,25 @@
+import { PacketHighwayContext } from "@/core/packet/highway/highwayContext";
+import { NapCatCore } from "@/core";
+import { PacketLogger } from "@/core/packet/context/loggerContext";
+import { NapCoreContext } from "@/core/packet/context/napCoreContext";
+import { PacketClientContext } from "@/core/packet/context/clientContext";
+import { PacketOperationContext } from "@/core/packet/context/operationContext";
+import { PacketMsgConverter } from "@/core/packet/message/converter";
+
+export class PacketContext {
+    readonly napcore: NapCoreContext;
+    readonly logger: PacketLogger;
+    readonly client: PacketClientContext;
+    readonly highway: PacketHighwayContext;
+    readonly msgConverter: PacketMsgConverter;
+    readonly operation: PacketOperationContext;
+
+    constructor(core: NapCatCore) {
+        this.napcore = new NapCoreContext(core);
+        this.logger = new PacketLogger(this);
+        this.client = new PacketClientContext(this);
+        this.highway = new PacketHighwayContext(this);
+        this.msgConverter = new PacketMsgConverter();
+        this.operation = new PacketOperationContext(this);
+    }
+}

src/core/packet/entities/aiChat.ts

@@ -0,0 +1,16 @@
+export enum AIVoiceChatType {
+    Unknown = 0,
+    Sound = 1,
+    Sing = 2
+}
+
+export interface AIVoiceItem {
+    voiceId: string;
+    voiceDisplayName: string;
+    voiceExampleUrl: string;
+}
+
+export interface AIVoiceItemList {
+    category: string;
+    voices: AIVoiceItem[];
+}

src/core/packet/entities/miniApp.ts

@@ -0,0 +1,79 @@
+export interface MiniAppReqCustomParams {
+    title: string;
+    desc: string;
+    picUrl: string;
+    jumpUrl: string;
+}
+
+export interface MiniAppReqTemplateParams {
+    sdkId: string;
+    appId: string;
+    scene: number;
+    iconUrl: string;
+    templateType: number;
+    businessType: number;
+    verType: number;
+    shareType: number;
+    versionId: string;
+    withShareTicket: number;
+}
+
+export interface MiniAppReqParams extends MiniAppReqCustomParams, MiniAppReqTemplateParams {}
+
+export interface MiniAppData {
+    ver: string;
+    prompt: string;
+    config: Config;
+    app: string;
+    view: string;
+    meta: MetaData;
+    miniappShareOrigin: number;
+    miniappOpenRefer: string;
+}
+
+export interface MiniAppRawData {
+    appName: string;
+    appView: string;
+    ver: string;
+    desc: string;
+    prompt: string;
+    metaData: MetaData;
+    config: Config;
+}
+
+interface Config {
+    type: string;
+    width: number;
+    height: number;
+    forward: number;
+    autoSize: number;
+    ctime: number;
+    token: string;
+}
+
+interface Host {
+    uin: number;
+    nick: string;
+}
+
+interface Detail {
+    appid: string;
+    appType: number;
+    title: string;
+    desc: string;
+    icon: string;
+    preview: string;
+    url: string;
+    scene: number;
+    host: Host;
+    shareTemplateId: string;
+    shareTemplateData: Record<string, unknown>;
+    showLittleTail: string;
+    gamePoints: string;
+    gamePointsUrl: string;
+    shareOrigin: number;
+}
+
+interface MetaData {
+    detail_1: Detail;
+}

src/core/packet/highway/client.ts

@@ -0,0 +1,73 @@
+import * as stream from 'node:stream';
+import { ReadStream } from "node:fs";
+import { HighwayTcpUploader } from "@/core/packet/highway/uploader/highwayTcpUploader";
+import { HighwayHttpUploader } from "@/core/packet/highway/uploader/highwayHttpUploader";
+import { PacketHighwaySig } from "@/core/packet/highway/highwayContext";
+import { PacketLogger } from "@/core/packet/context/loggerContext";
+
+export interface PacketHighwayTrans {
+    uin: string;
+    cmd: number;
+    command: string;
+    data: stream.Readable;
+    sum: Uint8Array;
+    size: number;
+    ticket: Uint8Array;
+    loginSig?: Uint8Array;
+    ext: Uint8Array;
+    encrypt: boolean;
+    timeout?: number;
+    server: string;
+    port: number;
+}
+
+export class PacketHighwayClient {
+    sig: PacketHighwaySig;
+    server: string = 'htdata3.qq.com';
+    port: number = 80;
+    logger: PacketLogger;
+
+    constructor(sig: PacketHighwaySig, logger: PacketLogger, server: string = 'htdata3.qq.com', port: number = 80) {
+        this.sig = sig;
+        this.logger = logger;
+    }
+
+    changeServer(server: string, port: number) {
+        this.server = server;
+        this.port = port;
+    }
+
+    private buildDataUpTrans(cmd: number, data: ReadStream, fileSize: number, md5: Uint8Array, extendInfo: Uint8Array, timeout: number = 1200): PacketHighwayTrans {
+        return {
+            uin: this.sig.uin,
+            cmd: cmd,
+            command: 'PicUp.DataUp',
+            data: data,
+            sum: md5,
+            size: fileSize,
+            ticket: this.sig.sigSession!,
+            ext: extendInfo,
+            encrypt: false,
+            timeout: timeout,
+            server: this.server,
+            port: this.port,
+        } as PacketHighwayTrans;
+    }
+
+    async upload(cmd: number, data: ReadStream, fileSize: number, md5: Uint8Array, extendInfo: Uint8Array): Promise<void> {
+        const trans = this.buildDataUpTrans(cmd, data, fileSize, md5, extendInfo);
+        try {
+            const tcpUploader = new HighwayTcpUploader(trans, this.logger);
+            await tcpUploader.upload();
+        } catch (e) {
+            this.logger.error(`[Highway] upload failed: ${e}, fallback to http upload`);
+            try {
+                const httpUploader = new HighwayHttpUploader(trans, this.logger);
+                await httpUploader.upload();
+            } catch (e) {
+                this.logger.error(`[Highway] http upload failed: ${e}`);
+                throw e;
+            }
+        }
+    }
+}

src/core/packet/highway/frame.ts

@@ -0,0 +1,23 @@
+import assert from "node:assert";
+
+export class Frame{
+    static pack(head: Buffer, body: Buffer): Buffer {
+        const totalLength = 9 + head.length + body.length + 1;
+        const buffer = Buffer.allocUnsafe(totalLength);
+        buffer[0] = 0x28;
+        buffer.writeUInt32BE(head.length, 1);
+        buffer.writeUInt32BE(body.length, 5);
+        head.copy(buffer, 9);
+        body.copy(buffer, 9 + head.length);
+        buffer[totalLength - 1] = 0x29;
+        return buffer;
+    }
+
+    static unpack(frame: Buffer): [Buffer, Buffer] {
+        assert(frame[0] === 0x28 && frame[frame.length - 1] === 0x29, 'Invalid frame!');
+        const headLen = frame.readUInt32BE(1);
+        const bodyLen = frame.readUInt32BE(5);
+        // assert(frame.length === 9 + headLen + bodyLen + 1, `Frame ${frame.toString('hex')} length does not match head and body lengths!`);
+        return [frame.subarray(9, 9 + headLen), frame.subarray(9 + headLen, 9 + headLen + bodyLen)];
+    }
+}

src/core/packet/highway/highwayContext.ts

@@ -0,0 +1,535 @@
+import { PacketHighwayClient } from "@/core/packet/highway/client";
+import { PacketContext } from "@/core/packet/context/packetContext";
+import { PacketLogger } from "@/core/packet/context/loggerContext";
+import FetchSessionKey from "@/core/packet/transformer/highway/FetchSessionKey";
+import { int32ip2str, oidbIpv4s2HighwayIpv4s } from "@/core/packet/highway/utils";
+import {
+    PacketMsgFileElement,
+    PacketMsgPicElement,
+    PacketMsgPttElement,
+    PacketMsgVideoElement
+} from "@/core/packet/message/element";
+import { ChatType, Peer } from "@/core";
+import { calculateSha1, calculateSha1StreamBytes, computeMd5AndLengthWithLimit } from "@/core/packet/utils/crypto/hash";
+import UploadGroupImage from "@/core/packet/transformer/highway/UploadGroupImage";
+import { NapProtoMsg } from "@napneko/nap-proto-core";
+import * as proto from "@/core/packet/transformer/proto";
+import * as trans from "@/core/packet/transformer";
+import fs from "fs";
+
+export const BlockSize = 1024 * 1024;
+
+interface HighwayServerAddr {
+    ip: string
+    port: number
+}
+
+export interface PacketHighwaySig {
+    uin: string;
+    uid: string;
+    sigSession: Uint8Array | null
+    sessionKey: Uint8Array | null
+    serverAddr: HighwayServerAddr[]
+}
+
+export class PacketHighwayContext {
+    private readonly context: PacketContext;
+    protected sig: PacketHighwaySig;
+    protected logger: PacketLogger;
+    protected hwClient: PacketHighwayClient;
+    private cachedPrepareReq: Promise<void> | null = null;
+
+    constructor(context: PacketContext) {
+        this.context = context;
+        this.sig = {
+            uin: String(context.napcore.basicInfo.uin),
+            uid: context.napcore.basicInfo.uid,
+            sigSession: null,
+            sessionKey: null,
+            serverAddr: [],
+        };
+        this.logger = context.logger;
+        this.hwClient = new PacketHighwayClient(this.sig, context.logger);
+    }
+
+    private async checkAvailable() {
+        if (this.sig.sigSession === null || this.sig.sessionKey === null) {
+            if (this.cachedPrepareReq === null) {
+                this.cachedPrepareReq = this.prepareUpload().finally(() => {
+                    this.cachedPrepareReq = null;
+                });
+            }
+            await this.cachedPrepareReq;
+        }
+    }
+
+    private async prepareUpload(): Promise<void> {
+        this.logger.debug('[Highway] on prepareUpload!');
+        const packet = FetchSessionKey.build();
+        const req = await this.context.client.sendOidbPacket(packet, true);
+        const rsp = FetchSessionKey.parse(req);
+        this.sig.sigSession = rsp.httpConn.sigSession;
+        this.sig.sessionKey = rsp.httpConn.sessionKey;
+        for (const info of rsp.httpConn.serverInfos) {
+            if (info.serviceType !== 1) continue;
+            for (const addr of info.serverAddrs) {
+                this.logger.debug(`[Highway PrepareUpload] server addr add: ${int32ip2str(addr.ip)}:${addr.port}`);
+                this.sig.serverAddr.push({
+                    ip: int32ip2str(addr.ip),
+                    port: addr.port
+                });
+            }
+        }
+    }
+
+    async uploadImage(peer: Peer, img: PacketMsgPicElement): Promise<void> {
+        await this.checkAvailable();
+        if (peer.chatType === ChatType.KCHATTYPEGROUP) {
+            await this.uploadGroupImage(+peer.peerUid, img);
+        } else if (peer.chatType === ChatType.KCHATTYPEC2C) {
+            await this.uploadC2CImage(peer.peerUid, img);
+        } else {
+            throw new Error(`[Highway] unsupported chatType: ${peer.chatType}`);
+        }
+    }
+
+    async uploadVideo(peer: Peer, video: PacketMsgVideoElement): Promise<void> {
+        await this.checkAvailable();
+        if (+(video.fileSize ?? 0) > 1024 * 1024 * 100) {
+            throw new Error(`[Highway] 视频文件过大: ${(+(video.fileSize ?? 0) / (1024 * 1024)).toFixed(2)} MB > 100 MB，请使用文件上传！`);
+        }
+        if (peer.chatType === ChatType.KCHATTYPEGROUP) {
+            await this.uploadGroupVideo(+peer.peerUid, video);
+        } else if (peer.chatType === ChatType.KCHATTYPEC2C) {
+            await this.uploadC2CVideo(peer.peerUid, video);
+        } else {
+            throw new Error(`[Highway] unsupported chatType: ${peer.chatType}`);
+        }
+    }
+
+    async uploadPtt(peer: Peer, ptt: PacketMsgPttElement): Promise<void> {
+        await this.checkAvailable();
+        if (peer.chatType === ChatType.KCHATTYPEGROUP) {
+            await this.uploadGroupPtt(+peer.peerUid, ptt);
+        } else if (peer.chatType === ChatType.KCHATTYPEC2C) {
+            await this.uploadC2CPtt(peer.peerUid, ptt);
+        } else {
+            throw new Error(`[Highway] unsupported chatType: ${peer.chatType}`);
+        }
+    }
+
+    async uploadFile(peer: Peer, file: PacketMsgFileElement): Promise<void> {
+        await this.checkAvailable();
+        if (peer.chatType === ChatType.KCHATTYPEGROUP) {
+            await this.uploadGroupFile(+peer.peerUid, file);
+        } else if (peer.chatType === ChatType.KCHATTYPEC2C) {
+            await this.uploadC2CFile(peer.peerUid, file);
+        } else {
+            throw new Error(`[Highway] unsupported chatType: ${peer.chatType}`);
+        }
+    }
+
+    private async uploadGroupImage(groupUin: number, img: PacketMsgPicElement): Promise<void> {
+        img.sha1 = Buffer.from(await calculateSha1(img.path)).toString('hex');
+        const req = UploadGroupImage.build(groupUin, img);
+        const resp = await this.context.client.sendOidbPacket(req, true);
+        const preRespData = UploadGroupImage.parse(resp);
+        const ukey = preRespData.upload.uKey;
+        if (ukey && ukey != "") {
+            this.logger.debug(`[Highway] uploadGroupImageReq get upload ukey: ${ukey}, need upload!`);
+            const index = preRespData.upload.msgInfo.msgInfoBody[0].index;
+            const sha1 = Buffer.from(index.info.fileSha1, 'hex');
+            const md5 = Buffer.from(index.info.fileHash, 'hex');
+            const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
+                fileUuid: index.fileUuid,
+                uKey: ukey,
+                network: {
+                    ipv4S: oidbIpv4s2HighwayIpv4s(preRespData.upload.ipv4S)
+                },
+                msgInfoBody: preRespData.upload.msgInfo.msgInfoBody,
+                blockSize: BlockSize,
+                hash: {
+                    fileSha1: [sha1]
+                }
+            });
+            await this.hwClient.upload(
+                1004,
+                fs.createReadStream(img.path, { highWaterMark: BlockSize }),
+                img.size,
+                md5,
+                extend
+            );
+        } else {
+            this.logger.debug(`[Highway] uploadGroupImageReq get upload invalid ukey ${ukey}, don't need upload!`);
+        }
+        img.msgInfo = preRespData.upload.msgInfo;
+        // img.groupPicExt = new NapProtoMsg(CustomFace).decode(preRespData.tcpUpload.compatQMsg)
+    }
+
+    private async uploadC2CImage(peerUid: string, img: PacketMsgPicElement): Promise<void> {
+        img.sha1 = Buffer.from(await calculateSha1(img.path)).toString('hex');
+        const req = trans.UploadPrivateImage.build(peerUid, img);
+        const resp = await this.context.client.sendOidbPacket(req, true);
+        const preRespData = trans.UploadPrivateImage.parse(resp);
+        const ukey = preRespData.upload.uKey;
+        if (ukey && ukey != "") {
+            this.logger.debug(`[Highway] uploadC2CImageReq get upload ukey: ${ukey}, need upload!`);
+            const index = preRespData.upload.msgInfo.msgInfoBody[0].index;
+            const sha1 = Buffer.from(index.info.fileSha1, 'hex');
+            const md5 = Buffer.from(index.info.fileHash, 'hex');
+            const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
+                fileUuid: index.fileUuid,
+                uKey: ukey,
+                network: {
+                    ipv4S: oidbIpv4s2HighwayIpv4s(preRespData.upload.ipv4S)
+                },
+                msgInfoBody: preRespData.upload.msgInfo.msgInfoBody,
+                blockSize: BlockSize,
+                hash: {
+                    fileSha1: [sha1]
+                }
+            });
+            await this.hwClient.upload(
+                1003,
+                fs.createReadStream(img.path, { highWaterMark: BlockSize }),
+                img.size,
+                md5,
+                extend
+            );
+        } else {
+            this.logger.debug(`[Highway] uploadC2CImageReq get upload invalid ukey ${ukey}, don't need upload!`);
+        }
+        img.msgInfo = preRespData.upload.msgInfo;
+    }
+
+    private async uploadGroupVideo(groupUin: number, video: PacketMsgVideoElement): Promise<void> {
+        if (!video.filePath || !video.thumbPath) throw new Error("video.filePath or video.thumbPath is empty");
+        video.fileSha1 = Buffer.from(await calculateSha1(video.filePath)).toString('hex');
+        video.thumbSha1 = Buffer.from(await calculateSha1(video.thumbPath)).toString('hex');
+        const req = trans.UploadGroupVideo.build(groupUin, video);
+        const resp = await this.context.client.sendOidbPacket(req, true);
+        const preRespData = trans.UploadGroupVideo.parse(resp);
+        const ukey = preRespData.upload.uKey;
+        if (ukey && ukey != "") {
+            this.logger.debug(`[Highway] uploadGroupVideoReq get upload video ukey: ${ukey}, need upload!`);
+            const index = preRespData.upload.msgInfo.msgInfoBody[0].index;
+            const md5 = Buffer.from(index.info.fileHash, 'hex');
+            const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
+                fileUuid: index.fileUuid,
+                uKey: ukey,
+                network: {
+                    ipv4S: oidbIpv4s2HighwayIpv4s(preRespData.upload.ipv4S)
+                },
+                msgInfoBody: preRespData.upload.msgInfo.msgInfoBody,
+                blockSize: BlockSize,
+                hash: {
+                    fileSha1: await calculateSha1StreamBytes(video.filePath)
+                }
+            });
+            await this.hwClient.upload(
+                1005,
+                fs.createReadStream(video.filePath, { highWaterMark: BlockSize }),
+                +video.fileSize!,
+                md5,
+                extend
+            );
+        } else {
+            this.logger.debug(`[Highway] uploadGroupVideoReq get upload invalid ukey ${ukey}, don't need upload!`);
+        }
+        const subFile = preRespData.upload.subFileInfos[0];
+        if (subFile.uKey && subFile.uKey != "") {
+            this.logger.debug(`[Highway] uploadGroupVideoReq get upload video thumb ukey: ${subFile.uKey}, need upload!`);
+            const index = preRespData.upload.msgInfo.msgInfoBody[1].index;
+            const md5 = Buffer.from(index.info.fileHash, 'hex');
+            const sha1 = Buffer.from(index.info.fileSha1, 'hex');
+            const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
+                fileUuid: index.fileUuid,
+                uKey: subFile.uKey,
+                network: {
+                    ipv4S: oidbIpv4s2HighwayIpv4s(subFile.ipv4S)
+                },
+                msgInfoBody: preRespData.upload.msgInfo.msgInfoBody,
+                blockSize: BlockSize,
+                hash: {
+                    fileSha1: [sha1]
+                }
+            });
+            await this.hwClient.upload(
+                1006,
+                fs.createReadStream(video.thumbPath, { highWaterMark: BlockSize }),
+                +video.thumbSize!,
+                md5,
+                extend
+            );
+        } else {
+            this.logger.debug(`[Highway] uploadGroupVideoReq get upload invalid thumb ukey ${subFile.uKey}, don't need upload!`);
+        }
+        video.msgInfo = preRespData.upload.msgInfo;
+    }
+
+    private async uploadC2CVideo(peerUid: string, video: PacketMsgVideoElement): Promise<void> {
+        if (!video.filePath || !video.thumbPath) throw new Error("video.filePath or video.thumbPath is empty");
+        video.fileSha1 = Buffer.from(await calculateSha1(video.filePath)).toString('hex');
+        video.thumbSha1 = Buffer.from(await calculateSha1(video.thumbPath)).toString('hex');
+        const req = trans.UploadPrivateVideo.build(peerUid, video);
+        const resp = await this.context.client.sendOidbPacket(req, true);
+        const preRespData = trans.UploadPrivateVideo.parse(resp);
+        const ukey = preRespData.upload.uKey;
+        if (ukey && ukey != "") {
+            this.logger.debug(`[Highway] uploadC2CVideoReq get upload video ukey: ${ukey}, need upload!`);
+            const index = preRespData.upload.msgInfo.msgInfoBody[0].index;
+            const md5 = Buffer.from(index.info.fileHash, 'hex');
+            const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
+                fileUuid: index.fileUuid,
+                uKey: ukey,
+                network: {
+                    ipv4S: oidbIpv4s2HighwayIpv4s(preRespData.upload.ipv4S)
+                },
+                msgInfoBody: preRespData.upload.msgInfo.msgInfoBody,
+                blockSize: BlockSize,
+                hash: {
+                    fileSha1: await calculateSha1StreamBytes(video.filePath)
+                }
+            });
+            await this.hwClient.upload(
+                1001,
+                fs.createReadStream(video.filePath, { highWaterMark: BlockSize }),
+                +video.fileSize!,
+                md5,
+                extend
+            );
+        } else {
+            this.logger.debug(`[Highway] uploadC2CVideoReq get upload invalid ukey ${ukey}, don't need upload!`);
+        }
+        const subFile = preRespData.upload.subFileInfos[0];
+        if (subFile.uKey && subFile.uKey != "") {
+            this.logger.debug(`[Highway] uploadC2CVideoReq get upload video thumb ukey: ${subFile.uKey}, need upload!`);
+            const index = preRespData.upload.msgInfo.msgInfoBody[1].index;
+            const md5 = Buffer.from(index.info.fileHash, 'hex');
+            const sha1 = Buffer.from(index.info.fileSha1, 'hex');
+            const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
+                fileUuid: index.fileUuid,
+                uKey: subFile.uKey,
+                network: {
+                    ipv4S: oidbIpv4s2HighwayIpv4s(subFile.ipv4S)
+                },
+                msgInfoBody: preRespData.upload.msgInfo.msgInfoBody,
+                blockSize: BlockSize,
+                hash: {
+                    fileSha1: [sha1]
+                }
+            });
+            await this.hwClient.upload(
+                1002,
+                fs.createReadStream(video.thumbPath, { highWaterMark: BlockSize }),
+                +video.thumbSize!,
+                md5,
+                extend
+            );
+        } else {
+            this.logger.debug(`[Highway] uploadC2CVideoReq get upload invalid thumb ukey ${subFile.uKey}, don't need upload!`);
+        }
+        video.msgInfo = preRespData.upload.msgInfo;
+    }
+
+    private async uploadGroupPtt(groupUin: number, ptt: PacketMsgPttElement): Promise<void> {
+        ptt.fileSha1 = Buffer.from(await calculateSha1(ptt.filePath)).toString('hex');
+        const req = trans.UploadGroupPtt.build(groupUin, ptt);
+        const resp = await this.context.client.sendOidbPacket(req, true);
+        const preRespData = trans.UploadGroupPtt.parse(resp);
+        const ukey = preRespData.upload.uKey;
+        if (ukey && ukey != "") {
+            this.logger.debug(`[Highway] uploadGroupPttReq get upload ptt ukey: ${ukey}, need upload!`);
+            const index = preRespData.upload.msgInfo.msgInfoBody[0].index;
+            const md5 = Buffer.from(index.info.fileHash, 'hex');
+            const sha1 = Buffer.from(index.info.fileSha1, 'hex');
+            const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
+                fileUuid: index.fileUuid,
+                uKey: ukey,
+                network: {
+                    ipv4S: oidbIpv4s2HighwayIpv4s(preRespData.upload.ipv4S)
+                },
+                msgInfoBody: preRespData.upload.msgInfo.msgInfoBody,
+                blockSize: BlockSize,
+                hash: {
+                    fileSha1: [sha1]
+                }
+            });
+            await this.hwClient.upload(
+                1008,
+                fs.createReadStream(ptt.filePath, { highWaterMark: BlockSize }),
+                ptt.fileSize,
+                md5,
+                extend
+            );
+        } else {
+            this.logger.debug(`[Highway] uploadGroupPttReq get upload invalid ukey ${ukey}, don't need upload!`);
+        }
+        ptt.msgInfo = preRespData.upload.msgInfo;
+    }
+
+    private async uploadC2CPtt(peerUid: string, ptt: PacketMsgPttElement): Promise<void> {
+        ptt.fileSha1 = Buffer.from(await calculateSha1(ptt.filePath)).toString('hex');
+        const req = trans.UploadPrivatePtt.build(peerUid, ptt);
+        const resp = await this.context.client.sendOidbPacket(req, true);
+        const preRespData = trans.UploadPrivatePtt.parse(resp);
+        const ukey = preRespData.upload.uKey;
+        if (ukey && ukey != "") {
+            this.logger.debug(`[Highway] uploadC2CPttReq get upload ptt ukey: ${ukey}, need upload!`);
+            const index = preRespData.upload.msgInfo.msgInfoBody[0].index;
+            const md5 = Buffer.from(index.info.fileHash, 'hex');
+            const sha1 = Buffer.from(index.info.fileSha1, 'hex');
+            const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
+                fileUuid: index.fileUuid,
+                uKey: ukey,
+                network: {
+                    ipv4S: oidbIpv4s2HighwayIpv4s(preRespData.upload.ipv4S)
+                },
+                msgInfoBody: preRespData.upload.msgInfo.msgInfoBody,
+                blockSize: BlockSize,
+                hash: {
+                    fileSha1: [sha1]
+                }
+            });
+            await this.hwClient.upload(
+                1007,
+                fs.createReadStream(ptt.filePath, { highWaterMark: BlockSize }),
+                ptt.fileSize,
+                md5,
+                extend
+            );
+        } else {
+            this.logger.debug(`[Highway] uploadC2CPttReq get upload invalid ukey ${ukey}, don't need upload!`);
+        }
+        ptt.msgInfo = preRespData.upload.msgInfo;
+    }
+
+    private async uploadGroupFile(groupUin: number, file: PacketMsgFileElement): Promise<void> {
+        file.isGroupFile = true;
+        file.fileMd5 = await computeMd5AndLengthWithLimit(file.filePath);
+        file.fileSha1 = await calculateSha1(file.filePath);
+        const req = trans.UploadGroupFile.build(groupUin, file);
+        const resp = await this.context.client.sendOidbPacket(req, true);
+        const preRespData = trans.UploadGroupFile.parse(resp);
+        if (!preRespData?.upload?.boolFileExist) {
+            this.logger.debug(`[Highway] uploadGroupFileReq file not exist, need upload!`);
+            const ext = new NapProtoMsg(proto.FileUploadExt).encode({
+                unknown1: 100,
+                unknown2: 1,
+                entry: {
+                    busiBuff: {
+                        senderUin: BigInt(this.sig.uin),
+                        receiverUin: BigInt(groupUin),
+                        groupCode: BigInt(groupUin),
+                    },
+                    fileEntry: {
+                        fileSize: BigInt(file.fileSize),
+                        md5: file.fileMd5,
+                        md5S2: file.fileMd5,
+                        checkKey: preRespData.upload.checkKey,
+                        fileId: preRespData.upload.fileId,
+                        uploadKey: preRespData.upload.fileKey,
+                    },
+                    clientInfo: {
+                        clientType: 3,
+                        appId: "100",
+                        terminalType: 3,
+                        clientVer: "1.1.1",
+                        unknown: 4
+                    },
+                    fileNameInfo: {
+                        fileName: file.fileName
+                    },
+                    host: {
+                        hosts: [
+                            {
+                                url: {
+                                    host: preRespData.upload.uploadIp,
+                                    unknown: 1,
+                                },
+                                port: preRespData.upload.uploadPort,
+                            }
+                        ]
+                    }
+                },
+                unknown200: 0,
+            });
+            await this.hwClient.upload(
+                71,
+                fs.createReadStream(file.filePath, { highWaterMark: BlockSize }),
+                file.fileSize,
+                file.fileMd5,
+                ext
+            );
+        } else {
+            this.logger.debug(`[Highway] uploadGroupFileReq file exist, don't need upload!`);
+        }
+        file.fileUuid = preRespData.upload.fileId;
+    }
+
+    private async uploadC2CFile(peerUid: string, file: PacketMsgFileElement): Promise<void> {
+        file.isGroupFile = false;
+        file.fileMd5 = await computeMd5AndLengthWithLimit(file.filePath);
+        file.fileSha1 = await calculateSha1(file.filePath);
+        const req = await trans.UploadPrivateFile.build(this.sig.uid, peerUid, file);
+        const res = await this.context.client.sendOidbPacket(req, true);
+        const preRespData  = trans.UploadPrivateFile.parse(res);
+        if (!preRespData.upload?.boolFileExist) {
+            this.logger.debug(`[Highway] uploadC2CFileReq file not exist, need upload!`);
+            const ext = new NapProtoMsg(proto.FileUploadExt).encode({
+                unknown1: 100,
+                unknown2: 1,
+                entry: {
+                    busiBuff: {
+                        senderUin: BigInt(this.sig.uin),
+                    },
+                    fileEntry: {
+                        fileSize: BigInt(file.fileSize),
+                        md5: file.fileMd5,
+                        md5S2: file.fileMd5,
+                        checkKey: file.fileSha1,
+                        fileId: preRespData.upload?.uuid,
+                        uploadKey: preRespData.upload?.mediaPlatformUploadKey,
+                    },
+                    clientInfo: {
+                        clientType: 3,
+                        appId: "100",
+                        terminalType: 3,
+                        clientVer: "1.1.1",
+                        unknown: 4
+                    },
+                    fileNameInfo: {
+                        fileName: file.fileName
+                    },
+                    host: {
+                        hosts: [
+                            {
+                                url: {
+                                    host: preRespData.upload?.uploadIp,
+                                    unknown: 1,
+                                },
+                                port: preRespData.upload?.uploadPort,
+                            }
+                        ]
+                    }
+                },
+                unknown200: 1,
+                unknown3: 0
+            });
+            await this.hwClient.upload(
+                95,
+                fs.createReadStream(file.filePath, { highWaterMark: BlockSize }),
+                file.fileSize,
+                file.fileMd5,
+                ext
+            );
+        }
+        file.fileUuid = preRespData.upload?.uuid;
+        file.fileHash = preRespData.upload?.fileAddon;
+        const fileExistReq = trans.DownloadOfflineFile.build(file.fileUuid!, file.fileHash!, this.sig.uid, peerUid);
+        const fileExistRes = await this.context.client.sendOidbPacket(fileExistReq, true);
+        file._e37_800_rsp = trans.DownloadOfflineFile.parse(fileExistRes);
+        file._private_send_uid = this.sig.uid;
+        file._private_recv_uid = peerUid;
+    }
+}

src/core/packet/highway/uploader/highwayHttpUploader.ts

@@ -0,0 +1,75 @@
+import crypto from "node:crypto";
+import http from "node:http";
+import { NapProtoMsg } from "@napneko/nap-proto-core";
+import { IHighwayUploader } from "@/core/packet/highway/uploader/highwayUploader";
+import { Frame } from "@/core/packet/highway/frame";
+import * as proto from "@/core/packet/transformer/proto";
+
+export class HighwayHttpUploader extends IHighwayUploader {
+    async upload(): Promise<void> {
+        const controller = new AbortController();
+        const { signal } = controller;
+        const upload = (async () => {
+            let offset = 0;
+            for await (const chunk of this.trans.data) {
+                if (signal.aborted) {
+                    throw new Error('Upload aborted due to timeout');
+                }
+                const block = chunk as Buffer;
+                try {
+                    await this.uploadBlock(block, offset);
+                } catch (err) {
+                    throw new Error(`[Highway] httpUpload Error uploading block at offset ${offset}: ${err}`);
+                }
+                offset += block.length;
+            }
+        })();
+        const timeout = this.timeout().catch((err) => {
+            controller.abort();
+            throw new Error(err.message);
+        });
+        await Promise.race([upload, timeout]);
+    }
+
+    private async uploadBlock(block: Buffer, offset: number): Promise<void> {
+        const chunkMD5 = crypto.createHash('md5').update(block).digest();
+        const payload = this.buildPicUpHead(offset, block.length, chunkMD5);
+        const frame = Frame.pack(Buffer.from(payload), block);
+        const resp = await this.httpPostHighwayContent(frame, `http://${this.trans.server}:${this.trans.port}/cgi-bin/httpconn?htcmd=0x6FF0087&uin=${this.trans.uin}`);
+        const [head, body] = Frame.unpack(resp);
+        const headData = new NapProtoMsg(proto.RespDataHighwayHead).decode(head);
+        this.logger.debug(`[Highway] httpUploadBlock: ${headData.errorCode} | ${headData.msgSegHead?.retCode} | ${headData.bytesRspExtendInfo} | ${head.toString('hex')} | ${body.toString('hex')}`);
+        if (headData.errorCode !== 0) throw new Error(`[Highway] httpUploadBlock failed (code=${headData.errorCode})`);
+    }
+
+    private async httpPostHighwayContent(frame: Buffer, serverURL: string): Promise<Buffer> {
+        return new Promise((resolve, reject) => {
+            try {
+                const options: http.RequestOptions = {
+                    method: 'POST',
+                    headers: {
+                        'Connection': 'keep-alive',
+                        'Accept-Encoding': 'identity',
+                        'User-Agent': 'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2)',
+                        'Content-Length': frame.length.toString(),
+                    },
+                };
+                const req = http.request(serverURL, options, (res) => {
+                    const data: Buffer[] = [];
+                    res.on('data', (chunk) => {
+                        data.push(chunk);
+                    });
+                    res.on('end', () => {
+                        resolve(Buffer.concat(data));
+                    });
+                });
+                req.write(frame);
+                req.on('error', (error: Error) => {
+                    reject(error);
+                });
+            } catch (error: unknown) {
+                reject(new Error((error as Error).message));
+            }
+        });
+    }
+}

src/core/packet/highway/uploader/highwayTcpUploader.ts

@@ -0,0 +1,85 @@
+import net from "node:net";
+import stream from "node:stream";
+import crypto from "node:crypto";
+import { NapProtoMsg } from "@napneko/nap-proto-core";
+import { BlockSize } from "@/core/packet/highway/highwayContext";
+import { Frame } from "@/core/packet/highway/frame";
+import { IHighwayUploader } from "@/core/packet/highway/uploader/highwayUploader";
+import * as proto from "@/core/packet/transformer/proto";
+
+class HighwayTcpUploaderTransform extends stream.Transform {
+    uploader: HighwayTcpUploader;
+    offset: number;
+
+    constructor(uploader: HighwayTcpUploader) {
+        super();
+        this.uploader = uploader;
+        this.offset = 0;
+    }
+
+    _transform(data: Buffer, _: BufferEncoding, callback: stream.TransformCallback) {
+        let chunkOffset = 0;
+        while (chunkOffset < data.length) {
+            const chunkSize = Math.min(BlockSize, data.length - chunkOffset);
+            const chunk = data.subarray(chunkOffset, chunkOffset + chunkSize);
+            const chunkMd5 = crypto.createHash('md5').update(chunk).digest();
+            const head = this.uploader.buildPicUpHead(this.offset, chunk.length, chunkMd5);
+            chunkOffset += chunk.length;
+            this.offset += chunk.length;
+            this.push(Frame.pack(Buffer.from(head), chunk));
+        }
+        callback(null);
+    }
+}
+
+export class HighwayTcpUploader extends IHighwayUploader {
+    async upload(): Promise<void> {
+        const controller = new AbortController();
+        const { signal } = controller;
+        const upload = new Promise<void>((resolve, reject) => {
+            const highwayTransForm = new HighwayTcpUploaderTransform(this);
+            const socket = net.connect(this.trans.port, this.trans.server, () => {
+                this.trans.data.pipe(highwayTransForm).pipe(socket, { end: false });
+            });
+            const handleRspHeader = (header: Buffer) => {
+                const rsp = new NapProtoMsg(proto.RespDataHighwayHead).decode(header);
+                if (rsp.errorCode !== 0) {
+                    socket.end();
+                    reject(new Error(`[Highway] tcpUpload failed (code=${rsp.errorCode})`));
+                }
+                const percent = ((Number(rsp.msgSegHead?.dataOffset) + Number(rsp.msgSegHead?.dataLength)) / Number(rsp.msgSegHead?.filesize)).toFixed(2);
+                this.logger.debug(`[Highway] tcpUpload ${rsp.errorCode} | ${percent} | ${Buffer.from(header).toString('hex')}`);
+                if (Number(rsp.msgSegHead?.dataOffset) + Number(rsp.msgSegHead?.dataLength) >= Number(rsp.msgSegHead?.filesize)) {
+                    this.logger.debug('[Highway] tcpUpload finished.');
+                    socket.end();
+                    resolve();
+                }
+            };
+            socket.on('data', (chunk: Buffer) => {
+                if (signal.aborted) {
+                    socket.end();
+                    reject(new Error('Upload aborted due to timeout'));
+                }
+                const [head, _] = Frame.unpack(chunk);
+                handleRspHeader(head);
+            });
+            socket.on('close', () => {
+                this.logger.debug('[Highway] tcpUpload socket closed.');
+                resolve();
+            });
+            socket.on('error', (err) => {
+                socket.end();
+                reject(new Error(`[Highway] tcpUpload socket.on error: ${err}`));
+            });
+            this.trans.data.on('error', (err) => {
+                socket.end();
+                reject(new Error(`[Highway] tcpUpload readable error: ${err}`));
+            });
+        });
+        const timeout = this.timeout().catch((err) => {
+            controller.abort();
+            throw new Error(err.message);
+        });
+        await Promise.race([upload, timeout]);
+    }
+}

src/core/packet/highway/uploader/highwayUploader.ts

@@ -0,0 +1,63 @@
+import * as tea from "@/core/packet/utils/crypto/tea";
+import { NapProtoMsg } from "@napneko/nap-proto-core";
+import { PacketHighwayTrans } from "@/core/packet/highway/client";
+import { PacketLogger } from "@/core/packet/context/loggerContext";
+import * as proto from "@/core/packet/transformer/proto";
+
+export abstract class IHighwayUploader {
+    readonly trans: PacketHighwayTrans;
+    readonly logger: PacketLogger;
+
+    constructor(trans: PacketHighwayTrans, logger: PacketLogger) {
+        this.trans = trans;
+        this.logger = logger;
+    }
+
+    private encryptTransExt(key: Uint8Array) {
+        if (!this.trans.encrypt) return;
+        this.trans.ext = tea.encrypt(Buffer.from(this.trans.ext), Buffer.from(key));
+    }
+
+    protected timeout(): Promise<void> {
+        return new Promise<void>((_, reject) => {
+            setTimeout(() => {
+                reject(new Error(`[Highway] timeout after ${this.trans.timeout}s`));
+            }, (this.trans.timeout ?? Infinity) * 1000
+            );
+        });
+    }
+
+    buildPicUpHead(offset: number, bodyLength: number, bodyMd5: Uint8Array): Uint8Array {
+        return new NapProtoMsg(proto.ReqDataHighwayHead).encode({
+            msgBaseHead: {
+                version: 1,
+                uin: this.trans.uin,
+                command: "PicUp.DataUp",
+                seq: 0,
+                retryTimes: 0,
+                appId: 1600001604,
+                dataFlag: 16,
+                commandId: this.trans.cmd,
+            },
+            msgSegHead: {
+                serviceId: 0,
+                filesize: BigInt(this.trans.size),
+                dataOffset: BigInt(offset),
+                dataLength: bodyLength,
+                serviceTicket: this.trans.ticket,
+                md5: bodyMd5,
+                fileMd5: this.trans.sum,
+                cacheAddr: 0,
+                cachePort: 0,
+            },
+            bytesReqExtendInfo: this.trans.ext,
+            timestamp: BigInt(0),
+            msgLoginSigHead: {
+                uint32LoginSigType: 8,
+                appId: 1600001604,
+            }
+        });
+    }
+
+    abstract upload(): Promise<void>;
+}