cli-jaw 2.2.18 → 2.2.20
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 +106 -3
- package/dist/bin/cli-jaw.js +1 -1
- package/dist/bin/cli-jaw.js.map +1 -1
- package/dist/bin/commands/dispatch.js +14 -4
- package/dist/bin/commands/dispatch.js.map +1 -1
- package/dist/bin/commands/service.js +322 -222
- package/dist/bin/commands/service.js.map +1 -1
- package/dist/bin/postinstall.js +20 -4
- package/dist/bin/postinstall.js.map +1 -1
- package/dist/server.js +39 -2
- package/dist/server.js.map +1 -1
- package/dist/src/agent/spawn/process-kill.js +96 -2
- package/dist/src/agent/spawn/process-kill.js.map +1 -1
- package/dist/src/agent/spawn.js +35 -77
- package/dist/src/agent/spawn.js.map +1 -1
- package/dist/src/bgtask/runner.js +26 -21
- package/dist/src/bgtask/runner.js.map +1 -1
- package/dist/src/cli/acp-client.js +11 -5
- package/dist/src/cli/acp-client.js.map +1 -1
- package/dist/src/cli/cli-status-worker.js +59 -6
- package/dist/src/cli/cli-status-worker.js.map +1 -1
- package/dist/src/cli/employee-handler.js +3 -2
- package/dist/src/cli/employee-handler.js.map +1 -1
- package/dist/src/code-mode/acp-host.js +22 -10
- package/dist/src/code-mode/acp-host.js.map +1 -1
- package/dist/src/core/cli-detect.js +54 -8
- package/dist/src/core/cli-detect.js.map +1 -1
- package/dist/src/core/config.js +24 -0
- package/dist/src/core/config.js.map +1 -1
- package/dist/src/core/db.js +16 -0
- package/dist/src/core/db.js.map +1 -1
- package/dist/src/core/employees.js +22 -4
- package/dist/src/core/employees.js.map +1 -1
- package/dist/src/core/instance-lifecycle.js +120 -0
- package/dist/src/core/instance-lifecycle.js.map +1 -0
- package/dist/src/core/runtime-path.js +92 -12
- package/dist/src/core/runtime-path.js.map +1 -1
- package/dist/src/core/runtime-settings.js +4 -1
- package/dist/src/core/runtime-settings.js.map +1 -1
- package/dist/src/core/settings-watch.js +12 -1
- package/dist/src/core/settings-watch.js.map +1 -1
- package/dist/src/core/windows-shell.js +63 -0
- package/dist/src/core/windows-shell.js.map +1 -0
- package/dist/src/discord/bot.js +199 -147
- package/dist/src/discord/bot.js.map +1 -1
- package/dist/src/discord/gateway-supervisor.js +303 -0
- package/dist/src/discord/gateway-supervisor.js.map +1 -0
- package/dist/src/discord/rest-scheduler.js +448 -0
- package/dist/src/discord/rest-scheduler.js.map +1 -0
- package/dist/src/discord/send-only-client.js +59 -43
- package/dist/src/discord/send-only-client.js.map +1 -1
- package/dist/src/manager/lifecycle.js +7 -2
- package/dist/src/manager/lifecycle.js.map +1 -1
- package/dist/src/manager/notes/capabilities.js +9 -7
- package/dist/src/manager/notes/capabilities.js.map +1 -1
- package/dist/src/memory/bootstrap.js +5 -1
- package/dist/src/memory/bootstrap.js.map +1 -1
- package/dist/src/memory/host-toolchain.js +156 -0
- package/dist/src/memory/host-toolchain.js.map +1 -0
- package/dist/src/messaging/channel-capabilities.js +30 -0
- package/dist/src/messaging/channel-capabilities.js.map +1 -0
- package/dist/src/messaging/delivery-outcome.js +73 -0
- package/dist/src/messaging/delivery-outcome.js.map +1 -0
- package/dist/src/messaging/draft-stream.js +154 -0
- package/dist/src/messaging/draft-stream.js.map +1 -0
- package/dist/src/messaging/runtime.js +3 -9
- package/dist/src/messaging/runtime.js.map +1 -1
- package/dist/src/messaging/send.js +40 -8
- package/dist/src/messaging/send.js.map +1 -1
- package/dist/src/messaging/types.js +22 -1
- package/dist/src/messaging/types.js.map +1 -1
- package/dist/src/notes/search.js +31 -6
- package/dist/src/notes/search.js.map +1 -1
- package/dist/src/prompt/builder.js +169 -13
- package/dist/src/prompt/builder.js.map +1 -1
- package/dist/src/prompt/conversation-context.js +23 -0
- package/dist/src/prompt/conversation-context.js.map +1 -0
- package/dist/src/prompt/templates/a1-system.md +28 -12
- package/dist/src/prompt/templates/control-system.md +19 -6
- package/dist/src/prompt/templates/employee.md +16 -3
- package/dist/src/routes/settings.js +8 -1
- package/dist/src/routes/settings.js.map +1 -1
- package/dist/src/routes/system.js +5 -1
- package/dist/src/routes/system.js.map +1 -1
- package/dist/src/routes/wiki.js +17 -12
- package/dist/src/routes/wiki.js.map +1 -1
- package/dist/src/search/coordinator.js +13 -5
- package/dist/src/search/coordinator.js.map +1 -1
- package/dist/src/search/provider.js.map +1 -1
- package/dist/src/search/providers/wiki.js +17 -9
- package/dist/src/search/providers/wiki.js.map +1 -1
- package/dist/src/security/path-guards.js +124 -27
- package/dist/src/security/path-guards.js.map +1 -1
- package/dist/src/slack/api.js +38 -5
- package/dist/src/slack/api.js.map +1 -1
- package/dist/src/slack/bot.js +214 -35
- package/dist/src/slack/bot.js.map +1 -1
- package/dist/src/slack/context.js +192 -0
- package/dist/src/slack/context.js.map +1 -0
- package/dist/src/slack/conversation.js +275 -0
- package/dist/src/slack/conversation.js.map +1 -0
- package/dist/src/slack/enrichment-cache.js +334 -0
- package/dist/src/slack/enrichment-cache.js.map +1 -0
- package/dist/src/slack/history.js +47 -8
- package/dist/src/slack/history.js.map +1 -1
- package/dist/src/slack/identity.js +99 -190
- package/dist/src/slack/identity.js.map +1 -1
- package/dist/src/slack/ingress.js +78 -2
- package/dist/src/slack/ingress.js.map +1 -1
- package/dist/src/slack/manifest.js +14 -3
- package/dist/src/slack/manifest.js.map +1 -1
- package/dist/src/slack/progress.js +39 -51
- package/dist/src/slack/progress.js.map +1 -1
- package/dist/src/slack/thread-tracker.js +78 -0
- package/dist/src/slack/thread-tracker.js.map +1 -1
- package/dist/src/telegram/bot.js +105 -56
- package/dist/src/telegram/bot.js.map +1 -1
- package/dist/src/telegram/update-offset.js +152 -0
- package/dist/src/telegram/update-offset.js.map +1 -0
- package/dist/src/wiki/config.js +42 -14
- package/dist/src/wiki/config.js.map +1 -1
- package/dist/src/wiki/prompt.js +2 -2
- package/dist/src/wiki/prompt.js.map +1 -1
- package/package.json +1 -1
- package/public/dist/assets/Agent-C5EvX-_v.js +1 -0
- package/public/dist/assets/{app-DqSJmDwP.js → app-is76CHGZ.js} +4 -4
- package/public/dist/assets/{bgtask-badge-D6XYRFI5.js → bgtask-badge-B0B1nXUs.js} +1 -1
- package/public/dist/assets/bgtask-badge-B2jUZ5mC.js +1 -0
- package/public/dist/assets/{employees-B_wKPfTO.js → employees-eiW0cC8z.js} +1 -1
- package/public/dist/assets/{iframe-renderer-D1-zDg8V.js → iframe-renderer-C7qQJX4c.js} +2 -2
- package/public/dist/assets/iframe-renderer-D7PB_yrC.js +1 -0
- package/public/dist/assets/{manager-Bjuh1jpq.js → manager-CP-Au860.js} +1 -1
- package/public/dist/assets/{memory-CNUpXWEC.js → memory--Q8Tb5SZ.js} +1 -1
- package/public/dist/assets/memory-rsKN0aa2.js +1 -0
- package/public/dist/assets/message-history-BttkY77h.js +1 -0
- package/public/dist/assets/{message-history-DB1rynP-.js → message-history-CfAHmCDW.js} +1 -1
- package/public/dist/assets/{render-DXwQzjsJ.js → render-BDso7Yb5.js} +1 -1
- package/public/dist/assets/{settings-CXndjCad.js → settings-CqnIqxkG.js} +1 -1
- package/public/dist/assets/{settings-core-t5yYVRrv.js → settings-core-BxuFkt4a.js} +4 -4
- package/public/dist/assets/settings-core-CdZ7oKhM.js +1 -0
- package/public/dist/assets/settings-pPMHNs0G.js +1 -0
- package/public/dist/assets/{sidebar-DgIj-LuT.js → sidebar-BNT58qR0.js} +3 -3
- package/public/dist/assets/{skills-QqxjqDHg.js → skills-CwRBcm3m.js} +1 -1
- package/public/dist/assets/skills-DiVoaVdS.js +1 -0
- package/public/dist/assets/slash-commands-Bx4saHwR.js +1 -0
- package/public/dist/assets/{slash-commands-B2V_jngP.js → slash-commands-cm0U58n7.js} +1 -1
- package/public/dist/assets/{trace-drawer-CBe9nRjS.js → trace-drawer-BuwO4m2P.js} +1 -1
- package/public/dist/assets/{ui-CDozpEQt.js → ui-C-LHMki1.js} +1 -1
- package/public/dist/assets/ui-XPQDPe-5.js +1 -0
- package/public/dist/index.html +1 -1
- package/public/dist/manager/index.html +1 -1
- package/public/js/features/channel-onboarding.ts +8 -5
- package/public/locales/en.json +3 -2
- package/public/locales/ja.json +3 -2
- package/public/locales/ko.json +3 -2
- package/public/locales/zh.json +3 -2
- package/public/manager/src/settings/cli-status-polling.ts +84 -0
- package/public/manager/src/settings/pages/Agent.tsx +84 -5
- package/scripts/install-officecli.ps1 +38 -2
- package/scripts/install-officecli.sh +28 -0
- package/scripts/install.ps1 +1 -1
- package/public/dist/assets/Agent-nMPZsMfN.js +0 -1
- package/public/dist/assets/bgtask-badge-CjWz0F6U.js +0 -1
- package/public/dist/assets/iframe-renderer-qRVLHPnT.js +0 -1
- package/public/dist/assets/memory-CcWGiPy_.js +0 -1
- package/public/dist/assets/message-history-BamMPUnL.js +0 -1
- package/public/dist/assets/settings-RGpifFHy.js +0 -1
- package/public/dist/assets/settings-core-X_5UHfr3.js +0 -1
- package/public/dist/assets/skills-CbwIimit.js +0 -1
- package/public/dist/assets/slash-commands-tCNRlNTC.js +0 -1
- package/public/dist/assets/ui-o-VpvrSv.js +0 -1
|
@@ -0,0 +1,448 @@
|
|
|
1
|
+
import { discordDeliveryError } from '../messaging/delivery-outcome.js';
|
|
2
|
+
const API_BASE = 'https://discord.com/api/v10';
|
|
3
|
+
const REQUEST_TIMEOUT_MS = 10_000;
|
|
4
|
+
const DEFAULT_MAX_QUEUE = 100;
|
|
5
|
+
const DEFAULT_MAX_RETRIES = 3;
|
|
6
|
+
const DEFAULT_MAX_WAIT_MS = 30_000;
|
|
7
|
+
const INITIAL_BACKOFF_MS = 250;
|
|
8
|
+
export class DiscordRestScheduler {
|
|
9
|
+
options;
|
|
10
|
+
fetchImpl;
|
|
11
|
+
now;
|
|
12
|
+
sleep;
|
|
13
|
+
maxQueue;
|
|
14
|
+
maxRetries;
|
|
15
|
+
maxWait;
|
|
16
|
+
lanes = new Map();
|
|
17
|
+
bucketAliases = new Map();
|
|
18
|
+
globalUntil = 0;
|
|
19
|
+
queued = 0;
|
|
20
|
+
nextSequence = 0;
|
|
21
|
+
generation = 0;
|
|
22
|
+
closed = false;
|
|
23
|
+
closeController = new AbortController();
|
|
24
|
+
constructor(options) {
|
|
25
|
+
this.options = options;
|
|
26
|
+
this.fetchImpl = options.fetchImpl ?? fetch;
|
|
27
|
+
this.now = options.now ?? Date.now;
|
|
28
|
+
this.sleep = options.sleep ?? abortableSleep;
|
|
29
|
+
this.maxQueue = options.maxQueue ?? DEFAULT_MAX_QUEUE;
|
|
30
|
+
this.maxRetries = options.maxRetries ?? DEFAULT_MAX_RETRIES;
|
|
31
|
+
this.maxWait = options.maxCumulativeWaitMs ?? DEFAULT_MAX_WAIT_MS;
|
|
32
|
+
}
|
|
33
|
+
schedule(request) {
|
|
34
|
+
if (this.closed || request.signal?.aborted) {
|
|
35
|
+
return Promise.resolve(this.unsent('discord_request_aborted'));
|
|
36
|
+
}
|
|
37
|
+
if (this.queued >= this.maxQueue) {
|
|
38
|
+
return Promise.resolve(this.unsent('discord_rest_queue_full'));
|
|
39
|
+
}
|
|
40
|
+
const routeMajor = routeMajorKey(request);
|
|
41
|
+
const laneKey = this.bucketAliases.get(routeMajor) ?? routeMajor;
|
|
42
|
+
const existing = this.lanes.get(laneKey);
|
|
43
|
+
const lane = existing ? this.canonical(existing) : newLane(laneKey);
|
|
44
|
+
if (!existing)
|
|
45
|
+
this.lanes.set(laneKey, lane);
|
|
46
|
+
this.queued += 1;
|
|
47
|
+
return new Promise((resolve) => {
|
|
48
|
+
const generation = this.generation;
|
|
49
|
+
const item = {
|
|
50
|
+
sequence: this.nextSequence++,
|
|
51
|
+
generation,
|
|
52
|
+
...(request.signal ? { callerSignal: request.signal } : {}),
|
|
53
|
+
run: async (owningLane) => {
|
|
54
|
+
resolve(await this.execute(request, generation, owningLane));
|
|
55
|
+
},
|
|
56
|
+
rejectUnsent: (code) => resolve(this.unsent(code)),
|
|
57
|
+
};
|
|
58
|
+
if (request.signal) {
|
|
59
|
+
const onAbort = () => this.cancelQueued(lane, item);
|
|
60
|
+
request.signal.addEventListener('abort', onAbort, { once: true });
|
|
61
|
+
item.detachAbort = () => request.signal?.removeEventListener('abort', onAbort);
|
|
62
|
+
}
|
|
63
|
+
lane.queue.push(item);
|
|
64
|
+
this.kick(lane);
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
close() {
|
|
68
|
+
if (this.closed)
|
|
69
|
+
return;
|
|
70
|
+
this.closed = true;
|
|
71
|
+
this.generation += 1;
|
|
72
|
+
this.closeController.abort();
|
|
73
|
+
const roots = new Set([...this.lanes.values()].map((lane) => this.canonical(lane)));
|
|
74
|
+
for (const lane of roots) {
|
|
75
|
+
for (const item of lane.queue.splice(0)) {
|
|
76
|
+
this.queued -= 1;
|
|
77
|
+
item.detachAbort?.();
|
|
78
|
+
item.rejectUnsent('discord_rest_scheduler_closed');
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
canonical(lane) {
|
|
83
|
+
if (!lane.parent)
|
|
84
|
+
return lane;
|
|
85
|
+
lane.parent = this.canonical(lane.parent);
|
|
86
|
+
return lane.parent;
|
|
87
|
+
}
|
|
88
|
+
kick(lane) {
|
|
89
|
+
const root = this.canonical(lane);
|
|
90
|
+
if (root.kickScheduled || this.closed)
|
|
91
|
+
return;
|
|
92
|
+
root.kickScheduled = true;
|
|
93
|
+
queueMicrotask(() => {
|
|
94
|
+
root.kickScheduled = false;
|
|
95
|
+
const current = this.canonical(root);
|
|
96
|
+
if (current !== root) {
|
|
97
|
+
this.kick(current);
|
|
98
|
+
return;
|
|
99
|
+
}
|
|
100
|
+
if (this.closed || current.active !== 0)
|
|
101
|
+
return;
|
|
102
|
+
const item = current.queue.shift();
|
|
103
|
+
if (!item) {
|
|
104
|
+
this.deleteIdleRoot(current);
|
|
105
|
+
return;
|
|
106
|
+
}
|
|
107
|
+
this.queued -= 1;
|
|
108
|
+
item.detachAbort?.();
|
|
109
|
+
if (item.generation !== this.generation || item.callerSignal?.aborted) {
|
|
110
|
+
item.rejectUnsent('discord_request_aborted');
|
|
111
|
+
this.kick(current);
|
|
112
|
+
return;
|
|
113
|
+
}
|
|
114
|
+
current.active += 1;
|
|
115
|
+
void item.run(current).finally(() => this.release(current));
|
|
116
|
+
});
|
|
117
|
+
}
|
|
118
|
+
cancelQueued(lane, item) {
|
|
119
|
+
const root = this.canonical(lane);
|
|
120
|
+
const index = root.queue.indexOf(item);
|
|
121
|
+
if (index < 0)
|
|
122
|
+
return;
|
|
123
|
+
root.queue.splice(index, 1);
|
|
124
|
+
this.queued -= 1;
|
|
125
|
+
item.detachAbort?.();
|
|
126
|
+
item.rejectUnsent('discord_request_aborted');
|
|
127
|
+
this.kick(root);
|
|
128
|
+
}
|
|
129
|
+
release(dispatchedFrom) {
|
|
130
|
+
const root = this.canonical(dispatchedFrom);
|
|
131
|
+
root.active -= 1;
|
|
132
|
+
if (root.active < 0)
|
|
133
|
+
throw new Error('discord_rest_lane_active_underflow');
|
|
134
|
+
if (root.active === 0)
|
|
135
|
+
this.kick(root);
|
|
136
|
+
}
|
|
137
|
+
deleteIdleRoot(root) {
|
|
138
|
+
if (root.active !== 0 || root.queue.length !== 0)
|
|
139
|
+
return;
|
|
140
|
+
for (const [key, lane] of this.lanes) {
|
|
141
|
+
if (this.canonical(lane) === root)
|
|
142
|
+
this.lanes.delete(key);
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
async execute(request, generation, initialLane) {
|
|
146
|
+
let retries = 0;
|
|
147
|
+
let cumulativeWait = 0;
|
|
148
|
+
let lane = this.canonical(initialLane);
|
|
149
|
+
while (!this.closed && generation === this.generation) {
|
|
150
|
+
lane = this.canonical(lane);
|
|
151
|
+
const gateUntil = Math.max(this.globalUntil, lane.remaining === 0 ? lane.resetAt : 0);
|
|
152
|
+
const gateWait = Math.max(0, gateUntil - this.now());
|
|
153
|
+
if (gateWait > 0) {
|
|
154
|
+
cumulativeWait += gateWait;
|
|
155
|
+
if (cumulativeWait > this.maxWait)
|
|
156
|
+
return this.rateLimit(gateWait);
|
|
157
|
+
if (!await this.waitFor(gateWait, request.signal)) {
|
|
158
|
+
return retries > 0 ? this.rateLimit(gateWait) : this.unsent('discord_request_aborted');
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
if (!await this.acquireFetch(lane, request.signal)) {
|
|
162
|
+
return retries > 0 ? this.rateLimit(0) : this.unsent('discord_request_aborted');
|
|
163
|
+
}
|
|
164
|
+
const dispatchLane = lane;
|
|
165
|
+
let init;
|
|
166
|
+
try {
|
|
167
|
+
init = await request.makeInit();
|
|
168
|
+
}
|
|
169
|
+
catch {
|
|
170
|
+
this.releaseFetch(dispatchLane);
|
|
171
|
+
return this.unsent('discord_request_init_failed');
|
|
172
|
+
}
|
|
173
|
+
if (this.closed || generation !== this.generation || request.signal?.aborted) {
|
|
174
|
+
this.releaseFetch(dispatchLane);
|
|
175
|
+
return this.unsent('discord_request_aborted');
|
|
176
|
+
}
|
|
177
|
+
let response;
|
|
178
|
+
try {
|
|
179
|
+
response = await this.fetchImpl(`${API_BASE}${request.path}`, {
|
|
180
|
+
...init,
|
|
181
|
+
method: request.method,
|
|
182
|
+
headers: { Authorization: `Bot ${this.options.token}`, ...(init.headers ?? {}) },
|
|
183
|
+
signal: combineSignals(request.signal, this.closeController.signal, AbortSignal.timeout(REQUEST_TIMEOUT_MS)),
|
|
184
|
+
});
|
|
185
|
+
}
|
|
186
|
+
catch (error) {
|
|
187
|
+
this.releaseFetch(dispatchLane);
|
|
188
|
+
return this.dispatchedFailure(error);
|
|
189
|
+
}
|
|
190
|
+
const meta = await readRateMeta(response);
|
|
191
|
+
lane = this.applyMeta(request, lane, meta);
|
|
192
|
+
this.releaseFetch(dispatchLane);
|
|
193
|
+
if (response.status === 429) {
|
|
194
|
+
const retryDelay = meta.retryAfterMs
|
|
195
|
+
?? meta.resetAfterMs
|
|
196
|
+
?? exponentialBackoff(retries);
|
|
197
|
+
if (meta.global) {
|
|
198
|
+
this.globalUntil = Math.max(this.globalUntil, this.now() + retryDelay);
|
|
199
|
+
}
|
|
200
|
+
else {
|
|
201
|
+
lane.remaining = 0;
|
|
202
|
+
lane.resetAt = Math.max(lane.resetAt, this.now() + retryDelay);
|
|
203
|
+
}
|
|
204
|
+
if (retries >= this.maxRetries || cumulativeWait + retryDelay > this.maxWait) {
|
|
205
|
+
return this.rateLimit(retryDelay, response.status);
|
|
206
|
+
}
|
|
207
|
+
retries += 1;
|
|
208
|
+
// Let other already-settled discovery responses union their lanes
|
|
209
|
+
// before this job attempts to reacquire the canonical fetch fence.
|
|
210
|
+
await Promise.resolve();
|
|
211
|
+
continue;
|
|
212
|
+
}
|
|
213
|
+
if (!response.ok)
|
|
214
|
+
return await this.responseFailure(response, meta);
|
|
215
|
+
try {
|
|
216
|
+
return { ok: true, status: response.status, value: await request.parse(response) };
|
|
217
|
+
}
|
|
218
|
+
catch (error) {
|
|
219
|
+
return this.dispatchedFailure(error, response.status);
|
|
220
|
+
}
|
|
221
|
+
}
|
|
222
|
+
return this.unsent('discord_rest_scheduler_closed');
|
|
223
|
+
}
|
|
224
|
+
applyMeta(request, lane, meta) {
|
|
225
|
+
lane = this.canonical(lane);
|
|
226
|
+
if (meta.remaining !== undefined)
|
|
227
|
+
lane.remaining = meta.remaining;
|
|
228
|
+
if (meta.resetAfterMs !== undefined)
|
|
229
|
+
lane.resetAt = this.now() + meta.resetAfterMs;
|
|
230
|
+
if (!meta.bucket)
|
|
231
|
+
return lane;
|
|
232
|
+
const routeMajor = routeMajorKey(request);
|
|
233
|
+
const learnedKey = `${meta.bucket}|${request.majorKey}`;
|
|
234
|
+
this.bucketAliases.set(routeMajor, learnedKey);
|
|
235
|
+
const learned = this.lanes.get(learnedKey);
|
|
236
|
+
if (!learned) {
|
|
237
|
+
lane.key = learnedKey;
|
|
238
|
+
this.lanes.set(learnedKey, lane);
|
|
239
|
+
return lane;
|
|
240
|
+
}
|
|
241
|
+
return this.mergeLanes(lane, this.canonical(learned), learnedKey);
|
|
242
|
+
}
|
|
243
|
+
mergeLanes(source, target, learnedKey) {
|
|
244
|
+
source = this.canonical(source);
|
|
245
|
+
target = this.canonical(target);
|
|
246
|
+
if (source === target)
|
|
247
|
+
return target;
|
|
248
|
+
target.active += source.active;
|
|
249
|
+
source.active = 0;
|
|
250
|
+
target.fetching += source.fetching;
|
|
251
|
+
source.fetching = 0;
|
|
252
|
+
target.fetchWaiters.push(...source.fetchWaiters);
|
|
253
|
+
source.fetchWaiters.length = 0;
|
|
254
|
+
target.queue.push(...source.queue);
|
|
255
|
+
target.queue.sort((left, right) => left.sequence - right.sequence);
|
|
256
|
+
source.queue.length = 0;
|
|
257
|
+
target.remaining = minimumKnown(target.remaining, source.remaining);
|
|
258
|
+
target.resetAt = Math.max(target.resetAt, source.resetAt);
|
|
259
|
+
source.parent = target;
|
|
260
|
+
this.lanes.set(learnedKey, target);
|
|
261
|
+
this.kick(target);
|
|
262
|
+
return target;
|
|
263
|
+
}
|
|
264
|
+
async acquireFetch(lane, caller) {
|
|
265
|
+
while (!this.closed) {
|
|
266
|
+
const root = this.canonical(lane);
|
|
267
|
+
if (root.fetching === 0) {
|
|
268
|
+
root.fetching = 1;
|
|
269
|
+
return true;
|
|
270
|
+
}
|
|
271
|
+
const signal = combineSignals(caller, this.closeController.signal);
|
|
272
|
+
try {
|
|
273
|
+
await new Promise((resolve, reject) => {
|
|
274
|
+
if (signal.aborted) {
|
|
275
|
+
reject(signal.reason);
|
|
276
|
+
return;
|
|
277
|
+
}
|
|
278
|
+
const wake = () => {
|
|
279
|
+
signal.removeEventListener('abort', onAbort);
|
|
280
|
+
resolve();
|
|
281
|
+
};
|
|
282
|
+
const onAbort = () => {
|
|
283
|
+
const owner = this.canonical(root);
|
|
284
|
+
const index = owner.fetchWaiters.indexOf(wake);
|
|
285
|
+
if (index >= 0)
|
|
286
|
+
owner.fetchWaiters.splice(index, 1);
|
|
287
|
+
reject(signal.reason);
|
|
288
|
+
};
|
|
289
|
+
root.fetchWaiters.push(wake);
|
|
290
|
+
signal.addEventListener('abort', onAbort, { once: true });
|
|
291
|
+
});
|
|
292
|
+
}
|
|
293
|
+
catch {
|
|
294
|
+
return false;
|
|
295
|
+
}
|
|
296
|
+
}
|
|
297
|
+
return false;
|
|
298
|
+
}
|
|
299
|
+
releaseFetch(dispatchedFrom) {
|
|
300
|
+
const root = this.canonical(dispatchedFrom);
|
|
301
|
+
root.fetching -= 1;
|
|
302
|
+
if (root.fetching < 0)
|
|
303
|
+
throw new Error('discord_rest_lane_fetch_underflow');
|
|
304
|
+
if (root.fetching === 0)
|
|
305
|
+
root.fetchWaiters.shift()?.();
|
|
306
|
+
}
|
|
307
|
+
async waitFor(ms, caller) {
|
|
308
|
+
try {
|
|
309
|
+
await this.sleep(ms, combineSignals(caller, this.closeController.signal));
|
|
310
|
+
return true;
|
|
311
|
+
}
|
|
312
|
+
catch {
|
|
313
|
+
return false;
|
|
314
|
+
}
|
|
315
|
+
}
|
|
316
|
+
async responseFailure(response, meta) {
|
|
317
|
+
const body = await safeJson(response.clone());
|
|
318
|
+
const message = typeof body['message'] === 'string'
|
|
319
|
+
? body['message']
|
|
320
|
+
: await response.text().catch(() => response.statusText);
|
|
321
|
+
const failure = discordDeliveryError({
|
|
322
|
+
channel: 'discord',
|
|
323
|
+
status: response.status,
|
|
324
|
+
message,
|
|
325
|
+
...(body['code'] === undefined ? {} : { code: String(body['code']) }),
|
|
326
|
+
...(meta.retryAfterMs === undefined ? {} : { retryAfterMs: meta.retryAfterMs }),
|
|
327
|
+
dispatched: true,
|
|
328
|
+
});
|
|
329
|
+
return { ok: false, status: response.status, failure };
|
|
330
|
+
}
|
|
331
|
+
dispatchedFailure(error, status) {
|
|
332
|
+
const failure = discordDeliveryError({
|
|
333
|
+
channel: 'discord',
|
|
334
|
+
...(status === undefined ? {} : { status }),
|
|
335
|
+
dispatched: true,
|
|
336
|
+
message: error instanceof Error ? error.message : String(error),
|
|
337
|
+
cause: error,
|
|
338
|
+
});
|
|
339
|
+
return { ok: false, ...(status === undefined ? {} : { status }), failure };
|
|
340
|
+
}
|
|
341
|
+
unsent(code) {
|
|
342
|
+
return {
|
|
343
|
+
ok: false,
|
|
344
|
+
failure: discordDeliveryError({
|
|
345
|
+
channel: 'discord', code, message: code, dispatched: false,
|
|
346
|
+
}),
|
|
347
|
+
};
|
|
348
|
+
}
|
|
349
|
+
rateLimit(ms, status = 429) {
|
|
350
|
+
return {
|
|
351
|
+
ok: false,
|
|
352
|
+
status,
|
|
353
|
+
failure: discordDeliveryError({
|
|
354
|
+
channel: 'discord',
|
|
355
|
+
status,
|
|
356
|
+
code: 'rate_limited',
|
|
357
|
+
message: 'Discord rate limit retry budget exhausted',
|
|
358
|
+
retryAfterMs: ms,
|
|
359
|
+
dispatched: true,
|
|
360
|
+
}),
|
|
361
|
+
};
|
|
362
|
+
}
|
|
363
|
+
}
|
|
364
|
+
function newLane(key) {
|
|
365
|
+
return {
|
|
366
|
+
key,
|
|
367
|
+
parent: null,
|
|
368
|
+
queue: [],
|
|
369
|
+
active: 0,
|
|
370
|
+
fetching: 0,
|
|
371
|
+
fetchWaiters: [],
|
|
372
|
+
kickScheduled: false,
|
|
373
|
+
remaining: null,
|
|
374
|
+
resetAt: 0,
|
|
375
|
+
};
|
|
376
|
+
}
|
|
377
|
+
function routeMajorKey(request) {
|
|
378
|
+
return `${request.routeKey}|${request.majorKey}`;
|
|
379
|
+
}
|
|
380
|
+
async function readRateMeta(response) {
|
|
381
|
+
const body = response.status === 429 ? await safeJson(response.clone()) : {};
|
|
382
|
+
const bucket = header(response, 'x-ratelimit-bucket');
|
|
383
|
+
const remaining = headerNumber(response, 'x-ratelimit-remaining');
|
|
384
|
+
const resetAfterMs = secondsToMs(header(response, 'x-ratelimit-reset-after'));
|
|
385
|
+
const retryAfterMs = secondsToMs(header(response, 'retry-after') ?? body['retry_after']);
|
|
386
|
+
return {
|
|
387
|
+
...(bucket ? { bucket } : {}),
|
|
388
|
+
...(remaining === undefined ? {} : { remaining: Math.max(0, Math.floor(remaining)) }),
|
|
389
|
+
...(resetAfterMs === undefined ? {} : { resetAfterMs }),
|
|
390
|
+
...(retryAfterMs === undefined ? {} : { retryAfterMs }),
|
|
391
|
+
global: response.headers.get('x-ratelimit-global') === 'true'
|
|
392
|
+
|| response.headers.get('x-ratelimit-scope') === 'global'
|
|
393
|
+
|| body['global'] === true,
|
|
394
|
+
};
|
|
395
|
+
}
|
|
396
|
+
function header(response, name) {
|
|
397
|
+
return response.headers.get(name) ?? undefined;
|
|
398
|
+
}
|
|
399
|
+
function headerNumber(response, name) {
|
|
400
|
+
const raw = response.headers.get(name);
|
|
401
|
+
if (raw === null || raw.trim() === '')
|
|
402
|
+
return undefined;
|
|
403
|
+
const value = Number(raw);
|
|
404
|
+
return Number.isFinite(value) ? value : undefined;
|
|
405
|
+
}
|
|
406
|
+
function secondsToMs(value) {
|
|
407
|
+
const seconds = Number(value);
|
|
408
|
+
return Number.isFinite(seconds) && seconds >= 0 ? Math.ceil(seconds * 1000) : undefined;
|
|
409
|
+
}
|
|
410
|
+
function exponentialBackoff(retry) {
|
|
411
|
+
return INITIAL_BACKOFF_MS * (2 ** retry);
|
|
412
|
+
}
|
|
413
|
+
function minimumKnown(left, right) {
|
|
414
|
+
if (left === null)
|
|
415
|
+
return right;
|
|
416
|
+
if (right === null)
|
|
417
|
+
return left;
|
|
418
|
+
return Math.min(left, right);
|
|
419
|
+
}
|
|
420
|
+
async function safeJson(response) {
|
|
421
|
+
const value = await response.json().catch(() => ({}));
|
|
422
|
+
return value && typeof value === 'object' && !Array.isArray(value)
|
|
423
|
+
? value
|
|
424
|
+
: {};
|
|
425
|
+
}
|
|
426
|
+
function combineSignals(...values) {
|
|
427
|
+
const signals = values.filter((value) => value !== undefined);
|
|
428
|
+
return signals.length === 1 ? signals[0] : AbortSignal.any(signals);
|
|
429
|
+
}
|
|
430
|
+
function abortableSleep(ms, signal) {
|
|
431
|
+
return new Promise((resolve, reject) => {
|
|
432
|
+
if (signal.aborted) {
|
|
433
|
+
reject(signal.reason);
|
|
434
|
+
return;
|
|
435
|
+
}
|
|
436
|
+
const done = () => {
|
|
437
|
+
signal.removeEventListener('abort', aborted);
|
|
438
|
+
resolve();
|
|
439
|
+
};
|
|
440
|
+
const aborted = () => {
|
|
441
|
+
clearTimeout(timer);
|
|
442
|
+
reject(signal.reason);
|
|
443
|
+
};
|
|
444
|
+
const timer = setTimeout(done, ms);
|
|
445
|
+
signal.addEventListener('abort', aborted, { once: true });
|
|
446
|
+
});
|
|
447
|
+
}
|
|
448
|
+
//# sourceMappingURL=rest-scheduler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rest-scheduler.js","sourceRoot":"","sources":["../../../src/discord/rest-scheduler.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,8 +4,12 @@ import { settings } from '../core/config.js';
|
|
|
4
4
|
import { chunkDiscordMessage } from './forwarder.js';
|
|
5
5
|
import { validateDiscordFileSize } from './discord-file.js';
|
|
6
6
|
import { redactOutboundText } from '../messaging/redact.js';
|
|
7
|
+
import { DiscordRestScheduler, } from './rest-scheduler.js';
|
|
8
|
+
import { discordDeliveryError, } from '../messaging/delivery-outcome.js';
|
|
9
|
+
let cachedScheduler = null;
|
|
7
10
|
export function invalidateDiscordSendClient() {
|
|
8
|
-
|
|
11
|
+
cachedScheduler?.scheduler.close();
|
|
12
|
+
cachedScheduler = null;
|
|
9
13
|
}
|
|
10
14
|
export function getDiscordSendClient() {
|
|
11
15
|
const dc = settings["discord"];
|
|
@@ -18,41 +22,40 @@ export function getDiscordSendClient() {
|
|
|
18
22
|
}
|
|
19
23
|
return { token };
|
|
20
24
|
}
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
// Without a deadline a stalled socket holds the send path open
|
|
32
|
-
// indefinitely. AbortSignal cancels the request rather than just
|
|
33
|
-
// abandoning the promise, which Promise.race would not do.
|
|
34
|
-
signal: AbortSignal.timeout(REST_TIMEOUT_MS),
|
|
35
|
-
});
|
|
36
|
-
if (!response.ok) {
|
|
37
|
-
const body = await response.text().catch(() => '');
|
|
38
|
-
return { ok: false, error: body || response.statusText, status: response.status };
|
|
39
|
-
}
|
|
25
|
+
function schedulerFor(token) {
|
|
26
|
+
if (cachedScheduler?.token === token)
|
|
27
|
+
return cachedScheduler.scheduler;
|
|
28
|
+
cachedScheduler?.scheduler.close();
|
|
29
|
+
const scheduler = new DiscordRestScheduler({ token });
|
|
30
|
+
cachedScheduler = { token, scheduler };
|
|
31
|
+
return scheduler;
|
|
32
|
+
}
|
|
33
|
+
function sendResult(result) {
|
|
34
|
+
if (result.ok)
|
|
40
35
|
return { ok: true };
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
36
|
+
return {
|
|
37
|
+
ok: false,
|
|
38
|
+
failure: result.failure,
|
|
39
|
+
error: result.failure.message,
|
|
40
|
+
...('status' in result && result.status !== undefined ? { status: result.status } : {}),
|
|
41
|
+
};
|
|
45
42
|
}
|
|
46
43
|
export async function sendDiscordTextRest(token, channelId, text) {
|
|
47
44
|
const chunks = chunkDiscordMessage(text);
|
|
48
45
|
for (const chunk of chunks) {
|
|
49
|
-
const result = await
|
|
46
|
+
const result = await schedulerFor(token).schedule({
|
|
50
47
|
method: 'POST',
|
|
51
|
-
|
|
52
|
-
|
|
48
|
+
path: `/channels/${encodeURIComponent(channelId)}/messages`,
|
|
49
|
+
routeKey: 'POST:/channels/:channel/messages',
|
|
50
|
+
majorKey: channelId,
|
|
51
|
+
makeInit: () => ({
|
|
52
|
+
headers: { 'Content-Type': 'application/json' },
|
|
53
|
+
body: JSON.stringify({ content: chunk }),
|
|
54
|
+
}),
|
|
55
|
+
parse: async () => undefined,
|
|
53
56
|
});
|
|
54
57
|
if (!result.ok)
|
|
55
|
-
return result;
|
|
58
|
+
return sendResult(result);
|
|
56
59
|
}
|
|
57
60
|
return { ok: true };
|
|
58
61
|
}
|
|
@@ -60,26 +63,39 @@ export async function sendDiscordFileRest(token, channelId, filePath, caption) {
|
|
|
60
63
|
try {
|
|
61
64
|
const buffer = await readFile(filePath);
|
|
62
65
|
validateDiscordFileSize(filePath, buffer.length);
|
|
63
|
-
const
|
|
64
|
-
|
|
65
|
-
if (caption?.trim()) {
|
|
66
|
-
form.append('payload_json', JSON.stringify({ content: redactOutboundText(caption.trim()) }));
|
|
67
|
-
}
|
|
68
|
-
const response = await fetch(`https://discord.com/api/v10/channels/${encodeURIComponent(channelId)}/messages`, {
|
|
66
|
+
const safeCaption = caption?.trim() ? redactOutboundText(caption.trim()) : '';
|
|
67
|
+
const result = await schedulerFor(token).schedule({
|
|
69
68
|
method: 'POST',
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
69
|
+
path: `/channels/${encodeURIComponent(channelId)}/messages`,
|
|
70
|
+
routeKey: 'POST:/channels/:channel/messages',
|
|
71
|
+
majorKey: channelId,
|
|
72
|
+
makeInit: () => {
|
|
73
|
+
const form = new FormData();
|
|
74
|
+
form.append('files[0]', new Blob([buffer]), basename(filePath));
|
|
75
|
+
if (safeCaption) {
|
|
76
|
+
form.append('payload_json', JSON.stringify({ content: safeCaption }));
|
|
77
|
+
}
|
|
78
|
+
return { body: form };
|
|
79
|
+
},
|
|
80
|
+
parse: async () => undefined,
|
|
73
81
|
});
|
|
74
|
-
|
|
75
|
-
const body = await response.text().catch(() => '');
|
|
76
|
-
return { ok: false, error: body || response.statusText, status: response.status };
|
|
77
|
-
}
|
|
78
|
-
return { ok: true };
|
|
82
|
+
return sendResult(result);
|
|
79
83
|
}
|
|
80
84
|
catch (error) {
|
|
81
85
|
const statusCode = error.statusCode;
|
|
82
|
-
|
|
86
|
+
const failure = discordDeliveryError({
|
|
87
|
+
channel: 'discord',
|
|
88
|
+
...(statusCode === undefined ? {} : { status: statusCode }),
|
|
89
|
+
message: error instanceof Error ? error.message : String(error),
|
|
90
|
+
dispatched: false,
|
|
91
|
+
cause: error,
|
|
92
|
+
});
|
|
93
|
+
return {
|
|
94
|
+
ok: false,
|
|
95
|
+
failure,
|
|
96
|
+
error: failure.message,
|
|
97
|
+
...(statusCode === undefined ? {} : { status: statusCode }),
|
|
98
|
+
};
|
|
83
99
|
}
|
|
84
100
|
}
|
|
85
101
|
//# sourceMappingURL=send-only-client.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send-only-client.js","sourceRoot":"","sources":["../../../src/discord/send-only-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"send-only-client.js","sourceRoot":"","sources":["../../../src/discord/send-only-client.ts"],"names":[],"mappings":"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"}
|