release: 3.0.6

feat: add `friend_poke` OneBot11 API

.editorconfig

@@ -17,5 +17,8 @@ charset = utf-8
 indent_style = space
 indent_size = 4
 
+[*.bat]
+charset = latin1
+
 # Unfortunately, EditorConfig doesn't support space configuration inside import braces directly.
 # You'll need to rely on your linter/formatter like ESLint or Prettier for that.

.eslintrc.cjs

@@ -4,7 +4,7 @@ module.exports = {
         'es2021': true,
         'node': true
     },
-    'ignorePatterns': ['src/proto/'],
+    'ignorePatterns': ['src/core/proto/'],
     'extends': [
         'eslint:recommended',
         'plugin:@typescript-eslint/recommended'

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -10,6 +10,7 @@ body:
         在提交新的 Bug 反馈前，请确保您：
         * 已经搜索了现有的 issues，并且没有找到可以解决您问题的方法
         * 不与现有的某一 issue 重复
+        * 不涉及[已经停止维护的特性](https://github.com/NapNeko/NapCatQQ?tab=readme-ov-file#挥别昨日)，例如 CQ 码
   - type: input
     id: system-version
     attributes:
@@ -78,4 +79,4 @@ body:
     attributes:
       label: OneBot 客户端运行日志
       description: 粘贴 OneBot 客户端的相关日志内容到此处
-      render: shell
+      render: shell

.github/workflows/build.yml

@@ -1,15 +1,11 @@
 name: "Build Action"
 on:
   workflow_dispatch:
-  push:
-    branches:
-      - main
 
 permissions: write-all
 
 jobs:
   Build-LiteLoader:
-    if: ${{ startsWith(github.event.head_commit.message, 'build:') }}
     runs-on: ubuntu-latest
     steps:
     - name: Clone Main Repository
@@ -37,7 +33,6 @@ jobs:
         name: NapCat.Framework
         path: dist
   Build-Shell:
-    if: ${{ startsWith(github.event.head_commit.message, 'build:') }}
     runs-on: ubuntu-latest
     steps:
         - name: Clone Main Repository
@@ -63,4 +58,4 @@ jobs:
           uses: actions/upload-artifact@v4
           with:
               name: NapCat.Shell
-              path: dist
+              path: dist

.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,38 +1,52 @@
 <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" />
+  <img src="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" alt="NapCatQQ" width="640" height="320" />
 </div>
 
 ---
-## To Be Continued
-当前版本 (v2.1.x) 请使用内核构建版本（版本号最后的五位数）为 27187 以上的 PC NTQQ 运行。
+## 欢迎回来
+NapCatQQ (aka 猫猫框架) 是现代化的基于 NTQQ 的 Bot 协议端实现
 
-## 项目介绍
-NapCatQQ 是现代化的基于 NTQQ 的 Bot 协议端实现。
+## 猫猫技能
+- [x] **超高性能**：轻松数千群聊 独创消息队列
+- [x] **启动方式**：支持以无头、LiteLoader 插件、仅 QQ GUI 三种方式启动
+- [x] **覆盖平台**: 覆盖 Windows / Linux (可选 Docker) / Android Termux / MacOS
+- [x] **安装简单**: 支持一键脚本/程序自动部署/镜像部署等多种覆盖范围
+- [x] **超低占用**：无头模式占用资源极低，适合在服务器上运行
+- [x] **超多接口**：实现大部分 OneBot 和 go-cqhttp 接口，超多扩展 API
+- [x] **远程管理**：自带 WebUI 支持，远程管理更加便捷
+- [x] **扩展支持**：基于 MoeHoo 的Native 可实现发包与收包
 
-## 项目优势
-- [x] **多种启动方式**：支持以无头、LiteLoader 插件、仅 QQ GUI 三种方式启动
-- [x] **低占用**：无头模式占用资源极低，适合在服务器上运行
-- [x] **超多接口**：在实现大部分Onebot接口上扩展了一套私有API
-- [x] **WebUI**：自带 WebUI 支持，远程管理更加便捷
-
-## 如何使用
+## 使用猫猫
 
 可前往 [Release](https://github.com/NapNeko/NapCatQQ/releases/) 页面下载最新版本
 
-**首次使用**请务必前往[官方文档](https://napneko.github.io/)查看使用教程。
+**首次使用**请务必查看如下文档看使用教程
 
-## 相关链接
+### 文档地址
+[Github.IO](https://napneko.github.io/)
+
+[Cloudflare.Worker](https://doc.napneko.icu/)
+
+[Cloudflare.HKServer](https://napcat.napneko.icu/)
+
+[Cloudflare.Pages](https://napneko.pages.dev/)
+
+## 回家旅途
 [QQ Group](https://qm.qq.com/q/VfjAq5HIMS)
 
 [Telegram Link](https://t.me/+nLZEnpne-pQ1OWFl)
 
-## 鸣谢名单
-感谢 [LLOneBot](https://github.com/LLOneBot/LLOneBot) 提供初始版本基础
+## 猫猫朋友
+感谢 [LLOneBot](https://github.com/LLOneBot/LLOneBot)
 
 感谢 [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持
 
+不过最最重要的 还是需要感谢屏幕前的你哦~
+
 ---
 
-## 使用许可
+## 约法三章
+> [!CAUTION]\
+> **请不要在 QQ 官方群聊和任何影响力较大的简中互联网平台（包括但不限于: 哔哩哔哩，微博，知乎，抖音等）发布和讨论*任何*与本项目存在相关性的信息**
 
-任何使用本仓库代码的地方，都应当严格遵守[本仓库开源许可](./LICENSE)。**此外，禁止任何项目未经授权二次分发或基于 [core](./src/core) 部分代码开发。**
+任何使用本仓库代码的地方，都应当严格遵守[本仓库开源许可](./LICENSE)。**此外，禁止任何项目未经授权二次分发或基于 NapCat 代码开发。**

launcher/launcher-win10.bat

@@ -0,0 +1,40 @@
+@echo off
+chcp 65001
+net session >nul 2>&1
+if %errorLevel% == 0 (
+    echo Administrator mode detected.
+) else (
+    echo Please run this script in administrator mode.
+    powershell -Command "Start-Process 'cmd.exe' -ArgumentList '/c cd /d \"%cd%\" && \"%~f0\" %1' -Verb runAs" 
+    exit
+)
+
+set NAPCAT_PATCH_PACKAGE=%cd%\qqnt.json
+set NAPCAT_LOAD_PATH=%cd%\loadNapCat.js
+set NAPCAT_INJECT_PATH=%cd%\NapCatWinBootHook.dll
+set NAPCAT_LAUNCHER_PATH=%cd%\NapCatWinBootMain.exe
+set NAPCAT_MAIN_PATH=%cd%\napcat.mjs
+:loop_read
+for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
+    set RetString=%%b
+    goto :napcat_boot
+)
+
+:napcat_boot
+for %%a in ("%RetString%") do (
+    set "pathWithoutUninstall=%%~dpa"
+)
+
+SET QQPath=%pathWithoutUninstall%QQ.exe
+
+if not exist "%QQpath%" (
+    echo provided QQ path is invalid: %QQpath%
+    pause
+    exit /b
+)
+set NAPCAT_MAIN_PATH=%NAPCAT_MAIN_PATH:\=/%
+echo (async () =^> {await import("file:///%NAPCAT_MAIN_PATH%")})() > "%NAPCAT_LOAD_PATH%"
+
+"%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" %1
+
+REM "%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" 123456

launcher/launcher.bat

@@ -0,0 +1,39 @@
+@echo off
+chcp 65001
+net session >nul 2>&1
+if %errorLevel% == 0 (
+    echo Administrator mode detected.
+) else (
+    echo Please run this script in administrator mode.
+    powershell -Command "Start-Process 'wt.exe' -ArgumentList 'cmd /c cd /d \"%cd%\" && \"%~f0\" %1' -Verb runAs"
+    exit
+)
+
+set NAPCAT_PATCH_PACKAGE=%cd%\qqnt.json
+set NAPCAT_LOAD_PATH=%cd%\loadNapCat.js
+set NAPCAT_INJECT_PATH=%cd%\NapCatWinBootHook.dll
+set NAPCAT_LAUNCHER_PATH=%cd%\NapCatWinBootMain.exe
+set NAPCAT_MAIN_PATH=%cd%\napcat.mjs
+:loop_read
+for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
+    set RetString=%%b
+    goto :napcat_boot
+)
+
+:napcat_boot
+for %%a in ("%RetString%") do (
+    set "pathWithoutUninstall=%%~dpa"
+)
+
+SET QQPath=%pathWithoutUninstall%QQ.exe
+
+if not exist "%QQpath%" (
+    echo provided QQ path is invalid: %QQpath%
+    pause
+    exit /b
+)
+
+set NAPCAT_MAIN_PATH=%NAPCAT_MAIN_PATH:\=/%
+echo (async () =^> {await import("file:///%NAPCAT_MAIN_PATH%")})() > "%NAPCAT_LOAD_PATH%"
+
+"%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" %1

launcher/loadNapCat.js

@@ -0,0 +1,5 @@
+const path = require('path');
+const CurrentPath = path.dirname(__filename);
+(async () => {
+    await import("file://" + path.join(CurrentPath, './napcat/napcat.mjs'));
+})();

launcher/qqnt.json

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

launcher/quickLoginExample.bat

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

manifest.json

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

package.json

@@ -1,65 +1,52 @@
-{
-  "name": "napcat",
-  "private": true,
-  "type": "module",
-  "version": "2.2.2",
-  "scripts": {
-    "build:framework": "vite build --mode framework",
-    "build:shell": "vite build --mode shell",
-    "build:webui": "cd ./src/webui && vite build",
-    "lint": "eslint --fix src/**/*.{js,ts}",
-    "depend": "cd dist && npm install --omit=dev"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.24.7",
-    "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-proposal-decorators": "^7.24.7",
-    "@babel/preset-typescript": "^7.24.7",
-    "@log4js-node/log4js-api": "^1.0.2",
-    "@protobuf-ts/plugin": "^2.9.4",
-    "@rollup/plugin-node-resolve": "^15.2.3",
-    "@rollup/plugin-typescript": "^11.1.6",
-    "@types/cors": "^2.8.17",
-    "@types/express": "^4.17.21",
-    "@types/figlet": "^1.5.8",
-    "@types/fluent-ffmpeg": "^2.1.24",
-    "@types/jest": "^29.5.12",
-    "@types/node": "^22.0.1",
-    "@types/qrcode-terminal": "^0.12.2",
-    "@types/ws": "^8.5.12",
-    "@typescript-eslint/eslint-plugin": "^7.4.0",
-    "@typescript-eslint/parser": "^7.4.0",
-    "eslint": "^8.57.0",
-    "eslint-import-resolver-typescript": "^3.6.1",
-    "eslint-plugin-import": "^2.29.1",
-    "i": "^0.3.7",
-    "javascript-obfuscator": "^4.1.0",
-    "rollup": "^4.13.2",
-    "rollup-plugin-dts": "^6.1.0",
-    "rollup-plugin-obfuscator": "^1.1.0",
-    "typescript": "^5.3.3",
-    "vite": "^5.2.6",
-    "vite-plugin-babel": "^1.2.0",
-    "vite-plugin-cp": "^4.0.8",
-    "vite-plugin-dts": "^3.8.2",
-    "vite-tsconfig-paths": "^4.3.2"
-  },
-  "dependencies": {
-    "ajv": "^8.13.0",
-    "async-mutex": "^0.5.0",
-    "chalk": "^5.3.0",
-    "commander": "^12.1.0",
-    "cors": "^2.8.5",
-    "express": "^5.0.0-beta.2",
-    "fast-xml-parser": "^4.3.6",
-    "file-type": "^19.0.0",
-    "fluent-ffmpeg": "^2.1.2",
-    "image-size": "^1.1.1",
-    "json-schema-to-ts": "^3.1.0",
-    "log4js": "^6.9.1",
-    "qrcode-terminal": "^0.12.0",
-    "silk-wasm": "^3.6.1",
-    "strtok3": "8.0.1",
-    "ws": "^8.18.0"
-  }
-}
+{
+  "name": "napcat",
+  "private": true,
+  "type": "module",
+  "version": "3.0.6",
+  "scripts": {
+    "build:framework": "vite build --mode framework",
+    "build:shell": "vite build --mode shell",
+    "build:webui": "cd ./src/webui && vite build",
+    "lint": "eslint --fix src/**/*.{js,ts}",
+    "depend": "cd dist && npm install --omit=dev"
+  },
+  "devDependencies": {
+    "@babel/preset-typescript": "^7.24.7",
+    "@log4js-node/log4js-api": "^1.0.2",
+    "@rollup/plugin-node-resolve": "^15.2.3",
+    "@rollup/plugin-typescript": "^11.1.6",
+    "@types/cors": "^2.8.17",
+    "@types/express": "^5.0.0",
+    "@types/fluent-ffmpeg": "^2.1.24",
+    "@types/node": "^22.0.1",
+    "@types/qrcode-terminal": "^0.12.2",
+    "@types/ws": "^8.5.12",
+    "@typescript-eslint/eslint-plugin": "^8.3.0",
+    "@typescript-eslint/parser": "^8.3.0",
+    "eslint": "^8.57.0",
+    "eslint-import-resolver-typescript": "^3.6.1",
+    "eslint-plugin-import": "^2.29.1",
+    "typescript": "^5.3.3",
+    "vite": "^5.2.6",
+    "vite-plugin-cp": "^4.0.8",
+    "vite-tsconfig-paths": "^4.3.2",
+    "@protobuf-ts/runtime": "^2.9.4",
+    "ajv": "^8.13.0",
+    "fast-xml-parser": "^4.3.6",
+    "chalk": "^5.3.0",
+    "commander": "^12.1.0",
+    "async-mutex": "^0.5.0",
+    "file-type": "^19.0.0",
+    "json-schema-to-ts": "^3.1.0",
+    "image-size": "^1.1.1",
+    "cors": "^2.8.5"
+  },
+  "dependencies": {
+    "qrcode-terminal": "^0.12.0",
+    "fluent-ffmpeg": "^2.1.2",
+    "express": "^5.0.0-beta.2",
+    "log4js": "^6.9.1",
+    "silk-wasm": "^3.6.1",
+    "ws": "^8.18.0"
+  }
+}

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/KillQQ.bat

@@ -0,0 +1,2 @@
+@echo off
+taskkill /f /im QQ.exe

src/common/audio.ts

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

src/common/config-base.ts

@@ -4,13 +4,13 @@ import type { NapCatCore } from '@/core';
 
 export abstract class ConfigBase<T> {
     name: string;
-    coreContext: NapCatCore;
+    core: NapCatCore;
     configPath: string;
     configData: T = {} as T;
 
-    protected constructor(name: string, coreContext: NapCatCore, configPath: string) {
+    protected constructor(name: string, core: NapCatCore, configPath: string) {
         this.name = name;
-        this.coreContext = coreContext;
+        this.core = core;
         this.configPath = configPath;
         fs.mkdirSync(this.configPath, { recursive: true });
         this.read();
@@ -22,20 +22,25 @@ export abstract class ConfigBase<T> {
     }
 
     getConfigPath(pathName: string | undefined): string {
-        const suffix = pathName ? `_${pathName}` : '';
-        const filename = `${this.name}${suffix}.json`;
-        return path.join(this.configPath, filename);
+        if (!pathName) {
+            const filename = `${this.name}.json`;
+            const mainPath = this.core.context.pathWrapper.binaryPath;
+            return path.join(mainPath, 'config', filename);
+        } else {
+            const filename = `${this.name}_${pathName}.json`;
+            return path.join(this.configPath, filename);
+        }
     }
 
     read(): T {
-        const logger = this.coreContext.context.logger;
-        const configPath = this.getConfigPath(this.coreContext.selfInfo.uin);
+        const logger = this.core.context.logger;
+        const configPath = this.getConfigPath(this.core.selfInfo.uin);
         if (!fs.existsSync(configPath)) {
             try {
                 fs.writeFileSync(configPath, fs.readFileSync(this.getConfigPath(undefined), 'utf-8'));
                 logger.log(`[Core] [Config] 配置文件创建成功!\n`);
             } catch (e: any) {
-                logger.logError(`[Core] [Config] 创建配置文件时发生错误:`, e.message);
+                logger.logError.bind(logger)(`[Core] [Config] 创建配置文件时发生错误:`, e.message);
             }
         }
         try {
@@ -44,24 +49,24 @@ 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;
         }
     }
 
 
-    save(newConfigData: T = this.configData as T) {
-        const logger = this.coreContext.context.logger;
-        const selfInfo = this.coreContext.selfInfo;
+    save(newConfigData: T = this.configData) {
+        const logger = this.core.context.logger;
+        const selfInfo = this.core.selfInfo;
         this.configData = newConfigData;
         const configPath = this.getConfigPath(selfInfo.uin);
         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.ts

@@ -1,7 +1,8 @@
-import { NodeIQQNTWrapperSession } from '@/core/wrapper/wrapper';
+import { NodeIQQNTWrapperSession } from '@/core/wrapper';
 import { randomUUID } from 'crypto';
+import { ListenerNamingMapping, ServiceNamingMapping } from '@/core';
 
-interface Internal_MapKey {
+interface InternalMapKey {
     timeout: number;
     createtime: number;
     func: (...arg: any[]) => any;
@@ -10,34 +11,27 @@ interface Internal_MapKey {
 
 export type ListenerClassBase = Record<string, string>;
 
-export interface ListenerIBase {
-    // eslint-disable-next-line @typescript-eslint/no-misused-new
-    new(listener: any): ListenerClassBase;
-}
-
-export class LegacyNTEventWrapper {
+export class NTEventWrapper {
     private WrapperSession: NodeIQQNTWrapperSession | undefined; //WrapperSession
     private listenerManager: Map<string, ListenerClassBase> = new Map<string, ListenerClassBase>(); //ListenerName-Unique -> Listener实例
-    private EventTask = new Map<string, Map<string, Map<string, Internal_MapKey>>>(); //tasks ListenerMainName -> ListenerSubName-> uuid -> {timeout,createtime,func}
+    private EventTask = new Map<string, Map<string, Map<string, InternalMapKey>>>(); //tasks ListenerMainName -> ListenerSubName-> uuid -> {timeout,createtime,func}
 
     constructor(
-        wrapperSession: NodeIQQNTWrapperSession
+        wrapperSession: NodeIQQNTWrapperSession,
     ) {
         this.WrapperSession = wrapperSession;
     }
 
     createProxyDispatch(ListenerMainName: string) {
-        // eslint-disable-next-line @typescript-eslint/no-this-alias
-        const current = this;
+        const dispatcherListenerFunc = this.dispatcherListener.bind(this);
         return new Proxy(
             {},
             {
                 get(target: any, prop: any, receiver: any) {
-                    // console.log('get', prop, typeof target[prop]);
                     if (typeof target[prop] === 'undefined') {
                         // 如果方法不存在，返回一个函数，这个函数调用existentMethod
                         return (...args: any[]) => {
-                            current.dispatcherListener.apply(current, [ListenerMainName, prop, ...args]).then();
+                            dispatcherListenerFunc(ListenerMainName, prop, ...args).then();
                         };
                     }
                     // 如果方法存在，正常返回
@@ -47,7 +41,13 @@ export class LegacyNTEventWrapper {
         );
     }
 
-    createEventFunction<T extends (...args: any) => any>(eventName: string): T | undefined {
+    createEventFunction<
+        Service extends keyof ServiceNamingMapping,
+        ServiceMethod extends Exclude<keyof ServiceNamingMapping[Service], symbol>,
+        // eslint-disable-next-line
+        // @ts-ignore
+        T extends (...args: any) => any = ServiceNamingMapping[Service][ServiceMethod],
+    >(eventName: `${Service}/${ServiceMethod}`): T | undefined {
         const eventNameArr = eventName.split('/');
         type eventType = {
             [key: string]: () => { [key: string]: (...params: Parameters<T>) => Promise<ReturnType<T>> };
@@ -55,8 +55,6 @@ export class LegacyNTEventWrapper {
         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]();
             let event = services[eventName];
             //重新绑定this
@@ -72,10 +70,11 @@ export class LegacyNTEventWrapper {
         const existListener = this.listenerManager.get(listenerMainName + uniqueCode);
         if (!existListener) {
             const Listener = this.createProxyDispatch(listenerMainName);
-            const ServiceSubName = listenerMainName.match(/^NodeIKernel(.*?)Listener$/)![1];
-            const Service = 'NodeIKernel' + ServiceSubName + 'Service/addKernel' + ServiceSubName + 'Listener';
-            const addfunc = this.createEventFunction<(listener: T) => number>(Service);
-            addfunc!(Listener as T);
+            const ServiceSubName = /^NodeIKernel(.*?)Listener$/.exec(listenerMainName)![1];
+            const Service = `NodeIKernel${ServiceSubName}Service/addKernel${ServiceSubName}Listener`;
+            // eslint-disable-next-line
+            // @ts-ignore
+            this.createEventFunction(Service)(Listener as T);
             this.listenerManager.set(listenerMainName + uniqueCode, Listener);
             return Listener as T;
         }
@@ -84,62 +83,62 @@ export class LegacyNTEventWrapper {
 
     //统一回调清理事件
     async dispatcherListener(ListenerMainName: string, ListenerSubName: string, ...args: any[]) {
-        //console.log("[EventDispatcher]",ListenerMainName, ListenerSubName, ...args);
         this.EventTask.get(ListenerMainName)
             ?.get(ListenerSubName)
             ?.forEach((task, uuid) => {
-                //console.log(task.func, uuid, task.createtime, task.timeout);
                 if (task.createtime + task.timeout < Date.now()) {
                     this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.delete(uuid);
                     return;
                 }
-                if (task.checker && task.checker(...args)) {
+                if (task?.checker?.(...args)) {
                     task.func(...args);
                 }
             });
     }
 
-    async callNoListenerEvent<EventType extends (...args: any[]) => Promise<any> | any>(
-        EventName = '',
-        timeout: number = 3000,
+    async callNoListenerEvent<
+        Service extends keyof ServiceNamingMapping,
+        ServiceMethod extends Exclude<keyof ServiceNamingMapping[Service], symbol>,
+        // eslint-disable-next-line
+        // @ts-ignore
+        EventType extends (...args: any) => any = ServiceNamingMapping[Service][ServiceMethod],
+    >(
+        serviceAndMethod: `${Service}/${ServiceMethod}`,
         ...args: Parameters<EventType>
-    ) {
-        return new Promise<Awaited<ReturnType<EventType>>>(async (resolve, reject) => {
-            const EventFunc = this.createEventFunction<EventType>(EventName);
-            let complete = false;
-            setTimeout(() => {
-                if (!complete) {
-                    reject(new Error('NTEvent EventName:' + EventName + ' timeout'));
-                }
-            }, timeout);
-            const retData = await EventFunc!(...args);
-            complete = true;
-            resolve(retData);
-        });
+    ): Promise<Awaited<ReturnType<EventType>>> {
+        return (this.createEventFunction(serviceAndMethod))!(...args);
     }
 
-    async RegisterListen<ListenerType extends (...args: any[]) => void>(
-        ListenerName = '',
+    async registerListen<
+        Listener extends keyof ListenerNamingMapping,
+        ListenerMethod extends Exclude<keyof ListenerNamingMapping[Listener], symbol>,
+        // eslint-disable-next-line
+        // @ts-ignore
+        ListenerType extends (...args: any) => any = ListenerNamingMapping[Listener][ListenerMethod],
+    >(
+        listenerAndMethod: `${Listener}/${ListenerMethod}`,
         waitTimes = 1,
         timeout = 5000,
         checker: (...args: Parameters<ListenerType>) => boolean,
     ) {
         return new Promise<Parameters<ListenerType>>((resolve, reject) => {
-            const ListenerNameList = ListenerName.split('/');
+            const ListenerNameList = listenerAndMethod.split('/');
             const ListenerMainName = ListenerNameList[0];
             const ListenerSubName = ListenerNameList[1];
             const id = randomUUID();
             let complete = 0;
             let retData: Parameters<ListenerType> | undefined = undefined;
-            const databack = () => {
+
+            function sendDataCallback() {
                 if (complete == 0) {
-                    reject(new Error(' ListenerName:' + ListenerName + ' timeout'));
+                    reject(new Error(' ListenerName:' + listenerAndMethod + ' timeout'));
                 } else {
                     resolve(retData!);
                 }
-            };
-            const timeoutRef = setTimeout(databack, timeout);
-            const eventCallbak = {
+            }
+
+            const timeoutRef = setTimeout(sendDataCallback, timeout);
+            const eventCallback = {
                 timeout: timeout,
                 createtime: Date.now(),
                 checker: checker,
@@ -148,7 +147,7 @@ export class LegacyNTEventWrapper {
                     retData = args;
                     if (complete >= waitTimes) {
                         clearTimeout(timeoutRef);
-                        databack();
+                        sendDataCallback();
                     }
                 },
             };
@@ -158,21 +157,30 @@ export class LegacyNTEventWrapper {
             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.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.set(id, eventCallback);
             this.createListenerFunction(ListenerMainName);
         });
     }
 
-    async CallNormalEvent<
-        EventType extends (...args: any[]) => Promise<any>,
-        ListenerType extends (...args: any[]) => void
+    async callNormalEventV2<
+        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]
     >(
-        EventName = '',
-        ListenerName = '',
-        waitTimes = 1,
-        timeout: number = 3000,
-        checker: (...args: Parameters<ListenerType>) => boolean,
-        ...args: Parameters<EventType>
+        serviceAndMethod: `${Service}/${ServiceMethod}`,
+        listenerAndMethod: `${Listener}/${ListenerMethod}`,
+        args: Parameters<EventType>,
+        checkerEvent: (ret: Awaited<ReturnType<EventType>>) => boolean = () => true,
+        checkerListener: (...args: Parameters<ListenerType>) => boolean = () => true,
+        callbackTimesToWait = 1,
+        timeout = 5000,
     ) {
         return new Promise<[EventRet: Awaited<ReturnType<EventType>>, ...Parameters<ListenerType>]>(
             async (resolve, reject) => {
@@ -180,14 +188,15 @@ export class LegacyNTEventWrapper {
                 let complete = 0;
                 let retData: Parameters<ListenerType> | undefined = undefined;
                 let retEvent: any = {};
-                const databack = () => {
+
+                function sendDataCallback() {
                     if (complete == 0) {
                         reject(
                             new Error(
-                                'Timeout: NTEvent EventName:' +
-                                EventName +
+                                'Timeout: NTEvent serviceAndMethod:' +
+                                serviceAndMethod +
                                 ' ListenerName:' +
-                                ListenerName +
+                                listenerAndMethod +
                                 ' EventRet:\n' +
                                 JSON.stringify(retEvent, null, 4) +
                                 '\n',
@@ -196,25 +205,24 @@ export class LegacyNTEventWrapper {
                     } else {
                         resolve([retEvent as Awaited<ReturnType<EventType>>, ...retData!]);
                     }
-                };
+                }
 
-                const ListenerNameList = ListenerName.split('/');
+                const ListenerNameList = listenerAndMethod.split('/');
                 const ListenerMainName = ListenerNameList[0];
                 const ListenerSubName = ListenerNameList[1];
 
-                const Timeouter = setTimeout(databack, timeout);
+                const timeoutRef = setTimeout(sendDataCallback, timeout);
 
-                const eventCallbak = {
+                const eventCallback = {
                     timeout: timeout,
                     createtime: Date.now(),
-                    checker: checker,
+                    checker: checkerListener,
                     func: (...args: any[]) => {
                         complete++;
-                        //console.log('func', ...args);
                         retData = args as Parameters<ListenerType>;
-                        if (complete >= waitTimes) {
-                            clearTimeout(Timeouter);
-                            databack();
+                        if (complete >= callbackTimesToWait) {
+                            clearTimeout(timeoutRef);
+                            sendDataCallback();
                         }
                     },
                 };
@@ -224,36 +232,26 @@ export class LegacyNTEventWrapper {
                 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.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.set(id, eventCallback);
                 this.createListenerFunction(ListenerMainName);
-                const EventFunc = this.createEventFunction<EventType>(EventName);
-                retEvent = await EventFunc!(...(args as any[]));
+                const eventFunction = this.createEventFunction(serviceAndMethod);
+                retEvent = await eventFunction!(...(args));
+                if (!checkerEvent(retEvent) && timeoutRef.hasRef()) {
+                    clearTimeout(timeoutRef);
+                    reject(
+                        new Error(
+                            'EventChecker Failed: NTEvent serviceAndMethod:' +
+                            serviceAndMethod +
+                            ' ListenerName:' +
+                            listenerAndMethod +
+                            ' EventRet:\n' +
+                            JSON.stringify(retEvent, null, 4) +
+                            '\n',
+                        ),
+                    );
+                }
+
             },
         );
     }
 }
-
-// 示例代码 快速创建事件
-// let NTEvent = new NTEventWrapper();
-// let TestEvent = NTEvent.CreatEventFunction<(force: boolean) => Promise<Number>>('NodeIKernelProfileLikeService/GetTest');
-// if (TestEvent) {
-//     TestEvent(true);
-// }
-
-// 示例代码 快速创建监听Listener类
-// let NTEvent = new NTEventWrapper();
-// NTEvent.CreatListenerFunction<NodeIKernelMsgListener>('NodeIKernelMsgListener', 'core')
-
-// 调用接口
-//let NTEvent = new NTEventWrapper();
-//let ret = await NTEvent.CallNormalEvent<(force: boolean) => Promise<Number>, (data1: string, data2: number) => void>('NodeIKernelProfileLikeService/GetTest', 'NodeIKernelMsgListener/onAddSendMsg', 1, 3000, true);
-
-// 注册监听 解除监听
-// NTEventDispatch.RigisterListener('NodeIKernelMsgListener/onAddSendMsg','core',cb);
-// NTEventDispatch.UnRigisterListener('NodeIKernelMsgListener/onAddSendMsg','core');
-
-// let GetTest = NTEventDispatch.CreatEvent('NodeIKernelProfileLikeService/GetTest','NodeIKernelMsgListener/onAddSendMsg',Mode);
-// GetTest('test');
-
-// always模式
-// NTEventDispatch.CreatEvent('NodeIKernelProfileLikeService/GetTest','NodeIKernelMsgListener/onAddSendMsg',Mode,(...args:any[])=>{ console.log(args) });

src/common/file.ts

@@ -4,6 +4,7 @@ import crypto, { randomUUID } from 'crypto';
 import util from 'util';
 import path from 'node:path';
 import * as fileType from 'file-type';
+import { solveProblem } from './helper';
 
 export function isGIF(path: string) {
     const buffer = Buffer.alloc(4);
@@ -12,6 +13,7 @@ export function isGIF(path: string) {
     fs.closeSync(fd);
     return buffer.toString() === 'GIF8';
 }
+
 // 定义一个异步函数来检查文件是否存在
 export function checkFileReceived(path: string, timeout: number = 3000): Promise<void> {
     return new Promise((resolve, reject) => {
@@ -121,16 +123,15 @@ export interface HttpDownloadOptions {
     headers?: Record<string, string> | string;
 }
 
-export async function httpDownload(options: string | HttpDownloadOptions): Promise<Buffer> {
-    const chunks: Buffer[] = [];
+async function tryDownload(options: string | HttpDownloadOptions, useReferer: boolean = false): Promise<Response> {
+    // const chunks: Buffer[] = [];
     let url: string;
     let headers: Record<string, string> = {
         'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.71 Safari/537.36',
     };
     if (typeof options === 'string') {
         url = options;
-        const host = new URL(url).hostname;
-        headers['Host'] = host;
+        headers['Host'] = new URL(url).hostname;
     } else {
         url = options.url;
         if (options.headers) {
@@ -141,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);
 }
@@ -159,8 +171,7 @@ type Uri2LocalRes = {
     errMsg: string,
     fileName: string,
     ext: string,
-    path: string,
-    isLocal: boolean
+    path: string
 }
 
 export async function checkFileV2(filePath: string) {
@@ -185,68 +196,83 @@ export enum FileUriType {
 }
 
 export async function checkUriType(Uri: string) {
-    //先判断是否是本地文件
-    try {
-        if (fs.existsSync(Uri)) return { Uri: Uri, Type: FileUriType.Local };
-    } catch (error) {
-    }
-    try {
+
+    const LocalFileRet = await solveProblem((uri: string) => {
+        if (fs.existsSync(uri)) {
+            return { Uri: uri, Type: FileUriType.Local };
+        }
+        return undefined;
+    }, Uri);
+    if (LocalFileRet) return LocalFileRet;
+    const OtherFileRet = await solveProblem((uri: string) => {
         //再判断是否是Http
-        if (Uri.startsWith('http://') || Uri.startsWith('https://')) {
-            return { Uri: Uri, Type: FileUriType.Remote };
+        if (uri.startsWith('http://') || uri.startsWith('https://')) {
+            return { Uri: uri, Type: FileUriType.Remote };
         }
         //再判断是否是Base64
-        if (Uri.startsWith('base64://')) {
-            return { Uri: Uri, Type: FileUriType.Base64 };
+        if (uri.startsWith('base64://')) {
+            return { Uri: uri, Type: FileUriType.Base64 };
         }
-        if (Uri.startsWith('file://')) {
-            let pathname: string;
+        if (uri.startsWith('file://')) {
             let filePath: string;
-            // await fs.copyFile(url.pathname, filePath);
-            pathname = decodeURIComponent(new URL(Uri).pathname);
+            const pathname = decodeURIComponent(new URL(uri).pathname);
             if (process.platform === 'win32') {
                 filePath = pathname.slice(1);
             } else {
                 filePath = pathname;
             }
+
             return { Uri: filePath, Type: FileUriType.Local };
         }
-    } catch (error) {
-    }
+        if (uri.startsWith('data:')) {
+            const data = uri.split(',')[1];
+            if (data) return { Uri: data, Type: FileUriType.Base64 };
+        }
+    }, Uri);
+    if (OtherFileRet) return OtherFileRet;
+
     return { Uri: Uri, Type: FileUriType.Unknown };
 }
 
 export async function uri2local(dir: string, uri: string, filename: string | undefined = undefined): Promise<Uri2LocalRes> {
     const { Uri: HandledUri, Type: UriType } = await checkUriType(uri);
     //解析失败
+    const tempName = randomUUID();
+    if (!filename) filename = randomUUID();
+    //解析Http和Https协议
 
     if (UriType == FileUriType.Unknown) {
-        return { success: false, errMsg: '未知文件类型', fileName: '', ext: '', path: '', isLocal: false };
+        return { success: false, errMsg: '未知文件类型', fileName: '', ext: '', path: '' };
     }
     //解析File协议和本地文件
     if (UriType == FileUriType.Local) {
         const fileExt = path.extname(HandledUri);
-        const filename = path.basename(HandledUri, fileExt);
-        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: HandledUri, isLocal: true };
+        let filename = path.basename(HandledUri, fileExt);
+        filename += fileExt;
+        //复制文件到临时文件并保持后缀
+        const filenameTemp = tempName + fileExt;
+        const filePath = path.join(dir, filenameTemp);
+        fs.copyFileSync(HandledUri, filePath);
+        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: filePath };
     }
     //接下来都要有文件名
-    if (!filename) filename = randomUUID();
-    //解析Http和Https协议
-    
+
     if (UriType == FileUriType.Remote) {
         const pathInfo = path.parse(decodeURIComponent(new URL(HandledUri).pathname));
         if (pathInfo.name) {
-            filename = pathInfo.name;
+            const pathlen = 200 - dir.length - pathInfo.name.length;
+            filename = pathlen > 0 ? pathInfo.name.substring(0, pathlen) : pathInfo.name.substring(pathInfo.name.length, pathInfo.name.length - 10);//过长截断
             if (pathInfo.ext) {
                 filename += pathInfo.ext;
             }
         }
         filename = filename.replace(/[/\\:*?"<>|]/g, '_');
-        const fileExt = path.extname(HandledUri);
-        const filePath = path.join(dir, filename);
+        const fileExt = path.extname(HandledUri).replace(/[/\\:*?"<>|]/g, '_').substring(0, 10);
+        const filePath = path.join(dir, tempName + fileExt);
         const buffer = await httpDownload(HandledUri);
-        fs.writeFileSync(filePath, buffer);
-        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: filePath, isLocal: true };
+        //没有文件就创建
+        fs.writeFileSync(filePath, buffer, { flag: 'wx' });
+        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: filePath };
     }
     //解析Base64
     if (UriType == FileUriType.Base64) {
@@ -261,7 +287,7 @@ export async function uri2local(dir: string, uri: string, filename: string | und
             fileExt = ext;
             filename = filename + '.' + ext;
         }
-        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: filePath, isLocal: true };
+        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: filePath };
     }
-    return { success: false, errMsg: '未知文件类型', fileName: '', ext: '', path: '', isLocal: false };
-}
+    return { success: false, errMsg: '未知文件类型', fileName: '', ext: '', path: '' };
+}

src/common/framework/event.ts

@@ -1,140 +0,0 @@
-import type { NodeIQQNTWrapperSession, WrapperNodeApi } from '@/core/wrapper/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;
-}
-
-export class NTEventChannel 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) {
-        // eslint-disable-next-line @typescript-eslint/no-this-alias
-        const current = this;
-        return new Proxy({}, {
-            get(_target: any, prop: any, _receiver: any) {
-                return (...args: any[]) => {
-                    current.dispatcherListener.apply(current, [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 = listenerMainName.match(/^NodeIKernel(.*?)Listener$/)![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>>>(async (resolve, reject) => {
-            const EventFunc = this.createEventFunction<EventType>(EventName);
-            let complete = false;
-            const Timeouter = setTimeout(() => {
-                if (!complete) {
-                    reject(new Error('NTEvent EventName:' + EventName + ' timeout'));
-                }
-            }, timeout);
-            const retData = await EventFunc!(...args);
-            complete = true;
-            resolve(retData);
-        });
-    }
-}
-
-//NTEvent2.0

src/common/helper.ts

@@ -0,0 +1,241 @@
+import path from 'node:path';
+import fs from 'fs';
+import os from 'node:os';
+import { Peer, QQLevel } from '@/core';
+
+export async function solveProblem<T extends (...arg: any[]) => any>(func: T, ...args: Parameters<T>): Promise<ReturnType<T> | undefined> {
+    return new Promise<ReturnType<T> | undefined>((resolve) => {
+        try {
+            const result = func(...args);
+            resolve(result);
+        } catch (e) {
+            resolve(undefined);
+        }
+    });
+}
+
+export async function solveAsyncProblem<T extends (...args: any[]) => Promise<any>>(func: T, ...args: Parameters<T>): Promise<Awaited<ReturnType<T>> | undefined> {
+    return new Promise<Awaited<ReturnType<T>> | undefined>((resolve) => {
+        func(...args).then((result) => {
+            resolve(result);
+        }).catch(() => {
+            resolve(undefined);
+        });
+    });
+}
+
+export class FileNapCatOneBotUUID {
+    static encodeModelId(peer: Peer, modelId: string, fileId: string, fileUUID: string = "", endString: string = ""): string {
+        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长度
+        length.write(data, 4);
+        return length.toString('hex') + endString;
+    }
+
+    static decodeModelId(uuid: string): undefined | {
+        peer: Peer,
+        modelId: string,
+        fileId: string,
+        fileUUID?: string
+    } {
+        //前四个字节是data长度
+        const length = Buffer.from(uuid.slice(0, 8), 'hex').readUInt32BE(0);
+        //根据length计算需要读取的长度
+        const dataId = uuid.slice(8, 8 + length);
+        //hex还原为string
+        const realData = Buffer.from(dataId, 'hex').toString();
+        if (!realData.startsWith('NapCatOneBot|ModelIdFile|')) return undefined;
+        const data = realData.split('|');
+        if (data.length < 6) return undefined;  // compatibility requirement
+        const [, , chatType, peerUid, modelId, fileId, fileUUID = undefined] = data;
+        return {
+            peer: {
+                chatType: chatType as any,
+                peerUid: peerUid,
+            },
+            modelId,
+            fileId,
+            fileUUID
+        };
+    }
+
+    static encode(peer: Peer, msgId: string, elementId: string, fileUUID: string = "", endString: string = ""): string {
+        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);
+        length.writeUInt32BE(data.length * 2, 0);
+        length.write(data, 4);
+        return length.toString('hex') + endString;
+    }
+
+    static decode(uuid: string): undefined | {
+        peer: Peer,
+        msgId: string,
+        elementId: string,
+        fileUUID?: string
+    } {
+        //前四个字节是data长度
+        const length = Buffer.from(uuid.slice(0, 8), 'hex').readUInt32BE(0);
+        //根据length计算需要读取的长度
+        const dataId = uuid.slice(8, 8 + length);
+        //hex还原为string
+        const realData = Buffer.from(dataId, 'hex').toString();
+        if (!realData.startsWith('NapCatOneBot|MsgFile|')) return undefined;
+        const data = realData.split('|');
+        if (data.length < 6) return undefined;  // compatibility requirement
+        const [, , chatType, peerUid, msgId, elementId, fileUUID = undefined] = data;
+        return {
+            peer: {
+                chatType: chatType as any,
+                peerUid: peerUid,
+            },
+            msgId,
+            elementId,
+            fileUUID
+        };
+    }
+}
+
+export function sleep(ms: number): Promise<void> {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+export function PromiseTimer<T>(promise: Promise<T>, ms: number): Promise<T> {
+    const timeoutPromise = new Promise<T>((_, reject) =>
+        setTimeout(() => reject(new Error('PromiseTimer: Operation timed out')), ms),
+    );
+    return Promise.race([promise, timeoutPromise]);
+}
+
+export async function runAllWithTimeout<T>(tasks: Promise<T>[], timeout: number): Promise<T[]> {
+    const wrappedTasks = tasks.map((task) =>
+        PromiseTimer(task, timeout).then(
+            (result) => ({ status: 'fulfilled', value: result }),
+            (error) => ({ status: 'rejected', reason: error }),
+        ),
+    );
+    const results = await Promise.all(wrappedTasks);
+    return results
+        .filter((result) => result.status === 'fulfilled')
+        .map((result) => (result as { status: 'fulfilled'; value: T }).value);
+}
+
+export function isNull(value: any) {
+    return value === undefined || value === null;
+}
+
+export function isNumeric(str: string) {
+    return /^\d+$/.test(str);
+}
+
+export function truncateString(obj: any, maxLength = 500) {
+    if (obj !== null && typeof obj === 'object') {
+        Object.keys(obj).forEach((key) => {
+            if (typeof obj[key] === 'string') {
+                // 如果是字符串且超过指定长度，则截断
+                if (obj[key].length > maxLength) {
+                    obj[key] = obj[key].substring(0, maxLength) + '...';
+                }
+            } else if (typeof obj[key] === 'object') {
+                // 如果是对象或数组，则递归调用
+                truncateString(obj[key], maxLength);
+            }
+        });
+    }
+    return obj;
+}
+
+export function isEqual(obj1: any, obj2: any) {
+    if (obj1 === obj2) return true;
+    if (obj1 == null || obj2 == null) return false;
+    if (typeof obj1 !== 'object' || typeof obj2 !== 'object') return obj1 === obj2;
+
+    const keys1 = Object.keys(obj1);
+    const keys2 = Object.keys(obj2);
+
+    if (keys1.length !== keys2.length) return false;
+
+    for (const key of keys1) {
+        if (!isEqual(obj1[key], obj2[key])) return false;
+    }
+    return true;
+}
+
+export function getDefaultQQVersionConfigInfo(): QQVersionConfigType {
+    if (os.platform() === 'linux') {
+        return {
+            baseVersion: '3.2.12.28060',
+            curVersion: '3.2.12.28060',
+            prevVersion: '',
+            onErrorVersions: [],
+            buildId: '27254',
+        };
+    }
+    if (os.platform() === 'darwin') {
+        return {
+            baseVersion: '6.9.53.28060',
+            curVersion: '6.9.53.28060',
+            prevVersion: '',
+            onErrorVersions: [],
+            buildId: '28060',
+        };
+    }
+    return {
+        baseVersion: '9.9.15-28131',
+        curVersion: '9.9.15-28131',
+        prevVersion: '',
+        onErrorVersions: [],
+        buildId: '28131',
+    };
+}
+
+export function getQQPackageInfoPath(exePath: string = '', version?: string): string {
+    let packagePath;
+    if (os.platform() === 'darwin') {
+        packagePath = path.join(path.dirname(exePath), '..', 'Resources', 'app', 'package.json');
+    } else if (os.platform() === 'linux') {
+        packagePath = path.join(path.dirname(exePath), './resources/app/package.json');
+    } else {
+        packagePath = path.join(path.dirname(exePath), './versions/' + version + '/resources/app/package.json');
+    }
+    //下面是老版本兼容 未来去掉
+    if (!fs.existsSync(packagePath)) {
+        packagePath = path.join(path.dirname(exePath), './resources/app/versions/' + version + '/package.json');
+    }
+    return packagePath;
+}
+
+export function getQQVersionConfigPath(exePath: string = ''): string | undefined {
+    let configVersionInfoPath;
+    if (os.platform() === 'win32') {
+        configVersionInfoPath = path.join(path.dirname(exePath), 'versions', 'config.json');
+    } else if (os.platform() === 'darwin') {
+        const userPath = os.homedir();
+        const appDataPath = path.resolve(userPath, './Library/Application Support/QQ');
+        configVersionInfoPath = path.resolve(appDataPath, './versions/config.json');
+    } else {
+        const userPath = os.homedir();
+        const appDataPath = path.resolve(userPath, './.config/QQ');
+        configVersionInfoPath = path.resolve(appDataPath, './versions/config.json');
+    }
+    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) {
+    if (!level) return 0;
+    const { crownNum, sunNum, moonNum, starNum } = level;
+    return crownNum * 64 + sunNum * 16 + moonNum * 4 + starNum;
+}

src/common/log.ts

@@ -1,5 +1,5 @@
 import log4js, { Configuration } from 'log4js';
-import { truncateString } from '@/common/utils/helper';
+import { truncateString } from '@/common/helper';
 import path from 'node:path';
 import chalk from 'chalk';
 import { AtType, ChatType, ElementType, MessageElement, RawMessage, SelfInfo } from '@/core';
@@ -139,9 +139,13 @@ export class LogWrapper {
 
     logMessage(msg: RawMessage, selfInfo: SelfInfo) {
         const isSelfSent = msg.senderUin === selfInfo.uin;
-        this.log(`${
-            isSelfSent ? '发送 ->' : '接收 <-'
-        } ${rawMessageToText(msg)}`);
+
+        // Intercept grey tip
+        if (msg.elements[0]?.elementType === ElementType.GreyTip) {
+            return;
+        }
+
+        this.log(`${isSelfSent ? '发送 ->' : '接收 <-' } ${rawMessageToText(msg)}`);
     }
 }
 
@@ -155,7 +159,12 @@ export function rawMessageToText(msg: RawMessage, recursiveLevel = 0): string {
     if (msg.chatType == ChatType.KCHATTYPEC2C) {
         tokens.push(`私聊 (${msg.peerUin})`);
     } else if (msg.chatType == ChatType.KCHATTYPEGROUP) {
-        tokens.push(`群聊 (群 ${msg.peerUin} 的 ${msg.senderUin})`);
+        if (recursiveLevel < 1) {
+            tokens.push(`群聊 [${msg.peerName}(${msg.peerUin})]`);
+        }
+        if (msg.senderUin !== '0') {
+            tokens.push(`[${msg.sendMemberName || msg.sendRemarkName || msg.sendNickName}(${msg.senderUin})]`);
+        }
     } else if (msg.chatType == ChatType.KCHATTYPEDATALINE) {
         tokens.push('移动设备');
     } else /* temp */ {
@@ -167,7 +176,8 @@ export function rawMessageToText(msg: RawMessage, recursiveLevel = 0): string {
     function msgElementToText(element: MessageElement) {
         if (element.textElement) {
             if (element.textElement.atType === AtType.notAt) {
-                return element.textElement.content;
+                const originalContentLines = element.textElement.content.split('\n');
+                return `${originalContentLines[0]}${originalContentLines.length > 1 ? ' ...' : ''}`;
             } else if (element.textElement.atType === AtType.atAll) {
                 return `@全体成员`;
             } else if (element.textElement.atType === AtType.atUser) {
@@ -177,19 +187,18 @@ export function rawMessageToText(msg: RawMessage, recursiveLevel = 0): string {
 
         if (element.replyElement) {
             const recordMsgOrNull = msg.records.find(
-                record => element.replyElement!.sourceMsgIdInRecords === record.msgId
+                record => element.replyElement!.sourceMsgIdInRecords === record.msgId,
             );
-            return `[回复消息 ${
-                recordMsgOrNull &&
-                recordMsgOrNull.peerUin != '284840486' // 非转发消息; 否则定位不到
-                    ? 
-                    rawMessageToText(recordMsgOrNull, recursiveLevel + 1) :
-                    `未找到消息记录 (MsgId = ${element.replyElement.sourceMsgIdInRecords})`
+            return `[回复消息 ${recordMsgOrNull &&
+                    recordMsgOrNull.peerUin != '284840486' && recordMsgOrNull.peerUin != '1094950020'// 非转发消息; 否则定位不到
+                ?
+                rawMessageToText(recordMsgOrNull, recursiveLevel + 1) :
+                `未找到消息记录 (MsgId = ${element.replyElement.sourceMsgIdInRecords})`
             }]`;
         }
 
         if (element.picElement) {
-            return `[图片 ${element.picElement.fileName}]`;
+            return '[图片]';
         }
 
         if (element.fileElement) {
@@ -197,7 +206,7 @@ export function rawMessageToText(msg: RawMessage, recursiveLevel = 0): string {
         }
 
         if (element.videoElement) {
-            return `[视频 ${element.videoElement.fileName}]`;
+            return '[视频]';
         }
 
         if (element.pttElement) {
@@ -205,7 +214,7 @@ export function rawMessageToText(msg: RawMessage, recursiveLevel = 0): string {
         }
 
         if (element.arkElement) {
-            return `[卡片消息 ${element.arkElement.bytesData}]`;
+            return '[卡片消息]';
         }
 
         if (element.faceElement) {
@@ -213,19 +222,19 @@ export function rawMessageToText(msg: RawMessage, recursiveLevel = 0): string {
         }
 
         if (element.marketFaceElement) {
-            return `[商城表情 ${element.marketFaceElement.faceName}]`;
+            return element.marketFaceElement.faceName;
         }
 
         if (element.markdownElement) {
-            return `[Markdown ${element.markdownElement.content}]`;
+            return '[Markdown 消息]';
         }
 
         if (element.multiForwardMsgElement) {
-            return `[转发消息]`;
+            return '[转发消息]';
         }
 
         if (element.elementType === ElementType.GreyTip) {
-            return `[灰条消息]`; // TODO: resolve the text
+            return '[灰条消息]';
         }
 
         return `[未实现 (ElementType = ${element.elementType})]`;

src/common/lru-cache.ts

@@ -24,7 +24,9 @@ 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;
-            this.cache.delete(firstKey);
+            if (firstKey !== undefined) {
+                this.cache.delete(firstKey);
+            }
         }
         this.cache.set(key, value);
     }

src/common/message-unique.ts

@@ -15,25 +15,17 @@ export class LimitedHashTable<K, V> {
     }
 
     set(key: K, value: V): void {
-        // const isExist = this.keyToValue.get(key);
-        // if (isExist && isExist === value) {
-        //   return;
-        // }
         this.keyToValue.set(key, value);
         this.valueToKey.set(value, key);
         while (this.keyToValue.size !== this.valueToKey.size) {
-            //console.log('keyToValue.size !== valueToKey.size Error Atom');
             this.keyToValue.clear();
             this.valueToKey.clear();
         }
-        // console.log('---------------');
-        // console.log(this.keyToValue);
-        // console.log(this.valueToKey);
-        // console.log('---------------');
         while (this.keyToValue.size > this.maxSize || this.valueToKey.size > this.maxSize) {
-            //console.log(this.keyToValue.size > this.maxSize, this.valueToKey.size > this.maxSize);
             const oldestKey = this.keyToValue.keys().next().value;
+            // @ts-ignore
             this.valueToKey.delete(this.keyToValue.get(oldestKey)!);
+            // @ts-ignore
             this.keyToValue.delete(oldestKey);
         }
     }
@@ -101,17 +93,13 @@ class MessageUniqueWrapper {
         return ret.map((t) => t?.MsgId).filter((t) => t !== undefined);
     }
 
-    createMsg(peer: Peer, msgId: string): number | undefined {
+    createUniqueMsgId(peer: Peer, msgId: string) {
         const key = `${msgId}|${peer.chatType}|${peer.peerUid}`;
         const hash = crypto.createHash('md5').update(key).digest();
         //设置第一个bit为0 保证shortId为正数
         hash[0] &= 0x7f;
         const shortId = hash.readInt32BE(0);
         //减少性能损耗
-        // const isExist = this.msgIdMap.getKey(shortId);
-        // if (isExist && isExist === msgId) {
-        //   return shortId;
-        // }
         this.msgIdMap.set(msgId, shortId);
         this.msgDataMap.set(key, shortId);
         return shortId;

src/common/path.ts

@@ -1,8 +1,7 @@
 import path, { dirname } from 'path';
 import { fileURLToPath } from 'url';
 import fs from 'fs';
-
-export const napcat_version = '2.2.2';
+import os from 'os';
 
 export class NapCatPathWrapper {
     binaryPath: string;
@@ -13,17 +12,23 @@ export class NapCatPathWrapper {
 
     constructor(mainPath: string = dirname(fileURLToPath(import.meta.url))) {
         this.binaryPath = mainPath;
-        this.logsPath = path.join(this.binaryPath, 'logs');
-        this.configPath = path.join(this.binaryPath, 'config');
-        this.cachePath = path.join(this.binaryPath, 'cache');
+        let writePath: string;
+        if (os.platform() === 'darwin') {
+            writePath = path.join(os.homedir(), 'Library', 'Application Support', 'QQ', 'NapCat');
+        } else {
+            writePath = this.binaryPath;
+        }
+        this.logsPath = path.join(writePath, 'logs');
+        this.configPath = path.join(writePath, 'config');
+        this.cachePath = path.join(writePath, 'cache');
         this.staticPath = path.join(this.binaryPath, 'static');
-        if (fs.existsSync(this.logsPath)) {
+        if (!fs.existsSync(this.logsPath)) {
             fs.mkdirSync(this.logsPath, { recursive: true });
         }
-        if (fs.existsSync(this.configPath)) {
+        if (!fs.existsSync(this.configPath)) {
             fs.mkdirSync(this.configPath, { recursive: true });
         }
-        if (fs.existsSync(this.cachePath)) {
+        if (!fs.existsSync(this.cachePath)) {
             fs.mkdirSync(this.cachePath, { recursive: true });
         }
     }

src/common/proxy-handler.ts

@@ -3,7 +3,6 @@ import { LogWrapper } from './log';
 export function proxyHandlerOf(logger: LogWrapper) {
     return {
         get(target: any, prop: any, receiver: any) {
-            // console.log('get', prop, typeof target[prop]);
             if (typeof target[prop] === 'undefined') {
                 // 如果方法不存在，返回一个函数，这个函数调用existentMethod
                 return (..._args: unknown[]) => {

src/common/qq-basic-info.ts

@@ -1,7 +1,6 @@
-import path from 'node:path';
 import fs from 'node:fs';
-import { systemPlatform } from '@/common/utils/system';
-import { getDefaultQQVersionConfigInfo, getQQVersionConfigPath } from './helper';
+import { systemPlatform } from '@/common/system';
+import { getDefaultQQVersionConfigInfo, getQQPackageInfoPath, getQQVersionConfigPath } from './helper';
 import AppidTable from '@/core/external/appid.json';
 import { LogWrapper } from './log';
 
@@ -20,14 +19,16 @@ export class QQBasicInfoWrapper {
         //基础目录获取
         this.context = context;
         this.QQMainPath = process.execPath;
-        this.QQPackageInfoPath = path.join(path.dirname(this.QQMainPath), 'resources', 'app', 'package.json');
         this.QQVersionConfigPath = getQQVersionConfigPath(this.QQMainPath);
 
+
         //基础信息获取 无快更则启用默认模板填充
         this.isQuickUpdate = !!this.QQVersionConfigPath;
         this.QQVersionConfig = this.isQuickUpdate
             ? JSON.parse(fs.readFileSync(this.QQVersionConfigPath!).toString())
             : getDefaultQQVersionConfigInfo();
+
+        this.QQPackageInfoPath = getQQPackageInfoPath(this.QQMainPath, this.QQVersionConfig?.curVersion);
         this.QQPackageInfo = JSON.parse(fs.readFileSync(this.QQPackageInfoPath).toString());
         const { appid: IQQVersionAppid, qua: IQQVersionQua } = this.getAppidV2();
         this.QQVersionAppid = IQQVersionAppid;
@@ -46,36 +47,43 @@ export class QQBasicInfoWrapper {
     }
 
     requireMinNTQQBuild(buildStr: string) {
-        const currentBuild = parseInt(this.getQQBuildStr() || '0');
+        const currentBuild = +(this.getQQBuildStr() ?? '0');
         if (currentBuild == 0) throw new Error('QQBuildStr获取失败');
         return currentBuild >= parseInt(buildStr);
     }
 
     //此方法不要直接使用
-    getQUAInternal() {
-        return systemPlatform === 'linux'
-            ? `V1_LNX_NQ_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`
-            : `V1_WIN_NQ_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;
+    getQUAFallback() {
+        const platformMapping: Partial<Record<NodeJS.Platform, string>> = {
+            win32: `V1_WIN_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`,
+            darwin: `V1_MAC_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`,
+            linux: `V1_LNX_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`,
+        };
+        return platformMapping[systemPlatform] ?? (platformMapping.win32)!;
+    }
+
+    getAppIdFallback() {
+        const platformMapping: Partial<Record<NodeJS.Platform, string>> = {
+            win32: '537246092',
+            darwin: '537246140',
+            linux: '537246140',
+        };
+        return platformMapping[systemPlatform] ?? '537246092';
     }
 
     getAppidV2(): { appid: string; qua: string } {
         const appidTbale = AppidTable as unknown as QQAppidTableType;
-        try {
-            const fullVersion = this.getFullQQVesion();
-            if (!fullVersion) throw new Error('QQ版本获取失败');
+        const fullVersion = this.getFullQQVesion();
+        if (fullVersion) {
             const data = appidTbale[fullVersion];
             if (data) {
                 return data;
             }
-        } catch (e) {
-            this.context.logger.log(`[QQ版本兼容性检测] 获取Appid异常 请检测NapCat/QQNT是否正常`);
         }
-        // 以下是兜底措施
-        this.context.logger.log(
-            `[QQ版本兼容性检测] ${this.getFullQQVesion()} 版本兼容性不佳，可能会导致一些功能无法正常使用`,
-        );
-        return { appid: systemPlatform === 'linux' ? '537240795' : '537240709', qua: this.getQUAInternal() };
+
+        // else
+        this.context.logger.log(`[QQ版本兼容性检测] 获取Appid异常 请检测NapCat/QQNT是否正常`);
+        this.context.logger.log(`[QQ版本兼容性检测] ${fullVersion} 版本兼容性不佳，可能会导致一些功能无法正常使用`,);
+        return { appid: this.getAppIdFallback(), qua: this.getQUAFallback() };
     }
 }
-
-export let QQBasicInfo: QQBasicInfoWrapper | undefined;

src/common/request.ts

@@ -61,7 +61,7 @@ export class RequestUtil {
         const options = {
             hostname: option.hostname,
             port: option.port,
-            path: option.href,
+            path: option.pathname + option.search,
             method: method,
             headers: headers,
         };

src/common/system.ts

@@ -0,0 +1,21 @@
+import os from 'node:os';
+import path from 'node:path';
+
+// 缓解Win7设备兼容性问题
+let osName: string;
+
+try {
+    osName = os.hostname();
+} catch (e) {
+    osName = 'NapCat'; // + crypto.randomUUID().substring(0, 4);
+}
+
+
+const homeDir = os.homedir();
+
+export const systemPlatform = os.platform();
+export const cpuArch = os.arch();
+export const systemVersion = os.release();
+export const hostname = osName;
+export const downloadsPath = path.join(homeDir, 'Downloads');
+export const systemName = os.type();

src/common/utils/audio.ts

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

src/common/utils/helper.ts

@@ -1,135 +0,0 @@
-import path from 'node:path';
-import fs from 'fs';
-import os from 'node:os';
-import { QQLevel } from '@/core';
-
-//下面这个类是用于将uid+msgid合并的类
-
-export class UUIDConverter {
-    static encode(highStr: string, lowStr: string): string {
-        const high = BigInt(highStr);
-        const low = BigInt(lowStr);
-        const highHex = high.toString(16).padStart(16, '0');
-        const lowHex = low.toString(16).padStart(16, '0');
-        const combinedHex = highHex + lowHex;
-        const uuid = `${combinedHex.substring(0, 8)}-${combinedHex.substring(8, 12)}-${combinedHex.substring(
-            12,
-            16,
-        )}-${combinedHex.substring(16, 20)}-${combinedHex.substring(20)}`;
-        return uuid;
-    }
-
-    static decode(uuid: string): { high: string; low: string } {
-        const hex = uuid.replace(/-/g, '');
-        const high = BigInt('0x' + hex.substring(0, 16));
-        const low = BigInt('0x' + hex.substring(16));
-        return { high: high.toString(), low: low.toString() };
-    }
-}
-
-export function sleep(ms: number): Promise<void> {
-    return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
-export function PromiseTimer<T>(promise: Promise<T>, ms: number): Promise<T> {
-    const timeoutPromise = new Promise<T>((_, reject) =>
-        setTimeout(() => reject(new Error('PromiseTimer: Operation timed out')), ms),
-    );
-    return Promise.race([promise, timeoutPromise]);
-}
-
-export async function runAllWithTimeout<T>(tasks: Promise<T>[], timeout: number): Promise<T[]> {
-    const wrappedTasks = tasks.map((task) =>
-        PromiseTimer(task, timeout).then(
-            (result) => ({ status: 'fulfilled', value: result }),
-            (error) => ({ status: 'rejected', reason: error }),
-        ),
-    );
-    const results = await Promise.all(wrappedTasks);
-    return results
-        .filter((result) => result.status === 'fulfilled')
-        .map((result) => (result as { status: 'fulfilled'; value: T }).value);
-}
-
-export function isNull(value: any) {
-    return value === undefined || value === null;
-}
-
-export function isNumeric(str: string) {
-    return /^\d+$/.test(str);
-}
-
-export function truncateString(obj: any, maxLength = 500) {
-    if (obj !== null && typeof obj === 'object') {
-        Object.keys(obj).forEach((key) => {
-            if (typeof obj[key] === 'string') {
-                // 如果是字符串且超过指定长度，则截断
-                if (obj[key].length > maxLength) {
-                    obj[key] = obj[key].substring(0, maxLength) + '...';
-                }
-            } else if (typeof obj[key] === 'object') {
-                // 如果是对象或数组，则递归调用
-                truncateString(obj[key], maxLength);
-            }
-        });
-    }
-    return obj;
-}
-
-export function isEqual(obj1: any, obj2: any) {
-    if (obj1 === obj2) return true;
-    if (obj1 == null || obj2 == null) return false;
-    if (typeof obj1 !== 'object' || typeof obj2 !== 'object') return obj1 === obj2;
-
-    const keys1 = Object.keys(obj1);
-    const keys2 = Object.keys(obj2);
-
-    if (keys1.length !== keys2.length) return false;
-
-    for (const key of keys1) {
-        if (!isEqual(obj1[key], obj2[key])) return false;
-    }
-    return true;
-}
-
-export function getDefaultQQVersionConfigInfo(): QQVersionConfigType {
-    if (os.platform() === 'linux') {
-        return {
-            baseVersion: '3.2.12-27254',
-            curVersion: '3.2.12-27254',
-            prevVersion: '',
-            onErrorVersions: [],
-            buildId: '27254',
-        };
-    }
-    return {
-        baseVersion: '9.9.15-27254',
-        curVersion: '9.9.15-27254',
-        prevVersion: '',
-        onErrorVersions: [],
-        buildId: '27254',
-    };
-}
-
-export function getQQVersionConfigPath(exePath: string = ''): string | undefined {
-    let configVersionInfoPath;
-    if (os.platform() !== 'linux') {
-        configVersionInfoPath = path.join(path.dirname(exePath), 'resources', 'app', 'versions', 'config.json');
-    } else {
-        const userPath = os.homedir();
-        const appDataPath = path.resolve(userPath, './.config/QQ');
-        configVersionInfoPath = path.resolve(appDataPath, './versions/config.json');
-    }
-    if (typeof configVersionInfoPath !== 'string') {
-        return undefined;
-    }
-    if (!fs.existsSync(configVersionInfoPath)) {
-        return undefined;
-    }
-    return configVersionInfoPath;
-}
-
-export function calcQQLevel(level: QQLevel) {
-    const { crownNum, sunNum, moonNum, starNum } = level;
-    return crownNum * 64 + sunNum * 16 + moonNum * 4 + starNum;
-}

src/common/utils/system.ts

@@ -1,73 +0,0 @@
-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();
-} catch (e) {
-    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();
-
-export const systemPlatform = os.platform();
-export const cpuArch = os.arch();
-export const systemVersion = os.release();
-export const hostname = osName;
-export const downloadsPath = path.join(homeDir, 'Downloads');
-export const systemName = os.type();

src/common/version.ts

@@ -0,0 +1 @@
+export const napCatVersion = '3.0.6';

src/core/adapters/NodeIDependsAdapter.ts

@@ -1,22 +1,8 @@
-interface IDependsAdapter {
-    onMSFStatusChange(arg1: number, arg2: number): void;
+import { MsfChangeReasonType, MsfStatusType } from "../entities/adapter";
 
-    onMSFSsoError(args: unknown): void;
+export class NodeIDependsAdapter {
+    onMSFStatusChange(statusType: MsfStatusType, changeReasonType: MsfChangeReasonType) {
 
-    getGroupCode(args: unknown): void;
-}
-
-export interface NodeIDependsAdapter extends IDependsAdapter {
-    // eslint-disable-next-line @typescript-eslint/no-misused-new
-    new(adapter: IDependsAdapter): NodeIDependsAdapter;
-}
-
-export class DependsAdapter implements IDependsAdapter {
-    onMSFStatusChange(arg1: number, arg2: number) {
-        // console.log(arg1, arg2);
-        // if (arg1 == 2 && arg2 == 2) {
-        //   log("NapCat丢失网络连接,请检查网络")
-        // }
     }
 
     onMSFSsoError(args: unknown) {

src/core/adapters/NodeIDispatcherAdapter.ts

@@ -1,17 +1,4 @@
-interface IDispatcherAdapter {
-    dispatchRequest(arg: unknown): void;
-
-    dispatchCall(arg: unknown): void;
-
-    dispatchCallWithJson(arg: unknown): void;
-}
-
-export interface NodeIDispatcherAdapter extends IDispatcherAdapter {
-    // eslint-disable-next-line @typescript-eslint/no-misused-new
-    new(adapter: IDispatcherAdapter): NodeIDispatcherAdapter;
-}
-
-export class DispatcherAdapter implements IDispatcherAdapter {
+export class NodeIDispatcherAdapter {
     dispatchRequest(arg: unknown) {
     }
 

src/core/adapters/NodeIGlobalAdapter.ts

@@ -1,27 +1,4 @@
-interface IGlobalAdapter {
-    onLog(...args: unknown[]): void;
-
-    onGetSrvCalTime(...args: unknown[]): void;
-
-    onShowErrUITips(...args: unknown[]): void;
-
-    fixPicImgType(...args: unknown[]): void;
-
-    getAppSetting(...args: unknown[]): void;
-
-    onInstallFinished(...args: unknown[]): void;
-
-    onUpdateGeneralFlag(...args: unknown[]): void;
-
-    onGetOfflineMsg(...args: unknown[]): void;
-}
-
-export interface NodeIGlobalAdapter extends IGlobalAdapter {
-    // eslint-disable-next-line @typescript-eslint/no-misused-new
-    new(adapter: IGlobalAdapter): NodeIGlobalAdapter;
-}
-
-export class GlobalAdapter implements IGlobalAdapter {
+export class NodeIGlobalAdapter {
     onLog(...args: unknown[]) {
     }
 

src/core/apis/collection.ts

@@ -10,7 +10,7 @@ export class NTQQCollectionApi {
     }
 
     async createCollection(authorUin: string, authorUid: string, authorName: string, brief: string, rawData: string) {
-        const param = {
+        return this.context.session.getCollectionService().createNewCollectionItem({
             commInfo: {
                 bid: 1,
                 category: 2,
@@ -43,12 +43,11 @@ export class NTQQCollectionApi {
                 fileList: [],
             },
             need_share_url: false,
-        };
-        return this.context.session.getCollectionService().createNewCollectionItem(param);
+        });
     }
 
     async getAllCollection(category: number = 0, count: number = 50) {
-        const param = {
+        return this.context.session.getCollectionService().getCollectionItemList({
             category: category,
             groupId: -1,
             forceSync: true,
@@ -56,7 +55,6 @@ export class NTQQCollectionApi {
             timeStamp: '0',
             count: count,
             searchDown: true,
-        };
-        return this.context.session.getCollectionService().getCollectionItemList(param);
+        });
     }
 }

src/core/apis/file.ts

@@ -1,39 +1,41 @@
 import {
-    CacheFileListItem,
-    CacheFileType,
-    ChatCacheListItemBasic,
     ChatType,
     ElementType,
     IMAGE_HTTP_HOST,
     IMAGE_HTTP_HOST_NT,
     Peer,
     PicElement,
+    PicType,
+    SendFileElement,
+    SendPicElement,
+    SendPttElement,
+    SendVideoElement,
 } from '@/core/entities';
 import path from 'path';
 import fs from 'fs';
 import fsPromises from 'fs/promises';
-import { InstanceContext, NapCatCore, OnRichMediaDownloadCompleteParams } from '@/core';
+import { InstanceContext, NapCatCore, SearchResultItem } from '@/core';
 import * as fileType from 'file-type';
 import imageSize from 'image-size';
 import { ISizeCalculationResult } from 'image-size/dist/types/interface';
-import { NodeIKernelSearchService } from '../services/NodeIKernelSearchService';
 import { RkeyManager } from '../helper/rkey';
-import { calculateFileMD5 } from '@/common/utils/file';
-
+import { calculateFileMD5, isGIF } from '@/common/file';
+import pathLib from 'node:path';
+import { defaultVideoThumbB64, getVideoInfo } from '@/common/video';
+import ffmpeg from 'fluent-ffmpeg';
+import { encodeSilk } from '@/common/audio';
+import { MessageContext } from '@/onebot/api';
 
 export class NTQQFileApi {
     context: InstanceContext;
     core: NapCatCore;
     rkeyManager: RkeyManager;
+    packetRkey: Array<{ rkey: string; time: number; type: number; }> | undefined;
 
     constructor(context: InstanceContext, core: NapCatCore) {
         this.context = context;
         this.core = core;
-        this.rkeyManager = new RkeyManager('http://napcat-sign.wumiao.wang:2082/rkey', this.context.logger);
-    }
-
-    async getFileType(filePath: string) {
-        return fileType.fileTypeFromFile(filePath);
+        this.rkeyManager = new RkeyManager(['https://llob.linyuchen.net/rkey', 'http://napcat-sign.wumiao.wang:2082/rkey'], this.context.logger);
     }
 
     async copyFile(filePath: string, destPath: string) {
@@ -51,18 +53,15 @@ export class NTQQFileApi {
         })).urlResult.domainUrl;
     }
 
-    // 上传文件到QQ的文件夹
     async uploadFile(filePath: string, elementType: ElementType = ElementType.PIC, elementSubType: number = 0) {
-        // napCatCore.wrapper.util.
         const fileMd5 = await calculateFileMD5(filePath);
-        let ext: string = (await this.getFileType(filePath))?.ext as string || '';
-        if (ext) {
-            ext = '.' + ext;
-        }
+        const extOrEmpty = (await fileType.fileTypeFromFile(filePath))?.ext;
+        const ext = extOrEmpty ? `.${extOrEmpty}` : '';
         let fileName = `${path.basename(filePath)}`;
         if (fileName.indexOf('.') === -1) {
             fileName += ext;
         }
+
         const mediaPath = this.context.session.getMsgService().getRichMediaFilePathForGuild({
             md5HexStr: fileMd5,
             fileName: fileName,
@@ -73,7 +72,8 @@ export class NTQQFileApi {
             downloadType: 1,
             file_uuid: '',
         });
-        await this.copyFile(filePath, mediaPath!);
+
+        await this.copyFile(filePath, mediaPath);
         const fileSize = await this.getFileSize(filePath);
         return {
             md5: fileMd5,
@@ -84,12 +84,190 @@ export class NTQQFileApi {
         };
     }
 
-    async downloadMediaByUuid() {
-        //napCatCore.session.getRichMediaService().downloadFileForFileUuid();
+    async createValidSendFileElement(context: MessageContext, filePath: string, fileName: string = '', folderId: string = '',): Promise<SendFileElement> {
+        const {
+            fileName: _fileName,
+            path,
+            fileSize,
+        } = await this.core.apis.FileApi.uploadFile(filePath, ElementType.FILE);
+        if (fileSize === 0) {
+            throw new Error('文件异常，大小为0');
+        }
+        context.deleteAfterSentFiles.push(path);
+        return {
+            elementType: ElementType.FILE,
+            elementId: '',
+            fileElement: {
+                fileName: fileName || _fileName,
+                folderId: folderId,
+                filePath: path,
+                fileSize: (fileSize).toString(),
+            },
+        };
+    }
+
+    async createValidSendPicElement(context: MessageContext, picPath: string, summary: string = '', subType: 0 | 1 = 0,): Promise<SendPicElement> {
+        const { md5, fileName, path, fileSize } = await this.core.apis.FileApi.uploadFile(picPath, ElementType.PIC, subType);
+        if (fileSize === 0) {
+            throw new Error('文件异常，大小为0');
+        }
+        const imageSize = await this.core.apis.FileApi.getImageSize(picPath);
+        context.deleteAfterSentFiles.push(path);
+        return {
+            elementType: ElementType.PIC,
+            elementId: '',
+            picElement: {
+                md5HexStr: md5,
+                fileSize: fileSize.toString(),
+                picWidth: imageSize.width,
+                picHeight: imageSize.height,
+                fileName: fileName,
+                sourcePath: path,
+                original: true,
+                picType: isGIF(picPath) ? PicType.gif : PicType.jpg,
+                picSubType: subType,
+                fileUuid: '',
+                fileSubId: '',
+                thumbFileSize: 0,
+                summary,
+            } as PicElement,
+        };
+    }
+
+    async createValidSendVideoElement(context: MessageContext, filePath: string, fileName: string = '', diyThumbPath: string = ''): Promise<SendVideoElement> {
+        const logger = this.core.context.logger;
+        let videoInfo = {
+            width: 1920, height: 1080,
+            time: 15,
+            format: 'mp4',
+            size: 0,
+            filePath,
+        };
+        try {
+            videoInfo = await getVideoInfo(filePath, logger);
+        } catch (e) {
+            logger.logError.bind(logger)('获取视频信息失败，将使用默认值', e);
+        }
+
+        let fileExt = 'mp4';
+        try {
+            const tempExt = (await fileType.fileTypeFromFile(filePath))?.ext;
+            if (tempExt) fileExt = tempExt;
+        } catch (e) {
+            this.context.logger.logError.bind(logger)('获取文件类型失败', e);
+        }
+        const newFilePath = filePath + '.' + fileExt;
+        fs.copyFileSync(filePath, newFilePath);
+        context.deleteAfterSentFiles.push(newFilePath);
+        filePath = newFilePath;
+        const { fileName: _fileName, path, fileSize, md5 } = await this.core.apis.FileApi.uploadFile(filePath, ElementType.VIDEO);
+        if (fileSize === 0) {
+            throw new Error('文件异常，大小为0');
+        }
+        videoInfo.size = fileSize;
+        let thumb = path.replace(`${pathLib.sep}Ori${pathLib.sep}`, `${pathLib.sep}Thumb${pathLib.sep}`);
+        thumb = pathLib.dirname(thumb);
+
+        const thumbPath = new Map();
+        const _thumbPath = await new Promise<string | undefined>((resolve, reject) => {
+            const thumbFileName = `${md5}_0.png`;
+            const thumbPath = pathLib.join(thumb, thumbFileName);
+            ffmpeg(filePath)
+                .on('error', (err) => {
+                    logger.logDebug('获取视频封面失败，使用默认封面', err);
+                    if (diyThumbPath) {
+                        fsPromises.copyFile(diyThumbPath, thumbPath).then(() => {
+                            resolve(thumbPath);
+                        }).catch(reject);
+                    } else {
+                        fs.writeFileSync(thumbPath, Buffer.from(defaultVideoThumbB64, 'base64'));
+                        resolve(thumbPath);
+                    }
+                })
+                .screenshots({
+                    timestamps: [0],
+                    filename: thumbFileName,
+                    folder: thumb,
+                    size: videoInfo.width + 'x' + videoInfo.height,
+                })
+                .on('end', () => {
+                    resolve(thumbPath);
+                });
+        });
+        const thumbSize = _thumbPath ? (await fsPromises.stat(_thumbPath)).size : 0;
+        thumbPath.set(0, _thumbPath);
+        const thumbMd5 = _thumbPath ? await calculateFileMD5(_thumbPath) : '';
+        context.deleteAfterSentFiles.push(path);
+        const uploadName = (fileName || _fileName).toLocaleLowerCase().endsWith('.' + fileExt.toLocaleLowerCase()) ? (fileName || _fileName) : (fileName || _fileName) + '.' + fileExt;
+        return {
+            elementType: ElementType.VIDEO,
+            elementId: '',
+            videoElement: {
+                fileName: uploadName,
+                filePath: path,
+                videoMd5: md5,
+                thumbMd5,
+                fileTime: videoInfo.time,
+                thumbPath: thumbPath,
+                thumbSize,
+                thumbWidth: videoInfo.width,
+                thumbHeight: videoInfo.height,
+                fileSize: '' + fileSize,
+            },
+        };
+    }
+
+    async createValidSendPttElement(pttPath: string): Promise<SendPttElement> {
+        const { converted, path: silkPath, duration } = await encodeSilk(pttPath, this.core.NapCatTempPath, this.core.context.logger);
+        if (!silkPath) {
+            throw new Error('语音转换失败, 请检查语音文件是否正常');
+        }
+        const { md5, fileName, path, fileSize } = await this.core.apis.FileApi.uploadFile(silkPath, ElementType.PTT);
+        if (fileSize === 0) {
+            throw new Error('文件异常，大小为0');
+        }
+        if (converted) {
+            fsPromises.unlink(silkPath).then().catch(
+                (e) => this.context.logger.logError.bind(this.context.logger)('删除临时文件失败', e)
+            );
+        }
+        return {
+            elementType: ElementType.PTT,
+            elementId: '',
+            pttElement: {
+                fileName: fileName,
+                filePath: path,
+                md5HexStr: md5,
+                fileSize: fileSize,
+                duration: duration ?? 1,
+                formatType: 1,
+                voiceType: 1,
+                voiceChangeType: 0,
+                canConvert2Text: true,
+                waveAmplitudes: [
+                    0, 18, 9, 23, 16, 17, 16, 15, 44, 17, 24, 20, 14, 15, 17,
+                ],
+                fileSubId: '',
+                playState: 1,
+                autoConvertText: 0,
+            },
+        };
+    }
+
+    async downloadFileForModelId(peer: Peer, modelId: string, unknown: string, timeout = 1000 * 60 * 2) {
+        const [, fileTransNotifyInfo] = await this.core.eventWrapper.callNormalEventV2(
+            'NodeIKernelRichMediaService/downloadFileForModelId',
+            'NodeIKernelMsgListener/onRichMediaDownloadComplete',
+            [peer, [modelId], unknown],
+            () => true,
+            (arg) => arg?.commonFileInfo?.fileModelId === modelId,
+            1,
+            timeout,
+        );
+        return fileTransNotifyInfo.filePath;
     }
 
     async downloadMedia(msgId: string, chatType: ChatType, peerUid: string, elementId: string, thumbPath: string, sourcePath: string, timeout = 1000 * 60 * 2, force: boolean = false) {
-        //logDebug('receive downloadMedia task', msgId, chatType, peerUid, elementId, thumbPath, sourcePath, timeout, force);
         // 用于下载收到的消息中的图片等
         if (sourcePath && fs.existsSync(sourcePath)) {
             if (force) {
@@ -102,279 +280,145 @@ export class NTQQFileApi {
                 return sourcePath;
             }
         }
-        const data = await this.core.eventWrapper.CallNormalEvent<
-            (
-                params: {
-                    fileModelId: string,
-                    downloadSourceType: number,
-                    triggerType: number,
-                    msgId: string,
-                    chatType: ChatType,
-                    peerUid: string,
-                    elementId: string,
-                    thumbSize: number,
-                    downloadType: number,
-                    filePath: string
-                }) => Promise<unknown>,
-            (fileTransNotifyInfo: OnRichMediaDownloadCompleteParams) => void
-                >(
-                'NodeIKernelMsgService/downloadRichMedia',
-                'NodeIKernelMsgListener/onRichMediaDownloadComplete',
-                1,
-                timeout,
-                (arg: OnRichMediaDownloadCompleteParams) => {
-                    if (arg.msgId === msgId) {
-                        return true;
-                    }
-                    return false;
-                },
-                {
-                    fileModelId: '0',
-                    downloadSourceType: 0,
-                    triggerType: 1,
-                    msgId: msgId,
-                    chatType: chatType,
-                    peerUid: peerUid,
-                    elementId: elementId,
-                    thumbSize: 0,
-                    downloadType: 1,
-                    filePath: thumbPath,
-                },
-                );
-        const msg = await this.core.apis.MsgApi.getMsgsByMsgId({
-            guildId: '',
-            chatType: chatType,
-            peerUid: peerUid,
-        }, [msgId]);
-        if (msg.msgList.length === 0) {
-            return data[1].filePath;
-        }
-        //获取原始消息
-        const FileElements = msg?.msgList[0]?.elements?.find(e => e.elementId === elementId);
-        if (!FileElements) {
-            //失败则就乱来 Todo
-            return data[1].filePath;
-        }
-        //从原始消息获取文件路径
-        const filePath =
-            FileElements?.fileElement?.filePath ||
-            FileElements?.pttElement?.filePath ||
-            FileElements?.videoElement?.filePath ||
-            FileElements?.picElement?.sourcePath;
-        return filePath;
+        const [, completeRetData] = await this.core.eventWrapper.callNormalEventV2(
+            'NodeIKernelMsgService/downloadRichMedia',
+            'NodeIKernelMsgListener/onRichMediaDownloadComplete',
+            [{
+                fileModelId: '0',
+                downloadSourceType: 0,
+                triggerType: 1,
+                msgId: msgId,
+                chatType: chatType,
+                peerUid: peerUid,
+                elementId: elementId,
+                thumbSize: 0,
+                downloadType: 1,
+                filePath: thumbPath,
+            }],
+            () => true,
+            (arg) => arg.msgId === msgId,
+            1,
+            timeout,
+        );
+        return completeRetData.filePath;
     }
 
-    async getImageSize(filePath: string): Promise<ISizeCalculationResult | undefined> {
+    async getImageSize(filePath: string): Promise<ISizeCalculationResult> {
         return new Promise((resolve, reject) => {
             imageSize(filePath, (err, dimensions) => {
                 if (err) {
                     reject(err);
                 } else {
-                    resolve(dimensions);
+                    if (!dimensions) {
+                        reject(new Error('获取图片尺寸失败'));
+                    } else {
+                        resolve(dimensions);
+                    }
                 }
             });
         });
     }
 
-    async addFileCache(peer: Peer, msgId: string, msgSeq: string, senderUid: string, elemId: string, elemType: string, fileSize: string, fileName: string) {
-        let GroupData;
-        let BuddyData;
-        if (peer.chatType === ChatType.KCHATTYPEGROUP) {
-            GroupData =
-                [{
-                    groupCode: peer.peerUid,
-                    isConf: false,
-                    hasModifyConfGroupFace: true,
-                    hasModifyConfGroupName: true,
-                    groupName: 'NapCat.Cached',
-                    remark: 'NapCat.Cached',
-                }];
-        } else if (peer.chatType === ChatType.KCHATTYPEC2C) {
-            BuddyData = [{
-                category_name: 'NapCat.Cached',
-                peerUid: peer.peerUid,
-                peerUin: peer.peerUid,
-                remark: 'NapCat.Cached',
-            }];
-        } else {
-            return undefined;
-        }
-
-        return this.context.session.getSearchService().addSearchHistory({
-            type: 4,
-            contactList: [],
-            id: -1,
-            groupInfos: [],
-            msgs: [],
-            fileInfos: [
-                {
-                    chatType: peer.chatType,
-                    buddyChatInfo: BuddyData || [],
-                    discussChatInfo: [],
-                    groupChatInfo: GroupData || [],
-                    dataLineChatInfo: [],
-                    tmpChatInfo: [],
-                    msgId: msgId,
-                    msgSeq: msgSeq,
-                    msgTime: Math.floor(Date.now() / 1000).toString(),
-                    senderUid: senderUid,
-                    senderNick: 'NapCat.Cached',
-                    senderRemark: 'NapCat.Cached',
-                    senderCard: 'NapCat.Cached',
-                    elemId: elemId,
-                    elemType: elemType,
-                    fileSize: fileSize,
-                    filePath: '',
-                    fileName: fileName,
-                    hits: [{
-                        start: 12,
-                        end: 14,
-                    }],
-                },
+    async searchForFile(keys: string[]): Promise<SearchResultItem | undefined> {
+        const randomResultId = 100000 + Math.floor(Math.random() * 10000);
+        let searchId = 0;
+        const [, searchResult] = await this.core.eventWrapper.callNormalEventV2(
+            'NodeIKernelFileAssistantService/searchFile',
+            'NodeIKernelFileAssistantListener/onFileSearch',
+            [
+                keys,
+                { resultType: 2, pageLimit: 1 },
+                randomResultId,
             ],
-        });
+            (ret) => {
+                searchId = ret;
+                return true;
+            },
+            result => result.searchId === searchId && result.resultId === randomResultId,
+        );
+        return searchResult.resultItems[0];
     }
 
-    async searchfile(keys: string[]) {
-        type EventType = NodeIKernelSearchService['searchFileWithKeywords'];
-
-        interface OnListener {
-            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
-                }[]
-            }[]
-        }
-
-        const Event = this.core.eventWrapper.createEventFunction<EventType>('NodeIKernelSearchService/searchFileWithKeywords');
-        let id = '';
-        const Listener = this.core.eventWrapper.RegisterListen<(params: OnListener) => void>
-            (
-            'NodeIKernelSearchListener/onSearchFileKeywordsResult',
+    async downloadFileById(
+        fileId: string,
+        fileSize: number = 1024576,
+        estimatedTime: number = (fileSize * 1000 / 1024576) + 5000,
+    ) {
+        const [, fileData] = await this.core.eventWrapper.callNormalEventV2(
+            'NodeIKernelFileAssistantService/downloadFile',
+            'NodeIKernelFileAssistantListener/onFileStatusChanged',
+            [[fileId]],
+            ret => ret.result === 0,
+            status => status.fileStatus === 2 && status.fileProgress === '0',
             1,
-            20000,
-            (params) => id !== '' && params.searchId == id,
-            );
-        id = await Event!(keys, 12);
-        const [ret] = (await Listener);
-        return ret;
+            estimatedTime, // estimate 1MB/s
+        );
+        return fileData.filePath!;
     }
 
     async getImageUrl(element: PicElement) {
         if (!element) {
             return '';
         }
-        const url: string = element.originImageUrl!;  // 没有域名
+        const url: string = element.originImageUrl ?? '';
         const md5HexStr = element.md5HexStr;
         const fileMd5 = element.md5HexStr;
-        const fileUuid = element.fileUuid;
 
         if (url) {
-            const UrlParse = new URL(IMAGE_HTTP_HOST + url);//临时解析拼接
-            const imageAppid = UrlParse.searchParams.get('appid');
-            const isNewPic = imageAppid && ['1406', '1407'].includes(imageAppid);
-            if (isNewPic) {
-                let UrlRkey = UrlParse.searchParams.get('rkey');
-                if (UrlRkey) {
-                    return IMAGE_HTTP_HOST_NT + url;
+            const parsedUrl = new URL(IMAGE_HTTP_HOST + url);
+            const urlRkey = parsedUrl.searchParams.get('rkey');
+            const imageAppid = parsedUrl.searchParams.get('appid');
+            const isNTV2 = imageAppid && ['1406', '1407'].includes(imageAppid);
+            const imageFileId = parsedUrl.searchParams.get('fileid');
+
+            const rkeyData = {
+                private_rkey: 'CAQSKAB6JWENi5LM_xp9vumLbuThJSaYf-yzMrbZsuq7Uz2qEc3Rbib9LP4',
+                group_rkey: 'CAQSKAB6JWENi5LM_xp9vumLbuThJSaYf-yzMrbZsuq7Uz2qffcqm614gds',
+                online_rkey: false
+            };
+            try {
+                if (this.core.apis.PacketApi.available) {
+                    if ((!this.packetRkey || this.packetRkey[0].time > Date.now() / 1000)) {
+                        this.packetRkey = await this.core.apis.PacketApi.sendRkeyPacket();
+                    }
+                    if (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;
+                    }
                 }
-                const rkeyData = await this.rkeyManager.getRkey();
-                UrlRkey = imageAppid === '1406' ? rkeyData.private_rkey : rkeyData.group_rkey;
-                return IMAGE_HTTP_HOST_NT + url + `${UrlRkey}`;
-            } else {
-                // 老的图片url，不需要rkey
-                return IMAGE_HTTP_HOST + url;
+            } catch (error: any) {
+                this.context.logger.logError.bind(this.context.logger)('获取rkey失败', error.message);
             }
-        } else if (fileMd5 || md5HexStr) {
-            // 没有url，需要自己拼接
-            return `${IMAGE_HTTP_HOST}/gchatpic_new/0/0-0-${(fileMd5 || md5HexStr)!.toUpperCase()}/0`;
+
+            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);
+                }
+            }
+            if (isNTV2 && urlRkey) {
+                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 + url + `&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}`;
+            }
+
         }
+        //到这里说明可能是旧客户端
+        if (fileMd5 || md5HexStr) {
+            return `${IMAGE_HTTP_HOST}/gchatpic_new/0/0-0-${(fileMd5 ?? md5HexStr)!.toUpperCase()}/0`;
+        }
+
         this.context.logger.logDebug('图片url获取失败', element);
         return '';
     }
 }
 
-export class NTQQFileCacheApi {
-    context: InstanceContext;
-    core: NapCatCore;
-
-    constructor(context: InstanceContext, core: NapCatCore) {
-        this.context = context;
-        this.core = core;
-    }
-
-    async setCacheSilentScan(isSilent: boolean = true) {
-        return '';
-    }
-
-    getCacheSessionPathList() {
-        return '';
-    }
-
-    clearCache(cacheKeys: Array<string> = ['tmp', 'hotUpdate']) {
-        // 参数未验证
-        return this.context.session.getStorageCleanService().clearCacheDataByKeys(cacheKeys);
-    }
-
-    addCacheScannedPaths(pathMap: object = {}) {
-        return this.context.session.getStorageCleanService().addCacheScanedPaths(pathMap);
-    }
-
-    scanCache() {
-        //return (await this.context.session.getStorageCleanService().scanCache()).size;
-    }
-
-    getHotUpdateCachePath() {
-        // 未实现
-        return '';
-    }
-
-    getDesktopTmpPath() {
-        // 未实现
-        return '';
-    }
-
-    getChatCacheList(type: ChatType, pageSize: number = 1000, pageIndex: number = 0) {
-        return this.context.session.getStorageCleanService().getChatCacheInfo(type, pageSize, 1, pageIndex);
-    }
-
-    getFileCacheInfo(fileType: CacheFileType, pageSize: number = 1000, lastRecord?: CacheFileListItem) {
-        const _lastRecord = lastRecord ? lastRecord : { fileType: fileType };
-        //需要五个参数
-        //return napCatCore.session.getStorageCleanService().getFileCacheInfo();
-    }
-
-    async clearChatCache(chats: ChatCacheListItemBasic[] = [], fileKeys: string[] = []) {
-        return this.context.session.getStorageCleanService().clearChatCacheInfo(chats, fileKeys);
-    }
-}

src/core/apis/friend.ts

@@ -1,61 +1,54 @@
-import { Friend, FriendV2, User } from '@/core/entities';
-import { BuddyListReqType, InstanceContext, NapCatCore, NodeIKernelProfileService, OnBuddyChangeParams } from '@/core';
-import { LimitedHashTable } from '@/common/utils/MessageUnique';
+import { FriendV2 } from '@/core/entities';
+import { BuddyListReqType, InstanceContext, NapCatCore } from '@/core';
+import { LimitedHashTable } from '@/common/message-unique';
 
 export class NTQQFriendApi {
     context: InstanceContext;
     core: NapCatCore;
-    //friends: Map<string, Friend> = new Map<string, FriendV2>();
 
     constructor(context: InstanceContext, core: NapCatCore) {
         this.context = context;
         this.core = core;
-        // if (!this.context.basicInfoWrapper.requireMinNTQQBuild('26702')) {
-        //     this.getFriends(true);
-        // }
+    }
+    async 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 uids = buddyListV2.data.flatMap(item => item.buddyUids);
+        return await this.core.eventWrapper.callNoListenerEvent(
+            'NodeIKernelProfileService/getCoreAndBaseInfo',
+            'nodeStore',
+            uids,
+        );
     }
 
     async getBuddyV2(refresh = false): Promise<FriendV2[]> {
-        const uids: string[] = [];
-        const buddyService = this.context.session.getBuddyService();
-        const buddyListV2 = refresh ? await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL) : await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL);
-        uids.push(...buddyListV2.data.flatMap(item => item.buddyUids));
-        const data = await this.core.eventWrapper.callNoListenerEvent<NodeIKernelProfileService['getCoreAndBaseInfo']>(
-            'NodeIKernelProfileService/getCoreAndBaseInfo', 5000, 'nodeStore', uids,
-        );
-        return Array.from(data.values());
+        return Array.from((await this.getBuddyV2SimpleInfoMap(refresh)).values());
     }
 
     async getBuddyIdMap(refresh = false): Promise<LimitedHashTable<string, string>> {
-        const uids: string[] = [];
         const retMap: LimitedHashTable<string, string> = new LimitedHashTable<string, string>(5000);
-        const buddyService = this.context.session.getBuddyService();
-        const buddyListV2 = refresh ? await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL) : await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL);
-        uids.push(...buddyListV2.data.flatMap(item => item.buddyUids));
-        const data = await this.core.eventWrapper.callNoListenerEvent<NodeIKernelProfileService['getCoreAndBaseInfo']>(
-            'NodeIKernelProfileService/getCoreAndBaseInfo', 5000, 'nodeStore', uids,
-        );
-        data.forEach((value, key) => {
-            retMap.set(value.uin!, value.uid!);
-        });
-        //console.log('getBuddyIdMap', retMap.getValue);
+        const data = await this.getBuddyV2SimpleInfoMap(refresh);
+        data.forEach((value) => retMap.set(value.uin!, value.uid!));
         return retMap;
     }
 
     async getBuddyV2ExWithCate(refresh = false) {
-        const uids: string[] = [];
         const categoryMap: Map<string, any> = new Map();
         const buddyService = this.context.session.getBuddyService();
         const buddyListV2 = refresh ? (await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL)).data : (await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL)).data;
-        uids.push(
-            ...buddyListV2.flatMap(item => {
-                item.buddyUids.forEach(uid => {
-                    categoryMap.set(uid, { categoryId: item.categoryId, categoryName: item.categroyName });
-                });
-                return item.buddyUids;
-            }));
-        const data = await this.core.eventWrapper.callNoListenerEvent<NodeIKernelProfileService['getCoreAndBaseInfo']>(
-            'NodeIKernelProfileService/getCoreAndBaseInfo', 5000, 'nodeStore', uids,
+        const uids = buddyListV2.flatMap(item => {
+            item.buddyUids.forEach(uid => {
+                categoryMap.set(uid, { categoryId: item.categoryId, categoryName: item.categroyName });
+            });
+            return item.buddyUids;
+        });
+        const data = await this.core.eventWrapper.callNoListenerEvent(
+            'NodeIKernelProfileService/getCoreAndBaseInfo',
+            'nodeStore',
+            uids,
         );
         return buddyListV2.map(category => ({
             categoryId: category.categoryId,
@@ -71,28 +64,17 @@ export class NTQQFriendApi {
         return this.context.session.getBuddyService().isBuddy(uid);
     }
 
-    /**
-     * @deprecated
-     * @param forced
-     * @returns
-     */
-    async getFriends(forced = false): Promise<User[]> {
-        const [_retData, _BuddyArg] = await this.core.eventWrapper.CallNormalEvent<(force: boolean) => Promise<any>, (arg: OnBuddyChangeParams) => void>
-            (
-            'NodeIKernelBuddyService/getBuddyList',
-            'NodeIKernelBuddyListener/onBuddyListChange',
-            1,
-            5000,
-            () => true,
-            forced,
-            );
-        const friends: User[] = [];
-        for (const categoryItem of _BuddyArg) {
-            for (const friend of categoryItem.buddyList) {
-                friends.push(friend);
-            }
-        }
-        return friends;
+    async clearBuddyReqUnreadCnt() {
+        return this.context.session.getBuddyService().clearBuddyReqUnreadCnt();
+    }
+
+    async getBuddyReq() {
+        const [, ret] = await this.core.eventWrapper.callNormalEventV2(
+            'NodeIKernelBuddyService/getBuddyReq',
+            'NodeIKernelBuddyListener/onBuddyReqChange',
+            [],
+        );
+        return ret;
     }
 
     async handleFriendRequest(flag: string, accept: boolean) {

src/core/apis/group.ts

@@ -1,18 +1,17 @@
 import {
-    ChatType,
     GeneralCallResult,
     Group,
     GroupMember,
     GroupMemberRole,
-    GroupNotify,
     GroupRequestOperateTypes,
     InstanceContext,
+    KickMemberV2Req,
     MemberExtSourceType,
     NapCatCore,
-    NodeIKernelGroupListener,
-    NodeIKernelGroupService,
 } from '@/core';
-import { isNumeric, runAllWithTimeout } from '@/common/utils/helper';
+import { isNumeric, solveAsyncProblem } from '@/common/helper';
+import { LimitedHashTable } from '@/common/message-unique';
+import { NTEventWrapper } from '@/common/event';
 
 export class NTQQGroupApi {
     context: InstanceContext;
@@ -20,38 +19,102 @@ export class NTQQGroupApi {
     groupCache: Map<string, Group> = new Map<string, Group>();
     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);
+        this.initCache().then().catch(context.logger.logError.bind(context.logger));
     }
+
     async initCache() {
         this.groups = await this.getGroups();
         for (const group of this.groups) {
             this.groupCache.set(group.groupCode, group);
-            const data = await this.getGroupMembers(group.groupCode, 3000);
-            this.groupMemberCache.set(group.groupCode, data);
         }
         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) {
+        const pskey = (await this.core.apis.UserApi.getPSkey(['qun.qq.com'])).domainPskeyMap.get('qun.qq.com')!;
+        return this.context.session.getGroupService().fetchGroupEssenceList({
+            groupCode: groupCode,
+            pageStart: 0,
+            pageLimit: 300,
+        }, pskey);
+    }
+    async getGroupShutUpMemberList(groupCode: string) {
+        return this.context.session.getGroupService().getGroupShutUpMemberList(groupCode);
+    }
+    async clearGroupNotifiesUnreadCount(uk: boolean) {
+        return this.context.session.getGroupService().clearGroupNotifiesUnreadCount(uk);
+    }
+
     async setGroupAvatar(gc: string, filePath: string) {
         return this.context.session.getGroupService().setHeader(gc, filePath);
     }
 
     async getGroups(forced = false) {
-        type ListenerType = NodeIKernelGroupListener['onGroupListUpdate'];
-        const [_retData, _updateType, groupList] = await this.core.eventWrapper.CallNormalEvent<(force: boolean) => Promise<any>, ListenerType>
-            (
+        const [, , groupList] = await this.core.eventWrapper.callNormalEventV2(
             'NodeIKernelGroupService/getGroupList',
             'NodeIKernelGroupListener/onGroupListUpdate',
-            1,
-            5000,
-            () => true,
-            forced,
-            );
+            [forced],
+        );
         return groupList;
     }
 
+    async getGroupExtFE0Info(groupCode: string[], forced = true) {
+        return this.context.session.getGroupService().getGroupExt0xEF0Info(
+            groupCode,
+            [],
+            {
+                bindGuildId: 1,
+                blacklistExpireTime: 1,
+                companyId: 1,
+                essentialMsgPrivilege: 1,
+                essentialMsgSwitch: 1,
+                fullGroupExpansionSeq: 1,
+                fullGroupExpansionSwitch: 1,
+                gangUpId: 1,
+                groupAioBindGuildId: 1,
+                groupBindGuildIds: 1,
+                groupBindGuildSwitch: 1,
+                groupExcludeGuildIds: 1,
+                groupExtFlameData: 1,
+                groupFlagPro1: 1,
+                groupInfoExtSeq: 1,
+                groupOwnerId: 1,
+                groupSquareSwitch: 1,
+                hasGroupCustomPortrait: 1,
+                inviteRobotMemberExamine: 1,
+                inviteRobotMemberSwitch: 1,
+                inviteRobotSwitch: 1,
+                isLimitGroupRtc: 1,
+                lightCharNum: 1,
+                luckyWord: 1,
+                luckyWordId: 1,
+                msgEventSeq: 1,
+                qqMusicMedalSwitch: 1,
+                reserve: 1,
+                showPlayTogetherSwitch: 1,
+                starId: 1,
+                todoSeq: 1,
+                viewedMsgDisappearTime: 1,
+            },
+            forced,
+        );
+    }
+
     async getGroup(groupCode: string, forced = false) {
         let group = this.groupCache.get(groupCode.toString());
         if (!group) {
@@ -70,64 +133,8 @@ export class NTQQGroupApi {
         return group;
     }
 
-    async getGroupMemberLatestSendTimeCache(GroupCode: string, uids: string[]) {
-        return this.getGroupMemberLatestSendTime(GroupCode, uids);
-    }
-
-    /**
-     * 通过QQ自带数据库获取群成员最后发言时间(仅返回有效数据 且消耗延迟大 需要进行缓存)
-     * @param GroupCode 群号
-     * @param uids QQ号
-     * @returns Map<string, string> key: uin value: sendTime
-     * @example
-     * let ret = await NTQQGroupApi.getGroupMemberLastestSendTime('123456');
-     * for (let [uin, sendTime] of ret) {
-     *  console.log(uin, sendTime);
-     * }
-     */
-    async getGroupMemberLatestSendTime(GroupCode: string, uids: string[]) {
-        const getdata = async (uid: string) => {
-            const NTRet = await this.getLatestMsgByUids(GroupCode, [uid]);
-            if (NTRet.result != 0 && NTRet.msgList.length < 1) {
-                return undefined;
-            }
-            return { sendUin: NTRet.msgList[0].senderUin, sendTime: NTRet.msgList[0].msgTime };
-        };
-        const PromiseData: Promise<({
-            sendUin: string;
-            sendTime: string;
-        } | undefined)>[] = [];
-        const ret: Map<string, string> = new Map();
-        for (const uid of uids) {
-            PromiseData.push(getdata(uid).catch(() => undefined));
-        }
-        const allRet = await runAllWithTimeout(PromiseData, 2500);
-        for (const PromiseDo of allRet) {
-            if (PromiseDo) {
-                ret.set(PromiseDo.sendUin, PromiseDo.sendTime);
-            }
-        }
-        return ret;
-    }
-
-    async getLatestMsgByUids(GroupCode: string, uids: string[]) {
-        return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', '0', {
-            chatInfo: {
-                peerUid: GroupCode,
-                chatType: ChatType.KCHATTYPEGROUP,
-            },
-            filterMsgType: [],
-            filterSendersUid: uids,
-            filterMsgToTime: '0',
-            filterMsgFromTime: '0',
-            isReverseOrder: false,
-            isIncludeCurrent: true,
-            pageLimit: 1,
-        });
-    }
-
-    async getGroupMemberAll(GroupCode: string, forced = false) {
-        return this.context.session.getGroupService().getAllMemberList(GroupCode, forced);
+    async getGroupMemberAll(groupCode: string, forced = false) {
+        return this.context.session.getGroupService().getAllMemberList(groupCode, forced);
     }
 
     async getGroupMember(groupCode: string | number, memberUinOrUid: string | number) {
@@ -139,8 +146,7 @@ export class NTQQGroupApi {
                 members = await this.getGroupMembers(groupCodeStr);
                 // 更新群成员列表
                 this.groupMemberCache.set(groupCodeStr, members);
-            }
-            catch (e) {
+            } catch (e) {
                 return null;
             }
         }
@@ -164,31 +170,8 @@ export class NTQQGroupApi {
         return member;
     }
 
-    async getLatestMsg(GroupCode: string, uins: string[]) {
-        const uids: Array<string> = [];
-        for (const uin of uins) {
-            const uid = await this.core.apis.UserApi.getUidByUinV2(uin);
-            if (uid) {
-                uids.push(uid);
-            }
-        }
-        return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', '0', {
-            chatInfo: {
-                peerUid: GroupCode,
-                chatType: ChatType.KCHATTYPEGROUP,
-            },
-            filterMsgType: [],
-            filterSendersUid: uids,
-            filterMsgToTime: '0',
-            filterMsgFromTime: '0',
-            isReverseOrder: false,
-            isIncludeCurrent: true,
-            pageLimit: 1,
-        });
-    }
-
-    async getGroupRecommendContactArkJson(GroupCode: string) {
-        return this.context.session.getGroupService().getGroupRecommendContactArkJson(GroupCode);
+    async getGroupRecommendContactArkJson(groupCode: string) {
+        return this.context.session.getGroupService().getGroupRecommendContactArkJson(groupCode);
     }
 
     async CreatGroupFileFolder(groupCode: string, folderName: string) {
@@ -204,8 +187,6 @@ export class NTQQGroupApi {
     }
 
     async addGroupEssence(GroupCode: string, msgId: string) {
-        // 代码没测过
-        // 需要 ob11msgid->msgId + (peer) -> msgSeq + msgRandom
         const MsgData = await this.context.session.getMsgService().getMsgsIncludeSelf({
             chatType: 2,
             guildId: '',
@@ -216,13 +197,36 @@ export class NTQQGroupApi {
             msgRandom: parseInt(MsgData.msgList[0].msgRandom),
             msgSeq: parseInt(MsgData.msgList[0].msgSeq),
         };
-        // GetMsgByShoretID(ShoretID); -> MsgService.getMsgs(Peer,MsgId,1,false); -> 组出参数
         return this.context.session.getGroupService().addGroupEssence(param);
     }
 
+    async kickMemberV2Inner(param: KickMemberV2Req) {
+        return this.context.session.getGroupService().kickMemberV2(param);
+    }
+
+    async deleteGroupBulletin(GroupCode: string, noticeId: string) {
+        const psKey = (await this.core.apis.UserApi.getPSkey(['qun.qq.com'])).domainPskeyMap.get('qun.qq.com')!;
+        return this.context.session.getGroupService().deleteGroupBulletin(GroupCode, psKey, noticeId);
+    }
+
+    async quitGroupV2(GroupCode: string, needDeleteLocalMsg: boolean) {
+        const param = {
+            groupCode: GroupCode,
+            needDeleteLocalMsg: needDeleteLocalMsg,
+        };
+        return this.context.session.getGroupService().quitGroupV2(param);
+    }
+
+    async removeGroupEssenceBySeq(GroupCode: string, msgRandom: string, msgSeq: string) {
+        const param = {
+            groupCode: GroupCode,
+            msgRandom: parseInt(msgRandom),
+            msgSeq: parseInt(msgSeq),
+        };
+        return this.context.session.getGroupService().removeGroupEssence(param);
+    }
+
     async removeGroupEssence(GroupCode: string, msgId: string) {
-        // 代码没测过
-        // 需要 ob11msgid->msgId + (peer) -> msgSeq + msgRandom
         const MsgData = await this.context.session.getMsgService().getMsgsIncludeSelf({
             chatType: 2,
             guildId: '',
@@ -233,41 +237,33 @@ export class NTQQGroupApi {
             msgRandom: parseInt(MsgData.msgList[0].msgRandom),
             msgSeq: parseInt(MsgData.msgList[0].msgSeq),
         };
-        // GetMsgByShoretID(ShoretID); -> MsgService.getMsgs(Peer,MsgId,1,false); -> 组出参数
         return this.context.session.getGroupService().removeGroupEssence(param);
     }
 
-    async getSingleScreenNotifies(num: number) {
-        const [_retData, _doubt, _seq, notifies] = await this.core.eventWrapper.CallNormalEvent<(arg1: boolean, arg2: string, arg3: number) => Promise<any>, (doubt: boolean, seq: string, notifies: GroupNotify[]) => void>
-            (
+    async getSingleScreenNotifies(doubt: boolean, num: number) {
+        const [, , , notifies] = await this.core.eventWrapper.callNormalEventV2(
             'NodeIKernelGroupService/getSingleScreenNotifies',
             'NodeIKernelGroupListener/onGroupSingleScreenNotifies',
-            1,
-            5000,
-            () => true,
-            false,
-            '',
-            num,
-            );
+            [
+                doubt,
+                '',
+                num,
+            ],
+        );
         return notifies;
     }
 
     async getGroupMemberV2(GroupCode: string, uid: string, forced = false) {
-        //type ListenerType = NodeIKernelGroupListener['onMemberInfoChange'];
-        type EventType = NodeIKernelGroupService['getMemberInfo'];
-        // NTEventDispatch.CreatListenerFunction('NodeIKernelGroupListener/onGroupMemberInfoUpdate', 
-        //return napCatCore.session.getGroupService().getMemberInfo(GroupCode, [uid], forced);
-        const Listener = this.core.eventWrapper.RegisterListen<(params: any) => void>
-            (
+        const Listener = this.core.eventWrapper.registerListen(
             'NodeIKernelGroupListener/onMemberInfoChange',
             1,
             forced ? 5000 : 250,
-            (params) => {
-                return params === GroupCode;
-            },
-            );
-        const EventFunc = this.core.eventWrapper.createEventFunction<EventType>('NodeIKernelGroupService/getMemberInfo');
-        const retData = await EventFunc!(GroupCode, [uid], forced);
+            (params, _, members) => params === GroupCode && members.size > 0,
+        );
+        const retData = await (
+            this.core.eventWrapper
+                .createEventFunction('NodeIKernelGroupService/getMemberInfo')
+        )!(GroupCode, [uid], forced);
         if (retData.result !== 0) {
             throw new Error(`${retData.errMsg}`);
         }
@@ -278,20 +274,60 @@ export class NTQQGroupApi {
             member = members.get(uid);
         }
         return member;
+    }
 
-        // 原本的方法: (no_cache 下效率很高, cache 下效率一致)
-        // const [, , , _members] = await this.core.eventWrapper.CallNormalEvent<EventType, ListenerType>
-        // (
-        //     'NodeIKernelGroupService/getMemberInfo',
-        //     'NodeIKernelGroupListener/onMemberInfoChange',
-        //     1,
-        //     5000,
-        //     (groupCode: string, changeType: number, members: Map<string, GroupMember>) => {
-        //         return groupCode == GroupCode && members.has(uid);
-        //     },
-        //     GroupCode, [uid], forced,
-        // );
-        // return _members.get(uid);
+    async searchGroup(groupCode: string) {
+        const [, ret] = await this.core.eventWrapper.callNormalEventV2(
+            'NodeIKernelSearchService/searchGroup',
+            'NodeIKernelSearchListener/onSearchGroupResult',
+            [{
+                keyWords: groupCode,
+                groupNum: 25,
+                exactSearch: false,
+                penetrate: ''
+            }],
+            (ret) => ret.result === 0,
+            (params) => !!params.groupInfos.find(g => g.groupCode === groupCode),
+            1,
+            5000
+        );
+        return ret.groupInfos.find(g => g.groupCode === groupCode);
+    }
+
+    async getGroupMemberEx(GroupCode: string, uid: string, forced = false, retry = 2) {
+        const data = await solveAsyncProblem((eventWrapper: NTEventWrapper, GroupCode: string, uid: string, forced = false) => {
+            return eventWrapper.callNormalEventV2(
+                'NodeIKernelGroupService/getMemberInfo',
+                'NodeIKernelGroupListener/onMemberInfoChange',
+                [GroupCode, [uid], forced],
+                (ret) => ret.result === 0,
+                (params, _, members) => params === GroupCode && members.size > 0 && members.has(uid),
+                1,
+                forced ? 2500 : 250
+            );
+        }, this.core.eventWrapper, GroupCode, uid, forced);
+        if (data && data[3] instanceof Map && data[3].has(uid)) {
+            return data[3].get(uid);
+        }
+        if (retry > 0) {
+            const trydata = await this.getGroupMemberEx(GroupCode, uid, true, retry - 1) as GroupMember | undefined;
+            if (trydata) return trydata;
+        }
+        return undefined;
+    }
+
+    async getGroupMembersV2(groupQQ: string, num = 3000): Promise<Map<string, GroupMember>> {
+        const sceneId = this.context.session.getGroupService().createMemberListScene(groupQQ, 'groupMemberList_MainWindow');
+        let once = this.core.eventWrapper.registerListen('NodeIKernelGroupListener/onMemberListChange', 1, 2000, (params) => params.sceneId === sceneId)
+            .catch();
+        const result = await this.context.session.getGroupService().getNextMemberList(sceneId!, undefined, num);
+        if (result.errCode !== 0) {
+            throw new Error('获取群成员列表出错,' + result.errMsg);
+        }
+        if (result.result.infos.size === 0) {
+            return (await once)[0].infos;
+        }
+        return result.result.infos;
     }
 
     async getGroupMembers(groupQQ: string, num = 3000): Promise<Map<string, GroupMember>> {
@@ -299,41 +335,21 @@ export class NTQQGroupApi {
         const sceneId = groupService.createMemberListScene(groupQQ, 'groupMemberList_MainWindow');
         const result = await groupService.getNextMemberList(sceneId!, undefined, num);
         if (result.errCode !== 0) {
-            throw ('获取群成员列表出错,' + result.errMsg);
+            throw new Error('获取群成员列表出错,' + result.errMsg);
         }
-
-        //logDebug(`获取群(${groupQQ})成员列表结果:`, `finish: ${result.result.finish}`); //, Array.from(result.result.infos.values()));
+        this.context.logger.logDebug(`获取群(${groupQQ})成员列表结果:`, `members: ${result.result.infos.size}`);
         return result.result.infos;
-        /*
-        console.log(sceneId);
-        const result = await napCatCore.getGroupService().getNextMemberList(sceneId, num);
-        console.log(result);
-    
-        return result;
-        */
     }
 
-    async getGroupNotifies() {
-        // 获取管理员变更
-        // 加群通知，退出通知，需要管理员权限
-
-    }
-
-    async GetGroupFileCount(Gids: Array<string>) {
+    async getGroupFileCount(Gids: Array<string>) {
         return this.context.session.getRichMediaService().batchGetGroupFileCount(Gids);
     }
 
-    async getGroupIgnoreNotifies() {
-    }
-
     async getArkJsonGroupShare(GroupCode: string) {
-        const ret = await this.core.eventWrapper.callNoListenerEvent<(GroupId: string) => Promise<GeneralCallResult & {
-            arkJson: string
-        }>>(
+        const ret = await this.core.eventWrapper.callNoListenerEvent(
             'NodeIKernelGroupService/getGroupRecommendContactArkJson',
-            5000,
             GroupCode,
-            );
+        ) as GeneralCallResult & { arkJson: string };
         return ret.arkJson;
     }
 
@@ -352,12 +368,12 @@ export class NTQQGroupApi {
         return this.context.session.getGroupService().operateSysNotify(
             false,
             {
-                'operateType': operateType, // 2 拒绝
-                'targetMsg': {
-                    'seq': seq,  // 通知序列号
-                    'type': type,
-                    'groupCode': groupCode,
-                    'postscript': reason || ' ', // 仅传空值可能导致处理失败，故默认给个空格
+                operateType: operateType, // 2 拒绝
+                targetMsg: {
+                    seq: seq,  // 通知序列号
+                    type: type,
+                    groupCode: groupCode,
+                    postscript: reason ?? ' ', // 仅传空值可能导致处理失败，故默认给个空格
                 },
             });
     }
@@ -391,19 +407,12 @@ export class NTQQGroupApi {
         return this.context.session.getGroupService().modifyGroupName(groupQQ, groupName, false);
     }
 
-    // 头衔不可用
-    /*
-    async setGroupTitle(groupQQ: string, uid: string, title: string) {
-
-    }
-     */
-
     async publishGroupBulletin(groupQQ: string, content: string, picInfo: {
         id: string,
         width: number,
         height: number
     } | undefined = undefined, pinned: number = 0, confirmRequired: number = 0) {
-        const _Pskey = (await this.core.apis.UserApi.getPSkey(['qun.qq.com'])).domainPskeyMap.get('qun.qq.com');
+        const psKey = (await this.core.apis.UserApi.getPSkey(['qun.qq.com'])).domainPskeyMap.get('qun.qq.com');
         //text是content内容url编码
         const data = {
             text: encodeURI(content),
@@ -412,7 +421,7 @@ export class NTQQGroupApi {
             pinned: pinned,
             confirmRequired: confirmRequired,
         };
-        return this.context.session.getGroupService().publishGroupBulletin(groupQQ, _Pskey!, data);
+        return this.context.session.getGroupService().publishGroupBulletin(groupQQ, psKey!, data);
     }
 
     async getGroupRemainAtTimes(GroupCode: string) {
@@ -420,7 +429,6 @@ export class NTQQGroupApi {
     }
 
     async getMemberExtInfo(groupCode: string, uin: string) {
-        // 仅NTQQ 9.9.11 24568测试 容易炸开谨慎使用
         return this.context.session.getGroupService().getMemberExtInfo(
             {
                 groupCode: groupCode,

src/core/apis/msg.ts

@@ -1,9 +1,12 @@
 import { ChatType, GetFileListParam, Peer, RawMessage, SendMessageElement, SendStatusType } from '@/core/entities';
 import { InstanceContext, NapCatCore } from '@/core';
-import { onGroupFileInfoUpdateParamType } from '@/core/listeners';
 import { GeneralCallResult } from '@/core/services/common';
 
 export class NTQQMsgApi {
+    // 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
+
     context: InstanceContext;
     core: NapCatCore;
 
@@ -12,34 +15,24 @@ export class NTQQMsgApi {
         this.core = core;
     }
 
-    async FetchLongMsg(peer: Peer, msgId: string) {
-        return this.context.session.getMsgService().fetchLongMsg(peer, msgId);
+    async getAioFirstViewLatestMsgs(peer: Peer, MsgCount: number) {
+        return this.context.session.getMsgService().getAioFirstViewLatestMsgs(peer, MsgCount);
     }
 
     async sendShowInputStatusReq(peer: Peer, eventType: number) {
         return this.context.session.getMsgService().sendShowInputStatusReq(peer.chatType, eventType, peer.peerUid);
     }
+
     async getMsgEmojiLikesList(peer: Peer, msgSeq: string, emojiId: string, emojiType: string, count: number = 20) {
-        //console.log(peer, msgSeq, emojiId, emojiType, count);
-        //注意此处emojiType 可选值一般为1-2 2好像是unicode表情dec值 大部分情况 Taged M likiowa
-        return this.context.session.getMsgService().getMsgEmojiLikesList(peer, msgSeq, emojiId, emojiType, '', false, 20);
+        //注意此处emojiType 可选值一般为1-2 2好像是unicode表情dec值 大部分情况 Taged Mlikiowa
+        return this.context.session.getMsgService().getMsgEmojiLikesList(peer, msgSeq, emojiId, emojiType, '', false, count);
     }
 
-    //  napCatCore: NapCatCore | null = null;
-    //   enum BaseEmojiType {
-    //     NORMAL_EMOJI,
-    //     SUPER_EMOJI,
-    //     RANDOM_SUPER_EMOJI,
-    //     CHAIN_SUPER_EMOJI,
-    //     EMOJI_EMOJI
-    // }
     async setEmojiLike(peer: Peer, msgSeq: string, emojiId: string, set: boolean = true) {
-        // nt_qq//global//nt_data//Emoji//emoji-resource//sysface_res/apng/ 下可以看到所有QQ表情预览
-        // nt_qq\global\nt_data\Emoji\emoji-resource\face_config.json 里面有所有表情的id, 自带表情id是QSid, 标准emoji表情id是QCid
-        // 其实以官方文档为准是最好的，https://bot.q.qq.com/wiki/develop/api-v2/openapi/emoji/model.html#EmojiType
         emojiId = emojiId.toString();
         return this.context.session.getMsgService().setMsgEmojiLikes(peer, msgSeq, emojiId, emojiId.length > 3 ? '2' : '1', set);
     }
+
     async getMultiMsg(peer: Peer, rootMsgId: string, parentMsgId: string): Promise<GeneralCallResult & {
         msgList: RawMessage[]
     } | undefined> {
@@ -50,24 +43,10 @@ export class NTQQMsgApi {
         return this.context.session.getMsgService().forwardMsg(msgIds, peer, [peer], new Map());
     }
 
-    async getLastestMsgByUids(peer: Peer, count: number = 20, isReverseOrder: boolean = false) {
-        const ret = await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', '0', {
-            chatInfo: peer,
-            filterMsgType: [],
-            filterSendersUid: [],
-            filterMsgToTime: '0',
-            filterMsgFromTime: '0',
-            isReverseOrder: isReverseOrder,//此参数有点离谱 注意不是本次查询的排序 而是全部消历史信息的排序 默认false 从新消息拉取到旧消息
-            isIncludeCurrent: true,
-            pageLimit: count,
-        });
-        return ret;
-    }
-
     async getMsgsByMsgId(peer: Peer | undefined, msgIds: string[] | undefined) {
         if (!peer) throw new Error('peer is not allowed');
         if (!msgIds) throw new Error('msgIds is not allowed');
-        //Mlikiowa： 参数不合规会导致NC异常崩溃 原因是TX未对进入参数判断 对应Android标记@NotNull AndroidJADX分析可得
+        //MliKiowa: 参数不合规会导致NC异常崩溃 原因是TX未对进入参数判断 对应Android标记@NotNull AndroidJADX分析可得
         return await this.context.session.getMsgService().getMsgsByMsgId(peer, msgIds);
     }
 
@@ -80,8 +59,8 @@ export class NTQQMsgApi {
     }
 
     async queryMsgsWithFilterExWithSeq(peer: Peer, msgSeq: string) {
-        const ret = await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', msgSeq, {
-            chatInfo: peer,//此处为Peer 为关键查询参数 没有啥也没有 by mlik iowa
+        return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', msgSeq, {
+            chatInfo: peer,
             filterMsgType: [],
             filterSendersUid: [],
             filterMsgToTime: '0',
@@ -90,9 +69,32 @@ export class NTQQMsgApi {
             isIncludeCurrent: true,
             pageLimit: 1,
         });
-        return ret;
     }
-
+    async queryMsgsWithFilterExWithSeqV2(peer: Peer, msgSeq: string, MsgTime: string, SendersUid: string[]) {
+        return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', msgSeq, {
+            chatInfo: peer,
+            filterMsgType: [],
+            filterSendersUid: SendersUid,
+            filterMsgToTime: MsgTime,
+            filterMsgFromTime: MsgTime,
+            isReverseOrder: false,
+            isIncludeCurrent: true,
+            pageLimit: 1,
+        });
+    }
+    async queryFirstMsgBySeq(peer: Peer, msgSeq: string) {
+        return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', msgSeq, {
+            chatInfo: peer,
+            filterMsgType: [],
+            filterSendersUid: [],
+            filterMsgToTime: '0',
+            filterMsgFromTime: '0',
+            isReverseOrder: true,
+            isIncludeCurrent: true,
+            pageLimit: 1,
+        });
+    }
+    //@deprecated
     async getMsgsBySeqAndCount(peer: Peer, seq: string, count: number, desc: boolean, z: boolean) {
         return await this.context.session.getMsgService().getMsgsBySeqAndCount(peer, seq, count, desc, z);
     }
@@ -100,7 +102,7 @@ export class NTQQMsgApi {
         const DateNow = Math.floor(Date.now() / 1000);
         const filterMsgFromTime = (DateNow - 300).toString();
         const filterMsgToTime = DateNow.toString();
-        const ret = await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', msgSeq, {
+        return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', msgSeq, {
             chatInfo: peer,//此处为Peer 为关键查询参数 没有啥也没有 by mlik iowa
             filterMsgType: [],
             filterSendersUid: [],
@@ -110,29 +112,26 @@ export class NTQQMsgApi {
             isIncludeCurrent: true,
             pageLimit: 100,
         });
-        return ret;
     }
+
     async setMsgRead(peer: Peer) {
         return this.context.session.getMsgService().setMsgRead(peer);
     }
 
     async getGroupFileList(GroupCode: string, params: GetFileListParam) {
-        const data = await this.core.eventWrapper.CallNormalEvent<
-            (GroupCode: string, params: GetFileListParam) => Promise<unknown>,
-            (groupFileListResult: onGroupFileInfoUpdateParamType) => void
-                >(
-                'NodeIKernelRichMediaService/getGroupFileList',
-                'NodeIKernelMsgListener/onGroupFileInfoUpdate',
-                1,
-                5000,
-                (groupFileListResult: onGroupFileInfoUpdateParamType) => {
-                //Developer Mlikiowa Todo: 此处有问题 无法判断是否成功
-                    return true;
-                },
+        const [, groupFileListResult] = await this.core.eventWrapper.callNormalEventV2(
+            'NodeIKernelRichMediaService/getGroupFileList',
+            'NodeIKernelMsgListener/onGroupFileInfoUpdate',
+            [
                 GroupCode,
                 params,
-                );
-        return data[1].item;
+            ],
+            () => true,
+            () => true, // Todo: 应当通过 groupFileListResult 判断
+            1,
+            5000,
+        );
+        return groupFileListResult.item;
     }
 
     async getMsgHistory(peer: Peer, msgId: string, count: number, isReverseOrder: boolean = false) {
@@ -140,80 +139,77 @@ export class NTQQMsgApi {
         return this.context.session.getMsgService().getMsgsIncludeSelf(peer, msgId, count, isReverseOrder);
     }
 
-    async recallMsg(peer: Peer, msgIds: string[]) {
-        await this.context.session.getMsgService().recallMsg({
-            chatType: peer.chatType,
-            peerUid: peer.peerUid,
-        }, msgIds);
+    async recallMsg(peer: Peer, msgId: string) {
+        await this.core.eventWrapper.callNormalEventV2(
+            'NodeIKernelMsgService/recallMsg',
+            'NodeIKernelMsgListener/onMsgInfoListUpdate',
+            [peer, [msgId]],
+            () => true,
+            (updatedList) => updatedList.find(m => m.msgId === msgId && m.recallTime !== '0') !== undefined,
+            1,
+            1000,
+        );
     }
+
     async PrepareTempChat(toUserUid: string, GroupCode: string, nickname: string) {
-        //By Jadx/Ida Mlikiowa
-        const TempGameSession = {
-            nickname: "",
-            gameAppId: "",
-            selfTinyId: "",
-            peerRoleId: "",
-            peerOpenId: "",
-        };
         return this.context.session.getMsgService().prepareTempChat({
             chatType: ChatType.KCHATTYPETEMPC2CFROMGROUP,
             peerUid: toUserUid,
             peerNickname: nickname,
             fromGroupCode: GroupCode,
-            sig: "",
-            selfPhone: "",
+            sig: '',
+            selfPhone: '',
             selfUid: this.core.selfInfo.uid,
-            gameSession: TempGameSession
+            gameSession: {
+                nickname: '',
+                gameAppId: '',
+                selfTinyId: '',
+                peerRoleId: '',
+                peerOpenId: '',
+            },
         });
     }
+
     async getTempChatInfo(chatType: ChatType, peerUid: string) {
         return this.context.session.getMsgService().getTempChatInfo(chatType, peerUid);
     }
+
     async sendMsg(peer: Peer, msgElements: SendMessageElement[], waitComplete = true, timeout = 10000) {
-        //唉？ ！我有个想法
+        //唉？！我有个想法
         if (peer.chatType === ChatType.KCHATTYPETEMPC2CFROMGROUP && peer.guildId && peer.guildId !== '') {
             const member = await this.core.apis.GroupApi.getGroupMember(peer.guildId, peer.peerUid!);
             if (member) {
                 await this.PrepareTempChat(peer.peerUid, peer.guildId, member.nick);
             }
         }
-        const msgId = await this.generateMsgUniqueId(peer.chatType, await this.getServerTime());
+        const msgId = await this.generateMsgUniqueId(peer.chatType);
         peer.guildId = msgId;
-        const data = await this.core.eventWrapper.CallNormalEvent<
-            (msgId: string, peer: Peer, msgElements: SendMessageElement[], map: Map<any, any>) => Promise<unknown>,
-            (msgList: RawMessage[]) => void
-                >(
-                'NodeIKernelMsgService/sendMsg',
-                'NodeIKernelMsgListener/onMsgInfoListUpdate',
-                1,
-                timeout,
-                (msgRecords: RawMessage[]) => {
-                    for (const msgRecord of msgRecords) {
-                        if (msgRecord.guildId === msgId && msgRecord.sendStatus === SendStatusType.KSEND_STATUS_SUCCESS) {
-                            return true;
-                        }
-                    }
-                    return false;
-                },
+        const [, msgList] = await this.core.eventWrapper.callNormalEventV2(
+            'NodeIKernelMsgService/sendMsg',
+            'NodeIKernelMsgListener/onMsgInfoListUpdate',
+            [
                 '0',
                 peer,
                 msgElements,
                 new Map(),
-                );
-        const retMsg = data[1].find(msgRecord => {
-            if (msgRecord.guildId === msgId) {
-                return true;
-            }
-        });
-        return retMsg;
+            ],
+            (ret) => ret.result === 0,
+            msgRecords => {
+                for (const msgRecord of msgRecords) {
+                    if (msgRecord.guildId === msgId && msgRecord.sendStatus === SendStatusType.KSEND_STATUS_SUCCESS) {
+                        return true;
+                    }
+                }
+                return false;
+            },
+            1,
+            timeout,
+        );
+        return msgList.find(msgRecord => msgRecord.guildId === msgId);
     }
 
-    async generateMsgUniqueId(chatType: number, time: string) {
-        return this.context.session.getMsgService().generateMsgUniqueId(chatType, time);
-    }
-
-    async getServerTime() {
-        return this.context.session.getMSFService().getServerTime();
+    async generateMsgUniqueId(chatType: number) {
+        return this.context.session.getMsgService().generateMsgUniqueId(chatType, this.context.session.getMSFService().getServerTime());
     }
 
     async forwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {
@@ -224,34 +220,28 @@ export class NTQQMsgApi {
         const msgInfos = msgIds.map(id => {
             return { msgId: id, senderShowName: this.core.selfInfo.nick };
         });
-        const data = await this.core.eventWrapper.CallNormalEvent<
-            (msgInfo: typeof msgInfos, srcPeer: Peer, destPeer: Peer, comment: Array<any>, attr: Map<any, any>) => Promise<unknown>,
-            (msgList: RawMessage[]) => void
-                >(
-                'NodeIKernelMsgService/multiForwardMsgWithComment',
-                'NodeIKernelMsgListener/onMsgInfoListUpdate',
-                1,
-                5000,
-                (msgRecords: RawMessage[]) => {
-                    for (const msgRecord of msgRecords) {
-                        if (msgRecord.peerUid == destPeer.peerUid && msgRecord.senderUid == this.core.selfInfo.uid) {
-                            return true;
-                        }
-                    }
-                    return false;
-                },
+        const [, msgList] = await this.core.eventWrapper.callNormalEventV2(
+            'NodeIKernelMsgService/multiForwardMsgWithComment',
+            'NodeIKernelMsgListener/onMsgInfoListUpdate',
+            [
                 msgInfos,
                 srcPeer,
                 destPeer,
                 [],
                 new Map(),
-                );
-        for (const msg of data[1]) {
+            ],
+            () => true,
+            (msgRecords) => msgRecords.some(
+                msgRecord => msgRecord.peerUid === destPeer.peerUid
+                    && msgRecord.senderUid === this.core.selfInfo.uid
+            ),
+        );
+        for (const msg of msgList) {
             const arkElement = msg.elements.find(ele => ele.arkElement);
             if (!arkElement) {
                 continue;
             }
-            const forwardData: any = JSON.parse(arkElement.arkElement?.bytesData || "");
+            const forwardData: any = JSON.parse(arkElement.arkElement?.bytesData ?? '');
             if (forwardData.app != 'com.tencent.multimsg') {
                 continue;
             }
@@ -262,7 +252,7 @@ export class NTQQMsgApi {
         throw new Error('转发消息超时');
     }
 
-    async markallMsgAsRead() {
+    async markAllMsgAsRead() {
         return this.context.session.getMsgService().setAllC2CAndGroupMsgRead();
     }
 }

src/core/apis/packet.ts

@@ -0,0 +1,148 @@
+import * as os from 'os';
+import { ChatType, InstanceContext, NapCatCore } from '..';
+import offset from '@/core/external/offset.json';
+import { PacketClient, RecvPacketData } from '@/core/packet/client';
+import { PacketSession } from "@/core/packet/session";
+import { PacketHexStr } from "@/core/packet/packer";
+import { NapProtoMsg } from '@/core/packet/proto/NapProto';
+import { OidbSvcTrpcTcp0X9067_202_Rsp_Body } from '@/core/packet/proto/oidb/Oidb.0x9067_202';
+import { OidbSvcTrpcTcpBase, OidbSvcTrpcTcpBaseRsp } from '@/core/packet/proto/oidb/OidbBase';
+import { OidbSvcTrpcTcp0XFE1_2RSP } from '@/core/packet/proto/oidb/Oidb.0XFE1_2';
+import { LogWrapper } from "@/common/log";
+import { SendLongMsgResp } from "@/core/packet/proto/message/action";
+import { PacketMsg } from "@/core/packet/msg/message";
+import { OidbSvcTrpcTcp0x6D6Response } from "@/core/packet/proto/oidb/Oidb.0x6D6";
+import { PacketMsgPicElement } from "@/core/packet/msg/element";
+import { c } from 'vite/dist/node/types.d-aGj9QkWt';
+
+interface OffsetType {
+    [key: string]: {
+        recv: string;
+        send: string;
+    };
+}
+
+const typedOffset: OffsetType = offset;
+
+export class NTQQPacketApi {
+    context: InstanceContext;
+    core: NapCatCore;
+    logger: LogWrapper
+    serverUrl: string | undefined;
+    qqVersion: string | undefined;
+    packetSession: PacketSession | undefined;
+
+    constructor(context: InstanceContext, core: NapCatCore) {
+        this.context = context;
+        this.core = core;
+        this.logger = core.context.logger;
+        this.packetSession = undefined;
+        const config = this.core.configLoader.configData;
+        if (config && config.packetServer && config.packetServer.length > 0) {
+            const serverUrl = this.core.configLoader.configData.packetServer ?? '127.0.0.1:8086';
+            this.InitSendPacket(serverUrl, this.context.basicInfoWrapper.getFullQQVesion())
+                .then()
+                .catch(this.core.context.logger.logError.bind(this.core.context.logger));
+        } else {
+            this.core.context.logger.logWarn('PacketServer is not set, will not init NapCat.Packet!');
+        }
+    }
+
+    get available(): boolean {
+        return this.packetSession?.client.available ?? false;
+    }
+
+    async InitSendPacket(serverUrl: string, qqversion: string) {
+        this.serverUrl = serverUrl;
+        this.qqVersion = qqversion;
+        const offsetTable: OffsetType = offset;
+        const table = offsetTable[qqversion + '-' + os.arch()];
+        if (!table) return false;
+        const url = 'ws://' + this.serverUrl + '/ws';
+        this.packetSession = new PacketSession(this.core.context.logger, new PacketClient(url, this.core));
+        const cb = () => {
+            if (this.packetSession && this.packetSession.client) {
+                this.packetSession.client.init(process.pid, table.recv, table.send).then().catch(this.logger.logError.bind(this.logger));
+            }
+        }
+        await this.packetSession.client.connect(cb);
+        return true;
+    }
+
+    async sendPacket(cmd: string, data: PacketHexStr, rsp = false): Promise<RecvPacketData> {
+        return this.packetSession!.client.sendPacket(cmd, data, rsp);
+    }
+
+    async sendPokePacket(peer: number, group?: number) {
+        const data = this.packetSession?.packer.packPokePacket(peer, group);
+        await this.sendPacket('OidbSvcTrpcTcp.0xed3_1', data!, false);
+    }
+
+    async sendRkeyPacket() {
+        const packet = this.packetSession?.packer.packRkeyPacket();
+        const ret = await this.sendPacket('OidbSvcTrpcTcp.0x9067_202', packet!, true);
+        if (!ret?.hex_data) return [];
+        const body = new NapProtoMsg(OidbSvcTrpcTcpBaseRsp).decode(Buffer.from(ret.hex_data, 'hex')).body;
+        const retData = new NapProtoMsg(OidbSvcTrpcTcp0X9067_202_Rsp_Body).decode(body);
+        return retData.data.rkeyList;
+    }
+
+    async sendStatusPacket(uin: number): Promise<{ status: number; ext_status: number; } | undefined> {
+        let status = 0;
+        try {
+            const packet = this.packetSession?.packer.packStatusPacket(uin);
+            const ret = await this.sendPacket('OidbSvcTrpcTcp.0xfe1_2', packet!, true);
+            const data = Buffer.from(ret.hex_data, 'hex');
+            const ext = new NapProtoMsg(OidbSvcTrpcTcp0XFE1_2RSP).decode(new NapProtoMsg(OidbSvcTrpcTcpBase).decode(data).body).data.status.value;
+            // ext & 0xff00 + ext >> 16 & 0xff
+            const extBigInt = BigInt(ext); // 转换为 BigInt
+            if (extBigInt <= 10n) {
+                return { status: Number(extBigInt) * 10, ext_status: 0 };
+            }
+            status = Number((extBigInt & 0xff00n) + ((extBigInt >> 16n) & 0xffn)); // 使用 BigInt 操作符
+            return { status: 10, ext_status: status };
+        } catch (error) {
+            return undefined;
+        }
+    }
+
+    async sendSetSpecialTittlePacket(groupCode: string, uid: string, tittle: string) {
+        const data = this.packetSession?.packer.packSetSpecialTittlePacket(groupCode, uid, tittle);
+        await this.sendPacket('OidbSvcTrpcTcp.0x8fc_2', data!, true);
+    }
+
+    private async uploadResources(msg: PacketMsg[], groupUin: number = 0) {
+        const reqList = []
+        for (const m of msg) {
+            for (const e of m.msg) {
+                if (e instanceof PacketMsgPicElement) {
+                    reqList.push(this.packetSession?.highwaySession.uploadImage({
+                        chatType: groupUin ? ChatType.KCHATTYPEGROUP : ChatType.KCHATTYPEC2C,
+                        peerUid: String(groupUin) ? String(groupUin) : this.core.selfInfo.uid
+                    }, e));
+                }
+            }
+        }
+        return Promise.all(reqList);
+    }
+
+    async sendUploadForwardMsg(msg: PacketMsg[], groupUin: number = 0) {
+        await this.uploadResources(msg, groupUin);
+        const data = await this.packetSession?.packer.packUploadForwardMsg(this.core.selfInfo.uid, msg, groupUin);
+        const ret = await this.sendPacket('trpc.group.long_msg_interface.MsgService.SsoSendLongMsg', data!, true);
+        this.logger.logDebug('sendUploadForwardMsg', ret);
+        const resp = new NapProtoMsg(SendLongMsgResp).decode(Buffer.from(ret.hex_data, 'hex'));
+        return resp.result.resId;
+    }
+
+    async sendGroupFileDownloadReq(groupUin: number, fileUUID: string) {
+        const data = this.packetSession?.packer.packGroupFileDownloadReq(groupUin, fileUUID);
+        const ret = await this.sendPacket('OidbSvcTrpcTcp.0x6d6_2', data!, true);
+        const body = new NapProtoMsg(OidbSvcTrpcTcpBaseRsp).decode(Buffer.from(ret.hex_data, 'hex')).body;
+        const resp = new NapProtoMsg(OidbSvcTrpcTcp0x6D6Response).decode(body);
+        if (resp.download.retCode !== 0) {
+            throw new Error(`sendGroupFileDownloadReq error: ${resp.download.clientWording}`);
+        }
+        return `https://${resp.download.downloadDns}/ftn_handler/${Buffer.from(resp.download.downloadUrl).toString('hex')}/?fname=`
+    }
+}

src/core/apis/sign.ts

@@ -1,78 +1,7 @@
-import { RequestUtil } from '@/common/utils/request';
+import { RequestUtil } from '@/common/request';
 import { MiniAppLuaJsonType } from '@/core';
 import { InstanceContext, NapCatCore } from '..';
 
-// let t = await napCatCore.session.getGroupService().shareDigest({
-//   appId: "100497308",
-//   appType: 1,
-//   msgStyle: 0,
-//   recvUin: "726067488",
-//   sendType: 1,
-//   clientInfo: {
-//     platform: 1
-//   },
-//   richMsg: {
-//     usingArk: true,
-//     title: "Bot测试title",
-//     summary:  "Bot测试summary",
-//     url: "https://www.bilibili.com",
-//     pictureUrl: "https://y.qq.com/music/photo_new/T002R300x300M0000035DC6W4ZpSqf_1.jpg?max_age=2592000",
-//     brief:  "Bot测试brief",
-//   }
-// });
-// {
-//   errCode: 0,
-//   errMsg: '',
-//   rsp: {
-//     sendType: 1,
-//     recvUin: '726067488',
-//     recvOpenId: '',
-//     errCode: 901501,
-//     errMsg: 'imagent service_error:150_OIDB_NO_PRIV',
-//     extInfo: {
-//       wording: '消息下发失败(错误码：901501)',
-//       jumpResult: 0,
-//       jumpUrl: '',
-//       level: 0,
-//       subLevel: 0,
-//       developMsg: 'imagent error'
-//     }
-//   }
-// }
-
-// export class MusicSign {
-//   private readonly url: string;
-
-//   constructor(url: string) {
-//     this.url = url;
-//   }
-
-//   sign(postData: CustomMusicSignPostData | IdMusicSignPostData): Promise<any> {
-//     return new Promise((resolve, reject) => {
-//       fetch(this.url, {
-//         method: 'POST', // 指定请求方法为 POST
-//         headers: {
-//           'Content-Type': 'application/json' // 设置请求头，指明发送的数据类型为 JSON
-//         },
-//         body: JSON.stringify(postData) // 将 JavaScript 对象转换为 JSON 字符串作为请求体
-//       })
-//         .then(response => {
-//           if (!response.ok) {
-//             reject(response.statusText); // 请求失败，返回错误信息
-//           }
-//           return response.json(); // 解析 JSON 格式的响应体
-//         })
-//         .then(data => {
-//           logDebug('音乐消息生成成功', data);
-//           resolve(data);
-//         })
-//         .catch(error => {
-//           reject(error);
-//         });
-//     });
-//   }
-// }
-
 export class NTQQMusicSignApi {
     context: InstanceContext;
     core: NapCatCore;
@@ -285,11 +214,6 @@ export class NTQQMusicSignApi {
         //console.log(MusicReal);
         return { ...MusicReal.data, mid: signedMid };
     }
-
-    async CreateMusicThirdWay1(id: string = '', mid: string = '') {
-
-    }
-
     //转换外域名为 https://qq.ugcimg.cn/v1/cpqcbu4b8870i61bde6k7cbmjgejq8mr3in82qir4qi7ielffv5slv8ck8g42novtmev26i233ujtuab6tvu2l2sjgtupfr389191v00s1j5oh5325j5eqi40774jv1i/khovifoh7jrqd6eahoiv7koh8o
     //https://cgi.connect.qq.com/qqconnectopen/openapi/change_image_url?url=https://th.bing.com/th?id=OSK.b8ed36f1fb1889de6dc84fd81c187773&w=46&h=46&c=11&rs=1&qlt=80&o=6&dpr=2&pid=SANGAM
 

src/core/apis/system.ts

@@ -1,4 +1,4 @@
-import { GeneralCallResult, InstanceContext, NapCatCore } from '@/core';
+import { InstanceContext, NapCatCore } from '@/core';
 
 export class NTQQSystemApi {
     context: InstanceContext;
@@ -13,7 +13,7 @@ export class NTQQSystemApi {
         return this.core.util.hasOtherRunningQQProcess();
     }
 
-    async ORCImage(filePath: string) {
+    async ocrImage(filePath: string) {
         return this.context.session.getNodeMiscService().wantWinScreenOCR(filePath);
     }
 
@@ -21,27 +21,16 @@ export class NTQQSystemApi {
         return this.context.session.getRichMediaService().translateEnWordToZn(words);
     }
 
-    //调用会超时 没灯用 (好像是通知listener的) onLineDev
     async getOnlineDev() {
-        return this.context.session.getMsgService().getOnLineDev();
+        this.context.session.getMsgService().getOnLineDev();
     }
 
-    //1-2-162b9b42-65b9-4405-a8ed-2e256ec8aa50
     async getArkJsonCollection(cid: string) {
-        const ret = await this.core.eventWrapper.callNoListenerEvent<(cid: string) => Promise<GeneralCallResult & {
-            arkJson: string
-        }>>(
-            'NodeIKernelCollectionService/collectionArkShare',
-            5000,
-            '1717662698058',
-            );
-        return ret;
+        return await this.core.eventWrapper.callNoListenerEvent('NodeIKernelCollectionService/collectionArkShare', '1717662698058');
     }
 
-    async BootMiniApp(appfile: string, params: string) {
+    async bootMiniApp(appFile: string, params: string) {
         await this.context.session.getNodeMiscService().setMiniAppVersion('2.16.4');
-        const c = await this.context.session.getNodeMiscService().getMiniAppPath();
-
-        return this.context.session.getNodeMiscService().startNewMiniApp(appfile, params);
+        return this.context.session.getNodeMiscService().startNewMiniApp(appFile, params);
     }
 }

src/core/apis/user.ts

@@ -1,8 +1,7 @@
-import type { ModifyProfileParams, User, UserDetailInfoByUin, UserDetailInfoByUinV2 } from '@/core/entities';
-import { NodeIKernelProfileListener } from '@/core/listeners';
-import { RequestUtil } from '@/common/utils/request';
-import { NodeIKernelProfileService, ProfileBizType, UserDetailSource } from '@/core/services';
-import { InstanceContext, NapCatCore } from '..';
+import { ModifyProfileParams, User, UserDetailSource } from '@/core/entities';
+import { RequestUtil } from '@/common/request';
+import { InstanceContext, NapCatCore, ProfileBizType } from '..';
+import { solveAsyncProblem } from '@/common/helper';
 
 export class NTQQUserApi {
     context: InstanceContext;
@@ -12,12 +11,16 @@ export class NTQQUserApi {
         this.context = context;
         this.core = core;
     }
-
+    //self_tind格式
+    async createUidFromTinyId(tinyId: string) {
+        return this.context.session.getMsgService().createUidFromTinyId(this.core.selfInfo.uin, tinyId);
+    }
+    async getStatusByUid(uid: string) {
+        return this.context.session.getProfileService().getStatus(uid);
+    }
     async getProfileLike(uid: string) {
         return this.context.session.getProfileLikeService().getBuddyProfileLike({
-            friendUids: [
-                uid,
-            ],
+            friendUids: [uid],
             basic: 1,
             vote: 1,
             favorite: 0,
@@ -27,7 +30,18 @@ export class NTQQUserApi {
             limit: 20,
         });
     }
-
+    async fetchOtherProfileLike(uid: string) {
+        return this.context.session.getProfileLikeService().getBuddyProfileLike({
+            friendUids: [uid],
+            basic: 1,
+            vote: 1,
+            favorite: 0,
+            userProfile: 0,
+            type: 1,
+            start: 0,
+            limit: 20,
+        });
+    }
     async setLongNick(longNick: string) {
         return this.context.session.getProfileService().setLongNick(longNick);
     }
@@ -54,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) as setQQAvatarRet;
+        const ret = await this.context.session.getProfileService().setHeader(filePath);
         return { result: ret?.result, errMsg: ret?.errMsg };
     }
 
@@ -63,59 +76,20 @@ export class NTQQUserApi {
         return this.context.session.getGroupService().setHeader(gc, filePath);
     }
 
-    async fetchUserDetailInfos(uids: string[]) {
-        //26702 以上使用新接口 .Dev Mlikiowa
-        type EventService = NodeIKernelProfileService['fetchUserDetailInfo'];
-        type EventListener = NodeIKernelProfileListener['onUserDetailInfoChanged'];
-        const retData: User[] = [];
-        const [_retData, _retListener] = await this.core.eventWrapper.CallNormalEvent<
-            EventService, EventListener
-        >(
-            'NodeIKernelProfileService/fetchUserDetailInfo',
-            'NodeIKernelProfileListener/onUserDetailInfoChanged',
-            uids.length,
-            5000,
-            (profile) => {
-                if (uids.includes(profile.uid)) {
-                    const RetUser: User = {
-                        ...profile.simpleInfo.coreInfo,
-                        ...profile.simpleInfo.status,
-                        ...profile.simpleInfo.vasInfo,
-                        ...profile.commonExt,
-                        ...profile.simpleInfo.baseInfo,
-                        qqLevel: profile.commonExt.qqLevel,
-                        pendantId: '',
-                    };
-                    retData.push(RetUser);
-                    return true;
-                }
-                return false;
-            },
-            'BuddyProfileStore',
-            uids,
-            UserDetailSource.KSERVER,
-            [ProfileBizType.KALL],
-        );
-
-        return retData;
-    }
-
     async fetchUserDetailInfo(uid: string, mode: UserDetailSource = UserDetailSource.KDB) {
-        type EventService = NodeIKernelProfileService['fetchUserDetailInfo'];
-        type EventListener = NodeIKernelProfileListener['onUserDetailInfoChanged'];
-        const [_retData, profile] = await this.core.eventWrapper.CallNormalEvent<EventService, EventListener>(
+        const [_retData, profile] = await this.core.eventWrapper.callNormalEventV2(
             'NodeIKernelProfileService/fetchUserDetailInfo',
             'NodeIKernelProfileListener/onUserDetailInfoChanged',
-            1,
-            5000,
+            [
+                'BuddyProfileStore',
+                [uid],
+                mode,
+                [ProfileBizType.KALL],
+            ],
+            () => true,
             (profile) => profile.uid === uid,
-            'BuddyProfileStore',
-            [uid],
-            mode,
-            [ProfileBizType.KALL],
         );
         const RetUser: User = {
-            ...profile.simpleInfo.coreInfo,
             ...profile.simpleInfo.status,
             ...profile.simpleInfo.vasInfo,
             ...profile.commonExt,
@@ -123,33 +97,42 @@ export class NTQQUserApi {
             qqLevel: profile.commonExt?.qqLevel,
             age: profile.simpleInfo.baseInfo.age,
             pendantId: '',
+            ...profile.simpleInfo.coreInfo
         };
         return RetUser;
     }
 
     async getUserDetailInfo(uid: string): Promise<User> {
-        try {
-            const retUser = await this.fetchUserDetailInfo(uid, UserDetailSource.KDB);
-            if (retUser.uin !== '0') {
-                return retUser;
-            }
-        } catch (e) {
+        let retUser = await solveAsyncProblem(async (uid) => this.fetchUserDetailInfo(uid, UserDetailSource.KDB), uid);
+        if (retUser && retUser.uin !== '0') {
+            return retUser;
         }
         this.context.logger.logDebug('[NapCat] [Mark] getUserDetailInfo Mode1 Failed.');
-        return this.fetchUserDetailInfo(uid, UserDetailSource.KSERVER);
+        retUser = await this.fetchUserDetailInfo(uid, UserDetailSource.KSERVER);
+        if (retUser && retUser.uin === '0') {
+            retUser.uin = await this.core.apis.UserApi.getUidByUinV2(uid) ?? '0';
+        }
+        return retUser;
     }
 
     async modifySelfProfile(param: ModifyProfileParams) {
         return this.context.session.getProfileService().modifyDesktopMiniProfile(param);
     }
 
-    //需要异常处理
     async getCookies(domain: string) {
         const ClientKeyData = await this.forceFetchClientKey();
         const requestUrl = 'https://ssl.ptlogin2.qq.com/jump?ptlang=1033&clientuin=' + this.core.selfInfo.uin +
             '&clientkey=' + ClientKeyData.clientKey + '&u1=https%3A%2F%2F' + domain + '%2F' + this.core.selfInfo.uin + '%2Finfocenter&keyindex=19%27';
-        const cookies: { [key: string]: string; } = await RequestUtil.HttpsGetCookies(requestUrl);
-        return cookies;
+        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[]) {
@@ -163,7 +146,6 @@ export class NTQQUserApi {
             version: 0,
             aioKeywordVersion: 0,
         });
-        // console.log(robotUinRanges?.response?.robotUinRanges);
         return robotUinRanges?.response?.robotUinRanges;
     }
 
@@ -172,24 +154,23 @@ export class NTQQUserApi {
     async getQzoneCookies() {
         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%2Fuser.qzone.qq.com%2F' + this.core.selfInfo.uin + '%2Finfocenter&keyindex=19%27';
-        const cookies: { [key: string]: string; } = await RequestUtil.HttpsGetCookies(requestUrl);
-        return cookies;
+        return await RequestUtil.HttpsGetCookies(requestUrl);
     }
 
     //需要异常处理
 
-    async getSkey(): Promise<string | undefined> {
+    async getSKey(): Promise<string | undefined> {
         const ClientKeyData = await this.forceFetchClientKey();
         if (ClientKeyData.result !== 0) {
             throw new Error('getClientKey Error');
         }
         const clientKey = ClientKeyData.clientKey;
-        const keyIndex = ClientKeyData.keyIndex;
+        // const keyIndex = ClientKeyData.keyIndex;
         const requestUrl = 'https://ssl.ptlogin2.qq.com/jump?ptlang=1033&clientuin=' + this.core.selfInfo.uin + '&clientkey=' + clientKey + '&u1=https%3A%2F%2Fh5.qzone.qq.com%2Fqqnt%2Fqzoneinpcqq%2Ffriend%3Frefresh%3D0%26clientuin%3D0%26darkMode%3D0&keyindex=19%27';
         const cookies: { [key: string]: string; } = await RequestUtil.HttpsGetCookies(requestUrl);
         const skey = cookies['skey'];
         if (!skey) {
-            throw new Error('getSkey Skey is Empty');
+            throw new Error('SKey is Empty');
         }
         return skey;
     }
@@ -202,8 +183,8 @@ export class NTQQUserApi {
         if (uid) return uid;
         uid = (await this.context.session.getUixConvertService().getUid([Uin])).uidInfo.get(Uin);
         if (uid) return uid;
-        const unveifyUid = (await this.getUserDetailInfoByUinV2(Uin)).detail.uid;//从QQ Native 特殊转换
-        if (unveifyUid.indexOf('*') == -1) uid = unveifyUid;
+        const unverifiedUid = (await this.getUserDetailInfoByUin(Uin)).detail.uid;//从QQ Native 特殊转换
+        if (unverifiedUid.indexOf('*') == -1) uid = unverifiedUid;
         //if (uid) return uid;
         return uid;
     }
@@ -238,9 +219,11 @@ export class NTQQUserApi {
         return await this.context.session.getRecentContactService().getRecentContactList();
     }
 
-    async getUserDetailInfoByUinV2(Uin: string) {
-        return await this.core.eventWrapper.callNoListenerEvent<(Uin: string) => Promise<UserDetailInfoByUinV2>>
-            ('NodeIKernelProfileService/getUserDetailInfoByUin', 5000, Uin);
+    async getUserDetailInfoByUin(Uin: string) {
+        return await this.core.eventWrapper.callNoListenerEvent(
+            'NodeIKernelProfileService/getUserDetailInfoByUin',
+            Uin
+        );
     }
 
     async forceFetchClientKey() {

src/core/apis/webapi.ts

@@ -1,4 +1,4 @@
-import { RequestUtil } from '@/common/utils/request';
+import { RequestUtil } from '@/common/request';
 import {
     GroupEssenceMsgRet,
     InstanceContext,
@@ -20,43 +20,48 @@ export class NTQQWebApi {
 
     async shareDigest(groupCode: string, msgSeq: string, msgRandom: string, targetGroupCode: string) {
         const cookieObject = await this.core.apis.UserApi.getCookies('qun.qq.com');
-        const url = `https://qun.qq.com/cgi-bin/group_digest/share_digest?${
-            new URLSearchParams({
-                bkn: this.getBknFromCookie(cookieObject),
-                group_code: groupCode,
-                msg_seq: msgSeq,
-                msg_random: msgRandom,
-                target_group_code: targetGroupCode,
-            }).toString()
-        }`;
+        const url = `https://qun.qq.com/cgi-bin/group_digest/share_digest?${new URLSearchParams({
+            bkn: this.getBknFromCookie(cookieObject),
+            group_code: groupCode,
+            msg_seq: msgSeq,
+            msg_random: msgRandom,
+            target_group_code: targetGroupCode,
+        }).toString()}`;
         try {
             return RequestUtil.HttpGetText(url, 'GET', '', { 'Cookie': this.cookieToString(cookieObject) });
         } catch (e) {
             return undefined;
         }
     }
-
-    async getGroupEssenceMsg(GroupCode: string, page_start: string) {
+    async getGroupEssenceMsgAll(GroupCode: string) {
+        const ret: GroupEssenceMsgRet[] = [];
+        for (let i = 0; i < 20; i++) {
+            const data = await this.getGroupEssenceMsg(GroupCode, i, 50);
+            if (!data) break;
+            ret.push(data);
+            if (data.data.is_end) break;
+        }
+        return ret;
+    }
+    async getGroupEssenceMsg(GroupCode: string, page_start: number = 0, page_limit: number = 50) {
         const cookieObject = await this.core.apis.UserApi.getCookies('qun.qq.com');
-        const url = `https://qun.qq.com/cgi-bin/group_digest/digest_list?${
-            new URLSearchParams({
-                bkn: this.getBknFromCookie(cookieObject),
-                group_code: GroupCode,
-                page_start,
-                page_limit: '20',
-            }).toString()
-        }`;
-        let ret;
+        const url = `https://qun.qq.com/cgi-bin/group_digest/digest_list?${new URLSearchParams({
+            bkn: this.getBknFromCookie(cookieObject),
+            page_start: page_start.toString(),
+            page_limit: page_limit.toString(),
+            group_code: GroupCode,
+        }).toString()}`;
         try {
-            ret = await RequestUtil.HttpGetJson<GroupEssenceMsgRet>
-            (url, 'GET', '', { 'Cookie': this.cookieToString(cookieObject) });
+            const ret = await RequestUtil.HttpGetJson<GroupEssenceMsgRet>(
+                url,
+                'GET',
+                '',
+                { 'Cookie': this.cookieToString(cookieObject) }
+            );
+            return ret.retcode === 0 ? ret : undefined;
         } catch {
             return undefined;
         }
-        if (ret.retcode !== 0) {
-            return undefined;
-        }
-        return ret;
     }
 
     async getGroupMembers(GroupCode: string, cached: boolean = true): Promise<WebApiGroupMember[]> {
@@ -64,16 +69,18 @@ export class NTQQWebApi {
         const memberData: Array<WebApiGroupMember> = new Array<WebApiGroupMember>();
         const cookieObject = await this.core.apis.UserApi.getCookies('qun.qq.com');
         const retList: Promise<WebApiGroupMemberRet>[] = [];
-        const fastRet = await RequestUtil.HttpGetJson<WebApiGroupMemberRet>
-        (`https://qun.qq.com/cgi-bin/qun_mgr/search_group_members?${
-            new URLSearchParams({
+        const fastRet = await RequestUtil.HttpGetJson<WebApiGroupMemberRet>(
+            `https://qun.qq.com/cgi-bin/qun_mgr/search_group_members?${new URLSearchParams({
                 st: '0',
                 end: '40',
                 sort: '1',
                 gc: GroupCode,
                 bkn: this.getBknFromCookie(cookieObject),
-            }).toString()
-        }`, 'POST', '', { 'Cookie': this.cookieToString(cookieObject) });
+            }).toString()}`,
+            'POST',
+            '',
+            { 'Cookie': this.cookieToString(cookieObject) }
+        );
         if (!fastRet?.count || fastRet?.errcode !== 0 || !fastRet?.mems) {
             return [];
         } else {
@@ -85,16 +92,18 @@ export class NTQQWebApi {
         const PageNum = Math.ceil(fastRet.count / 40);
         //遍历批量请求
         for (let i = 2; i <= PageNum; i++) {
-            const ret = RequestUtil.HttpGetJson<WebApiGroupMemberRet>
-            (`https://qun.qq.com/cgi-bin/qun_mgr/search_group_members?${
-                new URLSearchParams({
+            const ret = RequestUtil.HttpGetJson<WebApiGroupMemberRet>(
+                `https://qun.qq.com/cgi-bin/qun_mgr/search_group_members?${new URLSearchParams({
                     st: ((i - 1) * 40).toString(),
                     end: (i * 40).toString(),
                     sort: '1',
                     gc: GroupCode,
                     bkn: this.getBknFromCookie(cookieObject),
-                }).toString()
-            }`, 'POST', '', { 'Cookie': this.cookieToString(cookieObject) });
+                }).toString()}`,
+                'POST',
+                '',
+                { 'Cookie': this.cookieToString(cookieObject) }
+            );
             retList.push(ret);
         }
         //批量等待
@@ -122,21 +131,56 @@ export class NTQQWebApi {
     //   return await res.json();
     // }
 
-    async setGroupNotice(GroupCode: string, Content: string) {
+    async setGroupNotice(
+        GroupCode: string,
+        Content: string,
+        pinned: number = 0,
+        type: number = 1,
+        is_show_edit_card: number = 1,
+        tip_window_type: number = 1,
+        confirm_required: number = 1,
+        picId: string = '',
+        imgWidth: number = 540,
+        imgHeight: number = 300,
+    ) {
+        interface SetNoticeRetSuccess {
+            ec: number;
+            em: string;
+            id: number;
+            ltsm: number;
+            new_fid: string;
+            read_only: number;
+            role: number;
+            srv_code: number;
+        }
+
         const cookieObject = await this.core.apis.UserApi.getCookies('qun.qq.com');
-        let ret: any = undefined;
+
         try {
-            ret = await RequestUtil.HttpGetJson<any>
-            (`https://web.qun.qq.com/cgi-bin/announce/add_qun_notice${
-                new URLSearchParams({
+            const settings = JSON.stringify({
+                is_show_edit_card: is_show_edit_card,
+                tip_window_type: tip_window_type,
+                confirm_required: confirm_required
+            });
+            const externalParam = {
+                pic: picId,
+                imgWidth: imgWidth.toString(),
+                imgHeight: imgHeight.toString(),
+            };
+            const ret: SetNoticeRetSuccess = await RequestUtil.HttpGetJson<SetNoticeRetSuccess>(
+                `https://web.qun.qq.com/cgi-bin/announce/add_qun_notice?${new URLSearchParams({
                     bkn: this.getBknFromCookie(cookieObject),
                     qid: GroupCode,
                     text: Content,
-                    pinned: '0',
-                    type: '1',
-                    settings: '{"is_show_edit_card":1,"tip_window_type":1,"confirm_required":1}',
-                }).toString()
-            }`, 'GET', '', { 'Cookie': this.cookieToString(cookieObject) });
+                    pinned: pinned.toString(),
+                    type: type.toString(),
+                    settings: settings,
+                    ...(picId === '' ? {} : externalParam)
+                }).toString()}`,
+                'POST',
+                '',
+                { 'Cookie': this.cookieToString(cookieObject) }
+            );
             return ret;
         } catch (e) {
             return undefined;
@@ -145,21 +189,24 @@ export class NTQQWebApi {
 
     async getGroupNotice(GroupCode: string): Promise<undefined | WebApiGroupNoticeRet> {
         const cookieObject = await this.core.apis.UserApi.getCookies('qun.qq.com');
-        let ret: WebApiGroupNoticeRet | undefined = undefined;
         try {
-            ret = await RequestUtil.HttpGetJson<WebApiGroupNoticeRet>(`https://web.qun.qq.com/cgi-bin/announce/get_t_list?${
-                new URLSearchParams({
+            const ret = await RequestUtil.HttpGetJson<WebApiGroupNoticeRet>(
+                `https://web.qun.qq.com/cgi-bin/announce/get_t_list?${new URLSearchParams({
                     bkn: this.getBknFromCookie(cookieObject),
                     qid: GroupCode,
-                    type: '1',
-                    start: '0',
-                    num: '1',
-                }).toString()
-            }`, 'GET', '', { 'Cookie': this.cookieToString(cookieObject) });
-            if (ret?.ec !== 0) {
-                return undefined;
-            }
-            return ret;
+                    ft: '23',
+                    ni: '1',
+                    n: '1',
+                    i: '1',
+                    log_read: '1',
+                    platform: '1',
+                    s: '-1',
+                }).toString()}&n=20`,
+                'GET',
+                '',
+                { 'Cookie': this.cookieToString(cookieObject) }
+            );
+            return ret?.ec === 0 ? ret : undefined;
         } catch (e) {
             return undefined;
         }
@@ -168,16 +215,18 @@ export class NTQQWebApi {
     async getGroupHonorInfo(groupCode: string, getType: WebHonorType) {
         const cookieObject = await this.core.apis.UserApi.getCookies('qun.qq.com');
         const getDataInternal = async (Internal_groupCode: string, Internal_type: number) => {
-            const url = `https://qun.qq.com/interactive/honorlist?${
-                new URLSearchParams({
-                    gc: Internal_groupCode,
-                    type: Internal_type.toString(),
-                }).toString()
-            }`;
             let resJson;
             try {
-                const res = await RequestUtil.HttpGetText(url, 'GET', '', { 'Cookie': this.cookieToString(cookieObject) });
-                const match = res.match(/window\.__INITIAL_STATE__=(.*?);/);
+                const res = await RequestUtil.HttpGetText(
+                    `https://qun.qq.com/interactive/honorlist?${new URLSearchParams({
+                        gc: Internal_groupCode,
+                        type: Internal_type.toString(),
+                    }).toString()}`,
+                    'GET',
+                    '',
+                    { 'Cookie': this.cookieToString(cookieObject) }
+                );
+                const match = /window\.__INITIAL_STATE__=(.*?);/.exec(res);
                 if (match) {
                     resJson = JSON.parse(match[1].trim());
                 }
@@ -187,7 +236,7 @@ export class NTQQWebApi {
                     return resJson?.actorList;
                 }
             } catch (e) {
-                this.context.logger.logDebug('获取当前群荣耀失败', url, e);
+                this.context.logger.logDebug('获取当前群荣耀失败', e);
             }
             return undefined;
         };
@@ -195,11 +244,8 @@ export class NTQQWebApi {
         const HonorInfo: any = { group_id: groupCode };
 
         if (getType === WebHonorType.TALKATIVE || getType === WebHonorType.ALL) {
-            try {
-                const RetInternal = await getDataInternal(groupCode, 1);
-                if (!RetInternal) {
-                    throw new Error('获取龙王信息失败');
-                }
+            const RetInternal = await getDataInternal(groupCode, 1);
+            if (RetInternal) {
                 HonorInfo.current_talkative = {
                     user_id: RetInternal[0]?.uin,
                     avatar: RetInternal[0]?.avatar,
@@ -217,16 +263,13 @@ export class NTQQWebApi {
                         nickname: talkative_ele?.name,
                     });
                 }
-            } catch (e) {
-                this.context.logger.logDebug(e);
+            } else {
+                this.context.logger.logError.bind(this.context.logger)('获取龙王信息失败');
             }
         }
         if (getType === WebHonorType.PERFORMER || getType === WebHonorType.ALL) {
-            try {
-                const RetInternal = await getDataInternal(groupCode, 2);
-                if (!RetInternal) {
-                    throw new Error('获取群聊之火失败');
-                }
+            const RetInternal = await getDataInternal(groupCode, 2);
+            if (RetInternal) {
                 HonorInfo.performer_list = [];
                 for (const performer_ele of RetInternal) {
                     HonorInfo.performer_list.push({
@@ -236,16 +279,13 @@ export class NTQQWebApi {
                         description: performer_ele?.desc,
                     });
                 }
-            } catch (e) {
-                this.context.logger.logDebug(e);
+            } else {
+                this.context.logger.logError.bind(this.context.logger)('获取群聊之火失败');
             }
         }
         if (getType === WebHonorType.PERFORMER || getType === WebHonorType.ALL) {
-            try {
-                const RetInternal = await getDataInternal(groupCode, 3);
-                if (!RetInternal) {
-                    throw new Error('获取群聊炽焰失败');
-                }
+            const RetInternal = await getDataInternal(groupCode, 3);
+            if (RetInternal) {
                 HonorInfo.legend_list = [];
                 for (const legend_ele of RetInternal) {
                     HonorInfo.legend_list.push({
@@ -255,16 +295,13 @@ export class NTQQWebApi {
                         desc: legend_ele?.description,
                     });
                 }
-            } catch (e) {
-                this.context.logger.logDebug('获取群聊炽焰失败', e);
+            } else {
+                this.context.logger.logError.bind(this.context.logger)('获取群聊炽焰失败');
             }
         }
         if (getType === WebHonorType.EMOTION || getType === WebHonorType.ALL) {
-            try {
-                const RetInternal = await getDataInternal(groupCode, 6);
-                if (!RetInternal) {
-                    throw new Error('获取快乐源泉失败');
-                }
+            const RetInternal = await getDataInternal(groupCode, 6);
+            if (RetInternal) {
                 HonorInfo.emotion_list = [];
                 for (const emotion_ele of RetInternal) {
                     HonorInfo.emotion_list.push({
@@ -274,14 +311,16 @@ export class NTQQWebApi {
                         desc: emotion_ele.description,
                     });
                 }
-            } catch (e) {
-                this.context.logger.logDebug('获取快乐源泉失败', e);
+            } else {
+                this.context.logger.logError.bind(this.context.logger)('获取快乐源泉失败');
             }
         }
-        //冒尖小春笋好像已经被tx扬了
+
+        // 冒尖小春笋好像已经被tx扬了 R.I.P.
         if (getType === WebHonorType.EMOTION || getType === WebHonorType.ALL) {
             HonorInfo.strong_newbie_list = [];
         }
+
         return HonorInfo;
     }
 

src/core/core.ts

@@ -1,210 +0,0 @@
-import { NodeQQNTWrapperUtil, NTApiContext, WrapperNodeApi } from '@/core/wrapper';
-import path from 'node:path';
-import fs from 'node:fs';
-import { InstanceContext } from './wrapper';
-import { proxiedListenerOf } from '@/common/utils/proxy-handler';
-import { GroupListener, MsgListener, ProfileListener } from './listeners';
-import { GroupMember, SelfInfo } from './entities';
-import { LegacyNTEventWrapper } from '@/common/framework/event-legacy';
-import { NTQQFileApi, NTQQFriendApi, NTQQGroupApi, NTQQMsgApi, NTQQSystemApi, NTQQUserApi, NTQQWebApi } from './apis';
-import os from 'node:os';
-import { NTQQCollectionApi } from './apis/collection';
-import { NapCatConfigLoader } from './helper/config';
-import { LogLevel } from '@/common/utils/log';
-
-export enum NapCatCoreWorkingEnv {
-    Unknown = 0,
-    Shell = 1,
-    Framework = 2,
-}
-
-export function loadQQWrapper(QQVersion: string): WrapperNodeApi {
-    let wrapperNodePath = path.resolve(path.dirname(process.execPath), './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 class NapCatCore {
-    readonly context: InstanceContext;
-    readonly apis: NTApiContext;
-    readonly eventWrapper: LegacyNTEventWrapper;
-    // readonly eventChannel: NTEventChannel;
-    NapCatDataPath: string;
-    NapCatTempPath: string;
-    // runtime info, not readonly
-    selfInfo: SelfInfo;
-    util: NodeQQNTWrapperUtil;
-    configLoader: NapCatConfigLoader;
-
-    // 通过构造器递过去的 runtime info 应该尽量少
-    constructor(context: InstanceContext, selfInfo: SelfInfo) {
-        this.selfInfo = selfInfo;
-        this.context = context;
-        this.util = this.context.wrapper.NodeQQNTWrapperUtil;
-        this.eventWrapper = new LegacyNTEventWrapper(context.session);
-        this.apis = {
-            FileApi: new NTQQFileApi(this.context, this),
-            SystemApi: new NTQQSystemApi(this.context, this),
-            CollectionApi: new NTQQCollectionApi(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);
-        this.NapCatDataPath = path.join(this.dataPath, 'NapCat');
-        fs.mkdirSync(this.NapCatDataPath, { recursive: true });
-        this.NapCatTempPath = path.join(this.NapCatDataPath, 'temp');
-        // 创建临时目录
-        if (!fs.existsSync(this.NapCatTempPath)) {
-            fs.mkdirSync(this.NapCatTempPath, { recursive: true });
-        }
-        this.initNapCatCoreListeners().then().catch(this.context.logger.logError);
-
-        this.context.logger.setFileLogEnabled(
-            this.configLoader.configData.fileLog,
-        );
-        this.context.logger.setConsoleLogEnabled(
-            this.configLoader.configData.consoleLog,
-        );
-        this.context.logger.setFileAndConsoleLogLevel(
-            this.configLoader.configData.fileLogLevel as LogLevel,
-            this.configLoader.configData.consoleLogLevel as LogLevel,
-        );
-    }
-
-    get dataPath(): string {
-        let result = this.context.wrapper.NodeQQNTWrapperUtil.getNTUserDataInfoConfig();
-        if (!result) {
-            result = path.resolve(os.homedir(), './.config/QQ');
-            fs.mkdirSync(result, { recursive: true });
-        }
-        return result;
-    }
-
-    // Renamed from 'InitDataListener'
-    async initNapCatCoreListeners() {
-        const msgListener = new MsgListener();
-        msgListener.onRecvMsg = (msgs) => {
-            msgs.forEach(msg => this.context.logger.logMessage(msg, this.selfInfo));
-        };
-        msgListener.onAddSendMsg = (msg) => {
-            this.context.logger.logMessage(msg, this.selfInfo);
-        };
-        //await sleep(2500);
-        this.context.session.getMsgService().addKernelMsgListener(
-            proxiedListenerOf(msgListener, this.context.logger) as any
-        );
-
-        const profileListener = new ProfileListener();
-        profileListener.onProfileDetailInfoChanged = (profile) => {
-            if (profile.uid === this.selfInfo.uid) {
-                Object.assign(this.selfInfo, profile);
-            }
-        };
-        profileListener.onSelfStatusChanged = (/* Info: SelfStatusInfo */) => {
-            // if (Info.status == 20) {
-            //   log("账号状态变更为离线")
-            // }
-        };
-        this.context.session.getProfileService().addKernelProfileListener(
-            proxiedListenerOf(profileListener, this.context.logger),
-        );
-
-        // 群相关
-        const groupListener = new GroupListener();
-        groupListener.onGroupListUpdate = (updateType, groupList) => {
-            // console.log("onGroupListUpdate", updateType, groupList)
-            groupList.map(g => {
-                const existGroup = this.apis.GroupApi.groupCache.get(g.groupCode);
-                //群成员数量变化 应该刷新缓存
-                if (existGroup && g.memberCount === existGroup.memberCount) {
-                    Object.assign(existGroup, g);
-                }
-                else {
-                    this.apis.GroupApi.groupCache.set(g.groupCode, g);
-                    // 获取群成员
-                }
-                const sceneId = this.context.session.getGroupService().createMemberListScene(g.groupCode, 'groupMemberList_MainWindow');
-                this.context.session.getGroupService().getNextMemberList(sceneId!, undefined, 3000).then( /* r => {
-                    // console.log(`get group ${g.groupCode} members`, r);
-                    // r.result.infos.forEach(member => {
-                    // });
-                    // groupMembers.set(g.groupCode, r.result.infos);
-                } */);
-            });
-        };
-        groupListener.onMemberListChange = (arg) => {
-            // todo: 应该加一个内部自己维护的成员变动callback，用于判断成员变化通知
-            const groupCode = arg.sceneId.split('_')[0];
-            if (this.apis.GroupApi.groupMemberCache.has(groupCode)) {
-                const existMembers = this.apis.GroupApi.groupMemberCache.get(groupCode)!;
-                arg.infos.forEach((member, uid) => {
-                    //console.log('onMemberListChange', member);
-                    const existMember = existMembers.get(uid);
-                    if (existMember) {
-                        Object.assign(existMember, member);
-                    }
-                    else {
-                        existMembers!.set(uid, member);
-                    }
-                    //移除成员
-                    if (member.isDelete) {
-                        existMembers.delete(uid);
-                    }
-                });
-            }
-            else {
-                this.apis.GroupApi.groupMemberCache.set(groupCode, arg.infos);
-            }
-            // console.log('onMemberListChange', groupCode, arg);
-        };
-        groupListener.onMemberInfoChange = (groupCode, changeType, members) => {
-            //console.log('onMemberInfoChange', groupCode, changeType, members);
-            if (changeType === 0 && members.get(this.selfInfo.uid)?.isDelete) {
-                // 自身退群或者被踢退群 5s用于Api操作 之后不再出现
-                setTimeout(() => {
-                    this.apis.GroupApi.groupCache.delete(groupCode);
-                }, 5000);
-
-            }
-            const existMembers = this.apis.GroupApi.groupMemberCache.get(groupCode);
-            if (existMembers) {
-                members.forEach((member, uid) => {
-                    const existMember = existMembers.get(uid);
-                    if (existMember) {
-                        // 检查管理变动
-                        member.isChangeRole = this.checkAdminEvent(groupCode, member, existMember);
-                        // 更新成员信息
-                        Object.assign(existMember, member);
-                    }
-                    else {
-                        existMembers.set(uid, member);
-                    }
-                    //移除成员
-                    if (member.isDelete) {
-                        existMembers.delete(uid);
-                    }
-                });
-            }
-            else {
-                this.apis.GroupApi.groupMemberCache.set(groupCode, members);
-            }
-        };
-        this.context.session.getGroupService().addKernelGroupListener(
-            proxiedListenerOf(profileListener, this.context.logger) as any
-        );
-    }
-    checkAdminEvent(groupCode: string, memberNew: GroupMember, memberOld: GroupMember | undefined): boolean {
-        if (memberNew.role !== memberOld?.role) {
-            this.context.logger.log(`群 ${groupCode} ${memberNew.nick} 角色变更为 ${memberNew.role === 3 ? '管理员' : '群员'}`);
-            return true;
-        }
-        return false;
-    }
-}

src/core/entities/adapter.ts

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

src/core/entities/contact.ts

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

src/core/entities/group.ts

@@ -1,4 +1,68 @@
-import { QQLevel, Sex, User } from './user';
+import { QQLevel, Sex } from './user';
+
+export interface KickMemberInfo {
+    optFlag: number,
+    optOperate: number,
+    optMemberUid: string,
+    optBytesMsg: string,
+}
+//getGroupDetailInfo GroupCode,GroupInfoSource
+export enum GroupInfoSource {
+    KUNSPECIFIED,
+    KBIGDATACARD,
+    KDATACARD,
+    KNOTICE,
+    KAIO,
+    KRECENTCONTACT,
+    KMOREPANEL
+}
+export interface GroupExt0xEF0InfoFilter {
+    bindGuildId: number;
+    blacklistExpireTime: number;
+    companyId: number;
+    essentialMsgPrivilege: number;
+    essentialMsgSwitch: number;
+    fullGroupExpansionSeq: number;
+    fullGroupExpansionSwitch: number;
+    gangUpId: number;
+    groupAioBindGuildId: number;
+    groupBindGuildIds: number;
+    groupBindGuildSwitch: number;
+    groupExcludeGuildIds: number;
+    groupExtFlameData: number;
+    groupFlagPro1: number;
+    groupInfoExtSeq: number;
+    groupOwnerId: number;
+    groupSquareSwitch: number;
+    hasGroupCustomPortrait: number;
+    inviteRobotMemberExamine: number;
+    inviteRobotMemberSwitch: number;
+    inviteRobotSwitch: number;
+    isLimitGroupRtc: number;
+    lightCharNum: number;
+    luckyWord: number;
+    luckyWordId: number;
+    msgEventSeq: number;
+    qqMusicMedalSwitch: number;
+    reserve: number;
+    showPlayTogetherSwitch: number;
+    starId: number;
+    todoSeq: number;
+    viewedMsgDisappearTime: number;
+}
+
+export interface KickMemberV2Req {
+    groupCode: string,
+    kickFlag: number,
+    kickList: Array<KickMemberInfo>,
+    kickListUids: Array<string>,
+    kickMsg: string
+}
+
+export enum DataSource {
+    LOCAL,
+    REMOTE
+}
 
 export enum GroupListUpdateType {
     REFRESHALL,
@@ -6,13 +70,15 @@ export enum GroupListUpdateType {
     MODIFIED,
     REMOVE
 }
+
 export interface GroupMemberCache {
     group: {
         data: GroupMember[];
         isExpired: boolean;
-    }
+    };
     isExpired: boolean;
 }
+
 export interface Group {
     groupCode: string,
     createTime?: string,//高版本才有
@@ -51,6 +117,7 @@ export enum GroupMemberRole {
 }
 
 export interface GroupMember {
+    memberRealLevel: string | undefined;
     memberSpecialTitle?: string;
     avatarPath: string;
     cardName: string;

src/core/entities/msg.ts

@@ -1,4 +1,4 @@
-import { GroupMemberRole } from './group';
+import { GroupMemberRole } from '@/core';
 
 export interface Peer {
     chatType: ChatType;
@@ -22,6 +22,7 @@ export interface GetFileListParam {
     startIndex: number;
     sortOrder: number;
     showOnlinedocFolder: number;
+    folderId?: string;
 }
 
 export enum ElementType {
@@ -145,6 +146,7 @@ export interface TaskTopMsgElement {
     iconUrl: string;
     topMsgType: number;
 }
+
 export enum NTMsgType {
     KMSGTYPEARKSTRUCT = 11,
     KMSGTYPEFACEBUBBLE = 24,
@@ -168,6 +170,7 @@ export enum NTMsgType {
     KMSGTYPEVIDEO = 7,
     KMSGTYPEWALLET = 10
 }
+
 export interface SendTaskTopMsgElement {
     elementType: ElementType.TASKTOPMSG;
     elementId: string;
@@ -355,6 +358,7 @@ export enum NTMsgAtType {
     ATTYPESUMMONROLE = 256,
     ATTYPEUNKNOWN = 0
 }
+
 export interface SendPicElement {
     elementType: ElementType.PIC;
     elementId: string;
@@ -366,7 +370,9 @@ export interface ReplyElement {
     replayMsgSeq: string;
     replayMsgId: string;
     senderUin: string;
-    senderUinStr: string;
+    senderUidStr?: string;
+    replyMsgTime?: string;
+    replyMsgClientSeq?: string;
 }
 
 export interface SendReplyElement {
@@ -386,7 +392,7 @@ export interface SendMarketFaceElement {
     marketFaceElement: MarketFaceElement;
 }
 
-export interface SendstructLongMsgElement {
+export interface SendStructLongMsgElement {
     elementType: ElementType.STRUCTLONGMSG;
     elementId: string;
     structLongMsgElement: StructLongMsgElement;
@@ -411,7 +417,7 @@ export interface ShareLocationElement {
     ext: string;
 }
 
-export interface sendShareLocationElement {
+export interface SendShareLocationElement {
     elementType: ElementType.SHARELOCATION;
     elementId: string;
     shareLocationElement?: ShareLocationElement;
@@ -461,7 +467,7 @@ export interface SendMarkdownElement {
 
 export type SendMessageElement = SendTextElement | SendPttElement |
     SendPicElement | SendReplyElement | SendFaceElement | SendMarketFaceElement | SendFileElement |
-    SendVideoElement | SendArkElement | SendMarkdownElement | sendShareLocationElement;
+    SendVideoElement | SendArkElement | SendMarkdownElement | SendShareLocationElement;
 
 export interface TextElement {
     content: string;
@@ -511,6 +517,13 @@ 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 {
     KCHATTYPEADELIE = 42,
@@ -589,6 +602,7 @@ export const IMAGE_HTTP_HOST_NT = 'https://multimedia.nt.qq.com.cn';
 
 export interface PicElement {
     md5HexStr?: string;
+    filePath?: string;
     fileSize: number | string;//number
     picWidth: number;
     picHeight: number;
@@ -626,6 +640,7 @@ export enum NTGrayTipElementSubTypeV2 {
     GRAYTIP_ELEMENT_SUBTYPE_WALLET = 16,
     GRAYTIP_ELEMENT_SUBTYPE_XMLMSG = 12,
 }
+
 export interface GrayTipElement {
     subElementType: NTGrayTipElementSubTypeV2;
     revokeElement: {
@@ -651,7 +666,8 @@ export interface GrayTipElement {
 export enum FaceType {
     normal = 1, // 小黄脸
     normal2 = 2, // 新小黄脸, 从faceIndex 222开始？
-    dice = 3  // 骰子
+    dice = 3,  // 骰子
+    poke = 5  // 拍一拍
 }
 
 export enum FaceIndex {
@@ -848,47 +864,14 @@ export interface MultiForwardMsgElement {
     resId: string;
     fileName: string;
 }
-export enum NTSubMsgType {
-    KMSGSUBTYPEARKGROUPANNOUNCE = 3,
-    KMSGSUBTYPEARKGROUPANNOUNCECONFIRMREQUIRED = 4,
-    KMSGSUBTYPEARKGROUPGIFTATME = 5,
-    KMSGSUBTYPEARKGROUPTASKATALL = 6,
-    KMSGSUBTYPEARKMULTIMSG = 7,
-    KMSGSUBTYPEARKNORMAL = 0,
-    KMSGSUBTYPEARKTENCENTDOCFROMMINIAPP = 1,
-    KMSGSUBTYPEARKTENCENTDOCFROMPLUSPANEL = 2,
-    KMSGSUBTYPEEMOTICON = 15,
-    KMSGSUBTYPEFILEAPP = 11,
-    KMSGSUBTYPEFILEAUDIO = 3,
-    KMSGSUBTYPEFILEDOC = 4,
-    KMSGSUBTYPEFILEEXCEL = 6,
-    KMSGSUBTYPEFILEFOLDER = 13,
-    KMSGSUBTYPEFILEHTML = 10,
-    KMSGSUBTYPEFILEIPA = 14,
-    KMSGSUBTYPEFILENORMAL = 0,
-    KMSGSUBTYPEFILEPDF = 7,
-    KMSGSUBTYPEFILEPIC = 1,
-    KMSGSUBTYPEFILEPPT = 5,
-    KMSGSUBTYPEFILEPSD = 12,
-    KMSGSUBTYPEFILETXT = 8,
-    KMSGSUBTYPEFILEVIDEO = 2,
-    KMSGSUBTYPEFILEZIP = 9,
-    KMSGSUBTYPELINK = 5,
-    KMSGSUBTYPEMARKETFACE = 1,
-    KMSGSUBTYPEMIXEMOTICON = 7,
-    KMSGSUBTYPEMIXFACE = 3,
-    KMSGSUBTYPEMIXMARKETFACE = 2,
-    KMSGSUBTYPEMIXPIC = 1,
-    KMSGSUBTYPEMIXREPLY = 4,
-    KMSGSUBTYPEMIXTEXT = 0,
-    KMSGSUBTYPETENCENTDOC = 6
-}
+
 export enum SendStatusType {
     KSEND_STATUS_FAILED = 0,
     KSEND_STATUS_SENDING = 1,
     KSEND_STATUS_SUCCESS = 2,
     KSEND_STATUS_SUCCESS_NOSEQ = 3
 }
+
 export interface RawMessage {
     parentMsgPeer: Peer;
 
@@ -897,6 +880,8 @@ export interface RawMessage {
     /**
      * 扩展字段，与 Ob11 msg ID 有关
      */
+
+
     id?: number;
 
     guildId: string;
@@ -914,7 +899,7 @@ export interface RawMessage {
 
     msgType: NTMsgType;
 
-    subMsgType: NTSubMsgType;
+    subMsgType: number;
 
     senderUid: string;
 
@@ -933,11 +918,26 @@ export interface RawMessage {
      */
     peerUin: string;
 
+    /**
+     * 好友备注（如果是好友消息）
+     */
+    remark?: string;
+
+    /**
+     * 群名（如果是群消息）
+     */
+    peerName: string;
+
     /**
      * 发送者昵称（如果是好友消息）
      */
     sendNickName: string;
 
+    /**
+     * 发送者好友备注（如果是群消息并且有发送者好友）
+     */
+    sendRemarkName: string;
+
     /**
      * 发送者群名片（如果是群消息）
      */
@@ -958,4 +958,46 @@ export interface RawMessage {
     records: RawMessage[];
 
     elements: MessageElement[];
-}
+
+    sourceType: MsgSourceType;
+}
+export interface QueryMsgsParams {
+    chatInfo: Peer;
+    filterMsgType: [];
+    filterSendersUid: string[];
+    filterMsgFromTime: string;
+    filterMsgToTime: string;
+    pageLimit: number;
+    isReverseOrder: boolean;
+    isIncludeCurrent: boolean;
+}
+
+export interface TmpChatInfoApi {
+    errMsg: string;
+    result: number;
+    tmpChatInfo?: TmpChatInfo;
+}
+
+export interface TmpChatInfo {
+    chatType: number;
+    fromNick: string;
+    groupCode: string;
+    peerUid: string;
+    sessionType: number;
+    sig: string;
+}
+export interface MsgReqType {
+    peer: Peer,
+    byType: number,
+    msgId: string,
+    msgSeq: string,
+    msgTime: string,
+    clientSeq: string,
+    cnt: number,
+    queryOrder: boolean,
+    includeSelf: boolean,
+    includeDeleteMsg: boolean,
+    extraCnt: number
+}
+//getMsgsIncludeSelf Peer必须 byType 1
+//getMsgsWithMsgTimeAndClientSeqForC2C Peer必须 byType 3

src/core/entities/notify.ts

@@ -1,12 +1,20 @@
-export enum GroupNotifyTypes {
-    INVITE_ME = 1,
-    INVITED_JOIN = 4,  // 有人接受了邀请入群
-    JOIN_REQUEST = 7,
-    ADMIN_SET = 8,
-    KICK_MEMBER = 9,
-    MEMBER_EXIT = 11, // 主动退出
-    ADMIN_UNSET = 12,
-    ADMIN_UNSET_OTHER = 13,  // 其他人取消管理员
+export enum GroupNotifyMsgType {
+    UN_SPECIFIED,
+    INVITED_BY_MEMBER,
+    REFUSE_INVITED,
+    REFUSED_BY_ADMINI_STRATOR,
+    AGREED_TOJOIN_DIRECT,// 有人接受了邀请入群
+    INVITED_NEED_ADMINI_STRATOR_PASS,
+    AGREED_TO_JOIN_BY_ADMINI_STRATOR,
+    REQUEST_JOIN_NEED_ADMINI_STRATOR_PASS,
+    SET_ADMIN,
+    KICK_MEMBER_NOTIFY_ADMIN,
+    KICK_MEMBER_NOTIFY_KICKED,
+    MEMBER_LEAVE_NOTIFY_ADMIN,// 主动退出
+    CANCEL_ADMIN_NOTIFY_CANCELED,
+    CANCEL_ADMIN_NOTIFY_ADMIN,// 其他人取消管理员
+    TRANSFER_GROUP_NOTIFY_OLDOWNER,
+    TRANSFER_GROUP_NOTIFY_ADMIN
 }
 
 export interface GroupNotifies {
@@ -15,26 +23,40 @@ export interface GroupNotifies {
     notifies: GroupNotify[];
 }
 
-export enum GroupNotifyStatus {
-    IGNORE = 0,
-    WAIT_HANDLE = 1,
-    APPROVE = 2,
-    REJECT = 3
+export enum GroupNotifyMsgStatus {
+    KINIT,//初始化
+    KUNHANDLE,//未处理
+    KAGREED,//同意
+    KREFUSED,//拒绝
+    KIGNORED//忽略
+}
+
+export enum GroupInviteStatus {
+    INIT,
+    WAIT_TO_APPROVE,
+    JOINED,
+    REFUSED_BY_ADMINI_STRATOR
+}
+
+export enum GroupInviteType {
+    BYBUDDY,
+    BYGROUPMEMBER,
+    BYDISCUSSMEMBER
 }
 
 export interface GroupNotify {
-    time: number;  // 自己添加的字段，时间戳，毫秒, 用于判断收到短时间内收到重复的notify
-    seq: string; // 唯一标识符，转成数字再除以1000应该就是时间戳？
-    type: GroupNotifyTypes;
-    status: GroupNotifyStatus;  // 0是已忽略？，1是未处理，2是已同意
+    seq: string; // 通知序列号
+    type: GroupNotifyMsgType;
+    status: GroupNotifyMsgStatus;
     group: { groupCode: string; groupName: string };
     user1: { uid: string; nickName: string }; // 被设置管理员的人
     user2: { uid: string; nickName: string };  // 操作者
     actionUser: { uid: string; nickName: string }; //未知
     actionTime: string;
     invitationExt: {
-        srcType: number;  // 0?未知
-        groupCode: string; waitStatus: number
+        srcType: GroupInviteType;  // 邀请来源
+        groupCode: string;
+        waitStatus: GroupInviteStatus
     };
     postscript: string;  // 加群用户填写的验证信息
     repeatSeqs: [];
@@ -64,6 +86,7 @@ export enum BuddyReqType {
 }
 
 export interface FriendRequest {
+    isBuddy?: boolean;
     isInitiator?: boolean;
     isDecide: boolean;
     friendUid: 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,
-    title: string,
-    image?: string,
+    audio?: string,
+    title?: string,
+    image: string,
     singer?: string
 }
 

src/core/entities/user.ts

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

src/core/entities/webapi.ts

@@ -57,7 +57,7 @@ export interface WebApiGroupMemberRet {
 
 export interface WebApiGroupNoticeFeed {
     u: number;//发送者
-    fid: string;//fid
+    fid: string;//fid,notice_id
     pubt: number;//时间
     msg: {
         text: string

src/core/external/appid.json

@@ -1,30 +1,54 @@
 {
-    "3.2.12-27187": {
-        "appid": 537240645,
-        "qua": "V1_LNX_NQ_3.2.12_27187_GW_B"
+    "9.9.15-28060": {
+        "appid": 537246092,
+        "qua": "V1_WIN_NQ_9.9.15_28060_GW_B"
     },
-    "3.2.12-27206": {
-        "appid": 537240645,
-        "qua": "V1_LNX_NQ_3.2.12_27206_GW_B"
+    "9.9.15-28131": {
+        "appid": 537246092,
+        "qua": "V1_WIN_NQ_9.9.15_28131_GW_B"
     },
-    "3.2.12-27254":{
-        "appid": 537240795,
-        "qua": "V1_LNX_NQ_3.2.12_27254_GW_B"
+    "3.2.12-28060": {
+        "appid": 537246140,
+        "qua": "V1_LNX_NQ_3.2.12_28060_GW_B"
     },
-    "9.9.15-27187":{
-        "appid": 537240610,
-        "qua": "V1_WIN_NQ_9.9.15_27187_GW_B"
+    "3.2.12-28131": {
+        "appid": 537246140,
+        "qua": "V1_LNX_NQ_3.2.12_28131_GW_B"
     },
-    "9.9.15-27206":{
-        "appid": 537240610,
-        "qua": "V1_WIN_NQ_9.9.15_27206_GW_B"
+    "6.9.55-28131": {
+        "appid": 537246115,
+        "qua": "V1_MAC_NQ_6.9.55_28131_GW_B"
     },
-    "9.9.15-27254":{
-        "appid": 537240709,
-        "qua": "V1_WIN_NQ_9.9.15_27254_GW_B"
+    "9.9.15-28327": {
+        "appid": 537249321,
+        "qua": "V1_WIN_NQ_9.9.15_28327_GW_B"
     },
-    "9.9.15-27333": {
-        "appid": 537240709,
-        "qua": "V1_WIN_NQ_9.9.15_27333_GW_B"
+    "3.2.12-28327": {
+        "appid": 537249393,
+        "qua": "V1_LNX_NQ_3.2.12_28327_GW_B"
+    },
+    "9.9.15-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"
     }
 }

src/core/external/napcat.json

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

src/core/external/offset.json

@@ -0,0 +1,22 @@
+{
+    "3.2.12-28418-x64": {
+        "recv": "A0723E0",
+        "send": "A06EAE0"
+    },
+    "9.9.15-28418-x64": {
+        "recv": "37A9004",
+        "send": "37A4BD0"
+    },
+    "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"
+    }
+}

src/core/external/proto/EmojiLikeToOthers.proto

@@ -0,0 +1,31 @@
+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

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

src/core/external/proto/ProfileLikeTip.proto

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

src/core/external/proto/SysMessage.proto

@@ -0,0 +1,36 @@
+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/config.ts

@@ -1,13 +1,11 @@
-import { ConfigBase } from "@/common/utils/ConfigBase";
+import { ConfigBase } from '@/common/config-base';
 import napCatDefaultConfig from '@/core/external/napcat.json';
 import { NapCatCore } from '@/core';
 
-// eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
 export type NapCatConfig = typeof napCatDefaultConfig;
 
-// eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
 export class NapCatConfigLoader extends ConfigBase<NapCatConfig> {
-    constructor(coreContext: NapCatCore, configPath: string) {
-        super('napcat', coreContext, configPath);
+    constructor(core: NapCatCore, configPath: string) {
+        super('napcat', core, configPath);
     }
 }

src/core/helper/rkey.ts

@@ -1,5 +1,5 @@
-import { LogWrapper } from '@/common/utils/log';
-import { RequestUtil } from '@/common/utils/request';
+import { LogWrapper } from '@/common/log';
+import { RequestUtil } from '@/common/request';
 
 interface ServerRkeyData {
     group_rkey: string;
@@ -8,7 +8,7 @@ interface ServerRkeyData {
 }
 
 export class RkeyManager {
-    serverUrl: string = '';
+    serverUrl: string[] = [];
     logger: LogWrapper;
     private rkeyData: ServerRkeyData = {
         group_rkey: '',
@@ -16,7 +16,7 @@ export class RkeyManager {
         expired_time: 0,
     };
 
-    constructor(serverUrl: string, logger: LogWrapper) {
+    constructor(serverUrl: string[], logger: LogWrapper) {
         this.logger = logger;
         this.serverUrl = serverUrl;
     }
@@ -26,7 +26,8 @@ export class RkeyManager {
             try {
                 await this.refreshRkey();
             } catch (e) {
-                this.logger.logError('获取rkey失败', e);
+                throw new Error(`获取rkey失败: ${e}`);//外抛
+                //this.logger.logError.bind(this.logger)('获取rkey失败', e);
             }
         }
         return this.rkeyData;
@@ -40,6 +41,22 @@ export class RkeyManager {
 
     async refreshRkey(): Promise<any> {
         //刷新rkey
-        this.rkeyData = await RequestUtil.HttpGetJson<ServerRkeyData>(this.serverUrl, 'GET');
+        for (const url of this.serverUrl) {
+            try {
+                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.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

@@ -1,5 +1,334 @@
-export * from './core';
+import {
+    NTQQFileApi,
+    NTQQFriendApi,
+    NTQQGroupApi,
+    NTQQMsgApi,
+    NTQQSystemApi,
+    NTQQUserApi,
+    NTQQWebApi,
+} from '@/core/apis';
+import { NTQQCollectionApi } from '@/core/apis/collection';
+import {
+    NodeIQQNTWrapperSession,
+    NodeQQNTWrapperUtil,
+    PlatformType,
+    VendorType,
+    WrapperNodeApi,
+    WrapperSessionInitConfig,
+} from '@/core/wrapper';
+import { LogLevel, LogWrapper } from '@/common/log';
+import { NodeIKernelLoginService } from '@/core/services';
+import { QQBasicInfoWrapper } from '@/common/qq-basic-info';
+import { NapCatPathWrapper } from '@/common/path';
+import path from 'node:path';
+import fs from 'node:fs';
+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';
 export * from './listeners';
+
+export enum NapCatCoreWorkingEnv {
+    Unknown = 0,
+    Shell = 1,
+    Framework = 2,
+}
+
+export function loadQQWrapper(QQVersion: string): WrapperNodeApi {
+    let appPath;
+    if (os.platform() === 'darwin') {
+        appPath = path.resolve(path.dirname(process.execPath), '../Resources/app');
+    } else if (os.platform() === 'linux') {
+        appPath = path.resolve(path.dirname(process.execPath), './resources/app');
+    } else {
+        appPath = path.resolve(path.dirname(process.execPath), `./versions/${QQVersion}/`);
+    }
+    let wrapperNodePath = path.resolve(appPath, 'wrapper.node');
+    if (!fs.existsSync(wrapperNodePath)) {
+        wrapperNodePath = path.join(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 class NapCatCore {
+    readonly context: InstanceContext;
+    readonly apis: StableNTApiWrapper;
+    readonly eventWrapper: NTEventWrapper;
+    // readonly eventChannel: NTEventChannel;
+    NapCatDataPath: string;
+    NapCatTempPath: string;
+    // runtime info, not readonly
+    selfInfo: SelfInfo;
+    util: NodeQQNTWrapperUtil;
+    configLoader: NapCatConfigLoader;
+
+    // 通过构造器递过去的 runtime info 应该尽量少
+    constructor(context: InstanceContext, selfInfo: SelfInfo) {
+        this.selfInfo = selfInfo;
+        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.NapCatDataPath = path.join(this.dataPath, 'NapCat');
+        fs.mkdirSync(this.NapCatDataPath, { recursive: true });
+        this.NapCatTempPath = path.join(this.NapCatDataPath, 'temp');
+        // 创建临时目录
+        if (!fs.existsSync(this.NapCatTempPath)) {
+            fs.mkdirSync(this.NapCatTempPath, { recursive: true });
+        }
+       
+        this.initNapCatCoreListeners().then().catch(this.context.logger.logError.bind(this.context.logger));
+
+        this.context.logger.setFileLogEnabled(
+            this.configLoader.configData.fileLog,
+        );
+        this.context.logger.setConsoleLogEnabled(
+            this.configLoader.configData.consoleLog,
+        );
+        this.context.logger.setFileAndConsoleLogLevel(
+            this.configLoader.configData.fileLogLevel as LogLevel,
+            this.configLoader.configData.consoleLogLevel as LogLevel,
+        );
+    }
+
+    get dataPath(): string {
+        let result = this.context.wrapper.NodeQQNTWrapperUtil.getNTUserDataInfoConfig();
+        if (!result) {
+            result = path.resolve(os.homedir(), './.config/QQ');
+            fs.mkdirSync(result, { recursive: true });
+        }
+        return result;
+    }
+
+    // Renamed from 'InitDataListener'
+    async initNapCatCoreListeners() {
+        const msgListener = new NodeIKernelMsgListener();
+        msgListener.onKickedOffLine = (Info: KickedOffLineInfo) => {
+            // 下线通知
+            this.context.logger.logError.bind(this.context.logger)('[KickedOffLine] [' + Info.tipsTitle + '] ' + Info.tipsDesc);
+            this.selfInfo.online = false;
+        };
+        msgListener.onRecvMsg = (msgs) => {
+            msgs.forEach(msg => this.context.logger.logMessage(msg, this.selfInfo));
+        };
+        msgListener.onAddSendMsg = (msg) => {
+            this.context.logger.logMessage(msg, this.selfInfo);
+        };
+        //await sleep(2500);
+        this.context.session.getMsgService().addKernelMsgListener(
+            proxiedListenerOf(msgListener, this.context.logger) as any,
+        );
+
+        const profileListener = new NodeIKernelProfileListener();
+        profileListener.onProfileDetailInfoChanged = (profile) => {
+            if (profile.uid === this.selfInfo.uid) {
+                Object.assign(this.selfInfo, profile);
+            }
+        };
+        profileListener.onSelfStatusChanged = (Info: SelfStatusInfo) => {
+            if (Info.status == 20) {
+                this.selfInfo.online = false;
+                this.context.logger.log("账号状态变更为离线");
+            } else {
+                this.selfInfo.online = true;
+            }
+        };
+        this.context.session.getProfileService().addKernelProfileListener(
+            proxiedListenerOf(profileListener, this.context.logger),
+        );
+
+        // 群相关
+        const groupListener = new NodeIKernelGroupListener();
+        groupListener.onGroupListUpdate = (updateType, groupList) => {
+            // console.log("onGroupListUpdate", updateType, groupList)
+            groupList.map(g => {
+                const existGroup = this.apis.GroupApi.groupCache.get(g.groupCode);
+                //群成员数量变化 应该刷新缓存
+                if (existGroup && g.memberCount === existGroup.memberCount) {
+                    Object.assign(existGroup, g);
+                } else {
+                    this.apis.GroupApi.groupCache.set(g.groupCode, g);
+                    // 获取群成员
+                }
+                const sceneId = this.context.session.getGroupService().createMemberListScene(g.groupCode, 'groupMemberList_MainWindow');
+                this.context.session.getGroupService().getNextMemberList(sceneId, undefined, 3000).then( /* r => {
+                    // console.log(`get group ${g.groupCode} members`, r);
+                    // r.result.infos.forEach(member => {
+                    // });
+                    // groupMembers.set(g.groupCode, r.result.infos);
+                } */);
+                this.context.session.getGroupService().destroyMemberListScene(sceneId);
+            });
+        };
+        groupListener.onMemberListChange = (arg) => {
+            // todo: 应该加一个内部自己维护的成员变动callback，用于判断成员变化通知
+            const groupCode = arg.sceneId.split('_')[0];
+            if (this.apis.GroupApi.groupMemberCache.has(groupCode)) {
+                const existMembers = this.apis.GroupApi.groupMemberCache.get(groupCode)!;
+                arg.infos.forEach((member, uid) => {
+                    //console.log('onMemberListChange', member);
+                    const existMember = existMembers.get(uid);
+                    if (existMember) {
+                        Object.assign(existMember, member);
+                    } else {
+                        existMembers!.set(uid, member);
+                    }
+                    //移除成员
+                    if (member.isDelete) {
+                        existMembers.delete(uid);
+                    }
+                });
+            } else {
+                this.apis.GroupApi.groupMemberCache.set(groupCode, arg.infos);
+            }
+        };
+        groupListener.onMemberInfoChange = (groupCode, dataSource, members) => {
+            if (dataSource === DataSource.LOCAL && members.get(this.selfInfo.uid)?.isDelete) {
+                // 自身退群或者被踢退群 5s用于Api操作 之后不再出现
+                setTimeout(() => {
+                    this.apis.GroupApi.groupCache.delete(groupCode);
+                }, 5000);
+
+            }
+            const existMembers = this.apis.GroupApi.groupMemberCache.get(groupCode);
+            if (existMembers) {
+                members.forEach((member, uid) => {
+                    const existMember = existMembers.get(uid);
+                    if (existMember) {
+                        // 检查管理变动
+                        member.isChangeRole = this.checkAdminEvent(groupCode, member, existMember);
+                        // 更新成员信息
+                        Object.assign(existMember, member);
+                    } else {
+                        existMembers.set(uid, member);
+                    }
+                    //移除成员
+                    if (member.isDelete) {
+                        existMembers.delete(uid);
+                    }
+                });
+            } else {
+                this.apis.GroupApi.groupMemberCache.set(groupCode, members);
+            }
+        };
+        this.context.session.getGroupService().addKernelGroupListener(
+            proxiedListenerOf(groupListener, this.context.logger) as any,
+        );
+    }
+
+    checkAdminEvent(groupCode: string, memberNew: GroupMember, memberOld: GroupMember | undefined): boolean {
+        if (memberNew.role !== memberOld?.role) {
+            this.context.logger.logDebug(`群 ${groupCode} ${memberNew.nick} 角色变更为 ${memberNew.role === 3 ? '管理员' : '群员'}`);
+            return true;
+        }
+        return false;
+    }
+}
+
+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 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,
+        a2: '',
+        d2: '',
+        d2Key: '',
+        machineId: '',
+        platform: systemPlatform,  // 3是Windows? 
+        platVer: systemVersion,  // 系统版本号, 应该可以固定
+        appid: QQVersionAppid,
+        rdeliveryConfig: {
+            appKey: '',
+            systemId: 0,
+            appId: '',
+            logicEnvironment: '',
+            platform: systemPlatform,
+            language: '',
+            sdkVersion: '',
+            userId: '',
+            appVersion: '',
+            osVersion: '',
+            bundleId: '',
+            serverUrl: '',
+            fixedAfterHitKeys: [''],
+        },
+        defaultFileDownloadPath: downloadPath,
+        deviceInfo: {
+            guid,
+            buildVer: QQVersion,
+            localId: 2052,
+            devName: hostname,
+            devType: systemName,
+            vendorName: '',
+            osVer: systemVersion,
+            vendorOsName: systemName,
+            setMute: false,
+            vendorType: VendorType.KNOSETONIOS,
+        },
+        deviceConfig: '{"appearance":{"isSplitViewMode":true},"msg":{}}',
+    };
+}
+
+export interface InstanceContext {
+    readonly workingEnv: NapCatCoreWorkingEnv;
+    readonly wrapper: WrapperNodeApi;
+    readonly session: NodeIQQNTWrapperSession;
+    readonly logger: LogWrapper;
+    readonly loginService: NodeIKernelLoginService;
+    readonly basicInfoWrapper: QQBasicInfoWrapper;
+    readonly pathWrapper: NapCatPathWrapper;
+}
+
+export interface StableNTApiWrapper {
+    FileApi: NTQQFileApi,
+    SystemApi: NTQQSystemApi,
+    PacketApi: NTQQPacketApi,
+    CollectionApi: NTQQCollectionApi,
+    WebApi: NTQQWebApi,
+    FriendApi: NTQQFriendApi,
+    MsgApi: NTQQMsgApi,
+    UserApi: NTQQUserApi,
+    GroupApi: NTQQGroupApi
+}

src/core/listeners/NodeIKernelBuddyListener.ts

@@ -1,53 +1,9 @@
 import { BuddyCategoryType, FriendRequestNotify } from '@/core/entities';
 
-export type OnBuddyChangeParams = BuddyCategoryType[]
+export type OnBuddyChangeParams = BuddyCategoryType[];
 
-interface IBuddyListener {
-    onBuddyListChangedV2(arg: unknown): void,//V2版本 还没兼容
-
-    onBuddyListChange(arg: OnBuddyChangeParams): void,
-
-    onBuddyInfoChange(arg: unknown): void,
-
-    onBuddyDetailInfoChange(arg: unknown): void,
-
-    onNickUpdated(arg: unknown): void,
-
-    onBuddyRemarkUpdated(arg: unknown): void,
-
-    onAvatarUrlUpdated(arg: unknown): void,
-
-    onBuddyReqChange(arg: FriendRequestNotify): void,
-
-    onBuddyReqUnreadCntChange(arg: unknown): void,
-
-    onCheckBuddySettingResult(arg: unknown): void,
-
-    onAddBuddyNeedVerify(arg: unknown): void,
-
-    onSmartInfos(arg: unknown): void,
-
-    onSpacePermissionInfos(arg: unknown): void,
-
-    onDoubtBuddyReqChange(arg: unknown): void,
-
-    onDoubtBuddyReqUnreadNumChange(arg: unknown): void,
-
-    onBlockChanged(arg: unknown): void,
-
-    onAddMeSettingChanged(arg: unknown): void,
-
-    onDelBatchBuddyInfos(arg: unknown): void
-}
-
-export interface NodeIKernelBuddyListener extends IBuddyListener {
-    // eslint-disable-next-line @typescript-eslint/no-misused-new
-    new(listener: IBuddyListener): NodeIKernelBuddyListener;
-}
-
-export class BuddyListener implements IBuddyListener {
+export class NodeIKernelBuddyListener {
     onBuddyListChangedV2(arg: unknown): void {
-        //throw new Error('Method not implemented.');
     }
 
     onAddBuddyNeedVerify(arg: unknown) {

src/core/listeners/NodeIKernelFileAssistantListener.ts

@@ -1,22 +1,13 @@
-export interface IKernelFileAssistantListener {
-    onFileStatusChanged(...args: unknown[]): unknown;
-
-    onSessionListChanged(...args: unknown[]): unknown;
-
-    onSessionChanged(...args: unknown[]): unknown;
-
-    onFileListChanged(...args: unknown[]): unknown;
-
-    onFileSearch(...args: unknown[]): unknown;
-}
-
-export interface NodeIKernelFileAssistantListener extends IKernelFileAssistantListener {
-    // eslint-disable-next-line @typescript-eslint/no-misused-new
-    new(adapter: IKernelFileAssistantListener): NodeIKernelFileAssistantListener;
-}
-
-export class KernelFileAssistantListener implements IKernelFileAssistantListener {
-    onFileStatusChanged(...args: unknown[]) {
+export class NodeIKernelFileAssistantListener {
+    onFileStatusChanged(fileStatus: {
+        id: string,
+        fileStatus: number,
+        fileProgress: `${number}`,
+        fileSize: `${number}`,
+        fileSpeed: number,
+        thumbPath: string | null,
+        filePath: string | null,
+    }) {
     }
 
     onSessionListChanged(...args: unknown[]) {
@@ -28,6 +19,42 @@ export class KernelFileAssistantListener implements IKernelFileAssistantListener
     onFileListChanged(...args: unknown[]) {
     }
 
-    onFileSearch(...args: unknown[]) {
+    onFileSearch(searchResult: SearchResultWrapper) {
     }
 }
+
+export type SearchResultWrapper = {
+    searchId: number,
+    resultId: number,
+    hasMore: boolean,
+    resultItems: SearchResultItem[],
+};
+
+export type SearchResultItem = {
+    id: string,
+    fileName: string,
+    fileNameHits: string[],
+    fileStatus: number,
+    fileSize: string,
+    isSend: boolean,
+    source: number,
+    fileTime: string,
+    expTime: string,
+    session: {
+        context: null,
+        uid: string,
+        nick: string,
+        remark: string,
+        memberCard: string,
+        groupCode: string,
+        groupName: string,
+        groupRemark: string,
+        count: number,
+    },
+    thumbPath: string,
+    filePath: string,
+    msgId: string,
+    chatType: number,
+    peerUid: string,
+    fileType: number,
+};

src/core/listeners/NodeIKernelGroupListener.ts

@@ -1,68 +1,7 @@
-import { Group, GroupListUpdateType, GroupMember, GroupNotify } from '@/core/entities';
+import { DataSource, Group, GroupListUpdateType, GroupMember, GroupNotify } from '@/core/entities';
 
-export interface IGroupListener {
-    onGroupListUpdate(updateType: GroupListUpdateType, groupList: Group[]): void;
-
-    onGroupExtListUpdate(...args: unknown[]): void;
-
-    onGroupSingleScreenNotifies(doubt: boolean, seq: string, notifies: GroupNotify[]): void;
-
-    onGroupNotifiesUpdated(dboubt: boolean, notifies: GroupNotify[]): void;
-
-    onGroupNotifiesUnreadCountUpdated(...args: unknown[]): void;
-
-    onGroupDetailInfoChange(...args: unknown[]): void;
-
-    onGroupAllInfoChange(...args: unknown[]): void;
-
-    onGroupsMsgMaskResult(...args: unknown[]): void;
-
-    onGroupConfMemberChange(...args: unknown[]): void;
-
-    onGroupBulletinChange(...args: unknown[]): void;
-
-    onGetGroupBulletinListResult(...args: unknown[]): void;
-
-    onMemberListChange(arg: {
-        sceneId: string,
-        ids: string[],
-        infos: Map<string, GroupMember>,
-        finish: boolean,
-        hasRobot: boolean
-    }): void;
-
-    onMemberInfoChange(groupCode: string, changeType: number, members: Map<string, GroupMember>): void;
-
-    onSearchMemberChange(...args: unknown[]): void;
-
-    onGroupBulletinRichMediaDownloadComplete(...args: unknown[]): void;
-
-    onGroupBulletinRichMediaProgressUpdate(...args: unknown[]): void;
-
-    onGroupStatisticInfoChange(...args: unknown[]): void;
-
-    onJoinGroupNotify(...args: unknown[]): void;
-
-    onShutUpMemberListChanged(...args: unknown[]): void;
-
-    onGroupBulletinRemindNotify(...args: unknown[]): void;
-
-    onGroupFirstBulletinNotify(...args: unknown[]): void;
-
-    onJoinGroupNoVerifyFlag(...args: unknown[]): void;
-
-    onGroupArkInviteStateResult(...args: unknown[]): void;
-
-    // 发现于Win 9.9.9 23159
-    onGroupMemberLevelInfoChange(...args: unknown[]): void;
-}
-
-export interface NodeIKernelGroupListener extends IGroupListener {
-    // eslint-disable-next-line @typescript-eslint/no-misused-new
-    new(listener: IGroupListener): NodeIKernelGroupListener;
-}
-
-export class GroupListener implements IGroupListener {
+export class NodeIKernelGroupListener {
+    onGroupListInited(listEmpty: boolean): void { }
     // 发现于Win 9.9.9 23159
     onGroupMemberLevelInfoChange(...args: unknown[]): void {
 
@@ -125,7 +64,7 @@ export class GroupListener implements IGroupListener {
     onJoinGroupNoVerifyFlag(...args: unknown[]) {
     }
 
-    onMemberInfoChange(groupCode: string, changeType: number, members: Map<string, GroupMember>) {
+    onMemberInfoChange(groupCode: string, dateSource: DataSource, members: Map<string, GroupMember>) {
     }
 
     onMemberListChange(arg: {
@@ -142,102 +81,4 @@ export class GroupListener implements IGroupListener {
 
     onShutUpMemberListChanged(...args: unknown[]) {
     }
-}
-
-export class DebugGroupListener implements IGroupListener {
-    onGroupMemberLevelInfoChange(...args: unknown[]): void {
-        console.log('onGroupMemberLevelInfoChange:', ...args);
-    }
-
-    onGetGroupBulletinListResult(...args: unknown[]) {
-        console.log('onGetGroupBulletinListResult:', ...args);
-    }
-
-    onGroupAllInfoChange(...args: unknown[]) {
-        console.log('onGroupAllInfoChange:', ...args);
-    }
-
-    onGroupBulletinChange(...args: unknown[]) {
-        console.log('onGroupBulletinChange:', ...args);
-    }
-
-    onGroupBulletinRemindNotify(...args: unknown[]) {
-        console.log('onGroupBulletinRemindNotify:', ...args);
-    }
-
-    onGroupArkInviteStateResult(...args: unknown[]) {
-        console.log('onGroupArkInviteStateResult:', ...args);
-    }
-
-    onGroupBulletinRichMediaDownloadComplete(...args: unknown[]) {
-        console.log('onGroupBulletinRichMediaDownloadComplete:', ...args);
-    }
-
-    onGroupConfMemberChange(...args: unknown[]) {
-        console.log('onGroupConfMemberChange:', ...args);
-    }
-
-    onGroupDetailInfoChange(...args: unknown[]) {
-        console.log('onGroupDetailInfoChange:', ...args);
-    }
-
-    onGroupExtListUpdate(...args: unknown[]) {
-        console.log('onGroupExtListUpdate:', ...args);
-    }
-
-    onGroupFirstBulletinNotify(...args: unknown[]) {
-        console.log('onGroupFirstBulletinNotify:', ...args);
-    }
-
-    onGroupListUpdate(...args: unknown[]) {
-        console.log('onGroupListUpdate:', ...args);
-    }
-
-    onGroupNotifiesUpdated(...args: unknown[]) {
-        console.log('onGroupNotifiesUpdated:', ...args);
-    }
-
-    onGroupBulletinRichMediaProgressUpdate(...args: unknown[]) {
-        console.log('onGroupBulletinRichMediaProgressUpdate:', ...args);
-    }
-
-    onGroupNotifiesUnreadCountUpdated(...args: unknown[]) {
-        console.log('onGroupNotifiesUnreadCountUpdated:', ...args);
-    }
-
-    onGroupSingleScreenNotifies(doubt: boolean, seq: string, notifies: GroupNotify[]) {
-        console.log('onGroupSingleScreenNotifies:');
-    }
-
-    onGroupsMsgMaskResult(...args: unknown[]) {
-        console.log('onGroupsMsgMaskResult:', ...args);
-    }
-
-    onGroupStatisticInfoChange(...args: unknown[]) {
-        console.log('onGroupStatisticInfoChange:', ...args);
-    }
-
-    onJoinGroupNotify(...args: unknown[]) {
-        console.log('onJoinGroupNotify:', ...args);
-    }
-
-    onJoinGroupNoVerifyFlag(...args: unknown[]) {
-        console.log('onJoinGroupNoVerifyFlag:', ...args);
-    }
-
-    onMemberInfoChange(groupCode: string, changeType: number, members: Map<string, GroupMember>) {
-        console.log('onMemberInfoChange:', groupCode, changeType, members);
-    }
-
-    onMemberListChange(...args: unknown[]) {
-        console.log('onMemberListChange:', ...args);
-    }
-
-    onSearchMemberChange(...args: unknown[]) {
-        console.log('onSearchMemberChange:', ...args);
-    }
-
-    onShutUpMemberListChanged(...args: unknown[]) {
-        console.log('onShutUpMemberListChanged:', ...args);
-    }
-}
+}

src/core/listeners/NodeIKernelLoginListener.ts

@@ -1,45 +1,4 @@
-export interface IKernelLoginListener {
-    onLoginConnected(...args: any[]): void;
-
-    onLoginDisConnected(...args: any[]): void;
-
-    onLoginConnecting(...args: any[]): void;
-
-    onQRCodeGetPicture(...args: any[]): void;
-
-    onQRCodeLoginPollingStarted(...args: any[]): void;
-
-    onQRCodeSessionUserScaned(...args: any[]): void;
-
-    onQRCodeLoginSucceed(...args: any[]): void;
-
-    onQRCodeSessionFailed(...args: any[]): void;
-
-    onLoginFailed(...args: any[]): void;
-
-    onLogoutSucceed(...args: any[]): void;
-
-    onLogoutFailed(...args: any[]): void;
-
-    onUserLoggedIn(...args: any[]): void;
-
-    onQRCodeSessionQuickLoginFailed(...args: any[]): void;
-
-    onPasswordLoginFailed(...args: any[]): void;
-
-    OnConfirmUnusualDeviceFailed(...args: any[]): void;
-
-    onQQLoginNumLimited(...args: any[]): void;
-
-    onLoginState(...args: any[]): void;
-}
-
-export interface NodeIKernelLoginListener {
-    // eslint-disable-next-line @typescript-eslint/no-misused-new
-    new(listener: IKernelLoginListener): NodeIKernelLoginListener;
-}
-
-export class LoginListener implements IKernelLoginListener {
+export class NodeIKernelLoginListener {
     onLoginConnected(...args: any[]): void {
     }
 

src/core/listeners/NodeIKernelMsgListener.ts

@@ -1,4 +1,5 @@
 import { ChatType, RawMessage } from '@/core/entities';
+import { CommonFileInfo } from '@/core';
 
 export interface OnRichMediaDownloadCompleteParams {
     fileModelId: string,
@@ -15,7 +16,7 @@ export interface OnRichMediaDownloadCompleteParams {
     totalSize: string,
     trasferStatus: number,
     step: number,
-    commonFileInfo: unknown | null,
+    commonFileInfo?: CommonFileInfo,
     fileSrvErrCode: string,
     clientMsg: string,
     businessId: number,
@@ -23,12 +24,52 @@ export interface OnRichMediaDownloadCompleteParams {
     userUsedSpacePerDay: unknown | null
 }
 
-export interface onGroupFileInfoUpdateParamType {
+export interface GroupFileInfoUpdateParamType {
     retCode: number;
     retMsg: string;
     clientWording: string;
     isEnd: boolean;
-    item: Array<any>;
+    item: Array<{
+        peerId: string;
+        type: number;
+        folderInfo?: {
+            folderId: string;
+            parentFolderId: string;
+            folderName: string;
+            createTime: number;
+            modifyTime: number;
+            createUin: string;
+            creatorName: string;
+            totalFileCount: number;
+            modifyUin: string;
+            modifyName: string;
+            usedSpace: string;
+        },
+        fileInfo?: {
+            fileModelId: string;
+            fileId: string;
+            fileName: string;
+            fileSize: string;
+            busId: number;
+            uploadedSize: string;
+            uploadTime: number;
+            deadTime: number;
+            modifyTime: number;
+            downloadTimes: number;
+            sha: string;
+            sha3: string;
+            md5: string;
+            uploaderLocalPath: string;
+            uploaderName: string;
+            uploaderUin: string;
+            parentFolderId: string;
+            localPath: string;
+            transStatus: number;
+            transType: number;
+            elementId: string;
+            isFolder: boolean;
+        },
+    }>;
     allFileCount: string;
     nextIndex: string;
     reqId: string;
@@ -52,199 +93,7 @@ export interface TempOnRecvParams {
 
 }
 
-export interface IKernelMsgListener {
-    onAddSendMsg(msgRecord: RawMessage): void;
-
-    onBroadcastHelperDownloadComplete(broadcastHelperTransNotifyInfo: unknown): void;
-
-    onBroadcastHelperProgressUpdate(broadcastHelperTransNotifyInfo: unknown): void;
-
-    onChannelFreqLimitInfoUpdate(contact: unknown, z: unknown, freqLimitInfo: unknown): void;
-
-    onContactUnreadCntUpdate(hashMap: unknown): void;
-
-    onCustomWithdrawConfigUpdate(customWithdrawConfig: unknown): void;
-
-    onDraftUpdate(contact: unknown, arrayList: unknown, j2: unknown): void;
-
-    onEmojiDownloadComplete(emojiNotifyInfo: unknown): void;
-
-    onEmojiResourceUpdate(emojiResourceInfo: unknown): void;
-
-    onFeedEventUpdate(firstViewDirectMsgNotifyInfo: unknown): void;
-
-    onFileMsgCome(arrayList: unknown): void;
-
-    onFirstViewDirectMsgUpdate(firstViewDirectMsgNotifyInfo: unknown): void;
-
-    onFirstViewGroupGuildMapping(arrayList: unknown): void;
-
-    onGrabPasswordRedBag(i2: unknown, str: unknown, i3: unknown, recvdOrder: unknown, msgRecord: unknown): void;
-
-    onGroupFileInfoAdd(groupItem: unknown): void;
-
-    onGroupFileInfoUpdate(groupFileListResult: onGroupFileInfoUpdateParamType): void;
-
-    onGroupGuildUpdate(groupGuildNotifyInfo: unknown): void;
-
-    onGroupTransferInfoAdd(groupItem: unknown): void;
-
-    onGroupTransferInfoUpdate(groupFileListResult: unknown): void;
-
-    onGuildInteractiveUpdate(guildInteractiveNotificationItem: unknown): void;
-
-    onGuildMsgAbFlagChanged(guildMsgAbFlag: unknown): void;
-
-    onGuildNotificationAbstractUpdate(guildNotificationAbstractInfo: unknown): void;
-
-    onHitCsRelatedEmojiResult(downloadRelateEmojiResultInfo: unknown): void;
-
-    onHitEmojiKeywordResult(hitRelatedEmojiWordsResult: unknown): void;
-
-    onHitRelatedEmojiResult(relatedWordEmojiInfo: unknown): void;
-
-    onImportOldDbProgressUpdate(importOldDbMsgNotifyInfo: unknown): void;
-
-    onInputStatusPush(inputStatusInfo: {
-        chatType: number;
-        eventType: number;
-        fromUin: string;
-        interval: string;
-        showTime: string;
-        statusText: string;
-        timestamp: string;
-        toUin: string;
-    }): void;
-
-    onKickedOffLine(kickedInfo: unknown): void;
-
-    onLineDev(arrayList: unknown): void;
-
-    onLogLevelChanged(j2: unknown): void;
-
-    onMsgAbstractUpdate(arrayList: unknown): void;
-
-    onMsgBoxChanged(arrayList: unknown): void;
-
-    onMsgDelete(contact: unknown, arrayList: unknown): void;
-
-    onMsgEventListUpdate(hashMap: unknown): void;
-
-    onMsgInfoListAdd(arrayList: unknown): void;
-
-    onMsgInfoListUpdate(msgList: RawMessage[]): void;
-
-    onMsgQRCodeStatusChanged(i2: unknown): void;
-
-    onMsgRecall(i2: unknown, str: unknown, j2: unknown): void;
-
-    onMsgSecurityNotify(msgRecord: unknown): void;
-
-    onMsgSettingUpdate(msgSetting: unknown): void;
-
-    onNtFirstViewMsgSyncEnd(): void;
-
-    onNtMsgSyncEnd(): void;
-
-    onNtMsgSyncStart(): void;
-
-    onReadFeedEventUpdate(firstViewDirectMsgNotifyInfo: unknown): void;
-
-    onRecvGroupGuildFlag(i2: unknown): void;
-
-    onRecvMsg(...arrayList: unknown[]): void;
-
-    onRecvMsgSvrRspTransInfo(j2: unknown, contact: unknown, i2: unknown, i3: unknown, str: unknown, bArr: unknown): void;
-
-    onRecvOnlineFileMsg(arrayList: unknown): void;
-
-    onRecvS2CMsg(arrayList: unknown): void;
-
-    onRecvSysMsg(arrayList: unknown): void;
-
-    onRecvUDCFlag(i2: unknown): void;
-
-    onRichMediaDownloadComplete(fileTransNotifyInfo: OnRichMediaDownloadCompleteParams): void;
-
-    onRichMediaProgerssUpdate(fileTransNotifyInfo: unknown): void;
-
-    onRichMediaUploadComplete(fileTransNotifyInfo: unknown): void;
-
-    onSearchGroupFileInfoUpdate(searchGroupFileResult:
-                                    {
-                                        result: {
-                                            retCode: number,
-                                            retMsg: string,
-                                            clientWording: string
-                                        },
-                                        syncCookie: string,
-                                        totalMatchCount: number,
-                                        ownerMatchCount: number,
-                                        isEnd: boolean,
-                                        reqId: number,
-                                        item: Array<{
-                                            groupCode: string,
-                                            groupName: string,
-                                            uploaderUin: string,
-                                            uploaderName: string,
-                                            matchUin: string,
-                                            matchWords: Array<unknown>,
-                                            fileNameHits: Array<{
-                                                start: number,
-                                                end: number
-                                            }>,
-                                            fileModelId: string,
-                                            fileId: string,
-                                            fileName: string,
-                                            fileSize: string,
-                                            busId: number,
-                                            uploadTime: number,
-                                            modifyTime: number,
-                                            deadTime: number,
-                                            downloadTimes: number,
-                                            localPath: string
-                                        }>
-                                    }): void;
-
-    onSendMsgError(j2: unknown, contact: unknown, i2: unknown, str: unknown): void;
-
-    onSysMsgNotification(i2: unknown, j2: unknown, j3: unknown, arrayList: unknown): void;
-
-    onTempChatInfoUpdate(tempChatInfo: TempOnRecvParams): void;
-
-    onUnreadCntAfterFirstView(hashMap: unknown): void;
-
-    onUnreadCntUpdate(hashMap: unknown): void;
-
-    onUserChannelTabStatusChanged(z: unknown): void;
-
-    onUserOnlineStatusChanged(z: unknown): void;
-
-    onUserTabStatusChanged(arrayList: unknown): void;
-
-    onlineStatusBigIconDownloadPush(i2: unknown, j2: unknown, str: unknown): void;
-
-    onlineStatusSmallIconDownloadPush(i2: unknown, j2: unknown, str: unknown): void;
-
-    // 第一次发现于Linux
-    onUserSecQualityChanged(...args: unknown[]): void;
-
-    onMsgWithRichLinkInfoUpdate(...args: unknown[]): void;
-
-    onRedTouchChanged(...args: unknown[]): void;
-
-    // 第一次发现于Win 9.9.9 23159
-    onBroadcastHelperProgerssUpdate(...args: unknown[]): void;
-
-}
-
-export interface NodeIKernelMsgListener extends IKernelMsgListener {
-    // eslint-disable-next-line @typescript-eslint/no-misused-new
-    new(listener: IKernelMsgListener): NodeIKernelMsgListener;
-}
-
-
-export class MsgListener implements IKernelMsgListener {
+export class NodeIKernelMsgListener {
     onAddSendMsg(msgRecord: RawMessage) {
 
     }
@@ -305,7 +154,7 @@ export class MsgListener implements IKernelMsgListener {
 
     }
 
-    onGroupFileInfoUpdate(groupFileListResult: onGroupFileInfoUpdateParamType) {
+    onGroupFileInfoUpdate(groupFileListResult: GroupFileInfoUpdateParamType) {
 
     }
 
@@ -451,7 +300,7 @@ export class MsgListener implements IKernelMsgListener {
 
     }
 
-    onRecvSysMsg(arrayList: unknown) {
+    onRecvSysMsg(arrayList: Array<number>) {
 
     }
 

src/core/listeners/NodeIKernelProfileListener.ts

@@ -1,25 +1,6 @@
 import { User, UserDetailInfoListenerArg } from '@/core/entities';
 
-interface IProfileListener {
-    onProfileSimpleChanged(...args: unknown[]): void;
-
-    onUserDetailInfoChanged(arg: UserDetailInfoListenerArg): void;
-
-    onProfileDetailInfoChanged(profile: User): void;
-
-    onStatusUpdate(...args: unknown[]): void;
-
-    onSelfStatusChanged(...args: unknown[]): void;
-
-    onStrangerRemarkChanged(...args: unknown[]): void;
-}
-
-export interface NodeIKernelProfileListener extends IProfileListener {
-    // eslint-disable-next-line @typescript-eslint/no-misused-new
-    new(listener: IProfileListener): NodeIKernelProfileListener;
-}
-
-export class ProfileListener implements IProfileListener {
+export class NodeIKernelProfileListener {
     onUserDetailInfoChanged(arg: UserDetailInfoListenerArg): void {
 
     }
@@ -43,4 +24,48 @@ export class ProfileListener implements IProfileListener {
     onStrangerRemarkChanged(...args: unknown[]) {
 
     }
+
+    onMemberListChange(...args: unknown[]) {
+
+    }
+
+    onMemberInfoChange(...args: unknown[]) {
+
+    }
+
+    onGroupListUpdate(...args: unknown[]) {
+
+    }
+
+    onGroupAllInfoChange(...args: unknown[]) {
+
+    }
+
+    onGroupDetailInfoChange(...args: unknown[]) {
+
+    }
+
+    onGroupConfMemberChange(...args: unknown[]) {
+
+    }
+
+    onGroupExtListUpdate(...args: unknown[]) {
+
+    }
+
+    onGroupNotifiesUpdated(...args: unknown[]) {
+
+    }
+
+    onGroupNotifiesUnreadCountUpdated(...args: unknown[]) {
+
+    }
+
+    onGroupMemberLevelInfoChange(...args: unknown[]) {
+
+    }
+
+    onGroupBulletinChange(...args: unknown[]) {
+
+    }
 }

src/core/listeners/NodeIKernelRecentContactListener.ts

@@ -1,28 +1,9 @@
-interface IKernelRecentContactListener {
-    onDeletedContactsNotify(...args: unknown[]): unknown;
-
-    onRecentContactNotification(...args: unknown[]): unknown;
-
-    onMsgUnreadCountUpdate(...args: unknown[]): unknown;
-
-    onGuildDisplayRecentContactListChanged(...args: unknown[]): unknown;
-
-    onRecentContactListChanged(...args: unknown[]): unknown;
-
-    onRecentContactListChangedVer2(...args: unknown[]): unknown;
-}
-
-export interface NodeIKernelRecentContactListener extends IKernelRecentContactListener {
-    // eslint-disable-next-line @typescript-eslint/no-misused-new
-    new(listener: IKernelRecentContactListener): NodeIKernelRecentContactListener;
-}
-
-export class KernelRecentContactListener implements IKernelRecentContactListener {
+export class NodeIKernelRecentContactListener {
     onDeletedContactsNotify(...args: unknown[]) {
 
     }
 
-    onRecentContactNotification(...args: unknown[]) {
+    onRecentContactNotification(msgList: any, arg0: { msgListUnreadCnt: string }, arg1: number) {
 
     }
 

src/core/listeners/NodeIKernelRobotListener.ts

@@ -1,17 +1,4 @@
-export interface IKernelRobotListener {
-    onRobotFriendListChanged(...args: unknown[]): void;
-
-    onRobotListChanged(...args: unknown[]): void;
-
-    onRobotProfileChanged(...args: unknown[]): void;
-}
-
-export interface NodeIKernelRobotListener extends IKernelRobotListener {
-    // eslint-disable-next-line @typescript-eslint/no-misused-new
-    new(adapter: IKernelRobotListener): NodeIKernelRobotListener;
-}
-
-export class KernelRobotListener implements IKernelRobotListener {
+export class NodeIKernelRobotListener {
     onRobotFriendListChanged(...args: unknown[]) {
 
     }

src/core/listeners/NodeIKernelSearchListener.ts

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

src/core/listeners/NodeIKernelSessionListener.ts

@@ -1,23 +1,4 @@
-export interface ISessionListener {
-    onNTSessionCreate(args: unknown): void;
-
-    onGProSessionCreate(args: unknown): void;
-
-    onSessionInitComplete(args: unknown): void;
-
-    onOpentelemetryInit(args: unknown): void;
-
-    onUserOnlineResult(args: unknown): void;
-
-    onGetSelfTinyId(args: unknown): void;
-}
-
-export interface NodeIKernelSessionListener extends ISessionListener {
-    // eslint-disable-next-line @typescript-eslint/no-misused-new
-    new(adapter: ISessionListener): NodeIKernelSessionListener;
-}
-
-export class SessionListener implements ISessionListener {
+export class NodeIKernelSessionListener {
     onNTSessionCreate(args: unknown) {
 
     }

src/core/listeners/NodeIKernelStorageCleanListener.ts

@@ -1,22 +1,4 @@
-export interface IStorageCleanListener {
-    onCleanCacheProgressChanged(args: unknown): void;
-
-    onScanCacheProgressChanged(args: unknown): void;
-
-    onCleanCacheStorageChanged(args: unknown): void;
-
-    onFinishScan(args: unknown): void;
-
-    onChatCleanDone(args: unknown): void;
-
-}
-
-export interface NodeIKernelStorageCleanListener extends IStorageCleanListener {
-    // eslint-disable-next-line @typescript-eslint/no-misused-new
-    new(adapter: IStorageCleanListener): NodeIKernelStorageCleanListener;
-}
-
-export class StorageCleanListener implements IStorageCleanListener {
+export class NodeIKernelStorageCleanListener {
     onCleanCacheProgressChanged(args: unknown) {
 
     }

src/core/listeners/NodeIKernelTicketListener.ts

@@ -1,10 +1,2 @@
-export interface IKernelTicketListener {
-}
-
-export interface NodeIKernelTicketListener extends IKernelTicketListener {
-    // eslint-disable-next-line @typescript-eslint/no-misused-new
-    new(adapter: IKernelTicketListener): NodeIKernelTicketListener;
-}
-
-export class KernelTicketListener implements IKernelTicketListener {
+export class NodeIKernelTicketListener {
 }

src/core/listeners/NodeIO3MiscListener.ts

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

src/core/listeners/index.ts

@@ -9,4 +9,32 @@ export * from './NodeIKernelProfileListener';
 export * from './NodeIKernelTicketListener';
 export * from './NodeIKernelStorageCleanListener';
 export * from './NodeIKernelFileAssistantListener';
+export * from './NodeIKernelSearchListener';
 
+import type {
+    NodeIKernelBuddyListener,
+    NodeIKernelFileAssistantListener,
+    NodeIKernelGroupListener,
+    NodeIKernelLoginListener,
+    NodeIKernelMsgListener,
+    NodeIKernelProfileListener,
+    NodeIKernelRobotListener,
+    NodeIKernelSessionListener,
+    NodeIKernelStorageCleanListener,
+    NodeIKernelTicketListener,
+} from '.';
+import { NodeIKernelSearchListener } from './NodeIKernelSearchListener';
+
+export type ListenerNamingMapping = {
+    NodeIKernelSessionListener: NodeIKernelSessionListener;
+    NodeIKernelLoginListener: NodeIKernelLoginListener;
+    NodeIKernelMsgListener: NodeIKernelMsgListener;
+    NodeIKernelGroupListener: NodeIKernelGroupListener;
+    NodeIKernelBuddyListener: NodeIKernelBuddyListener;
+    NodeIKernelProfileListener: NodeIKernelProfileListener;
+    NodeIKernelRobotListener: NodeIKernelRobotListener;
+    NodeIKernelTicketListener: NodeIKernelTicketListener;
+    NodeIKernelStorageCleanListener: NodeIKernelStorageCleanListener;
+    NodeIKernelFileAssistantListener: NodeIKernelFileAssistantListener;
+    NodeIKernelSearchListener: NodeIKernelSearchListener;
+};

src/core/packet/client.ts

@@ -0,0 +1,180 @@
+import { LogWrapper } from "@/common/log";
+import { LRUCache } from "@/common/lru-cache";
+import WebSocket, { Data } from "ws";
+import crypto, { createHash } from "crypto";
+import { NapCatCore } from "@/core";
+import { PacketHexStr } from "@/core/packet/packer";
+import { sleep } from "@/common/helper";
+
+export interface RecvPacket {
+    type: string, // 仅recv
+    trace_id_md5?: string,
+    data: RecvPacketData
+}
+
+export interface RecvPacketData {
+    seq: number
+    cmd: string
+    hex_data: string
+}
+
+export class PacketClient {
+    private websocket: WebSocket | undefined;
+    private isConnected: boolean = false;
+    private reconnectAttempts: number = 0;
+    private readonly maxReconnectAttempts: number = 60;//现在暂时不可配置
+    private readonly cb = new LRUCache<string, (json: RecvPacketData) => Promise<void>>(500); // trace_id-type callback
+    private readonly clientUrl: string = '';
+    readonly napCatCore: NapCatCore;
+    private readonly logger: LogWrapper;
+
+    constructor(url: string, core: NapCatCore) {
+        this.clientUrl = url;
+        this.napCatCore = core;
+        this.logger = core.context.logger;
+    }
+
+    get available(): boolean {
+        return this.isConnected && this.websocket !== undefined;
+    }
+
+    private randText(len: number) {
+        let text = '';
+        const possible = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+        for (let i = 0; i < len; i++) {
+            text += possible.charAt(Math.floor(Math.random() * possible.length));
+        }
+        return text;
+    }
+
+    connect(cb: any): Promise<void> {
+        return new Promise((resolve, reject) => {
+            //this.logger.log.bind(this.logger)(`[Core] [Packet Server] Attempting to connect to ${this.clientUrl}`);
+            this.websocket = new WebSocket(this.clientUrl);
+            this.websocket.on('error', (err) => { }/*this.logger.logError.bind(this.logger)('[Core] [Packet Server] Error:', err.message)*/);
+
+            this.websocket.onopen = () => {
+                this.isConnected = true;
+                this.reconnectAttempts = 0;
+                this.logger.log.bind(this.logger)(`[Core] [Packet Server] Connected to ${this.clientUrl}`);
+                cb();
+                resolve();
+            };
+
+            this.websocket.onerror = (error) => {
+                //this.logger.logError.bind(this.logger)(`WebSocket error: ${error}`);
+                reject(new Error(`${error.message}`));
+            };
+
+            this.websocket.onmessage = (event) => {
+                // const message = JSON.parse(event.data.toString());
+                // console.log("Received message:", message);
+                this.handleMessage(event.data).then().catch();
+            };
+
+            this.websocket.onclose = () => {
+                this.isConnected = false;
+                //this.logger.logWarn.bind(this.logger)(`[Core] [Packet Server] Disconnected from ${this.clientUrl}`);
+                this.attemptReconnect(cb);
+            };
+        });
+    }
+
+    private attemptReconnect(cb: any): void {
+        try {
+            if (this.reconnectAttempts < this.maxReconnectAttempts) {
+                this.reconnectAttempts++;
+                setTimeout(() => {
+                    this.connect(cb).catch((error) => {
+                        this.logger.logError.bind(this.logger)(`[Core] [Packet Server] Reconnecting attempt failed,${error.message}`);
+                    });
+                }, 5000 * this.reconnectAttempts);
+            } else {
+                this.logger.logError.bind(this.logger)(`[Core] [Packet Server] Max reconnect attempts reached. ${this.clientUrl}`);
+            }
+        } catch (error: any) {
+            this.logger.logError.bind(this.logger)(`Error attempting to reconnect: ${error.message}`);
+        }
+    }
+
+    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);
+    }
+
+    async init(pid: number, recv: string, send: string): Promise<void> {
+        if (!this.isConnected || !this.websocket) {
+            throw new Error("WebSocket is not connected");
+        }
+        const initMessage = {
+            action: 'init',
+            pid: pid,
+            recv: recv,
+            send: send
+        };
+        this.websocket.send(JSON.stringify(initMessage));
+    }
+
+    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.isConnected || !this.websocket) {
+                throw new Error("WebSocket is not connected");
+            }
+            const commandMessage = {
+                action: 'send',
+                cmd: cmd,
+                data: data,
+                trace_id: trace_id
+            };
+            this.websocket.send(JSON.stringify(commandMessage));
+            if (rsp) {
+                this.registerCallback(trace_id, 'recv', async (json: RecvPacketData) => {
+                    clearTimeout(timeoutHandle);
+                    resolve(json);
+                });
+            }
+            this.registerCallback(trace_id, 'send', async (json: RecvPacketData) => {
+                sendcb(json);
+                if (!rsp) {
+                    clearTimeout(timeoutHandle);
+                    resolve(json);
+                }
+            });
+            const timeoutHandle = setTimeout(() => {
+                reject(new Error(`sendCommand timed out after ${timeout} ms for ${cmd} with trace_id ${trace_id}`));
+            }, timeout);
+        });
+    }
+
+    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);
+            }
+            //console.log("Received message:", json);
+        } catch (error) {
+            this.logger.logError.bind(this.logger)(`Error parsing message: ${error}`);
+        }
+    }
+
+    async sendPacket(cmd: string, data: PacketHexStr, rsp = false): Promise<RecvPacketData> {
+        // wtfk tx
+        // 校验失败和异常 可能返回undefined
+        return new Promise((resolve, reject) => {
+            if (!this.available) {
+                this.logger.logError('NapCat.Packet is not init');
+                return undefined;
+            }
+            const md5 = crypto.createHash('md5').update(data).digest('hex');
+            const trace_id = (this.randText(4) + md5 + data).slice(0, data.length / 2);
+            this.sendCommand(cmd, data, trace_id, rsp, 20000, async () => {
+                // await sleep(10);
+                await this.napCatCore.context.session.getMsgService().sendSsoCmdReqByContend(cmd, trace_id);
+            }).then((res) => resolve(res)).catch((e: Error) => reject(e));
+        });
+    }
+}

src/core/packet/highway/client.ts

@@ -0,0 +1,72 @@
+import * as stream from 'node:stream';
+import {ReadStream} from "node:fs";
+import {PacketHighwaySig} from "@/core/packet/highway/session";
+import {HighwayHttpUploader, HighwayTcpUploader} from "@/core/packet/highway/uploader";
+import {LogWrapper} from "@/common/log";
+
+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: LogWrapper;
+
+    constructor(sig: PacketHighwaySig, logger: LogWrapper, 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 = 3600): 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.logError(`[Highway] upload failed: ${e}, fallback to http upload`);
+            try {
+                const httpUploader = new HighwayHttpUploader(trans, this.logger);
+                await httpUploader.upload();
+            } catch (e) {
+                this.logger.logError(`[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/session.ts

@@ -0,0 +1,171 @@
+import * as fs from "node:fs";
+import {ChatType, Peer} from "@/core";
+import {LogWrapper} from "@/common/log";
+import {PacketClient} from "@/core/packet/client";
+import {PacketPacker} from "@/core/packet/packer";
+import {NapProtoMsg} from "@/core/packet/proto/NapProto";
+import {HttpConn0x6ff_501Response} from "@/core/packet/proto/action/action";
+import {PacketHighwayClient} from "@/core/packet/highway/client";
+import {NTV2RichMediaResp} from "@/core/packet/proto/oidb/common/Ntv2.RichMediaResp";
+import {OidbSvcTrpcTcpBaseRsp} from "@/core/packet/proto/oidb/OidbBase";
+import {PacketMsgPicElement} from "@/core/packet/msg/element";
+import {NTV2RichMediaHighwayExt} from "@/core/packet/proto/highway/highway";
+import {int32ip2str, oidbIpv4s2HighwayIpv4s} from "@/core/packet/highway/utils";
+
+export const BlockSize = 1024 * 1024;
+
+interface HighwayServerAddr {
+    ip: string
+    port: number
+}
+
+export interface PacketHighwaySig {
+    uin: string;
+    sigSession: Uint8Array | null
+    sessionKey: Uint8Array | null
+    serverAddr: HighwayServerAddr[]
+}
+
+export class PacketHighwaySession {
+    protected packetClient: PacketClient;
+    protected packetHighwayClient: PacketHighwayClient;
+    protected sig: PacketHighwaySig;
+    protected logger: LogWrapper;
+    protected packer: PacketPacker;
+    private cachedPrepareReq: Promise<void> | null = null;
+
+    constructor(logger: LogWrapper, client: PacketClient, packer: PacketPacker) {
+        this.packetClient = client;
+        this.logger = logger;
+        this.sig = {
+            uin: this.packetClient.napCatCore.selfInfo.uin,
+            sigSession: null,
+            sessionKey: null,
+            serverAddr: [],
+        }
+        this.packer = packer;
+        this.packetHighwayClient = new PacketHighwayClient(this.sig, this.logger);
+    }
+
+    private async checkAvailable() {
+        if (!this.packetClient.available) {
+            this.logger.logError('[Highway] packetServer not available!');
+            throw new Error('packetServer不可用，请参照文档 https://napneko.github.io/config/advanced 检查packetServer状态或进行配置');
+        }
+        if (this.sig.sigSession === null || this.sig.sessionKey === null) {
+            this.logger.logWarn('[Highway] sigSession or sessionKey not available!');
+            if (this.cachedPrepareReq === null) {
+                this.cachedPrepareReq = this.prepareUpload().finally(() => {
+                    this.cachedPrepareReq = null;
+                });
+            }
+            await this.cachedPrepareReq;
+        }
+    }
+
+    private async prepareUpload(): Promise<void> {
+        const packet = this.packer.packHttp0x6ff_501();
+        const req = await this.packetClient.sendPacket('HttpConn.0x6ff_501', packet, true);
+        const rsp = new NapProtoMsg(HttpConn0x6ff_501Response).decode(
+            Buffer.from(req.hex_data, 'hex')
+        );
+        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.logDebug(`[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.uploadGroupImageReq(Number(peer.peerUid), img);
+        } else if (peer.chatType === ChatType.KCHATTYPEC2C) {
+            await this.uploadC2CImageReq(peer.peerUid, img);
+        } else {
+            throw new Error(`[Highway] unsupported chatType: ${peer.chatType}`);
+        }
+    }
+
+    private async uploadGroupImageReq(groupUin: number, img: PacketMsgPicElement): Promise<void> {
+        const preReq = await this.packer.packUploadGroupImgReq(groupUin, img);
+        const preRespRaw = await this.packetClient.sendPacket('OidbSvcTrpcTcp.0x11c4_100', preReq, true);
+        const preResp = new NapProtoMsg(OidbSvcTrpcTcpBaseRsp).decode(
+            Buffer.from(preRespRaw.hex_data, 'hex')
+        );
+        const preRespData = new NapProtoMsg(NTV2RichMediaResp).decode(preResp.body);
+        const ukey = preRespData.upload.uKey;
+        if (ukey && ukey != "") {
+            this.logger.logDebug(`[Highway] 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(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.packetHighwayClient.upload(
+                1004,
+                fs.createReadStream(img.path, {highWaterMark: BlockSize}),
+                img.size,
+                md5,
+                extend
+            );
+        } else {
+            this.logger.logDebug(`[Highway] 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 uploadC2CImageReq(peerUid: string, img: PacketMsgPicElement): Promise<void> {
+        const preReq = await this.packer.packUploadC2CImgReq(peerUid, img);
+        const preRespRaw = await this.packetClient.sendPacket('OidbSvcTrpcTcp.0x11c5_100', preReq, true);
+        const preResp = new NapProtoMsg(OidbSvcTrpcTcpBaseRsp).decode(
+            Buffer.from(preRespRaw.hex_data, 'hex')
+        );
+        const preRespData = new NapProtoMsg(NTV2RichMediaResp).decode(preResp.body);
+        const ukey = preRespData.upload.uKey;
+        if (ukey && ukey != "") {
+            this.logger.logDebug(`[Highway] 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(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.packetHighwayClient.upload(
+                1003,
+                fs.createReadStream(img.path, {highWaterMark: BlockSize}),
+                img.size,
+                md5,
+                extend
+            );
+        }
+        img.msgInfo = preRespData.upload.msgInfo;
+    }
+}

src/core/packet/highway/uploader.ts

@@ -0,0 +1,196 @@
+import * as net from "node:net";
+import * as crypto from "node:crypto";
+import * as http from "node:http";
+import * as stream from "node:stream";
+import {LogWrapper} from "@/common/log";
+import * as tea from "@/core/packet/utils/crypto/tea";
+import {NapProtoMsg} from "@/core/packet/proto/NapProto";
+import {ReqDataHighwayHead, RespDataHighwayHead} from "@/core/packet/proto/highway/highway";
+import {BlockSize} from "@/core/packet/highway/session";
+import {PacketHighwayTrans} from "@/core/packet/highway/client";
+import {Frame} from "@/core/packet/highway/frame";
+
+abstract class HighwayUploader {
+    readonly trans: PacketHighwayTrans;
+    readonly logger: LogWrapper;
+
+    constructor(trans: PacketHighwayTrans, logger: LogWrapper) {
+        this.trans = trans;
+        this.logger = logger;
+    }
+
+    encryptTransExt(key: Uint8Array) {
+        if (!this.trans.encrypt) return;
+        this.trans.ext = tea.encrypt(Buffer.from(this.trans.ext), Buffer.from(key));
+    }
+
+    buildPicUpHead(offset: number, bodyLength: number, bodyMd5: Uint8Array): Uint8Array {
+        return new NapProtoMsg(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>;
+}
+
+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 HighwayUploader {
+    async upload(): Promise<void> {
+        const highwayTransForm = new HighwayTcpUploaderTransform(this);
+        const upload = new Promise<void>((resolve, _) => {
+            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(RespDataHighwayHead).decode(header);
+                if (rsp.errorCode !== 0) {
+                    this.logger.logWarn(`[Highway] tcpUpload failed (code: ${rsp.errorCode})`);
+                }
+                const percent = ((Number(rsp.msgSegHead?.dataOffset) + Number(rsp.msgSegHead?.dataLength)) / Number(rsp.msgSegHead?.filesize)).toFixed(2);
+                this.logger.logDebug(`[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.logDebug('[Highway] tcpUpload finished.');
+                    socket.end();
+                    resolve();
+                }
+            };
+            socket.on('data', (chunk: Buffer) => {
+                try {
+                    const [head, _] = Frame.unpack(chunk);
+                    handleRspHeader(head);
+                } catch (e) {
+                    this.logger.logError(`[Highway] tcpUpload parse response error: ${e}`);
+                }
+            })
+            socket.on('close', () => {
+                this.logger.logDebug('[Highway] tcpUpload socket closed.');
+                resolve();
+            })
+            socket.on('error', (err) => {
+                this.logger.logError('[Highway] tcpUpload socket.on error:', err);
+            })
+            this.trans.data.on('error', (err) => {
+                this.logger.logError('[Highway] tcpUpload readable error:', err);
+                socket.end();
+            })
+        })
+        const timeout = new Promise<void>((_, reject) => {
+            setTimeout(() => {
+                reject(new Error(`[Highway] tcpUpload timeout after ${this.trans.timeout}s`))
+            }, (this.trans.timeout ?? Infinity) * 1000
+            )
+        })
+        await Promise.race([upload, timeout]);
+    }
+}
+
+// TODO: timeout impl
+export class HighwayHttpUploader extends HighwayUploader {
+    async upload(): Promise<void> {
+        let offset = 0;
+        for await (const chunk of this.trans.data) {
+            let block = chunk as Buffer;
+            try {
+                await this.uploadBlock(block, offset);
+            } catch (err) {
+                this.logger.logError(`[Highway] httpUpload Error uploading block at offset ${offset}: ${err}`);
+                throw err;
+            }
+            offset += block.length;
+        }
+    }
+
+    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(RespDataHighwayHead).decode(head);
+        this.logger.logDebug(`[Highway] httpUploadBlock: ${headData.errorCode} | ${headData.msgSegHead?.retCode} | ${headData.bytesRspExtendInfo} | ${head.toString('hex')} | ${body.toString('hex')}`);
+        if (headData.errorCode !== 0) {
+            this.logger.logError(`[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) => {
+                    let data = Buffer.alloc(0);
+                    res.on('data', (chunk) => {
+                        data = Buffer.concat([data, chunk]);
+                    });
+                    res.on('end', () => {
+                        resolve(data);
+                    });
+                });
+                req.write(frame);
+                req.on('error', (error) => {
+                    reject(error);
+                });
+            } catch (error) {
+                reject(error);
+            }
+        });
+    }
+}

src/core/packet/highway/utils.ts

@@ -0,0 +1,20 @@
+import {NapProtoEncodeStructType} from "@/core/packet/proto/NapProto";
+import {IPv4} from "@/core/packet/proto/oidb/common/Ntv2.RichMediaResp";
+import {NTHighwayIPv4} from "@/core/packet/proto/highway/highway";
+
+export const int32ip2str = (ip: number) => {
+    ip = ip & 0xffffffff;
+    return [ip & 0xff, (ip & 0xff00) >> 8, (ip & 0xff0000) >> 16, ((ip & 0xff000000) >> 24) & 0xff].join('.');
+}
+
+export const oidbIpv4s2HighwayIpv4s = (ipv4s: NapProtoEncodeStructType<typeof IPv4>[]): NapProtoEncodeStructType<typeof NTHighwayIPv4>[] =>{
+    return ipv4s.map((ip) => {
+        return {
+            domain: {
+                isEnable: true,
+                ip: int32ip2str(ip.outIP!),
+            },
+            port: ip.outPort!
+        } as NapProtoEncodeStructType<typeof NTHighwayIPv4>
+    })
+}

src/core/packet/msg/builder.ts

@@ -0,0 +1,58 @@
+import * as crypto from "crypto";
+import {PushMsgBody} from "@/core/packet/proto/message/message";
+import {NapProtoEncodeStructType} from "@/core/packet/proto/NapProto";
+import {LogWrapper} from "@/common/log";
+import {PacketMsg} from "@/core/packet/msg/message";
+
+export class PacketMsgBuilder {
+    private logger: LogWrapper;
+
+    constructor(logger: LogWrapper) {
+        this.logger = logger;
+    }
+
+    buildFakeMsg(selfUid: string, element: PacketMsg[]): NapProtoEncodeStructType<typeof PushMsgBody>[] {
+        return element.map((node): NapProtoEncodeStructType<typeof PushMsgBody> => {
+            const avatar = `https://q.qlogo.cn/headimg_dl?dst_uin=${node.senderUin}&spec=640&img_type=jpg`;
+            const msgElement = node.msg.flatMap(msg => msg.buildElement() ?? []);
+            return {
+                responseHead: {
+                    fromUid: "",
+                    fromUin: node.senderUin,
+                    toUid: node.groupId ? undefined : selfUid,
+                    forward: node.groupId ? undefined : {
+                        friendName: node.senderName,
+                    },
+                    grp: node.groupId ? {
+                        groupUin: node.groupId,
+                        memberName: node.senderName,
+                        unknown5: 2
+                    } : undefined,
+                },
+                contentHead: {
+                    type: node.groupId ? 82 : 9,
+                    subType: node.groupId ? undefined : 4,
+                    divSeq: node.groupId ? undefined : 4,
+                    msgId: crypto.randomBytes(4).readUInt32LE(0),
+                    sequence: crypto.randomBytes(4).readUInt32LE(0),
+                    timeStamp: Math.floor(Date.now() / 1000),
+                    field7: BigInt(1),
+                    field8: 0,
+                    field9: 0,
+                    forward: {
+                        field1: 0,
+                        field2: 0,
+                        field3: node.groupId ? 0 : 2,
+                        unknownBase64: avatar,
+                        avatar: avatar
+                    }
+                },
+                body: {
+                    richText: {
+                        elems: msgElement
+                    }
+                }
+            };
+        });
+    }
+}

src/core/packet/msg/converter.ts

@@ -0,0 +1,131 @@
+import {
+    MessageElement,
+    RawMessage,
+    SendArkElement,
+    SendFaceElement,
+    SendFileElement,
+    SendMarkdownElement,
+    SendMarketFaceElement,
+    SendPicElement,
+    SendPttElement,
+    SendReplyElement,
+    SendStructLongMsgElement,
+    SendTextElement,
+    SendVideoElement
+} from "@/core";
+import {
+    IPacketMsgElement,
+    PacketMsgAtElement,
+    PacketMsgFaceElement,
+    PacketMsgFileElement,
+    PacketMsgLightAppElement,
+    PacketMsgMarkDownElement,
+    PacketMsgMarkFaceElement,
+    PacketMsgPicElement,
+    PacketMsgPttElement,
+    PacketMsgReplyElement,
+    PacketMsgTextElement,
+    PacketMsgVideoElement,
+    PacketMultiMsgElement
+} from "@/core/packet/msg/element";
+import {PacketMsg, PacketSendMsgElement} from "@/core/packet/msg/message";
+import {LogWrapper} from "@/common/log";
+
+type SendMessageElementMap = {
+    textElement: SendTextElement,
+    picElement: SendPicElement,
+    replyElement: SendReplyElement,
+    faceElement: SendFaceElement,
+    marketFaceElement: SendMarketFaceElement,
+    videoElement: SendVideoElement,
+    fileElement: SendFileElement,
+    pttElement: SendPttElement,
+    arkElement: SendArkElement,
+    markdownElement: SendMarkdownElement,
+    structLongMsgElement: SendStructLongMsgElement
+};
+
+type RawToPacketMsgConverters = {
+    [K in keyof SendMessageElementMap]: (
+        element: SendMessageElementMap[K],
+        msg?: RawMessage,
+        elementWrapper?: MessageElement,
+    ) => IPacketMsgElement<SendMessageElementMap[K]> | null;
+};
+
+export type rawMsgWithSendMsg = {
+    senderUin: number;
+    senderUid?: string;
+    senderName: string;
+    groupId?: number;
+    time: number;
+    msg: PacketSendMsgElement[]
+}
+
+export class PacketMsgConverter {
+    private logger: LogWrapper;
+
+    constructor(logger: LogWrapper) {
+        this.logger = logger;
+    }
+
+    rawMsgWithSendMsgToPacketMsg(msg: rawMsgWithSendMsg): PacketMsg {
+        return {
+            senderUid: msg.senderUid ?? '',
+            senderUin: msg.senderUin,
+            senderName: msg.senderName,
+            groupId: msg.groupId,
+            time: msg.time,
+            msg: msg.msg.map((element) => {
+                const key = (Object.keys(this.rawToPacketMsgConverters) as Array<keyof SendMessageElementMap>).find(
+                    (k) => (element as any)[k] !== undefined  // TODO:
+                );
+                if (key) {
+                    const elementData = (element as any)[key];  // TODO:
+                    if (elementData) return this.rawToPacketMsgConverters[key](element as any)
+                }
+                return null;
+            }).filter((e) => e !== null)
+        }
+    }
+
+    private rawToPacketMsgConverters: RawToPacketMsgConverters = {
+        textElement: (element: SendTextElement) => {
+            if (element.textElement.atType) {
+                return new PacketMsgAtElement(element)
+            }
+            return new PacketMsgTextElement(element)
+        },
+        picElement: (element: SendPicElement) => {
+            return new PacketMsgPicElement(element)
+        },
+        replyElement: (element: SendReplyElement) => {
+            return new PacketMsgReplyElement(element)
+        },
+        faceElement: (element: SendFaceElement) => {
+            return new PacketMsgFaceElement(element)
+        },
+        marketFaceElement: (element: SendMarketFaceElement) => {
+            return new PacketMsgMarkFaceElement(element)
+        },
+        videoElement: (element: SendVideoElement) => {
+            return new PacketMsgVideoElement(element)
+        },
+        fileElement: (element: SendFileElement) => {
+            return new PacketMsgFileElement(element)
+        },
+        pttElement: (element: SendPttElement) => {
+            return new PacketMsgPttElement(element)
+        },
+        arkElement: (element: SendArkElement) => {
+            return new PacketMsgLightAppElement(element)
+        },
+        markdownElement: (element: SendMarkdownElement) => {
+            return new PacketMsgMarkDownElement(element)
+        },
+        // TODO: check this logic, move it in arkElement?
+        structLongMsgElement: (element: SendStructLongMsgElement) => {
+            return new PacketMultiMsgElement(element)
+        }
+    }
+}