Merge pull request #235 from LLOneBot/dev

快速操作回复自动引用原消息开关

.github/workflows/publish.yml

@@ -1,8 +1,8 @@
-name: "publish"
+name: 'publish'
 on:
   push:
     tags:
-      - "v*"
+      - 'v*'
 
 jobs:
   build-and-publish:
@@ -34,6 +34,6 @@ jobs:
       - name: publish
         uses: ncipollo/release-action@v1
         with:
-        artifacts: "LLOneBot.zip"
+          artifacts: 'LLOneBot.zip'
           draft: true
           token: ${{ secrets.RELEASE_TOKEN }}

.prettierrc.yml

@@ -0,0 +1,4 @@
+semi: false
+singleQuote: true
+trailingComma: all
+printWidth: 120

CHANGELOG

@@ -0,0 +1,14 @@
+# 3.24.0
+
+## 修复
+
+* 修复图片rkey导致链接失效的问题
+* 修复/get_image, /get_file 无法获取图片的问题
+* 修复上报他人管理员被取消通知
+
+## 新增
+
+* 新增表情回应发送和上报
+* 新增商城表情发送，和上报 url
+* 新增转发单条消息接口 `forward_friend_single_msg`, `forward_group_single_msg`
+* 新增新增好友事件

README.md

@@ -1,7 +1,10 @@
+# LLOneBot
 
-# LLOneBot API
 LiteLoaderQQNT插件，使你的NTQQ支持OneBot11协议进行QQ机器人开发
 
+> [!CAUTION]\
+> **请不要在 QQ 官方群聊和任何影响力较大的简中互联网平台（包括但不限于:B站，微博，知乎，抖音等）发布和讨论*任何*与本插件存在相关性的信息**
+
 TG群：<https://t.me/+nLZEnpne-pQ1OWFl>
 
 ## 安装方法
@@ -20,8 +23,8 @@ TG群：<https://t.me/+nLZEnpne-pQ1OWFl>
 
 见 <https://llonebot.github.io/zh-CN/develop/api>
 
-
 ## TODO
+
 - [x] 重构摆脱LLAPI，目前调用LLAPI只能在renderer进程调用，需重构成在main进程调用
 - [x] 支持正、反向websocket（感谢@disymayufei的PR）
 - [x] 转发消息记录
@@ -36,17 +39,21 @@ TG群：<https://t.me/+nLZEnpne-pQ1OWFl>
 - [ ] 框架对接文档
 
 ## onebot11文档
+
 <https://11.onebot.dev/>
 
 ## Stargazers over time
+
 [![Stargazers over time](https://starchart.cc/LLOneBot/LLOneBot.svg?variant=adaptive)](https://starchart.cc/LLOneBot/LLOneBot)
 
-
 ## 鸣谢
-* [LiteLoaderQQNT](https://liteloaderqqnt.github.io/guide/install.html)
-* [LLAPI](https://github.com/Night-stars-1/LiteLoaderQQNT-Plugin-LLAPI)
-* [chronocat](https://github.com/chrononeko/chronocat/)
-* [koishi-plugin-adapter-onebot](https://github.com/koishijs/koishi-plugin-adapter-onebot)
+
+- [LiteLoaderQQNT](https://liteloaderqqnt.github.io/guide/install.html)
+- [LLAPI](https://github.com/Night-stars-1/LiteLoaderQQNT-Plugin-LLAPI)
+- [chronocat](https://github.com/chrononeko/chronocat/)
+- [koishi-plugin-adapter-onebot](https://github.com/koishijs/koishi-plugin-adapter-onebot)
+- [silk-wasm](https://github.com/idranme/silk-wasm)
 
 ## 友链
-* [Lagrange.Core](https://github.com/LagrangeDev/Lagrange.Core) 一款用C#实现的NTQQ纯协议跨平台QQ机器人框架
+
+- [Lagrange.Core](https://github.com/LagrangeDev/Lagrange.Core) 一款用C#实现的NTQQ纯协议跨平台QQ机器人框架

electron.vite.config.ts

@@ -1,9 +1,19 @@
-import cp from 'vite-plugin-cp';
-import "./scripts/gen-version"
+import cp from 'vite-plugin-cp'
+import './scripts/gen-version'
+import path from 'node:path'
 
-const external = ["silk-wasm", "ws",
-    "level", "classic-level", "abstract-level", "level-supports", "level-transcoder",
-    "module-error", "catering", "node-gyp-build"];
+const external = [
+  'silk-wasm',
+  'ws',
+  'level',
+  'classic-level',
+  'abstract-level',
+  'level-supports',
+  'level-transcoder',
+  'module-error',
+  'catering',
+  'node-gyp-build',
+]
 
 function genCpModule(module: string) {
   return { src: `./node_modules/${module}`, dest: `dist/node_modules/${module}`, flatten: false }
@@ -12,62 +22,68 @@ function genCpModule(module: string) {
 let config = {
   main: {
     build: {
-            outDir: "dist/main",
+      outDir: 'dist/main',
       emptyOutDir: true,
       lib: {
-                formats: ["cjs"],
-                entry: {"main": "src/main/main.ts"},
+        formats: ['cjs'],
+        entry: { main: 'src/main/main.ts' },
       },
       rollupOptions: {
         external,
-                input: "src/main/main.ts",
-            }
+        input: 'src/main/main.ts',
+      },
     },
     resolve: {
       alias: {
-                './lib-cov/fluent-ffmpeg': './lib/fluent-ffmpeg'
+        '@': path.resolve(__dirname, './src'),
+        './lib-cov/fluent-ffmpeg': './lib/fluent-ffmpeg',
       },
     },
-        plugins: [cp({
+    plugins: [
+      cp({
         targets: [
           ...external.map(genCpModule),
-                {src: './manifest.json', dest: 'dist'}, {src: './icon.jpg', dest: 'dist'},
-                {src: './src/ntqqapi/external/ccpoke/poke-win32-x64.node', dest: 'dist/main/ccpoke/'},
-            ]
-        })]
+          { src: './manifest.json', dest: 'dist' },
+          { src: './icon.jpg', dest: 'dist' },
+          { src: './src/ntqqapi/native/crychic/crychic-win32-x64.node', dest: 'dist/main/' },
+          // { src: './src/ntqqapi/native/moehook/MoeHoo-win32-x64.node', dest: 'dist/main/' },
+          // { src: './src/ntqqapi/native/moehook/MoeHoo-linux-x64.node', dest: 'dist/main/' },
+        ],
+      }),
+    ],
   },
   preload: {
     // vite config options
     build: {
-            outDir: "dist/preload",
+      outDir: 'dist/preload',
       emptyOutDir: true,
       lib: {
-                formats: ["cjs"],
-                entry: {"preload": "src/preload.ts"},
+        formats: ['cjs'],
+        entry: { preload: 'src/preload.ts' },
       },
       rollupOptions: {
         // external: externalAll,
-                input: "src/preload.ts",
-            }
+        input: 'src/preload.ts',
       },
-        resolve: {}
+    },
+    resolve: {},
   },
   renderer: {
     // vite config options
     build: {
-            outDir: "dist/renderer",
+      outDir: 'dist/renderer',
       emptyOutDir: true,
       lib: {
-                formats: ["es"],
-                entry: {"renderer": "src/renderer/index.ts"},
+        formats: ['es'],
+        entry: { renderer: 'src/renderer/index.ts' },
       },
       rollupOptions: {
         // external: externalAll,
-                input: "src/renderer/index.ts",
-            }
+        input: 'src/renderer/index.ts',
+      },
+    },
+    resolve: {},
   },
-        resolve: {}
-    }
 }
 
-export default config;
+export default config

manifest.json

@@ -1,10 +1,10 @@
 {
   "manifest_version": 4,
   "type": "extension",
-  "name": "LLOneBot v3.20.0",
+  "name": "LLOneBot v3.26.2",
   "slug": "LLOneBot",
   "description": "使你的NTQQ支持OneBot11协议进行QQ机器人开发, 不支持商店在线更新",
-  "version": "3.20.0",
+  "version": "3.26.2",
   "icon": "./icon.jpg",
   "authors": [
     {

package.json

@@ -9,17 +9,21 @@
     "build-mac": "npm run build && npm run deploy-mac",
     "deploy-mac": "cp -r dist/* ~/Library/Containers/com.tencent.qq/Data/LiteLoaderQQNT/plugins/LLOneBot/",
     "build-win": "npm run build && npm run deploy-win",
-    "deploy-win": "cmd /c \"xcopy /C /S /Y dist\\* %USERPROFILE%\\documents\\LiteLoaderQQNT\\plugins\\LLOneBot\\\""
+    "deploy-win": "cmd /c \"xcopy /C /S /Y dist\\* %USERPROFILE%\\documents\\LiteLoaderQQNT\\plugins\\LLOneBot\\\"",
+    "format": "prettier -cw .",
+    "check": "tsc"
   },
   "author": "",
-  "license": "ISC",
+  "license": "MIT",
   "dependencies": {
     "compressing": "^1.10.0",
+    "cors": "^2.8.5",
     "express": "^4.18.2",
+    "fast-xml-parser": "^4.3.6",
     "file-type": "^19.0.0",
     "fluent-ffmpeg": "^2.1.2",
     "level": "^8.0.1",
-    "silk-wasm": "^3.3.3",
+    "silk-wasm": "^3.3.4",
     "utf-8-validate": "^6.0.3",
     "uuid": "^9.0.1",
     "ws": "^8.16.0"

scripts/test/test_db.ts

@@ -1,13 +1,13 @@
-import {Level} from "level"
+import { Level } from 'level'
 
-const db = new Level(process.env["level_db_path"], {valueEncoding: 'json'});
+const db = new Level(process.env['level_db_path'], { valueEncoding: 'json' })
 
 async function getGroupNotify() {
-    let keys = await db.keys().all();
+  let keys = await db.keys().all()
   let result = []
   for (const key of keys) {
     // console.log(key)
-        if (key.startsWith("group_notify_")) {
+    if (key.startsWith('group_notify_')) {
       result.push(key)
     }
   }

src/common/config.ts

@@ -1,92 +1,99 @@
-import fs from "fs";
-import {Config, OB11Config} from './types';
+import fs from 'fs'
+import fsPromise from 'fs/promises'
+import { Config, OB11Config } from './types'
 
-import {mergeNewProperties} from "./utils/helper";
-import path from "node:path";
-import {selfInfo} from "./data";
-import {DATA_DIR} from "./utils";
+import { mergeNewProperties } from './utils/helper'
+import path from 'node:path'
+import { selfInfo } from './data'
+import { DATA_DIR } from './utils'
 
-export const HOOK_LOG = false;
+export const HOOK_LOG = false
 
-export const ALLOW_SEND_TEMP_MSG = false;
+export const ALLOW_SEND_TEMP_MSG = false
 
 export class ConfigUtil {
-    private readonly configPath: string;
-    private config: Config | null = null;
+  private readonly configPath: string
+  private config: Config | null = null
 
   constructor(configPath: string) {
-        this.configPath = configPath;
+    this.configPath = configPath
   }
 
   getConfig(cache = true) {
     if (this.config && cache) {
-            return this.config;
+      return this.config
     }
 
-        return this.reloadConfig();
+    return this.reloadConfig()
   }
 
   reloadConfig(): Config {
     let ob11Default: OB11Config = {
       httpPort: 3000,
       httpHosts: [],
-            httpSecret: "",
+      httpSecret: '',
       wsPort: 3001,
       wsHosts: [],
       enableHttp: true,
       enableHttpPost: true,
       enableWs: true,
       enableWsReverse: false,
-            messagePostFormat: "array",
+      messagePostFormat: 'array',
+      enableHttpHeart: false,
+      enableQOAutoQuote: false
     }
     let defaultConfig: Config = {
       ob11: ob11Default,
       heartInterval: 60000,
-            token: "",
+      token: '',
       enableLocalFile2Url: false,
       debug: false,
       log: false,
       reportSelfMessage: false,
       autoDeleteFile: false,
       autoDeleteFileSecond: 60,
-            enablePoke: false
-        };
+      enablePoke: false,
+      musicSignUrl: '',
+    }
 
     if (!fs.existsSync(this.configPath)) {
-            this.config = defaultConfig;
-            return this.config;
+      this.config = defaultConfig
+      return this.config
     } else {
-            const data = fs.readFileSync(this.configPath, "utf-8");
-            let jsonData: Config = defaultConfig;
+      const data = fs.readFileSync(this.configPath, 'utf-8')
+      let jsonData: Config = defaultConfig
       try {
         jsonData = JSON.parse(data)
       } catch (e) {
-                this.config = defaultConfig;
-                return this.config;
+        this.config = defaultConfig
+        return this.config
       }
-            mergeNewProperties(defaultConfig, jsonData);
-            this.checkOldConfig(jsonData.ob11, jsonData, "httpPort", "http");
-            this.checkOldConfig(jsonData.ob11, jsonData, "httpHosts", "hosts");
-            this.checkOldConfig(jsonData.ob11, jsonData, "wsPort", "wsPort");
+      mergeNewProperties(defaultConfig, jsonData)
+      this.checkOldConfig(jsonData.ob11, jsonData, 'httpPort', 'http')
+      this.checkOldConfig(jsonData.ob11, jsonData, 'httpHosts', 'hosts')
+      this.checkOldConfig(jsonData.ob11, jsonData, 'wsPort', 'wsPort')
       // console.log("get config", jsonData);
-            this.config = jsonData;
-            return this.config;
+      this.config = jsonData
+      return this.config
     }
   }
 
   setConfig(config: Config) {
-        this.config = config;
-        fs.writeFileSync(this.configPath, JSON.stringify(config, null, 2), "utf-8")
+    this.config = config
+    fs.writeFileSync(this.configPath, JSON.stringify(config, null, 2), 'utf-8')
   }
 
-    private checkOldConfig(currentConfig: Config | OB11Config,
+  private checkOldConfig(
+    currentConfig: Config | OB11Config,
     oldConfig: Config | OB11Config,
-                           currentKey: string, oldKey: string) {
+    currentKey: string,
+    oldKey: string,
+  ) {
     // 迁移旧的配置到新配置，避免用户重新填写配置
-        const oldValue = oldConfig[oldKey];
+    const oldValue = oldConfig[oldKey]
     if (oldValue) {
-            currentConfig[currentKey] = oldValue;
-            delete oldConfig[oldKey];
+      currentConfig[currentKey] = oldValue
+      delete oldConfig[oldKey]
     }
   }
 }

src/common/data.ts

@@ -1,20 +1,28 @@
 import {
+  CategoryFriend,
   type Friend,
   type FriendRequest,
   type Group,
   type GroupMember,
-    type SelfInfo
+  type SelfInfo,
+  User,
 } from '../ntqqapi/types'
 import { type FileCache, type LLOneBotError } from './types'
-import {NTQQGroupApi} from "../ntqqapi/api/group";
-import {log} from "./utils/log";
-import {isNumeric} from "./utils/helper";
+import { NTQQGroupApi } from '../ntqqapi/api/group'
+import { log } from './utils/log'
+import { isNumeric } from './utils/helper'
+import { NTQQFriendApi } from '../ntqqapi/api'
+import { WebApiGroupMember } from '@/ntqqapi/api/webapi'
 
 export const selfInfo: SelfInfo = {
   uid: '',
   uin: '',
   nick: '',
-    online: true
+  online: true,
+}
+export const WebGroupData = {
+  GroupData: new Map<string, Array<WebApiGroupMember>>(),
+  GroupTime: new Map<string, number>(),
 }
 export let groups: Group[] = []
 export let friends: Friend[] = []
@@ -23,49 +31,59 @@ export const llonebotError: LLOneBotError = {
   ffmpegError: '',
   httpServerError: '',
   wsServerError: '',
-    otherError: 'LLOnebot未能正常启动，请检查日志查看错误'
+  otherError: 'LLOnebot未能正常启动，请检查日志查看错误',
 }
 
-
 export async function getFriend(uinOrUid: string): Promise<Friend | undefined> {
-    let filterKey = isNumeric(uinOrUid) ? "uin" : "uid"
+  let filterKey = isNumeric(uinOrUid.toString()) ? 'uin' : 'uid'
   let filterValue = uinOrUid
-    let friend = friends.find(friend => friend[filterKey] === filterValue.toString())
-    // if (!friend) {
-    //     try {
-    //         friends = (await NTQQApi.getFriends(true))
-    //         friend = friends.find(friend => friend[filterKey] === filterValue.toString())
-    //     } catch (e) {
-    //         // log("刷新好友列表失败", e.stack.toString())
-    //     }
-    // }
+  let friend = friends.find((friend) => friend[filterKey] === filterValue.toString())
+  if (!friend) {
+    try {
+      const _friends = await NTQQFriendApi.getFriends(true)
+      friend = _friends.find((friend) => friend[filterKey] === filterValue.toString())
+      if (friend) {
+        friends.push(friend)
+      }
+    } catch (e) {
+      log('刷新好友列表失败', e.stack.toString())
+    }
+  }
   return friend
 }
 
 export async function getGroup(qq: string): Promise<Group | undefined> {
-    let group = groups.find(group => group.groupCode === qq.toString())
+  let group = groups.find((group) => group.groupCode === qq.toString())
   if (!group) {
     try {
-            const _groups = await NTQQGroupApi.getGroups(true);
-            group = _groups.find(group => group.groupCode === qq.toString())
+      const _groups = await NTQQGroupApi.getGroups(true)
+      group = _groups.find((group) => group.groupCode === qq.toString())
       if (group) {
         groups.push(group)
       }
     } catch (e) {
     }
-
   }
   return group
 }
 
+export function deleteGroup(groupCode: string) {
+  const groupIndex = groups.findIndex((group) => group.groupCode === groupCode.toString())
+  // log(groups, groupCode, groupIndex);
+  if (groupIndex !== -1) {
+    log('删除群', groupCode)
+    groups.splice(groupIndex, 1)
+  }
+}
+
 export async function getGroupMember(groupQQ: string | number, memberUinOrUid: string | number) {
   groupQQ = groupQQ.toString()
   memberUinOrUid = memberUinOrUid.toString()
   const group = await getGroup(groupQQ)
   if (group) {
-        const filterKey = isNumeric(memberUinOrUid) ? "uin" : "uid"
+    const filterKey = isNumeric(memberUinOrUid) ? 'uin' : 'uid'
     const filterValue = memberUinOrUid
-        let filterFunc: (member: GroupMember) => boolean = member => member[filterKey] === filterValue
+    let filterFunc: (member: GroupMember) => boolean = (member) => member[filterKey] === filterValue
     let member = group.members?.find(filterFunc)
     if (!member) {
       try {
@@ -85,7 +103,7 @@ export async function getGroupMember(groupQQ: string | number, memberUinOrUid: s
 }
 
 export async function refreshGroupMembers(groupQQ: string) {
-    const group = groups.find(group => group.groupCode === groupQQ)
+  const group = groups.find((group) => group.groupCode === groupQQ)
   if (group) {
     group.members = await NTQQGroupApi.getGroupMembers(groupQQ)
   }
@@ -94,11 +112,13 @@ export async function refreshGroupMembers(groupQQ: string) {
 export const uidMaps: Record<string, string> = {} // 一串加密的字符串(uid) -> qq号
 
 export function getUidByUin(uin: string) {
-    for (const key in uidMaps) {
-        if (uidMaps[key] === uin) {
-            return key
+  for (const uid in uidMaps) {
+    if (uidMaps[uid] === uin) {
+      return uid
     }
   }
 }
 
 export let tempGroupCodeMap: Record<string, string> = {} // peerUid => 群号
+
+export let rawFriends: CategoryFriend[] = []

src/common/db.ts

@@ -1,22 +1,22 @@
-import {Level} from "level";
-import {type GroupNotify, RawMessage} from "../ntqqapi/types";
-import {DATA_DIR} from "./utils";
-import {selfInfo} from "./data";
-import {FileCache} from "./types";
-import {log} from "./utils/log";
+import { Level } from 'level'
+import { type GroupNotify, RawMessage } from '../ntqqapi/types'
+import { DATA_DIR } from './utils'
+import { selfInfo } from './data'
+import { FileCache } from './types'
+import { log } from './utils/log'
 
-type ReceiveTempUinMap = Record<string, string>;
+type ReceiveTempUinMap = Record<string, string>
 
 class DBUtil {
-    public readonly DB_KEY_PREFIX_MSG_ID = "msg_id_";
-    public readonly DB_KEY_PREFIX_MSG_SHORT_ID = "msg_short_id_";
-    public readonly DB_KEY_PREFIX_MSG_SEQ_ID = "msg_seq_id_";
-    public readonly DB_KEY_PREFIX_FILE = "file_";
-    public readonly DB_KEY_PREFIX_GROUP_NOTIFY = "group_notify_";
-    private readonly DB_KEY_RECEIVED_TEMP_UIN_MAP = "received_temp_uin_map";
-    public db: Level;
+  public readonly DB_KEY_PREFIX_MSG_ID = 'msg_id_'
+  public readonly DB_KEY_PREFIX_MSG_SHORT_ID = 'msg_short_id_'
+  public readonly DB_KEY_PREFIX_MSG_SEQ_ID = 'msg_seq_id_'
+  public readonly DB_KEY_PREFIX_FILE = 'file_'
+  public readonly DB_KEY_PREFIX_GROUP_NOTIFY = 'group_notify_'
+  private readonly DB_KEY_RECEIVED_TEMP_UIN_MAP = 'received_temp_uin_map'
+  public db: Level
   public cache: Record<string, RawMessage | string | FileCache | GroupNotify | ReceiveTempUinMap> = {} // <msg_id_ | msg_short_id_ | msg_seq_id_><id>: RawMessage
-    private currentShortId: number;
+  private currentShortId: number
 
   /*
    * 数据库结构
@@ -27,41 +27,41 @@ class DBUtil {
    * */
 
   constructor() {
-        let initCount = 0;
+    let initCount = 0
     new Promise((resolve, reject) => {
       const initDB = () => {
-                initCount++;
+        initCount++
         // if (initCount > 50) {
         //     return reject("init db fail")
         // }
 
         try {
           if (!selfInfo.uin) {
-                        setTimeout(initDB, 300);
+            setTimeout(initDB, 300)
             return
           }
-                    const DB_PATH = DATA_DIR + `/msg_${selfInfo.uin}`;
-                    this.db = new Level(DB_PATH, {valueEncoding: 'json'});
-                    console.log("llonebot init db success")
+          const DB_PATH = DATA_DIR + `/msg_${selfInfo.uin}`
+          this.db = new Level(DB_PATH, { valueEncoding: 'json' })
+          console.log('llonebot init db success')
           resolve(null)
         } catch (e) {
-                    console.log("init db fail", e.stack.toString())
-                    setTimeout(initDB, 300);
+          console.log('init db fail', e.stack.toString())
+          setTimeout(initDB, 300)
         }
       }
-            initDB();
+      setTimeout(initDB)
     }).then()
 
-        const expiredMilliSecond = 1000 * 60 * 60;
+    const expiredMilliSecond = 1000 * 60 * 60
 
     setInterval(() => {
       // this.cache = {}
       // 清理时间较久的缓存
       const now = Date.now()
       for (let key in this.cache) {
-                let message: RawMessage = this.cache[key] as RawMessage;
+        let message: RawMessage = this.cache[key] as RawMessage
         if (message?.msgTime) {
-                    if ((now - (parseInt(message.msgTime) * 1000)) > expiredMilliSecond) {
+          if (now - parseInt(message.msgTime) * 1000 > expiredMilliSecond) {
             delete this.cache[key]
             // log("clear cache", key, message.msgTime);
           }
@@ -72,14 +72,13 @@ class DBUtil {
 
   public async getReceivedTempUinMap(): Promise<ReceiveTempUinMap> {
     try {
-            this.cache[this.DB_KEY_RECEIVED_TEMP_UIN_MAP] = JSON.parse(await this.db.get(this.DB_KEY_RECEIVED_TEMP_UIN_MAP));
-        }catch (e) {
-        }
-        return (this.cache[this.DB_KEY_RECEIVED_TEMP_UIN_MAP] || {}) as ReceiveTempUinMap;
+      this.cache[this.DB_KEY_RECEIVED_TEMP_UIN_MAP] = JSON.parse(await this.db.get(this.DB_KEY_RECEIVED_TEMP_UIN_MAP))
+    } catch (e) {}
+    return (this.cache[this.DB_KEY_RECEIVED_TEMP_UIN_MAP] || {}) as ReceiveTempUinMap
   }
   public setReceivedTempUinMap(data: ReceiveTempUinMap) {
-        this.cache[this.DB_KEY_RECEIVED_TEMP_UIN_MAP] = data;
-        this.db.put(this.DB_KEY_RECEIVED_TEMP_UIN_MAP, JSON.stringify(data)).then();
+    this.cache[this.DB_KEY_RECEIVED_TEMP_UIN_MAP] = data
+    this.db.put(this.DB_KEY_RECEIVED_TEMP_UIN_MAP, JSON.stringify(data)).then()
   }
   private addCache(msg: RawMessage) {
     const longIdKey = this.DB_KEY_PREFIX_MSG_ID + msg.msgId
@@ -93,23 +92,23 @@ class DBUtil {
   }
 
   async getMsgByShortId(shortMsgId: number): Promise<RawMessage> {
-        const shortMsgIdKey = this.DB_KEY_PREFIX_MSG_SHORT_ID + shortMsgId;
+    const shortMsgIdKey = this.DB_KEY_PREFIX_MSG_SHORT_ID + shortMsgId
     if (this.cache[shortMsgIdKey]) {
       // log("getMsgByShortId cache", shortMsgIdKey, this.cache[shortMsgIdKey])
       return this.cache[shortMsgIdKey] as RawMessage
     }
     try {
-            const longId = await this.db.get(shortMsgIdKey);
+      const longId = await this.db.get(shortMsgIdKey)
       const msg = await this.getMsgByLongId(longId)
       this.addCache(msg)
       return msg
     } catch (e) {
-            log("getMsgByShortId db error", e.stack.toString())
+      log('getMsgByShortId db error', e.stack.toString())
     }
   }
 
   async getMsgByLongId(longId: string): Promise<RawMessage> {
-        const longIdKey = this.DB_KEY_PREFIX_MSG_ID + longId;
+    const longIdKey = this.DB_KEY_PREFIX_MSG_ID + longId
     if (this.cache[longIdKey]) {
       return this.cache[longIdKey] as RawMessage
     }
@@ -124,17 +123,17 @@ class DBUtil {
   }
 
   async getMsgBySeqId(seqId: string): Promise<RawMessage> {
-        const seqIdKey = this.DB_KEY_PREFIX_MSG_SEQ_ID + seqId;
+    const seqIdKey = this.DB_KEY_PREFIX_MSG_SEQ_ID + seqId
     if (this.cache[seqIdKey]) {
       return this.cache[seqIdKey] as RawMessage
     }
     try {
-            const longId = await this.db.get(seqIdKey);
+      const longId = await this.db.get(seqIdKey)
       const msg = await this.getMsgByLongId(longId)
       this.addCache(msg)
       return msg
     } catch (e) {
-            log("getMsgBySeqId db error", e.stack.toString())
+      log('getMsgBySeqId db error', e.stack.toString())
     }
   }
 
@@ -155,23 +154,23 @@ class DBUtil {
       this.updateMsg(msg).then()
       return existMsg.msgShortId
     }
-        this.addCache(msg);
 
-        const shortMsgId = await this.genMsgShortId();
-        const shortIdKey = this.DB_KEY_PREFIX_MSG_SHORT_ID + shortMsgId;
-        const seqIdKey = this.DB_KEY_PREFIX_MSG_SEQ_ID + msg.msgSeq;
-        msg.msgShortId = shortMsgId;
+    const shortMsgId = await this.genMsgShortId()
+    const shortIdKey = this.DB_KEY_PREFIX_MSG_SHORT_ID + shortMsgId
+    const seqIdKey = this.DB_KEY_PREFIX_MSG_SEQ_ID + msg.msgSeq
+    msg.msgShortId = shortMsgId
+    this.addCache(msg)
     // log("新增消息记录", msg.msgId)
-        this.db.put(shortIdKey, msg.msgId).then().catch();
-        this.db.put(longIdKey, JSON.stringify(msg)).then().catch();
+    this.db.put(shortIdKey, msg.msgId).then().catch()
+    this.db.put(longIdKey, JSON.stringify(msg)).then().catch()
     try {
       await this.db.get(seqIdKey)
     } catch (e) {
       // log("新的seqId", seqIdKey)
-            this.db.put(seqIdKey, msg.msgId).then().catch();
+      this.db.put(seqIdKey, msg.msgId).then().catch()
     }
     if (!this.cache[seqIdKey]) {
-            this.cache[seqIdKey] = msg;
+      this.cache[seqIdKey] = msg
     }
     return shortMsgId
     // log(`消息入库 ${seqIdKey}: ${msg.msgId}, ${shortMsgId}: ${msg.msgId}`);
@@ -189,89 +188,88 @@ class DBUtil {
     }
 
     Object.assign(existMsg, msg)
-        this.db.put(longIdKey, JSON.stringify(existMsg)).then().catch();
-        const shortIdKey = this.DB_KEY_PREFIX_MSG_SHORT_ID + existMsg.msgShortId;
-        const seqIdKey = this.DB_KEY_PREFIX_MSG_SEQ_ID + msg.msgSeq;
+    this.db.put(longIdKey, JSON.stringify(existMsg)).then().catch()
+    const shortIdKey = this.DB_KEY_PREFIX_MSG_SHORT_ID + existMsg.msgShortId
+    const seqIdKey = this.DB_KEY_PREFIX_MSG_SEQ_ID + msg.msgSeq
     if (!this.cache[seqIdKey]) {
-            this.cache[seqIdKey] = existMsg;
+      this.cache[seqIdKey] = existMsg
     }
-        this.db.put(shortIdKey, msg.msgId).then().catch();
+    this.db.put(shortIdKey, msg.msgId).then().catch()
     try {
       await this.db.get(seqIdKey)
     } catch (e) {
-            this.db.put(seqIdKey, msg.msgId).then().catch();
+      this.db.put(seqIdKey, msg.msgId).then().catch()
       // log("更新seqId error", e.stack, seqIdKey);
     }
     // log("更新消息", existMsg.msgSeq, existMsg.msgShortId, existMsg.msgId);
   }
 
-
   private async genMsgShortId(): Promise<number> {
-        const key = "msg_current_short_id";
+    const key = 'msg_current_short_id'
     if (this.currentShortId === undefined) {
       try {
-                let id: string = await this.db.get(key);
-                this.currentShortId = parseInt(id);
+        let id: string = await this.db.get(key)
+        this.currentShortId = parseInt(id)
       } catch (e) {
         this.currentShortId = -2147483640
       }
     }
 
-        this.currentShortId++;
-        this.db.put(key, this.currentShortId.toString()).then().catch();
-        return this.currentShortId;
+    this.currentShortId++
+    this.db.put(key, this.currentShortId.toString()).then().catch()
+    return this.currentShortId
   }
 
   async addFileCache(fileNameOrUuid: string, data: FileCache) {
-        const key = this.DB_KEY_PREFIX_FILE + fileNameOrUuid;
+    const key = this.DB_KEY_PREFIX_FILE + fileNameOrUuid
     if (this.cache[key]) {
       return
     }
     let cacheDBData = { ...data }
     delete cacheDBData['downloadFunc']
-        this.cache[fileNameOrUuid] = data;
+    this.cache[fileNameOrUuid] = data
     try {
-            await this.db.put(key, JSON.stringify(cacheDBData));
+      await this.db.put(key, JSON.stringify(cacheDBData))
     } catch (e) {
-            log("addFileCache db error", e.stack.toString())
+      log('addFileCache db error', e.stack.toString())
     }
   }
 
   async getFileCache(fileNameOrUuid: string): Promise<FileCache | undefined> {
-        const key = this.DB_KEY_PREFIX_FILE + (fileNameOrUuid);
+    const key = this.DB_KEY_PREFIX_FILE + fileNameOrUuid
     if (this.cache[key]) {
       return this.cache[key] as FileCache
     }
     try {
-            let data = await this.db.get(key);
-            return JSON.parse(data);
+      let data = await this.db.get(key)
+      return JSON.parse(data)
     } catch (e) {
       // log("getFileCache db error", e.stack.toString())
     }
   }
 
   async addGroupNotify(notify: GroupNotify) {
-        const key = this.DB_KEY_PREFIX_GROUP_NOTIFY + notify.seq;
+    const key = this.DB_KEY_PREFIX_GROUP_NOTIFY + notify.seq
     let existNotify = this.cache[key] as GroupNotify
     if (existNotify) {
       return
     }
-        this.cache[key] = notify;
-        this.db.put(key, JSON.stringify(notify)).then().catch();
+    this.cache[key] = notify
+    this.db.put(key, JSON.stringify(notify)).then().catch()
   }
 
   async getGroupNotify(seq: string): Promise<GroupNotify | undefined> {
-        const key = this.DB_KEY_PREFIX_GROUP_NOTIFY + seq;
+    const key = this.DB_KEY_PREFIX_GROUP_NOTIFY + seq
     if (this.cache[key]) {
       return this.cache[key] as GroupNotify
     }
     try {
-            let data = await this.db.get(key);
-            return JSON.parse(data);
+      let data = await this.db.get(key)
+      return JSON.parse(data)
     } catch (e) {
       // log("getGroupNotify db error", e.stack.toString())
     }
   }
 }
 
-export const dbUtil = new DBUtil();
+export const dbUtil = new DBUtil()

src/common/server/http.ts

@@ -1,75 +1,78 @@
-import express, {Express, Request, Response} from "express";
-import http from "http";
-import {log} from "../utils/log";
-import {getConfigUtil} from "../config";
-import {llonebotError} from "../data";
+import express, { Express, Request, Response } from 'express'
+import http from 'http'
+import cors from 'cors'
+import { log } from '../utils/log'
+import { getConfigUtil } from '../config'
+import { llonebotError } from '../data'
 
 type RegisterHandler = (res: Response, payload: any) => Promise<any>
 
 export abstract class HttpServerBase {
-    name: string = "LLOneBot";
-    private readonly expressAPP: Express;
-    private server: http.Server = null;
+  name: string = 'LLOneBot'
+  private readonly expressAPP: Express
+  private server: http.Server = null
 
   constructor() {
-        this.expressAPP = express();
-        this.expressAPP.use(express.urlencoded({extended: true, limit: "5000mb"}));
+    this.expressAPP = express()
+    // 添加 CORS 中间件
+    this.expressAPP.use(cors())
+    this.expressAPP.use(express.urlencoded({ extended: true, limit: '5000mb' }))
     this.expressAPP.use((req, res, next) => {
       // 兼容处理没有带content-type的请求
       // log("req.headers['content-type']", req.headers['content-type'])
-            req.headers['content-type'] = 'application/json';
-            const originalJson = express.json({limit: "5000mb"});
+      req.headers['content-type'] = 'application/json'
+      const originalJson = express.json({ limit: '5000mb' })
       // 调用原始的express.json()处理器
       originalJson(req, res, (err) => {
         if (err) {
-                    log("Error parsing JSON:", err);
-                    return res.status(400).send("Invalid JSON");
+          log('Error parsing JSON:', err)
+          return res.status(400).send('Invalid JSON')
         }
-                next();
-            });
-        });
+        next()
+      })
+    })
   }
 
   authorize(req: Request, res: Response, next: () => void) {
-        let serverToken = getConfigUtil().getConfig().token;
-        let clientToken = ""
-        const authHeader = req.get("authorization")
+    let serverToken = getConfigUtil().getConfig().token
+    let clientToken = ''
+    const authHeader = req.get('authorization')
     if (authHeader) {
-            clientToken = authHeader.split("Bearer ").pop()
-            log("receive http header token", clientToken)
+      clientToken = authHeader.split('Bearer ').pop()
+      log('receive http header token', clientToken)
     } else if (req.query.access_token) {
       if (Array.isArray(req.query.access_token)) {
-                clientToken = req.query.access_token[0].toString();
+        clientToken = req.query.access_token[0].toString()
       } else {
-                clientToken = req.query.access_token.toString();
+        clientToken = req.query.access_token.toString()
       }
-            log("receive http url token", clientToken)
+      log('receive http url token', clientToken)
     }
 
     if (serverToken && clientToken != serverToken) {
-            return res.status(403).send(JSON.stringify({message: 'token verify failed!'}));
+      return res.status(403).send(JSON.stringify({ message: 'token verify failed!' }))
+    }
+    next()
   }
-        next();
-    };
 
   start(port: number) {
     try {
       this.expressAPP.get('/', (req: Request, res: Response) => {
-                res.send(`${this.name}已启动`);
+        res.send(`${this.name}已启动`)
       })
-            this.listen(port);
-            llonebotError.httpServerError = ""
+      this.listen(port)
+      llonebotError.httpServerError = ''
     } catch (e) {
-            log("HTTP服务启动失败", e.toString())
-            llonebotError.httpServerError = "HTTP服务启动失败, " + e.toString()
+      log('HTTP服务启动失败', e.toString())
+      llonebotError.httpServerError = 'HTTP服务启动失败, ' + e.toString()
     }
   }
 
   stop() {
-        llonebotError.httpServerError = ""
+    llonebotError.httpServerError = ''
     if (this.server) {
       this.server.close()
-            this.server = null;
+      this.server = null
     }
   }
 
@@ -80,35 +83,37 @@ export abstract class HttpServerBase {
 
   abstract handleFailed(res: Response, payload: any, err: any): void
 
-    registerRouter(method: "post" | "get" | string, url: string, handler: RegisterHandler) {
-        if (!url.startsWith("/")) {
-            url = "/" + url
+  registerRouter(method: 'post' | 'get' | string, url: string, handler: RegisterHandler) {
+    if (!url.startsWith('/')) {
+      url = '/' + url
     }
 
     if (!this.expressAPP[method]) {
-            const err = `${this.name} register router failed，${method} not exist`;
-            log(err);
-            throw err;
+      const err = `${this.name} register router failed，${method} not exist`
+      log(err)
+      throw err
     }
     this.expressAPP[method](url, this.authorize, async (req: Request, res: Response) => {
-            let payload = req.body;
-            if (method == "get") {
+      let payload = req.body
+      if (method == 'get') {
         payload = req.query
+      } else if (req.query) {
+        payload = { ...req.query, ...req.body }
       }
-            log("收到http请求", url, payload);
+      log('收到http请求', url, payload)
       try {
         res.send(await handler(res, payload))
       } catch (e) {
         this.handleFailed(res, payload, e.stack.toString())
       }
-        });
+    })
   }
 
   protected listen(port: number) {
-        this.server = this.expressAPP.listen(port, "0.0.0.0", () => {
+    this.server = this.expressAPP.listen(port, '0.0.0.0', () => {
       const info = `${this.name} started 0.0.0.0:${port}`
-            console.log(info);
-            log(info);
-        });
+      console.log(info)
+      log(info)
+    })
   }
 }

src/common/server/websocket.ts

@@ -1,29 +1,26 @@
-import {WebSocket, WebSocketServer} from "ws";
-import urlParse from "url";
-import {IncomingMessage} from "node:http";
-import {log} from "../utils/log";
-import {getConfigUtil} from "../config";
-import {llonebotError} from "../data";
+import { WebSocket, WebSocketServer } from 'ws'
+import urlParse from 'url'
+import { IncomingMessage } from 'node:http'
+import { log } from '../utils/log'
+import { getConfigUtil } from '../config'
+import { llonebotError } from '../data'
 
 class WebsocketClientBase {
   private wsClient: WebSocket
 
-    constructor() {
-    }
+  constructor() {}
 
   send(msg: string) {
     if (this.wsClient && this.wsClient.readyState == WebSocket.OPEN) {
-            this.wsClient.send(msg);
+      this.wsClient.send(msg)
     }
   }
 
-    onMessage(msg: string) {
-
-    }
+  onMessage(msg: string) {}
 }
 
 export class WebsocketServerBase {
-    private ws: WebSocketServer = null;
+  private ws: WebSocketServer = null
 
   constructor() {
     console.log(`llonebot websocket service started`)
@@ -31,16 +28,16 @@ export class WebsocketServerBase {
 
   start(port: number) {
     try {
-            this.ws = new WebSocketServer({port});
+      this.ws = new WebSocketServer({ port, maxPayload: 1024 * 1024 * 1024 })
       llonebotError.wsServerError = ''
     } catch (e) {
-            llonebotError.wsServerError = "正向ws服务启动失败, " + e.toString()
+      llonebotError.wsServerError = '正向ws服务启动失败, ' + e.toString()
     }
-        this.ws.on("connection", (wsClient, req) => {
-            const url = req.url.split("?").shift()
-            this.authorize(wsClient, req);
-            this.onConnect(wsClient, url, req);
-            wsClient.on("message", async (msg) => {
+    this.ws.on('connection', (wsClient, req) => {
+      const url = req.url.split('?').shift()
+      this.authorize(wsClient, req)
+      this.onConnect(wsClient, url, req)
+      wsClient.on('message', async (msg) => {
         this.onMessage(wsClient, url, msg.toString())
       })
     })
@@ -49,35 +46,35 @@ export class WebsocketServerBase {
   stop() {
     llonebotError.wsServerError = ''
     this.ws.close((err) => {
-            log("ws server close failed!", err)
-        });
-        this.ws = null;
+      log('ws server close failed!', err)
+    })
+    this.ws = null
   }
 
   restart(port: number) {
-        this.stop();
-        this.start(port);
+    this.stop()
+    this.start(port)
   }
 
   authorize(wsClient: WebSocket, req) {
-        let token = getConfigUtil().getConfig().token;
-        const url = req.url.split("?").shift();
-        log("ws connect", url)
-        let clientToken: string = ""
-        const authHeader = req.headers['authorization'];
+    let token = getConfigUtil().getConfig().token
+    const url = req.url.split('?').shift()
+    log('ws connect', url)
+    let clientToken: string = ''
+    const authHeader = req.headers['authorization']
     if (authHeader) {
-            clientToken = authHeader.split("Bearer ").pop()
-            log("receive ws header token", clientToken);
+      clientToken = authHeader.split('Bearer ').pop()
+      log('receive ws header token', clientToken)
     } else {
-            const parsedUrl = urlParse.parse(req.url, true);
-            const urlToken = parsedUrl.query.access_token;
+      const parsedUrl = urlParse.parse(req.url, true)
+      const urlToken = parsedUrl.query.access_token
       if (urlToken) {
         if (Array.isArray(urlToken)) {
           clientToken = urlToken[0]
         } else {
           clientToken = urlToken
         }
-                log("receive ws url token", clientToken);
+        log('receive ws url token', clientToken)
       }
     }
     if (token && clientToken != token) {
@@ -86,19 +83,11 @@ export class WebsocketServerBase {
     }
   }
 
-    authorizeFailed(wsClient: WebSocket) {
+  authorizeFailed(wsClient: WebSocket) {}
 
-    }
-
-    onConnect(wsClient: WebSocket, url: string, req: IncomingMessage) {
-
-    }
-
-    onMessage(wsClient: WebSocket, url: string, msg: string) {
-
-    }
-
-    sendHeart() {
-
-    }
+  onConnect(wsClient: WebSocket, url: string, req: IncomingMessage) {}
+
+  onMessage(wsClient: WebSocket, url: string, msg: string) {}
+
+  sendHeart() {}
 }

src/common/types.ts

@@ -9,9 +9,11 @@ export interface OB11Config {
   enableWs?: boolean
   enableWsReverse?: boolean
   messagePostFormat?: 'array' | 'string'
+  enableHttpHeart?: boolean
+  enableQOAutoQuote: boolean  // 快速操作回复自动引用原消息
 }
 export interface CheckVersion {
-  result: boolean,
+  result: boolean
   version: string
 }
 export interface Config {
@@ -26,6 +28,8 @@ export interface Config {
   autoDeleteFileSecond?: number
   ffmpeg?: string // ffmpeg路径
   enablePoke?: boolean
+  musicSignUrl?: string
+  ignoreBeforeLoginMsg?: boolean
 }
 
 export interface LLOneBotError {
@@ -42,5 +46,6 @@ export interface FileCache {
   fileUuid?: string
   url?: string
   msgId?: string
+  elementId: string
   downloadFunc?: () => Promise<void>
 }

src/common/utils/QQBasicInfo.ts

@@ -0,0 +1,75 @@
+import path from 'node:path'
+import fs from 'node:fs'
+import os from 'node:os'
+import { systemPlatform } from './system'
+
+export const exePath = process.execPath;
+
+export const pkgInfoPath = path.join(path.dirname(exePath), 'resources', 'app', 'package.json');
+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') {
+  throw new Error('Something went wrong when load QQ info path');
+}
+
+export { configVersionInfoPath };
+
+type QQPkgInfo = {
+  version: string;
+  buildVersion: string;
+  platform: string;
+  eleArch: string;
+}
+type QQVersionConfigInfo = {
+  baseVersion: string;
+  curVersion: string;
+  prevVersion: string;
+  onErrorVersions: Array<any>;
+  buildId: string;
+}
+
+let _qqVersionConfigInfo: QQVersionConfigInfo = {
+  'baseVersion': '9.9.9-23361',
+  'curVersion': '9.9.9-23361',
+  'prevVersion': '',
+  'onErrorVersions': [],
+  'buildId': '23361'
+};
+
+if (fs.existsSync(configVersionInfoPath)) {
+  try {
+    const _ =JSON.parse(fs.readFileSync(configVersionInfoPath).toString());
+    _qqVersionConfigInfo = Object.assign(_qqVersionConfigInfo, _);
+  } catch (e) {
+    console.error('Load QQ version config info failed, Use default version', e);
+  }
+}
+
+export const qqVersionConfigInfo: QQVersionConfigInfo = _qqVersionConfigInfo;
+
+export const qqPkgInfo: QQPkgInfo = require(pkgInfoPath);
+// platform_type: 3,
+// app_type: 4,
+// app_version: '9.9.9-23159',
+// qua: 'V1_WIN_NQ_9.9.9_23159_GW_B',
+// appid: '537213764',
+// platVer: '10.0.26100',
+// clientVer: '9.9.9-23159',
+
+let _appid: string = '537213803';  // 默认为 Windows 平台的 appid
+if (systemPlatform === 'linux') {
+  _appid = '537213827';
+}
+// todo: mac 平台的 appid
+export const appid = _appid;
+export const isQQ998: boolean = qqPkgInfo.buildVersion >= '22106'

src/common/utils/audio.ts

@@ -1,33 +1,33 @@
-import fs from "fs";
-import {encode, getDuration, getWavFileInfo, isWav} from "silk-wasm";
-import fsPromise from "fs/promises";
-import {log} from "./log";
-import path from "node:path";
-import {DATA_DIR, TEMP_DIR} from "./index";
-import {v4 as uuidv4} from "uuid";
-import {getConfigUtil} from "../config";
-import ffmpeg from "fluent-ffmpeg";
+import fs from 'fs'
+import { encode, getDuration, getWavFileInfo, isWav } from 'silk-wasm'
+import fsPromise from 'fs/promises'
+import { log } from './log'
+import path from 'node:path'
+import { DATA_DIR, TEMP_DIR } from './index'
+import { v4 as uuidv4 } from 'uuid'
+import { getConfigUtil } from '../config'
+import { spawn } from 'node:child_process'
 
 export async function encodeSilk(filePath: string) {
   function getFileHeader(filePath: string) {
     // 定义要读取的字节数
-        const bytesToRead = 7;
+    const bytesToRead = 7
     try {
       const buffer = fs.readFileSync(filePath, {
         encoding: null,
-                flag: "r",
-            });
+        flag: 'r',
+      })
 
-            const fileHeader = buffer.toString("hex", 0, bytesToRead);
-            return fileHeader;
+      const fileHeader = buffer.toString('hex', 0, bytesToRead)
+      return fileHeader
     } catch (err) {
-            console.error("读取文件错误:", err);
-            return;
+      console.error('读取文件错误:', err)
+      return
     }
   }
 
   async function isWavFile(filePath: string) {
-        return isWav(fs.readFileSync(filePath));
+    return isWav(fs.readFileSync(filePath))
   }
 
   async function guessDuration(pttPath: string) {
@@ -60,78 +60,71 @@ export async function encodeSilk(filePath: string) {
   // }
 
   try {
-        const pttPath = path.join(TEMP_DIR, uuidv4());
-        if (getFileHeader(filePath) !== "02232153494c4b") {
+    const pttPath = path.join(TEMP_DIR, uuidv4())
+    if (getFileHeader(filePath) !== '02232153494c4b') {
       log(`语音文件${filePath}需要转换成silk`)
-            const _isWav = await isWavFile(filePath);
-            const wavPath = pttPath + ".wav"
-            const convert = async () => {
-                return await new Promise((resolve, reject) => {
-                    const ffmpegPath = getConfigUtil().getConfig().ffmpeg;
-                    if (ffmpegPath) {
-                        ffmpeg.setFfmpegPath(ffmpegPath);
+      const _isWav = await isWavFile(filePath)
+      const pcmPath = pttPath + '.pcm'
+      let sampleRate = 0
+      const convert = () => {
+        return new Promise<Buffer>((resolve, reject) => {
+          const ffmpegPath = getConfigUtil().getConfig().ffmpeg || process.env.FFMPEG_PATH || 'ffmpeg'
+          const cp = spawn(ffmpegPath, ['-y', '-i', filePath, '-ar', '24000', '-ac', '1', '-f', 's16le', pcmPath])
+          cp.on('error', (err) => {
+            log(`FFmpeg处理转换出错: `, err.message)
+            return reject(err)
+          })
+          cp.on('exit', (code, signal) => {
+            const EXIT_CODES = [0, 255]
+            if (code == null || EXIT_CODES.includes(code)) {
+              sampleRate = 24000
+              const data = fs.readFileSync(pcmPath)
+              fs.unlink(pcmPath, (err) => {})
+              return resolve(data)
             }
-                    ffmpeg(filePath).toFormat("wav")
-                        .audioChannels(1)
-                        .audioFrequency(24000)
-                        .on('end', function () {
-                        log('wav转换完成');
+            log(`FFmpeg exit: code=${code ?? 'unknown'} sig=${signal ?? 'unknown'}`)
+            reject(Error(`FFmpeg处理转换失败`))
           })
-                        .on('error', function (err) {
-                            log(`wav转换出错: `, err.message,);
-                            reject(err);
-                        })
-                        .save(wavPath)
-                        .on("end", () => {
-                            filePath = wavPath
-                            resolve(wavPath);
-                        });
         })
       }
-            let wav: Buffer
+      let input: Buffer
       if (!_isWav) {
-                log(`语音文件${filePath}正在转换成wav`)
-                await convert()
+        input = await convert()
       } else {
-                wav = fs.readFileSync(filePath)
+        input = fs.readFileSync(filePath)
         const allowSampleRate = [8000, 12000, 16000, 24000, 32000, 44100, 48000]
-                const {fmt} = getWavFileInfo(wav)
+        const { fmt } = getWavFileInfo(input)
         // log(`wav文件信息`, fmt)
         if (!allowSampleRate.includes(fmt.sampleRate)) {
-                    wav = undefined
-                    await convert()
+          input = await convert()
         }
       }
-            wav ||= fs.readFileSync(filePath);
-            const silk = await encode(wav, 0);
-            fs.writeFileSync(pttPath, silk.data);
-            fs.unlink(wavPath, (err) => {
-            });
-            // const gDuration = await guessDuration(pttPath)
+      const silk = await encode(input, sampleRate)
+      fs.writeFileSync(pttPath, silk.data)
       log(`语音文件${filePath}转换成功!`, pttPath, `时长:`, silk.duration)
       return {
         converted: true,
         path: pttPath,
-                duration: silk.duration / 1000
-            };
+        duration: silk.duration / 1000,
+      }
     } else {
-            const silk = fs.readFileSync(filePath);
-            let duration = 0;
+      const silk = fs.readFileSync(filePath)
+      let duration = 0
       try {
         duration = getDuration(silk) / 1000
       } catch (e) {
-                log("获取语音文件时长失败, 使用文件大小推测时长", filePath, e.stack)
-                duration = await guessDuration(filePath);
+        log('获取语音文件时长失败, 使用文件大小推测时长', filePath, e.stack)
+        duration = await guessDuration(filePath)
       }
 
       return {
         converted: false,
         path: filePath,
-                duration: duration,
-            };
+        duration,
+      }
     }
   } catch (error) {
-        log("convert silk failed", error.stack);
-        return {};
+    log('convert silk failed', error.stack)
+    return {}
   }
 }

src/common/utils/file.ts

@@ -1,47 +1,46 @@
-import fs from "fs";
-import fsPromise from "fs/promises";
-import crypto from "crypto";
-import util from "util";
-import path from "node:path";
-import {v4 as uuidv4} from "uuid";
-import {log, TEMP_DIR} from "./index";
-import {dbUtil} from "../db";
-import * as fileType from "file-type";
-import {net} from "electron";
-
+import fs from 'fs'
+import fsPromise from 'fs/promises'
+import crypto from 'crypto'
+import util from 'util'
+import path from 'node:path'
+import { v4 as uuidv4 } from 'uuid'
+import { log, TEMP_DIR } from './index'
+import { dbUtil } from '../db'
+import * as fileType from 'file-type'
+import { net } from 'electron'
 
 export function isGIF(path: string) {
-    const buffer = Buffer.alloc(4);
-    const fd = fs.openSync(path, 'r');
-    fs.readSync(fd, buffer, 0, 4, 0);
-    fs.closeSync(fd);
+  const buffer = Buffer.alloc(4)
+  const fd = fs.openSync(path, 'r')
+  fs.readSync(fd, buffer, 0, 4, 0)
+  fs.closeSync(fd)
   return buffer.toString() === 'GIF8'
 }
 
 // 定义一个异步函数来检查文件是否存在
 export function checkFileReceived(path: string, timeout: number = 3000): Promise<void> {
   return new Promise((resolve, reject) => {
-        const startTime = Date.now();
+    const startTime = Date.now()
 
     function check() {
       if (fs.existsSync(path)) {
-                resolve();
+        resolve()
       } else if (Date.now() - startTime > timeout) {
-                reject(new Error(`文件不存在: ${path}`));
+        reject(new Error(`文件不存在: ${path}`))
       } else {
-                setTimeout(check, 100);
+        setTimeout(check, 100)
       }
     }
 
-        check();
-    });
+    check()
+  })
 }
 
 export async function file2base64(path: string) {
-    const readFile = util.promisify(fs.readFile);
+  const readFile = util.promisify(fs.readFile)
   let result = {
-        err: "",
-        data: ""
+    err: '',
+    data: '',
   }
   try {
     // 读取文件内容
@@ -49,123 +48,121 @@ export async function file2base64(path: string) {
     //     path = path.replace("\\Ori\\", "\\Thumb\\");
     // }
     try {
-            await checkFileReceived(path, 5000);
+      await checkFileReceived(path, 5000)
     } catch (e: any) {
-            result.err = e.toString();
-            return result;
+      result.err = e.toString()
+      return result
     }
-        const data = await readFile(path);
+    const data = await readFile(path)
     // 转换为Base64编码
-        result.data = data.toString('base64');
+    result.data = data.toString('base64')
   } catch (err) {
-        result.err = err.toString();
+    result.err = err.toString()
   }
-    return result;
+  return result
 }
 
-
-
 export function calculateFileMD5(filePath: string): Promise<string> {
   return new Promise((resolve, reject) => {
     // 创建一个流式读取器
-        const stream = fs.createReadStream(filePath);
-        const hash = crypto.createHash('md5');
+    const stream = fs.createReadStream(filePath)
+    const hash = crypto.createHash('md5')
 
     stream.on('data', (data: Buffer) => {
       // 当读取到数据时，更新哈希对象的状态
-            hash.update(data);
-        });
+      hash.update(data)
+    })
 
     stream.on('end', () => {
       // 文件读取完成，计算哈希
-            const md5 = hash.digest('hex');
-            resolve(md5);
-        });
+      const md5 = hash.digest('hex')
+      resolve(md5)
+    })
 
     stream.on('error', (err: Error) => {
       // 处理可能的读取错误
-            reject(err);
-        });
-    });
+      reject(err)
+    })
+  })
 }
 
 export interface HttpDownloadOptions {
-    url: string;
-    headers?: Record<string, string> | string;
+  url: string
+  headers?: Record<string, string> | string
 }
 export async function httpDownload(options: string | HttpDownloadOptions): Promise<Buffer> {
-    let chunks: Buffer[] = [];
-    let url: string;
+  let chunks: Buffer[] = []
+  let url: string
   let headers: Record<string, string> = {
-        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.71 Safari/537.36"
-    };
-    if (typeof options === "string") {
-        url = options;
+    'User-Agent':
+      'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.71 Safari/537.36',
+  }
+  if (typeof options === 'string') {
+    url = options
   } else {
-        url = options.url;
+    url = options.url
     if (options.headers) {
-            if (typeof options.headers === "string") {
-                headers = JSON.parse(options.headers);
+      if (typeof options.headers === 'string') {
+        headers = JSON.parse(options.headers)
       } else {
-                headers = options.headers;
+        headers = options.headers
       }
     }
   }
-    const fetchRes = await net.fetch(url, headers);
+  const fetchRes = await net.fetch(url, {headers})
   if (!fetchRes.ok) throw new Error(`下载文件失败: ${fetchRes.statusText}`)
 
-    const blob = await fetchRes.blob();
-    let buffer = await blob.arrayBuffer();
-    return Buffer.from(buffer);
+  const blob = await fetchRes.blob()
+  let buffer = await blob.arrayBuffer()
+  return Buffer.from(buffer)
 }
 
 type Uri2LocalRes = {
-    success: boolean,
-    errMsg: string,
-    fileName: string,
-    ext: string,
-    path: string,
+  success: boolean
+  errMsg: string
+  fileName: string
+  ext: string
+  path: string
   isLocal: boolean
 }
 
 export async function uri2local(uri: string, fileName: string = null): Promise<Uri2LocalRes> {
   let res = {
     success: false,
-        errMsg: "",
-        fileName: "",
-        ext: "",
-        path: "",
-        isLocal: false
+    errMsg: '',
+    fileName: '',
+    ext: '',
+    path: '',
+    isLocal: false,
   }
   if (!fileName) {
-        fileName = uuidv4();
+    fileName = uuidv4()
   }
   let filePath = path.join(TEMP_DIR, fileName)
-    let url = null;
+  let url = null
   try {
-        url = new URL(uri);
+    url = new URL(uri)
   } catch (e) {
     res.errMsg = `uri ${uri} 解析失败,` + e.toString() + ` 可能${uri}不存在`
     return res
   }
 
   // log("uri protocol", url.protocol, uri);
-    if (url.protocol == "base64:") {
+  if (url.protocol == 'base64:') {
     // base64转成文件
-        let base64Data = uri.split("base64://")[1]
+    let base64Data = uri.split('base64://')[1]
     try {
-            const buffer = Buffer.from(base64Data, 'base64');
-            fs.writeFileSync(filePath, buffer);
-
+      const buffer = Buffer.from(base64Data, 'base64')
+      fs.writeFileSync(filePath, buffer)
     } catch (e: any) {
       res.errMsg = `base64文件下载失败,` + e.toString()
       return res
     }
-    } else if (url.protocol == "http:" || url.protocol == "https:") {
+  } else if (url.protocol == 'http:' || url.protocol == 'https:') {
     // 下载文件
-        let buffer: Buffer = null;
+    let buffer: Buffer = null
     try {
-            buffer = await httpDownload(uri);
+      buffer = await httpDownload(uri)
     } catch (e) {
       res.errMsg = `${url}下载失败,` + e.toString()
       return res
@@ -179,29 +176,30 @@ export async function uri2local(uri: string, fileName: string = null): Promise<U
           // res.ext = pathInfo.ext
         }
       }
+      fileName = fileName.replace(/[/\\:*?"<>|]/g, '_')
       res.fileName = fileName
       filePath = path.join(TEMP_DIR, uuidv4() + fileName)
-            fs.writeFileSync(filePath, buffer);
+      fs.writeFileSync(filePath, buffer)
     } catch (e: any) {
       res.errMsg = `${url}下载失败,` + e.toString()
       return res
     }
   } else {
-        let pathname: string;
-        if (url.protocol === "file:") {
+    let pathname: string
+    if (url.protocol === 'file:') {
       // await fs.copyFile(url.pathname, filePath);
       pathname = decodeURIComponent(url.pathname)
-            if (process.platform === "win32") {
+      if (process.platform === 'win32') {
         filePath = pathname.slice(1)
       } else {
         filePath = pathname
       }
     } else {
-            const cache = await dbUtil.getFileCache(uri);
+      const cache = await dbUtil.getFileCache(uri)
       if (cache) {
         filePath = cache.filePath
       } else {
-                filePath = uri;
+        filePath = uri
       }
     }
 
@@ -219,7 +217,7 @@ export async function uri2local(uri: string, fileName: string = null): Promise<U
     try {
       let ext: string = (await fileType.fileTypeFromFile(filePath)).ext
       if (ext) {
-                log("获取文件类型", ext, filePath)
+        log('获取文件类型', ext, filePath)
         fs.renameSync(filePath, filePath + `.${ext}`)
         filePath += `.${ext}`
         res.fileName += `.${ext}`
@@ -236,23 +234,23 @@ export async function uri2local(uri: string, fileName: string = null): Promise<U
 
 export async function copyFolder(sourcePath: string, destPath: string) {
   try {
-        const entries = await fsPromise.readdir(sourcePath, {withFileTypes: true});
-        await fsPromise.mkdir(destPath, {recursive: true});
+    const entries = await fsPromise.readdir(sourcePath, { withFileTypes: true })
+    await fsPromise.mkdir(destPath, { recursive: true })
     for (let entry of entries) {
-            const srcPath = path.join(sourcePath, entry.name);
-            const dstPath = path.join(destPath, entry.name);
+      const srcPath = path.join(sourcePath, entry.name)
+      const dstPath = path.join(destPath, entry.name)
       if (entry.isDirectory()) {
-                await copyFolder(srcPath, dstPath);
+        await copyFolder(srcPath, dstPath)
       } else {
         try {
-                    await fsPromise.copyFile(srcPath, dstPath);
+          await fsPromise.copyFile(srcPath, dstPath)
         } catch (error) {
-                    console.error(`无法复制文件 '${srcPath}' 到 '${dstPath}': ${error}`);
+          console.error(`无法复制文件 '${srcPath}' 到 '${dstPath}': ${error}`)
           // 这里可以决定是否要继续复制其他文件
         }
       }
     }
   } catch (error) {
-        console.error('复制文件夹时出错:', error);
+    console.error('复制文件夹时出错:', error)
   }
 }

src/common/utils/helper.ts

@@ -1,48 +1,48 @@
 export function truncateString(obj: any, maxLength = 500) {
   if (obj !== null && typeof obj === 'object') {
-        Object.keys(obj).forEach(key => {
+    Object.keys(obj).forEach((key) => {
       if (typeof obj[key] === 'string') {
         // 如果是字符串且超过指定长度，则截断
         if (obj[key].length > maxLength) {
-                    obj[key] = obj[key].substring(0, maxLength) + '...';
+          obj[key] = obj[key].substring(0, maxLength) + '...'
         }
       } else if (typeof obj[key] === 'object') {
         // 如果是对象或数组，则递归调用
-                truncateString(obj[key], maxLength);
+        truncateString(obj[key], maxLength)
       }
-        });
+    })
   }
-    return obj;
+  return obj
 }
 
 export function isNumeric(str: string) {
-    return /^\d+$/.test(str);
+  return /^\d+$/.test(str)
 }
 
 export function sleep(ms: number): Promise<void> {
-    return new Promise(resolve => setTimeout(resolve, ms));
+  return new Promise((resolve) => setTimeout(resolve, ms))
 }
 
 // 在保证老对象已有的属性不变化的情况下将新对象的属性复制到老对象
 export function mergeNewProperties(newObj: any, oldObj: any) {
-    Object.keys(newObj).forEach(key => {
+  Object.keys(newObj).forEach((key) => {
     // 如果老对象不存在当前属性，则直接复制
     if (!oldObj.hasOwnProperty(key)) {
-            oldObj[key] = newObj[key];
+      oldObj[key] = newObj[key]
     } else {
       // 如果老对象和新对象的当前属性都是对象，则递归合并
       if (typeof oldObj[key] === 'object' && typeof newObj[key] === 'object') {
-                mergeNewProperties(newObj[key], oldObj[key]);
+        mergeNewProperties(newObj[key], oldObj[key])
       } else if (typeof oldObj[key] === 'object' || typeof newObj[key] === 'object') {
         // 属性冲突，有一方不是对象，直接覆盖
-                oldObj[key] = newObj[key];
+        oldObj[key] = newObj[key]
       }
     }
-    });
+  })
 }
 
 export function isNull(value: any) {
-    return value === undefined || value === null;
+  return value === undefined || value === null
 }
 
 /**
@@ -53,16 +53,45 @@ export function isNull(value: any) {
  */
 export function wrapText(str: string, maxLength: number): string {
   // 初始化一个空字符串用于存放结果
-    let result: string = '';
+  let result: string = ''
 
   // 循环遍历字符串，每次步进maxLength个字符
   for (let i = 0; i < str.length; i += maxLength) {
     // 从i开始，截取长度为maxLength的字符串段，并添加到结果字符串
     // 如果不是第一段，先添加一个换行符
-        if (i > 0) result += '\n';
-        result += str.substring(i, i + maxLength);
+    if (i > 0) result += '\n'
+    result += str.substring(i, i + maxLength)
   }
 
+  return result
+}
+
+
+/**
+ * 函数缓存装饰器，根据方法名、参数、自定义key生成缓存键，在一定时间内返回缓存结果
+ * @param ttl 超时时间，单位毫秒
+ * @param customKey 自定义缓存键前缀，可为空，防止方法名参数名一致时导致缓存键冲突
+ * @returns 处理后缓存或调用原方法的结果
+ */
+export function cacheFunc(ttl: number, customKey: string='') {
+  const cache = new Map<string, { expiry: number; value: any }>();
+
+  return function (target: any, propertyKey: string, descriptor: PropertyDescriptor): PropertyDescriptor {
+    const originalMethod = descriptor.value;
+    const className = target.constructor.name;  // 获取类名
+    const methodName = propertyKey;             // 获取方法名
+    descriptor.value = async function (...args: any[]){
+      const cacheKey = `${customKey}${className}.${methodName}:${JSON.stringify(args)}`;
+      const cached = cache.get(cacheKey);
+      if (cached && cached.expiry > Date.now()) {
+        return cached.value;
+      } else {
+        const result = await originalMethod.apply(this, args);
+        cache.set(cacheKey, { value: result, expiry: Date.now() + ttl });
         return result;
       }
+    };
 
+    return descriptor;
+  };
+}

src/common/utils/index.ts

@@ -1,18 +1,19 @@
-import path from "node:path";
-import fs from "fs";
+import path from 'node:path'
+import fs from 'fs'
 
 export * from './file'
 export * from './helper'
 export * from './log'
 export * from './qqlevel'
-export * from './qqpkg'
+export * from './QQBasicInfo'
 export * from './upgrade'
-export const DATA_DIR = global.LiteLoader.plugins["LLOneBot"].path.data;
-export const TEMP_DIR = path.join(DATA_DIR, "temp");
-export const PLUGIN_DIR = global.LiteLoader.plugins["LLOneBot"].path.plugin;
+export const DATA_DIR = global.LiteLoader.plugins['LLOneBot'].path.data
+export const TEMP_DIR = path.join(DATA_DIR, 'temp')
+export const PLUGIN_DIR = global.LiteLoader.plugins['LLOneBot'].path.plugin
 if (!fs.existsSync(TEMP_DIR)) {
-    fs.mkdirSync(TEMP_DIR, {recursive: true});
+  fs.mkdirSync(TEMP_DIR, { recursive: true })
 }
-export {getVideoInfo} from "./video";
-export {checkFfmpeg} from "./video";
-export {encodeSilk} from "./audio";
+export { getVideoInfo } from './video'
+export { checkFfmpeg } from './video'
+export { encodeSilk } from './audio'
+export { isQQ998 } from './QQBasicInfo'

src/common/utils/log.ts

@@ -1,14 +1,14 @@
-import {selfInfo} from "../data";
-import fs from "fs";
-import path from "node:path";
-import {DATA_DIR, truncateString} from "./index";
-import {getConfigUtil} from "../config";
+import { selfInfo } from '../data'
+import fs from 'fs'
+import path from 'node:path'
+import { DATA_DIR, truncateString } from './index'
+import { getConfigUtil } from '../config'
 
-const date = new Date();
-const logFileName = `llonebot-${date.toLocaleString("zh-CN")}.log`.replace(/\//g, "-").replace(/:/g, "-");
-const logDir = path.join(DATA_DIR, "logs");
+const date = new Date()
+const logFileName = `llonebot-${date.toLocaleString('zh-CN')}.log`.replace(/\//g, '-').replace(/:/g, '-')
+const logDir = path.join(DATA_DIR, 'logs')
 if (!fs.existsSync(logDir)) {
-    fs.mkdirSync(logDir, {recursive: true});
+  fs.mkdirSync(logDir, { recursive: true })
 }
 
 export function log(...msg: any[]) {
@@ -16,22 +16,20 @@ export function log(...msg: any[]) {
     return //console.log(...msg);
   }
 
-    const userInfo = selfInfo.uin ? `${selfInfo.nick}(${selfInfo.uin})` : ""
-    let logMsg = "";
+  const userInfo = selfInfo.uin ? `${selfInfo.nick}(${selfInfo.uin})` : ''
+  let logMsg = ''
   for (let msgItem of msg) {
     // 判断是否是对象
-        if (typeof msgItem === "object") {
-            let obj = JSON.parse(JSON.stringify(msgItem));
-            logMsg += JSON.stringify(truncateString(obj)) + " ";
-            continue;
+    if (typeof msgItem === 'object') {
+      let obj = JSON.parse(JSON.stringify(msgItem))
+      logMsg += JSON.stringify(truncateString(obj)) + ' '
+      continue
     }
-        logMsg += msgItem + " ";
+    logMsg += msgItem + ' '
   }
-    let currentDateTime = new Date().toLocaleString();
+  let currentDateTime = new Date().toLocaleString()
   logMsg = `${currentDateTime} ${userInfo}: ${logMsg}\n\n`
   // sendLog(...msg);
   // console.log(msg)
-    fs.appendFile(path.join(logDir, logFileName), logMsg, (err: any) => {
-
-    })
+  fs.appendFile(path.join(logDir, logFileName), logMsg, (err: any) => {})
 }

src/common/utils/qqlevel.ts

@@ -1,5 +1,5 @@
 // QQ等级换算
-import {QQLevel} from "../../ntqqapi/types";
+import { QQLevel } from '../../ntqqapi/types'
 
 export function calcQQLevel(level: QQLevel) {
   const { crownNum, sunNum, moonNum, starNum } = level

src/common/utils/qqpkg.ts

@@ -1,12 +0,0 @@
-import path from "path";
-
-type QQPkgInfo = {
-    version: string;
-    buildVersion: string;
-    platform: string;
-    eleArch: string;
-}
-
-export const qqPkgInfo: QQPkgInfo = require(path.join(process.resourcesPath, "app/package.json"))
-
-export const isQQ998: boolean = qqPkgInfo.buildVersion >= "22106"

src/common/utils/request.ts

@@ -0,0 +1,87 @@
+import https from 'node:https';
+import http from 'node:http';
+
+export class RequestUtil {
+  // 适用于获取服务器下发cookies时获取，仅GET
+  static async HttpsGetCookies(url: string): Promise<Map<string, string>> {
+    return new Promise<Map<string, string>>((resolve, reject) => {
+      const protocol = url.startsWith('https://') ? https : http;
+      protocol.get(url, (res) => {
+        const cookiesHeader = res.headers['set-cookie'];
+        if (!cookiesHeader) {
+          resolve(new Map<string, string>());
+        } else {
+          const cookiesMap = new Map<string, string>();
+          cookiesHeader.forEach((cookieStr) => {
+            cookieStr.split(';').forEach((cookiePart) => {
+              const trimmedPart = cookiePart.trim();
+              if (trimmedPart.includes('=')) {
+                const [key, value] = trimmedPart.split('=').map(part => part.trim());
+                cookiesMap.set(key, decodeURIComponent(value)); // 解码cookie值
+              }
+            });
+          });
+          resolve(cookiesMap);
+        }
+      }).on('error', (error) => {
+        reject(error);
+      });
+    });
+  }
+
+  // 请求和回复都是JSON data传原始内容 自动编码json
+  static async HttpGetJson<T>(url: string, method: string = 'GET', data?: any, headers: Record<string, string> = {}, isJsonRet: boolean = true, isArgJson: boolean = true): Promise<T> {
+    let option = new URL(url);
+    const protocol = url.startsWith('https://') ? https : http;
+    const options = {
+      hostname: option.hostname,
+      port: option.port,
+      path: option.href,
+      method: method,
+      headers: headers
+    };
+    return new Promise((resolve, reject) => {
+      const req = protocol.request(options, (res: any) => {
+        let responseBody = '';
+        res.on('data', (chunk: string | Buffer) => {
+          responseBody += chunk.toString();
+        });
+
+        res.on('end', () => {
+          try {
+            if (res.statusCode && res.statusCode >= 200 && res.statusCode < 300) {
+              if (isJsonRet) {
+                const responseJson = JSON.parse(responseBody);
+                resolve(responseJson as T);
+              } else {
+                resolve(responseBody as T);
+              }
+            } else {
+              reject(new Error(`Unexpected status code: ${res.statusCode}`));
+            }
+          } catch (parseError) {
+            reject(parseError);
+          }
+        });
+      });
+
+      req.on('error', (error: any) => {
+        reject(error);
+      });
+      if (method === 'POST' || method === 'PUT' || method === 'PATCH') {
+        if (isArgJson) {
+          req.write(JSON.stringify(data));
+        } else {
+          req.write(data);
+        }
+
+      }
+      req.end();
+    });
+  }
+
+  // 请求返回都是原始内容
+  static async HttpGetText(url: string, method: string = 'GET', data?: any, headers: Record<string, string> = {}) {
+    return this.HttpGetJson<string>(url, method, data, headers, false, false);
+  }
+}

src/common/utils/sign.ts

@@ -0,0 +1,37 @@
+import { log } from './log'
+
+export interface IdMusicSignPostData {
+  type: 'qq' | '163'
+  id: string | number
+}
+
+export interface CustomMusicSignPostData {
+  type: 'custom'
+  url: string
+  audio: string
+  title: string
+  image?: string
+  singer?: string
+}
+
+export type MusicSignPostData = IdMusicSignPostData | CustomMusicSignPostData
+
+export class MusicSign {
+  private readonly url: string
+
+  constructor(url: string) {
+    this.url = url
+  }
+
+  async sign(postData: MusicSignPostData): Promise<string> {
+    const resp = await fetch(this.url, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify(postData),
+    })
+    if (!resp.ok) throw new Error(resp.statusText)
+    const data = await resp.text()
+    log('音乐消息生成成功', data)
+    return data
+  }
+}

src/common/utils/system.ts

@@ -0,0 +1,10 @@
+import os from 'node:os';
+import path from 'node:path';
+
+export const systemPlatform = os.platform();
+export const cpuArch = os.arch();
+export const systemVersion = os.release();
+// export const hostname = os.hostname(); // win7不支持
+const homeDir = os.homedir();
+export const downloadsPath = path.join(homeDir, 'Downloads');
+export const systemName = os.type();

src/common/utils/upgrade.ts

@@ -1,98 +1,97 @@
-import { version } from "../../version";
-import * as path from "node:path";
-import * as fs from "node:fs";
-import { copyFolder, httpDownload, log, PLUGIN_DIR, TEMP_DIR } from ".";
-import compressing from "compressing";
+import { version } from '../../version'
+import * as path from 'node:path'
+import * as fs from 'node:fs'
+import { copyFolder, httpDownload, log, PLUGIN_DIR, TEMP_DIR } from '.'
+import compressing from 'compressing'
 
-
-const downloadMirrorHosts = ["https://mirror.ghproxy.com/"];
-const checkVersionMirrorHosts = ["https://521github.com"];
+const downloadMirrorHosts = ['https://mirror.ghproxy.com/']
+const checkVersionMirrorHosts = ['https://kkgithub.com']
 
 export async function checkNewVersion() {
-    const latestVersionText = await getRemoteVersion();
-    const latestVersion = latestVersionText.split(".");
-    log("llonebot last version", latestVersion);
-    const currentVersion: string[] = version.split(".");
-    log("llonebot current version", currentVersion);
+  const latestVersionText = await getRemoteVersion()
+  const latestVersion = latestVersionText.split('.')
+  log('llonebot last version', latestVersion)
+  const currentVersion: string[] = version.split('.')
+  log('llonebot current version', currentVersion)
   for (let k of [0, 1, 2]) {
     if (parseInt(latestVersion[k]) > parseInt(currentVersion[k])) {
-            log("")
-            return { result: true, version: latestVersionText };
-        }
-        else if (parseInt(latestVersion[k]) < parseInt(currentVersion[k])) {
-            break;
+      log('')
+      return { result: true, version: latestVersionText }
+    } else if (parseInt(latestVersion[k]) < parseInt(currentVersion[k])) {
+      break
     }
   }
-    return { result: false, version: version };
+  return { result: false, version: version }
 }
 
 export async function upgradeLLOneBot() {
-    const latestVersion = await getRemoteVersion();
-    if (latestVersion && latestVersion != "") {
-        const downloadUrl = "https://github.com/LLOneBot/LLOneBot/releases/download/v" + latestVersion + "/LLOneBot.zip";
-        const filePath = path.join(TEMP_DIR, "./update-" + latestVersion + ".zip");
-        let downloadSuccess = false;
+  const latestVersion = await getRemoteVersion()
+  if (latestVersion && latestVersion != '') {
+    const downloadUrl = 'https://github.com/LLOneBot/LLOneBot/releases/download/v' + latestVersion + '/LLOneBot.zip'
+    const filePath = path.join(TEMP_DIR, './update-' + latestVersion + '.zip')
+    let downloadSuccess = false
     // 多镜像下载
     for (const mirrorGithub of downloadMirrorHosts) {
       try {
-                const buffer = await httpDownload(mirrorGithub + downloadUrl);
+        const buffer = await httpDownload(mirrorGithub + downloadUrl)
         fs.writeFileSync(filePath, buffer)
-                downloadSuccess = true;
-                break;
+        downloadSuccess = true
+        break
       } catch (e) {
-                log("llonebot upgrade error", e);
+        log('llonebot upgrade error', e)
       }
     }
     if (!downloadSuccess) {
-            log("llonebot upgrade error", "download failed");
-            return false;
+      log('llonebot upgrade error', 'download failed')
+      return false
     }
-        const temp_ver_dir = path.join(TEMP_DIR, "LLOneBot" + latestVersion);
+    const temp_ver_dir = path.join(TEMP_DIR, 'LLOneBot' + latestVersion)
     let uncompressedPromise = async function () {
       return new Promise<boolean>((resolve, reject) => {
-                compressing.zip.uncompress(filePath, temp_ver_dir).then(() => {
-                    resolve(true);
-                }).catch((reason: any) => {
-                    log("llonebot upgrade failed, ", reason);
+        compressing.zip
+          .uncompress(filePath, temp_ver_dir)
+          .then(() => {
+            resolve(true)
+          })
+          .catch((reason: any) => {
+            log('llonebot upgrade failed, ', reason)
             if (reason?.errno == -4082) {
-                        resolve(true);
+              resolve(true)
             }
-                    resolve(false);
-                });
-            });
+            resolve(false)
+          })
+      })
     }
-        const uncompressedResult = await uncompressedPromise();
+    const uncompressedResult = await uncompressedPromise()
     // 复制文件
-        await copyFolder(temp_ver_dir, PLUGIN_DIR);
+    await copyFolder(temp_ver_dir, PLUGIN_DIR)
 
-        return uncompressedResult;
+    return uncompressedResult
   }
-    return false;
+  return false
 }
 
 export async function getRemoteVersion() {
-    let Version = "";
+  let Version = ''
   for (let i = 0; i < checkVersionMirrorHosts.length; i++) {
-        let mirrorGithub = checkVersionMirrorHosts[i];
-        let tVersion = await getRemoteVersionByMirror(mirrorGithub);
-        if (tVersion && tVersion != "") {
-            Version = tVersion;
-            break;
+    let mirrorGithub = checkVersionMirrorHosts[i]
+    let tVersion = await getRemoteVersionByMirror(mirrorGithub)
+    if (tVersion && tVersion != '') {
+      Version = tVersion
+      break
     }
   }
-    return Version;
+  return Version
 }
 
 export async function getRemoteVersionByMirror(mirrorGithub: string) {
-    let releasePage = "error";
+  let releasePage = 'error'
 
   try {
-        releasePage = (await httpDownload(mirrorGithub + "/LLOneBot/LLOneBot/releases")).toString();
+    releasePage = (await httpDownload(mirrorGithub + '/LLOneBot/LLOneBot/releases')).toString()
     // log("releasePage", releasePage);
-        if (releasePage === "error") return "";
-        return releasePage.match(new RegExp('(?<=(tag/v)).*?(?=("))'))[0];
-    } catch {
-    }
-    return "";
-
+    if (releasePage === 'error') return ''
+    return releasePage.match(new RegExp('(?<=(tag/v)).*?(?=("))'))[0]
+  } catch {}
+  return ''
 }

src/main/ipcsend.ts

@@ -1,13 +1,12 @@
-import {webContents} from 'electron';
-
+import { webContents } from 'electron'
 
 function sendIPCMsg(channel: string, ...data: any) {
-    let contents = webContents.getAllWebContents();
+  let contents = webContents.getAllWebContents()
   for (const content of contents) {
     try {
       content.send(channel, ...data)
     } catch (e) {
-            console.log("llonebot send ipc msg to render error:", e)
+      console.log('llonebot send ipc msg to render error:', e)
     }
   }
 }

src/main/main.ts

@@ -1,8 +1,8 @@
 // 运行在 Electron 主进程 下的插件入口
 
-import {BrowserWindow, dialog, ipcMain} from 'electron';
-import * as fs from 'node:fs';
-import {Config} from "../common/types";
+import { BrowserWindow, dialog, ipcMain } from 'electron'
+import * as fs from 'node:fs'
+import { Config } from '../common/types'
 import {
   CHANNEL_CHECK_VERSION,
   CHANNEL_ERROR,
@@ -11,167 +11,189 @@ import {
   CHANNEL_SELECT_FILE,
   CHANNEL_SET_CONFIG,
   CHANNEL_UPDATE,
-} from "../common/channels";
-import {ob11WebsocketServer} from "../onebot11/server/ws/WebsocketServer";
-import {DATA_DIR} from "../common/utils";
+} from '../common/channels'
+import { ob11WebsocketServer } from '../onebot11/server/ws/WebsocketServer'
+import { DATA_DIR } from '../common/utils'
 import {
   friendRequests,
   getFriend,
   getGroup,
   getGroupMember,
+  groups,
   llonebotError,
   refreshGroupMembers,
   selfInfo,
-    uidMaps
-} from "../common/data";
-import {hookNTQQApiCall, hookNTQQApiReceive, ReceiveCmdS, registerReceiveHook} from "../ntqqapi/hook";
-import {OB11Constructor} from "../onebot11/constructor";
+  uidMaps,
+} from '../common/data'
+import { hookNTQQApiCall, hookNTQQApiReceive, ReceiveCmdS, registerReceiveHook } from '../ntqqapi/hook'
+import { OB11Constructor } from '../onebot11/constructor'
 import {
   ChatType,
   FriendRequestNotify,
   GroupMemberRole,
   GroupNotifies,
   GroupNotifyTypes,
-    RawMessage
-} from "../ntqqapi/types";
-import {ob11HTTPServer} from "../onebot11/server/http";
-import {OB11FriendRecallNoticeEvent} from "../onebot11/event/notice/OB11FriendRecallNoticeEvent";
-import {OB11GroupRecallNoticeEvent} from "../onebot11/event/notice/OB11GroupRecallNoticeEvent";
-import {postOB11Event} from "../onebot11/server/postOB11Event";
-import {ob11ReverseWebsockets} from "../onebot11/server/ws/ReverseWebsocket";
-import {OB11GroupAdminNoticeEvent} from "../onebot11/event/notice/OB11GroupAdminNoticeEvent";
-import {OB11GroupRequestEvent} from "../onebot11/event/request/OB11GroupRequest";
-import {OB11FriendRequestEvent} from "../onebot11/event/request/OB11FriendRequest";
-import * as path from "node:path";
-import {dbUtil} from "../common/db";
-import {setConfig} from "./setConfig";
-import {NTQQUserApi} from "../ntqqapi/api/user";
-import {NTQQGroupApi} from "../ntqqapi/api/group";
-import {registerPokeHandler} from "../ntqqapi/external/ccpoke";
-import {OB11FriendPokeEvent, OB11GroupPokeEvent} from "../onebot11/event/notice/OB11PokeEvent";
-import {checkNewVersion, upgradeLLOneBot} from "../common/utils/upgrade";
-import {log} from "../common/utils/log";
-import {getConfigUtil} from "../common/config";
-import {checkFfmpeg} from "../common/utils/video";
+  RawMessage,
+} from '../ntqqapi/types'
+import { httpHeart, ob11HTTPServer } from '../onebot11/server/http'
+import { OB11FriendRecallNoticeEvent } from '../onebot11/event/notice/OB11FriendRecallNoticeEvent'
+import { OB11GroupRecallNoticeEvent } from '../onebot11/event/notice/OB11GroupRecallNoticeEvent'
+import { postOb11Event } from '../onebot11/server/post-ob11-event'
+import { ob11ReverseWebsockets } from '../onebot11/server/ws/ReverseWebsocket'
+import { OB11GroupAdminNoticeEvent } from '../onebot11/event/notice/OB11GroupAdminNoticeEvent'
+import { OB11GroupRequestEvent } from '../onebot11/event/request/OB11GroupRequest'
+import { OB11FriendRequestEvent } from '../onebot11/event/request/OB11FriendRequest'
+import * as path from 'node:path'
+import { dbUtil } from '../common/db'
+import { setConfig } from './setConfig'
+import { NTQQUserApi } from '../ntqqapi/api/user'
+import { NTQQGroupApi } from '../ntqqapi/api/group'
+import { crychic } from '../ntqqapi/native/crychic'
+import { OB11FriendPokeEvent, OB11GroupPokeEvent } from '../onebot11/event/notice/OB11PokeEvent'
+import { checkNewVersion, upgradeLLOneBot } from '../common/utils/upgrade'
+import { log } from '../common/utils/log'
+import { getConfigUtil } from '../common/config'
+import { checkFfmpeg } from '../common/utils/video'
+import { GroupDecreaseSubType, OB11GroupDecreaseEvent } from '../onebot11/event/notice/OB11GroupDecreaseEvent'
+import '../ntqqapi/native/wrapper'
 
+let running = false
 
-let running = false;
-
-let mainWindow: BrowserWindow | null = null;
+let mainWindow: BrowserWindow | null = null
 
 // 加载插件时触发
 function onLoad() {
-    log("llonebot main onLoad");
+  log('llonebot main onLoad')
   ipcMain.handle(CHANNEL_CHECK_VERSION, async (event, arg) => {
-
-        return checkNewVersion();
-    });
+    return checkNewVersion()
+  })
   ipcMain.handle(CHANNEL_UPDATE, async (event, arg) => {
-        return upgradeLLOneBot();
-    });
+    return upgradeLLOneBot()
+  })
   ipcMain.handle(CHANNEL_SELECT_FILE, async (event, arg) => {
     const selectPath = new Promise<string>((resolve, reject) => {
       dialog
         .showOpenDialog({
-                    title: "请选择ffmpeg",
-                    properties: ["openFile"],
-                    buttonLabel: "确定",
+          title: '请选择ffmpeg',
+          properties: ['openFile'],
+          buttonLabel: '确定',
         })
         .then((result) => {
-                    log("选择文件", result);
+          log('选择文件', result)
           if (!result.canceled) {
-                        const _selectPath = path.join(result.filePaths[0]);
-                        resolve(_selectPath);
+            const _selectPath = path.join(result.filePaths[0])
+            resolve(_selectPath)
             // let config = getConfigUtil().getConfig()
             // config.ffmpeg = path.join(result.filePaths[0]);
             // getConfigUtil().setConfig(config);
           }
-                    resolve("")
+          resolve('')
         })
         .catch((err) => {
-                    reject(err);
-                });
+          reject(err)
+        })
     })
     try {
-            return await selectPath;
+      return await selectPath
     } catch (e) {
-            log("选择文件出错", e)
-            return ""
+      log('选择文件出错', e)
+      return ''
     }
   })
   if (!fs.existsSync(DATA_DIR)) {
-        fs.mkdirSync(DATA_DIR, {recursive: true});
+    fs.mkdirSync(DATA_DIR, { recursive: true })
   }
   ipcMain.handle(CHANNEL_ERROR, async (event, arg) => {
     const ffmpegOk = await checkFfmpeg(getConfigUtil().getConfig().ffmpeg)
-        llonebotError.ffmpegError = ffmpegOk ? "" : "没有找到ffmpeg,音频只能发送wav和silk,视频尺寸可能异常"
-        let {httpServerError, wsServerError, otherError, ffmpegError} = llonebotError;
+    llonebotError.ffmpegError = ffmpegOk ? '' : '没有找到ffmpeg,音频只能发送wav和silk,视频尺寸可能异常'
+    let { httpServerError, wsServerError, otherError, ffmpegError } = llonebotError
     let error = `${otherError}\n${httpServerError}\n${wsServerError}\n${ffmpegError}`
-        error = error.replace("\n\n", "\n")
-        error = error.trim();
-        return error;
+    error = error.replace('\n\n', '\n')
+    error = error.trim()
+    log('查询llonebot错误信息', error)
+    return error
   })
   ipcMain.handle(CHANNEL_GET_CONFIG, async (event, arg) => {
     const config = getConfigUtil().getConfig()
-        return config;
+    return config
   })
   ipcMain.on(CHANNEL_SET_CONFIG, (event, ask: boolean, config: Config) => {
     if (!ask) {
-            setConfig(config).then();
+      setConfig(config)
+        .then()
+        .catch((e) => {
+          log('保存设置失败', e.stack)
+        })
       return
     }
-        dialog.showMessageBox(mainWindow, {
+    dialog
+      .showMessageBox(mainWindow, {
         type: 'question',
         buttons: ['确认', '取消'],
         defaultId: 0, // 默认选中的按钮，0 代表第一个按钮，即 "确认"
         title: '确认保存',
         message: '是否保存？',
-            detail: 'LLOneBot配置已更改，是否保存？'
-        }).then(result => {
+        detail: 'LLOneBot配置已更改，是否保存？',
+      })
+      .then((result) => {
         if (result.response === 0) {
-                setConfig(config).then();
-            } else {
+          setConfig(config)
+            .then()
+            .catch((e) => {
+              log('保存设置失败', e.stack)
+            })
         }
-        }).catch(err => {
-            log("保存设置询问弹窗错误", err);
-        });
+        else {
+        }
+      })
+      .catch((err) => {
+        log('保存设置询问弹窗错误', err)
+      })
   })
 
   ipcMain.on(CHANNEL_LOG, (event, arg) => {
-        log(arg);
+    log(arg)
   })
 
   async function postReceiveMsg(msgList: RawMessage[]) {
-        const {debug, reportSelfMessage} = getConfigUtil().getConfig();
+    const { debug, reportSelfMessage } = getConfigUtil().getConfig()
     for (let message of msgList) {
-
+      // 过滤启动之前的消息
+      // log('收到新消息', message);
+      if (parseInt(message.msgTime) < startTime / 1000) {
+        continue
+      }
       // log("收到新消息", message.msgId, message.msgSeq)
       // if (message.senderUin !== selfInfo.uin){
-            message.msgShortId = await dbUtil.addMsg(message);
+      message.msgShortId = await dbUtil.addMsg(message)
       // }
 
-            OB11Constructor.message(message).then((msg) => {
-                if (debug) {
-                    msg.raw = message;
-                } else {
-                    if (msg.message.length === 0) {
+      OB11Constructor.message(message)
+        .then((msg) => {
+          if (!debug && msg.message.length === 0) {
             return
           }
-                }
           const isSelfMsg = msg.user_id.toString() == selfInfo.uin
           if (isSelfMsg && !reportSelfMessage) {
             return
           }
           if (isSelfMsg) {
-                    msg.target_id = parseInt(message.peerUin);
+            msg.target_id = parseInt(message.peerUin)
           }
-                postOB11Event(msg);
+          postOb11Event(msg)
           // log("post msg", msg)
-            }).catch(e => log("constructMessage error: ", e.stack.toString()));
-            OB11Constructor.GroupEvent(message).then(groupEvent => {
+        })
+        .catch((e) => log('constructMessage error: ', e.stack.toString()))
+      OB11Constructor.GroupEvent(message).then((groupEvent) => {
         if (groupEvent) {
           // log("post group event", groupEvent);
-                    postOB11Event(groupEvent);
+          postOb11Event(groupEvent)
+        }
+      })
+      OB11Constructor.FriendAddEvent(message).then((friendAddEvent) => {
+        if (friendAddEvent) {
+          // log("post friend add event", friendAddEvent);
+          postOb11Event(friendAddEvent)
         }
       })
     }
@@ -179,83 +201,78 @@ function onLoad() {
 
   async function startReceiveHook() {
     if (getConfigUtil().getConfig().enablePoke) {
-            registerPokeHandler((id, isGroup) => {
+      crychic.loadNode()
+      crychic.registerPokeHandler((id, isGroup) => {
         log(`收到戳一戳消息了！是否群聊：${isGroup}，id:${id}`)
-                let pokeEvent: OB11FriendPokeEvent | OB11GroupPokeEvent;
+        let pokeEvent: OB11FriendPokeEvent | OB11GroupPokeEvent
         if (isGroup) {
-                    pokeEvent = new OB11GroupPokeEvent(parseInt(id));
-                } else {
-                    pokeEvent = new OB11FriendPokeEvent(parseInt(id));
+          pokeEvent = new OB11GroupPokeEvent(parseInt(id))
         }
-                postOB11Event(pokeEvent);
+        else {
+          pokeEvent = new OB11FriendPokeEvent(parseInt(id))
+        }
+        postOb11Event(pokeEvent)
       })
     }
     registerReceiveHook<{
       msgList: Array<RawMessage>
     }>([ReceiveCmdS.NEW_MSG, ReceiveCmdS.NEW_ACTIVE_MSG], async (payload) => {
       try {
-                await postReceiveMsg(payload.msgList);
+        await postReceiveMsg(payload.msgList)
       } catch (e) {
-                log("report message error: ", e.stack.toString());
+        log('report message error: ', e.stack.toString())
       }
     })
+    const recallMsgIds: string[] = [] // 避免重复上报
     registerReceiveHook<{ msgList: Array<RawMessage> }>([ReceiveCmdS.UPDATE_MSG], async (payload) => {
       for (const message of payload.msgList) {
-                // log("message update", message.sendStatus, message.msgId, message.msgSeq)
-                if (message.recallTime != "0") { //todo: 这个判断方法不太好，应该使用灰色消息元素来判断
-                    // 撤回消息上报
+        log('message update', message.msgId, message)
+        if (message.recallTime != '0') {
+          if (recallMsgIds.includes(message.msgId)) {
+            continue
+          }
+          recallMsgIds.push(message.msgId)
           const oriMessage = await dbUtil.getMsgByLongId(message.msgId)
           if (!oriMessage) {
             continue
           }
           oriMessage.recallTime = message.recallTime
-                    dbUtil.updateMsg(oriMessage).then();
-                    if (message.chatType == ChatType.friend) {
-                        const friendRecallEvent = new OB11FriendRecallNoticeEvent(parseInt(message.senderUin), oriMessage.msgShortId);
-                        postOB11Event(friendRecallEvent);
-                    } else if (message.chatType == ChatType.group) {
-                        let operatorId = message.senderUin
-                        for (const element of message.elements) {
-                            const operatorUid = element.grayTipElement?.revokeElement.operatorUid
-                            const operator = await getGroupMember(message.peerUin, operatorUid)
-                            operatorId = operator.uin
-                        }
-                        const groupRecallEvent = new OB11GroupRecallNoticeEvent(
-                            parseInt(message.peerUin),
-                            parseInt(message.senderUin),
-                            parseInt(operatorId),
-                            oriMessage.msgShortId
-                        )
-                        postOB11Event(groupRecallEvent);
+          dbUtil.updateMsg(oriMessage).then()
+          message.msgShortId = oriMessage.msgShortId
+          OB11Constructor.RecallEvent(message).then((recallEvent) => {
+            if (recallEvent) {
+              log('post recall event', recallEvent)
+              postOb11Event(recallEvent)
             }
+          })
           // 不让入库覆盖原来消息，不然就获取不到撤回的消息内容了
           continue
         }
-                dbUtil.updateMsg(message).then();
+        dbUtil.updateMsg(message).then()
       }
     })
     registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmdS.SELF_SEND_MSG, async (payload) => {
-            const {reportSelfMessage} = getConfigUtil().getConfig();
+      const { reportSelfMessage } = getConfigUtil().getConfig()
       if (!reportSelfMessage) {
         return
       }
       // log("reportSelfMessage", payload)
       try {
-                await postReceiveMsg([payload.msgRecord]);
+        await postReceiveMsg([payload.msgRecord])
       } catch (e) {
-                log("report self message error: ", e.stack.toString());
+        log('report self message error: ', e.stack.toString())
       }
     })
     registerReceiveHook<{
-            "doubt": boolean,
-            "oldestUnreadSeq": string,
-            "unreadCount": number
+      doubt: boolean
+      oldestUnreadSeq: string
+      unreadCount: number
     }>(ReceiveCmdS.UNREAD_GROUP_NOTIFY, async (payload) => {
       if (payload.unreadCount) {
         // log("开始获取群通知详情")
-                let notify: GroupNotifies;
+        let notify: GroupNotifies
         try {
-                    notify = await NTQQGroupApi.getGroupNotifies();
+          notify = await NTQQGroupApi.getGroupNotifies()
         } catch (e) {
           // log("获取群通知详情失败", e);
           return
@@ -266,202 +283,227 @@ function onLoad() {
 
         for (const notify of notifies) {
           try {
-                        notify.time = Date.now();
+            notify.time = Date.now()
             // const notifyTime = parseInt(notify.seq) / 1000
             // log(`加群通知时间${notifyTime}`, `LLOneBot启动时间${startTime}`);
             // if (notifyTime < startTime) {
             //     continue;
             // }
-                        let existNotify = await dbUtil.getGroupNotify(notify.seq);
+            let existNotify = await dbUtil.getGroupNotify(notify.seq)
             if (existNotify) {
               continue
             }
-                        log("收到群通知", notify);
-                        await dbUtil.addGroupNotify(notify);
+            log('收到群通知', notify)
+            await dbUtil.addGroupNotify(notify)
             // let member2: GroupMember;
             // if (notify.user2.uid) {
             //     member2 = await getGroupMember(notify.group.groupCode, null, notify.user2.uid);
             // }
-                        if ([GroupNotifyTypes.ADMIN_SET, GroupNotifyTypes.ADMIN_UNSET].includes(notify.type)) {
-                            const member1 = await getGroupMember(notify.group.groupCode, notify.user1.uid);
-                            log("有管理员变动通知");
+            if (
+              [GroupNotifyTypes.ADMIN_SET, GroupNotifyTypes.ADMIN_UNSET, GroupNotifyTypes.ADMIN_UNSET_OTHER].includes(
+                notify.type,
+              )
+            ) {
+              const member1 = await getGroupMember(notify.group.groupCode, notify.user1.uid)
+              log('有管理员变动通知')
               refreshGroupMembers(notify.group.groupCode).then()
               let groupAdminNoticeEvent = new OB11GroupAdminNoticeEvent()
-                            groupAdminNoticeEvent.group_id = parseInt(notify.group.groupCode);
-                            log("开始获取变动的管理员")
+              groupAdminNoticeEvent.group_id = parseInt(notify.group.groupCode)
+              log('开始获取变动的管理员')
               if (member1) {
-                                log("变动管理员获取成功")
-                                groupAdminNoticeEvent.user_id = parseInt(member1.uin);
-                                groupAdminNoticeEvent.sub_type = notify.type == GroupNotifyTypes.ADMIN_UNSET ? "unset" : "set";
+                log('变动管理员获取成功')
+                groupAdminNoticeEvent.user_id = parseInt(member1.uin)
+                groupAdminNoticeEvent.sub_type = [
+                  GroupNotifyTypes.ADMIN_UNSET,
+                  GroupNotifyTypes.ADMIN_UNSET_OTHER,
+                ].includes(notify.type)
+                  ? 'unset'
+                  : 'set'
                 // member1.role = notify.type == GroupNotifyTypes.ADMIN_SET ? GroupMemberRole.admin : GroupMemberRole.normal;
-                                postOB11Event(groupAdminNoticeEvent, true);
-                            } else {
-                                log("获取群通知的成员信息失败", notify, getGroup(notify.group.groupCode));
+                postOb11Event(groupAdminNoticeEvent, true)
               }
-                        } else if (notify.type == GroupNotifyTypes.MEMBER_EXIT) {
-                            // log("有成员退出通知");
-                            // const member1 = await getGroupMember(notify.group.groupCode, null, notify.user1.uid);
-                            // let groupDecreaseEvent = new OB11GroupDecreaseEvent(parseInt(notify.group.groupCode), parseInt(member1.uin))
-                            // postEvent(groupDecreaseEvent, true);
-                        } else if ([GroupNotifyTypes.JOIN_REQUEST].includes(notify.type)) {
-                            log("有加群请求");
-                            let groupRequestEvent = new OB11GroupRequestEvent();
-                            groupRequestEvent.group_id = parseInt(notify.group.groupCode);
-                            let requestQQ = ""
+              else {
+                log('获取群通知的成员信息失败', notify, getGroup(notify.group.groupCode))
+              }
+            }
+            else if (notify.type == GroupNotifyTypes.MEMBER_EXIT || notify.type == GroupNotifyTypes.KICK_MEMBER) {
+              log('有成员退出通知', notify)
               try {
-                                requestQQ = (await NTQQUserApi.getUserDetailInfo(notify.user1.uid)).uin;
-                            } catch (e) {
-                                log("获取加群人QQ号失败", e)
+                const member1 = await NTQQUserApi.getUserDetailInfo(notify.user1.uid)
+                let operatorId = member1.uin
+                let subType: GroupDecreaseSubType = 'leave'
+                if (notify.user2.uid) {
+                  // 是被踢的
+                  const member2 = await getGroupMember(notify.group.groupCode, notify.user2.uid)
+                  operatorId = member2.uin
+                  subType = 'kick'
                 }
-                            groupRequestEvent.user_id = parseInt(requestQQ) || 0;
-                            groupRequestEvent.sub_type = "add"
-                            groupRequestEvent.comment = notify.postscript;
-                            groupRequestEvent.flag = notify.seq;
-                            postOB11Event(groupRequestEvent);
-                        } else if (notify.type == GroupNotifyTypes.INVITE_ME) {
-                            log("收到邀请我加群通知")
-                            let groupInviteEvent = new OB11GroupRequestEvent();
-                            groupInviteEvent.group_id = parseInt(notify.group.groupCode);
+                let groupDecreaseEvent = new OB11GroupDecreaseEvent(
+                  parseInt(notify.group.groupCode),
+                  parseInt(member1.uin),
+                  parseInt(operatorId),
+                  subType,
+                )
+                postOb11Event(groupDecreaseEvent, true)
+              } catch (e) {
+                log('获取群通知的成员信息失败', notify, e.stack.toString())
+              }
+            }
+            else if ([GroupNotifyTypes.JOIN_REQUEST].includes(notify.type)) {
+              log('有加群请求')
+              let groupRequestEvent = new OB11GroupRequestEvent()
+              groupRequestEvent.group_id = parseInt(notify.group.groupCode)
+              let requestQQ = ''
+              try {
+                requestQQ = (await NTQQUserApi.getUserDetailInfo(notify.user1.uid)).uin
+              } catch (e) {
+                log('获取加群人QQ号失败', e)
+              }
+              groupRequestEvent.user_id = parseInt(requestQQ) || 0
+              groupRequestEvent.sub_type = 'add'
+              groupRequestEvent.comment = notify.postscript
+              groupRequestEvent.flag = notify.seq
+              postOb11Event(groupRequestEvent)
+            }
+            else if (notify.type == GroupNotifyTypes.INVITE_ME) {
+              log('收到邀请我加群通知')
+              let groupInviteEvent = new OB11GroupRequestEvent()
+              groupInviteEvent.group_id = parseInt(notify.group.groupCode)
               let user_id = (await getFriend(notify.user2.uid))?.uin
               if (!user_id) {
                 user_id = (await NTQQUserApi.getUserDetailInfo(notify.user2.uid))?.uin
               }
-                            groupInviteEvent.user_id = parseInt(user_id);
-                            groupInviteEvent.sub_type = "invite";
-                            groupInviteEvent.flag = notify.seq;
-                            postOB11Event(groupInviteEvent);
+              groupInviteEvent.user_id = parseInt(user_id)
+              groupInviteEvent.sub_type = 'invite'
+              groupInviteEvent.flag = notify.seq
+              postOb11Event(groupInviteEvent)
             }
           } catch (e) {
-                        log("解析群通知失败", e.stack.toString());
+            log('解析群通知失败', e.stack.toString())
           }
         }
-
-            } else if (payload.doubt) {
+      }
+      else if (payload.doubt) {
         // 可能有群管理员变动
       }
     })
 
     registerReceiveHook<FriendRequestNotify>(ReceiveCmdS.FRIEND_REQUEST, async (payload) => {
       for (const req of payload.data.buddyReqs) {
-                if (req.isUnread && !friendRequests[req.sourceId] && (parseInt(req.reqTime) > startTime / 1000)) {
-                    friendRequests[req.sourceId] = req;
-                    log("有新的好友请求", req);
-                    let friendRequestEvent = new OB11FriendRequestEvent();
+        let flag = req.friendUid + req.reqTime
+        if (req.isUnread && parseInt(req.reqTime) > startTime / 1000) {
+          friendRequests[flag] = req
+          log('有新的好友请求', req)
+          let friendRequestEvent = new OB11FriendRequestEvent()
           try {
             let requester = await NTQQUserApi.getUserDetailInfo(req.friendUid)
-                        friendRequestEvent.user_id = parseInt(requester.uin);
+            friendRequestEvent.user_id = parseInt(requester.uin)
           } catch (e) {
-                        log("获取加好友者QQ号失败", e);
+            log('获取加好友者QQ号失败', e)
           }
-                    friendRequestEvent.flag = req.sourceId.toString();
-                    friendRequestEvent.comment = req.extWords;
-                    postOB11Event(friendRequestEvent);
+          friendRequestEvent.flag = flag
+          friendRequestEvent.comment = req.extWords
+          postOb11Event(friendRequestEvent)
         }
       }
     })
   }
 
-    let startTime = 0;
+  let startTime = 0 // 毫秒
 
   async function start() {
-        log("llonebot pid", process.pid)
-        llonebotError.otherError = "";
-        startTime = Date.now();
-        dbUtil.getReceivedTempUinMap().then(m => {
+    log('llonebot pid', process.pid)
+    llonebotError.otherError = ''
+    startTime = Date.now()
+    dbUtil.getReceivedTempUinMap().then((m) => {
       for (const [key, value] of Object.entries(m)) {
-                uidMaps[value] = key;
+        uidMaps[value] = key
       }
     })
-        startReceiveHook().then();
-        // NTQQGroupApi.getGroups(true).then(_groups => {
-        //     _groups.map(group => {
-        //         if (!groups.find(g => g.groupCode == group.groupCode)) {
-        //             groups.push(group)
-        //         }
-        //     })
-        // })
+    startReceiveHook().then()
+    NTQQGroupApi.getGroups(true).then()
     const config = getConfigUtil().getConfig()
     if (config.ob11.enableHttp) {
       ob11HTTPServer.start(config.ob11.httpPort)
     }
     if (config.ob11.enableWs) {
-            ob11WebsocketServer.start(config.ob11.wsPort);
+      ob11WebsocketServer.start(config.ob11.wsPort)
     }
     if (config.ob11.enableWsReverse) {
-            ob11ReverseWebsockets.start();
+      ob11ReverseWebsockets.start()
+    }
+    if (config.ob11.enableHttpHeart) {
+      httpHeart.start()
     }
 
-        log("LLOneBot start")
+    log('LLOneBot start')
   }
 
-    let getSelfNickCount = 0;
+  let getSelfNickCount = 0
   const init = async () => {
     try {
-            log("start get self info")
-            const _ = await NTQQUserApi.getSelfInfo();
-            log("get self info api result:", _);
-            Object.assign(selfInfo, _);
-            selfInfo.nick = selfInfo.uin;
+      log('start get self info')
+      const _ = await NTQQUserApi.getSelfInfo()
+      log('get self info api result:', _)
+      Object.assign(selfInfo, _)
+      selfInfo.nick = selfInfo.uin
     } catch (e) {
-            log("retry get self info", e);
+      log('retry get self info', e)
     }
     if (!selfInfo.uin) {
-            selfInfo.uin = globalThis.authData?.uin;
-            selfInfo.uid = globalThis.authData?.uid;
-            selfInfo.nick = selfInfo.uin;
+      selfInfo.uin = globalThis.authData?.uin
+      selfInfo.uid = globalThis.authData?.uid
+      selfInfo.nick = selfInfo.uin
     }
-        log("self info", selfInfo, globalThis.authData);
+    log('self info', selfInfo, globalThis.authData)
     if (selfInfo.uin) {
       async function getUserNick() {
         try {
-                    getSelfNickCount++;
-                    const userInfo = (await NTQQUserApi.getUserDetailInfo(selfInfo.uid));
-                    log("self info", userInfo);
+          getSelfNickCount++
+          const userInfo = await NTQQUserApi.getUserDetailInfo(selfInfo.uid)
+          log('self info', userInfo)
           if (userInfo) {
-                        selfInfo.nick = userInfo.nick;
+            selfInfo.nick = userInfo.nick
             return
           }
         } catch (e) {
-                    log("get self nickname failed", e.stack);
+          log('get self nickname failed', e.stack)
         }
         if (getSelfNickCount < 10) {
-                    return setTimeout(getUserNick, 1000);
+          return setTimeout(getUserNick, 1000)
         }
       }
 
       getUserNick().then()
-            start().then();
-        } else {
+      start().then()
+    }
+    else {
       setTimeout(init, 1000)
     }
   }
-    setTimeout(init, 1000);
+  setTimeout(init, 1000)
 }
 
-
 // 创建窗口时触发
 function onBrowserWindowCreated(window: BrowserWindow) {
   if (selfInfo.uid) {
     return
   }
-    mainWindow = window;
-    log("window create", window.webContents.getURL().toString())
+  mainWindow = window
+  log('window create', window.webContents.getURL().toString())
   try {
-        hookNTQQApiCall(window);
-        hookNTQQApiReceive(window);
+    hookNTQQApiCall(window)
+    hookNTQQApiReceive(window)
   } catch (e) {
-        log("LLOneBot hook error: ", e.toString())
+    log('LLOneBot hook error: ', e.toString())
   }
 }
 
 try {
-    onLoad();
+  onLoad()
 } catch (e: any) {
   console.log(e.toString())
 }
 
-
 // 这两个函数都是可选的
-export {
-    onBrowserWindowCreated
-}
+export { onBrowserWindowCreated }

src/main/setConfig.ts

@@ -1,56 +1,67 @@
-import {Config} from "../common/types";
-import {ob11HTTPServer} from "../onebot11/server/http";
-import {ob11WebsocketServer} from "../onebot11/server/ws/WebsocketServer";
-import {ob11ReverseWebsockets} from "../onebot11/server/ws/ReverseWebsocket";
-import {llonebotError} from "../common/data";
-import {getConfigUtil} from "../common/config";
-import {checkFfmpeg} from "../common/utils";
+import { Config } from '../common/types'
+import { httpHeart, ob11HTTPServer } from '../onebot11/server/http'
+import { ob11WebsocketServer } from '../onebot11/server/ws/WebsocketServer'
+import { ob11ReverseWebsockets } from '../onebot11/server/ws/ReverseWebsocket'
+import { llonebotError } from '../common/data'
+import { getConfigUtil } from '../common/config'
+import { checkFfmpeg, log } from '../common/utils'
 
 export async function setConfig(config: Config) {
-    let oldConfig = getConfigUtil().getConfig();
+  let oldConfig = { ...getConfigUtil().getConfig() }
   getConfigUtil().setConfig(config)
   if (config.ob11.httpPort != oldConfig.ob11.httpPort && config.ob11.enableHttp) {
-        ob11HTTPServer.restart(config.ob11.httpPort);
+    ob11HTTPServer.restart(config.ob11.httpPort)
   }
   // 判断是否启用或关闭HTTP服务
   if (!config.ob11.enableHttp) {
-        ob11HTTPServer.stop();
+    ob11HTTPServer.stop()
   } else {
-        ob11HTTPServer.start(config.ob11.httpPort);
+    ob11HTTPServer.start(config.ob11.httpPort)
   }
   // 正向ws端口变化，重启服务
   if (config.ob11.wsPort != oldConfig.ob11.wsPort) {
-        ob11WebsocketServer.restart(config.ob11.wsPort);
+    ob11WebsocketServer.restart(config.ob11.wsPort)
     llonebotError.wsServerError = ''
   }
   // 判断是否启用或关闭正向ws
   if (config.ob11.enableWs != oldConfig.ob11.enableWs) {
     if (config.ob11.enableWs) {
-            ob11WebsocketServer.start(config.ob11.wsPort);
+      ob11WebsocketServer.start(config.ob11.wsPort)
     } else {
-            ob11WebsocketServer.stop();
+      ob11WebsocketServer.stop()
     }
   }
   // 判断是否启用或关闭反向ws
   if (config.ob11.enableWsReverse != oldConfig.ob11.enableWsReverse) {
     if (config.ob11.enableWsReverse) {
-            ob11ReverseWebsockets.start();
+      ob11ReverseWebsockets.start()
     } else {
-            ob11ReverseWebsockets.stop();
+      ob11ReverseWebsockets.stop()
     }
   }
   if (config.ob11.enableWsReverse) {
     // 判断反向ws地址有变化
     if (config.ob11.wsHosts.length != oldConfig.ob11.wsHosts.length) {
-            ob11ReverseWebsockets.restart();
+      log('反向ws地址有变化, 重启反向ws服务')
+      ob11ReverseWebsockets.restart()
     } else {
       for (const newHost of config.ob11.wsHosts) {
         if (!oldConfig.ob11.wsHosts.includes(newHost)) {
-                    ob11ReverseWebsockets.restart();
-                    break;
+          log('反向ws地址有变化, 重启反向ws服务')
+          ob11ReverseWebsockets.restart()
+          break
         }
       }
     }
   }
+  if (config.ob11.enableHttpHeart) {
+    // 启动http心跳
+    httpHeart.start()
+  } else {
+    // 关闭http心跳
+    httpHeart.stop()
+  }
+  log('old config', oldConfig)
+  log('配置已更新', config)
   checkFfmpeg(config.ffmpeg).then()
 }

src/ntqqapi/api/file.ts

@@ -1,4 +1,4 @@
-import {callNTQQApi, GeneralCallResult, NTQQApiClass, NTQQApiMethod} from "../ntcall";
+import { callNTQQApi, GeneralCallResult, NTQQApiClass, NTQQApiMethod } from '../ntcall'
 import {
   CacheFileList,
   CacheFileListItem,
@@ -7,17 +7,23 @@ import {
   ChatCacheList,
   ChatCacheListItemBasic,
   ChatType,
-    ElementType
-} from "../types";
-import path from "path";
-import fs from "fs";
-import {ReceiveCmdS} from "../hook";
-import {log} from "../../common/utils/log";
+  ElementType,
+  IMAGE_HTTP_HOST,
+  IMAGE_HTTP_HOST_NT, PicElement,
+  RawMessage,
+} from '../types'
+import path from 'path'
+import fs from 'fs'
+import { ReceiveCmdS } from '../hook'
+import { log } from '@/common/utils'
+import { rkeyManager } from '@/ntqqapi/api/rkey'
 
 export class NTQQFileApi {
   static async getFileType(filePath: string) {
     return await callNTQQApi<{ ext: string }>({
-            className: NTQQApiClass.FS_API, methodName: NTQQApiMethod.FILE_TYPE, args: [filePath]
+      className: NTQQApiClass.FS_API,
+      methodName: NTQQApiMethod.FILE_TYPE,
+      args: [filePath],
     })
   }
 
@@ -25,7 +31,7 @@ export class NTQQFileApi {
     return await callNTQQApi<string>({
       className: NTQQApiClass.FS_API,
       methodName: NTQQApiMethod.FILE_MD5,
-            args: [filePath]
+      args: [filePath],
     })
   }
 
@@ -33,35 +39,40 @@ export class NTQQFileApi {
     return await callNTQQApi<string>({
       className: NTQQApiClass.FS_API,
       methodName: NTQQApiMethod.FILE_COPY,
-            args: [{
+      args: [
+        {
           fromPath: filePath,
-                toPath: destPath
-            }]
+          toPath: destPath,
+        },
+      ],
     })
   }
 
   static async getFileSize(filePath: string) {
     return await callNTQQApi<number>({
-            className: NTQQApiClass.FS_API, methodName: NTQQApiMethod.FILE_SIZE, args: [filePath]
+      className: NTQQApiClass.FS_API,
+      methodName: NTQQApiMethod.FILE_SIZE,
+      args: [filePath],
     })
   }
 
   // 上传文件到QQ的文件夹
   static async uploadFile(filePath: string, elementType: ElementType = ElementType.PIC, elementSubType: number = 0) {
-        const md5 = await NTQQFileApi.getFileMd5(filePath);
+    const md5 = await NTQQFileApi.getFileMd5(filePath)
     let ext = (await NTQQFileApi.getFileType(filePath))?.ext
     if (ext) {
-            ext = "." + ext
+      ext = '.' + ext
     } else {
-            ext = ""
+      ext = ''
     }
-        let fileName = `${path.basename(filePath)}`;
-        if (fileName.indexOf(".") === -1) {
-            fileName += ext;
+    let fileName = `${path.basename(filePath)}`
+    if (fileName.indexOf('.') === -1) {
+      fileName += ext
     }
     const mediaPath = await callNTQQApi<string>({
       methodName: NTQQApiMethod.MEDIA_FILE_PATH,
-            args: [{
+      args: [
+        {
           path_info: {
             md5HexStr: md5,
             fileName: fileName,
@@ -70,31 +81,44 @@ export class NTQQFileApi {
             thumbSize: 0,
             needCreate: true,
             downloadType: 1,
-                    file_uuid: ""
-                }
-            }]
+            file_uuid: '',
+          },
+        },
+      ],
     })
-        log("media path", mediaPath)
-        await NTQQFileApi.copyFile(filePath, mediaPath);
-        const fileSize = await NTQQFileApi.getFileSize(filePath);
+    log('media path', mediaPath)
+    await NTQQFileApi.copyFile(filePath, mediaPath)
+    const fileSize = await NTQQFileApi.getFileSize(filePath)
     return {
       md5,
       fileName,
       path: mediaPath,
       fileSize,
-            ext
+      ext,
     }
   }
 
-    static async downloadMedia(msgId: string, chatType: ChatType, peerUid: string, elementId: string, thumbPath: string, sourcePath: string, isFile: boolean = false) {
+  static async downloadMedia(
+    msgId: string,
+    chatType: ChatType,
+    peerUid: string,
+    elementId: string,
+    thumbPath: string,
+    sourcePath: string,
+    force: boolean = false,
+  ) {
     // 用于下载收到的消息中的图片等
     if (sourcePath && fs.existsSync(sourcePath)) {
+      if (force) {
+        fs.unlinkSync(sourcePath)
+      } else {
         return sourcePath
       }
+    }
     const apiParams = [
       {
         getReq: {
-                    fileModelId: "0",
+          fileModelId: '0',
           downloadSourceType: 0,
           triggerType: 1,
           msgId: msgId,
@@ -113,124 +137,174 @@ export class NTQQFileApi {
       methodName: NTQQApiMethod.DOWNLOAD_MEDIA,
       args: apiParams,
       cbCmd: ReceiveCmdS.MEDIA_DOWNLOAD_COMPLETE,
-            cmdCB: (payload: { notifyInfo: { filePath: string, msgId: string } }) => {
-                log("media 下载完成判断", payload.notifyInfo.msgId, msgId);
-                return payload.notifyInfo.msgId == msgId;
-            }
+      cmdCB: (payload: { notifyInfo: { filePath: string; msgId: string } }) => {
+        log('media 下载完成判断', payload.notifyInfo.msgId, msgId)
+        return payload.notifyInfo.msgId == msgId
+      },
     })
     return sourcePath
   }
 
   static async getImageSize(filePath: string) {
-        return await callNTQQApi<{ width: number, height: number }>({
-            className: NTQQApiClass.FS_API, methodName: NTQQApiMethod.IMAGE_SIZE, args: [filePath]
+    return await callNTQQApi<{ width: number; height: number }>({
+      className: NTQQApiClass.FS_API,
+      methodName: NTQQApiMethod.IMAGE_SIZE,
+      args: [filePath],
     })
   }
 
+  static async getImageUrl(picElement: PicElement, chatType: ChatType) {
+    const isPrivateImage = chatType !== ChatType.group
+    const url = picElement.originImageUrl // 没有域名
+    const md5HexStr = picElement.md5HexStr
+    const fileMd5 = picElement.md5HexStr
+    const fileUuid = picElement.fileUuid
+    if (url) {
+      if (url.startsWith('/download')) {
+        // console.log('rkey', rkey);
+        if (url.includes('&rkey=')) {
+          return IMAGE_HTTP_HOST_NT + url
+        }
+
+        const rkeyData = await rkeyManager.getRkey();
+        const existsRKey = isPrivateImage ? rkeyData.private_rkey : rkeyData.group_rkey;
+        return IMAGE_HTTP_HOST_NT + url + `${existsRKey}`
+      } else {
+        // 老的图片url，不需要rkey
+        return IMAGE_HTTP_HOST + url
+      }
+    } else if (fileMd5 || md5HexStr) {
+      // 没有url，需要自己拼接
+      return `${IMAGE_HTTP_HOST}/gchatpic_new/0/0-0-${(fileMd5 || md5HexStr)!.toUpperCase()}/0`
+    }
+    log('图片url获取失败', picElement)
+    return ''
+  }
 }
 
 export class NTQQFileCacheApi {
   static async setCacheSilentScan(isSilent: boolean = true) {
     return await callNTQQApi<GeneralCallResult>({
       methodName: NTQQApiMethod.CACHE_SET_SILENCE,
-            args: [{
-                isSilent
-            }, null]
-        });
+      args: [
+        {
+          isSilent,
+        },
+        null,
+      ],
+    })
   }
 
   static getCacheSessionPathList() {
-        return callNTQQApi<{
-            key: string,
+    return callNTQQApi<
+      {
+        key: string
         value: string
-        }[]>({
+      }[]
+    >({
       className: NTQQApiClass.OS_API,
       methodName: NTQQApiMethod.CACHE_PATH_SESSION,
-        });
+    })
   }
 
   static clearCache(cacheKeys: Array<string> = ['tmp', 'hotUpdate']) {
-        return callNTQQApi<any>({ // TODO: 目前还不知道真正的返回值是什么
+    return callNTQQApi<any>({
+      // TODO: 目前还不知道真正的返回值是什么
       methodName: NTQQApiMethod.CACHE_CLEAR,
-            args: [{
-                keys: cacheKeys
-            }, null]
-        });
+      args: [
+        {
+          keys: cacheKeys,
+        },
+        null,
+      ],
+    })
   }
 
   static addCacheScannedPaths(pathMap: object = {}) {
     return callNTQQApi<GeneralCallResult>({
       methodName: NTQQApiMethod.CACHE_ADD_SCANNED_PATH,
-            args: [{
+      args: [
+        {
           pathMap: { ...pathMap },
-            }, null]
-        });
+        },
+        null,
+      ],
+    })
   }
 
   static scanCache() {
     callNTQQApi<GeneralCallResult>({
       methodName: ReceiveCmdS.CACHE_SCAN_FINISH,
       classNameIsRegister: true,
-        }).then();
+    }).then()
     return callNTQQApi<CacheScanResult>({
       methodName: NTQQApiMethod.CACHE_SCAN,
       args: [null, null],
       timeoutSecond: 300,
-        });
+    })
   }
 
   static getHotUpdateCachePath() {
     return callNTQQApi<string>({
       className: NTQQApiClass.HOTUPDATE_API,
-            methodName: NTQQApiMethod.CACHE_PATH_HOT_UPDATE
-        });
+      methodName: NTQQApiMethod.CACHE_PATH_HOT_UPDATE,
+    })
   }
 
   static getDesktopTmpPath() {
     return callNTQQApi<string>({
       className: NTQQApiClass.BUSINESS_API,
-            methodName: NTQQApiMethod.CACHE_PATH_DESKTOP_TEMP
-        });
+      methodName: NTQQApiMethod.CACHE_PATH_DESKTOP_TEMP,
+    })
   }
 
   static getChatCacheList(type: ChatType, pageSize: number = 1000, pageIndex: number = 0) {
     return new Promise<ChatCacheList>((res, rej) => {
       callNTQQApi<ChatCacheList>({
         methodName: NTQQApiMethod.CACHE_CHAT_GET,
-                args: [{
+        args: [
+          {
             chatType: type,
             pageSize,
             order: 1,
-                    pageIndex
-                }, null]
-            }).then(list => res(list))
-                .catch(e => rej(e));
-        });
+            pageIndex,
+          },
+          null,
+        ],
+      })
+        .then((list) => res(list))
+        .catch((e) => rej(e))
+    })
   }
 
   static getFileCacheInfo(fileType: CacheFileType, pageSize: number = 1000, lastRecord?: CacheFileListItem) {
-        const _lastRecord = lastRecord ? lastRecord : {fileType: fileType};
+    const _lastRecord = lastRecord ? lastRecord : { fileType: fileType }
 
     return callNTQQApi<CacheFileList>({
       methodName: NTQQApiMethod.CACHE_FILE_GET,
-            args: [{
+      args: [
+        {
           fileType: fileType,
           restart: true,
           pageSize: pageSize,
           order: 1,
           lastRecord: _lastRecord,
-            }, null]
+        },
+        null,
+      ],
     })
   }
 
   static async clearChatCache(chats: ChatCacheListItemBasic[] = [], fileKeys: string[] = []) {
     return await callNTQQApi<GeneralCallResult>({
       methodName: NTQQApiMethod.CACHE_CHAT_CLEAR,
-            args: [{
+      args: [
+        {
           chats,
-                fileKeys
-            }, null]
-        });
+          fileKeys,
+        },
+        null,
+      ],
+    })
   }
-
 }

src/ntqqapi/api/friend.ts

@@ -1,24 +1,26 @@
-import {Friend, FriendRequest} from "../types";
-import {ReceiveCmdS} from "../hook";
-import {callNTQQApi, GeneralCallResult, NTQQApiMethod} from "../ntcall";
-import {friendRequests} from "../../common/data";
+import { Friend, FriendRequest } from '../types'
+import { ReceiveCmdS } from '../hook'
+import { callNTQQApi, GeneralCallResult, NTQQApiMethod } from '../ntcall'
+import { friendRequests } from '../../common/data'
+import { log } from '../../common/utils'
 
 export class NTQQFriendApi {
   static async getFriends(forced = false) {
     const data = await callNTQQApi<{
       data: {
-                categoryId: number,
-                categroyName: string,
-                categroyMbCount: number,
+        categoryId: number
+        categroyName: string
+        categroyMbCount: number
         buddyList: Friend[]
       }[]
-        }>(
-            {
+    }>({
       methodName: NTQQApiMethod.FRIENDS,
       args: [{ force_update: forced }, undefined],
-                cbCmd: ReceiveCmdS.FRIENDS
+      cbCmd: ReceiveCmdS.FRIENDS,
+      afterFirstCmd: false,
     })
-        let _friends: Friend[] = [];
+    // log('获取好友列表', data)
+    let _friends: Friend[] = []
     for (const fData of data.data) {
       _friends.push(...fData.buddyList)
     }
@@ -27,35 +29,37 @@ export class NTQQFriendApi{
   static async likeFriend(uid: string, count = 1) {
     return await callNTQQApi<GeneralCallResult>({
       methodName: NTQQApiMethod.LIKE_FRIEND,
-            args: [{
+      args: [
+        {
           doLikeUserInfo: {
             friendUid: uid,
             sourceId: 71,
             doLikeCount: count,
-                    doLikeTollCount: 0
-                }
-            }, null]
+            doLikeTollCount: 0,
+          },
+        },
+        null,
+      ],
     })
   }
-    static async handleFriendRequest(sourceId: number, accept: boolean,) {
-        const request: FriendRequest = friendRequests[sourceId]
+  static async handleFriendRequest(flag: string, accept: boolean) {
+    const request: FriendRequest = friendRequests[flag]
     if (!request) {
-            throw `sourceId ${sourceId}, 对应的好友请求不存在`
+      throw `flat: ${flag}, 对应的好友请求不存在`
     }
     const result = await callNTQQApi<GeneralCallResult>({
       methodName: NTQQApiMethod.HANDLE_FRIEND_REQUEST,
       args: [
         {
-                    "approvalInfo": {
-                        "friendUid": request.friendUid,
-                        "reqTime": request.reqTime,
-                        accept
-                    }
-                }
-            ]
+          approvalInfo: {
+            friendUid: request.friendUid,
+            reqTime: request.reqTime,
+            accept,
+          },
+        },
+      ],
     })
-        delete friendRequests[sourceId];
-        return result;
+    delete friendRequests[flag]
+    return result
   }
-
 }

src/ntqqapi/api/group.ts

@@ -1,19 +1,19 @@
-import {ReceiveCmdS} from "../hook";
-import {Group, GroupMember, GroupMemberRole, GroupNotifies, GroupNotify, GroupRequestOperateTypes} from "../types";
-import {callNTQQApi, GeneralCallResult, NTQQApiClass, NTQQApiMethod} from "../ntcall";
-import {uidMaps} from "../../common/data";
-import {dbUtil} from "../../common/db";
-import {log} from "../../common/utils/log";
-import {NTQQWindowApi, NTQQWindows} from "./window";
+import { ReceiveCmdS } from '../hook'
+import { Group, GroupMember, GroupMemberRole, GroupNotifies, GroupNotify, GroupRequestOperateTypes } from '../types'
+import { callNTQQApi, GeneralCallResult, NTQQApiClass, NTQQApiMethod } from '../ntcall'
+import { deleteGroup, uidMaps } from '../../common/data'
+import { dbUtil } from '../../common/db'
+import { log } from '../../common/utils/log'
+import { NTQQWindowApi, NTQQWindows } from './window'
 
 export class NTQQGroupApi {
   static async getGroups(forced = false) {
     let cbCmd = ReceiveCmdS.GROUPS
-        if (process.platform != "win32") {
+    if (process.platform != 'win32') {
       cbCmd = ReceiveCmdS.GROUPS_STORE
     }
     const result = await callNTQQApi<{
-            updateType: number,
+      updateType: number
       groupList: Group[]
     }>({ methodName: NTQQApiMethod.GROUPS, args: [{ force_update: forced }, undefined], cbCmd })
     return result.groupList
@@ -21,10 +21,12 @@ export class NTQQGroupApi{
   static async getGroupMembers(groupQQ: string, num = 3000): Promise<GroupMember[]> {
     const sceneId = await callNTQQApi({
       methodName: NTQQApiMethod.GROUP_MEMBER_SCENE,
-            args: [{
+      args: [
+        {
           groupCode: groupQQ,
-                scene: "groupMemberList_MainWindow"
-            }]
+          scene: 'groupMemberList_MainWindow',
+        },
+      ],
     })
     // log("get group member sceneId", sceneId);
     try {
@@ -32,19 +34,20 @@ export class NTQQGroupApi{
         result: { infos: any }
       }>({
         methodName: NTQQApiMethod.GROUP_MEMBERS,
-                args: [{
+        args: [
+          {
             sceneId: sceneId,
-                    num: num
+            num: num,
           },
-                    null
-                ]
+          null,
+        ],
       })
       // log("members info", typeof result.result.infos, Object.keys(result.result.infos))
       const values = result.result.infos.values()
 
       const members: GroupMember[] = Array.from(values)
       for (const member of members) {
-                uidMaps[member.uid] = member.uin;
+        uidMaps[member.uid] = member.uin
       }
       // log(uidMaps);
       // log("members info", values);
@@ -66,15 +69,16 @@ export class NTQQGroupApi{
       methodName: NTQQApiMethod.GET_GROUP_NOTICE,
       cbCmd: ReceiveCmdS.GROUP_NOTIFY,
       afterFirstCmd: false,
-            args: [
-                {"doubt": false, "startSeq": "", "number": 14},
-                null
-            ]
-        });
+      args: [{ doubt: false, startSeq: '', number: 14 }, null],
+    })
   }
   static async getGroupIgnoreNotifies() {
-        await NTQQGroupApi.getGroupNotifies();
-        return await NTQQWindowApi.openWindow(NTQQWindows.GroupNotifyFilterWindow,[], ReceiveCmdS.GROUP_NOTIFY);
+    await NTQQGroupApi.getGroupNotifies()
+    return await NTQQWindowApi.openWindow<GeneralCallResult & GroupNotifies>(
+      NTQQWindows.GroupNotifyFilterWindow,
+      [],
+      ReceiveCmdS.GROUP_NOTIFY,
+    )
   }
   static async handleGroupRequest(seq: string, operateType: GroupRequestOperateTypes, reason?: string) {
     const notify: GroupNotify = await dbUtil.getGroupNotify(seq)
@@ -86,33 +90,38 @@ export class NTQQGroupApi{
       methodName: NTQQApiMethod.HANDLE_GROUP_REQUEST,
       args: [
         {
-                    "doubt": false,
-                    "operateMsg": {
-                        "operateType": operateType, // 2 拒绝
-                        "targetMsg": {
-                            "seq": seq,  // 通知序列号
-                            "type": notify.type,
-                            "groupCode": notify.group.groupCode,
-                            "postscript": reason
-                        }
-                    }
+          doubt: false,
+          operateMsg: {
+            operateType: operateType, // 2 拒绝
+            targetMsg: {
+              seq: seq, // 通知序列号
+              type: notify.type,
+              groupCode: notify.group.groupCode,
+              postscript: reason,
             },
-                null
-            ]
-        });
-    }
-    static async quitGroup(groupQQ: string) {
-        await callNTQQApi<GeneralCallResult>({
-            methodName: NTQQApiMethod.QUIT_GROUP,
-            args: [
-                {"groupCode": groupQQ},
-                null
-            ]
+          },
+        },
+        null,
+      ],
     })
   }
-    static async kickMember(groupQQ: string, kickUids: string[], refuseForever: boolean = false, kickReason: string = '') {
-        return await callNTQQApi<GeneralCallResult>(
-            {
+  static async quitGroup(groupQQ: string) {
+    const result = await callNTQQApi<GeneralCallResult>({
+      methodName: NTQQApiMethod.QUIT_GROUP,
+      args: [{ groupCode: groupQQ }, null],
+    })
+    if (result.result === 0) {
+      deleteGroup(groupQQ)
+    }
+    return result
+  }
+  static async kickMember(
+    groupQQ: string,
+    kickUids: string[],
+    refuseForever: boolean = false,
+    kickReason: string = '',
+  ) {
+    return await callNTQQApi<GeneralCallResult>({
       methodName: NTQQApiMethod.KICK_MEMBER,
       args: [
         {
@@ -120,24 +129,21 @@ export class NTQQGroupApi{
           kickUids,
           refuseForever,
           kickReason,
+        },
+      ],
+    })
   }
-                ]
-            }
-        )
-    }
-    static async banMember(groupQQ: string, memList: Array<{ uid: string, timeStamp: number }>) {
+  static async banMember(groupQQ: string, memList: Array<{ uid: string; timeStamp: number }>) {
     // timeStamp为秒数, 0为解除禁言
-        return await callNTQQApi<GeneralCallResult>(
-            {
+    return await callNTQQApi<GeneralCallResult>({
       methodName: NTQQApiMethod.MUTE_MEMBER,
       args: [
         {
           groupCode: groupQQ,
           memList,
-                    }
-                ]
-            }
-        )
+        },
+      ],
+    })
   }
   static async banGroup(groupQQ: string, shutUp: boolean) {
     return await callNTQQApi<GeneralCallResult>({
@@ -145,9 +151,10 @@ export class NTQQGroupApi{
       args: [
         {
           groupCode: groupQQ,
-                    shutUp
-                }, null
-            ]
+          shutUp,
+        },
+        null,
+      ],
     })
   }
   static async setMemberCard(groupQQ: string, memberUid: string, cardName: string) {
@@ -157,9 +164,10 @@ export class NTQQGroupApi{
         {
           groupCode: groupQQ,
           uid: memberUid,
-                    cardName
-                }, null
-            ]
+          cardName,
+        },
+        null,
+      ],
     })
   }
   static async setMemberRole(groupQQ: string, memberUid: string, role: GroupMemberRole) {
@@ -169,9 +177,10 @@ export class NTQQGroupApi{
         {
           groupCode: groupQQ,
           uid: memberUid,
-                    role
-                }, null
-            ]
+          role,
+        },
+        null,
+      ],
     })
   }
   static async setGroupName(groupQQ: string, groupName: string) {
@@ -180,9 +189,32 @@ export class NTQQGroupApi{
       args: [
         {
           groupCode: groupQQ,
-                    groupName
-                }, null
-            ]
+          groupName,
+        },
+        null,
+      ],
+    })
+  }
+
+  static async getGroupAtAllRemainCount(groupCode: string) {
+    return await callNTQQApi<
+      GeneralCallResult & {
+        atInfo: {
+          canAtAll: boolean
+          RemainAtAllCountForUin: number
+          RemainAtAllCountForGroup: number
+          atTimesMsg: string
+          canNotAtAllMsg: ''
+        }
+      }
+    >({
+      methodName: NTQQApiMethod.GROUP_AT_ALL_REMAIN_COUNT,
+      args: [
+        {
+          groupCode,
+        },
+        null,
+      ],
     })
   }
 
@@ -194,12 +226,11 @@ export class NTQQGroupApi{
         {
           groupCode: groupQQ,
           uid,
-                    title
-                }, null
-            ]
+          title,
+        },
+        null,
+      ],
     })
   }
-    static publishGroupBulletin(groupQQ: string, title: string, content: string) {
-
-    }
+  static publishGroupBulletin(groupQQ: string, title: string, content: string) {}
 }

src/ntqqapi/api/index.ts

@@ -1,7 +1,7 @@
-export * from "./file";
-export * from "./friend";
-export * from "./group";
-export * from "./msg";
-export * from "./user";
-export * from "./webapi";
-export * from "./window";
+export * from './file'
+export * from './friend'
+export * from './group'
+export * from './msg'
+export * from './user'
+export * from './webapi'
+export * from './window'

src/ntqqapi/api/msg.ts

@@ -1,49 +1,132 @@
-import {callNTQQApi, GeneralCallResult, NTQQApiMethod} from "../ntcall";
-import {ChatType, RawMessage, SendMessageElement} from "../types";
-import {dbUtil} from "../../common/db";
-import {selfInfo} from "../../common/data";
-import {ReceiveCmdS, registerReceiveHook} from "../hook";
-import {log} from "../../common/utils/log";
-import {sleep} from "../../common/utils/helper";
-import {isQQ998} from "../../common/utils";
+import { callNTQQApi, GeneralCallResult, NTQQApiMethod } from '../ntcall'
+import { ChatType, RawMessage, SendMessageElement } from '../types'
+import { dbUtil } from '../../common/db'
+import { selfInfo } from '../../common/data'
+import { ReceiveCmdS, registerReceiveHook } from '../hook'
+import { log } from '../../common/utils/log'
+import { sleep } from '../../common/utils/helper'
+import { isQQ998 } from '../../common/utils'
 
 export let sendMessagePool: Record<string, ((sendSuccessMsg: RawMessage) => void) | null> = {} // peerUid: callbackFunnc
 
 export interface Peer {
   chatType: ChatType
   peerUid: string // 如果是群聊uid为群号，私聊uid就是加密的字符串
-    guildId?: ""
+  guildId?: ''
+}
+
+async function sendWaiter(peer: Peer, waitComplete = true, timeout: number = 10000) {
+  // 等待上一个相同的peer发送完
+  const peerUid = peer.peerUid
+  let checkLastSendUsingTime = 0
+  const waitLastSend = async () => {
+    if (checkLastSendUsingTime > timeout) {
+      throw '发送超时'
+    }
+    let lastSending = sendMessagePool[peer.peerUid]
+    if (lastSending) {
+      // log("有正在发送的消息，等待中...")
+      await sleep(500)
+      checkLastSendUsingTime += 500
+      return await waitLastSend()
+    } else {
+      return
+    }
+  }
+  await waitLastSend()
+
+  let sentMessage: RawMessage = null
+  sendMessagePool[peerUid] = async (rawMessage: RawMessage) => {
+    delete sendMessagePool[peerUid]
+    sentMessage = rawMessage
+  }
+
+  let checkSendCompleteUsingTime = 0
+  const checkSendComplete = async (): Promise<RawMessage> => {
+    if (sentMessage) {
+      if (waitComplete) {
+        if ((await dbUtil.getMsgByLongId(sentMessage.msgId)).sendStatus == 2) {
+          return sentMessage
+        }
+      } else {
+        return sentMessage
+      }
+      // log(`给${peerUid}发送消息成功`)
+    }
+    checkSendCompleteUsingTime += 500
+    if (checkSendCompleteUsingTime > timeout) {
+      throw '发送超时'
+    }
+    await sleep(500)
+    return await checkSendComplete()
+  }
+  return checkSendComplete();
 }
 
 export class NTQQMsgApi {
+  static async setEmojiLike(peer: Peer, msgSeq: string, emojiId: string, set: boolean = true) {
+    // nt_qq//global//nt_data//Emoji//emoji-resource//sysface_res/apng/ 下可以看到所有QQ表情预览
+    // nt_qq\global\nt_data\Emoji\emoji-resource\face_config.json 里面有所有表情的id, 自带表情id是QSid, 标准emoji表情id是QCid
+    // 其实以官方文档为准是最好的，https://bot.q.qq.com/wiki/develop/api-v2/openapi/emoji/model.html#EmojiType
+    emojiId = emojiId.toString()
+    return await callNTQQApi<GeneralCallResult>({
+      methodName: NTQQApiMethod.EMOJI_LIKE,
+      args: [
+        {
+          peer,
+          msgSeq,
+          emojiId,
+          emojiType: emojiId.length > 3 ? '2' : '1',
+          setEmoji: set,
+        },
+        null,
+      ],
+    })
+  }
   static async getMultiMsg(peer: Peer, rootMsgId: string, parentMsgId: string) {
     return await callNTQQApi<GeneralCallResult & { msgList: RawMessage[] }>({
       methodName: NTQQApiMethod.GET_MULTI_MSG,
-            args: [{
+      args: [
+        {
           peer,
           rootMsgId,
-                parentMsgId
-            }, null]
+          parentMsgId,
+        },
+        null,
+      ],
     })
   }
 
-    static async activateGroupChat(groupCode: string) {
+  static async activateChat(peer: Peer) {
     // await this.fetchRecentContact();
     // await sleep(500);
     return await callNTQQApi<GeneralCallResult>({
-            methodName: NTQQApiMethod.ADD_ACTIVE_CHAT,
-            args: [{peer:{peerUid: groupCode, chatType: ChatType.group}, cnt: 20}, null]
+      methodName: NTQQApiMethod.ACTIVE_CHAT_PREVIEW,
+      args: [{ peer, cnt: 20 }, null],
+    })
+  }
+  static async activateChatAndGetHistory(peer: Peer) {
+    // await this.fetchRecentContact();
+    // await sleep(500);
+    return await callNTQQApi<GeneralCallResult>({
+      methodName: NTQQApiMethod.ACTIVE_CHAT_HISTORY,
+      // 参数似乎不是这样
+      args: [{ peer, cnt: 20 }, null],
     })
   }
   static async getMsgHistory(peer: Peer, msgId: string, count: number) {
+    // 消息时间从旧到新
     return await callNTQQApi<GeneralCallResult & { msgList: RawMessage[] }>({
-            methodName: isQQ998 ? NTQQApiMethod.HISTORY_MSG_998 : NTQQApiMethod.HISTORY_MSG,
-            args: [{
+      methodName: isQQ998 ? NTQQApiMethod.ACTIVE_CHAT_HISTORY : NTQQApiMethod.HISTORY_MSG,
+      args: [
+        {
           peer,
           msgId,
           cnt: count,
           queryOrder: true,
-            }, null]
+        },
+        null,
+      ],
     })
   }
   static async fetchRecentContact() {
@@ -62,100 +145,61 @@ export class NTQQMsgApi {
             count: 200,
             fetchOld: true,
           },
-                }
-            ]
+        },
+      ],
     })
   }
 
   static async recallMsg(peer: Peer, msgIds: string[]) {
     return await callNTQQApi({
       methodName: NTQQApiMethod.RECALL_MSG,
-            args: [{
+      args: [
+        {
           peer,
-                msgIds
-            }, null]
+          msgIds,
+        },
+        null,
+      ],
     })
   }
 
-    static async sendMsg(peer: Peer, msgElements: SendMessageElement[],
-                         waitComplete = true, timeout = 10000) {
-        const peerUid = peer.peerUid
-
-        // 等待上一个相同的peer发送完
-        let checkLastSendUsingTime = 0;
-        const waitLastSend = async () => {
-            if (checkLastSendUsingTime > timeout) {
-                throw ("发送超时")
-            }
-            let lastSending = sendMessagePool[peer.peerUid]
-            if (lastSending) {
-                // log("有正在发送的消息，等待中...")
-                await sleep(500);
-                checkLastSendUsingTime += 500;
-                return await waitLastSend();
-            } else {
-                return;
-            }
-        }
-        await waitLastSend();
-
-        let sentMessage: RawMessage = null;
-        sendMessagePool[peerUid] = async (rawMessage: RawMessage) => {
-            delete sendMessagePool[peerUid];
-            sentMessage = rawMessage;
-        }
-
-        let checkSendCompleteUsingTime = 0;
-        const checkSendComplete = async (): Promise<RawMessage> => {
-            if (sentMessage) {
-                if (waitComplete) {
-                    if ((await dbUtil.getMsgByLongId(sentMessage.msgId)).sendStatus == 2) {
-                        return sentMessage
-                    }
-                } else {
-                    return sentMessage
-                }
-                // log(`给${peerUid}发送消息成功`)
-            }
-            checkSendCompleteUsingTime += 500
-            if (checkSendCompleteUsingTime > timeout) {
-                throw ('发送超时')
-            }
-            await sleep(500)
-            return await checkSendComplete()
-        }
-
+  static async sendMsg(peer: Peer, msgElements: SendMessageElement[], waitComplete = true, timeout = 10000) {
+    const waiter = sendWaiter(peer, waitComplete, timeout);
     callNTQQApi({
       methodName: NTQQApiMethod.SEND_MSG,
-            args: [{
-                msgId: "0",
-                peer, msgElements,
+      args: [
+        {
+          msgId: '0',
+          peer,
+          msgElements,
           msgAttributeInfos: new Map(),
-            }, null]
+        },
+        null,
+      ],
     }).then()
-        return await checkSendComplete()
+    return await waiter;
   }
 
   static async forwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {
-        return await callNTQQApi<GeneralCallResult>({
+    const waiter = sendWaiter(destPeer, true, 10000);
+    callNTQQApi<GeneralCallResult>({
       methodName: NTQQApiMethod.FORWARD_MSG,
       args: [
         {
           msgIds: msgIds,
           srcContact: srcPeer,
-                    dstContacts: [
-                        destPeer
-                    ],
+          dstContacts: [destPeer],
           commentElements: [],
-                    msgAttributeInfos: new Map()
+          msgAttributeInfos: new Map(),
         },
         null,
-            ]
-        })
+      ],
+    }).then().catch(log)
+    return await waiter;
   }
 
   static async multiForwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {
-        const msgInfos = msgIds.map(id => {
+    const msgInfos = msgIds.map((id) => {
       return { msgId: id, senderShowName: selfInfo.nick }
     })
     const apiArgs = [
@@ -164,7 +208,7 @@ export class NTQQMsgApi {
         srcContact: srcPeer,
         dstContact: destPeer,
         commentElements: [],
-                msgAttributeInfos: new Map()
+        msgAttributeInfos: new Map(),
       },
       null,
     ]
@@ -172,13 +216,13 @@ export class NTQQMsgApi {
       let complete = false
       setTimeout(() => {
         if (!complete) {
-                    reject("转发消息超时");
+          reject('转发消息超时')
         }
       }, 5000)
       registerReceiveHook(ReceiveCmdS.SELF_SEND_MSG, async (payload: { msgRecord: RawMessage }) => {
         const msg = payload.msgRecord
         // 需要判断它是转发的消息，并且识别到是当前转发的这一条
-                const arkElement = msg.elements.find(ele => ele.arkElement)
+        const arkElement = msg.elements.find((ele) => ele.arkElement)
         if (!arkElement) {
           // log("收到的不是转发消息")
           return
@@ -196,16 +240,14 @@ export class NTQQMsgApi {
       })
       callNTQQApi<GeneralCallResult>({
         methodName: NTQQApiMethod.MULTI_FORWARD_MSG,
-                args: apiArgs
-            }).then(result => {
-                log("转发消息结果:", result, apiArgs)
+        args: apiArgs,
+      }).then((result) => {
+        log('转发消息结果:', result, apiArgs)
         if (result.result !== 0) {
-                    complete = true;
-                    reject("转发消息失败," + JSON.stringify(result));
+          complete = true
+          reject('转发消息失败,' + JSON.stringify(result))
         }
       })
     })
   }
-
-
 }

src/ntqqapi/api/rkey.ts

@@ -0,0 +1,59 @@
+//远端rkey获取
+
+import { log } from '@/common/utils'
+
+interface ServerRkeyData{
+  group_rkey: string;
+  private_rkey: string;
+  expired_time: number;
+}
+
+class RkeyManager {
+  serverUrl: string = '';
+  private rkeyData: ServerRkeyData = {
+    group_rkey: '',
+    private_rkey: '',
+    expired_time: 0
+  };
+  constructor(serverUrl: string) {
+    this.serverUrl = serverUrl;
+  }
+  async getRkey(){
+    if (this.isExpired()) {
+      try {
+        await this.refreshRkey();
+      } catch (e) {
+        log('获取rkey失败', e);
+      }
+    }
+    return this.rkeyData;
+  }
+
+  isExpired(): boolean {
+    const now = new Date().getTime() / 1000;
+    // console.log(`now: ${now}, expired_time: ${this.rkeyData.expired_time}`);
+    return now > this.rkeyData.expired_time;
+  }
+  async refreshRkey(): Promise<any> {
+    //刷新rkey
+    this.rkeyData = await this.fetchServerRkey();
+  }
+  async fetchServerRkey(){
+    return new Promise<ServerRkeyData>((resolve, reject) => {
+      fetch(this.serverUrl)
+        .then(response => {
+          if (!response.ok) {
+            return reject(response.statusText); // 请求失败，返回错误信息
+          }
+          return response.json(); // 解析 JSON 格式的响应体
+        })
+        .then(data => {
+          resolve(data);
+        })
+        .catch(error => {
+          reject(error);
+        });
+    });
+  }
+}
+export const rkeyManager = new RkeyManager('http://napcat-sign.wumiao.wang:2082/rkey');

src/ntqqapi/api/user.ts

@@ -1,38 +1,58 @@
-import {callNTQQApi, GeneralCallResult, NTQQApiClass, NTQQApiMethod} from "../ntcall";
-import {SelfInfo, User} from "../types";
-import {ReceiveCmdS} from "../hook";
-import {uidMaps} from "../../common/data";
-import {NTQQWindowApi, NTQQWindows} from "./window";
+import { callNTQQApi, GeneralCallResult, NTQQApiClass, NTQQApiMethod } from '../ntcall'
+import { Group, SelfInfo, User } from '../types'
+import { ReceiveCmdS } from '../hook'
+import { selfInfo, uidMaps } from '../../common/data'
+import { NTQQWindowApi, NTQQWindows } from './window'
+import { cacheFunc, isQQ998, log, sleep } from '../../common/utils'
+import { wrapperApi } from '@/ntqqapi/native/wrapper'
+import * as https from 'https'
 
+let userInfoCache: Record<string, User> = {} // uid: User
+
+export interface ClientKeyData extends GeneralCallResult {
+  url: string;
+  keyIndex: string;
+  clientKey: string;
+  expireTime: string;
+}
 
 export class NTQQUserApi {
   static async setQQAvatar(filePath: string) {
     return await callNTQQApi<GeneralCallResult>({
       methodName: NTQQApiMethod.SET_QQ_AVATAR,
-            args: [{
-                path:filePath
-            }, null],
-            timeoutSecond: 10 // 10秒不一定够
-        });
+      args: [
+        {
+          path: filePath,
+        },
+        null,
+      ],
+      timeoutSecond: 10, // 10秒不一定够
+    })
   }
 
   static async getSelfInfo() {
     return await callNTQQApi<SelfInfo>({
       className: NTQQApiClass.GLOBAL_DATA,
-            methodName: NTQQApiMethod.SELF_INFO, timeoutSecond: 2
+      methodName: NTQQApiMethod.SELF_INFO,
+      timeoutSecond: 2,
     })
   }
+
   static async getUserInfo(uid: string) {
     const result = await callNTQQApi<{ profiles: Map<string, User> }>({
       methodName: NTQQApiMethod.USER_INFO,
       args: [{ force: true, uids: [uid] }, undefined],
-            cbCmd: ReceiveCmdS.USER_INFO
+      cbCmd: ReceiveCmdS.USER_INFO,
     })
     return result.profiles.get(uid)
   }
-    static async getUserDetailInfo(uid: string) {
+
+  static async getUserDetailInfo(uid: string, getLevel = false) {
+    // this.getUserInfo(uid);
+    let methodName = !isQQ998 ? NTQQApiMethod.USER_DETAIL_INFO : NTQQApiMethod.USER_DETAIL_INFO_WITH_BIZ_INFO
+    const fetchInfo = async () => {
       const result = await callNTQQApi<{ info: User }>({
-            methodName: NTQQApiMethod.USER_DETAIL_INFO,
+        methodName,
         cbCmd: ReceiveCmdS.USER_DETAIL_INFO,
         afterFirstCmd: false,
         cmdCB: (payload) => {
@@ -42,10 +62,10 @@ export class NTQQUserApi{
         },
         args: [
           {
-                    uid
+            uid,
           },
-                null
-            ]
+          null,
+        ],
       })
       const info = result.info
       if (info?.uin) {
@@ -53,51 +73,93 @@ export class NTQQUserApi{
       }
       return info
     }
+    // 首次请求两次才能拿到的等级信息
+    if (!userInfoCache[uid] && getLevel) {
+      await fetchInfo()
+      await sleep(1000)
+    }
+    let userInfo = await fetchInfo()
+    userInfoCache[uid] = userInfo
+    return userInfo
+  }
 
-    static async getPSkey() {
+  // return 'p_uin=o0xxx; p_skey=orXDssiGF8axxxxxxxxxxxxxx_; skey='
+  static async getCookieWithoutSkey() {
     return await callNTQQApi<string>({
       className: NTQQApiClass.GROUP_HOME_WORK,
       methodName: NTQQApiMethod.UPDATE_SKEY,
       args: [
         {
-                    domain: "qun.qq.com"
-                }
-            ]
+          domain: 'qun.qq.com',
+        },
+      ],
     })
   }
-    static async getSkey(groupName: string, groupCode: string): Promise<{data: string}> {
-        return await NTQQWindowApi.openWindow<{data: string}>(NTQQWindows.GroupHomeWorkWindow, [{
-            groupName,
-            groupCode,
-            "source": "funcbar"
-        }], ReceiveCmdS.SKEY_UPDATE, 1);
-        // return await callNTQQApi<string>({
-        //     className: NTQQApiClass.GROUP_HOME_WORK,
-        //     methodName: NTQQApiMethod.UPDATE_SKEY,
-        //     args: [
-        //         {
-        //             domain: "qun.qq.com"
-        //         }
-        //     ]
-        // })
-        // return await callNTQQApi<GeneralCallResult>({
-        //     methodName: NTQQApiMethod.GET_SKEY,
-        //     args: [
-        //         {
-        //             "domains": [
-        //                 "qzone.qq.com",
-        //                 "qlive.qq.com",
-        //                 "qun.qq.com",
-        //                 "gamecenter.qq.com",
-        //                 "vip.qq.com",
-        //                 "qianbao.qq.com",
-        //                 "qidian.qq.com"
-        //             ],
-        //             "isForNewPCQQ": false
-        //         },
-        //         null
-        //     ]
-        // })
+
+  static async getSkey(): Promise<string> {
+    const clientKeyData = await this.getClientKey()
+    if (clientKeyData.result !== 0) {
+      throw new Error('获取clientKey失败')
+    }
+    const url = 'https://ssl.ptlogin2.qq.com/jump?ptlang=1033&clientuin=' + selfInfo.uin
+      + '&clientkey=' + clientKeyData.clientKey
+      + '&u1=https%3A%2F%2Fh5.qzone.qq.com%2Fqqnt%2Fqzoneinpcqq%2Ffriend%3Frefresh%3D0%26clientuin%3D0%26darkMode%3D0&keyindex=' + clientKeyData.keyIndex
+
+    return new Promise((resolve, reject) => {
+      const req = https.get(url, (res) => {
+        const rawCookies = res.headers['set-cookie']
+        const cookies = {}
+        rawCookies.forEach(cookie => {
+          // 使用正则表达式匹配 cookie 名称和值
+          const regex = /([^=;]+)=([^;]*)/
+          const match = regex.exec(cookie)
+          if (match) {
+            cookies[match[1].trim()] = match[2].trim()
+          }
+        })
+        resolve(cookies['skey'])
+      })
+      req.on('error', e => {
+        reject(e)
+      });
+      req.end();
+    });
+  }
+
+  @cacheFunc(60 * 30 * 1000)
+  static async getCookies(domain: string) {
+    const skey = await this.getSkey();
+    const pskey= (await this.getPSkey([domain])).get(domain);
+    if (!pskey || !skey) {
+      throw new Error('获取Cookies失败')
+    }
+    const bkn = NTQQUserApi.genBkn(skey)
+    const cookies = `p_skey=${pskey}; skey=${skey}; p_uin=o${selfInfo.uin}; uin=o${selfInfo.uin}`;
+    return { cookies, bkn }
+  }
+
+  static genBkn(sKey: string) {
+    sKey = sKey || ''
+    let hash = 5381
+
+    for (let i = 0; i < sKey.length; i++) {
+      const code = sKey.charCodeAt(i)
+      hash = hash + (hash << 5) + code
+    }
+
+    return (hash & 0x7fffffff).toString()
+  }
+
+  static async getPSkey(domains: string[]): Promise<Map<string, string>> {
+    const res = await wrapperApi.NodeIQQNTWrapperSession.getTipOffService().getPskey(domains, true)
+    if (res.result !== 0) {
+      throw new Error(`获取Pskey失败: ${res.errMsg}`)
+    }
+    return res.domainPskeyMap
+  }
+
+  static async getClientKey(): Promise<ClientKeyData> {
+    return await wrapperApi.NodeIQQNTWrapperSession.getTicketService().forceFetchClientKey('')
   }
 
 }

src/ntqqapi/api/webapi.ts

@@ -1,35 +1,243 @@
-import {groups} from "../../common/data";
-import {log} from "../../common/utils";
-import {NTQQUserApi} from "./user";
-
+import { WebGroupData, groups, selfInfo } from '@/common/data';
+import { log } from '@/common/utils/log';
+import { NTQQUserApi } from './user';
+import { RequestUtil } from '@/common/utils/request';
+export enum WebHonorType {
+  ALL = 'all',
+  TALKACTIVE = 'talkative',
+  PERFROMER = 'performer',
+  LEGEND = 'legend',
+  STORONGE_NEWBI = 'strong_newbie',
+  EMOTION = 'emotion'
+}
+export interface WebApiGroupMember {
+  uin: number
+  role: number
+  g: number
+  join_time: number
+  last_speak_time: number
+  lv: {
+    point: number
+    level: number
+  }
+  card: string
+  tags: string
+  flag: number
+  nick: string
+  qage: number
+  rm: number
+}
+interface WebApiGroupMemberRet {
+  ec: number
+  errcode: number
+  em: string
+  cache: number
+  adm_num: number
+  levelname: any
+  mems: WebApiGroupMember[]
+  count: number
+  svr_time: number
+  max_count: number
+  search_count: number
+  extmode: number
+}
+export interface WebApiGroupNoticeFeed {
+  u: number//发送者
+  fid: string//fid
+  pubt: number//时间
+  msg: {
+    text: string
+    text_face: string
+    title: string,
+    pics?: {
+      id: string,
+      w: string,
+      h: string
+    }[]
+  }
+  type: number
+  fn: number
+  cn: number
+  vn: number
+  settings: {
+    is_show_edit_card: number
+    remind_ts: number
+    tip_window_type: number
+    confirm_required: number
+  }
+  read_num: number
+  is_read: number
+  is_all_confirm: number
+}
+export interface WebApiGroupNoticeRet {
+  ec: number
+  em: string
+  ltsm: number
+  srv_code: number
+  read_only: number
+  role: number
+  feeds: WebApiGroupNoticeFeed[]
+  group: {
+    group_id: number
+    class_ext: number
+  }
+  sta: number,
+  gln: number
+  tst: number,
+  ui: any
+  server_time: number
+  svrt: number
+  ad: number
+}
+interface GroupEssenceMsg {
+  group_code: string
+  msg_seq: number
+  msg_random: number
+  sender_uin: string
+  sender_nick: string
+  sender_time: number
+  add_digest_uin: string
+  add_digest_nick: string
+  add_digest_time: number
+  msg_content: any[]
+  can_be_removed: true
+}
+export interface GroupEssenceMsgRet {
+  retcode: number
+  retmsg: string
+  data: {
+    msg_list: GroupEssenceMsg[]
+    is_end: boolean
+    group_role: number
+    config_page_url: string
+  }
+}
 export class WebApi {
-    private static bkn: string;
-    private static skey: string;
-    private static pskey: string;
-    private static cookie: string
-    private defaultHeaders: Record<string,string> = {
-        "User-Agent": "QQ/8.9.28.635 CFNetwork/1312 Darwin/21.0.0"
+  static async getGroupEssenceMsg(GroupCode: string, page_start: string): Promise<GroupEssenceMsgRet> {
+    const {cookies: CookieValue, bkn: Bkn} = (await NTQQUserApi.getCookies('qun.qq.com'))
+    const url = 'https://qun.qq.com/cgi-bin/group_digest/digest_list?bkn=' + Bkn + '&group_code=' + GroupCode + '&page_start=' + page_start + '&page_limit=20';
+    let ret;
+    try {
+      ret = await RequestUtil.HttpGetJson<GroupEssenceMsgRet>(url, 'GET', '', { 'Cookie': CookieValue });
+    } catch {
+      return undefined;
     }
-
-    constructor() {
-
+    //console.log(url, CookieValue);
+    if (ret.retcode !== 0) {
+      return undefined;
     }
-
-    public async addGroupDigest(groupCode: string, msgSeq: string){
-        const url = `https://qun.qq.com/cgi-bin/group_digest/cancel_digest?random=665&X-CROSS-ORIGIN=fetch&group_code=${groupCode}&msg_seq=${msgSeq}&msg_random=444021292`
-        const res = await this.request(url)
-        return await res.json()
+    return ret;
   }
+  static async getGroupMembers(GroupCode: string, cached: boolean = true): Promise<WebApiGroupMember[]> {
+    log('webapi 获取群成员', GroupCode);
+    let MemberData: Array<WebApiGroupMember> = new Array<WebApiGroupMember>();
+    try {
+      let cachedData = WebGroupData.GroupData.get(GroupCode);
+      let cachedTime = WebGroupData.GroupTime.get(GroupCode);
 
-    public async getGroupDigest(groupCode: string){
-        const url = `https://qun.qq.com/cgi-bin/group_digest/digest_list?random=665&X-CROSS-ORIGIN=fetch&group_code=${groupCode}&page_start=0&page_limit=20`
-        const res = await this.request(url)
-        log(res.headers)
-        return await res.json()
+      if (!cachedTime || Date.now() - cachedTime > 1800 * 1000 || !cached) {
+        const _Pskey = (await NTQQUserApi.getPSkey(['qun.qq.com']))['qun.qq.com'];
+        const _Skey = await NTQQUserApi.getSkey();
+        const CookieValue = 'p_skey=' + _Pskey + '; skey=' + _Skey + '; p_uin=o' + selfInfo.uin;
+        if (!_Skey || !_Pskey) {
+          return MemberData;
         }
+        const Bkn = WebApi.genBkn(_Skey);
+        const retList: Promise<WebApiGroupMemberRet>[] = [];
+        const fastRet = await RequestUtil.HttpGetJson<WebApiGroupMemberRet>('https://qun.qq.com/cgi-bin/qun_mgr/search_group_members?st=0&end=40&sort=1&gc=' + GroupCode + '&bkn=' + Bkn, 'POST', '', { 'Cookie': CookieValue });
+        if (!fastRet?.count || fastRet?.errcode !== 0 || !fastRet?.mems) {
+          return [];
+        } else {
+          for (const key in fastRet.mems) {
+            MemberData.push(fastRet.mems[key]);
+          }
+        }
+        //初始化获取PageNum
+        const PageNum = Math.ceil(fastRet.count / 40);
+        //遍历批量请求
+        for (let i = 2; i <= PageNum; i++) {
+          const ret: Promise<WebApiGroupMemberRet> = RequestUtil.HttpGetJson<WebApiGroupMemberRet>('https://qun.qq.com/cgi-bin/qun_mgr/search_group_members?st=' + (i - 1) * 40 + '&end=' + i * 40 + '&sort=1&gc=' + GroupCode + '&bkn=' + Bkn, 'POST', '', { 'Cookie': CookieValue });
+          retList.push(ret);
+        }
+        //批量等待
+        for (let i = 1; i <= PageNum; i++) {
+          const ret = await (retList[i]);
+          if (!ret?.count || ret?.errcode !== 0 || !ret?.mems) {
+            continue;
+          }
+          for (const key in ret.mems) {
+            MemberData.push(ret.mems[key]);
+          }
+        }
+        WebGroupData.GroupData.set(GroupCode, MemberData);
+        WebGroupData.GroupTime.set(GroupCode, Date.now());
+      } else {
+        MemberData = cachedData as Array<WebApiGroupMember>;
+      }
+    } catch {
+      return MemberData;
+    }
+    return MemberData;
+  }
+  // public static async addGroupDigest(groupCode: string, msgSeq: string) {
+  //   const url = `https://qun.qq.com/cgi-bin/group_digest/cancel_digest?random=665&X-CROSS-ORIGIN=fetch&group_code=${groupCode}&msg_seq=${msgSeq}&msg_random=444021292`;
+  //   const res = await this.request(url);
+  //   return await res.json();
+  // }
 
-    private genBkn(sKey: string){
-        sKey = sKey || "";
+  // public async getGroupDigest(groupCode: string) {
+  //   const url = `https://qun.qq.com/cgi-bin/group_digest/digest_list?random=665&X-CROSS-ORIGIN=fetch&group_code=${groupCode}&page_start=0&page_limit=20`;
+  //   const res = await this.request(url);
+  //   return await res.json();
+  // }
+  static async setGroupNotice(GroupCode: string, Content: string = '') {
+    //https://web.qun.qq.com/cgi-bin/announce/add_qun_notice?bkn=${bkn}
+    //qid=${群号}&bkn=${bkn}&text=${内容}&pinned=0&type=1&settings={"is_show_edit_card":1,"tip_window_type":1,"confirm_required":1}
+    const _Pskey = (await NTQQUserApi.getPSkey(['qun.qq.com']))['qun.qq.com'];
+    const _Skey = await NTQQUserApi.getSkey();
+    const CookieValue = 'p_skey=' + _Pskey + '; skey=' + _Skey + '; p_uin=o' + selfInfo.uin;
+    let ret: any = undefined;
+    //console.log(CookieValue);
+    if (!_Skey || !_Pskey) {
+      //获取Cookies失败
+      return undefined;
+    }
+    const Bkn = WebApi.genBkn(_Skey);
+    const data = 'qid=' + GroupCode + '&bkn=' + Bkn + '&text=' + Content + '&pinned=0&type=1&settings={"is_show_edit_card":1,"tip_window_type":1,"confirm_required":1}';
+    const url = 'https://web.qun.qq.com/cgi-bin/announce/add_qun_notice?bkn=' + Bkn;
+    try {
+      ret = await RequestUtil.HttpGetJson<any>(url, 'GET', '', { 'Cookie': CookieValue });
+      return ret;
+    } catch (e) {
+      return undefined;
+    }
+    return undefined;
+  }
+  static async getGrouptNotice(GroupCode: string): Promise<undefined | WebApiGroupNoticeRet> {
+    const _Pskey = (await NTQQUserApi.getPSkey(['qun.qq.com']))['qun.qq.com'];
+    const _Skey = await NTQQUserApi.getSkey();
+    const CookieValue = 'p_skey=' + _Pskey + '; skey=' + _Skey + '; p_uin=o' + selfInfo.uin;
+    let ret: WebApiGroupNoticeRet | undefined = undefined;
+    //console.log(CookieValue);
+    if (!_Skey || !_Pskey) {
+      //获取Cookies失败
+      return undefined;
+    }
+    const Bkn = WebApi.genBkn(_Skey);
+    const url = 'https://web.qun.qq.com/cgi-bin/announce/get_t_list?bkn=' + Bkn + '&qid=' + GroupCode + '&ft=23&ni=1&n=1&i=1&log_read=1&platform=1&s=-1&n=20';
+    try {
+      ret = await RequestUtil.HttpGetJson<WebApiGroupNoticeRet>(url, 'GET', '', { 'Cookie': CookieValue });
+      if (ret?.ec !== 0) {
+        return undefined;
+      }
+      return ret;
+    } catch (e) {
+      return undefined;
+    }
+    return undefined;
+  }
+  static genBkn(sKey: string) {
+    sKey = sKey || '';
     let hash = 5381;
 
     for (let i = 0; i < sKey.length; i++) {
@@ -39,48 +247,120 @@ export class WebApi{
 
     return (hash & 0x7FFFFFFF).toString();
   }
-    private async init(){
-        if (!WebApi.bkn) {
-            const group = groups[0];
-            WebApi.skey = (await NTQQUserApi.getSkey(group.groupName, group.groupCode)).data;
-            WebApi.bkn = this.genBkn(WebApi.skey);
-            let cookie = await NTQQUserApi.getPSkey();
-            const pskeyRegex = /p_skey=([^;]+)/;
-            const match = cookie.match(pskeyRegex);
-            const pskeyValue = match ? match[1] : null;
-            WebApi.pskey = pskeyValue;
-            if (cookie.indexOf("skey=;") !== -1) {
-                cookie = cookie.replace("skey=;", `skey=${WebApi.skey};`);
+  //实现未缓存 考虑2h缓存
+  static async getGroupHonorInfo(groupCode: string, getType: WebHonorType) {
+    async function getDataInternal(Internal_groupCode: string, Internal_type: number) {
+      let url = 'https://qun.qq.com/interactive/honorlist?gc=' + Internal_groupCode + '&type=' + Internal_type.toString();
+      let res = '';
+      let resJson;
+      try {
+        res = await RequestUtil.HttpGetText(url, 'GET', '', { 'Cookie': CookieValue });
+        const match = res.match(/window\.__INITIAL_STATE__=(.*?);/);
+        if (match) {
+          resJson = JSON.parse(match[1].trim());
         }
-            WebApi.cookie = cookie;
-            // for(const kv of WebApi.cookie.split(";")){
-            //     const [key, value] = kv.split("=");
-            // }
-            //     log("set cookie", key, value)
-            //     await session.defaultSession.cookies.set({
-            //         url: 'https://qun.qq.com', // 你要请求的域名
-            //         name: key.trim(),
-            //         value: value.trim(),
-            //         expirationDate: Date.now() / 1000 + 300000, // Cookie 过期时间，例如设置为当前时间之后的300秒
-            //     });
-            // }
+        if (Internal_type === 1) {
+          return resJson?.talkativeList;
+        } else {
+          return resJson?.actorList;
         }
+      } catch (e) {
+        log('获取当前群荣耀失败', url, e);
+      }
+      return undefined;
     }
 
-    private async request(url: string, method: "GET" | "POST" = "GET", headers: Record<string, string> = {}){
+    let HonorInfo: any = { group_id: groupCode };
+    const CookieValue = (await NTQQUserApi.getCookies('qun.qq.com')).cookies;
 
-        await this.init();
-        url += "&bkn=" + WebApi.bkn;
-        let _headers: Record<string, string> = {
-            ...this.defaultHeaders, ...headers,
-            "Cookie": WebApi.cookie,
-            credentials: 'include'
+    if (getType === WebHonorType.TALKACTIVE || getType === WebHonorType.ALL) {
+      try {
+        let RetInternal = await getDataInternal(groupCode, 1);
+        if (!RetInternal) {
+          throw new Error('获取龙王信息失败');
         }
-        log("request", url, _headers)
-        const options = {
-            method: method,
-            headers: _headers
+        HonorInfo.current_talkative = {
+          user_id: RetInternal[0]?.uin,
+          avatar: RetInternal[0]?.avatar,
+          nickname: RetInternal[0]?.name,
+          day_count: 0,
+          description: RetInternal[0]?.desc
         }
-        return fetch(url, options)
+        HonorInfo.talkative_list = [];
+        for (const talkative_ele of RetInternal) {
+          HonorInfo.talkative_list.push({
+            user_id: talkative_ele?.uin,
+            avatar: talkative_ele?.avatar,
+            description: talkative_ele?.desc,
+            day_count: 0,
+            nickname: talkative_ele?.name
+          });
+        }
+      } catch (e) {
+        log(e);
+      }
+    }
+    if (getType === WebHonorType.PERFROMER || getType === WebHonorType.ALL) {
+      try {
+        let RetInternal = await getDataInternal(groupCode, 2);
+        if (!RetInternal) {
+          throw new Error('获取群聊之火失败');
+        }
+        HonorInfo.performer_list = [];
+        for (const performer_ele of RetInternal) {
+          HonorInfo.performer_list.push({
+            user_id: performer_ele?.uin,
+            nickname: performer_ele?.name,
+            avatar: performer_ele?.avatar,
+            description: performer_ele?.desc
+          });
+        }
+      } catch (e) {
+        log(e);
+      }
+    }
+    if (getType === WebHonorType.PERFROMER || getType === WebHonorType.ALL) {
+      try {
+        let RetInternal = await getDataInternal(groupCode, 3);
+        if (!RetInternal) {
+          throw new Error('获取群聊炽焰失败');
+        }
+        HonorInfo.legend_list = [];
+        for (const legend_ele of RetInternal) {
+          HonorInfo.legend_list.push({
+            user_id: legend_ele?.uin,
+            nickname: legend_ele?.name,
+            avatar: legend_ele?.avatar,
+            desc: legend_ele?.description
+          });
+        }
+      } catch (e) {
+        log('获取群聊炽焰失败', e);
+      }
+    }
+    if (getType === WebHonorType.EMOTION || getType === WebHonorType.ALL) {
+      try {
+        let RetInternal = await getDataInternal(groupCode, 6);
+        if (!RetInternal) {
+          throw new Error('获取快乐源泉失败');
+        }
+        HonorInfo.emotion_list = [];
+        for (const emotion_ele of RetInternal) {
+          HonorInfo.emotion_list.push({
+            user_id: emotion_ele?.uin,
+            nickname: emotion_ele?.name,
+            avatar: emotion_ele?.avatar,
+            desc: emotion_ele?.description
+          });
+        }
+      } catch (e) {
+        log('获取快乐源泉失败', e);
+      }
+    }
+    //冒尖小春笋好像已经被tx扬了
+    if (getType === WebHonorType.EMOTION || getType === WebHonorType.ALL) {
+      HonorInfo.strong_newbie_list = [];
+    }
+    return HonorInfo;
   }
 }

src/ntqqapi/api/window.ts

@@ -1,49 +1,50 @@
-import {callNTQQApi, GeneralCallResult, NTQQApiClass, NTQQApiMethod} from "../ntcall";
-import {ReceiveCmd} from "../hook";
-import {BrowserWindow} from "electron";
+import { callNTQQApi, GeneralCallResult, NTQQApiClass, NTQQApiMethod } from '../ntcall'
+import { ReceiveCmd } from '../hook'
+import { BrowserWindow } from 'electron'
 
 export interface NTQQWindow {
-    windowName: string,
-    windowUrlHash: string,
+  windowName: string
+  windowUrlHash: string
 }
 
 export class NTQQWindows {
   static GroupHomeWorkWindow: NTQQWindow = {
-        windowName: "GroupHomeWorkWindow",
-        windowUrlHash: "#/group-home-work"
+    windowName: 'GroupHomeWorkWindow',
+    windowUrlHash: '#/group-home-work',
   }
   static GroupNotifyFilterWindow: NTQQWindow = {
-        windowName: "GroupNotifyFilterWindow",
-        windowUrlHash: "#/group-notify-filter"
+    windowName: 'GroupNotifyFilterWindow',
+    windowUrlHash: '#/group-notify-filter',
   }
   static GroupEssenceWindow: NTQQWindow = {
-        windowName: "GroupEssenceWindow",
-        windowUrlHash: "#/group-essence"
+    windowName: 'GroupEssenceWindow',
+    windowUrlHash: '#/group-essence',
   }
 }
 
 export class NTQQWindowApi {
-
   // 打开窗口并获取对应的下发事件
-    static async openWindow<R=GeneralCallResult>(ntQQWindow: NTQQWindow, args: any[], cbCmd: ReceiveCmd=null, autoCloseSeconds: number=2){
+  static async openWindow<R = GeneralCallResult>(
+    ntQQWindow: NTQQWindow,
+    args: any[],
+    cbCmd: ReceiveCmd = null,
+    autoCloseSeconds: number = 2,
+  ) {
     const result = await callNTQQApi<R>({
       className: NTQQApiClass.WINDOW_API,
       methodName: NTQQApiMethod.OPEN_EXTRA_WINDOW,
       cbCmd,
       afterFirstCmd: false,
-            args: [
-                ntQQWindow.windowName,
-                ...args
-            ]
+      args: [ntQQWindow.windowName, ...args],
     })
     setTimeout(() => {
       for (const w of BrowserWindow.getAllWindows()) {
         // log("close window", w.webContents.getURL())
         if (w.webContents.getURL().indexOf(ntQQWindow.windowUrlHash) != -1) {
-                    w.close();
+          w.close()
         }
       }
-        }, autoCloseSeconds * 1000);
-        return result;
+    }, autoCloseSeconds * 1000)
+    return result
   }
 }

src/ntqqapi/constructor.ts

@@ -1,172 +1,215 @@
 import {
   AtType,
   ElementType,
+  FaceIndex,
   PicType,
   SendArkElement,
   SendFaceElement,
   SendFileElement,
+  SendMarketFaceElement,
   SendPicElement,
   SendPttElement,
   SendReplyElement,
   SendTextElement,
-    SendVideoElement
-} from "./types";
-import {promises as fs} from "node:fs";
-import ffmpeg from "fluent-ffmpeg"
-import {NTQQFileApi} from "./api/file";
-import {calculateFileMD5, isGIF} from "../common/utils/file";
-import {log} from "../common/utils/log";
-import {defaultVideoThumb, getVideoInfo} from "../common/utils/video";
-import {encodeSilk} from "../common/utils/audio";
+  SendVideoElement,
+} from './types'
+import { promises as fs } from 'node:fs'
+import ffmpeg from 'fluent-ffmpeg'
+import { NTQQFileApi } from './api/file'
+import { calculateFileMD5, isGIF } from '../common/utils/file'
+import { log } from '../common/utils/log'
+import { defaultVideoThumb, getVideoInfo } from '../common/utils/video'
+import { encodeSilk } from '../common/utils/audio'
+import { isNull } from '../common/utils'
+import faceConfig from './face_config.json';
 
+export const mFaceCache = new Map<string, string>() // emojiId -> faceName
 
 export class SendMsgElementConstructor {
+  static poke(groupCode: string, uin: string) {
+    return null
+  }
+
   static text(content: string): SendTextElement {
     return {
       elementType: ElementType.TEXT,
-            elementId: "",
+      elementId: '',
       textElement: {
         content,
         atType: AtType.notAt,
-                atUid: "",
-                atTinyId: "",
-                atNtUid: "",
+        atUid: '',
+        atTinyId: '',
+        atNtUid: '',
       },
-        };
+    }
   }
 
   static at(atUid: string, atNtUid: string, atType: AtType, atName: string): SendTextElement {
     return {
       elementType: ElementType.TEXT,
-            elementId: "",
+      elementId: '',
       textElement: {
         content: `@${atName}`,
         atType,
         atUid,
-                atTinyId: "",
+        atTinyId: '',
         atNtUid,
       },
-        };
+    }
   }
 
   static reply(msgSeq: string, msgId: string, senderUin: string, senderUinStr: string): SendReplyElement {
     return {
       elementType: ElementType.REPLY,
-            elementId: "",
+      elementId: '',
       replyElement: {
         replayMsgSeq: msgSeq, // raw.msgSeq
         replayMsgId: msgId, // raw.msgId
         senderUin: senderUin,
         senderUinStr: senderUinStr,
-            }
+      },
     }
   }
 
-    static async pic(picPath: string, summary: string = "", subType: 0|1=0): Promise<SendPicElement> {
-        const {md5, fileName, path, fileSize, ext} = await NTQQFileApi.uploadFile(picPath, ElementType.PIC, subType);
+  static async pic(picPath: string, summary: string = '', subType: 0 | 1 = 0): Promise<SendPicElement> {
+    const { md5, fileName, path, fileSize } = await NTQQFileApi.uploadFile(picPath, ElementType.PIC, subType)
     if (fileSize === 0) {
-            throw "文件异常，大小为0";
+      throw '文件异常，大小为0'
     }
-        const imageSize = await NTQQFileApi.getImageSize(picPath);
+    const maxMB = 30;
+    if (fileSize > 1024 * 1024 * 30){
+      throw `图片过大，最大支持${maxMB}MB，当前文件大小${fileSize}B`
+    }
+    const imageSize = await NTQQFileApi.getImageSize(picPath)
     const picElement = {
       md5HexStr: md5,
       fileSize: fileSize.toString(),
       picWidth: imageSize.width,
       picHeight: imageSize.height,
-            fileName: md5 + ext,
+      fileName: fileName,
       sourcePath: path,
       original: true,
       picType: isGIF(picPath) ? PicType.gif : PicType.jpg,
       picSubType: subType,
-            fileUuid: "",
-            fileSubId: "",
+      fileUuid: '',
+      fileSubId: '',
       thumbFileSize: 0,
-            summary
-        };
-        log("图片信息", picElement)
+      summary,
+    }
+    log('图片信息', picElement)
     return {
       elementType: ElementType.PIC,
-            elementId: "",
+      elementId: '',
       picElement,
-        };
+    }
   }
 
-    static async file(filePath: string, fileName: string = ""): Promise<SendFileElement> {
-        const {md5, fileName: _fileName, path, fileSize} = await NTQQFileApi.uploadFile(filePath, ElementType.FILE);
+  static async file(filePath: string, fileName: string = ''): Promise<SendFileElement> {
+    const { md5, fileName: _fileName, path, fileSize } = await NTQQFileApi.uploadFile(filePath, ElementType.FILE)
     if (fileSize === 0) {
-            throw "文件异常，大小为0";
+      throw '文件异常，大小为0'
     }
     let element: SendFileElement = {
       elementType: ElementType.FILE,
-            elementId: "",
+      elementId: '',
       fileElement: {
         fileName: fileName || _fileName,
-                "filePath": path,
-                "fileSize": (fileSize).toString(),
-            }
+        filePath: path,
+        fileSize: fileSize.toString(),
+      },
     }
 
-        return element;
+    return element
   }
 
-    static async video(filePath: string, fileName: string = "", diyThumbPath: string = ""): Promise<SendVideoElement> {
-        let {fileName: _fileName, path, fileSize, md5} = await NTQQFileApi.uploadFile(filePath, ElementType.VIDEO);
+  static async video(filePath: string, fileName: string = '', diyThumbPath: string = ''): Promise<SendVideoElement> {
+    try {
+      await fs.stat(filePath)
+    } catch (e) {
+      throw `文件${filePath}异常，不存在`
+    }
+    log('复制视频到QQ目录', filePath)
+    let { fileName: _fileName, path, fileSize, md5 } = await NTQQFileApi.uploadFile(filePath, ElementType.VIDEO)
+
+    log('复制视频到QQ目录完成', path)
     if (fileSize === 0) {
-            throw "文件异常，大小为0";
+      throw '文件异常，大小为0'
     }
-        const pathLib = require("path");
-        let thumb = path.replace(`${pathLib.sep}Ori${pathLib.sep}`, `${pathLib.sep}Thumb${pathLib.sep}`)
-        thumb = pathLib.dirname(thumb)
+    const maxMB = 100;
+    if (fileSize > 1024 * 1024 * maxMB) {
+      throw `视频过大，最大支持${maxMB}MB，当前文件大小${fileSize}B`
+    }
+    const pathLib = require('path')
+    let thumbDir = path.replace(`${pathLib.sep}Ori${pathLib.sep}`, `${pathLib.sep}Thumb${pathLib.sep}`)
+    thumbDir = pathLib.dirname(thumbDir)
     // log("thumb 目录", thumb)
     let videoInfo = {
-            width: 1920, height: 1080,
+      width: 1920,
+      height: 1080,
       time: 15,
-            format: "mp4",
+      format: 'mp4',
       size: fileSize,
-            filePath
-        };
+      filePath,
+    }
     try {
-            videoInfo = await getVideoInfo(path);
-            log("视频信息", videoInfo)
+      videoInfo = await getVideoInfo(path)
+      log('视频信息', videoInfo)
     } catch (e) {
-            log("获取视频信息失败", e)
+      log('获取视频信息失败', e)
     }
     const createThumb = new Promise<string>((resolve, reject) => {
       const thumbFileName = `${md5}_0.png`
-            const thumbPath = pathLib.join(thumb, thumbFileName)
-            ffmpeg(filePath)
-                .on("end", () => {
+      const thumbPath = pathLib.join(thumbDir, thumbFileName)
+      log('开始生成视频缩略图', filePath)
+      let completed = false
+
+      function useDefaultThumb() {
+        if (completed) return
+        log('获取视频封面失败，使用默认封面')
+        fs.writeFile(thumbPath, defaultVideoThumb)
+          .then(() => {
+            resolve(thumbPath)
           })
-                .on("error", (err) => {
-                    log("获取视频封面失败，使用默认封面", err)
+          .catch(reject)
+      }
+
+      setTimeout(useDefaultThumb, 5000)
+      ffmpeg(filePath)
+        .on('end', () => {})
+        .on('error', (err) => {
           if (diyThumbPath) {
-                        fs.copyFile(diyThumbPath, thumbPath).then(() => {
-                            resolve(thumbPath);
-                        }).catch(reject)
+            fs.copyFile(diyThumbPath, thumbPath)
+              .then(() => {
+                completed = true
+                resolve(thumbPath)
+              })
+              .catch(reject)
           } else {
-                        fs.writeFile(thumbPath, defaultVideoThumb).then(() => {
-                            resolve(thumbPath);
-                        }).catch(reject)
+            useDefaultThumb()
           }
         })
         .screenshots({
           timestamps: [0],
           filename: thumbFileName,
-                    folder: thumb,
-                    size: videoInfo.width + "x" + videoInfo.height
-                }).on("end", () => {
-                resolve(thumbPath);
-            });
+          folder: thumbDir,
+          size: videoInfo.width + 'x' + videoInfo.height,
+        })
+        .on('end', () => {
+          log('生成视频缩略图', thumbPath)
+          completed = true
+          resolve(thumbPath)
+        })
     })
     let thumbPath = new Map()
-        const _thumbPath = await createThumb;
-        const thumbSize = (await fs.stat(_thumbPath)).size;
+    const _thumbPath = await createThumb
+    log('生成视频缩略图', _thumbPath)
+    const thumbSize = (await fs.stat(_thumbPath)).size
     // log("生成缩略图", _thumbPath)
     thumbPath.set(0, _thumbPath)
-        const thumbMd5 = await calculateFileMD5(_thumbPath);
+    const thumbMd5 = await calculateFileMD5(_thumbPath)
     let element: SendVideoElement = {
       elementType: ElementType.VIDEO,
-            elementId: "",
+      elementId: '',
       videoElement: {
         fileName: fileName || _fileName,
         filePath: path,
@@ -177,7 +220,7 @@ export class SendMsgElementConstructor {
         thumbSize,
         thumbWidth: videoInfo.width,
         thumbHeight: videoInfo.height,
-                fileSize: "" + fileSize,
+        fileSize: '' + fileSize,
         // fileUuid: "",
         // transferStatus: 0,
         // progress: 0,
@@ -188,24 +231,28 @@ export class SendMsgElementConstructor {
         // fileFormat: 2,
         // import_rich_media_context: null,
         // sourceVideoCodecFormat: 2
+      },
     }
-        }
-        return element;
+    log('videoElement', element)
+    return element
   }
 
   static async ptt(pttPath: string): Promise<SendPttElement> {
-        const {converted, path: silkPath, duration} = await encodeSilk(pttPath);
+    const { converted, path: silkPath, duration } = await encodeSilk(pttPath)
+    if (!silkPath) {
+      throw '语音转换失败, 请检查语音文件是否正常'
+    }
     // log("生成语音", silkPath, duration);
-        const {md5, fileName, path, fileSize} = await NTQQFileApi.uploadFile(silkPath, ElementType.PTT);
+    const { md5, fileName, path, fileSize } = await NTQQFileApi.uploadFile(silkPath, ElementType.PTT)
     if (fileSize === 0) {
-            throw "文件异常，大小为0";
+      throw '文件异常，大小为0'
     }
     if (converted) {
-            fs.unlink(silkPath).then();
+      fs.unlink(silkPath).then()
     }
     return {
       elementType: ElementType.PTT,
-            elementId: "",
+      elementId: '',
       pttElement: {
         fileName: fileName,
         filePath: path,
@@ -217,36 +264,109 @@ export class SendMsgElementConstructor {
         voiceType: 1,
         voiceChangeType: 0,
         canConvert2Text: true,
-                waveAmplitudes: [
-                    0, 18, 9, 23, 16, 17, 16, 15, 44, 17, 24, 20, 14, 15, 17,
-                ],
-                fileSubId: "",
+        waveAmplitudes: [0, 18, 9, 23, 16, 17, 16, 15, 44, 17, 24, 20, 14, 15, 17],
+        fileSubId: '',
         playState: 1,
         autoConvertText: 0,
+      },
     }
-        };
   }
 
   static face(faceId: number): SendFaceElement {
+    // 从face_config.json中获取表情名称
+    const sysFaces = faceConfig.sysface
+    const emojiFaces = faceConfig.emoji
+    const face = sysFaces.find((face) => face.QSid === faceId.toString())
+    faceId = parseInt(faceId.toString())
+    // let faceType = parseInt(faceId.toString().substring(0, 1));
+    let faceType = 1
+    if (faceId >= 222){
+      faceType = 2
+    }
+    if (face.AniStickerType){
+      faceType = 3;
+    }
     return {
       elementType: ElementType.FACE,
-            elementId: "",
+      elementId: '',
       faceElement: {
         faceIndex: faceId,
-                faceType: 1
-            }
+        faceType,
+        faceText: face.QDes,
+        stickerId: face.AniStickerId,
+        stickerType: face.AniStickerType,
+        packId: face.AniStickerPackId,
+        sourceType: 1,
+      },
     }
   }
 
-    static ark(data: any): SendArkElement {
+  static mface(emojiPackageId: number, emojiId: string, key: string, faceName: string): SendMarketFaceElement {
+    return {
+      elementType: ElementType.MFACE,
+      marketFaceElement: {
+        emojiPackageId,
+        emojiId,
+        key,
+        faceName: faceName || mFaceCache.get(emojiId) || '[商城表情]',
+      },
+    }
+  }
+
+  static dice(resultId: number | null): SendFaceElement {
+    // 实际测试并不能控制结果
+
+    // 随机1到6
+    if (isNull(resultId)) resultId = Math.floor(Math.random() * 6) + 1
+    return {
+      elementType: ElementType.FACE,
+      elementId: '',
+      faceElement: {
+        faceIndex: FaceIndex.dice,
+        faceType: 3,
+        faceText: '[骰子]',
+        packId: '1',
+        stickerId: '33',
+        sourceType: 1,
+        stickerType: 2,
+        resultId: resultId.toString(),
+        surpriseId: '',
+        // "randomType": 1,
+      },
+    }
+  }
+
+  // 猜拳(石头剪刀布)表情
+  static rps(resultId: number | null): SendFaceElement {
+    // 实际测试并不能控制结果
+    if (isNull(resultId)) resultId = Math.floor(Math.random() * 3) + 1
+    return {
+      elementType: ElementType.FACE,
+      elementId: '',
+      faceElement: {
+        faceIndex: FaceIndex.RPS,
+        faceText: '[包剪锤]',
+        faceType: 3,
+        packId: '1',
+        stickerId: '34',
+        sourceType: 1,
+        stickerType: 2,
+        resultId: resultId.toString(),
+        surpriseId: '',
+        // "randomType": 1,
+      },
+    }
+  }
+
+  static ark(data: string): SendArkElement {
     return {
       elementType: ElementType.ARK,
-            elementId: "",
+      elementId: '',
       arkElement: {
         bytesData: data,
         linkInfo: null,
-                subElementType: null
-            }
+        subElementType: null,
+      },
     }
   }
 }

src/ntqqapi/external/ccpoke/index.ts

@@ -1,28 +0,0 @@
-import {log} from "../../../common/utils/log";
-
-let pokeEngine: any = null
-
-type PokeHandler = (id: string, isGroup: boolean)=>void
-
-let pokeRecords: Record<string, number> = {}
-export function registerPokeHandler(handler: PokeHandler){
-    if(!pokeEngine){
-        try {
-            pokeEngine = require("./ccpoke/poke-win32-x64.node")
-            pokeEngine.performHooks();
-        }catch (e) {
-            log("戳一戳引擎加载失败", e)
-            return
-        }
-    }
-    pokeEngine.setHandlerForPokeHook((id: string, isGroup: boolean)=>{
-        let existTime = pokeRecords[id]
-        if (existTime){
-            if (Date.now() - existTime < 1500){
-                return
-            }
-        }
-        pokeRecords[id] = Date.now()
-        handler(id, isGroup);
-    })
-}

src/ntqqapi/hook.ts

@@ -1,97 +1,109 @@
-import {BrowserWindow} from 'electron';
-import {NTQQApiClass} from "./ntcall";
-import {NTQQMsgApi, sendMessagePool} from "./api/msg"
-import {ChatType, Group, GroupMember, RawMessage, User} from "./types";
-import {friends, getGroupMember, groups, selfInfo, tempGroupCodeMap, uidMaps} from "../common/data";
-import {OB11GroupDecreaseEvent} from "../onebot11/event/notice/OB11GroupDecreaseEvent";
-import {v4 as uuidv4} from "uuid"
-import {postOB11Event} from "../onebot11/server/postOB11Event";
-import {getConfigUtil, HOOK_LOG} from "../common/config";
-import fs from "fs";
-import {dbUtil} from "../common/db";
-import {NTQQGroupApi} from "./api/group";
-import {log} from "../common/utils/log";
-import {sleep} from "../common/utils/helper";
-import {OB11GroupCardEvent} from "../onebot11/event/notice/OB11GroupCardEvent";
+import { BrowserWindow } from 'electron'
+import { NTQQApiClass, NTQQApiMethod } from './ntcall'
+import { NTQQMsgApi, sendMessagePool } from './api/msg'
+import { CategoryFriend, ChatType, Group, GroupMember, GroupMemberRole, RawMessage, User } from './types'
+import {
+  deleteGroup,
+  friends,
+  getFriend,
+  getGroupMember,
+  groups, rawFriends,
+  selfInfo,
+  tempGroupCodeMap,
+  uidMaps,
+} from '@/common/data'
+import { OB11GroupDecreaseEvent } from '../onebot11/event/notice/OB11GroupDecreaseEvent'
+import { v4 as uuidv4 } from 'uuid'
+import { postOb11Event } from '../onebot11/server/post-ob11-event'
+import { getConfigUtil, HOOK_LOG } from '@/common/config'
+import fs from 'fs'
+import { dbUtil } from '@/common/db'
+import { NTQQGroupApi } from './api/group'
+import { log } from '@/common/utils'
+import { isNumeric, sleep } from '@/common/utils'
+import { OB11Constructor } from '../onebot11/constructor'
 
 export let hookApiCallbacks: Record<string, (apiReturn: any) => void> = {}
 
 export let ReceiveCmdS = {
-    UPDATE_MSG: "nodeIKernelMsgListener/onMsgInfoListUpdate",
-    UPDATE_ACTIVE_MSG: "nodeIKernelMsgListener/onActiveMsgInfoUpdate",
+  RECENT_CONTACT: 'nodeIKernelRecentContactListener/onRecentContactListChangedVer2',
+  UPDATE_MSG: 'nodeIKernelMsgListener/onMsgInfoListUpdate',
+  UPDATE_ACTIVE_MSG: 'nodeIKernelMsgListener/onActiveMsgInfoUpdate',
   NEW_MSG: `nodeIKernelMsgListener/onRecvMsg`,
   NEW_ACTIVE_MSG: `nodeIKernelMsgListener/onRecvActiveMsg`,
-    SELF_SEND_MSG: "nodeIKernelMsgListener/onAddSendMsg",
-    USER_INFO: "nodeIKernelProfileListener/onProfileSimpleChanged",
-    USER_DETAIL_INFO: "nodeIKernelProfileListener/onProfileDetailInfoChanged",
-    GROUPS: "nodeIKernelGroupListener/onGroupListUpdate",
-    GROUPS_STORE: "onGroupListUpdate",
-    GROUP_MEMBER_INFO_UPDATE: "nodeIKernelGroupListener/onMemberInfoChange",
-    FRIENDS: "onBuddyListChange",
-    MEDIA_DOWNLOAD_COMPLETE: "nodeIKernelMsgListener/onRichMediaDownloadComplete",
-    UNREAD_GROUP_NOTIFY: "nodeIKernelGroupListener/onGroupNotifiesUnreadCountUpdated",
-    GROUP_NOTIFY: "nodeIKernelGroupListener/onGroupSingleScreenNotifies",
-    FRIEND_REQUEST: "nodeIKernelBuddyListener/onBuddyReqChange",
+  SELF_SEND_MSG: 'nodeIKernelMsgListener/onAddSendMsg',
+  USER_INFO: 'nodeIKernelProfileListener/onProfileSimpleChanged',
+  USER_DETAIL_INFO: 'nodeIKernelProfileListener/onProfileDetailInfoChanged',
+  GROUPS: 'nodeIKernelGroupListener/onGroupListUpdate',
+  GROUPS_STORE: 'onGroupListUpdate',
+  GROUP_MEMBER_INFO_UPDATE: 'nodeIKernelGroupListener/onMemberInfoChange',
+  FRIENDS: 'onBuddyListChange',
+  MEDIA_DOWNLOAD_COMPLETE: 'nodeIKernelMsgListener/onRichMediaDownloadComplete',
+  UNREAD_GROUP_NOTIFY: 'nodeIKernelGroupListener/onGroupNotifiesUnreadCountUpdated',
+  GROUP_NOTIFY: 'nodeIKernelGroupListener/onGroupSingleScreenNotifies',
+  FRIEND_REQUEST: 'nodeIKernelBuddyListener/onBuddyReqChange',
   SELF_STATUS: 'nodeIKernelProfileListener/onSelfStatusChanged',
-    CACHE_SCAN_FINISH: "nodeIKernelStorageCleanListener/onFinishScan",
-    MEDIA_UPLOAD_COMPLETE: "nodeIKernelMsgListener/onRichMediaUploadComplete",
-    SKEY_UPDATE: "onSkeyUpdate"
+  CACHE_SCAN_FINISH: 'nodeIKernelStorageCleanListener/onFinishScan',
+  MEDIA_UPLOAD_COMPLETE: 'nodeIKernelMsgListener/onRichMediaUploadComplete',
+  SKEY_UPDATE: 'onSkeyUpdate',
 }
 
-export type ReceiveCmd = typeof ReceiveCmdS[keyof typeof ReceiveCmdS]
+export type ReceiveCmd = (typeof ReceiveCmdS)[keyof typeof ReceiveCmdS]
 
 interface NTQQApiReturnData<PayloadType = unknown> extends Array<any> {
   0: {
-        "type": "request",
-        "eventName": NTQQApiClass,
-        "callbackId"?: string
-    },
-    1:
-        {
-            cmdName: ReceiveCmd,
-            cmdType: "event",
+    type: 'request'
+    eventName: NTQQApiClass
+    callbackId?: string
+  }
+  1: {
+    cmdName: ReceiveCmd
+    cmdType: 'event'
     payload: PayloadType
   }[]
 }
 
 let receiveHooks: Array<{
-    method: ReceiveCmd[],
-    hookFunc: ((payload: any) => void | Promise<void>)
+  method: ReceiveCmd[]
+  hookFunc: (payload: any) => void | Promise<void>
   id: string
 }> = []
 
+let callHooks: Array<{
+  method: NTQQApiMethod[]
+  hookFunc: (callParams: unknown[]) => void | Promise<void>
+}> = []
+
 export function hookNTQQApiReceive(window: BrowserWindow) {
-    const originalSend = window.webContents.send;
+  const originalSend = window.webContents.send
   const patchSend = (channel: string, ...args: NTQQApiReturnData) => {
     // console.log("hookNTQQApiReceive", channel, args)
     let isLogger = false
     try {
-            isLogger = args[0]?.eventName?.startsWith("ns-LoggerApi")
-        } catch (e) {
-
-        }
+      isLogger = args[0]?.eventName?.startsWith('ns-LoggerApi')
+    } catch (e) {}
     if (!isLogger) {
       try {
         HOOK_LOG && log(`received ntqq api message: ${channel}`, args)
       } catch (e) {
-                log("hook log error", e, args)
+        log('hook log error', e, args)
       }
     }
     try {
       if (args?.[1] instanceof Array) {
         for (let receiveData of args?.[1]) {
-                    const ntQQApiMethodName = receiveData.cmdName;
+          const ntQQApiMethodName = receiveData.cmdName
           // log(`received ntqq api message: ${channel} ${ntQQApiMethodName}`, JSON.stringify(receiveData))
           for (let hook of receiveHooks) {
             if (hook.method.includes(ntQQApiMethodName)) {
               new Promise((resolve, reject) => {
                 try {
                   let _ = hook.hookFunc(receiveData.payload)
-                                    if (hook.hookFunc.constructor.name === "AsyncFunction") {
-                                        (_ as Promise<void>).then()
+                  if (hook.hookFunc.constructor.name === 'AsyncFunction') {
+                    ;(_ as Promise<void>).then()
                   }
                 } catch (e) {
-                                    log("hook error", e, receiveData.payload)
+                  log('hook error', e, receiveData.payload)
                 }
               }).then()
             }
@@ -100,80 +112,96 @@ export function hookNTQQApiReceive(window: BrowserWindow) {
       }
       if (args[0]?.callbackId) {
         // log("hookApiCallback", hookApiCallbacks, args)
-                const callbackId = args[0].callbackId;
+        const callbackId = args[0].callbackId
         if (hookApiCallbacks[callbackId]) {
           // log("callback found")
           new Promise((resolve, reject) => {
-                        hookApiCallbacks[callbackId](args[1]);
+            hookApiCallbacks[callbackId](args[1])
           }).then()
-                    delete hookApiCallbacks[callbackId];
+          delete hookApiCallbacks[callbackId]
         }
       }
     } catch (e) {
-            log("hookNTQQApiReceive error", e.stack.toString(), args)
+      log('hookNTQQApiReceive error', e.stack.toString(), args)
     }
-        originalSend.call(window.webContents, channel, ...args);
+    originalSend.call(window.webContents, channel, ...args)
   }
-    window.webContents.send = patchSend;
+  window.webContents.send = patchSend
 }
 
 export function hookNTQQApiCall(window: BrowserWindow) {
   // 监听调用NTQQApi
-    let webContents = window.webContents as any;
-    const ipc_message_proxy = webContents._events["-ipc-message"]?.[0] || webContents._events["-ipc-message"];
+  let webContents = window.webContents as any
+  const ipc_message_proxy = webContents._events['-ipc-message']?.[0] || webContents._events['-ipc-message']
 
   const proxyIpcMsg = new Proxy(ipc_message_proxy, {
     apply(target, thisArg, args) {
       // console.log(thisArg, args);
       let isLogger = false
       try {
-                isLogger = args[3][0].eventName.startsWith("ns-LoggerApi")
-            } catch (e) {
-
-            }
+        isLogger = args[3][0].eventName.startsWith('ns-LoggerApi')
+      } catch (e) {}
       if (!isLogger) {
         try {
-                    HOOK_LOG && log("call NTQQ api", thisArg, args);
+          HOOK_LOG && log('call NTQQ api', thisArg, args)
+        } catch (e) {}
+        try {
+          const _args: unknown[] = args[3][1]
+          const cmdName: NTQQApiMethod = _args[0] as NTQQApiMethod
+          const callParams = _args.slice(1)
+          callHooks.forEach((hook) => {
+            if (hook.method.includes(cmdName)) {
+              new Promise((resolve, reject) => {
+                try {
+                  let _ = hook.hookFunc(callParams)
+                  if (hook.hookFunc.constructor.name === 'AsyncFunction') {
+                    ;(_ as Promise<void>).then()
+                  }
                 } catch (e) {
-                    
+                  log('hook call error', e, _args)
                 }
+              }).then()
             }
-            return target.apply(thisArg, args);
+          })
+        } catch (e) {}
+      }
+      return target.apply(thisArg, args)
     },
-    });
-    if (webContents._events["-ipc-message"]?.[0]) {
-        webContents._events["-ipc-message"][0] = proxyIpcMsg;
+  })
+  if (webContents._events['-ipc-message']?.[0]) {
+    webContents._events['-ipc-message'][0] = proxyIpcMsg
   } else {
-        webContents._events["-ipc-message"] = proxyIpcMsg;
+    webContents._events['-ipc-message'] = proxyIpcMsg
   }
 
-    const ipc_invoke_proxy = webContents._events["-ipc-invoke"]?.[0] || webContents._events["-ipc-invoke"];
+  const ipc_invoke_proxy = webContents._events['-ipc-invoke']?.[0] || webContents._events['-ipc-invoke']
   const proxyIpcInvoke = new Proxy(ipc_invoke_proxy, {
     apply(target, thisArg, args) {
       // console.log(args);
-            HOOK_LOG && log("call NTQQ invoke api", thisArg, args)
-            args[0]["_replyChannel"]["sendReply"] = new Proxy(args[0]["_replyChannel"]["sendReply"], {
+      HOOK_LOG && log('call NTQQ invoke api', thisArg, args)
+      args[0]['_replyChannel']['sendReply'] = new Proxy(args[0]['_replyChannel']['sendReply'], {
         apply(sendtarget, sendthisArg, sendargs) {
-                    sendtarget.apply(sendthisArg, sendargs);
-                }
-            });
-            let ret = target.apply(thisArg, args);
+          sendtarget.apply(sendthisArg, sendargs)
+        },
+      })
+      let ret = target.apply(thisArg, args)
       try {
-                HOOK_LOG && log("call NTQQ invoke api return", ret)
-            }catch (e) {
-                
-            }
-            return ret;
-        }
-    });
-    if (webContents._events["-ipc-invoke"]?.[0]) {
-        webContents._events["-ipc-invoke"][0] = proxyIpcInvoke;
+        HOOK_LOG && log('call NTQQ invoke api return', ret)
+      } catch (e) {}
+      return ret
+    },
+  })
+  if (webContents._events['-ipc-invoke']?.[0]) {
+    webContents._events['-ipc-invoke'][0] = proxyIpcInvoke
   } else {
-        webContents._events["-ipc-invoke"] = proxyIpcInvoke;
+    webContents._events['-ipc-invoke'] = proxyIpcInvoke
   }
 }
 
-export function registerReceiveHook<PayloadType>(method: ReceiveCmd | ReceiveCmd[], hookFunc: (payload: PayloadType) => void): string {
+export function registerReceiveHook<PayloadType>(
+  method: ReceiveCmd | ReceiveCmd[],
+  hookFunc: (payload: PayloadType) => void,
+): string {
   const id = uuidv4()
   if (!Array.isArray(method)) {
     method = [method]
@@ -181,43 +209,64 @@ export function registerReceiveHook<PayloadType>(method: ReceiveCmd | ReceiveCmd
   receiveHooks.push({
     method,
     hookFunc,
-        id
+    id,
+  })
+  return id
+}
+
+export function registerCallHook(
+  method: NTQQApiMethod | NTQQApiMethod[],
+  hookFunc: (callParams: unknown[]) => void | Promise<void>,
+): void {
+  if (!Array.isArray(method)) {
+    method = [method]
+  }
+  callHooks.push({
+    method,
+    hookFunc,
   })
-    return id;
 }
 
 export function removeReceiveHook(id: string) {
-    const index = receiveHooks.findIndex(h => h.id === id)
-    receiveHooks.splice(index, 1);
+  const index = receiveHooks.findIndex((h) => h.id === id)
+  receiveHooks.splice(index, 1)
 }
 
-let activatedGroups: string[] = [];
+let activatedGroups: string[] = []
+
 async function updateGroups(_groups: Group[], needUpdate: boolean = true) {
   for (let group of _groups) {
-        log("update group", group)
-        if (!activatedGroups.includes(group.groupCode)) {
-            NTQQMsgApi.activateGroupChat(group.groupCode).then((r) => {
-                activatedGroups.push(group.groupCode);
+    log('update group', group)
+    if (group.privilegeFlag === 0) {
+      deleteGroup(group.groupCode)
+      continue
+    }
+    log('update group', group)
+    // if (!activatedGroups.includes(group.groupCode)) {
+    NTQQMsgApi.activateChat({ peerUid: group.groupCode, chatType: ChatType.group })
+      .then((r) => {
+        // activatedGroups.push(group.groupCode);
         // log(`激活群聊天窗口${group.groupName}(${group.groupCode})`, r)
         // if (r.result !== 0) {
         //     setTimeout(() => NTQQMsgApi.activateGroupChat(group.groupCode).then(r => log(`再次激活群聊天窗口${group.groupName}(${group.groupCode})`, r)), 500);
         // }else {
         // }
-            }).catch(log)
-        }
-        let existGroup = groups.find(g => g.groupCode == group.groupCode);
+      })
+      .catch(log)
+    // }
+    let existGroup = groups.find((g) => g.groupCode == group.groupCode)
     if (existGroup) {
-            Object.assign(existGroup, group);
+      Object.assign(existGroup, group)
     } else {
-            groups.push(group);
-            existGroup = group;
+      groups.push(group)
+      existGroup = group
     }
 
     if (needUpdate) {
-            const members = await NTQQGroupApi.getGroupMembers(group.groupCode);
+      const members = await NTQQGroupApi.getGroupMembers(group.groupCode)
 
       if (members) {
-                existGroup.members = members;
+        existGroup.members = members
       }
     }
   }
@@ -225,74 +274,92 @@ async function updateGroups(_groups: Group[], needUpdate: boolean = true) {
 
 async function processGroupEvent(payload: { groupList: Group[] }) {
   try {
-        const newGroupList = payload.groupList;
+    const newGroupList = payload.groupList
     for (const group of newGroupList) {
-            let existGroup = groups.find(g => g.groupCode == group.groupCode);
+      let existGroup = groups.find((g) => g.groupCode == group.groupCode)
       if (existGroup) {
         if (existGroup.memberCount > group.memberCount) {
-                    log(`群(${group.groupCode})成员数量减少${existGroup.memberCount} -> ${group.memberCount}`);
-                    const oldMembers = existGroup.members;
+          log(`群(${group.groupCode})成员数量减少${existGroup.memberCount} -> ${group.memberCount}`)
+          const oldMembers = existGroup.members
 
-                    await sleep(200);  // 如果请求QQ API的速度过快，通常无法正确拉取到最新的群信息，因此这里人为引入一个延时
-                    const newMembers = await NTQQGroupApi.getGroupMembers(group.groupCode);
+          await sleep(200) // 如果请求QQ API的速度过快，通常无法正确拉取到最新的群信息，因此这里人为引入一个延时
+          const newMembers = await NTQQGroupApi.getGroupMembers(group.groupCode)
 
-                    group.members = newMembers;
-                    const newMembersSet = new Set<string>();  // 建立索引降低时间复杂度
+          group.members = newMembers
+          const newMembersSet = new Set<string>() // 建立索引降低时间复杂度
 
           for (const member of newMembers) {
-                        newMembersSet.add(member.uin);
+            newMembersSet.add(member.uin)
           }
 
+          // 判断bot是否是管理员，如果是管理员不需要从这里得知有人退群，这里的退群无法得知是主动退群还是被踢
+          let bot = await getGroupMember(group.groupCode, selfInfo.uin)
+          if (bot.role == GroupMemberRole.admin || bot.role == GroupMemberRole.owner) {
+            continue
+          }
           for (const member of oldMembers) {
             if (!newMembersSet.has(member.uin) && member.uin != selfInfo.uin) {
-                            postOB11Event(new OB11GroupDecreaseEvent(parseInt(group.groupCode), parseInt(member.uin), parseInt(member.uin), "leave"));
-                            break;
+              postOb11Event(
+                new OB11GroupDecreaseEvent(
+                  parseInt(group.groupCode),
+                  parseInt(member.uin),
+                  parseInt(member.uin),
+                  'leave',
+                ),
+              )
+              break
+            }
+          }
+        }
+        if (group.privilegeFlag === 0) {
+          deleteGroup(group.groupCode)
         }
       }
     }
 
-            }
-        }
-
-        updateGroups(newGroupList, false).then();
+    updateGroups(newGroupList, false).then()
   } catch (e) {
-        updateGroups(payload.groupList).then();
-        log("更新群信息错误", e.stack.toString());
+    updateGroups(payload.groupList).then()
+    log('更新群信息错误', e.stack.toString())
   }
 }
 
 // 群列表变动
-registerReceiveHook<{ groupList: Group[], updateType: number }>(ReceiveCmdS.GROUPS, (payload) => {
+registerReceiveHook<{ groupList: Group[]; updateType: number }>(ReceiveCmdS.GROUPS, (payload) => {
   // updateType 3是群列表变动，2是群成员变动
   // log("群列表变动", payload.updateType, payload.groupList)
   if (payload.updateType != 2) {
-        updateGroups(payload.groupList).then();
+    updateGroups(payload.groupList).then()
   } else {
-        if (process.platform == "win32") {
-            processGroupEvent(payload).then();
+    if (process.platform == 'win32') {
+      processGroupEvent(payload).then()
     }
   }
 })
-registerReceiveHook<{ groupList: Group[], updateType: number }>(ReceiveCmdS.GROUPS_STORE, (payload) => {
+registerReceiveHook<{ groupList: Group[]; updateType: number }>(ReceiveCmdS.GROUPS_STORE, (payload) => {
   // updateType 3是群列表变动，2是群成员变动
   // log("群列表变动", payload.updateType, payload.groupList)
   if (payload.updateType != 2) {
-        updateGroups(payload.groupList).then();
+    updateGroups(payload.groupList).then()
   } else {
-        if (process.platform != "win32") {
-            processGroupEvent(payload).then();
+    if (process.platform != 'win32') {
+      processGroupEvent(payload).then()
     }
   }
 })
 
-registerReceiveHook<{groupCode: string, dataSource: number, members: Set<GroupMember>}>(ReceiveCmdS.GROUP_MEMBER_INFO_UPDATE, async (payload) => {
-    const groupCode = payload.groupCode;
-    const members = Array.from(payload.members.values());
+registerReceiveHook<{
+  groupCode: string
+  dataSource: number
+  members: Set<GroupMember>
+}>(ReceiveCmdS.GROUP_MEMBER_INFO_UPDATE, async (payload) => {
+  const groupCode = payload.groupCode
+  const members = Array.from(payload.members.values())
   // log("群成员信息变动", groupCode, members)
   for (const member of members) {
-        const existMember = await getGroupMember(groupCode, member.uin);
+    const existMember = await getGroupMember(groupCode, member.uin)
     if (existMember) {
-            Object.assign(existMember, member);
+      Object.assign(existMember, member)
     }
   }
   // const existGroup = groups.find(g => g.groupCode == groupCode);
@@ -313,12 +380,15 @@ registerReceiveHook<{groupCode: string, dataSource: number, members: Set<GroupMe
 
 // 好友列表变动
 registerReceiveHook<{
-    data: { categoryId: number, categroyName: string, categroyMbCount: number, buddyList: User[] }[]
-}>(ReceiveCmdS.FRIENDS, payload => {
+  data:CategoryFriend[]
+}>(ReceiveCmdS.FRIENDS, (payload) => {
+  rawFriends.length = 0;
+  rawFriends.push(...payload.data);
   for (const fData of payload.data) {
-        const _friends = fData.buddyList;
+    const _friends = fData.buddyList
     for (let friend of _friends) {
-            let existFriend = friends.find(f => f.uin == friend.uin)
+      NTQQMsgApi.activateChat({ peerUid: friend.uid, chatType: ChatType.friend }).then()
+      let existFriend = friends.find((f) => f.uin == friend.uin)
       if (!existFriend) {
         friends.push(friend)
       } else {
@@ -331,24 +401,23 @@ registerReceiveHook<{
 registerReceiveHook<{ msgList: Array<RawMessage> }>([ReceiveCmdS.NEW_MSG, ReceiveCmdS.NEW_ACTIVE_MSG], (payload) => {
   // 保存一下uid
   for (const message of payload.msgList) {
-        const uid = message.senderUid;
-        const uin = message.senderUin;
+    const uid = message.senderUid
+    const uin = message.senderUin
     if (uid && uin) {
       if (message.chatType === ChatType.temp) {
-                dbUtil.getReceivedTempUinMap().then(receivedTempUinMap=>{
+        dbUtil.getReceivedTempUinMap().then((receivedTempUinMap) => {
           if (!receivedTempUinMap[uin]) {
-                        receivedTempUinMap[uin] = uid;
+            receivedTempUinMap[uin] = uid
             dbUtil.setReceivedTempUinMap(receivedTempUinMap)
           }
         })
       }
-            uidMaps[uid] = uin;
+      uidMaps[uid] = uin
     }
   }
 
-
   // 自动清理新消息文件
-    const {autoDeleteFile} = getConfigUtil().getConfig();
+  const { autoDeleteFile } = getConfigUtil().getConfig()
   if (!autoDeleteFile) {
     return
   }
@@ -371,15 +440,15 @@ registerReceiveHook<{ msgList: Array<RawMessage> }>([ReceiveCmdS.NEW_MSG, Receiv
         }
         const aioOpGrayTipElement = msgElement.grayTipElement?.aioOpGrayTipElement
         if (aioOpGrayTipElement) {
-                    tempGroupCodeMap[aioOpGrayTipElement.peerUid] = aioOpGrayTipElement.fromGrpCodeOfTmpChat;
+          tempGroupCodeMap[aioOpGrayTipElement.peerUid] = aioOpGrayTipElement.fromGrpCodeOfTmpChat
         }
 
         // log("需要清理的文件", pathList);
         for (const path of pathList) {
           if (path) {
             fs.unlink(picPath, () => {
-                            log("删除文件成功", path)
-                        });
+              log('删除文件成功', path)
+            })
           }
         }
       }, getConfigUtil().getConfig().autoDeleteFileSecond * 1000)
@@ -388,17 +457,17 @@ registerReceiveHook<{ msgList: Array<RawMessage> }>([ReceiveCmdS.NEW_MSG, Receiv
 })
 
 registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmdS.SELF_SEND_MSG, ({ msgRecord }) => {
-    const message = msgRecord;
-    const peerUid = message.peerUid;
+  const message = msgRecord
+  const peerUid = message.peerUid
   // log("收到自己发送成功的消息", Object.keys(sendMessagePool), message);
   // log("收到自己发送成功的消息", message.msgId, message.msgSeq);
   dbUtil.addMsg(message).then()
   const sendCallback = sendMessagePool[peerUid]
   if (sendCallback) {
     try {
-            sendCallback(message);
+      sendCallback(message)
     } catch (e) {
-            log("receive self msg error", e.stack)
+      log('receive self msg error', e.stack)
     }
   }
 })
@@ -406,3 +475,56 @@ registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmdS.SELF_SEND_MSG, ({msgR
 registerReceiveHook<{ info: { status: number } }>(ReceiveCmdS.SELF_STATUS, (info) => {
   selfInfo.online = info.info.status !== 20
 })
+
+let activatedPeerUids: string[] = []
+registerReceiveHook<{
+  changedRecentContactLists: {
+    listType: number
+    sortedContactList: string[]
+    changedList: {
+      id: string // peerUid
+      chatType: ChatType
+    }[]
+  }[]
+}>(ReceiveCmdS.RECENT_CONTACT, async (payload) => {
+  for (const recentContact of payload.changedRecentContactLists) {
+    for (const changedContact of recentContact.changedList) {
+      if (activatedPeerUids.includes(changedContact.id)) continue
+      activatedPeerUids.push(changedContact.id)
+      const peer = { peerUid: changedContact.id, chatType: changedContact.chatType }
+      if (changedContact.chatType === ChatType.temp) {
+        log('收到临时会话消息', peer)
+        NTQQMsgApi.activateChatAndGetHistory(peer).then(() => {
+          NTQQMsgApi.getMsgHistory(peer, '', 20).then(({ msgList }) => {
+            let lastTempMsg = msgList.pop()
+            log('激活窗口之前的第一条临时会话消息:', lastTempMsg)
+            if (Date.now() / 1000 - parseInt(lastTempMsg.msgTime) < 5) {
+              OB11Constructor.message(lastTempMsg).then((r) => postOb11Event(r))
+            }
+          })
+        })
+      } else {
+        NTQQMsgApi.activateChat(peer).then()
+      }
+    }
+  }
+})
+
+registerCallHook(NTQQApiMethod.DELETE_ACTIVE_CHAT, async (payload) => {
+  const peerUid = payload[0] as string
+  log('激活的聊天窗口被删除，准备重新激活', peerUid)
+  let chatType = ChatType.friend
+  if (isNumeric(peerUid)) {
+    chatType = ChatType.group
+  } else {
+    // 检查是否好友
+    if (!(await getFriend(peerUid))) {
+      chatType = ChatType.temp
+    }
+  }
+  const peer = { peerUid, chatType }
+  await sleep(1000)
+  NTQQMsgApi.activateChat(peer).then((r) => {
+    log('重新激活聊天窗口', peer, { result: r.result, errMsg: r.errMsg })
+  })
+})

src/ntqqapi/native/cpmodule.ts

@@ -0,0 +1,19 @@
+import * as os from "os";
+import path from "node:path";
+import fs from "fs";
+
+export function getModuleWithArchName(moduleName: string) {
+  const systemPlatform = os.platform()
+  const cpuArch = os.arch()
+  return `${moduleName}-${systemPlatform}-${cpuArch}.node`
+}
+
+export function cpModule(moduleName: string) {
+  const currentDir = path.resolve(__dirname);
+  const fileName = `./${getModuleWithArchName(moduleName)}`
+  try {
+    fs.copyFileSync(path.join(currentDir, fileName), path.join(currentDir, `${moduleName}.node`));
+  } catch (e) {
+
+  }
+}

src/ntqqapi/native/crychic/index.ts

@@ -0,0 +1,58 @@
+import { log } from '../../../common/utils'
+import { NTQQApi } from '../../ntcall'
+import { cpModule } from '../cpmodule'
+
+type PokeHandler = (id: string, isGroup: boolean) => void
+type CrychicHandler = (event: string, id: string, isGroup: boolean) => void
+
+let pokeRecords: Record<string, number> = {}
+
+class Crychic {
+  private crychic: any = undefined
+
+  loadNode() {
+    if (!this.crychic) {
+      try {
+        cpModule('crychic')
+        this.crychic = require('./crychic.node')
+        this.crychic.init()
+      } catch (e) {
+        log('crychic加载失败', e)
+      }
+    }
+  }
+
+  registerPokeHandler(fn: PokeHandler) {
+    this.registerHandler((event, id, isGroup) => {
+      if (event === 'poke') {
+        let existTime = pokeRecords[id]
+        if (existTime) {
+          if (Date.now() - existTime < 1500) {
+            return
+          }
+        }
+        pokeRecords[id] = Date.now()
+        fn(id, isGroup)
+      }
+    })
+  }
+
+  registerHandler(fn: CrychicHandler) {
+    if (!this.crychic) return
+    this.crychic.setCryHandler(fn)
+  }
+
+  sendFriendPoke(friendUid: string) {
+    if (!this.crychic) return
+    this.crychic.sendFriendPoke(parseInt(friendUid))
+    NTQQApi.fetchUnitedCommendConfig().then()
+  }
+
+  sendGroupPoke(groupCode: string, memberUin: string) {
+    if (!this.crychic) return
+    this.crychic.sendGroupPoke(parseInt(memberUin), parseInt(groupCode))
+    NTQQApi.fetchUnitedCommendConfig().then()
+  }
+}
+
+export const crychic = new Crychic()

src/ntqqapi/native/moehook/hook.ts

@@ -0,0 +1,33 @@
+import {cpModule} from "../cpmodule";
+import { qqPkgInfo } from '@/common/utils/QQBasicInfo'
+
+interface MoeHook {
+  GetRkey: () => string,  // Return '&rkey=xxx'
+  HookRkey: (version: string) => string
+}
+
+
+class HookApi {
+  private readonly moeHook: MoeHook | null = null;
+
+  constructor() {
+    cpModule('MoeHoo');
+    try {
+      this.moeHook = require('./MoeHoo.node');
+      console.log("hook rkey qq version", this.moeHook!.HookRkey(qqPkgInfo.version));
+      console.log("hook rkey地址", this.moeHook!.HookRkey(qqPkgInfo.version));
+    } catch (e) {
+      console.log('加载 moehoo 失败', e);
+    }
+  }
+
+  getRKey(): string {
+    return this.moeHook?.GetRkey() || '';
+  }
+
+  isAvailable() {
+    return !!this.moeHook;
+  }
+}
+
+// export const hookApi = new HookApi();

src/ntqqapi/native/wrapper.ts

@@ -0,0 +1,19 @@
+let Process = require('process')
+let os = require('os')
+Process.dlopenOrig = Process.dlopen
+
+export const wrapperApi: any = {}
+
+Process.dlopen = function(module, filename, flags = os.constants.dlopen.RTLD_LAZY) {
+  let dlopenRet = this.dlopenOrig(module, filename, flags)
+  for (let export_name in module.exports) {
+    module.exports[export_name] = new Proxy(module.exports[export_name], {
+      construct: (target, args, _newTarget) => {
+        let ret = new target(...args)
+        if (export_name === 'NodeIQQNTWrapperSession') wrapperApi.NodeIQQNTWrapperSession = ret
+        return ret
+      },
+    })
+  }
+  return dlopenRet
+}

src/ntqqapi/ntcall.ts

@@ -1,64 +1,70 @@
-import {ipcMain} from "electron";
-import {hookApiCallbacks, ReceiveCmd, ReceiveCmdS, registerReceiveHook, removeReceiveHook} from "./hook";
+import { ipcMain } from 'electron'
+import { hookApiCallbacks, ReceiveCmd, ReceiveCmdS, registerReceiveHook, removeReceiveHook } from './hook'
 
-import {v4 as uuidv4} from "uuid"
-import {log} from "../common/utils/log";
-import {NTQQWindow, NTQQWindowApi, NTQQWindows} from "./api/window";
-import {WebApi} from "./api/webapi";
-import {HOOK_LOG} from "../common/config";
+import { v4 as uuidv4 } from 'uuid'
+import { log } from '../common/utils/log'
+import { NTQQWindow, NTQQWindowApi, NTQQWindows } from './api/window'
+import { HOOK_LOG } from '../common/config'
 
 export enum NTQQApiClass {
-    NT_API = "ns-ntApi",
-    FS_API = "ns-FsApi",
-    OS_API = "ns-OsApi",
-    WINDOW_API = "ns-WindowApi",
-    HOTUPDATE_API = "ns-HotUpdateApi",
-    BUSINESS_API = "ns-BusinessApi",
-    GLOBAL_DATA = "ns-GlobalDataApi",
-    SKEY_API = "ns-SkeyApi",
-    GROUP_HOME_WORK = "ns-GroupHomeWork",
-    GROUP_ESSENCE = "ns-GroupEssence",
+  NT_API = 'ns-ntApi',
+  FS_API = 'ns-FsApi',
+  OS_API = 'ns-OsApi',
+  WINDOW_API = 'ns-WindowApi',
+  HOTUPDATE_API = 'ns-HotUpdateApi',
+  BUSINESS_API = 'ns-BusinessApi',
+  GLOBAL_DATA = 'ns-GlobalDataApi',
+  SKEY_API = 'ns-SkeyApi',
+  GROUP_HOME_WORK = 'ns-GroupHomeWork',
+  GROUP_ESSENCE = 'ns-GroupEssence',
 }
 
 export enum NTQQApiMethod {
-    RECENT_CONTACT = "nodeIKernelRecentContactService/fetchAndSubscribeABatchOfRecentContact",
-    ADD_ACTIVE_CHAT = "nodeIKernelMsgService/getAioFirstViewLatestMsgsAndAddActiveChat",  // 激活群助手内的聊天窗口，这样才能收到消息
-    HISTORY_MSG_998 = "nodeIKernelMsgService/getMsgsIncludeSelfAndAddActiveChat",
-    HISTORY_MSG = "nodeIKernelMsgService/getMsgsIncludeSelf",
-    GET_MULTI_MSG = "nodeIKernelMsgService/getMultiMsg",
+  TEST = 'NodeIKernelTipOffService/getPskey',
+  RECENT_CONTACT = 'nodeIKernelRecentContactService/fetchAndSubscribeABatchOfRecentContact',
+  ACTIVE_CHAT_PREVIEW = 'nodeIKernelMsgService/getAioFirstViewLatestMsgsAndAddActiveChat', // 激活聊天窗口，有时候必须这样才能收到消息, 并返回最新预览消息
+  ACTIVE_CHAT_HISTORY = 'nodeIKernelMsgService/getMsgsIncludeSelfAndAddActiveChat', // 激活聊天窗口，有时候必须这样才能收到消息, 并返回历史消息
+  HISTORY_MSG = 'nodeIKernelMsgService/getMsgsIncludeSelf',
+  GET_MULTI_MSG = 'nodeIKernelMsgService/getMultiMsg',
+  DELETE_ACTIVE_CHAT = 'nodeIKernelMsgService/deleteActiveChatByUid',
 
-    LIKE_FRIEND = "nodeIKernelProfileLikeService/setBuddyProfileLike",
-    SELF_INFO = "fetchAuthData",
-    FRIENDS = "nodeIKernelBuddyService/getBuddyList",
-    GROUPS = "nodeIKernelGroupService/getGroupList",
-    GROUP_MEMBER_SCENE = "nodeIKernelGroupService/createMemberListScene",
-    GROUP_MEMBERS = "nodeIKernelGroupService/getNextMemberList",
-    USER_INFO = "nodeIKernelProfileService/getUserSimpleInfo",
-    USER_DETAIL_INFO = "nodeIKernelProfileService/getUserDetailInfo",
-    FILE_TYPE = "getFileType",
-    FILE_MD5 = "getFileMd5",
-    FILE_COPY = "copyFile",
-    IMAGE_SIZE = "getImageSizeFromPath",
-    FILE_SIZE = "getFileSize",
-    MEDIA_FILE_PATH = "nodeIKernelMsgService/getRichMediaFilePathForGuild",
-    RECALL_MSG = "nodeIKernelMsgService/recallMsg",
-    SEND_MSG = "nodeIKernelMsgService/sendMsg",
-    DOWNLOAD_MEDIA = "nodeIKernelMsgService/downloadRichMedia",
-    FORWARD_MSG = "nodeIKernelMsgService/forwardMsgWithComment",
-    MULTI_FORWARD_MSG = "nodeIKernelMsgService/multiForwardMsgWithComment", // 合并转发
-    GET_GROUP_NOTICE = "nodeIKernelGroupService/getSingleScreenNotifies",
-    HANDLE_GROUP_REQUEST = "nodeIKernelGroupService/operateSysNotify",
-    QUIT_GROUP = "nodeIKernelGroupService/quitGroup",
+  LIKE_FRIEND = 'nodeIKernelProfileLikeService/setBuddyProfileLike',
+  SELF_INFO = 'fetchAuthData',
+  FRIENDS = 'nodeIKernelBuddyService/getBuddyList',
+  GROUPS = 'nodeIKernelGroupService/getGroupList',
+  GROUP_MEMBER_SCENE = 'nodeIKernelGroupService/createMemberListScene',
+  GROUP_MEMBERS = 'nodeIKernelGroupService/getNextMemberList',
+  USER_INFO = 'nodeIKernelProfileService/getUserSimpleInfo',
+  USER_DETAIL_INFO = 'nodeIKernelProfileService/getUserDetailInfo',
+  USER_DETAIL_INFO_WITH_BIZ_INFO = 'nodeIKernelProfileService/getUserDetailInfoWithBizInfo',
+  FILE_TYPE = 'getFileType',
+  FILE_MD5 = 'getFileMd5',
+  FILE_COPY = 'copyFile',
+  IMAGE_SIZE = 'getImageSizeFromPath',
+  FILE_SIZE = 'getFileSize',
+  MEDIA_FILE_PATH = 'nodeIKernelMsgService/getRichMediaFilePathForGuild',
+
+  RECALL_MSG = 'nodeIKernelMsgService/recallMsg',
+  SEND_MSG = 'nodeIKernelMsgService/sendMsg',
+  EMOJI_LIKE = 'nodeIKernelMsgService/setMsgEmojiLikes',
+
+  DOWNLOAD_MEDIA = 'nodeIKernelMsgService/downloadRichMedia',
+  FORWARD_MSG = 'nodeIKernelMsgService/forwardMsgWithComment',
+  MULTI_FORWARD_MSG = 'nodeIKernelMsgService/multiForwardMsgWithComment', // 合并转发
+  GET_GROUP_NOTICE = 'nodeIKernelGroupService/getSingleScreenNotifies',
+  HANDLE_GROUP_REQUEST = 'nodeIKernelGroupService/operateSysNotify',
+  QUIT_GROUP = 'nodeIKernelGroupService/quitGroup',
+  GROUP_AT_ALL_REMAIN_COUNT = 'nodeIKernelGroupService/getGroupRemainAtTimes',
   // READ_FRIEND_REQUEST = "nodeIKernelBuddyListener/onDoubtBuddyReqUnreadNumChange"
-    HANDLE_FRIEND_REQUEST = "nodeIKernelBuddyService/approvalFriendRequest",
-    KICK_MEMBER = "nodeIKernelGroupService/kickMember",
-    MUTE_MEMBER = "nodeIKernelGroupService/setMemberShutUp",
-    MUTE_GROUP = "nodeIKernelGroupService/setGroupShutUp",
-    SET_MEMBER_CARD = "nodeIKernelGroupService/modifyMemberCardName",
-    SET_MEMBER_ROLE = "nodeIKernelGroupService/modifyMemberRole",
-    PUBLISH_GROUP_BULLETIN = "nodeIKernelGroupService/publishGroupBulletinBulletin",
-    SET_GROUP_NAME = "nodeIKernelGroupService/modifyGroupName",
-    SET_GROUP_TITLE = "nodeIKernelGroupService/modifyMemberSpecialTitle",
+  HANDLE_FRIEND_REQUEST = 'nodeIKernelBuddyService/approvalFriendRequest',
+  KICK_MEMBER = 'nodeIKernelGroupService/kickMember',
+  MUTE_MEMBER = 'nodeIKernelGroupService/setMemberShutUp',
+  MUTE_GROUP = 'nodeIKernelGroupService/setGroupShutUp',
+  SET_MEMBER_CARD = 'nodeIKernelGroupService/modifyMemberCardName',
+  SET_MEMBER_ROLE = 'nodeIKernelGroupService/modifyMemberRole',
+  PUBLISH_GROUP_BULLETIN = 'nodeIKernelGroupService/publishGroupBulletinBulletin',
+  SET_GROUP_NAME = 'nodeIKernelGroupService/modifyGroupName',
+  SET_GROUP_TITLE = 'nodeIKernelGroupService/modifyMemberSpecialTitle',
 
   CACHE_SET_SILENCE = 'nodeIKernelStorageCleanService/setSilentScan',
   CACHE_ADD_SCANNED_PATH = 'nodeIKernelStorageCleanService/addCacheScanedPaths',
@@ -75,48 +81,56 @@ export enum NTQQApiMethod {
   OPEN_EXTRA_WINDOW = 'openExternalWindow',
 
   SET_QQ_AVATAR = 'nodeIKernelProfileService/setHeader',
-    GET_SKEY = "nodeIKernelTipOffService/getPskey",
-    UPDATE_SKEY = "updatePskey"
+  GET_PSKEY = 'nodeIKernelTipOffService/getPskey',
+  UPDATE_SKEY = 'updatePskey',
+
+  FETCH_UNITED_COMMEND_CONFIG = 'nodeIKernelUnitedConfigService/fetchUnitedCommendConfig', // 发包需要调用的
 }
 
 enum NTQQApiChannel {
-    IPC_UP_2 = "IPC_UP_2",
-    IPC_UP_3 = "IPC_UP_3",
-    IPC_UP_1 = "IPC_UP_1",
+  IPC_UP_2 = 'IPC_UP_2',
+  IPC_UP_3 = 'IPC_UP_3',
+  IPC_UP_1 = 'IPC_UP_1',
 }
 
 interface NTQQApiParams {
-    methodName: NTQQApiMethod | string,
-    className?: NTQQApiClass,
-    channel?: NTQQApiChannel,
+  methodName: NTQQApiMethod | string
+  className?: NTQQApiClass
+  channel?: NTQQApiChannel
   classNameIsRegister?: boolean
-    args?: unknown[],
-    cbCmd?: ReceiveCmd | null,
-    cmdCB?: (payload: any) => boolean;
-    afterFirstCmd?: boolean,  // 是否在methodName调用完之后再去hook cbCmd
-    timeoutSecond?: number,
+  args?: unknown[]
+  cbCmd?: ReceiveCmd | null
+  cmdCB?: (payload: any) => boolean
+  afterFirstCmd?: boolean // 是否在methodName调用完之后再去hook cbCmd
+  timeoutSecond?: number
 }
 
 export function callNTQQApi<ReturnType>(params: NTQQApiParams) {
   let {
-        className, methodName, channel, args,
-        cbCmd, timeoutSecond: timeout,
-        classNameIsRegister, cmdCB, afterFirstCmd
-    } = params;
-    className = className ?? NTQQApiClass.NT_API;
-    channel = channel ?? NTQQApiChannel.IPC_UP_2;
-    args = args ?? [];
-    timeout = timeout ?? 5;
-    afterFirstCmd = afterFirstCmd ?? true;
-    const uuid = uuidv4();
-    HOOK_LOG && log("callNTQQApi", channel, className, methodName, args, uuid)
+    className,
+    methodName,
+    channel,
+    args,
+    cbCmd,
+    timeoutSecond: timeout,
+    classNameIsRegister,
+    cmdCB,
+    afterFirstCmd,
+  } = params
+  className = className ?? NTQQApiClass.NT_API
+  channel = channel ?? NTQQApiChannel.IPC_UP_2
+  args = args ?? []
+  timeout = timeout ?? 5
+  afterFirstCmd = afterFirstCmd ?? true
+  const uuid = uuidv4()
+  HOOK_LOG && log('callNTQQApi', channel, className, methodName, args, uuid)
   return new Promise((resolve: (data: ReturnType) => void, reject) => {
     // log("callNTQQApiPromise", channel, className, methodName, args, uuid)
     const _timeout = timeout * 1000
     let success = false
-        let eventName = className + "-" + channel[channel.length - 1];
+    let eventName = className + '-' + channel[channel.length - 1]
     if (classNameIsRegister) {
-            eventName += "-register";
+      eventName += '-register'
     }
     const apiArgs = [methodName, ...args]
     if (!cbCmd) {
@@ -124,7 +138,7 @@ export function callNTQQApi<ReturnType>(params: NTQQApiParams) {
       hookApiCallbacks[uuid] = (r: ReturnType) => {
         success = true
         resolve(r)
-            };
+      }
     } else {
       // 这里的callback比较特殊，QQ后端先返回是否调用成功，再返回一条结果数据
       const secondCallback = () => {
@@ -132,32 +146,32 @@ export function callNTQQApi<ReturnType>(params: NTQQApiParams) {
           // log(methodName, "second callback", cbCmd, payload, cmdCB);
           if (!!cmdCB) {
             if (cmdCB(payload)) {
-                            removeReceiveHook(hookId);
+              removeReceiveHook(hookId)
               success = true
-                            resolve(payload);
+              resolve(payload)
             }
           } else {
-                        removeReceiveHook(hookId);
+            removeReceiveHook(hookId)
             success = true
-                        resolve(payload);
+            resolve(payload)
           }
         })
       }
-            !afterFirstCmd && secondCallback();
+      !afterFirstCmd && secondCallback()
       hookApiCallbacks[uuid] = (result: GeneralCallResult) => {
         log(`${methodName} callback`, result)
         if (result?.result == 0 || result === undefined) {
-                    afterFirstCmd && secondCallback();
+          afterFirstCmd && secondCallback()
         } else {
           success = true
-                    reject(`ntqq api call failed, ${result.errMsg}`);
+          reject(`ntqq api call failed, ${result.errMsg}`)
         }
       }
     }
     setTimeout(() => {
       // log("ntqq api timeout", success, channel, className, methodName)
       if (!success) {
-                log(`ntqq api timeout ${channel}, ${eventName}, ${methodName}`, apiArgs);
+        log(`ntqq api timeout ${channel}, ${eventName}, ${methodName}`, apiArgs)
         reject(`ntqq api timeout ${channel}, ${eventName}, ${methodName}, ${apiArgs}`)
       }
     }, _timeout)
@@ -166,31 +180,37 @@ export function callNTQQApi<ReturnType>(params: NTQQApiParams) {
       channel,
       {
         sender: {
-                    send: (..._args: unknown[]) => {
-                    },
+          send: (..._args: unknown[]) => {},
         },
       },
       { type: 'request', callbackId: uuid, eventName },
-            apiArgs
+      apiArgs,
     )
   })
 }
 
-
 export interface GeneralCallResult {
-    result: number,  // 0: success
+  result: number // 0: success
   errMsg: string
 }
 
-
 export class NTQQApi {
-    static async call(className: NTQQApiClass, cmdName: string, args: any[],) {
+  static async call(className: NTQQApiClass, cmdName: string, args: any[]) {
     return await callNTQQApi<GeneralCallResult>({
       className,
       methodName: cmdName,
+      args: [...args],
+    })
+  }
+
+  static async fetchUnitedCommendConfig() {
+    return await callNTQQApi<GeneralCallResult>({
+      methodName: NTQQApiMethod.FETCH_UNITED_COMMEND_CONFIG,
       args: [
-                ...args,
-            ]
+        {
+          groups: ['100243'],
+        },
+      ],
     })
   }
 }

src/ntqqapi/types/cache.ts

@@ -1,8 +1,9 @@
-import {ChatType} from "./msg";
+import { ChatType } from './msg'
 
 export interface CacheScanResult {
-    result: number,
-    size: [ // 单位为字节
+  result: number
+  size: [
+    // 单位为字节
     string, // 系统总存储空间
     string, // 系统可用存储空间
     string, // 系统已用存储空间
@@ -16,24 +17,24 @@ export interface CacheScanResult {
 }
 
 export interface ChatCacheList {
-    pageCount: number,
+  pageCount: number
   infos: ChatCacheListItem[]
 }
 
 export interface ChatCacheListItem {
-    chatType: ChatType,
-    basicChatCacheInfo: ChatCacheListItemBasic,
+  chatType: ChatType
+  basicChatCacheInfo: ChatCacheListItemBasic
   guildChatCacheInfo: unknown[] // TODO: 没用过频道所以不知道这里边的详细内容
 }
 
 export interface ChatCacheListItemBasic {
-    chatSize: string,
-    chatTime: string,
-    uid: string,
-    uin: string,
-    remarkName: string,
-    nickName: string,
-    chatType?: ChatType,
+  chatSize: string
+  chatTime: string
+  uid: string
+  uin: string
+  remarkName: string
+  nickName: string
+  chatType?: ChatType
   isChecked?: boolean
 }
 
@@ -46,20 +47,20 @@ export enum CacheFileType {
 }
 
 export interface CacheFileList {
-    infos: CacheFileListItem[],
+  infos: CacheFileListItem[]
 }
 
 export interface CacheFileListItem {
-    fileSize: string,
-    fileTime: string,
-    fileKey: string,
-    elementId: string,
-    elementIdStr: string,
-    fileType: CacheFileType,
-    path: string,
-    fileName: string,
-    senderId: string,
-    previewPath: string,
-    senderName: string,
-    isChecked?: boolean,
+  fileSize: string
+  fileTime: string
+  fileKey: string
+  elementId: string
+  elementIdStr: string
+  fileType: CacheFileType
+  path: string
+  fileName: string
+  senderId: string
+  previewPath: string
+  senderName: string
+  isChecked?: boolean
 }

src/ntqqapi/types/group.ts

@@ -1,55 +1,56 @@
-import {QQLevel, Sex} from "./user";
+import { QQLevel, Sex } from './user'
 
 export interface Group {
-    groupCode: string,
-    maxMember: number,
-    memberCount: number,
-    groupName: string,
-    groupStatus: 0,
-    memberRole: 2,
-    isTop: boolean,
-    toppedTimestamp: "0",
-    privilegeFlag: number, //65760
-    isConf: boolean,
-    hasModifyConfGroupFace: boolean,
-    hasModifyConfGroupName: boolean,
-    remarkName: string,
-    hasMemo: boolean,
-    groupShutupExpireTime: string, //"0",
-    personShutupExpireTime: string, //"0",
-    discussToGroupUin: string, //"0",
-    discussToGroupMaxMsgSeq: number,
-    discussToGroupTime: number,
-    groupFlagExt: number, //1073938496,
-    authGroupType: number, //0,
-    groupCreditLevel: number, //0,
-    groupFlagExt3: number, //0,
+  groupCode: string
+  maxMember: number
+  memberCount: number
+  groupName: string
+  groupStatus: 0
+  memberRole: 2
+  isTop: boolean
+  toppedTimestamp: '0'
+  privilegeFlag: number //65760
+  isConf: boolean
+  hasModifyConfGroupFace: boolean
+  hasModifyConfGroupName: boolean
+  remarkName: string
+  hasMemo: boolean
+  groupShutupExpireTime: string //"0",
+  personShutupExpireTime: string //"0",
+  discussToGroupUin: string //"0",
+  discussToGroupMaxMsgSeq: number
+  discussToGroupTime: number
+  groupFlagExt: number //1073938496,
+  authGroupType: number //0,
+  groupCreditLevel: number //0,
+  groupFlagExt3: number //0,
   groupOwnerId: {
-        "memberUin": string, //"0",
-        "memberUid": string, //"u_fbf8N7aeuZEnUiJAbQ9R8Q"
-    },
+    memberUin: string //"0",
+    memberUid: string //"u_fbf8N7aeuZEnUiJAbQ9R8Q"
+  }
   members: GroupMember[] // 原始数据是没有这个的，为了方便自己加了这个字段
 }
 
 export enum GroupMemberRole {
   normal = 2,
   admin = 3,
-    owner = 4
+  owner = 4,
 }
 
 export interface GroupMember {
-    avatarPath: string;
-    cardName: string;
-    cardType: number;
-    isDelete: boolean;
-    nick: string;
-    qid: string;
-    remark: string;
-    role: GroupMemberRole; // 群主:4, 管理员:3，群员:2
-    shutUpTime: number; // 禁言时间，单位是什么暂时不清楚
-    uid: string; // 加密的字符串
-    uin: string; // QQ号
-    isRobot: boolean;
+  memberSpecialTitle: string
+  avatarPath: string
+  cardName: string
+  cardType: number
+  isDelete: boolean
+  nick: string
+  qid: string
+  remark: string
+  role: GroupMemberRole // 群主:4, 管理员:3，群员:2
+  shutUpTime: number // 禁言时间，单位是什么暂时不清楚
+  uid: string // 加密的字符串
+  uin: string // QQ号
+  isRobot: boolean
   sex?: Sex
   qqLevel?: QQLevel
 }

src/ntqqapi/types/index.ts

@@ -1,7 +1,5 @@
-
-export * from './user';
-export * from './group';
-export * from './msg';
-export * from './notify';
-export * from './cache';
-
+export * from './user'
+export * from './group'
+export * from './msg'
+export * from './notify'
+export * from './cache'

src/ntqqapi/types/msg.ts

@@ -1,5 +1,5 @@
-import {GroupMemberRole} from "./group";
-import exp from "constants";
+import { GroupMemberRole } from './group'
+import exp from 'constants'
 
 export enum ElementType {
   TEXT = 1,
@@ -10,399 +10,406 @@ export enum ElementType {
   FACE = 6,
   REPLY = 7,
   ARK = 10,
+  MFACE = 11,
 }
 
 export interface SendTextElement {
-    elementType: ElementType.TEXT,
-    elementId: "",
+  elementType: ElementType.TEXT
+  elementId: ''
   textElement: {
-        content: string,
-        atType: number,
-        atUid: string,
-        atTinyId: string,
-        atNtUid: string,
+    content: string
+    atType: number
+    atUid: string
+    atTinyId: string
+    atNtUid: string
   }
 }
 
 export interface SendPttElement {
-    elementType: ElementType.PTT,
-    elementId: "",
+  elementType: ElementType.PTT
+  elementId: ''
   pttElement: {
-        fileName: string,
-        filePath: string,
-        md5HexStr: string,
-        fileSize: number,
-        duration: number,  // 单位是秒
-        formatType: number,
-        voiceType: number,
-        voiceChangeType: number,
-        canConvert2Text: boolean,
-        waveAmplitudes: number[],
-        fileSubId: "",
-        playState: number,
-        autoConvertText: number,
+    fileName: string
+    filePath: string
+    md5HexStr: string
+    fileSize: number
+    duration: number // 单位是秒
+    formatType: number
+    voiceType: number
+    voiceChangeType: number
+    canConvert2Text: boolean
+    waveAmplitudes: number[]
+    fileSubId: ''
+    playState: number
+    autoConvertText: number
   }
 }
 
 export enum PicType {
   gif = 2000,
-    jpg = 1000
+  jpg = 1000,
 }
 
 export enum PicSubType {
   normal = 0, // 普通图片，大图
-    face = 1  // 表情包小图
+  face = 1, // 表情包小图
 }
 
 export interface SendPicElement {
-    elementType: ElementType.PIC,
-    elementId: "",
+  elementType: ElementType.PIC
+  elementId: ''
   picElement: {
-        md5HexStr: string,
-        fileSize: number | string,
-        picWidth: number,
-        picHeight: number,
-        fileName: string,
-        sourcePath: string,
-        original: boolean,
-        picType: PicType,
-        picSubType: PicSubType,
-        fileUuid: string,
-        fileSubId: string,
-        thumbFileSize: number,
-        summary: string,
-    },
+    md5HexStr: string
+    fileSize: number | string
+    picWidth: number
+    picHeight: number
+    fileName: string
+    sourcePath: string
+    original: boolean
+    picType: PicType
+    picSubType: PicSubType
+    fileUuid: string
+    fileSubId: string
+    thumbFileSize: number
+    summary: string
+  }
 }
 
 export interface SendReplyElement {
-    elementType: ElementType.REPLY,
-    elementId: "",
+  elementType: ElementType.REPLY
+  elementId: ''
   replyElement: {
-        replayMsgSeq: string,
-        replayMsgId: string,
-        senderUin: string,
-        senderUinStr: string,
+    replayMsgSeq: string
+    replayMsgId: string
+    senderUin: string
+    senderUinStr: string
   }
 }
 
 export interface SendFaceElement {
-    elementType: ElementType.FACE,
-    elementId: "",
+  elementType: ElementType.FACE
+  elementId: ''
   faceElement: FaceElement
 }
 
+export interface SendMarketFaceElement {
+  elementType: ElementType.MFACE
+  marketFaceElement: MarketFaceElement
+}
+
 export interface FileElement {
-    "fileMd5"?: "",
-    "fileName": string,
-    "filePath": string,
-    "fileSize": string,
-    "picHeight"?: number,
-    "picWidth"?: number,
-    "picThumbPath"?: {},
-    "file10MMd5"?: "",
-    "fileSha"?: "",
-    "fileSha3"?: "",
-    "fileUuid"?: "",
-    "fileSubId"?: "",
-    "thumbFileSize"?: number,
+  fileMd5?: ''
+  fileName: string
+  filePath: string
+  fileSize: string
+  picHeight?: number
+  picWidth?: number
+  picThumbPath?: {}
+  file10MMd5?: ''
+  fileSha?: ''
+  fileSha3?: ''
+  fileUuid?: ''
+  fileSubId?: ''
+  thumbFileSize?: number
   fileBizId?: number
 }
 
 export interface SendFileElement {
   elementType: ElementType.FILE
-    elementId: "",
+  elementId: ''
   fileElement: FileElement
 }
 
 export interface SendVideoElement {
   elementType: ElementType.VIDEO
-    elementId: "",
+  elementId: ''
   videoElement: VideoElement
 }
 
 export interface SendArkElement {
-    elementType: ElementType.ARK,
-    elementId: "",
+  elementType: ElementType.ARK
+  elementId: ''
   arkElement: ArkElement
-
 }
 
-export type SendMessageElement = SendTextElement | SendPttElement |
-    SendPicElement | SendReplyElement | SendFaceElement | SendFileElement | SendVideoElement | SendArkElement
+export type SendMessageElement =
+  | SendTextElement
+  | SendPttElement
+  | SendPicElement
+  | SendReplyElement
+  | SendFaceElement
+  | SendMarketFaceElement
+  | SendFileElement
+  | SendVideoElement
+  | SendArkElement
 
 export enum AtType {
   notAt = 0,
   atAll = 1,
-    atUser = 2
+  atUser = 2,
 }
 
 export enum ChatType {
   friend = 1,
   group = 2,
-    temp = 100
+  temp = 100,
 }
 
 export interface PttElement {
-    canConvert2Text: boolean;
-    duration: number; // 秒数
-    fileBizId: null;
-    fileId: number; // 0
-    fileName: string; // "e4d09c784d5a2abcb2f9980bdc7acfe6.amr"
-    filePath: string; // "/Users//Library/Containers/com.tencent.qq/Data/Library/Application Support/QQ/nt_qq_a6b15c9820595d25a56c1633ce19ad40/nt_data/Ptt/2023-11/Ori/e4d09c784d5a2abcb2f9980bdc7acfe6.amr"
-    fileSize: string; // "4261"
-    fileSubId: string; // "0"
-    fileUuid: string; // "90j3z7rmRphDPrdVgP9udFBaYar#oK0TWZIV"
-    formatType: string; // 1
-    invalidState: number; // 0
-    md5HexStr: string; // "e4d09c784d5a2abcb2f9980bdc7acfe6"
-    playState: number; // 0
-    progress: number; // 0
-    text: string; // ""
-    transferStatus: number; // 0
-    translateStatus: number; // 0
-    voiceChangeType: number; // 0
-    voiceType: number; // 0
-    waveAmplitudes: number[];
+  canConvert2Text: boolean
+  duration: number // 秒数
+  fileBizId: null
+  fileId: number // 0
+  fileName: string // "e4d09c784d5a2abcb2f9980bdc7acfe6.amr"
+  filePath: string // "/Users//Library/Containers/com.tencent.qq/Data/Library/Application Support/QQ/nt_qq_a6b15c9820595d25a56c1633ce19ad40/nt_data/Ptt/2023-11/Ori/e4d09c784d5a2abcb2f9980bdc7acfe6.amr"
+  fileSize: string // "4261"
+  fileSubId: string // "0"
+  fileUuid: string // "90j3z7rmRphDPrdVgP9udFBaYar#oK0TWZIV"
+  formatType: string // 1
+  invalidState: number // 0
+  md5HexStr: string // "e4d09c784d5a2abcb2f9980bdc7acfe6"
+  playState: number // 0
+  progress: number // 0
+  text: string // ""
+  transferStatus: number // 0
+  translateStatus: number // 0
+  voiceChangeType: number // 0
+  voiceType: number // 0
+  waveAmplitudes: number[]
 }
 
 export interface ArkElement {
-    bytesData: string;
-    linkInfo: null,
+  bytesData: string
+  linkInfo: null
   subElementType: null
 }
 
-export const IMAGE_HTTP_HOST = "https://gchat.qpic.cn"
+export const IMAGE_HTTP_HOST = 'https://gchat.qpic.cn'
+export const IMAGE_HTTP_HOST_NT = 'https://multimedia.nt.qq.com.cn'
 
 export interface PicElement {
-    originImageUrl: string;  // http url, 没有host，host是https://gchat.qpic.cn/
-    sourcePath: string; // 图片本地路径
-    thumbPath: Map<number, string>;
-    picWidth: number;
-    picHeight: number;
-    fileSize: number;
-    fileName: string;
-    fileUuid: string;
-    md5HexStr?: string;
+  picType: PicType  // 有这玩意儿吗
+  originImageUrl: string // http url, 没有host，host是https://gchat.qpic.cn/, 带download参数的是https://multimedia.nt.qq.com.cn
+  originImageMd5?: string
+  sourcePath: string // 图片本地路径
+  thumbPath: Map<number, string>
+  picWidth: number
+  picHeight: number
+  fileSize: number
+  fileName: string
+  fileUuid: string
+  md5HexStr?: string
 }
 
 export enum GrayTipElementSubType {
+  RECALL = 1,
   INVITE_NEW_MEMBER = 12,
-    MEMBER_NEW_TITLE = 17
+  MEMBER_NEW_TITLE = 17,
 }
 
 export interface GrayTipElement {
-    subElementType: GrayTipElementSubType;
+  subElementType: GrayTipElementSubType
   revokeElement: {
-        operatorRole: string;
-        operatorUid: string;
-        operatorNick: string;
-        operatorRemark: string;
-        operatorMemRemark?: string;
-        wording: string;  // 自定义的撤回提示语
+    operatorRole: string
+    operatorUid: string
+    operatorNick: string
+    operatorRemark: string
+    operatorMemRemark?: string
+    origMsgSenderUid?: string
+    isSelfOperate?: boolean
+    wording: string // 自定义的撤回提示语
   }
-    aioOpGrayTipElement: TipAioOpGrayTipElement,
-    groupElement: TipGroupElement,
+  aioOpGrayTipElement: TipAioOpGrayTipElement
+  groupElement: TipGroupElement
   xmlElement: {
-        content: string;
-    },
-    jsonGrayTipElement: {
-        jsonStr: string;
+    templId: string
+    content: string
   }
+  jsonGrayTipElement: {
+    jsonStr: string
+  }
+}
+
+
+export enum FaceIndex {
+  dice = 358,
+  RPS = 359, // 石头剪刀布
 }
 
 export interface FaceElement {
-    faceIndex: number,
-    faceType: 1
+  faceIndex: number
+  faceType: number
+  faceText?: string
+  packId?: string
+  stickerId?: string
+  sourceType?: number
+  stickerType?: number
+  resultId?: string
+  surpriseId?: string
+  randomType?: number
 }
 
 export interface MarketFaceElement {
-    "itemType": 6,
-    "faceInfo": 1,
-    "emojiPackageId": 203875,
-    "subType": 3,
-    "mediaType": 0,
-    "imageWidth": 200,
-    "imageHeight": 200,
-    "faceName": string,
-    "emojiId": "094d53bd1c9ac5d35d04b08e8a6c992c",
-    "key": "a8b1dd0aebc8d910",
-    "param": null,
-    "mobileParam": null,
-    "sourceType": null,
-    "startTime": null,
-    "endTime": null,
-    "emojiType": 1,
-    "hasIpProduct": null,
-    "voiceItemHeightArr": null,
-    "sourceName": null,
-    "sourceJumpUrl": null,
-    "sourceTypeName": null,
-    "backColor": null,
-    "volumeColor": null,
-    "staticFacePath": "E:\\SystemDocuments\\QQ\\721011692\\nt_qq\\nt_data\\Emoji\\marketface\\203875\\094d53bd1c9ac5d35d04b08e8a6c992c_aio.png",
-    "dynamicFacePath": "E:\\SystemDocuments\\QQ\\721011692\\nt_qq\\nt_data\\Emoji\\marketface\\203875\\094d53bd1c9ac5d35d04b08e8a6c992c",
-    "supportSize": [
-        {
-            "width": 300,
-            "height": 300
-        },
-        {
-            "width": 200,
-            "height": 200
-        }
-    ],
-    "apngSupportSize": null
+  emojiPackageId: number
+  faceName?: string
+  emojiId: string
+  key: string
 }
 
 export interface VideoElement {
-    "filePath": string,
-    "fileName": string,
-    "videoMd5"?: string,
-    "thumbMd5"?: string
-    "fileTime"?: number, // second
-    "thumbSize"?: number, // byte
-    "fileFormat"?: number,  // 2表示mp4？
-    "fileSize"?: string,  // byte
-    "thumbWidth"?: number,
-    "thumbHeight"?: number,
-    "busiType"?: 0, // 未知
-    "subBusiType"?: 0, // 未知
-    "thumbPath"?: Map<number, any>,
-    "transferStatus"?: 0, // 未知
-    "progress"?: 0,  // 下载进度？
-    "invalidState"?: 0, // 未知
-    "fileUuid"?: string,  // 可以用于下载链接？
-    "fileSubId"?: "",
-    "fileBizId"?: null,
-    "originVideoMd5"?: "",
-    "import_rich_media_context"?: null,
-    "sourceVideoCodecFormat"?: number
+  filePath: string
+  fileName: string
+  videoMd5?: string
+  thumbMd5?: string
+  fileTime?: number // second
+  thumbSize?: number // byte
+  fileFormat?: number // 2表示mp4？
+  fileSize?: string // byte
+  thumbWidth?: number
+  thumbHeight?: number
+  busiType?: 0 // 未知
+  subBusiType?: 0 // 未知
+  thumbPath?: Map<number, any>
+  transferStatus?: 0 // 未知
+  progress?: 0 // 下载进度？
+  invalidState?: 0 // 未知
+  fileUuid?: string // 可以用于下载链接？
+  fileSubId?: ''
+  fileBizId?: null
+  originVideoMd5?: ''
+  import_rich_media_context?: null
+  sourceVideoCodecFormat?: number
 }
 
 export interface MarkdownElement {
-    content: string,
+  content: string
 }
 
 export interface InlineKeyboardElementRowButton {
-    "id": "",
-    "label": string,
-    "visitedLabel": string,
-    "style": 1, // 未知
-    "type": 2, // 未知
-    "clickLimit": 0,  // 未知
-    "unsupportTips": "请升级新版手机QQ",
-    "data": string,
-    "atBotShowChannelList": false,
-    "permissionType": 2,
-    "specifyRoleIds": [],
-    "specifyTinyids": [],
-    "isReply": false,
-    "anchor": 0,
-    "enter": false,
-    "subscribeDataTemplateIds": []
+  id: ''
+  label: string
+  visitedLabel: string
+  style: 1 // 未知
+  type: 2 // 未知
+  clickLimit: 0 // 未知
+  unsupportTips: '请升级新版手机QQ'
+  data: string
+  atBotShowChannelList: false
+  permissionType: 2
+  specifyRoleIds: []
+  specifyTinyids: []
+  isReply: false
+  anchor: 0
+  enter: false
+  subscribeDataTemplateIds: []
 }
 export interface InlineKeyboardElement {
-    rows: [{
+  rows: [
+    {
       buttons: InlineKeyboardElementRowButton[]
-    }]
+    },
+  ]
 }
 
-export interface TipAioOpGrayTipElement {  // 这是什么提示来着？
-    operateType: number,
-    peerUid: string,
-    fromGrpCodeOfTmpChat: string,
+export interface TipAioOpGrayTipElement {
+  // 这是什么提示来着？
+  operateType: number
+  peerUid: string
+  fromGrpCodeOfTmpChat: string
 }
 
 export enum TipGroupElementType {
   memberIncrease = 1,
   kicked = 3, // 被移出群
-    ban = 8
+  ban = 8,
 }
 
 export interface TipGroupElement {
-    "type": TipGroupElementType,  // 1是表示有人加入群, 自己加入群也会收到这个
-    "role": 0,  // 暂时不知
-    "groupName": string,  // 暂时获取不到
-    "memberUid": string,
-    "memberNick": string,
-    "memberRemark": string,
-    "adminUid": string,
-    "adminNick": string,
-    "adminRemark": string,
-    "createGroup": null,
-    "memberAdd"?: {
-        "showType": 1,
-        "otherAdd": null,
-        "otherAddByOtherQRCode": null,
-        "otherAddByYourQRCode": null,
-        "youAddByOtherQRCode": null,
-        "otherInviteOther": null,
-        "otherInviteYou": null,
-        "youInviteOther": null
-    },
-    "shutUp"?: {
-        "curTime": string,
-        "duration": string,  // 禁言时间，秒
-        "admin": {
-            "uid": string,
-            "card": string,
-            "name": string,
-            "role": GroupMemberRole
-        },
-        "member": {
-            "uid": string
-            "card": string,
-            "name": string,
-            "role": GroupMemberRole
+  type: TipGroupElementType // 1是表示有人加入群, 自己加入群也会收到这个
+  role: 0 // 暂时不知
+  groupName: string // 暂时获取不到
+  memberUid: string
+  memberNick: string
+  memberRemark: string
+  adminUid: string
+  adminNick: string
+  adminRemark: string
+  createGroup: null
+  memberAdd?: {
+    showType: 1
+    otherAdd: null
+    otherAddByOtherQRCode: null
+    otherAddByYourQRCode: null
+    youAddByOtherQRCode: null
+    otherInviteOther: null
+    otherInviteYou: null
+    youInviteOther: null
+  }
+  shutUp?: {
+    curTime: string
+    duration: string // 禁言时间，秒
+    admin: {
+      uid: string
+      card: string
+      name: string
+      role: GroupMemberRole
+    }
+    member: {
+      uid: string
+      card: string
+      name: string
+      role: GroupMemberRole
     }
   }
 }
 
 export interface MultiForwardMsgElement {
-    xmlContent: string,  // xml格式的消息内容
-    resId: string,
-    fileName: string,
+  xmlContent: string // xml格式的消息内容
+  resId: string
+  fileName: string
 }
 
 export interface RawMessage {
-    msgId: string;
-    msgShortId?: number;  // 自己维护的消息id
-    msgTime: string; // 时间戳，秒
-    msgSeq: string;
-    senderUid: string;
-    senderUin?: string; // 发送者QQ号
-    peerUid: string; // 群号 或者 QQ uid
-    peerUin: string; // 群号 或者 发送者QQ号
-    sendNickName: string;
-    sendMemberName?: string; // 发送者群名片
-    chatType: ChatType;
-    sendStatus?: number;  // 消息状态，别人发的2是已撤回，自己发的2是已发送
-    recallTime: string; // 撤回时间, "0"是没有撤回
+  msgId: string
+  msgType: number
+  subMsgType: number
+  msgShortId?: number // 自己维护的消息id
+  msgTime: string // 时间戳，秒
+  msgSeq: string
+  senderUid: string
+  senderUin?: string // 发送者QQ号
+  peerUid: string // 群号 或者 QQ uid
+  peerUin: string // 群号 或者 发送者QQ号
+  sendNickName: string
+  sendMemberName?: string // 发送者群名片
+  chatType: ChatType
+  sendStatus?: number // 消息状态，别人发的2是已撤回，自己发的2是已发送
+  recallTime: string // 撤回时间, "0"是没有撤回
   elements: {
-        elementId: string,
-        elementType: ElementType;
+    elementId: string
+    elementType: ElementType
     replyElement: {
-            senderUid: string; // 原消息发送者QQ号
-            sourceMsgIsIncPic: boolean; // 原消息是否有图片
-            sourceMsgText: string;
-            replayMsgSeq: string; // 源消息的msgSeq，可以通过这个找到源消息的msgId
-        };
-        textElement: {
-            atType: AtType;
-            atUid: string; // QQ号
-            content: string;
-            atNtUid: string; // uid号
-        };
-        picElement: PicElement;
-        pttElement: PttElement;
-        arkElement: ArkElement;
-        grayTipElement: GrayTipElement;
-        faceElement: FaceElement;
-        videoElement: VideoElement;
-        fileElement: FileElement;
-        marketFaceElement: MarketFaceElement;
-        inlineKeyboardElement: InlineKeyboardElement;
-        markdownElement: MarkdownElement;
-        multiForwardMsgElement: MultiForwardMsgElement;
-    }[];
+      senderUid: string // 原消息发送者QQ号
+      sourceMsgIsIncPic: boolean // 原消息是否有图片
+      sourceMsgText: string
+      replayMsgSeq: string // 源消息的msgSeq，可以通过这个找到源消息的msgId
+    }
+    textElement: {
+      atType: AtType
+      atUid: string // QQ号
+      content: string
+      atNtUid: string // uid号
+    }
+    picElement: PicElement
+    pttElement: PttElement
+    arkElement: ArkElement
+    grayTipElement: GrayTipElement
+    faceElement: FaceElement
+    videoElement: VideoElement
+    fileElement: FileElement
+    marketFaceElement: MarketFaceElement
+    inlineKeyboardElement: InlineKeyboardElement
+    markdownElement: MarkdownElement
+    multiForwardMsgElement: MultiForwardMsgElement
+  }[]
 }

src/ntqqapi/types/notify.ts

@@ -1,64 +1,65 @@
-
 export enum GroupNotifyTypes {
   INVITE_ME = 1,
   INVITED_JOIN = 4, // 有人接受了邀请入群
   JOIN_REQUEST = 7,
   ADMIN_SET = 8,
-    ADMIN_UNSET = 12,
-    MEMBER_EXIT = 11, // 主动退出?
-
+  KICK_MEMBER = 9,
+  MEMBER_EXIT = 11, // 主动退出
+  ADMIN_UNSET = 12, // 我被取消管理员
+  ADMIN_UNSET_OTHER = 13, // 其他人取消管理员
 }
 
 export interface GroupNotifies {
-    doubt: boolean,
-    nextStartSeq: string,
-    notifies: GroupNotify[],
+  doubt: boolean
+  nextStartSeq: string
+  notifies: GroupNotify[]
 }
 
 export enum GroupNotifyStatus {
   IGNORE = 0,
   WAIT_HANDLE = 1,
   APPROVE = 2,
-    REJECT = 3
+  REJECT = 3,
 }
 
 export interface GroupNotify {
-    time: number;  // 自己添加的字段，时间戳，毫秒, 用于判断收到短时间内收到重复的notify
-    seq: string, // 唯一标识符，转成数字再除以1000应该就是时间戳？
-    type: GroupNotifyTypes,
-    status: GroupNotifyStatus,  // 0是已忽略？，1是未处理，2是已同意
-    group: { groupCode: string, groupName: string },
-    user1: { uid: string, nickName: string }, // 被设置管理员的人
-    user2: { uid: string, nickName: string },  // 操作者
-    actionUser: { uid: string, nickName: string }, //未知
-    actionTime: string,
+  time: number // 自己添加的字段，时间戳，毫秒, 用于判断收到短时间内收到重复的notify
+  seq: string // 唯一标识符，转成数字再除以1000应该就是时间戳？
+  type: GroupNotifyTypes
+  status: GroupNotifyStatus // 0是已忽略？，1是未处理，2是已同意
+  group: { groupCode: string; groupName: string }
+  user1: { uid: string; nickName: string } // 被设置管理员的人
+  user2: { uid: string; nickName: string } // 操作者
+  actionUser: { uid: string; nickName: string } //未知
+  actionTime: string
   invitationExt: {
-        srcType: number,  // 0?未知
-        groupCode: string, waitStatus: number
-    },
-    postscript: string,  // 加群用户填写的验证信息
-    repeatSeqs: [],
+    srcType: number // 0?未知
+    groupCode: string
+    waitStatus: number
+  }
+  postscript: string // 加群用户填写的验证信息
+  repeatSeqs: []
   warningTips: string
 }
 
 export enum GroupRequestOperateTypes {
   approve = 1,
-    reject = 2
+  reject = 2,
 }
 
 export interface FriendRequest {
-    friendUid: string,
-    reqTime: string,  // 时间戳,秒
-    extWords: string,  // 申请人填写的验证消息
-    isUnread: boolean,
-    friendNick: string,
-    sourceId: number,
+  friendUid: string
+  reqTime: string // 时间戳,秒
+  extWords: string // 申请人填写的验证消息
+  isUnread: boolean
+  friendNick: string
+  sourceId: number
   groupCode: string
 }
 
 export interface FriendRequestNotify {
   data: {
-        unreadNums: number,
+    unreadNums: number
     buddyReqs: FriendRequest[]
   }
 }

src/ntqqapi/types/user.ts

@@ -5,71 +5,80 @@ export enum Sex {
 }
 
 export interface QQLevel {
-    "crownNum": number,
-    "sunNum": number,
-    "moonNum": number,
-    "starNum": number
+  crownNum: number
+  sunNum: number
+  moonNum: number
+  starNum: number
 }
+
 export interface User {
-    uid: string; // 加密的字符串
-    uin: string; // QQ号
-    nick: string;
-    avatarUrl?: string;
-    longNick?: string; // 签名
-    remark?: string;
-    sex?: Sex;
-    qqLevel?: QQLevel,
+  uid: string // 加密的字符串
+  uin: string // QQ号
+  nick: string
+  avatarUrl?: string
+  longNick?: string // 签名
+  remark?: string
+  sex?: Sex
+  qqLevel?: QQLevel
   qid?: string
-    "birthday_year"?: number,
-    "birthday_month"?: number,
-    "birthday_day"?: number,
-    "topTime"?: string,
-    "constellation"?: number,
-    "shengXiao"?: number,
-    "kBloodType"?: number,
-    "homeTown"?: string, //"0-0-0",
-    "makeFriendCareer"?: number,
-    "pos"?: string,
-    "eMail"?: string
-    "phoneNum"?: string,
-    "college"?: string,
-    "country"?: string,
-    "province"?: string,
-    "city"?: string,
-    "postCode"?: string,
-    "address"?: string,
-    "isBlock"?: boolean,
-    "isSpecialCareOpen"?: boolean,
-    "isSpecialCareZone"?: boolean,
-    "ringId"?: string,
-    "regTime"?: number,
-    interest?: string,
-    "labels"?: string[],
-    "isHideQQLevel"?: number,
-    "privilegeIcon"?: {
-        "jumpUrl": string,
-        "openIconList": unknown[],
-        "closeIconList": unknown[]
-    },
-    "photoWall"?: {
-        "picList": unknown[]
-    },
-    "vipFlag"?: boolean,
-    "yearVipFlag"?: boolean,
-    "svipFlag"?: boolean,
-    "vipLevel"?: number,
-    "status"?: number,
-    "qidianMasterFlag"?: number,
-    "qidianCrewFlag"?: number,
-    "qidianCrewFlag2"?: number,
-    "extStatus"?: number,
-    "recommendImgFlag"?: number,
-    "disableEmojiShortCuts"?: number,
-    "pendantId"?: string,
+  birthday_year?: number
+  birthday_month?: number
+  birthday_day?: number
+  topTime?: string
+  constellation?: number
+  shengXiao?: number
+  kBloodType?: number
+  homeTown?: string //"0-0-0",
+  makeFriendCareer?: number
+  pos?: string
+  eMail?: string
+  phoneNum?: string
+  college?: string
+  country?: string
+  province?: string
+  city?: string
+  postCode?: string
+  address?: string
+  isBlock?: boolean
+  isSpecialCareOpen?: boolean
+  isSpecialCareZone?: boolean
+  ringId?: string
+  regTime?: number
+  interest?: string
+  labels?: string[]
+  isHideQQLevel?: number
+  privilegeIcon?: {
+    jumpUrl: string
+    openIconList: unknown[]
+    closeIconList: unknown[]
+  }
+  photoWall?: {
+    picList: unknown[]
+  }
+  vipFlag?: boolean
+  yearVipFlag?: boolean
+  svipFlag?: boolean
+  vipLevel?: number
+  status?: number
+  qidianMasterFlag?: number
+  qidianCrewFlag?: number
+  qidianCrewFlag2?: number
+  extStatus?: number
+  recommendImgFlag?: number
+  disableEmojiShortCuts?: number
+  pendantId?: string
 }
 
 export interface SelfInfo extends User {
-    online?: boolean;
+  online?: boolean
 }
 
-export interface Friend extends User {}
+export interface Friend extends User {
+}
+
+export interface CategoryFriend {
+  categoryId: number;
+  categroyName: string;
+  categroyMbCount: number;
+  buddyList: User[]
+}

src/onebot11/action/BaseAction.ts

@@ -1,8 +1,8 @@
-import {ActionName, BaseCheckResult} from "./types"
-import {OB11Response} from "./OB11Response"
-import {OB11Return} from "../types";
+import { ActionName, BaseCheckResult } from './types'
+import { OB11Response } from './OB11Response'
+import { OB11Return } from '../types'
 
-import {log} from "../../common/utils/log";
+import { log } from '../../common/utils/log'
 
 class BaseAction<PayloadType, ReturnDataType> {
   actionName: ActionName
@@ -14,16 +14,16 @@ class BaseAction<PayloadType, ReturnDataType> {
   }
 
   public async handle(payload: PayloadType): Promise<OB11Return<ReturnDataType | null>> {
-        const result = await this.check(payload);
+    const result = await this.check(payload)
     if (!result.valid) {
-            return OB11Response.error(result.message, 400);
+      return OB11Response.error(result.message, 400)
     }
     try {
-            const resData = await this._handle(payload);
-            return OB11Response.ok(resData);
+      const resData = await this._handle(payload)
+      return OB11Response.ok(resData)
     } catch (e) {
-            log("发生错误", e)
-            return OB11Response.error(e?.toString() || e?.stack?.toString() || "未知错误，可能操作超时", 200);
+      log('发生错误', e)
+      return OB11Response.error(e?.toString() || e?.stack?.toString() || '未知错误，可能操作超时', 200)
     }
   }
 
@@ -34,15 +34,15 @@ class BaseAction<PayloadType, ReturnDataType> {
     }
     try {
       const resData = await this._handle(payload)
-            return OB11Response.ok(resData, echo);
+      return OB11Response.ok(resData, echo)
     } catch (e) {
-            log("发生错误", e)
+      log('发生错误', e)
       return OB11Response.error(e.stack?.toString() || e.toString(), 1200, echo)
     }
   }
 
   protected async _handle(payload: PayloadType): Promise<ReturnDataType> {
-        throw `pleas override ${this.actionName} _handle`;
+    throw `pleas override ${this.actionName} _handle`
   }
 }
 

src/onebot11/action/OB11Response.ts

@@ -1,32 +1,32 @@
-import {OB11Return} from '../types';
+import { OB11Return } from '../types'
 
-import {isNull} from "../../common/utils/helper";
+import { isNull } from '../../common/utils/helper'
 
 export class OB11Response {
-    static res<T>(data: T, status: string, retcode: number, message: string = ""): OB11Return<T> {
+  static res<T>(data: T, status: string, retcode: number, message: string = ''): OB11Return<T> {
     return {
       status: status,
       retcode: retcode,
       data: data,
       message: message,
       wording: message,
-            echo: null
+      echo: null,
     }
   }
 
   static ok<T>(data: T, echo: any = null) {
-        let res = OB11Response.res<T>(data, "ok", 0)
+    let res = OB11Response.res<T>(data, 'ok', 0)
     if (!isNull(echo)) {
-            res.echo = echo;
+      res.echo = echo
     }
-        return res;
+    return res
   }
 
   static error(err: string, retcode: number, echo: any = null) {
-        let res = OB11Response.res(null, "failed", retcode, err)
+    let res = OB11Response.res(null, 'failed', retcode, err)
     if (!isNull(echo)) {
-            res.echo = echo;
+      res.echo = echo
     }
-        return res;
+    return res
   }
 }

src/onebot11/action/file/GetFile.ts

@@ -1,11 +1,12 @@
-import BaseAction from "../BaseAction";
-import fs from "fs/promises";
-import {dbUtil} from "../../../common/db";
-import {getConfigUtil} from "../../../common/config";
-import {log, sleep, uri2local} from "../../../common/utils";
-import {NTQQFileApi} from "../../../ntqqapi/api/file";
-import {ActionName} from "../types";
-import {FileElement, RawMessage, VideoElement} from "../../../ntqqapi/types";
+import BaseAction from '../BaseAction'
+import fs from 'fs/promises'
+import { dbUtil } from '@/common/db'
+import { getConfigUtil } from '@/common/config'
+import { log, sleep, uri2local } from '@/common/utils'
+import { NTQQFileApi } from '@/ntqqapi/api'
+import { ActionName } from '../types'
+import { FileElement, RawMessage, VideoElement } from '@/ntqqapi/types'
+import { FileCache } from '@/common/types'
 
 export interface GetFilePayload {
   file: string // 文件名或者fileUuid
@@ -19,15 +20,31 @@ export interface GetFileResponse {
   base64?: string
 }
 
-
 export class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
-    private getElement(msg: RawMessage): {id: string, element: VideoElement | FileElement}{
-        let element =  msg.elements.find(e=>e.fileElement)
+  private getElement(msg: RawMessage, elementId: string): VideoElement | FileElement {
+    let element = msg.elements.find((e) => e.elementId === elementId)
     if (!element) {
-            element = msg.elements.find(e=>e.videoElement)
-            return {id: element.elementId, element: element.videoElement}
+      throw new Error('element not found')
+    }
+    return element.fileElement
+  }
+  private async download(cache: FileCache, file: string) {
+    log('需要调用 NTQQ 下载文件api')
+    if (cache.msgId) {
+      let msg = await dbUtil.getMsgByLongId(cache.msgId)
+      if (msg) {
+        log('找到了文件 msg', msg)
+        let element = this.getElement(msg, cache.elementId)
+        log('找到了文件 element', element)
+        // 构建下载函数
+        await NTQQFileApi.downloadMedia(msg.msgId, msg.chatType, msg.peerUid, cache.elementId, '', '', true)
+        await sleep(1000)  // 这里延时是为何？
+        msg = await dbUtil.getMsgByLongId(cache.msgId)
+        log('下载完成后的msg', msg)
+        cache.filePath = this.getElement(msg, cache.elementId).filePath
+        dbUtil.addFileCache(file, cache).then()
+      }
     }
-        return {id: element.elementId, element: element.fileElement}
   }
   protected async _handle(payload: GetFilePayload): Promise<GetFileResponse> {
     const cache = await dbUtil.getFileCache(payload.file)
@@ -41,50 +58,32 @@ export class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
     try {
       await fs.access(cache.filePath, fs.constants.F_OK)
     } catch (e) {
-            log("file not found", e)
+      // log("file not found", e)
       if (cache.url) {
         const downloadResult = await uri2local(cache.url)
         if (downloadResult.success) {
           cache.filePath = downloadResult.path
           dbUtil.addFileCache(payload.file, cache).then()
         } else {
-                    throw new Error("file download failed. " + downloadResult.errMsg)
+          await this.download(cache, payload.file)
         }
-            }
-            else{
+      } else {
         // 没有url的可能是私聊文件或者群文件，需要自己下载
-                log("需要调用 NTQQ 下载文件api")
-                if (cache.msgId) {
-                    let msg = await dbUtil.getMsgByLongId(cache.msgId)
-                    if (msg){
-                        log("找到了文件 msg", msg)
-                        let element = this.getElement(msg);
-                        log("找到了文件 element", element);
-                        // 构建下载函数
-                        await NTQQFileApi.downloadMedia(msg.msgId, msg.chatType, msg.peerUid,
-                            element.id, "", "", true)
-                        await sleep(1000);
-                        msg = await dbUtil.getMsgByLongId(cache.msgId)
-                        log("下载完成后的msg", msg)
-                        cache.filePath = this.getElement(msg).element.filePath
-                        dbUtil.addFileCache(payload.file, cache).then()
+        await this.download(cache, payload.file)
       }
     }
-            }
-
-        }
     let res: GetFileResponse = {
       file: cache.filePath,
       url: cache.url,
       file_size: cache.fileSize,
-            file_name: cache.fileName
+      file_name: cache.fileName,
     }
     if (enableLocalFile2Url) {
       if (!cache.url) {
         try {
           res.base64 = await fs.readFile(cache.filePath, 'base64')
         } catch (e) {
-                    throw new Error("文件下载失败. " + e)
+          throw new Error('文件下载失败. ' + e)
         }
       }
     }
@@ -100,11 +99,11 @@ export class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
 export default class GetFile extends GetFileBase {
   actionName = ActionName.GetFile
 
-    protected async _handle(payload: {file_id: string, file: string}): Promise<GetFileResponse> {
+  protected async _handle(payload: { file_id: string; file: string }): Promise<GetFileResponse> {
     if (!payload.file_id) {
       throw new Error('file_id 不能为空')
     }
     payload.file = payload.file_id
-        return super._handle(payload);
+    return super._handle(payload)
   }
 }

src/onebot11/action/file/GetImage.ts

@@ -1,6 +1,5 @@
-import {GetFileBase} from "./GetFile";
-import {ActionName} from "../types";
-
+import { GetFileBase } from './GetFile'
+import { ActionName } from '../types'
 
 export default class GetImage extends GetFileBase {
   actionName = ActionName.GetImage

src/onebot11/action/file/GetRecord.ts

@@ -1,5 +1,5 @@
-import {GetFileBase, GetFilePayload, GetFileResponse} from "./GetFile";
-import {ActionName} from "../types";
+import { GetFileBase, GetFilePayload, GetFileResponse } from './GetFile'
+import { ActionName } from '../types'
 
 interface Payload extends GetFilePayload {
   out_format: 'mp3' | 'amr' | 'wma' | 'm4a' | 'spx' | 'ogg' | 'wav' | 'flac'
@@ -9,7 +9,7 @@ export default class GetRecord extends GetFileBase {
   actionName = ActionName.GetRecord
 
   protected async _handle(payload: Payload): Promise<GetFileResponse> {
-        let res = super._handle(payload);
-        return res;
+    let res = super._handle(payload)
+    return res
   }
 }

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

@@ -1,9 +1,9 @@
-import BaseAction from "../BaseAction";
-import {ActionName} from "../types";
-import fs from "fs";
-import {join as joinPath} from "node:path";
-import {calculateFileMD5, httpDownload, TEMP_DIR} from "../../../common/utils";
-import {v4 as uuid4} from "uuid";
+import BaseAction from '../BaseAction'
+import { ActionName } from '../types'
+import fs from 'fs'
+import { join as joinPath } from 'node:path'
+import { calculateFileMD5, httpDownload, TEMP_DIR } from '../../../common/utils'
+import { v4 as uuid4 } from 'uuid'
 
 interface Payload {
   thread_count?: number
@@ -22,52 +22,51 @@ export default class GoCQHTTPDownloadFile extends BaseAction<Payload, FileRespon
 
   protected async _handle(payload: Payload): Promise<FileResponse> {
     const isRandomName = !payload.name
-        let name = payload.name || uuid4();
-        const filePath = joinPath(TEMP_DIR, name);
+    let name = payload.name || uuid4()
+    const filePath = joinPath(TEMP_DIR, name)
 
     if (payload.base64) {
       fs.writeFileSync(filePath, payload.base64, 'base64')
     } else if (payload.url) {
-            const headers = this.getHeaders(payload.headers);
+      const headers = this.getHeaders(payload.headers)
       let buffer = await httpDownload({ url: payload.url, headers: headers })
-            fs.writeFileSync(filePath, Buffer.from(buffer), 'binary');
+      fs.writeFileSync(filePath, Buffer.from(buffer), 'binary')
     } else {
-            throw new Error("不存在任何文件, 无法下载")
+      throw new Error('不存在任何文件, 无法下载')
     }
     if (fs.existsSync(filePath)) {
-
       if (isRandomName) {
         // 默认实现要名称未填写时文件名为文件 md5
-                const md5 = await calculateFileMD5(filePath);
-                const newPath = joinPath(TEMP_DIR, md5);
-                fs.renameSync(filePath, newPath);
+        const md5 = await calculateFileMD5(filePath)
+        const newPath = joinPath(TEMP_DIR, md5)
+        fs.renameSync(filePath, newPath)
         return { file: newPath }
       }
       return { file: filePath }
     } else {
-            throw new Error("文件写入失败, 检查权限")
+      throw new Error('文件写入失败, 检查权限')
     }
   }
 
   getHeaders(headersIn?: string | string[]): Record<string, string> {
-        const headers = {};
+    const headers = {}
     if (typeof headersIn == 'string') {
-            headersIn = headersIn.split('[\\r\\n]');
+      headersIn = headersIn.split('[\\r\\n]')
     }
     if (Array.isArray(headersIn)) {
       for (const headerItem of headersIn) {
-                const spilt = headerItem.indexOf('=');
+        const spilt = headerItem.indexOf('=')
         if (spilt < 0) {
-                    headers[headerItem] = "";
+          headers[headerItem] = ''
         } else {
-                    const key = headerItem.substring(0, spilt);
-                    headers[key] = headerItem.substring(0, spilt + 1);
+          const key = headerItem.substring(0, spilt)
+          headers[key] = headerItem.substring(0, spilt + 1)
         }
       }
     }
     if (!headers['Content-Type']) {
-            headers['Content-Type'] = 'application/octet-stream';
+      headers['Content-Type'] = 'application/octet-stream'
     }
-        return headers;
+    return headers
   }
 }

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

@@ -1,12 +1,13 @@
-import BaseAction from "../BaseAction";
-import {OB11ForwardMessage, OB11Message, OB11MessageData} from "../../types";
-import {NTQQMsgApi, Peer} from "../../../ntqqapi/api";
-import {dbUtil} from "../../../common/db";
-import {OB11Constructor} from "../../constructor";
-import {ActionName} from "../types";
+import BaseAction from '../BaseAction'
+import { OB11ForwardMessage, OB11Message, OB11MessageData } from '../../types'
+import { NTQQMsgApi, Peer } from '../../../ntqqapi/api'
+import { dbUtil } from '../../../common/db'
+import { OB11Constructor } from '../../constructor'
+import { ActionName } from '../types'
 
 interface Payload {
-    message_id: string;  // long msg id
+  message_id: string // long msg id，gocq
+  id?: string // long msg id, onebot11
 }
 
 interface Response {
@@ -16,23 +17,33 @@ interface Response{
 export class GoCQHTTGetForwardMsgAction extends BaseAction<Payload, any> {
   actionName = ActionName.GoCQHTTP_GetForwardMsg
   protected async _handle(payload: Payload): Promise<any> {
-        const rootMsg = await dbUtil.getMsgByLongId(payload.message_id)
-        if (!rootMsg){
-            throw Error("msg not found")
+    const message_id = payload.id || payload.message_id
+    if (!message_id) {
+      throw Error('message_id不能为空')
     }
-        let data = await NTQQMsgApi.getMultiMsg({chatType: rootMsg.chatType, peerUid: rootMsg.peerUid}, rootMsg.msgId, rootMsg.msgId)
+    const rootMsg = await dbUtil.getMsgByLongId(message_id)
+    if (!rootMsg) {
+      throw Error('msg not found')
+    }
+    let data = await NTQQMsgApi.getMultiMsg(
+      { chatType: rootMsg.chatType, peerUid: rootMsg.peerUid },
+      rootMsg.msgId,
+      rootMsg.msgId,
+    )
     if (data.result !== 0) {
-            throw Error("找不到相关的聊天记录" + data.errMsg)
+      throw Error('找不到相关的聊天记录' + data.errMsg)
     }
     let msgList = data.msgList
-        let messages = await Promise.all(msgList.map(async msg => {
+    let messages = await Promise.all(
+      msgList.map(async (msg) => {
         let resMsg = await OB11Constructor.message(msg)
-            resMsg.message_id = await dbUtil.addMsg(msg);
+        resMsg.message_id = await dbUtil.addMsg(msg)
         return resMsg
-        }))
-        messages.map(msg => {
-            (<OB11ForwardMessage>msg).content = msg.message;
-            delete msg.message;
+      }),
+    )
+    messages.map((msg) => {
+      ;(<OB11ForwardMessage>msg).content = msg.message
+      delete msg.message
     })
     return { messages }
   }

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

@@ -1,17 +1,16 @@
-import BaseAction from "../BaseAction";
-import {OB11Message, OB11User} from "../../types";
-import {groups} from "../../../common/data";
-import {ActionName} from "../types";
-import {ChatType} from "../../../ntqqapi/types";
-import {dbUtil} from "../../../common/db";
-import {NTQQMsgApi} from "../../../ntqqapi/api/msg";
-import {OB11Constructor} from "../../constructor";
-import {log} from "../../../common/utils";
-
+import BaseAction from '../BaseAction'
+import { OB11Message, OB11User } from '../../types'
+import { groups } from '../../../common/data'
+import { ActionName } from '../types'
+import { ChatType } from '../../../ntqqapi/types'
+import { dbUtil } from '../../../common/db'
+import { NTQQMsgApi } from '../../../ntqqapi/api/msg'
+import { OB11Constructor } from '../../constructor'
+import { log } from '../../../common/utils'
 
 interface Payload {
   group_id: number
-    message_seq: number,
+  message_seq: number
   count: number
 }
 
@@ -23,17 +22,25 @@ export default class GoCQHTTPGetGroupMsgHistory extends BaseAction<Payload, Resp
   actionName = ActionName.GoCQHTTP_GetGroupMsgHistory
 
   protected async _handle(payload: Payload): Promise<Response> {
-        const group = groups.find(group => group.groupCode === payload.group_id.toString())
+    const group = groups.find((group) => group.groupCode === payload.group_id.toString())
     if (!group) {
       throw `群${payload.group_id}不存在`
     }
-        const startMsgId = (await dbUtil.getMsgByShortId(payload.message_seq))?.msgId || "0"
+    const startMsgId = (await dbUtil.getMsgByShortId(payload.message_seq))?.msgId || '0'
     // log("startMsgId", startMsgId)
-        let msgList = (await NTQQMsgApi.getMsgHistory({chatType: ChatType.group, peerUid: group.groupCode}, startMsgId, parseInt(payload.count?.toString()) || 20)).msgList
-        await Promise.all(msgList.map(async msg => {
+    let msgList = (
+      await NTQQMsgApi.getMsgHistory(
+        { chatType: ChatType.group, peerUid: group.groupCode },
+        startMsgId,
+        parseInt(payload.count?.toString()) || 20,
+      )
+    ).msgList
+    await Promise.all(
+      msgList.map(async (msg) => {
         msg.msgShortId = await dbUtil.addMsg(msg)
-        }))
-        const ob11MsgList = await Promise.all(msgList.map(msg=>OB11Constructor.message(msg)))
-        return {"messages": ob11MsgList}
+      }),
+    )
+    const ob11MsgList = await Promise.all(msgList.map((msg) => OB11Constructor.message(msg)))
+    return { messages: ob11MsgList }
   }
 }

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

@@ -1,10 +1,9 @@
-import BaseAction from "../BaseAction";
-import {OB11User} from "../../types";
-import {getUidByUin, uidMaps} from "../../../common/data";
-import {OB11Constructor} from "../../constructor";
-import {ActionName} from "../types";
-import {NTQQUserApi} from "../../../ntqqapi/api/user";
-
+import BaseAction from '../BaseAction'
+import { OB11User } from '../../types'
+import { getUidByUin, uidMaps } from '../../../common/data'
+import { OB11Constructor } from '../../constructor'
+import { ActionName } from '../types'
+import { NTQQUserApi } from '../../../ntqqapi/api/user'
 
 export default class GoCQHTTPGetStrangerInfo extends BaseAction<{ user_id: number }, OB11User> {
   actionName = ActionName.GoCQHTTP_GetStrangerInfo
@@ -13,8 +12,8 @@ export default class GoCQHTTPGetStrangerInfo extends BaseAction<{ user_id: numbe
     const user_id = payload.user_id.toString()
     const uid = getUidByUin(user_id)
     if (!uid) {
-            throw new Error("查无此人")
+      throw new Error('查无此人')
     }
-        return OB11Constructor.stranger(await NTQQUserApi.getUserDetailInfo(uid))
+    return OB11Constructor.stranger(await NTQQUserApi.getUserDetailInfo(uid, true))
   }
 }

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

@@ -0,0 +1,17 @@
+import BaseAction from '../BaseAction'
+import { handleQuickOperation, QuickOperation, QuickOperationEvent } from '../quick-operation'
+import { log } from '@/common/utils'
+import { ActionName } from '../types'
+
+interface Payload{
+  context: QuickOperationEvent,
+  operation: QuickOperation
+}
+
+export class GoCQHTTHandleQuickOperation extends BaseAction<Payload, null>{
+  actionName = ActionName.GoCQHTTP_HandleQuickOperation
+  protected async _handle(payload: Payload): Promise<null> {
+    handleQuickOperation(payload.context, payload.operation).then().catch(log);
+    return null
+  }
+}

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

@@ -1,20 +1,20 @@
-import SendMsg, {convertMessage2List} from "../msg/SendMsg";
-import {OB11PostSendMsg} from "../../types";
-import {ActionName} from "../types";
+import SendMsg, { convertMessage2List } from '../msg/SendMsg'
+import { OB11PostSendMsg } from '../../types'
+import { ActionName } from '../types'
 
 export class GoCQHTTPSendForwardMsg extends SendMsg {
-    actionName = ActionName.GoCQHTTP_SendForwardMsg;
+  actionName = ActionName.GoCQHTTP_SendForwardMsg
 
   protected async check(payload: OB11PostSendMsg) {
-        if (payload.messages) payload.message = convertMessage2List(payload.messages);
-        return super.check(payload);
+    if (payload.messages) payload.message = convertMessage2List(payload.messages)
+    return super.check(payload)
   }
 }
 
 export class GoCQHTTPSendPrivateForwardMsg extends GoCQHTTPSendForwardMsg {
-    actionName = ActionName.GoCQHTTP_SendPrivateForwardMsg;
+  actionName = ActionName.GoCQHTTP_SendPrivateForwardMsg
 }
 
 export class GoCQHTTPSendGroupForwardMsg extends GoCQHTTPSendForwardMsg {
-    actionName = ActionName.GoCQHTTP_SendGroupForwardMsg;
+  actionName = ActionName.GoCQHTTP_SendGroupForwardMsg
 }

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

@@ -0,0 +1,49 @@
+import BaseAction from '../BaseAction'
+import { getGroup, getUidByUin } from '../../../common/data'
+import { ActionName } from '../types'
+import { SendMsgElementConstructor } from '../../../ntqqapi/constructor'
+import { ChatType, SendFileElement } from '../../../ntqqapi/types'
+import fs from 'fs'
+import { NTQQMsgApi, Peer } from '../../../ntqqapi/api/msg'
+import { uri2local } from '../../../common/utils'
+
+interface Payload {
+  user_id: number
+  group_id?: number
+  file: string
+  name: string
+  folder: string
+}
+
+class GoCQHTTPUploadFileBase extends BaseAction<Payload, null> {
+  actionName = ActionName.GoCQHTTP_UploadGroupFile
+
+  getPeer(payload: Payload): Peer {
+    if (payload.user_id) {
+      return { chatType: ChatType.friend, peerUid: getUidByUin(payload.user_id.toString()) }
+    }
+    return { chatType: ChatType.group, peerUid: payload.group_id.toString() }
+  }
+
+  protected async _handle(payload: Payload): Promise<null> {
+    let file = payload.file
+    if (fs.existsSync(file)) {
+      file = `file://${file}`
+    }
+    const downloadResult = await uri2local(file)
+    if (downloadResult.errMsg) {
+      throw new Error(downloadResult.errMsg)
+    }
+    let sendFileEle: SendFileElement = await SendMsgElementConstructor.file(downloadResult.path, payload.name)
+    await NTQQMsgApi.sendMsg(this.getPeer(payload), [sendFileEle])
+    return null
+  }
+}
+
+export class GoCQHTTPUploadGroupFile extends GoCQHTTPUploadFileBase {
+  actionName = ActionName.GoCQHTTP_UploadGroupFile
+}
+
+export class GoCQHTTPUploadPrivateFile extends GoCQHTTPUploadFileBase {
+  actionName = ActionName.GoCQHTTP_UploadPrivateFile
+}

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

@@ -1,37 +0,0 @@
-import BaseAction from "../BaseAction";
-import {getGroup} from "../../../common/data";
-import {ActionName} from "../types";
-import {SendMsgElementConstructor} from "../../../ntqqapi/constructor";
-import {ChatType, SendFileElement} from "../../../ntqqapi/types";
-import fs from "fs";
-import {NTQQMsgApi} from "../../../ntqqapi/api/msg";
-import {uri2local} from "../../../common/utils";
-
-interface Payload{
-    group_id: number
-    file: string
-    name: string
-    folder: string
-}
-
-export default class GoCQHTTPUploadGroupFile extends BaseAction<Payload, null> {
-    actionName = ActionName.GoCQHTTP_UploadGroupFile
-
-    protected async _handle(payload: Payload): Promise<null> {
-        const group = await getGroup(payload.group_id.toString());
-        if (!group){
-            throw new Error(`群组${payload.group_id}不存在`)
-        }
-        let file = payload.file;
-        if (fs.existsSync(file)){
-            file = `file://${file}`
-        }
-        const downloadResult = await uri2local(file);
-        if (downloadResult.errMsg){
-            throw new Error(downloadResult.errMsg)
-        }
-        let sendFileEle: SendFileElement = await SendMsgElementConstructor.file(downloadResult.path, payload.name);
-        await NTQQMsgApi.sendMsg({chatType: ChatType.group, peerUid: group.groupCode}, [sendFileEle]);
-        return null
-    }
-}

src/onebot11/action/group/GetGroupEssence.ts

@@ -0,0 +1,24 @@
+import { GroupEssenceMsgRet, WebApi } from "@/ntqqapi/api";
+import BaseAction from "../BaseAction";
+import { ActionName } from "../types";
+
+interface PayloadType {
+  group_id: number;
+  pages?: number;
+}
+
+export class GetGroupEssence extends BaseAction<PayloadType, GroupEssenceMsgRet> {
+  actionName = ActionName.GoCQHTTP_GetEssenceMsg;
+
+  protected async _handle(payload: PayloadType) {
+    throw '此 api 暂不支持'
+    const ret = await WebApi.getGroupEssenceMsg(payload.group_id.toString(), payload.pages?.toString() || '0');
+    if (!ret) {
+      throw new Error('获取失败');
+    }
+    // ret.map((item) => {
+    //
+    // })
+    return ret;
+  }
+}

src/onebot11/action/group/GetGroupHonorInfo.ts

@@ -0,0 +1,22 @@
+import { WebApi, WebHonorType } from "@/ntqqapi/api";
+import { ActionName } from "../types";
+import BaseAction from "../BaseAction";
+
+interface Payload {
+  group_id: number,
+  type?: WebHonorType
+}
+export class GetGroupHonorInfo extends BaseAction<Payload, Array<any>> {
+  actionName = ActionName.GetGroupHonorInfo;
+
+  protected async _handle(payload: Payload) {
+    // console.log(await NTQQUserApi.getRobotUinRange());
+    if (!payload.group_id) {
+      throw '缺少参数group_id';
+    }
+    if (!payload.type) {
+      payload.type = WebHonorType.ALL;
+    }
+    return await WebApi.getGroupHonorInfo(payload.group_id.toString(), payload.type);
+  }
+}

src/onebot11/action/group/GetGroupInfo.ts

@@ -1,8 +1,8 @@
-import {OB11Group} from '../../types';
-import {getGroup} from "../../../common/data";
-import {OB11Constructor} from "../../constructor";
-import BaseAction from "../BaseAction";
-import {ActionName} from "../types";
+import { OB11Group } from '../../types'
+import { getGroup } from '../../../common/data'
+import { OB11Constructor } from '../../constructor'
+import BaseAction from '../BaseAction'
+import { ActionName } from '../types'
 
 interface PayloadType {
   group_id: number

src/onebot11/action/group/GetGroupList.ts

@@ -1,21 +1,27 @@
-import {OB11Group} from '../../types';
-import {OB11Constructor} from "../../constructor";
-import {groups} from "../../../common/data";
-import BaseAction from "../BaseAction";
-import {ActionName} from "../types";
-import {NTQQGroupApi} from "../../../ntqqapi/api";
-import {log} from "../../../common/utils";
+import { OB11Group } from '../../types'
+import { OB11Constructor } from '../../constructor'
+import { groups } from '../../../common/data'
+import BaseAction from '../BaseAction'
+import { ActionName } from '../types'
+import { NTQQGroupApi } from '../../../ntqqapi/api'
+import { log } from '../../../common/utils'
 
+interface Payload {
+  no_cache: boolean | string
+}
 
-class GetGroupList extends BaseAction<null, OB11Group[]> {
+class GetGroupList extends BaseAction<Payload, OB11Group[]> {
   actionName = ActionName.GetGroupList
 
-    protected async _handle(payload: null) {
-        // if (groups.length === 0) {
-        //     const groups = await NTQQGroupApi.getGroups(true)
-        //     log("get groups", groups)
-        // }
-        return OB11Constructor.groups(groups);
+  protected async _handle(payload: Payload) {
+    if (groups.length === 0 || payload?.no_cache === true || payload?.no_cache === 'true') {
+      try {
+        const groups = await NTQQGroupApi.getGroups(true)
+        log('强制刷新群列表, 数量:', groups.length)
+        return OB11Constructor.groups(groups)
+      } catch (e) {}
+    }
+    return OB11Constructor.groups(groups)
   }
 }
 

src/onebot11/action/group/GetGroupMemberInfo.ts

@@ -1,12 +1,11 @@
-import {OB11GroupMember} from '../../types';
-import {getGroupMember} from "../../../common/data";
-import {OB11Constructor} from "../../constructor";
-import BaseAction from "../BaseAction";
-import {ActionName} from "../types";
-import {NTQQUserApi} from "../../../ntqqapi/api/user";
-import {log} from "../../../common/utils/log";
-import {isNull} from "../../../common/utils/helper";
-
+import { OB11GroupMember } from '../../types'
+import { getGroupMember } from '../../../common/data'
+import { OB11Constructor } from '../../constructor'
+import BaseAction from '../BaseAction'
+import { ActionName } from '../types'
+import { NTQQUserApi } from '../../../ntqqapi/api/user'
+import { log } from '../../../common/utils/log'
+import { isNull } from '../../../common/utils/helper'
 
 export interface PayloadType {
   group_id: number
@@ -20,14 +19,14 @@ class GetGroupMemberInfo extends BaseAction<PayloadType, OB11GroupMember> {
     const member = await getGroupMember(payload.group_id.toString(), payload.user_id.toString())
     if (member) {
       if (isNull(member.sex)) {
-                log("获取群成员详细信息")
-                let info = (await NTQQUserApi.getUserDetailInfo(member.uid))
-                log("群成员详细信息结果", info)
-                Object.assign(member, info);
+        log('获取群成员详细信息')
+        let info = await NTQQUserApi.getUserDetailInfo(member.uid, true)
+        log('群成员详细信息结果', info)
+        Object.assign(member, info)
       }
       return OB11Constructor.groupMember(payload.group_id.toString(), member)
     } else {
-            throw (`群成员${payload.user_id}不存在`)
+      throw `群成员${payload.user_id}不存在`
     }
   }
 }

src/onebot11/action/group/GetGroupMemberList.ts

@@ -1,27 +1,29 @@
-import {OB11GroupMember} from '../../types';
-import {getGroup} from "../../../common/data";
-import {OB11Constructor} from "../../constructor";
-import BaseAction from "../BaseAction";
-import {ActionName} from "../types";
-import {NTQQGroupApi} from "../../../ntqqapi/api/group";
+import { OB11GroupMember } from '../../types'
+import { getGroup } from '../../../common/data'
+import { OB11Constructor } from '../../constructor'
+import BaseAction from '../BaseAction'
+import { ActionName } from '../types'
+import { NTQQGroupApi } from '../../../ntqqapi/api/group'
+import { log } from '../../../common/utils'
 
 export interface PayloadType {
   group_id: number
+  no_cache: boolean | string
 }
 
-
 class GetGroupMemberList extends BaseAction<PayloadType, OB11GroupMember[]> {
   actionName = ActionName.GetGroupMemberList
 
   protected async _handle(payload: PayloadType) {
-        const group = await getGroup(payload.group_id.toString());
+    const group = await getGroup(payload.group_id.toString())
     if (group) {
-            if (!group.members?.length) {
+      if (!group.members?.length || payload.no_cache === true || payload.no_cache === 'true') {
         group.members = await NTQQGroupApi.getGroupMembers(payload.group_id.toString())
+        log('强制刷新群成员列表, 数量: ', group.members.length)
       }
-            return OB11Constructor.groupMembers(group);
+      return OB11Constructor.groupMembers(group)
     } else {
-            throw (`群${payload.group_id}不存在`)
+      throw `群${payload.group_id}不存在`
     }
   }
 }

src/onebot11/action/group/GetGuildList.ts

@@ -1,10 +1,10 @@
-import BaseAction from "../BaseAction";
-import {ActionName} from "../types";
+import BaseAction from '../BaseAction'
+import { ActionName } from '../types'
 
 export default class GetGuildList extends BaseAction<null, null> {
   actionName = ActionName.GetGuildList
 
   protected async _handle(payload: null): Promise<null> {
-        return null;
+    return null
   }
 }

src/onebot11/action/group/SendGroupMsg.ts

@@ -1,17 +1,16 @@
-import SendMsg from "../msg/SendMsg";
-import {ActionName, BaseCheckResult} from "../types";
-import {OB11PostSendMsg} from "../../types";
-
-import {log} from "../../../common/utils/log";
+import SendMsg from '../msg/SendMsg'
+import { ActionName, BaseCheckResult } from '../types'
+import { OB11PostSendMsg } from '../../types'
 
+import { log } from '../../../common/utils/log'
 
 class SendGroupMsg extends SendMsg {
   actionName = ActionName.SendGroupMsg
 
   protected async check(payload: OB11PostSendMsg): Promise<BaseCheckResult> {
-        delete payload.user_id;
-        payload.message_type = "group"
-        return super.check(payload);
+    delete payload.user_id
+    payload.message_type = 'group'
+    return super.check(payload)
   }
 }
 

src/onebot11/action/group/SetGroupAddRequest.ts

@@ -1,13 +1,13 @@
-import BaseAction from "../BaseAction";
-import {GroupRequestOperateTypes} from "../../../ntqqapi/types";
-import {ActionName} from "../types";
-import {NTQQGroupApi} from "../../../ntqqapi/api/group";
+import BaseAction from '../BaseAction'
+import { GroupRequestOperateTypes } from '../../../ntqqapi/types'
+import { ActionName } from '../types'
+import { NTQQGroupApi } from '../../../ntqqapi/api/group'
 
 interface Payload {
-    flag: string,
+  flag: string
   // sub_type: "add" | "invite",
   // type: "add" | "invite"
-    approve: boolean,
+  approve: boolean
   reason: string
 }
 
@@ -15,11 +15,12 @@ export default class SetGroupAddRequest extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupAddRequest
 
   protected async _handle(payload: Payload): Promise<null> {
-        const seq = payload.flag.toString();
-        const approve = payload.approve.toString() === "true";
-        await NTQQGroupApi.handleGroupRequest(seq,
+    const seq = payload.flag.toString()
+    const approve = payload.approve.toString() === 'true'
+    await NTQQGroupApi.handleGroupRequest(
+      seq,
       approve ? GroupRequestOperateTypes.approve : GroupRequestOperateTypes.reject,
-            payload.reason
+      payload.reason,
     )
     return null
   }

src/onebot11/action/group/SetGroupAdmin.ts

@@ -1,12 +1,12 @@
-import BaseAction from "../BaseAction";
-import {getGroupMember} from "../../../common/data";
-import {GroupMemberRole} from "../../../ntqqapi/types";
-import {ActionName} from "../types";
-import {NTQQGroupApi} from "../../../ntqqapi/api/group";
+import BaseAction from '../BaseAction'
+import { getGroupMember } from '../../../common/data'
+import { GroupMemberRole } from '../../../ntqqapi/types'
+import { ActionName } from '../types'
+import { NTQQGroupApi } from '../../../ntqqapi/api/group'
 
 interface Payload {
-    group_id: number,
-    user_id: number,
+  group_id: number
+  user_id: number
   enable: boolean
 }
 
@@ -15,11 +15,15 @@ export default class SetGroupAdmin extends BaseAction<Payload, null> {
 
   protected async _handle(payload: Payload): Promise<null> {
     const member = await getGroupMember(payload.group_id, payload.user_id)
-        const enable = payload.enable.toString() === "true"
+    const enable = payload.enable.toString() === 'true'
     if (!member) {
       throw `群成员${payload.user_id}不存在`
     }
-        await NTQQGroupApi.setMemberRole(payload.group_id.toString(), member.uid, enable ? GroupMemberRole.admin : GroupMemberRole.normal)
+    await NTQQGroupApi.setMemberRole(
+      payload.group_id.toString(),
+      member.uid,
+      enable ? GroupMemberRole.admin : GroupMemberRole.normal,
+    )
     return null
   }
 }

src/onebot11/action/group/SetGroupBan.ts

@@ -1,11 +1,11 @@
-import BaseAction from "../BaseAction";
-import {getGroupMember} from "../../../common/data";
-import {ActionName} from "../types";
-import {NTQQGroupApi} from "../../../ntqqapi/api/group";
+import BaseAction from '../BaseAction'
+import { getGroupMember } from '../../../common/data'
+import { ActionName } from '../types'
+import { NTQQGroupApi } from '../../../ntqqapi/api/group'
 
 interface Payload {
-    group_id: number,
-    user_id: number,
+  group_id: number
+  user_id: number
   duration: number
 }
 
@@ -17,8 +17,9 @@ export default class SetGroupBan extends BaseAction<Payload, null> {
     if (!member) {
       throw `群成员${payload.user_id}不存在`
     }
-        await NTQQGroupApi.banMember(payload.group_id.toString(),
-            [{uid: member.uid, timeStamp: parseInt(payload.duration.toString())}])
+    await NTQQGroupApi.banMember(payload.group_id.toString(), [
+      { uid: member.uid, timeStamp: parseInt(payload.duration.toString()) },
+    ])
     return null
   }
 }

src/onebot11/action/group/SetGroupCard.ts

@@ -1,11 +1,11 @@
-import BaseAction from "../BaseAction";
-import {getGroupMember} from "../../../common/data";
-import {ActionName} from "../types";
-import {NTQQGroupApi} from "../../../ntqqapi/api/group";
+import BaseAction from '../BaseAction'
+import { getGroupMember } from '../../../common/data'
+import { ActionName } from '../types'
+import { NTQQGroupApi } from '../../../ntqqapi/api/group'
 
 interface Payload {
-    group_id: number,
-    user_id: number,
+  group_id: number
+  user_id: number
   card: string
 }
 
@@ -17,7 +17,7 @@ export default class SetGroupCard extends BaseAction<Payload, null> {
     if (!member) {
       throw `群成员${payload.user_id}不存在`
     }
-        await NTQQGroupApi.setMemberCard(payload.group_id.toString(), member.uid, payload.card || "")
+    await NTQQGroupApi.setMemberCard(payload.group_id.toString(), member.uid, payload.card || '')
     return null
   }
 }

src/onebot11/action/group/SetGroupKick.ts

@@ -1,11 +1,11 @@
-import BaseAction from "../BaseAction";
-import {getGroupMember} from "../../../common/data";
-import {ActionName} from "../types";
-import {NTQQGroupApi} from "../../../ntqqapi/api/group";
+import BaseAction from '../BaseAction'
+import { getGroupMember } from '../../../common/data'
+import { ActionName } from '../types'
+import { NTQQGroupApi } from '../../../ntqqapi/api/group'
 
 interface Payload {
-    group_id: number,
-    user_id: number,
+  group_id: number
+  user_id: number
   reject_add_request: boolean
 }
 
@@ -17,7 +17,7 @@ export default class SetGroupKick extends BaseAction<Payload, null> {
     if (!member) {
       throw `群成员${payload.user_id}不存在`
     }
-        await NTQQGroupApi.kickMember(payload.group_id.toString(), [member.uid], !!payload.reject_add_request);
+    await NTQQGroupApi.kickMember(payload.group_id.toString(), [member.uid], !!payload.reject_add_request)
     return null
   }
 }

src/onebot11/action/group/SetGroupLeave.ts

@@ -1,10 +1,10 @@
-import BaseAction from "../BaseAction";
-import {ActionName} from "../types";
-import {NTQQGroupApi} from "../../../ntqqapi/api/group";
-import {log} from "../../../common/utils/log";
+import BaseAction from '../BaseAction'
+import { ActionName } from '../types'
+import { NTQQGroupApi } from '../../../ntqqapi/api/group'
+import { log } from '../../../common/utils/log'
 
 interface Payload {
-    group_id: number,
+  group_id: number
   is_dismiss: boolean
 }
 
@@ -15,7 +15,7 @@ export default class SetGroupLeave extends BaseAction<Payload, any> {
     try {
       await NTQQGroupApi.quitGroup(payload.group_id.toString())
     } catch (e) {
-            log("退群失败", e)
+      log('退群失败', e)
       throw e
     }
   }

src/onebot11/action/group/SetGroupName.ts

@@ -1,9 +1,9 @@
-import BaseAction from "../BaseAction";
-import {ActionName} from "../types";
-import {NTQQGroupApi} from "../../../ntqqapi/api/group";
+import BaseAction from '../BaseAction'
+import { ActionName } from '../types'
+import { NTQQGroupApi } from '../../../ntqqapi/api/group'
 
 interface Payload {
-    group_id: number,
+  group_id: number
   group_name: string
 }
 
@@ -11,7 +11,6 @@ export default class SetGroupName extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupName
 
   protected async _handle(payload: Payload): Promise<null> {
-
     await NTQQGroupApi.setGroupName(payload.group_id.toString(), payload.group_name)
     return null
   }

src/onebot11/action/group/SetGroupWholeBan.ts

@@ -1,9 +1,9 @@
-import BaseAction from "../BaseAction";
-import {ActionName} from "../types";
-import {NTQQGroupApi} from "../../../ntqqapi/api/group";
+import BaseAction from '../BaseAction'
+import { ActionName } from '../types'
+import { NTQQGroupApi } from '../../../ntqqapi/api/group'
 
 interface Payload {
-    group_id: number,
+  group_id: number
   enable: boolean
 }
 
@@ -11,7 +11,7 @@ export default class SetGroupWholeBan extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupWholeBan
 
   protected async _handle(payload: Payload): Promise<null> {
-        const enable = payload.enable.toString() === "true"
+    const enable = payload.enable.toString() === 'true'
     await NTQQGroupApi.banGroup(payload.group_id.toString(), enable)
     return null
   }

src/onebot11/action/index.ts

@@ -1,6 +1,6 @@
 import GetMsg from './msg/GetMsg'
 import GetLoginInfo from './system/GetLoginInfo'
-import GetFriendList from './user/GetFriendList'
+import { GetFriendList, GetFriendWithCategory} from './user/GetFriendList'
 import GetGroupList from './group/GetGroupList'
 import GetGroupInfo from './group/GetGroupInfo'
 import GetGroupMemberList from './group/GetGroupMemberList'
@@ -8,38 +8,48 @@ import GetGroupMemberInfo from './group/GetGroupMemberInfo'
 import SendGroupMsg from './group/SendGroupMsg'
 import SendPrivateMsg from './msg/SendPrivateMsg'
 import SendMsg from './msg/SendMsg'
-import DeleteMsg from "./msg/DeleteMsg";
-import BaseAction from "./BaseAction";
-import GetVersionInfo from "./system/GetVersionInfo";
-import CanSendRecord from "./system/CanSendRecord";
-import CanSendImage from "./system/CanSendImage";
-import GetStatus from "./system/GetStatus";
-import {GoCQHTTPSendForwardMsg, GoCQHTTPSendGroupForwardMsg, GoCQHTTPSendPrivateForwardMsg} from "./go-cqhttp/SendForwardMsg";
-import GoCQHTTPGetStrangerInfo from "./go-cqhttp/GetStrangerInfo";
-import SendLike from "./user/SendLike";
-import SetGroupAddRequest from "./group/SetGroupAddRequest";
-import SetGroupLeave from "./group/SetGroupLeave";
-import GetGuildList from "./group/GetGuildList";
-import Debug from "./llonebot/Debug";
-import SetFriendAddRequest from "./user/SetFriendAddRequest";
-import SetGroupWholeBan from "./group/SetGroupWholeBan";
-import SetGroupName from "./group/SetGroupName";
-import SetGroupBan from "./group/SetGroupBan";
-import SetGroupKick from "./group/SetGroupKick";
-import SetGroupAdmin from "./group/SetGroupAdmin";
-import SetGroupCard from "./group/SetGroupCard";
-import GetImage from "./file/GetImage";
-import GetRecord from "./file/GetRecord";
-import GoCQHTTPMarkMsgAsRead from "./msg/MarkMsgAsRead";
-import CleanCache from "./system/CleanCache";
-import GoCQHTTPUploadGroupFile from "./go-cqhttp/UploadGroupFile";
-import {GetConfigAction, SetConfigAction} from "./llonebot/Config";
-import GetGroupAddRequest from "./llonebot/GetGroupAddRequest";
+import DeleteMsg from './msg/DeleteMsg'
+import BaseAction from './BaseAction'
+import GetVersionInfo from './system/GetVersionInfo'
+import CanSendRecord from './system/CanSendRecord'
+import CanSendImage from './system/CanSendImage'
+import GetStatus from './system/GetStatus'
+import {
+  GoCQHTTPSendForwardMsg,
+  GoCQHTTPSendGroupForwardMsg,
+  GoCQHTTPSendPrivateForwardMsg,
+} from './go-cqhttp/SendForwardMsg'
+import GoCQHTTPGetStrangerInfo from './go-cqhttp/GetStrangerInfo'
+import SendLike from './user/SendLike'
+import SetGroupAddRequest from './group/SetGroupAddRequest'
+import SetGroupLeave from './group/SetGroupLeave'
+import GetGuildList from './group/GetGuildList'
+import Debug from './llonebot/Debug'
+import SetFriendAddRequest from './user/SetFriendAddRequest'
+import SetGroupWholeBan from './group/SetGroupWholeBan'
+import SetGroupName from './group/SetGroupName'
+import SetGroupBan from './group/SetGroupBan'
+import SetGroupKick from './group/SetGroupKick'
+import SetGroupAdmin from './group/SetGroupAdmin'
+import SetGroupCard from './group/SetGroupCard'
+import GetImage from './file/GetImage'
+import GetRecord from './file/GetRecord'
+import GoCQHTTPMarkMsgAsRead from './msg/MarkMsgAsRead'
+import CleanCache from './system/CleanCache'
+import { GoCQHTTPUploadGroupFile, GoCQHTTPUploadPrivateFile } from './go-cqhttp/UploadFile'
+import { GetConfigAction, SetConfigAction } from './llonebot/Config'
+import GetGroupAddRequest from './llonebot/GetGroupAddRequest'
 import SetQQAvatar from './llonebot/SetQQAvatar'
-import GoCQHTTPDownloadFile from "./go-cqhttp/DownloadFile";
-import GoCQHTTPGetGroupMsgHistory from "./go-cqhttp/GetGroupMsgHistory";
-import GetFile from "./file/GetFile";
-import {GoCQHTTGetForwardMsgAction} from "./go-cqhttp/GetForwardMsg";
+import GoCQHTTPDownloadFile from './go-cqhttp/DownloadFile'
+import GoCQHTTPGetGroupMsgHistory from './go-cqhttp/GetGroupMsgHistory'
+import GetFile from './file/GetFile'
+import { GoCQHTTGetForwardMsgAction } from './go-cqhttp/GetForwardMsg'
+import { GetCookies } from './user/GetCookie'
+import { SetMsgEmojiLike } from './msg/SetMsgEmojiLike'
+import { ForwardFriendSingleMsg, ForwardSingleGroupMsg } from './msg/ForwardSingleMsg'
+import { GetGroupEssence } from './group/GetGroupEssence'
+import { GetGroupHonorInfo } from './group/GetGroupHonorInfo'
+import { GoCQHTTHandleQuickOperation } from './go-cqhttp/QuickOperation'
 
 export const actionHandlers = [
   new GetFile(),
@@ -48,13 +58,19 @@ export const actionHandlers = [
   new SetConfigAction(),
   new GetGroupAddRequest(),
   new SetQQAvatar(),
+  new GetFriendWithCategory(),
   // onebot11
   new SendLike(),
   new GetMsg(),
   new GetLoginInfo(),
   new GetFriendList(),
-    new GetGroupList(), new GetGroupInfo(), new GetGroupMemberList(), new GetGroupMemberInfo(),
-    new SendGroupMsg(), new SendPrivateMsg(), new SendMsg(),
+  new GetGroupList(),
+  new GetGroupInfo(),
+  new GetGroupMemberList(),
+  new GetGroupMemberInfo(),
+  new SendGroupMsg(),
+  new SendPrivateMsg(),
+  new SendMsg(),
   new DeleteMsg(),
   new SetGroupAddRequest(),
   new SetFriendAddRequest(),
@@ -72,8 +88,13 @@ export const actionHandlers = [
   new GetImage(),
   new GetRecord(),
   new CleanCache(),
-
+  new GetCookies(),
+  new SetMsgEmojiLike(),
+  new ForwardFriendSingleMsg(),
+  new ForwardSingleGroupMsg(),
   //以下为go-cqhttp api
+  new GetGroupEssence(),
+  new GetGroupHonorInfo(),
   new GoCQHTTPSendForwardMsg(),
   new GoCQHTTPSendGroupForwardMsg(),
   new GoCQHTTPSendPrivateForwardMsg(),
@@ -82,18 +103,21 @@ export const actionHandlers = [
   new GetGuildList(),
   new GoCQHTTPMarkMsgAsRead(),
   new GoCQHTTPUploadGroupFile(),
+  new GoCQHTTPUploadPrivateFile(),
   new GoCQHTTPGetGroupMsgHistory(),
   new GoCQHTTGetForwardMsgAction(),
-
+  new GoCQHTTHandleQuickOperation()
 ]
 
 function initActionMap() {
-    const actionMap = new Map<string, BaseAction<any, any>>();
+  const actionMap = new Map<string, BaseAction<any, any>>()
   for (const action of actionHandlers) {
-        actionMap.set(action.actionName, action);
+    actionMap.set(action.actionName, action)
+    actionMap.set(action.actionName + '_async', action)
+    actionMap.set(action.actionName + '_rate_limited', action)
   }
 
   return actionMap
 }
 
-export const actionMap = initActionMap();
+export const actionMap = initActionMap()

src/onebot11/action/llonebot/Config.ts

@@ -1,9 +1,8 @@
-import BaseAction from "../BaseAction";
-import {Config} from "../../../common/types";
-import {ActionName} from "../types";
-import {setConfig} from "../../../main/setConfig";
-import {getConfigUtil} from "../../../common/config";
-
+import BaseAction from '../BaseAction'
+import { Config } from '../../../common/types'
+import { ActionName } from '../types'
+import { setConfig } from '../../../main/setConfig'
+import { getConfigUtil } from '../../../common/config'
 
 export class GetConfigAction extends BaseAction<null, Config> {
   actionName = ActionName.GetConfig
@@ -15,6 +14,6 @@ export class GetConfigAction extends BaseAction<null, Config> {
 export class SetConfigAction extends BaseAction<Config, void> {
   actionName = ActionName.SetConfig
   protected async _handle(payload: Config): Promise<void> {
-        setConfig(payload).then();
+    setConfig(payload).then()
   }
 }

src/onebot11/action/llonebot/Debug.ts

@@ -1,4 +1,4 @@
-import BaseAction from "../BaseAction";
+import BaseAction from '../BaseAction'
 // import * as ntqqApi from "../../../ntqqapi/api";
 import {
   NTQQMsgApi,
@@ -8,27 +8,27 @@ import {
   NTQQFileApi,
   NTQQFileCacheApi,
   NTQQWindowApi,
-} from "../../../ntqqapi/api";
-import {ActionName} from "../types";
-import {log} from "../../../common/utils/log";
+} from '../../../ntqqapi/api'
+import { ActionName } from '../types'
+import { log } from '../../../common/utils/log'
 
 interface Payload {
-    method: string,
-    args: any[],
+  method: string
+  args: any[]
 }
 
 export default class Debug extends BaseAction<Payload, any> {
   actionName = ActionName.Debug
 
   protected async _handle(payload: Payload): Promise<any> {
-        log("debug call ntqq api", payload);
+    log('debug call ntqq api', payload)
     const ntqqApi = [NTQQMsgApi, NTQQFriendApi, NTQQGroupApi, NTQQUserApi, NTQQFileApi, NTQQFileCacheApi, NTQQWindowApi]
     for (const ntqqApiClass of ntqqApi) {
-            log("ntqqApiClass", ntqqApiClass)
+      log('ntqqApiClass', ntqqApiClass)
       const method = ntqqApiClass[payload.method]
       if (method) {
-                const result = method(...payload.args);
-                if (method.constructor.name === "AsyncFunction") {
+        const result = method(...payload.args)
+        if (method.constructor.name === 'AsyncFunction') {
           return await result
         }
         return result

src/onebot11/action/llonebot/GetGroupAddRequest.ts

@@ -1,14 +1,14 @@
-import {GroupNotify, GroupNotifyStatus} from "../../../ntqqapi/types";
-import BaseAction from "../BaseAction";
-import {ActionName} from "../types";
-import {uidMaps} from "../../../common/data";
-import {NTQQUserApi} from "../../../ntqqapi/api/user";
-import {NTQQGroupApi} from "../../../ntqqapi/api/group";
-import {log} from "../../../common/utils/log";
+import { GroupNotify, GroupNotifyStatus } from '../../../ntqqapi/types'
+import BaseAction from '../BaseAction'
+import { ActionName } from '../types'
+import { uidMaps } from '../../../common/data'
+import { NTQQUserApi } from '../../../ntqqapi/api/user'
+import { NTQQGroupApi } from '../../../ntqqapi/api/group'
+import { log } from '../../../common/utils/log'
 
 interface OB11GroupRequestNotify {
-    group_id: number,
-    user_id: number,
+  group_id: number
+  user_id: number
   flag: string
 }
 
@@ -17,17 +17,17 @@ export default class GetGroupAddRequest extends BaseAction<null, OB11GroupReques
 
   protected async _handle(payload: null): Promise<OB11GroupRequestNotify[]> {
     const data = await NTQQGroupApi.getGroupIgnoreNotifies()
-        log(data);
-        let notifies: GroupNotify[] = data.notifies.filter(notify => notify.status === GroupNotifyStatus.WAIT_HANDLE);
+    log(data)
+    let notifies: GroupNotify[] = data.notifies.filter((notify) => notify.status === GroupNotifyStatus.WAIT_HANDLE)
     let returnData: OB11GroupRequestNotify[] = []
     for (const notify of notifies) {
       const uin = uidMaps[notify.user1.uid] || (await NTQQUserApi.getUserDetailInfo(notify.user1.uid))?.uin
       returnData.push({
         group_id: parseInt(notify.group.groupCode),
         user_id: parseInt(uin),
-                flag: notify.seq
+        flag: notify.seq,
       })
     }
-        return returnData;
+    return returnData
   }
 }

src/onebot11/action/llonebot/SetQQAvatar.ts

@@ -1,8 +1,8 @@
-import BaseAction from "../BaseAction";
-import {ActionName} from "../types";
-import * as fs from "node:fs";
-import {NTQQUserApi} from "../../../ntqqapi/api/user";
-import {checkFileReceived, uri2local} from "../../../common/utils/file";
+import BaseAction from '../BaseAction'
+import { ActionName } from '../types'
+import * as fs from 'node:fs'
+import { NTQQUserApi } from '../../../ntqqapi/api/user'
+import { checkFileReceived, uri2local } from '../../../common/utils/file'
 // import { log } from "../../../common/utils";
 
 interface Payload {
@@ -13,12 +13,12 @@ export default class SetAvatar extends BaseAction<Payload, null> {
   actionName = ActionName.SetQQAvatar
 
   protected async _handle(payload: Payload): Promise<null> {
-        const {path, isLocal, errMsg} = (await uri2local(payload.file))
+    const { path, isLocal, errMsg } = await uri2local(payload.file)
     if (errMsg) {
       throw `头像${payload.file}设置失败,file字段可能格式不正确`
     }
     if (path) {
-            await checkFileReceived(path, 5000); // 文件不存在QQ会崩溃，需要提前判断
+      await checkFileReceived(path, 5000) // 文件不存在QQ会崩溃，需要提前判断
       const ret = await NTQQUserApi.setQQAvatar(path)
       if (!isLocal) {
         fs.unlink(path, () => {})

src/onebot11/action/msg/DeleteMsg.ts

@@ -1,7 +1,7 @@
-import {ActionName} from "../types";
-import BaseAction from "../BaseAction";
-import {dbUtil} from "../../../common/db";
-import {NTQQMsgApi} from "../../../ntqqapi/api/msg";
+import { ActionName } from '../types'
+import BaseAction from '../BaseAction'
+import { dbUtil } from '../../../common/db'
+import { NTQQMsgApi } from '../../../ntqqapi/api/msg'
 
 interface Payload {
   message_id: number
@@ -12,10 +12,16 @@ class DeleteMsg extends BaseAction<Payload, void> {
 
   protected async _handle(payload: Payload) {
     let msg = await dbUtil.getMsgByShortId(payload.message_id)
-        await NTQQMsgApi.recallMsg({
+    if (!msg) {
+      throw `消息${payload.message_id}不存在`
+    }
+    await NTQQMsgApi.recallMsg(
+      {
         chatType: msg.chatType,
-            peerUid: msg.peerUid
-        }, [msg.msgId])
+        peerUid: msg.peerUid,
+      },
+      [msg.msgId],
+    )
   }
 }
 

src/onebot11/action/msg/ForwardSingleMsg.ts

@@ -0,0 +1,48 @@
+import BaseAction from '../BaseAction'
+import { NTQQMsgApi, Peer } from '../../../ntqqapi/api'
+import { ChatType, RawMessage } from '../../../ntqqapi/types'
+import { dbUtil } from '../../../common/db'
+import { getUidByUin } from '../../../common/data'
+import { ActionName } from '../types'
+
+interface Payload {
+  message_id: number
+  group_id: number
+  user_id?: number
+}
+
+interface Response {
+  message_id: number
+}
+
+class ForwardSingleMsg extends BaseAction<Payload, Response> {
+  protected async getTargetPeer(payload: Payload): Promise<Peer> {
+    if (payload.user_id) {
+      return { chatType: ChatType.friend, peerUid: getUidByUin(payload.user_id.toString()) }
+    }
+    return { chatType: ChatType.group, peerUid: payload.group_id.toString() }
+  }
+
+  protected async _handle(payload: Payload): Promise<Response> {
+    const msg = await dbUtil.getMsgByShortId(payload.message_id)
+    const peer = await this.getTargetPeer(payload)
+    const sentMsg = await NTQQMsgApi.forwardMsg(
+      {
+        chatType: msg.chatType,
+        peerUid: msg.peerUid,
+      },
+      peer,
+      [msg.msgId],
+    )
+    const ob11MsgId = await dbUtil.addMsg(sentMsg)
+    return {message_id: ob11MsgId}
+  }
+}
+
+export class ForwardFriendSingleMsg extends ForwardSingleMsg {
+  actionName = ActionName.ForwardFriendSingleMsg
+}
+
+export class ForwardSingleGroupMsg extends ForwardSingleMsg {
+  actionName = ActionName.ForwardGroupSingleMsg
+}

src/onebot11/action/msg/GetMsg.ts

@@ -1,9 +1,8 @@
-import {OB11Message} from '../../types';
-import {OB11Constructor} from "../../constructor";
-import BaseAction from "../BaseAction";
-import {ActionName} from "../types";
-import {dbUtil} from "../../../common/db";
-
+import { OB11Message } from '../../types'
+import { OB11Constructor } from '../../constructor'
+import BaseAction from '../BaseAction'
+import { ActionName } from '../types'
+import { dbUtil } from '../../../common/db'
 
 export interface PayloadType {
   message_id: number
@@ -17,14 +16,14 @@ class GetMsg extends BaseAction<PayloadType, OB11Message> {
   protected async _handle(payload: PayloadType) {
     // log("history msg ids", Object.keys(msgHistory));
     if (!payload.message_id) {
-            throw ("参数message_id不能为空")
+      throw '参数message_id不能为空'
     }
     let msg = await dbUtil.getMsgByShortId(payload.message_id)
     if (!msg) {
       msg = await dbUtil.getMsgByLongId(payload.message_id.toString())
     }
     if (!msg) {
-            throw ("消息不存在")
+      throw '消息不存在'
     }
     return await OB11Constructor.message(msg)
   }

src/onebot11/action/msg/MarkMsgAsRead.ts

@@ -1,5 +1,5 @@
-import BaseAction from "../BaseAction";
-import {ActionName} from "../types";
+import BaseAction from '../BaseAction'
+import { ActionName } from '../types'
 
 interface Payload {
   message_id: number

src/onebot11/action/msg/SendMsg.ts

@@ -2,73 +2,80 @@ import {
   AtType,
   ChatType,
   ElementType,
-    Group, PicSubType,
+  Friend,
+  Group,
+  GroupMemberRole,
+  PicSubType,
   RawMessage,
   SendArkElement,
-    SendMessageElement
-} from "../../../ntqqapi/types";
-import {
-    friends,
-    getFriend,
-    getGroup,
-    getGroupMember,
-    getUidByUin,
-    selfInfo,
-} from "../../../common/data";
+  SendMessageElement,
+} from '../../../ntqqapi/types'
+import { friends, getFriend, getGroup, getGroupMember, getUidByUin, selfInfo } from '../../../common/data'
 import {
   OB11MessageCustomMusic,
   OB11MessageData,
   OB11MessageDataType,
+  OB11MessageFile,
+  OB11MessageJson,
   OB11MessageMixType,
+  OB11MessageMusic,
   OB11MessageNode,
-    OB11PostSendMsg
-} from '../../types';
-import {Peer} from "../../../ntqqapi/api/msg";
-import {SendMsgElementConstructor} from "../../../ntqqapi/constructor";
-import BaseAction from "../BaseAction";
-import {ActionName, BaseCheckResult} from "../types";
-import * as fs from "node:fs";
-import {decodeCQCode} from "../../cqcode";
-import {dbUtil} from "../../../common/db";
-import {ALLOW_SEND_TEMP_MSG} from "../../../common/config";
-import {NTQQMsgApi} from "../../../ntqqapi/api/msg";
-import {log} from "../../../common/utils/log";
-import {sleep} from "../../../common/utils/helper";
-import {uri2local} from "../../../common/utils";
+  OB11MessageVideo,
+  OB11PostSendMsg,
+} from '../../types'
+import { NTQQMsgApi, Peer } from '../../../ntqqapi/api/msg'
+import { SendMsgElementConstructor } from '../../../ntqqapi/constructor'
+import BaseAction from '../BaseAction'
+import { ActionName, BaseCheckResult } from '../types'
+import * as fs from 'node:fs'
+import { decodeCQCode } from '../../cqcode'
+import { dbUtil } from '../../../common/db'
+import { ALLOW_SEND_TEMP_MSG, getConfigUtil } from '../../../common/config'
+import { log } from '../../../common/utils/log'
+import { sleep } from '../../../common/utils/helper'
+import { uri2local } from '../../../common/utils'
+import { crychic } from '../../../ntqqapi/native/crychic'
+import { NTQQGroupApi } from '../../../ntqqapi/api'
+import { CustomMusicSignPostData, IdMusicSignPostData, MusicSign, MusicSignPostData } from '../../../common/utils/sign'
 
 function checkSendMessage(sendMsgList: OB11MessageData[]) {
   function checkUri(uri: string): boolean {
-        const pattern = /^(file:\/\/|http:\/\/|https:\/\/|base64:\/\/)/;
-        return pattern.test(uri);
+    const pattern = /^(file:\/\/|http:\/\/|https:\/\/|base64:\/\/)/
+    return pattern.test(uri)
   }
 
   for (let msg of sendMsgList) {
-        if (msg["type"] && msg["data"]) {
-            let type = msg["type"];
-            let data = msg["data"];
-            if (type === "text" && !data["text"]) {
-                return 400;
-            } else if (["image", "voice", "record"].includes(type)) {
-                if (!data["file"]) {
-                    return 400;
-                } else {
-                    if (checkUri(data["file"])) {
-                        return 200;
-                    } else {
-                        return 400;
+    if (msg['type'] && msg['data']) {
+      let type = msg['type']
+      let data = msg['data']
+      if (type === 'text' && !data['text']) {
+        return 400
       }
+      else if (['image', 'voice', 'record'].includes(type)) {
+        if (!data['file']) {
+          return 400
         }
-
-            } else if (type === "at" && !data["qq"]) {
-                return 400;
-            } else if (type === "reply" && !data["id"]) {
-                return 400;
+        else {
+          if (checkUri(data['file'])) {
+            return 200
           }
-        } else {
+          else {
             return 400
           }
         }
-    return 200;
+      }
+      else if (type === 'at' && !data['qq']) {
+        return 400
+      }
+      else if (type === 'reply' && !data['id']) {
+        return 400
+      }
+    }
+    else {
+      return 400
+    }
+  }
+  return 200
 }
 
 export interface ReturnDataType {
@@ -76,24 +83,32 @@ export interface ReturnDataType {
 }
 
 export function convertMessage2List(message: OB11MessageMixType, autoEscape = false) {
-    if (typeof message === "string") {
-        if (!autoEscape) {
-            message = decodeCQCode(message.toString())
-        } else {
-            message = [{
+  if (typeof message === 'string') {
+    if (autoEscape === true) {
+      message = [
+        {
           type: OB11MessageDataType.text,
           data: {
-                    text: message
+            text: message,
+          },
+        },
+      ]
     }
-            }]
+    else {
+      message = decodeCQCode(message.toString())
     }
-    } else if (!Array.isArray(message)) {
+  }
+  else if (!Array.isArray(message)) {
     message = [message]
   }
-    return message;
+  return message
 }
 
-export async function createSendElements(messageData: OB11MessageData[], group: Group | undefined, ignoreTypes: OB11MessageDataType[] = []) {
+export async function createSendElements(
+  messageData: OB11MessageData[],
+  target: Group | Friend | undefined,
+  ignoreTypes: OB11MessageDataType[] = [],
+) {
   let sendElements: SendMessageElement[] = []
   let deleteAfterSentFiles: string[] = []
   for (let sendMsg of messageData) {
@@ -102,120 +117,222 @@ export async function createSendElements(messageData: OB11MessageData[], group:
     }
     switch (sendMsg.type) {
       case OB11MessageDataType.text: {
-                const text = sendMsg.data?.text;
+        const text = sendMsg.data?.text
         if (text) {
           sendElements.push(SendMsgElementConstructor.text(sendMsg.data!.text))
         }
       }
-                break;
+        break
       case OB11MessageDataType.at: {
-                if (!group) {
+        if (!target) {
           continue
         }
-                let atQQ = sendMsg.data?.qq;
+        let atQQ = sendMsg.data?.qq
         if (atQQ) {
           atQQ = atQQ.toString()
-                    if (atQQ === "all") {
-                        sendElements.push(SendMsgElementConstructor.at(atQQ, atQQ, AtType.atAll, "全体成员"))
-                    } else {
+          if (atQQ === 'all') {
+            // todo：查询剩余的at全体次数
+            const groupCode = (target as Group)?.groupCode
+            let remainAtAllCount = 1
+            let isAdmin: boolean = true
+            if (groupCode) {
+              try {
+                remainAtAllCount = (await NTQQGroupApi.getGroupAtAllRemainCount(groupCode)).atInfo
+                  .RemainAtAllCountForUin
+                log(`群${groupCode}剩余at全体次数`, remainAtAllCount)
+                const self = await getGroupMember((target as Group)?.groupCode, selfInfo.uin)
+                isAdmin = self.role === GroupMemberRole.admin || self.role === GroupMemberRole.owner
+              } catch (e) {
+              }
+            }
+            if (isAdmin && remainAtAllCount > 0) {
+              sendElements.push(SendMsgElementConstructor.at(atQQ, atQQ, AtType.atAll, '全体成员'))
+            }
+          }
+          else {
             // const atMember = group?.members.find(m => m.uin == atQQ)
-                        const atMember = await getGroupMember(group?.groupCode, atQQ);
+            const atMember = await getGroupMember((target as Group)?.groupCode, atQQ)
             if (atMember) {
-                            sendElements.push(SendMsgElementConstructor.at(atQQ, atMember.uid, AtType.atUser, atMember.cardName || atMember.nick))
+              sendElements.push(
+                SendMsgElementConstructor.at(atQQ, atMember.uid, AtType.atUser, atMember.cardName || atMember.nick),
+              )
             }
           }
         }
       }
-                break;
+        break
       case OB11MessageDataType.reply: {
-                let replyMsgId = sendMsg.data.id;
+        let replyMsgId = sendMsg.data.id
         if (replyMsgId) {
           const replyMsg = await dbUtil.getMsgByShortId(parseInt(replyMsgId))
           if (replyMsg) {
-                        sendElements.push(SendMsgElementConstructor.reply(replyMsg.msgSeq, replyMsg.msgId, replyMsg.senderUin, replyMsg.senderUin))
+            sendElements.push(
+              SendMsgElementConstructor.reply(
+                replyMsg.msgSeq,
+                replyMsg.msgId,
+                replyMsg.senderUin,
+                replyMsg.senderUin,
+              ),
+            )
           }
         }
       }
-                break;
+        break
       case OB11MessageDataType.face: {
         const faceId = sendMsg.data?.id
         if (faceId) {
           sendElements.push(SendMsgElementConstructor.face(parseInt(faceId)))
         }
       }
-                break;
-
+        break
+      case OB11MessageDataType.mface: {
+        sendElements.push(
+          SendMsgElementConstructor.mface(
+            sendMsg.data.emoji_package_id,
+            sendMsg.data.emoji_id,
+            sendMsg.data.key,
+            sendMsg.data.summary,
+          ),
+        )
+      }
+        break
       case OB11MessageDataType.image:
       case OB11MessageDataType.file:
       case OB11MessageDataType.video:
       case OB11MessageDataType.voice: {
-                let file = sendMsg.data?.file
-                const payloadFileName = sendMsg.data?.name
+        const data = (sendMsg as OB11MessageFile).data
+        let file = data.file
+        const payloadFileName = data?.name
         if (file) {
           const cache = await dbUtil.getFileCache(file)
           if (cache) {
             if (fs.existsSync(cache.filePath)) {
-                            file = "file://" + cache.filePath
-                        } else if (cache.downloadFunc) {
+              file = 'file://' + cache.filePath
+            }
+            else if (cache.downloadFunc) {
               await cache.downloadFunc()
-                            file = cache.filePath;
-                        } else if (cache.url) {
+              file = cache.filePath
+            }
+            else if (cache.url) {
               file = cache.url
             }
-                        log("找到文件缓存", file);
+            log('找到文件缓存', file)
           }
-                    const {path, isLocal, fileName, errMsg} = (await uri2local(file))
+          const { path, isLocal, fileName, errMsg } = await uri2local(file)
           if (errMsg) {
             throw errMsg
           }
           if (path) {
-                        if (!isLocal) { // 只删除http和base64转过来的文件
+            if (!isLocal) {
+              // 只删除http和base64转过来的文件
               deleteAfterSentFiles.push(path)
             }
             if (sendMsg.type === OB11MessageDataType.file) {
-                            log("发送文件", path, payloadFileName || fileName)
-                            sendElements.push(await SendMsgElementConstructor.file(path, payloadFileName || fileName));
-                        } else if (sendMsg.type === OB11MessageDataType.video) {
-                            log("发送视频", path, payloadFileName || fileName)
-                            let thumb = sendMsg.data?.thumb;
+              log('发送文件', path, payloadFileName || fileName)
+              sendElements.push(await SendMsgElementConstructor.file(path, payloadFileName || fileName))
+            }
+            else if (sendMsg.type === OB11MessageDataType.video) {
+              log('发送视频', path, payloadFileName || fileName)
+              let thumb = sendMsg.data?.thumb
               if (thumb) {
                 let uri2LocalRes = await uri2local(thumb)
                 if (uri2LocalRes.success) {
-                                    thumb = uri2LocalRes.path;
+                  thumb = uri2LocalRes.path
                 }
               }
-                            sendElements.push(await SendMsgElementConstructor.video(path, payloadFileName || fileName, thumb));
-                        } else if (sendMsg.type === OB11MessageDataType.voice) {
-                            sendElements.push(await SendMsgElementConstructor.ptt(path));
-                        } else if (sendMsg.type === OB11MessageDataType.image) {
-                            sendElements.push(await SendMsgElementConstructor.pic(path, sendMsg.data.summary || "", <PicSubType>parseInt(sendMsg.data?.subType?.toString()) || 0));
+              sendElements.push(await SendMsgElementConstructor.video(path, payloadFileName || fileName, thumb))
+            }
+            else if (sendMsg.type === OB11MessageDataType.voice) {
+              sendElements.push(await SendMsgElementConstructor.ptt(path))
+            }
+            else if (sendMsg.type === OB11MessageDataType.image) {
+              sendElements.push(
+                await SendMsgElementConstructor.pic(
+                  path,
+                  sendMsg.data.summary || '',
+                  <PicSubType>parseInt(sendMsg.data?.subType?.toString()) || 0,
+                ),
+              )
             }
           }
         }
       }
-                break;
+        break
       case OB11MessageDataType.json: {
         sendElements.push(SendMsgElementConstructor.ark(sendMsg.data.data))
       }
         break
+      case OB11MessageDataType.poke: {
+        let qq = sendMsg.data?.qq || sendMsg.data?.id
+        if (qq) {
+          if ('groupCode' in target) {
+            crychic.sendGroupPoke(target.groupCode, qq.toString())
+          }
+          else {
+            if (!qq) {
+              qq = parseInt(target.uin)
+            }
+            crychic.sendFriendPoke(qq.toString())
+          }
+          sendElements.push(SendMsgElementConstructor.poke('', ''))
+        }
+      }
+        break
+      case OB11MessageDataType.dice: {
+        const resultId = sendMsg.data?.result
+        sendElements.push(SendMsgElementConstructor.dice(resultId))
+      }
+        break
+      case OB11MessageDataType.RPS: {
+        const resultId = sendMsg.data?.result
+        sendElements.push(SendMsgElementConstructor.rps(resultId))
+      }
+        break
     }
-
   }
 
   return {
     sendElements,
-        deleteAfterSentFiles
+    deleteAfterSentFiles,
   }
 }
 
-export async function sendMsg(peer: Peer, sendElements: SendMessageElement[], deleteAfterSentFiles: string[], waitComplete = true) {
+export async function sendMsg(
+  peer: Peer,
+  sendElements: SendMessageElement[],
+  deleteAfterSentFiles: string[],
+  waitComplete = true,
+) {
   if (!sendElements.length) {
-        throw ("消息体无法解析")
+    throw '消息体无法解析，请检查是否发送了不支持的消息类型'
   }
-    const returnMsg = await NTQQMsgApi.sendMsg(peer, sendElements, waitComplete, 20000);
-    log("消息发送结果", returnMsg)
+  // 计算发送的文件大小
+  let totalSize = 0
+  for (const fileElement of sendElements) {
+    try {
+      if (fileElement.elementType === ElementType.PTT) {
+        totalSize += fs.statSync(fileElement.pttElement.filePath).size
+      }
+      if (fileElement.elementType === ElementType.FILE) {
+        totalSize += fs.statSync(fileElement.fileElement.filePath).size
+      }
+      if (fileElement.elementType === ElementType.VIDEO) {
+        totalSize += fs.statSync(fileElement.videoElement.filePath).size
+      }
+      if (fileElement.elementType === ElementType.PIC) {
+        totalSize += fs.statSync(fileElement.picElement.sourcePath).size
+      }
+    } catch (e) {
+      log('文件大小计算失败', e, fileElement)
+    }
+  }
+  log('发送消息总大小', totalSize, 'bytes')
+  let timeout = ((totalSize / 1024 / 512) * 1000) + 5000  // 512kb/s
+  log('设置消息超时时间', timeout)
+  const returnMsg = await NTQQMsgApi.sendMsg(peer, sendElements, waitComplete, timeout)
+  log('消息发送结果', returnMsg)
   returnMsg.msgShortId = await dbUtil.addMsg(returnMsg)
-    deleteAfterSentFiles.map(f => fs.unlink(f, () => {
+  deleteAfterSentFiles.map((f) => fs.unlink(f, () => {
   }))
   return returnMsg
 }
@@ -224,26 +341,33 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
   actionName = ActionName.SendMsg
 
   protected async check(payload: OB11PostSendMsg): Promise<BaseCheckResult> {
-        const messages = convertMessage2List(payload.message);
-        const fmNum = this.getSpecialMsgNum(payload, OB11MessageDataType.node)
+    const messages = convertMessage2List(payload.message)
+    const fmNum = this.getSpecialMsgNum(messages, OB11MessageDataType.node)
     if (fmNum && fmNum != messages.length) {
       return {
         valid: false,
-                message: "转发消息不能和普通消息混在一起发送,转发需要保证message只有type为node的元素"
+        message: '转发消息不能和普通消息混在一起发送,转发需要保证message只有type为node的元素',
       }
     }
-        if (payload.message_type !== "private" && payload.group_id &&!(await getGroup(payload.group_id))) {
+    const musicNum = this.getSpecialMsgNum(messages, OB11MessageDataType.music)
+    if (musicNum && messages.length > 1) {
       return {
         valid: false,
-                message: `群${payload.group_id}不存在`
+        message: '音乐消息不可以和其他消息混在一起发送',
       }
     }
-        if (payload.user_id && payload.message_type !== "group") {
+    if (payload.message_type !== 'private' && payload.group_id && !(await getGroup(payload.group_id))) {
+      return {
+        valid: false,
+        message: `群${payload.group_id}不存在`,
+      }
+    }
+    if (payload.user_id && payload.message_type !== 'group') {
       if (!(await getFriend(payload.user_id))) {
         if (!ALLOW_SEND_TEMP_MSG && !(await dbUtil.getReceivedTempUinMap())[payload.user_id.toString()]) {
           return {
             valid: false,
-                        message: `不能发送临时消息`
+            message: `不能发送临时消息`,
           }
         }
       }
@@ -254,13 +378,13 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
   }
 
   protected async _handle(payload: OB11PostSendMsg) {
-
     const peer: Peer = {
       chatType: ChatType.friend,
-            peerUid: ""
+      peerUid: '',
     }
-        let isTempMsg = false;
-        let group: Group | undefined = undefined;
+    let isTempMsg = false
+    let group: Group | undefined = undefined
+    let friend: Friend | undefined = undefined
     const genGroupPeer = async () => {
       group = await getGroup(payload.group_id.toString())
       peer.chatType = ChatType.group
@@ -269,116 +393,164 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
     }
 
     const genFriendPeer = () => {
-            const friend = friends.find(f => f.uin == payload.user_id.toString())
+      friend = friends.find((f) => f.uin == payload.user_id.toString())
       if (friend) {
         // peer.name = friend.nickName
         peer.peerUid = friend.uid
-            } else {
+      }
+      else {
         peer.chatType = ChatType.temp
         const tempUserUid = getUidByUin(payload.user_id.toString())
         if (!tempUserUid) {
-                    throw (`找不到私聊对象${payload.user_id}`)
+          throw `找不到私聊对象${payload.user_id}`
         }
         // peer.name = tempUser.nickName
-                isTempMsg = true;
-                peer.peerUid = tempUserUid;
+        isTempMsg = true
+        peer.peerUid = tempUserUid
       }
     }
-        if (payload?.group_id && payload.message_type === "group") {
+    if (payload?.group_id && payload.message_type === 'group') {
       await genGroupPeer()
-
-        } else if (payload?.user_id) {
+    }
+    else if (payload?.user_id) {
       genFriendPeer()
-        } else if (payload.group_id) {
-            await genGroupPeer()
-        } else {
-            throw ("发送消息参数错误, 请指定group_id或user_id")
     }
-        const messages = convertMessage2List(payload.message);
-        if (this.getSpecialMsgNum(payload, OB11MessageDataType.node)) {
+    else if (payload.group_id) {
+      await genGroupPeer()
+    }
+    else {
+      throw '发送消息参数错误, 请指定group_id或user_id'
+    }
+    const messages = convertMessage2List(
+      payload.message,
+      payload.auto_escape === true || payload.auto_escape === 'true',
+    )
+    if (this.getSpecialMsgNum(messages, OB11MessageDataType.node)) {
       try {
         const returnMsg = await this.handleForwardNode(peer, messages as OB11MessageNode[], group)
         return { message_id: returnMsg.msgShortId }
       } catch (e) {
-                throw ("发送转发消息失败 " + e.toString())
+        throw '发送转发消息失败 ' + e.toString()
       }
-        } else {
-            if (this.getSpecialMsgNum(payload, OB11MessageDataType.music)) {
-                const music: OB11MessageCustomMusic = messages[0] as OB11MessageCustomMusic
+    }
+    else if (this.getSpecialMsgNum(messages, OB11MessageDataType.music)) {
+      const music = messages[0] as OB11MessageMusic
       if (music) {
-                    const {url, audio, title, content, image} = music.data;
-                    const selfPeer: Peer = {peerUid: selfInfo.uid, chatType: ChatType.friend}
-                    // 搞不定！
-                    // const musicMsg = await this.send(selfPeer, [this.genMusicElement(url, audio, title, content, image)], [], false)
-                    // 转发
-                    // const res = await NTQQApi.forwardMsg(selfPeer, peer, [musicMsg.msgId])
-                    // log("转发音乐消息成功", res);
-                    // return {message_id: musicMsg.msgShortId}
+        const { musicSignUrl } = getConfigUtil().getConfig()
+        if (!musicSignUrl) {
+          throw '音乐签名地址未配置'
         }
+        const { type } = music.data
+        if (!['qq', '163', 'custom'].includes(type)) {
+          throw `不支持的音乐类型 ${type}`
+        }
+        const postData: MusicSignPostData = { ...music.data }
+        if (type === 'custom' && music.data.content) {
+          ;(postData as CustomMusicSignPostData).singer = music.data.content
+          delete (postData as OB11MessageCustomMusic['data']).content
+        }
+        if (type === 'custom') {
+          const customMusicData = music.data as CustomMusicSignPostData
+          if (!customMusicData.url) {
+            throw '自定义音卡缺少参数url'
+          }
+          if (!customMusicData.audio) {
+            throw '自定义音卡缺少参数audio'
+          }
+          if (!customMusicData.title) {
+            throw '自定义音卡缺少参数title'
+          }
+        }
+        if (type === 'qq' || type === '163') {
+          const idMusicData = music.data as IdMusicSignPostData
+          if (!idMusicData.id) {
+            throw '音乐卡片缺少id参数'
+          }
+        }
+        let jsonContent: string
+        try {
+          jsonContent = await new MusicSign(musicSignUrl).sign(postData)
+          if (!jsonContent) {
+            throw '音乐消息生成失败，提交内容有误或者签名服务器签名失败'
+          }
+        } catch (e) {
+          throw `签名音乐消息失败：${e}`
+        }
+        messages[0] = {
+          type: OB11MessageDataType.json,
+          data: { data: jsonContent },
+        } as OB11MessageJson
       }
     }
     // log("send msg:", peer, sendElements)
-        const {sendElements, deleteAfterSentFiles} = await createSendElements(messages, group)
+    const { sendElements, deleteAfterSentFiles } = await createSendElements(messages, group || friend)
+    if (sendElements.length === 1) {
+      if (sendElements[0] === null) {
+        return { message_id: 0 }
+      }
+    }
     const returnMsg = await sendMsg(peer, sendElements, deleteAfterSentFiles)
-        deleteAfterSentFiles.map(f => fs.unlink(f, () => {
-        }));
+    deleteAfterSentFiles.map((f) => fs.unlink(f, () => {
+    }))
     return { message_id: returnMsg.msgShortId }
   }
 
-
-    private getSpecialMsgNum(payload: OB11PostSendMsg, msgType: OB11MessageDataType): number {
-        if (Array.isArray(payload.message)) {
-            return payload.message.filter(msg => msg.type == msgType).length
+  private getSpecialMsgNum(message: OB11MessageData[], msgType: OB11MessageDataType): number {
+    if (Array.isArray(message)) {
+      return message.filter((msg) => msg.type == msgType).length
     }
     return 0
   }
 
   private async cloneMsg(msg: RawMessage): Promise<RawMessage> {
-        log("克隆的目标消息", msg)
-        let sendElements: SendMessageElement[] = [];
+    log('克隆的目标消息', msg)
+    let sendElements: SendMessageElement[] = []
     for (const ele of msg.elements) {
       sendElements.push(ele as SendMessageElement)
       // Object.keys(ele).forEach((eleKey) => {
       //     if (eleKey.endsWith("Element")) {
       //     }
-
     }
     if (sendElements.length === 0) {
-            log("需要clone的消息无法解析，将会忽略掉", msg)
+      log('需要clone的消息无法解析，将会忽略掉', msg)
     }
-        log("克隆消息", sendElements)
+    log('克隆消息', sendElements)
     try {
-            const nodeMsg = await NTQQMsgApi.sendMsg({
+      const nodeMsg = await NTQQMsgApi.sendMsg(
+        {
           chatType: ChatType.friend,
-                peerUid: selfInfo.uid
-            }, sendElements, true);
-            await sleep(500);
+          peerUid: selfInfo.uid,
+        },
+        sendElements,
+        true,
+      )
+      await sleep(500)
       return nodeMsg
     } catch (e) {
-            log(e, "克隆转发消息失败,将忽略本条消息", msg);
+      log(e, '克隆转发消息失败,将忽略本条消息', msg)
     }
-
   }
 
   // 返回一个合并转发的消息id
   private async handleForwardNode(destPeer: Peer, messageNodes: OB11MessageNode[], group: Group | undefined) {
-
     const selfPeer = {
       chatType: ChatType.friend,
-            peerUid: selfInfo.uid
+      peerUid: selfInfo.uid,
     }
     let nodeMsgIds: string[] = []
     // 先判断一遍是不是id和自定义混用
-        let needClone = messageNodes.filter(node => node.data.id).length && messageNodes.filter(node => !node.data.id).length
+    let needClone =
+      messageNodes.filter((node) => node.data.id).length && messageNodes.filter((node) => !node.data.id).length
     for (const messageNode of messageNodes) {
       // 一个node表示一个人的消息
-            let nodeId = messageNode.data.id;
+      let nodeId = messageNode.data.id
       // 有nodeId表示一个子转发消息卡片
       if (nodeId) {
-                let nodeMsg = await dbUtil.getMsgByShortId(parseInt(nodeId));
+        let nodeMsg = await dbUtil.getMsgByShortId(parseInt(nodeId))
         if (!needClone) {
           nodeMsgIds.push(nodeMsg.msgId)
-                } else {
+        }
+        else {
           if (nodeMsg.peerUid !== selfInfo.uid) {
             const cloneMsg = await this.cloneMsg(nodeMsg)
             if (cloneMsg) {
@@ -386,17 +558,18 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
             }
           }
         }
-            } else {
+      }
+      else {
         // 自定义的消息
         // 提取消息段，发给自己生成消息id
         try {
-                    const {
-                        sendElements,
-                        deleteAfterSentFiles
-                    } = await createSendElements(convertMessage2List(messageNode.data.content), group);
-                    log("开始生成转发节点", sendElements);
+          const { sendElements, deleteAfterSentFiles } = await createSendElements(
+            convertMessage2List(messageNode.data.content),
+            group,
+          )
+          log('开始生成转发节点', sendElements)
           let sendElementsSplit: SendMessageElement[][] = []
-                    let splitIndex = 0;
+          let splitIndex = 0
           for (const ele of sendElements) {
             if (!sendElementsSplit[splitIndex]) {
               sendElementsSplit[splitIndex] = []
@@ -404,51 +577,52 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
 
             if (ele.elementType === ElementType.FILE || ele.elementType === ElementType.VIDEO) {
               if (sendElementsSplit[splitIndex].length > 0) {
-                                splitIndex++;
+                splitIndex++
               }
               sendElementsSplit[splitIndex] = [ele]
-                            splitIndex++;
-                        } else {
+              splitIndex++
+            }
+            else {
               sendElementsSplit[splitIndex].push(ele)
             }
             log(sendElementsSplit)
           }
           // log("分割后的转发节点", sendElementsSplit)
           for (const eles of sendElementsSplit) {
-                        const nodeMsg = await sendMsg(selfPeer, eles, [], true);
+            const nodeMsg = await sendMsg(selfPeer, eles, [], true)
             nodeMsgIds.push(nodeMsg.msgId)
-                        await sleep(500);
-                        log("转发节点生成成功", nodeMsg.msgId);
+            await sleep(500)
+            log('转发节点生成成功', nodeMsg.msgId)
           }
-                    deleteAfterSentFiles.map(f => fs.unlink(f, () => {
-                    }));
-
+          deleteAfterSentFiles.map((f) => fs.unlink(f, () => {
+          }))
         } catch (e) {
-                    log("生成转发消息节点失败", e)
+          log('生成转发消息节点失败', e)
         }
       }
     }
 
     // 检查srcPeer是否一致，不一致则需要克隆成自己的消息, 让所有srcPeer都变成自己的，使其保持一致才能够转发
     let nodeMsgArray: Array<RawMessage> = []
-        let srcPeer: Peer = null;
-        let needSendSelf = false;
+    let srcPeer: Peer = null
+    let needSendSelf = false
     for (const [index, msgId] of nodeMsgIds.entries()) {
       const nodeMsg = await dbUtil.getMsgByLongId(msgId)
       if (nodeMsg) {
         nodeMsgArray.push(nodeMsg)
         if (!srcPeer) {
           srcPeer = { chatType: nodeMsg.chatType, peerUid: nodeMsg.peerUid }
-                } else if (srcPeer.peerUid !== nodeMsg.peerUid) {
+        }
+        else if (srcPeer.peerUid !== nodeMsg.peerUid) {
           needSendSelf = true
           srcPeer = selfPeer
         }
       }
     }
-        log("nodeMsgArray", nodeMsgArray);
-        nodeMsgIds = nodeMsgArray.map(msg => msg.msgId);
+    log('nodeMsgArray', nodeMsgArray)
+    nodeMsgIds = nodeMsgArray.map((msg) => msg.msgId)
     if (needSendSelf) {
-            log("需要克隆转发消息");
+      log('需要克隆转发消息')
       for (const [index, msg] of nodeMsgArray.entries()) {
         if (msg.peerUid !== selfInfo.uid) {
           const cloneMsg = await this.cloneMsg(msg)
@@ -468,53 +642,53 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
     // nodeIds.push(nodeMsg.msgId)
     // await sleep(500);
     // 开发转发
+    if (nodeMsgIds.length === 0) {
+      throw Error('转发消息失败，节点为空')
+    }
     try {
-            log("开发转发", nodeMsgIds)
+      log('开发转发', nodeMsgIds)
       return await NTQQMsgApi.multiForwardMsg(srcPeer, destPeer, nodeMsgIds)
     } catch (e) {
-            log("forward failed", e)
-            return null;
+      log('forward failed', e)
+      return null
     }
   }
 
+  // private genMusicElement(url: string, audio: string, title: string, content: string, image: string): SendArkElement {
+  //   const musicJson = {
+  //     app: 'com.tencent.structmsg',
+  //     config: {
+  //       ctime: 1709689928,
+  //       forward: 1,
+  //       token: '5c1e4905f926dd3a64a4bd3841460351',
+  //       type: 'normal',
+  //     },
+  //     extra: { app_type: 1, appid: 100497308, uin: selfInfo.uin },
+  //     meta: {
+  //       news: {
+  //         action: '',
+  //         android_pkg_name: '',
+  //         app_type: 1,
+  //         appid: 100497308,
+  //         ctime: 1709689928,
+  //         desc: content || title,
+  //         jumpUrl: url,
+  //         musicUrl: audio,
+  //         preview: image,
+  //         source_icon: 'https://p.qpic.cn/qqconnect/0/app_100497308_1626060999/100?max-age=2592000&t=0',
+  //         source_url: '',
+  //         tag: 'QQ音乐',
+  //         title: title,
+  //         uin: selfInfo.uin,
+  //       },
+  //     },
+  //     prompt: content || title,
+  //     ver: '0.0.0.1',
+  //     view: 'news',
+  //   }
 
-
-
-    private genMusicElement(url: string, audio: string, title: string, content: string, image: string): SendArkElement {
-        const musicJson = {
-            app: 'com.tencent.structmsg',
-            config: {
-                ctime: 1709689928,
-                forward: 1,
-                token: '5c1e4905f926dd3a64a4bd3841460351',
-                type: 'normal'
-            },
-            extra: {app_type: 1, appid: 100497308, uin: selfInfo.uin},
-            meta: {
-                news: {
-                    action: '',
-                    android_pkg_name: '',
-                    app_type: 1,
-                    appid: 100497308,
-                    ctime: 1709689928,
-                    desc: content || title,
-                    jumpUrl: url,
-                    musicUrl: audio,
-                    preview: image,
-                    source_icon: 'https://p.qpic.cn/qqconnect/0/app_100497308_1626060999/100?max-age=2592000&t=0',
-                    source_url: '',
-                    tag: 'QQ音乐',
-                    title: title,
-                    uin: selfInfo.uin,
-                }
-            },
-            prompt: content || title,
-            ver: '0.0.0.1',
-            view: 'news'
-        }
-
-        return SendMsgElementConstructor.ark(musicJson)
-    }
+  //   return SendMsgElementConstructor.ark(musicJson)
+  // }
 }
 
 export default SendMsg

src/onebot11/action/msg/SendPrivateMsg.ts

@@ -1,13 +1,13 @@
-import SendMsg from "./SendMsg";
-import {ActionName, BaseCheckResult} from "../types";
-import {OB11PostSendMsg} from "../../types";
+import SendMsg from './SendMsg'
+import { ActionName, BaseCheckResult } from '../types'
+import { OB11PostSendMsg } from '../../types'
 
 class SendPrivateMsg extends SendMsg {
   actionName = ActionName.SendPrivateMsg
 
   protected async check(payload: OB11PostSendMsg): Promise<BaseCheckResult> {
-        payload.message_type = "private"
-        return super.check(payload);
+    payload.message_type = 'private'
+    return super.check(payload)
   }
 }
 

src/onebot11/action/msg/SetMsgEmojiLike.ts

@@ -0,0 +1,32 @@
+import { ActionName } from '../types'
+import BaseAction from '../BaseAction'
+import { dbUtil } from '../../../common/db'
+import { NTQQMsgApi } from '../../../ntqqapi/api/msg'
+
+interface Payload {
+  message_id: number
+  emoji_id: string
+}
+
+export class SetMsgEmojiLike extends BaseAction<Payload, any> {
+  actionName = ActionName.SetMsgEmojiLike
+
+  protected async _handle(payload: Payload) {
+    let msg = await dbUtil.getMsgByShortId(payload.message_id)
+    if (!msg) {
+      throw new Error('msg not found')
+    }
+    if (!payload.emoji_id) {
+      throw new Error('emojiId not found')
+    }
+    return await NTQQMsgApi.setEmojiLike(
+      {
+        chatType: msg.chatType,
+        peerUid: msg.peerUid,
+      },
+      msg.msgSeq,
+      payload.emoji_id,
+      true,
+    )
+  }
+}

src/onebot11/action/quick-operation.ts

@@ -0,0 +1,149 @@
+// handle quick action, create at 2024-5-18 10:54:39 by linyuchen
+
+
+import { OB11Message, OB11MessageAt, OB11MessageData, OB11MessageDataType } from '../types'
+import { OB11FriendRequestEvent } from '../event/request/OB11FriendRequest'
+import { OB11GroupRequestEvent } from '../event/request/OB11GroupRequest'
+import { dbUtil } from '@/common/db'
+import { NTQQFriendApi, NTQQGroupApi, NTQQMsgApi, Peer } from '@/ntqqapi/api'
+import { ChatType, Group, GroupRequestOperateTypes } from '@/ntqqapi/types'
+import { getGroup, getUidByUin } from '@/common/data'
+import { convertMessage2List, createSendElements, sendMsg } from './msg/SendMsg'
+import { isNull, log } from '@/common/utils'
+import { getConfigUtil } from '@/common/config'
+
+
+interface QuickOperationPrivateMessage {
+  reply?: string
+  auto_escape?: boolean
+}
+
+interface QuickOperationGroupMessage extends QuickOperationPrivateMessage {
+  // 回复群消息
+  at_sender?: boolean
+  delete?: boolean
+  kick?: boolean
+  ban?: boolean
+  ban_duration?: number
+  //
+}
+
+interface QuickOperationFriendRequest {
+  approve?: boolean
+  remark?: string
+}
+
+interface QuickOperationGroupRequest {
+  approve?: boolean
+  reason?: string
+}
+
+export type QuickOperation = QuickOperationPrivateMessage &
+  QuickOperationGroupMessage &
+  QuickOperationFriendRequest &
+  QuickOperationGroupRequest
+
+export type QuickOperationEvent = OB11Message | OB11FriendRequestEvent | OB11GroupRequestEvent;
+
+export async function handleQuickOperation(context: QuickOperationEvent, quickAction: QuickOperation) {
+  if (context.post_type === 'message') {
+    handleMsg(context as OB11Message, quickAction).then().catch(log)
+  }
+  if (context.post_type === 'request') {
+    const friendRequest = context as OB11FriendRequestEvent
+    const groupRequest = context as OB11GroupRequestEvent
+    if ((friendRequest).request_type === 'friend') {
+      handleFriendRequest(friendRequest, quickAction).then().catch(log)
+    }
+    else if (groupRequest.request_type === 'group') {
+      handleGroupRequest(groupRequest, quickAction).then().catch(log)
+    }
+  }
+}
+
+async function handleMsg(msg: OB11Message, quickAction: QuickOperationPrivateMessage | QuickOperationGroupMessage) {
+  msg = msg as OB11Message
+  const rawMessage = await dbUtil.getMsgByShortId(msg.message_id)
+  const reply = quickAction.reply
+  const ob11Config = getConfigUtil().getConfig().ob11
+  let peer: Peer = {
+    chatType: ChatType.friend,
+    peerUid: msg.user_id.toString(),
+  }
+  if (msg.message_type == 'private') {
+    peer.peerUid = getUidByUin(msg.user_id.toString())
+    if (msg.sub_type === 'group') {
+      peer.chatType = ChatType.temp
+    }
+  }
+  else {
+    peer.chatType = ChatType.group
+    peer.peerUid = msg.group_id.toString()
+  }
+  if (reply) {
+    let group: Group = null
+    let replyMessage: OB11MessageData[] = []
+    if (ob11Config.enableQOAutoQuote) {
+      replyMessage.push({
+        type: OB11MessageDataType.reply,
+        data: {
+          id: msg.message_id.toString(),
+        },
+      })
+    }
+
+    if (msg.message_type == 'group') {
+      group = await getGroup(msg.group_id.toString())
+      if ((quickAction as QuickOperationGroupMessage).at_sender) {
+        replyMessage.push({
+          type: 'at',
+          data: {
+            qq: msg.user_id.toString(),
+          },
+        } as OB11MessageAt)
+      }
+    }
+    replyMessage = replyMessage.concat(convertMessage2List(reply, quickAction.auto_escape))
+    const { sendElements, deleteAfterSentFiles } = await createSendElements(replyMessage, group)
+    log(`发送消息给`, peer, sendElements)
+    sendMsg(peer, sendElements, deleteAfterSentFiles, false).then().catch(log)
+  }
+  if (msg.message_type === 'group') {
+    const groupMsgQuickAction = quickAction as QuickOperationGroupMessage
+    // handle group msg
+    if (groupMsgQuickAction.delete) {
+      NTQQMsgApi.recallMsg(peer, [rawMessage.msgId]).then().catch(log)
+    }
+    if (groupMsgQuickAction.kick) {
+      NTQQGroupApi.kickMember(peer.peerUid, [rawMessage.senderUid]).then().catch(log)
+    }
+    if (groupMsgQuickAction.ban) {
+      NTQQGroupApi.banMember(peer.peerUid, [
+        {
+          uid: rawMessage.senderUid,
+          timeStamp: groupMsgQuickAction.ban_duration || 60 * 30,
+        },
+      ]).then().catch(log)
+    }
+  }
+}
+
+async function handleFriendRequest(request: OB11FriendRequestEvent,
+                                   quickAction: QuickOperationFriendRequest) {
+  if (!isNull(quickAction.approve)) {
+    // todo: set remark
+    NTQQFriendApi.handleFriendRequest(request.flag, quickAction.approve).then().catch(log)
+  }
+}
+
+
+async function handleGroupRequest(request: OB11GroupRequestEvent,
+                                  quickAction: QuickOperationGroupRequest) {
+  if (!isNull(quickAction.approve)) {
+    NTQQGroupApi.handleGroupRequest(
+      request.flag,
+      quickAction.approve ? GroupRequestOperateTypes.approve : GroupRequestOperateTypes.reject,
+      quickAction.reason,
+    ).then().catch(log)
+  }
+}

src/onebot11/action/system/CanSendImage.ts

@@ -1,5 +1,5 @@
-import {ActionName} from "../types";
-import CanSendRecord from "./CanSendRecord";
+import { ActionName } from '../types'
+import CanSendRecord from './CanSendRecord'
 
 interface ReturnType {
   yes: boolean