fix: 177

修复webui快捷登录失败

docs/changelogs/CHANGELOG.v1.6.8.md

@@ -1,20 +0,0 @@
-# v1.6.8
-
-QQ Version: Windows 9.9.12-26000 / Linux 3.2.9-26000
-## 使用前警告
-1. 在最近版本由于QQ本体大幅变动，为了保证NapCat可用性，NapCat近期启动与安装方式将将大幅变动，请关注文档和社群获取。
-2. 在Core上完全执行开源，请不要用于违法用途，如此可能造成NapCat完全停止更新。
-3. 针对原启动方式的围堵，NapCat研发了多种方式，除此其余理论与扩展的分析和思路将部分展示于Docs，以便各位参与开发与维护NapCat。
-## 其余·备注
-启动方式: WayBoot.03 （Electron Main进程为Node 直接注入代码 同理项目: LiteLoader）
-
-## 修复与优化
-1. 移除数据库文件读写 ~ 优化性能
-2. 重构消息发送 极限速度优化 ~ 优化性能
-3. WebUi配置热重载优化 ~ 修复问题
-4. 修复偶现崩溃问题 ~ 修复问题
-
-## 新增与调整
-1. 最后发言时间重构 入群时间失效 ~ 替换功能
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/CHANGELOG.v1.7.7.md

