fix: send forward msg too fast

fix: check pic and ptt size
chore: ver 3.13.8
2024-11-22 01:56:33 +00:00 · 2024-03-09 09:59:39 +08:00 · 2024-03-09 02:43:58 +08:00 · 2024-03-09 02:38:05 +08:00 · 2024-03-09 02:34:21 +08:00 · 2024-03-08 23:52:35 +08:00
39 changed files with 1399 additions and 765 deletions
--- a/README.md
+++ b/README.md
@@ -9,22 +9,12 @@ TG群：<https://t.me/+nLZEnpne-pQ1OWFl>
 *V3之后不再需要LLAPI*

 ## 安装方法
-### Linux 容器化快速安装
-
-执行以下任意脚本，按照提示设置NoVnc密码，即可运行，脚本问题与异常参考 [llonebot-docker](https://github.com/MliKiowa/llonebot-docker) 项目。
-
- ```bash
-curl https://cdn.jsdelivr.net/gh/MliKiowa/llonebot-docker/fastboot.sh -o fastboot.sh & chmod +x fastboot.sh & sudo sh fastboot.sh
- ```
- ```bash
-wget -O fastboot.sh https://cdn.jsdelivr.net/gh/MliKiowa/llonebot-docker/fastboot.sh & chmod +x fastboot.sh & sudo sh fastboot.sh
- ```

 ### 通用手动安装方法

 1.安装[LiteLoaderQQNT](https://liteloaderqqnt.github.io/guide/install.html)

-2.安装本项目插件[OneBotApi](https://github.com/linyuchen/LiteLoaderQQNT-OneBotApi/releases/), 注意本插件2.0以下的版本不支持LiteLoader 1.0.0及以上版本
+2.安装本项目插件[LLOneBot](https://github.com/linyuchen/LiteLoaderQQNT-OneBotApi/releases/), 注意本插件2.0以下的版本不支持LiteLoader 1.0.0及以上版本

 *关于插件的安装方法: 下载后解压复制到插件目录*

@@ -34,22 +24,33 @@ wget -O fastboot.sh https://cdn.jsdelivr.net/gh/MliKiowa/llonebot-docker/fastboo
 ```
 ├── plugins
 │   ├── LLOneBot
-│   │   └── main.js
-│   │   └── preload.js
-│   │   └── renderer.js
+│   │   └── main/
+│   │   └── preload/
+│   │   └── renderer/
 │   │   └── manifest.json
 │   │   └── node_modules/...
 ```

+### Linux 容器化快速安装
+
+执行以下任意脚本，按照提示设置NoVnc密码，即可运行，脚本问题与异常参考 [llonebot-docker](https://github.com/MliKiowa/llonebot-docker) 项目。
+
+ ```bash
+curl https://cdn.jsdelivr.net/gh/LLOneBot/llonebot-docker/fastboot.sh -o fastboot.sh & chmod +x fastboot.sh & sudo sh fastboot.sh
+ ```
+ ```bash
+wget -O fastboot.sh https://cdn.jsdelivr.net/gh/LLOneBot/llonebot-docker/fastboot.sh & chmod +x fastboot.sh & sudo sh fastboot.sh
+ ```
+
 ### 使用termux安装

-见<https://github.com/LLOneBot/llonebot-termux>
+具体安装过程与教程,参考 [llonebot-termux](https://github.com/LLOneBot/llonebot-termux) 项目。

-## 支持的API
+## 支持的功能

 目前支持的协议
 - [x] http调用api
- [x] http事件上报
+- [x] http事件上报，不支持快捷回复等快捷操作
 - [x] 正向websocket
 - [x] 反向websocket

@@ -91,7 +92,8 @@ wget -O fastboot.sh https://cdn.jsdelivr.net/gh/MliKiowa/llonebot-docker/fastboo
    {
        "type": "file",
        "data": {
-            "file": "file:///D:/1.txt"
+            "file": "file:///D:/1.txt",
+            "name": "自定义显示的文件名"  // 此字段不是必须的
        }
    }
    ```
--- a/electron.vite.config.ts
+++ b/electron.vite.config.ts
@@ -1,7 +1,9 @@
 import cp from 'vite-plugin-cp';
 import "./scripts/gen-version"

-const external = ["silk-wasm", "ws"];
+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 }
@@ -52,11 +54,11 @@ let config = {
            emptyOutDir: true,
            lib: {
                formats: ["es"],
-                entry: { "renderer": "src/renderer.ts" },
+                entry: { "renderer": "src/renderer/index.ts" },
            },
            rollupOptions: {
                // external: externalAll,
-                input: "src/renderer.ts",
+                input: "src/renderer/index.ts",
            }
        },
        resolve:{
--- a/manifest.json
+++ b/manifest.json
@@ -1,10 +1,10 @@
 {
  "manifest_version": 4,
  "type": "extension",
-  "name": "LLOneBot v3.11.1",
+  "name": "LLOneBot v3.13.9",
  "slug": "LLOneBot",
  "description": "LiteLoaderQQNT的OneBotApi",
-  "version": "3.11.1",
+  "version": "3.13.9",
  "thumbnail": "./icon.png",
  "authors": [
    {
@@ -26,7 +26,7 @@
    "darwin"
  ],
  "injects": {
-    "renderer": "./renderer/renderer.js",
+    "renderer": "./renderer/index.js",
    "main": "./main/main.cjs",
    "preload": "./preload/preload.cjs"
  }
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,6 +12,7 @@
        "express": "^4.18.2",
        "file-type": "^19.0.0",
        "fluent-ffmpeg": "^2.1.2",
+        "level": "^8.0.1",
        "silk-wasm": "^3.2.3",
        "utf-8-validate": "^6.0.3",
        "uuid": "^9.0.1",
@@ -985,16 +986,6 @@
        "url": "https://opencollective.com/eslint"
      }
    },
-    "node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://mirrors.cloud.tencent.com/npm/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
    "node_modules/@eslint/eslintrc/node_modules/globals": {
      "version": "13.24.0",
      "resolved": "https://mirrors.cloud.tencent.com/npm/globals/-/globals-13.24.0.tgz",
@@ -1010,18 +1001,6 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
-    "node_modules/@eslint/eslintrc/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://mirrors.cloud.tencent.com/npm/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
    "node_modules/@eslint/eslintrc/node_modules/type-fest": {
      "version": "0.20.2",
      "resolved": "https://mirrors.cloud.tencent.com/npm/type-fest/-/type-fest-0.20.2.tgz",
@@ -1057,28 +1036,6 @@
        "node": ">=10.10.0"
      }
    },
-    "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://mirrors.cloud.tencent.com/npm/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/@humanwhocodes/config-array/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://mirrors.cloud.tencent.com/npm/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
    "node_modules/@humanwhocodes/module-importer": {
      "version": "1.0.1",
      "resolved": "https://mirrors.cloud.tencent.com/npm/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
@@ -1892,6 +1849,23 @@
      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
      "dev": true
    },
+    "node_modules/abstract-level": {
+      "version": "1.0.4",
+      "resolved": "https://mirrors.cloud.tencent.com/npm/abstract-level/-/abstract-level-1.0.4.tgz",
+      "integrity": "sha512-eUP/6pbXBkMbXFdx4IH2fVgvB7M0JvR7/lIL33zcs0IBcwjdzSSl31TOJsaCzmKSSDF9h8QYSOJux4Nd4YJqFg==",
+      "dependencies": {
+        "buffer": "^6.0.3",
+        "catering": "^2.1.0",
+        "is-buffer": "^2.0.5",
+        "level-supports": "^4.0.0",
+        "level-transcoder": "^1.0.1",
+        "module-error": "^1.0.1",
+        "queue-microtask": "^1.2.3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
    "node_modules/accepts": {
      "version": "1.3.8",
      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
@@ -2157,6 +2131,25 @@
      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
      "dev": true
    },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://mirrors.cloud.tencent.com/npm/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
    "node_modules/body-parser": {
      "version": "1.20.2",
      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
@@ -2221,6 +2214,17 @@
        "node": ">=8"
      }
    },
+    "node_modules/browser-level": {
+      "version": "1.0.1",
+      "resolved": "https://mirrors.cloud.tencent.com/npm/browser-level/-/browser-level-1.0.1.tgz",
+      "integrity": "sha512-XECYKJ+Dbzw0lbydyQuJzwNXtOpbMSq737qxJN11sIRTErOMShvDpbzTlgju7orJKvx4epULolZAuJGLzCmWRQ==",
+      "dependencies": {
+        "abstract-level": "^1.0.2",
+        "catering": "^2.1.1",
+        "module-error": "^1.0.2",
+        "run-parallel-limit": "^1.1.0"
+      }
+    },
    "node_modules/browserslist": {
      "version": "4.23.0",
      "resolved": "https://mirrors.cloud.tencent.com/npm/browserslist/-/browserslist-4.23.0.tgz",
@@ -2253,6 +2257,29 @@
        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
      }
    },
+    "node_modules/buffer": {
+      "version": "6.0.3",
+      "resolved": "https://mirrors.cloud.tencent.com/npm/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
+      }
+    },
    "node_modules/buffer-crc32": {
      "version": "0.2.13",
      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
@@ -2397,6 +2424,14 @@
        }
      ]
    },
+    "node_modules/catering": {
+      "version": "2.1.1",
+      "resolved": "https://mirrors.cloud.tencent.com/npm/catering/-/catering-2.1.1.tgz",
+      "integrity": "sha512-K7Qy8O9p76sL3/3m7/zLKbRkyOlSZAgzEaLhyj2mXS8PsCud2Eo4hAb8aLtZqHh0QGqLcb9dlJSu6lHRVENm1w==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
    "node_modules/chalk": {
      "version": "4.1.2",
      "resolved": "https://mirrors.cloud.tencent.com/npm/chalk/-/chalk-4.1.2.tgz",
@@ -2425,6 +2460,22 @@
        "node": ">=8"
      }
    },
+    "node_modules/classic-level": {
+      "version": "1.4.1",
+      "resolved": "https://mirrors.cloud.tencent.com/npm/classic-level/-/classic-level-1.4.1.tgz",
+      "integrity": "sha512-qGx/KJl3bvtOHrGau2WklEZuXhS3zme+jf+fsu6Ej7W7IP/C49v7KNlWIsT1jZu0YnfzSIYDGcEWpCa1wKGWXQ==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "abstract-level": "^1.0.2",
+        "catering": "^2.1.0",
+        "module-error": "^1.0.1",
+        "napi-macros": "^2.2.2",
+        "node-gyp-build": "^4.3.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
    "node_modules/clone-response": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
@@ -3130,16 +3181,6 @@
        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
      }
    },
-    "node_modules/eslint-plugin-import/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://mirrors.cloud.tencent.com/npm/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
    "node_modules/eslint-plugin-import/node_modules/debug": {
      "version": "3.2.7",
      "resolved": "https://mirrors.cloud.tencent.com/npm/debug/-/debug-3.2.7.tgz",
@@ -3161,18 +3202,6 @@
        "node": ">=0.10.0"
      }
    },
-    "node_modules/eslint-plugin-import/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://mirrors.cloud.tencent.com/npm/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
    "node_modules/eslint-plugin-n": {
      "version": "16.6.2",
      "resolved": "https://mirrors.cloud.tencent.com/npm/eslint-plugin-n/-/eslint-plugin-n-16.6.2.tgz",
@@ -3201,16 +3230,6 @@
        "eslint": ">=7.0.0"
      }
    },
-    "node_modules/eslint-plugin-n/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://mirrors.cloud.tencent.com/npm/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
    "node_modules/eslint-plugin-n/node_modules/globals": {
      "version": "13.24.0",
      "resolved": "https://mirrors.cloud.tencent.com/npm/globals/-/globals-13.24.0.tgz",
@@ -3226,18 +3245,6 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
-    "node_modules/eslint-plugin-n/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://mirrors.cloud.tencent.com/npm/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
    "node_modules/eslint-plugin-n/node_modules/semver": {
      "version": "7.6.0",
      "resolved": "https://mirrors.cloud.tencent.com/npm/semver/-/semver-7.6.0.tgz",
@@ -3289,16 +3296,6 @@
        "url": "https://opencollective.com/eslint"
      }
    },
-    "node_modules/eslint/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://mirrors.cloud.tencent.com/npm/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
    "node_modules/eslint/node_modules/eslint-scope": {
      "version": "7.2.2",
      "resolved": "https://mirrors.cloud.tencent.com/npm/eslint-scope/-/eslint-scope-7.2.2.tgz",
@@ -3382,18 +3379,6 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
-    "node_modules/eslint/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://mirrors.cloud.tencent.com/npm/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
    "node_modules/eslint/node_modules/p-limit": {
      "version": "3.1.0",
      "resolved": "https://mirrors.cloud.tencent.com/npm/p-limit/-/p-limit-3.1.0.tgz",
@@ -3917,6 +3902,26 @@
        "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
      }
    },
+    "node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://mirrors.cloud.tencent.com/npm/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
    "node_modules/glob-parent": {
      "version": "5.1.2",
      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
@@ -4319,6 +4324,28 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
+    "node_modules/is-buffer": {
+      "version": "2.0.5",
+      "resolved": "https://mirrors.cloud.tencent.com/npm/is-buffer/-/is-buffer-2.0.5.tgz",
+      "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "engines": {
+        "node": ">=4"
+      }
+    },
    "node_modules/is-builtin-module": {
      "version": "3.2.1",
      "resolved": "https://mirrors.cloud.tencent.com/npm/is-builtin-module/-/is-builtin-module-3.2.1.tgz",
@@ -4623,6 +4650,43 @@
        "json-buffer": "3.0.1"
      }
    },
+    "node_modules/level": {
+      "version": "8.0.1",
+      "resolved": "https://mirrors.cloud.tencent.com/npm/level/-/level-8.0.1.tgz",
+      "integrity": "sha512-oPBGkheysuw7DmzFQYyFe8NAia5jFLAgEnkgWnK3OXAuJr8qFT+xBQIwokAZPME2bhPFzS8hlYcL16m8UZrtwQ==",
+      "dependencies": {
+        "abstract-level": "^1.0.4",
+        "browser-level": "^1.0.1",
+        "classic-level": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/level"
+      }
+    },
+    "node_modules/level-supports": {
+      "version": "4.0.1",
+      "resolved": "https://mirrors.cloud.tencent.com/npm/level-supports/-/level-supports-4.0.1.tgz",
+      "integrity": "sha512-PbXpve8rKeNcZ9C1mUicC9auIYFyGpkV9/i6g76tLgANwWhtG2v7I4xNBUlkn3lE2/dZF3Pi0ygYGtLc4RXXdA==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/level-transcoder": {
+      "version": "1.0.1",
+      "resolved": "https://mirrors.cloud.tencent.com/npm/level-transcoder/-/level-transcoder-1.0.1.tgz",
+      "integrity": "sha512-t7bFwFtsQeD8cl8NIoQ2iwxA0CL/9IFw7/9gAjOonH0PWTTiRfY7Hq+Ejbsxh86tXobDQ6IOiddjNYIfOBs06w==",
+      "dependencies": {
+        "buffer": "^6.0.3",
+        "module-error": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
    "node_modules/levn": {
      "version": "0.4.1",
      "resolved": "https://mirrors.cloud.tencent.com/npm/levn/-/levn-0.4.1.tgz",
@@ -4768,6 +4832,28 @@
        "node": ">=4"
      }
    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://mirrors.cloud.tencent.com/npm/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minimatch/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://mirrors.cloud.tencent.com/npm/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
    "node_modules/minimist": {
      "version": "1.2.8",
      "resolved": "https://mirrors.cloud.tencent.com/npm/minimist/-/minimist-1.2.8.tgz",
@@ -4777,6 +4863,14 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
+    "node_modules/module-error": {
+      "version": "1.0.2",
+      "resolved": "https://mirrors.cloud.tencent.com/npm/module-error/-/module-error-1.0.2.tgz",
+      "integrity": "sha512-0yuvsqSCv8LbaOKhnsQ/T5JhyFlCYLPXK3U2sgV10zoKQwzs/MyfuQUOZQ1V/6OCOJsK/TRgNVrPuPDqtdMFtA==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
    "node_modules/ms": {
      "version": "2.1.2",
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -4801,6 +4895,11 @@
        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
      }
    },
+    "node_modules/napi-macros": {
+      "version": "2.2.2",
+      "resolved": "https://mirrors.cloud.tencent.com/npm/napi-macros/-/napi-macros-2.2.2.tgz",
+      "integrity": "sha512-hmEVtAGYzVQpCKdbQea4skABsdXW4RUh5t5mJ2zzqowJS2OyXZTU1KhDVFhx+NlWZ4ap9mqR9TcDO3LTTttd+g=="
+    },
    "node_modules/natural-compare": {
      "version": "1.4.0",
      "resolved": "https://mirrors.cloud.tencent.com/npm/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -5178,7 +5277,6 @@
      "version": "1.2.3",
      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true,
      "funding": [
        {
          "type": "github",
@@ -5343,48 +5441,6 @@
        "url": "https://github.com/sponsors/isaacs"
      }
    },
-    "node_modules/rimraf/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://mirrors.cloud.tencent.com/npm/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/rimraf/node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://mirrors.cloud.tencent.com/npm/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/rimraf/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://mirrors.cloud.tencent.com/npm/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
    "node_modules/roarr": {
      "version": "2.15.4",
      "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz",
@@ -5458,6 +5514,28 @@
        "queue-microtask": "^1.2.2"
      }
    },
+    "node_modules/run-parallel-limit": {
+      "version": "1.1.0",
+      "resolved": "https://mirrors.cloud.tencent.com/npm/run-parallel-limit/-/run-parallel-limit-1.1.0.tgz",
+      "integrity": "sha512-jJA7irRNM91jaKc3Hcl1npHsFLOXOoTkPCUL1JEa1R82O2miplXXRaGdjW/KM/98YQWDhJLiSs793CnXfblJUw==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
    "node_modules/safe-array-concat": {
      "version": "1.1.0",
      "resolved": "https://mirrors.cloud.tencent.com/npm/safe-array-concat/-/safe-array-concat-1.1.0.tgz",
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
    "express": "^4.18.2",
    "file-type": "^19.0.0",
    "fluent-ffmpeg": "^2.1.2",
+    "level": "^8.0.1",
    "silk-wasm": "^3.2.3",
    "utf-8-validate": "^6.0.3",
    "uuid": "^9.0.1",
--- a/src/common/config.ts
+++ b/src/common/config.ts
@@ -4,6 +4,8 @@ import {mergeNewProperties} from "./utils";

 export const HOOK_LOG = false;

+export const ALLOW_SEND_TEMP_MSG = false;
+
 export class ConfigUtil {
    private readonly configPath: string;
    private config: Config | null = null;
--- a/src/common/data.ts
+++ b/src/common/data.ts
@@ -9,6 +9,9 @@ import {
    type SelfInfo
 } from '../ntqqapi/types'
 import {type FileCache, type LLOneBotError} from './types'
+import {dbUtil} from "./db";
+import {raw} from "express";
+import {log} from "./utils";

 export const selfInfo: SelfInfo = {
    uid: '',
@@ -18,48 +21,41 @@ export const selfInfo: SelfInfo = {
 }
 export let groups: Group[] = []
 export let friends: Friend[] = []
-export let msgHistory: Record<string, RawMessage> = {} // msgId: RawMessage
 export let groupNotifies: Map<string, GroupNotify> = new Map<string, GroupNotify>()
 export let friendRequests: Map<number, FriendRequest> = new Map<number, FriendRequest>()
 export const llonebotError: LLOneBotError = {
    ffmpegError: '',
    otherError: ''
 }
-let globalMsgId = Math.floor(Date.now() / 1000)

-export const fileCache = new Map<string, FileCache>()

-export function addHistoryMsg(msg: RawMessage): boolean {
-    const existMsg = msgHistory[msg.msgId]
-    if (existMsg) {
-        Object.assign(existMsg, msg)
-        msg.msgShortId = existMsg.msgShortId
-        return false
-    }
-    msg.msgShortId = ++globalMsgId
-    msgHistory[msg.msgId] = msg
-    return true
-}
-
-export function getHistoryMsgByShortId(shortId: number | string) {
-    // log("getHistoryMsgByShortId", shortId, Object.values(msgHistory).map(m=>m.msgShortId))
-    return Object.values(msgHistory).find(msg => msg.msgShortId.toString() == shortId.toString())
-}
-
-export async function getFriend(qq: string): Promise<Friend | undefined> {
-    let friend = friends.find(friend => friend.uin === qq)
-    if (!friend){
-        friends = (await NTQQApi.getFriends(true))
-        friend = friends.find(friend => friend.uin === qq)
-    }
+export async function getFriend(qq: string, uid: string = ""): Promise<Friend | undefined> {
+    let filterKey = uid ? "uid" : "uin"
+    let filterValue = uid ? uid : qq
+    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())
+    //     }
+    // }
    return friend
 }

 export async function getGroup(qq: string): Promise<Group | undefined> {
-    let group = groups.find(group => group.groupCode === qq)
-    if (!group){
-        groups = await NTQQApi.getGroups(true);
-        group = groups.find(group => group.groupCode === qq)
+    let group = groups.find(group => group.groupCode === qq.toString())
+    if (!group) {
+        try {
+            const _groups = await NTQQApi.getGroups(true);
+            group = _groups.find(group => group.groupCode === qq.toString())
+            if (group) {
+                groups.push(group)
+            }
+        } catch (e) {
+        }
+
    }
    return group
 }
@@ -71,22 +67,25 @@ export async function getGroupMember(groupQQ: string | number, memberQQ: string
    }
    const group = await getGroup(groupQQ)
    if (group) {
-        let filterFunc: (member: GroupMember) => boolean
-        if (memberQQ) {
-            filterFunc = member => member.uin === memberQQ
-        } else if (memberUid) {
-            filterFunc = member => member.uid === memberUid
-        }
+        const filterKey = memberQQ ? "uin" : "uid"
+        const filterValue = memberQQ ? memberQQ : memberUid
+        let filterFunc: (member: GroupMember) => boolean = member => member[filterKey] === filterValue
        let member = group.members?.find(filterFunc)
        if (!member) {
-            const _members = await NTQQApi.getGroupMembers(groupQQ)
-            if (_members.length > 0) {
-                group.members = _members
+            try {
+                const _members = await NTQQApi.getGroupMembers(groupQQ)
+                if (_members.length > 0) {
+                    group.members = _members
+                }
+            } catch (e) {
+                // log("刷新群成员列表失败", e.stack.toString())
            }
+
            member = group.members?.find(filterFunc)
        }
        return member
    }
+    return null
 }

 export async function refreshGroupMembers(groupQQ: string) {
@@ -96,10 +95,6 @@ export async function refreshGroupMembers(groupQQ: string) {
    }
 }

-export function getHistoryMsgBySeq(seq: string) {
-    return Object.values(msgHistory).find(msg => msg.msgSeq === seq)
-}
-
 export const uidMaps: Record<string, string> = {} // 一串加密的字符串(uid) -> qq号

 export function getUidByUin(uin: string) {
@@ -109,3 +104,5 @@ export function getUidByUin(uin: string) {
        }
    }
 }
+
+export let tempGroupCodeMap: Record<string, string> = {}  // peerUid => 群号
--- a/src/common/db.ts
+++ b/src/common/db.ts
@@ -0,0 +1,208 @@
+import {Level} from "level";
+import {RawMessage} from "../ntqqapi/types";
+import {DATA_DIR, log} from "./utils";
+import {selfInfo} from "./data";
+import {FileCache} from "./types";
+
+
+class DBUtil {
+    private readonly DB_KEY_PREFIX_MSG_ID = "msg_id_";
+    private readonly DB_KEY_PREFIX_MSG_SHORT_ID = "msg_short_id_";
+    private readonly DB_KEY_PREFIX_MSG_SEQ_ID = "msg_seq_id_";
+    private readonly DB_KEY_PREFIX_FILE = "file_";
+    private db: Level;
+    private cache: Record<string, RawMessage | string | FileCache> = {}  // <msg_id_ | msg_short_id_ | msg_seq_id_><id>: RawMessage
+    private currentShortId: number;
+
+    /*
+    * 数据库结构
+    * msg_id_101231230999: {} // 长id: RawMessage
+    * msg_short_id_1: 101231230999  // 短id: 长id
+    * msg_seq_id_1: 101231230999  // 序列id: 长id
+    * file_7827DBAFJFW2323.png: {} // 文件名: FileCache
+    * */
+
+    constructor() {
+        let initCount = 0;
+        new Promise((resolve, reject) => {
+            const initDB = () => {
+                initCount++;
+                // if (initCount > 50) {
+                //     return reject("init db fail")
+                // }
+
+                try {
+                    if (!selfInfo.uin) {
+                        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")
+                    resolve(null)
+                } catch (e) {
+                    console.log("init db fail", e.stack.toString())
+                    setTimeout(initDB, 300);
+                }
+            }
+            initDB();
+        }).then()
+        setInterval(() => {
+            this.cache = {}
+        }, 1000 * 60 * 10)
+    }
+
+    private addCache(msg: RawMessage) {
+        const longIdKey = this.DB_KEY_PREFIX_MSG_ID + msg.msgId
+        const shortIdKey = this.DB_KEY_PREFIX_MSG_SHORT_ID + msg.msgShortId
+        const seqIdKey = this.DB_KEY_PREFIX_MSG_SEQ_ID + msg.msgSeq
+        this.cache[longIdKey] = this.cache[shortIdKey] = msg
+    }
+
+    async getMsgByShortId(shortMsgId: number): Promise<RawMessage> {
+        const shortMsgIdKey = this.DB_KEY_PREFIX_MSG_SHORT_ID + shortMsgId;
+        if (this.cache[shortMsgIdKey]) {
+            return this.cache[shortMsgIdKey] as RawMessage
+        }
+        const longId = await this.db.get(shortMsgIdKey);
+        const msg = await this.getMsgByLongId(longId)
+        this.addCache(msg)
+        return msg
+    }
+
+    async getMsgByLongId(longId: string): Promise<RawMessage> {
+        const longIdKey = this.DB_KEY_PREFIX_MSG_ID + longId;
+        if (this.cache[longIdKey]) {
+            return this.cache[longIdKey] as RawMessage
+        }
+        const data = await this.db.get(longIdKey)
+        const msg = JSON.parse(data)
+        this.addCache(msg)
+        return msg
+    }
+
+    async getMsgBySeqId(seqId: string): Promise<RawMessage> {
+        const seqIdKey = this.DB_KEY_PREFIX_MSG_SEQ_ID + seqId;
+        if (this.cache[seqIdKey]) {
+            return this.cache[seqIdKey] as RawMessage
+        }
+        const longId = await this.db.get(seqIdKey);
+        const msg = await this.getMsgByLongId(longId)
+        this.addCache(msg)
+        return msg
+    }
+
+    async addMsg(msg: RawMessage) {
+        // 有则更新，无则添加
+        // log("addMsg", msg.msgId, msg.msgSeq, msg.msgShortId);
+        const longIdKey = this.DB_KEY_PREFIX_MSG_ID + msg.msgId
+        let existMsg = this.cache[longIdKey] as RawMessage
+        if (!existMsg) {
+            try {
+                existMsg = await this.getMsgByLongId(msg.msgId)
+            } catch (e) {
+
+            }
+        }
+        if (existMsg) {
+            // log("消息已存在", existMsg.msgSeq, existMsg.msgShortId, existMsg.msgId)
+            this.updateMsg(msg).then()
+            return existMsg.msgShortId
+        }
+
+        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;
+        try {
+            this.db.put(shortIdKey, msg.msgId).then();
+            this.db.put(longIdKey, JSON.stringify(msg)).then();
+            try {
+                await this.db.get(seqIdKey)
+            } catch (e) {
+                // log("新的seqId", seqIdKey)
+                this.db.put(seqIdKey, msg.msgId).then();
+            }
+            this.cache[shortIdKey] = this.cache[longIdKey] = msg;
+            if (!this.cache[seqIdKey]) {
+                this.cache[seqIdKey] = msg;
+            }
+            // log(`消息入库 ${seqIdKey}: ${msg.msgId}, ${shortMsgId}: ${msg.msgId}`);
+        } catch (e) {
+            // log("addMsg db error", e.stack.toString());
+        }
+        return shortMsgId
+    }
+
+    async updateMsg(msg: RawMessage) {
+        const longIdKey = this.DB_KEY_PREFIX_MSG_ID + msg.msgId
+        let existMsg = this.cache[longIdKey] as RawMessage
+        if (!existMsg) {
+            try {
+                existMsg = await this.getMsgByLongId(msg.msgId)
+            } catch (e) {
+                existMsg = msg
+            }
+        }
+
+        Object.assign(existMsg, msg)
+        this.db.put(longIdKey, JSON.stringify(existMsg)).then();
+        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.db.put(shortIdKey, msg.msgId).then();
+        try {
+            await this.db.get(seqIdKey)
+        } catch (e) {
+            this.db.put(seqIdKey, msg.msgId).then();
+            // log("更新seqId error", e.stack, seqIdKey);
+        }
+        // log("更新消息", existMsg.msgSeq, existMsg.msgShortId, existMsg.msgId);
+    }
+
+
+    private async genMsgShortId(): Promise<number> {
+        const key = "msg_current_short_id";
+        if (this.currentShortId === undefined) {
+            try {
+                let id: string = await this.db.get(key);
+                this.currentShortId = parseInt(id);
+            } catch (e) {
+                this.currentShortId = -2147483640
+            }
+        }
+
+        this.currentShortId++;
+        await this.db.put(key, this.currentShortId.toString());
+        return this.currentShortId;
+    }
+
+    async addFileCache(fileName: string, data: FileCache) {
+        const key = this.DB_KEY_PREFIX_FILE + fileName;
+        if (this.cache[key]) {
+            return
+        }
+        let cacheDBData = {...data}
+        delete cacheDBData['downloadFunc']
+        this.cache[fileName] = data;
+        await this.db.put(key, JSON.stringify(cacheDBData));
+    }
+
+    async getFileCache(fileName: string): Promise<FileCache | undefined> {
+        const key = this.DB_KEY_PREFIX_FILE + fileName;
+        if (this.cache[key]) {
+            return this.cache[key] as FileCache
+        }
+        try {
+
+            let data = await this.db.get(key);
+            return JSON.parse(data);
+        } catch (e) {
+
+        }
+    }
+}
+
+export const dbUtil = new DBUtil();
--- a/src/common/utils.ts
+++ b/src/common/utils.ts
@@ -7,10 +7,10 @@ import fs from 'fs';
 import {v4 as uuidv4} from "uuid";
 import ffmpeg from "fluent-ffmpeg"

-export const CONFIG_DIR = global.LiteLoader.plugins["LLOneBot"].path.data;
+export const DATA_DIR = global.LiteLoader.plugins["LLOneBot"].path.data;

 export function getConfigUtil() {
-    const configFilePath = path.join(CONFIG_DIR, `config_${selfInfo.uin}.json`)
+    const configFilePath = path.join(DATA_DIR, `config_${selfInfo.uin}.json`)
    return new ConfigUtil(configFilePath)
 }

@@ -55,7 +55,7 @@ export function log(...msg: any[]) {
    logMsg = `${currentDateTime} ${userInfo}: ${logMsg}\n\n`
    // sendLog(...msg);
    // console.log(msg)
-    fs.appendFile(path.join(CONFIG_DIR, `llonebot-${currentDate}.log`), logMsg, (err: any) => {
+    fs.appendFile(path.join(DATA_DIR, `llonebot-${currentDate}.log`), logMsg, (err: any) => {

    })
 }
@@ -192,7 +192,7 @@ export async function encodeSilk(filePath: string) {

    try {
        const fileName = path.basename(filePath);
-        const pttPath = path.join(CONFIG_DIR, uuidv4());
+        const pttPath = path.join(DATA_DIR, uuidv4());
        if (getFileHeader(filePath) !== "02232153494c4b") {
            log(`语音文件${filePath}需要转换成silk`)
            const _isWav = await isWavFile(filePath);
@@ -233,7 +233,17 @@ export async function encodeSilk(filePath: string) {
            };
        } else {
            const pcm = fs.readFileSync(filePath);
-            const duration = getDuration(pcm);
+            let duration = 0;
+            try{
+                duration = getDuration(pcm);
+            }catch (e) {
+                log("获取语音文件时长失败", filePath, e.stack)
+                duration = fs.statSync(filePath).size / 1024 / 3  // 每3kb大约1s
+                duration = Math.floor(duration)
+                duration = Math.max(1, duration)
+                log("使用文件大小估算时长", duration)
+            }
+
            return {
                converted: false,
                path: filePath,
--- a/src/main/main.ts
+++ b/src/main/main.ts
@@ -11,15 +11,13 @@ import {
    CHANNEL_SET_CONFIG,
 } from "../common/channels";
 import {ob11WebsocketServer} from "../onebot11/server/ws/WebsocketServer";
-import {checkFfmpeg, CONFIG_DIR, getConfigUtil, log} from "../common/utils";
+import {checkFfmpeg, DATA_DIR, getConfigUtil, log} from "../common/utils";
 import {
-    addHistoryMsg,
-    friendRequests,
+    friendRequests, getFriend,
    getGroup,
    getGroupMember,
    groupNotifies,
-    llonebotError,
-    msgHistory, refreshGroupMembers,
+    llonebotError, refreshGroupMembers,
    selfInfo
 } from "../common/data";
 import {hookNTQQApiCall, hookNTQQApiReceive, ReceiveCmd, registerReceiveHook} from "../ntqqapi/hook";
@@ -43,6 +41,7 @@ import {OB11GroupDecreaseEvent} from "../onebot11/event/notice/OB11GroupDecrease
 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";


 let running = false;
@@ -82,8 +81,8 @@ function onLoad() {
            return ""
        }
    })
-    if (!fs.existsSync(CONFIG_DIR)) {
-        fs.mkdirSync(CONFIG_DIR, {recursive: true});
+    if (!fs.existsSync(DATA_DIR)) {
+        fs.mkdirSync(DATA_DIR, {recursive: true});
    }
    ipcMain.handle(CHANNEL_ERROR, (event, arg) => {
        return llonebotError;
@@ -153,14 +152,12 @@ function onLoad() {
        log(arg);
    })

-    function postReceiveMsg(msgList: RawMessage[]) {
+    async function postReceiveMsg(msgList: RawMessage[]) {
        const {debug, reportSelfMessage} = getConfigUtil().getConfig();
        for (let message of msgList) {
-            // log("收到新消息", message)
-            message.msgShortId = msgHistory[message.msgId]?.msgShortId
-            if (!message.msgShortId) {
-                addHistoryMsg(message);
-            }
+            // log("收到新消息", message.msgSeq)
+            message.msgShortId = await dbUtil.addMsg(message)
+
            OB11Constructor.message(message).then((msg) => {
                if (debug) {
                    msg.raw = message;
@@ -171,16 +168,16 @@ function onLoad() {
                }
                postOB11Event(msg);
                // log("post msg", msg)
-            }).catch(e => log("constructMessage error: ", e.toString()));
+            }).catch(e => log("constructMessage error: ", e.stack.toString()));
        }
    }

    async function startReceiveHook() {
-        registerReceiveHook<{ msgList: Array<RawMessage> }>(ReceiveCmd.NEW_MSG, (payload) => {
+        registerReceiveHook<{ msgList: Array<RawMessage> }>(ReceiveCmd.NEW_MSG, async (payload) => {
            try {
-                postReceiveMsg(payload.msgList);
+                await postReceiveMsg(payload.msgList);
            } catch (e) {
-                log("report message error: ", e.toString());
+                log("report message error: ", e.stack.toString());
            }
        })
        registerReceiveHook<{ msgList: Array<RawMessage> }>(ReceiveCmd.UPDATE_MSG, async (payload) => {
@@ -188,10 +185,12 @@ function onLoad() {
                // log("message update", message.sendStatus, message)
                if (message.recallTime != "0") {
                    // 撤回消息上报
-                    const oriMessage = msgHistory[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);
@@ -211,21 +210,22 @@ function onLoad() {

                        postOB11Event(groupRecallEvent);
                    }
+                    // 不让入库覆盖原来消息，不然就获取不到撤回的消息内容了
                    continue
                }
-                addHistoryMsg(message)
+                dbUtil.updateMsg(message).then();
            }
        })
-        registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmd.SELF_SEND_MSG, (payload) => {
+        registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmd.SELF_SEND_MSG, async (payload) => {
            const {reportSelfMessage} = getConfigUtil().getConfig();
            if (!reportSelfMessage) {
                return
            }
            // log("reportSelfMessage", payload)
            try {
-                postReceiveMsg([payload.msgRecord]);
+                await postReceiveMsg([payload.msgRecord]);
            } catch (e) {
-                log("report self message error: ", e.toString());
+                log("report self message error: ", e.stack.toString());
            }
        })
        registerReceiveHook<{
@@ -245,14 +245,15 @@ function onLoad() {

                const notifies = notify.notifies.slice(0, payload.unreadCount)
                // log("获取群通知详情完成", notifies, payload);
-                try {
-                    for (const notify of notifies) {
+
+                for (const notify of notifies) {
+                    try {
                        notify.time = Date.now();
                        const notifyTime = parseInt(notify.seq) / 1000
                        // log(`加群通知时间${notifyTime}`, `LLOneBot启动时间${startTime}`);
-                        if (notifyTime < startTime) {
-                            continue;
-                        }
+                        // if (notifyTime < startTime) {
+                        //     continue;
+                        // }
                        let existNotify = groupNotifies[notify.seq];
                        if (existNotify) {
                            if (Date.now() - existNotify.time < 3000) {
@@ -261,14 +262,14 @@ function onLoad() {
                        }
                        log("收到群通知", notify);
                        groupNotifies[notify.seq] = notify;
-                        const member1 = await getGroupMember(notify.group.groupCode, null, notify.user1.uid);
-                        refreshGroupMembers(notify.group.groupCode).then()
-                        let member2: GroupMember;
-                        if (notify.user2.uid) {
-                            member2 = await getGroupMember(notify.group.groupCode, null, notify.user2.uid);
-                        }
+                        // 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, null, notify.user1.uid);
                            log("有管理员变动通知");
+                            refreshGroupMembers(notify.group.groupCode).then()
                            let groupAdminNoticeEvent = new OB11GroupAdminNoticeEvent()
                            groupAdminNoticeEvent.group_id = parseInt(notify.group.groupCode);
                            log("开始获取变动的管理员")
@@ -281,8 +282,9 @@ function onLoad() {
                                log("获取群通知的成员信息失败", notify, getGroup(notify.group.groupCode));
                            }
                        } else if (notify.type == GroupNotifyTypes.MEMBER_EXIT) {
-                            log("有成员退出通知");
-                            let groupDecreaseEvent = new OB11GroupDecreaseEvent(parseInt(notify.group.groupCode), parseInt(member1.uin))
+                            // 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("有加群请求");
@@ -300,20 +302,24 @@ function onLoad() {
                            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 NTQQApi.getUserDetailInfo(notify.user2.uid))?.uin
+                            let user_id = (await getFriend("", notify.user2.uid))?.uin
+                            if (!user_id){
+                                user_id = (await NTQQApi.getUserDetailInfo(notify.user2.uid))?.uin
+                            }
                            groupInviteEvent.user_id = parseInt(user_id);
                            groupInviteEvent.sub_type = "invite";
                            groupInviteEvent.flag = notify.seq;
                            postOB11Event(groupInviteEvent);
                        }
+                    } catch (e) {
+                        log("解析群通知失败", e.stack.toString());
                    }
-                } catch (e) {
-                    log("解析群通知失败", e.stack);
                }
-            }
-            else if (payload.doubt){
+
+            } else if (payload.doubt) {
                // 可能有群管理员变动
            }
        })
--- a/src/ntqqapi/constructor.ts
+++ b/src/ntqqapi/constructor.ts
@@ -1,6 +1,6 @@
 import {
    AtType,
-    ElementType, PicType,
+    ElementType, PicType, SendArkElement,
    SendFaceElement,
    SendFileElement,
    SendPicElement,
@@ -57,6 +57,9 @@ export class SendMsgElementConstructor {

    static async pic(picPath: string): Promise<SendPicElement> {
        const {md5, fileName, path, fileSize} = await NTQQApi.uploadFile(picPath, ElementType.PIC);
+        if (fileSize === 0){
+            throw "文件异常，大小为0";
+        }
        const imageSize = await NTQQApi.getImageSize(picPath);
        const picElement = {
            md5HexStr: md5,
@@ -81,19 +84,22 @@ export class SendMsgElementConstructor {
        };
    }

-    static async file(filePath: string, isVideo: boolean = false): Promise<SendFileElement> {
+    static async file(filePath: string, showPreview: boolean = false, fileName: string = ""): Promise<SendFileElement> {
        let picHeight = 0;
        let picWidth = 0;
-        if (isVideo) {
+        if (showPreview) {
            picHeight = 1024;
            picWidth = 768;
        }
-        const {md5, fileName, path, fileSize} = await NTQQApi.uploadFile(filePath, ElementType.FILE);
+        const {md5, fileName: _fileName, path, fileSize} = await NTQQApi.uploadFile(filePath, ElementType.FILE);
+        if (fileSize === 0){
+            throw "文件异常，大小为0";
+        }
        let element: SendFileElement = {
            elementType: ElementType.FILE,
            elementId: "",
            fileElement: {
-                fileName,
+                fileName: fileName || _fileName,
                "filePath": path,
                "fileSize": (fileSize).toString(),
                picHeight,
@@ -104,14 +110,17 @@ export class SendMsgElementConstructor {
        return element;
    }

-    static video(filePath: string): Promise<SendFileElement> {
-        return SendMsgElementConstructor.file(filePath, true);
+    static video(filePath: string, fileName: string=""): Promise<SendFileElement> {
+        return SendMsgElementConstructor.file(filePath, true, fileName);
    }

    static async ptt(pttPath: string): Promise<SendPttElement> {
        const {converted, path: silkPath, duration} = await encodeSilk(pttPath);
        // log("生成语音", silkPath, duration);
        const {md5, fileName, path, fileSize} = await NTQQApi.uploadFile(silkPath, ElementType.PTT);
+        if (fileSize === 0){
+            throw "文件异常，大小为0";
+        }
        if (converted) {
            fs.unlink(silkPath, () => {
            });
@@ -150,4 +159,12 @@ export class SendMsgElementConstructor {
            }
        }
    }
+
+    static ark(data: any): SendArkElement {
+        return {
+            elementType: ElementType.ARK,
+            elementId: "",
+            arkElement: data
+        }
+    }
 }
--- a/src/ntqqapi/hook.ts
+++ b/src/ntqqapi/hook.ts
@@ -2,13 +2,14 @@ import {type BrowserWindow} from 'electron'
 import {getConfigUtil, log, sleep} from '../common/utils'
 import {NTQQApi, type NTQQApiClass, sendMessagePool} from './ntcall'
 import {type Group, type RawMessage, type User} from './types'
-import {addHistoryMsg, friends, groups, msgHistory, selfInfo} from '../common/data'
+import {friends, groups, selfInfo, tempGroupCodeMap} from '../common/data'
 import {OB11GroupDecreaseEvent} from '../onebot11/event/notice/OB11GroupDecreaseEvent'
 import {OB11GroupIncreaseEvent} from '../onebot11/event/notice/OB11GroupIncreaseEvent'
 import {v4 as uuidv4} from 'uuid'
 import {postOB11Event} from '../onebot11/server/postOB11Event'
 import {HOOK_LOG} from '../common/config'
 import fs from 'fs'
+import {dbUtil} from "../common/db";

 export const hookApiCallbacks: Record<string, (apiReturn: any) => void> = {}

@@ -232,8 +233,8 @@ registerReceiveHook<{
 registerReceiveHook<{ msgList: RawMessage[] }>(ReceiveCmd.NEW_MSG, (payload) => {
    const {autoDeleteFile, autoDeleteFileSecond} = getConfigUtil().getConfig()
    for (const message of payload.msgList) {
-        // log("收到新消息，push到历史记录", message)
-        addHistoryMsg(message)
+        // log("收到新消息，push到历史记录", message.msgSeq)
+        dbUtil.addMsg(message).then()
        // 清理文件
        if (!autoDeleteFile) {
            continue
@@ -246,6 +247,10 @@ registerReceiveHook<{ msgList: RawMessage[] }>(ReceiveCmd.NEW_MSG, (payload) =>
                if (msgElement.picElement) {
                    pathList.push(...Object.values(msgElement.picElement.thumbPath))
                }
+                const aioOpGrayTipElement = msgElement.grayTipElement?.aioOpGrayTipElement
+                if (aioOpGrayTipElement){
+                    tempGroupCodeMap[aioOpGrayTipElement.peerUid] = aioOpGrayTipElement.fromGrpCodeOfTmpChat;
+                }
                // log("需要清理的文件", pathList);
                for (const path of pathList) {
                    if (path) {
@@ -257,16 +262,14 @@ registerReceiveHook<{ msgList: RawMessage[] }>(ReceiveCmd.NEW_MSG, (payload) =>
            }, autoDeleteFileSecond * 1000)
        }
    }
-    const msgIds = Object.keys(msgHistory)
-    if (msgIds.length > 30000) {
-        delete msgHistory[msgIds.sort()[0]]
-    }
 })

 registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmd.SELF_SEND_MSG, ({msgRecord}) => {
    const message = msgRecord
    const peerUid = message.peerUid
    // log("收到自己发送成功的消息", Object.keys(sendMessagePool), message);
+    // log("收到自己发送成功的消息", message);
+    dbUtil.addMsg(message).then()
    const sendCallback = sendMessagePool[peerUid]
    if (sendCallback) {
        try {
--- a/src/ntqqapi/ntcall.ts
+++ b/src/ntqqapi/ntcall.ts
@@ -17,9 +17,10 @@ import {
    type User
 } from './types'
 import * as fs from 'node:fs'
-import {addHistoryMsg, friendRequests, groupNotifies, msgHistory, selfInfo} from '../common/data'
+import {friendRequests, groupNotifies, selfInfo, uidMaps} from '../common/data'
 import {v4 as uuidv4} from 'uuid'
 import path from 'path'
+import {dbUtil} from "../common/db";

 interface IPCReceiveEvent {
    eventName: string
@@ -57,6 +58,7 @@ export enum NTQQApiMethod {
    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',
@@ -290,7 +292,7 @@ export class NTQQApi {

            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);
@@ -420,7 +422,7 @@ export class NTQQApi {
        })
    }

-    static async sendMsg(peer: Peer, msgElements: SendMessageElement[], waitComplete = false, timeout = 10000) {
+    static async sendMsg(peer: Peer, msgElements: SendMessageElement[], waitComplete = true, timeout = 10000) {
        const peerUid = peer.peerUid

        // 等待上一个相同的peer发送完
@@ -449,19 +451,25 @@ export class NTQQApi {

        let checkSendCompleteUsingTime = 0
        const checkSendComplete = async (): Promise<RawMessage> => {
-            if (sentMessage && msgHistory[sentMessage.msgId]?.sendStatus == 2) {
-                // log(`给${peerUid}发送消息成功`)
-                return sentMessage
-            } else {
-                checkSendCompleteUsingTime += 500
-                if (checkSendCompleteUsingTime > timeout) {
-                    throw ('发送超时')
+            if (sentMessage) {
+                if (waitComplete) {
+                    if ((await dbUtil.getMsgByLongId(sentMessage.msgId)).sendStatus == 2) {
+                        return sentMessage
+                    }
                }
-                await sleep(500)
-                return await checkSendComplete()
+                else{
+                    return sentMessage
+                }
+                // log(`给${peerUid}发送消息成功`)
            }
+            checkSendCompleteUsingTime += 500
+            if (checkSendCompleteUsingTime > timeout) {
+                throw ('发送超时')
+            }
+            await sleep(500)
+            return await checkSendComplete()
        }
-
+        log("开始发送消息", peer, msgElements)
        callNTQQApi({
            methodName: NTQQApiMethod.SEND_MSG,
            args: [{
@@ -474,6 +482,24 @@ export class NTQQApi {
        return await checkSendComplete()
    }

+    static async forwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {
+        return await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.FORWARD_MSG,
+            args:[
+                {
+                    msgIds: msgIds,
+                    srcContact: srcPeer,
+                    dstContacts: [
+                        destPeer
+                    ],
+                    commentElements: [],
+                    msgAttributeInfos: new Map()
+                },
+                null,
+            ]
+        })
+
+    }
    static async multiForwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {
        const msgInfos = msgIds.map(id => {
            return {msgId: id, senderShowName: selfInfo.nick}
@@ -495,7 +521,7 @@ export class NTQQApi {
                    reject('转发消息超时')
                }
            }, 5000)
-            registerReceiveHook(ReceiveCmd.SELF_SEND_MSG, (payload: { msgRecord: RawMessage }) => {
+            registerReceiveHook(ReceiveCmd.SELF_SEND_MSG, async (payload: { msgRecord: RawMessage }) => {
                const msg = payload.msgRecord
                // 需要判断它是转发的消息，并且识别到是当前转发的这一条
                const arkElement = msg.elements.find(ele => ele.arkElement)
@@ -509,7 +535,7 @@ export class NTQQApi {
                }
                if (msg.peerUid == destPeer.peerUid && msg.senderUid == selfInfo.uid) {
                    complete = true
-                    addHistoryMsg(msg)
+                    await dbUtil.addMsg(msg)
                    resolve(msg)
                    log('转发消息成功：', payload)
                }
--- a/src/ntqqapi/types.ts
+++ b/src/ntqqapi/types.ts
@@ -73,6 +73,7 @@ export enum ElementType {
    PTT = 4,
    FACE = 6,
    REPLY = 7,
+    ARK = 10,
 }

 export interface SendTextElement {
@@ -95,7 +96,7 @@ export interface SendPttElement {
        filePath: string,
        md5HexStr: string,
        fileSize: number,
-        duration: number,
+        duration: number,  // 单位是秒
        formatType: number,
        voiceType: number,
        voiceChangeType: number,
@@ -165,13 +166,20 @@ export interface FileElement {
 }

 export interface SendFileElement {
-    "elementType": ElementType.FILE,
-    "elementId": "",
-    "fileElement": FileElement
+    elementType: ElementType.FILE,
+    elementId: "",
+    fileElement: FileElement
+}
+
+export interface SendArkElement {
+    elementType: ElementType.ARK,
+    elementId: "",
+    arkElement: ArkElement
+
 }

 export type SendMessageElement = SendTextElement | SendPttElement |
-    SendPicElement | SendReplyElement | SendFaceElement | SendFileElement
+    SendPicElement | SendReplyElement | SendFaceElement | SendFileElement | SendArkElement

 export enum AtType {
    notAt = 0,
@@ -210,6 +218,8 @@ export interface PttElement {

 export interface ArkElement {
    bytesData: string;
+    linkInfo:null,
+    subElementType:null
 }

 export const IMAGE_HTTP_HOST = "https://gchat.qpic.cn"
@@ -223,6 +233,7 @@ export interface PicElement {
    fileSize: number;
    fileName: string;
    fileUuid: string;
+    md5HexStr?: string;
 }

 export interface GrayTipElement {
@@ -234,6 +245,7 @@ export interface GrayTipElement {
        operatorMemRemark?: string;
        wording: string;  // 自定义的撤回提示语
    }
+    aioOpGrayTipElement: TipAioOpGrayTipElement
 }

 export interface FaceElement {
@@ -266,6 +278,37 @@ export interface VideoElement {
    "sourceVideoCodecFormat": 0
 }

+export interface TipAioOpGrayTipElement{
+    operateType: number,
+    peerUid: string,
+    fromGrpCodeOfTmpChat: string,
+}
+
+export interface TipGroupElement {
+    "type": 1,  // 1是表示有人加入群, 自己加入群也会收到这个
+    "role": 0,
+    "groupName": string,  // 暂时获取不到
+    "memberUid": string,
+    "memberNick": string,
+    "memberRemark": string,
+    "adminUid": string,  // 同意加群的管理员uid
+    "adminNick": string,
+    "adminRemark": string,
+    "createGroup": null,
+    "memberAdd": {
+        "showType": 1,
+        "otherAdd": null,
+        "otherAddByOtherQRCode": null,
+        "otherAddByYourQRCode": null,
+        "youAddByOtherQRCode": null,
+        "otherInviteOther": null,
+        "otherInviteYou": null,
+        "youInviteOther": null
+    },
+    "shutUp": null
+}
+
+
 export interface RawMessage {
    msgId: string;
    msgShortId?: number;  // 自己维护的消息id
--- a/src/onebot11/action/BaseAction.ts
+++ b/src/onebot11/action/BaseAction.ts
@@ -1,6 +1,7 @@
 import {ActionName, BaseCheckResult} from "./types"
 import {OB11Response} from "./utils"
 import {OB11Return} from "../types";
+import {log} from "../../common/utils";

 class BaseAction<PayloadType, ReturnDataType> {
    actionName: ActionName
@@ -20,6 +21,7 @@ class BaseAction<PayloadType, ReturnDataType> {
            const resData = await this._handle(payload);
            return OB11Response.ok(resData);
        } catch (e) {
+            log("发生错误", e)
            return OB11Response.error(e.toString(), 200);
        }
    }
@@ -33,6 +35,7 @@ class BaseAction<PayloadType, ReturnDataType> {
            const resData = await this._handle(payload)
            return OB11Response.ok(resData, echo);
        } catch (e) {
+            log("发生错误", e)
            return OB11Response.error(e.toString(), 1200, echo)
        }
    }
--- a/src/onebot11/action/DeleteMsg.ts
+++ b/src/onebot11/action/DeleteMsg.ts
@@ -1,7 +1,7 @@
 import {ActionName} from "./types";
 import BaseAction from "./BaseAction";
 import {NTQQApi} from "../../ntqqapi/ntcall";
-import {getHistoryMsgByShortId} from "../../common/data";
+import {dbUtil} from "../../common/db";

 interface Payload {
    message_id: number
@@ -11,7 +11,7 @@ class DeleteMsg extends BaseAction<Payload, void> {
    actionName = ActionName.DeleteMsg

    protected async _handle(payload: Payload) {
-        let msg = getHistoryMsgByShortId(payload.message_id)
+        let msg = await dbUtil.getMsgByShortId(payload.message_id)
        await NTQQApi.recallMsg({
            chatType: msg.chatType,
            peerUid: msg.peerUid
--- a/src/onebot11/action/GetFile.ts
+++ b/src/onebot11/action/GetFile.ts
@@ -1,7 +1,7 @@
 import BaseAction from "./BaseAction";
-import {fileCache} from "../../common/data";
 import {getConfigUtil} from "../../common/utils";
 import fs from "fs/promises";
+import {dbUtil} from "../../common/db";

 export interface GetFilePayload {
    file: string // 文件名
@@ -18,7 +18,7 @@ export interface GetFileResponse {

 export class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
    protected async _handle(payload: GetFilePayload): Promise<GetFileResponse> {
-        const cache = fileCache.get(payload.file)
+        const cache = await dbUtil.getFileCache(payload.file)
        const {autoDeleteFile, enableLocalFile2Url, autoDeleteFileSecond} = getConfigUtil().getConfig()
        if (!cache) {
            throw new Error('file not found')
--- a/src/onebot11/action/GetMsg.ts
+++ b/src/onebot11/action/GetMsg.ts
@@ -1,8 +1,8 @@
-import {getHistoryMsgByShortId} from "../../common/data";
 import {OB11Message} from '../types';
 import {OB11Constructor} from "../constructor";
 import BaseAction from "./BaseAction";
 import {ActionName} from "./types";
+import {dbUtil} from "../../common/db";


 export interface PayloadType {
@@ -19,7 +19,7 @@ class GetMsg extends BaseAction<PayloadType, OB11Message> {
        if (!payload.message_id) {
            throw ("参数message_id不能为空")
        }
-        const msg = getHistoryMsgByShortId(payload.message_id)
+        const msg = await dbUtil.getMsgByShortId(payload.message_id)
        if (msg) {
            const msgData = await OB11Constructor.message(msg);
            return msgData
--- a/src/onebot11/action/SendGroupMsg.ts
+++ b/src/onebot11/action/SendGroupMsg.ts
@@ -1,9 +1,17 @@
 import SendMsg from "./SendMsg";
-import {ActionName} from "./types";
+import {ActionName, BaseCheckResult} from "./types";
+import {OB11PostSendMsg} from "../types";
+import {log} from "../../common/utils";


 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);
+    }
 }

 export default SendGroupMsg
--- a/src/onebot11/action/SendLike.ts
+++ b/src/onebot11/action/SendLike.ts
@@ -1,7 +1,8 @@
 import BaseAction from "./BaseAction";
-import {getFriend} from "../../common/data";
+import {getFriend, getUidByUin, uidMaps} from "../../common/data";
 import {NTQQApi} from "../../ntqqapi/ntcall";
 import {ActionName} from "./types";
+import {log} from "../../common/utils";

 interface Payload {
    user_id: number,
@@ -12,13 +13,17 @@ export default class SendLike extends BaseAction<Payload, null> {
    actionName = ActionName.SendLike

    protected async _handle(payload: Payload): Promise<null> {
-        const qq = payload.user_id.toString();
-        const friend = await getFriend(qq)
-        if (!friend) {
-            throw (`点赞失败，${qq}不是好友`)
-        }
+        log("点赞参数", payload)
        try {
-            let result = await NTQQApi.likeFriend(friend.uid, parseInt(payload.times.toString()) || 1);
+            const qq = payload.user_id.toString();
+            const friend = await getFriend(qq)
+            let uid: string;
+            if (!friend) {
+                uid = getUidByUin(qq)
+            } else {
+                uid = friend.uid
+            }
+            let result = await NTQQApi.likeFriend(uid, parseInt(payload.times?.toString()) || 1);
            if (result.result !== 0) {
                throw result.errMsg
            }
--- a/src/onebot11/action/SendMsg.ts
+++ b/src/onebot11/action/SendMsg.ts
@@ -1,14 +1,13 @@
-import {AtType, ChatType, Group, RawMessage, SendMessageElement} from "../../ntqqapi/types";
+import {AtType, ChatType, Group, RawMessage, SendArkElement, SendMessageElement} from "../../ntqqapi/types";
+import {friends, getFriend, getGroup, getGroupMember, getUidByUin, selfInfo,} from "../../common/data";
 import {
-    addHistoryMsg,
-    friends,
-    getGroup,
-    getGroupMember,
-    getHistoryMsgByShortId,
-    getUidByUin,
-    selfInfo,
-} from "../../common/data";
-import {OB11MessageData, OB11MessageDataType, OB11MessageMixType, OB11MessageNode, OB11PostSendMsg} from '../types';
+    OB11MessageCustomMusic,
+    OB11MessageData,
+    OB11MessageDataType,
+    OB11MessageMixType,
+    OB11MessageNode,
+    OB11PostSendMsg
+} from '../types';
 import {NTQQApi, Peer} from "../../ntqqapi/ntcall";
 import {SendMsgElementConstructor} from "../../ntqqapi/constructor";
 import {uri2local} from "../utils";
@@ -17,6 +16,9 @@ import {ActionName, BaseCheckResult} from "./types";
 import * as fs from "node:fs";
 import {log} from "../../common/utils";
 import {decodeCQCode} from "../cqcode";
+import {dbUtil} from "../../common/db";
+import {ALLOW_SEND_TEMP_MSG} from "../../common/config";
+import {FileCache} from "../../common/types";

 function checkSendMessage(sendMsgList: OB11MessageData[]) {
    function checkUri(uri: string): boolean {
@@ -62,13 +64,29 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {

    protected async check(payload: OB11PostSendMsg): Promise<BaseCheckResult> {
        const messages = this.convertMessage2List(payload.message);
-        const fmNum = this.forwardMsgNum(payload)
+        const fmNum = this.getSpecialMsgNum(payload, OB11MessageDataType.node)
        if (fmNum && fmNum != messages.length) {
            return {
                valid: false,
                message: "转发消息不能和普通消息混在一起发送,转发需要保证message只有type为node的元素"
            }
        }
+        if (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) {
+                    return {
+                        valid: false,
+                        message: `不能发送临时消息`
+                    }
+                }
+            }
+        }
        return {
            valid: true,
        }
@@ -79,17 +97,16 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
            chatType: ChatType.friend,
            peerUid: ""
        }
-
+        let isTempMsg = false;
        let group: Group | undefined = undefined;
-        if (payload?.group_id) {
+        const genGroupPeer = async () => {
            group = await getGroup(payload.group_id.toString())
-            if (!group) {
-                throw (`群${payload.group_id}不存在`)
-            }
            peer.chatType = ChatType.group
            // peer.name = group.name
            peer.peerUid = group.groupCode
-        } else if (payload?.user_id) {
+        }
+
+        const genFriendPeer = () => {
            const friend = friends.find(f => f.uin == payload.user_id.toString())
            if (friend) {
                // peer.name = friend.nickName
@@ -101,24 +118,51 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                    throw (`找不到私聊对象${payload.user_id}`)
                }
                // peer.name = tempUser.nickName
+                isTempMsg = true;
                peer.peerUid = tempUserUid;
            }
        }
+        if (payload?.group_id && payload.message_type === "group") {
+            await genGroupPeer()
+
+        } else if (payload?.user_id) {
+            genFriendPeer()
+        } else if (payload.group_id) {
+            await genGroupPeer()
+        } else {
+            throw ("发送消息参数错误, 请指定group_id或user_id")
+        }
        const messages = this.convertMessage2List(payload.message);
-        if (this.forwardMsgNum(payload)) {
+        if (this.getSpecialMsgNum(payload, OB11MessageDataType.node)) {
            try {
                const returnMsg = await this.handleForwardNode(peer, messages as OB11MessageNode[], group)
                return {message_id: returnMsg.msgShortId}
            } catch (e) {
                throw ("发送转发消息失败 " + e.toString())
            }
+        } else {
+            if (this.getSpecialMsgNum(payload, OB11MessageDataType.music)) {
+                const music: OB11MessageCustomMusic = messages[0] as OB11MessageCustomMusic
+                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}
+                }
+            }
        }
        // log("send msg:", peer, sendElements)
        const {sendElements, deleteAfterSentFiles} = await this.createSendElements(messages, group)
        try {
            const returnMsg = await this.send(peer, sendElements, deleteAfterSentFiles)
+            deleteAfterSentFiles.map(f => fs.unlink(f, () => {}));
            return {message_id: returnMsg.msgShortId}
        } catch (e) {
+            log("发送消息失败", e.stack.toString())
            throw (e.toString())
        }
    }
@@ -138,9 +182,9 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
        return message;
    }

-    private forwardMsgNum(payload: OB11PostSendMsg): number {
+    private getSpecialMsgNum(payload: OB11PostSendMsg, msgType: OB11MessageDataType): number {
        if (Array.isArray(payload.message)) {
-            return payload.message.filter(msg => msg.type == OB11MessageDataType.node).length
+            return payload.message.filter(msg => msg.type == msgType).length
        }
        return 0
    }
@@ -158,7 +202,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
            let nodeId = messageNode.data.id;
            // 有nodeId表示一个子转发消息卡片
            if (nodeId) {
-                let nodeMsg = getHistoryMsgByShortId(nodeId);
+                let nodeMsg = await dbUtil.getMsgByShortId(parseInt(nodeId));
                if (nodeMsg) {
                    originalNodeMsgList.push(nodeMsg);
                }
@@ -245,6 +289,9 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                }
                    break;
                case OB11MessageDataType.at: {
+                    if (!group){
+                        continue
+                    }
                    let atQQ = sendMsg.data?.qq;
                    if (atQQ) {
                        atQQ = atQQ.toString()
@@ -263,8 +310,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                case OB11MessageDataType.reply: {
                    let replyMsgId = sendMsg.data.id;
                    if (replyMsgId) {
-                        replyMsgId = replyMsgId.toString()
-                        const replyMsg = getHistoryMsgByShortId(replyMsgId)
+                        const replyMsg = await dbUtil.getMsgByShortId(parseInt(replyMsgId))
                        if (replyMsg) {
                            sendElements.push(SendMsgElementConstructor.reply(replyMsg.msgSeq, replyMsg.msgId, replyMsg.senderUin, replyMsg.senderUin))
                        }
@@ -278,13 +324,29 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                    }
                }
                    break;
+
                case OB11MessageDataType.image:
                case OB11MessageDataType.file:
                case OB11MessageDataType.video:
                case OB11MessageDataType.voice: {
-                    const file = sendMsg.data?.file
+                    let file = sendMsg.data?.file
+                    const payloadFileName = sendMsg.data?.name
                    if (file) {
-                        const {path, isLocal} = (await uri2local(file))
+                        const cache = await dbUtil.getFileCache(file)
+                        if (cache){
+                            if (fs.existsSync(cache.filePath)){
+                                file = "file://" + cache.filePath
+                            }
+                            else if (cache.downloadFunc){
+                                await cache.downloadFunc()
+                                file = cache.filePath;
+                                log("找到文件缓存", file);
+                            }
+                        }
+                        const {path, isLocal, fileName, errMsg} = (await uri2local(file))
+                        if (errMsg){
+                            throw errMsg
+                        }
                        if (path) {
                            if (!isLocal) { // 只删除http和base64转过来的文件
                                deleteAfterSentFiles.push(path)
@@ -295,7 +357,15 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                                [OB11MessageDataType.video]: SendMsgElementConstructor.video,
                                [OB11MessageDataType.file]: SendMsgElementConstructor.file,
                            }
-                            sendElements.push(await constructorMap[sendMsg.type](path));
+                            if (sendMsg.type === OB11MessageDataType.file) {
+                                log("发送文件", path, payloadFileName || fileName)
+                                sendElements.push(await SendMsgElementConstructor.file(path, false, payloadFileName || fileName));
+                            } else if (sendMsg.type === OB11MessageDataType.video) {
+                                log("发送视频", path, payloadFileName || fileName)
+                                sendElements.push(await SendMsgElementConstructor.video(path, payloadFileName || fileName));
+                            } else {
+                                sendElements.push(await constructorMap[sendMsg.type](path));
+                            }
                        }
                    }
                }
@@ -310,16 +380,53 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
        }
    }

-    private async send(peer: Peer, sendElements: SendMessageElement[], deleteAfterSentFiles: string[], waitComplete = false) {
+    private async send(peer: Peer, sendElements: SendMessageElement[], deleteAfterSentFiles: string[], waitComplete = true) {
        if (!sendElements.length) {
            throw ("消息体无法解析")
        }
        const returnMsg = await NTQQApi.sendMsg(peer, sendElements, waitComplete, 20000);
-        addHistoryMsg(returnMsg)
+        log("消息发送结果", returnMsg)
+        returnMsg.msgShortId = await dbUtil.addMsg(returnMsg)
        deleteAfterSentFiles.map(f => fs.unlink(f, () => {
        }))
        return returnMsg
    }
+
+    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)
+    }
 }

 export default SendMsg
--- a/src/onebot11/action/SendPrivateMsg.ts
+++ b/src/onebot11/action/SendPrivateMsg.ts
@@ -1,8 +1,14 @@
 import SendMsg from "./SendMsg";
-import {ActionName} from "./types";
+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);
+    }
 }

 export default SendPrivateMsg
--- a/src/onebot11/constructor.ts
+++ b/src/onebot11/constructor.ts
@@ -9,11 +9,12 @@ import {
    OB11UserSex
 } from "./types";
 import {AtType, ChatType, Group, GroupMember, IMAGE_HTTP_HOST, RawMessage, SelfInfo, User} from '../ntqqapi/types';
-import {fileCache, getFriend, getGroupMember, getHistoryMsgBySeq, selfInfo} from '../common/data';
+import {getFriend, getGroupMember, selfInfo, tempGroupCodeMap} from '../common/data';
 import {getConfigUtil, log} from "../common/utils";
 import {NTQQApi} from "../ntqqapi/ntcall";
 import {EventType} from "./event/OB11BaseEvent";
 import {encodeCQCode} from "./cqcode";
+import {dbUtil} from "../common/db";


 export class OB11Constructor {
@@ -56,6 +57,10 @@ export class OB11Constructor {
            }
        } else if (msg.chatType == ChatType.temp) {
            resMsg.sub_type = "group"
+            const tempGroupCode = tempGroupCodeMap[msg.peerUin]
+            if (tempGroupCode) {
+                resMsg.group_id = parseInt(tempGroupCode)
+            }
        }

        for (let element of msg.elements) {
@@ -91,30 +96,44 @@ export class OB11Constructor {
                message_data["data"]["text"] = text
            } else if (element.replyElement) {
                message_data["type"] = "reply"
-                const replyMsg = getHistoryMsgBySeq(element.replyElement.replayMsgSeq)
-                if (replyMsg) {
-                    message_data["data"]["id"] = replyMsg.msgShortId.toString()
-                } else {
-                    continue
+                // log("收到回复消息", element.replyElement.replayMsgSeq)
+                try{
+                    const replyMsg = await dbUtil.getMsgBySeqId(element.replyElement.replayMsgSeq)
+                    // log("找到回复消息", replyMsg.msgShortId, replyMsg.msgId)
+                    if (replyMsg) {
+                        message_data["data"]["id"] = replyMsg.msgShortId.toString()
+                    } else {
+                        continue
+                    }
+                }catch (e) {
+                    log("获取不到引用的消息", e.stack, element.replyElement.replayMsgSeq)
                }
+
            } else if (element.picElement) {
                message_data["type"] = "image"
                // message_data["data"]["file"] = element.picElement.sourcePath
                message_data["data"]["file"] = element.picElement.fileName
                // message_data["data"]["path"] = element.picElement.sourcePath
-                message_data["data"]["url"] = IMAGE_HTTP_HOST + element.picElement.originImageUrl
+                const url = element.picElement.originImageUrl
+                const fileMd5 = element.picElement.md5HexStr
+                if (url){
+                    message_data["data"]["url"] = IMAGE_HTTP_HOST + url
+                }
+                else if (fileMd5 && element.picElement.fileUuid.indexOf("_") === -1){ // fileuuid有下划线的是Linux发送的，这个url是另外的格式，目前尚未得知如何组装
+                    message_data["data"]["url"] = `${IMAGE_HTTP_HOST}/gchatpic_new/0/0-0-${fileMd5.toUpperCase()}/0`
+                }
                // message_data["data"]["file_id"] = element.picElement.fileUuid
                message_data["data"]["file_size"] = element.picElement.fileSize
-                fileCache.set(element.picElement.fileName, {
+                dbUtil.addFileCache(element.picElement.fileName, {
                    fileName: element.picElement.fileName,
                    filePath: element.picElement.sourcePath,
                    fileSize: element.picElement.fileSize.toString(),
-                    url: IMAGE_HTTP_HOST + element.picElement.originImageUrl,
+                    url: message_data["data"]["url"],
                    downloadFunc: async () => {
                        await NTQQApi.downloadMedia(msg.msgId, msg.chatType, msg.peerUid,
-                            element.elementId, element.picElement.thumbPath.get(0), element.picElement.sourcePath)
+                            element.elementId, element.picElement.thumbPath?.get(0) || "", element.picElement.sourcePath)
                    }
-                })
+                }).then()
                // 不在自动下载图片

            } else if (element.videoElement) {
@@ -123,7 +142,7 @@ export class OB11Constructor {
                message_data["data"]["path"] = element.videoElement.filePath
                // message_data["data"]["file_id"] = element.videoElement.fileUuid
                message_data["data"]["file_size"] = element.videoElement.fileSize
-                fileCache.set(element.videoElement.fileName, {
+                dbUtil.addFileCache(element.videoElement.fileName, {
                    fileName: element.videoElement.fileName,
                    filePath: element.videoElement.filePath,
                    fileSize: element.videoElement.fileSize,
@@ -131,7 +150,7 @@ export class OB11Constructor {
                        await NTQQApi.downloadMedia(msg.msgId, msg.chatType, msg.peerUid,
                            element.elementId, element.videoElement.thumbPath.get(0), element.videoElement.filePath)
                    }
-                })
+                }).then()
                // 怎么拿到url呢
            } else if (element.fileElement) {
                message_data["type"] = OB11MessageDataType.file;
@@ -139,7 +158,7 @@ export class OB11Constructor {
                // message_data["data"]["path"] = element.fileElement.filePath
                // message_data["data"]["file_id"] = element.fileElement.fileUuid
                message_data["data"]["file_size"] = element.fileElement.fileSize
-                fileCache.set(element.fileElement.fileName, {
+                dbUtil.addFileCache(element.fileElement.fileName, {
                    fileName: element.fileElement.fileName,
                    filePath: element.fileElement.filePath,
                    fileSize: element.fileElement.fileSize,
@@ -147,7 +166,7 @@ export class OB11Constructor {
                        await NTQQApi.downloadMedia(msg.msgId, msg.chatType, msg.peerUid,
                            element.elementId, null, element.fileElement.filePath)
                    }
-                })
+                }).then()
                // 怎么拿到url呢
            } else if (element.pttElement) {
                message_data["type"] = OB11MessageDataType.voice;
@@ -155,11 +174,11 @@ export class OB11Constructor {
                message_data["data"]["path"] = element.pttElement.filePath
                // message_data["data"]["file_id"] = element.pttElement.fileUuid
                message_data["data"]["file_size"] = element.pttElement.fileSize
-                fileCache.set(element.pttElement.fileName, {
+                dbUtil.addFileCache(element.pttElement.fileName, {
                    fileName: element.pttElement.fileName,
                    filePath: element.pttElement.filePath,
                    fileSize: element.pttElement.fileSize,
-                })
+                }).then()

                // log("收到语音消息", msg)
                // window.LLAPI.Ptt2Text(message.raw.msgId, message.peer, messages).then(text => {
--- a/src/onebot11/event/notice/OB11GroupIncreaseEvent.ts
+++ b/src/onebot11/event/notice/OB11GroupIncreaseEvent.ts
@@ -3,12 +3,12 @@ import {OB11GroupNoticeEvent} from "./OB11GroupNoticeEvent";
 export class OB11GroupIncreaseEvent extends OB11GroupNoticeEvent {
    notice_type = "group_increase";
    sub_type = "approve";  // TODO: 实现其他几种子类型的识别 ("approve" | "invite")
-    operate_id: number;
+    operator_id: number;

    constructor(groupId: number, userId: number) {
        super();
        this.group_id = groupId;
-        this.operate_id = userId;  // 实际上不应该这么实现，但是现在还没有办法识别用户是被邀请的，还是主动加入的
+        this.operator_id = userId;  // 实际上不应该这么实现，但是现在还没有办法识别用户是被邀请的，还是主动加入的
        this.user_id = userId;
    }
-}
+}
--- a/src/onebot11/server/ws/ReverseWebsocket.ts
+++ b/src/onebot11/server/ws/ReverseWebsocket.ts
@@ -7,9 +7,10 @@ import {ActionName} from "../../action/types";
 import {OB11Response} from "../../action/utils";
 import BaseAction from "../../action/BaseAction";
 import {actionMap} from "../../action";
-import {registerWsEventSender, unregisterWsEventSender} from "../postOB11Event";
+import {postWsEvent, registerWsEventSender, unregisterWsEventSender} from "../postOB11Event";
 import {wsReply} from "./reply";
 import {WebSocket as WebSocketClass} from "ws";
+import {OB11HeartbeatEvent} from "../../event/meta/OB11HeartbeatEvent";

 export let rwsList: ReverseWebsocket[] = [];

@@ -76,7 +77,7 @@ export class ReverseWebsocket {
    }

    private connect() {
-        const {token} = getConfigUtil().getConfig()
+        const {token, heartInterval} = getConfigUtil().getConfig()
        this.websocket = new WebSocketClass(this.url, {
            handshakeTimeout: 2000,
            perMessageDeflate: false,
@@ -101,7 +102,11 @@ export class ReverseWebsocket {

        this.websocket.on("error", log);

+        const wsClientInterval = setInterval(() => {
+            postWsEvent(new OB11HeartbeatEvent(selfInfo.online, true, heartInterval));
+        }, heartInterval);  // 心跳包
        this.websocket.on("close", () => {
+            clearInterval(wsClientInterval);
            log("The websocket connection: " + this.url + " closed, trying reconnecting...");
            this.onclose();
        });
--- a/src/onebot11/server/ws/WebsocketServer.ts
+++ b/src/onebot11/server/ws/WebsocketServer.ts
@@ -10,6 +10,7 @@ import {OB11HeartbeatEvent} from "../../event/meta/OB11HeartbeatEvent";
 import {WebsocketServerBase} from "../../../common/server/websocket";
 import {IncomingMessage} from "node:http";
 import {wsReply} from "./reply";
+import {selfInfo} from "../../../common/data";

 let heartbeatRunning = false;

@@ -27,7 +28,7 @@ class OB11WebsocketServer extends WebsocketServerBase {
            let handleResult = await action.websocketHandle(params, echo);
            wsReply(wsClient, handleResult)
        } catch (e) {
-            wsReply(wsClient, OB11Response.error(`api处理出错:${e}`, 1200, echo))
+            wsReply(wsClient, OB11Response.error(`api处理出错:${e.stack}`, 1200, echo))
        }
    }

@@ -58,7 +59,7 @@ class OB11WebsocketServer extends WebsocketServerBase {
            }
            const {heartInterval} = getConfigUtil().getConfig();
            const wsClientInterval = setInterval(() => {
-                postWsEvent(new OB11HeartbeatEvent(true, true, heartInterval));
+                postWsEvent(new OB11HeartbeatEvent(selfInfo.online, true, heartInterval));
            }, heartInterval);  // 心跳包
            wsClient.on("close", () => {
                log("event上报ws客户端已断开")
--- a/src/onebot11/types.ts
+++ b/src/onebot11/types.ts
@@ -93,6 +93,7 @@ export interface OB11Return<DataType> {
 export enum OB11MessageDataType {
    text = "text",
    image = "image",
+    music = "music",
    video = "video",
    voice = "record",
    file = "file",
@@ -100,7 +101,7 @@ export enum OB11MessageDataType {
    reply = "reply",
    json = "json",
    face = "face",
-    node = "node"  // 合并转发消息
+    node = "node",  // 合并转发消息
 }

 export interface OB11MessageText {
@@ -112,6 +113,7 @@ export interface OB11MessageText {

 interface OB11MessageFileBase {
    data: {
+        name?: string;
        file: string,
        url?: string;
    }
@@ -166,12 +168,24 @@ export interface OB11MessageNode {
    }
 }

+export interface OB11MessageCustomMusic{
+    type: OB11MessageDataType.music
+    data: {
+        type: "custom"
+        url: string,
+        audio: string,
+        title: string,
+        content?: string,
+        image?: string
+    }
+}
+
 export type OB11MessageData =
    OB11MessageText |
    OB11MessageFace |
    OB11MessageAt | OB11MessageReply |
    OB11MessageImage | OB11MessageRecord | OB11MessageFile | OB11MessageVideo |
-    OB11MessageNode
+    OB11MessageNode | OB11MessageCustomMusic

 export interface OB11PostSendMsg {
    message_type?: "private" | "group"
--- a/src/onebot11/utils.ts
+++ b/src/onebot11/utils.ts
@@ -1,8 +1,8 @@
-import {CONFIG_DIR, isGIF} from "../common/utils";
+import {DATA_DIR, isGIF, log} from "../common/utils";
 import {v4 as uuidv4} from "uuid";
 import * as path from 'node:path';
-import {fileCache} from "../common/data";
 import * as fileType from 'file-type';
+import {dbUtil} from "../common/db";

 const fs = require("fs").promises;

@@ -10,11 +10,13 @@ export async function uri2local(uri: string, fileName: string = null) {
    if (!fileName) {
        fileName = uuidv4();
    }
-    let filePath = path.join(CONFIG_DIR, fileName)
+    let filePath = path.join(DATA_DIR, fileName)
    let url = new URL(uri);
    let res = {
        success: false,
        errMsg: "",
+        fileName: "",
+        ext: "",
        path: "",
        isLocal: false
    }
@@ -31,7 +33,13 @@ export async function uri2local(uri: string, fileName: string = null) {
        }
    } else if (url.protocol == "http:" || url.protocol == "https:") {
        // 下载文件
-        let fetchRes = await fetch(url)
+        let fetchRes: Response;
+        try{
+            fetchRes = await fetch(url)
+        }catch (e) {
+            res.errMsg = `${url}下载失败`
+            return res
+        }
        if (!fetchRes.ok) {
            res.errMsg = `${url}下载失败,` + fetchRes.statusText
            return res
@@ -39,8 +47,16 @@ export async function uri2local(uri: string, fileName: string = null) {
        let blob = await fetchRes.blob();
        let buffer = await blob.arrayBuffer();
        try {
-            fileName = path.parse(url.pathname).name || fileName
-            filePath = path.join(CONFIG_DIR, fileName)
+            const pathInfo = path.parse(decodeURIComponent(url.pathname))
+            if (pathInfo.name){
+                fileName = pathInfo.name
+                if (pathInfo.ext){
+                    fileName += pathInfo.ext
+                    // res.ext = pathInfo.ext
+                }
+            }
+            res.fileName = fileName
+            filePath = path.join(DATA_DIR, uuidv4() + fileName)
            await fs.writeFile(filePath, Buffer.from(buffer));
        } catch (e: any) {
            res.errMsg = `${url}下载失败,` + e.toString()
@@ -57,7 +73,7 @@ export async function uri2local(uri: string, fileName: string = null) {
                filePath = pathname
            }
        } else {
-            const cache = fileCache.get(uri)
+            const cache = await dbUtil.getFileCache(uri);
            if (cache) {
                filePath = cache.filePath
            } else {
@@ -71,15 +87,22 @@ export async function uri2local(uri: string, fileName: string = null) {
    //     res.errMsg = `不支持的file协议,` + url.protocol
    //     return res
    // }
-    if (isGIF(filePath) && !res.isLocal) {
-        await fs.rename(filePath, filePath + ".gif");
-        filePath += ".gif";
-    }
-    if (!res.isLocal) {
-        const {ext} = await fileType.fileTypeFromFile(filePath)
-        if (ext) {
-            await fs.rename(filePath, filePath + `.${ext}`)
-            filePath += `.${ext}`
+    // if (isGIF(filePath) && !res.isLocal) {
+    //     await fs.rename(filePath, filePath + ".gif");
+    //     filePath += ".gif";
+    // }
+    if (!res.isLocal && !res.ext) {
+        try {
+            let ext: string = (await fileType.fileTypeFromFile(filePath)).ext
+            if (ext) {
+                log("获取文件类型", ext, filePath)
+                await fs.rename(filePath, filePath + `.${ext}`)
+                filePath += `.${ext}`
+                res.fileName += `.${ext}`
+                res.ext = ext
+            }
+        } catch (e) {
+            // log("获取文件类型失败", filePath,e.stack)
        }
    }
    res.success = true
--- a/src/renderer.ts
+++ b/src/renderer.ts
@@ -1,380 +0,0 @@
-/// <reference path="./global.d.ts" />
-
-// 打开设置界面时触发
-
-async function onSettingWindowCreated (view: Element) {
-  window.llonebot.log('setting window created')
-  const isEmpty = (value: any) => value === undefined || value === null || value === ''
-  const config = await window.llonebot.getConfig()
-  const httpClass = 'http'
-  const httpPostClass = 'http-post'
-  const wsClass = 'ws'
-  const reverseWSClass = 'reverse-ws'
-  const llonebotError = await window.llonebot.getError()
-  window.llonebot.log('获取error' + JSON.stringify(llonebotError))
-
-  function createHttpHostEleStr (host: string) {
-    const eleStr = `
-            <setting-item data-direction="row" class="hostItem vertical-list-item ${httpPostClass}">
-                <h2>HTTP事件上报地址(http)</h2>
-                <input class="httpHost input-text" type="text" value="${host}" 
-                style="width:60%;padding: 5px"
-                placeholder="如:http://127.0.0.1:8080/onebot/v11/http"/>
-            </setting-item>
-            `
-    return eleStr
-  }
-
-  function createWsHostEleStr (host: string) {
-    const eleStr = `
-            <setting-item data-direction="row" class="hostItem vertical-list-item ${reverseWSClass}">
-                <h2>反向websocket地址:</h2>
-                <input class="wsHost input-text" type="text" value="${host}" 
-                style="width:60%;padding: 5px"
-                placeholder="如: ws://127.0.0.1:5410/onebot"/>
-            </setting-item>
-            `
-    return eleStr
-  }
-
-  let httpHostsEleStr = ''
-  for (const host of config.ob11.httpHosts) {
-    httpHostsEleStr += createHttpHostEleStr(host)
-  }
-
-  let wsHostsEleStr = ''
-  for (const host of config.ob11.wsHosts) {
-    wsHostsEleStr += createWsHostEleStr(host)
-  }
-
-  const html = `
-    <div class="config_view llonebot">
-        <setting-section>
-            <setting-panel id="llonebotError" style="display:${llonebotError.ffmpegError || llonebotError.otherError ? '' : 'none'}">
-                <setting-item id="ffmpegError" data-direction="row" 
-                    style="diplay:${llonebotError.ffmpegError ? '' : 'none'}"
-                    class="hostItem vertical-list-item">
-                    <setting-text data-type="secondary" class="err-content">${llonebotError.ffmpegError}</setting-text>
-                </setting-item>
-                <setting-item id="otherError" data-direction="row" 
-                    style="diplay:${llonebotError.otherError ? '' : 'none'}"
-                    class="hostItem vertical-list-item">
-                    <setting-text data-type="secondary" class="err-content">${llonebotError.otherError}</setting-text>
-                </setting-item>
-            </setting-panel>
-            <setting-panel>
-                <setting-list class="wrap">
-                    <setting-item data-direction="row" class="hostItem vertical-list-item">
-                        <div>
-                            <div>启用HTTP服务</div>
-                        </div>
-                        <setting-switch id="http" ${config.ob11.enableHttp ? 'is-active' : ''}></setting-switch>
-                    </setting-item>
-                    <setting-item class="vertical-list-item ${httpClass}" data-direction="row" style="display: ${config.ob11.enableHttp ? '' : 'none'}">
-                        <setting-text>HTTP监听端口</setting-text>
-                        <input id="httpPort" type="number" value="${config.ob11.httpPort}"/>
-                    </setting-item>
-                    <setting-item data-direction="row" class="hostItem vertical-list-item">
-                        <div>
-                            <div>启用HTTP事件上报</div>
-                        </div>
-                        <setting-switch id="httpPost" ${config.ob11.enableHttpPost ? 'is-active' : ''}></setting-switch>
-                    </setting-item>
-                    <div class="${httpPostClass}" style="display: ${config.ob11.enableHttpPost ? '' : 'none'}">
-                        <div >
-                            <button id="addHttpHost" class="q-button">添加HTTP POST上报地址</button>
-                        </div>
-                        <div id="httpHostItems">
-                            ${httpHostsEleStr}
-                        </div>
-                    </div>
-                    <setting-item data-direction="row" class="hostItem vertical-list-item">
-                        <div>
-                            <div>启用正向Websocket协议</div>
-                        </div>
-                        <setting-switch id="websocket" ${config.ob11.enableWs ? 'is-active' : ''}></setting-switch>
-                    </setting-item>
-                    <setting-item class="vertical-list-item ${wsClass}" data-direction="row" style="display: ${config.ob11.enableWs ? '' : 'none'}">
-                        <setting-text>正向Websocket监听端口</setting-text>
-                        <input id="wsPort" type="number" value="${config.ob11.wsPort}"/>
-                    </setting-item>
-                    
-                    <setting-item data-direction="row" class="hostItem vertical-list-item">
-                        <div>
-                            <div>启用反向Websocket协议</div>
-                        </div>
-                        <setting-switch id="websocketReverse" ${config.ob11.enableWsReverse ? 'is-active' : ''}></setting-switch>
-                    </setting-item>
-                    <div class="${reverseWSClass}" style="display: ${config.ob11.enableWsReverse ? '' : 'none'}">
-                        <div>
-                            <button id="addWsHost" class="q-button">添加反向Websocket地址</button>
-                        </div>
-                        <div id="wsHostItems">
-                            ${wsHostsEleStr}
-                        </div>
-                    </div>
-                    <setting-item class="vertical-list-item" data-direction="row">
-                        <setting-text>Access Token</setting-text>
-                        <input id="token" type="text" placeholder="可为空" value="${config.token}"/>
-                    </setting-item>
-                    <setting-item data-direction="row" class="vertical-list-item">
-                        <setting-item data-direction="row" class="vertical-list-item" style="width: 80%">
-                            <setting-text>ffmpeg路径</setting-text>
-                            <input id="ffmpegPath" class="input-text" type="text" 
-                                style="width:80%;padding: 5px"
-                                value="${config.ffmpeg || ''}"/>
-                        </setting-item>
-                        <button id="selectFFMPEG" class="q-button q-button--small q-button--secondary">选择ffmpeg</button>
-                    </setting-item>
-                    <button id="save" class="q-button">保存</button>
-                </setting-list>
-            </setting-panel>
-            <setting-panel>
-
-                <setting-item data-direction="row" class="vertical-list-item">
-                    <div>
-                        <setting-text>消息上报数据类型</setting-text>
-                        <setting-text data-type="secondary">如客户端无特殊需求推荐保持默认设置，两者的详细差异可参考 <a href="javascript:LiteLoader.api.openExternal('https://github.com/botuniverse/onebot-11/tree/master/message#readme');">OneBot v11 文档</a></setting-text>
-                    </div>
-                    <setting-select id="messagePostFormat">
-                        <setting-option data-value="array" ${config.ob11.messagePostFormat !== 'string' ? 'is-selected' : ''}>消息段</setting-option>
-                        <setting-option data-value="string" ${config.ob11.messagePostFormat === 'string' ? 'is-selected' : ''}>CQ码</setting-option>
-                    </setting-select>
-                </setting-item>
-                <setting-item data-direction="row" class="vertical-list-item">
-                    <div>
-                        <div>获取文件使用base64编码</div>
-                        <div class="tips">开启后，调用/get_image、/get_record时，获取不到url时添加一个base64字段</div>
-                    </div>
-                    <setting-switch id="switchFileUrl" ${config.enableLocalFile2Url ? 'is-active' : ''}></setting-switch>
-                </setting-item>
-                <setting-item data-direction="row" class="vertical-list-item">
-                    <div>
-                        <div>debug模式</div>
-                        <div class="tips">开启后上报消息添加raw字段附带原始消息</div>
-                    </div>
-                    <setting-switch id="debug" ${config.debug ? 'is-active' : ''}></setting-switch>
-                </setting-item>
-                <setting-item data-direction="row" class="vertical-list-item">
-                    <div>
-                        <div>上报自身发送消息</div>
-                        <div class="tips"></div>
-                    </div>
-                    <setting-switch id="reportSelfMessage" ${config.reportSelfMessage ? 'is-active' : ''}></setting-switch>
-                </setting-item>
-                <setting-item data-direction="row" class="vertical-list-item">
-                    <div>
-                        <div>日志</div>
-                        <div class="tips">目录:${window.LiteLoader.plugins.LLOneBot.path.data}</div>
-                    </div>
-                    <setting-switch id="log" ${config.log ? 'is-active' : ''}></setting-switch>
-                </setting-item>
-                <setting-item data-direction="row" class="vertical-list-item">
-                    <div>
-                        <div>自动删除收到的文件</div>
-                        <div class="tips">
-                            收到文件
-                            <input id="autoDeleteMin" 
-                                min="1" style="width: 50px"
-                                value="${config.autoDeleteFileSecond || 60}" type="number"/>秒后自动删除
-                        </div>
-                    </div>
-                    <setting-switch id="autoDeleteFile" ${config.autoDeleteFile ? 'is-active' : ''}></setting-switch>
-                </setting-item>
-            </setting-panel>
-        </setting-section>
-    </div>
-    <style>
-        setting-panel {
-            padding: 10px;
-        }
-        .tips {
-            font-size: 0.75rem;
-        }
-        @media (prefers-color-scheme: dark){
-            .llonebot input {
-                color: white;
-            }
-        }
-    </style>
-    `
-
-  const parser = new DOMParser()
-  const doc = parser.parseFromString(html, 'text/html')
-
-  const getError = async () => {
-    const llonebotError = await window.llonebot.getError()
-    console.log(llonebotError)
-    const llonebotErrorEle = document.getElementById('llonebotError')
-    const ffmpegErrorEle = document.getElementById('ffmpegError')
-    const otherErrorEle = document.getElementById('otherError')
-    if (llonebotError.otherError || llonebotError.ffmpegError) {
-      llonebotErrorEle.style.display = ''
-    } else {
-      llonebotErrorEle.style.display = 'none'
-    }
-    if (llonebotError.ffmpegError) {
-      const errContentEle = doc.querySelector('#ffmpegError .err-content')
-      // const errContent = ffmpegErrorEle.getElementsByClassName("err-content")[0];
-      errContentEle.textContent = llonebotError.ffmpegError;
-      (ffmpegErrorEle).style.display = ''
-    } else {
-      ffmpegErrorEle.style.display = ''
-    }
-    if (llonebotError.otherError) {
-      const errContentEle = doc.querySelector('#otherError .err-content')
-      errContentEle.textContent = llonebotError.otherError
-      otherErrorEle.style.display = ''
-    } else {
-      otherErrorEle.style.display = 'none'
-    }
-  }
-
-  function addHostEle (type: string, initValue: string = '') {
-    let addressEle, hostItemsEle
-    if (type === 'ws') {
-      const addressDoc = parser.parseFromString(createWsHostEleStr(initValue), 'text/html')
-      addressEle = addressDoc.querySelector('setting-item')
-      hostItemsEle = document.getElementById('wsHostItems')
-    } else {
-      const addressDoc = parser.parseFromString(createHttpHostEleStr(initValue), 'text/html')
-      addressEle = addressDoc.querySelector('setting-item')
-      hostItemsEle = document.getElementById('httpHostItems')
-    }
-
-    hostItemsEle.appendChild(addressEle)
-  }
-
-  doc.getElementById('addHttpHost').addEventListener('click', () => {
-    addHostEle('http')
-  })
-  doc.getElementById('addWsHost').addEventListener('click', () => {
-    addHostEle('ws')
-  })
-  doc.getElementById('messagePostFormat').addEventListener('selected', (e: CustomEvent) => {
-    config.ob11.messagePostFormat = e.detail && !isEmpty(e.detail.value) ? e.detail.value : 'array'
-    window.llonebot.setConfig(config)
-  })
-
-  function switchClick (eleId: string, configKey: string, _config = null) {
-    if (!_config) {
-      _config = config
-    }
-    doc.getElementById(eleId)?.addEventListener('click', (e) => {
-      const switchEle = e.target as HTMLInputElement
-      if (_config[configKey]) {
-        _config[configKey] = false
-        switchEle.removeAttribute('is-active')
-      } else {
-        _config[configKey] = true
-        switchEle.setAttribute('is-active', '')
-      }
-      // 妈蛋，手动操作DOM越写越麻烦，要不用vue算了
-      const keyClassMap = {
-        enableHttp: httpClass,
-        enableHttpPost: httpPostClass,
-        enableWs: wsClass,
-        enableWsReverse: reverseWSClass
-      }
-      for (const e of document.getElementsByClassName(keyClassMap[configKey])) {
-        (e as HTMLElement).style.display = _config[configKey] ? '' : 'none'
-      }
-
-      window.llonebot.setConfig(config)
-    })
-  }
-
-  switchClick('http', 'enableHttp', config.ob11)
-  switchClick('httpPost', 'enableHttpPost', config.ob11)
-  switchClick('websocket', 'enableWs', config.ob11)
-  switchClick('websocketReverse', 'enableWsReverse', config.ob11)
-  switchClick('debug', 'debug')
-  switchClick('switchFileUrl', 'enableLocalFile2Url')
-  switchClick('reportSelfMessage', 'reportSelfMessage')
-  switchClick('log', 'log')
-  switchClick('autoDeleteFile', 'autoDeleteFile')
-
-  doc.getElementById('save')?.addEventListener('click',
-    () => {
-      const httpPortEle: HTMLInputElement = document.getElementById('httpPort') as HTMLInputElement
-      const httpHostEles: HTMLCollectionOf<HTMLInputElement> = document.getElementsByClassName('httpHost') as HTMLCollectionOf<HTMLInputElement>
-      const wsPortEle: HTMLInputElement = document.getElementById('wsPort') as HTMLInputElement
-      const wsHostEles: HTMLCollectionOf<HTMLInputElement> = document.getElementsByClassName('wsHost') as HTMLCollectionOf<HTMLInputElement>
-      const tokenEle = document.getElementById('token') as HTMLInputElement
-      const ffmpegPathEle = document.getElementById('ffmpegPath') as HTMLInputElement
-
-      // 获取端口和host
-      const httpPort = httpPortEle.value
-      const httpHosts: string[] = []
-
-      for (const hostEle of httpHostEles) {
-        const value = hostEle.value.trim()
-        value && httpHosts.push(value)
-      }
-
-      const wsPort = wsPortEle.value
-      const token = tokenEle.value.trim()
-      const wsHosts: string[] = []
-
-      for (const hostEle of wsHostEles) {
-        const value = hostEle.value.trim()
-        value && wsHosts.push(value)
-      }
-
-      config.ob11.httpPort = parseInt(httpPort)
-      config.ob11.httpHosts = httpHosts
-      config.ob11.wsPort = parseInt(wsPort)
-      config.ob11.wsHosts = wsHosts
-      config.token = token
-      config.ffmpeg = ffmpegPathEle.value.trim()
-      window.llonebot.setConfig(config)
-      setTimeout(() => {
-        getError().then()
-      }, 1000)
-      alert('保存成功')
-    })
-
-  doc.getElementById('selectFFMPEG')?.addEventListener('click', () => {
-    window.llonebot.selectFile().then(selectPath => {
-      if (selectPath) {
-        config.ffmpeg = (document.getElementById('ffmpegPath') as HTMLInputElement).value = selectPath
-        // window.llonebot.setConfig(config);
-      }
-    })
-  })
-
-  // 自动保存删除文件延时时间
-  const autoDeleteMinEle = doc.getElementById('autoDeleteMin') as HTMLInputElement
-  let st = null
-  autoDeleteMinEle.addEventListener('change', () => {
-    if (st) {
-      clearTimeout(st)
-    }
-    st = setTimeout(() => {
-      console.log('auto delete file minute change')
-      config.autoDeleteFileSecond = parseInt(autoDeleteMinEle.value) || 1
-      window.llonebot.setConfig(config)
-    }, 1000)
-  })
-
-  doc.body.childNodes.forEach(node => {
-    view.appendChild(node)
-  })
-}
-
-function init () {
-  const hash = location.hash
-  if (hash === '#/blank') {
-
-  }
-}
-
-if (location.hash === '#/blank') {
-  (window as any).navigation.addEventListener('navigatesuccess', init, { once: true })
-} else {
-  init()
-}
-
-export {
-  onSettingWindowCreated
-}
--- a/src/renderer/components/button.ts
+++ b/src/renderer/components/button.ts
@@ -0,0 +1,4 @@
+
+export const SettingButton = (text: string, id?: string, type: string = 'secondary') => {
+    return `<setting-button ${type ? `data-type="${type}"` : ''} ${id ? `id="${id}"` : ''}>${text}</setting-button>`;
+}
--- a/src/renderer/components/index.ts
+++ b/src/renderer/components/index.ts
@@ -0,0 +1,5 @@
+export * from './list';
+export * from './item';
+export * from './button';
+export * from './switch';
+export * from './select';
--- a/src/renderer/components/item.ts
+++ b/src/renderer/components/item.ts
@@ -0,0 +1,10 @@
+
+export const SettingItem = (title: string, subtitle?: string, action?: string, id?: string, visible: boolean = true) => {
+    return `<setting-item ${id ? `id="${id}"` : ''} ${!visible ? 'is-hidden' : ''}>
+    <div>
+        <setting-text>${title}</setting-text>
+        ${subtitle ? `<setting-text data-type="secondary">${subtitle}</setting-text>` : ''}
+    </div>
+    ${action ? `<div>${action}</div>` : ''}
+</setting-item>`;
+}
--- a/src/renderer/components/list.ts
+++ b/src/renderer/components/list.ts
@@ -0,0 +1,10 @@
+
+export const SettingList = (items: string[], title?: string, isCollapsible: boolean = false, direction: string = 'column') => {
+    return `<setting-section ${title && !isCollapsible ? `data-title="${title}"` : ''}>
+    <setting-panel>
+        <setting-list ${direction ? `data-direction="${direction}"` : ''} ${isCollapsible ? 'is-collapsible' : ''} ${title && isCollapsible ? `data-title="${title}"` : ''}>
+            ${items.join('')}
+        </setting-list>
+    </setting-panel>
+</setting-section>`;
+}
--- a/src/renderer/components/option.ts
+++ b/src/renderer/components/option.ts
@@ -0,0 +1,4 @@
+
+export const SettingOption = (text: string, value?: string, isSelected: boolean = false) => {
+    return `<setting-option ${value ? `data-value="${value}"` : ''} ${isSelected ? 'is-selected' : ''}>${text}</setting-option>`;
+}
--- a/src/renderer/components/select.ts
+++ b/src/renderer/components/select.ts
@@ -0,0 +1,11 @@
+import { SettingOption } from "./option";
+
+export const SettingSelect = (items: Array<{ text: string, value: string }>, configKey?: string, configValue?: any) => {
+    return `<setting-select ${configKey ? `data-config-key="${configKey}"` : ''}>
+    <div>
+        ${items.map((e, i) => {
+            return SettingOption(e.text, e.value, (configKey && configValue ? configValue === e.value : i === 0));
+        }).join('')}
+    </div>
+</setting-select>`;
+}
--- a/src/renderer/components/switch.ts
+++ b/src/renderer/components/switch.ts
@@ -0,0 +1,9 @@
+
+export const SettingSwitch = (configKey?: string, isActive: boolean = false, extraData?: Record<string, string>) => {
+    return `<setting-switch 
+    ${configKey ? `data-config-key="${configKey}"` : ''} 
+    ${isActive ? 'is-active' : ''} 
+    ${extraData ? Object.keys(extraData).map(key => `data-${key}="${extraData[key]}"`) : ''} 
+    >
+</setting-switch>`;
+}
--- a/src/renderer/index.ts
+++ b/src/renderer/index.ts
@@ -0,0 +1,311 @@
+/// <reference path="../global.d.ts" />
+import {
+    SettingButton,
+    SettingItem,
+    SettingList,
+    SettingSelect,
+    SettingSwitch
+} from './components';
+import StyleRaw from './style.css?raw';
+
+// 打开设置界面时触发
+
+async function onSettingWindowCreated(view: Element) {
+    window.llonebot.log("setting window created");
+    const isEmpty = (value: any) => value === undefined || value === null || value === '';
+    let config = await window.llonebot.getConfig();
+    let ob11Config = { ...config.ob11 };
+    const setConfig = (key: string, value: any) => {
+        const configKey = key.split('.');
+
+        if (key.indexOf('ob11') === 0) {
+            if (configKey.length === 2) ob11Config[configKey[1]] = value;
+            else ob11Config[key] = value;
+        } else {
+            if (configKey.length === 2) config[configKey[0]][configKey[1]] = value;
+            else config[key] = value;
+
+            if (!['heartInterval', 'token', 'ffmpeg'].includes(key)){
+                window.llonebot.setConfig(config);
+            }
+        }
+    };
+
+    const parser = new DOMParser();
+    const doc = parser.parseFromString([
+        '<div>',
+        `<style>${StyleRaw}</style>`,
+        SettingList([
+            SettingItem('启用 HTTP 服务', null,
+                SettingSwitch('ob11.enableHttp', config.ob11.enableHttp, { 'control-display-id': 'config-ob11-httpPort' }),
+            ),
+            SettingItem('HTTP 服务监听端口', null,
+                `<div class="q-input"><input class="q-input__inner" data-config-key="ob11.httpPort" type="number" min="1" max="65534" value="${config.ob11.httpPort}" placeholder="${config.ob11.httpPort}" /></div>`,
+                'config-ob11-httpPort', config.ob11.enableHttp
+            ),
+            SettingItem('启用 HTTP 事件上报', null,
+                SettingSwitch('ob11.enableHttpPost', config.ob11.enableHttpPost, { 'control-display-id': 'config-ob11-httpHosts' }),
+            ),
+            `<div class="config-host-list" id="config-ob11-httpHosts" ${config.ob11.enableHttpPost ? '' : 'is-hidden'}>
+                <setting-item data-direction="row">
+                    <div>
+                        <setting-text>HTTP 事件上报地址</setting-text>
+                    </div>
+                    <setting-button id="config-ob11-httpHosts-add" data-type="primary">添加</setting-button>
+                </setting-item>
+                <div id="config-ob11-httpHosts-list"></div>
+            </div>`,
+            SettingItem('启用正向 WebSocket 服务', null,
+                SettingSwitch('ob11.enableWs', config.ob11.enableWs, { 'control-display-id': 'config-ob11-wsPort' }),
+            ),
+            SettingItem('正向 WebSocket 服务监听端口', null,
+                `<div class="q-input"><input class="q-input__inner" data-config-key="ob11.wsPort" type="number" min="1" max="65534" value="${config.ob11.wsPort}" placeholder="${config.ob11.wsPort}" /></div>`,
+                'config-ob11-wsPort', config.ob11.enableWs
+            ),
+            SettingItem('启用反向 WebSocket 服务', null,
+                SettingSwitch('ob11.enableWsReverse', config.ob11.enableWsReverse, { 'control-display-id': 'config-ob11-wsHosts' }),
+            ),
+            `<div class="config-host-list" id="config-ob11-wsHosts" ${config.ob11.enableWsReverse ? '' : 'is-hidden'}>
+                <setting-item data-direction="row">
+                    <div>
+                        <setting-text>反向 WebSocket 监听地址</setting-text>
+                    </div>
+                    <setting-button id="config-ob11-wsHosts-add" data-type="primary">添加</setting-button>
+                </setting-item>
+                <div id="config-ob11-wsHosts-list"></div>
+            </div>`,
+            SettingItem(' WebSocket 服务心跳间隔',
+                '控制每隔多久发送一个心跳包，单位为毫秒',
+                `<div class="q-input"><input class="q-input__inner" data-config-key="heartInterval" type="number" min="1000" value="${config.heartInterval}" placeholder="${config.heartInterval}" /></div>`,
+            ),
+            SettingItem('Access token', null,
+                `<div class="q-input" style="width:210px;"><input class="q-input__inner" data-config-key="token" type="text" value="${config.token}" placeholder="未设置" /></div>`,
+            ),
+            SettingItem(
+                '消息上报格式类型',
+                '如客户端无特殊需求推荐保持默认设置，两者的详细差异可参考 <a href="javascript:LiteLoader.api.openExternal(\'https://github.com/botuniverse/onebot-11/tree/master/message#readme\');">OneBot v11 文档</a>',
+                SettingSelect([
+                    { text: '消息段', value: 'array' },
+                    { text: 'CQ码', value: 'string' },
+                ], 'ob11.messagePostFormat', config.ob11.messagePostFormat),
+            ),
+            SettingItem(
+                'ffmpeg 路径', `<span id="config-ffmpeg-path-text">${!isEmpty(config.ffmpeg) ? config.ffmpeg : '未指定'}</span>`,
+                SettingButton('选择', 'config-ffmpeg-select'),
+            ),
+            SettingItem(
+                '', null,
+                SettingButton('保存', 'config-ob11-save', 'primary'),
+            )
+        ]),
+        SettingList([
+            SettingItem(
+                '使用 Base64 编码获取文件',
+                '开启后，调用 /get_image、/get_record 时，获取不到 url 时添加一个 Base64 字段',
+                SettingSwitch('enableLocalFile2Url', config.enableLocalFile2Url),
+            ),
+            SettingItem(
+                '调试模式',
+                '开启后上报信息会添加 raw 字段以附带原始信息',
+                SettingSwitch('debug', config.debug),
+            ),
+            SettingItem(
+                '上报 Bot 自身发送的消息',
+                '上报 event 为 message_sent',
+                SettingSwitch('reportSelfMessage', config.reportSelfMessage),
+            ),
+            SettingItem(
+                '自动删除收到的文件',
+                '在收到文件后的指定时间内删除该文件',
+                SettingSwitch('autoDeleteFile', config.autoDeleteFile, { 'control-display-id': 'config-auto-delete-file-second' }),
+            ),
+            SettingItem(
+                '自动删除文件时间',
+                '单位为秒',
+                `<div class="q-input"><input class="q-input__inner" data-config-key="autoDeleteFileSecond" type="number" min="1" value="${config.autoDeleteFileSecond}" placeholder="${config.autoDeleteFileSecond}" /></div>`,
+                'config-auto-delete-file-second', config.autoDeleteFile
+            ),
+            SettingItem(
+                '写入日志',
+                `将日志文件写入插件的数据文件夹`,
+                SettingSwitch('log', config.log),
+            ),
+            SettingItem(
+                '日志文件目录',
+                `${window.LiteLoader.plugins['LLOneBot'].path.data}`,
+                SettingButton('打开', 'config-open-log-path'),
+            ),
+        ]),
+        SettingList([
+            SettingItem(
+                'GitHub',
+                `https://github.com/LLOneBot/LLOneBot`,
+                SettingButton('点个Star', 'open-github'),
+            ),
+            SettingItem(
+                'Telegram 群',
+                `https://t.me/+nLZEnpne-pQ1OWFl`,
+                SettingButton('进去逛逛', 'open-telegram'),
+            ),
+            SettingItem(
+                'QQ 群',
+                `545402644`,
+                SettingButton('我要进去', 'open-qq-group'),
+            ),
+        ]),
+        '</div>',
+    ].join(''), "text/html");
+
+    // 外链按钮
+    doc.querySelector('#open-github').addEventListener('click', () => {
+        window.LiteLoader.api.openExternal('https://github.com/LLOneBot/LLOneBot')
+    })
+    doc.querySelector('#open-telegram').addEventListener('click', () => {
+        window.LiteLoader.api.openExternal('https://t.me/+nLZEnpne-pQ1OWFl')
+    })
+    doc.querySelector('#open-qq-group').addEventListener('click', () => {
+        window.LiteLoader.api.openExternal('https://qm.qq.com/q/bDnHRG38aI')
+    })
+    // 生成反向地址列表
+    const buildHostListItem = (type: string, host: string, index: number) => {
+        const dom = {
+            container: document.createElement('setting-item'),
+            input: document.createElement('input'),
+            inputContainer: document.createElement('div'),
+            deleteBtn: document.createElement('setting-button'),
+        };
+
+        dom.container.classList.add('setting-host-list-item');
+        dom.container.dataset.direction = 'row';
+
+        dom.input.classList.add('q-input__inner');
+        dom.input.type = 'url';
+        dom.input.value = host;
+        dom.input.addEventListener('input', () => {
+            ob11Config[type][index] = dom.input.value;
+        });
+
+        dom.inputContainer.classList.add('q-input');
+        dom.inputContainer.appendChild(dom.input);
+
+        dom.deleteBtn.innerHTML = '删除';
+        dom.deleteBtn.dataset.type = 'secondary';
+        dom.deleteBtn.addEventListener('click', () => {
+            ob11Config[type].splice(index, 1);
+            initReverseHost(type);
+        });
+
+        dom.container.appendChild(dom.inputContainer);
+        dom.container.appendChild(dom.deleteBtn);
+
+        return dom.container;
+    };
+    const buildHostList = (hosts: string[], type: string) => {
+        const result: HTMLElement[] = [];
+    
+        hosts.forEach((host, index) => {
+            result.push(buildHostListItem(type, host, index));
+        });
+    
+        return result;
+    };
+    const addReverseHost = (type: string, doc: Document = document) => {
+        const hostContainerDom = doc.body.querySelector(`#config-ob11-${type}-list`);
+        hostContainerDom.appendChild(buildHostListItem(type, '', ob11Config[type].length));
+        ob11Config[type].push('');
+    };
+    const initReverseHost = (type: string, doc: Document = document) => {
+        const hostContainerDom = doc.body.querySelector(`#config-ob11-${type}-list`);
+        [ ...hostContainerDom.childNodes ].forEach(dom => dom.remove());
+        buildHostList(ob11Config[type], type).forEach(dom => {
+            hostContainerDom.appendChild(dom);
+        });
+    };
+    initReverseHost('httpHosts', doc);
+    initReverseHost('wsHosts', doc);
+
+    doc.querySelector('#config-ob11-httpHosts-add').addEventListener('click', () => addReverseHost('httpHosts'));
+    doc.querySelector('#config-ob11-wsHosts-add').addEventListener('click', () => addReverseHost('wsHosts'));
+
+    doc.querySelector('#config-ffmpeg-select').addEventListener('click', () => {
+        window.llonebot.selectFile()
+            .then(path => {
+                if (!isEmpty(path)) {
+                    setConfig('ffmpeg', path);
+                    document.querySelector('#config-ffmpeg-path-text').innerHTML = path;
+                }
+            })
+    });
+
+    doc.querySelector('#config-open-log-path').addEventListener('click', () => {
+        window.LiteLoader.api.openPath(window.LiteLoader.plugins['LLOneBot'].path.data);
+    })
+
+    // 开关
+    doc.querySelectorAll('setting-switch[data-config-key]').forEach((dom: HTMLElement) => {
+        dom.addEventListener('click', () => {
+            const active = dom.getAttribute('is-active') === null;
+
+            setConfig(dom.dataset.configKey, active);
+
+            if (active) dom.setAttribute('is-active', '');
+            else dom.removeAttribute('is-active');
+
+            if (!isEmpty(dom.dataset.controlDisplayId)) {
+                const displayDom = document.querySelector(`#${dom.dataset.controlDisplayId}`);
+                if (active) displayDom.removeAttribute('is-hidden');
+                else displayDom.setAttribute('is-hidden', '');
+            }
+        });
+    });
+
+    // 输入框
+    doc.querySelectorAll('setting-item .q-input input.q-input__inner[data-config-key]').forEach((dom: HTMLInputElement) => {
+        dom.addEventListener('input', () => {
+            const Type = dom.getAttribute('type');
+            const configKey = dom.dataset.configKey;
+            const configValue = Type === 'number' ? (parseInt(dom.value) >= 1 ? parseInt(dom.value) : 1) : dom.value;
+
+            setConfig(configKey, configValue);
+        });
+    });
+
+    // 下拉框
+    doc.querySelectorAll('setting-select').forEach((dom: HTMLElement) => {
+        dom.addEventListener('selected', (e: CustomEvent) => {
+            const configKey = dom.dataset.configKey;
+            const configValue = e.detail.value;
+
+            setConfig(configKey, configValue);
+        });
+    });
+
+    // 保存按钮
+    doc.querySelector('#config-ob11-save').addEventListener('click', () => {
+        config.ob11 = ob11Config;
+
+        window.llonebot.setConfig(config);
+        alert('保存成功');
+    });
+
+    doc.body.childNodes.forEach(node => {
+        view.appendChild(node);
+    });
+}
+
+function init () {
+  const hash = location.hash
+  if (hash === '#/blank') {
+
+  }
+}
+
+if (location.hash === '#/blank') {
+  (window as any).navigation.addEventListener('navigatesuccess', init, { once: true })
+} else {
+  init()
+}
+
+export {
+  onSettingWindowCreated
+}
--- a/src/renderer/style.css
+++ b/src/renderer/style.css
@@ -0,0 +1,64 @@
+setting-item[is-hidden],
+setting-item[is-hidden] + setting-divider {
+  display: none !important;
+}
+
+.config-host-list {
+  width: 100%;
+  padding-left: 16px;
+  box-sizing: border-box;
+}
+.config-host-list[is-hidden],
+.config-host-list[is-hidden] + setting-divider {
+  display: none !important;
+}
+
+setting-item .q-input {
+  height: 24px;
+  width: 100px;
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+  border-bottom-left-radius: 4px;
+  box-sizing: border-box;
+  position: relative;
+  background: var(--bg_bottom_light);
+  border: 1px solid var(--border_dark);
+}
+
+setting-item .q-input .q-input__inner {
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+  border-bottom-left-radius: 4px;
+  box-sizing: border-box;
+  color: var(--text_primary);
+  font-family: inherit;
+  font-size: 12px;
+  height: 24px;
+  line-height: 24px;
+  width: 100%;
+  border: 1px solid transparent;
+  padding: 0px 8px;
+}
+
+setting-item .q-input input[type=number].q-input__inner::-webkit-outer-spin-button,
+setting-item .q-input input[type=number].q-input__inner::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+
+.config-host-list setting-item.setting-host-list-item .q-input {
+  width: 260px;
+}
+
+setting-item a {
+  color: var(--text-link);
+}
+setting-item a:hover {
+  color: var(--hover-link);
+}
+setting-item a:active,
+setting-item a:visited {
+  color: var(--text-link);
+}
--- a/src/version.ts
+++ b/src/version.ts
@@ -1 +1 @@
-export const version = "3.11.1"
+export const version = "3.13.9"
Author	SHA1	Message	Date
linyuchen	d1c94754ee	fix: send forward msg too fast	2024-03-09 09:59:39 +08:00
linyuchen	2626555c51	fix: check pic and ptt size	2024-03-09 02:43:58 +08:00
linyuchen	5ff6ceec6d	chore: ver 3.13.8	2024-03-09 02:38:05 +08:00
linyuchen	17af156451	fix: update msg seqId	2024-03-09 02:34:21 +08:00
linyuchen	c3c9e74832	fix: image cache url	2024-03-08 23:52:35 +08:00
linyuchen	0480208738	feat: file cache db	2024-03-08 23:27:20 +08:00
linyuchen	62eefbdb69	fix: sent pic message url	2024-03-08 22:16:05 +08:00
linyuchen	566537cbe3	fix: 构建转发消息的文件没有自动删除	2024-03-07 20:19:00 +08:00
linyuchen	ed831ae4cd	fix: 网络下载文件大小异常提示	2024-03-07 19:07:00 +08:00
linyuchen	501031b39b	fix: 网络视频后缀识别 fix: 网络文件下载失败的错误提示	2024-03-07 18:43:47 +08:00
linyuchen	7bfb3f2003	fix: 私聊带@报错，现已过滤私聊的at消息	2024-03-07 17:37:57 +08:00
linyuchen	ba8ed36c6a	fix: can not send reply msg fix: send like return error	2024-03-07 15:34:09 +08:00
linyuchen	55d046b4f9	fix: reply msg id	2024-03-07 14:18:24 +08:00
linyuchen	ac417cedd3	fix: reply msg id	2024-03-07 10:43:17 +08:00
linyuchen	ade509f26d	perf: 优化数据库缓存	2024-03-07 09:00:22 +08:00
linyuchen	a66c1a9779	Merge remote-tracking branch 'origin/main'	2024-03-06 23:33:35 +08:00
linyuchen	239cf18887	fix: init db failed	2024-03-06 23:33:19 +08:00
linyuchen	936554cca2	chore: ver 3.13.2	2024-03-06 22:57:36 +08:00
linyuchen	e1d47f55bf	fix: hotfix db initialize failed	2024-03-06 22:55:33 +08:00
linyuchen	cc8e8f108b	docs: update readme, file msg add new field `name`	2024-03-06 22:02:11 +08:00
linyuchen	e6d36dc6c3	fix: send video filename fix: send msg don't return message_id on Linux	2024-03-06 21:14:13 +08:00
linyuchen	aedc8cfc91	Merge branch 'main' into dev	2024-03-06 20:30:59 +08:00
linyuchen	00c80bf181	feat: send file api add name field	2024-03-06 20:30:26 +08:00
linyuchen	72890a8b59	Merge pull request #111 from lgc2333/patch-1 fix typo	2024-03-06 19:48:53 +08:00
student_2333	3b2577bcad	fix typo	2024-03-06 19:46:15 +08:00
linyuchen	063b2460f8	feat: some link on setting ui	2024-03-06 11:44:02 +08:00
linyuchen	9427377f30	Merge remote-tracking branch 'origin/main'	2024-03-06 11:24:58 +08:00
linyuchen	ecff16050a	feat: history msg db cache test: try send music card	2024-03-06 11:24:37 +08:00
手瓜一十雪	873cc6d6a5	docs: update readme	2024-03-05 22:26:57 +08:00
手瓜一十雪	eeb429048b	docs: update readme	2024-03-05 22:26:09 +08:00
linyuchen	f240f28ea6	docs: update readme	2024-03-05 11:53:42 +08:00
linyuchen	f993846230	fix: send silk fix: try get group qq from temp msg	2024-03-05 11:22:12 +08:00
linyuchen	276767e8bb	ui: report self message tips	2024-03-05 09:39:55 +08:00
linyuchen	38368afa10	ui: report self message tips	2024-03-05 09:38:43 +08:00
linyuchen	b23170e24f	fix: send ws heart packet	2024-03-05 09:28:50 +08:00
linyuchen	3c73826788	refactor: 'heartInterval', 'token', 'ffmpeg' not need auto save	2024-03-05 09:03:38 +08:00
linyuchen	3fb4b6a8da	Merge branch 'dev' of github.com:linyuchen/LiteLoaderQQNT-OneBotApi into dev	2024-03-05 08:33:51 +08:00
linyuchen	48768c18a9	fix: same url same path	2024-03-05 08:33:23 +08:00
linyuchen	2fe0df5ab9	Merge pull request #106 from MisaLiu/feat_setting_ui 重写设置页面	2024-03-05 07:22:50 +08:00
Misa Liu	3cea991839	chore: Edit config(s)	2024-03-05 00:25:28 +08:00
Misa Liu	f02ad6f788	feat: Finishing code	2024-03-05 00:25:28 +08:00
Misa Liu	beb372d102	feat: Add style to link(s)	2024-03-05 00:25:27 +08:00
Misa Liu	1cc726bcdc	feat: Made open config path button work	2024-03-05 00:25:27 +08:00
Misa Liu	9ff851ebb4	feat: Made ffmpeg select button work	2024-03-05 00:25:27 +08:00
Misa Liu	7d36e49bb2	feat: Made add button of reverse list work	2024-03-05 00:25:26 +08:00
Misa Liu	aec06d37b6	feat: Made reverse host list editable	2024-03-05 00:25:26 +08:00
Misa Liu	68dc2222d4	feat: Made delete work in host list	2024-03-05 00:25:26 +08:00
Misa Liu	0f51db62c9	feat: Generate reverse host list	2024-03-05 00:25:26 +08:00
Misa Liu	67cb8b2f0e	fix: Add missing setting option	2024-03-05 00:25:25 +08:00
Misa Liu	9e6ec92628	feat: Made save button work	2024-03-05 00:25:25 +08:00
Misa Liu	afacc79b56	feat: Made select works	2024-03-05 00:25:25 +08:00
Misa Liu	cbb732c778	feat: Made inputs work	2024-03-05 00:25:25 +08:00
Misa Liu	66fbce9e4c	fix: Add missing setting option	2024-03-05 00:25:24 +08:00
Misa Liu	a5877fec17	feat: Write config	2024-03-05 00:25:24 +08:00
Misa Liu	9acb0665d8	fix: Missing setting option	2024-03-05 00:25:24 +08:00
Misa Liu	f4fbe198e9	feat: Made switch works (UI)	2024-03-05 00:25:23 +08:00
Misa Liu	b668f948df	feat: Init new setting page	2024-03-05 00:25:17 +08:00
Misa Liu	1fc7356628	feat: Create setting components	2024-03-05 00:24:34 +08:00
linyuchen	b672a47d4e	Update README.md	2024-03-04 23:56:00 +08:00