lightclawbot 1.0.3 → 1.0.5
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/README.md +241 -1
- package/dist/public/data/scripts/manifest.json +11 -0
- package/dist/public/data/scripts/preflight.78097a58.sh +94 -0
- package/dist/public/data/scripts/preflight.sh +94 -0
- package/dist/src/channel.d.ts.map +1 -1
- package/dist/src/channel.js +34 -17
- package/dist/src/channel.js.map +1 -1
- package/dist/src/config.d.ts +38 -5
- package/dist/src/config.d.ts.map +1 -1
- package/dist/src/config.js +105 -7
- package/dist/src/config.js.map +1 -1
- package/dist/src/download-tool.d.ts.map +1 -1
- package/dist/src/download-tool.js +16 -16
- package/dist/src/download-tool.js.map +1 -1
- package/dist/src/file-storage.d.ts.map +1 -1
- package/dist/src/file-storage.js +3 -5
- package/dist/src/file-storage.js.map +1 -1
- package/dist/src/format-urls.d.ts +26 -0
- package/dist/src/format-urls.d.ts.map +1 -0
- package/dist/src/format-urls.js +53 -0
- package/dist/src/format-urls.js.map +1 -0
- package/dist/src/gateway.d.ts.map +1 -1
- package/dist/src/gateway.js +89 -39
- package/dist/src/gateway.js.map +1 -1
- package/dist/src/history/session-store.d.ts +4 -0
- package/dist/src/history/session-store.d.ts.map +1 -1
- package/dist/src/history/session-store.js +41 -0
- package/dist/src/history/session-store.js.map +1 -1
- package/dist/src/inbound.d.ts.map +1 -1
- package/dist/src/inbound.js +38 -15
- package/dist/src/inbound.js.map +1 -1
- package/dist/src/outbound.d.ts.map +1 -1
- package/dist/src/outbound.js +5 -3
- package/dist/src/outbound.js.map +1 -1
- package/dist/src/socket-handlers.d.ts.map +1 -1
- package/dist/src/socket-handlers.js +1 -0
- package/dist/src/socket-handlers.js.map +1 -1
- package/dist/src/types.d.ts +6 -1
- package/dist/src/types.d.ts.map +1 -1
- package/dist/src/upload-tool.d.ts.map +1 -1
- package/dist/src/upload-tool.js +14 -19
- package/dist/src/upload-tool.js.map +1 -1
- package/package.json +6 -3
- package/skills/lightclaw-media/SKILL.md +330 -0
package/README.md
CHANGED
|
@@ -1 +1,241 @@
|
|
|
1
|
-
|
|
1
|
+
# LightClaw — OpenClaw Channel 插件
|
|
2
|
+
|
|
3
|
+
对接 OpenClaw 框架的 LightClaw Bot channel 插件,支持多 apiKey(多账户)模式。
|
|
4
|
+
|
|
5
|
+
---
|
|
6
|
+
|
|
7
|
+
## 目录
|
|
8
|
+
|
|
9
|
+
- [配置](#配置)
|
|
10
|
+
- [多账户 apiKey 体系](#多账户-apikey-体系)
|
|
11
|
+
- [整体架构](#整体架构)
|
|
12
|
+
- [数据流全景](#数据流全景)
|
|
13
|
+
- [两级映射设计](#两级映射设计)
|
|
14
|
+
- [resolveEffectiveApiKey 统一入口](#resolveeffectiveapikey-统一入口)
|
|
15
|
+
- [为什么不能只用一级映射](#为什么不能只用一级映射)
|
|
16
|
+
- [关键模块说明](#关键模块说明)
|
|
17
|
+
- [调试指南](#调试指南)
|
|
18
|
+
- [已知约束与注意事项](#已知约束与注意事项)
|
|
19
|
+
|
|
20
|
+
---
|
|
21
|
+
|
|
22
|
+
## 配置
|
|
23
|
+
|
|
24
|
+
`~/.openclaw/openclaw.json` 中 `channels.lightclawbot` 段:
|
|
25
|
+
|
|
26
|
+
```json
|
|
27
|
+
{
|
|
28
|
+
"channels": {
|
|
29
|
+
"lightclawbot": {
|
|
30
|
+
"apiKeys": ["key-1", "key-2", "key-3"],
|
|
31
|
+
"enabled": true,
|
|
32
|
+
"dmScope": "per-channel-peer"
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
```
|
|
37
|
+
|
|
38
|
+
| 字段 | 说明 |
|
|
39
|
+
|------|------|
|
|
40
|
+
| `apiKeys` | apiKey 数组,每个 key 对应一个 uin(用户身份)。`apiKeys[0]` 为主 key,同时作为默认 fallback |
|
|
41
|
+
| `dmScope` | 会话隔离粒度,推荐 `"per-channel-peer"`(每用户独立 session) |
|
|
42
|
+
|
|
43
|
+
> **注意**:配置中只有 `apiKeys`(复数数组),没有 `apiKey`(单数字段)。运行时 `account.apiKey` 的值取自 `apiKeys[0]`。
|
|
44
|
+
|
|
45
|
+
---
|
|
46
|
+
|
|
47
|
+
## 多账户 apiKey 体系
|
|
48
|
+
|
|
49
|
+
### 整体架构
|
|
50
|
+
|
|
51
|
+
多 apiKey 模式下,一个 Bot 可以持有多个 apiKey,每个 apiKey 关联到不同的 uin(用户身份)。插件需要在处理消息和执行工具时,正确选取当前用户对应的 apiKey。
|
|
52
|
+
|
|
53
|
+
核心挑战:**消息处理(inbound)** 和 **工具执行(tool)** 拿到的上下文信息不同:
|
|
54
|
+
|
|
55
|
+
| 阶段 | 可用标识 | 不可用标识 |
|
|
56
|
+
|------|---------|-----------|
|
|
57
|
+
| inbound 消息到达 | `msg.senderId`(uin) | sessionKey(需路由解析后才知道) |
|
|
58
|
+
| tool 执行 | `ctx.sessionKey` | uin(框架不传递) |
|
|
59
|
+
|
|
60
|
+
因此需要 **两级映射** 来桥接两个阶段。
|
|
61
|
+
|
|
62
|
+
### 数据流全景
|
|
63
|
+
|
|
64
|
+
```
|
|
65
|
+
┌─────────────────────────────────────────────────────────────────┐
|
|
66
|
+
│ Gateway 启动(一次性) │
|
|
67
|
+
│ │
|
|
68
|
+
│ 1. 读取配置中的 apiKeys 数组 │
|
|
69
|
+
│ 2. 对每个 apiKey 调用 /user/current 获取其 uin │
|
|
70
|
+
│ 3. 构建 uin→apiKey 映射表(apiKeyMap) │
|
|
71
|
+
│ 4. setApiKeyMap(apiKeyMap, apiKeys[0]) │
|
|
72
|
+
│ ├─ globalApiKeyMap = { uin_A→key_1, uin_B→key_2, ... } │
|
|
73
|
+
│ └─ globalDefaultApiKey = apiKeys[0] (fallback 兜底) │
|
|
74
|
+
└─────────────────────────────────────────────────────────────────┘
|
|
75
|
+
│
|
|
76
|
+
▼
|
|
77
|
+
┌─────────────────────────────────────────────────────────────────┐
|
|
78
|
+
│ Inbound 消息处理(每条消息) │
|
|
79
|
+
│ │
|
|
80
|
+
│ 1. 收到消息,msg.senderId = uin_A │
|
|
81
|
+
│ 2. resolveEffectiveApiKey({ senderId: uin_A }) │
|
|
82
|
+
│ → 命中 globalApiKeyMap → 返回 key_1 │
|
|
83
|
+
│ 3. resolveAgentRoute(...) → 得到 route.sessionKey │
|
|
84
|
+
│ 4. setSessionApiKey(route.sessionKey, key_1) │
|
|
85
|
+
│ └─ sessionKeyToApiKey = { "agent:main:lc:direct:uin_A"→key_1 } │
|
|
86
|
+
│ 5. 处理消息、下载/上传附件(均使用 key_1) │
|
|
87
|
+
│ 6. 分发给 AI 引擎 │
|
|
88
|
+
└─────────────────────────────────────────────────────────────────┘
|
|
89
|
+
│
|
|
90
|
+
▼
|
|
91
|
+
┌─────────────────────────────────────────────────────────────────┐
|
|
92
|
+
│ Tool 执行(AI 调用工具时) │
|
|
93
|
+
│ │
|
|
94
|
+
│ 1. 框架传入 ctx.sessionKey = "agent:main:lc:direct:uin_A" │
|
|
95
|
+
│ 2. resolveEffectiveApiKey({ sessionKey }) │
|
|
96
|
+
│ → 命中 sessionKeyToApiKey → 返回 key_1 │
|
|
97
|
+
│ 3. 使用 key_1 上传/下载文件到 COS │
|
|
98
|
+
└─────────────────────────────────────────────────────────────────┘
|
|
99
|
+
```
|
|
100
|
+
|
|
101
|
+
### 两级映射设计
|
|
102
|
+
|
|
103
|
+
```
|
|
104
|
+
config.ts 中维护的全局状态:
|
|
105
|
+
|
|
106
|
+
┌─────────────────────────────────────────────────────────┐
|
|
107
|
+
│ 第1级:globalApiKeyMap (uin → apiKey) │
|
|
108
|
+
│ 写入时机:gateway 启动时(setApiKeyMap,一次性) │
|
|
109
|
+
│ 读取时机:inbound 处理消息时 │
|
|
110
|
+
│ 数据规模:= apiKeys 数量(固定,不随消息增长) │
|
|
111
|
+
└─────────────────────────────────────────────────────────┘
|
|
112
|
+
|
|
113
|
+
┌─────────────────────────────────────────────────────────┐
|
|
114
|
+
│ 第2级:sessionKeyToApiKey (sessionKey → apiKey) │
|
|
115
|
+
│ 写入时机:每条消息 inbound 处理时(setSessionApiKey) │
|
|
116
|
+
│ 读取时机:tool 执行时 │
|
|
117
|
+
│ 数据规模:= 活跃用户数(动态增长,但不会很大) │
|
|
118
|
+
└─────────────────────────────────────────────────────────┘
|
|
119
|
+
|
|
120
|
+
┌─────────────────────────────────────────────────────────┐
|
|
121
|
+
│ 兜底:globalDefaultApiKey │
|
|
122
|
+
│ 值 = apiKeys[0],当以上两级都未命中时使用 │
|
|
123
|
+
└─────────────────────────────────────────────────────────┘
|
|
124
|
+
```
|
|
125
|
+
|
|
126
|
+
### resolveEffectiveApiKey 统一入口
|
|
127
|
+
|
|
128
|
+
所有需要获取 apiKey 的地方(inbound / upload-tool / download-tool)统一调用此函数:
|
|
129
|
+
|
|
130
|
+
```typescript
|
|
131
|
+
resolveEffectiveApiKey(params: {
|
|
132
|
+
sessionKey?: string; // tool 执行时传入
|
|
133
|
+
senderId?: string; // inbound 处理时传入
|
|
134
|
+
}): string
|
|
135
|
+
```
|
|
136
|
+
|
|
137
|
+
**查找优先级**:
|
|
138
|
+
|
|
139
|
+
| 优先级 | 数据源 | 场景 |
|
|
140
|
+
|:------:|--------|------|
|
|
141
|
+
| 1 | `sessionKeyToApiKey[sessionKey]` | tool 执行时的主路径 |
|
|
142
|
+
| 2 | `globalApiKeyMap[senderId]` | inbound 处理时的主路径 |
|
|
143
|
+
| 3 | `globalApiKeyMap[extractUinFromSessionKey(sessionKey)]` | 兜底:从 sessionKey 解析 uin |
|
|
144
|
+
| 4 | `globalDefaultApiKey` | 最终 fallback |
|
|
145
|
+
|
|
146
|
+
### 为什么不能只用一级映射
|
|
147
|
+
|
|
148
|
+
**方案:只保留 sessionKeyToApiKey,去掉 globalApiKeyMap?**
|
|
149
|
+
|
|
150
|
+
不可行,原因是 **时序依赖**:
|
|
151
|
+
|
|
152
|
+
```
|
|
153
|
+
用户首条消息到达 inbound:
|
|
154
|
+
│
|
|
155
|
+
├─ 此时需要 apiKey(用于下载附件等)
|
|
156
|
+
│ → 但 sessionKey 尚未算出(要先调 resolveAgentRoute)
|
|
157
|
+
│ → 即使 sessionKey 已知,sessionKeyToApiKey 中没有记录(首条消息,从未写入过)
|
|
158
|
+
│ → ❌ 无法获取 apiKey
|
|
159
|
+
│
|
|
160
|
+
└─ 而 uin(msg.senderId)立即可用
|
|
161
|
+
→ globalApiKeyMap 在 gateway 启动时就已构建好
|
|
162
|
+
→ ✅ 可直接查到 apiKey
|
|
163
|
+
```
|
|
164
|
+
|
|
165
|
+
**`globalApiKeyMap` 是冷启动数据源(gateway 启动时预建),`sessionKeyToApiKey` 是运行时缓存(消息处理时按需写入)。** 两者解决不同阶段的问题,缺一不可。
|
|
166
|
+
|
|
167
|
+
---
|
|
168
|
+
|
|
169
|
+
## 关键模块说明
|
|
170
|
+
|
|
171
|
+
| 文件 | 职责 | 与 apiKey 体系的关系 |
|
|
172
|
+
|------|------|---------------------|
|
|
173
|
+
| `src/config.ts` | 配置解析 + apiKey 映射管理 | 定义 `setApiKeyMap`、`setSessionApiKey`、`resolveEffectiveApiKey` |
|
|
174
|
+
| `src/gateway.ts` | Socket.IO 连接生命周期管理 | 启动时调用 `resolveApiKeyIdentities` + `setApiKeyMap` 构建第1级映射 |
|
|
175
|
+
| `src/inbound.ts` | 入站消息处理 | 调用 `resolveEffectiveApiKey({ senderId })` 获取 apiKey,再调用 `setSessionApiKey` 写入第2级映射 |
|
|
176
|
+
| `src/upload-tool.ts` | 文件上传工具 | 调用 `resolveEffectiveApiKey({ sessionKey })` 获取 apiKey,传给 COS 上传 |
|
|
177
|
+
| `src/download-tool.ts` | 文件下载/转发工具 | 同上 |
|
|
178
|
+
| `src/file-storage.ts` | COS 文件存储封装 | 接收 `{ apiKey }` 参数,执行实际的 HTTP 上传/下载 |
|
|
179
|
+
|
|
180
|
+
### gateway.ts 中的 resolveApiKeyIdentities
|
|
181
|
+
|
|
182
|
+
```
|
|
183
|
+
对每个 apiKey 调用 /user/current,一次遍历完成:
|
|
184
|
+
- 提取每个 key 对应的 uin,构建 uin→apiKey 映射
|
|
185
|
+
- 从第一个成功的 key 中提取 botClientId(所有 key 共享同一个 bot)
|
|
186
|
+
- 容错:第一个 key 必须成功(否则无 botId,直接抛异常),后续 key 失败可降级跳过
|
|
187
|
+
- 总计 N 次 HTTP 请求,无重复调用
|
|
188
|
+
```
|
|
189
|
+
|
|
190
|
+
### inbound.ts 中的 mainSessionKey 安全约束
|
|
191
|
+
|
|
192
|
+
```typescript
|
|
193
|
+
// ⚠️ 只写入 per-channel-peer 的 sessionKey,不写入 mainSessionKey
|
|
194
|
+
// mainSessionKey(= "agent:main:main")是全局共享的,所有用户消息都会覆盖它,
|
|
195
|
+
// 导致最后一个用户的 apiKey 覆盖前一个用户,产生并发安全问题。
|
|
196
|
+
if (route?.sessionKey) {
|
|
197
|
+
setSessionApiKey(route.sessionKey, effectiveApiKey);
|
|
198
|
+
}
|
|
199
|
+
```
|
|
200
|
+
|
|
201
|
+
---
|
|
202
|
+
|
|
203
|
+
## 调试指南
|
|
204
|
+
|
|
205
|
+
### 查看 apiKey 选取日志
|
|
206
|
+
|
|
207
|
+
upload-tool 和 download-tool 中保留了 `log.warn` 级别的调试日志:
|
|
208
|
+
|
|
209
|
+
```
|
|
210
|
+
[lightclaw_upload_file] sessionKey="agent:main:lightclawbot:direct:12345", accountId="default"
|
|
211
|
+
[lightclaw_upload_file] resolved apiKey="key1abcd..."
|
|
212
|
+
```
|
|
213
|
+
|
|
214
|
+
这些日志在终端始终可见(warn 级别不会被框架过滤)。
|
|
215
|
+
|
|
216
|
+
### 框架日志级别说明
|
|
217
|
+
|
|
218
|
+
| 级别 | 终端可见性 | 适用场景 |
|
|
219
|
+
|------|-----------|---------|
|
|
220
|
+
| `log.debug` | 通常不可见 | 详细流程追踪 |
|
|
221
|
+
| `log.info` | 取决于配置 | 常规信息 |
|
|
222
|
+
| `log.warn` | **始终可见** | 调试关键路径、apiKey 选取 |
|
|
223
|
+
| `log.error` | **始终可见** | 错误 |
|
|
224
|
+
|
|
225
|
+
### apiKey 日志脱敏
|
|
226
|
+
|
|
227
|
+
所有日志中 apiKey 只打印前 8 位(如 `key1abcd...`),避免泄露完整密钥。
|
|
228
|
+
|
|
229
|
+
---
|
|
230
|
+
|
|
231
|
+
## 已知约束与注意事项
|
|
232
|
+
|
|
233
|
+
1. **dmScope 必须为 `per-channel-peer`**:确保每个用户有独立的 sessionKey,避免 `sessionKeyToApiKey` 并发覆盖。如果使用 `main`(默认值),所有用户共享同一个 sessionKey,多 key 模式会出问题。
|
|
234
|
+
|
|
235
|
+
2. **sessionKeyToApiKey 只增不减**:当前实现中没有过期清理机制。在活跃用户数有限的场景下不是问题。如果未来用户量极大,需考虑 LRU 或 TTL 淘汰策略。
|
|
236
|
+
|
|
237
|
+
3. **gateway 重启会重建 globalApiKeyMap**:`setApiKeyMap` 在每次 `startGateway` 时调用,会覆盖之前的映射。但 `sessionKeyToApiKey` 是累积的,重启后会被清空(模块级变量)。
|
|
238
|
+
|
|
239
|
+
4. **单 key 模式兼容**:当 `apiKeys` 只有一个元素时,`globalApiKeyMap` 只有一条记录,`resolveEffectiveApiKey` 最终都会 fallback 到 `globalDefaultApiKey`,行为与之前一致。
|
|
240
|
+
|
|
241
|
+
5. **环境变量兜底**:如果配置文件中没有 `apiKeys`,会尝试从 `LIGHTCLAW_API_KEY` 环境变量读取。
|
|
@@ -0,0 +1,94 @@
|
|
|
1
|
+
#!/bin/bash
|
|
2
|
+
|
|
3
|
+
# ========== lightclawbot 插件前置检查脚本 ==========
|
|
4
|
+
# 用途:快速判断 lightclawbot 插件是否可用
|
|
5
|
+
# 输出:最后一行固定为 RESULT:{...} JSON,供前端解析
|
|
6
|
+
# - 可用: RESULT:{"status":"ok","version":"x.y.z"}
|
|
7
|
+
# - 缺 openclaw: RESULT:{"status":"need_openclaw","reason":"..."}
|
|
8
|
+
# - 缺 lightclawbot:RESULT:{"status":"need_install","reason":"..."}
|
|
9
|
+
# - 缺 apiKey: RESULT:{"status":"need_apikey","reason":"apikeys_empty"}
|
|
10
|
+
#
|
|
11
|
+
# 使用方式:
|
|
12
|
+
# 本地执行: bash scripts/preflight.sh
|
|
13
|
+
# CDN 执行: bash <(curl -fsSL https://your-cdn.com/preflight.sh)
|
|
14
|
+
|
|
15
|
+
id="lightclawbot"
|
|
16
|
+
cfg="$HOME/.openclaw/openclaw.json"
|
|
17
|
+
plugin_dir="$HOME/.openclaw/extensions/${id}"
|
|
18
|
+
|
|
19
|
+
# ---------- 1. 检查 openclaw 是否可用 ----------
|
|
20
|
+
|
|
21
|
+
# 加载 nvm 环境(openclaw 可能依赖 nvm 管理的 node)
|
|
22
|
+
export NVM_DIR="$HOME/.nvm"
|
|
23
|
+
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
|
|
24
|
+
|
|
25
|
+
if ! command -v openclaw &>/dev/null; then
|
|
26
|
+
echo "RESULT:{\"status\":\"need_openclaw\",\"reason\":\"openclaw_not_found\"}"
|
|
27
|
+
exit 1
|
|
28
|
+
fi
|
|
29
|
+
|
|
30
|
+
# 验证 openclaw 可执行
|
|
31
|
+
# 已知输出格式:
|
|
32
|
+
# - OpenClaw 2026.3.8 (3caab92) (新版本,带前缀 + commit hash)
|
|
33
|
+
# - OpenClaw 2026.3.2 (带前缀,无 commit hash)
|
|
34
|
+
# - 2026.3.2 (旧版本,直接输出版本号,无前缀)
|
|
35
|
+
openclaw_output=$(openclaw -v 2>/dev/null || true)
|
|
36
|
+
if ! echo "$openclaw_output" | grep -qiE '(^OpenClaw[/ ])?[0-9]+\.[0-9]+'; then
|
|
37
|
+
echo "RESULT:{\"status\":\"need_openclaw\",\"reason\":\"openclaw_not_working\"}"
|
|
38
|
+
exit 1
|
|
39
|
+
fi
|
|
40
|
+
|
|
41
|
+
# ---------- 2. 检查配置文件是否存在 ----------
|
|
42
|
+
|
|
43
|
+
if [ ! -f "$cfg" ]; then
|
|
44
|
+
echo "RESULT:{\"status\":\"need_install\",\"reason\":\"config_not_found\"}"
|
|
45
|
+
exit 1
|
|
46
|
+
fi
|
|
47
|
+
|
|
48
|
+
# ---------- 3. 检查插件是否已安装(目录 + package.json) ----------
|
|
49
|
+
|
|
50
|
+
if [ ! -d "$plugin_dir" ] || [ ! -f "$plugin_dir/package.json" ]; then
|
|
51
|
+
echo "RESULT:{\"status\":\"need_install\",\"reason\":\"plugin_not_installed\"}"
|
|
52
|
+
exit 1
|
|
53
|
+
fi
|
|
54
|
+
|
|
55
|
+
# ---------- 4. 检查配置文件中插件注册是否完整 ----------
|
|
56
|
+
|
|
57
|
+
# 需要 jq 来解析 JSON
|
|
58
|
+
if ! command -v jq &>/dev/null; then
|
|
59
|
+
echo "RESULT:{\"status\":\"need_install\",\"reason\":\"jq_not_found\"}"
|
|
60
|
+
exit 1
|
|
61
|
+
fi
|
|
62
|
+
|
|
63
|
+
# 4a. plugins.entries 中是否存在且 enabled
|
|
64
|
+
plugin_enabled=$(jq -r ".plugins.entries.\"${id}\".enabled // false" "$cfg" 2>/dev/null)
|
|
65
|
+
if [ "$plugin_enabled" != "true" ]; then
|
|
66
|
+
echo "RESULT:{\"status\":\"need_install\",\"reason\":\"plugin_not_enabled\"}"
|
|
67
|
+
exit 1
|
|
68
|
+
fi
|
|
69
|
+
|
|
70
|
+
# 4b. plugins.installs 中是否有安装记录
|
|
71
|
+
if ! jq -e ".plugins.installs.\"${id}\"" "$cfg" > /dev/null 2>&1; then
|
|
72
|
+
echo "RESULT:{\"status\":\"need_install\",\"reason\":\"plugin_install_record_missing\"}"
|
|
73
|
+
exit 1
|
|
74
|
+
fi
|
|
75
|
+
|
|
76
|
+
# 4c. channels 中是否配置且 enabled
|
|
77
|
+
channel_enabled=$(jq -r ".channels.\"${id}\".enabled // false" "$cfg" 2>/dev/null)
|
|
78
|
+
if [ "$channel_enabled" != "true" ]; then
|
|
79
|
+
echo "RESULT:{\"status\":\"need_install\",\"reason\":\"channel_not_enabled\"}"
|
|
80
|
+
exit 1
|
|
81
|
+
fi
|
|
82
|
+
|
|
83
|
+
# 4d. channels 中 apiKeys 是否配置且非空
|
|
84
|
+
apikeys_count=$(jq -r ".channels.\"${id}\".apiKeys // [] | length" "$cfg" 2>/dev/null)
|
|
85
|
+
if [ "$apikeys_count" = "0" ] || [ -z "$apikeys_count" ]; then
|
|
86
|
+
echo "RESULT:{\"status\":\"need_install\",\"reason\":\"apikeys_empty\"}"
|
|
87
|
+
exit 1
|
|
88
|
+
fi
|
|
89
|
+
|
|
90
|
+
# ---------- 5. 全部通过,插件可用 ----------
|
|
91
|
+
|
|
92
|
+
version=$(jq -r '.version // "unknown"' "$plugin_dir/package.json")
|
|
93
|
+
echo "RESULT:{\"status\":\"ok\",\"version\":\"${version}\"}"
|
|
94
|
+
exit 0
|
|
@@ -0,0 +1,94 @@
|
|
|
1
|
+
#!/bin/bash
|
|
2
|
+
|
|
3
|
+
# ========== lightclawbot 插件前置检查脚本 ==========
|
|
4
|
+
# 用途:快速判断 lightclawbot 插件是否可用
|
|
5
|
+
# 输出:最后一行固定为 RESULT:{...} JSON,供前端解析
|
|
6
|
+
# - 可用: RESULT:{"status":"ok","version":"x.y.z"}
|
|
7
|
+
# - 缺 openclaw: RESULT:{"status":"need_openclaw","reason":"..."}
|
|
8
|
+
# - 缺 lightclawbot:RESULT:{"status":"need_install","reason":"..."}
|
|
9
|
+
# - 缺 apiKey: RESULT:{"status":"need_apikey","reason":"apikeys_empty"}
|
|
10
|
+
#
|
|
11
|
+
# 使用方式:
|
|
12
|
+
# 本地执行: bash scripts/preflight.sh
|
|
13
|
+
# CDN 执行: bash <(curl -fsSL https://your-cdn.com/preflight.sh)
|
|
14
|
+
|
|
15
|
+
id="lightclawbot"
|
|
16
|
+
cfg="$HOME/.openclaw/openclaw.json"
|
|
17
|
+
plugin_dir="$HOME/.openclaw/extensions/${id}"
|
|
18
|
+
|
|
19
|
+
# ---------- 1. 检查 openclaw 是否可用 ----------
|
|
20
|
+
|
|
21
|
+
# 加载 nvm 环境(openclaw 可能依赖 nvm 管理的 node)
|
|
22
|
+
export NVM_DIR="$HOME/.nvm"
|
|
23
|
+
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
|
|
24
|
+
|
|
25
|
+
if ! command -v openclaw &>/dev/null; then
|
|
26
|
+
echo "RESULT:{\"status\":\"need_openclaw\",\"reason\":\"openclaw_not_found\"}"
|
|
27
|
+
exit 1
|
|
28
|
+
fi
|
|
29
|
+
|
|
30
|
+
# 验证 openclaw 可执行
|
|
31
|
+
# 已知输出格式:
|
|
32
|
+
# - OpenClaw 2026.3.8 (3caab92) (新版本,带前缀 + commit hash)
|
|
33
|
+
# - OpenClaw 2026.3.2 (带前缀,无 commit hash)
|
|
34
|
+
# - 2026.3.2 (旧版本,直接输出版本号,无前缀)
|
|
35
|
+
openclaw_output=$(openclaw -v 2>/dev/null || true)
|
|
36
|
+
if ! echo "$openclaw_output" | grep -qiE '(^OpenClaw[/ ])?[0-9]+\.[0-9]+'; then
|
|
37
|
+
echo "RESULT:{\"status\":\"need_openclaw\",\"reason\":\"openclaw_not_working\"}"
|
|
38
|
+
exit 1
|
|
39
|
+
fi
|
|
40
|
+
|
|
41
|
+
# ---------- 2. 检查配置文件是否存在 ----------
|
|
42
|
+
|
|
43
|
+
if [ ! -f "$cfg" ]; then
|
|
44
|
+
echo "RESULT:{\"status\":\"need_install\",\"reason\":\"config_not_found\"}"
|
|
45
|
+
exit 1
|
|
46
|
+
fi
|
|
47
|
+
|
|
48
|
+
# ---------- 3. 检查插件是否已安装(目录 + package.json) ----------
|
|
49
|
+
|
|
50
|
+
if [ ! -d "$plugin_dir" ] || [ ! -f "$plugin_dir/package.json" ]; then
|
|
51
|
+
echo "RESULT:{\"status\":\"need_install\",\"reason\":\"plugin_not_installed\"}"
|
|
52
|
+
exit 1
|
|
53
|
+
fi
|
|
54
|
+
|
|
55
|
+
# ---------- 4. 检查配置文件中插件注册是否完整 ----------
|
|
56
|
+
|
|
57
|
+
# 需要 jq 来解析 JSON
|
|
58
|
+
if ! command -v jq &>/dev/null; then
|
|
59
|
+
echo "RESULT:{\"status\":\"need_install\",\"reason\":\"jq_not_found\"}"
|
|
60
|
+
exit 1
|
|
61
|
+
fi
|
|
62
|
+
|
|
63
|
+
# 4a. plugins.entries 中是否存在且 enabled
|
|
64
|
+
plugin_enabled=$(jq -r ".plugins.entries.\"${id}\".enabled // false" "$cfg" 2>/dev/null)
|
|
65
|
+
if [ "$plugin_enabled" != "true" ]; then
|
|
66
|
+
echo "RESULT:{\"status\":\"need_install\",\"reason\":\"plugin_not_enabled\"}"
|
|
67
|
+
exit 1
|
|
68
|
+
fi
|
|
69
|
+
|
|
70
|
+
# 4b. plugins.installs 中是否有安装记录
|
|
71
|
+
if ! jq -e ".plugins.installs.\"${id}\"" "$cfg" > /dev/null 2>&1; then
|
|
72
|
+
echo "RESULT:{\"status\":\"need_install\",\"reason\":\"plugin_install_record_missing\"}"
|
|
73
|
+
exit 1
|
|
74
|
+
fi
|
|
75
|
+
|
|
76
|
+
# 4c. channels 中是否配置且 enabled
|
|
77
|
+
channel_enabled=$(jq -r ".channels.\"${id}\".enabled // false" "$cfg" 2>/dev/null)
|
|
78
|
+
if [ "$channel_enabled" != "true" ]; then
|
|
79
|
+
echo "RESULT:{\"status\":\"need_install\",\"reason\":\"channel_not_enabled\"}"
|
|
80
|
+
exit 1
|
|
81
|
+
fi
|
|
82
|
+
|
|
83
|
+
# 4d. channels 中 apiKeys 是否配置且非空
|
|
84
|
+
apikeys_count=$(jq -r ".channels.\"${id}\".apiKeys // [] | length" "$cfg" 2>/dev/null)
|
|
85
|
+
if [ "$apikeys_count" = "0" ] || [ -z "$apikeys_count" ]; then
|
|
86
|
+
echo "RESULT:{\"status\":\"need_install\",\"reason\":\"apikeys_empty\"}"
|
|
87
|
+
exit 1
|
|
88
|
+
fi
|
|
89
|
+
|
|
90
|
+
# ---------- 5. 全部通过,插件可用 ----------
|
|
91
|
+
|
|
92
|
+
version=$(jq -r '.version // "unknown"' "$plugin_dir/package.json")
|
|
93
|
+
echo "RESULT:{\"status\":\"ok\",\"version\":\"${version}\"}"
|
|
94
|
+
exit 0
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"channel.d.ts","sourceRoot":"","sources":["../../src/channel.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,KAAK,aAAa,EAKnB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAqC3D,eAAO,MAAM,iBAAiB,EAAE,aAAa,CAAC,wBAAwB,
|
|
1
|
+
{"version":3,"file":"channel.d.ts","sourceRoot":"","sources":["../../src/channel.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,KAAK,aAAa,EAKnB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAqC3D,eAAO,MAAM,iBAAiB,EAAE,aAAa,CAAC,wBAAwB,CAqQrE,CAAC"}
|
package/dist/src/channel.js
CHANGED
|
@@ -71,14 +71,14 @@ export const myAssistantPlugin = {
|
|
|
71
71
|
cfg,
|
|
72
72
|
sectionKey: CHANNEL_KEY,
|
|
73
73
|
accountId,
|
|
74
|
-
clearBaseFields: ["
|
|
74
|
+
clearBaseFields: ["apiKeys", "apiBaseUrl", "name"],
|
|
75
75
|
}),
|
|
76
|
-
isConfigured: (account) => Boolean(account?.
|
|
76
|
+
isConfigured: (account) => Boolean(account?.allApiKeys?.length),
|
|
77
77
|
describeAccount: (account) => ({
|
|
78
78
|
accountId: account?.accountId ?? DEFAULT_ACCOUNT_ID,
|
|
79
79
|
name: account?.name,
|
|
80
80
|
enabled: account?.enabled ?? false,
|
|
81
|
-
configured: Boolean(account?.
|
|
81
|
+
configured: Boolean(account?.allApiKeys?.length),
|
|
82
82
|
tokenSource: account?.secretSource,
|
|
83
83
|
}),
|
|
84
84
|
resolveAllowFrom: ({ cfg, accountId }) => {
|
|
@@ -105,24 +105,41 @@ export const myAssistantPlugin = {
|
|
|
105
105
|
},
|
|
106
106
|
},
|
|
107
107
|
// ---- 消息目标解析 ----
|
|
108
|
+
// 使用标准 user:/channel: 前缀,确保框架的 detectTargetKind 能正确识别 peer kind
|
|
108
109
|
messaging: {
|
|
109
110
|
normalizeTarget: (target) => {
|
|
111
|
+
// 剥离通道名前缀 (lightclawbot:)
|
|
110
112
|
const cleaned = target.replace(new RegExp(`^${CHANNEL_KEY}:`, "i"), "");
|
|
111
113
|
if (!cleaned)
|
|
112
114
|
return undefined;
|
|
113
|
-
//
|
|
114
|
-
if (cleaned.startsWith("dm:")
|
|
115
|
-
return
|
|
115
|
+
// dm:xxx → user:xxx (私聊)
|
|
116
|
+
if (cleaned.startsWith("dm:")) {
|
|
117
|
+
return `user:${cleaned.slice(3)}`;
|
|
116
118
|
}
|
|
117
|
-
//
|
|
118
|
-
|
|
119
|
+
// group:xxx → channel:xxx (群聊)
|
|
120
|
+
if (cleaned.startsWith("group:")) {
|
|
121
|
+
return `channel:${cleaned.slice(6)}`;
|
|
122
|
+
}
|
|
123
|
+
// 已经是标准格式 user:/channel:,原样返回
|
|
124
|
+
if (/^(user|channel):/i.test(cleaned)) {
|
|
125
|
+
return cleaned;
|
|
126
|
+
}
|
|
127
|
+
// 纯 ID,默认当作私聊
|
|
128
|
+
return `user:${cleaned}`;
|
|
119
129
|
},
|
|
120
130
|
targetResolver: {
|
|
121
|
-
looksLikeId: (id) => {
|
|
122
|
-
const
|
|
123
|
-
|
|
131
|
+
looksLikeId: (id, normalized) => {
|
|
132
|
+
const value = (normalized ?? id).trim();
|
|
133
|
+
if (!value)
|
|
134
|
+
return false;
|
|
135
|
+
// 标准前缀格式
|
|
136
|
+
if (/^(user|channel):/i.test(value))
|
|
137
|
+
return true;
|
|
138
|
+
// lightclawbot 自有格式
|
|
139
|
+
const cleaned = value.replace(new RegExp(`^${CHANNEL_KEY}:`, "i"), "");
|
|
140
|
+
return /^(dm|group):\d+/.test(cleaned) || /^\d+$/.test(cleaned);
|
|
124
141
|
},
|
|
125
|
-
hint:
|
|
142
|
+
hint: `user:<userId> or channel:<groupId>`,
|
|
126
143
|
},
|
|
127
144
|
},
|
|
128
145
|
// ---- 出站消息适配器 ----
|
|
@@ -210,13 +227,13 @@ export const myAssistantPlugin = {
|
|
|
210
227
|
const section = nextCfg.channels?.[CHANNEL_KEY];
|
|
211
228
|
let cleared = false;
|
|
212
229
|
if (section) {
|
|
213
|
-
if (accountId === DEFAULT_ACCOUNT_ID && section.
|
|
214
|
-
delete section.
|
|
230
|
+
if (accountId === DEFAULT_ACCOUNT_ID && section.apiKeys) {
|
|
231
|
+
delete section.apiKeys;
|
|
215
232
|
cleared = true;
|
|
216
233
|
}
|
|
217
234
|
const accounts = section.accounts;
|
|
218
|
-
if (accounts?.[accountId]?.
|
|
219
|
-
delete accounts[accountId].
|
|
235
|
+
if (accounts?.[accountId]?.apiKeys) {
|
|
236
|
+
delete accounts[accountId].apiKeys;
|
|
220
237
|
cleared = true;
|
|
221
238
|
}
|
|
222
239
|
}
|
|
@@ -243,7 +260,7 @@ export const myAssistantPlugin = {
|
|
|
243
260
|
accountId: account?.accountId ?? DEFAULT_ACCOUNT_ID,
|
|
244
261
|
name: account?.name,
|
|
245
262
|
enabled: account?.enabled ?? false,
|
|
246
|
-
configured: Boolean(account?.
|
|
263
|
+
configured: Boolean(account?.allApiKeys?.length),
|
|
247
264
|
tokenSource: account?.secretSource,
|
|
248
265
|
running: runtime?.running ?? false,
|
|
249
266
|
connected: runtime?.connected ?? false,
|
package/dist/src/channel.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"channel.js","sourceRoot":"","sources":["../../src/channel.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"channel.js","sourceRoot":"","sources":["../../src/channel.ts"],"names":[],"mappings":"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"}
|
package/dist/src/config.d.ts
CHANGED
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
* ```json
|
|
9
9
|
"channels": {
|
|
10
10
|
"lightclawbot": {
|
|
11
|
-
"
|
|
11
|
+
"apiKeys": ["key-1", "key-2"],
|
|
12
12
|
"enabled": true
|
|
13
13
|
}
|
|
14
14
|
}
|
|
@@ -19,13 +19,13 @@ import type { AssistantAccountConfig, ResolvedAssistantAccount } from "./types.j
|
|
|
19
19
|
export declare const CHANNEL_KEY = "lightclawbot";
|
|
20
20
|
export declare const DEFAULT_ACCOUNT_ID = "default";
|
|
21
21
|
/** 核心服务域名 */
|
|
22
|
-
export declare const DOMAIN = "lightai.
|
|
22
|
+
export declare const DOMAIN = "lightai.cloud.tencent.com";
|
|
23
23
|
/** WebSocket 连接地址 */
|
|
24
|
-
export declare const WS_URL = "wss://lightai.
|
|
24
|
+
export declare const WS_URL = "wss://lightai.cloud.tencent.com";
|
|
25
25
|
/** HTTP API 基础地址 */
|
|
26
|
-
export declare const API_BASE_URL = "https://lightai.
|
|
26
|
+
export declare const API_BASE_URL = "https://lightai.cloud.tencent.com";
|
|
27
27
|
/** COS 相关配置 */
|
|
28
|
-
export declare const COS_BASE_URL = "https://lightai.
|
|
28
|
+
export declare const COS_BASE_URL = "https://lightai.cloud.tencent.com";
|
|
29
29
|
/** Socket.IO 连接路径 */
|
|
30
30
|
export declare const SOCKET_PATH = "/claw-socket";
|
|
31
31
|
/** Socket.IO 重连策略 */
|
|
@@ -36,6 +36,39 @@ export declare const SOCKET_RECONNECTION_ATTEMPTS: number;
|
|
|
36
36
|
export declare const X_PRODUCT = "channel";
|
|
37
37
|
/** 构建通用认证 headers */
|
|
38
38
|
export declare function buildAuthHeaders(apiKey: string): Record<string, string>;
|
|
39
|
+
/** WS 多 key 认证 headers(authorizations 为 JSON 数组字符串,不带 Bearer) */
|
|
40
|
+
export declare function buildMultiAuthHeaders(apiKeys: string[]): Record<string, string | string[]>;
|
|
41
|
+
/** 设置 apiKeyMap(gateway 启动时调用) */
|
|
42
|
+
export declare function setApiKeyMap(map: Map<string, string>, defaultApiKey: string): void;
|
|
43
|
+
/** 记录 sessionKey → apiKey 映射(inbound 处理消息时调用) */
|
|
44
|
+
export declare function setSessionApiKey(sessionKey: string, apiKey: string): void;
|
|
45
|
+
/**
|
|
46
|
+
* 统一的 apiKey 解析入口。
|
|
47
|
+
*
|
|
48
|
+
* 优先级:
|
|
49
|
+
* 1. sessionKey → 直查 sessionKeyToApiKey 映射
|
|
50
|
+
* 2. senderId (uin) → 直查 globalApiKeyMap
|
|
51
|
+
* 3. sessionKey 中解析 uin → 再查 globalApiKeyMap(兜底)
|
|
52
|
+
* 4. globalDefaultApiKey
|
|
53
|
+
*
|
|
54
|
+
* 全链路统一使用此函数获取 apiKey,避免 inbound / tool 各自维护不同的获取逻辑。
|
|
55
|
+
*/
|
|
56
|
+
export declare function resolveEffectiveApiKey(params: {
|
|
57
|
+
sessionKey?: string;
|
|
58
|
+
senderId?: string;
|
|
59
|
+
}): string;
|
|
60
|
+
/**
|
|
61
|
+
* 从 sessionKey 中提取 uin(peer ID)。
|
|
62
|
+
*
|
|
63
|
+
* 框架生成的 sessionKey 格式取决于 dmScope 配置:
|
|
64
|
+
* - per-channel-peer: "agent:<agentId>:<channel>:direct:<peerId>"
|
|
65
|
+
* - per-account-channel-peer: "agent:<agentId>:<channel>:<accountId>:direct:<peerId>"
|
|
66
|
+
* - per-peer: "agent:<agentId>:direct:<peerId>"
|
|
67
|
+
* - main (默认): "agent:<agentId>:main" ← 不含 peerId
|
|
68
|
+
*
|
|
69
|
+
* 也兼容旧格式 "lightclawbot:dm:<peerId>"。
|
|
70
|
+
*/
|
|
71
|
+
export declare function extractUinFromSessionKey(sessionKey: string): string | undefined;
|
|
39
72
|
/** 获取当前用户信息(用于提取 botId) */
|
|
40
73
|
export declare const API_PATH_USER_CURRENT = "/user/current";
|
|
41
74
|
/** COS 文件上传接口 */
|