fix: ws max payload

fix: http quick action handle friend request

.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

manifest.json

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

package-lock.json

@@ -9,12 +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",
-        "node-stream-zip": "^1.15.0",
+        "silk-wasm": "^3.3.4",
-        "silk-wasm": "^3.2.3",
         "utf-8-validate": "^6.0.3",
         "uuid": "^9.0.1",
         "ws": "^8.16.0"
@@ -551,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",
@@ -2151,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",
@@ -2281,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",
@@ -2515,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",
@@ -2559,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",
@@ -2813,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"
       }
@@ -3636,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",
@@ -3738,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",
@@ -3763,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",
@@ -3859,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",
@@ -4859,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",
@@ -4931,18 +5066,6 @@
       "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==",
       "dev": true
     },
-    "node_modules/node-stream-zip": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/node-stream-zip/-/node-stream-zip-1.15.0.tgz",
-      "integrity": "sha512-LN4fydt9TqhZhThkZIVQnF9cwjU3qmUH9h78Mx/K7d3VvfRqqwthLwJEUOEL0QPZ0XQmNN7be5Ggit5+4dq3Bw==",
-      "engines": {
-        "node": ">=0.12.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/antelle"
-      }
-    },
     "node_modules/normalize-url": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
@@ -5052,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"
       }
