mirror of
https://github.com/NapNeko/NapCatQQ.git
synced 2025-07-19 12:03:37 +00:00
Compare commits
49 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
9fcd218a5a | ||
![]() |
d6a0830cfe | ||
![]() |
40a63b9c66 | ||
![]() |
eeb19a04cc | ||
![]() |
91e457eb03 | ||
![]() |
78d1919d7f | ||
![]() |
8393acf173 | ||
![]() |
bca152a047 | ||
![]() |
6a15908a93 | ||
![]() |
c626bbab74 | ||
![]() |
c5c7dcc6f2 | ||
![]() |
03dafe727e | ||
![]() |
744921c45e | ||
![]() |
abc4a4dcba | ||
![]() |
7e0da2f929 | ||
![]() |
a3b70d0f1f | ||
![]() |
d291724f06 | ||
![]() |
122a9ca2cc | ||
![]() |
48aaddd32b | ||
![]() |
47401af856 | ||
![]() |
709adfd812 | ||
![]() |
038d0c5412 | ||
![]() |
6bb4362ed4 | ||
![]() |
e617f9452d | ||
![]() |
6d8bb49a37 | ||
![]() |
4f6073ee86 | ||
![]() |
2e7176304b | ||
![]() |
e36cf11004 | ||
![]() |
0e49e17f68 | ||
![]() |
524de45f6b | ||
![]() |
85741a4b60 | ||
![]() |
f9ccb8c978 | ||
![]() |
ea3d069e49 | ||
![]() |
3e6024f183 | ||
![]() |
337871693a | ||
![]() |
2d921c4577 | ||
![]() |
9accff7323 | ||
![]() |
88b1ee8c31 | ||
![]() |
3ac618bb4e | ||
![]() |
0051df3741 | ||
![]() |
7eb4e010b0 | ||
![]() |
33cc23ada3 | ||
![]() |
e5aee372e3 | ||
![]() |
6b6ce4a761 | ||
![]() |
8c4ea7f8f2 | ||
![]() |
c8b268b806 | ||
![]() |
cf5e0e0f14 | ||
![]() |
7b79f9cc17 | ||
![]() |
708d599966 |
115
.vscode/launch.json
vendored
Normal file
115
.vscode/launch.json
vendored
Normal file
@@ -0,0 +1,115 @@
|
|||||||
|
{
|
||||||
|
"version": "0.2.0",
|
||||||
|
"configurations": [
|
||||||
|
{
|
||||||
|
"type": "node",
|
||||||
|
"request": "launch",
|
||||||
|
"name": "dev:shell",
|
||||||
|
"runtimeExecutable": "npm",
|
||||||
|
"runtimeArgs": [
|
||||||
|
"run",
|
||||||
|
"dev:shell"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "node",
|
||||||
|
"request": "launch",
|
||||||
|
"name": "build:shell",
|
||||||
|
"runtimeExecutable": "npm",
|
||||||
|
"runtimeArgs": [
|
||||||
|
"run",
|
||||||
|
"build:shell"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "node",
|
||||||
|
"request": "launch",
|
||||||
|
"name": "build:universal",
|
||||||
|
"runtimeExecutable": "npm",
|
||||||
|
"runtimeArgs": [
|
||||||
|
"run",
|
||||||
|
"build:universal"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "node",
|
||||||
|
"request": "launch",
|
||||||
|
"name": "build:framework",
|
||||||
|
"runtimeExecutable": "npm",
|
||||||
|
"runtimeArgs": [
|
||||||
|
"run",
|
||||||
|
"build:framework"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "node",
|
||||||
|
"request": "launch",
|
||||||
|
"name": "build:webui",
|
||||||
|
"runtimeExecutable": "npm",
|
||||||
|
"runtimeArgs": [
|
||||||
|
"run",
|
||||||
|
"build:webui"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "node",
|
||||||
|
"request": "launch",
|
||||||
|
"name": "dev:universal",
|
||||||
|
"runtimeExecutable": "npm",
|
||||||
|
"runtimeArgs": [
|
||||||
|
"run",
|
||||||
|
"dev:universal"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "node",
|
||||||
|
"request": "launch",
|
||||||
|
"name": "dev:framework",
|
||||||
|
"runtimeExecutable": "npm",
|
||||||
|
"runtimeArgs": [
|
||||||
|
"run",
|
||||||
|
"dev:framework"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "node",
|
||||||
|
"request": "launch",
|
||||||
|
"name": "dev:webui",
|
||||||
|
"runtimeExecutable": "npm",
|
||||||
|
"runtimeArgs": [
|
||||||
|
"run",
|
||||||
|
"dev:webui"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "node",
|
||||||
|
"request": "launch",
|
||||||
|
"name": "lint",
|
||||||
|
"runtimeExecutable": "npm",
|
||||||
|
"runtimeArgs": [
|
||||||
|
"run",
|
||||||
|
"lint"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "node",
|
||||||
|
"request": "launch",
|
||||||
|
"name": "depend",
|
||||||
|
"runtimeExecutable": "npm",
|
||||||
|
"runtimeArgs": [
|
||||||
|
"run",
|
||||||
|
"depend"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "node",
|
||||||
|
"request": "launch",
|
||||||
|
"name": "dev:depend",
|
||||||
|
"runtimeExecutable": "npm",
|
||||||
|
"runtimeArgs": [
|
||||||
|
"run",
|
||||||
|
"dev:depend"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
79
README.md
79
README.md
@@ -1,67 +1,62 @@
|
|||||||
<div align="center">
|
<div align="center">
|
||||||
|
|
||||||
|
# NapCat
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
|
_Modern protocol-side framework implemented based on NTQQ._
|
||||||
|
|
||||||
|
> 云起兮风生,心向远方兮路未曾至.
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
---
|
---
|
||||||
## 欢迎回家
|
|
||||||
NapCatQQ 是现代化的基于 NTQQ 的 Bot 协议端实现
|
|
||||||
|
|
||||||
## 特性介绍
|
## Welcome
|
||||||
- [x] **安装简单**:就算是笨蛋也能使用
|
+ NapCatQQ is a modern implementation of the Bot protocol based on NTQQ.
|
||||||
- [x] **性能友好**:就算是低内存也能使用
|
- NapCatQQ 是现代化的基于 NTQQ 的 Bot 协议端实现
|
||||||
- [x] **接口丰富**:就算是没有也能使用
|
|
||||||
- [x] **稳定好用**:就算是被捉也能使用
|
|
||||||
|
|
||||||
## 使用框架
|
## Feature
|
||||||
|
|
||||||
|
+ **Easy to Use**
|
||||||
|
- 作为初学者能够轻松使用.
|
||||||
|
+ **Quick and Efficient**
|
||||||
|
- 在低内存操作系统长时运行.
|
||||||
|
+ **Rich API Interface**
|
||||||
|
- 完整实现了大部分标准接口.
|
||||||
|
+ **Stable and Reliable**
|
||||||
|
- 持续稳定的开发与维护.
|
||||||
|
## Quick Start
|
||||||
|
|
||||||
可前往 [Release](https://github.com/NapNeko/NapCatQQ/releases/) 页面下载最新版本
|
可前往 [Release](https://github.com/NapNeko/NapCatQQ/releases/) 页面下载最新版本
|
||||||
|
|
||||||
**首次使用**请务必查看如下文档看使用教程
|
**首次使用**请务必查看如下文档看使用教程
|
||||||
|
|
||||||
### 文档地址
|
## Link
|
||||||
|
|
||||||
[Cloudflare.Worker](https://doc.napneko.icu/)
|
| Docs | [](https://napneko.github.io/) | [](https://doc.napneko.icu/) | [](https://napcat.napneko.icu/) |
|
||||||
|
|:-:|:-:|:-:|:-:|
|
||||||
|
|
||||||
[Cloudflare.HKServer](https://napcat.napneko.icu/)
|
| Docs | [](https://napneko.pages.dev/) | [](https://docs.napcat.cyou/) | [](https://www.napcat.wiki) |
|
||||||
|
|:-:|:-:|:-:|:-:|
|
||||||
|
|
||||||
[Github.IO](https://napneko.github.io/)
|
| Contact | [](https://qm.qq.com/q/I6LU87a0Yq) | [](https://qm.qq.com/q/HaRcfrHpUk) | [](https://t.me/MelodicMoonlight) |
|
||||||
|
|:-:|:-:|:-:|:-:|
|
||||||
|
|
||||||
[Cloudflare.Pages](https://napneko.pages.dev/)
|
## Thanks
|
||||||
|
|
||||||
[Server.Other](https://docs.napcat.cyou/)
|
+ [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持 参考部分代码 已获授权
|
||||||
|
|
||||||
[NapCat.Wiki](https://www.napcat.wiki)
|
+ [LLOneBot](https://github.com/LLOneBot/LLOneBot) 相关的开发曾参与本项目部分开发
|
||||||
|
|
||||||
## 回家旅途
|
+ 不过最最重要的 还是需要感谢屏幕前的你哦~
|
||||||
[QQ Group#1](https://qm.qq.com/q/I6LU87a0Yq)
|
|
||||||
|
|
||||||
[QQ Group#2](https://qm.qq.com/q/HaRcfrHpUk)
|
|
||||||
|
|
||||||
[Telegram](https://t.me/MelodicMoonlight)
|
|
||||||
|
|
||||||
> QQ Group#2 准许Bot / Telegram与QQ Group#2 为新建Group
|
|
||||||
|
|
||||||
## 性能设计/协议标准
|
|
||||||
NapCat 已实现90%+的 OneBot / GoCQ 标准接口,并提供兼容性保留接口,其设计理念遵守 无数据库/异步优先/后台刷新 的性能思想。
|
|
||||||
|
|
||||||
由此设计带来一系列好处,在开发中,获取群员列表通常小于50Ms,单条文本消息发送在320Ms以内,在1k+的群聊流畅运行,同时带来一些副作用,消息Id无法持久,无法上报撤回消息原始内容。
|
|
||||||
|
|
||||||
NapCat 在设计理念下遵守 OneBot 规范大多数要求并且积极改进,任何合理的标准化 Issue 与 Pr 将被接收。
|
|
||||||
|
|
||||||
## 感谢他们
|
|
||||||
感谢 [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持 参考部分代码 已获授权
|
|
||||||
|
|
||||||
感谢 React 强力驱动 NapCat.WebUi
|
|
||||||
|
|
||||||
不过最最重要的 还是需要感谢屏幕前的你哦~
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## 特殊感谢
|
## License
|
||||||
[LLOneBot](https://github.com/LLOneBot/LLOneBot) 相关的开发曾参与本项目
|
本项目采用 混合协议 开源,因此使用本项目时,你需要注意以下几点:
|
||||||
|
1. 第三方库代码或修改部分遵循其原始开源许可.
|
||||||
|
2. 本项目获取部分项目授权而不受部分约束
|
||||||
|
2. 项目其余逻辑代码采用[本仓库开源许可](./LICENSE).
|
||||||
|
|
||||||
## 开源附加
|
**本仓库仅用于提高易用性,实现消息推送类功能,此外,禁止任何项目未经仓库主作者授权基于 NapCat 代码开发。使用请遵守当地法律法规,由此造成的问题由使用者和提供违规使用教程者负责。**
|
||||||
|
|
||||||
任何使用本仓库代码的地方,都应当严格遵守[本仓库开源许可](./LICENSE)。**本仓库仅用于提高易用性,实现消息推送类功能,此外,禁止任何项目未经仓库主作者授权基于 NapCat 代码开发。使用请遵守当地法律法规,由此造成的问题由使用者和提供违规使用教程者负责。**
|
|
||||||
|
BIN
external/LiteLoaderWrapper.zip
vendored
BIN
external/LiteLoaderWrapper.zip
vendored
Binary file not shown.
@@ -19,7 +19,7 @@ for %%a in ("%RetString%") do (
|
|||||||
SET QQPath=%pathWithoutUninstall%QQ.exe
|
SET QQPath=%pathWithoutUninstall%QQ.exe
|
||||||
|
|
||||||
if not exist "%QQpath%" (
|
if not exist "%QQpath%" (
|
||||||
echo provided QQ path is invalid: %QQpath%
|
echo provided QQ path is invalid
|
||||||
pause
|
pause
|
||||||
exit /b
|
exit /b
|
||||||
)
|
)
|
||||||
|
@@ -19,7 +19,7 @@ for %%a in ("%RetString%") do (
|
|||||||
SET QQPath=%pathWithoutUninstall%QQ.exe
|
SET QQPath=%pathWithoutUninstall%QQ.exe
|
||||||
|
|
||||||
if not exist "%QQpath%" (
|
if not exist "%QQpath%" (
|
||||||
echo provided QQ path is invalid: %QQpath%
|
echo provided QQ path is invalid
|
||||||
pause
|
pause
|
||||||
exit /b
|
exit /b
|
||||||
)
|
)
|
||||||
|
@@ -27,8 +27,8 @@ for %%a in ("%RetString%") do (
|
|||||||
|
|
||||||
SET QQPath=%pathWithoutUninstall%QQ.exe
|
SET QQPath=%pathWithoutUninstall%QQ.exe
|
||||||
|
|
||||||
if not exist "%QQpath%" (
|
if not exist "%QQPath%" (
|
||||||
echo provided QQ path is invalid: %QQpath%
|
echo provided QQ path is invalid
|
||||||
pause
|
pause
|
||||||
exit /b
|
exit /b
|
||||||
)
|
)
|
||||||
|
@@ -27,8 +27,8 @@ for %%a in ("%RetString%") do (
|
|||||||
|
|
||||||
SET QQPath=%pathWithoutUninstall%QQ.exe
|
SET QQPath=%pathWithoutUninstall%QQ.exe
|
||||||
|
|
||||||
if not exist "%QQpath%" (
|
if not exist "%QQPath%" (
|
||||||
echo provided QQ path is invalid: %QQpath%
|
echo provided QQ path is invalid
|
||||||
pause
|
pause
|
||||||
exit /b
|
exit /b
|
||||||
)
|
)
|
||||||
|
@@ -1,10 +1,9 @@
|
|||||||
{
|
{
|
||||||
"name": "qq-chat",
|
"name": "qq-chat",
|
||||||
"version": "9.9.17-30899",
|
"version": "9.9.18-32793",
|
||||||
"verHash": "ececf273",
|
"verHash": "d43f097e",
|
||||||
"linuxVersion": "3.2.15-30899",
|
"linuxVersion": "3.2.16-32793",
|
||||||
"linuxVerHash": "63c751e8",
|
"linuxVerHash": "ee4bd910",
|
||||||
"type": "module",
|
|
||||||
"private": true,
|
"private": true,
|
||||||
"description": "QQ",
|
"description": "QQ",
|
||||||
"productName": "QQ",
|
"productName": "QQ",
|
||||||
@@ -17,8 +16,25 @@
|
|||||||
"bin": {
|
"bin": {
|
||||||
"qd": "externals/devtools/cli/index.js"
|
"qd": "externals/devtools/cli/index.js"
|
||||||
},
|
},
|
||||||
|
"appid": {
|
||||||
|
"win32": "537258389",
|
||||||
|
"darwin": "537258412",
|
||||||
|
"linux": "537258424"
|
||||||
|
},
|
||||||
"main": "./loadNapCat.js",
|
"main": "./loadNapCat.js",
|
||||||
"buildVersion": "30899",
|
"peerDependenciesMeta": {
|
||||||
|
"*": {
|
||||||
|
"optional": true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"pnpm": {
|
||||||
|
"patchedDependencies": {
|
||||||
|
"@vue/runtime-dom@3.5.12": "patches/@vue__runtime-dom@3.5.12.patch",
|
||||||
|
"@swc/helpers@0.5.3": "patches/@swc__helpers@0.5.3.patch",
|
||||||
|
"vuex@4.1.0": "patches/vuex@4.1.0.patch"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"buildVersion": "32793",
|
||||||
"isPureShell": true,
|
"isPureShell": true,
|
||||||
"isByteCodeShell": true,
|
"isByteCodeShell": true,
|
||||||
"platform": "win32",
|
"platform": "win32",
|
||||||
|
@@ -4,7 +4,7 @@
|
|||||||
"name": "NapCatQQ",
|
"name": "NapCatQQ",
|
||||||
"slug": "NapCat.Framework",
|
"slug": "NapCat.Framework",
|
||||||
"description": "高性能的 OneBot 11 协议实现",
|
"description": "高性能的 OneBot 11 协议实现",
|
||||||
"version": "4.5.22",
|
"version": "4.6.7",
|
||||||
"icon": "./logo.png",
|
"icon": "./logo.png",
|
||||||
"authors": [
|
"authors": [
|
||||||
{
|
{
|
||||||
|
@@ -136,7 +136,7 @@ const OneBotApiDebug: React.FC<OneBotApiDebugProps> = (props) => {
|
|||||||
</div>
|
</div>
|
||||||
<Card
|
<Card
|
||||||
shadow="sm"
|
shadow="sm"
|
||||||
className="my-4 bg-opacity-50 backdrop-blur-md overflow-visible z-20"
|
className="my-4 bg-opacity-50 backdrop-blur-md overflow-visible"
|
||||||
>
|
>
|
||||||
<CardHeader className="font-bold text-lg gap-1 pb-0">
|
<CardHeader className="font-bold text-lg gap-1 pb-0">
|
||||||
<span className="mr-2">请求体</span>
|
<span className="mr-2">请求体</span>
|
||||||
|
10
package.json
10
package.json
@@ -2,7 +2,7 @@
|
|||||||
"name": "napcat",
|
"name": "napcat",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"version": "4.5.22",
|
"version": "4.6.7",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build:universal": "npm run build:webui && vite build --mode universal || exit 1",
|
"build:universal": "npm run build:webui && vite build --mode universal || exit 1",
|
||||||
"build:framework": "npm run build:webui && vite build --mode framework || exit 1",
|
"build:framework": "npm run build:webui && vite build --mode framework || exit 1",
|
||||||
@@ -50,7 +50,7 @@
|
|||||||
"express-rate-limit": "^7.5.0",
|
"express-rate-limit": "^7.5.0",
|
||||||
"fast-xml-parser": "^4.3.6",
|
"fast-xml-parser": "^4.3.6",
|
||||||
"file-type": "^20.0.0",
|
"file-type": "^20.0.0",
|
||||||
"globals": "^15.12.0",
|
"globals": "^16.0.0",
|
||||||
"image-size": "^1.1.1",
|
"image-size": "^1.1.1",
|
||||||
"json5": "^2.2.3",
|
"json5": "^2.2.3",
|
||||||
"multer": "^1.4.5-lts.1",
|
"multer": "^1.4.5-lts.1",
|
||||||
@@ -59,13 +59,13 @@
|
|||||||
"vite": "^6.0.1",
|
"vite": "^6.0.1",
|
||||||
"vite-plugin-cp": "^4.0.8",
|
"vite-plugin-cp": "^4.0.8",
|
||||||
"vite-tsconfig-paths": "^5.1.0",
|
"vite-tsconfig-paths": "^5.1.0",
|
||||||
"winston": "^3.17.0"
|
"napcat.protobuf": "^1.1.3",
|
||||||
|
"winston": "^3.17.0",
|
||||||
|
"compressing": "^1.10.1"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@ffmpeg.wasm/core-mt": "^0.13.2",
|
"@ffmpeg.wasm/core-mt": "^0.13.2",
|
||||||
"compressing": "^1.10.1",
|
|
||||||
"express": "^5.0.0",
|
"express": "^5.0.0",
|
||||||
"piscina": "^4.7.0",
|
|
||||||
"silk-wasm": "^3.6.1",
|
"silk-wasm": "^3.6.1",
|
||||||
"ws": "^8.18.0"
|
"ws": "^8.18.0"
|
||||||
}
|
}
|
||||||
|
@@ -1,9 +1,20 @@
|
|||||||
import { encode } from 'silk-wasm';
|
import { encode } from 'silk-wasm';
|
||||||
|
import { parentPort } from 'worker_threads';
|
||||||
|
|
||||||
export interface EncodeArgs {
|
export interface EncodeArgs {
|
||||||
input: ArrayBufferView | ArrayBuffer
|
input: ArrayBufferView | ArrayBuffer
|
||||||
sampleRate: number
|
sampleRate: number
|
||||||
}
|
}
|
||||||
export default async ({ input, sampleRate }: EncodeArgs) => {
|
export function recvTask<T>(cb: (taskData: T) => Promise<unknown>) {
|
||||||
|
parentPort?.on('message', async (taskData: T) => {
|
||||||
|
try {
|
||||||
|
let ret = await cb(taskData);
|
||||||
|
parentPort?.postMessage(ret);
|
||||||
|
} catch (error: unknown) {
|
||||||
|
parentPort?.postMessage({ error: (error as Error).message });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
recvTask<EncodeArgs>(async ({ input, sampleRate }) => {
|
||||||
return await encode(input, sampleRate);
|
return await encode(input, sampleRate);
|
||||||
};
|
});
|
@@ -1,4 +1,3 @@
|
|||||||
import Piscina from 'piscina';
|
|
||||||
import fsPromise from 'fs/promises';
|
import fsPromise from 'fs/promises';
|
||||||
import path from 'node:path';
|
import path from 'node:path';
|
||||||
import { randomUUID } from 'crypto';
|
import { randomUUID } from 'crypto';
|
||||||
@@ -6,16 +5,16 @@ import { EncodeResult, getDuration, getWavFileInfo, isSilk, isWav } from 'silk-w
|
|||||||
import { LogWrapper } from '@/common/log';
|
import { LogWrapper } from '@/common/log';
|
||||||
import { EncodeArgs } from '@/common/audio-worker';
|
import { EncodeArgs } from '@/common/audio-worker';
|
||||||
import { FFmpegService } from '@/common/ffmpeg';
|
import { FFmpegService } from '@/common/ffmpeg';
|
||||||
|
import { runTask } from './worker';
|
||||||
|
import { fileURLToPath } from 'node:url';
|
||||||
|
|
||||||
const ALLOW_SAMPLE_RATE = [8000, 12000, 16000, 24000, 32000, 44100, 48000];
|
const ALLOW_SAMPLE_RATE = [8000, 12000, 16000, 24000, 32000, 44100, 48000];
|
||||||
|
|
||||||
async function getWorkerPath() {
|
function getWorkerPath() {
|
||||||
return new URL(/* @vite-ignore */ './audio-worker.mjs', import.meta.url).href;
|
//return new URL(/* @vite-ignore */ './audio-worker.mjs', import.meta.url).href;
|
||||||
|
return path.join(path.dirname(fileURLToPath(import.meta.url)), 'audio-worker.mjs');
|
||||||
}
|
}
|
||||||
|
|
||||||
const piscina = new Piscina<EncodeArgs, EncodeResult>({
|
|
||||||
filename: await getWorkerPath(),
|
|
||||||
});
|
|
||||||
|
|
||||||
async function guessDuration(pttPath: string, logger: LogWrapper) {
|
async function guessDuration(pttPath: string, logger: LogWrapper) {
|
||||||
const pttFileInfo = await fsPromise.stat(pttPath);
|
const pttFileInfo = await fsPromise.stat(pttPath);
|
||||||
@@ -46,7 +45,7 @@ export async function encodeSilk(filePath: string, TEMP_DIR: string, logger: Log
|
|||||||
const { input, sampleRate } = isWav(file)
|
const { input, sampleRate } = isWav(file)
|
||||||
? await handleWavFile(file, filePath, pcmPath)
|
? await handleWavFile(file, filePath, pcmPath)
|
||||||
: { input: await FFmpegService.convert(filePath, pcmPath), sampleRate: 24000 };
|
: { input: await FFmpegService.convert(filePath, pcmPath), sampleRate: 24000 };
|
||||||
const silk = await piscina.run({ input: input, sampleRate: sampleRate });
|
const silk = await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { input: input, sampleRate: sampleRate });
|
||||||
fsPromise.unlink(pcmPath).catch((e) => logger.logError('删除临时文件失败', pcmPath, e));
|
fsPromise.unlink(pcmPath).catch((e) => logger.logError('删除临时文件失败', pcmPath, e));
|
||||||
await fsPromise.writeFile(pttPath, Buffer.from(silk.data));
|
await fsPromise.writeFile(pttPath, Buffer.from(silk.data));
|
||||||
logger.log(`语音文件${filePath}转换成功!`, pttPath, '时长:', silk.duration);
|
logger.log(`语音文件${filePath}转换成功!`, pttPath, '时长:', silk.duration);
|
||||||
|
@@ -5,6 +5,17 @@ import { readFileSync, statSync, writeFileSync } from 'fs';
|
|||||||
import type { VideoInfo } from './video';
|
import type { VideoInfo } from './video';
|
||||||
import { fileTypeFromFile } from 'file-type';
|
import { fileTypeFromFile } from 'file-type';
|
||||||
import imageSize from 'image-size';
|
import imageSize from 'image-size';
|
||||||
|
import { parentPort } from 'worker_threads';
|
||||||
|
export function recvTask<T>(cb: (taskData: T) => Promise<unknown>) {
|
||||||
|
parentPort?.on('message', async (taskData: T) => {
|
||||||
|
try {
|
||||||
|
let ret = await cb(taskData);
|
||||||
|
parentPort?.postMessage(ret);
|
||||||
|
} catch (error: unknown) {
|
||||||
|
parentPort?.postMessage({ error: (error as Error).message });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
class FFmpegService {
|
class FFmpegService {
|
||||||
public static async extractThumbnail(videoPath: string, thumbnailPath: string): Promise<void> {
|
public static async extractThumbnail(videoPath: string, thumbnailPath: string): Promise<void> {
|
||||||
const ffmpegInstance = await FFmpeg.create({ core: '@ffmpeg.wasm/core-mt' });
|
const ffmpegInstance = await FFmpeg.create({ core: '@ffmpeg.wasm/core-mt' });
|
||||||
@@ -149,3 +160,6 @@ export default async function handleFFmpegTask({ method, args }: FFmpegTask): Pr
|
|||||||
throw new Error(`Unknown method: ${method}`);
|
throw new Error(`Unknown method: ${method}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
recvTask<FFmpegTask>(async ({ method, args }: FFmpegTask) => {
|
||||||
|
return await handleFFmpegTask({ method, args });
|
||||||
|
});
|
@@ -1,6 +1,8 @@
|
|||||||
/* eslint-disable @typescript-eslint/no-explicit-any */
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
||||||
import Piscina from 'piscina';
|
|
||||||
import { VideoInfo } from './video';
|
import { VideoInfo } from './video';
|
||||||
|
import path from 'path';
|
||||||
|
import { fileURLToPath } from 'url';
|
||||||
|
import { runTask } from './worker';
|
||||||
|
|
||||||
type EncodeArgs = {
|
type EncodeArgs = {
|
||||||
method: 'extractThumbnail' | 'convertFile' | 'convert' | 'getVideoInfo';
|
method: 'extractThumbnail' | 'convertFile' | 'convert' | 'getVideoInfo';
|
||||||
@@ -9,42 +11,26 @@ type EncodeArgs = {
|
|||||||
|
|
||||||
type EncodeResult = any;
|
type EncodeResult = any;
|
||||||
|
|
||||||
async function getWorkerPath() {
|
function getWorkerPath() {
|
||||||
return new URL(/* @vite-ignore */ './ffmpeg-worker.mjs', import.meta.url).href;
|
return path.join(path.dirname(fileURLToPath(import.meta.url)), './ffmpeg-worker.mjs');
|
||||||
}
|
}
|
||||||
|
|
||||||
export class FFmpegService {
|
export class FFmpegService {
|
||||||
public static async extractThumbnail(videoPath: string, thumbnailPath: string): Promise<void> {
|
public static async extractThumbnail(videoPath: string, thumbnailPath: string): Promise<void> {
|
||||||
const piscina = new Piscina<EncodeArgs, EncodeResult>({
|
await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'extractThumbnail', args: [videoPath, thumbnailPath] });
|
||||||
filename: await getWorkerPath(),
|
|
||||||
});
|
|
||||||
await piscina.run({ method: 'extractThumbnail', args: [videoPath, thumbnailPath] });
|
|
||||||
await piscina.destroy();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static async convertFile(inputFile: string, outputFile: string, format: string): Promise<void> {
|
public static async convertFile(inputFile: string, outputFile: string, format: string): Promise<void> {
|
||||||
const piscina = new Piscina<EncodeArgs, EncodeResult>({
|
await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'convertFile', args: [inputFile, outputFile, format] });
|
||||||
filename: await getWorkerPath(),
|
|
||||||
});
|
|
||||||
await piscina.run({ method: 'convertFile', args: [inputFile, outputFile, format] });
|
|
||||||
await piscina.destroy();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static async convert(filePath: string, pcmPath: string): Promise<Buffer> {
|
public static async convert(filePath: string, pcmPath: string): Promise<Buffer> {
|
||||||
const piscina = new Piscina<EncodeArgs, EncodeResult>({
|
const result = await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'convert', args: [filePath, pcmPath] });
|
||||||
filename: await getWorkerPath(),
|
|
||||||
});
|
|
||||||
const result = await piscina.run({ method: 'convert', args: [filePath, pcmPath] });
|
|
||||||
await piscina.destroy();
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static async getVideoInfo(videoPath: string, thumbnailPath: string): Promise<VideoInfo> {
|
public static async getVideoInfo(videoPath: string, thumbnailPath: string): Promise<VideoInfo> {
|
||||||
const piscina = new Piscina<EncodeArgs, EncodeResult>({
|
const result = await await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'getVideoInfo', args: [videoPath, thumbnailPath] });
|
||||||
filename: await getWorkerPath(),
|
|
||||||
});
|
|
||||||
const result = await piscina.run({ method: 'getVideoInfo', args: [videoPath, thumbnailPath] });
|
|
||||||
await piscina.destroy();
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -232,7 +232,7 @@ export function rawMessageToText(msg: RawMessage, recursiveLevel = 0): string {
|
|||||||
tokens.push(`群聊 [${msg.peerName}(${msg.peerUin})]`);
|
tokens.push(`群聊 [${msg.peerName}(${msg.peerUin})]`);
|
||||||
}
|
}
|
||||||
if (msg.senderUin !== '0') {
|
if (msg.senderUin !== '0') {
|
||||||
tokens.push(`[${msg.sendMemberName ?? msg.sendRemarkName ?? msg.sendNickName}(${msg.senderUin})]`);
|
tokens.push(`[${msg.sendMemberName || msg.sendRemarkName || msg.sendNickName}(${msg.senderUin})]`);
|
||||||
}
|
}
|
||||||
} else if (msg.chatType == ChatType.KCHATTYPEDATALINE) {
|
} else if (msg.chatType == ChatType.KCHATTYPEDATALINE) {
|
||||||
tokens.push('移动设备');
|
tokens.push('移动设备');
|
||||||
|
@@ -163,7 +163,7 @@ class Store {
|
|||||||
const current = this.get<StoreValueType>(key);
|
const current = this.get<StoreValueType>(key);
|
||||||
|
|
||||||
if (current === null) {
|
if (current === null) {
|
||||||
this.set(key, 1);
|
this.set(key, 1, 60);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -180,7 +180,7 @@ class Store {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const newValue = numericValue + 1;
|
const newValue = numericValue + 1;
|
||||||
this.set(key, newValue);
|
this.set(key, newValue, 60);
|
||||||
return newValue;
|
return newValue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1 +1 @@
|
|||||||
export const napCatVersion = '4.5.22';
|
export const napCatVersion = '4.6.7';
|
||||||
|
29
src/common/worker.ts
Normal file
29
src/common/worker.ts
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
import { Worker } from 'worker_threads';
|
||||||
|
|
||||||
|
export async function runTask<T, R>(workerScript: string, taskData: T): Promise<R> {
|
||||||
|
let worker = new Worker(workerScript);
|
||||||
|
try {
|
||||||
|
return await new Promise<R>((resolve, reject) => {
|
||||||
|
worker.on('message', (result: R) => {
|
||||||
|
resolve(result);
|
||||||
|
});
|
||||||
|
|
||||||
|
worker.on('error', (error) => {
|
||||||
|
reject(new Error(`Worker error: ${error.message}`));
|
||||||
|
});
|
||||||
|
|
||||||
|
worker.on('exit', (code) => {
|
||||||
|
if (code !== 0) {
|
||||||
|
reject(new Error(`Worker stopped with exit code ${code}`));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
worker.postMessage(taskData);
|
||||||
|
});
|
||||||
|
} catch (error: unknown) {
|
||||||
|
throw new Error(`Failed to run task: ${(error as Error).message}`);
|
||||||
|
} finally {
|
||||||
|
// Ensure the worker is terminated after the promise is settled
|
||||||
|
worker.terminate();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@@ -41,7 +41,8 @@ export class NTQQFileApi {
|
|||||||
this.context = context;
|
this.context = context;
|
||||||
this.core = core;
|
this.core = core;
|
||||||
this.rkeyManager = new RkeyManager([
|
this.rkeyManager = new RkeyManager([
|
||||||
'https://rkey.napneko.icu/rkeys'
|
'https://ss.xingzhige.com/music_card/rkey', // 国内
|
||||||
|
'https://secret-service.bietiaop.com/rkeys',//国内
|
||||||
],
|
],
|
||||||
this.context.logger
|
this.context.logger
|
||||||
);
|
);
|
||||||
|
@@ -27,6 +27,9 @@ export class NTQQGroupApi {
|
|||||||
this.core = core;
|
this.core = core;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async setGroupRemark(groupCode: string, remark: string) {
|
||||||
|
return this.context.session.getGroupService().modifyGroupRemark(groupCode, remark);
|
||||||
|
}
|
||||||
async fetchGroupDetail(groupCode: string) {
|
async fetchGroupDetail(groupCode: string) {
|
||||||
const [, detailInfo] = await this.core.eventWrapper.callNormalEventV2(
|
const [, detailInfo] = await this.core.eventWrapper.callNormalEventV2(
|
||||||
'NodeIKernelGroupService/getGroupDetailInfo',
|
'NodeIKernelGroupService/getGroupDetailInfo',
|
||||||
@@ -165,7 +168,13 @@ export class NTQQGroupApi {
|
|||||||
|
|
||||||
return this.groupMemberCache.get(groupCode);
|
return this.groupMemberCache.get(groupCode);
|
||||||
}
|
}
|
||||||
|
async refreshGroupMemberCachePartial(groupCode: string, uid: string) {
|
||||||
|
const member = await this.getGroupMemberEx(groupCode, uid, true);
|
||||||
|
if (member) {
|
||||||
|
this.groupMemberCache.get(groupCode)?.set(uid, member);
|
||||||
|
}
|
||||||
|
return member;
|
||||||
|
}
|
||||||
async getGroupMember(groupCode: string | number, memberUinOrUid: string | number) {
|
async getGroupMember(groupCode: string | number, memberUinOrUid: string | number) {
|
||||||
const groupCodeStr = groupCode.toString();
|
const groupCodeStr = groupCode.toString();
|
||||||
const memberUinOrUidStr = memberUinOrUid.toString();
|
const memberUinOrUidStr = memberUinOrUid.toString();
|
||||||
@@ -339,9 +348,9 @@ export class NTQQGroupApi {
|
|||||||
return this.context.session.getGroupService().uploadGroupBulletinPic(groupCode, _Pskey, imageurl);
|
return this.context.session.getGroupService().uploadGroupBulletinPic(groupCode, _Pskey, imageurl);
|
||||||
}
|
}
|
||||||
|
|
||||||
async handleGroupRequest(notify: GroupNotify, operateType: NTGroupRequestOperateTypes, reason?: string) {
|
async handleGroupRequest(doubt: boolean, notify: GroupNotify, operateType: NTGroupRequestOperateTypes, reason?: string) {
|
||||||
return this.context.session.getGroupService().operateSysNotify(
|
return this.context.session.getGroupService().operateSysNotify(
|
||||||
false,
|
doubt,
|
||||||
{
|
{
|
||||||
operateType: operateType,
|
operateType: operateType,
|
||||||
targetMsg: {
|
targetMsg: {
|
||||||
|
@@ -136,6 +136,20 @@ export class NTQQMsgApi {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async queryFirstMsgBySender(peer: Peer, SendersUid: string[]) {
|
||||||
|
console.log(peer, SendersUid);
|
||||||
|
return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', '0', {
|
||||||
|
chatInfo: peer,
|
||||||
|
filterMsgType: [],
|
||||||
|
filterSendersUid: SendersUid,
|
||||||
|
filterMsgToTime: '0',
|
||||||
|
filterMsgFromTime: '0',
|
||||||
|
isReverseOrder: true,
|
||||||
|
isIncludeCurrent: true,
|
||||||
|
pageLimit: 20000,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
async setMsgRead(peer: Peer) {
|
async setMsgRead(peer: Peer) {
|
||||||
return this.context.session.getMsgService().setMsgRead(peer);
|
return this.context.session.getMsgService().setMsgRead(peer);
|
||||||
}
|
}
|
||||||
|
32
src/core/external/appid.json
vendored
32
src/core/external/appid.json
vendored
@@ -186,5 +186,37 @@
|
|||||||
"9.9.17-31363": {
|
"9.9.17-31363": {
|
||||||
"appid": 537266500,
|
"appid": 537266500,
|
||||||
"qua": "V1_WIN_NQ_9.9.17_31363_GW_B"
|
"qua": "V1_WIN_NQ_9.9.17_31363_GW_B"
|
||||||
|
},
|
||||||
|
"3.2.16-32690": {
|
||||||
|
"appid": 537271229,
|
||||||
|
"qua": "V1_LNX_NQ_3.2.16_32690_GW_B"
|
||||||
|
},
|
||||||
|
"9.9.18-32690": {
|
||||||
|
"appid": 537271194,
|
||||||
|
"qua": "V1_WIN_NQ_9.9.18_32690_GW_B"
|
||||||
|
},
|
||||||
|
"6.9.66-32690": {
|
||||||
|
"appid": 537271218,
|
||||||
|
"qua": "V1_MAC_NQ_6.9.66_32690_GW_B"
|
||||||
|
},
|
||||||
|
"3.2.16-32721": {
|
||||||
|
"appid": 537271229,
|
||||||
|
"qua": "V1_LNX_NQ_3.2.16_32721_GW_B"
|
||||||
|
},
|
||||||
|
"9.9.18-32793": {
|
||||||
|
"appid": 537271244,
|
||||||
|
"qua": "V1_WIN_NQ_9.9.18_32793_GW_B"
|
||||||
|
},
|
||||||
|
"3.2.16-32793": {
|
||||||
|
"appid": 537271279,
|
||||||
|
"qua": "V1_LNX_NQ_3.2.16_32793_GW_B"
|
||||||
|
},
|
||||||
|
"3.2.16-32869": {
|
||||||
|
"appid": 537271329,
|
||||||
|
"qua": "V1_LNX_NQ_3.2.16_32869_GW_B"
|
||||||
|
},
|
||||||
|
"9.9.18-32869": {
|
||||||
|
"appid": 537271294,
|
||||||
|
"qua": "V1_WIN_NQ_9.9.18_32869_GW_B"
|
||||||
}
|
}
|
||||||
}
|
}
|
3
src/core/external/napcat.json
vendored
3
src/core/external/napcat.json
vendored
@@ -4,5 +4,6 @@
|
|||||||
"fileLogLevel": "debug",
|
"fileLogLevel": "debug",
|
||||||
"consoleLogLevel": "info",
|
"consoleLogLevel": "info",
|
||||||
"packetBackend": "auto",
|
"packetBackend": "auto",
|
||||||
"packetServer": ""
|
"packetServer": "",
|
||||||
|
"o3HookMode": 1
|
||||||
}
|
}
|
44
src/core/external/offset.json
vendored
44
src/core/external/offset.json
vendored
@@ -246,5 +246,49 @@
|
|||||||
"6.9.65-31363-arm64": {
|
"6.9.65-31363-arm64": {
|
||||||
"send": "422CEF8",
|
"send": "422CEF8",
|
||||||
"recv": "422F710"
|
"recv": "422F710"
|
||||||
|
},
|
||||||
|
"9.9.18-32690-x64": {
|
||||||
|
"send": "39F9630",
|
||||||
|
"recv": "39FDE30"
|
||||||
|
},
|
||||||
|
"3.2.16-32690-x64": {
|
||||||
|
"send": "A5E24C0",
|
||||||
|
"recv": "A5E5EE0"
|
||||||
|
},
|
||||||
|
"3.2.16-32690-arm64": {
|
||||||
|
"send": "7226630",
|
||||||
|
"recv": "7229F60"
|
||||||
|
},
|
||||||
|
"3.2.16-32721-x64": {
|
||||||
|
"send": "A5E24C0",
|
||||||
|
"recv": "A5E5EE0"
|
||||||
|
},
|
||||||
|
"3.2.16-32721-arm64": {
|
||||||
|
"send": "7226630",
|
||||||
|
"recv": "7229F60"
|
||||||
|
},
|
||||||
|
"9.9.18-32793-x64": {
|
||||||
|
"send": "39F9A30",
|
||||||
|
"recv": "39FE230"
|
||||||
|
},
|
||||||
|
"3.2.16-32793-x64": {
|
||||||
|
"send": "A5E24C0",
|
||||||
|
"recv": "A5E5EE0"
|
||||||
|
},
|
||||||
|
"3.2.16-32793-arm64": {
|
||||||
|
"send": "7226630",
|
||||||
|
"recv": "7229F60"
|
||||||
|
},
|
||||||
|
"9.9.18-32869-x64": {
|
||||||
|
"send": "39F9A30",
|
||||||
|
"recv": "39FE230"
|
||||||
|
},
|
||||||
|
"3.2.16-32869-x64": {
|
||||||
|
"send": "A5E24C0",
|
||||||
|
"recv": "A5E5EE0"
|
||||||
|
},
|
||||||
|
"3.2.16-32869-arm64": {
|
||||||
|
"send": "7226630",
|
||||||
|
"recv": "7229F60"
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -10,6 +10,7 @@ export const NapcatConfigSchema = Type.Object({
|
|||||||
consoleLogLevel: Type.String({ default: 'info' }),
|
consoleLogLevel: Type.String({ default: 'info' }),
|
||||||
packetBackend: Type.String({ default: 'auto' }),
|
packetBackend: Type.String({ default: 'auto' }),
|
||||||
packetServer: Type.String({ default: '' }),
|
packetServer: Type.String({ default: '' }),
|
||||||
|
o3HookMode: Type.Number({ default: 0 }),
|
||||||
});
|
});
|
||||||
|
|
||||||
export type NapcatConfig = Static<typeof NapcatConfigSchema>;
|
export type NapcatConfig = Static<typeof NapcatConfigSchema>;
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
import { ChatType } from '@/core';
|
import { ChatType, RawMessage } from '@/core';
|
||||||
export interface SearchGroupInfo {
|
export interface SearchGroupInfo {
|
||||||
groupCode: string;
|
groupCode: string;
|
||||||
ownerUid: string;
|
ownerUid: string;
|
||||||
@@ -94,4 +94,27 @@ export interface NodeIKernelSearchListener {
|
|||||||
}[]
|
}[]
|
||||||
}[]
|
}[]
|
||||||
}): any;
|
}): any;
|
||||||
|
|
||||||
|
onSearchMsgKeywordsResult(params: {
|
||||||
|
searchId: string,
|
||||||
|
hasMore: boolean,
|
||||||
|
resultItems: Array<{
|
||||||
|
msgId: string,
|
||||||
|
msgSeq: string,
|
||||||
|
msgTime: string,
|
||||||
|
senderUid: string,
|
||||||
|
senderUin: string,
|
||||||
|
senderNick: string,
|
||||||
|
senderNickHits: unknown[],
|
||||||
|
senderRemark: string,
|
||||||
|
senderRemarkHits: unknown[],
|
||||||
|
senderCard: string,
|
||||||
|
senderCardHits: unknown[],
|
||||||
|
fieldType: number,
|
||||||
|
fieldText: string,
|
||||||
|
msgRecord: RawMessage;
|
||||||
|
hitsInfo: Array<unknown>,
|
||||||
|
msgAbstract: unknown,
|
||||||
|
}>
|
||||||
|
}): void | Promise<void>;
|
||||||
}
|
}
|
||||||
|
@@ -11,7 +11,7 @@ import { PacketLogger } from '@/core/packet/context/loggerContext';
|
|||||||
|
|
||||||
// 0 send 1 recv
|
// 0 send 1 recv
|
||||||
export interface NativePacketExportType {
|
export interface NativePacketExportType {
|
||||||
InitHook?: (send: string, recv: string, callback: (type: number, uin: string, cmd: string, seq: number, hex_data: string) => void) => boolean;
|
InitHook?: (send: string, recv: string, callback: (type: number, uin: string, cmd: string, seq: number, hex_data: string) => void, o3_hook: boolean) => boolean;
|
||||||
SendPacket?: (cmd: string, data: string, trace_id: string) => void;
|
SendPacket?: (cmd: string, data: string, trace_id: string) => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -42,6 +42,7 @@ export class NativePacketClient extends IPacketClient {
|
|||||||
const platform = process.platform + '.' + process.arch;
|
const platform = process.platform + '.' + process.arch;
|
||||||
const moehoo_path = path.join(dirname(fileURLToPath(import.meta.url)), './moehoo/MoeHoo.' + platform + '.node');
|
const moehoo_path = path.join(dirname(fileURLToPath(import.meta.url)), './moehoo/MoeHoo.' + platform + '.node');
|
||||||
process.dlopen(this.MoeHooExport, moehoo_path, constants.dlopen.RTLD_LAZY);
|
process.dlopen(this.MoeHooExport, moehoo_path, constants.dlopen.RTLD_LAZY);
|
||||||
|
|
||||||
this.MoeHooExport.exports.InitHook?.(send, recv, (type: number, uin: string, cmd: string, seq: number, hex_data: string) => {
|
this.MoeHooExport.exports.InitHook?.(send, recv, (type: number, uin: string, cmd: string, seq: number, hex_data: string) => {
|
||||||
const trace_id = createHash('md5').update(Buffer.from(hex_data, 'hex')).digest('hex');
|
const trace_id = createHash('md5').update(Buffer.from(hex_data, 'hex')).digest('hex');
|
||||||
if (type === 0 && this.cb.get(trace_id + 'recv')) {
|
if (type === 0 && this.cb.get(trace_id + 'recv')) {
|
||||||
@@ -55,7 +56,7 @@ export class NativePacketClient extends IPacketClient {
|
|||||||
// console.log('callback:', callback, trace_id);
|
// console.log('callback:', callback, trace_id);
|
||||||
callback?.({ seq, cmd, hex_data });
|
callback?.({ seq, cmd, hex_data });
|
||||||
}
|
}
|
||||||
});
|
}, this.napcore.config.o3HookMode == 1);
|
||||||
this.available = true;
|
this.available = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -144,7 +144,7 @@ export class PacketHighwayContext {
|
|||||||
const ukey = preRespData.upload.uKey;
|
const ukey = preRespData.upload.uKey;
|
||||||
if (ukey && ukey != '') {
|
if (ukey && ukey != '') {
|
||||||
this.logger.debug(`[Highway] uploadGroupImageReq get upload ukey: ${ukey}, need upload!`);
|
this.logger.debug(`[Highway] uploadGroupImageReq get upload ukey: ${ukey}, need upload!`);
|
||||||
const index = preRespData.upload.msgInfo.msgInfoBody[0].index;
|
const index = preRespData.upload.msgInfo.msgInfoBody[0]!.index;
|
||||||
const sha1 = Buffer.from(index.info.fileSha1, 'hex');
|
const sha1 = Buffer.from(index.info.fileSha1, 'hex');
|
||||||
const md5 = Buffer.from(index.info.fileHash, 'hex');
|
const md5 = Buffer.from(index.info.fileHash, 'hex');
|
||||||
const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
|
const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
|
||||||
@@ -181,7 +181,7 @@ export class PacketHighwayContext {
|
|||||||
const ukey = preRespData.upload.uKey;
|
const ukey = preRespData.upload.uKey;
|
||||||
if (ukey && ukey != '') {
|
if (ukey && ukey != '') {
|
||||||
this.logger.debug(`[Highway] uploadC2CImageReq get upload ukey: ${ukey}, need upload!`);
|
this.logger.debug(`[Highway] uploadC2CImageReq get upload ukey: ${ukey}, need upload!`);
|
||||||
const index = preRespData.upload.msgInfo.msgInfoBody[0].index;
|
const index = preRespData.upload.msgInfo.msgInfoBody[0]!.index;
|
||||||
const sha1 = Buffer.from(index.info.fileSha1, 'hex');
|
const sha1 = Buffer.from(index.info.fileSha1, 'hex');
|
||||||
const md5 = Buffer.from(index.info.fileHash, 'hex');
|
const md5 = Buffer.from(index.info.fileHash, 'hex');
|
||||||
const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
|
const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
|
||||||
@@ -219,7 +219,7 @@ export class PacketHighwayContext {
|
|||||||
const ukey = preRespData.upload.uKey;
|
const ukey = preRespData.upload.uKey;
|
||||||
if (ukey && ukey != '') {
|
if (ukey && ukey != '') {
|
||||||
this.logger.debug(`[Highway] uploadGroupVideoReq get upload video ukey: ${ukey}, need upload!`);
|
this.logger.debug(`[Highway] uploadGroupVideoReq get upload video ukey: ${ukey}, need upload!`);
|
||||||
const index = preRespData.upload.msgInfo.msgInfoBody[0].index;
|
const index = preRespData.upload.msgInfo.msgInfoBody[0]!.index;
|
||||||
const md5 = Buffer.from(index.info.fileHash, 'hex');
|
const md5 = Buffer.from(index.info.fileHash, 'hex');
|
||||||
const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
|
const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
|
||||||
fileUuid: index.fileUuid,
|
fileUuid: index.fileUuid,
|
||||||
@@ -244,16 +244,16 @@ export class PacketHighwayContext {
|
|||||||
this.logger.debug(`[Highway] uploadGroupVideoReq get upload invalid ukey ${ukey}, don't need upload!`);
|
this.logger.debug(`[Highway] uploadGroupVideoReq get upload invalid ukey ${ukey}, don't need upload!`);
|
||||||
}
|
}
|
||||||
const subFile = preRespData.upload.subFileInfos[0];
|
const subFile = preRespData.upload.subFileInfos[0];
|
||||||
if (subFile.uKey && subFile.uKey != '') {
|
if (subFile!.uKey && subFile!.uKey != '') {
|
||||||
this.logger.debug(`[Highway] uploadGroupVideoReq get upload video thumb ukey: ${subFile.uKey}, need upload!`);
|
this.logger.debug(`[Highway] uploadGroupVideoReq get upload video thumb ukey: ${subFile!.uKey}, need upload!`);
|
||||||
const index = preRespData.upload.msgInfo.msgInfoBody[1].index;
|
const index = preRespData.upload.msgInfo.msgInfoBody[1]!.index;
|
||||||
const md5 = Buffer.from(index.info.fileHash, 'hex');
|
const md5 = Buffer.from(index.info.fileHash, 'hex');
|
||||||
const sha1 = Buffer.from(index.info.fileSha1, 'hex');
|
const sha1 = Buffer.from(index.info.fileSha1, 'hex');
|
||||||
const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
|
const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
|
||||||
fileUuid: index.fileUuid,
|
fileUuid: index.fileUuid,
|
||||||
uKey: subFile.uKey,
|
uKey: subFile!.uKey,
|
||||||
network: {
|
network: {
|
||||||
ipv4S: oidbIpv4s2HighwayIpv4s(subFile.ipv4S)
|
ipv4S: oidbIpv4s2HighwayIpv4s(subFile!.ipv4S)
|
||||||
},
|
},
|
||||||
msgInfoBody: preRespData.upload.msgInfo.msgInfoBody,
|
msgInfoBody: preRespData.upload.msgInfo.msgInfoBody,
|
||||||
blockSize: BlockSize,
|
blockSize: BlockSize,
|
||||||
@@ -269,7 +269,7 @@ export class PacketHighwayContext {
|
|||||||
extend
|
extend
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
this.logger.debug(`[Highway] uploadGroupVideoReq get upload invalid thumb ukey ${subFile.uKey}, don't need upload!`);
|
this.logger.debug(`[Highway] uploadGroupVideoReq get upload invalid thumb ukey ${subFile!.uKey}, don't need upload!`);
|
||||||
}
|
}
|
||||||
video.msgInfo = preRespData.upload.msgInfo;
|
video.msgInfo = preRespData.upload.msgInfo;
|
||||||
}
|
}
|
||||||
@@ -284,7 +284,7 @@ export class PacketHighwayContext {
|
|||||||
const ukey = preRespData.upload.uKey;
|
const ukey = preRespData.upload.uKey;
|
||||||
if (ukey && ukey != '') {
|
if (ukey && ukey != '') {
|
||||||
this.logger.debug(`[Highway] uploadC2CVideoReq get upload video ukey: ${ukey}, need upload!`);
|
this.logger.debug(`[Highway] uploadC2CVideoReq get upload video ukey: ${ukey}, need upload!`);
|
||||||
const index = preRespData.upload.msgInfo.msgInfoBody[0].index;
|
const index = preRespData.upload.msgInfo.msgInfoBody[0]!.index;
|
||||||
const md5 = Buffer.from(index.info.fileHash, 'hex');
|
const md5 = Buffer.from(index.info.fileHash, 'hex');
|
||||||
const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
|
const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
|
||||||
fileUuid: index.fileUuid,
|
fileUuid: index.fileUuid,
|
||||||
@@ -309,16 +309,16 @@ export class PacketHighwayContext {
|
|||||||
this.logger.debug(`[Highway] uploadC2CVideoReq get upload invalid ukey ${ukey}, don't need upload!`);
|
this.logger.debug(`[Highway] uploadC2CVideoReq get upload invalid ukey ${ukey}, don't need upload!`);
|
||||||
}
|
}
|
||||||
const subFile = preRespData.upload.subFileInfos[0];
|
const subFile = preRespData.upload.subFileInfos[0];
|
||||||
if (subFile.uKey && subFile.uKey != '') {
|
if (subFile!.uKey && subFile!.uKey != '') {
|
||||||
this.logger.debug(`[Highway] uploadC2CVideoReq get upload video thumb ukey: ${subFile.uKey}, need upload!`);
|
this.logger.debug(`[Highway] uploadC2CVideoReq get upload video thumb ukey: ${subFile!.uKey}, need upload!`);
|
||||||
const index = preRespData.upload.msgInfo.msgInfoBody[1].index;
|
const index = preRespData.upload.msgInfo.msgInfoBody[1]!.index;
|
||||||
const md5 = Buffer.from(index.info.fileHash, 'hex');
|
const md5 = Buffer.from(index.info.fileHash, 'hex');
|
||||||
const sha1 = Buffer.from(index.info.fileSha1, 'hex');
|
const sha1 = Buffer.from(index.info.fileSha1, 'hex');
|
||||||
const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
|
const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
|
||||||
fileUuid: index.fileUuid,
|
fileUuid: index.fileUuid,
|
||||||
uKey: subFile.uKey,
|
uKey: subFile!.uKey,
|
||||||
network: {
|
network: {
|
||||||
ipv4S: oidbIpv4s2HighwayIpv4s(subFile.ipv4S)
|
ipv4S: oidbIpv4s2HighwayIpv4s(subFile!.ipv4S)
|
||||||
},
|
},
|
||||||
msgInfoBody: preRespData.upload.msgInfo.msgInfoBody,
|
msgInfoBody: preRespData.upload.msgInfo.msgInfoBody,
|
||||||
blockSize: BlockSize,
|
blockSize: BlockSize,
|
||||||
@@ -334,7 +334,7 @@ export class PacketHighwayContext {
|
|||||||
extend
|
extend
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
this.logger.debug(`[Highway] uploadC2CVideoReq get upload invalid thumb ukey ${subFile.uKey}, don't need upload!`);
|
this.logger.debug(`[Highway] uploadC2CVideoReq get upload invalid thumb ukey ${subFile!.uKey}, don't need upload!`);
|
||||||
}
|
}
|
||||||
video.msgInfo = preRespData.upload.msgInfo;
|
video.msgInfo = preRespData.upload.msgInfo;
|
||||||
}
|
}
|
||||||
@@ -347,7 +347,7 @@ export class PacketHighwayContext {
|
|||||||
const ukey = preRespData.upload.uKey;
|
const ukey = preRespData.upload.uKey;
|
||||||
if (ukey && ukey != '') {
|
if (ukey && ukey != '') {
|
||||||
this.logger.debug(`[Highway] uploadGroupPttReq get upload ptt ukey: ${ukey}, need upload!`);
|
this.logger.debug(`[Highway] uploadGroupPttReq get upload ptt ukey: ${ukey}, need upload!`);
|
||||||
const index = preRespData.upload.msgInfo.msgInfoBody[0].index;
|
const index = preRespData.upload.msgInfo.msgInfoBody[0]!.index;
|
||||||
const md5 = Buffer.from(index.info.fileHash, 'hex');
|
const md5 = Buffer.from(index.info.fileHash, 'hex');
|
||||||
const sha1 = Buffer.from(index.info.fileSha1, 'hex');
|
const sha1 = Buffer.from(index.info.fileSha1, 'hex');
|
||||||
const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
|
const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
|
||||||
@@ -383,7 +383,7 @@ export class PacketHighwayContext {
|
|||||||
const ukey = preRespData.upload.uKey;
|
const ukey = preRespData.upload.uKey;
|
||||||
if (ukey && ukey != '') {
|
if (ukey && ukey != '') {
|
||||||
this.logger.debug(`[Highway] uploadC2CPttReq get upload ptt ukey: ${ukey}, need upload!`);
|
this.logger.debug(`[Highway] uploadC2CPttReq get upload ptt ukey: ${ukey}, need upload!`);
|
||||||
const index = preRespData.upload.msgInfo.msgInfoBody[0].index;
|
const index = preRespData.upload.msgInfo.msgInfoBody[0]!.index;
|
||||||
const md5 = Buffer.from(index.info.fileHash, 'hex');
|
const md5 = Buffer.from(index.info.fileHash, 'hex');
|
||||||
const sha1 = Buffer.from(index.info.fileSha1, 'hex');
|
const sha1 = Buffer.from(index.info.fileSha1, 'hex');
|
||||||
const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
|
const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
|
||||||
|
@@ -165,7 +165,7 @@ export interface NodeIKernelGroupService {
|
|||||||
|
|
||||||
modifyGroupName(groupCode: string, groupName: string, isNormalMember: boolean): Promise<GeneralCallResult>;
|
modifyGroupName(groupCode: string, groupName: string, isNormalMember: boolean): Promise<GeneralCallResult>;
|
||||||
|
|
||||||
modifyGroupRemark(groupCode: string, remark: string): void;
|
modifyGroupRemark(groupCode: string, remark: string): Promise<GeneralCallResult>;
|
||||||
|
|
||||||
modifyGroupDetailInfo(groupCode: string, arg: unknown): void;
|
modifyGroupDetailInfo(groupCode: string, arg: unknown): void;
|
||||||
|
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
import { ChatType } from '@/core/types';
|
import { ChatType, Peer } from '@/core/types';
|
||||||
import { GeneralCallResult } from './common';
|
import { GeneralCallResult } from './common';
|
||||||
|
|
||||||
export interface NodeIKernelSearchService {
|
export interface NodeIKernelSearchService {
|
||||||
@@ -54,7 +54,7 @@ export interface NodeIKernelSearchService {
|
|||||||
|
|
||||||
cancelSearchChatMsgs(...args: unknown[]): unknown;// needs 3 arguments
|
cancelSearchChatMsgs(...args: unknown[]): unknown;// needs 3 arguments
|
||||||
|
|
||||||
searchMsgWithKeywords(...args: unknown[]): unknown;// needs 2 arguments
|
searchMsgWithKeywords(keyWords: string[], param: Peer & { searchFields: number, pageLimit: number }): Promise<GeneralCallResult>;
|
||||||
|
|
||||||
searchMoreMsgWithKeywords(...args: unknown[]): unknown;// needs 1 arguments
|
searchMoreMsgWithKeywords(...args: unknown[]): unknown;// needs 1 arguments
|
||||||
|
|
||||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
56
src/onebot/action/extends/GetUnidirectionalFriendList.ts
Normal file
56
src/onebot/action/extends/GetUnidirectionalFriendList.ts
Normal file
@@ -0,0 +1,56 @@
|
|||||||
|
import { PacketHexStr } from '@/core/packet/transformer/base';
|
||||||
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
|
import { ActionName } from '@/onebot/action/router';
|
||||||
|
import { ProtoBuf, ProtoBufBase, PBUint32, PBString } from 'napcat.protobuf';
|
||||||
|
|
||||||
|
interface Friend {
|
||||||
|
uin: number;
|
||||||
|
uid: string;
|
||||||
|
nick_name: string;
|
||||||
|
age: number;
|
||||||
|
source: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface Block {
|
||||||
|
str_uid: string;
|
||||||
|
bytes_source: string;
|
||||||
|
uint32_sex: number;
|
||||||
|
uint32_age: number;
|
||||||
|
bytes_nick: string;
|
||||||
|
uint64_uin: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class GetUnidirectionalFriendList extends OneBotAction<void, Friend[]> {
|
||||||
|
override actionName = ActionName.GetUnidirectionalFriendList;
|
||||||
|
|
||||||
|
async pack_data(data: string): Promise<Uint8Array> {
|
||||||
|
return ProtoBuf(class extends ProtoBufBase {
|
||||||
|
type = PBUint32(2, false, 0);
|
||||||
|
data = PBString(3, false, data);
|
||||||
|
}).encode();
|
||||||
|
}
|
||||||
|
|
||||||
|
async _handle(): Promise<Friend[]> {
|
||||||
|
const self_id = this.core.selfInfo.uin;
|
||||||
|
const req_json = {
|
||||||
|
uint64_uin: self_id,
|
||||||
|
uint64_top: 0,
|
||||||
|
uint32_req_num: 99,
|
||||||
|
bytes_cookies: ""
|
||||||
|
};
|
||||||
|
const packed_data = await this.pack_data(JSON.stringify(req_json));
|
||||||
|
const data = Buffer.from(packed_data).toString('hex');
|
||||||
|
const rsq = { cmd: 'MQUpdateSvc_com_qq_ti.web.OidbSvc.0xe17_0', data: data as PacketHexStr };
|
||||||
|
const rsp_data = await this.core.apis.PacketApi.pkt.operation.sendPacket(rsq, true);
|
||||||
|
const block_json = ProtoBuf(class extends ProtoBufBase { data = PBString(4); }).decode(rsp_data);
|
||||||
|
const block_list: Block[] = JSON.parse(block_json.data).rpt_block_list;
|
||||||
|
|
||||||
|
return block_list.map((block) => ({
|
||||||
|
uin: block.uint64_uin,
|
||||||
|
uid: block.str_uid,
|
||||||
|
nick_name: Buffer.from(block.bytes_nick, 'base64').toString(),
|
||||||
|
age: block.uint32_age,
|
||||||
|
source: Buffer.from(block.bytes_source, 'base64').toString()
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
}
|
22
src/onebot/action/extends/SetGroupRemark.ts
Normal file
22
src/onebot/action/extends/SetGroupRemark.ts
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
|
import { ActionName } from '@/onebot/action/router';
|
||||||
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
|
|
||||||
|
const SchemaData = Type.Object({
|
||||||
|
group_id: Type.String(),
|
||||||
|
remark: Type.String(),
|
||||||
|
});
|
||||||
|
|
||||||
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
|
export default class SetGroupRemark extends OneBotAction<Payload, null> {
|
||||||
|
override actionName = ActionName.SetGroupRemark;
|
||||||
|
override payloadSchema = SchemaData;
|
||||||
|
async _handle(payload: Payload): Promise<null> {
|
||||||
|
let ret = await this.core.apis.GroupApi.setGroupRemark(payload.group_id, payload.remark);
|
||||||
|
if (ret.result != 0) {
|
||||||
|
throw new Error(`设置群备注失败, ${ret.result}:${ret.errMsg}`);
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
@@ -5,7 +5,7 @@ import { Static, Type } from '@sinclair/typebox';
|
|||||||
const SchemaData = Type.Object({
|
const SchemaData = Type.Object({
|
||||||
group_id: Type.Union([Type.Number(), Type.String()]),
|
group_id: Type.Union([Type.Number(), Type.String()]),
|
||||||
user_id: Type.Union([Type.Number(), Type.String()]),
|
user_id: Type.Union([Type.Number(), Type.String()]),
|
||||||
special_title: Type.String(),
|
special_title: Type.String({ default: '' }),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = Static<typeof SchemaData>;
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
@@ -20,11 +20,12 @@ export default class SetGroupAddRequest extends OneBotAction<Payload, null> {
|
|||||||
const approve = payload.approve?.toString() !== 'false';
|
const approve = payload.approve?.toString() !== 'false';
|
||||||
const reason = payload.reason ?? ' ';
|
const reason = payload.reason ?? ' ';
|
||||||
const invite_notify = this.obContext.apis.MsgApi.notifyGroupInvite.get(flag);
|
const invite_notify = this.obContext.apis.MsgApi.notifyGroupInvite.get(flag);
|
||||||
const notify = invite_notify ?? await this.findNotify(flag);
|
const { doubt, notify } = invite_notify ? { doubt: false, notify: invite_notify } : await this.findNotify(flag);
|
||||||
if (!notify) {
|
if (!notify) {
|
||||||
throw new Error('No such request');
|
throw new Error('No such request');
|
||||||
}
|
}
|
||||||
await this.core.apis.GroupApi.handleGroupRequest(
|
await this.core.apis.GroupApi.handleGroupRequest(
|
||||||
|
doubt,
|
||||||
notify,
|
notify,
|
||||||
approve ? NTGroupRequestOperateTypes.KAGREE : NTGroupRequestOperateTypes.KREFUSE,
|
approve ? NTGroupRequestOperateTypes.KAGREE : NTGroupRequestOperateTypes.KREFUSE,
|
||||||
reason,
|
reason,
|
||||||
@@ -36,7 +37,8 @@ export default class SetGroupAddRequest extends OneBotAction<Payload, null> {
|
|||||||
let notify = (await this.core.apis.GroupApi.getSingleScreenNotifies(false, 100)).find(e => e.seq == flag);
|
let notify = (await this.core.apis.GroupApi.getSingleScreenNotifies(false, 100)).find(e => e.seq == flag);
|
||||||
if (!notify) {
|
if (!notify) {
|
||||||
notify = (await this.core.apis.GroupApi.getSingleScreenNotifies(true, 100)).find(e => e.seq == flag);
|
notify = (await this.core.apis.GroupApi.getSingleScreenNotifies(true, 100)).find(e => e.seq == flag);
|
||||||
|
return { doubt: true, notify };
|
||||||
}
|
}
|
||||||
return notify;
|
return { doubt: true, notify };
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -16,6 +16,8 @@ export default class SetGroupBan extends OneBotAction<Payload, null> {
|
|||||||
async _handle(payload: Payload): Promise<null> {
|
async _handle(payload: Payload): Promise<null> {
|
||||||
const uid = await this.core.apis.UserApi.getUidByUinV2(payload.user_id.toString());
|
const uid = await this.core.apis.UserApi.getUidByUinV2(payload.user_id.toString());
|
||||||
if (!uid) throw new Error('uid error');
|
if (!uid) throw new Error('uid error');
|
||||||
|
let member_role = (await this.core.apis.GroupApi.getGroupMemberEx(payload.group_id.toString(), uid, true))?.role;
|
||||||
|
if (member_role === 4) throw new Error('cannot ban owner');
|
||||||
// 例如无管理员权限时 result为 120101005 errMsg为 'ERR_NOT_GROUP_ADMIN'
|
// 例如无管理员权限时 result为 120101005 errMsg为 'ERR_NOT_GROUP_ADMIN'
|
||||||
let ret = await this.core.apis.GroupApi.banMember(payload.group_id.toString(),
|
let ret = await this.core.apis.GroupApi.banMember(payload.group_id.toString(),
|
||||||
[{ uid: uid, timeStamp: +payload.duration }]);
|
[{ uid: uid, timeStamp: +payload.duration }]);
|
||||||
|
@@ -107,10 +107,13 @@ import { SetDiyOnlineStatus } from './extends/SetDiyOnlineStatus';
|
|||||||
import { BotExit } from './extends/BotExit';
|
import { BotExit } from './extends/BotExit';
|
||||||
import { ClickInlineKeyboardButton } from './extends/ClickInlineKeyboardButton';
|
import { ClickInlineKeyboardButton } from './extends/ClickInlineKeyboardButton';
|
||||||
import { GetPrivateFileUrl } from './file/GetPrivateFileUrl';
|
import { GetPrivateFileUrl } from './file/GetPrivateFileUrl';
|
||||||
|
import { GetUnidirectionalFriendList } from './extends/GetUnidirectionalFriendList';
|
||||||
|
import SetGroupRemark from './extends/SetGroupRemark';
|
||||||
|
|
||||||
export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCore) {
|
export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCore) {
|
||||||
|
|
||||||
const actionHandlers = [
|
const actionHandlers = [
|
||||||
|
new SetGroupRemark(obContext, core),
|
||||||
new GetGroupInfoEx(obContext, core),
|
new GetGroupInfoEx(obContext, core),
|
||||||
new FetchEmojiLike(obContext, core),
|
new FetchEmojiLike(obContext, core),
|
||||||
new GetFile(obContext, core),
|
new GetFile(obContext, core),
|
||||||
@@ -226,7 +229,8 @@ export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCo
|
|||||||
new GetGroupSystemMsg(obContext, core),
|
new GetGroupSystemMsg(obContext, core),
|
||||||
new BotExit(obContext, core),
|
new BotExit(obContext, core),
|
||||||
new ClickInlineKeyboardButton(obContext, core),
|
new ClickInlineKeyboardButton(obContext, core),
|
||||||
new GetPrivateFileUrl(obContext,core)
|
new GetPrivateFileUrl(obContext, core),
|
||||||
|
new GetUnidirectionalFriendList(obContext, core),
|
||||||
];
|
];
|
||||||
|
|
||||||
type HandlerUnion = typeof actionHandlers[number];
|
type HandlerUnion = typeof actionHandlers[number];
|
||||||
|
@@ -10,6 +10,7 @@ export interface InvalidCheckResult {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export const ActionName = {
|
export const ActionName = {
|
||||||
|
SetGroupRemark: 'set_group_remark',
|
||||||
NapCat_GetPrivateFileUrl: 'get_private_file_url',
|
NapCat_GetPrivateFileUrl: 'get_private_file_url',
|
||||||
ClickInlineKeyboardButton: 'click_inline_keyboard_button',
|
ClickInlineKeyboardButton: 'click_inline_keyboard_button',
|
||||||
GetUnidirectionalFriendList: 'get_unidirectional_friend_list',
|
GetUnidirectionalFriendList: 'get_unidirectional_friend_list',
|
||||||
|
@@ -49,6 +49,7 @@ export class OneBotGroupApi {
|
|||||||
duration = -1;
|
duration = -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
await this.core.apis.GroupApi.refreshGroupMemberCachePartial(GroupCode, memberUid);
|
||||||
const adminUin = (await this.core.apis.GroupApi.getGroupMember(GroupCode, adminUid))?.uin;
|
const adminUin = (await this.core.apis.GroupApi.getGroupMember(GroupCode, adminUid))?.uin;
|
||||||
if (memberUin && adminUin) {
|
if (memberUin && adminUin) {
|
||||||
return new OB11GroupBanEvent(
|
return new OB11GroupBanEvent(
|
||||||
@@ -113,12 +114,16 @@ export class OneBotGroupApi {
|
|||||||
async parseCardChangedEvent(msg: RawMessage) {
|
async parseCardChangedEvent(msg: RawMessage) {
|
||||||
if (msg.senderUin && msg.senderUin !== '0') {
|
if (msg.senderUin && msg.senderUin !== '0') {
|
||||||
const member = await this.core.apis.GroupApi.getGroupMember(msg.peerUid, msg.senderUin);
|
const member = await this.core.apis.GroupApi.getGroupMember(msg.peerUid, msg.senderUin);
|
||||||
|
await this.core.apis.GroupApi.refreshGroupMemberCachePartial(msg.peerUid, msg.senderUid);
|
||||||
if (member && member.cardName !== msg.sendMemberName) {
|
if (member && member.cardName !== msg.sendMemberName) {
|
||||||
const newCardName = msg.sendMemberName ?? '';
|
const newCardName = msg.sendMemberName ?? '';
|
||||||
const event = new OB11GroupCardEvent(this.core, parseInt(msg.peerUid), parseInt(msg.senderUin), newCardName, member.cardName);
|
const event = new OB11GroupCardEvent(this.core, parseInt(msg.peerUid), parseInt(msg.senderUin), newCardName, member.cardName);
|
||||||
member.cardName = newCardName;
|
member.cardName = newCardName;
|
||||||
return event;
|
return event;
|
||||||
}
|
}
|
||||||
|
if (member && member.nick !== msg.sendNickName) {
|
||||||
|
await this.core.apis.GroupApi.refreshGroupMemberCachePartial(msg.peerUid, msg.senderUid);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return undefined;
|
return undefined;
|
||||||
}
|
}
|
||||||
|
@@ -355,6 +355,7 @@ export class OneBotMsgApi {
|
|||||||
data: {
|
data: {
|
||||||
file: fileCode,
|
file: fileCode,
|
||||||
file_size: element.fileSize,
|
file_size: element.fileSize,
|
||||||
|
path: element.filePath,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
@@ -654,6 +655,19 @@ export class OneBotMsgApi {
|
|||||||
[OB11MessageDataType.node]: async () => undefined,
|
[OB11MessageDataType.node]: async () => undefined,
|
||||||
|
|
||||||
[OB11MessageDataType.forward]: async ({ data }, context) => {
|
[OB11MessageDataType.forward]: async ({ data }, context) => {
|
||||||
|
// let id = data.id.toString();
|
||||||
|
// let peer: Peer | undefined = context.peer;
|
||||||
|
// if (isNumeric(id)) {
|
||||||
|
// let msgid = '';
|
||||||
|
// if (BigInt(data.id) > 2147483647n) {
|
||||||
|
// peer = MessageUnique.getPeerByMsgId(id)?.Peer;
|
||||||
|
// msgid = id;
|
||||||
|
// } else {
|
||||||
|
// let data = MessageUnique.getMsgIdAndPeerByShortId(parseInt(id));
|
||||||
|
// msgid = data?.MsgId ?? '';
|
||||||
|
// peer = data?.Peer;
|
||||||
|
// }
|
||||||
|
// }
|
||||||
const jsonData = ForwardMsgBuilder.fromResId(data.id);
|
const jsonData = ForwardMsgBuilder.fromResId(data.id);
|
||||||
return this.ob11ToRawConverters.json({
|
return this.ob11ToRawConverters.json({
|
||||||
data: { data: JSON.stringify(jsonData) },
|
data: { data: JSON.stringify(jsonData) },
|
||||||
@@ -795,6 +809,7 @@ export class OneBotMsgApi {
|
|||||||
message_id: msg.id!,
|
message_id: msg.id!,
|
||||||
message_seq: msg.id!,
|
message_seq: msg.id!,
|
||||||
real_id: msg.id!,
|
real_id: msg.id!,
|
||||||
|
real_seq: msg.msgSeq,
|
||||||
message_type: msg.chatType == ChatType.KCHATTYPEGROUP ? 'group' : 'private',
|
message_type: msg.chatType == ChatType.KCHATTYPEGROUP ? 'group' : 'private',
|
||||||
sender: {
|
sender: {
|
||||||
user_id: +(msg.senderUin ?? 0),
|
user_id: +(msg.senderUin ?? 0),
|
||||||
|
@@ -84,17 +84,19 @@ export class OneBotQuickActionApi {
|
|||||||
let notify = (await this.core.apis.GroupApi.getSingleScreenNotifies(false, 100)).find(e => e.seq == flag);
|
let notify = (await this.core.apis.GroupApi.getSingleScreenNotifies(false, 100)).find(e => e.seq == flag);
|
||||||
if (!notify) {
|
if (!notify) {
|
||||||
notify = (await this.core.apis.GroupApi.getSingleScreenNotifies(true, 100)).find(e => e.seq == flag);
|
notify = (await this.core.apis.GroupApi.getSingleScreenNotifies(true, 100)).find(e => e.seq == flag);
|
||||||
|
return { doubt: true, notify };
|
||||||
}
|
}
|
||||||
return notify;
|
return { doubt: true, notify };
|
||||||
}
|
}
|
||||||
|
|
||||||
async handleGroupRequest(request: OB11GroupRequestEvent, quickAction: QuickActionGroupRequest) {
|
async handleGroupRequest(request: OB11GroupRequestEvent, quickAction: QuickActionGroupRequest) {
|
||||||
|
|
||||||
const invite_notify = this.obContext.apis.MsgApi.notifyGroupInvite.get(request.flag);
|
const invite_notify = this.obContext.apis.MsgApi.notifyGroupInvite.get(request.flag);
|
||||||
const notify = invite_notify ?? await this.findNotify(request.flag);
|
const { doubt, notify } = invite_notify ? { doubt: false, notify: invite_notify } : await this.findNotify(request.flag);
|
||||||
|
|
||||||
if (!isNull(quickAction.approve) && notify) {
|
if (!isNull(quickAction.approve) && notify) {
|
||||||
this.core.apis.GroupApi.handleGroupRequest(
|
this.core.apis.GroupApi.handleGroupRequest(
|
||||||
|
doubt,
|
||||||
notify,
|
notify,
|
||||||
quickAction.approve ? NTGroupRequestOperateTypes.KAGREE : NTGroupRequestOperateTypes.KREFUSE,
|
quickAction.approve ? NTGroupRequestOperateTypes.KAGREE : NTGroupRequestOperateTypes.KREFUSE,
|
||||||
quickAction.reason,
|
quickAction.reason,
|
||||||
|
@@ -10,6 +10,7 @@ export enum OB11MessageType {
|
|||||||
|
|
||||||
// 消息接口定义
|
// 消息接口定义
|
||||||
export interface OB11Message {
|
export interface OB11Message {
|
||||||
|
real_seq?: string;// 自行扩展
|
||||||
temp_source?: number;
|
temp_source?: number;
|
||||||
message_sent_type?: string;
|
message_sent_type?: string;
|
||||||
target_id?: number; // 自己发送消息/私聊消息
|
target_id?: number; // 自己发送消息/私聊消息
|
||||||
|
@@ -8,8 +8,7 @@ const external = [
|
|||||||
'silk-wasm',
|
'silk-wasm',
|
||||||
'ws',
|
'ws',
|
||||||
'express',
|
'express',
|
||||||
'@ffmpeg.wasm/core-mt',
|
'@ffmpeg.wasm/core-mt'
|
||||||
'piscina'
|
|
||||||
];
|
];
|
||||||
const nodeModules = [...builtinModules, builtinModules.map((m) => `node:${m}`)].flat();
|
const nodeModules = [...builtinModules, builtinModules.map((m) => `node:${m}`)].flat();
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user