Merge pull request #156 from idanran/main

fix: audio

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,20 +0,0 @@
----
-name: Bug反馈
-about: 报个Bug
-title: ''
-labels: bug
-assignees: ''
-
----
-
-QQ版本：
-
-LLOneBot版本：
-
-调用LLOneBot的方式或者应用端(如postman直接调用，或NoneBot2、Koishi)：
-
-BUG描述：
-
-复现步骤：
-
-LLOneBot日志:

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -0,0 +1,81 @@
+name: Bug 反馈
+description: 报告可能的 LLOneBot 异常行为
+title: '[BUG] '
+labels: bug
+body:
+  - type: markdown
+    attributes:
+      value: |
+        欢迎来到 LLOneBot 的 Issue Tracker！请填写以下表格来提交 Bug。
+        在提交新的 Bug 反馈前，请确保您：
+        * 已经搜索了现有的 issues，并且没有找到可以解决您问题的方法
+        * 不与现有的某一 issue 重复
+  - type: input
+    id: system-version
+    attributes:
+      label: 系统版本
+      description: 运行 QQNT 的系统版本
+      placeholder: Windows 10 Pro Workstation 22H2
+    validations:
+      required: true
+  - type: input
+    id: qqnt-version
+    attributes:
+      label: QQNT 版本
+      description: 可在 QQNT 的「关于」或是在 LiteLoaderQQNT 的设置页中找到
+      placeholder: 9.9.7-21804
+    validations:
+      required: true
+  - type: input
+    id: llonebot-version
+    attributes:
+      label: LLOneBot 版本
+      description: 可在 LiteLoaderQQNT 的设置页或是 QQNT 的设置页侧栏中找到
+      placeholder: 3.18.0
+    validations:
+      required: true
+  - type: input
+    id: onebot-client-version
+    attributes:
+      label: OneBot 客户端
+      description: 连接至 LLOneBot 的客户端版本信息
+      placeholder: Overflow 2.16.0-2cf7991-SNAPSHOT
+    validations:
+      required: true
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: 发生了什么?
+      description: 填写你认为的 LLOneBot 的不正常行为
+    validations:
+      required: true
+  - type: textarea
+    id: how-reproduce
+    attributes:
+      label: 如何复现
+      description: 填写应当如何操作才能触发这个不正常行为
+      placeholder: |
+        1. xxx
+        2. xxx
+        3. xxx
+    validations:
+      required: true
+  - type: textarea
+    id: what-expected
+    attributes:
+      label: 期望的结果?
+      description: 填写你认为 LLOneBot 应当执行的正常行为
+    validations:
+      required: true
+  - type: textarea
+    id: llonebot-log
+    attributes:
+      label: LLOneBot 运行日志
+      description: 在 LLOneBot 的设置页中打开「写入日志」然后粘贴相关日志内容到此处
+      render: shell
+  - type: textarea
+    id: onebot-client-log
+    attributes:
+      label: OneBot 客户端运行日志
+      description: 粘贴 OneBot 客户端的相关日志内容到此处
+      render: shell

electron.vite.config.ts

@@ -28,8 +28,12 @@ let config = {
                 './lib-cov/fluent-ffmpeg': './lib/fluent-ffmpeg'
             },
         },
-        plugins: [cp({ targets: [...external.map(genCpModule),
+        plugins: [cp({
-                { src: './manifest.json', dest: 'dist' }, {src: './icon.jpg', dest: 'dist' }]
+            targets: [
+                ...external.map(genCpModule),
+                {src: './manifest.json', dest: 'dist'}, {src: './icon.jpg', dest: 'dist'},
+                {src: './src/ntqqapi/external/ccpoke/poke-win32-x64.node', dest: 'dist/main/ccpoke/'},
+            ]
         })]
     },
     preload: {
@@ -46,8 +50,7 @@ let config = {
                 input: "src/preload.ts",
             }
         },
-        resolve:{
+        resolve: {}
-        }
     },
     renderer: {
         // vite config options
@@ -63,8 +66,7 @@ let config = {
                 input: "src/renderer/index.ts",
             }
         },
-        resolve:{
+        resolve: {}
-        }
     }
 }
 

manifest.json

@@ -1,10 +1,10 @@
 {
   "manifest_version": 4,
   "type": "extension",
-  "name": "LLOneBot v3.15.1",
+  "name": "LLOneBot v3.19.0",
   "slug": "LLOneBot",
   "description": "LiteLoaderQQNT的OneBotApi,不支持商店在线更新",
-  "version": "3.15.1",
+  "version": "3.19.0",
   "icon": "./icon.jpg",
   "authors": [
     {

package-lock.json

@@ -9,11 +9,12 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
+        "compressing": "^1.10.0",
         "express": "^4.18.2",
         "file-type": "^19.0.0",
         "fluent-ffmpeg": "^2.1.2",
         "level": "^8.0.1",
-        "silk-wasm": "^3.2.3",
+        "silk-wasm": "^3.3.3",
         "utf-8-validate": "^6.0.3",
         "uuid": "^9.0.1",
         "ws": "^8.16.0"
@@ -550,6 +551,15 @@
         "@jridgewell/sourcemap-codec": "^1.4.10"
       }
     },
+    "node_modules/@eggjs/yauzl": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmmirror.com/@eggjs/yauzl/-/yauzl-2.11.0.tgz",
+      "integrity": "sha512-Jq+k2fCZJ3i3HShb0nxLUiAgq5pwo8JTT1TrH22JoehZQ0Nm2dvByGIja1NYfNyuE4Tx5/Dns5nVsBN/mlC8yg==",
+      "dependencies": {
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer2": "^1.2.0"
+      }
+    },
     "node_modules/@electron/get": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.3.tgz",
@@ -2150,6 +2160,47 @@
         }
       ]
     },
+    "node_modules/bl": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmmirror.com/bl/-/bl-1.2.3.tgz",
+      "integrity": "sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==",
+      "dependencies": {
+        "readable-stream": "^2.3.5",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/bl/node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+    },
+    "node_modules/bl/node_modules/readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/bl/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "node_modules/bl/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
     "node_modules/body-parser": {
       "version": "1.20.2",
       "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
@@ -2280,15 +2331,33 @@
         "ieee754": "^1.2.1"
       }
     },
+    "node_modules/buffer-alloc": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
+      "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
+      "dependencies": {
+        "buffer-alloc-unsafe": "^1.1.0",
+        "buffer-fill": "^1.0.0"
+      }
+    },
+    "node_modules/buffer-alloc-unsafe": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
+      "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="
+    },
     "node_modules/buffer-crc32": {
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
       "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
-      "dev": true,
       "engines": {
         "node": "*"
       }
     },
+    "node_modules/buffer-fill": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/buffer-fill/-/buffer-fill-1.0.0.tgz",
+      "integrity": "sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ=="
+    },
     "node_modules/buffer-from": {
       "version": "1.1.2",
       "resolved": "https://mirrors.cloud.tencent.com/npm/buffer-from/-/buffer-from-1.1.2.tgz",
@@ -2514,6 +2583,36 @@
       "optional": true,
       "peer": true
     },
+    "node_modules/compressing": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmmirror.com/compressing/-/compressing-1.10.0.tgz",
+      "integrity": "sha512-k2vpbZLaJoHe9euyUZjYYE8vOrbR19aU3HcWIYw5EBXiUs34ygfDVnXU+ubI41JXMriHutnoiu0ZFdwCkH6jPA==",
+      "dependencies": {
+        "@eggjs/yauzl": "^2.11.0",
+        "flushwritable": "^1.0.0",
+        "get-ready": "^1.0.0",
+        "iconv-lite": "^0.5.0",
+        "mkdirp": "^0.5.1",
+        "pump": "^3.0.0",
+        "streamifier": "^0.1.1",
+        "tar-stream": "^1.5.2",
+        "yazl": "^2.4.2"
+      },
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/compressing/node_modules/iconv-lite": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.5.2.tgz",
+      "integrity": "sha512-kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag==",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://mirrors.cloud.tencent.com/npm/concat-map/-/concat-map-0.0.1.tgz",
@@ -2558,6 +2657,11 @@
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
       "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
     },
+    "node_modules/core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
+    },
     "node_modules/create-require": {
       "version": "1.1.1",
       "resolved": "https://mirrors.cloud.tencent.com/npm/create-require/-/create-require-1.1.1.tgz",
@@ -2812,7 +2916,6 @@
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
       "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
       "dependencies": {
         "once": "^1.4.0"
       }
@@ -3635,6 +3738,14 @@
         "pend": "~1.2.0"
       }
     },
+    "node_modules/fd-slicer2": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/fd-slicer2/-/fd-slicer2-1.2.0.tgz",
+      "integrity": "sha512-3lBUNUckhMZduCc4g+Pw4Ve16LD9vpX9b8qUkkKq2mgDRLYWzblszZH2luADnJqjJe+cypngjCuKRm/IW12rRw==",
+      "dependencies": {
+        "pend": "^1.2.0"
+      }
+    },
     "node_modules/file-entry-cache": {
       "version": "6.0.1",
       "resolved": "https://mirrors.cloud.tencent.com/npm/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
@@ -3737,6 +3848,11 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/flushwritable": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/flushwritable/-/flushwritable-1.0.0.tgz",
+      "integrity": "sha512-3VELfuWCLVzt5d2Gblk8qcqFro6nuwvxwMzHaENVDHI7rxcBRtMCwTk/E9FXcgh+82DSpavPNDueA9+RxXJoFg=="
+    },
     "node_modules/for-each": {
       "version": "0.3.3",
       "resolved": "https://mirrors.cloud.tencent.com/npm/for-each/-/for-each-0.3.3.tgz",
@@ -3762,6 +3878,11 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/fs-constants": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/fs-constants/-/fs-constants-1.0.0.tgz",
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
+    },
     "node_modules/fs-extra": {
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
@@ -3858,6 +3979,11 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/get-ready": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/get-ready/-/get-ready-1.0.0.tgz",
+      "integrity": "sha512-mFXCZPJIlcYcth+N8267+mghfYN9h3EhsDa6JSnbA3Wrhh/XFpuowviFcsDeYZtKspQyWyJqfs4O6P8CHeTwzw=="
+    },
     "node_modules/get-stream": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
@@ -4858,11 +4984,21 @@
       "version": "1.2.8",
       "resolved": "https://mirrors.cloud.tencent.com/npm/minimist/-/minimist-1.2.8.tgz",
       "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-      "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/mkdirp": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+      "dependencies": {
+        "minimist": "^1.2.6"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
     "node_modules/module-error": {
       "version": "1.0.2",
       "resolved": "https://mirrors.cloud.tencent.com/npm/module-error/-/module-error-1.0.2.tgz",
@@ -5039,7 +5175,6 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dev": true,
       "dependencies": {
         "wrappy": "1"
       }
@@ -5152,8 +5287,7 @@
     "node_modules/pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
+      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="
-      "dev": true
     },
     "node_modules/picocolors": {
       "version": "1.0.0",
@@ -5219,6 +5353,11 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+    },
     "node_modules/progress": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
@@ -5244,7 +5383,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
       "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
       "dependencies": {
         "end-of-stream": "^1.1.0",
         "once": "^1.3.1"
@@ -5757,9 +5895,9 @@
       }
     },
     "node_modules/silk-wasm": {
-      "version": "3.2.3",
+      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/silk-wasm/-/silk-wasm-3.2.3.tgz",
+      "resolved": "https://registry.npmjs.org/silk-wasm/-/silk-wasm-3.3.3.tgz",
-      "integrity": "sha512-zZ3hgMpiPR6cFnKvCPgPpCwx6n5RoJCbEGIFlge2kAxAmgzBTf0b2F2xIPG5W4obUhQPQXXTTH074eGZJK01xw=="
+      "integrity": "sha512-9Qj93EtiIuBNkDyEwlPntabEtrm6Xu6LE4y9qZvomvo5+IsXFcXSy+N55kV22OehUTBYlZqOZYtRggA8G9IDGg=="
     },
     "node_modules/slash": {
       "version": "4.0.0",
@@ -5820,6 +5958,14 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/streamifier": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmmirror.com/streamifier/-/streamifier-0.1.1.tgz",
+      "integrity": "sha512-zDgl+muIlWzXNsXeyUfOk9dChMjlpkq0DRsxujtYPgyJ676yQ8jEm6zzaaWHFDg5BNcLuif0eD2MTyJdZqXpdg==",
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
     "node_modules/string_decoder": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
@@ -5946,6 +6092,55 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/tar-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmmirror.com/tar-stream/-/tar-stream-1.6.2.tgz",
+      "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==",
+      "dependencies": {
+        "bl": "^1.0.0",
+        "buffer-alloc": "^1.2.0",
+        "end-of-stream": "^1.0.0",
+        "fs-constants": "^1.0.0",
+        "readable-stream": "^2.3.0",
+        "to-buffer": "^1.1.1",
+        "xtend": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/tar-stream/node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+    },
+    "node_modules/tar-stream/node_modules/readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/tar-stream/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "node_modules/tar-stream/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
     "node_modules/terser": {
       "version": "5.28.1",
       "resolved": "https://mirrors.cloud.tencent.com/npm/terser/-/terser-5.28.1.tgz",
@@ -5972,6 +6167,11 @@
       "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
       "dev": true
     },
+    "node_modules/to-buffer": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/to-buffer/-/to-buffer-1.1.1.tgz",
+      "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg=="
+    },
     "node_modules/to-fast-properties": {
       "version": "2.0.0",
       "resolved": "https://mirrors.cloud.tencent.com/npm/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
@@ -6515,8 +6715,7 @@
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
-      "dev": true
     },
     "node_modules/ws": {
       "version": "8.16.0",
@@ -6538,6 +6737,14 @@
         }
       }
     },
+    "node_modules/xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmmirror.com/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
     "node_modules/yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
@@ -6554,6 +6761,14 @@
         "fd-slicer": "~1.1.0"
       }
     },