@@ -0,0 +1,11 @@
+# v1.7.7
+
+QQ Version: Windows 9.9.15-26702 / Linux 3.2.12-26702
+
+## 启动的方式
+Way03/Way05
+
+## 新增与调整
+1. 支持 9.9.15/3.2.12 版本QQ
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "1.6.8",
+  "version": "1.7.7",
   "scripts": {
     "watch:dev": "vite --mode development",
     "watch:prod": "vite --mode production",
@@ -31,7 +31,7 @@
     "@types/figlet": "^1.5.8",
     "@types/fluent-ffmpeg": "^2.1.24",
     "@types/jest": "^29.5.12",
-    "@types/node": "^20.11.30",
+    "@types/node": "^22.0.0",
     "@types/qrcode-terminal": "^0.12.2",
     "@types/ws": "^8.5.10",
     "@typescript-eslint/eslint-plugin": "^7.4.0",

script/BootWay.03.ps1

@@ -42,4 +42,4 @@ if (!(Test-Path $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 $params}"
+Start-Process powershell -ArgumentList "-noexit", "-noprofile", "-command &{& chcp 65001;& '$($commandInfo.Path)' --enable-logging }"

script/BootWay05.ps1

@@ -0,0 +1,123 @@
+# 检查当前会话是否具有管理员权限
+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..."
+}

src/common/server/http.ts

@@ -86,7 +86,7 @@ export abstract class HttpServerBase {
     this.start(port, host);
   }
 
-  abstract handleFailed(res: Response, payload: any, err: any): void
+  abstract handleFailed(res: Response, payload: any, err: Error): void
 
   registerRouter(method: 'post' | 'get' | string, url: string, handler: RegisterHandler) {
     if (!url.startsWith('/')) {
@@ -111,7 +111,7 @@ export abstract class HttpServerBase {
       try {
         res.send(await handler(res, payload));
       } catch (e: any) {
-        this.handleFailed(res, payload, e.stack.toString());
+        this.handleFailed(res, payload, e);
       }
     });
   }

src/common/server/websocket.ts

@@ -32,17 +32,17 @@ export class WebsocketServerBase {
     if (port instanceof http.Server) {
       try {
         const wss = new WebSocketServer({
-            noServer: true,
+          noServer: true,
-            maxPayload: 1024 * 1024 * 1024
+          maxPayload: 1024 * 1024 * 1024
-          }).on('error', () => {
+        }).on('error', () => {
-          });
+        });
         this.ws = wss;
         port.on('upgrade', function upgrade(request, socket, head) {
           wss.handleUpgrade(request, socket, head, function done(ws) {
             wss.emit('connection', ws, request);
           });
         });
-        log(`ws服务启动成功, 绑定到HTTP服务`);
+        log('ws服务启动成功, 绑定到HTTP服务');
       } catch (e: any) {
         throw Error('ws服务启动失败, 可能是绑定的HTTP服务异常' + e.toString());
       }

src/common/utils/ConfigBase.ts

@@ -14,8 +14,8 @@ fs.mkdirSync(configDir, { recursive: true });
 
 
 export class ConfigBase<T> {
-  public name: string = 'default_config'
+  public name: string = 'default_config';
-  private pathName: string | null = null // 本次读取的文件路径
+  private pathName: string | null = null; // 本次读取的文件路径
   constructor() {
   }
 
@@ -30,21 +30,21 @@ export class ConfigBase<T> {
     return configDir;
   }
   getConfigPath(pathName: string | null): string {
-    const suffix = pathName ? `_${pathName}` : ''
+    const suffix = pathName ? `_${pathName}` : '';
-    const filename = `${this.name}${suffix}.json`
+    const filename = `${this.name}${suffix}.json`;
     return path.join(this.getConfigDir(), filename);
   }
   read() {
     // 尝试加载当前账号配置
-    if (this.read_from_file(selfInfo.uin, false)) return this
+    if (this.read_from_file(selfInfo.uin, false)) return this;
     // 尝试加载默认配置
-    return this.read_from_file('', true)
+    return this.read_from_file('', true);
   }
   read_from_file(pathName: string, createIfNotExist: boolean) {
     const configPath = this.getConfigPath(pathName);
     if (!fs.existsSync(configPath)) {
-      if (!createIfNotExist) return null
+      if (!createIfNotExist) return null;
-      this.pathName = pathName // 记录有效的设置文件
+      this.pathName = pathName; // 记录有效的设置文件
       try {
         fs.writeFileSync(configPath, JSON.stringify(this, this.getKeys(), 2));
         log(`配置文件${configPath}已创建\n如果修改此文件后需要重启 NapCat 生效`);
@@ -77,7 +77,7 @@ export class ConfigBase<T> {
     Object.assign(this, config);
     if (overwrite) {
       // 用户要求强制写入，则变更当前文件为目标文件
-      this.pathName = `${selfInfo.uin}`
+      this.pathName = `${selfInfo.uin}`;
     }
     const configPath = this.getConfigPath(this.pathName);
     try {

src/common/utils/EventTask.ts

@@ -84,7 +84,7 @@ export class NTEventWrapper {
   }
   //统一回调清理事件
   async DispatcherListener(ListenerMainName: string, ListenerSubName: string, ...args: any[]) {
-    //console.log(ListenerMainName, ListenerSubName, ...args,this.EventTask.get(ListenerMainName)?.get(ListenerSubName));
+    //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()) {
@@ -96,7 +96,7 @@ export class NTEventWrapper {
       }
     });
   }
-  async CallNoListenerEvent<EventType extends (...args: any[]) => Promise<any>>(EventName = '', timeout: number = 3000, ...args: Parameters<EventType>) {
+  async CallNoListenerEvent<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.CreatEventFunction<EventType>(EventName);
       let complete = false;
@@ -110,8 +110,47 @@ export class NTEventWrapper {
       resolve(retData);
     });
   }
+  async RegisterListen<ListenerType extends (...args: any[]) => void>(ListenerName = '', waitTimes = 1, timeout = 5000, checker: (...args: Parameters<ListenerType>) => boolean) {
+    return new Promise<Parameters<ListenerType>>((resolve, reject) => {
+      const ListenerNameList = ListenerName.split('/');
+      const ListenerMainName = ListenerNameList[0];
+      const ListenerSubName = ListenerNameList[1];
+      const id = randomUUID();
+      let complete = 0;
+      let retData: Parameters<ListenerType> | undefined = undefined;
+      const databack = () => {
+        if (complete == 0) {
+          reject(new Error(' ListenerName:' + ListenerName + ' timeout'));
+        } else {
+          resolve(retData!);
+        }
+      };
+      const Timeouter = setTimeout(databack, timeout);
+      const eventCallbak = {
+        timeout: timeout,
+        createtime: Date.now(),
+        checker: checker,
+        func: (...args: Parameters<ListenerType>) => {
+          complete++;
+          retData = args;
+          if (complete >= waitTimes) {
+            clearTimeout(Timeouter);
+            databack();
+          }
+        }
+      };
+      if (!this.EventTask.get(ListenerMainName)) {
+        this.EventTask.set(ListenerMainName, new Map());
+      }
+      if (!(this.EventTask.get(ListenerMainName)?.get(ListenerSubName))) {
+        this.EventTask.get(ListenerMainName)?.set(ListenerSubName, new Map());
+      }
+      this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.set(id, eventCallbak);
+      this.CreatListenerFunction(ListenerMainName);
+    });
+  }
   async CallNormalEvent<EventType extends (...args: any[]) => Promise<any>, ListenerType extends (...args: any[]) => void>
-    (EventName = '', ListenerName = '', waitTimes = 1, timeout: number = 3000, checker: (...args: Parameters<ListenerType>) => boolean, ...args: Parameters<EventType>) {
+  (EventName = '', ListenerName = '', waitTimes = 1, timeout: number = 3000, checker: (...args: Parameters<ListenerType>) => boolean, ...args: Parameters<EventType>) {
     return new Promise<[EventRet: Awaited<ReturnType<EventType>>, ...Parameters<ListenerType>]>(async (resolve, reject) => {
       const id = randomUUID();
       let complete = 0;
@@ -119,16 +158,19 @@ export class NTEventWrapper {
       let retEvent: any = {};
       const databack = () => {
         if (complete == 0) {
-          reject(new Error('NTEvent EventName:' + EventName + ' ListenerName:' + ListenerName + ' timeout'));
+          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 ListenerNameList = ListenerName.split('/');
       const ListenerMainName = ListenerNameList[0];
       const ListenerSubName = ListenerNameList[1];
+
+      const Timeouter = setTimeout(databack, timeout);
+
       const eventCallbak = {
         timeout: timeout,
         createtime: Date.now(),
@@ -152,7 +194,6 @@ export class NTEventWrapper {
       this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.set(id, eventCallbak);
       this.CreatListenerFunction(ListenerMainName);
       const EventFunc = this.CreatEventFunction<EventType>(EventName);
-      //console.log("测试打点", args);
       retEvent = await EventFunc!(...(args as any[]));
     });
   }

src/common/utils/MessageUnique.ts

@@ -2,7 +2,7 @@ import { Peer } from '@/core';
 import crypto, { randomInt, randomUUID } from 'crypto';
 import { logError } from './log';
 
-class LimitedHashTable<K, V> {
+export class LimitedHashTable<K, V> {
   private keyToValue: Map<K, V> = new Map();
   private valueToKey: Map<V, K> = new Map();
   private maxSize: number;
@@ -15,10 +15,10 @@ class LimitedHashTable<K, V> {
   }
 
   set(key: K, value: V): void {
-    const isExist = this.keyToValue.get(key);
+    // const isExist = this.keyToValue.get(key);
-    if (isExist && isExist === value) {
+    // if (isExist && isExist === value) {
-      return;
+    //   return;
-    }
+    // }
     this.keyToValue.set(key, value);
     this.valueToKey.set(value, key);
     while (this.keyToValue.size !== this.valueToKey.size) {
@@ -61,6 +61,24 @@ class LimitedHashTable<K, V> {
       this.valueToKey.delete(value);
     }
   }
+
+  getKeyList(): K[] {
+    return Array.from(this.keyToValue.keys());
+  }
+  //获取最近刚写入的几个值
+  getHeads(size: number): { key: K; value: V }[] | undefined {
+    const keyList = this.getKeyList();
+    if (keyList.length === 0) {
+      return undefined;
+    }
+    const result: { key: K; value: V }[] = [];
+    const listSize = Math.min(size, keyList.length);
+    for (let i = 0; i < listSize; i++) {
+      const key = keyList[listSize - i];
+      result.push({ key, value: this.keyToValue.get(key)! });
+    }
+    return result;
+  }
 }
 
 class MessageUniqueWrapper {
@@ -70,16 +88,24 @@ class MessageUniqueWrapper {
     this.msgIdMap = new LimitedHashTable<string, number>(maxMap);
     this.msgDataMap = new LimitedHashTable<string, number>(maxMap);
   }
-
+  getRecentMsgIds(Peer: Peer, size: number): string[] {
+    const heads = this.msgIdMap.getHeads(size);
+    if (!heads) {
+      return [];
+    }
+    const data = heads.map((t) => MessageUnique.getMsgIdAndPeerByShortId(t.value));
+    const ret = data.filter((t) => t?.Peer.chatType === Peer.chatType && t?.Peer.peerUid === Peer.peerUid);
+    return ret.map((t) => t?.MsgId).filter((t) => t !== undefined);
+  }
   createMsg(peer: Peer, msgId: string): number | undefined {
     const key = `${msgId}|${peer.chatType}|${peer.peerUid}`;
-    const hash = crypto.createHash('sha1').update(key);
+    const hash = crypto.createHash('md5').update(key);
-    const shortId = parseInt(hash.digest('hex').slice(0, 8), 16);
+    const shortId = hash.digest().readInt32BE(0);
-    const isExist = this.msgIdMap.getKey(shortId);
+    //减少性能损耗
-    //console.log(`${peer.peerUid} ${msgId} ------- ${shortId}`);
+    // const isExist = this.msgIdMap.getKey(shortId);
-    if (isExist && isExist === msgId) {
+    // if (isExist && isExist === msgId) {
-      return shortId;
+    //   return shortId;
-    }
+    // }
     this.msgIdMap.set(msgId, shortId);
     this.msgDataMap.set(key, shortId);
     return shortId;

src/common/utils/QQBasicInfo.ts

@@ -1,62 +1,49 @@
 import path from 'node:path';
 import fs from 'node:fs';
-import os from 'node:os';
 import { systemPlatform } from '@/common/utils/system';
-import { logError } from '@/common/utils/log';
+import { getDefaultQQVersionConfigInfo, getQQVersionConfigPath } from './helper';
+import AppidTable from '@/core/external/appid.json';
+import { log } from './log';
 
-export const exePath = process.execPath;
+//基础目录获取
+export let QQMainPath = process.execPath;
+export let QQPackageInfoPath: string = path.join(path.dirname(QQMainPath), 'resources', 'app', 'package.json');
+export let QQVersionConfigPath: string | undefined = getQQVersionConfigPath(QQMainPath);
 
-export const pkgInfoPath = path.join(path.dirname(exePath), 'resources', 'app', 'package.json');
+//基础信息获取 无快更则启用默认模板填充
-let configVersionInfoPath;
+export let isQuickUpdate: boolean = !!QQVersionConfigPath;
+export let QQVersionConfig: QQVersionConfigType = isQuickUpdate ? JSON.parse(fs.readFileSync(QQVersionConfigPath!).toString()) : getDefaultQQVersionConfigInfo();
+export let QQPackageInfo: QQPackageInfoType = JSON.parse(fs.readFileSync(QQPackageInfoPath).toString());
+export let { appid: QQVersionAppid, qua: QQVersionQua } = getAppidV2();
 
-if (os.platform() !== 'linux') {
+//基础函数
-  configVersionInfoPath = path.join(path.dirname(exePath), 'resources', 'app', 'versions', 'config.json');
+export function getQQBuildStr() {
-} else {
+  return isQuickUpdate ? QQVersionConfig.buildId : QQPackageInfo.buildVersion;
-  const userPath = os.homedir();
-  const appDataPath = path.resolve(userPath, './.config/QQ');
-  configVersionInfoPath = path.resolve(appDataPath, './versions/config.json');
 }
-
+export function getFullQQVesion() {
-if (typeof configVersionInfoPath !== 'string') {
+  return isQuickUpdate ? QQVersionConfig.curVersion : QQPackageInfo.version;
-  throw new Error('Something went wrong when load QQ info path');
 }
-
+export function requireMinNTQQBuild(buildStr: string) {
-export { configVersionInfoPath };
+  return parseInt(getQQBuildStr()) >= parseInt(buildStr);
-
-type QQPkgInfo = {
-  version: string;
-  buildVersion: string;
-  platform: string;
-  eleArch: string;
 }
-type QQVersionConfigInfo = {
+//此方法不要直接使用
-  baseVersion: string;
+export function getQUAInternal() {
-  curVersion: string;
+  return systemPlatform === 'linux' ? `V1_LNX_NQ_${getFullQQVesion()}_${getQQBuildStr()}_GW_B` : `V1_WIN_NQ_${getFullQQVesion()}_${getQQBuildStr()}_GW_B`;
-  prevVersion: string;
-  onErrorVersions: Array<any>;
-  buildId: string;
 }
-
+export function getAppidV2(): { appid: string, qua: string } {
-let _qqVersionConfigInfo: QQVersionConfigInfo = {
+  let appidTbale = AppidTable as unknown as QQAppidTableType;
-  'baseVersion': '9.9.12-25765',
-  'curVersion': '9.9.12-25765',
-  'prevVersion': '',
-  'onErrorVersions': [],
-  'buildId': '25765'
-};
-
-if (fs.existsSync(configVersionInfoPath)) {
   try {
-    const _ =JSON.parse(fs.readFileSync(configVersionInfoPath).toString());
+    let data = appidTbale[getFullQQVesion()];
-    _qqVersionConfigInfo = Object.assign(_qqVersionConfigInfo, _);
+    if (data) {
-  } catch (e) {
+      return data;
-    logError('Load QQ version config info failed, Use default version', e);
+    }
   }
+  catch (e) {
+    log('[QQ版本兼容性检测] 版本兼容性不佳，可能会导致一些功能无法正常使用', e);
+  }
+  // 以下是兜底措施
+  return { appid: systemPlatform === 'linux' ? '537237950' : '537237765', qua: getQUAInternal() };
 }
-
-export const qqVersionConfigInfo: QQVersionConfigInfo = _qqVersionConfigInfo;
-//V1_WIN_NQ_9.9.12_25765_GW_B
-export const qqPkgInfo: QQPkgInfo = JSON.parse(fs.readFileSync(pkgInfoPath).toString());
 // platform_type: 3,
 // app_type: 4,
 // app_version: '9.9.12-25765',
@@ -64,14 +51,6 @@ export const qqPkgInfo: QQPkgInfo = JSON.parse(fs.readFileSync(pkgInfoPath).toSt
 // appid: '537234702',
 // platVer: '10.0.26100',
 // clientVer: '9.9.9-25765',
-
 // Linux
 // app_version: '3.2.9-25765',
 // qua: 'V1_LNX_NQ_3.2.10_25765_GW_B',
-
-let _appid: string = '537234702';  // 默认为 Windows 平台的 appid
-if (systemPlatform === 'linux') {
-  _appid = '537234773';
-}
-// todo: mac 平台的 appid
-export const appid = _appid;

src/common/utils/helper.ts

@@ -1,20 +1,42 @@
 import crypto from 'node:crypto';
 import path from 'node:path';
-import fs from 'fs/promises';
+import fs from 'fs';
 import { log, logDebug } from './log';
 import { dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import * as fsPromise from 'node:fs/promises';
+import os from 'node:os';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
+
+//下面这个类是用于将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)
+    setTimeout(() => reject(new Error('PromiseTimer: Operation timed out')), ms)
   );
   return Promise.race([promise, timeoutPromise]);
 }
@@ -283,14 +305,14 @@ export function migrateConfig(oldConfig: any) {
 }
 // 升级旧的配置到新的
 export async function UpdateConfig() {
-  const configFiles = await fs.readdir(path.join(__dirname, 'config'));
+  const configFiles = await fsPromise.readdir(path.join(__dirname, 'config'));
   for (const file of configFiles) {
     if (file.match(/^onebot11_\d+.json$/)) {
-      const CurrentConfig = JSON.parse(await fs.readFile(path.join(__dirname, 'config', file), 'utf8'));
+      const CurrentConfig = JSON.parse(await fsPromise.readFile(path.join(__dirname, 'config', file), 'utf8'));
       if (isValidOldConfig(CurrentConfig)) {
         log('正在迁移旧配置到新配置 File:', file);
         const NewConfig = migrateConfig(CurrentConfig);
-        await fs.writeFile(path.join(__dirname, 'config', file), JSON.stringify(NewConfig, null, 2));
+        await fsPromise.writeFile(path.join(__dirname, 'config', file), JSON.stringify(NewConfig, null, 2));
       }
     }
   }
@@ -310,7 +332,56 @@ export function isEqual(obj1: any, obj2: any) {
   }
   return true;
 }
+export function getDefaultQQVersionConfigInfo(): QQVersionConfigType {
+  if (os.platform() === 'linux') {
+    return {
+      baseVersion: '3.2.12-26702',
+      curVersion: '3.2.12-26702',
+      prevVersion: '',
+      onErrorVersions: [],
+      buildId: '26702'
+    };
+  }
+  return {
+    baseVersion: '9.9.15-26702',
+    curVersion: '9.9.15-26702',
+    prevVersion: '',
+    onErrorVersions: [],
+    buildId: '26702'
+  };
+}
+export async function promisePipeline(promises: Promise<any>[], callback: (result: any) => boolean): Promise<void> {
+  let callbackCalled = false;
+  for (const promise of promises) {
+    if (callbackCalled) break;
+    try {
+      const result = await promise;
+      if (!callbackCalled) {
+        callbackCalled = callback(result);
+      }
+    } catch (error) {
+      console.error("Error in promise pipeline:", error);
+    }
+  }
+}
 
+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 async function deleteOldFiles(directoryPath: string, daysThreshold: number) {
   try {
     const files = await fsPromise.readdir(directoryPath);

src/common/utils/type.ts

@@ -1,31 +1,17 @@
-/**
+//QQVersionType
- * 运行时类型转换与检查类
+type QQPackageInfoType = {
- */
+  version: string;
-export class TypeCheck {
+  buildVersion: string;
-  static isEmpty(value: any): boolean {
+  platform: string;
-    return value === null || value === undefined || value === '' ||
+  eleArch: string;
-            (Array.isArray(value) && value.length === 0) || (typeof value === 'object' && Object.keys(value).length === 0);
-  }
 }
-
+type QQVersionConfigType = {
-export class TypeConvert {
+  baseVersion: string;
-  static toNumber(value: any): number {
+  curVersion: string;
-    const num = Number(value);
+  prevVersion: string;
-    if (isNaN(num)) {
+  onErrorVersions: Array<any>;
-      throw new Error(`无法将输入转换为数字: ${value}`);
+  buildId: string;
-    }
+}
-    return num;
+type QQAppidTableType = {
-  }
+  [key: string]: { appid: string, qua: string };
-
-  static toString(value: any): string {
-    return String(value);
-  }
-
-  static toBoolean(value: any): boolean {
-    return Boolean(value);
-  }
-
-  static toArray(value: any): any[] {
-    return Array.isArray(value) ? value : [value];
-  }
 }

src/common/utils/version.ts

@@ -4,10 +4,10 @@ export async function checkVersion(): Promise<string> {
   return new Promise(async (resolve, reject) => {
     const MirrorList =
       [
+        'https://jsd.cdn.zzko.cn/gh/NapNeko/NapCatQQ@main/package.json',
         'https://fastly.jsdelivr.net/gh/NapNeko/NapCatQQ@main/package.json',
         'https://gcore.jsdelivr.net/gh/NapNeko/NapCatQQ@main/package.json',
-        'https://cdn.jsdelivr.us/gh/NapNeko/NapCatQQ@main/package.json',
+        'https://cdn.jsdelivr.net/gh/NapNeko/NapCatQQ@main/package.json'
-        'https://jsd.cdn.zzko.cn/gh/NapNeko/NapCatQQ@main/package.json'
       ];
     let version = undefined;
     for (const url of MirrorList) {

src/core/src/apis/file.ts

@@ -3,7 +3,7 @@ import {
   CacheFileType,
   ChatCacheListItemBasic,
   ChatType,
-  ElementType, IMAGE_HTTP_HOST, IMAGE_HTTP_HOST_NT, RawMessage
+  ElementType, IMAGE_HTTP_HOST, IMAGE_HTTP_HOST_NT, Peer, PicElement, RawMessage
 } from '@/core/entities';
 import path from 'path';
 import fs from 'fs';
@@ -18,6 +18,8 @@ import { sessionConfig } from '@/core/sessionConfig';
 import { rkeyManager } from '../utils/rkey';
 import { NTEventDispatch } from '@/common/utils/EventTask';
 import { NodeIKernelSearchService } from '../services/NodeIKernelSearchService';
+import { selfInfo } from '../data';
+
 
 export class NTQQFileApi {
   static async getFileType(filePath: string) {
@@ -31,12 +33,8 @@ export class NTQQFileApi {
   static async getFileSize(filePath: string): Promise<number> {
     return await napCatCore.util.getFileSize(filePath);
   }
-  static async getVideoUrl(msg: RawMessage, element: any) {
+  static async getVideoUrl(peer: Peer, msgId: string, elementId: string) {
-    return (await napCatCore.session.getRichMediaService().getVideoPlayUrlV2({
+    return (await napCatCore.session.getRichMediaService().getVideoPlayUrlV2(peer, msgId, elementId, 0, { downSourceType: 1, triggerType: 1 })).urlResult.domainUrl;
-      chatType: msg.chatType,
-      peerUid: msg.peerUid,
-      guildId: '0'
-    }, msg.msgId, element.elementId, 0, { downSourceType: 1, triggerType: 1 })).urlResult.domainUrl[0].url;
   }
   // 上传文件到QQ的文件夹
   static async uploadFile(filePath: string, elementType: ElementType = ElementType.PIC, elementSubType: number = 0) {
@@ -70,7 +68,9 @@ export class NTQQFileApi {
       ext
     };
   }
-
+  static async downloadMediaByUuid() {
+    //napCatCore.session.getRichMediaService().downloadFileForFileUuid();
+  }
   static 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);
     // 用于下载收到的消息中的图片等
@@ -146,8 +146,65 @@ export class NTQQFileApi {
       });
     });
   }
-  static async searchfile(keys: string[]) {
+  static 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.group) {
+      GroupData =
+        [{
+          groupCode: peer.peerUid,
+          isConf: false,
+          hasModifyConfGroupFace: true,
+          hasModifyConfGroupName: true,
+          groupName: "NapCat.Cached",
+          remark: "NapCat.Cached"
+        }];
+    } else if (peer.chatType === ChatType.friend) {
+      BuddyData = [{
+        category_name: 'NapCat.Cached',
+        peerUid: peer.peerUid,
+        peerUin: peer.peerUid,
+        remark: 'NapCat.Cached'
+      }];
+    } else {
+      return undefined;
+    }
 
+    return napCatCore.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
+          }]
+        }
+      ]
+    });
+  }
+  static async searchfile(keys: string[]) {
     type EventType = NodeIKernelSearchService['searchFileWithKeywords'];
     interface OnListener {
       searchId: string,
@@ -187,22 +244,23 @@ export class NTQQFileApi {
         }[]
       }[]
     };
-    const [id, data] = await NTEventDispatch.CallNormalEvent<EventType, (params: OnListener) => void>(
+    const Event = await NTEventDispatch.CreatEventFunction<EventType>('NodeIKernelSearchService/searchFileWithKeywords');
-      'NodeIKernelSearchService/searchFileWithKeywords',
+    let id = '';
-      'NodeIKernelSearchListener/onSearchFileKeywordsResult',
+    const Listener = NTEventDispatch.RegisterListen<(params: OnListener) => void>('NodeIKernelSearchListener/onSearchFileKeywordsResult', 1, 20000, (params) => {
-      1,
+      if (id !== '' && params.searchId == id) {
-      10000,
+        return true
-      (arg): boolean => { return id == data.searchId },
+      }
-      keys,
+      return false;
-      12
+    });
-    );
+    id = await Event!(keys, 12);
-    return data.resultItems[0];
+    let [ret] = (await Listener);
+    return ret;
   }
-  static async getImageUrl(element: { originImageUrl: any; md5HexStr?: any; fileUuid: any; }) {
+  static 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;

src/core/src/apis/friend.ts

@@ -1,11 +1,66 @@
-import { FriendRequest, User } from '@/core/entities';
+import { FriendRequest, FriendV2, SimpleInfo, User } from '@/core/entities';
-import { napCatCore, OnBuddyChangeParams } from '@/core';
+import { BuddyListReqType, napCatCore, NodeIKernelBuddyListener, NodeIKernelProfileService, OnBuddyChangeParams } from '@/core';
 import { NTEventDispatch } from '@/common/utils/EventTask';
-
+import { LimitedHashTable } from '@/common/utils/MessageUnique';
+import { CacheClassFuncAsyncExtend } from '@/common/utils/helper';
 export class NTQQFriendApi {
+  static async getBuddyV2(refresh = false): Promise<FriendV2[]> {
+    let uids: string[] = [];
+    const buddyService = napCatCore.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 NTEventDispatch.CallNoListenerEvent<NodeIKernelProfileService['getCoreAndBaseInfo']>(
+      'NodeIKernelProfileService/getCoreAndBaseInfo', 5000, 'nodeStore', uids
+    );
+    return Array.from(data.values());
+  }
+  @CacheClassFuncAsyncExtend(3600 * 1000, 'getBuddyIdMap', () => true)
+  static async getBuddyIdMapCache(refresh = false): Promise<LimitedHashTable<string, string>> {
+    return await NTQQFriendApi.getBuddyIdMap(refresh);
+  }
+  static async getBuddyIdMap(refresh = false): Promise<LimitedHashTable<string, string>> {
+    let uids: string[] = [];
+    let retMap: LimitedHashTable<string, string> = new LimitedHashTable<string, string>(5000);
+    const buddyService = napCatCore.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 NTEventDispatch.CallNoListenerEvent<NodeIKernelProfileService['getCoreAndBaseInfo']>(
+      'NodeIKernelProfileService/getCoreAndBaseInfo', 5000, 'nodeStore', uids
+    );
+    data.forEach((value, key) => {
+      retMap.set(value.uin!, value.uid!);
+    });
+    //console.log('getBuddyIdMap', retMap.getValue);
+    return retMap;
+  }
+  static async getBuddyV2ExWithCate(refresh = false) {
+    let uids: string[] = [];
+    let categoryMap: Map<string, any> = new Map();
+    const buddyService = napCatCore.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, categroyName: item.categroyName });
+        });
+        return item.buddyUids
+      }));
+    const data = await NTEventDispatch.CallNoListenerEvent<NodeIKernelProfileService['getCoreAndBaseInfo']>(
+      'NodeIKernelProfileService/getCoreAndBaseInfo', 5000, 'nodeStore', uids
+    );
+    return Array.from(data).map(([key, value]) => {
+      const category = categoryMap.get(key);
+      return category ? { ...value, categoryId: category.categoryId, categroyName: category.categroyName } : value;
+    });
+  }
   static async isBuddy(uid: string) {
     return napCatCore.session.getBuddyService().isBuddy(uid);
   }
+  /**
+   * @deprecated
+   * @param forced 
+   * @returns 
+   */
   static async getFriends(forced = false): Promise<User[]> {
     let [_retData, _BuddyArg] = await NTEventDispatch.CallNormalEvent
       <(force: boolean) => Promise<any>, (arg: OnBuddyChangeParams) => void>

src/core/src/apis/group.ts

@@ -1,5 +1,5 @@
-import { GroupMember, GroupRequestOperateTypes, GroupMemberRole, GroupNotify, Group, MemberExtSourceType, GroupNotifyTypes, ChatType } from '../entities';
+import { GroupMember, GroupRequestOperateTypes, GroupMemberRole, GroupNotify, Group, MemberExtSourceType, GroupNotifyTypes, ChatType, Peer, GroupListUpdateType } from '../entities';
-import { GeneralCallResult, NTQQUserApi, napCatCore } from '@/core';
+import { GeneralCallResult, NTQQUserApi, NodeIKernelGroupListener, NodeIKernelGroupService, napCatCore } from '@/core';
 import { NTEventDispatch } from '@/common/utils/EventTask';
 import { log } from '@/common/utils/log';
 import { groupMembers } from '../data';
@@ -9,24 +9,24 @@ export class NTQQGroupApi {
     return napCatCore.session.getGroupService().setHeader(gc, filePath);
   }
   static async getGroups(forced = false) {
+    type ListenerType = NodeIKernelGroupListener['onGroupListUpdate'];
     let [_retData, _updateType, groupList] = await NTEventDispatch.CallNormalEvent
-      <(force: boolean) => Promise<any>, (updateType: number, groupList: Group[]) => void>
+      <(force: boolean) => Promise<any>, ListenerType>
       (
         'NodeIKernelGroupService/getGroupList',
         'NodeIKernelGroupListener/onGroupListUpdate',
         1,
         5000,
-        () => true,
+        (updateType) => true,
         forced
       );
     return groupList;
   }
 
-  @CacheClassFuncAsyncExtend(600, "LastestSendTime", () => true)
+  @CacheClassFuncAsyncExtend(3600 * 1000, "LastestSendTime", () => true)
   static async getGroupMemberLastestSendTimeCache(GroupCode: string) {
     return NTQQGroupApi.getGroupMemberLastestSendTime(GroupCode);
   }
-
   /**
    * 通过QQ自带数据库获取群成员最后发言时间(仅返回有效数据 且消耗延迟大 需要进行缓存)
    * @param GroupCode 群号
@@ -81,17 +81,15 @@ export class NTQQGroupApi {
     });
     return ret;
   }
+  static async getGroupMemberAll(GroupCode: string, forced = false) {
+    return napCatCore.session.getGroupService().getAllMemberList(GroupCode, forced);
+  }
   static async getLastestMsg(GroupCode: string, uins: string[]) {
     let uids: Array<string> = [];
     for (let uin of uins) {
-      try {
+      let uid = await NTQQUserApi.getUidByUin(uin)
-        let uid = await NTQQUserApi.getUidByUin(uin)
+      if (uid) {
-        if (uid) {
+        uids.push(uid);
-          uids.push(uid);
-        }
-      } catch (error) {
-        log("getLastestMsg--->", error);
-        return undefined;
       }
     }
     let ret = await napCatCore.session.getMsgService().queryMsgsWithFilterEx('0', '0', '0', {
@@ -160,6 +158,25 @@ export class NTQQGroupApi {
       );
     return notifies;
   }
+  static 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 [ret, _groupCode, _changeType, _members] = await NTEventDispatch.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);
+  }
   static async getGroupMembers(groupQQ: string, num = 3000): Promise<Map<string, GroupMember>> {
     const groupService = napCatCore.session.getGroupService();
     const sceneId = groupService.createMemberListScene(groupQQ, 'groupMemberList_MainWindow');
@@ -167,6 +184,7 @@ export class NTQQGroupApi {
     if (result.errCode !== 0) {
       throw ('获取群成员列表出错,' + result.errMsg);
     }
+
     //logDebug(`获取群(${groupQQ})成员列表结果:`, `finish: ${result.result.finish}`); //, Array.from(result.result.infos.values()));
     return result.result.infos;
     /*

src/core/src/apis/msg.ts

@@ -1,4 +1,4 @@
-import { GetFileListParam, Peer, RawMessage, SendMessageElement } from '@/core/entities';
+import { GetFileListParam, Peer, RawMessage, SendMessageElement, SendMsgElementConstructor } from '@/core/entities';
 import { friends, groups, selfInfo } from '@/core/data';
 import { log, logWarn } from '@/common/utils/log';
 import { sleep } from '@/common/utils/helper';
@@ -7,6 +7,8 @@ import { onGroupFileInfoUpdateParamType } from '@/core/listeners';
 import { GeneralCallResult } from '@/core/services/common';
 import { MessageUnique } from '../../../common/utils/MessageUnique';
 import { NTEventDispatch } from '@/common/utils/EventTask';
+import { requireMinNTQQBuild } from '@/common/utils/QQBasicInfo';
+
 async function LoadMessageIdList(Peer: Peer, msgId: string) {
   let msgList = await NTQQMsgApi.getMsgHistory(Peer, msgId, 50);
   for (let j = 0; j < msgList.msgList.length; j++) {
@@ -17,11 +19,12 @@ async function loadMessageUnique() {
   if (groups.size > 100) {
     logWarn('群数量大于100，可能会导致性能问题');
   }
-  let predict = (groups.size + friends.size) / 5;
+  let predict = (groups.size + friends.size / 2) / 5;
   predict = predict < 20 ? 20 : predict;
   predict = predict > 50 ? 50 : predict;
   //let waitpromise: Array<Promise<{ msgList: RawMessage[]; }>> = [];
-  MessageUnique.resize(predict * 50);
+  predict = Math.floor(predict * 50);
+  MessageUnique.resize(predict);
   let RecentContact = await NTQQUserApi.getRecentContactListSnapShot(predict);
   let LoadMessageIdDo: Array<Promise<void>> = new Array<Promise<void>>();
   if (RecentContact?.info?.changedList && RecentContact?.info?.changedList?.length > 0) {
@@ -31,16 +34,37 @@ async function loadMessageUnique() {
     }
   }
   await Promise.all(LoadMessageIdDo).then(() => {
-    log(`[消息序列] 加载 ${predict * 50} 条历史消息记录完成`);
+    log(`[消息序列] 加载 ${predict} 条历史消息记录完成`);
   });
 }
 
 setTimeout(() => {
   napCatCore.onLoginSuccess(async () => {
     await sleep(100);
+    // NTQQMsgApi.CheckSendMode().then().catch();
     loadMessageUnique().then().catch();
+    //let data  = await napCatCore.session.getMsgService().sendSsoCmdReqByContend("LightAppSvc.mini_app_growguard.ReportExecute","1124343");
+    //console.log(data);
   });
 }, 100);
+//歇菜LocalMsg压根不写Db
+// setTimeout(async () => {
+//   let ele: MessageElement = { extBufForUI: '0x', ...SendMsgElementConstructor.text('测试消息') };
+//   let MsgId = await NTQQMsgApi.getMsgUniqueEx();
+//   let peer = { chatType: 2, peerUid: '', guildId: '' };
+//   console.log(await napCatCore.session.getTestPerformanceService().insertMsg(
+//     {
+//       peer: peer,
+//       msgTime: Math.floor(Date.now() / 1000).toString(),
+//       msgId: MsgId,
+//       msgSeq: '56564',
+//       batchNums: 1,
+//       timesPerBatch: 1,
+//       numPerTime: 1
+//     }, [ele]
+//   ));
+//   console.log(await NTQQMsgApi.multiForwardMsg(peer, peer, [MsgId]));
+// }, 25000)
 
 export class NTQQMsgApi {
   // static napCatCore: NapCatCore | null = null;
@@ -63,10 +87,41 @@ export class NTQQMsgApi {
   } | undefined> {
     return napCatCore.session.getMsgService().getMultiMsg(peer, rootMsgId, parentMsgId);
   }
-
+  static async getLastestMsgByUids(peer: Peer, count: number = 20) {
+    let ret = await napCatCore.session.getMsgService().queryMsgsWithFilterEx('0', '0', '0', {
+      chatInfo: peer,
+      filterMsgType: [],
+      filterSendersUid: [],
+      filterMsgToTime: '0',
+      filterMsgFromTime: '0',
+      isReverseOrder: false,
+      isIncludeCurrent: true,
+      pageLimit: 1,
+    });
+    return ret;
+  }
   static async getMsgsByMsgId(peer: Peer, msgIds: string[]) {
     return await napCatCore.session.getMsgService().getMsgsByMsgId(peer, msgIds);
   }
+  static async getSingleMsg(peer: Peer, seq: string) {
+    return await napCatCore.session.getMsgService().getSingleMsg(peer, seq);
+  }
+  static async fetchFavEmojiList(num: number) {
+    return napCatCore.session.getMsgService().fetchFavEmojiList("", num, true, true)
+  }
+  static async queryMsgsWithFilterExWithSeq(peer: Peer, msgSeq: string) {
+    let ret = await napCatCore.session.getMsgService().queryMsgsWithFilterEx('0', '0', msgSeq, {
+      chatInfo: peer,
+      filterMsgType: [],
+      filterSendersUid: [],
+      filterMsgToTime: '0',
+      filterMsgFromTime: '0',
+      isReverseOrder: false,
+      isIncludeCurrent: true,
+      pageLimit: 1,
+    });
+    return ret;
+  }
   static async getMsgsBySeqAndCount(peer: Peer, seq: string, count: number, desc: boolean, z: boolean) {
     return await napCatCore.session.getMsgService().getMsgsBySeqAndCount(peer, seq, count, desc, z);
   }
@@ -78,7 +133,7 @@ export class NTQQMsgApi {
       (GroupCode: string, params: GetFileListParam) => Promise<unknown>,
       (groupFileListResult: onGroupFileInfoUpdateParamType) => void
     >(
-      'NodeIKernelRichMediaService/sendMsg',
+      'NodeIKernelRichMediaService/getGroupFileList',
       'NodeIKernelMsgListener/onGroupFileInfoUpdate',
       1,
       5000,
@@ -100,8 +155,18 @@ export class NTQQMsgApi {
       peerUid: peer.peerUid
     }, msgIds);
   }
-  static async sendMsg(peer: Peer, msgElements: SendMessageElement[], waitComplete = true, timeout = 10000) {
+  static async sendMsgV2(peer: Peer, msgElements: SendMessageElement[], waitComplete = true, timeout = 10000) {
-    let msgId = await NTQQMsgApi.getMsgUnique(await NTQQMsgApi.getServerTime());
+    // function generateMsgId() {
+    //   const timestamp = Math.floor(Date.now() / 1000);
+    //   const random = Math.floor(Math.random() * Math.pow(2, 32));
+    //   const buffer = Buffer.alloc(8);
+    //   buffer.writeUInt32BE(timestamp, 0);
+    //   buffer.writeUInt32BE(random, 4);
+    //   const msgId = BigInt("0x" + buffer.toString('hex')).toString();
+    //   return msgId;
+    // }
+
+    let msgId = await NTQQMsgApi.getMsgUnique(peer.chatType, await NTQQMsgApi.getServerTime());
     let data = await NTEventDispatch.CallNormalEvent<
       (msgId: string, peer: Peer, msgElements: SendMessageElement[], map: Map<any, any>) => Promise<unknown>,
       (msgList: RawMessage[]) => void
@@ -130,16 +195,53 @@ export class NTQQMsgApi {
     });
     return retMsg;
   }
-  static async getMsgUniqueEx(){
+  static sendMsgEx(peer: Peer, msgElements: SendMessageElement[], waitComplete = true, timeout = 10000) {
-    let msgId = await NTQQMsgApi.getMsgUnique(await NTQQMsgApi.getServerTime());
+    //return NTQQMsgApi.sendMsgV1(peer, msgElements, waitComplete, timeout);
-    return msgId;
   }
-  static async getMsgUnique(time: string) {
+  static async sendMsg(peer: Peer, msgElements: SendMessageElement[], waitComplete = true, timeout = 10000) {
+    //唉？ ！我有个想法
+    let msgId = await NTQQMsgApi.getMsgUnique(peer.chatType, await NTQQMsgApi.getServerTime());
+    peer.guildId = msgId;
+    let data = await NTEventDispatch.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 (let msgRecord of msgRecords) {
+          if (msgRecord.guildId === msgId && msgRecord.sendStatus === 2) {
+            return true;
+          }
+        }
+        return false;
+      },
+      "0",
+      peer,
+      msgElements,
+      new Map()
+    );
+    let retMsg = data[1].find(msgRecord => {
+      if (msgRecord.guildId === msgId) {
+        return true;
+      }
+    });
+    return retMsg;
+  }
+  static async getMsgUnique(chatType: number, time: string) {
+    if (requireMinNTQQBuild('26702')) {
+      return napCatCore.session.getMsgService().generateMsgUniqueId(chatType, time);
+    }
     return napCatCore.session.getMsgService().getMsgUniqueId(time);
   }
   static async getServerTime() {
     return napCatCore.session.getMSFService().getServerTime();
   }
+  static async getServerTimeV2() {
+    return NTEventDispatch.CallNoListenerEvent<() => string>('NodeIKernelMsgService/getServerTime', 5000);
+  }
   static async forwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {
     return napCatCore.session.getMsgService().forwardMsg(msgIds, srcPeer, [destPeer], new Map());
   }

src/core/src/apis/system.ts

@@ -1,11 +1,7 @@
 
 
 import { NTEventDispatch } from '@/common/utils/EventTask';
-import { GeneralCallResult, NTQQUserApi, napCatCore } from '@/core';
+import { GeneralCallResult, NTQQFileApi, NTQQUserApi, napCatCore } from '@/core';
-// setTimeout(async () => {
-//     let ret = await NTQQSystemApi.getArkJsonCollection('1-2-162b9b42-65b9-4405-a8ed-2e256ec8aa50');
-//     console.log(ret);
-// }, 20000)
 export class NTQQSystemApi {
     static async hasOtherRunningQQProcess() {
         return napCatCore.util.hasOtherRunningQQProcess();

src/core/src/apis/user.ts

@@ -1,12 +1,13 @@
-import { ModifyProfileParams, SelfInfo, User, UserDetailInfoByUin } from '@/core/entities';
+import { ModifyProfileParams, SelfInfo, User, UserDetailInfoByUin, UserDetailInfoByUinV2 } from '@/core/entities';
-import { friends, selfInfo } from '@/core/data';
+import { friends, groupMembers, selfInfo } from '@/core/data';
 import { CacheClassFuncAsync, CacheClassFuncAsyncExtend } from '@/common/utils/helper';
-import { napCatCore } from '@/core';
+import { napCatCore, NTQQFriendApi } from '@/core';
 import { NodeIKernelProfileListener, ProfileListener } from '@/core/listeners';
 import { RequestUtil } from '@/common/utils/request';
 import { logWarn } from '@/common/utils/log';
 import { NTEventDispatch } from '@/common/utils/EventTask';
-import { NodeIKernelProfileService } from '@/core/services';
+import { NodeIKernelProfileService, ProfileBizType, UserDetailSource } from '@/core/services';
+import { requireMinNTQQBuild } from '@/common/utils/QQBasicInfo';
 
 export class NTQQUserApi {
   static async getProfileLike(uid: string) {
@@ -50,21 +51,87 @@ export class NTQQUserApi {
     return napCatCore.session.getGroupService().setHeader(gc, filePath);
   }
 
-  static async getSelfInfo() {
+  static async fetchUserDetailInfos(uids: string[]) {
+    //26702 以上使用新接口 .Dev Mlikiowa
+    type EventService = NodeIKernelProfileService['fetchUserDetailInfo'];
+    type EventListener = NodeIKernelProfileListener['onUserDetailInfoChanged'];
+    let retData: User[] = [];
+    let [_retData, _retListener] = await NTEventDispatch.CallNormalEvent
+      <EventService, EventListener>
+      (
+        'NodeIKernelProfileService/fetchUserDetailInfo',
+        'NodeIKernelProfileListener/onUserDetailInfoChanged',
+        uids.length,
+        5000,
+        (profile) => {
+          if (uids.includes(profile.uid)) {
+            let 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;
   }
-
+  static async fetchUserDetailInfo(uid: string) {
-  static async getUserInfo(uid: string) {
+    type EventService = NodeIKernelProfileService['fetchUserDetailInfo'];
-
+    type EventListener = NodeIKernelProfileListener['onUserDetailInfoChanged'];
+    let [_retData, profile] = await NTEventDispatch.CallNormalEvent
+      <EventService, EventListener>
+      (
+        'NodeIKernelProfileService/fetchUserDetailInfo',
+        'NodeIKernelProfileListener/onUserDetailInfoChanged',
+        1,
+        5000,
+        (profile) => {
+          if (profile.uid === uid) {
+            return true;
+          }
+          return false;
+        },
+        "BuddyProfileStore",
+        [
+          uid
+        ],
+        UserDetailSource.KSERVER,
+        [
+          ProfileBizType.KALL
+        ]
+      );
+    let RetUser: User = {
+      ...profile.simpleInfo.coreInfo,
+      ...profile.simpleInfo.status,
+      ...profile.simpleInfo.vasInfo,
+      ...profile.commonExt,
+      ...profile.simpleInfo.baseInfo,
+      qqLevel: profile.commonExt.qqLevel,
+      pendantId: ""
+    };
+    return RetUser;
   }
-  //   enum ProfileBizType {
-  //     KALL,
-  //     KBASEEXTEND,
-  //     KVAS,
-  //     KQZONE,
-  //     KOTHER
-  // }
   static async getUserDetailInfo(uid: string) {
+    if (requireMinNTQQBuild('26702')) {
+      return this.fetchUserDetailInfo(uid);
+    }
+    return this.getUserDetailInfoOld(uid);
+  }
+  static async getUserDetailInfoOld(uid: string) {
     type EventService = NodeIKernelProfileService['getUserDetailInfoWithBizInfo'];
     type EventListener = NodeIKernelProfileListener['onProfileDetailInfoChanged'];
     let [_retData, profile] = await NTEventDispatch.CallNormalEvent
@@ -135,38 +202,90 @@ export class NTQQUserApi {
     }
     return skey;
   }
-  @CacheClassFuncAsyncExtend(3600, 'Uin2Uid', (Uin: string, Uid: string | undefined) => {
+  @CacheClassFuncAsyncExtend(3600 * 1000, 'Uin2Uid', (Uin: string, Uid: string | undefined) => {
     if (Uid && Uid.indexOf('u_') != -1) {
       return true
     }
-    logWarn("uin转换到uid时异常", Uin);
+    logWarn("uin转换到uid时异常", Uin, Uid);
     return false;
   })
   static async getUidByUin(Uin: string) {
-    let ret = await NTEventDispatch.CallNoListenerEvent
+    //此代码仅临时使用，后期会被废弃
-      <(Uin: string[]) => Promise<{ uidInfo: Map<string, string> }>>(
+    if (requireMinNTQQBuild('26702')) {
-        'NodeIKernelUixConvertService/getUid',
+      return await NTQQUserApi.getUidByUinV2(Uin);
-        5000,
+    }
-        [Uin]
+    return await NTQQUserApi.getUidByUinV1(Uin);
-      );
+  }
-    let uid = ret.uidInfo.get(Uin); //通过QQ默认方式转换
+  @CacheClassFuncAsyncExtend(3600 * 1000, 'Uid2Uin', (Uid: string | undefined, Uin: number | undefined) => {
+    if (Uin && Uin != 0 && !isNaN(Uin)) {
+      return true
+    }
+    logWarn("uid转换到uin时异常", Uid, Uin);
+    return false;
+  })
+  static async getUinByUid(Uid: string) {
+    //此代码仅临时使用，后期会被废弃
+    if (requireMinNTQQBuild('26702')) {
+      return await NTQQUserApi.getUinByUidV2(Uid);
+    }
+    return await NTQQUserApi.getUinByUidV1(Uid);
+  }
+
+  //后期改成流水线处理
+  static async getUidByUinV2(Uin: string) {
+    let uid = (await napCatCore.session.getProfileService().getUidByUin('FriendsServiceImpl', [Uin])).get(Uin);
+    if (uid) return uid;
+    uid = (await napCatCore.session.getGroupService().getUidByUins([Uin])).uids.get(Uin);
+    if (uid) return uid;
+    uid = (await napCatCore.session.getUixConvertService().getUid([Uin])).uidInfo.get(Uin);
+    if (uid) return uid;
+    console.log((await NTQQFriendApi.getBuddyIdMapCache(true)));
+    uid = (await NTQQFriendApi.getBuddyIdMapCache(true)).getValue(Uin);//从Buddy缓存获取Uid
+    if (uid) return uid;
+    uid = (await NTQQFriendApi.getBuddyIdMap(true)).getValue(Uin);
+    if (uid) return uid;
+    let unveifyUid = (await NTQQUserApi.getUserDetailInfoByUinV2(Uin)).detail.uid;//从QQ Native 特殊转换
+    if (unveifyUid.indexOf("*") == -1) uid = unveifyUid;
+    //if (uid) return uid;
+    return uid;
+  }
+  //后期改成流水线处理
+  static async getUinByUidV2(Uid: string) {
+    let uin = (await napCatCore.session.getProfileService().getUinByUid('FriendsServiceImpl', [Uid])).get(Uid);
+    if (uin) return uin;
+    uin = (await napCatCore.session.getGroupService().getUinByUids([Uid])).uins.get(Uid);
+    if (uin) return uin;
+    uin = (await napCatCore.session.getUixConvertService().getUin([Uid])).uinInfo.get(Uid);
+    if (uin) return uin;
+    uin = (await NTQQFriendApi.getBuddyIdMapCache(true)).getKey(Uid);//从Buddy缓存获取Uin
+    if (uin) return uin;
+    uin = (await NTQQFriendApi.getBuddyIdMap(true)).getKey(Uid);
+    if (uin) return uin;
+    uin = (await NTQQUserApi.getUserDetailInfo(Uid)).uin; //从QQ Native 转换
+    return uin;
+  }
+
+  static async getUidByUinV1(Uin: string) {
+    // 通用转换开始尝试
+    let uid = (await napCatCore.session.getUixConvertService().getUid([Uin])).uidInfo.get(Uin);
+    // Uid 好友转
     if (!uid) {
       Array.from(friends.values()).forEach((t) => {
         if (t.uin == Uin) {
-          //logDebug('getUidByUin', t.uid, t.uin, Uin);
           uid = t.uid;
         }
-        //console.log(t.uid, t.uin, Uin);
       });
-      //uid = Array.from(friends.values()).find((t) => { t.uin == Uin })?.uid;  // 从NC维护的QQ Buddy缓存 转换
     }
-
+    //Uid 群友列表转
-    // if (!uid) {
+    if (!uid) {
-    //   uid = (await NTQQFriendApi.getFriends(false)).find((t) => { t.uin == Uin })?.uid;  //从QQ Native 缓存转换 方法一
+      for (let groupMembersList of groupMembers.values()) {
-    // }
+        for (let GroupMember of groupMembersList.values()) {
-    // if (!uid) {
+          if (GroupMember.uin == Uin) {
-    //   uid = (await NTQQFriendApi.getFriends(true)).find((t) => { t.uin == Uin })?.uid;  //从QQ Native 非缓存转换 方法二
+            uid = GroupMember.uid;
-    // }
+          }
+        }
+      }
+    }
     if (!uid) {
       let unveifyUid = (await NTQQUserApi.getUserDetailInfoByUin(Uin)).info.uid;//从QQ Native 特殊转换 方法三
       if (unveifyUid.indexOf("*") == -1) {
@@ -175,17 +294,7 @@ export class NTQQUserApi {
     }
     return uid;
   }
-  @CacheClassFuncAsyncExtend(3600, 'Uid2Uin', (Uid: string | undefined, Uin: number | undefined) => {
+  static async getUinByUidV1(Uid: string) {
-    if (Uin && Uin != 0 && !isNaN(Uin)) {
-      return true
-    }
-    logWarn("uid转换到uin时异常", Uid);
-    return false;
-  })
-  static async getUinByUid(Uid: string | undefined) {
-    if (!Uid) {
-      return '';
-    }
     let ret = await NTEventDispatch.CallNoListenerEvent
       <(Uin: string[]) => Promise<{ uinInfo: Map<string, string> }>>(
         'NodeIKernelUixConvertService/getUin',
@@ -225,6 +334,14 @@ export class NTQQUserApi {
   static async getRecentContactList() {
     return await napCatCore.session.getRecentContactService().getRecentContactList();
   }
+  static async getUserDetailInfoByUinV2(Uin: string) {
+    return await NTEventDispatch.CallNoListenerEvent
+      <(Uin: string) => Promise<UserDetailInfoByUinV2>>(
+        'NodeIKernelProfileService/getUserDetailInfoByUin',
+        5000,
+        Uin
+      );
+  }
   static async getUserDetailInfoByUin(Uin: string) {
     return NTEventDispatch.CallNoListenerEvent
       <(Uin: string) => Promise<UserDetailInfoByUin>>(

src/core/src/apis/webapi.ts

@@ -114,6 +114,22 @@ export interface GroupEssenceMsgRet {
   }
 }
 export class WebApi {
+  static async shareDigest(groupCode: string, msgSeq: string, msgRandom: string, targetGroupCode: string) {
+    const CookiesObject = await NTQQUserApi.getCookies('qun.qq.com');
+    const CookieValue = Object.entries(CookiesObject).map(([key, value]) => `${key}=${value}`).join('; ');
+    const Bkn = WebApi.genBkn(CookiesObject.skey);
+    let ret: any = undefined;
+    const data = 'group_code=' + groupCode + '&msg_seq=' + msgSeq + '&msg_random=' + msgRandom + '&target_group_code=' + targetGroupCode;
+    const url = 'https://qun.qq.com/cgi-bin/group_digest/share_digest?bkn=' + Bkn + "&" + data;
+    //console.log(url);
+    try {
+      ret = await RequestUtil.HttpGetText(url, 'GET', '', { 'Cookie': CookieValue });
+      return ret;
+    } catch (e) {
+      return undefined;
+    }
+    return undefined;
+  }
   @CacheClassFuncAsync(3600 * 1000, 'webapi_get_group_members')
   static async getGroupEssenceMsg(GroupCode: string, page_start: string) {
     const CookiesObject = await NTQQUserApi.getCookies('qun.qq.com');

src/core/src/core.ts

@@ -15,12 +15,12 @@ import { DependsAdapter, DispatcherAdapter, GlobalAdapter, NodeIGlobalAdapter }
 import path from 'node:path';
 import os from 'node:os';
 import fs from 'node:fs';
-import { appid, qqVersionConfigInfo } from '@/common/utils/QQBasicInfo';
+import { getFullQQVesion, QQVersionAppid, QQVersionQua, requireMinNTQQBuild } from '@/common/utils/QQBasicInfo';
 import { hostname, systemVersion } from '@/common/utils/system';
 import { genSessionConfig } from '@/core/sessionConfig';
 import { sleep } from '@/common/utils/helper';
 import crypto from 'node:crypto';
-import { rawFriends, friends, groupMembers, groups, selfInfo, stat } from '@/core/data';
+import { groupMembers, groups, selfInfo, stat } from '@/core/data';
 import { GroupMember, RawMessage } from '@/core/entities';
 import { NTEventDispatch } from '@/common/utils/EventTask';
 import {
@@ -33,6 +33,7 @@ import {
   setLogSelfInfo
 } from '@/common/utils/log';
 import { napCatConfig } from '@/core/utils/config';
+import { NTQQFriendApi } from './apis';
 
 export interface OnLoginSuccess {
   (uin: string, uid: string): void | Promise<void>;
@@ -84,7 +85,6 @@ export class NapCatCore {
         const dataPath = path.resolve(this.dataPath, './NapCat/data');
         fs.mkdirSync(dataPath, { recursive: true });
         logDebug('本账号数据/缓存目录：', dataPath);
-        // dbUtil.init(path.resolve(dataPath, `./${arg.uin}-v2.db`)).then(() => {
         this.initDataListener();
         this.onLoginSuccessFuncList.map(cb => {
           new Promise((resolve, reject) => {
@@ -94,11 +94,6 @@ export class NapCatCore {
             }
           }).then();
         });
-        // }).catch((e) => {
-        //   logError('数据库初始化失败', e);
-        // });
-        // this.initDataListener();
-
       }).catch((e) => {
         logError('initSession failed', e);
         throw new Error(`启动失败: ${JSON.stringify(e)}`);
@@ -139,10 +134,10 @@ export class NapCatCore {
       base_path_prefix: '',
       platform_type: 3,
       app_type: 4,
-      app_version: qqVersionConfigInfo.curVersion,
+      app_version: getFullQQVesion(),
       os_version: 'Windows 10 Pro',
       use_xlog: true,
-      qua: `V1_WIN_NQ_${qqVersionConfigInfo.curVersion.replace('-', '_')}_GW_B`,
+      qua: QQVersionQua,
       global_path_config: {
         desktopGlobalPath: this.dataPathGlobal,
       },
@@ -150,10 +145,10 @@ export class NapCatCore {
     }, new QQWrapper.NodeIGlobalAdapter(new GlobalAdapter()));
     this.loginService.initConfig({
       machineId: '',
-      appid,
+      appid: QQVersionAppid,
       platVer: systemVersion,
       commonPath: this.dataPathGlobal,
-      clientVer: qqVersionConfigInfo.curVersion,
+      clientVer: getFullQQVesion(),
       hostName: hostname
     });
   }
@@ -258,31 +253,23 @@ export class NapCatCore {
       stat.packet_received += 1;
     };
     this.addListener(msgListener);
-    // 好友相关
+    // 好友相关 
     const buddyListener = new BuddyListener();
-    buddyListener.onBuddyListChange = arg => {
+
-      rawFriends.length = 0;
+
-      rawFriends.push(...arg);
-      // console.log('onBuddyListChange', arg);
-      for (const categoryItem of arg) {
-        for (const friend of categoryItem.buddyList) {
-          // console.log("onBuddyListChange", friend)
-          const existFriend = friends.get(friend.uid);
-          if (existFriend) {
-            Object.assign(existFriend, friend);
-          }
-          else {
-            friends.set(friend.uid, friend);
-          }
-        }
-        // console.log("onBuddyListChange", friend)
-      }
-    };
     this.addListener(buddyListener);
-    // 刷新一次好友列表
+    // 刷新一次好友列表  26702版本以下需要手动刷新一次获取 高版本NTQQ自带缓存
-    this.session.getBuddyService().getBuddyList(true).then(arg => {
+    if (!requireMinNTQQBuild('26702')) {
-      // console.log('getBuddyList', arg);
+      this.session.getBuddyService().getBuddyList(true).then(arg => {
-    });
+        // console.log('getBuddyList', arg);
+      });
+    } else {
+      // NTQQFriendApi.getBuddyV2(true).then((res) => {
+      //   res.forEach((item) => {
+      //     CachedIdMap.set(item.uid!, item.uin!);
+      //   });
+      // }).catch();
+    }
     interface SelfStatusInfo {
       uid: string
       status: number

src/core/src/data.ts

@@ -3,9 +3,11 @@ import {
   type Group,
   type GroupMember,
   type SelfInfo,
-  type BuddyCategoryType
+  type BuddyCategoryType,
+  FriendV2
 } from './entities';
 import { isNumeric } from '@/common/utils/helper';
+import { LimitedHashTable } from '@/common/utils/MessageUnique';
 import { NTQQGroupApi } from '@/core/apis';
 
 export const selfInfo: SelfInfo = {
@@ -14,8 +16,6 @@ export const selfInfo: SelfInfo = {
   nick: '',
   online: true
 };
-// 未来只在此处保留 selfInfo stat
-// groupCode -> Group
 export const groups: Map<string, Group> = new Map<string, Group>();
 
 export function deleteGroup(groupQQ: string) {
@@ -26,9 +26,10 @@ export function deleteGroup(groupQQ: string) {
 // 群号 -> 群成员map(uid=>GroupMember)
 export const groupMembers: Map<string, Map<string, GroupMember>> = new Map<string, Map<string, GroupMember>>();
 
-// uid -> Friend 下面这俩个准备移除 QQ里面自带缓存
 export const friends: Map<string, Friend> = new Map<string, Friend>();
-export const rawFriends: Array<BuddyCategoryType> = []; // 带分组的好友列表
+
+//转换列表
+//export const CachedIdMap = new LimitedHashTable<string, string>(1000);
 
 export async function getGroup(qq: string | number): Promise<Group | undefined> {
   let group = groups.get(qq.toString());

src/core/src/entities/group.ts

@@ -1,12 +1,18 @@
 import { QQLevel, Sex } from './user';
-
+export enum GroupListUpdateType {
+    REFRESHALL,
+    GETALL,
+    MODIFIED,
+    REMOVE
+}
 export interface Group {
     groupCode: string,
+    createTime?:string,//高版本才有
     maxMember: number,
     memberCount: number,
     groupName: string,
-    groupStatus: 0,
+    groupStatus: number,
-    memberRole: 2,
+    memberRole: number,
     isTop: boolean,
     toppedTimestamp: string,
     privilegeFlag: number, //65760

src/core/src/entities/msg.ts

@@ -55,22 +55,24 @@ export enum ElementType {
   TASKTOPMSG = 29,
   RECOMMENDEDMSG = 43,
   ACTIONBAR = 44
+} 
+export interface ActionBarElement {
+  rows: InlineKeyboardRow[];
+  botAppid: string;
 }
 export interface SendActionBarElement {
   elementType: ElementType.ACTIONBAR;
   elementId: string;
-  actionBarElement: {
+  actionBarElement: ActionBarElement;
-    rows: InlineKeyboardRow[];
+}
-    botAppid: string;
+export interface RecommendedMsgElement {
-  }
+  rows: InlineKeyboardRow[];
+  botAppid: string;
 }
 export interface SendRecommendedMsgElement {
   elementType: ElementType.RECOMMENDEDMSG;
   elementId: string;
-  recommendedMsgElement: {
+  recommendedMsgElement: RecommendedMsgElement;
-    rows: InlineKeyboardRow[];
-    botAppid: string;
-  }
 }
 export interface InlineKeyboardButton {
   id: string;
@@ -93,67 +95,72 @@ export interface TofuElementContent {
   color: string;
   tittle: string;
 }
+export interface TaskTopMsgElement {
+  msgTitle: string;
+  msgSummary: string;
+  iconUrl: string;
+  topMsgType: number;
+}
 export interface SendTaskTopMsgElement {
   elementType: ElementType.TASKTOPMSG;
   elementId: string;
-  taskTopMsgElement: {
+  taskTopMsgElement: TaskTopMsgElement;
-    msgTitle: string;
+}
-    msgSummary: string;
+export interface TofuRecordElement {
-    iconUrl: string;
+  type: number;
-    topMsgType: number;
+  busiid: string;
-  }
+  busiuuid: string;
+  descriptionContent: string;
+  contentlist: TofuElementContent[],
+  background: string;
+  icon: string;
+  uinlist: string[],
+  uidlist: string[],
+  busiExtra: string;
+  updateTime: string;
+  dependedmsgid: string;
+  msgtime: string;
+  onscreennotify: boolean;
 }
 export interface SendTofuRecordElement {
   elementType: ElementType.TOFURECORD;
   elementId: string;
-  tofuRecordElement: {
+  tofuRecordElement: TofuRecordElement;
-    type: number;
+}
-    busiid: string;
+
-    busiuuid: string;
+export interface FaceBubbleElement {
-    descriptionContent: string;
+  faceCount: number;
-    contentlist: TofuElementContent[],
+  faceSummary: string;
-    background: string;
+  faceFlag: number;
-    icon: string;
+  content: string;
-    uinlist: string[],
+  oldVersionStr: string;
-    uidlist: string[],
+  faceType: number;
-    busiExtra: string;
+  others: string;
-    updateTime: string;
+  yellowFaceInfo: {
-    dependedmsgid: string;
+    index: number;
-    msgtime: string;
+    buf: string;
-    onscreennotify: boolean;
+    compatibleText: string;
+    text: string;
   }
 }
 export interface SendFaceBubbleElement {
   elementType: ElementType.FACEBUBBLE;
   elementId: string;
-  faceBubbleElement: {
+  faceBubbleElement: FaceBubbleElement;
-    faceCount: number;
-    faceSummary: string;
-    faceFlag: number;
-    content: string;
-    oldVersionStr: string;
-    faceType: number;
-    others: string;
-    yellowFaceInfo: {
-      index: number;
-      buf: string;
-      compatibleText: string;
-      text: string;
-    }
-  }
 
 }
+export interface AvRecordElement {
+  type: number;
+  time: string;
+  text: string;
+  mainType: number;
+  hasRead: boolean;
+  extraType: number;
+}
 export interface SendavRecordElement {
   elementType: ElementType.AVRECORD;
   elementId: string;
-  avRecordElement: {
+  avRecordElement: AvRecordElement;
-    type: number;
-    time: string;
-    text: string;
-    mainType: number;
-    hasRead: boolean;
-    extraType: number;
-  }
 }
 export interface YoloUserInfo {
   uid: string;
@@ -170,37 +177,40 @@ export interface SendInlineKeyboardElement {
   }
 
 }
+export interface YoloGameResultElement {
+  UserInfo: YoloUserInfo[];
+}
 export interface SendYoloGameResultElement {
   elementType: ElementType.YOLOGAMERESULT;
-  yoloGameResultElement: {
+  yoloGameResultElement: YoloGameResultElement
-    UserInfo: YoloUserInfo[];
+}
-  }
+export interface GiphyElement {
+  id: string;
+  isClip: boolean;
+  width: number;
+  height: number;
 }
 export interface SendGiphyElement {
   elementType: ElementType.GIPHY;
   elementId: string;
-  giphyElement: {
+  giphyElement: GiphyElement;
-    id: string;
-    isClip: boolean;
-    width: number;
-    height: number;
-  }
 }
 export interface SendWalletElement {
   elementType: ElementType.UNKNOWN;//不做 设置位置
   elementId: string;
   walletElement: {}
 }
+export interface CalendarElement {
+  summary: string;
+  msg: string;
+  expireTimeMs: string;
+  schemaType: number;
+  schema: string
+}
 export interface SendCalendarElement {
   elementType: ElementType.CALENDAR;
   elementId: string;
-  calendarElement: {
+  calendarElement: CalendarElement;
-    summary: string;
-    msg: string;
-    expireTimeMs: string;
-    schemaType: number;
-    schema: string
-  }
 }
 export interface SendliveGiftElement {
   elementType: ElementType.LIVEGIFT;
@@ -252,32 +262,18 @@ export enum PicSubType {
 export interface SendPicElement {
   elementType: ElementType.PIC;
   elementId: string;
-  picElement: {
+  picElement:PicElement
-    md5HexStr: string;
+}
-    fileSize: number | string;
+export interface ReplyElement {
-    picWidth: number;
+  replayMsgSeq: string;
-    picHeight: number;
+  replayMsgId: string;
-    fileName: string;
+  senderUin: string;
-    sourcePath: string;
+  senderUinStr: string;
-    original: boolean;
-    picType: PicType;
-    picSubType: PicSubType;
-    fileUuid: string;
-    fileSubId: string;
-    thumbFileSize: number;
-    summary: string;
-  };
 }
-
 export interface SendReplyElement {
   elementType: ElementType.REPLY;
   elementId: string;
-  replyElement: {
+  replyElement: ReplyElement
-    replayMsgSeq: string;
-    replayMsgId: string;
-    senderUin: string;
-    senderUinStr: string;
-  }
 }
 
 export interface SendFaceElement {
@@ -293,10 +289,11 @@ export interface SendMarketFaceElement {
 export interface SendstructLongMsgElement {
   elementType: ElementType.STRUCTLONGMSG;
   elementId: string;
-  structLongMsgElement: {
+  structLongMsgElement: StructLongMsgElement;
-    xmlContent: string;
+}
-    resId: string;
+export interface StructLongMsgElement {
-  }
+  xmlContent: string;
+  resId: string;
 }
 export interface SendactionBarElement {
   elementType: ElementType.ACTIONBAR;
@@ -306,13 +303,14 @@ export interface SendactionBarElement {
     botAppid: string;
   }
 }
+export interface ShareLocationElement {
+  text: string;
+  ext: string;
+}
 export interface sendShareLocationElement {
   elementType: ElementType.SHARELOCATION;
   elementId: string;
-  shareLocationElement: {
+  shareLocationElement?: ShareLocationElement;
-    text: string;
-    ext: string;
-  }
 }
 
 export interface FileElement {
@@ -356,10 +354,51 @@ export interface SendMarkdownElement {
   elementId: string;
   markdownElement: MarkdownElement;
 }
-
 export type SendMessageElement = SendTextElement | SendPttElement |
-  SendPicElement | SendReplyElement | SendFaceElement | SendMarketFaceElement | SendFileElement | SendVideoElement | SendArkElement | SendMarkdownElement | sendShareLocationElement
+  SendPicElement | SendReplyElement | SendFaceElement | SendMarketFaceElement | SendFileElement |
+  SendVideoElement | SendArkElement | SendMarkdownElement | sendShareLocationElement;
 
+export interface TextElement {
+  content: string;
+  atType: number;
+  atUid: string;
+  atTinyId: string;
+  atNtUid: string;
+}
+export interface MessageElement {
+  elementType: ElementType,
+  elementId: string,
+  extBufForUI: string,//"0x",
+  textElement?: TextElement;
+  faceElement?: FaceElement,
+  marketFaceElement?: MarkdownElement,
+  replyElement?: ReplyElement,
+  picElement?: PicElement,
+  pttElement?: PttElement,
+  videoElement?: VideoElement,
+  grayTipElement?: GrayTipElement,
+  arkElement?: ArkElement,
+  fileElement?: FileElement,
+  liveGiftElement?: null,
+  markdownElement?: MarkdownElement,
+  structLongMsgElement?: StructLongMsgElement,
+  multiForwardMsgElement?: MultiForwardMsgElement,
+  giphyElement?: GiphyElement,
+  walletElement?: null,
+  inlineKeyboardElement?: InlineKeyboardElement,
+  textGiftElement?: null,//????
+  calendarElement?: CalendarElement,
+  yoloGameResultElement?: YoloGameResultElement,
+  avRecordElement?: AvRecordElement,
+  structMsgElement?: null,
+  faceBubbleElement?: FaceBubbleElement,
+  shareLocationElement?: ShareLocationElement,
+  tofuRecordElement?: TofuRecordElement,
+  taskTopMsgElement?: TaskTopMsgElement,
+  recommendedMsgElement?: RecommendedMsgElement,
+  actionBarElement?:ActionBarElement
+
+}
 export enum AtType {
   notAt = 0,
   atAll = 1,
@@ -450,18 +489,23 @@ export const IMAGE_HTTP_HOST = 'https://gchat.qpic.cn';
 export const IMAGE_HTTP_HOST_NT = 'https://multimedia.nt.qq.com.cn';
 
 export interface PicElement {
-  picSubType?: number;
+  md5HexStr?: string;
-  originImageUrl: string;  // http url, 没有host，host是https://gchat.qpic.cn/, 带download参数的是https://multimedia.nt.qq.com.cn
+  fileSize: number | string;//number
-  originImageMd5?: string;
-  sourcePath: string; // 图片本地路径
-  thumbPath: Map<number, string>;
   picWidth: number;
   picHeight: number;
-  fileSize: number;
   fileName: string;
+  sourcePath: string;
+  original: boolean;
+  picType: PicType;
+  picSubType?: PicSubType;
   fileUuid: string;
-  md5HexStr?: string;
+  fileSubId: string;
-}
+  thumbFileSize: number;
+  summary: string;
+  thumbPath: Map<number, string>;
+  originImageMd5?: string;
+  originImageUrl?: string;  // http url, 没有host，host是https://gchat.qpic.cn/, 带download参数的是https://multimedia.nt.qq.com.cn
+};
 
 export enum GrayTipElementSubType {
   INVITE_NEW_MEMBER = 12,
@@ -687,6 +731,7 @@ export interface MultiForwardMsgElement {
 }
 
 export interface RawMessage {
+  guildId: string;
   msgRandom: string;
   // int32, 自己维护的消息id
   id?: number;
@@ -708,10 +753,12 @@ export interface RawMessage {
   chatType: ChatType;
   sendStatus?: number;  // 消息状态，别人发的2是已撤回，自己发的2是已发送
   recallTime: string; // 撤回时间, "0"是没有撤回
+  records: RawMessage[];
   elements: {
     elementId: string;
     elementType: ElementType;
     replyElement: {
+      sourceMsgIdInRecords: string;
       senderUid: string; // 原消息发送者QQ号
       sourceMsgIsIncPic: boolean; // 原消息是否有图片
       sourceMsgText: string;

src/core/src/entities/notify.ts

@@ -62,6 +62,7 @@ export enum BuddyReqType {
   KMEINITIATORWAITPEERCONFIRM
 }
 export interface FriendRequest {
+  isInitiator?: boolean;
   isDecide: boolean;
   friendUid: string;
   reqType: BuddyReqType,

src/core/src/entities/user.ts

@@ -9,7 +9,181 @@ export interface BuddyCategoryType {
     categroyMbCount: number;
     buddyList: User[];
 }
+export interface CoreInfo {
+    uid: string;
+    uin: string;
+    nick: string;
+    remark: string;
+}
 
+export interface BaseInfo {
+    qid: string;
+    longNick: string;
+    birthday_year: number;
+    birthday_month: number;
+    birthday_day: number;
+    age: number;
+    sex: number;
+    eMail: string;
+    phoneNum: string;
+    categoryId: number;
+    richTime: number;
+    richBuffer: string;
+}
+
+interface MusicInfo {
+    buf: string;
+}
+
+interface VideoBizInfo {
+    cid: string;
+    tvUrl: string;
+    synchType: string;
+}
+
+interface VideoInfo {
+    name: string;
+}
+
+interface ExtOnlineBusinessInfo {
+    buf: string;
+    customStatus: any;
+    videoBizInfo: VideoBizInfo;
+    videoInfo: VideoInfo;
+}
+
+interface ExtBuffer {
+    buf: string;
+}
+
+interface UserStatus {
+    uid: string;
+    uin: string;
+    status: number;
+    extStatus: number;
+    batteryStatus: number;
+    termType: number;
+    netType: number;
+    iconType: number;
+    customStatus: any;
+    setTime: string;
+    specialFlag: number;
+    abiFlag: number;
+    eNetworkType: number;
+    showName: string;
+    termDesc: string;
+    musicInfo: MusicInfo;
+    extOnlineBusinessInfo: ExtOnlineBusinessInfo;
+    extBuffer: ExtBuffer;
+}
+
+interface PrivilegeIcon {
+    jumpUrl: string;
+    openIconList: any[];
+    closeIconList: any[];
+}
+
+interface VasInfo {
+    vipFlag: boolean;
+    yearVipFlag: boolean;
+    svipFlag: boolean;
+    vipLevel: number;
+    bigClub: boolean;
+    bigClubLevel: number;
+    nameplateVipType: number;
+    grayNameplateFlag: number;
+    superVipTemplateId: number;
+    diyFontId: number;
+    pendantId: number;
+    pendantDiyId: number;
+    faceId: number;
+    vipFont: number;
+    vipFontType: number;
+    magicFont: number;
+    fontEffect: number;
+    newLoverDiamondFlag: number;
+    extendNameplateId: number;
+    diyNameplateIDs: any[];
+    vipStartFlag: number;
+    vipDataFlag: number;
+    gameNameplateId: string;
+    gameLastLoginTime: string;
+    gameRank: number;
+    gameIconShowFlag: boolean;
+    gameCardId: string;
+    vipNameColorId: string;
+    privilegeIcon: PrivilegeIcon;
+}
+
+interface RelationFlags {
+    topTime: string;
+    isBlock: boolean;
+    isMsgDisturb: boolean;
+    isSpecialCareOpen: boolean;
+    isSpecialCareZone: boolean;
+    ringId: string;
+    isBlocked: boolean;
+    recommendImgFlag: number;
+    disableEmojiShortCuts: number;
+    qidianMasterFlag: number;
+    qidianCrewFlag: number;
+    qidianCrewFlag2: number;
+    isHideQQLevel: number;
+    isHidePrivilegeIcon: number;
+}
+
+
+interface CommonExt {
+    constellation: number;
+    shengXiao: number;
+    kBloodType: number;
+    homeTown: string;
+    makeFriendCareer: number;
+    pos: string;
+    college: string;
+    country: string;
+    province: string;
+    city: string;
+    postCode: string;
+    address: string;
+    regTime: number;
+    interest: string;
+    labels: any[];
+    qqLevel: QQLevel;
+}
+
+interface Pic {
+    picId: string;
+    picTime: number;
+    picUrlMap: Record<string, string>;
+}
+
+interface PhotoWall {
+    picList: Pic[];
+}
+
+export interface SimpleInfo {
+    uid?: string;
+    uin?: string;
+    coreInfo: CoreInfo;
+    baseInfo: BaseInfo;
+    status: UserStatus | null;
+    vasInfo: VasInfo | null;
+    relationFlags: RelationFlags | null;
+    otherFlags: any | null;
+    intimate: any | null;
+}
+export interface FriendV2 extends SimpleInfo {
+    categoryId?: number;
+    categroyName?: string;
+}
+export interface UserDetailInfoListenerArg {
+    uid: string;
+    uin: string;
+    simpleInfo: SimpleInfo;
+    commonExt: CommonExt;
+    photoWall: PhotoWall;
+}
 export interface ModifyProfileParams {
     nick: string,
     longNick: string,
@@ -101,7 +275,18 @@ export interface Friend extends User { }
 export enum BizKey {
     KPRIVILEGEICON,
     KPHOTOWALL
-  }
+}
+export interface UserDetailInfoByUinV2 {
+    result: number,
+    errMsg: string,
+    detail: {
+        uid: string,
+        uin: string,
+        simpleInfo: SimpleInfo,
+        commonExt: CommonExt,
+        photoWall: null
+    }
+}
 export interface UserDetailInfoByUin {
     result: number,
     errMsg: string,

src/core/src/external/appid.json

@@ -0,0 +1,42 @@
+{
+    "3.1.2-13107": {
+        "appid": 537146866,
+        "qua": "V1_LNX_NQ_3.1.2-13107_RDM_B"
+    },
+    "3.2.10-25765": {
+        "appid": 537234773,
+        "qua": "V1_LNX_NQ_3.2.10_25765_GW_B"
+    },
+    "3.2.12-26702": {
+        "appid": 537237950,
+        "qua": "V1_LNX_NQ_3.2.12_26702_GW_B"
+    },
+    "9.9.11-24815": {
+        "appid": 537226656,
+        "qua": "V1_WIN_NQ_9.9.11_24815_GW_B"
+    },
+    "9.9.12-25493": {
+        "appid": 537231759,
+        "qua": "V1_WIN_NQ_9.9.12_25493_GW_B"
+    },
+    "9.9.12-25765": {
+        "appid": 537234702,
+        "qua": "V1_WIN_NQ_9.9.12_25765_GW_B"
+    },
+    "9.9.12-26299": {
+        "appid": 537234826,
+        "qua": "V1_WIN_NQ_9.9.12_26299_GW_B"
+    },
+    "9.9.12-26339": {
+        "appid": 537234826,
+        "qua": "V1_WIN_NQ_9.9.12_26339_GW_B"
+    },
+    "9.9.12-26466": {
+        "appid": 537234826,
+        "qua": "V1_WIN_NQ_9.9.12_26466_GW_B"
+    },
+    "9.9.15-26702": {
+        "appid": 537237765,
+        "qua": "V1_WIN_NQ_9.9.15_26702_GW_B"
+    }
+}

src/core/src/listeners/NodeIKernelBuddyListener.ts

@@ -3,6 +3,8 @@ import { BuddyCategoryType, FriendRequestNotify } from '@/core/entities';
 export type OnBuddyChangeParams = BuddyCategoryType[]
 
 interface IBuddyListener {
+  onBuddyListChangedV2(arg: unknown): void,//V2版本 还没兼容
+
   onBuddyListChange(arg: OnBuddyChangeParams): void,
 
   onBuddyInfoChange(arg: unknown): void,
@@ -44,6 +46,9 @@ export interface NodeIKernelBuddyListener extends IBuddyListener {
 }
 
 export class BuddyListener implements IBuddyListener {
+  onBuddyListChangedV2(arg: unknown): void {
+    //throw new Error('Method not implemented.');
+  }
   onAddBuddyNeedVerify(arg: unknown) {
   }
 

src/core/src/listeners/NodeIKernelGroupListener.ts

@@ -1,7 +1,7 @@
-import { Group, GroupMember, GroupNotify } from '@/core/entities';
+import { Group, GroupListUpdateType, GroupMember, GroupNotify } from '@/core/entities';
 
 interface IGroupListener {
-  onGroupListUpdate(updateType: number, groupList: Group[]): void;
+  onGroupListUpdate(updateType: GroupListUpdateType, groupList: Group[]): void;
 
   onGroupExtListUpdate(...args: unknown[]): void;
 
@@ -96,7 +96,7 @@ export class GroupListener implements IGroupListener {
   onGroupFirstBulletinNotify(...args: unknown[]) {
   }
 
-  onGroupListUpdate(updateType: number, groupList: Group[]) {
+  onGroupListUpdate(updateType: GroupListUpdateType, groupList: Group[]) {
   }
 
   onGroupNotifiesUpdated(dboubt: boolean, notifies: GroupNotify[]) {
@@ -202,7 +202,7 @@ export class DebugGroupListener implements IGroupListener {
     console.log('onGroupNotifiesUnreadCountUpdated:', ...args);
   }
 
-  onGroupSingleScreenNotifies(doubt: boolean, seq: string, notifies: GroupNotify[]){
+  onGroupSingleScreenNotifies(doubt: boolean, seq: string, notifies: GroupNotify[]) {
     console.log('onGroupSingleScreenNotifies:');
   }
 

src/core/src/listeners/NodeIKernelMsgListener.ts

@@ -226,7 +226,7 @@ export interface IKernelMsgListener {
 
 }
 
-export interface NodeIKernelMsgListener {
+export interface NodeIKernelMsgListener extends IKernelMsgListener {
   // eslint-disable-next-line @typescript-eslint/no-misused-new
   new(listener: IKernelMsgListener): NodeIKernelMsgListener;
 }

src/core/src/listeners/NodeIKernelProfileListener.ts

@@ -1,8 +1,8 @@
-import { User } from '@/core/entities';
+import { User, UserDetailInfoListenerArg } from '@/core/entities';
 
 interface IProfileListener {
   onProfileSimpleChanged(...args: unknown[]): void;
-
+  onUserDetailInfoChanged(arg: UserDetailInfoListenerArg): void;
   onProfileDetailInfoChanged(profile: User): void;
 
   onStatusUpdate(...args: unknown[]): void;
@@ -18,6 +18,9 @@ export interface NodeIKernelProfileListener extends IProfileListener {
 }
 
 export class ProfileListener implements IProfileListener {
+  onUserDetailInfoChanged(arg: UserDetailInfoListenerArg): void {
+    
+  }
   onProfileSimpleChanged(...args: unknown[]) {
 
   }

src/core/src/services/NodeIKernelBuddyService.ts

@@ -1,19 +1,44 @@
 import { Friend } from '@/core/entities';
 import { GeneralCallResult } from '@/core/services/common';
 import { NodeIKernelBuddyListener } from '@/core/listeners';
-
+export enum BuddyListReqType {
+  KNOMAL,
+  KLETTER
+}
 export interface NodeIKernelBuddyService {
-  // 以下为自行添加的，wrapper.node中并没有这些方法,目的是简化调用
+  // 26702 以上
-  friends: Friend[];
+  getBuddyListV2(callFrom: string, reqType: BuddyListReqType): Promise<GeneralCallResult & {
-
+    data: Array<{
-  getFriend(uidOrUin: string): Promise<Friend>;
+      categoryId: number,
-
+      categorySortId: number,
+      categroyName: string,
+      categroyMbCount: number,
+      onlineCount: number,
+      buddyUids: Array<string>
+    }>
+  }>;
+  //26702 以上
+  getBuddyListFromCache(callFrom: string): Promise<Array<
+    {
+      categoryId: number,//9999应该跳过 那是兜底数据吧
+      categorySortId: number,//排序方式
+      categroyName: string,//分类名
+      categroyMbCount: number,//不懂
+      onlineCount: number,//在线数目
+      buddyUids: Array<string>//Uids
+    }>>;
   // 以下为原生方法
   addKernelBuddyListener(listener: NodeIKernelBuddyListener): number;
 
+  getAllBuddyCount(): number;
+
   removeKernelBuddyListener(listener: unknown): void;
 
-  getBuddyList(bool: boolean): Promise<GeneralCallResult>;
+  /**
+   * @deprecated
+   * @param nocache 使用缓存
+   */
+  getBuddyList(nocache: boolean): Promise<GeneralCallResult>;
 
   getBuddyNick(uid: number): string;
 

src/core/src/services/NodeIKernelECDHService.ts

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

src/core/src/services/NodeIKernelGroupService.ts

@@ -8,8 +8,90 @@ import {
 } from '@/core/entities';
 import { GeneralCallResult } from '@/core/services/common';
 
+//高版本的接口不应该随意使用 使用应该严格进行pr审核 同时部分ipc中未出现的接口不要过于依赖 应该做好数据兜底
+
 export interface NodeIKernelGroupService {
-  setHeader(uid:string,path:string): unknown;
+  getMemberCommonInfo(Req: {
+    groupCode: string,
+    startUin: string,
+    identifyFlag: string,
+    uinList: string[],
+    memberCommonFilter: {
+      memberUin: number,
+      uinFlag: number,
+      uinFlagExt: number,
+      uinMobileFlag: number,
+      shutUpTime: number,
+      privilege: number,
+    },
+    memberNum: number,
+    filterMethod: string,
+    onlineFlag: string,
+    realSpecialTitleFlag: number
+  }): Promise<unknown>;
+  //26702
+  getGroupMemberLevelInfo(groupCode: string): Promise<unknown>;
+  //26702
+  getGroupHonorList(groupCodes: Array<string>): unknown;
+
+  getUinByUids(uins: string[]): Promise<{
+    errCode: number,
+    errMsg: string,
+    uins: Map<string, string>
+  }>;
+  
+  getUidByUins(uins: string[]): Promise<{
+    errCode: number,
+    errMsg: string,
+    uids: Map<string, string>
+  }>;
+  //26702(其实更早 但是我不知道)
+  checkGroupMemberCache(arrayList: Array<string>): Promise<unknown>;
+
+  //26702(其实更早 但是我不知道)
+  getGroupLatestEssenceList(groupCode: string): Promise<unknown>;
+
+  //26702(其实更早 但是我不知道) 
+  shareDigest(Req: {
+    appId: string,
+    appType: number,
+    msgStyle: number,
+    recvUin: string,
+    sendType: number,
+    clientInfo: {
+      platform: number
+    },
+    richMsg: {
+      usingArk: boolean,
+      title: string,
+      summary: string,
+      url: string,
+      pictureUrl: string,
+      brief: string
+    }
+  }): Promise<unknown>;
+  //26702(其实更早 但是我不知道)
+  isEssenceMsg(Req: { groupCode: string, msgRandom: number, msgSeq: number }): Promise<unknown>;
+  //26702(其实更早 但是我不知道)
+  queryCachedEssenceMsg(Req: { groupCode: string, msgRandom: number, msgSeq: number }): Promise<unknown>;
+  //26702(其实更早 但是我不知道)
+  fetchGroupEssenceList(Req: { groupCode: string, pageStart: number, pageLimit: number }, Arg: unknown): Promise<unknown>;
+  //26702
+  getAllMemberList(groupCode: string, forceFetch: boolean): Promise<{
+    errCode: number,
+    errMsg: string,
+    result: {
+      ids: Array<{
+        uid: string,
+        index: number//0
+      }>,
+      infos: {},
+      finish: true,
+      hasRobot: false
+    }
+  }>;
+
+  setHeader(uid: string, path: string): unknown;
 
   addKernelGroupListener(listener: NodeIKernelGroupListener): number;
 
@@ -17,7 +99,7 @@ export interface NodeIKernelGroupService {
 
   createMemberListScene(groupCode: string, scene: string): string;
 
-  destroyMemberListScene(): void;
+  destroyMemberListScene(SceneId:string): void;
   //About Arg (a) name: lastId 根据手Q来看为object {index:?(number),uid:string}
   getNextMemberList(sceneId: string, a: undefined, num: number): Promise<{
     errCode: number, errMsg: string,
@@ -28,9 +110,9 @@ export interface NodeIKernelGroupService {
 
   monitorMemberList(): unknown;
 
-  searchMember(uid: string): unknown;
+  searchMember(sceneId: string, keywords: string[]): unknown;
 
-  getMemberInfo(uid: string): unknown;
+  getMemberInfo(group_id: string, uids: string[], forceFetch: boolean): Promise<GeneralCallResult>;
   //getMemberInfo  [ '56729xxxx', [ 'u_4Nj08cwW5Hxxxxx' ], true ]
 
   kickMember(groupCode: string, memberUids: string[], refuseForever: boolean, kickReason: string): Promise<void>;
@@ -39,7 +121,7 @@ export interface NodeIKernelGroupService {
 
   modifyMemberCardName(groupCode: string, uid: string, cardName: string): void;
 
-  getTransferableMemberInfo(uid: string): unknown;
+  getTransferableMemberInfo(groupCode: string): unknown;//获取整个群的
 
   transferGroup(uid: string): void;
 

src/core/src/services/NodeIKernelMsgService.ts

@@ -1,11 +1,24 @@
-import { ElementType, Peer, RawMessage, SendMessageElement } from '@/core/entities';
+import { ElementType, MessageElement, Peer, RawMessage, SendMessageElement } from '@/core/entities';
 import { NodeIKernelMsgListener } from '@/core/listeners/NodeIKernelMsgListener';
 import { GeneralCallResult } from '@/core/services/common';
 
+export interface QueryMsgsParams {
+  chatInfo: Peer,
+  filterMsgType: [],
+  filterSendersUid: string[],
+  filterMsgFromTime: string,
+  filterMsgToTime: string,
+  pageLimit: number,
+  isReverseOrder: boolean,
+  isIncludeCurrent: boolean
+}
 export interface NodeIKernelMsgService {
+
+  generateMsgUniqueId(chatType: number, time: string): string;
+
   addKernelMsgListener(nodeIKernelMsgListener: NodeIKernelMsgListener): number;
 
-  sendMsg(msgId: string, peer: Peer, msgElements: SendMessageElement[], map: Map<any, any>): Promise<unknown>;
+  sendMsg(msgId: string, peer: Peer, msgElements: SendMessageElement[], map: Map<any, any>): Promise<GeneralCallResult>;
 
   recallMsg(peer: Peer, msgIds: string[]): Promise<GeneralCallResult>;
 
@@ -73,7 +86,7 @@ export interface NodeIKernelMsgService {
 
   cancelSendMsg(...args: unknown[]): unknown;
 
-  switchToOfflineSendMsg(...args: unknown[]): unknown;
+  switchToOfflineSendMsg(peer: Peer, MsgId: string): unknown;
 
   reqToOfflineSendMsg(...args: unknown[]): unknown;
 
@@ -115,9 +128,9 @@ export interface NodeIKernelMsgService {
 
   addLocalTofuRecordMsg(...args: unknown[]): unknown;
 
-  addLocalRecordMsg(Peer: Peer, msgId: string, rawMessage: RawMessage, attr: Array<any> | number, front: boolean): Promise<unknown>;
+  addLocalRecordMsg(Peer: Peer, msgId: string, ele: MessageElement, attr: Array<any> | number, front: boolean): Promise<unknown>;
 
-  deleteMsg(...args: unknown[]): unknown;
+  deleteMsg(Peer: Peer, msgIds: Array<string>): Promise<any>;
 
   updateElementExtBufForUI(...args: unknown[]): unknown;
 
@@ -141,7 +154,7 @@ export interface NodeIKernelMsgService {
 
   getLastMessageList(peer: Peer[]): Promise<unknown>;
 
-  getAioFirstViewLatestMsgs(peer: Peer, unknown: number): unknown;
+  getAioFirstViewLatestMsgs(peer: Peer, num: number): unknown;
 
   getMsgs(peer: Peer, msgId: string, count: unknown, queryOrder: boolean): Promise<unknown>;
 
@@ -154,7 +167,7 @@ export interface NodeIKernelMsgService {
   // this.$clientSeq = j3;
   // this.$cnt = i2;
 
-  getMsgsWithMsgTimeAndClientSeqForC2C(...args: unknown[]): Promise<unknown>;
+  getMsgsWithMsgTimeAndClientSeqForC2C(...args: unknown[]): Promise<GeneralCallResult & { msgList: RawMessage[] }>;
 
   getMsgsWithStatus(params: {
     peer: Peer
@@ -164,9 +177,9 @@ export interface NodeIKernelMsgService {
     queryOrder: boolean
     isIncludeSelf: boolean
     appid: unknown
-  }): Promise<unknown>;
+  }): Promise<GeneralCallResult & { msgList: RawMessage[] }>;
 
-  getMsgsBySeqRange(peer: Peer, startSeq: string, endSeq: string): Promise<unknown>;
+  getMsgsBySeqRange(peer: Peer, startSeq: string, endSeq: string): Promise<GeneralCallResult & { msgList: RawMessage[] }>;
 
   getMsgsBySeqAndCount(peer: Peer, seq: string, count: number, desc: boolean, unknownArg: boolean): Promise<GeneralCallResult & { msgList: RawMessage[] }>;
 
@@ -174,18 +187,18 @@ export interface NodeIKernelMsgService {
 
   getRecallMsgsByMsgId(peer: Peer, MsgId: string[]): Promise<unknown>;
 
-  getMsgsBySeqList(peer: Peer, seqList: string[]): Promise<unknown>;
+  getMsgsBySeqList(peer: Peer, seqList: string[]): Promise<GeneralCallResult & { msgList: RawMessage[] }>;
 
-  getSingleMsg(Peer: Peer, msgSeq: string): unknown;
+  getSingleMsg(Peer: Peer, msgSeq: string): Promise<GeneralCallResult & { msgList: RawMessage[] }>;
 
-  getSourceOfReplyMsg(...args: unknown[]): unknown;
+  getSourceOfReplyMsg(peer: Peer, MsgId: string, SourceSeq: string): unknown;
 
-  getSourceOfReplyMsgV2(...args: unknown[]): unknown;
+  getSourceOfReplyMsgV2(peer: Peer, RootMsgId: string, ReplyMsgId: string): unknown;
 
-  getMsgByClientSeqAndTime(...args: unknown[]): unknown;
+  getMsgByClientSeqAndTime(peer: Peer, clientSeq: string, time: string): unknown;
-
-  getSourceOfReplyMsgByClientSeqAndTime(...args: unknown[]): unknown;
 
+  getSourceOfReplyMsgByClientSeqAndTime(peer: Peer, clientSeq: string, time: string): unknown;
+  //cnt clientSeq?并不是吧
   getMsgsByTypeFilter(peer: Peer, msgId: string, cnt: unknown, queryOrder: boolean, typeFilter: { type: number, subtype: Array<number> }): unknown;
 
   getMsgsByTypeFilters(peer: Peer, msgId: string, cnt: unknown, queryOrder: boolean, typeFilters: Array<{ type: number, subtype: Array<number> }>): unknown;
@@ -214,19 +227,7 @@ export interface NodeIKernelMsgService {
    * @param param.isIncludeCurrent 是否包含当前页码。
    * @returns 返回一个Promise，解析为查询结果的未知类型对象。
    */
-  queryMsgsWithFilterVer2(MsgId: string, MsgTime: string, param: {
+  queryMsgsWithFilterVer2(MsgId: string, MsgTime: string, param: QueryMsgsParams): Promise<unknown>;
-    chatInfo: {
-      chatType: number,
-      peerUid: string
-    },
-    filterMsgType: [],
-    filterSendersUid: Array<string>,
-    filterMsgFromTime: string,
-    filterMsgToTime: string,
-    pageLimit: number,
-    isReverseOrder: boolean,
-    isIncludeCurrent: boolean
-  }): Promise<unknown>;
 
   // this.chatType = i2;
   // this.peerUid = str;
@@ -243,19 +244,7 @@ export interface NodeIKernelMsgService {
   // this.isReverseOrder = z;
   // this.isIncludeCurrent = z2;
   //queryMsgsWithFilterEx(0L, 0L, 0L, new QueryMsgsParams(new ChatInfo(2, str), new ArrayList(), new ArrayList(), 0L, 0L, 250, false, true))
-  queryMsgsWithFilterEx(msgId: string, msgTime: string, megSeq: string, param: {
+  queryMsgsWithFilterEx(msgId: string, msgTime: string, megSeq: string, param: QueryMsgsParams): Promise<GeneralCallResult & {
-    chatInfo: {
-      chatType: number,
-      peerUid: string
-    },
-    filterMsgType: [],
-    filterSendersUid: string[],
-    filterMsgFromTime: string,
-    filterMsgToTime: string,
-    pageLimit: number,
-    isReverseOrder: boolean,
-    isIncludeCurrent: boolean
-  }): Promise<GeneralCallResult & {
     msgList: RawMessage[]
   }>;
   //queryMsgsWithFilterEx(this.$msgId, this.$msgTime, this.$msgSeq, this.$param)
@@ -263,39 +252,15 @@ export interface NodeIKernelMsgService {
 
   setMsgRichInfoFlag(...args: unknown[]): unknown;
 
-  queryPicOrVideoMsgs(msgId: string, msgTime: string, megSeq: string, param: {
+  queryPicOrVideoMsgs(msgId: string, msgTime: string, megSeq: string, param: QueryMsgsParams): Promise<unknown>;
-    chatInfo: {
-      chatType: number,
-      peerUid: string
-    },
-    filterMsgType: [],
-    filterSendersUid: [],
-    filterMsgFromTime: string,
-    filterMsgToTime: string,
-    pageLimit: number,
-    isReverseOrder: boolean,
-    isIncludeCurrent: boolean
-  }): Promise<unknown>;
 
   queryPicOrVideoMsgsDesktop(...args: unknown[]): unknown;
 
-  queryEmoticonMsgs(...args: unknown[]): unknown;
+  queryEmoticonMsgs(msgId: string, msgTime: string, msgSeq: string, Params: QueryMsgsParams): Promise<unknown>;
 
-  queryTroopEmoticonMsgs(...args: unknown[]): unknown;
+  queryTroopEmoticonMsgs(msgId: string, msgTime: string, msgSeq: string, Params: QueryMsgsParams): Promise<unknown>;
 
-  queryMsgsAndAbstractsWithFilter(msgId: string, msgTime: string, megSeq: string, param: {
+  queryMsgsAndAbstractsWithFilter(msgId: string, msgTime: string, megSeq: string, param: QueryMsgsParams): unknown;
-    chatInfo: {
-      chatType: number,
-      peerUid: string
-    },
-    filterMsgType: [],
-    filterSendersUid: [],
-    filterMsgFromTime: string,
-    filterMsgToTime: string,
-    pageLimit: number,
-    isReverseOrder: boolean,
-    isIncludeCurrent: boolean
-  }): unknown;
 
   setFocusOnGuild(...args: unknown[]): unknown;
 
@@ -361,7 +326,7 @@ export interface NodeIKernelMsgService {
 
   setGuildTabUserFlag(...args: unknown[]): unknown;
 
-  setBuildMode(...args: unknown[]): unknown;
+  setBuildMode(flag: number/*0 1 3*/): unknown;
 
   setConfigurationServiceData(...args: unknown[]): unknown;
 
@@ -393,8 +358,35 @@ export interface NodeIKernelMsgService {
   translatePtt2Text(MsgId: string, Peer: {}, MsgElement: {}): unknown;
 
   setPttPlayedState(...args: unknown[]): unknown;
-
+  // NodeIQQNTWrapperSession fetchFavEmojiList [
-  fetchFavEmojiList(...args: unknown[]): unknown;
+  //   "",
+  //   48,
+  //   true,
+  //   true
+  // ]
+  fetchFavEmojiList(str: string, num: number, uk1: boolean, uk2: boolean): Promise<GeneralCallResult & {
+    emojiInfoList: Array<{
+      uin: string,
+      emoId: number,
+      emoPath: string,
+      isExist: boolean,
+      resId: string,
+      url: string,
+      md5: string,
+      emoOriginalPath: string,
+      thumbPath: string,
+      RomaingType: string,
+      isAPNG: false,
+      isMarkFace: false,
+      eId: string,
+      epId: string,
+      ocrWord: string,
+      modifyWord: string,
+      exposeNum: number,
+      clickNum: number,
+      desc: string
+    }>
+  }>;
 
   addFavEmoji(...args: unknown[]): unknown;
 
@@ -485,7 +477,7 @@ export interface NodeIKernelMsgService {
 
   setMsgEmojiLikes(...args: unknown[]): unknown;
 
-  getMsgEmojiLikesList(...args: unknown[]): unknown;
+  getMsgEmojiLikesList(peer: Peer, msgSeq: string, emojiId: string, emojiType: string, cookie: string, bForward: boolean, number: number): Promise<unknown>;
 
   setMsgEmojiLikesForRole(...args: unknown[]): unknown;
 
@@ -507,13 +499,13 @@ export interface NodeIKernelMsgService {
 
   queryCalendar(...args: unknown[]): unknown;
 
-  queryFirstMsgSeq(...args: unknown[]): unknown;
+  queryFirstMsgSeq(peer: Peer, ...args: unknown[]): unknown;
 
   queryRoamCalendar(...args: unknown[]): unknown;
 
   queryFirstRoamMsg(...args: unknown[]): unknown;
 
-  fetchLongMsg(...args: unknown[]): unknown;
+  fetchLongMsg(peer: Peer, msgId: string): unknown;
 
   fetchLongMsgWithCb(...args: unknown[]): unknown;
 
@@ -547,9 +539,9 @@ export interface NodeIKernelMsgService {
 
   deleteReplyDraft(...args: unknown[]): unknown;
 
-  getFirstUnreadAtMsg(...args: unknown[]): unknown;
+  getFirstUnreadAtMsg(peer: Peer): unknown;
 
-  clearMsgRecords(...args: unknown[]): unknown;//设置已读后调用我觉得比较好 清理记录
+  clearMsgRecords(...args: unknown[]): unknown;//设置已读后调用我觉得比较好 清理记录 现在别了
 
   IsExistOldDb(...args: unknown[]): unknown;
 
@@ -569,7 +561,7 @@ export interface NodeIKernelMsgService {
 
   getCurChatImportStatusByUin(...args: unknown[]): unknown;
 
-  getDataImportUserLevel(...args: unknown[]): unknown;
+  getDataImportUserLevel(): unknown;
 
   getMsgQRCode(...args: unknown[]): unknown;
 
@@ -600,6 +592,8 @@ export interface NodeIKernelMsgService {
   // this.selfPhone = str5;
   // this.gameSession = tempChatGameSession;
   prepareTempChat(args: unknown): unknown;//主动临时消息 不做
+  
+  sendSsoCmdReqByContend(cmd: string, param: string): Promise<unknown>;
 
   //chattype,uid->Promise<any>
   getTempChatInfo(ChatType: number, Uid: string): unknown;
@@ -624,7 +618,7 @@ export interface NodeIKernelMsgService {
 
   getABatchOfContactMsgBoxInfo(...args: unknown[]): unknown;
 
-  insertMsgToMsgBox(...args: unknown[]): unknown;
+  insertMsgToMsgBox(peer: Peer, msgId: string, arg: 2006): unknown;
 
   isHitEmojiKeyword(...args: unknown[]): unknown;
 
@@ -664,7 +658,25 @@ export interface NodeIKernelMsgService {
 
   dataMigrationStopOperation(...args: unknown[]): unknown;
 
-  dataMigrationImportMsgPbRecord(...args: unknown[]): unknown;
+  //新的希望
+  dataMigrationImportMsgPbRecord(DataMigrationMsgInfo: Array<{
+    extensionData: string//"Hex" 
+    extraData: string //""
+    chatType: number
+    chatUin: string
+    msgType: number
+    msgTime: string
+    msgSeq: string
+    msgRandom: string
+  }>, DataMigrationResourceInfo: {
+    extraData: string
+    filePath: string
+    fileSize: string
+    msgRandom: string
+    msgSeq: string
+    msgSubType: number
+    msgType: number
+  }): unknown;
 
   dataMigrationGetResourceLocalDestinyPath(...args: unknown[]): unknown;
 

src/core/src/services/NodeIKernelProfileService.ts

@@ -1,10 +1,36 @@
 import { AnyCnameRecord } from 'node:dns';
-import { BizKey, ModifyProfileParams, UserDetailInfoByUin } from '../entities';
+import { BaseInfo, BizKey, CoreInfo, ModifyProfileParams, SimpleInfo, UserDetailInfoByUin } from '../entities';
 import { NodeIKernelProfileListener } from '../listeners';
 import { GeneralCallResult } from '@/core/services/common';
-
+export enum UserDetailSource {
+  KDB,
+  KSERVER
+}
+export enum ProfileBizType {
+  KALL,
+  KBASEEXTEND,
+  KVAS,
+  KQZONE,
+  KOTHER
+}
 export interface NodeIKernelProfileService {
 
+  getUidByUin(callfrom: string, uin: Array<string>): Promise<Map<string,string>>;//uin->uid
+
+  getUinByUid(callfrom: string, uid: Array<string>): Promise<Map<string,string>>;
+  // {
+  //   coreInfo: CoreInfo,
+  //   baseInfo: BaseInfo,
+  //   status: null,
+  //   vasInfo: null,
+  //   relationFlags: null,
+  //   otherFlags: null,
+  //   intimate: null
+  // }
+  getCoreAndBaseInfo(callfrom: string, uids: string[]): Promise<Map<string, SimpleInfo>>;
+
+  fetchUserDetailInfo(trace: string, uids: string[], arg2: number, arg3: number[]): Promise<unknown>;
+
   addKernelProfileListener(listener: NodeIKernelProfileListener): number;
 
   removeKernelProfileListener(listenerId: number): void;

src/core/src/services/NodeIKernelRichMediaService.ts

@@ -1,6 +1,50 @@
-import { GetFileListParam, Peer } from "../entities";
+import { GetFileListParam, MessageElement, Peer, SendMessageElement } from "../entities";
 import { GeneralCallResult } from "./common";
-
+export enum UrlFileDownloadType {
+    KUNKNOWN,
+    KURLFILEDOWNLOADPRIVILEGEICON,
+    KURLFILEDOWNLOADPHOTOWALL,
+    KURLFILEDOWNLOADQZONE,
+    KURLFILEDOWNLOADCOMMON,
+    KURLFILEDOWNLOADINSTALLAPP
+}
+export enum RMBizTypeEnum {
+    KUNKNOWN,
+    KC2CFILE,
+    KGROUPFILE,
+    KC2CPIC,
+    KGROUPPIC,
+    KDISCPIC,
+    KC2CVIDEO,
+    KGROUPVIDEO,
+    KC2CPTT,
+    KGROUPPTT,
+    KFEEDCOMMENTPIC,
+    KGUILDFILE,
+    KGUILDPIC,
+    KGUILDPTT,
+    KGUILDVIDEO
+}
+export interface CommonFileInfo {
+    bizType: number;
+    chatType: number;
+    elemId: string;
+    favId: string;
+    fileModelId: string;
+    fileName: string;
+    fileSize: string;
+    md5: string;
+    md510m: string;
+    msgId: string;
+    msgTime: string;
+    parent: string;
+    peerUid: string;
+    picThumbPath: Array<string>
+    sha: string;
+    sha3: string;
+    subId: string;
+    uuid: string;
+}
 export interface NodeIKernelRichMediaService {
     //getVideoPlayUrl(peer, msgId, elemId, videoCodecFormat, VideoRequestWay.KHAND, cb);
     // public enum VideoCodecFormatType {
@@ -46,7 +90,7 @@ export interface NodeIKernelRichMediaService {
         }
     }>;
 
-    getRichMediaFileDir(arg1: unknown, arg2: unknown, arg3: unknown): unknown;
+    getRichMediaFileDir(elementType: number, downType: number, isTemp: boolean): unknown;
 
     // this.senderUid = "";
     // this.peerUid = "";
@@ -65,16 +109,43 @@ export interface NodeIKernelRichMediaService {
     // this.elem = msgElement;
     // this.useHttps = num;
 
-    getVideoPlayUrlInVisit(arg: unknown): unknown;
+    getVideoPlayUrlInVisit(arg: {
+        downloadType: number,
+        thumbSize: number,
+        msgId: string,
+        msgRandom: string,
+        msgSeq: string,
+        msgTime: string,
+        chatType: number,
+        senderUid: string,
+        peerUid: string,
+        guildId: string,
+        ele: MessageElement,
+        useHttps: boolean
+    }): Promise<unknown>;
 
-    isFileExpired(arg: unknown): unknown;
+    //arg双端number
+    isFileExpired(arg: number): unknown;
 
     deleteGroupFolder(GroupCode: string, FolderId: string): Promise<GeneralCallResult & { groupFileCommonResult: { retCode: number, retMsg: string, clientWording: string } }>;
 
     //参数与getVideoPlayUrlInVisit一样
-    downloadRichMediaInVisit(arg: unknown): unknown;
+    downloadRichMediaInVisit(arg: {
-
+        downloadType: number,
-    downloadFileForModelId(peer: Peer, arg: unknown[], arg3: string): unknown;
+        thumbSize: number,
+        msgId: string,
+        msgRandom: string,
+        msgSeq: string,
+        msgTime: string,
+        chatType: number,
+        senderUid: string,
+        peerUid: string,
+        guildId: string,
+        ele: MessageElement,
+        useHttps: boolean
+    }): unknown;
+    //arg3为“”
+    downloadFileForModelId(peer: Peer, ModelId: string[], arg3: string): unknown;
     //第三个参数 Array<Type>
     // this.fileId = "";
     // this.fileName = "";
@@ -83,15 +154,20 @@ export interface NodeIKernelRichMediaService {
     // this.fileSize = j2;
     // this.fileModelId = j3;
 
-    downloadFileForFileUuid(peer: Peer, arg1: string, arg3: unknown[]): unknown;
+    downloadFileForFileUuid(peer: Peer, uuid: string, arg3: {
+        fileId: string,
+        fileName: string,
+        fileSize: string,
+        fileModelId: string
+    }[]): Promise<unknown>;
 
-    downloadFileByUrlList(arg1: unknown, arg2: unknown): unknown;
+    downloadFileByUrlList(fileDownloadTyp: UrlFileDownloadType, urlList: Array<string>): unknown;
 
-    downloadFileForFileInfo(arg1: unknown, arg2: unknown): unknown;
+    downloadFileForFileInfo(fileInfo: CommonFileInfo[], savePath: string): unknown;
 
     createGroupFolder(GroupCode: string, FolderName: string): Promise<GeneralCallResult & { resultWithGroupItem: { result: any, groupItem: Array<any> } }>
 
-    downloadFile(arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown): unknown;
+    downloadFile(commonFile: CommonFileInfo, arg2: unknown, arg3: unknown, savePath: string): unknown;
 
     createGroupFolder(arg1: unknown, arg2: unknown): unknown;
 
@@ -124,8 +200,6 @@ export interface NodeIKernelRichMediaService {
 
     getGroupFileInfo(arg1: unknown, arg2: unknown): unknown;
 
-    getGroupFileList(arg1: unknown, arg2: unknown): unknown;
-
     getGroupTransferList(arg1: unknown, arg2: unknown): unknown;
 
     renameGroupFile(arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown, arg5: unknown): unknown;
@@ -133,7 +207,7 @@ export interface NodeIKernelRichMediaService {
     moveGroupFile(arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown, arg5: unknown): unknown;
 
     transGroupFile(arg1: unknown, arg2: unknown): unknown;
-    
+
     searchGroupFile(
         keywords: Array<string>,
         param: {
@@ -168,13 +242,25 @@ export interface NodeIKernelRichMediaService {
 
     cancelSearcheGroupFile(arg1: unknown, arg2: unknown, arg3: unknown): unknown;
 
-    onlyDownloadFile(arg1: unknown, arg2: unknown, arg3: unknown): unknown;
+    onlyDownloadFile(peer: Peer, arg2: unknown, arg3: Array<{
+        fileId: string,
+        fileName: string,
+        fileSize: string,
+        fileModelId: string
+    }
+    >): unknown;
 
     onlyUploadFile(arg1: unknown, arg2: unknown): unknown;
 
     isExtraLargePic(arg1: unknown, arg2: unknown, arg3: unknown): unknown;
 
-    uploadRMFileWithoutMsg(arg: unknown): unknown;
+    uploadRMFileWithoutMsg(arg: {
+        bizType: RMBizTypeEnum,
+        filePath: string,
+        peerUid: string,
+        transferId: string
+        useNTV2: string
+    }): Promise<unknown>;
 
     isNull(): boolean;
 }

src/core/src/services/NodeIKernelRobotService.ts

@@ -21,7 +21,7 @@ export interface NodeIKernelRobotService {
 
     removeKernelRobotListener(ListenerId: number): unknown;
 
-    getAllRobotFriendsFromCache(): unknown;
+    getAllRobotFriendsFromCache(): Promise<unknown>;
 
     fetchAllRobots(arg1: unknown, arg2: unknown): unknown;
 

src/core/src/services/NodeIKernelSearchService.ts

@@ -1,79 +1,129 @@
+import { ChatType } from "../entities";
+
 export interface NodeIKernelSearchService {
-    addKernelSearchListenerr(...args: any[]): unknown;// needs 1 arguments
+    addKernelSearchListener(...args: any[]): unknown;// needs 1 arguments
 
-    removeKernelSearchListenerr(...args: any[]): unknown;// needs 1 arguments
+    removeKernelSearchListener(...args: any[]): unknown;// needs 1 arguments
 
-    searchStrangerr(...args: any[]): unknown;// needs 3 arguments
+    searchStranger(...args: any[]): unknown;// needs 3 arguments
 
-    searchGroupr(...args: any[]): unknown;// needs 1 arguments
+    searchGroup(...args: any[]): unknown;// needs 1 arguments
 
-    searchLocalInfor(...args: any[]): unknown;// needs 2 arguments
+    searchLocalInfo(keywords: string, unknown: number/*4*/): unknown;
 
-    cancelSearchLocalInfor(...args: any[]): unknown;// needs 3 arguments
+    cancelSearchLocalInfo(...args: any[]): unknown;// needs 3 arguments
 
-    searchBuddyChatInfor(...args: any[]): unknown;// needs 2 arguments
+    searchBuddyChatInfo(...args: any[]): unknown;// needs 2 arguments
 
-    searchMoreBuddyChatInfor(...args: any[]): unknown;// needs 1 arguments
+    searchMoreBuddyChatInfo(...args: any[]): unknown;// needs 1 arguments
 
-    cancelSearchBuddyChatInfor(...args: any[]): unknown;// needs 3 arguments
+    cancelSearchBuddyChatInfo(...args: any[]): unknown;// needs 3 arguments
 
-    searchContactr(...args: any[]): unknown;// needs 2 arguments
+    searchContact(...args: any[]): unknown;// needs 2 arguments
 
-    searchMoreContactr(...args: any[]): unknown;// needs 1 arguments
+    searchMoreContact(...args: any[]): unknown;// needs 1 arguments
 
-    cancelSearchContactr(...args: any[]): unknown;// needs 3 arguments
+    cancelSearchContact(...args: any[]): unknown;// needs 3 arguments
 
-    searchGroupChatInfor(...args: any[]): unknown;// needs 3 arguments
+    searchGroupChatInfo(...args: any[]): unknown;// needs 3 arguments
 
-    resetSearchGroupChatInfoSortTyper(...args: any[]): unknown;// needs 3 arguments
+    resetSearchGroupChatInfoSortType(...args: any[]): unknown;// needs 3 arguments
 
-    resetSearchGroupChatInfoFilterMembersr(...args: any[]): unknown;// needs 3 arguments
+    resetSearchGroupChatInfoFilterMembers(...args: any[]): unknown;// needs 3 arguments
 
-    searchMoreGroupChatInfor(...args: any[]): unknown;// needs 1 arguments
+    searchMoreGroupChatInfo(...args: any[]): unknown;// needs 1 arguments
 
-    cancelSearchGroupChatInfor(...args: any[]): unknown;// needs 3 arguments
+    cancelSearchGroupChatInfo(...args: any[]): unknown;// needs 3 arguments
 
-    searchChatsWithKeywordsr(...args: any[]): unknown;// needs 3 arguments
+    searchChatsWithKeywords(...args: any[]): unknown;// needs 3 arguments
 
-    searchMoreChatsWithKeywordsr(...args: any[]): unknown;// needs 1 arguments
+    searchMoreChatsWithKeywords(...args: any[]): unknown;// needs 1 arguments
 
-    cancelSearchChatsWithKeywordsr(...args: any[]): unknown;// needs 3 arguments
+    cancelSearchChatsWithKeywords(...args: any[]): unknown;// needs 3 arguments
 
-    searchChatMsgsr(...args: any[]): unknown;// needs 2 arguments
+    searchChatMsgs(...args: any[]): unknown;// needs 2 arguments
 
-    searchMoreChatMsgsr(...args: any[]): unknown;// needs 1 arguments
+    searchMoreChatMsgs(...args: any[]): unknown;// needs 1 arguments
 
-    cancelSearchChatMsgsr(...args: any[]): unknown;// needs 3 arguments
+    cancelSearchChatMsgs(...args: any[]): unknown;// needs 3 arguments
 
-    searchMsgWithKeywordsr(...args: any[]): unknown;// needs 2 arguments
+    searchMsgWithKeywords(...args: any[]): unknown;// needs 2 arguments
 
-    searchMoreMsgWithKeywordsr(...args: any[]): unknown;// needs 1 arguments
+    searchMoreMsgWithKeywords(...args: any[]): unknown;// needs 1 arguments
 
     cancelSearchMsgWithKeywords(...args: any[]): unknown;// needs 3 arguments
 
-    searchFileWithKeywords(keywords: string[], source: number): Promise<unknown>;// needs 2 arguments
+    searchFileWithKeywords(keywords: string[], source: number): Promise<string>;// needs 2 arguments
 
-    searchMoreFileWithKeywordsr(...args: any[]): unknown;// needs 1 arguments
+    searchMoreFileWithKeywords(...args: any[]): unknown;// needs 1 arguments
 
-    cancelSearchFileWithKeywordsr(...args: any[]): unknown;// needs 3 arguments
+    cancelSearchFileWithKeywords(...args: any[]): unknown;// needs 3 arguments
 
-    searchAtMeChatsr(...args: any[]): unknown;// needs 3 arguments
+    searchAtMeChats(...args: any[]): unknown;// needs 3 arguments
 
-    searchMoreAtMeChatsr(...args: any[]): unknown;// needs 1 arguments
+    searchMoreAtMeChats(...args: any[]): unknown;// needs 1 arguments
 
-    cancelSearchAtMeChatsr(...args: any[]): unknown;// needs 3 arguments
+    cancelSearchAtMeChats(...args: any[]): unknown;// needs 3 arguments
 
-    searchChatAtMeMsgsr(...args: any[]): unknown;// needs 1 arguments
+    searchChatAtMeMsgs(...args: any[]): unknown;// needs 1 arguments
 
-    searchMoreChatAtMeMsgsr(...args: any[]): unknown;// needs 1 arguments
+    searchMoreChatAtMeMsgs(...args: any[]): unknown;// needs 1 arguments
 
-    cancelSearchChatAtMeMsgsr(...args: any[]): unknown;// needs 3 arguments
+    cancelSearchChatAtMeMsgs(...args: any[]): unknown;// needs 3 arguments
 
-    addSearchHistoryr(...args: any[]): unknown;// needs 1 arguments
+    addSearchHistory(param: {
+        type: number,//4
+        contactList: [],
+        id: number,//-1
+        groupInfos: [],
+        msgs: [],
+        fileInfos: [
+            {
+                chatType: ChatType,
+                buddyChatInfo: Array<{ category_name: string, peerUid: string, peerUin: string, remark: string }>,
+                discussChatInfo: [],
+                groupChatInfo: Array<
+                    {
+                        groupCode: string,
+                        isConf: boolean,
+                        hasModifyConfGroupFace: boolean,
+                        hasModifyConfGroupName: boolean,
+                        groupName: string,
+                        remark: string
+                    }>
+                ,
+                dataLineChatInfo: [],
+                tmpChatInfo: [],
+                msgId: string,
+                msgSeq: string,
+                msgTime: string,
+                senderUid: string,
+                senderNick: string,
+                senderRemark: string,
+                senderCard: string,
+                elemId: string,
+                elemType: string,//3
+                fileSize: string,
+                filePath: string,
+                fileName: string,
+                hits: Array<
+                    {
+                        start: 12,
+                        end: 14
+                    }
+                >
+            }
+        ]
 
-    removeSearchHistoryr(...args: any[]): unknown;// needs 1 arguments
+    }): Promise<{
+        result: number,
+        errMsg: string,
+        id?: number
+    }>;
 
-    searchCacher(...args: any[]): unknown;// needs 3 arguments
+    removeSearchHistory(...args: any[]): unknown;// needs 1 arguments
 
-    clearSearchCacher(...args: any[]): unknown;// needs 1 arguments
+    searchCache(...args: any[]): unknown;// needs 3 arguments
+
+    clearSearchCache(...args: any[]): unknown;// needs 1 arguments
 }

src/core/src/services/NodeIKernelUixConvertService.ts

@@ -1,5 +1,5 @@
 export interface NodeIKernelUixConvertService {
-    getUin(uid: string[]): Promise<{ uidInfo: Map<string, string> }>;
+    getUin(uid: string[]): Promise<{ uinInfo: Map<string, string> }>;
 
-    getUid(uin: string[]): Promise<{ uinInfo: Map<string, string> }>;
+    getUid(uin: string[]): Promise<{ uidInfo: Map<string, string> }>;
 }

src/core/src/services/NodeIkernelTestPerformanceService.ts

@@ -0,0 +1,14 @@
+import { MessageElement, Peer } from "../entities";
+
+export interface NodeIkernelTestPerformanceService {
+    insertMsg(MsgParam: {
+        peer: Peer
+        msgTime: string
+        msgId: string
+        msgSeq: string
+        batchNums: number
+        timesPerBatch: number
+        numPerTime: number
+    }, msg: Array<MessageElement>): Promise<unknown>;
+
+}

src/core/src/sessionConfig.ts

@@ -1,4 +1,4 @@
-import { appid, qqPkgInfo, qqVersionConfigInfo } from '@/common/utils/QQBasicInfo';
+import { getFullQQVesion, QQVersionAppid } from '@/common/utils/QQBasicInfo';
 import { hostname, systemName, systemVersion } from '@/common/utils/system';
 import path from 'node:path';
 import fs from 'node:fs';
@@ -34,42 +34,42 @@ export interface WrapperSessionInitConfig {
     account_path: string // 可以通过NodeQQNTWrapperUtil().getNTUserDataInfoConfig()获取
   }
   clientVer: string  // 9.9.8-22355
-  a2: '',
+  a2: string,
-  d2: '',
+  d2: string,
-  d2Key: '',
+  d2Key: string,
-  machineId: '',
+  machineId: string,
-  platform: 3,  // 3是Windows?
+  platform: PlatformType,  // 3是Windows?
   platVer: string,  // 系统版本号, 应该可以固定
   appid: string,
   rdeliveryConfig: {
-    appKey: '',
+    appKey: string,
-    systemId: 0,
+    systemId: number,
-    appId: '',
+    appId: string,
-    logicEnvironment: '',
+    logicEnvironment: string,
-    platform: 3,
+    platform: PlatformType,
-    language: '',
+    language: string,
-    sdkVersion: '',
+    sdkVersion: string,
-    userId: '',
+    userId: string,
-    appVersion: '',
+    appVersion: string,
-    osVersion: '',
+    osVersion: string,
-    bundleId: '',
+    bundleId: string,
-    serverUrl: '',
+    serverUrl: string,
-    fixedAfterHitKeys: ['']
+    fixedAfterHitKeys: string[]
   }
-  'defaultFileDownloadPath': string, // 这个可以通过环境变量获取？
+  defaultFileDownloadPath: string, // 这个可以通过环境变量获取？
-  'deviceInfo': {
+  deviceInfo: {
-    'guid': string,
+    guid: string,
-    'buildVer': string,
+    buildVer: string,
-    'localId': 2052,
+    localId: number,
-    'devName': string,
+    devName: string,
-    'devType': string,
+    devType: string,
-    'vendorName': '',
+    vendorName: string,
-    'osVer': string,
+    osVer: string,
-    'vendorOsName': string,
+    vendorOsName: string,
-    'setMute': false,
+    setMute: boolean,
-    'vendorType': 0
+    vendorType: VendorType
   },
-  'deviceConfig': '{"appearance":{"isSplitViewMode":true},"msg":{}}'
+  deviceConfig: '{"appearance":{"isSplitViewMode":true},"msg":{}}'
 }
 
 export const sessionConfig: WrapperSessionInitConfig | any = {};
@@ -79,7 +79,7 @@ export async function genSessionConfig(selfUin: string, selfUid: string, account
   fs.mkdirSync(downloadPath, { recursive: true });
   let guid: string = await getMachineId();
   //console.log(guid);
- // guid =  '52afb776-82f6-4e59-9d38-44705b112d0a';
+  // guid =  '52afb776-82f6-4e59-9d38-44705b112d0a';
   //let guid: string = await getMachineId();
   const config: WrapperSessionInitConfig = {
     selfUin,
@@ -87,20 +87,20 @@ export async function genSessionConfig(selfUin: string, selfUid: string, account
     desktopPathConfig: {
       account_path // 可以通过NodeQQNTWrapperUtil().getNTUserDataInfoConfig()获取
     },
-    clientVer: qqVersionConfigInfo.curVersion,  // 9.9.8-22355
+    clientVer: getFullQQVesion(),  // 9.9.8-22355
     a2: '',
     d2: '',
     d2Key: '',
     machineId: '',
-    platform: 3,  // 3是Windows?
+    platform: PlatformType.KWINDOWS,  // 3是Windows?
     platVer: systemVersion,  // 系统版本号, 应该可以固定
-    appid: appid,
+    appid: QQVersionAppid,
     rdeliveryConfig: {
       appKey: '',
       systemId: 0,
       appId: '',
       logicEnvironment: '',
-      platform: 3,
+      platform: PlatformType.KWINDOWS,
       language: '',
       sdkVersion: '',
       userId: '',
@@ -110,22 +110,21 @@ export async function genSessionConfig(selfUin: string, selfUid: string, account
       serverUrl: '',
       fixedAfterHitKeys: ['']
     },
-    'defaultFileDownloadPath': downloadPath,
+    defaultFileDownloadPath: downloadPath,
-    'deviceInfo': {
+    deviceInfo: {
       guid,
-      'buildVer': qqPkgInfo.version,
+      buildVer: getFullQQVesion(),
-      'localId': 2052,
+      localId: 2052,
-      'devName': hostname,
+      devName: hostname,
-      'devType': systemName,
+      devType: systemName,
-      'vendorName': '',
+      vendorName: '',
-      'osVer': systemVersion,
+      osVer: systemVersion,
-      'vendorOsName': systemName,
+      vendorOsName: systemName,
-      'setMute': false,
+      setMute: false,
-      'vendorType': 0
+      vendorType: VendorType.KNOSETONIOS
     },
-    'deviceConfig': '{"appearance":{"isSplitViewMode":true},"msg":{}}'
+    deviceConfig: '{"appearance":{"isSplitViewMode":true},"msg":{}}'
   };
   Object.assign(sessionConfig, config);
-  // log(sessionConfig);
   return config;
 }

src/core/src/wrapper.ts

@@ -26,7 +26,6 @@ import {
   NodeIKernelRichMediaService,
   NodeIKernelAvatarService,
 } from './services';
-import { qqVersionConfigInfo } from '@/common/utils/QQBasicInfo';
 import { NodeIKernelStorageCleanService } from './services/NodeIKernelStorageCleanService';
 import { NodeIKernelRobotService } from './services/NodeIKernelRobotService';
 import { dirname } from "node:path"
@@ -41,6 +40,9 @@ import { NodeIKernelSearchService } from './services/NodeIKernelSearchService';
 import { NodeIKernelCollectionService } from './services/NodeIKernelCollectionService';
 import { NodeIKernelRecentContactService } from './services/NodeIKernelRecentContactService';
 import { NodeIKernelMSFService } from './services/NodeIKernelMSFService';
+import { NodeIkernelTestPerformanceService } from './services/NodeIkernelTestPerformanceService';
+import { NodeIKernelECDHService } from './services/NodeIKernelECDHService';
+import { getFullQQVesion } from '@/common/utils/QQBasicInfo';
 
 
 const __filename = fileURLToPath(import.meta.url);
@@ -156,6 +158,10 @@ export interface NodeIQQNTWrapperSession {
 
   startNT(): void;
 
+  getBdhUploadService(): unknown;
+  
+  getECDHService(): NodeIKernelECDHService;
+
   getMsgService(): NodeIKernelMsgService;
 
   getProfileService(): NodeIKernelProfileService;
@@ -210,7 +216,7 @@ export interface NodeIQQNTWrapperSession {
 
   getSkinService(): unknown;
 
-  getTestPerformanceService(): unknown;
+  getTestPerformanceService(): NodeIkernelTestPerformanceService;
 
   getQQPlayService(): unknown;
 
@@ -286,7 +292,7 @@ export interface 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/${qqVersionConfigInfo.curVersion}/wrapper.node`);
+  wrapperNodePath = path.join(path.dirname(process.execPath), `resources/app/versions/${getFullQQVesion()}/wrapper.node`);
 }
 const nativemodule: any = { exports: {} };
 process.dlopen(nativemodule, wrapperNodePath);

src/index.ts

@@ -92,9 +92,9 @@ napCatCore.getQuickLoginList().then((res) => {
 
 WebUiDataRuntime.setQQQuickLoginCall(async (uin: string) => {
   const QuickLogin: Promise<{ result: boolean, message: string }> = new Promise((resolve, reject) => {
-    if (quickLoginQQ) {
+    if (uin) {
-      log('正在快速登录 ', quickLoginQQ);
+      log('正在快速登录 ', uin);
-      napCatCore.quickLogin(quickLoginQQ).then(res => {
+      napCatCore.quickLogin(uin).then(res => {
         if (res.loginErrorInfo.errMsg) {
           resolve({ result: false, message: res.loginErrorInfo.errMsg });
         }

src/onebot11/action/extends/FetchCustomFace.ts

@@ -0,0 +1,21 @@
+import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+import BaseAction from '../BaseAction';
+import { ActionName } from '../types';
+import { NTQQMsgApi } from '@/core/apis';
+const SchemaData = {
+  type: 'object',
+  properties: {
+    count: { type: 'number' },
+  }
+} as const satisfies JSONSchema;
+
+type Payload = FromSchema<typeof SchemaData>;
+
+export class FetchCustomFace extends BaseAction<Payload, string[]> {
+  actionName = ActionName.FetchCustomFace;
+  PayloadSchema = SchemaData;
+  protected async _handle(payload: Payload) {
+    const ret = await NTQQMsgApi.fetchFavEmojiList(payload.count || 48);
+    return ret.emojiInfoList.map(e => e.url);
+  }
+}

src/onebot11/action/extends/GetFriendWithCategory.ts

@@ -1,12 +1,19 @@
-import { rawFriends } from '@/core/data';
+import { requireMinNTQQBuild } from '@/common/utils/QQBasicInfo';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { BuddyCategoryType } from '@/core/entities/';
+import { NTQQFriendApi } from '@/core';
+import { OB11Constructor } from '@/onebot11/constructor';
 
-export class GetFriendWithCategory extends BaseAction<void, Array<BuddyCategoryType>> {
+export class GetFriendWithCategory extends BaseAction<void, any> {
   actionName = ActionName.GetFriendsWithCategory;
 
   protected async _handle(payload: void) {
-    return rawFriends;
+    if (requireMinNTQQBuild('26702')) {
+      //全新逻辑
+      return OB11Constructor.friendsV2(await NTQQFriendApi.getBuddyV2ExWithCate(true));
+    } else {
+      throw new Error('this ntqq version not support, must be 26702 or later');
+    }
   }
 }

src/onebot11/action/extends/TestApi01.ts

@@ -0,0 +1,32 @@
+import BaseAction from '../BaseAction';
+import { ActionName, BaseCheckResult } from '../types';
+import * as fs from 'node:fs';
+import { NTQQUserApi } from '@/core/apis/user';
+import { checkFileReceived, uri2local } from '@/common/utils/file';
+import { napCatCore, NTQQGroupApi } from '@/core';
+import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+// import { log } from "../../../common/utils";
+
+const SchemaData = {
+  type: 'object',
+  properties: {
+    cmd: { type: 'string' },
+    param: { type: 'string' }
+  },
+  required: ['cmd', 'param'],
+} as const satisfies JSONSchema;
+
+type Payload = FromSchema<typeof SchemaData>;
+
+export default class TestApi01 extends BaseAction<Payload, any> {
+  actionName = ActionName.TestApi01;
+  // 用不着复杂检测
+  protected async check(payload: Payload): Promise<BaseCheckResult> {
+    return {
+      valid: true,
+    };
+  }
+  protected async _handle(payload: Payload): Promise<any> {
+    return await napCatCore.session.getMsgService().sendSsoCmdReqByContend(payload.cmd, payload.param);
+  }
+}

src/onebot11/action/file/GetFile.ts

@@ -1,15 +1,12 @@
 import BaseAction from '../BaseAction';
 import fs from 'fs/promises';
 import { ob11Config } from '@/onebot11/config';
-import { log, logDebug } from '@/common/utils/log';
+import { UUIDConverter } from '@/common/utils/helper';
-import { sleep } from '@/common/utils/helper';
-import { uri2local } from '@/common/utils/file';
 import { ActionName, BaseCheckResult } from '../types';
-import { FileElement, RawMessage, VideoElement } from '@/core/entities';
+import { ChatType, ElementType, FileElement, Peer, RawMessage, VideoElement } from '@/core/entities';
-import { NTQQFileApi, NTQQMsgApi } from '@/core/apis';
+import { NTQQFileApi, NTQQFriendApi, NTQQMsgApi, NTQQUserApi } from '@/core/apis';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import Ajv from 'ajv';
+import { getGroup } from '@/core/data';
-import { MessageUnique } from '@/common/utils/MessageUnique';
 
 export interface GetFilePayload {
   file: string; // 文件名或者fileUuid
@@ -45,6 +42,102 @@ export class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
     return { id: element.elementId, element: element.fileElement };
   }
   protected async _handle(payload: GetFilePayload): Promise<GetFileResponse> {
+    const { enableLocalFile2Url } = ob11Config;
+    let UuidData: {
+      high: string;
+      low: string;
+    } | undefined;
+    try {
+      UuidData = UUIDConverter.decode(payload.file);
+      if (UuidData) {
+        const peerUin = UuidData.high;
+        const msgId = UuidData.low;
+        const isGroup = await getGroup(peerUin);
+        let peer: Peer | undefined;
+        //识别Peer
+        if (isGroup) {
+          peer = { chatType: ChatType.group, peerUid: peerUin };
+        }
+        const PeerUid = await NTQQUserApi.getUidByUin(peerUin);
+        if (PeerUid) {
+          const isBuddy = await NTQQFriendApi.isBuddy(PeerUid);
+          if (isBuddy) {
+            peer = { chatType: ChatType.friend, peerUid: PeerUid };
+          } else {
+            peer = { chatType: ChatType.temp, peerUid: PeerUid };
+          }
+        }
+        if (!peer) {
+          throw new Error('chattype not support');
+        }
+        const msgList = await NTQQMsgApi.getMsgsByMsgId(peer, [msgId]);
+        if (msgList.msgList.length == 0) {
+          throw new Error('msg not found');
+        }
+        const msg = msgList.msgList[0];
+        const findEle = msg.elements.find(e => e.elementType == ElementType.VIDEO || e.elementType == ElementType.FILE || e.elementType == ElementType.PTT);
+        if (!findEle) {
+          throw new Error('element not found');
+        }
+        const downloadPath = await NTQQFileApi.downloadMedia(msgId, msg.chatType, msg.peerUid, findEle.elementId, '', '');
+        const fileSize = findEle?.videoElement?.fileSize || findEle?.fileElement?.fileSize || findEle?.pttElement?.fileSize || '0';
+        const fileName = findEle?.videoElement?.fileName || findEle?.fileElement?.fileName || findEle?.pttElement?.fileName || '';
+        const res: GetFileResponse = {
+          file: downloadPath,
+          url: downloadPath,
+          file_size: fileSize,
+          file_name: fileName
+        };
+        if (enableLocalFile2Url) {
+          try {
+            res.base64 = await fs.readFile(downloadPath, 'base64');
+          } catch (e) {
+            throw new Error('文件下载失败. ' + e);
+          }
+        }
+        //不手动删除？文件持久化了
+        return res;
+      }
+    } catch {
+
+    }
+
+    const NTSearchNameResult = (await NTQQFileApi.searchfile([payload.file])).resultItems;
+    if (NTSearchNameResult.length !== 0) {
+      const MsgId = NTSearchNameResult[0].msgId;
+      let peer: Peer | undefined = undefined;
+      if (NTSearchNameResult[0].chatType == ChatType.group) {
+        peer = { chatType: ChatType.group, peerUid: NTSearchNameResult[0].groupChatInfo[0].groupCode };
+      }
+      if (!peer) {
+        throw new Error('chattype not support');
+      }
+      const msgList: RawMessage[] = (await NTQQMsgApi.getMsgsByMsgId(peer, [MsgId]))?.msgList;
+      if (!msgList || msgList.length == 0) {
+        throw new Error('msg not found');
+      }
+      const msg = msgList[0];
+      const file = msg.elements.filter(e => e.elementType == NTSearchNameResult[0].elemType);
+      if (file.length == 0) {
+        throw new Error('file not found');
+      }
+      const downloadPath = await NTQQFileApi.downloadMedia(msg.msgId, msg.chatType, msg.peerUid, file[0].elementId, '', '');
+      const res: GetFileResponse = {
+        file: downloadPath,
+        url: downloadPath,
+        file_size: NTSearchNameResult[0].fileSize.toString(),
+        file_name: NTSearchNameResult[0].fileName
+      };
+      if (enableLocalFile2Url) {
+        try {
+          res.base64 = await fs.readFile(downloadPath, 'base64');
+        } catch (e) {
+          throw new Error('文件下载失败. ' + e);
+        }
+      }
+      //不手动删除？文件持久化了
+      return res;
+    }
     throw new Error('file not found');
     // let cache = await dbUtil.getFileCacheByName(payload.file);
     // if (!cache) {

src/onebot11/action/go-cqhttp/GetGroupMsgHistory.ts

@@ -2,7 +2,7 @@ import BaseAction from '../BaseAction';
 import { OB11Message, OB11User } from '../../types';
 import { getGroup, groups } from '@/core/data';
 import { ActionName } from '../types';
-import { ChatType } from '@/core/entities';
+import { ChatType, RawMessage } from '@/core/entities';
 import { NTQQMsgApi } from '@/core/apis/msg';
 import { OB11Constructor } from '../../constructor';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
@@ -18,7 +18,7 @@ const SchemaData = {
     message_seq: { type: 'number' },
     count: { type: 'number' }
   },
-  required: ['group_id', 'message_seq', 'count']
+  required: ['group_id']
 } as const satisfies JSONSchema;
 
 type Payload = FromSchema<typeof SchemaData>;
@@ -31,14 +31,18 @@ export default class GoCQHTTPGetGroupMsgHistory extends BaseAction<Payload, Resp
     if (!group) {
       throw `群${payload.group_id}不存在`;
     }
-    const startMsgId = (await MessageUnique.getMsgIdAndPeerByShortId(payload.message_seq))?.MsgId || '0';
+    let targetMsgShortId, count = parseInt(payload.count?.toString() ?? '20');
-    // log("startMsgId", startMsgId)
+    const peer = {
-    const historyResult = (await NTQQMsgApi.getMsgHistory({
       chatType: ChatType.group,
       peerUid: group.groupCode
-    }, startMsgId, parseInt(payload.count?.toString()) || 20));
+    };
-    //logDebug(historyResult);
+    let msgList: RawMessage[];
-    const msgList = historyResult.msgList;
+    if (!payload.message_seq) {
+      msgList = (await NTQQMsgApi.getLastestMsgByUids(peer, count)).msgList;
+    } else {
+      const startMsgId = (await MessageUnique.getMsgIdAndPeerByShortId(targetMsgShortId ?? (payload.message_seq ?? 0)))?.MsgId || '0';
+      msgList = (await NTQQMsgApi.getMsgHistory(peer, startMsgId, count)).msgList;
+    }
     await Promise.all(msgList.map(async msg => {
       msg.id = await MessageUnique.createMsg({ guildId: '', chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId);
     }));

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

@@ -5,6 +5,7 @@ import { ActionName } from '../types';
 import { NTQQUserApi } from '@/core/apis/user';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import { calcQQLevel } from '@/common/utils/qqlevel';
+import { requireMinNTQQBuild } from '@/common/utils/QQBasicInfo';
 
 const SchemaData = {
   type: 'object',
@@ -20,24 +21,46 @@ export default class GoCQHTTPGetStrangerInfo extends BaseAction<Payload, OB11Use
   actionName = ActionName.GoCQHTTP_GetStrangerInfo;
 
   protected async _handle(payload: Payload): Promise<OB11User> {
-    const user_id = payload.user_id.toString();
+    if (!requireMinNTQQBuild('26702')) {
-    const extendData = await NTQQUserApi.getUserDetailInfoByUin(user_id);
+      const user_id = payload.user_id.toString();
-    const uid = (await NTQQUserApi.getUidByUin(user_id))!;
+      const extendData = await NTQQUserApi.getUserDetailInfoByUin(user_id);
-    if (!uid || uid.indexOf('*') != -1) {
+      const uid = (await NTQQUserApi.getUidByUin(user_id))!;
-      const ret = {
+      if (!uid || uid.indexOf('*') != -1) {
-        ...extendData,
+        const ret = {
-        user_id: parseInt(extendData.info.uin) || 0,
+          ...extendData,
-        nickname: extendData.info.nick,
+          user_id: parseInt(extendData.info.uin) || 0,
-        sex: OB11UserSex.unknown,
+          nickname: extendData.info.nick,
-        age: (extendData.info.birthday_year == 0) ? 0 : new Date().getFullYear() - extendData.info.birthday_year,
+          sex: OB11UserSex.unknown,
-        qid: extendData.info.qid,
+          age: (extendData.info.birthday_year == 0) ? 0 : new Date().getFullYear() - extendData.info.birthday_year,
-        level: extendData.info.qqLevel && calcQQLevel(extendData.info.qqLevel) || 0,
+          qid: extendData.info.qid,
-        login_days: 0,
+          level: extendData.info.qqLevel && calcQQLevel(extendData.info.qqLevel) || 0,
-        uid: ''
+          login_days: 0,
-      };
+          uid: ''
-      return ret;
+        };
+        return ret;
+      }
+      const data = { ...extendData, ...(await NTQQUserApi.getUserDetailInfo(uid)) };
+      return OB11Constructor.stranger(data);
+    } else {
+      const user_id = payload.user_id.toString();
+      const extendData = await NTQQUserApi.getUserDetailInfoByUinV2(user_id);
+      //console.log(extendData);
+      const uid = (await NTQQUserApi.getUidByUin(user_id))!;
+      if (!uid || uid.indexOf('*') != -1) {
+        const ret = {
+          ...extendData,
+          user_id: parseInt(extendData.detail.uin) || 0,
+          nickname: extendData.detail.simpleInfo.coreInfo.nick,
+          sex: OB11UserSex.unknown,
+          age: 0,
+          level: extendData.detail.commonExt.qqLevel && calcQQLevel(extendData.detail.commonExt.qqLevel) || 0,
+          login_days: 0,
+          uid: ''
+        };
+        return ret;
+      }
+      const data = { ...extendData, ...(await NTQQUserApi.getUserDetailInfo(uid)) };
+      return OB11Constructor.stranger(data);
     }
-    const data = { ...extendData, ...(await NTQQUserApi.getUserDetailInfo(uid)) };
-    return OB11Constructor.stranger(data);
   }
 }

src/onebot11/action/go-cqhttp/UploadPrivareFile.ts

@@ -0,0 +1,51 @@
+import BaseAction from '../BaseAction';
+import { getGroup } from '@/core/data';
+import { ActionName } from '../types';
+import { SendMsgElementConstructor } from '@/core/entities/constructor';
+import { ChatType, Peer, SendFileElement } from '@/core/entities';
+import fs from 'fs';
+import { SendMsg, sendMsg } from '@/onebot11/action/msg/SendMsg';
+import { uri2local } from '@/common/utils/file';
+import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+import { NTQQFriendApi, NTQQUserApi } from '@/core';
+const SchemaData = {
+  type: 'object',
+  properties: {
+    user_id: { type: ['number', 'string'] },
+    file: { type: 'string' },
+    name: { type: 'string' }
+  },
+  required: ['user_id', 'file', 'name']
+} as const satisfies JSONSchema;
+
+type Payload = FromSchema<typeof SchemaData>;
+
+export default class GoCQHTTPUploadPrivateFile extends BaseAction<Payload, null> {
+  actionName = ActionName.GOCQHTTP_UploadPrivateFile;
+  PayloadSchema = SchemaData;
+  async getPeer(payload: Payload): Promise<Peer> {
+    if (payload.user_id) {
+      const peerUid = await NTQQUserApi.getUidByUin(payload.user_id.toString());
+      if (!peerUid) {
+        throw `私聊${payload.user_id}不存在`;
+      }
+      const isBuddy = await NTQQFriendApi.isBuddy(peerUid);
+      return { chatType: isBuddy ? ChatType.friend : ChatType.temp, peerUid };
+    }
+    throw '缺少参数 user_id';
+  }
+  protected async _handle(payload: Payload): Promise<null> {
+    const peer = await this.getPeer(payload);
+    let file = payload.file;
+    if (fs.existsSync(file)) {
+      file = `file://${file}`;
+    }
+    const downloadResult = await uri2local(file);
+    if (downloadResult.errMsg) {
+      throw new Error(downloadResult.errMsg);
+    }
+    const sendFileEle: SendFileElement = await SendMsgElementConstructor.file(downloadResult.path, payload.name);
+    await sendMsg(peer, [sendFileEle], [], true);
+    return null;
+  }
+}

src/onebot11/action/group/GetGroupList.ts

@@ -2,10 +2,8 @@ import { OB11Group } from '../../types';
 import { OB11Constructor } from '../../constructor';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { groups } from '@/core/data';
 import { NTQQGroupApi } from '@/core/apis';
 import { Group } from '@/core/entities';
-import { log } from '@/common/utils/log';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 // no_cache get时传字符串
 const SchemaData = {
@@ -21,11 +19,7 @@ class GetGroupList extends BaseAction<Payload, OB11Group[]> {
   actionName = ActionName.GetGroupList;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload) {
-    let groupList: Group[] = Array.from(groups.values());
+    let groupList: Group[]  = await NTQQGroupApi.getGroups(payload?.no_cache === true || payload.no_cache === 'true');
-    if (groupList.length === 0 || payload?.no_cache === true || payload.no_cache === 'true') {
-      groupList = await NTQQGroupApi.getGroups(true);
-      // log('get groups', groups);
-    }
     return OB11Constructor.groups(groupList);
   }
 }

src/onebot11/action/group/GetGroupMemberInfo.ts

@@ -1,5 +1,4 @@
 import { OB11GroupMember } from '../../types';
-import { getGroup, getGroupMember, groupMembers, selfInfo } from '@/core/data';
 import { OB11Constructor } from '../../constructor';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
@@ -8,8 +7,7 @@ import { logDebug } from '@/common/utils/log';
 import { WebApi } from '@/core/apis/webapi';
 import { NTQQGroupApi } from '@/core';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-
+import { selfInfo } from '@/core/data';
-// no_cache get时传字符串
 const SchemaData = {
   type: 'object',
   properties: {
@@ -26,17 +24,12 @@ class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
   actionName = ActionName.GetGroupMemberInfo;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload) {
-    const group = await getGroup(payload.group_id.toString());
+    const isNocache = payload.no_cache == true || payload.no_cache === 'true';
-    const role = (await getGroupMember(payload.group_id, selfInfo.uin))?.role;
+    let uid = await NTQQUserApi.getUidByUin(payload.user_id.toString());
-    const isPrivilege = role === 3 || role === 4;
+    if (!uid) {
-    if (!group) {
+      throw (`Uin2Uid Error ${payload.user_id}不存在`);
-      throw (`群(${payload.group_id})不存在`);
     }
-    if (payload.no_cache == true || payload.no_cache === 'true') {
+    let member = await NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), uid, isNocache);
-      groupMembers.set(group.groupCode, await NTQQGroupApi.getGroupMembers(payload.group_id.toString()));
-    }
-    const member = await getGroupMember(payload.group_id.toString(), payload.user_id.toString());
-    //早返回
     if (!member) {
       throw (`群(${payload.group_id})成员${payload.user_id}不存在`);
     }
@@ -48,6 +41,11 @@ class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
       logDebug('获取群成员详细信息失败, 只能返回基础信息', e);
     }
     const retMember = OB11Constructor.groupMember(payload.group_id.toString(), member);
+    let SelfInfoInGroup = await NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), selfInfo.uid, isNocache);
+    let isPrivilege = false;
+    if (SelfInfoInGroup) {
+      isPrivilege = SelfInfoInGroup.role === 3 || SelfInfoInGroup.role === 4;
+    }
     if (isPrivilege) {
       const webGroupMembers = await WebApi.getGroupMembers(payload.group_id.toString());
       for (let i = 0, len = webGroupMembers.length; i < len; i++) {
@@ -59,9 +57,9 @@ class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
         }
       }
     } else {
-      let LastestMsgList = await NTQQGroupApi.getLastestMsg(payload.group_id.toString(), [payload.user_id.toString()]);
+      const LastestMsgList = await NTQQGroupApi.getLastestMsg(payload.group_id.toString(), [payload.user_id.toString()]);
       if (LastestMsgList?.msgList?.length && LastestMsgList?.msgList?.length > 0) {
-        let last_send_time = LastestMsgList.msgList[0].msgTime;
+        const last_send_time = LastestMsgList.msgList[0].msgTime;
         if (last_send_time && last_send_time != '0' && last_send_time != '') {
           retMember.last_sent_time = parseInt(last_send_time);
           retMember.join_time = Math.round(Date.now() / 1000);//兜底数据 防止群管乱杀

src/onebot11/action/group/GetGroupMemberInfoOld.ts

@@ -0,0 +1,84 @@
+import { OB11GroupMember } from '../../types';
+import { getGroup, getGroupMember, groupMembers, selfInfo } from '@/core/data';
+import { OB11Constructor } from '../../constructor';
+import BaseAction from '../BaseAction';
+import { ActionName } from '../types';
+import { NTQQUserApi } from '@/core/apis/user';
+import { logDebug } from '@/common/utils/log';
+import { WebApi } from '@/core/apis/webapi';
+import { NTQQGroupApi } from '@/core';
+import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+import { requireMinNTQQBuild } from '@/common/utils/QQBasicInfo';
+
+// no_cache get时传字符串
+const SchemaData = {
+  type: 'object',
+  properties: {
+    group_id: { type: ['number', 'string'] },
+    user_id: { type: ['number', 'string'] },
+    no_cache: { type: ['boolean', 'string'] },
+  },
+  required: ['group_id', 'user_id']
+} as const satisfies JSONSchema;
+
+type Payload = FromSchema<typeof SchemaData>;
+
+class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
+  actionName = ActionName.GetGroupMemberInfo;
+  PayloadSchema = SchemaData;
+  protected async _handle(payload: Payload) {
+    if (requireMinNTQQBuild('26702')) {
+      let V2Data = await NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), payload.user_id.toString(), payload.no_cache == true || payload.no_cache === 'true');
+      if (V2Data) {
+        return OB11Constructor.groupMember(payload.group_id.toString(), V2Data);
+      } else {
+        throw (`群(${payload.group_id})成员${payload.user_id}不存在`);
+      }
+    }
+    const group = await getGroup(payload.group_id.toString());
+    const role = (await getGroupMember(payload.group_id, selfInfo.uin))?.role;
+    const isPrivilege = role === 3 || role === 4;
+    if (!group) {
+      throw (`群(${payload.group_id})不存在`);
+    }
+    if (payload.no_cache == true || payload.no_cache === 'true') {
+      groupMembers.set(group.groupCode, await NTQQGroupApi.getGroupMembers(payload.group_id.toString()));
+    }
+    const member = await getGroupMember(payload.group_id.toString(), payload.user_id.toString());
+    //早返回
+    if (!member) {
+      throw (`群(${payload.group_id})成员${payload.user_id}不存在`);
+    }
+    //console.log('GetGroupMemberInfo', JSON.stringify(await NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), member.uid, true), null, 4));
+    try {
+      const info = (await NTQQUserApi.getUserDetailInfo(member.uid));
+      logDebug('群成员详细信息结果', info);
+      Object.assign(member, info);
+    } catch (e) {
+      logDebug('获取群成员详细信息失败, 只能返回基础信息', e);
+    }
+    const retMember = OB11Constructor.groupMember(payload.group_id.toString(), member);
+    if (isPrivilege) {
+      const webGroupMembers = await WebApi.getGroupMembers(payload.group_id.toString());
+      for (let i = 0, len = webGroupMembers.length; i < len; i++) {
+        if (webGroupMembers[i]?.uin && webGroupMembers[i].uin === retMember.user_id) {
+          retMember.join_time = webGroupMembers[i]?.join_time;
+          retMember.last_sent_time = webGroupMembers[i]?.last_speak_time;
+          retMember.qage = webGroupMembers[i]?.qage;
+          retMember.level = webGroupMembers[i]?.lv.level.toString();
+        }
+      }
+    } else {
+      const LastestMsgList = await NTQQGroupApi.getLastestMsg(payload.group_id.toString(), [payload.user_id.toString()]);
+      if (LastestMsgList?.msgList?.length && LastestMsgList?.msgList?.length > 0) {
+        const last_send_time = LastestMsgList.msgList[0].msgTime;
+        if (last_send_time && last_send_time != '0' && last_send_time != '') {
+          retMember.last_sent_time = parseInt(last_send_time);
+          retMember.join_time = Math.round(Date.now() / 1000);//兜底数据 防止群管乱杀
+        }
+      }
+    }
+    return retMember;
+  }
+}
+export default GetGroupMemberInfo;

src/onebot11/action/group/GetGroupMemberList.ts

@@ -1,4 +1,4 @@
-import { getGroup, getGroupMember, groupMembers, selfInfo } from '@/core/data';
+import { selfInfo } from '@/core/data';
 import { OB11GroupMember } from '../../types';
 import { OB11Constructor } from '../../constructor';
 import BaseAction from '../BaseAction';
@@ -22,24 +22,20 @@ class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
   actionName = ActionName.GetGroupMemberList;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload) {
-    const role = (await getGroupMember(payload.group_id, selfInfo.uin))?.role;
+    const isNocache = payload.no_cache == true || payload.no_cache === 'true';
 
-    const group = await getGroup(payload.group_id.toString());
+    const GroupList = await NTQQGroupApi.getGroups(isNocache);
+    const group = GroupList.find(item => item.groupCode == payload.group_id);
     if (!group) {
       throw (`群${payload.group_id}不存在`);
     }
-
+    let groupMembers = await NTQQGroupApi.getGroupMembers(payload.group_id.toString());
-    // 从Data里面获取
+    let _groupMembers = Array.from(groupMembers.values())
-    let _groupMembers: OB11GroupMember[] = OB11Constructor.groupMembers(group);
+      .map(item => { return OB11Constructor.groupMember(group.groupCode, item); });
-    if (payload.no_cache == true || payload.no_cache === 'true') {
-      // webGroupMembers = await WebApi.getGroupMembers(payload.group_id.toString());'
-      const _groupMembers = await NTQQGroupApi.getGroupMembers(payload.group_id.toString());
-      groupMembers.set(group.groupCode, _groupMembers);
-    }
 
     const MemberMap: Map<number, OB11GroupMember> = new Map<number, OB11GroupMember>();
     // 转为Map 方便索引
-    let date = Math.round(Date.now() / 1000);
+    const date = Math.round(Date.now() / 1000);
     for (let i = 0, len = _groupMembers.length; i < len; i++) {
       // 保证基础数据有这个 同时避免群管插件过于依赖这个杀了
       _groupMembers[i].join_time = date;
@@ -47,7 +43,9 @@ class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
       MemberMap.set(_groupMembers[i].user_id, _groupMembers[i]);
     }
 
-    const isPrivilege = role === 3 || role === 4;
+    const selfRole = groupMembers.get(selfInfo.uid)?.role;
+    const isPrivilege = selfRole === 3 || selfRole === 4;
+
     if (isPrivilege) {
       const webGroupMembers = await WebApi.getGroupMembers(payload.group_id.toString());
       for (let i = 0, len = webGroupMembers.length; i < len; i++) {
@@ -64,13 +62,20 @@ class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
         }
       }
     } else {
-      const DateMap = await NTQQGroupApi.getGroupMemberLastestSendTimeCache(payload.group_id.toString());//开始从本地拉取
+      if (isNocache) {
-      for (let DateUin of DateMap.keys()) {
+        const DateMap = await NTQQGroupApi.getGroupMemberLastestSendTimeCache(payload.group_id.toString());//开始从本地拉取
-        const MemberData = MemberMap.get(parseInt(DateUin));
+        for (const DateUin of DateMap.keys()) {
-        if (MemberData) {
+          const MemberData = MemberMap.get(parseInt(DateUin));
-          MemberData.last_sent_time = parseInt(DateMap.get(DateUin)!);
+          if (MemberData) {
-          //join_time 有基础数据兜底
+            MemberData.last_sent_time = parseInt(DateMap.get(DateUin)!);
+            //join_time 有基础数据兜底
+          }
         }
+      } else {
+        _groupMembers.forEach(item => {
+          item.last_sent_time = date;
+          item.join_time = date;
+        });
       }
     }
     // 还原索引到Array 一同返回

src/onebot11/action/index.ts

@@ -75,6 +75,9 @@ import SetEssenceMsg from './group/SetEssenceMsg';
 import GetRecentContact from './user/GetRecentContact';
 import { GetProfileLike } from './extends/GetProfileLike';
 import SetGroupHeader from './extends/SetGroupHeader';
+import { FetchCustomFace } from './extends/FetchCustomFace';
+import GoCQHTTPUploadPrivateFile from './go-cqhttp/UploadPrivareFile';
+import TestApi01 from './extends/TestApi01';
 
 export const actionHandlers = [
   new RebootNormal(),
@@ -156,9 +159,11 @@ export const actionHandlers = [
   new GetRecentContact(),
   new MarkAllMsgAsRead(),
   new GetProfileLike(),
-  new SetGroupHeader()
+  new SetGroupHeader(),
+  new FetchCustomFace(),
+  new GoCQHTTPUploadPrivateFile(),
+  new TestApi01()
 ];
-
 function initActionMap() {
   const actionMap = new Map<string, BaseAction<any, any>>();
   for (const action of actionHandlers) {

src/onebot11/action/msg/GetMsg.ts

@@ -32,10 +32,18 @@ class GetMsg extends BaseAction<Payload, OB11Message> {
     if (!msgIdWithPeer) {
       throw ('消息不存在');
     }
+    const peer = { guildId: '', peerUid: msgIdWithPeer?.Peer.peerUid, chatType: msgIdWithPeer.Peer.chatType };
     const msg = await NTQQMsgApi.getMsgsByMsgId(
-      { guildId: '', peerUid: msgIdWithPeer?.Peer.peerUid, chatType: msgIdWithPeer.Peer.chatType },
+      peer,
       [msgIdWithPeer?.MsgId || payload.message_id.toString()]);
-    return await OB11Constructor.message(msg.msgList[0]);
+    const retMsg = await OB11Constructor.message(msg.msgList[0]);
+    try {
+      retMsg.message_id = MessageUnique.createMsg(peer, msg.msgList[0].msgId)!;
+      retMsg.message_seq = retMsg.message_id;
+      retMsg.real_id = retMsg.message_id;
+    } catch (e) {
+    }
+    return retMsg;
   }
 }
 

src/onebot11/action/msg/SendMsg/create-send-elements.ts

@@ -12,45 +12,22 @@ import {
   SignMusicWrapper
 } from '@/core';
 import { getGroupMember } from '@/core/data';
-import { logDebug, logError } from '@/common/utils/log';
+import { logError, logWarn } from '@/common/utils/log';
 import { uri2local } from '@/common/utils/file';
 import { ob11Config } from '@/onebot11/config';
 import { RequestUtil } from '@/common/utils/request';
-import fs from 'node:fs';
 import { MessageUnique } from '@/common/utils/MessageUnique';
 
 export type MessageContext = {
   group?: Group,
   deleteAfterSentFiles: string[],
 }
-
 async function handleOb11FileLikeMessage(
-  { data: { file, name: payloadFileName } }: OB11MessageFileBase,
+  { data: inputdata }: OB11MessageFileBase,
   { deleteAfterSentFiles }: MessageContext
 ) {
-  const uri = file;
+  //有的奇怪的框架将url作为参数 而不是file 此时优先url
-
+  const { path, isLocal, fileName, errMsg } = (await uri2local(inputdata?.url || inputdata.file));
-  // const cache = await dbUtil.getFileCacheByName(file);
-  // if (cache) {
-  //   if (fs.existsSync(cache.path)) {
-  //     uri = 'file://' + cache.path;
-  //   } else if (cache.url) {
-  //     uri = cache.url;
-  //   } else {
-  //     const fileMsgPeer = MessageUnique.getPeerByMsgId(cache.msgId);
-  //     if (fileMsgPeer) {
-  //       cache.path = await NTQQFileApi.downloadMedia(
-  //         fileMsgPeer.MsgId, fileMsgPeer.Peer.chatType, fileMsgPeer.Peer.peerUid,
-  //         cache.elementId, '', ''
-  //       );
-  //       uri = 'file://' + cache.path;
-  //       dbUtil.updateFileCache(cache);
-  //     }
-  //   }
-  //   logDebug('找到文件缓存', uri);
-  // }
-
-  const { path, isLocal, fileName, errMsg } = (await uri2local(uri));
 
   if (errMsg) {
     logError('文件下载失败', errMsg);
@@ -61,7 +38,7 @@ async function handleOb11FileLikeMessage(
     deleteAfterSentFiles.push(path);
   }
 
-  return { path, fileName: payloadFileName || fileName };
+  return { path, fileName: inputdata.name || fileName };
 }
 
 const _handlers: {
@@ -85,9 +62,12 @@ const _handlers: {
       SendMsgElementConstructor.at(atQQ, atMember.uid, AtType.atUser, atMember.cardName || atMember.nick) :
       undefined;
   },
-
   [OB11MessageDataType.reply]: async ({ data: { id } }) => {
     const replyMsgM = MessageUnique.getMsgIdAndPeerByShortId(parseInt(id));
+    if (!replyMsgM) {
+      logWarn('回复消息不存在', id);
+      return undefined;
+    }
     const replyMsg = (await NTQQMsgApi.getMsgsByMsgId(replyMsgM?.Peer!, [replyMsgM?.MsgId!])).msgList[0];
     return replyMsg ?
       SendMsgElementConstructor.reply(replyMsg.msgSeq, replyMsg.msgId, replyMsg.senderUin!, replyMsg.senderUin!) :
@@ -230,7 +210,7 @@ export default async function createSendElements(
   ignoreTypes: OB11MessageDataType[] = []
 ) {
   const deleteAfterSentFiles: string[] = [];
-  let callResultList: Array<Promise<SendMessageElement | undefined>> = [];
+  const callResultList: Array<Promise<SendMessageElement | undefined>> = [];
   for (const sendMsg of messageData) {
     if (ignoreTypes.includes(sendMsg.type)) {
       continue;
@@ -241,7 +221,7 @@ export default async function createSendElements(
     )?.catch(undefined);
     callResultList.push(callResult);
   }
-  let ret = await Promise.all(callResultList);
+  const ret = await Promise.all(callResultList);
   const sendElements: SendMessageElement[] = ret.filter(ele => ele) as SendMessageElement[];
   return { sendElements, deleteAfterSentFiles };
 }

src/onebot11/action/msg/SendMsg/handle-forward-node.ts

@@ -127,7 +127,7 @@ export async function handleForwardNode(destPeer: Peer, messageNodes: OB11Messag
       }
     }
   }
- // logDebug('nodeMsgArray', nodeMsgArray);
+  // logDebug('nodeMsgArray', nodeMsgArray);
   nodeMsgIds = nodeMsgArray.map(msg => msg.msgId);
   if (needSendSelf) {
     //logDebug('需要克隆转发消息');

src/onebot11/action/msg/SendMsg/index.ts

@@ -10,6 +10,7 @@ import { ActionName, BaseCheckResult } from '@/onebot11/action/types';
 import { getGroup } from '@/core/data';
 import { ChatType, ElementType, Group, NTQQFileApi, NTQQFriendApi, NTQQMsgApi, NTQQUserApi, Peer, SendMessageElement, } from '@/core';
 import fs from 'node:fs';
+import fsPromise from 'node:fs/promises';
 import { logDebug, logError } from '@/common/utils/log';
 import { decodeCQCode } from '@/onebot11/cqcode';
 import createSendElements from './create-send-elements';
@@ -40,7 +41,7 @@ export async function sendMsg(peer: Peer, sendElements: SendMessageElement[], de
     throw ('消息体无法解析, 请检查是否发送了不支持的消息类型');
   }
   let totalSize = 0;
-  let timeout = 5000;
+  let timeout = 10000;
   try {
     for (const fileElement of sendElements) {
       if (fileElement.elementType === ElementType.PTT) {
@@ -59,7 +60,7 @@ export async function sendMsg(peer: Peer, sendElements: SendMessageElement[], de
     //且 PredictTime ((totalSize / 1024 / 512) * 1000)不等于Nan
     const PredictTime = totalSize / 1024 / 256 * 1000;
     if (!Number.isNaN(PredictTime)) {
-      timeout += PredictTime;// 5S Basic Timeout + PredictTime( For File 512kb/s )
+      timeout += PredictTime;// 10S Basic Timeout + PredictTime( For File 512kb/s )
     }
   } catch (e) {
     logError('发送消息计算预计时间异常', e);
@@ -71,14 +72,7 @@ export async function sendMsg(peer: Peer, sendElements: SendMessageElement[], de
     logDebug('发送消息id获取失败', e);
     returnMsg!.id = 0;
   }
-
+  deleteAfterSentFiles.map((f) => { fsPromise.unlink(f).then().catch(e => logError('发送消息删除文件失败', e)); });
-  deleteAfterSentFiles.map((f) => {
-    try {
-      fs.unlinkSync(f);
-    } catch (e) {
-      logError('发送消息删除文件失败', e);
-    }
-  });
   return returnMsg;
 }
 
@@ -134,7 +128,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
       return { valid: false, message: `群${payload.group_id}不存在` };
     }
     if (payload.user_id && payload.message_type !== 'group') {
-      const uid = await NTQQUserApi.getUidByUin(payload.user_id);
+      const uid = await NTQQUserApi.getUidByUin(payload.user_id.toString());
       const isBuddy = await NTQQFriendApi.isBuddy(uid!);
       // 此处有问题
       if (!isBuddy) {

src/onebot11/action/msg/SetMsgEmojiLike.ts

@@ -7,8 +7,8 @@ import { MessageUnique } from '@/common/utils/MessageUnique';
 const SchemaData = {
   type: 'object',
   properties: {
-    message_id: { type: ['string','number'] },
+    message_id: { type: ['string', 'number'] },
-    emoji_id: { type: ['string','number'] }
+    emoji_id: { type: ['string', 'number'] }
   },
   required: ['message_id', 'emoji_id']
 } as const satisfies JSONSchema;
@@ -23,10 +23,13 @@ export class SetMsgEmojiLike extends BaseAction<Payload, any> {
     if (!msg) {
       throw new Error('msg not found');
     }
-    if (!payload.emoji_id){
+    if (!payload.emoji_id) {
       throw new Error('emojiId not found');
     }
-    const msgSeq = (await NTQQMsgApi.getMsgsByMsgId(msg.Peer, [msg.MsgId])).msgList[0].msgSeq;
+    const msgData = (await NTQQMsgApi.getMsgsByMsgId(msg.Peer, [msg.MsgId])).msgList;
-    return await NTQQMsgApi.setEmojiLike(msg.Peer, msgSeq, payload.emoji_id.toString(), true);
+    if (!msgData || msgData.length == 0 || !msgData[0].msgSeq) {
+      throw new Error('find msg by msgid error');
+    }
+    return await NTQQMsgApi.setEmojiLike(msg.Peer, msgData[0].msgSeq, payload.emoji_id.toString(), true);
   }
 }

src/onebot11/action/types.ts

@@ -99,5 +99,8 @@ export enum ActionName {
     GetRecentContact = 'get_recent_contact',
     _MarkAllMsgAsRead = '_mark_all_as_read',
     GetProfileLike = 'get_profile_like',
-    SetGroupHeader = "set_group_head"
+    SetGroupHeader = 'set_group_head',
+    FetchCustomFace = 'fetch_custom_face',
+    GOCQHTTP_UploadPrivateFile = 'upload_private_file',
+    TestApi01 = 'test_api_01'
 }

src/onebot11/action/user/GetFriendList.ts

@@ -5,6 +5,7 @@ import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { NTQQFriendApi } from '@/core';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+import { requireMinNTQQBuild } from '@/common/utils/QQBasicInfo';
 
 
 // no_cache get时传字符串
@@ -20,6 +21,10 @@ export default class GetFriendList extends BaseAction<Payload, OB11User[]> {
   actionName = ActionName.GetFriendList;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload) {
+    if (requireMinNTQQBuild('26702')) {
+      //全新逻辑
+      return OB11Constructor.friendsV2(await NTQQFriendApi.getBuddyV2(payload?.no_cache === true || payload?.no_cache === 'true'));
+    }
     if (friends.size === 0 || payload?.no_cache === true || payload?.no_cache === 'true') {
       const _friends = await NTQQFriendApi.getFriends(true);
       // log('强制刷新好友列表，结果: ', _friends)

src/onebot11/config.ts

@@ -42,7 +42,7 @@ export interface OB11Config {
 }
 
 class Config extends ConfigBase<OB11Config> implements OB11Config {
-  name: string = 'onebot11'
+  name: string = 'onebot11';
   http = {
     enable: false,
     host: '',

src/onebot11/constructor.ts

@@ -12,18 +12,21 @@ import {
 import {
   AtType,
   ChatType,
-  ElementType, FaceIndex,
+  FaceIndex,
   Friend,
+  FriendV2,
   GrayTipElementSubType,
   Group,
   GroupMember,
-  IMAGE_HTTP_HOST, IMAGE_HTTP_HOST_NT, mFaceCache,
+  mFaceCache,
   Peer,
   RawMessage,
   SelfInfo,
   Sex,
+  SimpleInfo,
   TipGroupElementType,
-  User
+  User,
+  VideoElement
 } from '@/core/entities';
 import { EventType } from './event/OB11BaseEvent';
 import { encodeCQCode } from './cqcode';
@@ -33,8 +36,8 @@ import { OB11GroupUploadNoticeEvent } from './event/notice/OB11GroupUploadNotice
 import { OB11GroupNoticeEvent } from './event/notice/OB11GroupNoticeEvent';
 
 import { calcQQLevel } from '../common/utils/qqlevel';
-import { log, logDebug, logError } from '../common/utils/log';
+import { log, logDebug, logError, logWarn } from '../common/utils/log';
-import { sleep } from '../common/utils/helper';
+import { sleep, UUIDConverter } from '../common/utils/helper';
 import { OB11GroupTitleEvent } from './event/notice/OB11GroupTitleEvent';
 import { OB11GroupCardEvent } from './event/notice/OB11GroupCardEvent';
 import { OB11GroupDecreaseEvent } from './event/notice/OB11GroupDecreaseEvent';
@@ -43,6 +46,7 @@ import { deleteGroup, getGroupMember, groupMembers, selfInfo, tempGroupCodeMap }
 import { NTQQFileApi, NTQQGroupApi, NTQQMsgApi, NTQQUserApi } from '@/core/apis';
 import { OB11GroupMsgEmojiLikeEvent } from '@/onebot11/event/notice/OB11MsgEmojiLikeEvent';
 import { OB11FriendPokeEvent, OB11GroupPokeEvent } from './event/notice/OB11PokeEvent';
+import { OB11FriendAddNoticeEvent } from './event/notice/OB11FriendAddNoticeEvent';
 import { OB11BaseNoticeEvent } from './event/notice/OB11BaseNoticeEvent';
 import { OB11GroupEssenceEvent } from './event/notice/OB11GroupEssenceEvent';
 import { MessageUnique } from '@/common/utils/MessageUnique';
@@ -75,7 +79,12 @@ export class OB11Constructor {
     if (msg.chatType == ChatType.group) {
       resMsg.sub_type = 'normal'; // 这里go-cqhttp是group，而onebot11标准是normal, 蛋疼
       resMsg.group_id = parseInt(msg.peerUin);
-      const member = await getGroupMember(msg.peerUin, msg.senderUin!);
+      let member = await getGroupMember(msg.peerUin, msg.senderUin!);
+      if (!member) {
+        //直接去QQNative取
+        const memberList = await NTQQGroupApi.getGroupMembers(msg.peerUin);
+        member = memberList.get(msg.senderUin!);
+      }
       if (member) {
         resMsg.sender.role = OB11Constructor.groupMemberRole(member.role);
         resMsg.sender.nickname = member.nick;
@@ -83,8 +92,9 @@ export class OB11Constructor {
     }
     else if (msg.chatType == ChatType.friend) {
       resMsg.sub_type = 'friend';
-      const user = await NTQQUserApi.getUserDetailInfoByUin(msg.senderUin!);
+      resMsg.sender.nickname = (await NTQQUserApi.getUserDetailInfo(msg.senderUid)).nick;
-      resMsg.sender.nickname = user.info.nick;
+      //const user = await NTQQUserApi.getUserDetailInfoByUin(msg.senderUin!);
+      //resMsg.sender.nickname = user.info.nick;
     }
     else if (msg.chatType == ChatType.temp) {
       resMsg.sub_type = 'group';
@@ -94,33 +104,40 @@ export class OB11Constructor {
       }
     }
     for (const element of msg.elements) {
-      const message_data: OB11MessageData | any = {
+      let message_data: OB11MessageData = {
-        data: {},
+        data: {} as any,
-        type: 'unknown'
+        type: 'unknown' as any
       };
       if (element.textElement && element.textElement?.atType !== AtType.notAt) {
-        message_data['type'] = OB11MessageDataType.at;
+        let qq: `${number}` | 'all';
+        let name: string | undefined;
         if (element.textElement.atType == AtType.atAll) {
-          // message_data["data"]["mention"] = "all"
+          qq = 'all';
-          message_data['data']['qq'] = 'all';
         }
         else {
-          const atUid = element.textElement.atNtUid;
+          const { atNtUid, content } = element.textElement;
           let atQQ = element.textElement.atUid;
           if (!atQQ || atQQ === '0') {
-            const atMember = await getGroupMember(msg.peerUin, atUid);
+            const atMember = await getGroupMember(msg.peerUin, atNtUid);
             if (atMember) {
               atQQ = atMember.uin;
             }
           }
           if (atQQ) {
-            // message_data["data"]["mention"] = atQQ
+            qq = atQQ as `${number}`;
-            message_data['data']['qq'] = atQQ;
+            name = content.replace('@', '');
           }
         }
+        message_data = {
+          type: OB11MessageDataType.at,
+          data: {
+            qq: qq!,
+            name
+          }
+        };
       }
       else if (element.textElement) {
-        message_data['type'] = 'text';
+        message_data['type'] = OB11MessageDataType.text;
 
         let text = element.textElement.content;
         if (!text.trim()) {
@@ -133,41 +150,42 @@ export class OB11Constructor {
         message_data['data']['text'] = text;
       }
       else if (element.replyElement) {
-        message_data['type'] = 'reply';
+        message_data['type'] = OB11MessageDataType.reply;
-        // log("收到回复消息", element.replyElement.replayMsgSeq)
+        //log("收到回复消息", element.replyElement);
         try {
-          let replyMsg = await NTQQMsgApi.getMsgsBySeqAndCount(
+          //做这么多都是因为NC速度太快 可能nt还没有写入数据库
-            {
+          //const records = msg.records.find(msgRecord => msgRecord.msgId === element.replyElement.sourceMsgIdInRecords);
-              chatType: msg.chatType,
+          const peer = {
-              peerUid: msg.peerUid,
+            chatType: msg.chatType,
-              guildId: '',
+            peerUid: msg.peerUid,
-            },
+            guildId: '',
-            element.replyElement.replayMsgSeq,
+          };
-            1,
+          let replyMsg: RawMessage | undefined;
-            true,
+
-            true
+          replyMsg = (await NTQQMsgApi.getMsgsBySeqAndCount({ peerUid: msg.peerUid, guildId: '', chatType: msg.chatType }, element.replyElement.replayMsgSeq, 1, true, true)).msgList[0];
-          );
+          if (!replyMsg || element.replyElement.replayMsgSeq !== replyMsg.msgSeq) {
-          // console.log(JSON.stringify(retData, null, 2));
+            replyMsg = (await NTQQMsgApi.getSingleMsg(peer, element.replyElement.replayMsgSeq)).msgList[0];
-          // const replyMsg = await NTQQMsgApi.getMsgsBySeqAndCount({ peerUid: msg.peerUid, guildId: '', chatType: msg.chatType }, element.replyElement.replayMsgSeq, 1, true, true);
-          if (replyMsg) {
-            message_data['data']['id'] = MessageUnique.createMsg({ peerUid: msg.peerUid, guildId: '', chatType: msg.chatType }, replyMsg.msgList[0].msgId)?.toString();
           }
-          else {
+
-            continue;
+          if (!replyMsg || element.replyElement.replayMsgSeq !== replyMsg.msgSeq) {
+            throw new Error('回复消息消息验证失败');
           }
+          message_data['data']['id'] = MessageUnique.createMsg({ peerUid: msg.peerUid, guildId: '', chatType: msg.chatType }, replyMsg.msgId)?.toString();
           //log("找到回复消息", message_data['data']['id'], replyMsg.msgList[0].msgId)
         } catch (e: any) {
+          message_data['type'] = 'unknown' as any;
+          message_data['data'] = undefined;
           logError('获取不到引用的消息', e.stack, element.replyElement.replayMsgSeq);
         }
 
       }
       else if (element.picElement) {
-        message_data['type'] = 'image';
+        message_data['type'] = OB11MessageDataType.image;
         // message_data["data"]["file"] = element.picElement.sourcePath
         message_data['data']['file'] = element.picElement.fileName;
-        message_data['subType'] = element.picElement.picSubType;
+        message_data['data']['subType'] = element.picElement.picSubType;
+        message_data['data']['file_id'] = UUIDConverter.encode(msg.peerUin, msg.msgId);
         // message_data["data"]["path"] = element.picElement.sourcePath
-        // let currentRKey = "CAQSKAB6JWENi5LMk0kc62l8Pm3Jn1dsLZHyRLAnNmHGoZ3y_gDZPqZt-64"
 
         try {
           message_data['data']['url'] = await NTQQFileApi.getImageUrl(element.picElement);
@@ -177,63 +195,97 @@ export class OB11Constructor {
         //console.log(message_data['data']['url'])
         // message_data["data"]["file_id"] = element.picElement.fileUuid
         message_data['data']['file_size'] = element.picElement.fileSize;
-        // dbUtil.addFileCache({
-        //   name: element.picElement.fileName,
-        //   path: element.picElement.sourcePath,
-        //   size: element.picElement.fileSize,
-        //   url: message_data['data']['url'],
-        //   uuid: element.picElement.fileUuid || '',
-        //   msgId: msg.msgId,
-        //   element: element.picElement,
-        //   elementType: ElementType.PIC,
-        //   elementId: element.elementId
-        // }).then();
-        // 不自动下载图片
-
       }
-      else if (element.videoElement || element.fileElement) {
+      else if (element.fileElement) {
-        const videoOrFileElement = element.videoElement || element.fileElement;
+        const FileElement = element.fileElement;
-        const ob11MessageDataType = element.videoElement ? OB11MessageDataType.video : OB11MessageDataType.file;
+        message_data['type'] = OB11MessageDataType.file;
-        const videoDownUrl = element.videoElement ? await NTQQFileApi.getVideoUrl(msg, element) : videoOrFileElement.filePath;
+        message_data['data']['file'] = FileElement.fileName;
-        message_data['type'] = ob11MessageDataType;
+        message_data['data']['path'] = FileElement.filePath;
-        message_data['data']['file'] = videoOrFileElement.fileName;
+        message_data['data']['url'] = FileElement.filePath;
+        message_data['data']['file_id'] = UUIDConverter.encode(msg.peerUin, msg.msgId);
+        message_data['data']['file_size'] = FileElement.fileSize;
+        await NTQQFileApi.addFileCache({
+          peerUid: msg.peerUid,
+          chatType: msg.chatType,
+          guildId: '',
+        },
+          msg.msgId,
+          msg.msgSeq,
+          msg.senderUid,
+          element.elementId,
+          element.elementType.toString(),
+          FileElement.fileSize,
+          FileElement.fileName
+        );
+      }
+      else if (element.videoElement) {
+        const videoElement: VideoElement = element.videoElement;
+        //读取视频链接并兜底
+        let videoUrl;//Array
+        try {
+          videoUrl = await NTQQFileApi.getVideoUrl({
+            chatType: msg.chatType,
+            peerUid: msg.peerUid,
+            guildId: '0'
+          }, msg.msgId, element.elementId);
+        } catch (error) {
+          videoUrl = undefined;
+        }
+        //读取在线URL
+        let videoDownUrl = undefined;
+
+        if (videoUrl) {
+          const videoDownUrlTemp = videoUrl.find((url) => { if (url.url) { return true; } return false; });
+          if (videoDownUrlTemp) {
+            videoDownUrl = videoDownUrlTemp.url;
+          }
+        }
+        //开始兜底
+        if (!videoDownUrl) {
+          videoDownUrl = videoElement.filePath;
+        }
+        message_data['type'] = OB11MessageDataType.video;
+        message_data['data']['file'] = videoElement.fileName;
         message_data['data']['path'] = videoDownUrl;
         message_data['data']['url'] = videoDownUrl;
-        message_data['data']['file_id'] = videoOrFileElement.fileUuid;
+        message_data['data']['file_id'] = UUIDConverter.encode(msg.peerUin, msg.msgId);
-        message_data['data']['file_size'] = videoOrFileElement.fileSize;
+        message_data['data']['file_size'] = videoElement.fileSize;
-        if (!element.videoElement) {
+
-          //   dbUtil.addFileCache({
+        await NTQQFileApi.addFileCache({
-          //     msgId: msg.msgId,
+          peerUid: msg.peerUid,
-          //     name: videoOrFileElement.fileName,
+          chatType: msg.chatType,
-          //     path: videoOrFileElement.filePath,
+          guildId: '',
-          //     size: parseInt(videoOrFileElement.fileSize || '0'),
+        },
-          //     uuid: videoOrFileElement.fileUuid || '',
+          msg.msgId,
-          //     url: '',
+          msg.msgSeq,
-          //     element: element.videoElement || element.fileElement,
+          msg.senderUid,
-          //     elementType: element.videoElement ? ElementType.VIDEO : ElementType.FILE,
+          element.elementId,
-          //     elementId: element.elementId
+          element.elementType.toString(),
-          //   }).then();
+          videoElement.fileSize || '0',
-          // }
+          videoElement.fileName
-        }
+        );
       }
       else if (element.pttElement) {
         message_data['type'] = OB11MessageDataType.voice;
         message_data['data']['file'] = element.pttElement.fileName;
         message_data['data']['path'] = element.pttElement.filePath;
-        // message_data["data"]["file_id"] = element.pttElement.fileUuid
+        //message_data['data']['file_id'] = element.pttElement.fileUuid;
+        message_data['data']['file_id'] = UUIDConverter.encode(msg.peerUin, msg.msgId);
         message_data['data']['file_size'] = element.pttElement.fileSize;
-        // dbUtil.addFileCache({
+        await NTQQFileApi.addFileCache({
-        //   name: element.pttElement.fileName,
+          peerUid: msg.peerUid,
-        //   path: element.pttElement.filePath,
+          chatType: msg.chatType,
-        //   size: parseInt(element.pttElement.fileSize) || 0,
+          guildId: '',
-        //   url: '',
+        },
-        //   uuid: element.pttElement.fileUuid || '',
+          msg.msgId,
-        //   msgId: msg.msgId,
+          msg.msgSeq,
-        //   element: element.pttElement,
+          msg.senderUid,
-        //   elementType: ElementType.PTT,
+          element.elementId,
-        //   elementId: element.elementId
+          element.elementType.toString(),
-        // }).then();
+          element.pttElement.fileSize || '0',
-
+          element.pttElement.fileUuid || ''
+        );
+        //以uuid作为文件名
       }
       else if (element.arkElement) {
         message_data['type'] = OB11MessageDataType.json;
@@ -277,15 +329,16 @@ export class OB11Constructor {
         message_data['type'] = OB11MessageDataType.forward;
         message_data['data']['id'] = msg.msgId;
       }
-      if (message_data.type !== 'unknown' && message_data.data) {
+      if ((message_data.type as string) !== 'unknown' && message_data.data) {
         const cqCode = encodeCQCode(message_data);
+
         if (messagePostFormat === 'string') {
           (resMsg.message as string) += cqCode;
         }
         else (resMsg.message as OB11MessageData[]).push(message_data);
         resMsg.raw_message += cqCode;
       }
-      
+
     }
     resMsg.raw_message = resMsg.raw_message.trim();
     return resMsg;
@@ -298,6 +351,7 @@ export class OB11Constructor {
       if (element.grayTipElement) {
         if (element.grayTipElement.subElementType == GrayTipElementSubType.MEMBER_NEW_TITLE) {
           const json = JSON.parse(element.grayTipElement.jsonGrayTipElement.jsonStr);
+
           if (element.grayTipElement.jsonGrayTipElement.busiId == 1061) {
             //判断业务类型
             //Poke事件
@@ -306,11 +360,17 @@ export class OB11Constructor {
             pokedetail = pokedetail.filter(item => item.uid);
             //console.log("[NapCat] 群拍一拍 群:", pokedetail, parseInt(msg.peerUid), " ", await NTQQUserApi.getUinByUid(pokedetail[0].uid), "拍了拍", await NTQQUserApi.getUinByUid(pokedetail[1].uid));
             if (pokedetail.length == 2) {
-              return new OB11FriendPokeEvent(parseInt((await NTQQUserApi.getUinByUid(pokedetail[0].uid))!), parseInt((await NTQQUserApi.getUinByUid(pokedetail[1].uid))!));
+              return new OB11FriendPokeEvent(parseInt((await NTQQUserApi.getUinByUid(pokedetail[0].uid))!), parseInt((await NTQQUserApi.getUinByUid(pokedetail[1].uid))!), pokedetail);
             }
           }
           //下面得改 上面也是错的grayTipElement.subElementType == GrayTipElementSubType.MEMBER_NEW_TITLE
         }
+        if (element.grayTipElement.subElementType == GrayTipElementSubType.INVITE_NEW_MEMBER) {
+          //好友添加成功事件
+          if (element.grayTipElement.xmlElement.templId === '10229' && msg.peerUin !== '') {
+            return new OB11FriendAddNoticeEvent(parseInt(msg.peerUin));
+          }
+        }
       }
     }
   }
@@ -495,7 +555,24 @@ export class OB11Constructor {
       nickname: selfInfo.nick,
     };
   }
-
+  static friendsV2(friends: FriendV2[]): OB11User[] {
+    const data: OB11User[] = [];
+    friends.forEach(friend => {
+      const sexValue = this.sex(friend.baseInfo.sex!);
+      data.push({
+        ...friend.baseInfo,
+        ...friend.coreInfo,
+        user_id: parseInt(friend.coreInfo.uin),
+        nickname: friend.coreInfo.nick,
+        remark: friend.coreInfo.nick,
+        sex: sexValue,
+        level: 0,
+        categroyName: friend.categroyName,
+        categoryId: friend.categoryId
+      });
+    });
+    return data;
+  }
   static friends(friends: Friend[]): OB11User[] {
     const data: OB11User[] = [];
     friends.forEach(friend => {

src/onebot11/cqcode.ts

@@ -67,15 +67,15 @@ export function encodeCQCode(data: OB11MessageData) {
   let result = '[CQ:' + data.type;
   for (const name in data.data) {
     const value = data.data[name];
-    try {
+    if (value === undefined) {
-      // Check if the value can be converted to a string
-      value.toString();
-    } catch (error) {
-      // If it can't be converted, skip this name-value pair
-      // console.warn(`Skipping problematic name-value pair. Name: ${name}, Value: ${value}`);
       continue;
     }
-    result += `,${name}=${CQCodeEscape(value)}`;
+    try {
+      const text = value.toString();
+      result += `,${name}=${CQCodeEscape(text)}`;
+    } catch (error) {
+      // If it can't be converted, skip this name-value pair
+    }
   }
   result += ']';
   return result;

src/onebot11/event/notice/OB11FriendAddNoticeEvent.ts

@@ -0,0 +1,11 @@
+import { OB11BaseNoticeEvent } from './OB11BaseNoticeEvent';
+
+export class OB11FriendAddNoticeEvent extends OB11BaseNoticeEvent {
+  notice_type = 'friend_add';
+  user_id: number;
+
+  public constructor(user_Id: number) {
+    super();
+    this.user_id = user_Id;
+  }
+}

src/onebot11/event/notice/OB11PokeEvent.ts

@@ -10,22 +10,25 @@ class OB11PokeEvent extends OB11BaseNoticeEvent {
 }
 
 export class OB11FriendPokeEvent extends OB11PokeEvent {
-  constructor(user_id: number, target_id: number) {
+  raw_info: any;
+  //raw_message nb等框架标准为string
+  constructor(user_id: number, target_id: number, raw_message: any) {
     super();
     this.target_id = target_id;
     this.user_id = user_id;
+    this.raw_info = raw_message;
   }
 }
 
 export class OB11GroupPokeEvent extends OB11PokeEvent {
   group_id: number;
-  raw_message: any;
+  raw_info: any;
-
+  //raw_message nb等框架标准为string
   constructor(group_id: number, user_id: number = 0, target_id: number = 0, raw_message: any) {
     super();
     this.group_id = group_id;
     this.target_id = target_id;
     this.user_id = user_id;
-    this.raw_message = raw_message;
+    this.raw_info = raw_message;
   }
 }

src/onebot11/main.ts

@@ -22,7 +22,7 @@ import { ob11ReverseWebsockets } from '@/onebot11/server/ws/ReverseWebsocket';
 import { getGroup, getGroupMember, groupMembers, selfInfo, tempGroupCodeMap } from '@/core/data';
 import { BuddyListener, GroupListener, NodeIKernelBuddyListener } from '@/core/listeners';
 import { OB11FriendRequestEvent } from '@/onebot11/event/request/OB11FriendRequest';
-import { NTQQGroupApi, NTQQUserApi } from '@/core/apis';
+import { NTQQGroupApi, NTQQUserApi, WebApi } from '@/core/apis';
 import { log, logDebug, logError, setLogSelfInfo } from '@/common/utils/log';
 import { OB11GroupRequestEvent } from '@/onebot11/event/request/OB11GroupRequest';
 import { OB11GroupAdminNoticeEvent } from '@/onebot11/event/notice/OB11GroupAdminNoticeEvent';
@@ -41,7 +41,7 @@ export interface LineDevice {
   device_name: string;
   device_kind: string;
 }
-export let DeviceList = new Array<LineDevice>();
+export const DeviceList = new Array<LineDevice>();
 
 //peer->cached(boolen)
 // const PokeCache = new Map<string, boolean>();
@@ -209,6 +209,7 @@ export class NapCatOnebot11 {
       // 临时会话更新 tempGroupCodeMap uid -> source/GroupCode
     };
     msgListener.onRecvMsg = async (msg) => {
+      
       //console.log('ob11 onRecvMsg', JSON.stringify(msg, null, 2));
       // logDebug('收到消息', msg);
       for (const m of msg) {
@@ -240,16 +241,25 @@ export class NapCatOnebot11 {
     };
     msgListener.onMsgInfoListUpdate = (msgList) => {
       this.postRecallMsg(msgList).then().catch(logError);
+      for (const msg of msgList.filter(e => e.senderUin == selfInfo.uin)) {
+        //  console.log(msg);
+        if (msg.sendStatus == 2) {
+          //完成后再post
+          OB11Constructor.message(msg).then((_msg) => {
+            _msg.target_id = parseInt(msg.peerUin);
+            if (ob11Config.reportSelfMessage) {
+              msg.id = MessageUnique.createMsg({ chatType: msg.chatType, peerUid: msg.peerUid, guildId: '' }, msg.msgId);
+              this.postReceiveMsg([msg]).then().catch(logError);
+            } else {
+              logMessage(_msg as OB11Message).then().catch(logError);
+            }
+          }).catch(logError);
+        }
+
+      }
     };
     msgListener.onAddSendMsg = (msg) => {
-      OB11Constructor.message(msg).then((_msg) => {
+
-        _msg.target_id = parseInt(msg.peerUin);
-        logMessage(_msg as OB11Message).then().catch(logError);
-      }).catch(logError);
-      if (ob11Config.reportSelfMessage) {
-        msg.id = MessageUnique.createMsg({ chatType: msg.chatType, peerUid: msg.peerUid, guildId: '' }, msg.msgId);
-        this.postReceiveMsg([msg]).then().catch(logError);
-      }
     };
     napCatCore.addListener(msgListener);
     logDebug('ob11 msg listener added');
@@ -281,7 +291,7 @@ export class NapCatOnebot11 {
       }
     };
     groupListener.onMemberInfoChange = async (groupCode: string, changeType: number, members: Map<string, GroupMember>) => {
-      //console.log("ob11 onMemberInfoChange", groupCode, changeType, members)
+     // console.log("ob11 onMemberInfoChange", groupCode, changeType, members)
       if (changeType === 1) {
         let member;
         for (const [key, value] of members) {
@@ -323,11 +333,12 @@ export class NapCatOnebot11 {
       const isPrivilege = role === 3 || role === 4;
       for (const member of members.values()) {
         //console.log(member?.isDelete, role, isPrivilege);
-        if (member?.isDelete && !isPrivilege && selfInfo.uin !== member.uin) {
+        // Develop Mlikiowa Taged: 暂时屏蔽这个方案 考虑onMemberListChange
-          log('[群聊] 群组 ', groupCode, ' 成员' + member.uin + '退出');
+        // if (member?.isDelete && !isPrivilege && selfInfo.uin !== member.uin) {
-          const groupDecreaseEvent = new OB11GroupDecreaseEvent(parseInt(groupCode), parseInt(member.uin), 0, 'leave');// 不知道怎么出去的
+        //   log('[群聊] 群组 ', groupCode, ' 成员' + member.uin + '退出');
-          postOB11Event(groupDecreaseEvent, true);
+        //   const groupDecreaseEvent = new OB11GroupDecreaseEvent(parseInt(groupCode), parseInt(member.uin), 0, 'leave');// 不知道怎么出去的
-        }
+        //   postOB11Event(groupDecreaseEvent, true);
+        // }
       }
     };
     groupListener.onJoinGroupNotify = (...notify) => {
@@ -415,7 +426,7 @@ export class NapCatOnebot11 {
       if (check_http_ws_equal(NewOb11) || check_http_ws_equal(OldConfig)) {
         // http与ws共站 需要同步重启
         if (isHttpChanged || isWsChanged) {
-          log("http与ws进行热重载")
+          log('http与ws进行热重载');
           ob11WebsocketServer.stop();
           ob11HTTPServer.stop();
           if (NewOb11.http.enable) {
@@ -432,7 +443,7 @@ export class NapCatOnebot11 {
       } else {
         // http重启逻辑
         if (isHttpChanged) {
-          log("http进行热重载")
+          log('http进行热重载');
           ob11HTTPServer.stop();
           if (NewOb11.http.enable) {
             ob11HTTPServer.start(NewOb11.http.port, NewOb11.http.host);
@@ -441,7 +452,7 @@ export class NapCatOnebot11 {
 
         // ws重启逻辑
         if (isWsChanged) {
-          log("ws进行热重载")
+          log('ws进行热重载');
           ob11WebsocketServer.stop();
           if (NewOb11.ws.enable) {
             ob11WebsocketServer.start(NewOb11.ws.port, NewOb11.ws.host);
@@ -451,7 +462,7 @@ export class NapCatOnebot11 {
 
       // 反向ws重启逻辑
       if (isWsReverseChanged) {
-        log("反向ws进行热重载")
+        log('反向ws进行热重载');
         ob11ReverseWebsockets.stop();
         if (NewOb11.reverseWs.enable) {
           ob11ReverseWebsockets.start();
@@ -514,7 +525,8 @@ export class NapCatOnebot11 {
           } catch (e: any) {
             logError('获取群通知的成员信息失败', notify, e.stack.toString());
           }
-        } else if ([GroupNotifyTypes.JOIN_REQUEST].includes(notify.type)) {
+          //notify.status == 1 表示未处理 2表示处理完成
+        } else if ([GroupNotifyTypes.JOIN_REQUEST].includes(notify.type) && notify.status == 1) {
           logDebug('有加群请求');
           const groupRequestEvent = new OB11GroupRequestEvent();
           groupRequestEvent.group_id = parseInt(notify.group.groupCode);
@@ -583,7 +595,7 @@ export class NapCatOnebot11 {
 
   async postFriendRequest(reqs: FriendRequest[]) {
     for (const req of reqs) {
-      if (req.isDecide && req.reqType !== BuddyReqType.KMEINITIATORWAITPEERCONFIRM) {
+      if (!!req.isInitiator || (req.isDecide && req.reqType !== BuddyReqType.KMEINITIATORWAITPEERCONFIRM)) {
         continue;
       }
       const friendRequestEvent = new OB11FriendRequestEvent();

src/onebot11/server/http.ts

@@ -10,8 +10,8 @@ import { postOB11Event } from '@/onebot11/server/postOB11Event';
 class OB11HTTPServer extends HttpServerBase {
   name = 'OneBot V11 server';
 
-  handleFailed(res: Response, payload: any, e: any) {
+  handleFailed(res: Response, payload: any, e: Error) {
-    res.send(OB11Response.error(e.stack.toString(), 200));
+    res.send(OB11Response.error(e?.stack?.toString() || e.message || "Error Handle", 200));
   }
 
   protected listen(port: number, host: string) {

src/onebot11/types/entity.ts

@@ -7,6 +7,8 @@ export interface OB11User {
   age?: number;
   qid?: string;
   login_days?: number;
+  categroyName?:string;
+  categoryId?:number;
 }
 
 export enum OB11UserSex {

src/onebot11/types/message.ts

@@ -114,6 +114,7 @@ export interface OB11MessageAt {
   type: OB11MessageDataType.at
   data: {
     qq: `${number}` | 'all'
+    name?: string
   }
 }
 
@@ -177,13 +178,20 @@ export interface OB11MessageMarkdown {
   }
 }
 
+export interface OB11MessageForward {
+  type: OB11MessageDataType.forward
+  data: {
+    id: string
+  }
+}
+
 export type OB11MessageData =
   OB11MessageText |
   OB11MessageFace | OB11MessageMFace |
   OB11MessageAt | OB11MessageReply |
   OB11MessageImage | OB11MessageRecord | OB11MessageFile | OB11MessageVideo |
   OB11MessageNode | OB11MessageIdMusic | OB11MessageCustomMusic | OB11MessageJson |
-  OB11MessageDice | OB11MessageRPS | OB11MessageMarkdown
+  OB11MessageDice | OB11MessageRPS | OB11MessageMarkdown | OB11MessageForward
 
 export interface OB11PostSendMsg {
   message_type?: 'private' | 'group'

src/onebot11/version.ts

@@ -1 +1 @@
-export const version = '1.6.7';
+export const version = '1.7.7';

src/webui/index.ts

@@ -27,18 +27,19 @@ export async function InitWebUi() {
   }
   app.use(express.json());
   // 初始服务
-  app.all('/', (_req, res) => {
+  // WebUI只在config.prefix所示路径上提供服务，可配合Nginx挂载到子目录中
+  app.all(config.prefix + '/', (_req, res) => {
     res.json({
       msg: 'NapCat WebAPI is now running!',
     });
   });
   // 配置静态文件服务，提供./static目录下的文件服务，访问路径为/webui
-  app.use('/webui', express.static(resolve(__dirname, './static')));
+  app.use(config.prefix + '/webui', express.static(resolve(__dirname, './static')));
   //挂载API接口
-  app.use('/api', ALLRouter);
+  app.use(config.prefix + '/api', ALLRouter);
-  app.listen(config.port, async () => {
+  app.listen(config.port, config.host, async () => {
-    log(`[NapCat] [WebUi] Current WebUi is running at IP:${config.port}`);
+    log(`[NapCat] [WebUi] Current WebUi is running at http://${config.host}:${config.port}${config.prefix}`);
+    log(`[NapCat] [WebUi] Login URL is http://${config.host}:${config.port}${config.prefix}/webui`);
     log(`[NapCat] [WebUi] Login Token is ${config.token}`);
   });
-
+}
-}

src/webui/src/helper/config.ts

@@ -12,7 +12,33 @@ const __dirname = dirname(__filename);
 // 限制尝试端口的次数，避免死循环
 const MAX_PORT_TRY = 100;
 
-async function tryUsePort(port: number, tryCount: number = 0): Promise<number> {
+async function tryUseHost(host: string): Promise<string> {
+  return new Promise(async (resolve, reject) => {
+    try {
+      const server = net.createServer();
+      server.on('listening', () => {
+        server.close();
+        resolve(host);
+      });
+
+      server.on('error', (err: any) => {
+        if (err.code === 'EADDRNOTAVAIL') {
+          reject('主机地址验证失败，可能为非本机地址');
+        } else {
+          reject(`遇到错误: ${err.code}`);
+        }
+      });
+
+      // 尝试监听 让系统随机分配一个端口
+      server.listen(0, host);
+    } catch (error) {
+      // 这里捕获到的错误应该是启动服务器时的同步错误
+      reject(`服务器启动时发生错误: ${error}`);
+    }
+  });
+}
+
+async function tryUsePort(port: number, host: string, tryCount: number = 0): Promise<number> {
   return new Promise(async (resolve, reject) => {
     try {
       const server = net.createServer();
@@ -25,7 +51,7 @@ async function tryUsePort(port: number, tryCount: number = 0): Promise<number> {
         if (err.code === 'EADDRINUSE') {
           if (tryCount < MAX_PORT_TRY) {
             // 使用循环代替递归
-            resolve(tryUsePort(port + 1, tryCount + 1));
+            resolve(tryUsePort(port + 1, host, tryCount + 1));
           } else {
             reject(`端口尝试失败，达到最大尝试次数: ${MAX_PORT_TRY}`);
           }
@@ -35,7 +61,7 @@ async function tryUsePort(port: number, tryCount: number = 0): Promise<number> {
       });
 
       // 尝试监听端口
-      server.listen(port);
+      server.listen(port, host);
     } catch (error) {
       // 这里捕获到的错误应该是启动服务器时的同步错误
       reject(`服务器启动时发生错误: ${error}`);
@@ -44,44 +70,73 @@ async function tryUsePort(port: number, tryCount: number = 0): Promise<number> {
 }
 
 export interface WebUiConfigType {
+    host: string;
     port: number;
+    prefix: string;
     token: string;
     loginRate: number
 }
 // 读取当前目录下名为 webui.json 的配置文件，如果不存在则创建初始化配置文件
 class WebUiConfigWrapper {
   WebUiConfigData: WebUiConfigType | undefined = undefined;
+  private applyDefaults<T>(obj: Partial<T>, defaults: T): T {
+    return { ...defaults, ...obj };
+  }
   async GetWebUIConfig(): Promise<WebUiConfigType> {
     if (this.WebUiConfigData) {
       return this.WebUiConfigData;
     }
+    const defaultconfig: WebUiConfigType = {
+      host: '0.0.0.0',
+      port: 6099,
+      prefix: '',
+      token: '', // 默认先填空，空密码无法登录
+      loginRate: 3
+    };
+    try {
+      defaultconfig.token = Math.random().toString(36).slice(2); //生成随机密码
+    } catch (e) {
+      logError('随机密码生成失败', e);
+    }
     try {
       const configPath = resolve(__dirname, './config/webui.json');
-      const config: WebUiConfigType = {
-        port: 6099,
-        token: Math.random().toString(36).slice(2),//生成随机密码
-        loginRate: 3
-      };
 
       if (!existsSync(configPath)) {
-        writeFileSync(configPath, JSON.stringify(config, null, 4));
+        writeFileSync(configPath, JSON.stringify(defaultconfig, null, 4));
       }
 
       const fileContent = readFileSync(configPath, 'utf-8');
-      const parsedConfig = JSON.parse(fileContent) as WebUiConfigType;
+      // 更新配置字段后新增字段可能会缺失，同步一下
+      const parsedConfig = this.applyDefaults(JSON.parse(fileContent) as Partial<WebUiConfigType>, defaultconfig);
 
-      // 修正端口占用情况
+      if (!parsedConfig.prefix.startsWith('/')) parsedConfig.prefix = '/' + parsedConfig.prefix;
-      const [err, data] = await tryUsePort(parsedConfig.port).then(data => [null, data as number]).catch(err => [err, null]);
+      if (parsedConfig.prefix.endsWith('/')) parsedConfig.prefix = parsedConfig.prefix.slice(0, -1);
-      parsedConfig.port = data;
+      // 配置已经被操作过了，还是回写一下吧，不然新配置不会出现在配置文件里
-      if (err) {
+      writeFileSync(configPath, JSON.stringify(parsedConfig, null, 4));
-        //一般没那么离谱 如果真有这么离谱 考虑下 向外抛出异常
+      // 不希望回写的配置放后面
+
+      // 查询主机地址是否可用
+      const [host_err, host] = await tryUseHost(parsedConfig.host).then(data => [null, data as string]).catch(err => [err, null]);
+      if (host_err) {
+        logError('host不可用', host_err);
+        parsedConfig.port = 0; // 设置为0，禁用WebUI
+      } else {
+        parsedConfig.host = host;
+        // 修正端口占用情况
+        const [port_err, port] = await tryUsePort(parsedConfig.port, parsedConfig.host).then(data => [null, data as number]).catch(err => [err, null]);
+        if (port_err) {
+          logError('port不可用', port_err);
+          parsedConfig.port = 0; // 设置为0，禁用WebUI
+        } else {
+          parsedConfig.port = port;
+        }
       }
       this.WebUiConfigData = parsedConfig;
       return this.WebUiConfigData;
     } catch (e) {
       logError('读取配置文件失败', e);
     }
-    return {} as WebUiConfigType; // 理论上这行代码到不了，为了保持函数完整性而保留
+    return defaultconfig; // 理论上这行代码到不了，到了只能返回默认配置了
   }
 }
-export const WebUiConfig = new WebUiConfigWrapper();
+export const WebUiConfig = new WebUiConfigWrapper();

src/webui/ui/NapCat.ts

@@ -15,7 +15,7 @@ async function onSettingWindowCreated(view: Element) {
     } else if (configKey.length === 3) {
       ob11Config[configKey[1]][configKey[2]] = value;
     }
-    OB11ConfigWrapper.SetOB11Config(ob11Config);
+    // OB11ConfigWrapper.SetOB11Config(ob11Config); // 只有当点保存时才下发配置，而不是在修改值后立即下发
   };
 
   const parser = new DOMParser();
@@ -29,7 +29,7 @@ async function onSettingWindowCreated(view: Element) {
         SettingItem(
           '<span id="napcat-update-title">Napcat</span>',
           undefined,
-          SettingButton('V1.6.8', 'napcat-update-button', 'secondary')
+          SettingButton('V1.7.7', 'napcat-update-button', 'secondary')
         ),
       ]),
       SettingList([
@@ -192,7 +192,7 @@ async function onSettingWindowCreated(view: Element) {
 
   // 外链按钮
   doc.querySelector('#open-github')?.addEventListener('click', () => {
-    window.open('https://napneko.github.io/', '_blank');
+    window.open('https://github.com/NapNeko/NapCatQQ', '_blank');
   });
   doc.querySelector('#open-telegram')?.addEventListener('click', () => {
     window.open('https://t.me/+nLZEnpne-pQ1OWFl');
@@ -201,7 +201,7 @@ async function onSettingWindowCreated(view: Element) {
     window.open('https://qm.qq.com/q/bDnHRG38aI');
   });
   doc.querySelector('#open-docs')?.addEventListener('click', () => {
-    window.open('https://github.com/NapNeko/NapCatQQ');
+    window.open('https://napneko.github.io/', '_blank');
   });
   // 生成反向地址列表
   const buildHostListItem = (

src/webui/ui/components/WebUiApiOB11Config.ts

@@ -38,7 +38,7 @@ class WebUiApiOB11ConfigWrapper {
     this.retCredential = Credential;
   }
   async GetOB11Config(): Promise<OB11Config> {
-    const ConfigResponse = await fetch('/api/OB11Config/GetConfig', {
+    const ConfigResponse = await fetch('../api/OB11Config/GetConfig', {
       method: 'POST',
       headers: {
         Authorization: 'Bearer ' + this.retCredential,
@@ -54,7 +54,7 @@ class WebUiApiOB11ConfigWrapper {
     return {} as OB11Config;
   }
   async SetOB11Config(config: OB11Config): Promise<boolean> {
-    const ConfigResponse = await fetch('/api/OB11Config/SetConfig', {
+    const ConfigResponse = await fetch('../api/OB11Config/SetConfig', {
       method: 'POST',
       headers: {
         Authorization: 'Bearer ' + this.retCredential,

src/webui/webui.json

@@ -1,5 +1,7 @@
 {
+    "host": "0.0.0.0",
     "port": 6099,
+    "prefix": "",
     "token": "random",
     "loginRate": 3
     

static/QQLogin.html

@@ -160,7 +160,7 @@
     </div>
     <script>
         async function GetQQLoginQrcode(retCredential) {
-            let QQLoginResponse = await fetch('/api/QQLogin/GetQQLoginQrcode', {
+            let QQLoginResponse = await fetch('../api/QQLogin/GetQQLoginQrcode', {
                 method: 'POST',
                 headers: {
                     'Authorization': "Bearer " + retCredential,
@@ -180,7 +180,7 @@
             return "";
         }
         async function CheckQQLoginStatus(retCredential) {
-            let QQLoginResponse = await fetch('/api/QQLogin/CheckLoginStatus', {
+            let QQLoginResponse = await fetch('../api/QQLogin/CheckLoginStatus', {
                 method: 'POST',
                 headers: {
                     'Authorization': "Bearer " + retCredential,
@@ -200,7 +200,7 @@
             return false;
         }
         async function GetQQQucickLoginList(retCredential) {
-            let QQLoginResponse = await fetch('/api/QQLogin/GetQuickLoginList', {
+            let QQLoginResponse = await fetch('../api/QQLogin/GetQuickLoginList', {
                 method: 'POST',
                 headers: {
                     'Authorization': "Bearer " + retCredential,
@@ -216,7 +216,7 @@
             return [];
         }
         async function SetQuickLogin(uin, retCredential) {
-            let QQLoginResponse = await fetch('/api/QQLogin/SetQuickLogin', {
+            let QQLoginResponse = await fetch('../api/QQLogin/SetQuickLogin', {
                 method: 'POST',
                 headers: {
                     'Authorization': "Bearer " + retCredential,

static/assets/renderer.js

@@ -1,7 +1,7 @@
 const SettingList = (items, title, isCollapsible = false, direction = "column") => {
-  return `<setting-section ${title && !isCollapsible ? `data-title="${title}"` : ""}>
+  return `<setting-section ${""}>
       <setting-panel>
-          <setting-list ${direction ? `data-direction="${direction}"` : ""} ${isCollapsible ? "is-collapsible" : ""} ${title && isCollapsible ? `data-title="${title}"` : ""}>
+          <setting-list ${direction ? `data-direction="${direction}"` : ""} ${isCollapsible ? "is-collapsible" : ""} ${""}>
               ${items.join("")}
           </setting-list>
       </setting-panel>
@@ -66,16 +66,13 @@ window.customElements.define(
         window[`${isHidden ? "remove" : "add"}EventListener`]("pointerdown", windowPointerDown);
       };
       const windowPointerDown = ({ target }) => {
-        if (!this.contains(target))
+        if (!this.contains(target)) buttonClick();
-          buttonClick();
       };
       this._button.addEventListener("click", buttonClick);
       this._context.addEventListener("click", ({ target }) => {
-        if (target.tagName !== "SETTING-OPTION")
+        if (target.tagName !== "SETTING-OPTION") return;
-          return;
         buttonClick();
-        if (target.hasAttribute("is-selected"))
+        if (target.hasAttribute("is-selected")) return;
-          return;
         this.querySelectorAll("setting-option[is-selected]").forEach((dom) => dom.toggleAttribute("is-selected"));
         target.toggleAttribute("is-selected");
         this._text.value = target.textContent;
@@ -95,9 +92,9 @@ window.customElements.define(
   }
 );
 const SettingSelect = (items, configKey, configValue) => {
-  return `<ob-setting-select ${configKey ? `data-config-key="${configKey}"` : ""}>
+  return `<ob-setting-select ${`data-config-key="${configKey}"` }>
     ${items.map((e, i) => {
-    return SettingOption(e.text, e.value, configKey && configValue ? configValue === e.value : i === 0);
+    return SettingOption(e.text, e.value, configValue ? configValue === e.value : i === 0);
   }).join("")}
 </ob-setting-select>`;
 };
@@ -108,7 +105,7 @@ class WebUiApiOB11ConfigWrapper {
     this.retCredential = Credential;
   }
   async GetOB11Config() {
-    const ConfigResponse = await fetch("/api/OB11Config/GetConfig", {
+    const ConfigResponse = await fetch("../api/OB11Config/GetConfig", {
       method: "POST",
       headers: {
         Authorization: "Bearer " + this.retCredential,
@@ -124,7 +121,7 @@ class WebUiApiOB11ConfigWrapper {
     return {};
   }
   async SetOB11Config(config) {
-    const ConfigResponse = await fetch("/api/OB11Config/SetConfig", {
+    const ConfigResponse = await fetch("../api/OB11Config/SetConfig", {
       method: "POST",
       headers: {
         Authorization: "Bearer " + this.retCredential,
@@ -154,7 +151,6 @@ async function onSettingWindowCreated(view) {
     } else if (configKey.length === 3) {
       ob11Config[configKey[1]][configKey[2]] = value;
     }
-    OB11ConfigWrapper.SetOB11Config(ob11Config);
   };
   const parser = new DOMParser();
   const doc = parser.parseFromString(
@@ -167,7 +163,7 @@ async function onSettingWindowCreated(view) {
         SettingItem(
           '<span id="napcat-update-title">Napcat</span>',
           void 0,
-          SettingButton("V1.6.8", "napcat-update-button", "secondary")
+          SettingButton("V1.7.7", "napcat-update-button", "secondary")
         )
       ]),
       SettingList([
@@ -326,7 +322,7 @@ async function onSettingWindowCreated(view) {
     "text/html"
   );
   doc.querySelector("#open-github")?.addEventListener("click", () => {
-    window.open("https://napneko.github.io/", "_blank");
+    window.open("https://github.com/NapNeko/NapCatQQ", "_blank");
   });
   doc.querySelector("#open-telegram")?.addEventListener("click", () => {
     window.open("https://t.me/+nLZEnpne-pQ1OWFl");
@@ -335,7 +331,7 @@ async function onSettingWindowCreated(view) {
     window.open("https://qm.qq.com/q/bDnHRG38aI");
   });
   doc.querySelector("#open-docs")?.addEventListener("click", () => {
-    window.open("https://github.com/NapNeko/NapCatQQ");
+    window.open("https://napneko.github.io/", "_blank");
   });
   const buildHostListItem = (type, host, index, inputAttrs = {}) => {
     const dom = {
@@ -431,19 +427,15 @@ async function onSettingWindowCreated(view) {
     dom.addEventListener("click", () => {
       const active = dom.getAttribute("is-active") == void 0;
       setOB11Config(dom.dataset.configKey, active);
-      if (active)
+      if (active) dom.setAttribute("is-active", "");
-        dom.setAttribute("is-active", "");
+      else dom.removeAttribute("is-active");
-      else
-        dom.removeAttribute("is-active");
       if (!isEmpty(dom.dataset.controlDisplayId)) {
         const displayDom = document.querySelector(
           //@ts-expect-error 等待修复
           `#${dom.dataset.controlDisplayId}`
         );
-        if (active)
+        if (active) displayDom?.removeAttribute("is-hidden");
-          displayDom?.removeAttribute("is-hidden");
+        else displayDom?.setAttribute("is-hidden", "");
-        else
-          displayDom?.setAttribute("is-hidden", "");
       }
     });
   });

static/index.html

@@ -10,7 +10,7 @@
 <body>
     <script>
          async function CheckQQLoginStatus(retCredential) {
-            let QQLoginResponse = await fetch('/api/QQLogin/CheckLoginStatus', {
+            let QQLoginResponse = await fetch('../api/QQLogin/CheckLoginStatus', {
                 method: 'POST',
                 headers: {
                     'Authorization': "Bearer " + retCredential,
@@ -30,7 +30,7 @@
             return false;
         }
         async function CheckWebUiLogined(retCredential) {
-            let LoginResponse = await fetch('/api/auth/check', {
+            let LoginResponse = await fetch('../api/auth/check', {
                 method: 'POST',
                 headers: {
                     'Authorization': "Bearer " + retCredential,

static/login.html

@@ -86,7 +86,7 @@
                 let data = "";
 
                 try {
-                    let loginResponse = await fetch('/api/auth/login', {
+                    let loginResponse = await fetch('../api/auth/login', {
                         method: 'POST',
                         headers: {
                             'Content-Type': 'application/json'
@@ -99,7 +99,7 @@
                         //登录成功
                         let retCredential = loginResponseJson.data.Credential;
                         localStorage.setItem('auth', retCredential);
-                        let QQLoginResponse = await fetch('/api/QQLogin/CheckLoginStatus', {
+                        let QQLoginResponse = await fetch('../api/QQLogin/CheckLoginStatus', {
                             method: 'POST',
                             headers: {
                                 'Authorization': "Bearer " + retCredential,

test/MessageUnique.ts

@@ -1,6 +1,5 @@
 describe('MessageUniqueWrapper', () => {
-    let messageUniqueWrapper: MessageUniqueWrapper;
+    let messageUniqueWrapper: MessageUniqueWrapper;  
-    
     beforeEach(() => {
       messageUniqueWrapper = new MessageUniqueWrapper();
     });
@@ -91,4 +90,4 @@ describe('MessageUniqueWrapper', () => {
       
       expect(shortId).toBeUndefined();
     });
-  });
+  });

vite.config.ts

@@ -26,9 +26,9 @@ if (process.env.NAPCAT_BUILDSYS == 'linux') {
 } else if (process.env.NAPCAT_BUILDSYS == 'win32') {
   if (process.env.NAPCAT_BUILDARCH == 'x64') {
   }
-  startScripts = ['./script/napcat.ps1', './script/napcat.bat', './script/napcat-utf8.bat', './script/napcat-utf8.ps1', './script/napcat-log.ps1', './script/NapCat.164.bat', './script/napcat-9912.ps1', './script/napcat-9912-utf8.ps1', './script/napcat-9912.bat', './script/napcat-9912-utf8.bat'];
+  startScripts = ['./script/dbghelp.dll', './script/BootWay05.ps1', './script/napcat-9912.ps1', './script/napcat-9912-utf8.ps1', './script/napcat-9912.bat', './script/napcat-9912-utf8.bat'];
 } else {
-  startScripts = ['./script/napcat.sh', './script/napcat.ps1', './script/napcat.bat', './script/napcat-utf8.bat', './script/napcat-utf8.ps1', './script/napcat-log.ps1', './script/napcat-9912.ps1', './script/napcat-9912-utf8.ps1', './script/napcat-9912.bat', './script/napcat-9912-utf8.bat'];
+  startScripts = ['./script/dbghelp.dll', './script/BootWay05.ps1', './script/napcat.sh', './script/napcat.ps1', './script/napcat.bat', './script/napcat-utf8.bat', './script/napcat-utf8.ps1', './script/napcat-log.ps1', './script/napcat-9912.ps1', './script/napcat-9912-utf8.ps1', './script/napcat-9912.bat', './script/napcat-9912-utf8.bat'];
 }
 
 const baseConfigPlugin: PluginOption[] = [