@qqvu/openclaw-channel 1.0.8 → 1.0.10
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/dist/api-client.d.ts +6 -34
- package/dist/api-client.d.ts.map +1 -1
- package/dist/api-client.js +56 -100
- package/dist/api-client.js.map +1 -1
- package/dist/channel.js +3 -3
- package/dist/channel.js.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +73 -187
- package/dist/index.js.map +1 -1
- package/dist/types.d.ts +8 -15
- package/dist/types.d.ts.map +1 -1
- package/dist/websocket-client.d.ts +1 -1
- package/dist/websocket-client.d.ts.map +1 -1
- package/dist/websocket-client.js +1 -1
- package/dist/websocket-client.js.map +1 -1
- package/openclaw.plugin.json +6 -4
- package/package.json +3 -3
package/dist/api-client.d.ts
CHANGED
|
@@ -6,38 +6,14 @@ import type { PufferfishAccount, SendMessageRequest, SendMessageResponse } from
|
|
|
6
6
|
export declare class PufferfishAPIClient {
|
|
7
7
|
private baseURL;
|
|
8
8
|
private token;
|
|
9
|
-
private privateKey?;
|
|
10
9
|
private botUserId;
|
|
11
10
|
constructor(account: PufferfishAccount);
|
|
12
|
-
/**
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
requestGlobalToken(workerId: string, apiKey: string): Promise<{
|
|
19
|
-
token: string;
|
|
20
|
-
expiresAt: number;
|
|
21
|
-
}>;
|
|
22
|
-
/**
|
|
23
|
-
* 刷新全局 Token
|
|
24
|
-
* @param workerId OpenClaw 实例唯一标识
|
|
25
|
-
* @param accessToken 旧的 token
|
|
26
|
-
* @returns 返回新 token 和过期时间
|
|
27
|
-
*/
|
|
28
|
-
refreshGlobalToken(workerId: string, accessToken: string): Promise<{
|
|
29
|
-
token: string;
|
|
30
|
-
expiresAt: number;
|
|
31
|
-
}>;
|
|
32
|
-
/**
|
|
33
|
-
* 自动发现当前用户可用的机器人账号配置
|
|
34
|
-
* @param globalToken 全局 Token(从 requestGlobalToken 获取)
|
|
35
|
-
* @param options 可选参数
|
|
36
|
-
*/
|
|
37
|
-
discoverAccounts(globalToken: string, options?: {
|
|
38
|
-
workerId?: string;
|
|
39
|
-
leaseSeconds?: number;
|
|
40
|
-
}): Promise<PufferfishAccount[]>;
|
|
11
|
+
/** 兼容 apiUrl 为 https://host/v1/ */
|
|
12
|
+
static normalizeBaseUrl(apiUrl: string): string;
|
|
13
|
+
/** 反代 TLS 终止时,服务端可能返回 ws://;若 apiUrl 是 https://,这里自动提升为 wss://。 */
|
|
14
|
+
static normalizeWsUrl(apiUrl: string, wsUrl: string): string;
|
|
15
|
+
/** POST /v1/ai-bot/connect(challenge + privateKey 签名换取运行 token) */
|
|
16
|
+
static connectBot(apiUrl: string, botUid: string, privateKeyPem: string): Promise<PufferfishAccount>;
|
|
41
17
|
/**
|
|
42
18
|
* 发送消息到 Pufferfish
|
|
43
19
|
*/
|
|
@@ -60,10 +36,6 @@ export declare class PufferfishAPIClient {
|
|
|
60
36
|
* 下载文件
|
|
61
37
|
*/
|
|
62
38
|
downloadFile(url: string): Promise<Buffer>;
|
|
63
|
-
/**
|
|
64
|
-
* 请求签名(ECDSA)
|
|
65
|
-
*/
|
|
66
|
-
private signRequest;
|
|
67
39
|
private accountBotId;
|
|
68
40
|
/**
|
|
69
41
|
* 将 OpenClaw 的出站消息封装为 Pufferfish 客户端可解析的 MessageContent(base64(json))。
|
package/dist/api-client.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-client.d.ts","sourceRoot":"","sources":["../src/api-client.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"api-client.d.ts","sourceRoot":"","sources":["../src/api-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAG7F;;;GAGG;AACH,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,SAAS,CAAS;gBAEd,OAAO,EAAE,iBAAiB;IAMtC,mCAAmC;IACnC,MAAM,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAM/C,mEAAmE;IACnE,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;IAU5D,mEAAmE;WACtD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IA6D1G;;OAEG;IACG,WAAW,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IA8B3E;;;OAGG;IACG,iBAAiB,CAAC,MAAM,EAAE;QAC9B,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,EAAE,MAAM,CAAC;QAChB,QAAQ,EAAE,OAAO,CAAC;QAClB,SAAS,EAAE,OAAO,CAAC;KACpB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IA+BhC;;OAEG;IACG,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IA8BrE;;OAEG;IACG,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAShD,OAAO,CAAC,YAAY;IAIpB;;;;;OAKG;IACH,OAAO,CAAC,oBAAoB;IA6B5B,OAAO,CAAC,WAAW;CAQpB"}
|
package/dist/api-client.js
CHANGED
|
@@ -6,102 +6,76 @@ import crypto from 'crypto';
|
|
|
6
6
|
export class PufferfishAPIClient {
|
|
7
7
|
baseURL; // API 基础URL
|
|
8
8
|
token; // JWT 认证令牌
|
|
9
|
-
privateKey; // ECDSA 私钥(用于签名)
|
|
10
9
|
botUserId; // 机器人用户ID
|
|
11
10
|
constructor(account) {
|
|
12
|
-
|
|
13
|
-
// 统一把 baseURL 规范化为不带尾部斜杠、且不带末尾 /v1
|
|
14
|
-
let url = String(account.apiUrl ?? '').trim().replace(/\/+$/, '');
|
|
15
|
-
if (url.endsWith('/v1'))
|
|
16
|
-
url = url.slice(0, -3);
|
|
17
|
-
this.baseURL = url;
|
|
11
|
+
this.baseURL = PufferfishAPIClient.normalizeBaseUrl(account.apiUrl);
|
|
18
12
|
this.token = account.token;
|
|
19
|
-
this.privateKey = account.privateKey;
|
|
20
13
|
this.botUserId = account.botUserId ?? 0;
|
|
21
14
|
}
|
|
22
|
-
/**
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
async requestGlobalToken(workerId, apiKey) {
|
|
29
|
-
const response = await fetch(`${this.baseURL}/v1/ai-bot/auth/request-token`, {
|
|
30
|
-
method: 'POST',
|
|
31
|
-
headers: {
|
|
32
|
-
'Content-Type': 'application/json',
|
|
33
|
-
},
|
|
34
|
-
body: JSON.stringify({ workerId, apiKey }),
|
|
35
|
-
});
|
|
36
|
-
if (!response.ok) {
|
|
37
|
-
const text = await response.text();
|
|
38
|
-
throw new Error(`请求全局 Token 失败: ${response.status} ${text}`);
|
|
39
|
-
}
|
|
40
|
-
const data = await response.json();
|
|
41
|
-
return {
|
|
42
|
-
token: data.accessToken,
|
|
43
|
-
expiresAt: data.expiresAt,
|
|
44
|
-
};
|
|
15
|
+
/** 兼容 apiUrl 为 https://host/v1/ */
|
|
16
|
+
static normalizeBaseUrl(apiUrl) {
|
|
17
|
+
let url = String(apiUrl ?? '').trim().replace(/\/+$/, '');
|
|
18
|
+
if (url.endsWith('/v1'))
|
|
19
|
+
url = url.slice(0, -3);
|
|
20
|
+
return url;
|
|
45
21
|
}
|
|
46
|
-
/**
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
22
|
+
/** 反代 TLS 终止时,服务端可能返回 ws://;若 apiUrl 是 https://,这里自动提升为 wss://。 */
|
|
23
|
+
static normalizeWsUrl(apiUrl, wsUrl) {
|
|
24
|
+
const api = String(apiUrl ?? '').trim();
|
|
25
|
+
const ws = String(wsUrl ?? '').trim();
|
|
26
|
+
if (!api || !ws)
|
|
27
|
+
return ws;
|
|
28
|
+
if (api.toLowerCase().startsWith('https://') && ws.toLowerCase().startsWith('ws://')) {
|
|
29
|
+
return `wss://${ws.slice('ws://'.length)}`;
|
|
30
|
+
}
|
|
31
|
+
return ws;
|
|
32
|
+
}
|
|
33
|
+
/** POST /v1/ai-bot/connect(challenge + privateKey 签名换取运行 token) */
|
|
34
|
+
static async connectBot(apiUrl, botUid, privateKeyPem) {
|
|
35
|
+
const base = PufferfishAPIClient.normalizeBaseUrl(apiUrl);
|
|
36
|
+
const challengeResp = await fetch(`${base}/v1/ai-bot/connect/challenge`, {
|
|
54
37
|
method: 'POST',
|
|
55
|
-
headers: {
|
|
56
|
-
|
|
57
|
-
},
|
|
58
|
-
body: JSON.stringify({ workerId, accessToken }),
|
|
38
|
+
headers: { 'Content-Type': 'application/json' },
|
|
39
|
+
body: JSON.stringify({ botUid }),
|
|
59
40
|
});
|
|
60
|
-
if (!
|
|
61
|
-
const text = await
|
|
62
|
-
throw new Error(
|
|
63
|
-
}
|
|
64
|
-
const
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
const
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
params.set('lease_seconds', String(options.leaseSeconds));
|
|
81
|
-
}
|
|
82
|
-
const query = params.toString();
|
|
83
|
-
const url = `${this.baseURL}/v1/ai-bot/discovery${query ? `?${query}` : ''}`;
|
|
84
|
-
const response = await fetch(url, {
|
|
85
|
-
method: 'GET',
|
|
86
|
-
headers: {
|
|
87
|
-
'X-Global-Token': globalToken, // 使用全局 Token
|
|
88
|
-
},
|
|
41
|
+
if (!challengeResp.ok) {
|
|
42
|
+
const text = await challengeResp.text().catch(() => '');
|
|
43
|
+
throw new Error(`connect challenge 失败: ${challengeResp.status} ${text}`);
|
|
44
|
+
}
|
|
45
|
+
const challenge = await challengeResp.json();
|
|
46
|
+
const challengeId = String(challenge.challengeId ?? '').trim();
|
|
47
|
+
const nonceB64 = String(challenge.nonce ?? '').trim();
|
|
48
|
+
if (!challengeId || !nonceB64) {
|
|
49
|
+
throw new Error(`connect challenge 返回异常: ${JSON.stringify(challenge)}`);
|
|
50
|
+
}
|
|
51
|
+
const nonceBytes = Buffer.from(nonceB64, 'base64');
|
|
52
|
+
if (!nonceBytes.length) {
|
|
53
|
+
throw new Error('connect challenge nonce 解析失败');
|
|
54
|
+
}
|
|
55
|
+
const key = crypto.createPrivateKey(privateKeyPem);
|
|
56
|
+
const signature = crypto.sign(null, nonceBytes, key).toString('base64');
|
|
57
|
+
const response = await fetch(`${base}/v1/ai-bot/connect`, {
|
|
58
|
+
method: 'POST',
|
|
59
|
+
headers: { 'Content-Type': 'application/json' },
|
|
60
|
+
body: JSON.stringify({ botUid, challengeId, signature }),
|
|
89
61
|
});
|
|
90
62
|
if (!response.ok) {
|
|
91
63
|
const text = await response.text().catch(() => '');
|
|
92
|
-
throw new Error(`
|
|
64
|
+
throw new Error(`connect 失败: ${response.status} ${text}`);
|
|
93
65
|
}
|
|
94
66
|
const data = await response.json();
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
67
|
+
if (!data.enabled || !data.apiUrl || !data.wsUrl || !data.botUserId || !data.token) {
|
|
68
|
+
throw new Error(`connect 返回异常: ${JSON.stringify(data)}`);
|
|
69
|
+
}
|
|
70
|
+
return {
|
|
71
|
+
accountId: data.accountId ?? botUid,
|
|
99
72
|
enabled: true,
|
|
100
|
-
apiUrl:
|
|
101
|
-
wsUrl:
|
|
102
|
-
botUserId: Number(
|
|
103
|
-
|
|
104
|
-
|
|
73
|
+
apiUrl: data.apiUrl,
|
|
74
|
+
wsUrl: PufferfishAPIClient.normalizeWsUrl(data.apiUrl, data.wsUrl),
|
|
75
|
+
botUserId: Number(data.botUserId),
|
|
76
|
+
botUid: data.botUid ?? botUid,
|
|
77
|
+
token: data.token,
|
|
78
|
+
};
|
|
105
79
|
}
|
|
106
80
|
/**
|
|
107
81
|
* 发送消息到 Pufferfish
|
|
@@ -120,10 +94,6 @@ export class PufferfishAPIClient {
|
|
|
120
94
|
metadata: this.toStringMap(params.metadata),
|
|
121
95
|
});
|
|
122
96
|
const headers = { 'Content-Type': 'application/json' };
|
|
123
|
-
// 如果配置了私钥,添加签名
|
|
124
|
-
if (this.privateKey) {
|
|
125
|
-
headers['X-Signature'] = this.signRequest(body);
|
|
126
|
-
}
|
|
127
97
|
const response = await fetch(`${this.baseURL}/v1.AIBot/BotSendMessage`, {
|
|
128
98
|
method: 'POST',
|
|
129
99
|
headers,
|
|
@@ -154,9 +124,6 @@ export class PufferfishAPIClient {
|
|
|
154
124
|
},
|
|
155
125
|
});
|
|
156
126
|
const headers = { 'Content-Type': 'application/json' };
|
|
157
|
-
if (this.privateKey) {
|
|
158
|
-
headers['X-Signature'] = this.signRequest(body);
|
|
159
|
-
}
|
|
160
127
|
const response = await fetch(`${this.baseURL}/v1.AIBot/BotSendMessage`, {
|
|
161
128
|
method: 'POST',
|
|
162
129
|
headers,
|
|
@@ -205,17 +172,6 @@ export class PufferfishAPIClient {
|
|
|
205
172
|
const arrayBuffer = await response.arrayBuffer();
|
|
206
173
|
return Buffer.from(arrayBuffer);
|
|
207
174
|
}
|
|
208
|
-
/**
|
|
209
|
-
* 请求签名(ECDSA)
|
|
210
|
-
*/
|
|
211
|
-
signRequest(body) {
|
|
212
|
-
if (!this.privateKey) {
|
|
213
|
-
return '';
|
|
214
|
-
}
|
|
215
|
-
const sign = crypto.createSign('SHA256');
|
|
216
|
-
sign.update(body);
|
|
217
|
-
return sign.sign(this.privateKey, 'base64');
|
|
218
|
-
}
|
|
219
175
|
accountBotId() {
|
|
220
176
|
return this.botUserId;
|
|
221
177
|
}
|
package/dist/api-client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-client.js","sourceRoot":"","sources":["../src/api-client.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"api-client.js","sourceRoot":"","sources":["../src/api-client.ts"],"names":[],"mappings":"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"}
|
package/dist/channel.js
CHANGED
|
@@ -35,15 +35,15 @@ function resolvePufferfishAccountFromConfig(cfg, accountId) {
|
|
|
35
35
|
if (runtime) {
|
|
36
36
|
return runtime;
|
|
37
37
|
}
|
|
38
|
-
const account = cfg.channels?.pufferfish?.accounts?.[accountId ?? 'default'];
|
|
38
|
+
const account = cfg.channels?.pufferfish?.bots?.[accountId ?? 'default'] ?? cfg.channels?.pufferfish?.accounts?.[accountId ?? 'default'];
|
|
39
39
|
return {
|
|
40
40
|
accountId: accountId ?? 'default',
|
|
41
41
|
enabled: account?.enabled ?? true,
|
|
42
42
|
apiUrl: account?.apiUrl ?? 'http://localhost:8080',
|
|
43
43
|
wsUrl: account?.wsUrl ?? 'ws://localhost:8080/v1/ai-bot/ws',
|
|
44
44
|
botUserId: account?.botUserId ?? 0,
|
|
45
|
+
botUid: typeof account?.botUid === 'string' ? account.botUid : accountId ?? 'default',
|
|
45
46
|
token: account?.token ?? '',
|
|
46
|
-
privateKey: account?.privateKey,
|
|
47
47
|
};
|
|
48
48
|
}
|
|
49
49
|
function resolveOutboundCtx(ctx) {
|
|
@@ -77,7 +77,7 @@ export const pufferfishChannel = {
|
|
|
77
77
|
// 配置解析:从 OpenClaw 配置文件读取账号信息
|
|
78
78
|
config: {
|
|
79
79
|
// 列出所有配置的账号ID
|
|
80
|
-
listAccountIds: (cfg) => Object.keys(cfg.channels?.pufferfish?.accounts ?? {}),
|
|
80
|
+
listAccountIds: (cfg) => Object.keys(cfg.channels?.pufferfish?.bots ?? cfg.channels?.pufferfish?.accounts ?? {}),
|
|
81
81
|
// 解析指定账号的配置
|
|
82
82
|
resolveAccount: (cfg, accountId) => resolvePufferfishAccountFromConfig(cfg, accountId),
|
|
83
83
|
},
|
package/dist/channel.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"channel.js","sourceRoot":"","sources":["../src/channel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAGtD,MAAM,eAAe,GAAG,IAAI,GAAG,EAA6B,CAAC;AAE7D,MAAM,UAAU,iBAAiB,CAAC,OAA0B;IAC1D,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,SAAiB;IACpD,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;AACpC,CAAC;AAED;;GAEG;AACH,SAAS,yBAAyB,CAAC,GAAW;IAC5C,MAAM,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;IACrB,IAAI,CAAC,CAAC;QAAE,OAAO,CAAC,CAAC;IAEjB,MAAM,SAAS,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC1C,IAAI,SAAS;QAAE,OAAO,QAAQ,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7C,IAAI,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;QAAE,OAAO,CAAC,CAAC;IAEpC,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC5C,IAAI,UAAU;QAAE,OAAO,SAAS,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;IAChD,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;QAAE,OAAO,CAAC,CAAC;IAErC,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;IAC/C,IAAI,UAAU;QAAE,OAAO,SAAS,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;IAEhD,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QAAE,OAAO,QAAQ,CAAC,EAAE,CAAC;IAExC,OAAO,CAAC,CAAC;AACX,CAAC;AAED,SAAS,kCAAkC,CAAC,GAAQ,EAAE,SAAkB;IACtE,MAAM,OAAO,GAAG,eAAe,CAAC,GAAG,CAAC,SAAS,IAAI,SAAS,CAAC,CAAC;IAC5D,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,MAAM,OAAO,GAAG,GAAG,CAAC,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,SAAS,IAAI,SAAS,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"channel.js","sourceRoot":"","sources":["../src/channel.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAsBA;;;;GAIG;AACH,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,GAAG,EAAE,GAAG,QA+exC"}
|
package/dist/index.js
CHANGED
|
@@ -1,37 +1,37 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* OpenClaw「Pufferfish」通道插件入口。
|
|
3
|
+
*
|
|
4
|
+
* 职责概览:
|
|
5
|
+
* - 向 OpenClaw 注册 `pufferfish` 通道(见 channel.ts)
|
|
6
|
+
* - 从 `api.config.channels.pufferfish` 读取多机器人配置,用私钥换运行 token 并维持 WebSocket
|
|
7
|
+
* - 将 Pufferfish 下行消息适配为 OpenClaw 入站上下文,经 runtime 调度 Agent,再把回复发回 IM
|
|
8
|
+
*
|
|
9
|
+
* 注意:OpenClaw 安全扫描会拦截「读取外部进程环境 + 网络发送」的组合模式;
|
|
10
|
+
* 本插件不读取环境变量,也不再用本地绝对路径兜底加载 openclaw 模块。
|
|
11
|
+
*/
|
|
1
12
|
import { pufferfishChannel, removeRuntimeAccount, setRuntimeAccount } from './channel.js';
|
|
2
13
|
import { PufferfishWebSocketClient } from './websocket-client.js';
|
|
3
14
|
import { MessageAdapter } from './message-adapter.js';
|
|
4
15
|
import { PufferfishAPIClient } from './api-client.js';
|
|
5
|
-
import crypto from 'crypto';
|
|
6
|
-
// 注意:OpenClaw 安全扫描会拦截“读取外部进程环境 + 网络发送”的组合模式;
|
|
7
|
-
// 本插件不读取环境变量,也不再使用本地绝对路径兜底加载 openclaw 模块。
|
|
8
16
|
/**
|
|
9
17
|
* OpenClaw 插件注册函数
|
|
10
18
|
* 这是插件的入口点,OpenClaw 启动时会调用此函数
|
|
11
19
|
* @param api OpenClaw Plugin API 对象
|
|
12
20
|
*/
|
|
13
21
|
export default function register(api) {
|
|
14
|
-
api.logger.info('Pufferfish Channel Plugin loaded
|
|
22
|
+
api.logger.info('======Pufferfish Channel Plugin loaded!=======');
|
|
15
23
|
// 注册 Pufferfish Channel 到 OpenClaw
|
|
16
24
|
api.registerChannel({ plugin: pufferfishChannel });
|
|
17
25
|
// OpenClaw 2026+:完整配置在 api.config(旧版 api.getConfig 已移除)
|
|
18
26
|
const config = api.config ?? {};
|
|
19
27
|
const channelConfig = config.channels?.pufferfish ?? {};
|
|
20
|
-
|
|
21
|
-
const
|
|
28
|
+
// 多机器人:key 为配置里的 accountId(推荐直接使用 botUid 作为 key)
|
|
29
|
+
const botConfigs = (channelConfig.bots ?? {});
|
|
30
|
+
/** 每个已启用账号一条 WebSocket 连接,与 channel 层共享 account 快照(setRuntimeAccount) */
|
|
22
31
|
const runtimeConnections = new Map();
|
|
23
|
-
//
|
|
24
|
-
const
|
|
25
|
-
|
|
26
|
-
let discoveryTimer = null;
|
|
27
|
-
let globalToken = null; // 全局 Token
|
|
28
|
-
let tokenExpiresAt = 0; // Token 过期时间(Unix 时间戳,秒)
|
|
29
|
-
let tokenRefreshTimer = null; // Token 刷新定时器
|
|
30
|
-
const syncOperatorApiKey = (typeof channelConfig.operatorApiKey === 'string' && channelConfig.operatorApiKey.trim()) ||
|
|
31
|
-
(typeof discovery?.operatorApiKey === 'string' && discovery.operatorApiKey.trim()) ||
|
|
32
|
-
'';
|
|
33
|
-
const botProfilesByBotUserId = (channelConfig.botProfilesByBotUserId ?? {});
|
|
34
|
-
const botProfilesByAccountId = (channelConfig.botProfilesByAccountId ?? {});
|
|
32
|
+
// Bot 侧 systemPrompt / skills 按 botUid 查找
|
|
33
|
+
const botProfilesByBotUid = (channelConfig.botProfilesByBotUid ?? {});
|
|
34
|
+
/** 去重、去空白的 skills 列表,供 sync_config 发给服务端 */
|
|
35
35
|
const normalizeSkills = (skills) => {
|
|
36
36
|
if (!Array.isArray(skills))
|
|
37
37
|
return [];
|
|
@@ -46,70 +46,46 @@ export default function register(api) {
|
|
|
46
46
|
}
|
|
47
47
|
return result;
|
|
48
48
|
};
|
|
49
|
+
/** 按 botUid 读取 profile(systemPrompt / skills) */
|
|
49
50
|
const resolveBotProfile = (account) => {
|
|
50
|
-
const
|
|
51
|
-
const byAccount = botProfilesByAccountId[account.accountId] ?? {};
|
|
51
|
+
const byUid = account.botUid && botProfilesByBotUid[account.botUid] ? botProfilesByBotUid[account.botUid] : {};
|
|
52
52
|
return {
|
|
53
|
-
systemPrompt:
|
|
54
|
-
|
|
55
|
-
llmProvider: byBot.llmProvider ?? byAccount.llmProvider,
|
|
56
|
-
skills: byBot.skills ?? byAccount.skills,
|
|
53
|
+
systemPrompt: byUid.systemPrompt,
|
|
54
|
+
skills: byUid.skills,
|
|
57
55
|
};
|
|
58
56
|
};
|
|
59
|
-
|
|
60
|
-
const raw = [
|
|
61
|
-
String(params.botUserId),
|
|
62
|
-
params.systemPrompt.trim(),
|
|
63
|
-
params.llmModel.trim(),
|
|
64
|
-
String(params.llmProvider),
|
|
65
|
-
params.skills.join(','),
|
|
66
|
-
String(params.timestamp),
|
|
67
|
-
].join('\n');
|
|
68
|
-
return crypto.createHmac('sha256', syncOperatorApiKey).update(raw).digest('hex');
|
|
69
|
-
};
|
|
57
|
+
/** WS 就绪后把 systemPrompt + skills 同步给 Pufferfish 服务端(无 prompt 则跳过并打日志) */
|
|
70
58
|
const sendSyncConfig = (account, wsClient) => {
|
|
71
|
-
if (!syncOperatorApiKey) {
|
|
72
|
-
api.logger.warn('未配置 channels.pufferfish.operatorApiKey(且 discovery.operatorApiKey 为空),跳过 sync_config');
|
|
73
|
-
return;
|
|
74
|
-
}
|
|
75
59
|
if (!wsClient.isOpen()) {
|
|
76
60
|
return;
|
|
77
61
|
}
|
|
78
62
|
const profile = resolveBotProfile(account);
|
|
79
63
|
const systemPrompt = String(profile.systemPrompt ?? '').trim();
|
|
80
|
-
const llmModel = String(profile.llmModel ?? '').trim();
|
|
81
|
-
const llmProvider = Number(profile.llmProvider ?? 0);
|
|
82
64
|
const skills = normalizeSkills(profile.skills);
|
|
83
|
-
if (!systemPrompt
|
|
84
|
-
api.logger.warn(`sync_config
|
|
65
|
+
if (!systemPrompt) {
|
|
66
|
+
api.logger.warn(`sync_config 缺少 systemPrompt,已跳过 [accountId=${account.accountId}] [botUserId=${account.botUserId}]`);
|
|
85
67
|
return;
|
|
86
68
|
}
|
|
87
|
-
const timestamp = Math.floor(Date.now() / 1000);
|
|
88
|
-
const signature = signSyncConfig({
|
|
89
|
-
botUserId: account.botUserId,
|
|
90
|
-
systemPrompt,
|
|
91
|
-
llmModel,
|
|
92
|
-
llmProvider,
|
|
93
|
-
skills,
|
|
94
|
-
timestamp,
|
|
95
|
-
});
|
|
96
69
|
wsClient.send({
|
|
97
70
|
action: 'sync_config',
|
|
98
71
|
systemPrompt,
|
|
99
|
-
llmModel,
|
|
100
|
-
llmProvider,
|
|
101
72
|
skills,
|
|
102
|
-
timestamp,
|
|
103
|
-
signature,
|
|
104
73
|
});
|
|
105
74
|
api.logger.info(`已发送 sync_config [accountId=${account.accountId}] [botUserId=${account.botUserId}] [skills=${skills.length}]`);
|
|
106
75
|
};
|
|
76
|
+
/**
|
|
77
|
+
* 将一条 Pufferfish 会话消息喂给 OpenClaw:拼 envelope → 写入 session → 调度 Agent → deliver 回 IM。
|
|
78
|
+
* 依赖 api.runtime.channel 上的一组内部 API;缺任一能力则抛错,避免半套集成。
|
|
79
|
+
*/
|
|
107
80
|
const ingestIncomingMessage = async (payload) => {
|
|
108
81
|
const rawBody = typeof payload?.message?.text === 'string' ? payload.message.text : '';
|
|
109
82
|
const tsMs = payload.timestamp < 1e12 ? payload.timestamp * 1000 : payload.timestamp;
|
|
110
83
|
const senderAddress = `${payload.channelId}:${payload.senderId}`;
|
|
111
84
|
const recipientAddress = payload.chatId;
|
|
112
85
|
const conversationLabel = payload.chatId;
|
|
86
|
+
/**
|
|
87
|
+
* 模型有时返回工具 JSON 或带 ```json 的块;尽量抽出 parameters.message 作为最终对用户可见文本。
|
|
88
|
+
*/
|
|
113
89
|
const normalizeReplyText = (raw) => {
|
|
114
90
|
const s = String(raw ?? '');
|
|
115
91
|
if (!s.trim())
|
|
@@ -148,6 +124,7 @@ export default function register(api) {
|
|
|
148
124
|
!channelRuntime?.reply?.dispatchReplyWithBufferedBlockDispatcher) {
|
|
149
125
|
throw new Error('OpenClaw runtime.channel 能力不完整,无法处理入站消息。');
|
|
150
126
|
}
|
|
127
|
+
/** OpenClaw 在 Agent 产出回复后调用:可选执行内联工具计划、上传媒体、再发文本消息 */
|
|
151
128
|
const deliver = async (outboundPayload) => {
|
|
152
129
|
const client = new PufferfishAPIClient(payload.account);
|
|
153
130
|
const rawText = typeof outboundPayload?.text === 'string' ? outboundPayload.text : '';
|
|
@@ -271,6 +248,7 @@ export default function register(api) {
|
|
|
271
248
|
});
|
|
272
249
|
}
|
|
273
250
|
};
|
|
251
|
+
// 解析该 peer 对应的 Agent 与会话存储路径
|
|
274
252
|
const route = channelRuntime.routing.resolveAgentRoute({
|
|
275
253
|
cfg: api.config,
|
|
276
254
|
channel: payload.channelId,
|
|
@@ -283,6 +261,7 @@ export default function register(api) {
|
|
|
283
261
|
const storePath = channelRuntime.session.resolveStorePath(api.config?.session?.store, {
|
|
284
262
|
agentId: route.agentId,
|
|
285
263
|
});
|
|
264
|
+
// 用于 envelope 里的「相对上次更新时间」等元信息
|
|
286
265
|
const previousTimestamp = channelRuntime.session.readSessionUpdatedAt({
|
|
287
266
|
storePath,
|
|
288
267
|
sessionKey: route.sessionKey,
|
|
@@ -296,6 +275,7 @@ export default function register(api) {
|
|
|
296
275
|
envelope: envelopeOptions,
|
|
297
276
|
body: rawBody,
|
|
298
277
|
});
|
|
278
|
+
// 供 session 与 reply 管线使用的统一入站上下文
|
|
299
279
|
const ctxPayload = channelRuntime.reply.finalizeInboundContext({
|
|
300
280
|
Body: body,
|
|
301
281
|
BodyForAgent: rawBody,
|
|
@@ -316,6 +296,7 @@ export default function register(api) {
|
|
|
316
296
|
OriginatingChannel: payload.channelId,
|
|
317
297
|
OriginatingTo: payload.chatId,
|
|
318
298
|
});
|
|
299
|
+
// 把消息「记录到会话里」方便 agent 记住上下文
|
|
319
300
|
await channelRuntime.session.recordInboundSession({
|
|
320
301
|
storePath,
|
|
321
302
|
sessionKey: route.sessionKey,
|
|
@@ -324,6 +305,7 @@ export default function register(api) {
|
|
|
324
305
|
api.logger.error(`Pufferfish inbound: record session failed: ${String(err)}`);
|
|
325
306
|
},
|
|
326
307
|
});
|
|
308
|
+
// 把消息派发给
|
|
327
309
|
await channelRuntime.reply.dispatchReplyWithBufferedBlockDispatcher({
|
|
328
310
|
ctx: ctxPayload,
|
|
329
311
|
cfg: api.config,
|
|
@@ -335,6 +317,7 @@ export default function register(api) {
|
|
|
335
317
|
},
|
|
336
318
|
});
|
|
337
319
|
};
|
|
320
|
+
/** 关闭 WS、从 channel 运行时表移除、清本地 Map */
|
|
338
321
|
const disconnectAccount = (accountId) => {
|
|
339
322
|
const runtime = runtimeConnections.get(accountId);
|
|
340
323
|
if (!runtime)
|
|
@@ -344,6 +327,10 @@ export default function register(api) {
|
|
|
344
327
|
removeRuntimeAccount(accountId);
|
|
345
328
|
runtimeConnections.delete(accountId);
|
|
346
329
|
};
|
|
330
|
+
/**
|
|
331
|
+
* 为单个账号建立或复用 WebSocket:若连接参数未变则只更新 token 与 sync_config;
|
|
332
|
+
* 若曾断开则重新 connect,避免「仅刷新 token 却永远不连」的死锁。
|
|
333
|
+
*/
|
|
347
334
|
const connectAccount = (account) => {
|
|
348
335
|
const existing = runtimeConnections.get(account.accountId);
|
|
349
336
|
if (existing &&
|
|
@@ -353,12 +340,12 @@ export default function register(api) {
|
|
|
353
340
|
existing.account = account;
|
|
354
341
|
existing.wsClient.updateAccount(account);
|
|
355
342
|
setRuntimeAccount(account);
|
|
356
|
-
// 已建立 WS
|
|
343
|
+
// 已建立 WS 时仅刷新运行 token,不必重连。
|
|
357
344
|
if (existing.wsClient.isOpen()) {
|
|
358
345
|
sendSyncConfig(account, existing.wsClient);
|
|
359
346
|
return;
|
|
360
347
|
}
|
|
361
|
-
// 曾失败/未连上时不能 return
|
|
348
|
+
// 曾失败/未连上时不能 return:否则下一次重新加载配置时会因为“仅 token 变化”而永远不连。
|
|
362
349
|
existing.wsClient.connect().catch((error) => {
|
|
363
350
|
api.logger.error(`连接 Pufferfish WebSocket 失败 [账号: ${account.accountId}]:`, error);
|
|
364
351
|
});
|
|
@@ -405,6 +392,7 @@ export default function register(api) {
|
|
|
405
392
|
api.logger.error(`连接 Pufferfish WebSocket 失败 [账号: ${account.accountId}]:`, error);
|
|
406
393
|
});
|
|
407
394
|
};
|
|
395
|
+
/** 与配置列表对齐:新增/更新连接,配置里已禁用的账号从运行时移除 */
|
|
408
396
|
const applyAccounts = (accounts) => {
|
|
409
397
|
const nextIds = new Set();
|
|
410
398
|
for (const account of accounts) {
|
|
@@ -419,146 +407,44 @@ export default function register(api) {
|
|
|
419
407
|
}
|
|
420
408
|
}
|
|
421
409
|
};
|
|
422
|
-
const loadStaticAccounts = () => {
|
|
423
|
-
const accounts = Object.entries(staticAccounts)
|
|
424
|
-
.map(([accountId, accountConfig]) => ({
|
|
425
|
-
accountId,
|
|
426
|
-
enabled: accountConfig.enabled,
|
|
427
|
-
apiUrl: accountConfig.apiUrl,
|
|
428
|
-
wsUrl: accountConfig.wsUrl,
|
|
429
|
-
botUserId: accountConfig.botUserId,
|
|
430
|
-
token: accountConfig.token,
|
|
431
|
-
privateKey: accountConfig.privateKey,
|
|
432
|
-
}))
|
|
433
|
-
.filter((account) => account.enabled);
|
|
434
|
-
applyAccounts(accounts);
|
|
435
|
-
};
|
|
436
410
|
/**
|
|
437
|
-
*
|
|
411
|
+
* 通过 botUid 直连服务端,换取当前机器人自己的运行 token。
|
|
412
|
+
* 一个 botUid 就是一只独立机器人,因此不会和其它机器人串线。
|
|
438
413
|
*/
|
|
439
|
-
const
|
|
440
|
-
const
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
const result = await client.refreshGlobalToken(workerId, globalToken);
|
|
450
|
-
globalToken = result.token;
|
|
451
|
-
tokenExpiresAt = result.expiresAt;
|
|
452
|
-
scheduleTokenRefresh(client, operatorApiKey, workerId);
|
|
453
|
-
api.logger.info(`全局 Token 刷新成功,过期时间: ${new Date(tokenExpiresAt * 1000).toISOString()}`);
|
|
454
|
-
return globalToken;
|
|
455
|
-
}
|
|
456
|
-
catch (error) {
|
|
457
|
-
api.logger.warn('刷新全局 Token 失败,尝试重新请求:', error);
|
|
414
|
+
const loadBotAccounts = async () => {
|
|
415
|
+
const accounts = [];
|
|
416
|
+
for (const [rawAccountId, botConfig] of Object.entries(botConfigs)) {
|
|
417
|
+
const accountId = String(rawAccountId).trim();
|
|
418
|
+
const apiUrl = String(botConfig?.apiUrl ?? '').trim();
|
|
419
|
+
const botUid = String(botConfig?.botUid ?? accountId).trim();
|
|
420
|
+
const privateKey = String(botConfig?.privateKey ?? '').trim();
|
|
421
|
+
const enabled = botConfig?.enabled ?? true;
|
|
422
|
+
if (!enabled || !apiUrl || !botUid) {
|
|
423
|
+
continue;
|
|
458
424
|
}
|
|
459
|
-
}
|
|
460
|
-
// 请求新 token
|
|
461
|
-
api.logger.info('请求全局 Token...');
|
|
462
|
-
const result = await client.requestGlobalToken(workerId, operatorApiKey);
|
|
463
|
-
globalToken = result.token;
|
|
464
|
-
tokenExpiresAt = result.expiresAt;
|
|
465
|
-
scheduleTokenRefresh(client, operatorApiKey, workerId);
|
|
466
|
-
api.logger.info(`全局 Token 获取成功,过期时间: ${new Date(tokenExpiresAt * 1000).toISOString()}`);
|
|
467
|
-
return globalToken;
|
|
468
|
-
};
|
|
469
|
-
/**
|
|
470
|
-
* 安排 Token 自动刷新
|
|
471
|
-
*/
|
|
472
|
-
const scheduleTokenRefresh = (client, operatorApiKey, workerId) => {
|
|
473
|
-
if (tokenRefreshTimer) {
|
|
474
|
-
clearTimeout(tokenRefreshTimer);
|
|
475
|
-
tokenRefreshTimer = null;
|
|
476
|
-
}
|
|
477
|
-
const now = Math.floor(Date.now() / 1000);
|
|
478
|
-
const ttl = tokenExpiresAt - now;
|
|
479
|
-
// 在过期前 5 分钟刷新(或 TTL 的 80%,取较小值)
|
|
480
|
-
const refreshBeforeSeconds = Math.min(300, Math.floor(ttl * 0.2));
|
|
481
|
-
const refreshInSeconds = Math.max(1, ttl - refreshBeforeSeconds);
|
|
482
|
-
api.logger.debug(`将在 ${refreshInSeconds} 秒后刷新 Token`);
|
|
483
|
-
tokenRefreshTimer = setTimeout(() => {
|
|
484
|
-
ensureGlobalToken(client, operatorApiKey, workerId).catch((error) => {
|
|
485
|
-
api.logger.error('自动刷新 Token 失败:', error);
|
|
486
|
-
});
|
|
487
|
-
}, refreshInSeconds * 1000);
|
|
488
|
-
};
|
|
489
|
-
const startDiscovery = async () => {
|
|
490
|
-
// 默认 1 小时轮询一次(旧代码的默认值误写成 36000000 秒,会导致 setInterval 溢出并退化为 1ms 触发)
|
|
491
|
-
const parsedInterval = Number(discovery?.intervalSeconds);
|
|
492
|
-
const intervalSeconds = Number.isFinite(parsedInterval) && parsedInterval > 0
|
|
493
|
-
? Math.max(5, parsedInterval)
|
|
494
|
-
: 3600;
|
|
495
|
-
const leaseSeconds = Math.max(intervalSeconds * 3, 30);
|
|
496
|
-
const operatorApiKey = discovery?.operatorApiKey ?? '';
|
|
497
|
-
const client = new PufferfishAPIClient({
|
|
498
|
-
accountId: 'discovery',
|
|
499
|
-
enabled: true,
|
|
500
|
-
apiUrl: discovery?.apiUrl ?? '',
|
|
501
|
-
wsUrl: '',
|
|
502
|
-
botUserId: 0,
|
|
503
|
-
token: '', // 不再使用静态 token
|
|
504
|
-
});
|
|
505
|
-
// 首次请求 token
|
|
506
|
-
try {
|
|
507
|
-
await ensureGlobalToken(client, operatorApiKey, workerId);
|
|
508
|
-
}
|
|
509
|
-
catch (error) {
|
|
510
|
-
const msg = error instanceof Error ? (error.stack ?? error.message) : String(error);
|
|
511
|
-
api.logger.error('获取全局 Token 失败:', msg);
|
|
512
|
-
return;
|
|
513
|
-
}
|
|
514
|
-
const refresh = async () => {
|
|
515
425
|
try {
|
|
516
|
-
|
|
517
|
-
|
|
518
|
-
|
|
519
|
-
const
|
|
520
|
-
|
|
521
|
-
|
|
522
|
-
|
|
523
|
-
applyAccounts(accounts);
|
|
426
|
+
if (!privateKey) {
|
|
427
|
+
throw new Error('缺少 privateKey(PEM),无法进行 connect 签名认证');
|
|
428
|
+
}
|
|
429
|
+
const account = await PufferfishAPIClient.connectBot(apiUrl, botUid, privateKey);
|
|
430
|
+
account.accountId = accountId;
|
|
431
|
+
account.botUid = botUid;
|
|
432
|
+
accounts.push(account);
|
|
524
433
|
}
|
|
525
434
|
catch (error) {
|
|
526
435
|
const msg = error instanceof Error ? (error.stack ?? error.message) : String(error);
|
|
527
|
-
api.logger.error(
|
|
436
|
+
api.logger.error(`Pufferfish bot 连接失败 [accountId=${accountId}] [botUid=${botUid}]: ${msg}`);
|
|
528
437
|
}
|
|
529
|
-
};
|
|
530
|
-
refresh().catch(() => undefined);
|
|
531
|
-
// Node 的 setInterval/setTimeout 最大延迟约为 2^31-1 ms;超过会触发 TimeoutOverflowWarning 并被强制设为 1ms。
|
|
532
|
-
const maxIntervalSeconds = Math.floor(2_147_483_647 / 1000);
|
|
533
|
-
const safeIntervalSeconds = Math.min(intervalSeconds, maxIntervalSeconds);
|
|
534
|
-
if (safeIntervalSeconds !== intervalSeconds) {
|
|
535
|
-
api.logger.warn(`discovery intervalSeconds=${intervalSeconds} 超出 Node 定时器上限,已降级为 ${safeIntervalSeconds}s`);
|
|
536
438
|
}
|
|
537
|
-
|
|
538
|
-
refresh().catch(() => undefined);
|
|
539
|
-
}, safeIntervalSeconds * 1000);
|
|
439
|
+
applyAccounts(accounts);
|
|
540
440
|
};
|
|
541
|
-
|
|
542
|
-
|
|
543
|
-
|
|
544
|
-
|
|
545
|
-
|
|
546
|
-
|
|
547
|
-
});
|
|
548
|
-
}
|
|
549
|
-
else {
|
|
550
|
-
api.logger.info('Pufferfish Channel 运行在静态账号模式');
|
|
551
|
-
loadStaticAccounts();
|
|
552
|
-
}
|
|
441
|
+
api.logger.info('Pufferfish Channel 运行在 bot 直连模式(challenge + privateKey -> /v1/ai-bot/connect)');
|
|
442
|
+
loadBotAccounts().catch((error) => {
|
|
443
|
+
const msg = error instanceof Error ? (error.stack ?? error.message) : String(error);
|
|
444
|
+
api.logger.error('加载机器人配置失败:', msg);
|
|
445
|
+
});
|
|
446
|
+
// 网关退出时释放所有连接,避免进程悬挂或重复注册
|
|
553
447
|
api.on('gateway_stop', () => {
|
|
554
|
-
if (discoveryTimer) {
|
|
555
|
-
clearInterval(discoveryTimer);
|
|
556
|
-
discoveryTimer = null;
|
|
557
|
-
}
|
|
558
|
-
if (tokenRefreshTimer) {
|
|
559
|
-
clearTimeout(tokenRefreshTimer);
|
|
560
|
-
tokenRefreshTimer = null;
|
|
561
|
-
}
|
|
562
448
|
for (const accountId of runtimeConnections.keys()) {
|
|
563
449
|
disconnectAccount(accountId);
|
|
564
450
|
}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/types.d.ts
CHANGED
|
@@ -23,31 +23,24 @@ export interface PufferfishAccount {
|
|
|
23
23
|
apiUrl: string;
|
|
24
24
|
wsUrl: string;
|
|
25
25
|
botUserId: number;
|
|
26
|
+
/** OpenClaw 对外使用的机器人标识 */
|
|
27
|
+
botUid?: string;
|
|
26
28
|
token: string;
|
|
27
|
-
privateKey?: string;
|
|
28
29
|
}
|
|
29
30
|
/**
|
|
30
31
|
* 机器人在 OpenClaw 侧的运行时配置(用于下发 sync_config)。
|
|
31
32
|
*/
|
|
32
33
|
export interface PufferfishBotProfile {
|
|
33
34
|
systemPrompt?: string;
|
|
34
|
-
llmModel?: string;
|
|
35
|
-
llmProvider?: number;
|
|
36
35
|
skills?: string[];
|
|
37
36
|
}
|
|
38
|
-
/**
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
export interface PufferfishDiscoveryConfig {
|
|
42
|
-
enabled: boolean;
|
|
37
|
+
/** 单个机器人配置。一个 botUid 就是一只独立机器人。 */
|
|
38
|
+
export interface PufferfishBotConfig {
|
|
39
|
+
enabled?: boolean;
|
|
43
40
|
apiUrl: string;
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
* 用于 discovery 负载均衡的 workerId。
|
|
48
|
-
* 如果不指定,将回退到环境变量 PUFFERFISH_WORKER_ID 或默认值。
|
|
49
|
-
*/
|
|
50
|
-
workerId?: string;
|
|
41
|
+
botUid?: string;
|
|
42
|
+
/** Ed25519 私钥(PEM),用于 connect challenge 签名换取运行 token */
|
|
43
|
+
privateKey?: string;
|
|
51
44
|
}
|
|
52
45
|
/**
|
|
53
46
|
* OpenClaw 消息格式
|
package/dist/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC;IACpD,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC;IACpD,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,0BAA0B;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,mCAAmC;AACnC,MAAM,WAAW,mBAAmB;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,wDAAwD;IACxD,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAChC;AAED;;;GAGG;AACH,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAChC;AAED;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB"}
|
|
@@ -19,7 +19,7 @@ export declare class PufferfishWebSocketClient extends EventEmitter {
|
|
|
19
19
|
private shouldReconnect;
|
|
20
20
|
constructor(account: PufferfishAccount);
|
|
21
21
|
private prefix;
|
|
22
|
-
/**
|
|
22
|
+
/** 服务端重新签发运行 token 时同步,避免重连仍用旧 token */
|
|
23
23
|
updateAccount(account: PufferfishAccount): void;
|
|
24
24
|
isOpen(): boolean;
|
|
25
25
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-client.d.ts","sourceRoot":"","sources":["../src/websocket-client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,EAAE,iBAAiB,EAAqB,MAAM,YAAY,CAAC;AAEvE;;;;;;;;;GASG;AACH,qBAAa,yBAA0B,SAAQ,YAAY;IACzD,OAAO,CAAC,EAAE,CAA0B;IACpC,OAAO,CAAC,OAAO,CAAoB;IACnC,OAAO,CAAC,cAAc,CAA+B;IACrD,OAAO,CAAC,cAAc,CAA+B;IACrD,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,eAAe,CAAQ;gBAEnB,OAAO,EAAE,iBAAiB;IAKtC,OAAO,CAAC,MAAM;IAMd,
|
|
1
|
+
{"version":3,"file":"websocket-client.d.ts","sourceRoot":"","sources":["../src/websocket-client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,EAAE,iBAAiB,EAAqB,MAAM,YAAY,CAAC;AAEvE;;;;;;;;;GASG;AACH,qBAAa,yBAA0B,SAAQ,YAAY;IACzD,OAAO,CAAC,EAAE,CAA0B;IACpC,OAAO,CAAC,OAAO,CAAoB;IACnC,OAAO,CAAC,cAAc,CAA+B;IACrD,OAAO,CAAC,cAAc,CAA+B;IACrD,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,eAAe,CAAQ;gBAEnB,OAAO,EAAE,iBAAiB;IAKtC,OAAO,CAAC,MAAM;IAMd,wCAAwC;IACxC,aAAa,CAAC,OAAO,EAAE,iBAAiB,GAAG,IAAI;IAI/C,MAAM,IAAI,OAAO;IAIjB;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAoE9B;;OAEG;IACH,UAAU,IAAI,IAAI;IAelB;;OAEG;IACH,IAAI,CAAC,IAAI,EAAE,GAAG,GAAG,IAAI;IAMrB;;OAEG;IACH,OAAO,CAAC,cAAc;IAStB;;OAEG;IACH,OAAO,CAAC,aAAa;IAOrB;;OAEG;IACH,OAAO,CAAC,iBAAiB;CAa1B"}
|
package/dist/websocket-client.js
CHANGED
|
@@ -26,7 +26,7 @@ export class PufferfishWebSocketClient extends EventEmitter {
|
|
|
26
26
|
const accountId = this.account?.accountId ?? 'unknown';
|
|
27
27
|
return `[Pufferfish WS] [accountId=${accountId}] [botUserId=${botUserId}]`;
|
|
28
28
|
}
|
|
29
|
-
/**
|
|
29
|
+
/** 服务端重新签发运行 token 时同步,避免重连仍用旧 token */
|
|
30
30
|
updateAccount(account) {
|
|
31
31
|
this.account = account;
|
|
32
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-client.js","sourceRoot":"","sources":["../src/websocket-client.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,IAAI,CAAC;AAC3B,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAGtC;;;;;;;;;GASG;AACH,MAAM,OAAO,yBAA0B,SAAQ,YAAY;IACjD,EAAE,GAAqB,IAAI,CAAC,CAAc,iBAAiB;IAC3D,OAAO,CAAoB,CAAe,OAAO;IACjD,cAAc,GAA0B,IAAI,CAAC,CAAE,QAAQ;IACvD,cAAc,GAA0B,IAAI,CAAC,CAAE,QAAQ;IACvD,YAAY,GAAG,KAAK,CAAC,CAAqB,UAAU;IACpD,eAAe,GAAG,IAAI,CAAC,CAAmB,WAAW;IAE7D,YAAY,OAA0B;QACpC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAEO,MAAM;QACZ,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,EAAE,SAAS,IAAI,CAAC,CAAC;QAC/C,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,EAAE,SAAS,IAAI,SAAS,CAAC;QACvD,OAAO,8BAA8B,SAAS,gBAAgB,SAAS,GAAG,CAAC;IAC7E,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"websocket-client.js","sourceRoot":"","sources":["../src/websocket-client.ts"],"names":[],"mappings":"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"}
|
package/openclaw.plugin.json
CHANGED
|
@@ -7,13 +7,15 @@
|
|
|
7
7
|
"type": "object",
|
|
8
8
|
"additionalProperties": true,
|
|
9
9
|
"properties": {
|
|
10
|
-
"
|
|
10
|
+
"bots": {
|
|
11
11
|
"type": "object",
|
|
12
|
-
"additionalProperties": true
|
|
12
|
+
"additionalProperties": true,
|
|
13
|
+
"description": "机器人配置集合;key 会作为运行时 accountId,建议直接使用 botUid,值中需要 apiUrl + privateKey(PEM,可选 enabled)"
|
|
13
14
|
},
|
|
14
|
-
"
|
|
15
|
+
"botProfilesByBotUid": {
|
|
15
16
|
"type": "object",
|
|
16
|
-
"additionalProperties": true
|
|
17
|
+
"additionalProperties": true,
|
|
18
|
+
"description": "按 botUid 配置 systemPrompt / skills;key 应与 bots 中 botUid 一致"
|
|
17
19
|
}
|
|
18
20
|
}
|
|
19
21
|
}
|
package/package.json
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@qqvu/openclaw-channel",
|
|
3
|
-
"version": "1.0.
|
|
4
|
-
"description": "OpenClaw channel plugin for
|
|
3
|
+
"version": "1.0.10",
|
|
4
|
+
"description": "OpenClaw channel plugin for QQvu platform",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
7
7
|
"types": "./dist/index.d.ts",
|
|
8
|
-
"author": "
|
|
8
|
+
"author": "QQvu Team",
|
|
9
9
|
"license": "MIT",
|
|
10
10
|
"scripts": {
|
|
11
11
|
"build": "tsc",
|