botmux 2.51.1 → 2.52.0
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.en.md +5 -1
- package/README.md +5 -1
- package/dist/bot-registry.d.ts +30 -0
- package/dist/bot-registry.d.ts.map +1 -1
- package/dist/bot-registry.js +31 -0
- package/dist/bot-registry.js.map +1 -1
- package/dist/core/dashboard-ipc-server.d.ts.map +1 -1
- package/dist/core/dashboard-ipc-server.js +37 -0
- package/dist/core/dashboard-ipc-server.js.map +1 -1
- package/dist/daemon.d.ts +3 -0
- package/dist/daemon.d.ts.map +1 -1
- package/dist/daemon.js +138 -10
- package/dist/daemon.js.map +1 -1
- package/dist/dashboard/web/bot-defaults.d.ts.map +1 -1
- package/dist/dashboard/web/bot-defaults.js +114 -0
- package/dist/dashboard/web/bot-defaults.js.map +1 -1
- package/dist/dashboard/web/i18n.d.ts.map +1 -1
- package/dist/dashboard/web/i18n.js +22 -0
- package/dist/dashboard/web/i18n.js.map +1 -1
- package/dist/dashboard-web/app.js +449 -426
- package/dist/dashboard.js +20 -0
- package/dist/dashboard.js.map +1 -1
- package/dist/i18n/en.d.ts.map +1 -1
- package/dist/i18n/en.js +7 -1
- package/dist/i18n/en.js.map +1 -1
- package/dist/i18n/zh.d.ts.map +1 -1
- package/dist/i18n/zh.js +7 -1
- package/dist/i18n/zh.js.map +1 -1
- package/dist/im/lark/card-builder.d.ts +4 -2
- package/dist/im/lark/card-builder.d.ts.map +1 -1
- package/dist/im/lark/card-builder.js +15 -3
- package/dist/im/lark/card-builder.js.map +1 -1
- package/dist/im/lark/card-handler.d.ts.map +1 -1
- package/dist/im/lark/card-handler.js +6 -4
- package/dist/im/lark/card-handler.js.map +1 -1
- package/dist/im/lark/event-dispatcher.d.ts +12 -0
- package/dist/im/lark/event-dispatcher.d.ts.map +1 -1
- package/dist/im/lark/event-dispatcher.js +39 -31
- package/dist/im/lark/event-dispatcher.js.map +1 -1
- package/dist/im/lark/grant-command.d.ts +13 -0
- package/dist/im/lark/grant-command.d.ts.map +1 -1
- package/dist/im/lark/grant-command.js +49 -3
- package/dist/im/lark/grant-command.js.map +1 -1
- package/dist/im/lark/grant-pending.d.ts +7 -4
- package/dist/im/lark/grant-pending.d.ts.map +1 -1
- package/dist/im/lark/grant-pending.js +12 -6
- package/dist/im/lark/grant-pending.js.map +1 -1
- package/dist/services/grant-prefs-store.d.ts +23 -0
- package/dist/services/grant-prefs-store.d.ts.map +1 -0
- package/dist/services/grant-prefs-store.js +94 -0
- package/dist/services/grant-prefs-store.js.map +1 -0
- package/dist/services/grant-store.d.ts +34 -2
- package/dist/services/grant-store.d.ts.map +1 -1
- package/dist/services/grant-store.js +160 -9
- package/dist/services/grant-store.js.map +1 -1
- package/dist/services/quota-dedup.d.ts +33 -0
- package/dist/services/quota-dedup.d.ts.map +1 -0
- package/dist/services/quota-dedup.js +67 -0
- package/dist/services/quota-dedup.js.map +1 -0
- package/package.json +1 -1
|
@@ -5,6 +5,39 @@
|
|
|
5
5
|
import { getBot, getOwnerOpenId } from '../bot-registry.js';
|
|
6
6
|
import { rmwBotEntry } from './config-store.js';
|
|
7
7
|
import { logger } from '../utils/logger.js';
|
|
8
|
+
// ─── 消息额度(scope-aware quota)─────────────────────────────────────────────
|
|
9
|
+
// quotaKey 的单一格式来源:chat 授权按群+人,global 授权按人。evaluateTalk 拼 key 时
|
|
10
|
+
// 复用这两个 builder,保证 store / enforce 两侧格式一致。
|
|
11
|
+
export function chatQuotaKey(chatId, openId) { return `chat:${chatId}:${openId}`; }
|
|
12
|
+
export function globalQuotaKey(openId) { return `global:${openId}`; }
|
|
13
|
+
/** 取 quotaState(容错:非对象/数组 → undefined)。entry(磁盘原始)与 bot.config 同形,通用。 */
|
|
14
|
+
function getQuotaMap(o) {
|
|
15
|
+
return (o.quotaState && typeof o.quotaState === 'object' && !Array.isArray(o.quotaState)) ? o.quotaState : undefined;
|
|
16
|
+
}
|
|
17
|
+
/** 写/删一条 quota 记录(rec=null 删)。返回是否实际改动。空 map 删键。 */
|
|
18
|
+
function setQuotaRecord(o, qk, rec) {
|
|
19
|
+
const qs = getQuotaMap(o);
|
|
20
|
+
if (rec) {
|
|
21
|
+
o.quotaState = { ...(qs ?? {}), [qk]: rec };
|
|
22
|
+
return true;
|
|
23
|
+
}
|
|
24
|
+
if (qs && qk in qs) {
|
|
25
|
+
const next = { ...qs };
|
|
26
|
+
delete next[qk];
|
|
27
|
+
if (Object.keys(next).length > 0)
|
|
28
|
+
o.quotaState = next;
|
|
29
|
+
else
|
|
30
|
+
delete o.quotaState;
|
|
31
|
+
return true;
|
|
32
|
+
}
|
|
33
|
+
return false;
|
|
34
|
+
}
|
|
35
|
+
/** 授权时套额度:quota>0 → 重置为 {limit,used:0}(续杯语义);undefined → 删记录(转无限)。 */
|
|
36
|
+
function applyGrantQuota(o, qk, quota) {
|
|
37
|
+
return quota !== undefined && quota > 0
|
|
38
|
+
? setQuotaRecord(o, qk, { limit: quota, used: 0 })
|
|
39
|
+
: setQuotaRecord(o, qk, null);
|
|
40
|
+
}
|
|
8
41
|
/** 把目标 open_id 映射回 allowedUsers 里的 raw 条目(可能是 email,也可能就是 open_id)。 */
|
|
9
42
|
function rawEntryForOpenId(larkAppId, openId) {
|
|
10
43
|
const bot = getBot(larkAppId);
|
|
@@ -19,7 +52,7 @@ function rawEntryForOpenId(larkAppId, openId) {
|
|
|
19
52
|
function resolvedAfterRemoval(larkAppId, openId) {
|
|
20
53
|
return getBot(larkAppId).resolvedAllowedUsers.filter(u => u !== openId);
|
|
21
54
|
}
|
|
22
|
-
export async function addChatGrant(larkAppId, chatId, openId) {
|
|
55
|
+
export async function addChatGrant(larkAppId, chatId, openId, quota) {
|
|
23
56
|
let bot;
|
|
24
57
|
try {
|
|
25
58
|
bot = getBot(larkAppId);
|
|
@@ -27,6 +60,7 @@ export async function addChatGrant(larkAppId, chatId, openId) {
|
|
|
27
60
|
catch {
|
|
28
61
|
return { ok: false, reason: 'bot_not_registered' };
|
|
29
62
|
}
|
|
63
|
+
const qk = chatQuotaKey(chatId, openId);
|
|
30
64
|
const r = await rmwBotEntry(larkAppId, (entry) => {
|
|
31
65
|
const map = (entry.chatGrants && typeof entry.chatGrants === 'object') ? entry.chatGrants : {};
|
|
32
66
|
const cur = Array.isArray(map[chatId]) ? map[chatId] : [];
|
|
@@ -35,22 +69,26 @@ export async function addChatGrant(larkAppId, chatId, openId) {
|
|
|
35
69
|
cur.push(openId);
|
|
36
70
|
map[chatId] = cur;
|
|
37
71
|
entry.chatGrants = map;
|
|
38
|
-
|
|
72
|
+
// 带额度即(重)设记录;无额度则删除已有记录(转无限)。重新授权 = 续杯/重置。
|
|
73
|
+
const qChanged = applyGrantQuota(entry, qk, quota);
|
|
74
|
+
return { write: created || qChanged, result: { created } };
|
|
39
75
|
});
|
|
40
76
|
if (!r.ok)
|
|
41
77
|
return r;
|
|
42
78
|
if (r.result.created) {
|
|
43
79
|
const map = (bot.config.chatGrants ??= {});
|
|
44
|
-
|
|
45
|
-
|
|
80
|
+
if (!map[chatId]?.includes(openId))
|
|
81
|
+
map[chatId] = [...(map[chatId] ?? []), openId];
|
|
46
82
|
}
|
|
83
|
+
applyGrantQuota(bot.config, qk, quota); // 同步内存
|
|
84
|
+
logger.info(`[grant:${larkAppId}] +chat ${chatId} ${openId}${quota ? ` quota=${quota}` : ''}`);
|
|
47
85
|
return { ok: true, created: r.result.created };
|
|
48
86
|
}
|
|
49
87
|
/**
|
|
50
88
|
* 全局对话授权:把 open_id 加入 globalGrants(被授权在任意群与本 bot 对话的名单,人/bot 通用)。
|
|
51
89
|
* talk-only —— 只进 canTalk / bot 路由闸,绝不写 allowedUsers、不授 canOperate(与 addChatGrant 同源)。
|
|
52
90
|
*/
|
|
53
|
-
export async function addGlobalGrant(larkAppId, openId) {
|
|
91
|
+
export async function addGlobalGrant(larkAppId, openId, quota) {
|
|
54
92
|
let bot;
|
|
55
93
|
try {
|
|
56
94
|
bot = getBot(larkAppId);
|
|
@@ -58,22 +96,129 @@ export async function addGlobalGrant(larkAppId, openId) {
|
|
|
58
96
|
catch {
|
|
59
97
|
return { ok: false, reason: 'bot_not_registered' };
|
|
60
98
|
}
|
|
99
|
+
const qk = globalQuotaKey(openId);
|
|
61
100
|
const r = await rmwBotEntry(larkAppId, (entry) => {
|
|
62
101
|
const cur = Array.isArray(entry.globalGrants) ? entry.globalGrants : [];
|
|
63
102
|
const created = !cur.includes(openId);
|
|
64
103
|
if (created)
|
|
65
104
|
cur.push(openId);
|
|
66
105
|
entry.globalGrants = cur;
|
|
67
|
-
|
|
106
|
+
const qChanged = applyGrantQuota(entry, qk, quota);
|
|
107
|
+
return { write: created || qChanged, result: { created } };
|
|
68
108
|
});
|
|
69
109
|
if (!r.ok)
|
|
70
110
|
return r;
|
|
71
|
-
if (r.result.created) {
|
|
111
|
+
if (r.result.created && !bot.config.globalGrants?.includes(openId)) {
|
|
72
112
|
bot.config.globalGrants = [...(bot.config.globalGrants ?? []), openId];
|
|
73
|
-
logger.info(`[grant:${larkAppId}] +global ${openId}`);
|
|
74
113
|
}
|
|
114
|
+
applyGrantQuota(bot.config, qk, quota); // 同步内存
|
|
115
|
+
logger.info(`[grant:${larkAppId}] +global ${openId}${quota ? ` quota=${quota}` : ''}`);
|
|
75
116
|
return { ok: true, created: r.result.created };
|
|
76
117
|
}
|
|
118
|
+
/**
|
|
119
|
+
* scope-aware talk-only 移除:删本群 chatGrants[chatId] 中的 openId + 其 chat quota 记录。
|
|
120
|
+
* 额度用尽/崩溃自愈时调。不碰 allowedUsers、不碰 globalGrants,故无 would_open_bot 守卫。
|
|
121
|
+
*/
|
|
122
|
+
export async function removeChatGrant(larkAppId, chatId, openId) {
|
|
123
|
+
let bot;
|
|
124
|
+
try {
|
|
125
|
+
bot = getBot(larkAppId);
|
|
126
|
+
}
|
|
127
|
+
catch {
|
|
128
|
+
return { ok: false, reason: 'bot_not_registered' };
|
|
129
|
+
}
|
|
130
|
+
const qk = chatQuotaKey(chatId, openId);
|
|
131
|
+
const r = await rmwBotEntry(larkAppId, (entry) => {
|
|
132
|
+
let removed = false;
|
|
133
|
+
const map = (entry.chatGrants && typeof entry.chatGrants === 'object') ? entry.chatGrants : {};
|
|
134
|
+
if (Array.isArray(map[chatId]) && map[chatId].includes(openId)) {
|
|
135
|
+
map[chatId] = map[chatId].filter((u) => u !== openId);
|
|
136
|
+
if (map[chatId].length === 0)
|
|
137
|
+
delete map[chatId];
|
|
138
|
+
entry.chatGrants = map;
|
|
139
|
+
removed = true;
|
|
140
|
+
}
|
|
141
|
+
const qChanged = setQuotaRecord(entry, qk, null);
|
|
142
|
+
return { write: removed || qChanged, result: { removed } };
|
|
143
|
+
});
|
|
144
|
+
if (!r.ok)
|
|
145
|
+
return r;
|
|
146
|
+
if (r.result.removed && bot.config.chatGrants?.[chatId]) {
|
|
147
|
+
bot.config.chatGrants[chatId] = bot.config.chatGrants[chatId].filter(u => u !== openId);
|
|
148
|
+
if (bot.config.chatGrants[chatId].length === 0)
|
|
149
|
+
delete bot.config.chatGrants[chatId];
|
|
150
|
+
}
|
|
151
|
+
setQuotaRecord(bot.config, qk, null);
|
|
152
|
+
logger.info(`[grant:${larkAppId}] -chat ${chatId} ${openId} (quota exhausted/heal)`);
|
|
153
|
+
return { ok: true, removed: r.result.removed };
|
|
154
|
+
}
|
|
155
|
+
/**
|
|
156
|
+
* scope-aware talk-only 移除:删 globalGrants 中的 openId + 其 global quota 记录。
|
|
157
|
+
* talk-only,不碰 allowedUsers,无 would_open_bot 守卫(清空它不放大 operate)。
|
|
158
|
+
*/
|
|
159
|
+
export async function removeGlobalGrant(larkAppId, openId) {
|
|
160
|
+
let bot;
|
|
161
|
+
try {
|
|
162
|
+
bot = getBot(larkAppId);
|
|
163
|
+
}
|
|
164
|
+
catch {
|
|
165
|
+
return { ok: false, reason: 'bot_not_registered' };
|
|
166
|
+
}
|
|
167
|
+
const qk = globalQuotaKey(openId);
|
|
168
|
+
const r = await rmwBotEntry(larkAppId, (entry) => {
|
|
169
|
+
let removed = false;
|
|
170
|
+
const gg = Array.isArray(entry.globalGrants) ? entry.globalGrants : [];
|
|
171
|
+
if (gg.includes(openId)) {
|
|
172
|
+
const next = gg.filter((u) => u !== openId);
|
|
173
|
+
if (next.length > 0)
|
|
174
|
+
entry.globalGrants = next;
|
|
175
|
+
else
|
|
176
|
+
delete entry.globalGrants;
|
|
177
|
+
removed = true;
|
|
178
|
+
}
|
|
179
|
+
const qChanged = setQuotaRecord(entry, qk, null);
|
|
180
|
+
return { write: removed || qChanged, result: { removed } };
|
|
181
|
+
});
|
|
182
|
+
if (!r.ok)
|
|
183
|
+
return r;
|
|
184
|
+
if (r.result.removed) {
|
|
185
|
+
const next = (bot.config.globalGrants ?? []).filter(u => u !== openId);
|
|
186
|
+
if (next.length > 0)
|
|
187
|
+
bot.config.globalGrants = next;
|
|
188
|
+
else
|
|
189
|
+
delete bot.config.globalGrants;
|
|
190
|
+
}
|
|
191
|
+
setQuotaRecord(bot.config, qk, null);
|
|
192
|
+
logger.info(`[grant:${larkAppId}] -global ${openId} (quota exhausted/heal)`);
|
|
193
|
+
return { ok: true, removed: r.result.removed };
|
|
194
|
+
}
|
|
195
|
+
/**
|
|
196
|
+
* 扣一次额度(一条对话输入)。RMW 锁内递增、内存以锁内磁盘快照 used 为准。
|
|
197
|
+
* 无记录 → tracked:false(无需 enforce,放行)。
|
|
198
|
+
* 已达/超上限 → allow:false(应拦本条 + 自愈 revoke)。
|
|
199
|
+
* 正常递增 → allow:true,exhausted=(used 恰好达 limit),调用方放行本条、若 exhausted 则处理后 revoke。
|
|
200
|
+
* 基础设施失败(getBot / RMW)会 throw —— 调用方 catch 后 fail-closed(拒发以保硬上限)。
|
|
201
|
+
*/
|
|
202
|
+
export async function consumeQuota(larkAppId, quotaKey) {
|
|
203
|
+
const bot = getBot(larkAppId); // throw → 调用方 fail-closed
|
|
204
|
+
const r = await rmwBotEntry(larkAppId, (entry) => {
|
|
205
|
+
const qs = getQuotaMap(entry);
|
|
206
|
+
const rec = qs?.[quotaKey];
|
|
207
|
+
if (!rec)
|
|
208
|
+
return { write: false, result: { tracked: false, allow: true, exhausted: false, used: 0, limit: 0 } };
|
|
209
|
+
if (rec.used >= rec.limit) {
|
|
210
|
+
return { write: false, result: { tracked: true, allow: false, exhausted: true, used: rec.used, limit: rec.limit } };
|
|
211
|
+
}
|
|
212
|
+
const used = rec.used + 1;
|
|
213
|
+
entry.quotaState = { ...qs, [quotaKey]: { limit: rec.limit, used } };
|
|
214
|
+
return { write: true, result: { tracked: true, allow: true, exhausted: used >= rec.limit, used, limit: rec.limit } };
|
|
215
|
+
});
|
|
216
|
+
if (!r.ok)
|
|
217
|
+
throw new Error(`consumeQuota RMW failed: ${r.reason}`);
|
|
218
|
+
if (r.result.tracked)
|
|
219
|
+
setQuotaRecord(bot.config, quotaKey, { limit: r.result.limit, used: r.result.used });
|
|
220
|
+
return r.result;
|
|
221
|
+
}
|
|
77
222
|
/**
|
|
78
223
|
* 整群 talk 授权:把 chatId 加入 allowedChatGroups("talk-open 的 chat_id 列表")。
|
|
79
224
|
* 命中后该 chat 任何成员都过 canTalk(见 event-dispatcher.canTalk),不授 canOperate。
|
|
@@ -188,7 +333,10 @@ export async function revokeGrant(larkAppId, chatId, openId) {
|
|
|
188
333
|
delete entry.globalGrants;
|
|
189
334
|
globalTalk = true;
|
|
190
335
|
}
|
|
191
|
-
|
|
336
|
+
// 手动 /revoke 一并清两 scope 的额度记录(与三支授权同 RMW 原子)。
|
|
337
|
+
const qChat = setQuotaRecord(entry, chatQuotaKey(chatId, openId), null);
|
|
338
|
+
const qGlobal = setQuotaRecord(entry, globalQuotaKey(openId), null);
|
|
339
|
+
return { write: chat || global || globalTalk || qChat || qGlobal, result: { chat, global, globalTalk } };
|
|
192
340
|
});
|
|
193
341
|
if (!r.ok)
|
|
194
342
|
return r;
|
|
@@ -214,6 +362,9 @@ export async function revokeGrant(larkAppId, chatId, openId) {
|
|
|
214
362
|
else
|
|
215
363
|
delete bot.config.globalGrants;
|
|
216
364
|
}
|
|
365
|
+
// 同步内存额度记录(两 scope)
|
|
366
|
+
setQuotaRecord(bot.config, chatQuotaKey(chatId, openId), null);
|
|
367
|
+
setQuotaRecord(bot.config, globalQuotaKey(openId), null);
|
|
217
368
|
logger.info(`[grant:${larkAppId}] revoke chat=${chatId} ${openId} removed=${JSON.stringify(r.result)}`);
|
|
218
369
|
return { ok: true, removed: r.result };
|
|
219
370
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grant-store.js","sourceRoot":"","sources":["../../src/services/grant-store.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"grant-store.js","sourceRoot":"","sources":["../../src/services/grant-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 消息额度扣费去重:飞书事件可能重投、WSClient 重连后同一 message_id 可能再次进来,
|
|
3
|
+
* 硬额度若按事件次数扣会被重复扣。这里用一个有界的 message_id 状态表做幂等。
|
|
4
|
+
*
|
|
5
|
+
* 三态去重(codex review 二轮收紧,修 fail-open):
|
|
6
|
+
* - beginCharge 首次见 id → 记 **pending**("扣费进行中",非定论),返回 'fresh':调用方继续扣费。
|
|
7
|
+
* - 扣费**成功** → commitCharge 转 **done**;后续同 id 重投命中 done → 返回 'done':跳过扣费、放行
|
|
8
|
+
* (同一条消息只扣一次)。
|
|
9
|
+
* - 扣费**失败 / 被拒**(consumeQuota throw、或 allow=false 这种 fail-closed drop)→ abortCharge
|
|
10
|
+
* 删除标记,让后续重投**重新走扣费判定**,避免「先 mark 后失败/被拒 → 重投命中标记被放行 →
|
|
11
|
+
* 硬上限被绕过」的 fail-open。**关键**:被拒消息绝不能留成 done,否则重投会被直接放行。
|
|
12
|
+
* - 重投撞上仍 **pending**(前一投扣费 in-flight 未定论)→ 返回 'pending':调用方按 **fail-closed
|
|
13
|
+
* drop** 处理(不放行、不扣),绝不在扣费定论前放行第二投。第一投走完会照常扣费+投递。
|
|
14
|
+
*
|
|
15
|
+
* 纯内存:重投是近期行为(秒~分钟级),daemon 重启后再收到旧 message_id 概率极低,
|
|
16
|
+
* 额度近似安全,不值得持久化。
|
|
17
|
+
*/
|
|
18
|
+
/** beginCharge 的结果:见 beginCharge 文档。 */
|
|
19
|
+
export type ChargeOutcome = 'fresh' | 'pending' | 'done';
|
|
20
|
+
/**
|
|
21
|
+
* 标记/查询一次扣费,返回三态:
|
|
22
|
+
* - 'fresh' 首次见此 id(已记 pending):调用方应继续扣费。
|
|
23
|
+
* - 'pending' 已有 in-flight 扣费尚未定论:调用方应 **fail-closed drop**(不放行、不扣)。
|
|
24
|
+
* - 'done' 已成功扣费定论:调用方放行(跳过扣费,不重复扣)。
|
|
25
|
+
* 空 messageId 无法去重 → 永远 'fresh'(commit/abort 对它是 no-op)。
|
|
26
|
+
*/
|
|
27
|
+
export declare function beginCharge(larkAppId: string, messageId: string): ChargeOutcome;
|
|
28
|
+
/** 扣费成功:pending → done(定论,后续重投会被跳过+放行)。 */
|
|
29
|
+
export declare function commitCharge(larkAppId: string, messageId: string): void;
|
|
30
|
+
/** 扣费失败 / 被拒(fail-closed drop):删除标记,让后续重投重新判定(保硬上限不被绕过)。 */
|
|
31
|
+
export declare function abortCharge(larkAppId: string, messageId: string): void;
|
|
32
|
+
export declare function _resetForTest(): void;
|
|
33
|
+
//# sourceMappingURL=quota-dedup.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"quota-dedup.d.ts","sourceRoot":"","sources":["../../src/services/quota-dedup.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAIH,wCAAwC;AACxC,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM,CAAC;AAMzD;;;;;;GAMG;AACH,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,aAAa,CAQ/E;AAED,2CAA2C;AAC3C,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAIvE;AAED,4DAA4D;AAC5D,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAGtE;AAaD,wBAAgB,aAAa,IAAI,IAAI,CAA4B"}
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 消息额度扣费去重:飞书事件可能重投、WSClient 重连后同一 message_id 可能再次进来,
|
|
3
|
+
* 硬额度若按事件次数扣会被重复扣。这里用一个有界的 message_id 状态表做幂等。
|
|
4
|
+
*
|
|
5
|
+
* 三态去重(codex review 二轮收紧,修 fail-open):
|
|
6
|
+
* - beginCharge 首次见 id → 记 **pending**("扣费进行中",非定论),返回 'fresh':调用方继续扣费。
|
|
7
|
+
* - 扣费**成功** → commitCharge 转 **done**;后续同 id 重投命中 done → 返回 'done':跳过扣费、放行
|
|
8
|
+
* (同一条消息只扣一次)。
|
|
9
|
+
* - 扣费**失败 / 被拒**(consumeQuota throw、或 allow=false 这种 fail-closed drop)→ abortCharge
|
|
10
|
+
* 删除标记,让后续重投**重新走扣费判定**,避免「先 mark 后失败/被拒 → 重投命中标记被放行 →
|
|
11
|
+
* 硬上限被绕过」的 fail-open。**关键**:被拒消息绝不能留成 done,否则重投会被直接放行。
|
|
12
|
+
* - 重投撞上仍 **pending**(前一投扣费 in-flight 未定论)→ 返回 'pending':调用方按 **fail-closed
|
|
13
|
+
* drop** 处理(不放行、不扣),绝不在扣费定论前放行第二投。第一投走完会照常扣费+投递。
|
|
14
|
+
*
|
|
15
|
+
* 纯内存:重投是近期行为(秒~分钟级),daemon 重启后再收到旧 message_id 概率极低,
|
|
16
|
+
* 额度近似安全,不值得持久化。
|
|
17
|
+
*/
|
|
18
|
+
const MAX_ENTRIES = 5000;
|
|
19
|
+
const table = new Map(); // key=`${larkAppId}:${messageId}`
|
|
20
|
+
let seq = 0;
|
|
21
|
+
const key = (larkAppId, messageId) => `${larkAppId}:${messageId}`;
|
|
22
|
+
/**
|
|
23
|
+
* 标记/查询一次扣费,返回三态:
|
|
24
|
+
* - 'fresh' 首次见此 id(已记 pending):调用方应继续扣费。
|
|
25
|
+
* - 'pending' 已有 in-flight 扣费尚未定论:调用方应 **fail-closed drop**(不放行、不扣)。
|
|
26
|
+
* - 'done' 已成功扣费定论:调用方放行(跳过扣费,不重复扣)。
|
|
27
|
+
* 空 messageId 无法去重 → 永远 'fresh'(commit/abort 对它是 no-op)。
|
|
28
|
+
*/
|
|
29
|
+
export function beginCharge(larkAppId, messageId) {
|
|
30
|
+
if (!messageId)
|
|
31
|
+
return 'fresh';
|
|
32
|
+
const k = key(larkAppId, messageId);
|
|
33
|
+
const e = table.get(k);
|
|
34
|
+
if (e)
|
|
35
|
+
return e.state === 'done' ? 'done' : 'pending';
|
|
36
|
+
table.set(k, { state: 'pending', seq: ++seq });
|
|
37
|
+
evict();
|
|
38
|
+
return 'fresh';
|
|
39
|
+
}
|
|
40
|
+
/** 扣费成功:pending → done(定论,后续重投会被跳过+放行)。 */
|
|
41
|
+
export function commitCharge(larkAppId, messageId) {
|
|
42
|
+
if (!messageId)
|
|
43
|
+
return;
|
|
44
|
+
const e = table.get(key(larkAppId, messageId));
|
|
45
|
+
if (e)
|
|
46
|
+
e.state = 'done';
|
|
47
|
+
}
|
|
48
|
+
/** 扣费失败 / 被拒(fail-closed drop):删除标记,让后续重投重新判定(保硬上限不被绕过)。 */
|
|
49
|
+
export function abortCharge(larkAppId, messageId) {
|
|
50
|
+
if (!messageId)
|
|
51
|
+
return;
|
|
52
|
+
table.delete(key(larkAppId, messageId));
|
|
53
|
+
}
|
|
54
|
+
/** 有界淘汰:超限时按插入序删最旧(Map 迭代序即插入序)。pending 短命,极少被淘汰。 */
|
|
55
|
+
function evict() {
|
|
56
|
+
if (table.size <= MAX_ENTRIES)
|
|
57
|
+
return;
|
|
58
|
+
const drop = table.size - MAX_ENTRIES;
|
|
59
|
+
let i = 0;
|
|
60
|
+
for (const oldKey of table.keys()) {
|
|
61
|
+
table.delete(oldKey);
|
|
62
|
+
if (++i >= drop)
|
|
63
|
+
break;
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
export function _resetForTest() { table.clear(); seq = 0; }
|
|
67
|
+
//# sourceMappingURL=quota-dedup.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"quota-dedup.js","sourceRoot":"","sources":["../../src/services/quota-dedup.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,MAAM,WAAW,GAAG,IAAI,CAAC;AAIzB,MAAM,KAAK,GAAG,IAAI,GAAG,EAAyC,CAAC,CAAC,kCAAkC;AAClG,IAAI,GAAG,GAAG,CAAC,CAAC;AAEZ,MAAM,GAAG,GAAG,CAAC,SAAiB,EAAE,SAAiB,EAAE,EAAE,CAAC,GAAG,SAAS,IAAI,SAAS,EAAE,CAAC;AAElF;;;;;;GAMG;AACH,MAAM,UAAU,WAAW,CAAC,SAAiB,EAAE,SAAiB;IAC9D,IAAI,CAAC,SAAS;QAAE,OAAO,OAAO,CAAC;IAC/B,MAAM,CAAC,GAAG,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACpC,MAAM,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACvB,IAAI,CAAC;QAAE,OAAO,CAAC,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;IACtD,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;IAC/C,KAAK,EAAE,CAAC;IACR,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,2CAA2C;AAC3C,MAAM,UAAU,YAAY,CAAC,SAAiB,EAAE,SAAiB;IAC/D,IAAI,CAAC,SAAS;QAAE,OAAO;IACvB,MAAM,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;IAC/C,IAAI,CAAC;QAAE,CAAC,CAAC,KAAK,GAAG,MAAM,CAAC;AAC1B,CAAC;AAED,4DAA4D;AAC5D,MAAM,UAAU,WAAW,CAAC,SAAiB,EAAE,SAAiB;IAC9D,IAAI,CAAC,SAAS;QAAE,OAAO;IACvB,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;AAC1C,CAAC;AAED,qDAAqD;AACrD,SAAS,KAAK;IACZ,IAAI,KAAK,CAAC,IAAI,IAAI,WAAW;QAAE,OAAO;IACtC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,GAAG,WAAW,CAAC;IACtC,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;QAClC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACrB,IAAI,EAAE,CAAC,IAAI,IAAI;YAAE,MAAM;IACzB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,aAAa,KAAW,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC"}
|