+    "node_modules/yazl": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmmirror.com/yazl/-/yazl-2.5.1.tgz",
+      "integrity": "sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==",
+      "dependencies": {
+        "buffer-crc32": "~0.2.3"
+      }
+    },
     "node_modules/yn": {
       "version": "3.1.1",
       "resolved": "https://mirrors.cloud.tencent.com/npm/yn/-/yn-3.1.1.tgz",

package.json

@@ -14,11 +14,12 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "compressing": "^1.10.0",
     "express": "^4.18.2",
     "file-type": "^19.0.0",
     "fluent-ffmpeg": "^2.1.2",
     "level": "^8.0.1",
-    "silk-wasm": "^3.2.3",
+    "silk-wasm": "^3.3.3",
     "utf-8-validate": "^6.0.3",
     "uuid": "^9.0.1",
     "ws": "^8.16.0"

src/common/channels.ts

@@ -2,4 +2,6 @@ export const CHANNEL_GET_CONFIG = 'llonebot_get_config'
 export const CHANNEL_SET_CONFIG = 'llonebot_set_config'
 export const CHANNEL_LOG = 'llonebot_log'
 export const CHANNEL_ERROR = 'llonebot_error'
+export const CHANNEL_UPDATE = 'llonebot_update'
+export const CHANNEL_CHECK_VERSION = 'llonebot_check_version'
 export const CHANNEL_SELECT_FILE = 'llonebot_select_ffmpeg'

src/common/config.ts

@@ -1,6 +1,10 @@
 import fs from "fs";
 import {Config, OB11Config} from './types';
-import {mergeNewProperties} from "./utils";
+
+import {mergeNewProperties} from "./utils/helper";
+import path from "node:path";
+import {selfInfo} from "./data";
+import {DATA_DIR} from "./utils";
 
 export const HOOK_LOG = false;
 
@@ -26,6 +30,7 @@ export class ConfigUtil {
         let ob11Default: OB11Config = {
             httpPort: 3000,
             httpHosts: [],
+            httpSecret: "",
             wsPort: 3001,
             wsHosts: [],
             enableHttp: true,
@@ -44,6 +49,7 @@ export class ConfigUtil {
             reportSelfMessage: false,
             autoDeleteFile: false,
             autoDeleteFileSecond: 60,
+            enablePoke: false
         };
 
         if (!fs.existsSync(this.configPath)) {
@@ -84,3 +90,8 @@ export class ConfigUtil {
         }
     }
 }
+
+export function getConfigUtil() {
+    const configFilePath = path.join(DATA_DIR, `config_${selfInfo.uin}.json`)
+    return new ConfigUtil(configFilePath)
+}

src/common/data.ts

@@ -1,17 +1,14 @@
-import {NTQQApi} from '../ntqqapi/ntcall'
 import {
     type Friend,
     type FriendRequest,
     type Group,
     type GroupMember,
-    type GroupNotify,
-    type RawMessage,
     type SelfInfo
 } from '../ntqqapi/types'
 import {type FileCache, type LLOneBotError} from './types'
-import {dbUtil} from "./db";
+import {NTQQGroupApi} from "../ntqqapi/api/group";
-import {raw} from "express";
+import {log} from "./utils/log";
-import {isNumeric, log} from "./utils";
+import {isNumeric} from "./utils/helper";
 
 export const selfInfo: SelfInfo = {
     uid: '',
@@ -24,7 +21,9 @@ export let friends: Friend[] = []
 export let friendRequests: Map<number, FriendRequest> = new Map<number, FriendRequest>()
 export const llonebotError: LLOneBotError = {
     ffmpegError: '',
-    otherError: ''
+    httpServerError: '',
+    wsServerError: '',
+    otherError: 'LLOnebot未能正常启动，请检查日志查看错误'
 }
 
 
@@ -47,7 +46,7 @@ export async function getGroup(qq: string): Promise<Group | undefined> {
     let group = groups.find(group => group.groupCode === qq.toString())
     if (!group) {
         try {
-            const _groups = await NTQQApi.getGroups(true);
+            const _groups = await NTQQGroupApi.getGroups(true);
             group = _groups.find(group => group.groupCode === qq.toString())
             if (group) {
                 groups.push(group)
@@ -70,7 +69,7 @@ export async function getGroupMember(groupQQ: string | number, memberUinOrUid: s
         let member = group.members?.find(filterFunc)
         if (!member) {
             try {
-                const _members = await NTQQApi.getGroupMembers(groupQQ)
+                const _members = await NTQQGroupApi.getGroupMembers(groupQQ)
                 if (_members.length > 0) {
                     group.members = _members
                 }
@@ -88,7 +87,7 @@ export async function getGroupMember(groupQQ: string | number, memberUinOrUid: s
 export async function refreshGroupMembers(groupQQ: string) {
     const group = groups.find(group => group.groupCode === groupQQ)
     if (group) {
-        group.members = await NTQQApi.getGroupMembers(groupQQ)
+        group.members = await NTQQGroupApi.getGroupMembers(groupQQ)
     }
 }
 

src/common/db.ts

@@ -1,9 +1,11 @@
 import {Level} from "level";
 import {type GroupNotify, RawMessage} from "../ntqqapi/types";
-import {DATA_DIR, log} from "./utils";
+import {DATA_DIR} from "./utils";
 import {selfInfo} from "./data";
 import {FileCache} from "./types";
+import {log} from "./utils/log";
 
+type ReceiveTempUinMap = Record<string, string>;
 
 class DBUtil {
     public readonly DB_KEY_PREFIX_MSG_ID = "msg_id_";
@@ -11,8 +13,9 @@ class DBUtil {
     public readonly DB_KEY_PREFIX_MSG_SEQ_ID = "msg_seq_id_";
     public readonly DB_KEY_PREFIX_FILE = "file_";
     public readonly DB_KEY_PREFIX_GROUP_NOTIFY = "group_notify_";
+    private readonly DB_KEY_RECEIVED_TEMP_UIN_MAP = "received_temp_uin_map";
     public db: Level;
-    public cache: Record<string, RawMessage | string | FileCache | GroupNotify> = {}  // <msg_id_ | msg_short_id_ | msg_seq_id_><id>: RawMessage
+    public cache: Record<string, RawMessage | string | FileCache | GroupNotify | ReceiveTempUinMap> = {}  // <msg_id_ | msg_short_id_ | msg_seq_id_><id>: RawMessage
     private currentShortId: number;
 
     /*
@@ -67,6 +70,17 @@ class DBUtil {
         }, expiredMilliSecond)
     }
 
+    public async getReceivedTempUinMap(): Promise<ReceiveTempUinMap> {
+        try{
+            this.cache[this.DB_KEY_RECEIVED_TEMP_UIN_MAP] = JSON.parse(await this.db.get(this.DB_KEY_RECEIVED_TEMP_UIN_MAP));
+        }catch (e) {
+        }
+        return (this.cache[this.DB_KEY_RECEIVED_TEMP_UIN_MAP] || {}) as ReceiveTempUinMap;
+    }
+    public setReceivedTempUinMap(data: ReceiveTempUinMap) {
+        this.cache[this.DB_KEY_RECEIVED_TEMP_UIN_MAP] = data;
+        this.db.put(this.DB_KEY_RECEIVED_TEMP_UIN_MAP, JSON.stringify(data)).then();
+    }
     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
@@ -208,14 +222,14 @@ class DBUtil {
         return this.currentShortId;
     }
 
-    async addFileCache(fileName: string, data: FileCache) {
+    async addFileCache(fileNameOrUuid: string, data: FileCache) {
-        const key = this.DB_KEY_PREFIX_FILE + fileName;
+        const key = this.DB_KEY_PREFIX_FILE + fileNameOrUuid;
         if (this.cache[key]) {
             return
         }
         let cacheDBData = {...data}
         delete cacheDBData['downloadFunc']
-        this.cache[fileName] = data;
+        this.cache[fileNameOrUuid] = data;
         try {
             await this.db.put(key, JSON.stringify(cacheDBData));
         } catch (e) {
@@ -223,8 +237,8 @@ class DBUtil {
         }
     }
 
-    async getFileCache(fileName: string): Promise<FileCache | undefined> {
+    async getFileCache(fileNameOrUuid: string): Promise<FileCache | undefined> {
-        const key = this.DB_KEY_PREFIX_FILE + fileName;
+        const key = this.DB_KEY_PREFIX_FILE + (fileNameOrUuid);
         if (this.cache[key]) {
             return this.cache[key] as FileCache
         }

src/common/server/http.ts

@@ -1,6 +1,8 @@
-import express, {Express, json, Request, Response} from "express";
+import express, {Express, Request, Response} from "express";
-import {getConfigUtil, log} from "../utils";
 import http from "http";
+import {log} from "../utils/log";
+import {getConfigUtil} from "../config";
+import {llonebotError} from "../data";
 
 type RegisterHandler = (res: Response, payload: any) => Promise<any>
 
@@ -51,13 +53,20 @@ export abstract class HttpServerBase {
     };
 
     start(port: number) {
+        try {
             this.expressAPP.get('/', (req: Request, res: Response) => {
                 res.send(`${this.name}已启动`);
             })
             this.listen(port);
+            llonebotError.httpServerError = ""
+        } catch (e) {
+            log("HTTP服务启动失败", e.toString())
+            llonebotError.httpServerError = "HTTP服务启动失败, " + e.toString()
+        }
     }
 
     stop() {
+        llonebotError.httpServerError = ""
         if (this.server) {
             this.server.close()
             this.server = null;

src/common/server/websocket.ts

@@ -1,7 +1,9 @@
 import {WebSocket, WebSocketServer} from "ws";
-import {getConfigUtil, log} from "../utils";
 import urlParse from "url";
 import {IncomingMessage} from "node:http";
+import {log} from "../utils/log";
+import {getConfigUtil} from "../config";
+import {llonebotError} from "../data";
 
 class WebsocketClientBase {
     private wsClient: WebSocket
@@ -28,7 +30,12 @@ export class WebsocketServerBase {
     }
 
     start(port: number) {
+        try {
             this.ws = new WebSocketServer({port});
+            llonebotError.wsServerError = ''
+        }catch (e) {
+            llonebotError.wsServerError = "正向ws服务启动失败, " + e.toString()
+        }
         this.ws.on("connection", (wsClient, req) => {
             const url = req.url.split("?").shift()
             this.authorize(wsClient, req);
@@ -40,6 +47,7 @@ export class WebsocketServerBase {
     }
 
     stop() {
+        llonebotError.wsServerError = ''
         this.ws.close((err) => {
             log("ws server close failed!", err)
         });

src/common/types.ts

@@ -1,6 +1,7 @@
 export interface OB11Config {
   httpPort: number
   httpHosts: string[]
+  httpSecret?: string
   wsPort: number
   wsHosts: string[]
   enableHttp?: boolean
@@ -9,7 +10,10 @@ export interface OB11Config {
   enableWsReverse?: boolean
   messagePostFormat?: 'array' | 'string'
 }
-
+export interface CheckVersion {
+  result: boolean,
+  version: string
+}
 export interface Config {
   ob11: OB11Config
   token?: string
@@ -21,9 +25,12 @@ export interface Config {
   autoDeleteFile?: boolean
   autoDeleteFileSecond?: number
   ffmpeg?: string // ffmpeg路径
+  enablePoke?: boolean
 }
 
 export interface LLOneBotError {
+  httpServerError?: string
+  wsServerError?: string
   ffmpegError?: string
   otherError?: string
 }
@@ -32,6 +39,8 @@ export interface FileCache {
   fileName: string
   filePath: string
   fileSize: string
+  fileUuid?: string
   url?: string
+  msgId?: string
   downloadFunc?: () => Promise<void>
 }

src/common/utils.ts

@@ -1,342 +0,0 @@
-import * as path from "node:path";
-import {selfInfo} from "./data";
-import {ConfigUtil} from "./config";
-import util from "util";
-import {encode, getDuration, isWav} from "silk-wasm";
-import fs from 'fs';
-import * as crypto from 'crypto';
-import {v4 as uuidv4} from "uuid";
-import ffmpeg from "fluent-ffmpeg"
-
-export const DATA_DIR = global.LiteLoader.plugins["LLOneBot"].path.data;
-
-export function getConfigUtil() {
-    const configFilePath = path.join(DATA_DIR, `config_${selfInfo.uin}.json`)
-    return new ConfigUtil(configFilePath)
-}
-
-function truncateString(obj: any, maxLength = 500) {
-    if (obj !== null && typeof obj === 'object') {
-        Object.keys(obj).forEach(key => {
-            if (typeof obj[key] === 'string') {
-                // 如果是字符串且超过指定长度，则截断
-                if (obj[key].length > maxLength) {
-                    obj[key] = obj[key].substring(0, maxLength) + '...';
-                }
-            } else if (typeof obj[key] === 'object') {
-                // 如果是对象或数组，则递归调用
-                truncateString(obj[key], maxLength);
-            }
-        });
-    }
-    return obj;
-}
-
-export function isNumeric(str: string) {
-    return /^\d+$/.test(str);
-}
-
-
-export function log(...msg: any[]) {
-    if (!getConfigUtil().getConfig().log) {
-        return //console.log(...msg);
-    }
-    let currentDateTime = new Date().toLocaleString();
-    const date = new Date();
-    const year = date.getFullYear();
-    const month = date.getMonth() + 1;
-    const day = date.getDate();
-    const currentDate = `${year}-${month}-${day}`;
-    const userInfo = selfInfo.uin ? `${selfInfo.nick}(${selfInfo.uin})` : ""
-    let logMsg = "";
-    for (let msgItem of msg) {
-        // 判断是否是对象
-        if (typeof msgItem === "object") {
-            let obj = JSON.parse(JSON.stringify(msgItem));
-            logMsg += JSON.stringify(truncateString(obj)) + " ";
-            continue;
-        }
-        logMsg += msgItem + " ";
-    }
-    logMsg = `${currentDateTime} ${userInfo}: ${logMsg}\n\n`
-    // sendLog(...msg);
-    // console.log(msg)
-    fs.appendFile(path.join(DATA_DIR, `llonebot-${currentDate}.log`), logMsg, (err: any) => {
-
-    })
-}
-
-export function isGIF(path: string) {
-    const buffer = Buffer.alloc(4);
-    const fd = fs.openSync(path, 'r');
-    fs.readSync(fd, buffer, 0, 4, 0);
-    fs.closeSync(fd);
-    return buffer.toString() === 'GIF8'
-}
-
-export function sleep(ms: number): Promise<void> {
-    return new Promise(resolve => setTimeout(resolve, ms));
-}
-
-
-// 定义一个异步函数来检查文件是否存在
-export function checkFileReceived(path: string, timeout: number = 3000): Promise<void> {
-    return new Promise((resolve, reject) => {
-        const startTime = Date.now();
-
-        function check() {
-            if (fs.existsSync(path)) {
-                resolve();
-            } else if (Date.now() - startTime > timeout) {
-                reject(new Error(`文件不存在: ${path}`));
-            } else {
-                setTimeout(check, 100);
-            }
-        }
-
-        check();
-    });
-}
-
-export async function file2base64(path: string) {
-    const readFile = util.promisify(fs.readFile);
-    let result = {
-        err: "",
-        data: ""
-    }
-    try {
-        // 读取文件内容
-        // if (!fs.existsSync(path)){
-        //     path = path.replace("\\Ori\\", "\\Thumb\\");
-        // }
-        try {
-            await checkFileReceived(path, 5000);
-        } catch (e: any) {
-            result.err = e.toString();
-            return result;
-        }
-        const data = await readFile(path);
-        // 转换为Base64编码
-        result.data = data.toString('base64');
-    } catch (err) {
-        result.err = err.toString();
-    }
-    return result;
-}
-
-
-// 在保证老对象已有的属性不变化的情况下将新对象的属性复制到老对象
-export function mergeNewProperties(newObj: any, oldObj: any) {
-    Object.keys(newObj).forEach(key => {
-        // 如果老对象不存在当前属性，则直接复制
-        if (!oldObj.hasOwnProperty(key)) {
-            oldObj[key] = newObj[key];
-        } else {
-            // 如果老对象和新对象的当前属性都是对象，则递归合并
-            if (typeof oldObj[key] === 'object' && typeof newObj[key] === 'object') {
-                mergeNewProperties(newObj[key], oldObj[key]);
-            } else if (typeof oldObj[key] === 'object' || typeof newObj[key] === 'object') {
-                // 属性冲突，有一方不是对象，直接覆盖
-                oldObj[key] = newObj[key];
-            }
-        }
-    });
-}
-
-export function checkFfmpeg(newPath: string = null): Promise<boolean> {
-    return new Promise((resolve, reject) => {
-        if (newPath) {
-            ffmpeg.setFfmpegPath(newPath);
-            ffmpeg.getAvailableFormats((err, formats) => {
-                if (err) {
-                    log('ffmpeg is not installed or not found in PATH:', err);
-                    resolve(false)
-                } else {
-                    log('ffmpeg is installed.');
-                    resolve(true);
-                }
-            })
-        }
-    });
-}
-
-export async function encodeSilk(filePath: string) {
-    const fsp = require("fs").promises
-
-    function getFileHeader(filePath: string) {
-        // 定义要读取的字节数
-        const bytesToRead = 7;
-        try {
-            const buffer = fs.readFileSync(filePath, {
-                encoding: null,
-                flag: "r",
-            });
-
-            const fileHeader = buffer.toString("hex", 0, bytesToRead);
-            return fileHeader;
-        } catch (err) {
-            console.error("读取文件错误:", err);
-            return;
-        }
-    }
-
-    async function isWavFile(filePath: string) {
-        return isWav(fs.readFileSync(filePath));
-    }
-
-    // async function getAudioSampleRate(filePath: string) {
-    //     try {
-    //         const mm = await import('music-metadata');
-    //         const metadata = await mm.parseFile(filePath);
-    //         log(`${filePath}采样率`, metadata.format.sampleRate);
-    //         return metadata.format.sampleRate;
-    //     } catch (error) {
-    //         log(`${filePath}采样率获取失败`, error.stack);
-    //         // console.error(error);
-    //     }
-    // }
-
-    try {
-        const fileName = path.basename(filePath);
-        const pttPath = path.join(DATA_DIR, uuidv4());
-        if (getFileHeader(filePath) !== "02232153494c4b") {
-            log(`语音文件${filePath}需要转换成silk`)
-            const _isWav = await isWavFile(filePath);
-            const wavPath = pttPath + ".wav"
-            if (!_isWav) {
-                log(`语音文件${filePath}正在转换成wav`)
-                // let voiceData = await fsp.readFile(filePath)
-                await new Promise((resolve, reject) => {
-                    const ffmpegPath = getConfigUtil().getConfig().ffmpeg;
-                    if (ffmpegPath) {
-                        ffmpeg.setFfmpegPath(ffmpegPath);
-                    }
-                    ffmpeg(filePath).toFormat("wav").audioChannels(2).on('end', function () {
-                        log('wav转换完成');
-                    })
-                        .on('error', function (err) {
-                            log(`wav转换出错: `, err.message,);
-                            reject(err);
-                        })
-                        .save(wavPath)
-                        .on("end", () => {
-                            filePath = wavPath
-                            resolve(wavPath);
-                        });
-                })
-            }
-            // const sampleRate = await getAudioSampleRate(filePath) || 0;
-            // log("音频采样率", sampleRate)
-            const pcm = fs.readFileSync(filePath);
-            const silk = await encode(pcm, 0);
-            fs.writeFileSync(pttPath, silk.data);
-            fs.unlink(wavPath, (err) => { });
-            log(`语音文件${filePath}转换成功!`, pttPath)
-            return {
-                converted: true,
-                path: pttPath,
-                duration: silk.duration,
-            };
-        } else {
-            const pcm = fs.readFileSync(filePath);
-            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,
-                duration: duration,
-            };
-        }
-    } catch (error) {
-        log("convert silk failed", error.stack);
-        return {};
-    }
-}
-
-export async function getVideoInfo(filePath: string) {
-    const size = fs.statSync(filePath).size;
-    return new Promise<{ width: number, height: number, time: number, format: string, size: number, filePath: string }>((resolve, reject) => {
-        ffmpeg(filePath).ffprobe( (err, metadata) => {
-            if (err) {
-                reject(err);
-            } else {
-                const videoStream = metadata.streams.find(s => s.codec_type === 'video');
-                if (videoStream) {
-                    console.log(`视频尺寸: ${videoStream.width}x${videoStream.height}`);
-                } else {
-                    console.log('未找到视频流信息。');
-                }
-                resolve({
-                    width: videoStream.width, height: videoStream.height,
-                    time: parseInt(videoStream.duration),
-                    format: metadata.format.format_name,
-                    size,
-                    filePath
-                });
-            }
-        });
-    })
-}
-
-
-export async function encodeMp4(filePath: string) {
-    let videoInfo = await getVideoInfo(filePath);
-    log("视频信息", videoInfo)
-    if (videoInfo.format.indexOf("mp4") === -1) {
-        log("视频需要转换为MP4格式", filePath)
-        // 转成mp4
-        const newPath: string = await new Promise<string>((resolve, reject) => {
-            const newPath = filePath + ".mp4"
-            ffmpeg(filePath)
-                .toFormat('mp4')
-                .on('error', (err) => {
-                    reject(`转换视频格式失败: ${err.message}`);
-                })
-                .on('end', () => {
-                    log('视频转换为MP4格式完成');
-                    resolve(newPath); // 返回转换后的文件路径
-                })
-                .save(newPath);
-        });
-        return await getVideoInfo(newPath)
-    }
-    return videoInfo
-}
-
-export function isNull(value: any) {
-    return value === undefined || value === null;
-}
-
-
-export function calculateFileMD5(filePath: string): Promise<string> {
-    return new Promise((resolve, reject) => {
-        // 创建一个流式读取器
-        const stream = fs.createReadStream(filePath);
-        const hash = crypto.createHash('md5');
-
-        stream.on('data', (data: Buffer) => {
-            // 当读取到数据时，更新哈希对象的状态
-            hash.update(data);
-        });
-
-        stream.on('end', () => {
-            // 文件读取完成，计算哈希
-            const md5 = hash.digest('hex');
-            resolve(md5);
-        });
-
-        stream.on('error', (err: Error) => {
-            // 处理可能的读取错误
-            reject(err);
-        });
-    });
-}

src/common/utils/audio.ts

@@ -0,0 +1,137 @@
+import fs from "fs";
+import {encode, getDuration, getWavFileInfo, isWav} from "silk-wasm";
+import fsPromise from "fs/promises";
+import {log} from "./log";
+import path from "node:path";
+import {DATA_DIR, TEMP_DIR} from "./index";
+import {v4 as uuidv4} from "uuid";
+import {getConfigUtil} from "../config";
+import ffmpeg from "fluent-ffmpeg";
+
+export async function encodeSilk(filePath: string) {
+    function getFileHeader(filePath: string) {
+        // 定义要读取的字节数
+        const bytesToRead = 7;
+        try {
+            const buffer = fs.readFileSync(filePath, {
+                encoding: null,
+                flag: "r",
+            });
+
+            const fileHeader = buffer.toString("hex", 0, bytesToRead);
+            return fileHeader;
+        } catch (err) {
+            console.error("读取文件错误:", err);
+            return;
+        }
+    }
+
+    async function isWavFile(filePath: string) {
+        return isWav(fs.readFileSync(filePath));
+    }
+
+    async function guessDuration(pttPath: string) {
+        const pttFileInfo = await fsPromise.stat(pttPath)
+        let duration = pttFileInfo.size / 1024 / 3  // 3kb/s
+        duration = Math.floor(duration)
+        duration = Math.max(1, duration)
+        log(`通过文件大小估算语音的时长:`, duration)
+        return duration
+    }
+
+    // function verifyDuration(oriDuration: number, guessDuration: number) {
+    //     // 单位都是秒
+    //     if (oriDuration - guessDuration > 10) {
+    //         return guessDuration
+    //     }
+    //     oriDuration = Math.max(1, oriDuration)
+    //     return oriDuration
+    // }
+    // async function getAudioSampleRate(filePath: string) {
+    //     try {
+    //         const mm = await import('music-metadata');
+    //         const metadata = await mm.parseFile(filePath);
+    //         log(`${filePath}采样率`, metadata.format.sampleRate);
+    //         return metadata.format.sampleRate;
+    //     } catch (error) {
+    //         log(`${filePath}采样率获取失败`, error.stack);
+    //         // console.error(error);
+    //     }
+    // }
+
+    try {
+        const pttPath = path.join(TEMP_DIR, uuidv4());
+        if (getFileHeader(filePath) !== "02232153494c4b") {
+            log(`语音文件${filePath}需要转换成silk`)
+            const _isWav = await isWavFile(filePath);
+            const wavPath = pttPath + ".wav"
+            const convert = async () => {
+                return await new Promise((resolve, reject) => {
+                    const ffmpegPath = getConfigUtil().getConfig().ffmpeg;
+                    if (ffmpegPath) {
+                        ffmpeg.setFfmpegPath(ffmpegPath);
+                    }
+                    ffmpeg(filePath).toFormat("wav")
+                        .audioChannels(1)
+                        .audioFrequency(24000)
+                        .on('end', function () {
+                        log('wav转换完成');
+                    })
+                        .on('error', function (err) {
+                            log(`wav转换出错: `, err.message,);
+                            reject(err);
+                        })
+                        .save(wavPath)
+                        .on("end", () => {
+                            filePath = wavPath
+                            resolve(wavPath);
+                        });
+                })
+            }
+            let wav: Buffer
+            if (!_isWav) {
+                log(`语音文件${filePath}正在转换成wav`)
+                await convert()
+            } else {
+                wav = fs.readFileSync(filePath)
+                const allowSampleRate = [8000, 12000, 16000, 24000, 32000, 44100, 48000]
+                const {fmt} = getWavFileInfo(wav)
+                // log(`wav文件信息`, fmt)
+                if (!allowSampleRate.includes(fmt.sampleRate)) {
+                    wav = undefined
+                    await convert()
+                }
+            }
+            wav ||= fs.readFileSync(filePath);
+            const silk = await encode(wav, 0);
+            fs.writeFileSync(pttPath, silk.data);
+            fs.unlink(wavPath, (err) => {
+            });
+            // const gDuration = await guessDuration(pttPath)
+            log(`语音文件${filePath}转换成功!`, pttPath, `时长:`, silk.duration)
+            return {
+                converted: true,
+                path: pttPath,
+                duration: silk.duration / 1000
+            };
+        } else {
+            const silk = fs.readFileSync(filePath);
+            let duration = 0;
+            try {
+                duration = getDuration(silk) / 1000
+            } catch (e) {
+                log("获取语音文件时长失败, 使用文件大小推测时长", filePath, e.stack)
+                duration = await guessDuration(filePath);
+            }
+
+            return {
+                converted: false,
+                path: filePath,
+                duration: duration,
+            };
+        }
+    } catch (error) {
+        log("convert silk failed", error.stack);
+        return {};
+    }
+}

src/common/utils/file.ts

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

src/common/utils/helper.ts

@@ -0,0 +1,68 @@
+export function truncateString(obj: any, maxLength = 500) {
+    if (obj !== null && typeof obj === 'object') {
+        Object.keys(obj).forEach(key => {
+            if (typeof obj[key] === 'string') {
+                // 如果是字符串且超过指定长度，则截断
+                if (obj[key].length > maxLength) {
+                    obj[key] = obj[key].substring(0, maxLength) + '...';
+                }
+            } else if (typeof obj[key] === 'object') {
+                // 如果是对象或数组，则递归调用
+                truncateString(obj[key], maxLength);
+            }
+        });
+    }
+    return obj;
+}
+
+export function isNumeric(str: string) {
+    return /^\d+$/.test(str);
+}
+
+export function sleep(ms: number): Promise<void> {
+    return new Promise(resolve => setTimeout(resolve, ms));
+}
+
+// 在保证老对象已有的属性不变化的情况下将新对象的属性复制到老对象
+export function mergeNewProperties(newObj: any, oldObj: any) {
+    Object.keys(newObj).forEach(key => {
+        // 如果老对象不存在当前属性，则直接复制
+        if (!oldObj.hasOwnProperty(key)) {
+            oldObj[key] = newObj[key];
+        } else {
+            // 如果老对象和新对象的当前属性都是对象，则递归合并
+            if (typeof oldObj[key] === 'object' && typeof newObj[key] === 'object') {
+                mergeNewProperties(newObj[key], oldObj[key]);
+            } else if (typeof oldObj[key] === 'object' || typeof newObj[key] === 'object') {
+                // 属性冲突，有一方不是对象，直接覆盖
+                oldObj[key] = newObj[key];
+            }
+        }
+    });
+}
+
+export function isNull(value: any) {
+    return value === undefined || value === null;
+}
+
+/**
+ * 将字符串按最大长度分割并添加换行符
+ * @param str 原始字符串
+ * @param maxLength 每行的最大字符数
+ * @returns 处理后的字符串，超过长度的地方将会换行
+ */
+export function wrapText(str: string, maxLength: number): string {
+    // 初始化一个空字符串用于存放结果
+    let result: string = '';
+
+    // 循环遍历字符串，每次步进maxLength个字符
+    for (let i = 0; i < str.length; i += maxLength) {
+        // 从i开始，截取长度为maxLength的字符串段，并添加到结果字符串
+        // 如果不是第一段，先添加一个换行符
+        if (i > 0) result += '\n';
+        result += str.substring(i, i + maxLength);
+    }
+
+    return result;
+}
+

src/common/utils/index.ts

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

src/common/utils/log.ts

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

src/common/utils/qqlevel.ts

@@ -0,0 +1,7 @@
+// QQ等级换算
+import {QQLevel} from "../../ntqqapi/types";
+
+export function calcQQLevel(level: QQLevel) {
+    const {crownNum, sunNum, moonNum, starNum} = level
+    return crownNum * 64 + sunNum * 16 + moonNum * 4 + starNum
+}

src/common/utils/qqpkg.ts

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

src/common/utils/upgrade.ts

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

src/main/main.ts

@@ -7,11 +7,13 @@ import {
     CHANNEL_ERROR,
     CHANNEL_GET_CONFIG,
     CHANNEL_LOG,
+    CHANNEL_CHECK_VERSION,
     CHANNEL_SELECT_FILE,
     CHANNEL_SET_CONFIG,
+    CHANNEL_UPDATE,
 } from "../common/channels";
 import {ob11WebsocketServer} from "../onebot11/server/ws/WebsocketServer";
-import {checkFfmpeg, DATA_DIR, getConfigUtil, log} from "../common/utils";
+import {DATA_DIR, wrapText} from "../common/utils";
 import {
     friendRequests,
     getFriend,
@@ -19,11 +21,10 @@ import {
     getGroupMember,
     llonebotError,
     refreshGroupMembers,
-    selfInfo
+    selfInfo, uidMaps
 } from "../common/data";
-import {hookNTQQApiCall, hookNTQQApiReceive, ReceiveCmd, registerReceiveHook} from "../ntqqapi/hook";
+import {hookNTQQApiCall, hookNTQQApiReceive, ReceiveCmdS, registerReceiveHook} from "../ntqqapi/hook";
 import {OB11Constructor} from "../onebot11/constructor";
-import {NTQQApi} from "../ntqqapi/ntcall";
 import {ChatType, FriendRequestNotify, GroupNotifies, GroupNotifyTypes, RawMessage} from "../ntqqapi/types";
 import {ob11HTTPServer} from "../onebot11/server/http";
 import {OB11FriendRecallNoticeEvent} from "../onebot11/event/notice/OB11FriendRecallNoticeEvent";
@@ -36,15 +37,30 @@ import {OB11FriendRequestEvent} from "../onebot11/event/request/OB11FriendReques
 import * as path from "node:path";
 import {dbUtil} from "../common/db";
 import {setConfig} from "./setConfig";
+import {NTQQUserApi} from "../ntqqapi/api/user";
+import {NTQQGroupApi} from "../ntqqapi/api/group";
+import {registerPokeHandler} from "../ntqqapi/external/ccpoke";
+import {OB11FriendPokeEvent, OB11GroupPokeEvent} from "../onebot11/event/notice/OB11PokeEvent";
+import {checkNewVersion, upgradeLLOneBot} from "../common/utils/upgrade";
+import {log} from "../common/utils/log";
+import {getConfigUtil} from "../common/config";
+import {checkFfmpeg} from "../common/utils/video";
 
 
 let running = false;
 
+let mainWindow: BrowserWindow | null = null;
 
 // 加载插件时触发
 function onLoad() {
     log("llonebot main onLoad");
+    ipcMain.handle(CHANNEL_CHECK_VERSION, async (event, arg) => {
 
+        return checkNewVersion();
+    });
+    ipcMain.handle(CHANNEL_UPDATE, async (event, arg) => {
+        return upgradeLLOneBot();
+    });
     ipcMain.handle(CHANNEL_SELECT_FILE, async (event, arg) => {
         const selectPath = new Promise<string>((resolve, reject) => {
             dialog
@@ -78,15 +94,39 @@ function onLoad() {
     if (!fs.existsSync(DATA_DIR)) {
         fs.mkdirSync(DATA_DIR, {recursive: true});
     }
-    ipcMain.handle(CHANNEL_ERROR, (event, arg) => {
+    ipcMain.handle(CHANNEL_ERROR, async (event, arg) => {
-        return llonebotError;
+        const ffmpegOk = await checkFfmpeg(getConfigUtil().getConfig().ffmpeg)
+        llonebotError.ffmpegError = ffmpegOk ? "" : "没有找到ffmpeg,音频只能发送wav和silk,视频尺寸可能异常"
+        let {httpServerError, wsServerError, otherError, ffmpegError} = llonebotError;
+        let error = `${otherError}\n${httpServerError}\n${wsServerError}\n${ffmpegError}`
+        error = error.replace("\n\n", "\n")
+        error = error.trim();
+        return error;
     })
     ipcMain.handle(CHANNEL_GET_CONFIG, async (event, arg) => {
         const config = getConfigUtil().getConfig()
         return config;
     })
-    ipcMain.on(CHANNEL_SET_CONFIG, (event, config: Config) => {
+    ipcMain.on(CHANNEL_SET_CONFIG, (event, ask:boolean, config: Config) => {
+        if (!ask){
             setConfig(config).then();
+            return
+        }
+        dialog.showMessageBox(mainWindow, {
+            type: 'question',
+            buttons: ['确认', '取消'],
+            defaultId: 0, // 默认选中的按钮，0 代表第一个按钮，即 "确认"
+            title: '确认保存',
+            message: '是否保存？',
+            detail: 'LLOneBot配置已更改，是否保存？'
+        }).then(result => {
+            if (result.response === 0) {
+                setConfig(config).then();
+            } else {
+            }
+        }).catch(err => {
+            log("保存设置询问弹窗错误", err);
+        });
     })
 
     ipcMain.on(CHANNEL_LOG, (event, arg) => {
@@ -105,11 +145,18 @@ function onLoad() {
             OB11Constructor.message(message).then((msg) => {
                 if (debug) {
                     msg.raw = message;
+                } else {
+                    if (msg.message.length === 0) {
+                        return
+                    }
                 }
                 const isSelfMsg = msg.user_id.toString() == selfInfo.uin
                 if (isSelfMsg && !reportSelfMessage) {
                     return
                 }
+                if (isSelfMsg) {
+                    msg.target_id = parseInt(message.peerUin);
+                }
                 postOB11Event(msg);
                 // log("post msg", msg)
             }).catch(e => log("constructMessage error: ", e.stack.toString()));
@@ -123,14 +170,28 @@ function onLoad() {
     }
 
     async function startReceiveHook() {
-        registerReceiveHook<{ msgList: Array<RawMessage> }>(ReceiveCmd.NEW_MSG, async (payload) => {
+        if (getConfigUtil().getConfig().enablePoke) {
+            registerPokeHandler((id, isGroup) => {
+                log(`收到戳一戳消息了！是否群聊：${isGroup}，id:${id}`)
+                let pokeEvent: OB11FriendPokeEvent | OB11GroupPokeEvent;
+                if (isGroup) {
+                    pokeEvent = new OB11GroupPokeEvent(parseInt(id));
+                } else {
+                    pokeEvent = new OB11FriendPokeEvent(parseInt(id));
+                }
+                postOB11Event(pokeEvent);
+            })
+        }
+        registerReceiveHook<{
+            msgList: Array<RawMessage>
+        }>([ReceiveCmdS.NEW_MSG, ReceiveCmdS.NEW_ACTIVE_MSG], async (payload) => {
             try {
                 await postReceiveMsg(payload.msgList);
             } catch (e) {
                 log("report message error: ", e.stack.toString());
             }
         })
-        registerReceiveHook<{ msgList: Array<RawMessage> }>(ReceiveCmd.UPDATE_MSG, async (payload) => {
+        registerReceiveHook<{ msgList: Array<RawMessage> }>([ReceiveCmdS.UPDATE_MSG], async (payload) => {
             for (const message of payload.msgList) {
                 // log("message update", message.sendStatus, message.msgId, message.msgSeq)
                 if (message.recallTime != "0") { //todo: 这个判断方法不太好，应该使用灰色消息元素来判断
@@ -157,7 +218,6 @@ function onLoad() {
                             parseInt(operatorId),
                             oriMessage.msgShortId
                         )
-
                         postOB11Event(groupRecallEvent);
                     }
                     // 不让入库覆盖原来消息，不然就获取不到撤回的消息内容了
@@ -166,7 +226,7 @@ function onLoad() {
                 dbUtil.updateMsg(message).then();
             }
         })
-        registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmd.SELF_SEND_MSG, async (payload) => {
+        registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmdS.SELF_SEND_MSG, async (payload) => {
             const {reportSelfMessage} = getConfigUtil().getConfig();
             if (!reportSelfMessage) {
                 return
@@ -182,12 +242,12 @@ function onLoad() {
             "doubt": boolean,
             "oldestUnreadSeq": string,
             "unreadCount": number
-        }>(ReceiveCmd.UNREAD_GROUP_NOTIFY, async (payload) => {
+        }>(ReceiveCmdS.UNREAD_GROUP_NOTIFY, async (payload) => {
             if (payload.unreadCount) {
                 // log("开始获取群通知详情")
                 let notify: GroupNotifies;
                 try {
-                    notify = await NTQQApi.getGroupNotifies();
+                    notify = await NTQQGroupApi.getGroupNotifies();
                 } catch (e) {
                     // log("获取群通知详情失败", e);
                     return
@@ -240,7 +300,7 @@ function onLoad() {
                             groupRequestEvent.group_id = parseInt(notify.group.groupCode);
                             let requestQQ = ""
                             try {
-                                requestQQ = (await NTQQApi.getUserDetailInfo(notify.user1.uid)).uin;
+                                requestQQ = (await NTQQUserApi.getUserDetailInfo(notify.user1.uid)).uin;
                             } catch (e) {
                                 log("获取加群人QQ号失败", e)
                             }
@@ -255,7 +315,7 @@ function onLoad() {
                             groupInviteEvent.group_id = parseInt(notify.group.groupCode);
                             let user_id = (await getFriend(notify.user2.uid))?.uin
                             if (!user_id) {
-                                user_id = (await NTQQApi.getUserDetailInfo(notify.user2.uid))?.uin
+                                user_id = (await NTQQUserApi.getUserDetailInfo(notify.user2.uid))?.uin
                             }
                             groupInviteEvent.user_id = parseInt(user_id);
                             groupInviteEvent.sub_type = "invite";
@@ -272,14 +332,14 @@ function onLoad() {
             }
         })
 
-        registerReceiveHook<FriendRequestNotify>(ReceiveCmd.FRIEND_REQUEST, async (payload) => {
+        registerReceiveHook<FriendRequestNotify>(ReceiveCmdS.FRIEND_REQUEST, async (payload) => {
             for (const req of payload.data.buddyReqs) {
                 if (req.isUnread && !friendRequests[req.sourceId] && (parseInt(req.reqTime) > startTime / 1000)) {
                     friendRequests[req.sourceId] = req;
                     log("有新的好友请求", req);
                     let friendRequestEvent = new OB11FriendRequestEvent();
                     try {
-                        let requester = await NTQQApi.getUserDetailInfo(req.friendUid)
+                        let requester = await NTQQUserApi.getUserDetailInfo(req.friendUid)
                         friendRequestEvent.user_id = parseInt(requester.uin);
                     } catch (e) {
                         log("获取加好友者QQ号失败", e);
@@ -296,22 +356,18 @@ function onLoad() {
 
     async function start() {
         log("llonebot pid", process.pid)
+        llonebotError.otherError = "";
         startTime = Date.now();
-        startReceiveHook().then();
+        dbUtil.getReceivedTempUinMap().then(m=>{
-        NTQQApi.getGroups(true).then()
+            for (const [key, value] of Object.entries(m)) {
-        const config = getConfigUtil().getConfig()
+                uidMaps[value] = key;
-        // 检查ffmpeg
-        checkFfmpeg(config.ffmpeg).then(exist => {
-            if (!exist) {
-                llonebotError.ffmpegError = `没有找到ffmpeg,音频只能发送wav和silk`
             }
         })
+        startReceiveHook().then();
+        NTQQGroupApi.getGroups(true).then()
+        const config = getConfigUtil().getConfig()
         if (config.ob11.enableHttp) {
-            try {
             ob11HTTPServer.start(config.ob11.httpPort)
-            } catch (e) {
-                log("http server start failed", e);
-            }
         }
         if (config.ob11.enableWs) {
             ob11WebsocketServer.start(config.ob11.wsPort);
@@ -327,30 +383,35 @@ function onLoad() {
     const init = async () => {
         try {
             log("start get self info")
-            const _ = await NTQQApi.getSelfInfo();
+            const _ = await NTQQUserApi.getSelfInfo();
             log("get self info api result:", _);
             Object.assign(selfInfo, _);
             selfInfo.nick = selfInfo.uin;
         } catch (e) {
             log("retry get self info", e);
+            selfInfo.uin = globalThis.authData?.uin;
+            selfInfo.uid = globalThis.authData?.uid;
+            selfInfo.nick = selfInfo.uin;
         }
-        log("self info", selfInfo);
+        log("self info", selfInfo, globalThis.authData);
         if (selfInfo.uin) {
+            async function getUserNick(){
                 try {
-                const userInfo = (await NTQQApi.getUserDetailInfo(selfInfo.uid));
+                    getSelfNickCount++;
+                    const userInfo = (await NTQQUserApi.getUserDetailInfo(selfInfo.uid));
                     log("self info", userInfo);
                     if (userInfo) {
                         selfInfo.nick = userInfo.nick;
-                } else {
+                        return
-                    getSelfNickCount++;
-                    if (getSelfNickCount < 10) {
-                        return setTimeout(init, 1000);
-                    }
                     }
                 } catch (e) {
-                log("get self nickname failed", e.toString());
+                    log("get self nickname failed", e.stack);
-                return setTimeout(init, 1000);
                 }
+                if (getSelfNickCount < 10) {
+                    return setTimeout(getUserNick, 1000);
+                }
+            }
+            getUserNick().then()
             start().then();
         } else {
             setTimeout(init, 1000)
@@ -365,6 +426,7 @@ function onBrowserWindowCreated(window: BrowserWindow) {
     if (selfInfo.uid) {
         return
     }
+    mainWindow = window;
     log("window create", window.webContents.getURL().toString())
     try {
         hookNTQQApiCall(window);
@@ -380,6 +442,7 @@ try {
     console.log(e.toString())
 }
 
+
 // 这两个函数都是可选的
 export {
     onBrowserWindowCreated

src/main/setConfig.ts

@@ -1,9 +1,10 @@
 import {Config} from "../common/types";
-import {checkFfmpeg, getConfigUtil} from "../common/utils";
 import {ob11HTTPServer} from "../onebot11/server/http";
 import {ob11WebsocketServer} from "../onebot11/server/ws/WebsocketServer";
 import {ob11ReverseWebsockets} from "../onebot11/server/ws/ReverseWebsocket";
 import {llonebotError} from "../common/data";
+import {getConfigUtil} from "../common/config";
+import {checkFfmpeg} from "../common/utils";
 
 export async function setConfig(config: Config) {
     let oldConfig = getConfigUtil().getConfig();
@@ -20,6 +21,7 @@ export async function setConfig(config: Config) {
     // 正向ws端口变化，重启服务
     if (config.ob11.wsPort != oldConfig.ob11.wsPort) {
         ob11WebsocketServer.restart(config.ob11.wsPort);
+        llonebotError.wsServerError = ''
     }
     // 判断是否启用或关闭正向ws
     if (config.ob11.enableWs != oldConfig.ob11.enableWs) {
@@ -50,14 +52,5 @@ export async function setConfig(config: Config) {
             }
         }
     }
-
+    checkFfmpeg(config.ffmpeg).then()
-    // 检查ffmpeg
-    if (config.ffmpeg) {
-        checkFfmpeg(config.ffmpeg).then(success => {
-            if (success) {
-                llonebotError.ffmpegError = ''
-            }
-        })
-    }
-
 }

src/ntqqapi/api/file.ts

@@ -0,0 +1,235 @@
+import {callNTQQApi, GeneralCallResult, NTQQApiClass, NTQQApiMethod} from "../ntcall";
+import {
+    CacheFileList,
+    CacheFileListItem,
+    CacheFileType,
+    CacheScanResult,
+    ChatCacheList,
+    ChatCacheListItemBasic,
+    ChatType,
+    ElementType
+} from "../types";
+import path from "path";
+import fs from "fs";
+import {ReceiveCmdS} from "../hook";
+import {log} from "../../common/utils/log";
+
+export class NTQQFileApi {
+    static async getFileType(filePath: string) {
+        return await callNTQQApi<{ ext: string }>({
+            className: NTQQApiClass.FS_API, methodName: NTQQApiMethod.FILE_TYPE, args: [filePath]
+        })
+    }
+
+    static async getFileMd5(filePath: string) {
+        return await callNTQQApi<string>({
+            className: NTQQApiClass.FS_API,
+            methodName: NTQQApiMethod.FILE_MD5,
+            args: [filePath]
+        })
+    }
+
+    static async copyFile(filePath: string, destPath: string) {
+        return await callNTQQApi<string>({
+            className: NTQQApiClass.FS_API,
+            methodName: NTQQApiMethod.FILE_COPY,
+            args: [{
+                fromPath: filePath,
+                toPath: destPath
+            }]
+        })
+    }
+
+    static async getFileSize(filePath: string) {
+        return await callNTQQApi<number>({
+            className: NTQQApiClass.FS_API, methodName: NTQQApiMethod.FILE_SIZE, args: [filePath]
+        })
+    }
+
+    // 上传文件到QQ的文件夹
+    static async uploadFile(filePath: string, elementType: ElementType = ElementType.PIC) {
+        const md5 = await NTQQFileApi.getFileMd5(filePath);
+        let ext = (await NTQQFileApi.getFileType(filePath))?.ext
+        if (ext) {
+            ext = "." + ext
+        } else {
+            ext = ""
+        }
+        let fileName = `${path.basename(filePath)}`;
+        if (fileName.indexOf(".") === -1) {
+            fileName += ext;
+        }
+        const mediaPath = await callNTQQApi<string>({
+            methodName: NTQQApiMethod.MEDIA_FILE_PATH,
+            args: [{
+                path_info: {
+                    md5HexStr: md5,
+                    fileName: fileName,
+                    elementType: elementType,
+                    elementSubType: 0,
+                    thumbSize: 0,
+                    needCreate: true,
+                    downloadType: 1,
+                    file_uuid: ""
+                }
+            }]
+        })
+        log("media path", mediaPath)
+        await NTQQFileApi.copyFile(filePath, mediaPath);
+        const fileSize = await NTQQFileApi.getFileSize(filePath);
+        return {
+            md5,
+            fileName,
+            path: mediaPath,
+            fileSize
+        }
+    }
+
+    static async downloadMedia(msgId: string, chatType: ChatType, peerUid: string, elementId: string, thumbPath: string, sourcePath: string, isFile: boolean = false) {
+        // 用于下载收到的消息中的图片等
+        if (sourcePath && fs.existsSync(sourcePath)) {
+            return sourcePath
+        }
+        const apiParams = [
+            {
+                getReq: {
+                    fileModelId: "0",
+                    downloadSourceType: 0,
+                    triggerType: 1,
+                    msgId: msgId,
+                    chatType: chatType,
+                    peerUid: peerUid,
+                    elementId: elementId,
+                    thumbSize: 0,
+                    downloadType: 1,
+                    filePath: thumbPath,
+                },
+            },
+            null,
+        ]
+        // log("需要下载media", sourcePath);
+        await callNTQQApi({
+            methodName: NTQQApiMethod.DOWNLOAD_MEDIA,
+            args: apiParams,
+            cbCmd: ReceiveCmdS.MEDIA_DOWNLOAD_COMPLETE,
+            cmdCB: (payload: { notifyInfo: { filePath: string, msgId: string } }) => {
+                log("media 下载完成判断", payload.notifyInfo.msgId, msgId);
+                return payload.notifyInfo.msgId == msgId;
+            }
+        })
+        return sourcePath
+    }
+
+    static async getImageSize(filePath: string) {
+        return await callNTQQApi<{ width: number, height: number }>({
+            className: NTQQApiClass.FS_API, methodName: NTQQApiMethod.IMAGE_SIZE, args: [filePath]
+        })
+    }
+
+}
+
+export class NTQQFileCacheApi {
+    static async setCacheSilentScan(isSilent: boolean = true) {
+        return await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.CACHE_SET_SILENCE,
+            args: [{
+                isSilent
+            }, null]
+        });
+    }
+
+    static getCacheSessionPathList() {
+        return callNTQQApi<{
+            key: string,
+            value: string
+        }[]>({
+            className: NTQQApiClass.OS_API,
+            methodName: NTQQApiMethod.CACHE_PATH_SESSION,
+        });
+    }
+
+    static clearCache(cacheKeys: Array<string> = ['tmp', 'hotUpdate']) {
+        return callNTQQApi<any>({ // TODO: 目前还不知道真正的返回值是什么
+            methodName: NTQQApiMethod.CACHE_CLEAR,
+            args: [{
+                keys: cacheKeys
+            }, null]
+        });
+    }
+
+    static addCacheScannedPaths(pathMap: object = {}) {
+        return callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.CACHE_ADD_SCANNED_PATH,
+            args: [{
+                pathMap: {...pathMap},
+            }, null]
+        });
+    }
+
+    static scanCache() {
+        callNTQQApi<GeneralCallResult>({
+            methodName: ReceiveCmdS.CACHE_SCAN_FINISH,
+            classNameIsRegister: true,
+        }).then();
+        return callNTQQApi<CacheScanResult>({
+            methodName: NTQQApiMethod.CACHE_SCAN,
+            args: [null, null],
+            timeoutSecond: 300,
+        });
+    }
+
+    static getHotUpdateCachePath() {
+        return callNTQQApi<string>({
+            className: NTQQApiClass.HOTUPDATE_API,
+            methodName: NTQQApiMethod.CACHE_PATH_HOT_UPDATE
+        });
+    }
+
+    static getDesktopTmpPath() {
+        return callNTQQApi<string>({
+            className: NTQQApiClass.BUSINESS_API,
+            methodName: NTQQApiMethod.CACHE_PATH_DESKTOP_TEMP
+        });
+    }
+
+    static getChatCacheList(type: ChatType, pageSize: number = 1000, pageIndex: number = 0) {
+        return new Promise<ChatCacheList>((res, rej) => {
+            callNTQQApi<ChatCacheList>({
+                methodName: NTQQApiMethod.CACHE_CHAT_GET,
+                args: [{
+                    chatType: type,
+                    pageSize,
+                    order: 1,
+                    pageIndex
+                }, null]
+            }).then(list => res(list))
+                .catch(e => rej(e));
+        });
+    }
+
+    static getFileCacheInfo(fileType: CacheFileType, pageSize: number = 1000, lastRecord?: CacheFileListItem) {
+        const _lastRecord = lastRecord ? lastRecord : {fileType: fileType};
+
+        return callNTQQApi<CacheFileList>({
+            methodName: NTQQApiMethod.CACHE_FILE_GET,
+            args: [{
+                fileType: fileType,
+                restart: true,
+                pageSize: pageSize,
+                order: 1,
+                lastRecord: _lastRecord,
+            }, null]
+        })
+    }
+
+    static async clearChatCache(chats: ChatCacheListItemBasic[] = [], fileKeys: string[] = []) {
+        return await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.CACHE_CHAT_CLEAR,
+            args: [{
+                chats,
+                fileKeys
+            }, null]
+        });
+    }
+
+}

src/ntqqapi/api/friend.ts

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

src/ntqqapi/api/group.ts

@@ -0,0 +1,205 @@
+import {ReceiveCmdS} from "../hook";
+import {Group, GroupMember, GroupMemberRole, GroupNotifies, GroupNotify, GroupRequestOperateTypes} from "../types";
+import {callNTQQApi, GeneralCallResult, NTQQApiClass, NTQQApiMethod} from "../ntcall";
+import {uidMaps} from "../../common/data";
+import {dbUtil} from "../../common/db";
+import {log} from "../../common/utils/log";
+import {NTQQWindowApi, NTQQWindows} from "./window";
+
+export class NTQQGroupApi{
+    static async getGroups(forced = false) {
+        let cbCmd = ReceiveCmdS.GROUPS
+        if (process.platform != "win32") {
+            cbCmd = ReceiveCmdS.GROUPS_UNIX
+        }
+        const result = await callNTQQApi<{
+            updateType: number,
+            groupList: Group[]
+        }>({methodName: NTQQApiMethod.GROUPS, args: [{force_update: forced}, undefined], cbCmd})
+        return result.groupList
+    }
+    static async getGroupMembers(groupQQ: string, num = 3000): Promise<GroupMember[]> {
+        const sceneId = await callNTQQApi({
+            methodName: NTQQApiMethod.GROUP_MEMBER_SCENE,
+            args: [{
+                groupCode: groupQQ,
+                scene: "groupMemberList_MainWindow"
+            }]
+        })
+        // log("get group member sceneId", sceneId);
+        try {
+            const result = await callNTQQApi<{
+                result: { infos: any }
+            }>({
+                methodName: NTQQApiMethod.GROUP_MEMBERS,
+                args: [{
+                    sceneId: sceneId,
+                    num: num
+                },
+                    null
+                ]
+            })
+            // log("members info", typeof result.result.infos, Object.keys(result.result.infos))
+            const values = result.result.infos.values()
+
+            const members: GroupMember[] = Array.from(values)
+            for (const member of members) {
+                uidMaps[member.uid] = member.uin;
+            }
+            // log(uidMaps);
+            // log("members info", values);
+            log(`get group ${groupQQ} members success`)
+            return members
+        } catch (e) {
+            log(`get group ${groupQQ} members failed`, e)
+            return []
+        }
+    }
+    static async getGroupNotifies() {
+        // 获取管理员变更
+        // 加群通知，退出通知，需要管理员权限
+        callNTQQApi<GeneralCallResult>({
+            methodName: ReceiveCmdS.GROUP_NOTIFY,
+            classNameIsRegister: true,
+        }).then()
+        return await callNTQQApi<GroupNotifies>({
+            methodName: NTQQApiMethod.GET_GROUP_NOTICE,
+            cbCmd: ReceiveCmdS.GROUP_NOTIFY,
+            afterFirstCmd: false,
+            args: [
+                {"doubt": false, "startSeq": "", "number": 14},
+                null
+            ]
+        });
+    }
+    static async getGroupIgnoreNotifies() {
+        await NTQQGroupApi.getGroupNotifies();
+        return await NTQQWindowApi.openWindow(NTQQWindows.GroupNotifyFilterWindow,[], ReceiveCmdS.GROUP_NOTIFY);
+    }
+    static async handleGroupRequest(seq: string, operateType: GroupRequestOperateTypes, reason?: string) {
+        const notify: GroupNotify = await dbUtil.getGroupNotify(seq)
+        if (!notify) {
+            throw `${seq}对应的加群通知不存在`
+        }
+        // delete groupNotifies[seq];
+        return await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.HANDLE_GROUP_REQUEST,
+            args: [
+                {
+                    "doubt": false,
+                    "operateMsg": {
+                        "operateType": operateType, // 2 拒绝
+                        "targetMsg": {
+                            "seq": seq,  // 通知序列号
+                            "type": notify.type,
+                            "groupCode": notify.group.groupCode,
+                            "postscript": reason
+                        }
+                    }
+                },
+                null
+            ]
+        });
+    }
+    static async quitGroup(groupQQ: string) {
+        await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.QUIT_GROUP,
+            args: [
+                {"groupCode": groupQQ},
+                null
+            ]
+        })
+    }
+    static async kickMember(groupQQ: string, kickUids: string[], refuseForever: boolean = false, kickReason: string = '') {
+        return await callNTQQApi<GeneralCallResult>(
+            {
+                methodName: NTQQApiMethod.KICK_MEMBER,
+                args: [
+                    {
+                        groupCode: groupQQ,
+                        kickUids,
+                        refuseForever,
+                        kickReason,
+                    }
+                ]
+            }
+        )
+    }
+    static async banMember(groupQQ: string, memList: Array<{ uid: string, timeStamp: number }>) {
+        // timeStamp为秒数, 0为解除禁言
+        return await callNTQQApi<GeneralCallResult>(
+            {
+                methodName: NTQQApiMethod.MUTE_MEMBER,
+                args: [
+                    {
+                        groupCode: groupQQ,
+                        memList,
+                    }
+                ]
+            }
+        )
+    }
+    static async banGroup(groupQQ: string, shutUp: boolean) {
+        return await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.MUTE_GROUP,
+            args: [
+                {
+                    groupCode: groupQQ,
+                    shutUp
+                }, null
+            ]
+        })
+    }
+    static async setMemberCard(groupQQ: string, memberUid: string, cardName: string) {
+        return await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.SET_MEMBER_CARD,
+            args: [
+                {
+                    groupCode: groupQQ,
+                    uid: memberUid,
+                    cardName
+                }, null
+            ]
+        })
+    }
+    static async setMemberRole(groupQQ: string, memberUid: string, role: GroupMemberRole) {
+        return await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.SET_MEMBER_ROLE,
+            args: [
+                {
+                    groupCode: groupQQ,
+                    uid: memberUid,
+                    role
+                }, null
+            ]
+        })
+    }
+    static async setGroupName(groupQQ: string, groupName: string) {
+        return await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.SET_GROUP_NAME,
+            args: [
+                {
+                    groupCode: groupQQ,
+                    groupName
+                }, null
+            ]
+        })
+    }
+
+    // 头衔不可用
+    static async setGroupTitle(groupQQ: string, uid: string, title: string) {
+        return await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.SET_GROUP_TITLE,
+            args: [
+                {
+                    groupCode: groupQQ,
+                    uid,
+                    title
+                }, null
+            ]
+        })
+    }
+    static publishGroupBulletin(groupQQ: string, title: string, content: string) {
+
+    }
+}

src/ntqqapi/api/index.ts

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

src/ntqqapi/api/msg.ts

@@ -0,0 +1,200 @@
+import {callNTQQApi, GeneralCallResult, NTQQApiMethod} from "../ntcall";
+import {ChatType, RawMessage, SendMessageElement} from "../types";
+import {dbUtil} from "../../common/db";
+import {selfInfo} from "../../common/data";
+import {ReceiveCmdS, registerReceiveHook} from "../hook";
+import {log} from "../../common/utils/log";
+import {sleep} from "../../common/utils/helper";
+import {isQQ998} from "../../common/utils";
+
+export let sendMessagePool: Record<string, ((sendSuccessMsg: RawMessage) => void) | null> = {}// peerUid: callbackFunnc
+
+export interface Peer {
+    chatType: ChatType
+    peerUid: string  // 如果是群聊uid为群号，私聊uid就是加密的字符串
+    guildId?: ""
+}
+
+export class NTQQMsgApi {
+    static async activateGroupChat(groupCode: string) {
+        // await this.fetchRecentContact();
+        // await sleep(500);
+        return await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.ADD_ACTIVE_CHAT,
+            args: [{peer:{peerUid: groupCode, chatType: ChatType.group}, cnt: 20}, null]
+        })
+    }
+    static async getMsgHistory(peer: Peer, msgId: string, count: number) {
+        return await callNTQQApi<GeneralCallResult & {msgList: RawMessage[]}>({
+            methodName: isQQ998 ? NTQQApiMethod.HISTORY_MSG_998 : NTQQApiMethod.HISTORY_MSG,
+            args: [{
+                peer,
+                msgId,
+                cnt: count,
+                queryOrder: true,
+            }, null]
+        })
+    }
+    static async fetchRecentContact(){
+        await callNTQQApi({
+            methodName: NTQQApiMethod.RECENT_CONTACT,
+            args: [
+                {
+                    fetchParam: {
+                        anchorPointContact: {
+                            contactId: '',
+                            sortField: '',
+                            pos: 0,
+                        },
+                        relativeMoveCount: 0,
+                        listType: 2,  // 1普通消息，2群助手内的消息
+                        count: 200,
+                        fetchOld: true,
+                    },
+                }
+            ]
+        })
+    }
+
+    static async recallMsg(peer: Peer, msgIds: string[]) {
+        return await callNTQQApi({
+            methodName: NTQQApiMethod.RECALL_MSG,
+            args: [{
+                peer,
+                msgIds
+            }, null]
+        })
+    }
+
+    static async sendMsg(peer: Peer, msgElements: SendMessageElement[],
+                         waitComplete = true, timeout = 10000) {
+        const peerUid = peer.peerUid
+
+        // 等待上一个相同的peer发送完
+        let checkLastSendUsingTime = 0;
+        const waitLastSend = async () => {
+            if (checkLastSendUsingTime > timeout) {
+                throw ("发送超时")
+            }
+            let lastSending = sendMessagePool[peer.peerUid]
+            if (lastSending) {
+                // log("有正在发送的消息，等待中...")
+                await sleep(500);
+                checkLastSendUsingTime += 500;
+                return await waitLastSend();
+            } else {
+                return;
+            }
+        }
+        await waitLastSend();
+
+        let sentMessage: RawMessage = null;
+        sendMessagePool[peerUid] = async (rawMessage: RawMessage) => {
+            delete sendMessagePool[peerUid];
+            sentMessage = rawMessage;
+        }
+
+        let checkSendCompleteUsingTime = 0;
+        const checkSendComplete = async (): Promise<RawMessage> => {
+            if (sentMessage) {
+                if (waitComplete) {
+                    if ((await dbUtil.getMsgByLongId(sentMessage.msgId)).sendStatus == 2) {
+                        return sentMessage
+                    }
+                } else {
+                    return sentMessage
+                }
+                // log(`给${peerUid}发送消息成功`)
+            }
+            checkSendCompleteUsingTime += 500
+            if (checkSendCompleteUsingTime > timeout) {
+                throw ('发送超时')
+            }
+            await sleep(500)
+            return await checkSendComplete()
+        }
+
+        callNTQQApi({
+            methodName: NTQQApiMethod.SEND_MSG,
+            args: [{
+                msgId: "0",
+                peer, msgElements,
+                msgAttributeInfos: new Map(),
+            }, null]
+        }).then()
+        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}
+        })
+        const apiArgs = [
+            {
+                msgInfos,
+                srcContact: srcPeer,
+                dstContact: destPeer,
+                commentElements: [],
+                msgAttributeInfos: new Map()
+            },
+            null,
+        ]
+        return await new Promise<RawMessage>((resolve, reject) => {
+            let complete = false
+            setTimeout(() => {
+                if (!complete) {
+                    reject("转发消息超时");
+                }
+            }, 5000)
+            registerReceiveHook(ReceiveCmdS.SELF_SEND_MSG, async (payload: { msgRecord: RawMessage }) => {
+                const msg = payload.msgRecord
+                // 需要判断它是转发的消息，并且识别到是当前转发的这一条
+                const arkElement = msg.elements.find(ele => ele.arkElement)
+                if (!arkElement) {
+                    // log("收到的不是转发消息")
+                    return
+                }
+                const forwardData: any = JSON.parse(arkElement.arkElement.bytesData)
+                if (forwardData.app != 'com.tencent.multimsg') {
+                    return
+                }
+                if (msg.peerUid == destPeer.peerUid && msg.senderUid == selfInfo.uid) {
+                    complete = true
+                    await dbUtil.addMsg(msg)
+                    resolve(msg)
+                    log('转发消息成功：', payload)
+                }
+            })
+            callNTQQApi<GeneralCallResult>({
+                methodName: NTQQApiMethod.MULTI_FORWARD_MSG,
+                args: apiArgs
+            }).then(result => {
+                log("转发消息结果:", result, apiArgs)
+                if (result.result !== 0) {
+                    complete = true;
+                    reject("转发消息失败," + JSON.stringify(result));
+                }
+            })
+        })
+    }
+
+
+}

src/ntqqapi/api/user.ts

@@ -0,0 +1,103 @@
+import {callNTQQApi, GeneralCallResult, NTQQApiClass, NTQQApiMethod} from "../ntcall";
+import {SelfInfo, User} from "../types";
+import {ReceiveCmdS} from "../hook";
+import {uidMaps} from "../../common/data";
+import {NTQQWindowApi, NTQQWindows} from "./window";
+
+
+export class NTQQUserApi{
+    static async setQQAvatar(filePath: string) {
+        return await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.SET_QQ_AVATAR,
+            args: [{
+                path:filePath
+            }, null],
+            timeoutSecond: 10 // 10秒不一定够
+        });
+    }
+
+    static async getSelfInfo() {
+        return await callNTQQApi<SelfInfo>({
+            className: NTQQApiClass.GLOBAL_DATA,
+            methodName: NTQQApiMethod.SELF_INFO, timeoutSecond: 2
+        })
+    }
+    static async getUserInfo(uid: string) {
+        const result = await callNTQQApi<{ profiles: Map<string, User> }>({
+            methodName: NTQQApiMethod.USER_INFO,
+            args: [{force: true, uids: [uid]}, undefined],
+            cbCmd: ReceiveCmdS.USER_INFO
+        })
+        return result.profiles.get(uid)
+    }
+    static async getUserDetailInfo(uid: string) {
+        const result = await callNTQQApi<{ info: User }>({
+            methodName: NTQQApiMethod.USER_DETAIL_INFO,
+            cbCmd: ReceiveCmdS.USER_DETAIL_INFO,
+            afterFirstCmd: false,
+            cmdCB: (payload) => {
+                const success = payload.info.uid == uid
+                // log("get user detail info", success, uid, payload)
+                return success
+            },
+            args: [
+                {
+                    uid
+                },
+                null
+            ]
+        })
+        const info = result.info
+        if (info?.uin) {
+            uidMaps[info.uid] = info.uin
+        }
+        return info
+    }
+
+    static async getPSkey() {
+        return await callNTQQApi<string>({
+            className: NTQQApiClass.GROUP_HOME_WORK,
+            methodName: NTQQApiMethod.UPDATE_SKEY,
+            args: [
+                {
+                    domain: "qun.qq.com"
+                }
+            ]
+        })
+    }
+    static async getSkey(groupName: string, groupCode: string): Promise<{data: string}> {
+        return await NTQQWindowApi.openWindow<{data: string}>(NTQQWindows.GroupHomeWorkWindow, [{
+            groupName,
+            groupCode,
+            "source": "funcbar"
+        }], ReceiveCmdS.SKEY_UPDATE, 1);
+        // return await callNTQQApi<string>({
+        //     className: NTQQApiClass.GROUP_HOME_WORK,
+        //     methodName: NTQQApiMethod.UPDATE_SKEY,
+        //     args: [
+        //         {
+        //             domain: "qun.qq.com"
+        //         }
+        //     ]
+        // })
+        // return await callNTQQApi<GeneralCallResult>({
+        //     methodName: NTQQApiMethod.GET_SKEY,
+        //     args: [
+        //         {
+        //             "domains": [
+        //                 "qzone.qq.com",
+        //                 "qlive.qq.com",
+        //                 "qun.qq.com",
+        //                 "gamecenter.qq.com",
+        //                 "vip.qq.com",
+        //                 "qianbao.qq.com",
+        //                 "qidian.qq.com"
+        //             ],
+        //             "isForNewPCQQ": false
+        //         },
+        //         null
+        //     ]
+        // })
+    }
+
+}

src/ntqqapi/api/webapi.ts

@@ -0,0 +1,86 @@
+import {groups} from "../../common/data";
+import {log} from "../../common/utils";
+import {NTQQUserApi} from "./user";
+
+export class WebApi{
+    private static bkn: string;
+    private static skey: string;
+    private static pskey: string;
+    private static cookie: string
+    private defaultHeaders: Record<string,string> = {
+        "User-Agent": "QQ/8.9.28.635 CFNetwork/1312 Darwin/21.0.0"
+    }
+
+    constructor() {
+
+    }
+
+    public async addGroupDigest(groupCode: string, msgSeq: string){
+        const url = `https://qun.qq.com/cgi-bin/group_digest/cancel_digest?random=665&X-CROSS-ORIGIN=fetch&group_code=${groupCode}&msg_seq=${msgSeq}&msg_random=444021292`
+        const res = await this.request(url)
+        return await res.json()
+    }
+
+    public async getGroupDigest(groupCode: string){
+        const url = `https://qun.qq.com/cgi-bin/group_digest/digest_list?random=665&X-CROSS-ORIGIN=fetch&group_code=${groupCode}&page_start=0&page_limit=20`
+        const res = await this.request(url)
+        log(res.headers)
+        return await res.json()
+    }
+
+    private genBkn(sKey: string){
+        sKey = sKey || "";
+        let hash = 5381;
+
+        for (let i = 0; i < sKey.length; i++) {
+            const code = sKey.charCodeAt(i);
+            hash = hash + (hash << 5) + code;
+        }
+
+        return (hash & 0x7FFFFFFF).toString();
+    }
+    private async init(){
+        if (!WebApi.bkn) {
+            const group = groups[0];
+            WebApi.skey = (await NTQQUserApi.getSkey(group.groupName, group.groupCode)).data;
+            WebApi.bkn = this.genBkn(WebApi.skey);
+            let cookie = await NTQQUserApi.getPSkey();
+            const pskeyRegex = /p_skey=([^;]+)/;
+            const match = cookie.match(pskeyRegex);
+            const pskeyValue = match ? match[1] : null;
+            WebApi.pskey = pskeyValue;
+            if (cookie.indexOf("skey=;") !== -1) {
+                cookie = cookie.replace("skey=;", `skey=${WebApi.skey};`);
+            }
+            WebApi.cookie = cookie;
+            // for(const kv of WebApi.cookie.split(";")){
+            //     const [key, value] = kv.split("=");
+            // }
+            //     log("set cookie", key, value)
+            //     await session.defaultSession.cookies.set({
+            //         url: 'https://qun.qq.com', // 你要请求的域名
+            //         name: key.trim(),
+            //         value: value.trim(),
+            //         expirationDate: Date.now() / 1000 + 300000, // Cookie 过期时间，例如设置为当前时间之后的300秒
+            //     });
+            // }
+        }
+    }
+
+    private async request(url: string, method: "GET" | "POST" = "GET", headers: Record<string, string> = {}){
+
+        await this.init();
+        url += "&bkn=" + WebApi.bkn;
+        let _headers: Record<string, string> = {
+            ...this.defaultHeaders, ...headers,
+            "Cookie": WebApi.cookie,
+            credentials: 'include'
+        }
+        log("request", url, _headers)
+        const options = {
+            method: method,
+            headers: _headers
+        }
+        return fetch(url, options)
+    }
+}

src/ntqqapi/api/window.ts

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

src/ntqqapi/constructor.ts

@@ -11,10 +11,13 @@ import {
     SendTextElement,
     SendVideoElement
 } from "./types";
-import {NTQQApi} from "./ntcall";
-import {calculateFileMD5, encodeSilk, getVideoInfo, isGIF, log, sleep} from "../common/utils";
 import {promises as fs} from "node:fs";
 import ffmpeg from "fluent-ffmpeg"
+import {NTQQFileApi} from "./api/file";
+import {calculateFileMD5, isGIF} from "../common/utils/file";
+import {log} from "../common/utils/log";
+import {defaultVideoThumb, getVideoInfo} from "../common/utils/video";
+import {encodeSilk} from "../common/utils/audio";
 
 
 export class SendMsgElementConstructor {
@@ -59,12 +62,12 @@ export class SendMsgElementConstructor {
         }
     }
 
-    static async pic(picPath: string): Promise<SendPicElement> {
+    static async pic(picPath: string, summary: string = ""): Promise<SendPicElement> {
-        const {md5, fileName, path, fileSize} = await NTQQApi.uploadFile(picPath, ElementType.PIC);
+        const {md5, fileName, path, fileSize} = await NTQQFileApi.uploadFile(picPath, ElementType.PIC);
         if (fileSize === 0) {
             throw "文件异常，大小为0";
         }
-        const imageSize = await NTQQApi.getImageSize(picPath);
+        const imageSize = await NTQQFileApi.getImageSize(picPath);
         const picElement = {
             md5HexStr: md5,
             fileSize: fileSize,
@@ -78,7 +81,7 @@ export class SendMsgElementConstructor {
             fileUuid: "",
             fileSubId: "",
             thumbFileSize: 0,
-            summary: "",
+            summary,
         };
 
         return {
@@ -89,7 +92,7 @@ export class SendMsgElementConstructor {
     }
 
     static async file(filePath: string, fileName: string = ""): Promise<SendFileElement> {
-        const {md5, fileName: _fileName, path, fileSize} = await NTQQApi.uploadFile(filePath, ElementType.FILE);
+        const {md5, fileName: _fileName, path, fileSize} = await NTQQFileApi.uploadFile(filePath, ElementType.FILE);
         if (fileSize === 0) {
             throw "文件异常，大小为0";
         }
@@ -106,29 +109,45 @@ export class SendMsgElementConstructor {
         return element;
     }
 
-    static async video(filePath: string, fileName: string = ""): Promise<SendVideoElement> {
+    static async video(filePath: string, fileName: string = "", diyThumbPath: string = ""): Promise<SendVideoElement> {
-        let {fileName: _fileName, path, fileSize, md5} = await NTQQApi.uploadFile(filePath, ElementType.VIDEO);
+        let {fileName: _fileName, path, fileSize, md5} = await NTQQFileApi.uploadFile(filePath, ElementType.VIDEO);
         if (fileSize === 0) {
             throw "文件异常，大小为0";
         }
-        // const videoInfo = await encodeMp4(path);
-        // path = videoInfo.filePath
-        // md5 = videoInfo.md5;
-        // fileSize = videoInfo.size;
-        // log("上传视频", md5, path, fileSize, fileName || _fileName)
         const pathLib = require("path");
         let thumb = path.replace(`${pathLib.sep}Ori${pathLib.sep}`, `${pathLib.sep}Thumb${pathLib.sep}`)
         thumb = pathLib.dirname(thumb)
         // log("thumb 目录", thumb)
-        const videoInfo = await getVideoInfo(path);
+        let videoInfo ={
+            width: 1920, height: 1080,
+            time: 15,
+            format: "mp4",
+            size: fileSize,
+            filePath
+        };
+        try {
+            videoInfo = await getVideoInfo(path);
             log("视频信息", videoInfo)
+        }catch (e) {
+            log("获取视频信息失败", e)
+        }
         const createThumb = new Promise<string>((resolve, reject) => {
             const thumbFileName = `${md5}_0.png`
+            const thumbPath = pathLib.join(thumb, thumbFileName)
             ffmpeg(filePath)
                 .on("end", () => {
                 })
                 .on("error", (err) => {
-                    reject(err);
+                    log("获取视频封面失败，使用默认封面", err)
+                    if (diyThumbPath) {
+                        fs.copyFile(diyThumbPath, thumbPath).then(() => {
+                            resolve(thumbPath);
+                        }).catch(reject)
+                    } else {
+                        fs.writeFile(thumbPath, defaultVideoThumb).then(() => {
+                            resolve(thumbPath);
+                        }).catch(reject)
+                    }
                 })
                 .screenshots({
                     timestamps: [0],
@@ -136,7 +155,7 @@ export class SendMsgElementConstructor {
                     folder: thumb,
                     size: videoInfo.width + "x" + videoInfo.height
                 }).on("end", () => {
-                    resolve(pathLib.join(thumb, thumbFileName));
+                resolve(thumbPath);
             });
         })
         let thumbPath = new Map()
@@ -177,7 +196,7 @@ export class SendMsgElementConstructor {
     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);
+        const {md5, fileName, path, fileSize} = await NTQQFileApi.uploadFile(silkPath, ElementType.PTT);
         if (fileSize === 0) {
             throw "文件异常，大小为0";
         }
@@ -193,7 +212,7 @@ export class SendMsgElementConstructor {
                 md5HexStr: md5,
                 fileSize: fileSize,
                 // duration: Math.max(1, Math.round(fileSize / 1024 / 3)), // 一秒钟大概是3kb大小, 小于1秒的按1秒算
-                duration: duration / 1000,
+                duration: duration,
                 formatType: 1,
                 voiceType: 1,
                 voiceChangeType: 0,
@@ -223,7 +242,11 @@ export class SendMsgElementConstructor {
         return {
             elementType: ElementType.ARK,
             elementId: "",
-            arkElement: data
+            arkElement: {
+                bytesData: data,
+                linkInfo: null,
+                subElementType: null
+            }
         }
     }
 }

src/ntqqapi/external/ccpoke/index.ts

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

src/ntqqapi/hook.ts

@@ -1,36 +1,45 @@
 import {BrowserWindow} from 'electron';
-import {getConfigUtil, log, sleep} from "../common/utils";
+import {NTQQApiClass} from "./ntcall";
-import {NTQQApi, NTQQApiClass, sendMessagePool} from "./ntcall";
+import {NTQQMsgApi, sendMessagePool} from "./api/msg"
-import {Group, RawMessage, User} from "./types";
+import {ChatType, Group, GroupMember, RawMessage, User} from "./types";
-import {friends, groups, selfInfo, tempGroupCodeMap} from "../common/data";
+import {friends, groups, selfInfo, tempGroupCodeMap, uidMaps} 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 {getConfigUtil, HOOK_LOG} from "../common/config";
 import fs from "fs";
 import {dbUtil} from "../common/db";
+import {NTQQGroupApi} from "./api/group";
+import {log} from "../common/utils/log";
+import {sleep} from "../common/utils/helper";
+import {OB11GroupCardEvent} from "../onebot11/event/notice/OB11GroupCardEvent";
 
 export let hookApiCallbacks: Record<string, (apiReturn: any) => void> = {}
 
-export enum ReceiveCmd {
+export let ReceiveCmdS = {
-    UPDATE_MSG = "nodeIKernelMsgListener/onMsgInfoListUpdate",
+    UPDATE_MSG: "nodeIKernelMsgListener/onMsgInfoListUpdate",
-    NEW_MSG = "nodeIKernelMsgListener/onRecvMsg",
+    UPDATE_ACTIVE_MSG: "nodeIKernelMsgListener/onActiveMsgInfoUpdate",
-    SELF_SEND_MSG = "nodeIKernelMsgListener/onAddSendMsg",
+    NEW_MSG: `nodeIKernelMsgListener/onRecvMsg`,
-    USER_INFO = "nodeIKernelProfileListener/onProfileSimpleChanged",
+    NEW_ACTIVE_MSG: `nodeIKernelMsgListener/onRecvActiveMsg`,
-    USER_DETAIL_INFO = "nodeIKernelProfileListener/onProfileDetailInfoChanged",
+    SELF_SEND_MSG: "nodeIKernelMsgListener/onAddSendMsg",
-    GROUPS = "nodeIKernelGroupListener/onGroupListUpdate",
+    USER_INFO: "nodeIKernelProfileListener/onProfileSimpleChanged",
-    GROUPS_UNIX = "onGroupListUpdate",
+    USER_DETAIL_INFO: "nodeIKernelProfileListener/onProfileDetailInfoChanged",
-    FRIENDS = "onBuddyListChange",
+    GROUPS: "nodeIKernelGroupListener/onGroupListUpdate",
-    MEDIA_DOWNLOAD_COMPLETE = "nodeIKernelMsgListener/onRichMediaDownloadComplete",
+    GROUPS_UNIX: "onGroupListUpdate",
-    UNREAD_GROUP_NOTIFY = "nodeIKernelGroupListener/onGroupNotifiesUnreadCountUpdated",
+    GROUP_MEMBER_INFO_UPDATE: "nodeIKernelGroupListener/onMemberInfoChange",
-    GROUP_NOTIFY = "nodeIKernelGroupListener/onGroupSingleScreenNotifies",
+    FRIENDS: "onBuddyListChange",
-    FRIEND_REQUEST = "nodeIKernelBuddyListener/onBuddyReqChange",
+    MEDIA_DOWNLOAD_COMPLETE: "nodeIKernelMsgListener/onRichMediaDownloadComplete",
-    SELF_STATUS = 'nodeIKernelProfileListener/onSelfStatusChanged',
+    UNREAD_GROUP_NOTIFY: "nodeIKernelGroupListener/onGroupNotifiesUnreadCountUpdated",
-    CACHE_SCAN_FINISH = "nodeIKernelStorageCleanListener/onFinishScan",
+    GROUP_NOTIFY: "nodeIKernelGroupListener/onGroupSingleScreenNotifies",
-    MEDIA_UPLOAD_COMPLETE = "nodeIKernelMsgListener/onRichMediaUploadComplete",
+    FRIEND_REQUEST: "nodeIKernelBuddyListener/onBuddyReqChange",
+    SELF_STATUS: 'nodeIKernelProfileListener/onSelfStatusChanged',
+    CACHE_SCAN_FINISH: "nodeIKernelStorageCleanListener/onFinishScan",
+    MEDIA_UPLOAD_COMPLETE: "nodeIKernelMsgListener/onRichMediaUploadComplete",
+    SKEY_UPDATE: "onSkeyUpdate"
 }
 
+export type ReceiveCmd = typeof ReceiveCmdS[keyof typeof ReceiveCmdS]
+
 interface NTQQApiReturnData<PayloadType = unknown> extends Array<any> {
     0: {
         "type": "request",
@@ -46,7 +55,7 @@ interface NTQQApiReturnData<PayloadType = unknown> extends Array<any> {
 }
 
 let receiveHooks: Array<{
-    method: ReceiveCmd,
+    method: ReceiveCmd[],
     hookFunc: ((payload: any) => void | Promise<void>)
     id: string
 }> = []
@@ -54,13 +63,27 @@ let receiveHooks: Array<{
 export function hookNTQQApiReceive(window: BrowserWindow) {
     const originalSend = window.webContents.send;
     const patchSend = (channel: string, ...args: NTQQApiReturnData) => {
-        HOOK_LOG && log(`received ntqq api message: ${channel}`, JSON.stringify(args))
+        // console.log("hookNTQQApiReceive", channel, args)
+        let isLogger = false
+        try {
+            isLogger = args[0]?.eventName?.startsWith("ns-LoggerApi")
+        } catch (e) {
+
+        }
+        if (!isLogger) {
+            try {
+                HOOK_LOG && log(`received ntqq api message: ${channel}`, args)
+            }catch (e) {
+                log("hook log error", e, args)
+            }
+        }
+        try {
             if (args?.[1] instanceof Array) {
                 for (let receiveData of args?.[1]) {
                     const ntQQApiMethodName = receiveData.cmdName;
                     // log(`received ntqq api message: ${channel} ${ntQQApiMethodName}`, JSON.stringify(receiveData))
                     for (let hook of receiveHooks) {
-                    if (hook.method === ntQQApiMethodName) {
+                        if (hook.method.includes(ntQQApiMethodName)) {
                             new Promise((resolve, reject) => {
                                 try {
                                     let _ = hook.hookFunc(receiveData.payload)
@@ -86,7 +109,10 @@ export function hookNTQQApiReceive(window: BrowserWindow) {
                     delete hookApiCallbacks[callbackId];
                 }
             }
-        return originalSend.call(window.webContents, channel, ...args);
+        }catch (e) {
+            log("hookNTQQApiReceive error", e.stack.toString(), args)
+        }
+        originalSend.call(window.webContents, channel, ...args);
     }
     window.webContents.send = patchSend;
 }
@@ -98,7 +124,20 @@ export function hookNTQQApiCall(window: BrowserWindow) {
 
     const proxyIpcMsg = new Proxy(ipc_message_proxy, {
         apply(target, thisArg, args) {
+            // console.log(thisArg, args);
+            let isLogger = false
+            try {
+                isLogger = args[3][0].eventName.startsWith("ns-LoggerApi")
+            } catch (e) {
+
+            }
+            if (!isLogger) {
+                try{
                     HOOK_LOG && log("call NTQQ api", thisArg, args);
+                }catch (e) {
+                    
+                }
+            }
             return target.apply(thisArg, args);
         },
     });
@@ -107,10 +146,38 @@ export function hookNTQQApiCall(window: BrowserWindow) {
     } else {
         webContents._events["-ipc-message"] = proxyIpcMsg;
     }
+
+    const ipc_invoke_proxy = webContents._events["-ipc-invoke"]?.[0] || webContents._events["-ipc-invoke"];
+    const proxyIpcInvoke = new Proxy(ipc_invoke_proxy, {
+        apply(target, thisArg, args) {
+            // console.log(args);
+            HOOK_LOG && log("call NTQQ invoke api", thisArg, args)
+            args[0]["_replyChannel"]["sendReply"] = new Proxy(args[0]["_replyChannel"]["sendReply"], {
+                apply(sendtarget, sendthisArg, sendargs) {
+                    sendtarget.apply(sendthisArg, sendargs);
+                }
+            });
+            let ret = target.apply(thisArg, args);
+            try {
+                HOOK_LOG && log("call NTQQ invoke api return", ret)
+            }catch (e) {
+                
+            }
+            return ret;
+        }
+    });
+    if (webContents._events["-ipc-invoke"]?.[0]) {
+        webContents._events["-ipc-invoke"][0] = proxyIpcInvoke;
+    } else {
+        webContents._events["-ipc-invoke"] = proxyIpcInvoke;
+    }
 }
 
-export function registerReceiveHook<PayloadType>(method: ReceiveCmd, hookFunc: (payload: PayloadType) => void): string {
+export function registerReceiveHook<PayloadType>(method: ReceiveCmd | ReceiveCmd[], hookFunc: (payload: PayloadType) => void): string {
     const id = uuidv4()
+    if (!Array.isArray(method)) {
+        method = [method]
+    }
     receiveHooks.push({
         method,
         hookFunc,
@@ -124,8 +191,20 @@ export function removeReceiveHook(id: string) {
     receiveHooks.splice(index, 1);
 }
 
+let activatedGroups: string[] = [];
 async function updateGroups(_groups: Group[], needUpdate: boolean = true) {
     for (let group of _groups) {
+        log("update group", group)
+        if (!activatedGroups.includes(group.groupCode)) {
+            NTQQMsgApi.activateGroupChat(group.groupCode).then((r) => {
+                activatedGroups.push(group.groupCode);
+                // log(`激活群聊天窗口${group.groupName}(${group.groupCode})`, r)
+                // if (r.result !== 0) {
+                //     setTimeout(() => NTQQMsgApi.activateGroupChat(group.groupCode).then(r => log(`再次激活群聊天窗口${group.groupName}(${group.groupCode})`, r)), 500);
+                // }else {
+                // }
+            }).catch(log)
+        }
         let existGroup = groups.find(g => g.groupCode == group.groupCode);
         if (existGroup) {
             Object.assign(existGroup, group);
@@ -135,7 +214,7 @@ async function updateGroups(_groups: Group[], needUpdate: boolean = true) {
         }
 
         if (needUpdate) {
-            const members = await NTQQApi.getGroupMembers(group.groupCode);
+            const members = await NTQQGroupApi.getGroupMembers(group.groupCode);
 
             if (members) {
                 existGroup.members = members;
@@ -144,17 +223,18 @@ async function updateGroups(_groups: Group[], needUpdate: boolean = true) {
     }
 }
 
-async function processGroupEvent(payload) {
+async function processGroupEvent(payload: {groupList: Group[]}) {
     try {
         const newGroupList = payload.groupList;
         for (const group of newGroupList) {
             let existGroup = groups.find(g => g.groupCode == group.groupCode);
             if (existGroup) {
+
                 if (existGroup.memberCount > group.memberCount) {
                     const oldMembers = existGroup.members;
 
                     await sleep(200);  // 如果请求QQ API的速度过快，通常无法正确拉取到最新的群信息，因此这里人为引入一个延时
-                    const newMembers = await NTQQApi.getGroupMembers(group.groupCode);
+                    const newMembers = await NTQQGroupApi.getGroupMembers(group.groupCode);
 
                     group.members = newMembers;
                     const newMembersSet = new Set<string>();  // 建立索引降低时间复杂度
@@ -165,45 +245,56 @@ async function processGroupEvent(payload) {
 
                     for (const member of oldMembers) {
                         if (!newMembersSet.has(member.uin)) {
-                            postOB11Event(new OB11GroupDecreaseEvent(group.groupCode, parseInt(member.uin)));
+                            postOB11Event(new OB11GroupDecreaseEvent(parseInt(group.groupCode), parseInt(member.uin)));
                             break;
                         }
                     }
                 }
+
             }
         }
 
         updateGroups(newGroupList, false).then();
     } catch (e) {
         updateGroups(payload.groupList).then();
-        console.log(e);
+        log("更新群信息错误", e.stack.toString());
     }
 }
 
 // 群列表变动
-registerReceiveHook<{ groupList: Group[], updateType: number }>(ReceiveCmd.GROUPS, (payload) => {
+registerReceiveHook<{ groupList: Group[], updateType: number }>([ReceiveCmdS.GROUPS, ReceiveCmdS.GROUPS_UNIX], (payload) => {
+    log("群列表变动", payload)
     if (payload.updateType != 2) {
         updateGroups(payload.groupList).then();
     } else {
-        if (process.platform == "win32") {
         processGroupEvent(payload).then();
     }
-    }
 })
-registerReceiveHook<{ groupList: Group[], updateType: number }>(ReceiveCmd.GROUPS_UNIX, (payload) => {
+
-    if (payload.updateType != 2) {
+registerReceiveHook<{groupCode: string, dataSource: number, members: Set<GroupMember>}>(ReceiveCmdS.GROUP_MEMBER_INFO_UPDATE, (payload) => {
-        updateGroups(payload.groupList).then();
+    const groupCode = payload.groupCode;
-    } else {
+    const members = Array.from(payload.members.values());
-        if (process.platform != "win32") {
+    // log("群成员变动", groupCode, payload.members.keys(), payload.members.values())
-            processGroupEvent(payload).then();
+    // const existGroup = groups.find(g => g.groupCode == groupCode);
-        }
+    // if (existGroup) {
-    }
+    //     log("对比群成员", existGroup.members, members)
+    //     for (const member of members) {
+    //         const existMember = existGroup.members.find(m => m.uin == member.uin);
+    //         if (existMember) {
+    //             log("对比群名片", existMember.cardName, member.cardName)
+    //             if (existMember.cardName != member.cardName) {
+    //                 postOB11Event(new OB11GroupCardEvent(parseInt(existGroup.groupCode), parseInt(member.uin), member.cardName, existMember.cardName));
+    //             }
+    //             Object.assign(existMember, member);
+    //         }
+    //     }
+    // }
 })
 
 // 好友列表变动
 registerReceiveHook<{
     data: { categoryId: number, categroyName: string, categroyMbCount: number, buddyList: User[] }[]
-}>(ReceiveCmd.FRIENDS, payload => {
+}>(ReceiveCmdS.FRIENDS, payload => {
     for (const fData of payload.data) {
         const _friends = fData.buddyList;
         for (let friend of _friends) {
@@ -217,8 +308,26 @@ registerReceiveHook<{
     }
 })
 
-// 新消息
+registerReceiveHook<{ msgList: Array<RawMessage> }>([ReceiveCmdS.NEW_MSG, ReceiveCmdS.NEW_ACTIVE_MSG], (payload) => {
-registerReceiveHook<{ msgList: Array<RawMessage> }>(ReceiveCmd.NEW_MSG, (payload) => {
+    // 保存一下uid
+    for (const message of payload.msgList) {
+        const uid = message.senderUid;
+        const uin = message.senderUin;
+        if (uid && uin) {
+            if (message.chatType === ChatType.temp){
+                dbUtil.getReceivedTempUinMap().then(receivedTempUinMap=>{
+                    if (!receivedTempUinMap[uin]){
+                        receivedTempUinMap[uin] = uid;
+                        dbUtil.setReceivedTempUinMap(receivedTempUinMap)
+                    }
+                })
+            }
+            uidMaps[uid] = uin;
+        }
+    }
+
+
+    // 自动清理新消息文件
     const {autoDeleteFile} = getConfigUtil().getConfig();
     if (!autoDeleteFile) {
         return
@@ -258,7 +367,7 @@ registerReceiveHook<{ msgList: Array<RawMessage> }>(ReceiveCmd.NEW_MSG, (payload
     }
 })
 
-registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmd.SELF_SEND_MSG, ({msgRecord}) => {
+registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmdS.SELF_SEND_MSG, ({msgRecord}) => {
     const message = msgRecord;
     const peerUid = message.peerUid;
     // log("收到自己发送成功的消息", Object.keys(sendMessagePool), message);
@@ -274,6 +383,6 @@ registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmd.SELF_SEND_MSG, ({msgRe
     }
 })
 
-registerReceiveHook<{ info: { status: number } }>(ReceiveCmd.SELF_STATUS, (info) => {
+registerReceiveHook<{ info: { status: number } }>(ReceiveCmdS.SELF_STATUS, (info) => {
     selfInfo.online = info.info.status !== 20
 })

src/ntqqapi/ntcall.ts

@@ -1,42 +1,11 @@
-import {BrowserWindow, ipcMain} from "electron";
+import {ipcMain} from "electron";
-import {hookApiCallbacks, ReceiveCmd, registerReceiveHook, removeReceiveHook} from "./hook";
+import {hookApiCallbacks, ReceiveCmd, ReceiveCmdS, registerReceiveHook, removeReceiveHook} from "./hook";
-import {log, sleep} from "../common/utils";
+
-import {
-    ChatType,
-    ElementType,
-    Friend,
-    FriendRequest,
-    Group,
-    GroupMember,
-    GroupMemberRole,
-    GroupNotifies,
-    GroupNotify,
-    GroupRequestOperateTypes,
-    RawMessage,
-    SelfInfo,
-    SendMessageElement,
-    User,
-    CacheScanResult,
-    ChatCacheList, ChatCacheListItemBasic,
-    CacheFileList, CacheFileListItem, CacheFileType,
-} from "./types";
-import * as fs from "fs";
-import {friendRequests, selfInfo, uidMaps} from "../common/data";
 import {v4 as uuidv4} from "uuid"
-import path from "path";
+import {log} from "../common/utils/log";
-import {dbUtil} from "../common/db";
+import {NTQQWindow, NTQQWindowApi, NTQQWindows} from "./api/window";
-
+import {WebApi} from "./api/webapi";
-interface IPCReceiveEvent {
+import {HOOK_LOG} from "../common/config";
-    eventName: string
-    callbackId: string
-}
-
-export type IPCReceiveDetail = [
-    {
-        cmdName: NTQQApiMethod
-        payload: unknown
-    },
-]
 
 export enum NTQQApiClass {
     NT_API = "ns-ntApi",
@@ -45,11 +14,17 @@ export enum NTQQApiClass {
     WINDOW_API = "ns-WindowApi",
     HOTUPDATE_API = "ns-HotUpdateApi",
     BUSINESS_API = "ns-BusinessApi",
-    GLOBAL_DATA = "ns-GlobalDataApi"
+    GLOBAL_DATA = "ns-GlobalDataApi",
+    SKEY_API = "ns-SkeyApi",
+    GROUP_HOME_WORK = "ns-GroupHomeWork",
+    GROUP_ESSENCE = "ns-GroupEssence",
 }
 
 export enum NTQQApiMethod {
-    SET_HEADER = "nodeIKernelProfileService/setHeader",
+    RECENT_CONTACT = "nodeIKernelRecentContactService/fetchAndSubscribeABatchOfRecentContact",
+    ADD_ACTIVE_CHAT = "nodeIKernelMsgService/getAioFirstViewLatestMsgsAndAddActiveChat",  // 激活群助手内的聊天窗口，这样才能收到消息
+    HISTORY_MSG_998 = "nodeIKernelMsgService/getMsgsIncludeSelfAndAddActiveChat",
+    HISTORY_MSG = "nodeIKernelMsgService/getMsgsIncludeSelf",
     LIKE_FRIEND = "nodeIKernelProfileLikeService/setBuddyProfileLike",
     SELF_INFO = "fetchAuthData",
     FRIENDS = "nodeIKernelBuddyService/getBuddyList",
@@ -97,7 +72,9 @@ export enum NTQQApiMethod {
 
     OPEN_EXTRA_WINDOW = 'openExternalWindow',
 
-    SET_QQ_AVATAR = 'nodeIKernelProfileService/setHeader'
+    SET_QQ_AVATAR = 'nodeIKernelProfileService/setHeader',
+    GET_SKEY = "nodeIKernelTipOffService/getPskey",
+    UPDATE_SKEY = "updatePskey"
 }
 
 enum NTQQApiChannel {
@@ -106,12 +83,6 @@ enum NTQQApiChannel {
     IPC_UP_1 = "IPC_UP_1",
 }
 
-export interface Peer {
-    chatType: ChatType
-    peerUid: string  // 如果是群聊uid为群号，私聊uid就是加密的字符串
-    guildId?: ""
-}
-
 interface NTQQApiParams {
     methodName: NTQQApiMethod | string,
     className?: NTQQApiClass,
@@ -124,7 +95,7 @@ interface NTQQApiParams {
     timeoutSecond?: number,
 }
 
-function callNTQQApi<ReturnType>(params: NTQQApiParams) {
+export function callNTQQApi<ReturnType>(params: NTQQApiParams) {
     let {
         className, methodName, channel, args,
         cbCmd, timeoutSecond: timeout,
@@ -136,7 +107,7 @@ function callNTQQApi<ReturnType>(params: NTQQApiParams) {
     timeout = timeout ?? 5;
     afterFirstCmd = afterFirstCmd ?? true;
     const uuid = uuidv4();
-    // log("callNTQQApi", channel, className, methodName, args, uuid)
+    HOOK_LOG && log("callNTQQApi", channel, className, methodName, args, uuid)
     return new Promise((resolve: (data: ReturnType) => void, reject) => {
         // log("callNTQQApiPromise", channel, className, methodName, args, uuid)
         const _timeout = timeout * 1000
@@ -147,7 +118,7 @@ function callNTQQApi<ReturnType>(params: NTQQApiParams) {
         }
         const apiArgs = [methodName, ...args]
         if (!cbCmd) {
-            // QQ后端会返回结果，并且可以插根据uuid识别
+            // QQ后端会返回结果，并且可以根据uuid识别
             hookApiCallbacks[uuid] = (r: ReturnType) => {
                 success = true
                 resolve(r)
@@ -199,574 +170,13 @@ function callNTQQApi<ReturnType>(params: NTQQApiParams) {
 }
 
 
-export let sendMessagePool: Record<string, ((sendSuccessMsg: RawMessage) => void) | null> = {}// peerUid: callbackFunnc
+export interface GeneralCallResult {
-
-interface GeneralCallResult {
     result: number,  // 0: success
     errMsg: string
 }
 
 
 export class NTQQApi {
-    static async setHeader(path: string) {
-        return await callNTQQApi<GeneralCallResult>({
-            methodName: NTQQApiMethod.SET_HEADER,
-            args: [path]
-        })
-    }
-
-    static async likeFriend(uid: string, count = 1) {
-        return await callNTQQApi<GeneralCallResult>({
-            methodName: NTQQApiMethod.LIKE_FRIEND,
-            args: [{
-                doLikeUserInfo: {
-                    friendUid: uid,
-                    sourceId: 71,
-                    doLikeCount: count,
-                    doLikeTollCount: 0
-                }
-            }, null]
-        })
-    }
-
-    static async getSelfInfo() {
-        return await callNTQQApi<SelfInfo>({
-            className: NTQQApiClass.GLOBAL_DATA,
-            methodName: NTQQApiMethod.SELF_INFO, timeoutSecond: 2
-        })
-    }
-
-    static async getUserInfo(uid: string) {
-        const result = await callNTQQApi<{ profiles: Map<string, User> }>({
-            methodName: NTQQApiMethod.USER_INFO,
-            args: [{force: true, uids: [uid]}, undefined],
-            cbCmd: ReceiveCmd.USER_INFO
-        })
-        return result.profiles.get(uid)
-    }
-
-    static async getUserDetailInfo(uid: string) {
-        const result = await callNTQQApi<{ info: User }>({
-            methodName: NTQQApiMethod.USER_DETAIL_INFO,
-            cbCmd: ReceiveCmd.USER_DETAIL_INFO,
-            afterFirstCmd: false,
-            cmdCB: (payload) => {
-                const success = payload.info.uid == uid
-                // log("get user detail info", success, uid, payload)
-                return success
-            },
-            args: [
-                {
-                    uid
-                },
-                null
-            ]
-        })
-        const info = result.info
-        if (info?.uin) {
-            uidMaps[info.uid] = info.uin
-        }
-        return info
-    }
-
-    static async getFriends(forced = false) {
-        const data = await callNTQQApi<{
-            data: {
-                categoryId: number,
-                categroyName: string,
-                categroyMbCount: number,
-                buddyList: Friend[]
-            }[]
-        }>(
-            {
-                methodName: NTQQApiMethod.FRIENDS,
-                args: [{force_update: forced}, undefined],
-                cbCmd: ReceiveCmd.FRIENDS
-            })
-        let _friends: Friend[] = [];
-        for (const fData of data.data) {
-            _friends.push(...fData.buddyList)
-        }
-        return _friends
-    }
-
-    static async getGroups(forced = false) {
-        let cbCmd = ReceiveCmd.GROUPS
-        if (process.platform != "win32") {
-            cbCmd = ReceiveCmd.GROUPS_UNIX
-        }
-        const result = await callNTQQApi<{
-            updateType: number,
-            groupList: Group[]
-        }>({methodName: NTQQApiMethod.GROUPS, args: [{force_update: forced}, undefined], cbCmd})
-        return result.groupList
-    }
-
-    static async getGroupMembers(groupQQ: string, num = 3000): Promise<GroupMember[]> {
-        const sceneId = await callNTQQApi({
-            methodName: NTQQApiMethod.GROUP_MEMBER_SCENE,
-            args: [{
-                groupCode: groupQQ,
-                scene: "groupMemberList_MainWindow"
-            }]
-        })
-        // log("get group member sceneId", sceneId);
-        try {
-            const result = await callNTQQApi<{
-                result: { infos: any }
-            }>({
-                methodName: NTQQApiMethod.GROUP_MEMBERS,
-                args: [{
-                    sceneId: sceneId,
-                    num: num
-                },
-                    null
-                ]
-            })
-            // log("members info", typeof result.result.infos, Object.keys(result.result.infos))
-            const values = result.result.infos.values()
-
-            const members: GroupMember[] = Array.from(values)
-            for (const member of members) {
-                uidMaps[member.uid] = member.uin;
-            }
-            // log(uidMaps);
-            // log("members info", values);
-            log(`get group ${groupQQ} members success`)
-            return members
-        } catch (e) {
-            log(`get group ${groupQQ} members failed`, e)
-            return []
-        }
-    }
-
-    static async getFileType(filePath: string) {
-        return await callNTQQApi<{ ext: string }>({
-            className: NTQQApiClass.FS_API, methodName: NTQQApiMethod.FILE_TYPE, args: [filePath]
-        })
-    }
-
-    static async getFileMd5(filePath: string) {
-        return await callNTQQApi<string>({
-            className: NTQQApiClass.FS_API,
-            methodName: NTQQApiMethod.FILE_MD5,
-            args: [filePath]
-        })
-    }
-
-    static async copyFile(filePath: string, destPath: string) {
-        return await callNTQQApi<string>({
-            className: NTQQApiClass.FS_API,
-            methodName: NTQQApiMethod.FILE_COPY,
-            args: [{
-                fromPath: filePath,
-                toPath: destPath
-            }]
-        })
-    }
-
-    static async getImageSize(filePath: string) {
-        return await callNTQQApi<{ width: number, height: number }>({
-            className: NTQQApiClass.FS_API, methodName: NTQQApiMethod.IMAGE_SIZE, args: [filePath]
-        })
-    }
-
-    static async getFileSize(filePath: string) {
-        return await callNTQQApi<number>({
-            className: NTQQApiClass.FS_API, methodName: NTQQApiMethod.FILE_SIZE, args: [filePath]
-        })
-    }
-
-    // 上传文件到QQ的文件夹
-    static async uploadFile(filePath: string, elementType: ElementType = ElementType.PIC) {
-        const md5 = await NTQQApi.getFileMd5(filePath);
-        let ext = (await NTQQApi.getFileType(filePath))?.ext
-        if (ext) {
-            ext = "." + ext
-        } else {
-            ext = ""
-        }
-        let fileName = `${path.basename(filePath)}`;
-        if (fileName.indexOf(".") === -1) {
-            fileName += ext;
-        }
-        const mediaPath = await callNTQQApi<string>({
-            methodName: NTQQApiMethod.MEDIA_FILE_PATH,
-            args: [{
-                path_info: {
-                    md5HexStr: md5,
-                    fileName: fileName,
-                    elementType: elementType,
-                    elementSubType: 0,
-                    thumbSize: 0,
-                    needCreate: true,
-                    downloadType: 1,
-                    file_uuid: ""
-                }
-            }]
-        })
-        log("media path", mediaPath)
-        await NTQQApi.copyFile(filePath, mediaPath);
-        const fileSize = await NTQQApi.getFileSize(filePath);
-        return {
-            md5,
-            fileName,
-            path: mediaPath,
-            fileSize
-        }
-    }
-
-    static async downloadMedia(msgId: string, chatType: ChatType, peerUid: string, elementId: string, thumbPath: string, sourcePath: string) {
-        // 用于下载收到的消息中的图片等
-        if (fs.existsSync(sourcePath)) {
-            return sourcePath
-        }
-        const apiParams = [
-            {
-                getReq: {
-                    msgId: msgId,
-                    chatType: chatType,
-                    peerUid: peerUid,
-                    elementId: elementId,
-                    thumbSize: 0,
-                    downloadType: 1,
-                    filePath: thumbPath,
-                },
-            },
-            undefined,
-        ]
-        // log("需要下载media", sourcePath);
-        await callNTQQApi({
-            methodName: NTQQApiMethod.DOWNLOAD_MEDIA,
-            args: apiParams,
-            cbCmd: ReceiveCmd.MEDIA_DOWNLOAD_COMPLETE,
-            cmdCB: (payload: { notifyInfo: { filePath: string } }) => {
-                // log("media 下载完成判断", payload.notifyInfo.filePath, sourcePath);
-                return payload.notifyInfo.filePath == sourcePath;
-            }
-        })
-        return sourcePath
-    }
-
-    static async recallMsg(peer: Peer, msgIds: string[]) {
-        return await callNTQQApi({
-            methodName: NTQQApiMethod.RECALL_MSG,
-            args: [{
-                peer,
-                msgIds
-            }, null]
-        })
-    }
-
-    static async sendMsg(peer: Peer, msgElements: SendMessageElement[], waitComplete = true, timeout = 10000) {
-        const peerUid = peer.peerUid
-
-        // 等待上一个相同的peer发送完
-        let checkLastSendUsingTime = 0;
-        const waitLastSend = async () => {
-            if (checkLastSendUsingTime > timeout) {
-                throw ("发送超时")
-            }
-            let lastSending = sendMessagePool[peer.peerUid]
-            if (lastSending) {
-                // log("有正在发送的消息，等待中...")
-                await sleep(500);
-                checkLastSendUsingTime += 500;
-                return await waitLastSend();
-            } else {
-                return;
-            }
-        }
-        await waitLastSend();
-
-        let sentMessage: RawMessage = null;
-        sendMessagePool[peerUid] = async (rawMessage: RawMessage) => {
-            delete sendMessagePool[peerUid];
-            sentMessage = rawMessage;
-        }
-
-        let checkSendCompleteUsingTime = 0;
-        const checkSendComplete = async (): Promise<RawMessage> => {
-            if (sentMessage) {
-                if (waitComplete) {
-                    if ((await dbUtil.getMsgByLongId(sentMessage.msgId)).sendStatus == 2) {
-                        return sentMessage
-                    }
-                } else {
-                    return sentMessage
-                }
-                // log(`给${peerUid}发送消息成功`)
-            }
-            checkSendCompleteUsingTime += 500
-            if (checkSendCompleteUsingTime > timeout) {
-                throw ('发送超时')
-            }
-            await sleep(500)
-            return await checkSendComplete()
-        }
-
-        callNTQQApi({
-            methodName: NTQQApiMethod.SEND_MSG,
-            args: [{
-                msgId: "0",
-                peer, msgElements,
-                msgAttributeInfos: new Map(),
-            }, null]
-        }).then()
-        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}
-        })
-        const apiArgs = [
-            {
-                msgInfos,
-                srcContact: srcPeer,
-                dstContact: destPeer,
-                commentElements: [],
-                msgAttributeInfos: new Map()
-            },
-            null,
-        ]
-        return await new Promise<RawMessage>((resolve, reject) => {
-            let complete = false
-            setTimeout(() => {
-                if (!complete) {
-                    reject("转发消息超时");
-                }
-            }, 5000)
-            registerReceiveHook(ReceiveCmd.SELF_SEND_MSG, async (payload: { msgRecord: RawMessage }) => {
-                const msg = payload.msgRecord
-                // 需要判断它是转发的消息，并且识别到是当前转发的这一条
-                const arkElement = msg.elements.find(ele => ele.arkElement)
-                if (!arkElement) {
-                    // log("收到的不是转发消息")
-                    return
-                }
-                const forwardData: any = JSON.parse(arkElement.arkElement.bytesData)
-                if (forwardData.app != 'com.tencent.multimsg') {
-                    return
-                }
-                if (msg.peerUid == destPeer.peerUid && msg.senderUid == selfInfo.uid) {
-                    complete = true
-                    await dbUtil.addMsg(msg)
-                    resolve(msg)
-                    log('转发消息成功：', payload)
-                }
-            })
-            callNTQQApi<GeneralCallResult>({
-                methodName: NTQQApiMethod.MULTI_FORWARD_MSG,
-                args: apiArgs
-            }).then(result => {
-                log("转发消息结果:", result, apiArgs)
-                if (result.result !== 0) {
-                    complete = true;
-                    reject("转发消息失败," + JSON.stringify(result));
-                }
-            })
-        })
-    }
-
-    static async getGroupNotifies() {
-        // 获取管理员变更
-        // 加群通知，退出通知，需要管理员权限
-        callNTQQApi<GeneralCallResult>({
-            methodName: ReceiveCmd.GROUP_NOTIFY,
-            classNameIsRegister: true,
-        }).then()
-        return await callNTQQApi<GroupNotifies>({
-            methodName: NTQQApiMethod.GET_GROUP_NOTICE,
-            cbCmd: ReceiveCmd.GROUP_NOTIFY,
-            afterFirstCmd: false,
-            args: [
-                {"doubt": false, "startSeq": "", "number": 14},
-                null
-            ]
-        });
-    }
-
-    static async getGroupIgnoreNotifies() {
-        await NTQQApi.getGroupNotifies();
-        const result = callNTQQApi<GroupNotifies>({
-            className: NTQQApiClass.WINDOW_API,
-            methodName: NTQQApiMethod.OPEN_EXTRA_WINDOW,
-            cbCmd: ReceiveCmd.GROUP_NOTIFY,
-            afterFirstCmd: false,
-            args: [
-                "GroupNotifyFilterWindow"
-            ]
-        })
-        // 关闭窗口
-        setTimeout(() => {
-            for (const w of BrowserWindow.getAllWindows()) {
-                // log("close window", w.webContents.getURL())
-                if (w.webContents.getURL().indexOf("#/notify-filter/") != -1) {
-                    w.close();
-                }
-            }
-        }, 2000);
-        return result;
-    }
-
-    static async handleGroupRequest(seq: string, operateType: GroupRequestOperateTypes, reason?: string) {
-        const notify: GroupNotify = await dbUtil.getGroupNotify(seq)
-        if (!notify) {
-            throw `${seq}对应的加群通知不存在`
-        }
-        // delete groupNotifies[seq];
-        return await callNTQQApi<GeneralCallResult>({
-            methodName: NTQQApiMethod.HANDLE_GROUP_REQUEST,
-            args: [
-                {
-                    "doubt": false,
-                    "operateMsg": {
-                        "operateType": operateType, // 2 拒绝
-                        "targetMsg": {
-                            "seq": seq,  // 通知序列号
-                            "type": notify.type,
-                            "groupCode": notify.group.groupCode,
-                            "postscript": reason
-                        }
-                    }
-                },
-                null
-            ]
-        });
-    }
-
-    static async quitGroup(groupQQ: string) {
-        await callNTQQApi<GeneralCallResult>({
-            methodName: NTQQApiMethod.QUIT_GROUP,
-            args: [
-                {"groupCode": groupQQ},
-                null
-            ]
-        })
-    }
-
-    static async handleFriendRequest(sourceId: number, accept: boolean,) {
-        const request: FriendRequest = friendRequests[sourceId]
-        if (!request) {
-            throw `sourceId ${sourceId}, 对应的好友请求不存在`
-        }
-        const result = await callNTQQApi<GeneralCallResult>({
-            methodName: NTQQApiMethod.HANDLE_FRIEND_REQUEST,
-            args: [
-                {
-                    "approvalInfo": {
-                        "friendUid": request.friendUid,
-                        "reqTime": request.reqTime,
-                        accept
-                    }
-                }
-            ]
-        })
-        delete friendRequests[sourceId];
-        return result;
-    }
-
-    static async kickMember(groupQQ: string, kickUids: string[], refuseForever: boolean = false, kickReason: string = '') {
-        return await callNTQQApi<GeneralCallResult>(
-            {
-                methodName: NTQQApiMethod.KICK_MEMBER,
-                args: [
-                    {
-                        groupCode: groupQQ,
-                        kickUids,
-                        refuseForever,
-                        kickReason,
-                    }
-                ]
-            }
-        )
-    }
-
-    static async banMember(groupQQ: string, memList: Array<{ uid: string, timeStamp: number }>) {
-        // timeStamp为秒数, 0为解除禁言
-        return await callNTQQApi<GeneralCallResult>(
-            {
-                methodName: NTQQApiMethod.MUTE_MEMBER,
-                args: [
-                    {
-                        groupCode: groupQQ,
-                        memList,
-                    }
-                ]
-            }
-        )
-    }
-
-    static async banGroup(groupQQ: string, shutUp: boolean) {
-        return await callNTQQApi<GeneralCallResult>({
-            methodName: NTQQApiMethod.MUTE_GROUP,
-            args: [
-                {
-                    groupCode: groupQQ,
-                    shutUp
-                }, null
-            ]
-        })
-    }
-
-    static async setMemberCard(groupQQ: string, memberUid: string, cardName: string) {
-        return await callNTQQApi<GeneralCallResult>({
-            methodName: NTQQApiMethod.SET_MEMBER_CARD,
-            args: [
-                {
-                    groupCode: groupQQ,
-                    uid: memberUid,
-                    cardName
-                }, null
-            ]
-        })
-    }
-
-    static async setMemberRole(groupQQ: string, memberUid: string, role: GroupMemberRole) {
-        return await callNTQQApi<GeneralCallResult>({
-            methodName: NTQQApiMethod.SET_MEMBER_ROLE,
-            args: [
-                {
-                    groupCode: groupQQ,
-                    uid: memberUid,
-                    role
-                }, null
-            ]
-        })
-    }
-
-    static async setGroupName(groupQQ: string, groupName: string) {
-        return await callNTQQApi<GeneralCallResult>({
-            methodName: NTQQApiMethod.SET_GROUP_NAME,
-            args: [
-                {
-                    groupCode: groupQQ,
-                    groupName
-                }, null
-            ]
-        })
-    }
-
     static async call(className: NTQQApiClass, cmdName: string, args: any[],) {
         return await callNTQQApi<GeneralCallResult>({
             className,
@@ -776,134 +186,4 @@ export class NTQQApi {
             ]
         })
     }
-
-    static async setGroupTitle(groupQQ: string, uid: string, title: string) {
-        return await callNTQQApi<GeneralCallResult>({
-            methodName: NTQQApiMethod.SET_GROUP_TITLE,
-            args: [
-                {
-                    groupCode: groupQQ,
-                    uid,
-                    title
-                }, null
-            ]
-        })
-    }
-
-    static publishGroupBulletin(groupQQ: string, title: string, content: string) {
-
-    }
-
-    static async setCacheSilentScan(isSilent: boolean = true) {
-        return await callNTQQApi<GeneralCallResult>({
-            methodName: NTQQApiMethod.CACHE_SET_SILENCE,
-            args: [{
-                isSilent
-            }, null]
-        });
-    }
-
-    static addCacheScannedPaths(pathMap: object = {}) {
-        return callNTQQApi<GeneralCallResult>({
-            methodName: NTQQApiMethod.CACHE_ADD_SCANNED_PATH,
-            args: [{
-                pathMap: {...pathMap},
-            }, null]
-        });
-    }
-
-    static scanCache() {
-        callNTQQApi<GeneralCallResult>({
-            methodName: ReceiveCmd.CACHE_SCAN_FINISH,
-            classNameIsRegister: true,
-        }).then();
-        return callNTQQApi<CacheScanResult>({
-            methodName: NTQQApiMethod.CACHE_SCAN,
-            args: [null, null],
-            timeoutSecond: 300,
-        });
-    }
-
-    static getHotUpdateCachePath() {
-        return callNTQQApi<string>({
-            className: NTQQApiClass.HOTUPDATE_API,
-            methodName: NTQQApiMethod.CACHE_PATH_HOT_UPDATE
-        });
-    }
-
-    static getDesktopTmpPath() {
-        return callNTQQApi<string>({
-            className: NTQQApiClass.BUSINESS_API,
-            methodName: NTQQApiMethod.CACHE_PATH_DESKTOP_TEMP
-        });
-    }
-
-    static getCacheSessionPathList() {
-        return callNTQQApi<{
-            key: string,
-            value: string
-        }[]>({
-            className: NTQQApiClass.OS_API,
-            methodName: NTQQApiMethod.CACHE_PATH_SESSION,
-        });
-    }
-
-    static clearCache(cacheKeys: Array<string> = ['tmp', 'hotUpdate']) {
-        return callNTQQApi<any>({ // TODO: 目前还不知道真正的返回值是什么
-            methodName: NTQQApiMethod.CACHE_CLEAR,
-            args: [{
-                keys: cacheKeys
-            }, null]
-        });
-    }
-
-    static getChatCacheList(type: ChatType, pageSize: number = 1000, pageIndex: number = 0) {
-        return new Promise<ChatCacheList>((res, rej) => {
-            callNTQQApi<ChatCacheList>({
-                methodName: NTQQApiMethod.CACHE_CHAT_GET,
-                args: [{
-                    chatType: type,
-                    pageSize,
-                    order: 1,
-                    pageIndex
-                }, null]
-            }).then(list => res(list))
-                .catch(e => rej(e));
-        });
-    }
-
-    static getFileCacheInfo(fileType: CacheFileType, pageSize: number = 1000, lastRecord?: CacheFileListItem) {
-        const _lastRecord = lastRecord ? lastRecord : {fileType: fileType};
-
-        return callNTQQApi<CacheFileList>({
-            methodName: NTQQApiMethod.CACHE_FILE_GET,
-            args: [{
-                fileType: fileType,
-                restart: true,
-                pageSize: pageSize,
-                order: 1,
-                lastRecord: _lastRecord,
-            }, null]
-        })
-    }
-
-    static async clearChatCache(chats: ChatCacheListItemBasic[] = [], fileKeys: string[] = []) {
-        return await callNTQQApi<GeneralCallResult>({
-            methodName: NTQQApiMethod.CACHE_CHAT_CLEAR,
-            args: [{
-                chats,
-                fileKeys
-            }, null]
-        });
-    }
-
-    static async setQQAvatar(filePath: string) {
-        return await callNTQQApi<GeneralCallResult>({
-            methodName: NTQQApiMethod.SET_QQ_AVATAR,
-            args: [{
-                path:filePath
-            }, null],
-            timeoutSecond: 10 // 10秒不一定够
-        });
-    }
 }

src/ntqqapi/types/cache.ts

@@ -0,0 +1,65 @@
+import {ChatType} from "./msg";
+
+export interface CacheScanResult {
+    result: number,
+    size: [ // 单位为字节
+        string, // 系统总存储空间
+        string, // 系统可用存储空间
+        string, // 系统已用存储空间
+        string, // QQ总大小
+        string, // 「聊天与文件」大小
+        string, // 未知
+        string, // 「缓存数据」大小
+        string, // 「其他数据」大小
+        string, // 未知
+    ]
+}
+
+export interface ChatCacheList {
+    pageCount: number,
+    infos: ChatCacheListItem[]
+}
+
+export interface ChatCacheListItem {
+    chatType: ChatType,
+    basicChatCacheInfo: ChatCacheListItemBasic,
+    guildChatCacheInfo: unknown[] // TODO: 没用过频道所以不知道这里边的详细内容
+}
+
+export interface ChatCacheListItemBasic {
+    chatSize: string,
+    chatTime: string,
+    uid: string,
+    uin: string,
+    remarkName: string,
+    nickName: string,
+    chatType?: ChatType,
+    isChecked?: boolean
+}
+
+export enum CacheFileType {
+    IMAGE = 0,
+    VIDEO = 1,
+    AUDIO = 2,
+    DOCUMENT = 3,
+    OTHER = 4,
+}
+
+export interface CacheFileList {
+    infos: CacheFileListItem[],
+}
+
+export interface CacheFileListItem {
+    fileSize: string,
+    fileTime: string,
+    fileKey: string,
+    elementId: string,
+    elementIdStr: string,
+    fileType: CacheFileType,
+    path: string,
+    fileName: string,
+    senderId: string,
+    previewPath: string,
+    senderName: string,
+    isChecked?: boolean,
+}

src/ntqqapi/types/group.ts

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

src/ntqqapi/types/index.ts

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

src/ntqqapi/types/msg.ts

@@ -1,70 +1,4 @@
-export interface User {
+import {GroupMemberRole} from "./group";
-    uid: string; // 加密的字符串
-    uin: string; // QQ号
-    nick: string;
-    avatarUrl?: string;
-    longNick?: string; // 签名
-    remark?: string
-}
-
-export interface SelfInfo extends User {
-    online?: boolean;
-}
-
-export interface Friend extends User {
-}
-
-export interface Group {
-    groupCode: string,
-    maxMember: number,
-    memberCount: number,
-    groupName: string,
-    groupStatus: 0,
-    memberRole: 2,
-    isTop: boolean,
-    toppedTimestamp: "0",
-    privilegeFlag: number, //65760
-    isConf: boolean,
-    hasModifyConfGroupFace: boolean,
-    hasModifyConfGroupName: boolean,
-    remarkName: string,
-    hasMemo: boolean,
-    groupShutupExpireTime: string, //"0",
-    personShutupExpireTime: string, //"0",
-    discussToGroupUin: string, //"0",
-    discussToGroupMaxMsgSeq: number,
-    discussToGroupTime: number,
-    groupFlagExt: number, //1073938496,
-    authGroupType: number, //0,
-    groupCreditLevel: number, //0,
-    groupFlagExt3: number, //0,
-    groupOwnerId: {
-        "memberUin": string, //"0",
-        "memberUid": string, //"u_fbf8N7aeuZEnUiJAbQ9R8Q"
-    },
-    members: GroupMember[]  // 原始数据是没有这个的，为了方便自己加了这个字段
-}
-
-export enum GroupMemberRole {
-    normal = 2,
-    admin = 3,
-    owner = 4
-}
-
-export interface GroupMember {
-    avatarPath: string;
-    cardName: string;
-    cardType: number;
-    isDelete: boolean;
-    nick: string;
-    qid: string;
-    remark: string;
-    role: GroupMemberRole; // 群主:4, 管理员:3，群员:2
-    shutUpTime: number; // 禁言时间，单位是什么暂时不清楚
-    uid: string; // 加密的字符串
-    uin: string; // QQ号
-    isRobot: boolean;
-}
 
 export enum ElementType {
     TEXT = 1,
@@ -178,6 +112,7 @@ export interface SendVideoElement {
     elementId: "",
     videoElement: VideoElement
 }
+
 export interface SendArkElement {
     elementType: ElementType.ARK,
     elementId: "",
@@ -243,7 +178,13 @@ export interface PicElement {
     md5HexStr?: string;
 }
 
+export enum GrayTipElementSubType {
+    INVITE_NEW_MEMBER = 12,
+    MEMBER_NEW_TITLE = 17
+}
+
 export interface GrayTipElement {
+    subElementType: GrayTipElementSubType;
     revokeElement: {
         operatorRole: string;
         operatorUid: string;
@@ -253,7 +194,13 @@ export interface GrayTipElement {
         wording: string;  // 自定义的撤回提示语
     }
     aioOpGrayTipElement: TipAioOpGrayTipElement,
-    groupElement: TipGroupElement
+    groupElement: TipGroupElement,
+    xmlElement: {
+        content: string;
+    },
+    jsonGrayTipElement:{
+        jsonStr: string;
+    }
 }
 
 export interface FaceElement {
@@ -375,130 +322,3 @@ export interface RawMessage {
         fileElement: FileElement;
     }[];
 }
-
-export enum GroupNotifyTypes {
-    INVITE_ME = 1,
-    INVITED_JOIN = 4,  // 有人接受了邀请入群
-    JOIN_REQUEST = 7,
-    ADMIN_SET = 8,
-    ADMIN_UNSET = 12,
-    MEMBER_EXIT = 11, // 主动退出?
-
-}
-
-export interface GroupNotifies {
-    doubt: boolean,
-    nextStartSeq: string,
-    notifies: GroupNotify[],
-}
-
-export enum GroupNotifyStatus {
-    IGNORE = 0,
-    WAIT_HANDLE = 1,
-    APPROVE = 2,
-    REJECT = 3
-}
-export interface GroupNotify {
-    time: number;  // 自己添加的字段，时间戳，毫秒, 用于判断收到短时间内收到重复的notify
-    seq: string, // 唯一标识符，转成数字再除以1000应该就是时间戳？
-    type: GroupNotifyTypes,
-    status: GroupNotifyStatus,  // 0是已忽略？，1是未处理，2是已同意
-    group: { groupCode: string, groupName: string },
-    user1: { uid: string, nickName: string }, // 被设置管理员的人
-    user2: { uid: string, nickName: string },  // 操作者
-    actionUser: { uid: string, nickName: string }, //未知
-    actionTime: string,
-    invitationExt: {
-        srcType: number,  // 0?未知
-        groupCode: string, waitStatus: number
-    },
-    postscript: string,  // 加群用户填写的验证信息
-    repeatSeqs: [],
-    warningTips: string
-}
-
-export enum GroupRequestOperateTypes {
-    approve = 1,
-    reject = 2
-}
-
-export interface FriendRequest {
-    friendUid: string,
-    reqTime: string,  // 时间戳,秒
-    extWords: string,  // 申请人填写的验证消息
-    isUnread: boolean,
-    friendNick: string,
-    sourceId: number,
-    groupCode: string
-}
-
-export interface FriendRequestNotify {
-    data: {
-        unreadNums: number,
-        buddyReqs: FriendRequest[]
-    }
-}
-
-export interface CacheScanResult {
-    result: number,
-    size: [ // 单位为字节
-        string, // 系统总存储空间
-        string, // 系统可用存储空间
-        string, // 系统已用存储空间
-        string, // QQ总大小
-        string, // 「聊天与文件」大小
-        string, // 未知
-        string, // 「缓存数据」大小
-        string, // 「其他数据」大小
-        string, // 未知
-    ]
-}
-
-export interface ChatCacheList {
-    pageCount: number,
-    infos: ChatCacheListItem[]
-}
-
-export interface ChatCacheListItem {
-    chatType: ChatType,
-    basicChatCacheInfo: ChatCacheListItemBasic,
-    guildChatCacheInfo: unknown[] // TODO: 没用过频道所以不知道这里边的详细内容
-}
-
-export interface ChatCacheListItemBasic {
-    chatSize: string,
-    chatTime: string,
-    uid: string,
-    uin: string,
-    remarkName: string,
-    nickName: string,
-    chatType?: ChatType,
-    isChecked?: boolean
-}
-
-export enum CacheFileType {
-    IMAGE = 0,
-    VIDEO = 1,
-    AUDIO = 2,
-    DOCUMENT = 3,
-    OTHER = 4,
-}
-
-export interface CacheFileList {
-    infos: CacheFileListItem[],
-}
-
-export interface CacheFileListItem {
-    fileSize: string,
-    fileTime: string,
-    fileKey: string,
-    elementId: string,
-    elementIdStr: string,
-    fileType: CacheFileType,
-    path: string,
-    fileName: string,
-    senderId: string,
-    previewPath: string,
-    senderName: string,
-    isChecked?: boolean,
-}

src/ntqqapi/types/notify.ts

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

src/ntqqapi/types/user.ts

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

src/onebot11/action/BaseAction.ts

@@ -1,7 +1,8 @@
 import {ActionName, BaseCheckResult} from "./types"
-import {OB11Response} from "./utils"
+import {OB11Response} from "./OB11Response"
 import {OB11Return} from "../types";
-import {log} from "../../common/utils";
+
+import {log} from "../../common/utils/log";
 
 class BaseAction<PayloadType, ReturnDataType> {
     actionName: ActionName

src/onebot11/action/Debug.ts

@@ -1,28 +0,0 @@
-import BaseAction from "./BaseAction";
-import {NTQQApi} from "../../ntqqapi/ntcall";
-import {ActionName} from "./types";
-import {log} from "../../common/utils";
-
-interface Payload {
-    method: string,
-    args: any[],
-}
-
-export default class Debug extends BaseAction<Payload, any> {
-    actionName = ActionName.Debug
-
-    protected async _handle(payload: Payload): Promise<any> {
-        log("debug call ntqq api", payload);
-        const method = NTQQApi[payload.method]
-        if (!method) {
-            throw `${method} 不存在`
-        }
-        const result = method(...payload.args);
-        if (method.constructor.name === "AsyncFunction") {
-            return await result
-        }
-        return result
-        // const info = await NTQQApi.getUserDetailInfo(friends[0].uid);
-        // return info
-    }
-}

src/onebot11/action/GetFile.ts

@@ -1,47 +0,0 @@
-import BaseAction from "./BaseAction";
-import {getConfigUtil} from "../../common/utils";
-import fs from "fs/promises";
-import {dbUtil} from "../../common/db";
-
-export interface GetFilePayload {
-    file: string // 文件名
-}
-
-export interface GetFileResponse {
-    file?: string  // path
-    url?: string
-    file_size?: string
-    file_name?: string
-    base64?: string
-}
-
-
-export class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
-    protected async _handle(payload: GetFilePayload): Promise<GetFileResponse> {
-        const cache = await dbUtil.getFileCache(payload.file)
-        const {autoDeleteFile, enableLocalFile2Url, autoDeleteFileSecond} = getConfigUtil().getConfig()
-        if (!cache) {
-            throw new Error('file not found')
-        }
-        if (cache.downloadFunc) {
-            await cache.downloadFunc()
-        }
-        let res: GetFileResponse = {
-            file: cache.filePath,
-            url: cache.url,
-            file_size: cache.fileSize,
-            file_name: cache.fileName
-        }
-        if (enableLocalFile2Url) {
-            if (!cache.url) {
-                res.base64 = await fs.readFile(cache.filePath, 'base64')
-            }
-        }
-        if (autoDeleteFile) {
-            setTimeout(() => {
-                fs.unlink(cache.filePath)
-            }, autoDeleteFileSecond * 1000)
-        }
-        return res
-    }
-}

src/onebot11/action/GetGroupMemberInfo.ts

@@ -1,26 +0,0 @@
-import {OB11GroupMember} from '../types';
-import {getGroupMember} from "../../common/data";
-import {OB11Constructor} from "../constructor";
-import BaseAction from "./BaseAction";
-import {ActionName} from "./types";
-
-
-export interface PayloadType {
-    group_id: number
-    user_id: number
-}
-
-class GetGroupMemberInfo extends BaseAction<PayloadType, OB11GroupMember> {
-    actionName = ActionName.GetGroupMemberInfo
-
-    protected async _handle(payload: PayloadType) {
-        const member = await getGroupMember(payload.group_id.toString(), payload.user_id.toString())
-        if (member) {
-            return OB11Constructor.groupMember(payload.group_id.toString(), member)
-        } else {
-            throw (`群成员${payload.user_id}不存在`)
-        }
-    }
-}
-
-export default GetGroupMemberInfo

src/onebot11/action/OB11Response.ts

@@ -1,5 +1,6 @@
 import {OB11Return} from '../types';
-import {isNull} from '../../common/utils';
+
+import {isNull} from "../../common/utils/helper";
 
 export class OB11Response {
     static res<T>(data: T, status: string, retcode: number, message: string = ""): OB11Return<T> {

src/onebot11/action/file/GetFile.ts

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

src/onebot11/action/file/GetImage.ts

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

src/onebot11/action/file/GetRecord.ts

@@ -1,5 +1,5 @@
 import {GetFileBase, GetFilePayload, GetFileResponse} from "./GetFile";
-import {ActionName} from "./types";
+import {ActionName} from "../types";
 
 interface Payload extends GetFilePayload {
     out_format: 'mp3' | 'amr' | 'wma' | 'm4a' | 'spx' | 'ogg' | 'wav' | 'flac'

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

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

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

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

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

@@ -1,8 +1,9 @@
 import BaseAction from "../BaseAction";
 import {OB11User} from "../../types";
-import {getFriend, getGroupMember, groups} from "../../../common/data";
+import {getUidByUin, uidMaps} from "../../../common/data";
 import {OB11Constructor} from "../../constructor";
 import {ActionName} from "../types";
+import {NTQQUserApi} from "../../../ntqqapi/api/user";
 
 
 export default class GoCQHTTPGetStrangerInfo extends BaseAction<{ user_id: number }, OB11User> {
@@ -10,16 +11,10 @@ export default class GoCQHTTPGetStrangerInfo extends BaseAction<{ user_id: numbe
 
     protected async _handle(payload: { user_id: number }): Promise<OB11User> {
         const user_id = payload.user_id.toString()
-        const friend = await getFriend(user_id)
+        const uid = getUidByUin(user_id)
-        if (friend) {
+        if (!uid) {
-            return OB11Constructor.friend(friend);
+            throw new Error("查无此人")
         }
-        for (const group of groups) {
+        return OB11Constructor.stranger(await NTQQUserApi.getUserDetailInfo(uid))
-            const member = await getGroupMember(group.groupCode, user_id)
-            if (member) {
-                return OB11Constructor.groupMember(group.groupCode, member) as OB11User
-            }
-        }
-        throw ("查无此人")
     }
 }

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

@@ -1,4 +1,4 @@
-import SendMsg from "../SendMsg";
+import SendMsg from "../msg/SendMsg";
 import {OB11PostSendMsg} from "../../types";
 import {ActionName} from "../types";
 
@@ -6,7 +6,9 @@ export class GoCQHTTPSendGroupForwardMsg extends SendMsg {
     actionName = ActionName.GoCQHTTP_SendGroupForwardMsg;
 
     protected async check(payload: OB11PostSendMsg) {
+        if (payload.messages){
             payload.message = this.convertMessage2List(payload.messages);
+        }
         return super.check(payload);
     }
 }

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

@@ -3,9 +3,9 @@ import {getGroup} from "../../../common/data";
 import {ActionName} from "../types";
 import {SendMsgElementConstructor} from "../../../ntqqapi/constructor";
 import {ChatType, SendFileElement} from "../../../ntqqapi/types";
-import {NTQQApi} from "../../../ntqqapi/ntcall";
-import {uri2local} from "../../utils";
 import fs from "fs";
+import {NTQQMsgApi} from "../../../ntqqapi/api/msg";
+import {uri2local} from "../../../common/utils";
 
 interface Payload{
     group_id: number
@@ -31,7 +31,7 @@ export default class GoCQHTTPUploadGroupFile extends BaseAction<Payload, null> {
             throw new Error(downloadResult.errMsg)
         }
         let sendFileEle: SendFileElement = await SendMsgElementConstructor.file(downloadResult.path, payload.name);
-        await NTQQApi.sendMsg({chatType: ChatType.group, peerUid: group.groupCode}, [sendFileEle]);
+        await NTQQMsgApi.sendMsg({chatType: ChatType.group, peerUid: group.groupCode}, [sendFileEle]);
         return null
     }
 }

src/onebot11/action/group/GetGroupInfo.ts

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

src/onebot11/action/group/GetGroupList.ts

@@ -1,8 +1,8 @@
-import {OB11Group} from '../types';
+import {OB11Group} from '../../types';
-import {OB11Constructor} from "../constructor";
+import {OB11Constructor} from "../../constructor";
-import {groups} from "../../common/data";
+import {groups} from "../../../common/data";
-import BaseAction from "./BaseAction";
+import BaseAction from "../BaseAction";
-import {ActionName} from "./types";
+import {ActionName} from "../types";
 
 
 class GetGroupList extends BaseAction<null, OB11Group[]> {

src/onebot11/action/group/GetGroupMemberInfo.ts

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

src/onebot11/action/group/GetGroupMemberList.ts

@@ -1,9 +1,9 @@
-import {OB11GroupMember} from '../types';
+import {OB11GroupMember} from '../../types';
-import {getGroup} from "../../common/data";
+import {getGroup} from "../../../common/data";
-import {NTQQApi} from "../../ntqqapi/ntcall";
+import {OB11Constructor} from "../../constructor";
-import {OB11Constructor} from "../constructor";
+import BaseAction from "../BaseAction";
-import BaseAction from "./BaseAction";
+import {ActionName} from "../types";
-import {ActionName} from "./types";
+import {NTQQGroupApi} from "../../../ntqqapi/api/group";
 
 export interface PayloadType {
     group_id: number
@@ -17,7 +17,7 @@ class GetGroupMemberList extends BaseAction<PayloadType, OB11GroupMember[]> {
         const group = await getGroup(payload.group_id.toString());
         if (group) {
             if (!group.members?.length) {
-                group.members = await NTQQApi.getGroupMembers(payload.group_id.toString())
+                group.members = await NTQQGroupApi.getGroupMembers(payload.group_id.toString())
             }
             return OB11Constructor.groupMembers(group);
         } else {

src/onebot11/action/group/GetGuildList.ts

@@ -1,5 +1,5 @@
-import BaseAction from "./BaseAction";
+import BaseAction from "../BaseAction";
-import {ActionName} from "./types";
+import {ActionName} from "../types";
 
 export default class GetGuildList extends BaseAction<null, null> {
     actionName = ActionName.GetGuildList

src/onebot11/action/group/SendGroupMsg.ts

@@ -1,7 +1,8 @@
-import SendMsg from "./SendMsg";
+import SendMsg from "../msg/SendMsg";
-import {ActionName, BaseCheckResult} from "./types";
+import {ActionName, BaseCheckResult} from "../types";
-import {OB11PostSendMsg} from "../types";
+import {OB11PostSendMsg} from "../../types";
-import {log} from "../../common/utils";
+
+import {log} from "../../../common/utils/log";
 
 
 class SendGroupMsg extends SendMsg {

src/onebot11/action/group/SetGroupAddRequest.ts

@@ -1,7 +1,7 @@
-import BaseAction from "./BaseAction";
+import BaseAction from "../BaseAction";
-import {GroupRequestOperateTypes} from "../../ntqqapi/types";
+import {GroupRequestOperateTypes} from "../../../ntqqapi/types";
-import {NTQQApi} from "../../ntqqapi/ntcall";
+import {ActionName} from "../types";
-import {ActionName} from "./types";
+import {NTQQGroupApi} from "../../../ntqqapi/api/group";
 
 interface Payload {
     flag: string,
@@ -16,8 +16,9 @@ export default class SetGroupAddRequest extends BaseAction<Payload, null> {
 
     protected async _handle(payload: Payload): Promise<null> {
         const seq = payload.flag.toString();
-        await NTQQApi.handleGroupRequest(seq,
+        const approve = payload.approve.toString() === "true";
-            payload.approve ? GroupRequestOperateTypes.approve : GroupRequestOperateTypes.reject,
+        await NTQQGroupApi.handleGroupRequest(seq,
+            approve ? GroupRequestOperateTypes.approve : GroupRequestOperateTypes.reject,
             payload.reason
         )
         return null

src/onebot11/action/group/SetGroupAdmin.ts

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

src/onebot11/action/group/SetGroupBan.ts

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

src/onebot11/action/group/SetGroupCard.ts

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

src/onebot11/action/group/SetGroupKick.ts

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

src/onebot11/action/group/SetGroupLeave.ts

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

src/onebot11/action/group/SetGroupName.ts

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

src/onebot11/action/group/SetGroupWholeBan.ts

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

src/onebot11/action/index.ts

@@ -1,43 +1,47 @@
-import GetMsg from './GetMsg'
+import GetMsg from './msg/GetMsg'
-import GetLoginInfo from './GetLoginInfo'
+import GetLoginInfo from './system/GetLoginInfo'
-import GetFriendList from './GetFriendList'
+import GetFriendList from './user/GetFriendList'
-import GetGroupList from './GetGroupList'
+import GetGroupList from './group/GetGroupList'
-import GetGroupInfo from './GetGroupInfo'
+import GetGroupInfo from './group/GetGroupInfo'
-import GetGroupMemberList from './GetGroupMemberList'
+import GetGroupMemberList from './group/GetGroupMemberList'
-import GetGroupMemberInfo from './GetGroupMemberInfo'
+import GetGroupMemberInfo from './group/GetGroupMemberInfo'
-import SendGroupMsg from './SendGroupMsg'
+import SendGroupMsg from './group/SendGroupMsg'
-import SendPrivateMsg from './SendPrivateMsg'
+import SendPrivateMsg from './msg/SendPrivateMsg'
-import SendMsg from './SendMsg'
+import SendMsg from './msg/SendMsg'
-import DeleteMsg from "./DeleteMsg";
+import DeleteMsg from "./msg/DeleteMsg";
 import BaseAction from "./BaseAction";
-import GetVersionInfo from "./GetVersionInfo";
+import GetVersionInfo from "./system/GetVersionInfo";
-import CanSendRecord from "./CanSendRecord";
+import CanSendRecord from "./system/CanSendRecord";
-import CanSendImage from "./CanSendImage";
+import CanSendImage from "./system/CanSendImage";
-import GetStatus from "./GetStatus";
+import GetStatus from "./system/GetStatus";
 import {GoCQHTTPSendGroupForwardMsg, GoCQHTTPSendPrivateForwardMsg} from "./go-cqhttp/SendForwardMsg";
 import GoCQHTTPGetStrangerInfo from "./go-cqhttp/GetStrangerInfo";
-import SendLike from "./SendLike";
+import SendLike from "./user/SendLike";
-import SetGroupAddRequest from "./SetGroupAddRequest";
+import SetGroupAddRequest from "./group/SetGroupAddRequest";
-import SetGroupLeave from "./SetGroupLeave";
+import SetGroupLeave from "./group/SetGroupLeave";
-import GetGuildList from "./GetGuildList";
+import GetGuildList from "./group/GetGuildList";
-import Debug from "./Debug";
+import Debug from "./llonebot/Debug";
-import SetFriendAddRequest from "./SetFriendAddRequest";
+import SetFriendAddRequest from "./user/SetFriendAddRequest";
-import SetGroupWholeBan from "./SetGroupWholeBan";
+import SetGroupWholeBan from "./group/SetGroupWholeBan";
-import SetGroupName from "./SetGroupName";
+import SetGroupName from "./group/SetGroupName";
-import SetGroupBan from "./SetGroupBan";
+import SetGroupBan from "./group/SetGroupBan";
-import SetGroupKick from "./SetGroupKick";
+import SetGroupKick from "./group/SetGroupKick";
-import SetGroupAdmin from "./SetGroupAdmin";
+import SetGroupAdmin from "./group/SetGroupAdmin";
-import SetGroupCard from "./SetGroupCard";
+import SetGroupCard from "./group/SetGroupCard";
-import GetImage from "./GetImage";
+import GetImage from "./file/GetImage";
-import GetRecord from "./GetRecord";
+import GetRecord from "./file/GetRecord";
-import GoCQHTTPMarkMsgAsRead from "./MarkMsgAsRead";
+import GoCQHTTPMarkMsgAsRead from "./msg/MarkMsgAsRead";
-import CleanCache from "./CleanCache";
+import CleanCache from "./system/CleanCache";
 import GoCQHTTPUploadGroupFile from "./go-cqhttp/UploadGroupFile";
 import {GetConfigAction, SetConfigAction} from "./llonebot/Config";
 import GetGroupAddRequest from "./llonebot/GetGroupAddRequest";
 import SetQQAvatar from './llonebot/SetQQAvatar'
+import GoCQHTTPDownloadFile from "./go-cqhttp/DownloadFile";
+import GoCQHTTPGetGroupMsgHistory from "./go-cqhttp/GetGroupMsgHistory";
+import GetFile from "./file/GetFile";
 
 export const actionHandlers = [
+    new GetFile(),
     new Debug(),
     new GetConfigAction(),
     new SetConfigAction(),
@@ -72,9 +76,11 @@ export const actionHandlers = [
     new GoCQHTTPSendGroupForwardMsg(),
     new GoCQHTTPSendPrivateForwardMsg(),
     new GoCQHTTPGetStrangerInfo(),
+    new GoCQHTTPDownloadFile(),
     new GetGuildList(),
     new GoCQHTTPMarkMsgAsRead(),
     new GoCQHTTPUploadGroupFile(),
+    new GoCQHTTPGetGroupMsgHistory(),
 
 ]
 

src/onebot11/action/llonebot/Config.ts

@@ -1,8 +1,8 @@
 import BaseAction from "../BaseAction";
 import {Config} from "../../../common/types";
-import {getConfigUtil} from "../../../common/utils";
 import {ActionName} from "../types";
 import {setConfig} from "../../../main/setConfig";
+import {getConfigUtil} from "../../../common/config";
 
 
 export class GetConfigAction extends BaseAction<null, Config> {

src/onebot11/action/llonebot/Debug.ts

@@ -0,0 +1,42 @@
+import BaseAction from "../BaseAction";
+// import * as ntqqApi from "../../../ntqqapi/api";
+import {
+    NTQQMsgApi,
+    NTQQFriendApi,
+    NTQQGroupApi,
+    NTQQUserApi,
+    NTQQFileApi,
+    NTQQFileCacheApi,
+    NTQQWindowApi,
+} from "../../../ntqqapi/api";
+import {ActionName} from "../types";
+import {log} from "../../../common/utils/log";
+
+interface Payload {
+    method: string,
+    args: any[],
+}
+
+export default class Debug extends BaseAction<Payload, any> {
+    actionName = ActionName.Debug
+
+    protected async _handle(payload: Payload): Promise<any> {
+        log("debug call ntqq api", payload);
+        const ntqqApi = [NTQQMsgApi, NTQQFriendApi, NTQQGroupApi, NTQQUserApi, NTQQFileApi, NTQQFileCacheApi, NTQQWindowApi]
+        for (const ntqqApiClass of ntqqApi) {
+            log("ntqqApiClass", ntqqApiClass)
+            const method = ntqqApiClass[payload.method]
+            if (method) {
+                const result = method(...payload.args);
+                if (method.constructor.name === "AsyncFunction") {
+                    return await result
+                }
+                return result
+            }
+        }
+        throw `${payload.method}方法 不存在`
+
+        // const info = await NTQQApi.getUserDetailInfo(friends[0].uid);
+        // return info
+    }
+}

src/onebot11/action/llonebot/GetGroupAddRequest.ts

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

src/onebot11/action/llonebot/SetQQAvatar.ts

@@ -1,9 +1,8 @@
 import BaseAction from "../BaseAction";
-import {NTQQApi} from "../../../ntqqapi/ntcall";
 import {ActionName} from "../types";
-import { uri2local } from "../../utils";
 import * as fs from "node:fs";
-import { checkFileReceived } from "../../../common/utils";
+import {NTQQUserApi} from "../../../ntqqapi/api/user";
+import {checkFileReceived, uri2local} from "../../../common/utils/file";
 // import { log } from "../../../common/utils";
 
 interface Payload {
@@ -20,7 +19,7 @@ export default class SetAvatar extends BaseAction<Payload, null> {
         }
         if (path) {
             await checkFileReceived(path, 5000); // 文件不存在QQ会崩溃，需要提前判断
-            const ret = await NTQQApi.setQQAvatar(path)
+            const ret = await NTQQUserApi.setQQAvatar(path)
             if (!isLocal){
                 fs.unlink(path, () => {})
             }

src/onebot11/action/msg/DeleteMsg.ts

@@ -1,7 +1,7 @@
-import {ActionName} from "./types";
+import {ActionName} from "../types";
-import BaseAction from "./BaseAction";
+import BaseAction from "../BaseAction";
-import {NTQQApi} from "../../ntqqapi/ntcall";
+import {dbUtil} from "../../../common/db";
-import {dbUtil} from "../../common/db";
+import {NTQQMsgApi} from "../../../ntqqapi/api/msg";
 
 interface Payload {
     message_id: number
@@ -12,7 +12,7 @@ class DeleteMsg extends BaseAction<Payload, void> {
 
     protected async _handle(payload: Payload) {
         let msg = await dbUtil.getMsgByShortId(payload.message_id)
-        await NTQQApi.recallMsg({
+        await NTQQMsgApi.recallMsg({
             chatType: msg.chatType,
             peerUid: msg.peerUid
         }, [msg.msgId])

src/onebot11/action/msg/GetMsg.ts

@@ -1,8 +1,8 @@
-import {OB11Message} from '../types';
+import {OB11Message} from '../../types';
-import {OB11Constructor} from "../constructor";
+import {OB11Constructor} from "../../constructor";
-import BaseAction from "./BaseAction";
+import BaseAction from "../BaseAction";
-import {ActionName} from "./types";
+import {ActionName} from "../types";
-import {dbUtil} from "../../common/db";
+import {dbUtil} from "../../../common/db";
 
 
 export interface PayloadType {

src/onebot11/action/msg/MarkMsgAsRead.ts

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

src/onebot11/action/msg/SendMsg.ts

@@ -6,8 +6,15 @@ import {
     RawMessage,
     SendArkElement,
     SendMessageElement
-} from "../../ntqqapi/types";
+} from "../../../ntqqapi/types";
-import {friends, getFriend, getGroup, getGroupMember, getUidByUin, selfInfo,} from "../../common/data";
+import {
+    friends,
+    getFriend,
+    getGroup,
+    getGroupMember,
+    getUidByUin,
+    selfInfo,
+} from "../../../common/data";
 import {
     OB11MessageCustomMusic,
     OB11MessageData,
@@ -15,17 +22,19 @@ import {
     OB11MessageMixType,
     OB11MessageNode,
     OB11PostSendMsg
-} from '../types';
+} from '../../types';
-import {NTQQApi, Peer} from "../../ntqqapi/ntcall";
+import {Peer} from "../../../ntqqapi/api/msg";
-import {SendMsgElementConstructor} from "../../ntqqapi/constructor";
+import {SendMsgElementConstructor} from "../../../ntqqapi/constructor";
-import {uri2local} from "../utils";
+import BaseAction from "../BaseAction";
-import BaseAction from "./BaseAction";
+import {ActionName, BaseCheckResult} from "../types";
-import {ActionName, BaseCheckResult} from "./types";
 import * as fs from "node:fs";
-import {log, sleep} from "../../common/utils";
+import {decodeCQCode} from "../../cqcode";
-import {decodeCQCode} from "../cqcode";
+import {dbUtil} from "../../../common/db";
-import {dbUtil} from "../../common/db";
+import {ALLOW_SEND_TEMP_MSG} from "../../../common/config";
-import {ALLOW_SEND_TEMP_MSG} from "../../common/config";
+import {NTQQMsgApi} from "../../../ntqqapi/api/msg";
+import {log} from "../../../common/utils/log";
+import {sleep} from "../../../common/utils/helper";
+import {uri2local} from "../../../common/utils";
 
 function checkSendMessage(sendMsgList: OB11MessageData[]) {
     function checkUri(uri: string): boolean {
@@ -66,278 +75,25 @@ export interface ReturnDataType {
     message_id: number
 }
 
-export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
+export function convertMessage2List(message: OB11MessageMixType, autoEscape = false) {
-    actionName = ActionName.SendMsg
-
-    protected async check(payload: OB11PostSendMsg): Promise<BaseCheckResult> {
-        const messages = this.convertMessage2List(payload.message);
-        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,
-        }
-    }
-
-    protected async _handle(payload: OB11PostSendMsg) {
-
-        const peer: Peer = {
-            chatType: ChatType.friend,
-            peerUid: ""
-        }
-        let isTempMsg = false;
-        let group: Group | undefined = undefined;
-        const genGroupPeer = async () => {
-            group = await getGroup(payload.group_id.toString())
-            peer.chatType = ChatType.group
-            // peer.name = group.name
-            peer.peerUid = group.groupCode
-        }
-
-        const genFriendPeer = () => {
-            const friend = friends.find(f => f.uin == payload.user_id.toString())
-            if (friend) {
-                // peer.name = friend.nickName
-                peer.peerUid = friend.uid
-            } else {
-                peer.chatType = ChatType.temp
-                const tempUserUid = getUidByUin(payload.user_id.toString())
-                if (!tempUserUid) {
-                    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.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)
-        const returnMsg = await this.send(peer, sendElements, deleteAfterSentFiles)
-        deleteAfterSentFiles.map(f => fs.unlink(f, () => {
-        }));
-        return {message_id: returnMsg.msgShortId}
-    }
-
-    protected convertMessage2List(message: OB11MessageMixType) {
     if (typeof message === "string") {
-            // message = [{
+        if (!autoEscape) {
-            //     type: OB11MessageDataType.text,
-            //     data: {
-            //         text: message
-            //     }
-            // }] as OB11MessageData[]
             message = decodeCQCode(message.toString())
+        } else {
+            message = [{
+                type: OB11MessageDataType.text,
+                data: {
+                    text: message
+                }
+            }]
+        }
     } else if (!Array.isArray(message)) {
         message = [message]
     }
     return message;
 }
 
-    private getSpecialMsgNum(payload: OB11PostSendMsg, msgType: OB11MessageDataType): number {
+export async function createSendElements(messageData: OB11MessageData[], group: Group | undefined, ignoreTypes: OB11MessageDataType[] = []) {
-        if (Array.isArray(payload.message)) {
-            return payload.message.filter(msg => msg.type == msgType).length
-        }
-        return 0
-    }
-
-    private async cloneMsg(msg: RawMessage): Promise<RawMessage> {
-        log("克隆的目标消息", msg)
-        let sendElements: SendMessageElement[] = [];
-        for (const ele of msg.elements) {
-            sendElements.push(ele as SendMessageElement)
-            // Object.keys(ele).forEach((eleKey) => {
-            //     if (eleKey.endsWith("Element")) {
-            //     }
-
-        }
-        if (sendElements.length === 0) {
-            log("需要clone的消息无法解析，将会忽略掉", msg)
-        }
-        log("克隆消息", sendElements)
-        try {
-            const nodeMsg = await NTQQApi.sendMsg({
-                chatType: ChatType.friend,
-                peerUid: selfInfo.uid
-            }, sendElements, true);
-            await sleep(500);
-            return nodeMsg
-        } catch (e) {
-            log(e, "克隆转发消息失败,将忽略本条消息", msg);
-        }
-
-    }
-
-    // 返回一个合并转发的消息id
-    private async handleForwardNode(destPeer: Peer, messageNodes: OB11MessageNode[], group: Group | undefined) {
-
-        const selfPeer = {
-            chatType: ChatType.friend,
-            peerUid: selfInfo.uid
-        }
-        let nodeMsgIds: string[] = []
-        // 先判断一遍是不是id和自定义混用
-        let needClone = messageNodes.filter(node => node.data.id).length && messageNodes.filter(node => !node.data.id).length
-        for (const messageNode of messageNodes) {
-            // 一个node表示一个人的消息
-            let nodeId = messageNode.data.id;
-            // 有nodeId表示一个子转发消息卡片
-            if (nodeId) {
-                let nodeMsg = await dbUtil.getMsgByShortId(parseInt(nodeId));
-                if (!needClone) {
-                    nodeMsgIds.push(nodeMsg.msgId)
-                } else {
-                    if (nodeMsg.peerUid !== selfInfo.uid) {
-                        const cloneMsg = await this.cloneMsg(nodeMsg)
-                        if (cloneMsg) {
-                            nodeMsgIds.push(cloneMsg.msgId)
-                        }
-                    }
-                }
-            } else {
-                // 自定义的消息
-                // 提取消息段，发给自己生成消息id
-                try {
-                    const {
-                        sendElements,
-                        deleteAfterSentFiles
-                    } = await this.createSendElements(this.convertMessage2List(messageNode.data.content), group);
-                    log("开始生成转发节点", sendElements);
-                    let sendElementsSplit: SendMessageElement[][] = []
-                    let splitIndex = 0;
-                    for (const ele of sendElements) {
-                        if (!sendElementsSplit[splitIndex]) {
-                            sendElementsSplit[splitIndex] = []
-                        }
-
-                        if (ele.elementType === ElementType.FILE || ele.elementType === ElementType.VIDEO) {
-                            if (sendElementsSplit[splitIndex].length > 0) {
-                                splitIndex++;
-                            }
-                            sendElementsSplit[splitIndex] = [ele]
-                            splitIndex++;
-                        } else {
-                            sendElementsSplit[splitIndex].push(ele)
-                        }
-                        log(sendElementsSplit)
-                    }
-                    // log("分割后的转发节点", sendElementsSplit)
-                    for (const eles of sendElementsSplit) {
-                        const nodeMsg = await this.send(selfPeer, eles, [], true);
-                        nodeMsgIds.push(nodeMsg.msgId)
-                        await sleep(500);
-                        log("转发节点生成成功", nodeMsg.msgId);
-                    }
-                    deleteAfterSentFiles.map(f => fs.unlink(f, () => {
-                    }));
-
-                } catch (e) {
-                    log("生成转发消息节点失败", e)
-                }
-            }
-        }
-
-        // 检查srcPeer是否一致，不一致则需要克隆成自己的消息, 让所有srcPeer都变成自己的，使其保持一致才能够转发
-        let nodeMsgArray: Array<RawMessage> = []
-        let srcPeer: Peer = null;
-        let needSendSelf = false;
-        for (const [index, msgId] of nodeMsgIds.entries()) {
-            const nodeMsg = await dbUtil.getMsgByLongId(msgId)
-            if (nodeMsg) {
-                nodeMsgArray.push(nodeMsg)
-                if (!srcPeer) {
-                    srcPeer = {chatType: nodeMsg.chatType, peerUid: nodeMsg.peerUid}
-                } else if (srcPeer.peerUid !== nodeMsg.peerUid) {
-                    needSendSelf = true
-                    srcPeer = selfPeer
-                }
-            }
-        }
-        log("nodeMsgArray", nodeMsgArray);
-        nodeMsgIds = nodeMsgArray.map(msg => msg.msgId);
-        if (needSendSelf) {
-            log("需要克隆转发消息");
-            for (const [index, msg] of nodeMsgArray.entries()) {
-                if (msg.peerUid !== selfInfo.uid) {
-                    const cloneMsg = await this.cloneMsg(msg)
-                    if (cloneMsg) {
-                        nodeMsgIds[index] = cloneMsg.msgId
-                    }
-                }
-            }
-        }
-        // elements之间用换行符分隔
-        // let _sendForwardElements: SendMessageElement[] = []
-        // for(let i = 0; i < sendForwardElements.length; i++){
-        //     _sendForwardElements.push(sendForwardElements[i])
-        //     _sendForwardElements.push(SendMsgElementConstructor.text("\n\n"))
-        // }
-        // const nodeMsg = await NTQQApi.sendMsg(selfPeer, _sendForwardElements, true);
-        // nodeIds.push(nodeMsg.msgId)
-        // await sleep(500);
-        // 开发转发
-        try {
-            log("开发转发", nodeMsgIds)
-            return await NTQQApi.multiForwardMsg(srcPeer, destPeer, nodeMsgIds)
-        } catch (e) {
-            log("forward failed", e)
-            return null;
-        }
-    }
-
-    private async createSendElements(messageData: OB11MessageData[], group: Group | undefined, ignoreTypes: OB11MessageDataType[] = []) {
     let sendElements: SendMessageElement[] = []
     let deleteAfterSentFiles: string[] = []
     for (let sendMsg of messageData) {
@@ -416,25 +172,32 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                         if (!isLocal) { // 只删除http和base64转过来的文件
                             deleteAfterSentFiles.push(path)
                         }
-                            const constructorMap = {
-                                [OB11MessageDataType.image]: SendMsgElementConstructor.pic,
-                                [OB11MessageDataType.voice]: SendMsgElementConstructor.ptt,
-                                [OB11MessageDataType.video]: SendMsgElementConstructor.video,
-                                [OB11MessageDataType.file]: SendMsgElementConstructor.file,
-                            }
                         if (sendMsg.type === OB11MessageDataType.file) {
                             log("发送文件", path, payloadFileName || fileName)
                             sendElements.push(await SendMsgElementConstructor.file(path, payloadFileName || fileName));
                         } else if (sendMsg.type === OB11MessageDataType.video) {
                             log("发送视频", path, payloadFileName || fileName)
-                                sendElements.push(await SendMsgElementConstructor.video(path, payloadFileName || fileName));
+                            let thumb = sendMsg.data?.thumb;
-                            } else {
+                            if (thumb) {
-                                sendElements.push(await constructorMap[sendMsg.type](path));
+                                let uri2LocalRes = await uri2local(thumb)
+                                if (uri2LocalRes.success) {
+                                    thumb = uri2LocalRes.path;
+                                }
+                            }
+                            sendElements.push(await SendMsgElementConstructor.video(path, payloadFileName || fileName, thumb));
+                        } else if (sendMsg.type === OB11MessageDataType.voice) {
+                            sendElements.push(await SendMsgElementConstructor.ptt(path));
+                        } else if (sendMsg.type === OB11MessageDataType.image) {
+                            sendElements.push(await SendMsgElementConstructor.pic(path, sendMsg.data.summary || ""));
                         }
                     }
                 }
             }
                 break;
+            case OB11MessageDataType.json: {
+                sendElements.push(SendMsgElementConstructor.ark(sendMsg.data.data))
+            }
+                break
         }
 
     }
@@ -445,11 +208,11 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
     }
 }
 
-    private async send(peer: Peer, sendElements: SendMessageElement[], deleteAfterSentFiles: string[], waitComplete = true) {
+export async function sendMsg(peer: Peer, sendElements: SendMessageElement[], deleteAfterSentFiles: string[], waitComplete = true) {
     if (!sendElements.length) {
         throw ("消息体无法解析")
     }
-        const returnMsg = await NTQQApi.sendMsg(peer, sendElements, waitComplete, 20000);
+    const returnMsg = await NTQQMsgApi.sendMsg(peer, sendElements, waitComplete, 20000);
     log("消息发送结果", returnMsg)
     returnMsg.msgShortId = await dbUtil.addMsg(returnMsg)
     deleteAfterSentFiles.map(f => fs.unlink(f, () => {
@@ -457,6 +220,266 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
     return returnMsg
 }
 
+export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
+    actionName = ActionName.SendMsg
+
+    protected async check(payload: OB11PostSendMsg): Promise<BaseCheckResult> {
+        const messages = convertMessage2List(payload.message);
+        const fmNum = this.getSpecialMsgNum(payload, OB11MessageDataType.node)
+        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 && !(await dbUtil.getReceivedTempUinMap())[payload.user_id.toString()]) {
+                    return {
+                        valid: false,
+                        message: `不能发送临时消息`
+                    }
+                }
+            }
+        }
+        return {
+            valid: true,
+        }
+    }
+
+    protected async _handle(payload: OB11PostSendMsg) {
+
+        const peer: Peer = {
+            chatType: ChatType.friend,
+            peerUid: ""
+        }
+        let isTempMsg = false;
+        let group: Group | undefined = undefined;
+        const genGroupPeer = async () => {
+            group = await getGroup(payload.group_id.toString())
+            peer.chatType = ChatType.group
+            // peer.name = group.name
+            peer.peerUid = group.groupCode
+        }
+
+        const genFriendPeer = () => {
+            const friend = friends.find(f => f.uin == payload.user_id.toString())
+            if (friend) {
+                // peer.name = friend.nickName
+                peer.peerUid = friend.uid
+            } else {
+                peer.chatType = ChatType.temp
+                const tempUserUid = getUidByUin(payload.user_id.toString())
+                if (!tempUserUid) {
+                    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 = convertMessage2List(payload.message);
+        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 createSendElements(messages, group)
+        const returnMsg = await sendMsg(peer, sendElements, deleteAfterSentFiles)
+        deleteAfterSentFiles.map(f => fs.unlink(f, () => {
+        }));
+        return {message_id: returnMsg.msgShortId}
+    }
+
+
+    private getSpecialMsgNum(payload: OB11PostSendMsg, msgType: OB11MessageDataType): number {
+        if (Array.isArray(payload.message)) {
+            return payload.message.filter(msg => msg.type == msgType).length
+        }
+        return 0
+    }
+
+    private async cloneMsg(msg: RawMessage): Promise<RawMessage> {
+        log("克隆的目标消息", msg)
+        let sendElements: SendMessageElement[] = [];
+        for (const ele of msg.elements) {
+            sendElements.push(ele as SendMessageElement)
+            // Object.keys(ele).forEach((eleKey) => {
+            //     if (eleKey.endsWith("Element")) {
+            //     }
+
+        }
+        if (sendElements.length === 0) {
+            log("需要clone的消息无法解析，将会忽略掉", msg)
+        }
+        log("克隆消息", sendElements)
+        try {
+            const nodeMsg = await NTQQMsgApi.sendMsg({
+                chatType: ChatType.friend,
+                peerUid: selfInfo.uid
+            }, sendElements, true);
+            await sleep(500);
+            return nodeMsg
+        } catch (e) {
+            log(e, "克隆转发消息失败,将忽略本条消息", msg);
+        }
+
+    }
+
+    // 返回一个合并转发的消息id
+    private async handleForwardNode(destPeer: Peer, messageNodes: OB11MessageNode[], group: Group | undefined) {
+
+        const selfPeer = {
+            chatType: ChatType.friend,
+            peerUid: selfInfo.uid
+        }
+        let nodeMsgIds: string[] = []
+        // 先判断一遍是不是id和自定义混用
+        let needClone = messageNodes.filter(node => node.data.id).length && messageNodes.filter(node => !node.data.id).length
+        for (const messageNode of messageNodes) {
+            // 一个node表示一个人的消息
+            let nodeId = messageNode.data.id;
+            // 有nodeId表示一个子转发消息卡片
+            if (nodeId) {
+                let nodeMsg = await dbUtil.getMsgByShortId(parseInt(nodeId));
+                if (!needClone) {
+                    nodeMsgIds.push(nodeMsg.msgId)
+                } else {
+                    if (nodeMsg.peerUid !== selfInfo.uid) {
+                        const cloneMsg = await this.cloneMsg(nodeMsg)
+                        if (cloneMsg) {
+                            nodeMsgIds.push(cloneMsg.msgId)
+                        }
+                    }
+                }
+            } else {
+                // 自定义的消息
+                // 提取消息段，发给自己生成消息id
+                try {
+                    const {
+                        sendElements,
+                        deleteAfterSentFiles
+                    } = await createSendElements(convertMessage2List(messageNode.data.content), group);
+                    log("开始生成转发节点", sendElements);
+                    let sendElementsSplit: SendMessageElement[][] = []
+                    let splitIndex = 0;
+                    for (const ele of sendElements) {
+                        if (!sendElementsSplit[splitIndex]) {
+                            sendElementsSplit[splitIndex] = []
+                        }
+
+                        if (ele.elementType === ElementType.FILE || ele.elementType === ElementType.VIDEO) {
+                            if (sendElementsSplit[splitIndex].length > 0) {
+                                splitIndex++;
+                            }
+                            sendElementsSplit[splitIndex] = [ele]
+                            splitIndex++;
+                        } else {
+                            sendElementsSplit[splitIndex].push(ele)
+                        }
+                        log(sendElementsSplit)
+                    }
+                    // log("分割后的转发节点", sendElementsSplit)
+                    for (const eles of sendElementsSplit) {
+                        const nodeMsg = await sendMsg(selfPeer, eles, [], true);
+                        nodeMsgIds.push(nodeMsg.msgId)
+                        await sleep(500);
+                        log("转发节点生成成功", nodeMsg.msgId);
+                    }
+                    deleteAfterSentFiles.map(f => fs.unlink(f, () => {
+                    }));
+
+                } catch (e) {
+                    log("生成转发消息节点失败", e)
+                }
+            }
+        }
+
+        // 检查srcPeer是否一致，不一致则需要克隆成自己的消息, 让所有srcPeer都变成自己的，使其保持一致才能够转发
+        let nodeMsgArray: Array<RawMessage> = []
+        let srcPeer: Peer = null;
+        let needSendSelf = false;
+        for (const [index, msgId] of nodeMsgIds.entries()) {
+            const nodeMsg = await dbUtil.getMsgByLongId(msgId)
+            if (nodeMsg) {
+                nodeMsgArray.push(nodeMsg)
+                if (!srcPeer) {
+                    srcPeer = {chatType: nodeMsg.chatType, peerUid: nodeMsg.peerUid}
+                } else if (srcPeer.peerUid !== nodeMsg.peerUid) {
+                    needSendSelf = true
+                    srcPeer = selfPeer
+                }
+            }
+        }
+        log("nodeMsgArray", nodeMsgArray);
+        nodeMsgIds = nodeMsgArray.map(msg => msg.msgId);
+        if (needSendSelf) {
+            log("需要克隆转发消息");
+            for (const [index, msg] of nodeMsgArray.entries()) {
+                if (msg.peerUid !== selfInfo.uid) {
+                    const cloneMsg = await this.cloneMsg(msg)
+                    if (cloneMsg) {
+                        nodeMsgIds[index] = cloneMsg.msgId
+                    }
+                }
+            }
+        }
+        // elements之间用换行符分隔
+        // let _sendForwardElements: SendMessageElement[] = []
+        // for(let i = 0; i < sendForwardElements.length; i++){
+        //     _sendForwardElements.push(sendForwardElements[i])
+        //     _sendForwardElements.push(SendMsgElementConstructor.text("\n\n"))
+        // }
+        // const nodeMsg = await NTQQApi.sendMsg(selfPeer, _sendForwardElements, true);
+        // nodeIds.push(nodeMsg.msgId)
+        // await sleep(500);
+        // 开发转发
+        try {
+            log("开发转发", nodeMsgIds)
+            return await NTQQMsgApi.multiForwardMsg(srcPeer, destPeer, nodeMsgIds)
+        } catch (e) {
+            log("forward failed", e)
+            return null;
+        }
+    }
+
+
+
+
     private genMusicElement(url: string, audio: string, title: string, content: string, image: string): SendArkElement {
         const musicJson = {
             app: 'com.tencent.structmsg',

src/onebot11/action/msg/SendPrivateMsg.ts

@@ -1,6 +1,6 @@
 import SendMsg from "./SendMsg";
-import {ActionName, BaseCheckResult} from "./types";
+import {ActionName, BaseCheckResult} from "../types";
-import {OB11PostSendMsg} from "../types";
+import {OB11PostSendMsg} from "../../types";
 
 class SendPrivateMsg extends SendMsg {
     actionName = ActionName.SendPrivateMsg

src/onebot11/action/system/CanSendImage.ts

@@ -1,4 +1,4 @@
-import {ActionName} from "./types";
+import {ActionName} from "../types";
 import CanSendRecord from "./CanSendRecord";
 
 interface ReturnType {

src/onebot11/action/system/CanSendRecord.ts

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

src/onebot11/action/system/CleanCache.ts

@@ -1,14 +1,14 @@
-import BaseAction from "./BaseAction";
+import BaseAction from "../BaseAction";
-import {ActionName} from "./types";
+import {ActionName} from "../types";
-import {NTQQApi} from "../../ntqqapi/ntcall";
 import fs from "fs";
 import Path from "path";
 import {
     ChatType,
     ChatCacheListItemBasic,
     CacheFileType
-} from '../../ntqqapi/types';
+} from '../../../ntqqapi/types';
-import {dbUtil} from "../../common/db";
+import {dbUtil} from "../../../common/db";
+import {NTQQFileApi, NTQQFileCacheApi} from "../../../ntqqapi/api/file";
 
 export default class CleanCache extends BaseAction<void, void> {
     actionName = ActionName.CleanCache
@@ -19,21 +19,21 @@ export default class CleanCache extends BaseAction<void, void> {
                 // dbUtil.clearCache();
                 const cacheFilePaths: string[] = [];
 
-                await NTQQApi.setCacheSilentScan(false);
+                await NTQQFileCacheApi.setCacheSilentScan(false);
 
-                cacheFilePaths.push((await NTQQApi.getHotUpdateCachePath()));
+                cacheFilePaths.push((await NTQQFileCacheApi.getHotUpdateCachePath()));
-                cacheFilePaths.push((await NTQQApi.getDesktopTmpPath()));
+                cacheFilePaths.push((await NTQQFileCacheApi.getDesktopTmpPath()));
-                (await NTQQApi.getCacheSessionPathList()).forEach(e => cacheFilePaths.push(e.value));
+                (await NTQQFileCacheApi.getCacheSessionPathList()).forEach(e => cacheFilePaths.push(e.value));
 
                 // await NTQQApi.addCacheScannedPaths(); // XXX: 调用就崩溃，原因目前还未知
-                const cacheScanResult = await NTQQApi.scanCache();
+                const cacheScanResult = await NTQQFileCacheApi.scanCache();
                 const cacheSize = parseInt(cacheScanResult.size[6]);
 
                 if (cacheScanResult.result !== 0) {
                     throw('Something went wrong while scanning cache. Code: ' + cacheScanResult.result);
                 }
 
-                await NTQQApi.setCacheSilentScan(true);
+                await NTQQFileCacheApi.setCacheSilentScan(true);
                 if (cacheSize > 0 && cacheFilePaths.length > 2) { // 存在缓存文件且大小不为 0 时执行清理动作
                     // await NTQQApi.clearCache([ 'tmp', 'hotUpdate', ...cacheScanResult ]) // XXX: 也是调用就崩溃，调用 fs 删除得了
                     deleteCachePath(cacheFilePaths);
@@ -55,11 +55,11 @@ export default class CleanCache extends BaseAction<void, void> {
                     const fileTypeAny: any = CacheFileType[name];
                     const fileType: CacheFileType = fileTypeAny;
 
-                    cacheFileList.push(...(await NTQQApi.getFileCacheInfo(fileType)).infos.map(file => file.fileKey));
+                    cacheFileList.push(...(await NTQQFileCacheApi.getFileCacheInfo(fileType)).infos.map(file => file.fileKey));
                 }
 
                 // 一并清除
-                await NTQQApi.clearChatCache(chatCacheList, cacheFileList);
+                await NTQQFileCacheApi.clearChatCache(chatCacheList, cacheFileList);
                 res();
             } catch(e) {
                 console.error('清理缓存时发生了错误');
@@ -89,7 +89,7 @@ function deleteCachePath(pathList: string[]) {
 
 function getCacheList(type: ChatType) { // NOTE: 做这个方法主要是因为目前还不支持针对频道消息的清理
     return new Promise<Array<ChatCacheListItemBasic>>((res, rej) => {
-        NTQQApi.getChatCacheList(type, 1000, 0)
+        NTQQFileCacheApi.getChatCacheList(type, 1000, 0)
             .then(data => {
                 const list = data.infos.filter(e => e.chatType === type && parseInt(e.basicChatCacheInfo.chatSize) > 0);
                 const result = list.map(e => {

src/onebot11/action/system/GetLoginInfo.ts

@@ -1,8 +1,8 @@
-import {OB11User} from '../types';
+import {OB11User} from '../../types';
-import {OB11Constructor} from "../constructor";
+import {OB11Constructor} from "../../constructor";
-import {selfInfo} from "../../common/data";
+import {selfInfo} from "../../../common/data";
-import BaseAction from "./BaseAction";
+import BaseAction from "../BaseAction";
-import {ActionName} from "./types";
+import {ActionName} from "../types";
 
 
 class GetLoginInfo extends BaseAction<null, OB11User> {

src/onebot11/action/system/GetStatus.ts

@@ -1,7 +1,7 @@
-import BaseAction from "./BaseAction";
+import BaseAction from "../BaseAction";
-import {OB11Status} from "../types";
+import {OB11Status} from "../../types";
-import {ActionName} from "./types";
+import {ActionName} from "../types";
-import {selfInfo} from "../../common/data";
+import {selfInfo} from "../../../common/data";
 
 
 export default class GetStatus extends BaseAction<any, OB11Status> {

src/onebot11/action/system/GetVersionInfo.ts

@@ -1,7 +1,7 @@
-import BaseAction from "./BaseAction";
+import BaseAction from "../BaseAction";
-import {OB11Version} from "../types";
+import {OB11Version} from "../../types";
-import {ActionName} from "./types";
+import {ActionName} from "../types";
-import {version} from "../../version";
+import {version} from "../../../version";
 
 export default class GetVersionInfo extends BaseAction<any, OB11Version> {
     actionName = ActionName.GetVersionInfo

src/onebot11/action/types.ts

@@ -14,11 +14,14 @@ export interface InvalidCheckResult {
 }
 
 export enum ActionName {
+    // llonebot
     GetGroupIgnoreAddRequest = "get_group_ignore_add_request",
     SetQQAvatar = "set_qq_avatar",
     GetConfig = "get_config",
     SetConfig = "set_config",
     Debug = "llonebot_debug",
+    GetFile = "get_file",
+    // onebot 11
     SendLike = "send_like",
     GetLoginInfo = "get_login_info",
     GetFriendList = "get_friend_list",
@@ -54,4 +57,6 @@ export enum ActionName {
     GetGuildList = "get_guild_list",
     GoCQHTTP_MarkMsgAsRead = "mark_msg_as_read",
     GoCQHTTP_UploadGroupFile = "upload_group_file",
+    GoCQHTTP_DownloadFile = "download_file",
+    GoCQHTTP_GetGroupMsgHistory = "get_group_msg_history",
 }

src/onebot11/action/user/GetFriendList.ts

@@ -1,8 +1,8 @@
-import {OB11User} from '../types';
+import {OB11User} from '../../types';
-import {OB11Constructor} from "../constructor";
+import {OB11Constructor} from "../../constructor";
-import {friends} from "../../common/data";
+import {friends} from "../../../common/data";
-import BaseAction from "./BaseAction";
+import BaseAction from "../BaseAction";
-import {ActionName} from "./types";
+import {ActionName} from "../types";
 
 
 class GetFriendList extends BaseAction<null, OB11User[]> {

src/onebot11/action/user/SendLike.ts

@@ -1,8 +1,8 @@
-import BaseAction from "./BaseAction";
+import BaseAction from "../BaseAction";
-import {getFriend, getUidByUin, uidMaps} from "../../common/data";
+import {getFriend, getUidByUin, uidMaps} from "../../../common/data";
-import {NTQQApi} from "../../ntqqapi/ntcall";
+import {ActionName} from "../types";
-import {ActionName} from "./types";
+import {NTQQFriendApi} from "../../../ntqqapi/api/friend";
-import {log} from "../../common/utils";
+import {log} from "../../../common/utils/log";
 
 interface Payload {
     user_id: number,
@@ -23,7 +23,7 @@ export default class SendLike extends BaseAction<Payload, null> {
             } else {
                 uid = friend.uid
             }
-            let result = await NTQQApi.likeFriend(uid, parseInt(payload.times?.toString()) || 1);
+            let result = await NTQQFriendApi.likeFriend(uid, parseInt(payload.times?.toString()) || 1);
             if (result.result !== 0) {
                 throw result.errMsg
             }

src/onebot11/action/user/SetFriendAddRequest.ts

@@ -1,6 +1,6 @@
-import BaseAction from "./BaseAction";
+import BaseAction from "../BaseAction";
-import {NTQQApi} from "../../ntqqapi/ntcall";
+import {ActionName} from "../types";
-import {ActionName} from "./types";
+import {NTQQFriendApi} from "../../../ntqqapi/api/friend";
 
 interface Payload {
     flag: string,
@@ -12,7 +12,8 @@ export default class SetFriendAddRequest extends BaseAction<Payload, null> {
     actionName = ActionName.SetFriendAddRequest;
 
     protected async _handle(payload: Payload): Promise<null> {
-        await NTQQApi.handleFriendRequest(parseInt(payload.flag), payload.approve)
+        const approve = payload.approve.toString() === "true";
+        await NTQQFriendApi.handleFriendRequest(parseInt(payload.flag), approve)
         return null;
     }
 }

src/onebot11/constructor.ts

@@ -11,17 +11,17 @@ import {
 import {
     AtType,
     ChatType,
+    GrayTipElementSubType,
     Group,
     GroupMember,
     IMAGE_HTTP_HOST,
     RawMessage,
     SelfInfo,
+    Sex,
     TipGroupElementType,
-    User
+    User, VideoElement
 } from '../ntqqapi/types';
-import {getFriend, getGroup, getGroupMember, selfInfo, tempGroupCodeMap} from '../common/data';
+import {getFriend, getGroupMember, selfInfo, tempGroupCodeMap} from '../common/data';
-import {getConfigUtil, log, sleep} from "../common/utils";
-import {NTQQApi} from "../ntqqapi/ntcall";
 import {EventType} from "./event/OB11BaseEvent";
 import {encodeCQCode} from "./cqcode";
 import {dbUtil} from "../common/db";
@@ -29,6 +29,14 @@ import {OB11GroupIncreaseEvent} from "./event/notice/OB11GroupIncreaseEvent";
 import {OB11GroupBanEvent} from "./event/notice/OB11GroupBanEvent";
 import {OB11GroupUploadNoticeEvent} from "./event/notice/OB11GroupUploadNoticeEvent";
 import {OB11GroupNoticeEvent} from "./event/notice/OB11GroupNoticeEvent";
+import {NTQQUserApi} from "../ntqqapi/api/user";
+import {NTQQFileApi} from "../ntqqapi/api/file";
+import {calcQQLevel} from "../common/utils/qqlevel";
+import {log} from "../common/utils/log";
+import {sleep} from "../common/utils/helper";
+import {getConfigUtil} from "../common/config";
+import {OB11GroupTitleEvent} from "./event/notice/OB11GroupTitleEvent";
+import {OB11GroupCardEvent} from "./event/notice/OB11GroupCardEvent";
 
 
 export class OB11Constructor {
@@ -143,41 +151,31 @@ export class OB11Constructor {
                     fileSize: element.picElement.fileSize.toString(),
                     url: message_data["data"]["url"],
                     downloadFunc: async () => {
-                        await NTQQApi.downloadMedia(msg.msgId, msg.chatType, msg.peerUid,
+                        await NTQQFileApi.downloadMedia(msg.msgId, msg.chatType, msg.peerUid,
                             element.elementId, element.picElement.thumbPath?.get(0) || "", element.picElement.sourcePath)
                     }
                 }).then()
                 // 不在自动下载图片
 
-            } else if (element.videoElement) {
+            } else if (element.videoElement || element.fileElement) {
-                message_data["type"] = OB11MessageDataType.video;
+                const videoOrFileElement = element.videoElement || element.fileElement
-                message_data["data"]["file"] = element.videoElement.fileName
+                const ob11MessageDataType = element.videoElement ? OB11MessageDataType.video : OB11MessageDataType.file
-                message_data["data"]["path"] = element.videoElement.filePath
+                message_data["type"] = ob11MessageDataType;
-                // message_data["data"]["file_id"] = element.videoElement.fileUuid
+                message_data["data"]["file"] = videoOrFileElement.fileName
-                message_data["data"]["file_size"] = element.videoElement.fileSize
+                message_data["data"]["path"] = videoOrFileElement.filePath
-                dbUtil.addFileCache(element.videoElement.fileName, {
+                message_data["data"]["file_id"] = videoOrFileElement.fileUuid
-                    fileName: element.videoElement.fileName,
+                message_data["data"]["file_size"] = videoOrFileElement.fileSize
-                    filePath: element.videoElement.filePath,
+                dbUtil.addFileCache(videoOrFileElement.fileUuid, {
-                    fileSize: element.videoElement.fileSize,
+                    msgId: msg.msgId,
+                    fileName: videoOrFileElement.fileName,
+                    filePath: videoOrFileElement.filePath,
+                    fileSize: videoOrFileElement.fileSize,
                     downloadFunc: async () => {
-                        await NTQQApi.downloadMedia(msg.msgId, msg.chatType, msg.peerUid,
+                        await NTQQFileApi.downloadMedia(
-                            element.elementId, element.videoElement.thumbPath.get(0), element.videoElement.filePath)
+                            msg.msgId, msg.chatType, msg.peerUid,
-                    }
+                            element.elementId,
-                }).then()
+                            ob11MessageDataType == OB11MessageDataType.video ? (videoOrFileElement as VideoElement).thumbPath.get(0) : null,
-                // 怎么拿到url呢
+                            videoOrFileElement.filePath)
-            } else if (element.fileElement) {
-                message_data["type"] = OB11MessageDataType.file;
-                message_data["data"]["file"] = element.fileElement.fileName
-                // message_data["data"]["path"] = element.fileElement.filePath
-                // message_data["data"]["file_id"] = element.fileElement.fileUuid
-                message_data["data"]["file_size"] = element.fileElement.fileSize
-                dbUtil.addFileCache(element.fileElement.fileName, {
-                    fileName: element.fileElement.fileName,
-                    filePath: element.fileElement.filePath,
-                    fileSize: element.fileElement.fileSize,
-                    downloadFunc: async () => {
-                        await NTQQApi.downloadMedia(msg.msgId, msg.chatType, msg.peerUid,
-                            element.elementId, null, element.fileElement.filePath)
                     }
                 }).then()
                 // 怎么拿到url呢
@@ -206,33 +204,6 @@ export class OB11Constructor {
                 message_data["type"] = OB11MessageDataType.face;
                 message_data["data"]["id"] = element.faceElement.faceIndex.toString();
             }
-            // todo: 解析入群grayTipElement
-            else if (element.grayTipElement?.aioOpGrayTipElement) {
-                log("收到 group gray tip 消息", element.grayTipElement.aioOpGrayTipElement)
-            }
-            // if (message_data.data.file) {
-            //     let filePath: string = message_data.data.file;
-            //     if (!enableLocalFile2Url) {
-            //         message_data.data.file = "file://" + filePath
-            //     } else { // 不使用本地路径
-            //         const ignoreTypes = [OB11MessageDataType.file, OB11MessageDataType.video]
-            //         if (!ignoreTypes.includes(message_data.type)) {
-            //             if (message_data.data.url && !message_data.data.url.startsWith(IMAGE_HTTP_HOST + "/download")) {
-            //                 message_data.data.file = message_data.data.url
-            //             } else {
-            //                 let { err, data } = await file2base64(filePath);
-            //                 if (err) {
-            //                     log("文件转base64失败", filePath, err)
-            //                 } else {
-            //                     message_data.data.file = "base64://" + data
-            //                 }
-            //             }
-            //         } else {
-            //             message_data.data.file = "file://" + filePath
-            //         }
-            //     }
-            // }
-
             if (message_data.type !== "unknown" && message_data.data) {
                 const cqCode = encodeCQCode(message_data);
                 if (messagePostFormat === 'string') {
@@ -250,8 +221,17 @@ export class OB11Constructor {
         if (msg.chatType !== ChatType.group) {
             return;
         }
+        if (msg.senderUin){
+            let member = await getGroupMember(msg.peerUid, msg.senderUin);
+            if (member && member.cardName !== msg.sendMemberName) {
+                member.cardName = msg.sendMemberName;
+                return new OB11GroupCardEvent(parseInt(msg.peerUid), parseInt(msg.senderUin), msg.sendMemberName, member.cardName)
+            }
+        }
+        // log("group msg", msg);
         for (let element of msg.elements) {
-            const groupElement = element.grayTipElement?.groupElement
+            const grayTipElement = element.grayTipElement
+            const groupElement = grayTipElement?.groupElement
             if (groupElement) {
                 // log("收到群提示消息", groupElement)
                 if (groupElement.type == TipGroupElementType.memberIncrease) {
@@ -260,7 +240,7 @@ export class OB11Constructor {
                     const member = await getGroupMember(msg.peerUid, groupElement.memberUid);
                     let memberUin = member?.uin;
                     if (!memberUin) {
-                        memberUin = (await NTQQApi.getUserDetailInfo(groupElement.memberUid)).uin
+                        memberUin = (await NTQQUserApi.getUserDetailInfo(groupElement.memberUid)).uin
                     }
                     // log("获取新群成员QQ", memberUin)
                     const adminMember = await getGroupMember(msg.peerUid, groupElement.adminUid);
@@ -271,8 +251,7 @@ export class OB11Constructor {
                         // log("构造群增加事件", event)
                         return event;
                     }
-                }
+                } else if (groupElement.type === TipGroupElementType.ban) {
-                else if (groupElement.type === TipGroupElementType.ban) {
                     log("收到群群员禁言提示", groupElement)
                     const memberUid = groupElement.shutUp.member.uid
                     const adminUid = groupElement.shutUp.admin.uid
@@ -280,22 +259,75 @@ export class OB11Constructor {
                     let duration = parseInt(groupElement.shutUp.duration)
                     let sub_type: "ban" | "lift_ban" = duration > 0 ? "ban" : "lift_ban"
                     if (memberUid) {
-                        memberUin = (await getGroupMember(msg.peerUid, memberUid))?.uin || (await NTQQApi.getUserDetailInfo(memberUid))?.uin
+                        memberUin = (await getGroupMember(msg.peerUid, memberUid))?.uin || (await NTQQUserApi.getUserDetailInfo(memberUid))?.uin
-                    }
+                    } else {
-                    else {
                         memberUin = "0";  // 0表示全员禁言
                         if (duration > 0) {
                             duration = -1
                         }
                     }
-                    const adminUin = (await getGroupMember(msg.peerUid, adminUid))?.uin || (await NTQQApi.getUserDetailInfo(adminUid))?.uin
+                    const adminUin = (await getGroupMember(msg.peerUid, adminUid))?.uin || (await NTQQUserApi.getUserDetailInfo(adminUid))?.uin
                     if (memberUin && adminUin) {
                         return new OB11GroupBanEvent(parseInt(msg.peerUid), parseInt(memberUin), parseInt(adminUin), duration, sub_type);
                     }
                 }
+            } else if (element.fileElement) {
+                return new OB11GroupUploadNoticeEvent(parseInt(msg.peerUid), parseInt(msg.senderUin), {
+                    id: element.fileElement.fileUuid,
+                    name: element.fileElement.fileName,
+                    size: parseInt(element.fileElement.fileSize)
+                })
+            }
+
+            if (grayTipElement) {
+                if (grayTipElement.subElementType == GrayTipElementSubType.INVITE_NEW_MEMBER) {
+                    log("收到新人被邀请进群消息", grayTipElement)
+                    const xmlElement = grayTipElement.xmlElement
+                    if (xmlElement?.content) {
+                        const regex = /jp="(\d+)"/g;
+
+                        let matches = [];
+                        let match = null
+
+                        while ((match = regex.exec(xmlElement.content)) !== null) {
+                            matches.push(match[1]);
+                        }
+                        if (matches.length === 2) {
+                            const [inviter, invitee] = matches;
+                            return new OB11GroupIncreaseEvent(parseInt(msg.peerUid), parseInt(invitee), parseInt(inviter), "invite");
+                        }
+                    }
+                } else if (grayTipElement.subElementType == GrayTipElementSubType.MEMBER_NEW_TITLE) {
+                    const json = JSON.parse(grayTipElement.jsonGrayTipElement.jsonStr)
+                    /*
+                    {
+                      align: 'center',
+                      items: [
+                        { txt: '恭喜', type: 'nor' },
+                        {
+                          col: '3',
+                          jp: '5',
+                          param: ["QQ号"],
+                          txt: '林雨辰',
+                          type: 'url'
+                        },
+                        { txt: '获得群主授予的', type: 'nor' },
+                        {
+                          col: '3',
+                          jp: '',
+                          txt: '好好好',
+                          type: 'url'
+                        },
+                        { txt: '头衔', type: 'nor' }
+                      ]
+                    }
+
+                    * */
+                    const memberUin = json.items[1].param[0]
+                    const title = json.items[3].txt
+                    log("收到群成员新头衔消息", json)
+                    return new OB11GroupTitleEvent(parseInt(msg.peerUid), parseInt(memberUin), title)
                 }
-            else if (element.fileElement){
-                return new OB11GroupUploadNoticeEvent(parseInt(msg.peerUid), parseInt(msg.senderUin), {id: element.fileElement.fileName, name: element.fileElement.fileName, size: parseInt(element.fileElement.fileSize)})
             }
         }
     }
@@ -304,15 +336,16 @@ export class OB11Constructor {
         return {
             user_id: parseInt(friend.uin),
             nickname: friend.nick,
-            remark: friend.remark
+            remark: friend.remark,
+            sex: OB11Constructor.sex(friend.sex),
+            level: friend.qqLevel && calcQQLevel(friend.qqLevel) || 0
         }
-
     }
 
     static selfInfo(selfInfo: SelfInfo): OB11User {
         return {
             user_id: parseInt(selfInfo.uin),
-            nickname: selfInfo.nick
+            nickname: selfInfo.nick,
         }
     }
 
@@ -328,16 +361,26 @@ export class OB11Constructor {
         }[role]
     }
 
+    static sex(sex: Sex): OB11UserSex {
+        const sexMap = {
+            [Sex.male]: OB11UserSex.male,
+            [Sex.female]: OB11UserSex.female,
+            [Sex.unknown]: OB11UserSex.unknown
+        }
+        return sexMap[sex] || OB11UserSex.unknown
+    }
+
     static groupMember(group_id: string, member: GroupMember): OB11GroupMember {
         return {
             group_id: parseInt(group_id),
             user_id: parseInt(member.uin),
             nickname: member.nick,
             card: member.cardName,
-            sex: OB11UserSex.unknown,
+            sex: OB11Constructor.sex(member.sex),
             age: 0,
             area: "",
             level: 0,
+            qq_level: member.qqLevel && calcQQLevel(member.qqLevel) || 0,
             join_time: 0,  // 暂时没法获取
             last_sent_time: 0,  // 暂时没法获取
             title_expire_time: 0,
@@ -349,6 +392,19 @@ export class OB11Constructor {
         }
     }
 
+    static stranger(user: User): OB11User {
+        return {
+            ...user,
+            user_id: parseInt(user.uin),
+            nickname: user.nick,
+            sex: OB11Constructor.sex(user.sex),
+            age: 0,
+            qid: user.qid,
+            login_days: 0,
+            level: user.qqLevel && calcQQLevel(user.qqLevel) || 0,
+        }
+    }
+
     static groupMembers(group: Group): OB11GroupMember[] {
         log("construct ob11 group members", group)
         return group.members.map(m => OB11Constructor.groupMember(group.groupCode, m))

src/onebot11/event/notice/OB11GroupCardEvent.ts

@@ -0,0 +1,16 @@
+import {OB11GroupNoticeEvent} from "./OB11GroupNoticeEvent";
+
+export class OB11GroupCardEvent extends OB11GroupNoticeEvent {
+    notice_type = "group_card";
+    card_new: string;
+    card_old: string;
+
+
+    constructor(groupId: number, userId: number, cardNew: string, cardOld: string) {
+        super();
+        this.group_id = groupId;
+        this.user_id = userId;
+        this.card_new = cardNew;
+        this.card_old = cardOld;
+    }
+}

src/onebot11/event/notice/OB11GroupIncreaseEvent.ts

@@ -1,14 +1,15 @@
 import {OB11GroupNoticeEvent} from "./OB11GroupNoticeEvent";
 
+type GroupIncreaseSubType = "approve" | "invite";
 export class OB11GroupIncreaseEvent extends OB11GroupNoticeEvent {
     notice_type = "group_increase";
-    sub_type = "approve";  // TODO: 实现其他几种子类型的识别 ("approve" | "invite")
     operator_id: number;
-
+    sub_type: GroupIncreaseSubType;
-    constructor(groupId: number, userId: number, operatorId: number) {
+    constructor(groupId: number, userId: number, operatorId: number, subType: GroupIncreaseSubType = "approve") {
         super();
         this.group_id = groupId;
         this.operator_id = operatorId;
         this.user_id = userId;
+        this.sub_type = subType
     }
 }

src/onebot11/event/notice/OB11GroupTitleEvent.ts

@@ -0,0 +1,15 @@
+import {OB11GroupNoticeEvent} from "./OB11GroupNoticeEvent";
+
+export class OB11GroupTitleEvent extends OB11GroupNoticeEvent {
+    notice_type = "notify";
+    sub_type = "title";
+    title: string
+
+
+    constructor(groupId: number, userId: number, title: string) {
+        super();
+        this.group_id = groupId;
+        this.user_id = userId;
+        this.title = title;
+    }
+}

src/onebot11/event/notice/OB11PokeEvent.ts

@@ -0,0 +1,30 @@
+import {OB11BaseNoticeEvent} from "./OB11BaseNoticeEvent";
+import {selfInfo} from "../../../common/data";
+import {OB11BaseEvent} from "../OB11BaseEvent";
+
+class OB11PokeEvent extends OB11BaseNoticeEvent{
+    notice_type = "notify"
+    sub_type = "poke"
+    target_id = parseInt(selfInfo.uin)
+    user_id: number
+}
+
+export class OB11FriendPokeEvent extends OB11PokeEvent{
+    sender_id: number
+    constructor(user_id: number) {
+        super();
+        this.user_id = user_id;
+        this.sender_id = user_id;
+    }
+}
+
+export class OB11GroupPokeEvent extends OB11PokeEvent{
+    group_id: number
+
+    constructor(group_id: number, user_id: number=0) {
+        super();
+        this.group_id = group_id;
+        this.target_id = user_id;
+        this.user_id = user_id;
+    }
+}

src/onebot11/server/http.ts

@@ -1,8 +1,8 @@
 import {Response} from "express";
-import {getConfigUtil} from "../../common/utils";
+import {OB11Response} from "../action/OB11Response";
-import {OB11Response} from "../action/utils";
 import {HttpServerBase} from "../../common/server/http";
 import {actionHandlers} from "../action";
+import {getConfigUtil} from "../../common/config";
 
 class OB11HTTPServer extends HttpServerBase {
     name = "OneBot V11 server"

src/onebot11/server/postOB11Event.ts

@@ -1,13 +1,53 @@
-import {getConfigUtil, log} from "../../common/utils";
+import {OB11Message, OB11MessageAt, OB11MessageData} from "../types";
-import {OB11Message} from "../types";
+import {getGroup, selfInfo} from "../../common/data";
-import {selfInfo} from "../../common/data";
 import {OB11BaseMetaEvent} from "../event/meta/OB11BaseMetaEvent";
 import {OB11BaseNoticeEvent} from "../event/notice/OB11BaseNoticeEvent";
 import {WebSocket as WebSocketClass} from "ws";
 import {wsReply} from "./ws/reply";
+import {log} from "../../common/utils/log";
+import {getConfigUtil} from "../../common/config";
+import crypto from 'crypto';
+import {NTQQFriendApi, NTQQGroupApi, NTQQMsgApi, Peer} from "../../ntqqapi/api";
+import {ChatType, Group, GroupRequestOperateTypes} from "../../ntqqapi/types";
+import {convertMessage2List, createSendElements, sendMsg} from "../action/msg/SendMsg";
+import {dbUtil} from "../../common/db";
+import {OB11FriendRequestEvent} from "../event/request/OB11FriendRequest";
+import {OB11GroupRequestEvent} from "../event/request/OB11GroupRequest";
+import {isNull} from "../../common/utils";
 
 export type PostEventType = OB11Message | OB11BaseMetaEvent | OB11BaseNoticeEvent
 
+interface QuickActionPrivateMessage {
+    reply?: string;
+    auto_escape?: boolean;
+}
+
+interface QuickActionGroupMessage extends QuickActionPrivateMessage {
+    // 回复群消息
+    at_sender?: boolean
+    delete?: boolean
+    kick?: boolean
+    ban?: boolean
+    ban_duration?: number
+    //
+}
+
+interface QuickActionFriendRequest {
+    approve?: boolean
+    remark?: string
+}
+
+interface QuickActionGroupRequest {
+    approve?: boolean
+    reason?: string
+}
+
+type QuickAction =
+    QuickActionPrivateMessage
+    & QuickActionGroupMessage
+    & QuickActionFriendRequest
+    & QuickActionGroupRequest
+
 const eventWSList: WebSocketClass[] = [];
 
 export function registerWsEventSender(ws: WebSocketClass) {
@@ -38,18 +78,95 @@ export function postOB11Event(msg: PostEventType, reportSelf = false) {
         }
     }
     if (config.ob11.enableHttpPost) {
+        const msgStr = JSON.stringify(msg);
+        const hmac = crypto.createHmac('sha1', config.ob11.httpSecret);
+        hmac.update(msgStr);
+        const sig = hmac.digest('hex');
+        let headers = {
+            "Content-Type": "application/json",
+            "x-self-id": selfInfo.uin
+        }
+        if (config.ob11.httpSecret) {
+            headers["x-signature"] = "sha1=" + sig;
+        }
         for (const host of config.ob11.httpHosts) {
             fetch(host, {
                 method: "POST",
-                headers: {
+                headers,
-                    "Content-Type": "application/json",
+                body: msgStr
-                    "x-self-id": selfInfo.uin
+            }).then(async (res) => {
-                },
+                log(`新消息事件HTTP上报成功: ${host} `, msgStr);
-                body: JSON.stringify(msg)
+                // todo: 处理不够优雅，应该使用高级泛型进行QuickAction类型识别
-            }).then((res: any) => {
+                let resJson: QuickAction;
-                log(`新消息事件HTTP上报成功: ${host} ` + JSON.stringify(msg));
+                try {
+                    resJson = await res.json();
+                    log(`新消息事件HTTP上报返回快速操作: `, JSON.stringify(resJson))
+                } catch (e) {
+                    log(`新消息事件HTTP上报没有返回快速操作，不需要处理`)
+                    return
+                }
+                if (msg.post_type === "message") {
+                    msg = msg as OB11Message;
+                    const rawMessage = await dbUtil.getMsgByShortId(msg.message_id)
+                    resJson = resJson as QuickActionPrivateMessage | QuickActionGroupMessage
+                    const reply = resJson.reply
+                    let peer: Peer = {
+                        chatType: ChatType.friend,
+                        peerUid: msg.user_id.toString()
+                    }
+                    if (msg.message_type == "private") {
+                        if (msg.sub_type === "group") {
+                            peer.chatType = ChatType.temp
+                        }
+                    } else {
+                        peer.chatType = ChatType.group
+                        peer.peerUid = msg.group_id.toString()
+                    }
+                    if (reply) {
+                        let group: Group = null
+                        let replyMessage: OB11MessageData[] = []
+
+                        if (msg.message_type == "group") {
+                            group = await getGroup(msg.group_id.toString())
+                            if ((resJson as QuickActionGroupMessage).at_sender) {
+                                replyMessage.push({
+                                    type: "at",
+                                    data: {
+                                        qq: msg.user_id.toString()
+                                    }
+                                } as OB11MessageAt)
+                            }
+                        }
+                        replyMessage = replyMessage.concat(convertMessage2List(reply, resJson.auto_escape))
+                        const {sendElements, deleteAfterSentFiles} = await createSendElements(replyMessage, group)
+                        sendMsg(peer, sendElements, deleteAfterSentFiles, false).then()
+                    } else if (resJson.delete) {
+                        NTQQMsgApi.recallMsg(peer, [rawMessage.msgId]).then()
+                    } else if (resJson.kick) {
+                        NTQQGroupApi.kickMember(peer.peerUid, [rawMessage.senderUid]).then()
+                    } else if (resJson.ban) {
+                        NTQQGroupApi.banMember(peer.peerUid, [{
+                            uid: rawMessage.senderUid,
+                            timeStamp: resJson.ban_duration || 60 * 30
+                        }],).then()
+                    }
+
+                } else if (msg.post_type === "request") {
+                    if ((msg as OB11FriendRequestEvent).request_type === "friend") {
+                        resJson = resJson as QuickActionFriendRequest
+                        if (!isNull(resJson.approve)) {
+                            // todo: set remark
+                            NTQQFriendApi.handleFriendRequest(parseInt((msg as OB11FriendRequestEvent).flag), resJson.approve).then()
+                        }
+                    } else if ((msg as OB11GroupRequestEvent).request_type === "group") {
+                        resJson = resJson as QuickActionGroupRequest
+                        if (!isNull(resJson.approve)) {
+                            NTQQGroupApi.handleGroupRequest((msg as OB11FriendRequestEvent).flag, resJson.approve ? GroupRequestOperateTypes.approve : GroupRequestOperateTypes.reject, resJson.reason).then()
+                        }
+                    }
+                }
             }, (err: any) => {
-                log(`新消息事件HTTP上报失败: ${host} ` + err + JSON.stringify(msg));
+                log(`新消息事件HTTP上报失败: ${host} `, err, msg);
             });
         }
     }

src/onebot11/server/ws/ReverseWebsocket.ts

@@ -1,16 +1,15 @@
-import {getConfigUtil, log} from "../../../common/utils";
-
-
 import {selfInfo} from "../../../common/data";
 import {LifeCycleSubType, OB11LifeCycleEvent} from "../../event/meta/OB11LifeCycleEvent";
 import {ActionName} from "../../action/types";
-import {OB11Response} from "../../action/utils";
+import {OB11Response} from "../../action/OB11Response";
 import BaseAction from "../../action/BaseAction";
 import {actionMap} from "../../action";
 import {postWsEvent, registerWsEventSender, unregisterWsEventSender} from "../postOB11Event";
 import {wsReply} from "./reply";
 import {WebSocket as WebSocketClass} from "ws";
 import {OB11HeartbeatEvent} from "../../event/meta/OB11HeartbeatEvent";
+import {log} from "../../../common/utils/log";
+import {getConfigUtil} from "../../../common/config";
 
 export let rwsList: ReverseWebsocket[] = [];
 

src/onebot11/server/ws/WebsocketServer.ts

@@ -1,7 +1,6 @@
 import {WebSocket} from "ws";
-import {getConfigUtil, log} from "../../../common/utils";
 import {actionMap} from "../../action";
-import {OB11Response} from "../../action/utils";
+import {OB11Response} from "../../action/OB11Response";
 import {postWsEvent, registerWsEventSender, unregisterWsEventSender} from "../postOB11Event";
 import {ActionName} from "../../action/types";
 import BaseAction from "../../action/BaseAction";
@@ -11,6 +10,8 @@ import {WebsocketServerBase} from "../../../common/server/websocket";
 import {IncomingMessage} from "node:http";
 import {wsReply} from "./reply";
 import {selfInfo} from "../../../common/data";
+import {log} from "../../../common/utils/log";
+import {getConfigUtil} from "../../../common/config";
 
 let heartbeatRunning = false;