@@ -5165,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",
@@ -5232,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",
@@ -5257,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"
@@ -5770,9 +5895,9 @@
       }
     },
     "node_modules/silk-wasm": {
-      "version": "3.2.3",
+      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/silk-wasm/-/silk-wasm-3.2.3.tgz",
+      "resolved": "https://registry.npmjs.org/silk-wasm/-/silk-wasm-3.3.4.tgz",
-      "integrity": "sha512-zZ3hgMpiPR6cFnKvCPgPpCwx6n5RoJCbEGIFlge2kAxAmgzBTf0b2F2xIPG5W4obUhQPQXXTTH074eGZJK01xw=="
+      "integrity": "sha512-cvjp9Zw50uPB46EfifHlO8gIh6buZOUKQaL+9BbPoLgH4bAp8wEEzVmPI34gIiltOUyeuEknm4DDGnE3kEEQ/A=="
     },
     "node_modules/slash": {
       "version": "4.0.0",
@@ -5833,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",
@@ -5959,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",
@@ -5985,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",
@@ -6528,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",
@@ -6551,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",
@@ -6567,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,12 +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",
-    "node-stream-zip": "^1.15.0",
+    "silk-wasm": "^3.3.4",
-    "silk-wasm": "^3.2.3",
     "utf-8-validate": "^6.0.3",
     "uuid": "^9.0.1",
     "ws": "^8.16.0"

src/common/channels.ts

@@ -3,5 +3,5 @@ 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_CHECKVERSION = 'llonebot_checkversion'
+export const CHANNEL_CHECK_VERSION = 'llonebot_check_version'
 export const CHANNEL_SELECT_FILE = 'llonebot_select_ffmpeg'

src/common/config.ts

@@ -1,4 +1,5 @@
 import fs from "fs";
+import fsPromise from "fs/promises";
 import {Config, OB11Config} from './types';
 
 import {mergeNewProperties} from "./utils/helper";
@@ -30,6 +31,7 @@ export class ConfigUtil {
         let ob11Default: OB11Config = {
             httpPort: 3000,
             httpHosts: [],
+            httpSecret: "",
             wsPort: 3001,
             wsHosts: [],
             enableHttp: true,

src/common/data.ts

@@ -21,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未能正常启动，请检查日志查看错误'
 }
 
 
@@ -92,9 +94,9 @@ export async function refreshGroupMembers(groupQQ: string) {
 export const uidMaps: Record<string, string> = {} // 一串加密的字符串(uid) -> qq号
 
 export function getUidByUin(uin: string) {
-    for (const key in uidMaps) {
+    for (const uid in uidMaps) {
-        if (uidMaps[key] === uin) {
+        if (uidMaps[uid] === uin) {
-            return key
+            return uid
         }
     }
 }

src/common/db.ts

@@ -222,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) {
@@ -237,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,7 +1,8 @@
-import express, {Express, json, Request, Response} from "express";
+import express, {Express, Request, Response} from "express";
 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>
 
@@ -52,13 +53,20 @@ export abstract class HttpServerBase {
     };
 
     start(port: number) {
-        this.expressAPP.get('/', (req: Request, res: Response) => {
+        try {
-            res.send(`${this.name}已启动`);
+            this.expressAPP.get('/', (req: Request, res: Response) => {
-        })
+                res.send(`${this.name}已启动`);
-        this.listen(port);
+            })
+            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

@@ -3,6 +3,7 @@ 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
@@ -29,7 +30,14 @@ export class WebsocketServerBase {
     }
 
     start(port: number) {
-        this.ws = new WebSocketServer({port});
+        try {
+            this.ws = new WebSocketServer({port,
+                maxPayload: 1024 * 1024 * 1024
+            });
+            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);
@@ -41,6 +49,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
@@ -14,6 +15,7 @@ export interface CheckVersion {
   version: string
 }
 export interface Config {
+  imageRKey?: string;
   ob11: OB11Config
   token?: string
   heartInterval?: number // ms
@@ -28,6 +30,8 @@ export interface Config {
 }
 
 export interface LLOneBotError {
+  httpServerError?: string
+  wsServerError?: string
   ffmpegError?: string
   otherError?: string
 }
@@ -36,6 +40,8 @@ export interface FileCache {
   fileName: string
   filePath: string
   fileSize: string
+  fileUuid?: string
   url?: string
+  msgId?: string
   downloadFunc?: () => Promise<void>
 }

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

@@ -1,13 +1,14 @@
 import fs from "fs";
+import fsPromise from "fs/promises";
 import crypto from "crypto";
-import ffmpeg from "fluent-ffmpeg";
 import util from "util";
-import {encode, getDuration, isWav} from "silk-wasm";
 import path from "node:path";
 import {v4 as uuidv4} from "uuid";
-import {DATA_DIR} from "./index";
+import {log, TEMP_DIR} from "./index";
-import {log} from "./log";
+import {dbUtil} from "../db";
-import {getConfigUtil} from "../config";
+import * as fileType from "file-type";
+import {net} from "electron";
+
 
 export function isGIF(path: string) {
     const buffer = Buffer.alloc(4);
@@ -62,181 +63,7 @@ export async function file2base64(path: string) {
     return result;
 }
 
-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 calculateFileMD5(filePath: string): Promise<string> {
     return new Promise((resolve, reject) => {
@@ -261,3 +88,171 @@ export function calculateFileMD5(filePath: string): Promise<string> {
         });
     });
 }
+
+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

@@ -44,3 +44,25 @@ export function mergeNewProperties(newObj: any, oldObj: any) {
 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

@@ -1,10 +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 './update'
+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

@@ -4,16 +4,18 @@ 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);
     }
-    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) {
@@ -25,10 +27,11 @@ export function log(...msg: any[]) {
         }
         logMsg += msgItem + " ";
     }
+    let currentDateTime = new Date().toLocaleString();
     logMsg = `${currentDateTime} ${userInfo}: ${logMsg}\n\n`
     // sendLog(...msg);
     // console.log(msg)
-    fs.appendFile(path.join(DATA_DIR, `llonebot-${currentDate}.log`), logMsg, (err: any) => {
+    fs.appendFile(path.join(logDir, logFileName), logMsg, (err: any) => {
 
     })
 }

src/common/utils/qqpkg.ts

@@ -8,3 +8,5 @@ type QQPkgInfo = {
 }
 
 export const qqPkgInfo: QQPkgInfo = require(path.join(process.resourcesPath, "app/package.json"))
+
+export const isQQ998: boolean = qqPkgInfo.buildVersion >= "22106"

src/common/utils/update.ts

@@ -1,62 +0,0 @@
-import {version} from "../../version";
-import https from "node:https";
-
-export async function checkVersion() {
-    const latestVersionText = await getRemoteVersion();
-    const latestVersion = latestVersionText.split(".");
-    const currentVersion = version.split(".");
-    for (let k in [0, 1, 2]) {
-        if (latestVersion[k] > currentVersion[k]) {
-            return { result: false, version: latestVersionText };
-        }
-    }
-    return { result: true, version: version };
-}
-export async function updateLLOneBot() {
-    let mirrorGithubList = ["https://mirror.ghproxy.com"];
-    const latestVersion = await getRemoteVersion();
-    if (latestVersion && latestVersion != "") {
-        const downloadUrl = "https://github.com/LLOneBot/LLOneBot/releases/download/v" + latestVersion + "/LLOneBot.zip";
-        const realUrl = mirrorGithubList[0] + downloadUrl;
-    }
-    return false;
-}
-export async function getRemoteVersion() {
-    let mirrorGithubList = ["https://521github.com"];
-    let Version = "";
-    for (let i = 0; i < mirrorGithubList.length; i++) {
-        let mirrorGithub = mirrorGithubList[i];
-        let tVersion = await getRemoteVersionByMirror(mirrorGithub);
-        if (tVersion && tVersion != "") {
-            Version = tVersion;
-            break;
-        }
-    }
-    return Version;
-}
-export async function getRemoteVersionByMirror(mirrorGithub: string) {
-    let releasePage = "error";
-    let reqPromise = async function (): Promise<string> {
-        return new Promise((resolve, reject) => {
-            https.get(mirrorGithub + "/LLOneBot/LLOneBot/releases", res => {
-                let list = [];
-                res.on('data', chunk => {
-                    list.push(chunk);
-                });
-                res.on('end', () => {
-                    resolve(Buffer.concat(list).toString());
-                });
-            }).on('error', err => {
-                reject();
-            });
-        });
-    }
-    try {
-        releasePage = await reqPromise();
-        if (releasePage === "error") return "";
-        return releasePage.match(new RegExp('(?<=(tag/v)).*?(?=("))'))[0];
-    }
-    catch { }
-    return "";
-
-}

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

@@ -4,10 +4,10 @@ import {BrowserWindow, dialog, ipcMain} from 'electron';
 import * as fs from 'node:fs';
 import {Config} from "../common/types";
 import {
+    CHANNEL_CHECK_VERSION,
     CHANNEL_ERROR,
     CHANNEL_GET_CONFIG,
     CHANNEL_LOG,
-    CHANNEL_CHECKVERSION,
     CHANNEL_SELECT_FILE,
     CHANNEL_SET_CONFIG,
     CHANNEL_UPDATE,
@@ -18,14 +18,22 @@ import {
     friendRequests,
     getFriend,
     getGroup,
-    getGroupMember,
+    getGroupMember, groups,
     llonebotError,
     refreshGroupMembers,
-    selfInfo, uidMaps
+    selfInfo,
+    uidMaps
 } from "../common/data";
 import {hookNTQQApiCall, hookNTQQApiReceive, ReceiveCmdS, registerReceiveHook} from "../ntqqapi/hook";
 import {OB11Constructor} from "../onebot11/constructor";
-import {ChatType, FriendRequestNotify, GroupNotifies, GroupNotifyTypes, RawMessage} from "../ntqqapi/types";
+import {
+    ChatType,
+    FriendRequestNotify,
+    GroupMemberRole,
+    GroupNotifies,
+    GroupNotifyTypes,
+    RawMessage
+} from "../ntqqapi/types";
 import {ob11HTTPServer} from "../onebot11/server/http";
 import {OB11FriendRecallNoticeEvent} from "../onebot11/event/notice/OB11FriendRecallNoticeEvent";
 import {OB11GroupRecallNoticeEvent} from "../onebot11/event/notice/OB11GroupRecallNoticeEvent";
@@ -41,23 +49,24 @@ 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 {checkVersion, updateLLOneBot} from "../common/utils/update";
+import {checkNewVersion, upgradeLLOneBot} from "../common/utils/upgrade";
-import {checkFfmpeg} from "../common/utils/file";
 import {log} from "../common/utils/log";
 import {getConfigUtil} from "../common/config";
-
+import {checkFfmpeg} from "../common/utils/video";
+import {GroupDecreaseSubType, OB11GroupDecreaseEvent} from "../onebot11/event/notice/OB11GroupDecreaseEvent";
 
 let running = false;
 
+let mainWindow: BrowserWindow | null = null;
 
 // 加载插件时触发
 function onLoad() {
     log("llonebot main onLoad");
-    ipcMain.handle(CHANNEL_CHECKVERSION, async (event, arg) => {
+    ipcMain.handle(CHANNEL_CHECK_VERSION, async (event, arg) => {
-        return checkVersion();
+        return checkNewVersion();
     });
     ipcMain.handle(CHANNEL_UPDATE, async (event, arg) => {
-        return updateLLOneBot();
+        return upgradeLLOneBot();
     });
     ipcMain.handle(CHANNEL_SELECT_FILE, async (event, arg) => {
         const selectPath = new Promise<string>((resolve, reject) => {
@@ -92,15 +101,44 @@ 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();
+        log("查询llonebot错误信息", error);
+        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) => {
-        setConfig(config).then();
+        if (!ask) {
+            setConfig(config).then().catch(e => {
+                log("保存设置失败", e.stack)
+            });
+            return
+        }
+        dialog.showMessageBox(mainWindow, {
+            type: 'question',
+            buttons: ['确认', '取消'],
+            defaultId: 0, // 默认选中的按钮，0 代表第一个按钮，即 "确认"
+            title: '确认保存',
+            message: '是否保存？',
+            detail: 'LLOneBot配置已更改，是否保存？'
+        }).then(result => {
+            if (result.response === 0) {
+                setConfig(config).then().catch(e => {
+                    log("保存设置失败", e.stack)
+                });
+            } else {
+            }
+        }).catch(err => {
+            log("保存设置询问弹窗错误", err);
+        });
     })
 
     ipcMain.on(CHANNEL_LOG, (event, arg) => {
@@ -192,7 +230,6 @@ function onLoad() {
                             parseInt(operatorId),
                             oriMessage.msgShortId
                         )
-
                         postOB11Event(groupRecallEvent);
                     }
                     // 不让入库覆盖原来消息，不然就获取不到撤回的消息内容了
@@ -260,15 +297,28 @@ function onLoad() {
                                 log("变动管理员获取成功")
                                 groupAdminNoticeEvent.user_id = parseInt(member1.uin);
                                 groupAdminNoticeEvent.sub_type = notify.type == GroupNotifyTypes.ADMIN_UNSET ? "unset" : "set";
+                                // member1.role = notify.type == GroupNotifyTypes.ADMIN_SET ? GroupMemberRole.admin : GroupMemberRole.normal;
                                 postOB11Event(groupAdminNoticeEvent, true);
                             } else {
                                 log("获取群通知的成员信息失败", notify, getGroup(notify.group.groupCode));
                             }
-                        } else if (notify.type == GroupNotifyTypes.MEMBER_EXIT) {
+                        } else if (notify.type == GroupNotifyTypes.MEMBER_EXIT || notify.type == GroupNotifyTypes.KICK_MEMBER) {
-                            // log("有成员退出通知");
+                            log("有成员退出通知", notify);
-                            // const member1 = await getGroupMember(notify.group.groupCode, null, notify.user1.uid);
+                            try {
-                            // let groupDecreaseEvent = new OB11GroupDecreaseEvent(parseInt(notify.group.groupCode), parseInt(member1.uin))
+                                const member1 = await NTQQUserApi.getUserDetailInfo(notify.user1.uid);
-                            // postEvent(groupDecreaseEvent, true);
+                                let operatorId = member1.uin;
+                                let subType: GroupDecreaseSubType = "leave";
+                                if (notify.user2.uid) {
+                                    // 是被踢的
+                                    const member2 = await getGroupMember(notify.group.groupCode, notify.user2.uid);
+                                    operatorId = member2.uin;
+                                    subType = "kick";
+                                }
+                                let groupDecreaseEvent = new OB11GroupDecreaseEvent(parseInt(notify.group.groupCode), parseInt(member1.uin), parseInt(operatorId), subType)
+                                postOB11Event(groupDecreaseEvent, true);
+                            } catch (e) {
+                                log("获取群通知的成员信息失败", notify, e.stack.toString())
+                            }
                         } else if ([GroupNotifyTypes.JOIN_REQUEST].includes(notify.type)) {
                             log("有加群请求");
                             let groupRequestEvent = new OB11GroupRequestEvent();
@@ -309,8 +359,9 @@ function onLoad() {
 
         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)) {
+                let flag = req.friendUid + req.reqTime;
-                    friendRequests[req.sourceId] = req;
+                if (req.isUnread && (parseInt(req.reqTime) > startTime / 1000)) {
+                    friendRequests[flag] = req;
                     log("有新的好友请求", req);
                     let friendRequestEvent = new OB11FriendRequestEvent();
                     try {
@@ -319,7 +370,7 @@ function onLoad() {
                     } catch (e) {
                         log("获取加好友者QQ号失败", e);
                     }
-                    friendRequestEvent.flag = req.sourceId.toString();
+                    friendRequestEvent.flag = flag;
                     friendRequestEvent.comment = req.extWords;
                     postOB11Event(friendRequestEvent);
                 }
@@ -331,9 +382,9 @@ function onLoad() {
 
     async function start() {
         log("llonebot pid", process.pid)
-
+        llonebotError.otherError = "";
         startTime = Date.now();
-        dbUtil.getReceivedTempUinMap().then(m=>{
+        dbUtil.getReceivedTempUinMap().then(m => {
             for (const [key, value] of Object.entries(m)) {
                 uidMaps[value] = key;
             }
@@ -341,18 +392,8 @@ function onLoad() {
         startReceiveHook().then();
         NTQQGroupApi.getGroups(true).then()
         const config = getConfigUtil().getConfig()
-        // 检查ffmpeg
-        checkFfmpeg(config.ffmpeg).then(exist => {
-            if (!exist) {
-                llonebotError.ffmpegError = `没有找到ffmpeg,音频只能发送wav和silk`
-            }
-        })
         if (config.ob11.enableHttp) {
-            try {
+            ob11HTTPServer.start(config.ob11.httpPort)
-                ob11HTTPServer.start(config.ob11.httpPort)
-            } catch (e) {
-                log("http server start failed", e);
-            }
         }
         if (config.ob11.enableWs) {
             ob11WebsocketServer.start(config.ob11.wsPort);
@@ -375,23 +416,31 @@ function onLoad() {
         } catch (e) {
             log("retry get self info", e);
         }
-        log("self info", selfInfo);
+        if (!selfInfo.uin) {
+            selfInfo.uin = globalThis.authData?.uin;
+            selfInfo.uid = globalThis.authData?.uid;
+            selfInfo.nick = selfInfo.uin;
+        }
+        log("self info", selfInfo, globalThis.authData);
         if (selfInfo.uin) {
-            try {
+            async function getUserNick() {
-                const userInfo = (await NTQQUserApi.getUserDetailInfo(selfInfo.uid));
+                try {
-                log("self info", userInfo);
-                if (userInfo) {
-                    selfInfo.nick = userInfo.nick;
-                } else {
                     getSelfNickCount++;
-                    if (getSelfNickCount < 10) {
+                    const userInfo = (await NTQQUserApi.getUserDetailInfo(selfInfo.uid));
-                        return setTimeout(init, 1000);
+                    log("self info", userInfo);
+                    if (userInfo) {
+                        selfInfo.nick = userInfo.nick;
+                        return
                     }
+                } catch (e) {
+                    log("get self nickname failed", e.stack);
+                }
+                if (getSelfNickCount < 10) {
+                    return setTimeout(getUserNick, 1000);
                 }
-            } catch (e) {
-                log("get self nickname failed", e.toString());
-                return setTimeout(init, 1000);
             }
+
+            getUserNick().then()
             start().then();
         } else {
             setTimeout(init, 1000)
@@ -406,6 +455,7 @@ function onBrowserWindowCreated(window: BrowserWindow) {
     if (selfInfo.uid) {
         return
     }
+    mainWindow = window;
     log("window create", window.webContents.getURL().toString())
     try {
         hookNTQQApiCall(window);
@@ -421,6 +471,7 @@ try {
     console.log(e.toString())
 }
 
+
 // 这两个函数都是可选的
 export {
     onBrowserWindowCreated

src/main/setConfig.ts

@@ -3,11 +3,11 @@ 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 {checkFfmpeg} from "../common/utils/file";
 import {getConfigUtil} from "../common/config";
+import {checkFfmpeg, log} from "../common/utils";
 
 export async function setConfig(config: Config) {
-    let oldConfig = getConfigUtil().getConfig();
+    let oldConfig = {...(getConfigUtil().getConfig())};
     getConfigUtil().setConfig(config)
     if (config.ob11.httpPort != oldConfig.ob11.httpPort && config.ob11.enableHttp) {
         ob11HTTPServer.restart(config.ob11.httpPort);
@@ -21,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) {
@@ -41,24 +42,19 @@ export async function setConfig(config: Config) {
     if (config.ob11.enableWsReverse) {
         // 判断反向ws地址有变化
         if (config.ob11.wsHosts.length != oldConfig.ob11.wsHosts.length) {
+            log("反向ws地址有变化, 重启反向ws服务")
             ob11ReverseWebsockets.restart();
         } else {
             for (const newHost of config.ob11.wsHosts) {
                 if (!oldConfig.ob11.wsHosts.includes(newHost)) {
+                    log("反向ws地址有变化, 重启反向ws服务")
                     ob11ReverseWebsockets.restart();
                     break;
                 }
             }
         }
     }
-
+    log("old config", oldConfig)
-    // 检查ffmpeg
+    log("配置已更新", config)
-    if (config.ffmpeg) {
+    checkFfmpeg(config.ffmpeg).then()
-        checkFfmpeg(config.ffmpeg).then(success => {
-            if (success) {
-                llonebotError.ffmpegError = ''
-            }
-        })
-    }
-
 }

src/ntqqapi/api/file.ts

@@ -4,7 +4,8 @@ import {
     CacheFileListItem,
     CacheFileType,
     CacheScanResult,
-    ChatCacheList, ChatCacheListItemBasic,
+    ChatCacheList,
+    ChatCacheListItemBasic,
     ChatType,
     ElementType
 } from "../types";
@@ -13,12 +14,13 @@ import fs from "fs";
 import {ReceiveCmdS} from "../hook";
 import {log} from "../../common/utils/log";
 
-export class NTQQFileApi{
+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,
@@ -26,6 +28,7 @@ export class NTQQFileApi{
             args: [filePath]
         })
     }
+
     static async copyFile(filePath: string, destPath: string) {
         return await callNTQQApi<string>({
             className: NTQQApiClass.FS_API,
@@ -36,13 +39,15 @@ export class NTQQFileApi{
             }]
         })
     }
+
     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) {
+    static async uploadFile(filePath: string, elementType: ElementType = ElementType.PIC, elementSubType: number = 0) {
         const md5 = await NTQQFileApi.getFileMd5(filePath);
         let ext = (await NTQQFileApi.getFileType(filePath))?.ext
         if (ext) {
@@ -61,7 +66,7 @@ export class NTQQFileApi{
                     md5HexStr: md5,
                     fileName: fileName,
                     elementType: elementType,
-                    elementSubType: 0,
+                    elementSubType,
                     thumbSize: 0,
                     needCreate: true,
                     downloadType: 1,
@@ -76,17 +81,22 @@ export class NTQQFileApi{
             md5,
             fileName,
             path: mediaPath,
-            fileSize
+            fileSize,
+            ext
         }
     }
-    static async downloadMedia(msgId: string, chatType: ChatType, peerUid: string, elementId: string, thumbPath: string, sourcePath: string) {
+
+    static async downloadMedia(msgId: string, chatType: ChatType, peerUid: string, elementId: string, thumbPath: string, sourcePath: string, isFile: boolean = false) {
         // 用于下载收到的消息中的图片等
-        if (fs.existsSync(sourcePath)) {
+        if (sourcePath && fs.existsSync(sourcePath)) {
             return sourcePath
         }
         const apiParams = [
             {
                 getReq: {
+                    fileModelId: "0",
+                    downloadSourceType: 0,
+                    triggerType: 1,
                     msgId: msgId,
                     chatType: chatType,
                     peerUid: peerUid,
@@ -96,20 +106,21 @@ export class NTQQFileApi{
                     filePath: thumbPath,
                 },
             },
-            undefined,
+            null,
         ]
         // log("需要下载media", sourcePath);
         await callNTQQApi({
             methodName: NTQQApiMethod.DOWNLOAD_MEDIA,
             args: apiParams,
             cbCmd: ReceiveCmdS.MEDIA_DOWNLOAD_COMPLETE,
-            cmdCB: (payload: { notifyInfo: { filePath: string } }) => {
+            cmdCB: (payload: { notifyInfo: { filePath: string, msgId: string } }) => {
-                // log("media 下载完成判断", payload.notifyInfo.filePath, sourcePath);
+                log("media 下载完成判断", payload.notifyInfo.msgId, msgId);
-                return payload.notifyInfo.filePath == sourcePath;
+                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]
@@ -118,7 +129,7 @@ export class NTQQFileApi{
 
 }
 
-export class NTQQFileCacheApi{
+export class NTQQFileCacheApi {
     static async setCacheSilentScan(isSilent: boolean = true) {
         return await callNTQQApi<GeneralCallResult>({
             methodName: NTQQApiMethod.CACHE_SET_SILENCE,
@@ -127,6 +138,7 @@ export class NTQQFileCacheApi{
             }, null]
         });
     }
+
     static getCacheSessionPathList() {
         return callNTQQApi<{
             key: string,
@@ -136,6 +148,7 @@ export class NTQQFileCacheApi{
             methodName: NTQQApiMethod.CACHE_PATH_SESSION,
         });
     }
+
     static clearCache(cacheKeys: Array<string> = ['tmp', 'hotUpdate']) {
         return callNTQQApi<any>({ // TODO: 目前还不知道真正的返回值是什么
             methodName: NTQQApiMethod.CACHE_CLEAR,
@@ -144,6 +157,7 @@ export class NTQQFileCacheApi{
             }, null]
         });
     }
+
     static addCacheScannedPaths(pathMap: object = {}) {
         return callNTQQApi<GeneralCallResult>({
             methodName: NTQQApiMethod.CACHE_ADD_SCANNED_PATH,
@@ -152,6 +166,7 @@ export class NTQQFileCacheApi{
             }, null]
         });
     }
+
     static scanCache() {
         callNTQQApi<GeneralCallResult>({
             methodName: ReceiveCmdS.CACHE_SCAN_FINISH,
@@ -163,6 +178,7 @@ export class NTQQFileCacheApi{
             timeoutSecond: 300,
         });
     }
+
     static getHotUpdateCachePath() {
         return callNTQQApi<string>({
             className: NTQQApiClass.HOTUPDATE_API,
@@ -176,6 +192,7 @@ export class NTQQFileCacheApi{
             methodName: NTQQApiMethod.CACHE_PATH_DESKTOP_TEMP
         });
     }
+
     static getChatCacheList(type: ChatType, pageSize: number = 1000, pageIndex: number = 0) {
         return new Promise<ChatCacheList>((res, rej) => {
             callNTQQApi<ChatCacheList>({
@@ -190,6 +207,7 @@ export class NTQQFileCacheApi{
                 .catch(e => rej(e));
         });
     }
+
     static getFileCacheInfo(fileType: CacheFileType, pageSize: number = 1000, lastRecord?: CacheFileListItem) {
         const _lastRecord = lastRecord ? lastRecord : {fileType: fileType};
 
@@ -204,6 +222,7 @@ export class NTQQFileCacheApi{
             }, null]
         })
     }
+
     static async clearChatCache(chats: ChatCacheListItemBasic[] = [], fileKeys: string[] = []) {
         return await callNTQQApi<GeneralCallResult>({
             methodName: NTQQApiMethod.CACHE_CHAT_CLEAR,

src/ntqqapi/api/friend.ts

@@ -37,10 +37,10 @@ export class NTQQFriendApi{
             }, null]
         })
     }
-    static async handleFriendRequest(sourceId: number, accept: boolean,) {
+    static async handleFriendRequest(flag: string, accept: boolean,) {
-        const request: FriendRequest = friendRequests[sourceId]
+        const request: FriendRequest = friendRequests[flag]
         if (!request) {
-            throw `sourceId ${sourceId}, 对应的好友请求不存在`
+            throw `flat: ${flag}, 对应的好友请求不存在`
         }
         const result = await callNTQQApi<GeneralCallResult>({
             methodName: NTQQApiMethod.HANDLE_FRIEND_REQUEST,
@@ -54,7 +54,7 @@ export class NTQQFriendApi{
                 }
             ]
         })
-        delete friendRequests[sourceId];
+        delete friendRequests[flag];
         return result;
     }
 

src/ntqqapi/api/group.ts

@@ -2,15 +2,15 @@ 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 {BrowserWindow} from "electron";
 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
+            cbCmd = ReceiveCmdS.GROUPS_STORE
         }
         const result = await callNTQQApi<{
             updateType: number,
@@ -74,25 +74,7 @@ export class NTQQGroupApi{
     }
     static async getGroupIgnoreNotifies() {
         await NTQQGroupApi.getGroupNotifies();
-        const result = callNTQQApi<GroupNotifies>({
+        return await NTQQWindowApi.openWindow(NTQQWindows.GroupNotifyFilterWindow,[], ReceiveCmdS.GROUP_NOTIFY);
-            className: NTQQApiClass.WINDOW_API,
-            methodName: NTQQApiMethod.OPEN_EXTRA_WINDOW,
-            cbCmd: ReceiveCmdS.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)

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

@@ -5,6 +5,7 @@ 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
 
@@ -15,12 +16,44 @@ export interface Peer {
 }
 
 export class NTQQMsgApi {
-    static async activateGroupChat(groupCode: string) {
+    static async getMultiMsg(peer: Peer, rootMsgId: string, parentMsgId: string) {
+        return await callNTQQApi<GeneralCallResult & {msgList: RawMessage[]}>({
+            methodName: NTQQApiMethod.GET_MULTI_MSG,
+            args: [{
+                peer,
+                rootMsgId,
+                parentMsgId
+            }, null]
+        })
+    }
+
+    static async activateChat(peer: Peer) {
         // await this.fetchRecentContact();
         // await sleep(500);
         return await callNTQQApi<GeneralCallResult>({
-            methodName: NTQQApiMethod.ADD_ACTIVE_CHAT,
+            methodName: NTQQApiMethod.ACTIVE_CHAT_PREVIEW,
-            args: [{peer:{peerUid: groupCode, chatType: ChatType.group}, cnt: 20}, null]
+            args: [{peer, cnt: 20}, null]
+        })
+    }
+    static async activateChatAndGetHistory(peer: Peer) {
+        // await this.fetchRecentContact();
+        // await sleep(500);
+        return await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.ACTIVE_CHAT_HISTORY,
+            // 参数似乎不是这样
+            args: [{peer, cnt: 20}, null]
+        })
+    }
+    static async getMsgHistory(peer: Peer, msgId: string, count: number) {
+        // 消息时间从旧到新
+        return await callNTQQApi<GeneralCallResult & {msgList: RawMessage[]}>({
+            methodName: isQQ998 ? NTQQApiMethod.ACTIVE_CHAT_HISTORY : NTQQApiMethod.HISTORY_MSG,
+            args: [{
+                peer,
+                msgId,
+                cnt: count,
+                queryOrder: true,
+            }, null]
         })
     }
     static async fetchRecentContact(){

src/ntqqapi/api/user.ts

@@ -2,7 +2,10 @@ import {callNTQQApi, GeneralCallResult, NTQQApiClass, NTQQApiMethod} from "../nt
 import {SelfInfo, User} from "../types";
 import {ReceiveCmdS} from "../hook";
 import {uidMaps} from "../../common/data";
+import {NTQQWindowApi, NTQQWindows} from "./window";
+import {isQQ998, sleep} from "../../common/utils";
 
+let userInfoCache: Record<string, User> = {};  // uid: User
 
 export class NTQQUserApi{
     static async setQQAvatar(filePath: string) {
@@ -29,29 +32,86 @@ export class NTQQUserApi{
         })
         return result.profiles.get(uid)
     }
-    static async getUserDetailInfo(uid: string) {
+    static async getUserDetailInfo(uid: string, getLevel=false) {
-        const result = await callNTQQApi<{ info: User }>({
+        // this.getUserInfo(uid);
-            methodName: NTQQApiMethod.USER_DETAIL_INFO,
+        let methodName = !isQQ998 ? NTQQApiMethod.USER_DETAIL_INFO : NTQQApiMethod.USER_DETAIL_INFO_WITH_BIZ_INFO
-            cbCmd: ReceiveCmdS.USER_DETAIL_INFO,
+        const fetchInfo = async ()=>{
-            afterFirstCmd: false,
+            const result = await callNTQQApi<{ info: User }>({
-            cmdCB: (payload) => {
+                methodName,
-                const success = payload.info.uid == uid
+                cbCmd: ReceiveCmdS.USER_DETAIL_INFO,
-                // log("get user detail info", success, uid, payload)
+                afterFirstCmd: false,
-                return success
+                cmdCB: (payload) => {
-            },
+                    const success = payload.info.uid == uid
-            args: [
+                    // log("get user detail info", success, uid, payload)
-                {
+                    return success
-                    uid
                 },
-                null
+                args: [
-            ]
+                    {
-        })
+                        uid
-        const info = result.info
+                    },
-        if (info?.uin) {
+                    null
-            uidMaps[info.uid] = info.uin
+                ]
+            })
+            const info = result.info
+            if (info?.uin) {
+                uidMaps[info.uid] = info.uin
+            }
+            return info
         }
-        return info
+        // 首次请求两次才能拿到的等级信息
+        if (!userInfoCache[uid] && getLevel) {
+            await fetchInfo()
+            await sleep(1000);
+        }
+        let userInfo = await fetchInfo()
+        userInfoCache[uid] = userInfo
+        return userInfo
     }
 
+    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

@@ -14,9 +14,10 @@ import {
 import {promises as fs} from "node:fs";
 import ffmpeg from "fluent-ffmpeg"
 import {NTQQFileApi} from "./api/file";
-import {calculateFileMD5, encodeSilk, getVideoInfo, isGIF} from "../common/utils/file";
+import {calculateFileMD5, isGIF} from "../common/utils/file";
 import {log} from "../common/utils/log";
-import {sleep} from "../common/utils/helper";
+import {defaultVideoThumb, getVideoInfo} from "../common/utils/video";
+import {encodeSilk} from "../common/utils/audio";
 
 
 export class SendMsgElementConstructor {
@@ -61,32 +62,32 @@ export class SendMsgElementConstructor {
         }
     }
 
-    static async pic(picPath: string, summary: string = ""): Promise<SendPicElement> {
+    static async pic(picPath: string, summary: string = "", subType: 0|1=0): Promise<SendPicElement> {
-        const {md5, fileName, path, fileSize} = await NTQQFileApi.uploadFile(picPath, ElementType.PIC);
+        const {md5, fileName, path, fileSize} = await NTQQFileApi.uploadFile(picPath, ElementType.PIC, subType);
         if (fileSize === 0) {
             throw "文件异常，大小为0";
         }
         const imageSize = await NTQQFileApi.getImageSize(picPath);
         const picElement = {
             md5HexStr: md5,
-            fileSize: fileSize,
+            fileSize: fileSize.toString(),
             picWidth: imageSize.width,
             picHeight: imageSize.height,
             fileName: fileName,
             sourcePath: path,
             original: true,
             picType: isGIF(picPath) ? PicType.gif : PicType.jpg,
-            picSubType: 0,
+            picSubType: subType,
             fileUuid: "",
             fileSubId: "",
             thumbFileSize: 0,
-            summary,
+            summary
         };
-
+        log("图片信息", picElement)
         return {
             elementType: ElementType.PIC,
             elementId: "",
-            picElement
+            picElement,
         };
     }
 
@@ -108,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 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 = {
-        log("视频信息", 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],
@@ -138,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()
@@ -195,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,
@@ -225,7 +242,11 @@ export class SendMsgElementConstructor {
         return {
             elementType: ElementType.ARK,
             elementId: "",
-            arkElement: data
+            arkElement: {
+                bytesData: data,
+                linkInfo: null,
+                subElementType: null
+            }
         }
     }
 }

src/ntqqapi/hook.ts

@@ -1,8 +1,8 @@
 import {BrowserWindow} from 'electron';
 import {NTQQApiClass} from "./ntcall";
 import {NTQQMsgApi, sendMessagePool} from "./api/msg"
-import {ChatType, Group, RawMessage, User} from "./types";
+import {ChatType, Group, GroupMember, GroupMemberRole, RawMessage, User} from "./types";
-import {friends, groups, selfInfo, tempGroupCodeMap, uidMaps} from "../common/data";
+import {friends, getGroupMember, groups, selfInfo, tempGroupCodeMap, uidMaps} from "../common/data";
 import {OB11GroupDecreaseEvent} from "../onebot11/event/notice/OB11GroupDecreaseEvent";
 import {v4 as uuidv4} from "uuid"
 import {postOB11Event} from "../onebot11/server/postOB11Event";
@@ -12,10 +12,12 @@ import {dbUtil} from "../common/db";
 import {NTQQGroupApi} from "./api/group";
 import {log} from "../common/utils/log";
 import {sleep} from "../common/utils/helper";
+import {OB11Constructor} from "../onebot11/constructor";
 
 export let hookApiCallbacks: Record<string, (apiReturn: any) => void> = {}
 
 export let ReceiveCmdS = {
+    RECENT_CONTACT: "nodeIKernelRecentContactListener/onRecentContactListChangedVer2",
     UPDATE_MSG: "nodeIKernelMsgListener/onMsgInfoListUpdate",
     UPDATE_ACTIVE_MSG: "nodeIKernelMsgListener/onActiveMsgInfoUpdate",
     NEW_MSG: `nodeIKernelMsgListener/onRecvMsg`,
@@ -24,7 +26,8 @@ export let ReceiveCmdS = {
     USER_INFO: "nodeIKernelProfileListener/onProfileSimpleChanged",
     USER_DETAIL_INFO: "nodeIKernelProfileListener/onProfileDetailInfoChanged",
     GROUPS: "nodeIKernelGroupListener/onGroupListUpdate",
-    GROUPS_UNIX: "onGroupListUpdate",
+    GROUPS_STORE: "onGroupListUpdate",
+    GROUP_MEMBER_INFO_UPDATE: "nodeIKernelGroupListener/onMemberInfoChange",
     FRIENDS: "onBuddyListChange",
     MEDIA_DOWNLOAD_COMPLETE: "nodeIKernelMsgListener/onRichMediaDownloadComplete",
     UNREAD_GROUP_NOTIFY: "nodeIKernelGroupListener/onGroupNotifiesUnreadCountUpdated",
@@ -33,6 +36,7 @@ export let ReceiveCmdS = {
     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]
@@ -60,45 +64,56 @@ let receiveHooks: Array<{
 export function hookNTQQApiReceive(window: BrowserWindow) {
     const originalSend = window.webContents.send;
     const patchSend = (channel: string, ...args: NTQQApiReturnData) => {
+        // console.log("hookNTQQApiReceive", channel, args)
+        let isLogger = false
         try {
-            if (!args[0]?.eventName?.startsWith("ns-LoggerApi")) {
+            isLogger = args[0]?.eventName?.startsWith("ns-LoggerApi")
-                HOOK_LOG && log(`received ntqq api message: ${channel}`, JSON.stringify(args))
-            }
         } catch (e) {
 
         }
-        if (args?.[1] instanceof Array) {
+        if (!isLogger) {
-            for (let receiveData of args?.[1]) {
+            try {
-                const ntQQApiMethodName = receiveData.cmdName;
+                HOOK_LOG && log(`received ntqq api message: ${channel}`, args)
-                // log(`received ntqq api message: ${channel} ${ntQQApiMethodName}`, JSON.stringify(receiveData))
+            } catch (e) {
-                for (let hook of receiveHooks) {
+                log("hook log error", e, args)
-                    if (hook.method.includes(ntQQApiMethodName)) {
+            }
-                        new Promise((resolve, reject) => {
+        }
-                            try {
+        try {
-                                let _ = hook.hookFunc(receiveData.payload)
+            if (args?.[1] instanceof Array) {
-                                if (hook.hookFunc.constructor.name === "AsyncFunction") {
+                for (let receiveData of args?.[1]) {
-                                    (_ as Promise<void>).then()
+                    const ntQQApiMethodName = receiveData.cmdName;
+                    // log(`received ntqq api message: ${channel} ${ntQQApiMethodName}`, JSON.stringify(receiveData))
+                    for (let hook of receiveHooks) {
+                        if (hook.method.includes(ntQQApiMethodName)) {
+                            new Promise((resolve, reject) => {
+                                try {
+                                    let _ = hook.hookFunc(receiveData.payload)
+                                    if (hook.hookFunc.constructor.name === "AsyncFunction") {
+                                        (_ as Promise<void>).then()
+                                    }
+                                } catch (e) {
+                                    log("hook error", e, receiveData.payload)
                                 }
-                            } catch (e) {
+                            }).then()
-                                log("hook error", e, receiveData.payload)
+                        }
-                            }
-                        }).then()
                     }
                 }
             }
-        }
+            if (args[0]?.callbackId) {
-        if (args[0]?.callbackId) {
+                // log("hookApiCallback", hookApiCallbacks, args)
-            // log("hookApiCallback", hookApiCallbacks, args)
+                const callbackId = args[0].callbackId;
-            const callbackId = args[0].callbackId;
+                if (hookApiCallbacks[callbackId]) {
-            if (hookApiCallbacks[callbackId]) {
+                    // log("callback found")
-                // log("callback found")
+                    new Promise((resolve, reject) => {
-                new Promise((resolve, reject) => {
+                        hookApiCallbacks[callbackId](args[1]);
-                    hookApiCallbacks[callbackId](args[1]);
+                    }).then()
-                }).then()
+                    delete hookApiCallbacks[callbackId];
-                delete hookApiCallbacks[callbackId];
+                }
             }
+        } catch (e) {
+            log("hookNTQQApiReceive error", e.stack.toString(), args)
         }
-        return originalSend.call(window.webContents, channel, ...args);
+        originalSend.call(window.webContents, channel, ...args);
     }
     window.webContents.send = patchSend;
 }
@@ -110,12 +125,19 @@ export function hookNTQQApiCall(window: BrowserWindow) {
 
     const proxyIpcMsg = new Proxy(ipc_message_proxy, {
         apply(target, thisArg, args) {
+            // console.log(thisArg, args);
+            let isLogger = false
             try {
-                if (args[3][1][0] !== "info") {
+                isLogger = args[3][0].eventName.startsWith("ns-LoggerApi")
-                    HOOK_LOG && log("call NTQQ api", thisArg, args);
-                }
             } catch (e) {
 
+            }
+            if (!isLogger) {
+                try {
+                    HOOK_LOG && log("call NTQQ api", thisArg, args);
+                } catch (e) {
+
+                }
             }
             return target.apply(thisArg, args);
         },
@@ -125,6 +147,31 @@ 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 | ReceiveCmd[], hookFunc: (payload: PayloadType) => void): string {
@@ -146,19 +193,20 @@ export function removeReceiveHook(id: string) {
 }
 
 let activatedGroups: string[] = [];
+
 async function updateGroups(_groups: Group[], needUpdate: boolean = true) {
     for (let group of _groups) {
-        // log("update group", group)
+        log("update group", group)
-        if (!activatedGroups.includes(group.groupCode)) {
+        // if (!activatedGroups.includes(group.groupCode)) {
-            NTQQMsgApi.activateGroupChat(group.groupCode).then((r) => {
+        NTQQMsgApi.activateChat({peerUid: group.groupCode, chatType: ChatType.group}).then((r) => {
-                activatedGroups.push(group.groupCode);
+            // activatedGroups.push(group.groupCode);
-                // log(`激活群聊天窗口${group.groupName}(${group.groupCode})`, r)
+            // log(`激活群聊天窗口${group.groupName}(${group.groupCode})`, r)
-                // if (r.result !== 0) {
+            // if (r.result !== 0) {
-                //     setTimeout(() => NTQQMsgApi.activateGroupChat(group.groupCode).then(r => log(`再次激活群聊天窗口${group.groupName}(${group.groupCode})`, r)), 500);
+            //     setTimeout(() => NTQQMsgApi.activateGroupChat(group.groupCode).then(r => log(`再次激活群聊天窗口${group.groupName}(${group.groupCode})`, r)), 500);
-                // }else {
+            // }else {
-                // }
+            // }
-            }).catch(log)
+        }).catch(log)
-        }
+        // }
         let existGroup = groups.find(g => g.groupCode == group.groupCode);
         if (existGroup) {
             Object.assign(existGroup, group);
@@ -177,13 +225,14 @@ 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) {
+                    log(`群(${group.groupCode})成员数量减少${existGroup.memberCount} -> ${group.memberCount}`);
                     const oldMembers = existGroup.members;
 
                     await sleep(200);  // 如果请求QQ API的速度过快，通常无法正确拉取到最新的群信息，因此这里人为引入一个延时
@@ -196,25 +245,33 @@ async function processGroupEvent(payload) {
                         newMembersSet.add(member.uin);
                     }
 
+                    // 判断bot是否是管理员，如果是管理员不需要从这里得知有人退群，这里的退群无法得知是主动退群还是被踢
+                    let bot = await getGroupMember(group.groupCode, selfInfo.uin)
+                    if (bot.role == GroupMemberRole.admin || bot.role == GroupMemberRole.owner) {
+                        continue
+                    }
                     for (const member of oldMembers) {
-                        if (!newMembersSet.has(member.uin)) {
+                        if (!newMembersSet.has(member.uin) && member.uin != selfInfo.uin) {
-                            postOB11Event(new OB11GroupDecreaseEvent(group.groupCode, parseInt(member.uin)));
+                            postOB11Event(new OB11GroupDecreaseEvent(parseInt(group.groupCode), parseInt(member.uin), parseInt(member.uin), "leave"));
                             break;
                         }
                     }
                 }
+
             }
         }
 
         updateGroups(newGroupList, false).then();
     } catch (e) {
         updateGroups(payload.groupList).then();
-        console.log(e);
+        log("更新群信息错误", e.stack.toString());
     }
 }
 
 // 群列表变动
 registerReceiveHook<{ groupList: Group[], updateType: number }>(ReceiveCmdS.GROUPS, (payload) => {
+    // updateType 3是群列表变动，2是群成员变动
+    // log("群列表变动", payload.updateType, payload.groupList)
     if (payload.updateType != 2) {
         updateGroups(payload.groupList).then();
     } else {
@@ -223,7 +280,9 @@ registerReceiveHook<{ groupList: Group[], updateType: number }>(ReceiveCmdS.GROU
         }
     }
 })
-registerReceiveHook<{ groupList: Group[], updateType: number }>(ReceiveCmdS.GROUPS_UNIX, (payload) => {
+registerReceiveHook<{ groupList: Group[], updateType: number }>(ReceiveCmdS.GROUPS_STORE, (payload) => {
+    // updateType 3是群列表变动，2是群成员变动
+    // log("群列表变动", payload.updateType, payload.groupList)
     if (payload.updateType != 2) {
         updateGroups(payload.groupList).then();
     } else {
@@ -233,6 +292,36 @@ registerReceiveHook<{ groupList: Group[], updateType: number }>(ReceiveCmdS.GROU
     }
 })
 
+registerReceiveHook<{
+    groupCode: string,
+    dataSource: number,
+    members: Set<GroupMember>
+}>(ReceiveCmdS.GROUP_MEMBER_INFO_UPDATE, async (payload) => {
+    const groupCode = payload.groupCode;
+    const members = Array.from(payload.members.values());
+    // log("群成员信息变动", groupCode, members)
+    for (const member of members) {
+        const existMember = await getGroupMember(groupCode, member.uin);
+        if (existMember) {
+            Object.assign(existMember, member);
+        }
+    }
+    // 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[] }[]
@@ -240,6 +329,7 @@ registerReceiveHook<{
     for (const fData of payload.data) {
         const _friends = fData.buddyList;
         for (let friend of _friends) {
+            NTQQMsgApi.activateChat({peerUid: friend.uid, chatType: ChatType.friend}).then()
             let existFriend = friends.find(f => f.uin == friend.uin)
             if (!existFriend) {
                 friends.push(friend)
@@ -256,9 +346,9 @@ registerReceiveHook<{ msgList: Array<RawMessage> }>([ReceiveCmdS.NEW_MSG, Receiv
         const uid = message.senderUid;
         const uin = message.senderUin;
         if (uid && uin) {
-            if (message.chatType === ChatType.temp){
+            if (message.chatType === ChatType.temp) {
-                dbUtil.getReceivedTempUinMap().then(receivedTempUinMap=>{
+                dbUtil.getReceivedTempUinMap().then(receivedTempUinMap => {
-                    if (!receivedTempUinMap[uin]){
+                    if (!receivedTempUinMap[uin]) {
                         receivedTempUinMap[uin] = uid;
                         dbUtil.setReceivedTempUinMap(receivedTempUinMap)
                     }
@@ -328,3 +418,39 @@ registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmdS.SELF_SEND_MSG, ({msgR
 registerReceiveHook<{ info: { status: number } }>(ReceiveCmdS.SELF_STATUS, (info) => {
     selfInfo.online = info.info.status !== 20
 })
+
+
+let activatedPeerUids: string[] = []
+registerReceiveHook<{
+    changedRecentContactLists: {
+        listType: number, sortedContactList: string[],
+        changedList: {
+            id: string,  // peerUid
+            chatType: ChatType
+        }[]
+    }[]
+}>(ReceiveCmdS.RECENT_CONTACT, async (payload) => {
+    for (const recentContact of payload.changedRecentContactLists) {
+        for (const changedContact of recentContact.changedList) {
+            if (activatedPeerUids.includes(changedContact.id)) continue;
+            activatedPeerUids.push(changedContact.id)
+            const peer = {peerUid: changedContact.id, chatType: changedContact.chatType}
+            if (changedContact.chatType === ChatType.temp) {
+                log("收到临时会话消息", peer)
+                NTQQMsgApi.activateChatAndGetHistory(peer).then(
+                    () => {
+                        NTQQMsgApi.getMsgHistory(peer, "", 20).then(({msgList}) => {
+                            let lastTempMsg =  msgList.pop()
+                            log("激活窗口之前的第一条临时会话消息:", lastTempMsg)
+                            if ((Date.now() / 1000) - parseInt(lastTempMsg.msgTime) < 5) {
+                                OB11Constructor.message(lastTempMsg).then(r => postOB11Event(r))
+                            }
+                        })
+                    }
+                )
+            } else {
+                NTQQMsgApi.activateChat(peer).then()
+            }
+        }
+    }
+})

src/ntqqapi/ntcall.ts

@@ -1,8 +1,11 @@
 import {ipcMain} from "electron";
-import {hookApiCallbacks, ReceiveCmd, registerReceiveHook, removeReceiveHook} from "./hook";
+import {hookApiCallbacks, ReceiveCmd, ReceiveCmdS, registerReceiveHook, removeReceiveHook} from "./hook";
 
 import {v4 as uuidv4} from "uuid"
 import {log} from "../common/utils/log";
+import {NTQQWindow, NTQQWindowApi, NTQQWindows} from "./api/window";
+import {WebApi} from "./api/webapi";
+import {HOOK_LOG} from "../common/config";
 
 export enum NTQQApiClass {
     NT_API = "ns-ntApi",
@@ -11,13 +14,19 @@ 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 {
     RECENT_CONTACT = "nodeIKernelRecentContactService/fetchAndSubscribeABatchOfRecentContact",
-    ADD_ACTIVE_CHAT = "nodeIKernelMsgService/getAioFirstViewLatestMsgsAndAddActiveChat",  // 激活群助手内的聊天窗口，这样才能收到消息
+    ACTIVE_CHAT_PREVIEW = "nodeIKernelMsgService/getAioFirstViewLatestMsgsAndAddActiveChat",  // 激活聊天窗口，有时候必须这样才能收到消息, 并返回最新预览消息
-    ADD_ACTIVE_CHAT_2 = "nodeIKernelMsgService/getMsgsIncludeSelfAndAddActiveChat",
+    ACTIVE_CHAT_HISTORY = "nodeIKernelMsgService/getMsgsIncludeSelfAndAddActiveChat", // 激活聊天窗口，有时候必须这样才能收到消息, 并返回历史消息
+    HISTORY_MSG = "nodeIKernelMsgService/getMsgsIncludeSelf",
+    GET_MULTI_MSG = "nodeIKernelMsgService/getMultiMsg",
+
     LIKE_FRIEND = "nodeIKernelProfileLikeService/setBuddyProfileLike",
     SELF_INFO = "fetchAuthData",
     FRIENDS = "nodeIKernelBuddyService/getBuddyList",
@@ -26,6 +35,7 @@ export enum NTQQApiMethod {
     GROUP_MEMBERS = "nodeIKernelGroupService/getNextMemberList",
     USER_INFO = "nodeIKernelProfileService/getUserSimpleInfo",
     USER_DETAIL_INFO = "nodeIKernelProfileService/getUserDetailInfo",
+    USER_DETAIL_INFO_WITH_BIZ_INFO = "nodeIKernelProfileService/getUserDetailInfoWithBizInfo",
     FILE_TYPE = "getFileType",
     FILE_MD5 = "getFileMd5",
     FILE_COPY = "copyFile",
@@ -65,7 +75,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 {
@@ -98,7 +110,7 @@ export 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
@@ -109,7 +121,7 @@ export function callNTQQApi<ReturnType>(params: NTQQApiParams) {
         }
         const apiArgs = [methodName, ...args]
         if (!cbCmd) {
-            // QQ后端会返回结果，并且可以插根据uuid识别
+            // QQ后端会返回结果，并且可以根据uuid识别
             hookApiCallbacks[uuid] = (r: ReturnType) => {
                 success = true
                 resolve(r)
@@ -153,7 +165,12 @@ export function callNTQQApi<ReturnType>(params: NTQQApiParams) {
 
         ipcMain.emit(
             channel,
-            {},
+            {
+                sender: {
+                    send: (..._args: unknown[]) => {
+                    },
+                },
+            },
             {type: 'request', callbackId: uuid, eventName},
             apiArgs
         )
@@ -177,5 +194,4 @@ export class NTQQApi {
             ]
         })
     }
-
 }

src/ntqqapi/types/group.ts

@@ -38,6 +38,7 @@ export enum GroupMemberRole {
 }
 
 export interface GroupMember {
+    memberSpecialTitle: string;
     avatarPath: string;
     cardName: string;
     cardType: number;

src/ntqqapi/types/msg.ts

@@ -1,4 +1,5 @@
 import {GroupMemberRole} from "./group";
+import exp from "constants";
 
 export enum ElementType {
     TEXT = 1,
@@ -48,24 +49,29 @@ export enum PicType {
     jpg = 1000
 }
 
+export enum PicSubType {
+    normal = 0, // 普通图片，大图
+    face = 1  // 表情包小图
+}
+
 export interface SendPicElement {
     elementType: ElementType.PIC,
     elementId: "",
     picElement: {
         md5HexStr: string,
-        fileSize: number,
+        fileSize: number | string,
         picWidth: number,
         picHeight: number,
         fileName: string,
         sourcePath: string,
         original: boolean,
         picType: PicType,
-        picSubType: number,
+        picSubType: PicSubType,
         fileUuid: string,
         fileSubId: string,
         thumbFileSize: number,
         summary: string,
-    }
+    },
 }
 
 export interface SendReplyElement {
@@ -98,7 +104,8 @@ export interface FileElement {
     "fileSha3"?: "",
     "fileUuid"?: "",
     "fileSubId"?: "",
-    "thumbFileSize"?: number
+    "thumbFileSize"?: number,
+    fileBizId?: number
 }
 
 export interface SendFileElement {
@@ -165,9 +172,11 @@ export interface ArkElement {
 }
 
 export const IMAGE_HTTP_HOST = "https://gchat.qpic.cn"
+export const IMAGE_HTTP_HOST_NT = "https://multimedia.nt.qq.com.cn"
 
 export interface PicElement {
-    originImageUrl: string;  // http url, 没有host，host是https://gchat.qpic.cn/
+    originImageUrl: string;  // http url, 没有host，host是https://gchat.qpic.cn/, 带download参数的是https://multimedia.nt.qq.com.cn
+    originImageMd5?: string;
     sourcePath: string; // 图片本地路径
     thumbPath: Map<number, string>;
     picWidth: number;
@@ -180,6 +189,7 @@ export interface PicElement {
 
 export enum GrayTipElementSubType {
     INVITE_NEW_MEMBER = 12,
+    MEMBER_NEW_TITLE = 17
 }
 
 export interface GrayTipElement {
@@ -196,6 +206,9 @@ export interface GrayTipElement {
     groupElement: TipGroupElement,
     xmlElement: {
         content: string;
+    },
+    jsonGrayTipElement: {
+        jsonStr: string;
     }
 }
 
@@ -204,6 +217,45 @@ export interface FaceElement {
     faceType: 1
 }
 
+export interface MarketFaceElement {
+    "itemType": 6,
+    "faceInfo": 1,
+    "emojiPackageId": 203875,
+    "subType": 3,
+    "mediaType": 0,
+    "imageWidth": 200,
+    "imageHeight": 200,
+    "faceName": string,
+    "emojiId": "094d53bd1c9ac5d35d04b08e8a6c992c",
+    "key": "a8b1dd0aebc8d910",
+    "param": null,
+    "mobileParam": null,
+    "sourceType": null,
+    "startTime": null,
+    "endTime": null,
+    "emojiType": 1,
+    "hasIpProduct": null,
+    "voiceItemHeightArr": null,
+    "sourceName": null,
+    "sourceJumpUrl": null,
+    "sourceTypeName": null,
+    "backColor": null,
+    "volumeColor": null,
+    "staticFacePath": "E:\\SystemDocuments\\QQ\\721011692\\nt_qq\\nt_data\\Emoji\\marketface\\203875\\094d53bd1c9ac5d35d04b08e8a6c992c_aio.png",
+    "dynamicFacePath": "E:\\SystemDocuments\\QQ\\721011692\\nt_qq\\nt_data\\Emoji\\marketface\\203875\\094d53bd1c9ac5d35d04b08e8a6c992c",
+    "supportSize": [
+        {
+            "width": 300,
+            "height": 300
+        },
+        {
+            "width": 200,
+            "height": 200
+        }
+    ],
+    "apngSupportSize": null
+}
+
 export interface VideoElement {
     "filePath": string,
     "fileName": string,
@@ -229,6 +281,34 @@ export interface VideoElement {
     "sourceVideoCodecFormat"?: number
 }
 
+export interface MarkdownElement {
+    content: string,
+}
+
+export interface InlineKeyboardElementRowButton{
+    "id": "",
+    "label": string,
+    "visitedLabel": string,
+    "style": 1, // 未知
+    "type": 2, // 未知
+    "clickLimit": 0,  // 未知
+    "unsupportTips": "请升级新版手机QQ",
+    "data": string,
+    "atBotShowChannelList": false,
+    "permissionType": 2,
+    "specifyRoleIds": [],
+    "specifyTinyids": [],
+    "isReply": false,
+    "anchor": 0,
+    "enter": false,
+    "subscribeDataTemplateIds": []
+}
+export interface InlineKeyboardElement {
+    rows: [{
+        buttons: InlineKeyboardElementRowButton[]
+    }]
+}
+
 export interface TipAioOpGrayTipElement {  // 这是什么提示来着？
     operateType: number,
     peerUid: string,
@@ -237,6 +317,7 @@ export interface TipAioOpGrayTipElement {  // 这是什么提示来着？
 
 export enum TipGroupElementType {
     memberIncrease = 1,
+    kicked = 3, // 被移出群
     ban = 8
 }
 
@@ -247,7 +328,7 @@ export interface TipGroupElement {
     "memberUid": string,
     "memberNick": string,
     "memberRemark": string,
-    "adminUid": string,  // 同意加群的管理员uid
+    "adminUid": string,
     "adminNick": string,
     "adminRemark": string,
     "createGroup": null,
@@ -279,6 +360,11 @@ export interface TipGroupElement {
     }
 }
 
+export interface MultiForwardMsgElement{
+    xmlContent: string,  // xml格式的消息内容
+    resId: string,
+    fileName: string,
+}
 
 export interface RawMessage {
     msgId: string;
@@ -316,5 +402,9 @@ export interface RawMessage {
         faceElement: FaceElement;
         videoElement: VideoElement;
         fileElement: FileElement;
+        marketFaceElement: MarketFaceElement;
+        inlineKeyboardElement: InlineKeyboardElement;
+        markdownElement: MarkdownElement;
+        multiForwardMsgElement: MultiForwardMsgElement;
     }[];
 }

src/ntqqapi/types/notify.ts

@@ -4,8 +4,9 @@ export enum GroupNotifyTypes {
     INVITED_JOIN = 4,  // 有人接受了邀请入群
     JOIN_REQUEST = 7,
     ADMIN_SET = 8,
+    KICK_MEMBER = 9,
+    MEMBER_EXIT = 11, // 主动退出
     ADMIN_UNSET = 12,
-    MEMBER_EXIT = 11, // 主动退出?
 
 }
 

src/ntqqapi/types/user.ts

@@ -18,7 +18,54 @@ export interface User {
     longNick?: string; // 签名
     remark?: string;
     sex?: Sex;
-    "qqLevel"?: QQLevel
+    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 {

src/onebot11/action/BaseAction.ts

@@ -1,5 +1,5 @@
 import {ActionName, BaseCheckResult} from "./types"
-import {OB11Response} from "./utils"
+import {OB11Response} from "./OB11Response"
 import {OB11Return} from "../types";
 
 import {log} from "../../common/utils/log";

src/onebot11/action/Debug.ts

@@ -1,29 +0,0 @@
-import BaseAction from "./BaseAction";
-import {NTQQApi} from "../../ntqqapi/ntcall";
-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 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 fs from "fs/promises";
-import {dbUtil} from "../../common/db";
-import {getConfigUtil} from "../../common/config";
-
-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/GetGroupList.ts

@@ -1,16 +0,0 @@
-import {OB11Group} from '../types';
-import {OB11Constructor} from "../constructor";
-import {groups} from "../../common/data";
-import BaseAction from "./BaseAction";
-import {ActionName} from "./types";
-
-
-class GetGroupList extends BaseAction<null, OB11Group[]> {
-    actionName = ActionName.GetGroupList
-
-    protected async _handle(payload: null) {
-        return OB11Constructor.groups(groups);
-    }
-}
-
-export default GetGroupList

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/GetForwardMsg.ts

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

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, true))
-            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,16 +1,20 @@
-import SendMsg from "../SendMsg";
+import SendMsg, {convertMessage2List} from "../msg/SendMsg";
 import {OB11PostSendMsg} from "../../types";
 import {ActionName} from "../types";
 
-export class GoCQHTTPSendGroupForwardMsg extends SendMsg {
+export class GoCQHTTPSendForwardMsg extends SendMsg {
-    actionName = ActionName.GoCQHTTP_SendGroupForwardMsg;
+    actionName = ActionName.GoCQHTTP_SendForwardMsg;
 
     protected async check(payload: OB11PostSendMsg) {
-        payload.message = this.convertMessage2List(payload.messages);
+        if (payload.messages) payload.message = convertMessage2List(payload.messages);
         return super.check(payload);
     }
 }
 
-export class GoCQHTTPSendPrivateForwardMsg extends GoCQHTTPSendGroupForwardMsg {
+export class GoCQHTTPSendPrivateForwardMsg extends GoCQHTTPSendForwardMsg {
     actionName = ActionName.GoCQHTTP_SendPrivateForwardMsg;
 }
+
+export class GoCQHTTPSendGroupForwardMsg extends GoCQHTTPSendForwardMsg {
+    actionName = ActionName.GoCQHTTP_SendGroupForwardMsg;
+}

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 {uri2local} from "../../utils";
 import fs from "fs";
 import {NTQQMsgApi} from "../../../ntqqapi/api/msg";
+import {uri2local} from "../../../common/utils";
 
 interface Payload{
     group_id: number

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

@@ -0,0 +1,22 @@
+import {OB11Group} from '../../types';
+import {OB11Constructor} from "../../constructor";
+import {groups} from "../../../common/data";
+import BaseAction from "../BaseAction";
+import {ActionName} from "../types";
+import {NTQQGroupApi} from "../../../ntqqapi/api";
+import {log} from "../../../common/utils";
+
+
+class GetGroupList extends BaseAction<null, OB11Group[]> {
+    actionName = ActionName.GetGroupList
+
+    protected async _handle(payload: null) {
+        // if (groups.length === 0) {
+        //     const groups = await NTQQGroupApi.getGroups(true)
+        //     log("get groups", groups)
+        // }
+        return OB11Constructor.groups(groups);
+    }
+}
+
+export default GetGroupList

src/onebot11/action/group/GetGroupMemberInfo.ts

@@ -1,11 +1,11 @@
-import {OB11GroupMember} from '../types';
+import {OB11GroupMember} from '../../types';
-import {getGroupMember} from "../../common/data";
+import {getGroupMember} 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";
-import {NTQQUserApi} from "../../ntqqapi/api/user";
+import {NTQQUserApi} from "../../../ntqqapi/api/user";
-import {log} from "../../common/utils/log";
+import {log} from "../../../common/utils/log";
-import {isNull} from "../../common/utils/helper";
+import {isNull} from "../../../common/utils/helper";
 
 
 export interface PayloadType {
@@ -21,7 +21,7 @@ class GetGroupMemberInfo extends BaseAction<PayloadType, OB11GroupMember> {
         if (member) {
             if (isNull(member.sex)){
                 log("获取群成员详细信息")
-                let info = (await NTQQUserApi.getUserDetailInfo(member.uid))
+                let info = (await NTQQUserApi.getUserDetailInfo(member.uid, true))
                 log("群成员详细信息结果", info)
                 Object.assign(member, info);
             }

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 {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";
+import {NTQQGroupApi} from "../../../ntqqapi/api/group";
 
 export interface PayloadType {
     group_id: number

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,8 +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/log";
+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 {ActionName} from "./types";
+import {ActionName} from "../types";
-import {NTQQGroupApi} from "../../ntqqapi/api/group";
+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();
+        const approve = payload.approve.toString() === "true";
         await NTQQGroupApi.handleGroupRequest(seq,
-            payload.approve ? GroupRequestOperateTypes.approve : GroupRequestOperateTypes.reject,
+            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 {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";
+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 NTQQGroupApi.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 {getGroupMember} from "../../common/data";
+import {getGroupMember} from "../../../common/data";
-import {ActionName} from "./types";
+import {ActionName} from "../types";
-import {NTQQGroupApi} from "../../ntqqapi/api/group";
+import {NTQQGroupApi} from "../../../ntqqapi/api/group";
 
 interface Payload {
     group_id: number,

src/onebot11/action/group/SetGroupCard.ts

@@ -1,7 +1,7 @@
-import BaseAction from "./BaseAction";
+import BaseAction from "../BaseAction";
-import {getGroupMember} from "../../common/data";
+import {getGroupMember} from "../../../common/data";
-import {ActionName} from "./types";
+import {ActionName} from "../types";
-import {NTQQGroupApi} from "../../ntqqapi/api/group";
+import {NTQQGroupApi} from "../../../ntqqapi/api/group";
 
 interface Payload {
     group_id: number,

src/onebot11/action/group/SetGroupKick.ts

@@ -1,7 +1,7 @@
-import BaseAction from "./BaseAction";
+import BaseAction from "../BaseAction";
-import {getGroupMember} from "../../common/data";
+import {getGroupMember} from "../../../common/data";
-import {ActionName} from "./types";
+import {ActionName} from "../types";
-import {NTQQGroupApi} from "../../ntqqapi/api/group";
+import {NTQQGroupApi} from "../../../ntqqapi/api/group";
 
 interface Payload {
     group_id: number,

src/onebot11/action/group/SetGroupLeave.ts

@@ -1,7 +1,7 @@
-import BaseAction from "./BaseAction";
+import BaseAction from "../BaseAction";
-import {ActionName} from "./types";
+import {ActionName} from "../types";
-import {NTQQGroupApi} from "../../ntqqapi/api/group";
+import {NTQQGroupApi} from "../../../ntqqapi/api/group";
-import {log} from "../../common/utils/log";
+import {log} from "../../../common/utils/log";
 
 interface Payload {
     group_id: number,

src/onebot11/action/group/SetGroupName.ts

@@ -1,6 +1,6 @@
-import BaseAction from "./BaseAction";
+import BaseAction from "../BaseAction";
-import {ActionName} from "./types";
+import {ActionName} from "../types";
-import {NTQQGroupApi} from "../../ntqqapi/api/group";
+import {NTQQGroupApi} from "../../../ntqqapi/api/group";
 
 interface Payload {
     group_id: number,

src/onebot11/action/group/SetGroupWholeBan.ts

@@ -1,6 +1,6 @@
-import BaseAction from "./BaseAction";
+import BaseAction from "../BaseAction";
-import {ActionName} from "./types";
+import {ActionName} from "../types";
-import {NTQQGroupApi} from "../../ntqqapi/api/group";
+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 NTQQGroupApi.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,48 @@
-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 {GoCQHTTPSendForwardMsg, 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";
+import {GoCQHTTGetForwardMsgAction} from "./go-cqhttp/GetForwardMsg";
 
 export const actionHandlers = [
+    new GetFile(),
     new Debug(),
     new GetConfigAction(),
     new SetConfigAction(),
@@ -69,12 +74,16 @@ export const actionHandlers = [
     new CleanCache(),
 
     //以下为go-cqhttp api
+    new GoCQHTTPSendForwardMsg(),
     new GoCQHTTPSendGroupForwardMsg(),
     new GoCQHTTPSendPrivateForwardMsg(),
     new GoCQHTTPGetStrangerInfo(),
+    new GoCQHTTPDownloadFile(),
     new GetGuildList(),
     new GoCQHTTPMarkMsgAsRead(),
     new GoCQHTTPUploadGroupFile(),
+    new GoCQHTTPGetGroupMsgHistory(),
+    new GoCQHTTGetForwardMsgAction(),
 
 ]
 

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/SetQQAvatar.ts

@@ -1,9 +1,8 @@
 import BaseAction from "../BaseAction";
 import {ActionName} from "../types";
-import { uri2local } from "../../utils";
 import * as fs from "node:fs";
 import {NTQQUserApi} from "../../../ntqqapi/api/user";
-import {checkFileReceived} from "../../../common/utils/file";
+import {checkFileReceived, uri2local} from "../../../common/utils/file";
 // import { log } from "../../../common/utils";
 
 interface Payload {

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 {dbUtil} from "../../common/db";
+import {dbUtil} from "../../../common/db";
-import {NTQQMsgApi} from "../../ntqqapi/api/msg";
+import {NTQQMsgApi} from "../../../ntqqapi/api/msg";
 
 interface Payload {
     message_id: number

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

@@ -2,11 +2,11 @@ import {
     AtType,
     ChatType,
     ElementType,
-    Group,
+    Group, PicSubType,
     RawMessage,
     SendArkElement,
     SendMessageElement
-} from "../../ntqqapi/types";
+} from "../../../ntqqapi/types";
 import {
     friends,
     getFriend,
@@ -14,7 +14,7 @@ import {
     getGroupMember,
     getUidByUin,
     selfInfo,
-} from "../../common/data";
+} from "../../../common/data";
 import {
     OB11MessageCustomMusic,
     OB11MessageData,
@@ -22,19 +22,19 @@ import {
     OB11MessageMixType,
     OB11MessageNode,
     OB11PostSendMsg
-} from '../types';
+} from '../../types';
-import {Peer} from "../../ntqqapi/api/msg";
+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 {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 {NTQQMsgApi} from "../../../ntqqapi/api/msg";
-import {log} from "../../common/utils/log";
+import {log} from "../../../common/utils/log";
-import {sleep} from "../../common/utils/helper";
+import {sleep} from "../../../common/utils/helper";
+import {uri2local} from "../../../common/utils";
 
 function checkSendMessage(sendMsgList: OB11MessageData[]) {
     function checkUri(uri: string): boolean {
@@ -75,11 +75,156 @@ export interface ReturnDataType {
     message_id: number
 }
 
+export function convertMessage2List(message: OB11MessageMixType, autoEscape = false) {
+    if (typeof message === "string") {
+        if (!autoEscape) {
+            message = decodeCQCode(message.toString())
+        } else {
+            message = [{
+                type: OB11MessageDataType.text,
+                data: {
+                    text: message
+                }
+            }]
+        }
+    } else if (!Array.isArray(message)) {
+        message = [message]
+    }
+    return message;
+}
+
+export async function createSendElements(messageData: OB11MessageData[], group: Group | undefined, ignoreTypes: OB11MessageDataType[] = []) {
+    let sendElements: SendMessageElement[] = []
+    let deleteAfterSentFiles: string[] = []
+    for (let sendMsg of messageData) {
+        if (ignoreTypes.includes(sendMsg.type)) {
+            continue
+        }
+        switch (sendMsg.type) {
+            case OB11MessageDataType.text: {
+                const text = sendMsg.data?.text;
+                if (text) {
+                    sendElements.push(SendMsgElementConstructor.text(sendMsg.data!.text))
+                }
+            }
+                break;
+            case OB11MessageDataType.at: {
+                if (!group) {
+                    continue
+                }
+                let atQQ = sendMsg.data?.qq;
+                if (atQQ) {
+                    atQQ = atQQ.toString()
+                    if (atQQ === "all") {
+                        sendElements.push(SendMsgElementConstructor.at(atQQ, atQQ, AtType.atAll, "全体成员"))
+                    } else {
+                        // const atMember = group?.members.find(m => m.uin == atQQ)
+                        const atMember = await getGroupMember(group?.groupCode, atQQ);
+                        if (atMember) {
+                            sendElements.push(SendMsgElementConstructor.at(atQQ, atMember.uid, AtType.atUser, atMember.cardName || atMember.nick))
+                        }
+                    }
+                }
+            }
+                break;
+            case OB11MessageDataType.reply: {
+                let replyMsgId = sendMsg.data.id;
+                if (replyMsgId) {
+                    const replyMsg = await dbUtil.getMsgByShortId(parseInt(replyMsgId))
+                    if (replyMsg) {
+                        sendElements.push(SendMsgElementConstructor.reply(replyMsg.msgSeq, replyMsg.msgId, replyMsg.senderUin, replyMsg.senderUin))
+                    }
+                }
+            }
+                break;
+            case OB11MessageDataType.face: {
+                const faceId = sendMsg.data?.id
+                if (faceId) {
+                    sendElements.push(SendMsgElementConstructor.face(parseInt(faceId)))
+                }
+            }
+                break;
+
+            case OB11MessageDataType.image:
+            case OB11MessageDataType.file:
+            case OB11MessageDataType.video:
+            case OB11MessageDataType.voice: {
+                let file = sendMsg.data?.file
+                const payloadFileName = sendMsg.data?.name
+                if (file) {
+                    const cache = await dbUtil.getFileCache(file)
+                    if (cache) {
+                        if (fs.existsSync(cache.filePath)) {
+                            file = "file://" + cache.filePath
+                        } else if (cache.downloadFunc) {
+                            await cache.downloadFunc()
+                            file = cache.filePath;
+                        } else if (cache.url) {
+                            file = cache.url
+                        }
+                        log("找到文件缓存", file);
+                    }
+                    const {path, isLocal, fileName, errMsg} = (await uri2local(file))
+                    if (errMsg) {
+                        throw errMsg
+                    }
+                    if (path) {
+                        if (!isLocal) { // 只删除http和base64转过来的文件
+                            deleteAfterSentFiles.push(path)
+                        }
+                        if (sendMsg.type === OB11MessageDataType.file) {
+                            log("发送文件", path, payloadFileName || fileName)
+                            sendElements.push(await SendMsgElementConstructor.file(path, payloadFileName || fileName));
+                        } else if (sendMsg.type === OB11MessageDataType.video) {
+                            log("发送视频", path, payloadFileName || fileName)
+                            let thumb = sendMsg.data?.thumb;
+                            if (thumb) {
+                                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 || "", <PicSubType>parseInt(sendMsg.data?.subType?.toString()) || 0));
+                        }
+                    }
+                }
+            }
+                break;
+            case OB11MessageDataType.json: {
+                sendElements.push(SendMsgElementConstructor.ark(sendMsg.data.data))
+            }
+                break
+        }
+
+    }
+
+    return {
+        sendElements,
+        deleteAfterSentFiles
+    }
+}
+
+export async function sendMsg(peer: Peer, sendElements: SendMessageElement[], deleteAfterSentFiles: string[], waitComplete = true) {
+    if (!sendElements.length) {
+        throw ("消息体无法解析")
+    }
+    const returnMsg = await NTQQMsgApi.sendMsg(peer, sendElements, waitComplete, 20000);
+    log("消息发送结果", returnMsg)
+    returnMsg.msgShortId = await dbUtil.addMsg(returnMsg)
+    deleteAfterSentFiles.map(f => fs.unlink(f, () => {
+    }))
+    return returnMsg
+}
+
 export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
     actionName = ActionName.SendMsg
 
     protected async check(payload: OB11PostSendMsg): Promise<BaseCheckResult> {
-        const messages = this.convertMessage2List(payload.message);
+        const messages = convertMessage2List(payload.message);
         const fmNum = this.getSpecialMsgNum(payload, OB11MessageDataType.node)
         if (fmNum && fmNum != messages.length) {
             return {
@@ -87,7 +232,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                 message: "转发消息不能和普通消息混在一起发送,转发需要保证message只有type为node的元素"
             }
         }
-        if (payload.group_id && !(await getGroup(payload.group_id))) {
+        if (payload.message_type !== "private" && payload.group_id &&!(await getGroup(payload.group_id))) {
             return {
                 valid: false,
                 message: `群${payload.group_id}不存在`
@@ -149,7 +294,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
         } else {
             throw ("发送消息参数错误, 请指定group_id或user_id")
         }
-        const messages = this.convertMessage2List(payload.message);
+        const messages = convertMessage2List(payload.message);
         if (this.getSpecialMsgNum(payload, OB11MessageDataType.node)) {
             try {
                 const returnMsg = await this.handleForwardNode(peer, messages as OB11MessageNode[], group)
@@ -173,27 +318,13 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
             }
         }
         // log("send msg:", peer, sendElements)
-        const {sendElements, deleteAfterSentFiles} = await this.createSendElements(messages, group)
+        const {sendElements, deleteAfterSentFiles} = await createSendElements(messages, group)
-        const returnMsg = await this.send(peer, sendElements, deleteAfterSentFiles)
+        const returnMsg = await sendMsg(peer, sendElements, deleteAfterSentFiles)
         deleteAfterSentFiles.map(f => fs.unlink(f, () => {
         }));
         return {message_id: returnMsg.msgShortId}
     }
 
-    protected convertMessage2List(message: OB11MessageMixType) {
-        if (typeof message === "string") {
-            // message = [{
-            //     type: OB11MessageDataType.text,
-            //     data: {
-            //         text: message
-            //     }
-            // }] as OB11MessageData[]
-            message = decodeCQCode(message.toString())
-        } else if (!Array.isArray(message)) {
-            message = [message]
-        }
-        return message;
-    }
 
     private getSpecialMsgNum(payload: OB11PostSendMsg, msgType: OB11MessageDataType): number {
         if (Array.isArray(payload.message)) {
@@ -262,7 +393,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                     const {
                         sendElements,
                         deleteAfterSentFiles
-                    } = await this.createSendElements(this.convertMessage2List(messageNode.data.content), group);
+                    } = await createSendElements(convertMessage2List(messageNode.data.content), group);
                     log("开始生成转发节点", sendElements);
                     let sendElementsSplit: SendMessageElement[][] = []
                     let splitIndex = 0;
@@ -284,7 +415,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                     }
                     // log("分割后的转发节点", sendElementsSplit)
                     for (const eles of sendElementsSplit) {
-                        const nodeMsg = await this.send(selfPeer, eles, [], true);
+                        const nodeMsg = await sendMsg(selfPeer, eles, [], true);
                         nodeMsgIds.push(nodeMsg.msgId)
                         await sleep(500);
                         log("转发节点生成成功", nodeMsg.msgId);
@@ -346,121 +477,8 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
         }
     }
 
-    private async createSendElements(messageData: OB11MessageData[], group: Group | undefined, ignoreTypes: OB11MessageDataType[] = []) {
-        let sendElements: SendMessageElement[] = []
-        let deleteAfterSentFiles: string[] = []
-        for (let sendMsg of messageData) {
-            if (ignoreTypes.includes(sendMsg.type)) {
-                continue
-            }
-            switch (sendMsg.type) {
-                case OB11MessageDataType.text: {
-                    const text = sendMsg.data?.text;
-                    if (text) {
-                        sendElements.push(SendMsgElementConstructor.text(sendMsg.data!.text))
-                    }
-                }
-                    break;
-                case OB11MessageDataType.at: {
-                    if (!group) {
-                        continue
-                    }
-                    let atQQ = sendMsg.data?.qq;
-                    if (atQQ) {
-                        atQQ = atQQ.toString()
-                        if (atQQ === "all") {
-                            sendElements.push(SendMsgElementConstructor.at(atQQ, atQQ, AtType.atAll, "全体成员"))
-                        } else {
-                            // const atMember = group?.members.find(m => m.uin == atQQ)
-                            const atMember = await getGroupMember(group?.groupCode, atQQ);
-                            if (atMember) {
-                                sendElements.push(SendMsgElementConstructor.at(atQQ, atMember.uid, AtType.atUser, atMember.cardName || atMember.nick))
-                            }
-                        }
-                    }
-                }
-                    break;
-                case OB11MessageDataType.reply: {
-                    let replyMsgId = sendMsg.data.id;
-                    if (replyMsgId) {
-                        const replyMsg = await dbUtil.getMsgByShortId(parseInt(replyMsgId))
-                        if (replyMsg) {
-                            sendElements.push(SendMsgElementConstructor.reply(replyMsg.msgSeq, replyMsg.msgId, replyMsg.senderUin, replyMsg.senderUin))
-                        }
-                    }
-                }
-                    break;
-                case OB11MessageDataType.face: {
-                    const faceId = sendMsg.data?.id
-                    if (faceId) {
-                        sendElements.push(SendMsgElementConstructor.face(parseInt(faceId)))
-                    }
-                }
-                    break;
 
-                case OB11MessageDataType.image:
-                case OB11MessageDataType.file:
-                case OB11MessageDataType.video:
-                case OB11MessageDataType.voice: {
-                    let file = sendMsg.data?.file
-                    const payloadFileName = sendMsg.data?.name
-                    if (file) {
-                        const cache = await dbUtil.getFileCache(file)
-                        if (cache) {
-                            if (fs.existsSync(cache.filePath)) {
-                                file = "file://" + cache.filePath
-                            } else if (cache.downloadFunc) {
-                                await cache.downloadFunc()
-                                file = cache.filePath;
-                            } else if (cache.url) {
-                                file = cache.url
-                            }
-                            log("找到文件缓存", file);
-                        }
-                        const {path, isLocal, fileName, errMsg} = (await uri2local(file))
-                        if (errMsg) {
-                            throw errMsg
-                        }
-                        if (path) {
-                            if (!isLocal) { // 只删除http和base64转过来的文件
-                                deleteAfterSentFiles.push(path)
-                            }
-                            if (sendMsg.type === OB11MessageDataType.file) {
-                                log("发送文件", path, payloadFileName || fileName)
-                                sendElements.push(await SendMsgElementConstructor.file(path, payloadFileName || fileName));
-                            } else if (sendMsg.type === OB11MessageDataType.video) {
-                                log("发送视频", path, payloadFileName || fileName)
-                                sendElements.push(await SendMsgElementConstructor.video(path, payloadFileName || fileName));
-                            } 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;
-            }
 
-        }
-
-        return {
-            sendElements,
-            deleteAfterSentFiles
-        }
-    }
-
-    private async send(peer: Peer, sendElements: SendMessageElement[], deleteAfterSentFiles: string[], waitComplete = true) {
-        if (!sendElements.length) {
-            throw ("消息体无法解析")
-        }
-        const returnMsg = await NTQQMsgApi.sendMsg(peer, sendElements, waitComplete, 20000);
-        log("消息发送结果", returnMsg)
-        returnMsg.msgShortId = await dbUtil.addMsg(returnMsg)
-        deleteAfterSentFiles.map(f => fs.unlink(f, () => {
-        }))
-        return returnMsg
-    }
 
     private genMusicElement(url: string, audio: string, title: string, content: string, image: string): SendArkElement {
         const musicJson = {

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 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";
+import {NTQQFileApi, NTQQFileCacheApi} from "../../../ntqqapi/api/file";
 
 export default class CleanCache extends BaseAction<void, void> {
     actionName = ActionName.CleanCache

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",
@@ -48,10 +51,14 @@ export enum ActionName {
     GetRecord = "get_record",
     CleanCache = "clean_cache",
     // 以下为go-cqhttp api
+    GoCQHTTP_SendForwardMsg = "send_forward_msg",
     GoCQHTTP_SendGroupForwardMsg = "send_group_forward_msg",
     GoCQHTTP_SendPrivateForwardMsg = "send_private_forward_msg",
     GoCQHTTP_GetStrangerInfo = "get_stranger_info",
     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",
+    GoCQHTTP_GetForwardMsg = "get_forward_msg",
 }

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 {ActionName} from "./types";
+import {ActionName} from "../types";
-import {NTQQFriendApi} from "../../ntqqapi/api/friend";
+import {NTQQFriendApi} from "../../../ntqqapi/api/friend";
-import {log} from "../../common/utils/log";
+import {log} from "../../../common/utils/log";
 
 interface Payload {
     user_id: number,

src/onebot11/action/user/SetFriendAddRequest.ts

@@ -1,6 +1,6 @@
-import BaseAction from "./BaseAction";
+import BaseAction from "../BaseAction";
-import {ActionName} from "./types";
+import {ActionName} from "../types";
-import {NTQQFriendApi} from "../../ntqqapi/api/friend";
+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 NTQQFriendApi.handleFriendRequest(parseInt(payload.flag), payload.approve)
+        const approve = payload.approve.toString() === "true";
+        await NTQQFriendApi.handleFriendRequest(payload.flag, approve)
         return null;
     }
 }

src/onebot11/constructor.ts

@@ -14,11 +14,13 @@ import {
     GrayTipElementSubType,
     Group,
     GroupMember,
-    IMAGE_HTTP_HOST,
+    IMAGE_HTTP_HOST, IMAGE_HTTP_HOST_NT,
     RawMessage,
-    SelfInfo, Sex,
+    SelfInfo,
+    Sex,
     TipGroupElementType,
-    User
+    User,
+    VideoElement
 } from '../ntqqapi/types';
 import {getFriend, getGroupMember, selfInfo, tempGroupCodeMap} from '../common/data';
 import {EventType} from "./event/OB11BaseEvent";
@@ -34,12 +36,16 @@ 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";
+import {OB11GroupDecreaseEvent} from "./event/notice/OB11GroupDecreaseEvent";
 
+let lastRKeyUpdateTime = 0;
 
 export class OB11Constructor {
     static async message(msg: RawMessage): Promise<OB11Message> {
-
+        let config = getConfigUtil().getConfig();
-        const {enableLocalFile2Url, ob11: {messagePostFormat}} = getConfigUtil().getConfig()
+        const {enableLocalFile2Url, ob11: {messagePostFormat}} = config;
         const message_type = msg.chatType == ChatType.group ? "group" : "private";
         const resMsg: OB11Message = {
             self_id: parseInt(selfInfo.uin),
@@ -135,9 +141,32 @@ export class OB11Constructor {
                 // message_data["data"]["path"] = element.picElement.sourcePath
                 const url = element.picElement.originImageUrl
                 const fileMd5 = element.picElement.md5HexStr
+                const fileUuid = element.picElement.fileUuid
+                // let currentRKey = config.imageRKey || "CAQSKAB6JWENi5LMk0kc62l8Pm3Jn1dsLZHyRLAnNmHGoZ3y_gDZPqZt-64"
+                let currentRKey = "CAQSKAB6JWENi5LMk0kc62l8Pm3Jn1dsLZHyRLAnNmHGoZ3y_gDZPqZt-64"
                 if (url) {
-                    message_data["data"]["url"] = IMAGE_HTTP_HOST + url
+                    if (url.startsWith("/download")) {
-                } else if (fileMd5 && element.picElement.fileUuid.indexOf("_") === -1) { // fileuuid有下划线的是Linux发送的，这个url是另外的格式，目前尚未得知如何组装
+                        if (url.includes("&rkey=")) {
+                            // 正则提取rkey
+                            // const rkey = url.match(/&rkey=([^&]+)/)[1]
+                            // // log("图片url已有rkey", rkey)
+                            // if (rkey != currentRKey){
+                            //     config.imageRKey = rkey
+                            //     if (Date.now() - lastRKeyUpdateTime > 1000 * 60) {
+                            //         lastRKeyUpdateTime = Date.now()
+                            //         getConfigUtil().setConfig(config)
+                            //     }
+                            // }
+                            message_data["data"]["url"] = IMAGE_HTTP_HOST + url
+                        }
+                        else{
+                            // 有可能会碰到appid为1406的，这个不能使用新的NT域名，并且需要把appid改为1407才可访问
+                            message_data["data"]["url"] = `${IMAGE_HTTP_HOST}/download?appid=1407&fileid=${fileUuid}&rkey=${currentRKey}&spec=0`
+                        }
+                    } else {
+                        message_data["data"]["url"] = IMAGE_HTTP_HOST + url
+                    }
+                } else if (fileMd5) {
                     message_data["data"]["url"] = `${IMAGE_HTTP_HOST}/gchatpic_new/0/0-0-${fileMd5.toUpperCase()}/0`
                 }
                 // message_data["data"]["file_id"] = element.picElement.fileUuid
@@ -154,35 +183,25 @@ export class OB11Constructor {
                 }).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 NTQQFileApi.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 NTQQFileApi.downloadMedia(msg.msgId, msg.chatType, msg.peerUid,
-                            element.elementId, null, element.fileElement.filePath)
                     }
                 }).then()
                 // 怎么拿到url呢
@@ -210,6 +229,15 @@ export class OB11Constructor {
             } else if (element.faceElement) {
                 message_data["type"] = OB11MessageDataType.face;
                 message_data["data"]["id"] = element.faceElement.faceIndex.toString();
+            } else if (element.marketFaceElement) {
+                message_data["type"] = OB11MessageDataType.mface;
+                message_data["data"]["text"] = element.marketFaceElement.faceName;
+            } else if (element.markdownElement){
+                message_data["type"] = OB11MessageDataType.markdown;
+                message_data["data"]["data"] = element.markdownElement.content;
+            } else if (element.multiForwardMsgElement){
+                message_data["type"] = OB11MessageDataType.forward;
+                message_data["data"]["id"] = msg.msgId
             }
             if (message_data.type !== "unknown" && message_data.data) {
                 const cqCode = encodeCQCode(message_data);
@@ -228,6 +256,14 @@ 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) {
+                const event = new OB11GroupCardEvent(parseInt(msg.peerUid), parseInt(msg.senderUin), msg.sendMemberName, member.cardName)
+                member.cardName = msg.sendMemberName;
+                return event
+            }
+        }
         // log("group msg", msg);
         for (let element of msg.elements) {
             const grayTipElement = element.grayTipElement
@@ -251,18 +287,16 @@ 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
                     let memberUin: string = ""
                     let duration = parseInt(groupElement.shutUp.duration)
                     let sub_type: "ban" | "lift_ban" = duration > 0 ? "ban" : "lift_ban"
-                    if (memberUid){
+                    if (memberUid) {
                         memberUin = (await getGroupMember(msg.peerUid, memberUid))?.uin || (await NTQQUserApi.getUserDetailInfo(memberUid))?.uin
-                    }
+                    } else {
-                    else {
                         memberUin = "0";  // 0表示全员禁言
                         if (duration > 0) {
                             duration = -1
@@ -273,16 +307,27 @@ export class OB11Constructor {
                         return new OB11GroupBanEvent(parseInt(msg.peerUid), parseInt(memberUin), parseInt(adminUin), duration, sub_type);
                     }
                 }
-            }
+                else if (groupElement.type == TipGroupElementType.kicked){
-            else if (element.fileElement){
+                    log("收到我被踢出提示", groupElement)
-                return new OB11GroupUploadNoticeEvent(parseInt(msg.peerUid), parseInt(msg.senderUin), {id: element.fileElement.fileUuid, name: element.fileElement.fileName, size: parseInt(element.fileElement.fileSize)})
+                    const adminUin = (await getGroupMember(msg.peerUid, groupElement.adminUid))?.uin || (await NTQQUserApi.getUserDetailInfo(groupElement.adminUid))?.uin
+                    if (adminUin) {
+                        return new OB11GroupDecreaseEvent(parseInt(msg.peerUid), parseInt(selfInfo.uin), parseInt(adminUin), "kick_me");
+                    }
+                }
+            } 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),
+                    busid: element.fileElement.fileBizId || 0
+                })
             }
 
             if (grayTipElement) {
-                if (grayTipElement.subElementType == GrayTipElementSubType.INVITE_NEW_MEMBER){
+                if (grayTipElement.subElementType == GrayTipElementSubType.INVITE_NEW_MEMBER) {
                     log("收到新人被邀请进群消息", grayTipElement)
                     const xmlElement = grayTipElement.xmlElement
-                    if (xmlElement?.content){
+                    if (xmlElement?.content) {
                         const regex = /jp="(\d+)"/g;
 
                         let matches = [];
@@ -291,11 +336,45 @@ export class OB11Constructor {
                         while ((match = regex.exec(xmlElement.content)) !== null) {
                             matches.push(match[1]);
                         }
-                        if (matches.length === 2){
+                        // log("新人进群匹配到的QQ号", matches)
+                        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)
+                    getGroupMember(msg.peerUid, memberUin).then(member => {
+                        member.memberSpecialTitle = title
+                    })
+                    return new OB11GroupTitleEvent(parseInt(msg.peerUid), parseInt(memberUin), title)
                 }
             }
         }
@@ -305,15 +384,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,
         }
     }
 
@@ -329,7 +409,7 @@ export class OB11Constructor {
         }[role]
     }
 
-    static sex(sex: Sex): OB11UserSex{
+    static sex(sex: Sex): OB11UserSex {
         const sexMap = {
             [Sex.male]: OB11UserSex.male,
             [Sex.female]: OB11UserSex.female,
@@ -337,6 +417,7 @@ export class OB11Constructor {
         }
         return sexMap[sex] || OB11UserSex.unknown
     }
+
     static groupMember(group_id: string, member: GroupMember): OB11GroupMember {
         return {
             group_id: parseInt(group_id),
@@ -356,6 +437,20 @@ export class OB11Constructor {
             is_robot: member.isRobot,
             shut_up_timestamp: member.shutUpTime,
             role: OB11Constructor.groupMemberRole(member.role),
+            title: member.memberSpecialTitle || "",
+        }
+    }
+
+    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,
         }
     }
 

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/OB11GroupDecreaseEvent.ts

@@ -1,14 +1,17 @@
 import {OB11GroupNoticeEvent} from "./OB11GroupNoticeEvent";
 
+export type GroupDecreaseSubType = "leave" | "kick" | "kick_me";
+
 export class OB11GroupDecreaseEvent extends OB11GroupNoticeEvent {
     notice_type = "group_decrease";
-    sub_type: "leave" | "kick" | "kick_me" = "leave";  // TODO: 实现其他几种子类型的识别 ("leave" | "kick" | "kick_me")
+    sub_type: GroupDecreaseSubType = "leave";  // TODO: 实现其他几种子类型的识别 ("leave" | "kick" | "kick_me")
-    operate_id: number;
+    operator_id: number;
 
-    constructor(groupId: number, userId: number) {
+    constructor(groupId: number, userId: number, operatorId: number, subType: GroupDecreaseSubType = "leave") {
         super();
         this.group_id = groupId;
-        this.operate_id = userId;  // 实际上不应该这么实现，但是现在还没有办法识别用户是被踢出的，还是自己主动退出的
+        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/OB11GroupUploadNoticeEvent.ts

@@ -3,7 +3,8 @@ import {OB11GroupNoticeEvent} from "./OB11GroupNoticeEvent";
 export interface GroupUploadFile{
     id: string,
     name: string,
-    size: number
+    size: number,
+    busid: number,
 }
 
 export class OB11GroupUploadNoticeEvent extends OB11GroupNoticeEvent {

src/onebot11/event/notice/OB11PokeEvent.ts

@@ -7,7 +7,6 @@ class OB11PokeEvent extends OB11BaseNoticeEvent{
     sub_type = "poke"
     target_id = parseInt(selfInfo.uin)
     user_id: number
-
 }
 
 export class OB11FriendPokeEvent extends OB11PokeEvent{

src/onebot11/server/http.ts

@@ -1,5 +1,5 @@
 import {Response} from "express";
-import {OB11Response} from "../action/utils";
+import {OB11Response} from "../action/OB11Response";
 import {HttpServerBase} from "../../common/server/http";
 import {actionHandlers} from "../action";
 import {getConfigUtil} from "../../common/config";

src/onebot11/server/postOB11Event.ts

@@ -1,14 +1,53 @@
-import {OB11Message} from "../types";
+import {OB11Message, OB11MessageAt, OB11MessageData} from "../types";
-import {selfInfo} from "../../common/data";
+import {getGroup, 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) {
@@ -24,6 +63,7 @@ export function unregisterWsEventSender(ws: WebSocketClass) {
 
 export function postWsEvent(event: PostEventType) {
     for (const ws of eventWSList) {
+        log(ws)
         new Promise(() => {
             wsReply(ws, event);
         }).then()
@@ -34,23 +74,100 @@ export function postOB11Event(msg: PostEventType, reportSelf = false) {
     const config = getConfigUtil().getConfig();
     // 判断msg是否是event
     if (!config.reportSelfMessage && !reportSelf) {
-        if ((msg as OB11Message).user_id.toString() == selfInfo.uin) {
+        if (msg.post_type === "message" && (msg as OB11Message).user_id.toString() == selfInfo.uin) {
             return
         }
     }
     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(((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,7 +1,7 @@
 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";
@@ -78,6 +78,7 @@ export class ReverseWebsocket {
     private connect() {
         const {token, heartInterval} = getConfigUtil().getConfig()
         this.websocket = new WebSocketClass(this.url, {
+            maxPayload: 1024 * 1024 * 1024,
             handshakeTimeout: 2000,
             perMessageDeflate: false,
             headers: {
@@ -128,8 +129,13 @@ class OB11ReverseWebsockets {
 
     stop() {
         for (let rws of rwsList) {
-            rws.stop();
+            try {
+                rws.stop();
+            }catch (e) {
+                log("反向ws关闭:", e.stack)
+            }
         }
+        rwsList.length = 0;
     }
 
     restart() {

src/onebot11/server/ws/WebsocketServer.ts

@@ -1,6 +1,6 @@
 import {WebSocket} from "ws";
 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";

src/onebot11/server/ws/reply.ts

@@ -1,5 +1,5 @@
 import {WebSocket as WebSocketClass} from "ws";
-import {OB11Response} from "../../action/utils";
+import {OB11Response} from "../../action/OB11Response";
 import {PostEventType} from "../postOB11Event";
 import {log} from "../../../common/utils/log";
 import {isNull} from "../../../common/utils/helper";

src/onebot11/types.ts

@@ -1,10 +1,15 @@
-import {RawMessage} from "../ntqqapi/types";
+import {PicSubType, RawMessage} from "../ntqqapi/types";
 import {EventType} from "./event/OB11BaseEvent";
 
 export interface OB11User {
     user_id: number;
     nickname: string;
-    remark?: string
+    remark?: string;
+    sex?: OB11UserSex;
+    level?: number;
+    age?: number;
+    qid?: string;
+    login_days?: number;
 }
 
 export enum OB11UserSex {
@@ -83,6 +88,10 @@ export interface OB11Message {
     raw?: RawMessage
 }
 
+export interface OB11ForwardMessage extends OB11Message {
+    content: OB11MessageData[] | string;
+}
+
 export interface OB11Return<DataType> {
     status: string
     retcode: number
@@ -103,9 +112,19 @@ export enum OB11MessageDataType {
     reply = "reply",
     json = "json",
     face = "face",
-    node = "node",  // 合并转发消息
+    mface = "mface", // 商城表情
+    markdown = "markdown",
+    node = "node",  // 合并转发消息节点
+    forward = "forward",  // 合并转发消息，用于上报
+    xml = "xml"
 }
 
+export interface OB11MessageMFace{
+    type: OB11MessageDataType.mface,
+    data: {
+        text: string
+    }
+}
 export interface OB11MessageText {
     type: OB11MessageDataType.text,
     data: {
@@ -115,17 +134,20 @@ export interface OB11MessageText {
 
 interface OB11MessageFileBase {
     data: {
+        thumb?: string;
         name?: string;
         file: string,
         url?: string;
     }
 }
 
+
 export interface OB11MessageImage extends OB11MessageFileBase {
     type: OB11MessageDataType.image
     data: OB11MessageFileBase['data'] & {
         summary ? : string; // 图片摘要
-    }
+        subType?: PicSubType
+    },
 }
 
 export interface OB11MessageRecord extends OB11MessageFileBase {
@@ -185,12 +207,17 @@ export interface OB11MessageCustomMusic{
     }
 }
 
+export interface OB11MessageJson {
+    type: OB11MessageDataType.json
+    data: {config: {token: string}} & any
+}
+
 export type OB11MessageData =
     OB11MessageText |
-    OB11MessageFace |
+    OB11MessageFace | OB11MessageMFace |
     OB11MessageAt | OB11MessageReply |
     OB11MessageImage | OB11MessageRecord | OB11MessageFile | OB11MessageVideo |
-    OB11MessageNode | OB11MessageCustomMusic
+    OB11MessageNode | OB11MessageCustomMusic | OB11MessageJson
 
 export interface OB11PostSendMsg {
     message_type?: "private" | "group"

src/onebot11/utils.ts

@@ -1,130 +0,0 @@
-import {DATA_DIR} from "../common/utils";
-import {v4 as uuidv4} from "uuid";
-import * as path from 'node:path';
-import * as fileType from 'file-type';
-import {dbUtil} from "../common/db";
-import {isGIF} from "../common/utils/file";
-import {log} from "../common/utils/log";
-
-const fs = require("fs").promises;
-
-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(DATA_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');
-            await fs.writeFile(filePath, buffer);
-
-        } catch (e: any) {
-            res.errMsg = `base64文件下载失败,` + e.toString()
-            return res
-        }
-    } else if (url.protocol == "http:" || url.protocol == "https:") {
-        // 下载文件
-        let fetchRes: Response;
-        try{
-            fetchRes = await fetch(url)
-        }catch (e) {
-            res.errMsg = `${url}下载失败`
-            return res
-        }
-        if (!fetchRes.ok) {
-            res.errMsg = `${url}下载失败,` + fetchRes.statusText
-            return res
-        }
-        let blob = await fetchRes.blob();
-        let buffer = await blob.arrayBuffer();
-        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(DATA_DIR, uuidv4() + fileName)
-            await fs.writeFile(filePath, Buffer.from(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)
-                await fs.rename(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
-}

src/preload.ts

@@ -5,7 +5,7 @@ import {
     CHANNEL_ERROR,
     CHANNEL_GET_CONFIG,
     CHANNEL_LOG,
-    CHANNEL_CHECKVERSION,
+    CHANNEL_CHECK_VERSION,
     CHANNEL_SELECT_FILE,
     CHANNEL_SET_CONFIG,
     CHANNEL_UPDATE,
@@ -19,18 +19,18 @@ const llonebot = {
         ipcRenderer.send(CHANNEL_LOG, data);
     },
     checkVersion:async (): Promise<CheckVersion> => {
-        return ipcRenderer.invoke(CHANNEL_CHECKVERSION);
+        return ipcRenderer.invoke(CHANNEL_CHECK_VERSION);
     },
     updateLLOneBot:async (): Promise<boolean> => {
         return ipcRenderer.invoke(CHANNEL_UPDATE);
     },
-    setConfig: (config: Config) => {
+    setConfig: (ask: boolean, config: Config) => {
-        ipcRenderer.send(CHANNEL_SET_CONFIG, config);
+        ipcRenderer.send(CHANNEL_SET_CONFIG, ask, config);
     },
     getConfig: async (): Promise<Config> => {
         return ipcRenderer.invoke(CHANNEL_GET_CONFIG);
     },
-    getError: async (): Promise<LLOneBotError> => {
+    getError: async (): Promise<string> => {
         return ipcRenderer.invoke(CHANNEL_ERROR);
     },
     selectFile: (): Promise<string> => {

src/renderer/components/select.ts

@@ -1,11 +1,77 @@
 import { SettingOption } from "./option";
 
-export const SettingSelect = (items: Array<{ text: string, value: string }>, configKey?: string, configValue?: any) => {
+interface MouseEventExtend extends MouseEvent {
-    return `<setting-select ${configKey ? `data-config-key="${configKey}"` : ''}>
+    target: HTMLElement,
-    <div>
+}
-        ${items.map((e, i) => {
+
-            return SettingOption(e.text, e.value, (configKey && configValue ? configValue === e.value : i === 0));
+// <ob-setting-select>
-        }).join('')}
+const SelectTemplate = document.createElement('template');
-    </div>
+SelectTemplate.innerHTML = `<style>
-</setting-select>`;
+    .hidden { display: none !important; }
+</style>
+<div part="parent">
+        <div part="button">
+            <input type="text" placeholder="请选择" part="current-text" />
+            <svg viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" part="button-arrow">
+                <path d="M12 6.0001L8.00004 10L4 6" stroke="currentColor" stroke-linejoin="round"></path>
+            </svg>
+        </div>
+    <ul class="hidden" part="option-list"><slot></slot></ul>
+</div>`;
+
+window.customElements.define('ob-setting-select', class extends HTMLElement {
+    readonly _button: HTMLDivElement;
+    readonly _text: HTMLInputElement;
+    readonly _context: HTMLUListElement;
+
+    constructor() {
+        super();
+    
+        this.attachShadow({ mode: 'open' });
+        this.shadowRoot.append(SelectTemplate.content.cloneNode(true));
+    
+        this._button = this.shadowRoot.querySelector('div[part="button"]');
+        this._text = this.shadowRoot.querySelector('input[part="current-text"]');
+        this._context = this.shadowRoot.querySelector('ul[part="option-list"]');
+    
+        const buttonClick = () => {
+            const isHidden = this._context.classList.toggle('hidden');
+            window[`${isHidden ? 'remove': 'add'}EventListener`]('pointerdown', windowPointerDown);
+        };
+    
+        const windowPointerDown = ({ target }) => {
+            if (!this.contains(target)) buttonClick();
+        };
+    
+        this._button.addEventListener('click', buttonClick);
+        this._context.addEventListener('click', ({ target }: MouseEventExtend) => {
+            if (target.tagName !== 'SETTING-OPTION') return;
+            buttonClick();
+    
+            if (target.hasAttribute('is-selected')) return;
+    
+            this.querySelectorAll('setting-option[is-selected]').forEach(dom => dom.toggleAttribute('is-selected'));
+            target.toggleAttribute('is-selected');
+    
+            this._text.value = target.textContent;
+            this.dispatchEvent(new CustomEvent('selected', {
+                bubbles: true,
+                composed: true,
+                detail: {
+                    name: target.textContent,
+                    value: target.dataset.value,
+                },
+            }));
+        });
+    
+        this._text.value = this.querySelector('setting-option[is-selected]').textContent;
+    }
+});
+
+export const SettingSelect = (items: Array<{ text: string, value: string }>, configKey?: string, configValue?: any) => {
+    return `<ob-setting-select ${configKey ? `data-config-key="${configKey}"` : ''}>
+    ${items.map((e, i) => {
+        return SettingOption(e.text, e.value, (configKey && configValue ? configValue === e.value : i === 0));
+    }).join('')}
+</ob-setting-select>`;
 }

src/renderer/icon.ts

@@ -0,0 +1,675 @@
+export const iconSvg = `
+<?xml version="2.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="50px" y="10px" width="262px" height="150" viewBox="0 0 212 262" enable-background="new 0 0 212 262" xml:space="preserve">  
+<image id="image0" width="212" height="210" x="0" y="-20" transform="rotate(180, 100, 100)"
+    xlink:href="data:image/png;base64,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" />
+</svg>
+`