@cxyhhhhh/dsh-qqbot 0.5.2-dev.202610201829 → 0.5.4-dev.202610281447
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +28 -0
- package/CHANGELOG_EN.md +28 -0
- package/README.md +21 -7
- package/README_EN.md +22 -6
- package/assets/icons/qq_logo.svg +3 -0
- package/assets/icons/qqbot_logo.svg +3 -0
- package/dist/config.d.ts +6 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +5 -1
- package/dist/config.js.map +1 -1
- package/dist/gateway/bootstrap.d.ts.map +1 -1
- package/dist/gateway/bootstrap.js +14 -10
- package/dist/gateway/bootstrap.js.map +1 -1
- package/dist/media/send-file-tool.d.ts +4 -27
- package/dist/media/send-file-tool.d.ts.map +1 -1
- package/dist/media/send-file-tool.js +12 -40
- package/dist/media/send-file-tool.js.map +1 -1
- package/dist/media/send-media.d.ts +53 -0
- package/dist/media/send-media.d.ts.map +1 -0
- package/dist/media/send-media.js +64 -0
- package/dist/media/send-media.js.map +1 -0
- package/dist/setup/bind-routes.d.ts.map +1 -1
- package/dist/setup/bind-routes.js +9 -3
- package/dist/setup/bind-routes.js.map +1 -1
- package/dist/setup/persist.d.ts +6 -7
- package/dist/setup/persist.d.ts.map +1 -1
- package/dist/setup/persist.js +224 -114
- package/dist/setup/persist.js.map +1 -1
- package/dist/transport/deliverables.d.ts +20 -0
- package/dist/transport/deliverables.d.ts.map +1 -0
- package/dist/transport/deliverables.js +68 -0
- package/dist/transport/deliverables.js.map +1 -0
- package/dist/transport/events.d.ts +15 -1
- package/dist/transport/events.d.ts.map +1 -1
- package/dist/transport/events.js +19 -0
- package/dist/transport/events.js.map +1 -1
- package/dist/transport/outbound.d.ts +3 -2
- package/dist/transport/outbound.d.ts.map +1 -1
- package/dist/transport/outbound.js +63 -12
- package/dist/transport/outbound.js.map +1 -1
- package/lib/client.js +109 -22
- package/lib/client.js.map +1 -1
- package/locale/en.json +6 -0
- package/locale/zh.json +6 -0
- package/package.json +13 -5
- package/docs/assets/qqchannel.jpg +0 -0
- package/docs/assets/qqgroup.jpg +0 -0
- package/docs/assets/qrcode.png +0 -0
package/CHANGELOG.md
CHANGED
|
@@ -6,6 +6,34 @@
|
|
|
6
6
|
|
|
7
7
|
格式遵循 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.0.0/)。
|
|
8
8
|
|
|
9
|
+
## [0.5.4] - 2026-10-28
|
|
10
|
+
|
|
11
|
+
### 问题修复
|
|
12
|
+
|
|
13
|
+
- **保存配置不再破坏其他插件配置**：绑定、改配置、解绑时，cordis.patch.yml 里其他插件的内容（含注释）原样保留，不再被整份重写。（#53）
|
|
14
|
+
- **长提示词可保存**：配置保存的请求体上限从 4KB 调整为 512KB，长 system prompt / 群聊提示词与大白名单不再被拒。（#69）
|
|
15
|
+
|
|
16
|
+
## [0.5.3] - 2026-10-27
|
|
17
|
+
|
|
18
|
+
### 新功能
|
|
19
|
+
|
|
20
|
+
- **流式回复**：回复实时分段送达 QQ，长回复不再整段等待；模型自动重试时改写同一条消息，不会重复。流式此前实际未生效，本版接入实时通道后真正可用。
|
|
21
|
+
- **交付文件直达会话**：模型通过 present 声明的交付文件（文档、表格、导出数据等）在本轮回复送达后自动发送到当前 QQ 会话；未能发送的以文字提示路径。可在配置中关闭或限制单轮数量。
|
|
22
|
+
|
|
23
|
+
### 问题修复
|
|
24
|
+
|
|
25
|
+
- **操作确认恢复工作**：此前确认请求从未送达，敏感操作一直报「没有可用的确认通道」，现已修复。（#51，感谢 [@IrisuM](https://github.com/IrisuM)）
|
|
26
|
+
- **设置面板输入与文案**：白名单文本框支持回车换行，保存时统一规范化；「开放 / 停用」等选项文案更直白。
|
|
27
|
+
|
|
28
|
+
### 元数据
|
|
29
|
+
|
|
30
|
+
- **插件元数据补齐**：新增插件图标与中英文双语描述，插件列表按界面语言显示「QQ 机器人 (dsh-qqbot)」/「QQ Bot (dsh-qqbot)」。
|
|
31
|
+
- **界面入口与图标**：侧栏与插件详情页新增管理面板入口，设置页图标改为矢量 logo。
|
|
32
|
+
|
|
33
|
+
### 文档
|
|
34
|
+
|
|
35
|
+
- README 新增桌面版安装说明（插件页添加 → 设置页扫码连接，全程无需命令行）。
|
|
36
|
+
|
|
9
37
|
## [0.5.2] - 2026-10-12
|
|
10
38
|
|
|
11
39
|
### 问题修复
|
package/CHANGELOG_EN.md
CHANGED
|
@@ -6,6 +6,34 @@ This file records significant dsh-qqbot updates from a product perspective, focu
|
|
|
6
6
|
|
|
7
7
|
The format follows [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
|
|
8
8
|
|
|
9
|
+
## [0.5.4] - 2026-10-28
|
|
10
|
+
|
|
11
|
+
### Fixed
|
|
12
|
+
|
|
13
|
+
- **Saving configuration no longer clobbers other plugins**: binding, saving settings, and unbinding now edit cordis.patch.yml in place — other plugins' entries and comments are preserved instead of the whole file being rewritten. (#53)
|
|
14
|
+
- **Long prompts can be saved**: the settings-save request body limit is raised from 4KB to 512KB, so long system / group prompts and large allowlists are no longer rejected. (#69)
|
|
15
|
+
|
|
16
|
+
## [0.5.3] - 2026-10-27
|
|
17
|
+
|
|
18
|
+
### Added
|
|
19
|
+
|
|
20
|
+
- **Streaming replies**: replies stream to QQ in segments while the model generates, and an automatic LLM retry rewrites the same streamed message instead of appending a duplicate. Streaming had never actually worked; it does now.
|
|
21
|
+
- **Delivered files reach the chat**: files the model declares as deliverables are automatically sent to the current QQ conversation right after the turn's reply, with a text notice when a file cannot be sent; can be disabled or capped in configuration.
|
|
22
|
+
|
|
23
|
+
### Fixed
|
|
24
|
+
|
|
25
|
+
- **Action confirmation restored**: confirmation requests never arrived — sensitive operations kept failing with "no approval channel is available". Fixed. (#51, thanks to [@IrisuM](https://github.com/IrisuM))
|
|
26
|
+
- **Settings panel input and copy**: allowlist textareas accept newlines, normalized on save; option labels such as open/disabled read more plainly.
|
|
27
|
+
|
|
28
|
+
### Metadata
|
|
29
|
+
|
|
30
|
+
- **Plugin metadata completed**: ships a plugin icon and a bilingual description; the plugin list shows “QQ 机器人 (dsh-qqbot)” / “QQ Bot (dsh-qqbot)” by interface language.
|
|
31
|
+
- **Entries and icon**: the sidebar and the plugin detail page gain management-panel entries; the settings panel icon becomes a vector logo.
|
|
32
|
+
|
|
33
|
+
### Documentation
|
|
34
|
+
|
|
35
|
+
- README: Desktop installation instructions — add from the Plugins page, connect by scanning in Settings, no command line involved.
|
|
36
|
+
|
|
9
37
|
## [0.5.2] - 2026-10-12
|
|
10
38
|
|
|
11
39
|
### Fixed
|
package/README.md
CHANGED
|
@@ -17,8 +17,8 @@
|
|
|
17
17
|
|
|
18
18
|
<table>
|
|
19
19
|
<tr>
|
|
20
|
-
<td align="center" width="50%"><img src="./docs/
|
|
21
|
-
<td align="center" width="50%"><img src="./docs/
|
|
20
|
+
<td align="center" width="50%"><img src="./assets/docs/qqgroup.jpg" height="360" alt="QQ 群二维码" /><br /><b>QQ 开发者交流群</b><br /><sub>群号: 1032635674</sub></td>
|
|
21
|
+
<td align="center" width="50%"><img src="./assets/docs/qqchannel.jpg" height="360" alt="QQ 频道二维码" /><br /><b>QQ 开发者社区频道</b><br /><sub>频道号: 20dnumts4z</sub></td>
|
|
22
22
|
</tr>
|
|
23
23
|
</table>
|
|
24
24
|
|
|
@@ -35,7 +35,21 @@ QQ 用户 → QQ WebSocket → dsh-qqbot → ctx.agents → dsh agent loop → L
|
|
|
35
35
|
|
|
36
36
|
## 安装
|
|
37
37
|
|
|
38
|
-
###
|
|
38
|
+
### 方式一：桌面版安装（推荐）
|
|
39
|
+
|
|
40
|
+
无需命令行，全程在应用内完成：
|
|
41
|
+
|
|
42
|
+
1. **安装**：左侧栏点击「插件」→「添加插件」→ 输入 `@tencent-connect/dsh-qqbot@latest` → 安装并立即启动
|
|
43
|
+
|
|
44
|
+
<img src="./assets/docs/install.png" alt="端内添加插件" width="560" />
|
|
45
|
+
|
|
46
|
+
2. **连接**：左下角头像 → 设置 →「QQ 机器人」→ 手机 QQ 扫码连接
|
|
47
|
+
|
|
48
|
+
<img src="./assets/docs/setting.png" alt="设置页扫码连接" width="560" />
|
|
49
|
+
|
|
50
|
+
扫码成功后凭据自动保存，后续启动无需再次扫码。
|
|
51
|
+
|
|
52
|
+
### 方式二：手动执行
|
|
39
53
|
|
|
40
54
|
```bash
|
|
41
55
|
# 安装到 profile
|
|
@@ -47,13 +61,13 @@ npx @deepseek-ai/dsh --profile qqbot
|
|
|
47
61
|
|
|
48
62
|
首次启动时，插件检测到凭据未配置会自动进入扫码引导：终端输出二维码 → 手机 QQ 扫码绑定 → 凭据自动保存到 profile，后续启动无需再次扫码。
|
|
49
63
|
|
|
50
|
-
|
|
64
|
+
无端内绑定页的环境（如纯 CLI）可设置 `QQBOT_BIND_OPEN_BROWSER=1`，额外拉起系统浏览器扫码页作为降级通道。
|
|
51
65
|
|
|
52
|
-
<img src="./docs/
|
|
66
|
+
<img src="./assets/docs/qrcode.png" alt="二维码扫码示意图" width="280" />
|
|
53
67
|
|
|
54
68
|
> **提示**：建议升级至 `0.4.0` 以上版本扫码，支持点击链接在浏览器打开，避免部分终端二维码渲染错位的问题。
|
|
55
69
|
|
|
56
|
-
###
|
|
70
|
+
### 方式三：本地路径安装
|
|
57
71
|
|
|
58
72
|
```bash
|
|
59
73
|
# 构建
|
|
@@ -68,7 +82,7 @@ export QQBOT_APPID="你的AppID" QQBOT_SECRET="你的AppSecret"
|
|
|
68
82
|
npx @deepseek-ai/dsh --profile qqbot
|
|
69
83
|
```
|
|
70
84
|
|
|
71
|
-
###
|
|
85
|
+
### 方式四：--patch 开发模式
|
|
72
86
|
|
|
73
87
|
```bash
|
|
74
88
|
export QQBOT_APPID="你的AppID" QQBOT_SECRET="你的AppSecret"
|
package/README_EN.md
CHANGED
|
@@ -17,8 +17,8 @@ Scan to join the QQ group / channel
|
|
|
17
17
|
|
|
18
18
|
<table>
|
|
19
19
|
<tr>
|
|
20
|
-
<td align="center" width="50%"><img src="./docs/
|
|
21
|
-
<td align="center" width="50%"><img src="./docs/
|
|
20
|
+
<td align="center" width="50%"><img src="./assets/docs/qqgroup.jpg" height="360" alt="QQ Group QR Code" /><br /><b>QQ Developer Group</b><br /><sub>Group ID: 1032635674</sub></td>
|
|
21
|
+
<td align="center" width="50%"><img src="./assets/docs/qqchannel.jpg" height="360" alt="QQ Channel QR Code" /><br /><b>QQ Developer Channel</b><br /><sub>Channel ID: 20dnumts4z</sub></td>
|
|
22
22
|
</tr>
|
|
23
23
|
</table>
|
|
24
24
|
|
|
@@ -35,7 +35,21 @@ QQ User → QQ WebSocket → dsh-qqbot → ctx.agents → dsh agent loop → LLM
|
|
|
35
35
|
|
|
36
36
|
## Installation
|
|
37
37
|
|
|
38
|
-
### Method 1:
|
|
38
|
+
### Method 1: Desktop install (recommended)
|
|
39
|
+
|
|
40
|
+
No command line needed — everything happens inside the app:
|
|
41
|
+
|
|
42
|
+
1. **Install**: click "Plugins" in the left sidebar → "Add plugin" → enter `@tencent-connect/dsh-qqbot@latest` → install and start now
|
|
43
|
+
|
|
44
|
+
<img src="./assets/docs/install.png" alt="In-app plugin install" width="560" />
|
|
45
|
+
|
|
46
|
+
2. **Connect**: avatar at the bottom-left → Settings → "QQ Bots" → scan the QR code with mobile QQ
|
|
47
|
+
|
|
48
|
+
<img src="./assets/docs/setting.png" alt="Settings QR binding" width="560" />
|
|
49
|
+
|
|
50
|
+
Credentials are saved automatically after the scan; later launches need no re-scan.
|
|
51
|
+
|
|
52
|
+
### Method 2: Manual
|
|
39
53
|
|
|
40
54
|
```bash
|
|
41
55
|
# Add to a profile
|
|
@@ -47,11 +61,13 @@ npx @deepseek-ai/dsh --profile qqbot
|
|
|
47
61
|
|
|
48
62
|
On first launch, the plugin detects missing credentials and automatically starts the QR flow: a QR code is printed in the terminal → scan it with the QQ mobile app → credentials are saved to the profile, so subsequent launches require no re-scan.
|
|
49
63
|
|
|
50
|
-
|
|
64
|
+
In environments without the in-app binding page (pure CLI), set `QQBOT_BIND_OPEN_BROWSER=1` to additionally open a browser QR page as a fallback.
|
|
65
|
+
|
|
66
|
+
<img src="./assets/docs/qrcode.png" alt="QR code scan example" width="280" />
|
|
51
67
|
|
|
52
68
|
> **Note**: Upgrade to `0.4.0` or later for browser-link scanning, which avoids QR code misalignment in some terminals.
|
|
53
69
|
|
|
54
|
-
### Method
|
|
70
|
+
### Method 3: Local path
|
|
55
71
|
|
|
56
72
|
```bash
|
|
57
73
|
# Build
|
|
@@ -66,7 +82,7 @@ export QQBOT_APPID="yourAppID" QQBOT_SECRET="yourAppSecret"
|
|
|
66
82
|
npx @deepseek-ai/dsh --profile qqbot
|
|
67
83
|
```
|
|
68
84
|
|
|
69
|
-
### Method
|
|
85
|
+
### Method 4: --patch dev mode
|
|
70
86
|
|
|
71
87
|
```bash
|
|
72
88
|
export QQBOT_APPID="yourAppID" QQBOT_SECRET="yourAppSecret"
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
|
|
2
|
+
<path d="M18.3262 10.3168C18.327 10.2893 18.3387 9.82506 18.3387 9.58562C18.3387 5.55264 16.4443 1.5002 11.7858 1.5C7.12723 1.5002 5.23276 5.55264 5.23276 9.58562C5.23276 9.81458 5.24351 10.2491 5.24503 10.3107L5.24518 10.3168L4.30497 12.6751C4.04744 13.3501 3.79317 14.0528 3.60687 14.6554C2.71838 17.529 3.00622 18.7182 3.22537 18.7448C3.69578 18.8019 5.05615 16.5816 5.05615 16.5816C5.05615 17.8673 5.71429 19.5452 7.1393 20.7568C6.60638 20.922 5.95335 21.176 5.53375 21.4874C5.15646 21.7675 5.20345 22.0529 5.27147 22.1682C5.57006 22.6745 10.3937 22.4914 11.7863 22.3338C13.1789 22.4914 18.0025 22.6745 18.3011 22.1682C18.3691 22.0529 18.4161 21.7675 18.0388 21.4874C17.619 21.1759 16.9655 20.9217 16.4324 20.7565C17.8572 19.545 18.5153 17.8672 18.5153 16.5816C18.5153 16.5816 19.8757 18.8019 20.346 18.7448C20.5652 18.7182 20.853 17.529 19.9646 14.6554C19.7783 14.0527 19.524 13.3501 19.2664 12.6751L18.3262 10.3168Z" fill="#0099FF"/>
|
|
3
|
+
</svg>
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
|
|
2
|
+
<path d="M19.3862 15.5001C19.3861 11.4203 16.0789 8.11296 11.999 8.11292C7.91915 8.11292 4.61203 11.4203 4.61182 15.5001V17.0001C4.61182 18.5949 5.90429 19.8873 7.49902 19.8873H16.499C18.0937 19.8873 19.3862 18.5949 19.3862 17.0001V15.5001ZM10.6118 14.0001C10.6118 14.6145 10.1129 15.1134 9.49853 15.1134C8.8843 15.1132 8.38672 14.6144 8.38672 14.0001V12.0006C8.38672 11.3863 8.8843 10.8875 9.49853 10.8873C10.1129 10.8873 10.6118 11.3862 10.6118 12.0006V14.0001ZM15.6113 14.0001C15.6113 14.6143 15.1136 15.1131 14.4995 15.1134C13.8851 15.1134 13.3862 14.6145 13.3862 14.0001V12.0006C13.3862 11.3862 13.8851 10.8873 14.4995 10.8873C15.1136 10.8876 15.6113 11.3864 15.6113 12.0006V14.0001ZM14.2607 3.04895C14.2607 3.89351 13.7957 4.62474 13.1108 5.0133V5.95374C17.8958 6.50514 21.6112 10.5676 21.6113 15.5001V17.0001C21.6113 19.8237 19.3225 22.1124 16.499 22.1124H7.49902C4.67546 22.1124 2.38672 19.8237 2.38672 17.0001V15.5001C2.38691 10.568 6.10139 6.50571 10.8857 5.95374V5.01185C10.2017 4.62305 9.73583 3.89286 9.73583 3.04895C9.73609 1.79961 10.7496 0.787231 11.999 0.787231C13.2484 0.787297 14.2605 1.79966 14.2607 3.04895Z" fill="#0085FF"/>
|
|
3
|
+
</svg>
|
package/dist/config.d.ts
CHANGED
|
@@ -36,11 +36,16 @@ export interface VisionConfig {
|
|
|
36
36
|
/** 视觉调用超时(ms) */
|
|
37
37
|
timeoutMs: number;
|
|
38
38
|
}
|
|
39
|
+
/** 附件发送配置（qqbot_send_file 工具与 present 交付物投递共用） */
|
|
39
40
|
export interface SendFileConfig {
|
|
40
41
|
/** 是否启用路径白名单（默认 true，仅允许 media + cwd + extraRoots；关闭则任意路径） */
|
|
41
42
|
restrictPaths: boolean;
|
|
42
43
|
/** 额外允许访问的根目录（media 和 agent cwd 始终默认允许） */
|
|
43
44
|
extraRoots: string[];
|
|
45
|
+
/** 是否把 present 声明的交付文件在轮末发送到当前会话 */
|
|
46
|
+
sendPresentedFiles: boolean;
|
|
47
|
+
/** 单轮最多投递的交付文件数 */
|
|
48
|
+
maxFiles: number;
|
|
44
49
|
}
|
|
45
50
|
export interface ImQQBotConfig {
|
|
46
51
|
/** QQ Bot AppID */
|
|
@@ -85,7 +90,7 @@ export interface ImQQBotConfig {
|
|
|
85
90
|
media: MediaConfig;
|
|
86
91
|
/** 视觉理解（qqbot_describe_image 工具，走 dsh llm + attachments） */
|
|
87
92
|
vision: VisionConfig;
|
|
88
|
-
/** 附件发送（qqbot_send_file
|
|
93
|
+
/** 附件发送（qqbot_send_file 工具与交付物投递共用） */
|
|
89
94
|
sendFile: SendFileConfig;
|
|
90
95
|
}
|
|
91
96
|
/** 访问控制子 Schema（独立导出：config 路由的服务端校验复用） */
|
package/dist/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,MAAM,MAAM,0BAA0B,CAAC;AAE9C,MAAM,WAAW,mBAAmB;IAClC,eAAe;IACf,OAAO,EAAE,MAAM,GAAG,WAAW,GAAG,UAAU,CAAC;IAC3C,2BAA2B;IAC3B,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,aAAa;IACb,SAAS,EAAE,MAAM,GAAG,WAAW,GAAG,UAAU,CAAC;IAC7C,0BAA0B;IAC1B,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB;AAED,MAAM,WAAW,WAAW;IAC1B,gCAAgC;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,2BAA2B;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,qCAAqC;IACrC,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,YAAY;IAC3B,wCAAwC;IACxC,OAAO,EAAE,OAAO,CAAC;IACjB,iDAAiD;IACjD,QAAQ,EAAE,MAAM,CAAC;IACjB,6BAA6B;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,8BAA8B;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,qBAAqB;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,kBAAkB;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,cAAc;IAC7B,8DAA8D;IAC9D,aAAa,EAAE,OAAO,CAAC;IACvB,2CAA2C;IAC3C,UAAU,EAAE,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,MAAM,MAAM,0BAA0B,CAAC;AAE9C,MAAM,WAAW,mBAAmB;IAClC,eAAe;IACf,OAAO,EAAE,MAAM,GAAG,WAAW,GAAG,UAAU,CAAC;IAC3C,2BAA2B;IAC3B,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,aAAa;IACb,SAAS,EAAE,MAAM,GAAG,WAAW,GAAG,UAAU,CAAC;IAC7C,0BAA0B;IAC1B,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB;AAED,MAAM,WAAW,WAAW;IAC1B,gCAAgC;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,2BAA2B;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,qCAAqC;IACrC,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,YAAY;IAC3B,wCAAwC;IACxC,OAAO,EAAE,OAAO,CAAC;IACjB,iDAAiD;IACjD,QAAQ,EAAE,MAAM,CAAC;IACjB,6BAA6B;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,8BAA8B;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,qBAAqB;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,kBAAkB;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,kDAAkD;AAClD,MAAM,WAAW,cAAc;IAC7B,8DAA8D;IAC9D,aAAa,EAAE,OAAO,CAAC;IACvB,2CAA2C;IAC3C,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,oCAAoC;IACpC,kBAAkB,EAAE,OAAO,CAAC;IAC5B,mBAAmB;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,mBAAmB;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,uBAAuB;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,oBAAoB;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW;IACX,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,sBAAsB;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,8BAA8B;IAC9B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,0BAA0B;IAC1B,cAAc,EAAE,OAAO,CAAC;IACxB,yBAAyB;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,yBAAyB;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,+BAA+B;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,wBAAwB;IACxB,SAAS,EAAE,OAAO,CAAC;IACnB,2BAA2B;IAC3B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,eAAe;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,6BAA6B;IAC7B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,8CAA8C;IAC9C,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW;IACX,MAAM,EAAE,mBAAmB,CAAC;IAC5B,6BAA6B;IAC7B,eAAe,EAAE,OAAO,CAAC;IACzB,WAAW;IACX,KAAK,EAAE,OAAO,CAAC;IACf,mBAAmB;IACnB,KAAK,EAAE,WAAW,CAAC;IACnB,4DAA4D;IAC5D,MAAM,EAAE,YAAY,CAAC;IACrB,uCAAuC;IACvC,QAAQ,EAAE,cAAc,CAAC;CAC1B;AAED,2CAA2C;AAC3C,eAAO,MAAM,mBAAmB,EAAE,MAAM,CAAC,mBAAmB,CAK1D,CAAC;AAEH,eAAO,MAAM,YAAY,EAAE,MAAM,CAAC,aAAa,CA8D7C,CAAC"}
|
package/dist/config.js
CHANGED
|
@@ -63,9 +63,13 @@ export const ConfigSchema = Schema.object({
|
|
|
63
63
|
sendFile: Schema.object({
|
|
64
64
|
restrictPaths: Schema.boolean().default(true).description('是否启用路径白名单（默认 true，仅允许 media + cwd + extraRoots）'),
|
|
65
65
|
extraRoots: Schema.array(Schema.string()).default([]).description('额外允许访问的根目录'),
|
|
66
|
+
sendPresentedFiles: Schema.boolean().default(true).description('是否将 present 声明的交付文件发送到当前会话'),
|
|
67
|
+
maxFiles: Schema.number().default(4).description('单轮最多投递的交付文件数'),
|
|
66
68
|
}).default({
|
|
67
69
|
restrictPaths: true,
|
|
68
70
|
extraRoots: [],
|
|
69
|
-
|
|
71
|
+
sendPresentedFiles: true,
|
|
72
|
+
maxFiles: 4,
|
|
73
|
+
}).description('附件发送配置'),
|
|
70
74
|
});
|
|
71
75
|
//# sourceMappingURL=config.js.map
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,MAAM,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bootstrap.d.ts","sourceRoot":"","sources":["../../src/gateway/bootstrap.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAGnD,OAAO,EAAkB,KAAK,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAY5E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAa,MAAM,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"bootstrap.d.ts","sourceRoot":"","sources":["../../src/gateway/bootstrap.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAGnD,OAAO,EAAkB,KAAK,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAY5E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAa,MAAM,EAAE,MAAM,aAAa,CAAC;AAsBrD,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAwJf"}
|
|
@@ -13,6 +13,7 @@ import { setupMiddlewares } from "./middleware-setup.js";
|
|
|
13
13
|
import { startMediaCleanup } from "../media/media-cleaner.js";
|
|
14
14
|
import { ensureVisionInputModal, registerDescribeImageTool } from "../media/vision-tool.js";
|
|
15
15
|
import { registerSendFileTool } from "../media/send-file-tool.js";
|
|
16
|
+
import { DeliverablesDeliverer } from "../transport/deliverables.js";
|
|
16
17
|
/**
|
|
17
18
|
* interaction 统一分发器：按 button_data 的顶层 `t` 判别字段，路由到对应
|
|
18
19
|
* channel（question / approval）。QQ 只有一个 interaction 入口，集中路由
|
|
@@ -79,7 +80,18 @@ export async function bootstrapGateway(ctx, agents, config, logger) {
|
|
|
79
80
|
},
|
|
80
81
|
}),
|
|
81
82
|
};
|
|
82
|
-
|
|
83
|
+
// ── 附件发送适配器（qqbot_send_file 工具与交付物投递共用） ──
|
|
84
|
+
// 包装 bot：让文件发送也走 msgId 兜底 + 被动回复限额管控。
|
|
85
|
+
// 注意：SDK 文件发送暂不支持 event_id，故 allowEvent=false，跳过 event 候选。
|
|
86
|
+
const mediaSender = {
|
|
87
|
+
sendImage: (target, source) => bot.sendImage(resolveReplyTarget(target, replyLimiter, false), source),
|
|
88
|
+
sendVideo: (target, source) => bot.sendVideo(resolveReplyTarget(target, replyLimiter, false), source),
|
|
89
|
+
sendVoice: (target, source) => bot.sendVoice(resolveReplyTarget(target, replyLimiter, false), source),
|
|
90
|
+
sendFile: (target, source, opts) => bot.sendFile(resolveReplyTarget(target, replyLimiter, false), source, opts),
|
|
91
|
+
};
|
|
92
|
+
// 交付物投递：present 声明的文件在轮末发送到当前会话（outbound 路由触发）
|
|
93
|
+
const deliverablesDeliverer = new DeliverablesDeliverer(sender, mediaSender, config, logger);
|
|
94
|
+
const outbound = createOutboundHandler(manager, sender, config, logger, toolsRegistry, deliverablesDeliverer);
|
|
83
95
|
ctx
|
|
84
96
|
.on('session/event', outbound.routeSessionEvent);
|
|
85
97
|
// ── 出站流式：agent/assistant-stream → 流式帧路由 ──
|
|
@@ -140,15 +152,7 @@ export async function bootstrapGateway(ctx, agents, config, logger) {
|
|
|
140
152
|
// ── 视觉工具注册（qqbot_describe_image，复用 dsh llm + attachments） ──
|
|
141
153
|
ensureVisionInputModal(config.vision, logger);
|
|
142
154
|
registerDescribeImageTool(ctx, config.vision, logger);
|
|
143
|
-
// ── 附件发送工具注册（qqbot_send_file） ──
|
|
144
|
-
// 包装 bot：让文件发送也走 msgId 兜底 + 被动回复限额管控。
|
|
145
|
-
// 注意：SDK 文件发送暂不支持 event_id，故 allowEvent=false，跳过 event 候选。
|
|
146
|
-
const mediaSender = {
|
|
147
|
-
sendImage: (target, source) => bot.sendImage(resolveReplyTarget(target, replyLimiter, false), source),
|
|
148
|
-
sendVideo: (target, source) => bot.sendVideo(resolveReplyTarget(target, replyLimiter, false), source),
|
|
149
|
-
sendVoice: (target, source) => bot.sendVoice(resolveReplyTarget(target, replyLimiter, false), source),
|
|
150
|
-
sendFile: (target, source, opts) => bot.sendFile(resolveReplyTarget(target, replyLimiter, false), source, opts),
|
|
151
|
-
};
|
|
155
|
+
// ── 附件发送工具注册（qqbot_send_file，发送器见上方 mediaSender） ──
|
|
152
156
|
registerSendFileTool(ctx, mediaSender, manager, config, logger);
|
|
153
157
|
// ── 生命周期 ──
|
|
154
158
|
ctx
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../src/gateway/bootstrap.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAC;AAEtD,OAAO,EAAE,cAAc,EAAyB,MAAM,qBAAqB,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAGxF,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,eAAe,EAA+B,MAAM,iCAAiC,CAAC;AAC/F,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAC5F,OAAO,EAAE,oBAAoB,EAAwB,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../src/gateway/bootstrap.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,35 +1,12 @@
|
|
|
1
1
|
import type { Context } from '@deepseek-ai/cordis';
|
|
2
2
|
import type { ImQQBotConfig } from '../config.ts';
|
|
3
3
|
import type { SessionManager } from '../session/index.ts';
|
|
4
|
-
import type { Logger
|
|
4
|
+
import type { Logger } from '../types.ts';
|
|
5
|
+
import { type MediaSenderLike } from './send-media.ts';
|
|
5
6
|
/** 工具名（qqbot 前缀避免与其他通道的同名工具冲突） */
|
|
6
7
|
export declare const SEND_FILE_TOOL_NAME = "qqbot_send_file";
|
|
7
|
-
/**
|
|
8
|
-
|
|
9
|
-
upload: {
|
|
10
|
-
file_uuid: string;
|
|
11
|
-
};
|
|
12
|
-
message?: {
|
|
13
|
-
id?: string;
|
|
14
|
-
};
|
|
15
|
-
}
|
|
16
|
-
export interface MediaSenderLike {
|
|
17
|
-
sendImage(target: ReplyTarget, source: {
|
|
18
|
-
localPath?: string;
|
|
19
|
-
}): Promise<MediaSendResult>;
|
|
20
|
-
sendVideo(target: ReplyTarget, source: {
|
|
21
|
-
localPath?: string;
|
|
22
|
-
}): Promise<MediaSendResult>;
|
|
23
|
-
sendVoice(target: ReplyTarget, source: {
|
|
24
|
-
localPath?: string;
|
|
25
|
-
}): Promise<MediaSendResult>;
|
|
26
|
-
sendFile(target: ReplyTarget, source: {
|
|
27
|
-
localPath?: string;
|
|
28
|
-
}, opts?: {
|
|
29
|
-
fileName?: string;
|
|
30
|
-
}): Promise<MediaSendResult>;
|
|
31
|
-
}
|
|
8
|
+
/** 发送器与分类发送的共享实现见 send-media.ts（扩展名分发 + 白名单为单一事实源） */
|
|
9
|
+
export type { MediaSenderLike, MediaSendResult } from './send-media.ts';
|
|
32
10
|
/** 注册 qqbot_send_file 工具（tools 服务缺失时优雅降级，不阻断插件启动） */
|
|
33
11
|
export declare function registerSendFileTool(ctx: Context, bot: MediaSenderLike, manager: SessionManager, config: ImQQBotConfig, logger: Logger): void;
|
|
34
|
-
export {};
|
|
35
12
|
//# sourceMappingURL=send-file-tool.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send-file-tool.d.ts","sourceRoot":"","sources":["../../src/media/send-file-tool.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"send-file-tool.d.ts","sourceRoot":"","sources":["../../src/media/send-file-tool.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAY,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,KAAK,EAAE,MAAM,EAAe,MAAM,aAAa,CAAC;AACvD,OAAO,EAAgC,KAAK,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAErF,kCAAkC;AAClC,eAAO,MAAM,mBAAmB,oBAAoB,CAAC;AAQrD,sDAAsD;AACtD,YAAY,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAuBxE,qDAAqD;AACrD,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,eAAe,EACpB,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,MAAM,GACb,IAAI,CAkGN"}
|
|
@@ -7,18 +7,14 @@
|
|
|
7
7
|
* - 路径白名单：默认只允许访问 media 目录 + agent cwd，可开关 + 扩展白名单。
|
|
8
8
|
*/
|
|
9
9
|
import { existsSync } from 'node:fs';
|
|
10
|
-
import {
|
|
11
|
-
import {
|
|
12
|
-
import { MEDIA_ROOT } from "./media-cleaner.js";
|
|
10
|
+
import { basename, resolve } from 'node:path';
|
|
11
|
+
import { isPathAllowed, sendMediaFile } from "./send-media.js";
|
|
13
12
|
/** 工具名（qqbot 前缀避免与其他通道的同名工具冲突） */
|
|
14
13
|
export const SEND_FILE_TOOL_NAME = 'qqbot_send_file';
|
|
15
14
|
const DESCRIPTION = 'Send a local file (image, video, voice, or generic file) to the QQ user or group '
|
|
16
15
|
+ 'of the current conversation. Pass the absolute path of a file that already exists on disk. '
|
|
17
16
|
+ 'Use this when the user asks you to deliver a generated file (chart, report, exported data, '
|
|
18
17
|
+ 'screenshot, etc.) or to send an existing media/file back to them.';
|
|
19
|
-
const IMAGE_EXTS = new Set(['.jpg', '.jpeg', '.png', '.gif', '.webp', '.bmp']);
|
|
20
|
-
const VIDEO_EXTS = new Set(['.mp4', '.mov', '.avi', '.mkv', '.webm']);
|
|
21
|
-
const VOICE_EXTS = new Set(['.mp3', '.wav', '.ogg', '.aac', '.silk', '.amr']);
|
|
22
18
|
/** 解析显式 target（"c2c:openid" / "group:openid"），非法返回 undefined */
|
|
23
19
|
function parseTarget(input) {
|
|
24
20
|
const idx = input.indexOf(':');
|
|
@@ -30,18 +26,6 @@ function parseTarget(input) {
|
|
|
30
26
|
return undefined;
|
|
31
27
|
return { scope, targetId };
|
|
32
28
|
}
|
|
33
|
-
/** 判断 filePath 是否位于 root 目录内（含 root 本身） */
|
|
34
|
-
function isWithinRoot(filePath, root) {
|
|
35
|
-
const rel = relative(resolve(root), filePath);
|
|
36
|
-
return rel === '' || (!rel.startsWith('..') && !isAbsolute(rel));
|
|
37
|
-
}
|
|
38
|
-
/** 路径白名单校验：restrictPaths 关闭时放行任意路径，否则限定 media + cwd + extraRoots */
|
|
39
|
-
function isPathAllowed(filePath, config, cwd) {
|
|
40
|
-
if (!config.restrictPaths)
|
|
41
|
-
return true;
|
|
42
|
-
const roots = [MEDIA_ROOT, cwd, ...config.extraRoots];
|
|
43
|
-
return roots.some((root) => isWithinRoot(filePath, root));
|
|
44
|
-
}
|
|
45
29
|
/** 注册 qqbot_send_file 工具（tools 服务缺失时优雅降级，不阻断插件启动） */
|
|
46
30
|
export function registerSendFileTool(ctx, bot, manager, config, logger) {
|
|
47
31
|
const tools = ctx.get('tools');
|
|
@@ -113,34 +97,22 @@ export function registerSendFileTool(ctx, bot, manager, config, logger) {
|
|
|
113
97
|
if (!existsSync(absPath)) {
|
|
114
98
|
throw new Error(`qqbot_send_file: 文件不存在: ${absPath}`);
|
|
115
99
|
}
|
|
116
|
-
|
|
117
|
-
if (!info.isFile()) {
|
|
118
|
-
throw new Error(`qqbot_send_file: 路径不是普通文件: ${absPath}`);
|
|
119
|
-
}
|
|
120
|
-
// 3. 按扩展名分类发送
|
|
100
|
+
// 3. 按扩展名分类发送（与交付物投递共用 send-media 的分发实现）
|
|
121
101
|
const fileName = basename(absPath);
|
|
122
|
-
const
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
if (IMAGE_EXTS.has(ext)) {
|
|
126
|
-
result = await bot.sendImage(replyTarget, source);
|
|
127
|
-
}
|
|
128
|
-
else if (VIDEO_EXTS.has(ext)) {
|
|
129
|
-
result = await bot.sendVideo(replyTarget, source);
|
|
130
|
-
}
|
|
131
|
-
else if (VOICE_EXTS.has(ext)) {
|
|
132
|
-
result = await bot.sendVoice(replyTarget, source);
|
|
102
|
+
const result = await sendMediaFile(bot, replyTarget, absPath);
|
|
103
|
+
if (result.outcome === 'missing') {
|
|
104
|
+
throw new Error(`qqbot_send_file: 文件不存在或不可读: ${absPath}`);
|
|
133
105
|
}
|
|
134
|
-
|
|
135
|
-
|
|
106
|
+
if (result.outcome === 'failed') {
|
|
107
|
+
throw new Error(`qqbot_send_file: 发送失败: ${result.error}`);
|
|
136
108
|
}
|
|
137
|
-
logger.info(`im-qqbot: qqbot_send_file 发送 ${fileName} (${
|
|
109
|
+
logger.info(`im-qqbot: qqbot_send_file 发送 ${fileName} (${result.size} bytes) → ${replyTarget.scope}:${replyTarget.targetId}`);
|
|
138
110
|
return {
|
|
139
111
|
fileName,
|
|
140
|
-
fileSize:
|
|
112
|
+
fileSize: result.size,
|
|
141
113
|
target: `${replyTarget.scope}:${replyTarget.targetId}`,
|
|
142
|
-
fileUuid: result.
|
|
143
|
-
...(result.
|
|
114
|
+
fileUuid: result.fileUuid ?? '',
|
|
115
|
+
...(result.messageId !== undefined ? { messageId: result.messageId } : {}),
|
|
144
116
|
};
|
|
145
117
|
},
|
|
146
118
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send-file-tool.js","sourceRoot":"","sources":["../../src/media/send-file-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"send-file-tool.js","sourceRoot":"","sources":["../../src/media/send-file-tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import type { ReplyTarget } from '../types.ts';
|
|
2
|
+
import type { SendFileConfig } from '../config.ts';
|
|
3
|
+
/** 发送器最小接口（QQBot 实例满足） */
|
|
4
|
+
export interface MediaSendResult {
|
|
5
|
+
upload: {
|
|
6
|
+
file_uuid: string;
|
|
7
|
+
};
|
|
8
|
+
message?: {
|
|
9
|
+
id?: string;
|
|
10
|
+
};
|
|
11
|
+
}
|
|
12
|
+
export interface MediaSenderLike {
|
|
13
|
+
sendImage(target: ReplyTarget, source: {
|
|
14
|
+
localPath?: string;
|
|
15
|
+
}): Promise<MediaSendResult>;
|
|
16
|
+
sendVideo(target: ReplyTarget, source: {
|
|
17
|
+
localPath?: string;
|
|
18
|
+
}): Promise<MediaSendResult>;
|
|
19
|
+
sendVoice(target: ReplyTarget, source: {
|
|
20
|
+
localPath?: string;
|
|
21
|
+
}): Promise<MediaSendResult>;
|
|
22
|
+
sendFile(target: ReplyTarget, source: {
|
|
23
|
+
localPath?: string;
|
|
24
|
+
}, opts?: {
|
|
25
|
+
fileName?: string;
|
|
26
|
+
}): Promise<MediaSendResult>;
|
|
27
|
+
}
|
|
28
|
+
/** 判断 filePath 是否位于 root 目录内（含 root 本身） */
|
|
29
|
+
export declare function isWithinRoot(filePath: string, root: string): boolean;
|
|
30
|
+
/** 路径白名单校验：restrictPaths 关闭时放行任意路径，否则限定 media + cwd + extraRoots */
|
|
31
|
+
export declare function isPathAllowed(filePath: string, config: SendFileConfig, cwd: string): boolean;
|
|
32
|
+
/** sendMediaFile 的结果：成功附带元数据；缺失不抛错；失败携带原因供日志与错误信息透出 */
|
|
33
|
+
export type SendMediaResult = {
|
|
34
|
+
outcome: 'sent';
|
|
35
|
+
size: number;
|
|
36
|
+
fileUuid?: string;
|
|
37
|
+
messageId?: string;
|
|
38
|
+
} | {
|
|
39
|
+
outcome: 'missing';
|
|
40
|
+
} | {
|
|
41
|
+
outcome: 'failed';
|
|
42
|
+
error: string;
|
|
43
|
+
};
|
|
44
|
+
/**
|
|
45
|
+
* 按扩展名分类发送一个本地文件
|
|
46
|
+
*
|
|
47
|
+
* 文件不存在、不是普通文件时返回 missing（不抛错，调用方决定降级文案）；
|
|
48
|
+
* 平台发送失败返回 failed。文件名透传给通用文件通道。
|
|
49
|
+
*/
|
|
50
|
+
export declare function sendMediaFile(bot: MediaSenderLike, target: ReplyTarget, filePath: string, opts?: {
|
|
51
|
+
fileName?: string;
|
|
52
|
+
}): Promise<SendMediaResult>;
|
|
53
|
+
//# sourceMappingURL=send-media.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"send-media.d.ts","sourceRoot":"","sources":["../../src/media/send-media.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAGnD,0BAA0B;AAC1B,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9B,OAAO,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC3B;AAED,MAAM,WAAW,eAAe;IAC9B,SAAS,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;IACzF,SAAS,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;IACzF,SAAS,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;IACzF,QAAQ,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,IAAI,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;CACvH;AAMD,2CAA2C;AAC3C,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAGpE;AAED,oEAAoE;AACpE,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAI5F;AAED,uDAAuD;AACvD,MAAM,MAAM,eAAe,GACvB;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GACxE;IAAE,OAAO,EAAE,SAAS,CAAA;CAAE,GACtB;IAAE,OAAO,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEzC;;;;;GAKG;AACH,wBAAsB,aAAa,CACjC,GAAG,EAAE,eAAe,EACpB,MAAM,EAAE,WAAW,EACnB,QAAQ,EAAE,MAAM,EAChB,IAAI,GAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAO,GAC/B,OAAO,CAAC,eAAe,CAAC,CA+B1B"}
|