openryoko 2026.9.3 → 2026.9.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/package.json +1 -1
- package/dist/src/connectors/discord/engaged-threads.d.ts +24 -0
- package/dist/src/connectors/discord/engaged-threads.d.ts.map +1 -0
- package/dist/src/connectors/discord/engaged-threads.js +28 -0
- package/dist/src/connectors/discord/engaged-threads.js.map +1 -0
- package/dist/src/connectors/discord/index.d.ts +91 -3
- package/dist/src/connectors/discord/index.d.ts.map +1 -1
- package/dist/src/connectors/discord/index.js +386 -34
- package/dist/src/connectors/discord/index.js.map +1 -1
- package/dist/src/connectors/discord/remote.d.ts +16 -1
- package/dist/src/connectors/discord/remote.d.ts.map +1 -1
- package/dist/src/connectors/discord/remote.js +70 -1
- package/dist/src/connectors/discord/remote.js.map +1 -1
- package/dist/src/connectors/discord/respond-policy.d.ts +96 -0
- package/dist/src/connectors/discord/respond-policy.d.ts.map +1 -0
- package/dist/src/connectors/discord/respond-policy.js +85 -0
- package/dist/src/connectors/discord/respond-policy.js.map +1 -0
- package/dist/src/connectors/discord/threads.d.ts +20 -2
- package/dist/src/connectors/discord/threads.d.ts.map +1 -1
- package/dist/src/connectors/discord/threads.js +28 -1
- package/dist/src/connectors/discord/threads.js.map +1 -1
- package/dist/src/connectors/slack/agents-canvas.d.ts +1 -0
- package/dist/src/connectors/slack/agents-canvas.d.ts.map +1 -1
- package/dist/src/connectors/slack/agents-canvas.js +75 -22
- package/dist/src/connectors/slack/agents-canvas.js.map +1 -1
- package/dist/src/gateway/api.d.ts +4 -0
- package/dist/src/gateway/api.d.ts.map +1 -1
- package/dist/src/gateway/api.js +25 -2
- package/dist/src/gateway/api.js.map +1 -1
- package/dist/src/gateway/server.d.ts.map +1 -1
- package/dist/src/gateway/server.js +2 -0
- package/dist/src/gateway/server.js.map +1 -1
- package/dist/src/sessions/context.d.ts +32 -7
- package/dist/src/sessions/context.d.ts.map +1 -1
- package/dist/src/sessions/context.js +81 -12
- package/dist/src/sessions/context.js.map +1 -1
- package/dist/src/sessions/manager.d.ts.map +1 -1
- package/dist/src/sessions/manager.js +18 -3
- package/dist/src/sessions/manager.js.map +1 -1
- package/dist/src/shared/types.d.ts +63 -10
- package/dist/src/shared/types.d.ts.map +1 -1
- package/dist/web/404.html +1 -1
- package/dist/web/__next.__PAGE__.txt +1 -1
- package/dist/web/__next._full.txt +1 -1
- package/dist/web/__next._tree.txt +1 -1
- package/dist/web/_next/static/chunks/{0los6agi5yfk-.js → 1ydtstxdw369l.js} +1 -1
- package/dist/web/_not-found/__next._full.txt +1 -1
- package/dist/web/_not-found/__next._not-found.__PAGE__.txt +1 -1
- package/dist/web/_not-found/__next._tree.txt +1 -1
- package/dist/web/_not-found.html +1 -1
- package/dist/web/_not-found.txt +1 -1
- package/dist/web/chat/__next._full.txt +1 -1
- package/dist/web/chat/__next._tree.txt +1 -1
- package/dist/web/chat/__next.chat.__PAGE__.txt +1 -1
- package/dist/web/chat.html +1 -1
- package/dist/web/chat.txt +1 -1
- package/dist/web/cron/__next._full.txt +1 -1
- package/dist/web/cron/__next._tree.txt +1 -1
- package/dist/web/cron/__next.cron.__PAGE__.txt +1 -1
- package/dist/web/cron.html +1 -1
- package/dist/web/cron.txt +1 -1
- package/dist/web/index.html +1 -1
- package/dist/web/index.txt +1 -1
- package/dist/web/kanban/__next._full.txt +1 -1
- package/dist/web/kanban/__next._tree.txt +1 -1
- package/dist/web/kanban/__next.kanban.__PAGE__.txt +1 -1
- package/dist/web/kanban.html +1 -1
- package/dist/web/kanban.txt +1 -1
- package/dist/web/logs/__next._full.txt +1 -1
- package/dist/web/logs/__next._tree.txt +1 -1
- package/dist/web/logs/__next.logs.__PAGE__.txt +1 -1
- package/dist/web/logs.html +1 -1
- package/dist/web/logs.txt +1 -1
- package/dist/web/org/__next._full.txt +1 -1
- package/dist/web/org/__next._tree.txt +1 -1
- package/dist/web/org/__next.org.__PAGE__.txt +1 -1
- package/dist/web/org.html +1 -1
- package/dist/web/org.txt +1 -1
- package/dist/web/sessions/__next._full.txt +1 -1
- package/dist/web/sessions/__next._tree.txt +1 -1
- package/dist/web/sessions/__next.sessions.__PAGE__.txt +1 -1
- package/dist/web/sessions.html +1 -1
- package/dist/web/sessions.txt +1 -1
- package/dist/web/settings/__next._full.txt +2 -2
- package/dist/web/settings/__next._tree.txt +1 -1
- package/dist/web/settings/__next.settings.__PAGE__.txt +2 -2
- package/dist/web/settings.html +1 -1
- package/dist/web/settings.txt +2 -2
- package/dist/web/skills/__next._full.txt +1 -1
- package/dist/web/skills/__next._tree.txt +1 -1
- package/dist/web/skills/__next.skills.__PAGE__.txt +1 -1
- package/dist/web/skills.html +1 -1
- package/dist/web/skills.txt +1 -1
- package/package.json +1 -1
- package/template/AGENTS.md +1 -1
- package/template/CLAUDE.md +1 -1
- package/template/config.default.yaml +13 -5
- package/template/docs/connectors.md +93 -1
- /package/dist/web/_next/static/{Kudq_QcLnSoz7UYDmluYu → vW8A0EhHuyi1vRgv7Qkyg}/_buildManifest.js +0 -0
- /package/dist/web/_next/static/{Kudq_QcLnSoz7UYDmluYu → vW8A0EhHuyi1vRgv7Qkyg}/_clientMiddlewareManifest.js +0 -0
- /package/dist/web/_next/static/{Kudq_QcLnSoz7UYDmluYu → vW8A0EhHuyi1vRgv7Qkyg}/_ssgManifest.js +0 -0
|
@@ -1,8 +1,42 @@
|
|
|
1
|
-
import { Client, GatewayIntentBits, Partials, } from "discord.js";
|
|
1
|
+
import { ChannelType, Client, GatewayIntentBits, MessageType, Partials, PermissionFlagsBits, } from "discord.js";
|
|
2
2
|
import { logger } from "../../shared/logger.js";
|
|
3
3
|
import { TMP_DIR } from "../../shared/paths.js";
|
|
4
4
|
import { formatResponse, downloadAttachment } from "./format.js";
|
|
5
|
-
import { deriveSessionKey, buildReplyContext, isOldMessage } from "./threads.js";
|
|
5
|
+
import { deriveSessionKey, buildReplyContext, isOldMessage, threadNameFor, supportsMessageThreads, } from "./threads.js";
|
|
6
|
+
import { evaluateRespondPolicy, resolveRespondMode, wasBotAddressed, addressesOnlyOthers, } from "./respond-policy.js";
|
|
7
|
+
import { EngagedThreadTracker } from "./engaged-threads.js";
|
|
8
|
+
/**
|
|
9
|
+
* Speaker identity forwarded to the session layer, mirroring the Slack
|
|
10
|
+
* connector's transportMeta fields. `speakerDiscordId` is the immutable
|
|
11
|
+
* snowflake that operator identification (portal.operatorDiscordId) and the
|
|
12
|
+
* MEMORY.md privacy gate (portal.trustedSpeakers) key on — names are display
|
|
13
|
+
* only and freely editable.
|
|
14
|
+
*/
|
|
15
|
+
function speakerMeta(message) {
|
|
16
|
+
return {
|
|
17
|
+
speakerName: message.member?.displayName ?? message.author.globalName ?? message.author.username,
|
|
18
|
+
speakerDisplayName: message.author.globalName ?? null,
|
|
19
|
+
speakerHandle: message.author.username,
|
|
20
|
+
speakerDiscordId: message.author.id,
|
|
21
|
+
speakerIsBot: message.author.bot,
|
|
22
|
+
};
|
|
23
|
+
}
|
|
24
|
+
/** Runtime validation for one channelRouting entry (config is untyped YAML/JSON). */
|
|
25
|
+
function normalizeRouteEntry(value) {
|
|
26
|
+
if (typeof value === "string" && value.trim())
|
|
27
|
+
return { url: value.trim() };
|
|
28
|
+
if (value && typeof value === "object" && !Array.isArray(value)) {
|
|
29
|
+
const { url, token } = value;
|
|
30
|
+
// A malformed token disables the whole entry — silently dropping it
|
|
31
|
+
// would send authenticated traffic unauthenticated.
|
|
32
|
+
if (typeof url === "string" &&
|
|
33
|
+
url.trim() &&
|
|
34
|
+
(token === undefined || typeof token === "string")) {
|
|
35
|
+
return { url: url.trim(), token: token || undefined };
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
return undefined;
|
|
39
|
+
}
|
|
6
40
|
export class DiscordConnector {
|
|
7
41
|
name;
|
|
8
42
|
instanceId;
|
|
@@ -14,18 +48,43 @@ export class DiscordConnector {
|
|
|
14
48
|
status = "starting";
|
|
15
49
|
lastError = null;
|
|
16
50
|
typingIntervals = new Map();
|
|
51
|
+
engagedThreads = new EngagedThreadTracker();
|
|
52
|
+
replyStyle;
|
|
53
|
+
/** channelRouting normalized to { url, token } with string keys (YAML may
|
|
54
|
+
* parse snowflake keys as numbers and values may be plain URL strings). */
|
|
55
|
+
routing;
|
|
56
|
+
/**
|
|
57
|
+
* Channels where thread creation failed for a channel-level reason
|
|
58
|
+
* (missing permission / access). Both the session keying and the reply
|
|
59
|
+
* destination consult this, so after one failed turn the channel settles
|
|
60
|
+
* into consistent reply-style behavior instead of splitting every turn
|
|
61
|
+
* into a fresh thread-keyed session. In-memory; resets with the connector.
|
|
62
|
+
*/
|
|
63
|
+
threadStyleFailed = new Set();
|
|
17
64
|
constructor(config) {
|
|
18
65
|
this.name = config.id || "discord";
|
|
19
66
|
this.instanceId = config.id || "discord";
|
|
20
67
|
this.config = config;
|
|
68
|
+
// Hand-edited YAML: an invalid value degrades to the legacy behavior.
|
|
69
|
+
this.replyStyle =
|
|
70
|
+
config.replyStyle === "reply" || config.replyStyle === "thread"
|
|
71
|
+
? config.replyStyle
|
|
72
|
+
: "channel";
|
|
21
73
|
// Normalize Discord IDs to strings (YAML may parse large snowflake IDs as numbers)
|
|
22
74
|
if (this.config.guildId)
|
|
23
75
|
this.config.guildId = String(this.config.guildId);
|
|
24
76
|
if (this.config.channelId)
|
|
25
77
|
this.config.channelId = String(this.config.channelId);
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
}
|
|
78
|
+
// YAML/API config is untyped at runtime: validate each route and disable
|
|
79
|
+
// (with a warning) anything that isn't a URL string or { url, token }.
|
|
80
|
+
this.routing = Object.fromEntries(Object.entries(config.channelRouting ?? {}).flatMap(([k, v]) => {
|
|
81
|
+
const route = normalizeRouteEntry(v);
|
|
82
|
+
if (!route) {
|
|
83
|
+
logger.warn(`[discord] channelRouting["${k}"] is invalid (expected a URL string or { url, token }) — entry disabled`);
|
|
84
|
+
return [];
|
|
85
|
+
}
|
|
86
|
+
return [[String(k), route]];
|
|
87
|
+
}));
|
|
29
88
|
this.allowedUserIds = new Set(Array.isArray(config.allowFrom)
|
|
30
89
|
? config.allowFrom
|
|
31
90
|
: config.allowFrom
|
|
@@ -52,6 +111,9 @@ export class DiscordConnector {
|
|
|
52
111
|
this.client.on("ready", () => {
|
|
53
112
|
logger.info(`Discord connector ready as ${this.client.user?.tag}`);
|
|
54
113
|
this.status = "running";
|
|
114
|
+
// Permissions may have changed while disconnected — let thread style
|
|
115
|
+
// re-attempt channels it had given up on.
|
|
116
|
+
this.threadStyleFailed.clear();
|
|
55
117
|
});
|
|
56
118
|
this.client.on("messageCreate", async (message) => {
|
|
57
119
|
try {
|
|
@@ -101,13 +163,10 @@ export class DiscordConnector {
|
|
|
101
163
|
const channel = await this.client.channels.fetch(target.channel);
|
|
102
164
|
if (!channel || !channel.isTextBased())
|
|
103
165
|
return;
|
|
104
|
-
const
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
lastId = sent.id;
|
|
109
|
-
}
|
|
110
|
-
return lastId;
|
|
166
|
+
const result = await this.sendChunks({ channel: channel }, text);
|
|
167
|
+
if (result.error !== undefined)
|
|
168
|
+
throw result.error;
|
|
169
|
+
return result.lastId;
|
|
111
170
|
}
|
|
112
171
|
catch (err) {
|
|
113
172
|
logger.error(`Discord sendMessage error: ${err instanceof Error ? err.message : err}`);
|
|
@@ -118,18 +177,135 @@ export class DiscordConnector {
|
|
|
118
177
|
const channel = await this.client.channels.fetch(target.thread ?? target.channel);
|
|
119
178
|
if (!channel || !channel.isTextBased())
|
|
120
179
|
return;
|
|
121
|
-
const
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
180
|
+
const destination = await this.resolveReplyDestination(channel, target);
|
|
181
|
+
const result = await this.sendChunks(destination, text);
|
|
182
|
+
// A thread that accepts nothing (locked archive, missing
|
|
183
|
+
// SEND_MESSAGES_IN_THREADS, private-thread access) must not swallow
|
|
184
|
+
// the response: if not a single chunk landed in any thread — the one
|
|
185
|
+
// thread style just opened, or the thread the message arrived in —
|
|
186
|
+
// retry as a reply in the parent channel. A partial send stays where
|
|
187
|
+
// it is; resending would duplicate the delivered chunks.
|
|
188
|
+
if (result.error !== undefined && result.sentCount === 0 && destination.channel.isThread()) {
|
|
189
|
+
// In the thread-style path `channel` is the flat parent we fetched
|
|
190
|
+
// to resolve the thread; for a direct thread target the parent
|
|
191
|
+
// comes from the thread itself.
|
|
192
|
+
const parent = destination.viaThreadStyle
|
|
193
|
+
? channel
|
|
194
|
+
: await this.client.channels
|
|
195
|
+
.fetch(destination.channel.parentId ?? "")
|
|
196
|
+
.catch(() => null);
|
|
197
|
+
// A permission-shaped refusal will keep failing — remember it so
|
|
198
|
+
// thread style stops opening threads nobody can post in. The
|
|
199
|
+
// pre-flight permission check catches most of these; this covers
|
|
200
|
+
// API-level denials that slip through.
|
|
201
|
+
const code = result.error.code;
|
|
202
|
+
if (code === 50013 || code === 50001) {
|
|
203
|
+
const parentId = destination.viaThreadStyle
|
|
204
|
+
? channel.id
|
|
205
|
+
: destination.channel.parentId;
|
|
206
|
+
if (parentId)
|
|
207
|
+
this.threadStyleFailed.add(parentId);
|
|
208
|
+
}
|
|
209
|
+
logger.warn(`[discord] sending into thread ${destination.channel.id} failed (${result.error instanceof Error ? result.error.message : result.error}) — falling back to a reply in the parent channel`);
|
|
210
|
+
if (parent && parent.isTextBased() && !parent.isThread()) {
|
|
211
|
+
const retry = await this.sendChunks(
|
|
212
|
+
// A reply reference must live in the parent channel — in-thread
|
|
213
|
+
// message IDs are invisible there. A message-rooted thread
|
|
214
|
+
// shares its starter message's ID, so referencing the thread ID
|
|
215
|
+
// attaches the fallback to the conversation's root (and merely
|
|
216
|
+
// degrades to a plain post for channel-rooted threads, thanks
|
|
217
|
+
// to failIfNotExists: false).
|
|
218
|
+
{ channel: parent, replyTo: destination.channel.id }, text);
|
|
219
|
+
if (retry.error !== undefined)
|
|
220
|
+
throw retry.error;
|
|
221
|
+
return retry.lastId;
|
|
222
|
+
}
|
|
223
|
+
throw result.error;
|
|
224
|
+
}
|
|
225
|
+
if (result.error !== undefined && result.sentCount === 0)
|
|
226
|
+
throw result.error;
|
|
227
|
+
if (result.error !== undefined) {
|
|
228
|
+
logger.error(`Discord replyMessage partial send (${result.sentCount} chunk(s) delivered): ${result.error instanceof Error ? result.error.message : result.error}`);
|
|
126
229
|
}
|
|
127
|
-
return lastId;
|
|
230
|
+
return result.lastId;
|
|
128
231
|
}
|
|
129
232
|
catch (err) {
|
|
130
233
|
logger.error(`Discord replyMessage error: ${err instanceof Error ? err.message : err}`);
|
|
131
234
|
}
|
|
132
235
|
}
|
|
236
|
+
/**
|
|
237
|
+
* Send a response in Discord-sized chunks. Only the first chunk carries
|
|
238
|
+
* the reply reference — one visual attachment per response, the rest
|
|
239
|
+
* reads as its continuation. Engagement is recorded per delivered chunk,
|
|
240
|
+
* so a partial send still counts. Failures are returned, not thrown, so
|
|
241
|
+
* the caller can see how far the send got.
|
|
242
|
+
*/
|
|
243
|
+
async sendChunks(destination, text) {
|
|
244
|
+
const chunks = formatResponse(text);
|
|
245
|
+
let lastId;
|
|
246
|
+
let sentCount = 0;
|
|
247
|
+
for (const [index, chunk] of chunks.entries()) {
|
|
248
|
+
try {
|
|
249
|
+
const sent = destination.replyTo !== undefined && index === 0
|
|
250
|
+
? await destination.channel.send({
|
|
251
|
+
content: chunk,
|
|
252
|
+
reply: { messageReference: destination.replyTo, failIfNotExists: false },
|
|
253
|
+
})
|
|
254
|
+
: await destination.channel.send(chunk);
|
|
255
|
+
lastId = sent.id;
|
|
256
|
+
sentCount += 1;
|
|
257
|
+
this.recordEngagement(destination.channel, sent.id);
|
|
258
|
+
}
|
|
259
|
+
catch (error) {
|
|
260
|
+
return { lastId, sentCount, error };
|
|
261
|
+
}
|
|
262
|
+
}
|
|
263
|
+
return { lastId, sentCount };
|
|
264
|
+
}
|
|
265
|
+
/**
|
|
266
|
+
* Where a response physically lands. Threads and DMs are already precise
|
|
267
|
+
* destinations and ignore replyStyle. In flat guild channels: "reply"
|
|
268
|
+
* attaches the response to the triggering message, "thread" opens (or
|
|
269
|
+
* reuses) the thread rooted on it, and "channel" keeps the legacy plain
|
|
270
|
+
* send. The thread path falls back to "reply" when the channel can't host
|
|
271
|
+
* message threads (voice/stage text chat) or when Discord refuses — a
|
|
272
|
+
* channel-level refusal (missing permission/access) is remembered so the
|
|
273
|
+
* session keying in handleMessage stops splitting turns into thread keys.
|
|
274
|
+
*/
|
|
275
|
+
async resolveReplyDestination(channel, target) {
|
|
276
|
+
if (channel.isThread() || channel.isDMBased())
|
|
277
|
+
return { channel };
|
|
278
|
+
if (!target.messageTs || this.replyStyle === "channel")
|
|
279
|
+
return { channel };
|
|
280
|
+
if (this.replyStyle === "reply" ||
|
|
281
|
+
!supportsMessageThreads(channel) ||
|
|
282
|
+
this.threadStyleFailed.has(channel.id) ||
|
|
283
|
+
!this.canOpenThreads(channel)) {
|
|
284
|
+
return { channel, replyTo: target.messageTs };
|
|
285
|
+
}
|
|
286
|
+
try {
|
|
287
|
+
// A message's thread shares its ID — fetch it directly instead of
|
|
288
|
+
// trusting the starter's cache (`Message#thread` misses archived
|
|
289
|
+
// threads, which aren't synced on startup).
|
|
290
|
+
const existing = await this.client.channels.fetch(target.messageTs).catch(() => null);
|
|
291
|
+
if (existing?.isThread()) {
|
|
292
|
+
return { channel: existing, viaThreadStyle: true };
|
|
293
|
+
}
|
|
294
|
+
const starter = await channel.messages.fetch(target.messageTs);
|
|
295
|
+
const thread = await starter.startThread({ name: threadNameFor(starter.content) });
|
|
296
|
+
return { channel: thread, viaThreadStyle: true };
|
|
297
|
+
}
|
|
298
|
+
catch (err) {
|
|
299
|
+
const code = err.code;
|
|
300
|
+
// 50013 Missing Permissions / 50001 Missing Access — channel-level,
|
|
301
|
+
// will keep failing; remember it. Anything else (deleted starter…)
|
|
302
|
+
// is message-level and the next turn starts clean.
|
|
303
|
+
if (code === 50013 || code === 50001)
|
|
304
|
+
this.threadStyleFailed.add(channel.id);
|
|
305
|
+
logger.warn(`[discord] could not open a thread on message ${target.messageTs} (${err instanceof Error ? err.message : err}) — falling back to a reply`);
|
|
306
|
+
return { channel, replyTo: target.messageTs };
|
|
307
|
+
}
|
|
308
|
+
}
|
|
133
309
|
async editMessage(target, text) {
|
|
134
310
|
try {
|
|
135
311
|
if (!target.messageTs)
|
|
@@ -153,6 +329,7 @@ export class DiscordConnector {
|
|
|
153
329
|
return;
|
|
154
330
|
const msg = await channel.messages.fetch(target.messageTs);
|
|
155
331
|
await msg.react(emoji);
|
|
332
|
+
this.recordEngagement(channel, target.messageTs);
|
|
156
333
|
}
|
|
157
334
|
catch {
|
|
158
335
|
// non-fatal
|
|
@@ -199,8 +376,9 @@ export class DiscordConnector {
|
|
|
199
376
|
}
|
|
200
377
|
}
|
|
201
378
|
async handleMessage(message) {
|
|
202
|
-
// Ignore bots (including self)
|
|
203
|
-
|
|
379
|
+
// Ignore bots (including self), webhooks, and Discord-generated system
|
|
380
|
+
// messages (joins, pins, thread-created…) — none of these are user turns.
|
|
381
|
+
if (message.author.bot || message.system || message.webhookId)
|
|
204
382
|
return;
|
|
205
383
|
logger.debug(`Discord message from ${message.author.username} in channel ${message.channel.id}`);
|
|
206
384
|
// Ignore old messages on boot
|
|
@@ -210,22 +388,74 @@ export class DiscordConnector {
|
|
|
210
388
|
// Guild restriction
|
|
211
389
|
if (this.config.guildId && message.guild?.id !== this.config.guildId)
|
|
212
390
|
return;
|
|
213
|
-
// Channel routing — proxy messages to remote instances
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
391
|
+
// Channel routing — proxy messages to remote instances. Addressing and
|
|
392
|
+
// thread engagement are resolved here and forwarded: only this instance
|
|
393
|
+
// sees the Discord gateway, and proxied sends run through this
|
|
394
|
+
// connector, so its tracker is the source of truth for engagement.
|
|
395
|
+
// Threads inherit their parent channel's route: a thread routes by its
|
|
396
|
+
// own id when explicitly configured, else by the channel it lives in —
|
|
397
|
+
// without this, a thread opened in a routed channel (replyStyle=thread
|
|
398
|
+
// creates one per conversation) would silently fall back to local
|
|
399
|
+
// handling.
|
|
400
|
+
const parentChannelId = message.channel.isThread()
|
|
401
|
+
? message.channel.parentId ?? undefined
|
|
402
|
+
: undefined;
|
|
403
|
+
const route = this.routing[message.channel.id] ??
|
|
404
|
+
(parentChannelId !== undefined ? this.routing[parentChannelId] : undefined);
|
|
405
|
+
if (route) {
|
|
406
|
+
logger.debug(`Routing Discord message from channel ${message.channel.id} to ${route.url}`);
|
|
407
|
+
// References resolve only outside DMs here: the remote's dm policy is
|
|
408
|
+
// unknown, and a routed-DM reply matters only under its dm=mention —
|
|
409
|
+
// too rare to spend a REST fetch on every routed DM reply.
|
|
410
|
+
const addressing = await this.resolveAddressing(message, {
|
|
411
|
+
allowFetch: !message.channel.isDMBased(),
|
|
412
|
+
});
|
|
413
|
+
await this.proxyToRemote(route, message, addressing);
|
|
218
414
|
return;
|
|
219
415
|
}
|
|
220
|
-
// Channel restriction — only respond in a specific channel
|
|
221
|
-
|
|
416
|
+
// Channel restriction — only respond in a specific channel, including
|
|
417
|
+
// the threads that live in it (+ DMs always allowed)
|
|
418
|
+
if (this.config.channelId &&
|
|
419
|
+
message.channel.id !== this.config.channelId &&
|
|
420
|
+
parentChannelId !== this.config.channelId &&
|
|
421
|
+
!message.channel.isDMBased())
|
|
222
422
|
return;
|
|
223
423
|
// User allowlist
|
|
224
424
|
if (this.allowedUserIds.size > 0 && !this.allowedUserIds.has(message.author.id))
|
|
225
425
|
return;
|
|
426
|
+
// Deterministic respondTo gate — the Discord port of the Slack gate.
|
|
427
|
+
// Addressing resolves after the cheap filters above, so filtered
|
|
428
|
+
// messages never cost a reference fetch; in DMs the fetch only matters
|
|
429
|
+
// under dm=mention (the sibling rule below never applies to DMs).
|
|
430
|
+
// botUserId is set once the client is ready (messageCreate never fires
|
|
431
|
+
// earlier); if it were somehow missing, mention scopes fail closed.
|
|
432
|
+
const isDM = message.channel.isDMBased();
|
|
433
|
+
const addressing = await this.resolveAddressing(message, {
|
|
434
|
+
allowFetch: !isDM || resolveRespondMode(this.config.respondTo, "dm") === "mention",
|
|
435
|
+
});
|
|
436
|
+
const respondDecision = evaluateRespondPolicy({
|
|
437
|
+
config: this.config.respondTo,
|
|
438
|
+
isDM,
|
|
439
|
+
wasMentioned: wasBotAddressed(addressing),
|
|
440
|
+
isEngagedThread: message.channel.isThread() && this.engagedThreads.has(message.channel.id),
|
|
441
|
+
});
|
|
442
|
+
if (!respondDecision.allow) {
|
|
443
|
+
logger.info(`[discord] respondTo gate → silent (${respondDecision.reason}) for message ${message.id}`);
|
|
444
|
+
return;
|
|
445
|
+
}
|
|
446
|
+
// Cross-user traffic in shared channels: a message that @-mentions or
|
|
447
|
+
// replies to somebody else (and not us) is addressed to them, not the
|
|
448
|
+
// bot — stay silent regardless of respondTo mode or thread engagement,
|
|
449
|
+
// mirroring the Slack connector's sibling-mention rule.
|
|
450
|
+
if (!isDM && addressesOnlyOthers(addressing)) {
|
|
451
|
+
logger.info(`[discord] message addresses other user(s) — staying silent for message ${message.id}`);
|
|
452
|
+
return;
|
|
453
|
+
}
|
|
226
454
|
if (!this.handler)
|
|
227
455
|
return;
|
|
228
|
-
const sessionKey = deriveSessionKey(message, this.instanceId
|
|
456
|
+
const sessionKey = deriveSessionKey(message, this.instanceId, {
|
|
457
|
+
threadPerMessage: this.threadSessionEligible(message),
|
|
458
|
+
});
|
|
229
459
|
const replyContext = buildReplyContext(message);
|
|
230
460
|
// Download attachments
|
|
231
461
|
const attachments = await Promise.all(Array.from(message.attachments.values()).map(async (att) => {
|
|
@@ -261,12 +491,114 @@ export class DiscordConnector {
|
|
|
261
491
|
: "dm",
|
|
262
492
|
guildId: message.guild?.id ?? null,
|
|
263
493
|
isDM: message.channel.isDMBased(),
|
|
494
|
+
isGroupDM: message.channel.type === ChannelType.GroupDM,
|
|
495
|
+
...speakerMeta(message),
|
|
264
496
|
},
|
|
265
497
|
};
|
|
266
498
|
this.handler(incomingMessage);
|
|
267
499
|
}
|
|
500
|
+
/**
|
|
501
|
+
* True when this flat-channel message's session should be keyed to the
|
|
502
|
+
* thread the reply will open (replyStyle=thread). Mirrors exactly the
|
|
503
|
+
* conditions under which resolveReplyDestination will actually attempt a
|
|
504
|
+
* thread, so the session key and the reply destination never diverge:
|
|
505
|
+
* channels that can't host message threads, channels where the bot lacks
|
|
506
|
+
* the thread permissions right now (checked per turn against the live
|
|
507
|
+
* permission cache), and channels where creation already failed at the
|
|
508
|
+
* channel level all stay channel-keyed from the first turn.
|
|
509
|
+
*/
|
|
510
|
+
threadSessionEligible(message) {
|
|
511
|
+
return (this.replyStyle === "thread" &&
|
|
512
|
+
!message.channel.isDMBased() &&
|
|
513
|
+
!message.channel.isThread() &&
|
|
514
|
+
supportsMessageThreads(message.channel) &&
|
|
515
|
+
!this.threadStyleFailed.has(message.channel.id) &&
|
|
516
|
+
this.canOpenThreads(message.channel));
|
|
517
|
+
}
|
|
518
|
+
/**
|
|
519
|
+
* Pre-flight permission check for thread style, evaluated against the
|
|
520
|
+
* cached guild permissions so it costs no request. Optimistic when the
|
|
521
|
+
* answer is unknowable (no permissionsFor on the channel shape, member
|
|
522
|
+
* not cached) — the failure path in replyMessage self-heals those.
|
|
523
|
+
*/
|
|
524
|
+
canOpenThreads(channel) {
|
|
525
|
+
const me = this.client.user;
|
|
526
|
+
if (!me || typeof channel.permissionsFor !== "function")
|
|
527
|
+
return true;
|
|
528
|
+
const perms = channel.permissionsFor(me);
|
|
529
|
+
if (!perms)
|
|
530
|
+
return true;
|
|
531
|
+
return (perms.has(PermissionFlagsBits.CreatePublicThreads) &&
|
|
532
|
+
perms.has(PermissionFlagsBits.SendMessagesInThreads));
|
|
533
|
+
}
|
|
534
|
+
/**
|
|
535
|
+
* Track engagement for the `respondTo.engagedThreads` continuation. Only
|
|
536
|
+
* anchor-eligible IDs whose engagement can actually be consumed are kept:
|
|
537
|
+
* the thread itself, or — in flat guild channels — the acted-on message,
|
|
538
|
+
* since a public thread created from a message reuses its ID. DM and
|
|
539
|
+
* in-thread message IDs can never root a thread and are never recorded,
|
|
540
|
+
* which keeps the unbounded tracker's real footprint small.
|
|
541
|
+
*/
|
|
542
|
+
recordEngagement(channel, anchorMessageId) {
|
|
543
|
+
if (channel.isThread()) {
|
|
544
|
+
if (this.consumesEngagement(channel.id, channel.parentId ?? undefined)) {
|
|
545
|
+
this.engagedThreads.record(channel.id);
|
|
546
|
+
}
|
|
547
|
+
return;
|
|
548
|
+
}
|
|
549
|
+
if (anchorMessageId &&
|
|
550
|
+
!channel.isDMBased() &&
|
|
551
|
+
this.consumesEngagement(anchorMessageId, channel.id)) {
|
|
552
|
+
this.engagedThreads.record(anchorMessageId);
|
|
553
|
+
}
|
|
554
|
+
}
|
|
555
|
+
/**
|
|
556
|
+
* True when engagement recorded under this id can ever be read back. The
|
|
557
|
+
* local gate consults the tracker only when the channel scope is
|
|
558
|
+
* mention-gated with engagedThreads on (DMs have no threads, so dm=mention
|
|
559
|
+
* alone consumes nothing). The routed path consults it for messages whose
|
|
560
|
+
* channel id — or, for threads, parent channel id — is a channelRouting
|
|
561
|
+
* key; for a flat-channel anchor the future thread's parent is the channel
|
|
562
|
+
* itself, so its route counts too.
|
|
563
|
+
*/
|
|
564
|
+
consumesEngagement(id, parentChannelId) {
|
|
565
|
+
if (resolveRespondMode(this.config.respondTo, "channel") === "mention" &&
|
|
566
|
+
this.config.respondTo?.engagedThreads !== false) {
|
|
567
|
+
return true;
|
|
568
|
+
}
|
|
569
|
+
if (this.routing[id] !== undefined)
|
|
570
|
+
return true;
|
|
571
|
+
return parentChannelId !== undefined && this.routing[parentChannelId] !== undefined;
|
|
572
|
+
}
|
|
573
|
+
/**
|
|
574
|
+
* Resolve who the message addresses. Reply attribution applies only to
|
|
575
|
+
* actual replies (`MessageType.Reply`) — a crosspost or forward also
|
|
576
|
+
* carries a `reference` but addresses nobody. `mentions.repliedUser` comes
|
|
577
|
+
* from the gateway's resolved reference and works whether or not the reply
|
|
578
|
+
* pinged; when Discord omitted the resolution and `allowFetch` is set,
|
|
579
|
+
* fall back to one fetch of the referenced message. A deleted reference
|
|
580
|
+
* stays undefined — no addressee.
|
|
581
|
+
*/
|
|
582
|
+
async resolveAddressing(message, opts) {
|
|
583
|
+
const isReply = message.type === MessageType.Reply;
|
|
584
|
+
let repliedToUserId = isReply ? message.mentions.repliedUser?.id : undefined;
|
|
585
|
+
if (isReply && repliedToUserId === undefined && opts.allowFetch && message.reference?.messageId) {
|
|
586
|
+
try {
|
|
587
|
+
const referenced = await message.fetchReference();
|
|
588
|
+
repliedToUserId = referenced.author?.id;
|
|
589
|
+
}
|
|
590
|
+
catch {
|
|
591
|
+
// Referenced message deleted or inaccessible.
|
|
592
|
+
}
|
|
593
|
+
}
|
|
594
|
+
return {
|
|
595
|
+
botUserId: this.client.user?.id,
|
|
596
|
+
mentionedUserIds: new Set(message.mentions.users.keys()),
|
|
597
|
+
repliedToUserId,
|
|
598
|
+
};
|
|
599
|
+
}
|
|
268
600
|
/** Forward a message to a remote Jinn instance via HTTP */
|
|
269
|
-
async proxyToRemote(
|
|
601
|
+
async proxyToRemote(route, message, addressing) {
|
|
270
602
|
try {
|
|
271
603
|
const attachments = Array.from(message.attachments.values()).map((att) => ({
|
|
272
604
|
name: att.name,
|
|
@@ -274,7 +606,11 @@ export class DiscordConnector {
|
|
|
274
606
|
mimeType: att.contentType ?? "application/octet-stream",
|
|
275
607
|
}));
|
|
276
608
|
const payload = {
|
|
277
|
-
|
|
609
|
+
// The primary's replyStyle renders every proxied send, so its
|
|
610
|
+
// thread-per-message session mapping applies to routed channels too.
|
|
611
|
+
sessionKey: deriveSessionKey(message, undefined, {
|
|
612
|
+
threadPerMessage: this.threadSessionEligible(message),
|
|
613
|
+
}),
|
|
278
614
|
channel: message.channel.id,
|
|
279
615
|
thread: message.channel.isThread() ? message.channel.id : undefined,
|
|
280
616
|
user: message.author.username,
|
|
@@ -289,19 +625,35 @@ export class DiscordConnector {
|
|
|
289
625
|
: "dm",
|
|
290
626
|
guildId: message.guild?.id ?? null,
|
|
291
627
|
isDM: message.channel.isDMBased(),
|
|
628
|
+
isGroupDM: message.channel.type === ChannelType.GroupDM,
|
|
629
|
+
...speakerMeta(message),
|
|
630
|
+
// Precomputed here (only this instance knows the bot user,
|
|
631
|
+
// resolves references, and tracks engagement) so the receiving
|
|
632
|
+
// instance can apply its own respondTo gate without another
|
|
633
|
+
// Discord round-trip.
|
|
634
|
+
...{
|
|
635
|
+
wasBotAddressed: wasBotAddressed(addressing),
|
|
636
|
+
addressesOnlyOthers: addressesOnlyOthers(addressing),
|
|
637
|
+
isEngagedThread: message.channel.isThread() && this.engagedThreads.has(message.channel.id),
|
|
638
|
+
},
|
|
292
639
|
},
|
|
293
640
|
};
|
|
294
|
-
const res = await fetch(`${
|
|
641
|
+
const res = await fetch(`${route.url.replace(/\/+$/, "")}/api/connectors/discord/incoming`, {
|
|
295
642
|
method: "POST",
|
|
296
|
-
headers: {
|
|
643
|
+
headers: {
|
|
644
|
+
"Content-Type": "application/json",
|
|
645
|
+
// The receiving gateway authenticates /api/* like any client —
|
|
646
|
+
// configure the route's token when its auth is enabled.
|
|
647
|
+
...(route.token ? { Authorization: `Bearer ${route.token}` } : {}),
|
|
648
|
+
},
|
|
297
649
|
body: JSON.stringify(payload),
|
|
298
650
|
});
|
|
299
651
|
if (!res.ok) {
|
|
300
|
-
logger.error(`Failed to proxy Discord message to ${
|
|
652
|
+
logger.error(`Failed to proxy Discord message to ${route.url}: ${res.status} ${res.statusText}`);
|
|
301
653
|
}
|
|
302
654
|
}
|
|
303
655
|
catch (err) {
|
|
304
|
-
logger.error(`Discord proxy error to ${
|
|
656
|
+
logger.error(`Discord proxy error to ${route.url}: ${err instanceof Error ? err.message : err}`);
|
|
305
657
|
}
|
|
306
658
|
}
|
|
307
659
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/connectors/discord/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/connectors/discord/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,MAAM,EACN,iBAAiB,EACjB,WAAW,EACX,QAAQ,EACR,mBAAmB,GAKpB,MAAM,YAAY,CAAC;AAUpB,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,YAAY,EACZ,aAAa,EACb,sBAAsB,GACvB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,qBAAqB,EACrB,kBAAkB,EAClB,eAAe,EACf,mBAAmB,GAEpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D;;;;;;GAMG;AACH,SAAS,WAAW,CAAC,OAAgB;IAOnC,OAAO;QACL,WAAW,EACT,OAAO,CAAC,MAAM,EAAE,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC,QAAQ;QACrF,kBAAkB,EAAE,OAAO,CAAC,MAAM,CAAC,UAAU,IAAI,IAAI;QACrD,aAAa,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ;QACtC,gBAAgB,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE;QACnC,YAAY,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG;KACjC,CAAC;AACJ,CAAC;AAED,qFAAqF;AACrF,SAAS,mBAAmB,CAAC,KAAc;IACzC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,GAAG,EAAE,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;IAC5E,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAChE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,KAA2C,CAAC;QACnE,oEAAoE;QACpE,oDAAoD;QACpD,IACE,OAAO,GAAG,KAAK,QAAQ;YACvB,GAAG,CAAC,IAAI,EAAE;YACV,CAAC,KAAK,KAAK,SAAS,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC,EAClD,CAAC;YACD,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,KAAK,IAAI,SAAS,EAAE,CAAC;QACxD,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAyBD,MAAM,OAAO,gBAAgB;IAC3B,IAAI,CAAS;IACb,UAAU,CAAS;IACX,MAAM,CAAS;IACf,MAAM,CAAyB;IAC/B,OAAO,GAA4C,IAAI,CAAC;IACxD,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACxB,cAAc,CAAc;IAC5B,MAAM,GAAiD,UAAU,CAAC;IAClE,SAAS,GAAkB,IAAI,CAAC;IAChC,eAAe,GAAG,IAAI,GAAG,EAA0C,CAAC;IACpE,cAAc,GAAG,IAAI,oBAAoB,EAAE,CAAC;IACnC,UAAU,CAAoB;IAC/C;gFAC4E;IAC3D,OAAO,CAAkD;IAC1E;;;;;;OAMG;IACc,iBAAiB,GAAG,IAAI,GAAG,EAAU,CAAC;IAEvD,YAAY,MAA8B;QACxC,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,EAAE,IAAI,SAAS,CAAC;QACnC,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,EAAE,IAAI,SAAS,CAAC;QACzC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,sEAAsE;QACtE,IAAI,CAAC,UAAU;YACb,MAAM,CAAC,UAAU,KAAK,OAAO,IAAI,MAAM,CAAC,UAAU,KAAK,QAAQ;gBAC7D,CAAC,CAAC,MAAM,CAAC,UAAU;gBACnB,CAAC,CAAC,SAAS,CAAC;QAChB,mFAAmF;QACnF,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC3E,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS;YAAE,IAAI,CAAC,MAAM,CAAC,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACjF,yEAAyE;QACzE,uEAAuE;QACvE,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,WAAW,CAC/B,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;YAC7D,MAAM,KAAK,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC;YACrC,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,MAAM,CAAC,IAAI,CACT,6BAA6B,CAAC,0EAA0E,CACzG,CAAC;gBACF,OAAO,EAAE,CAAC;YACZ,CAAC;YACD,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAU,CAAC,CAAC;QACvC,CAAC,CAAC,CACH,CAAC;QACF,IAAI,CAAC,cAAc,GAAG,IAAI,GAAG,CAC3B,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC;YAC7B,CAAC,CAAC,MAAM,CAAC,SAAS;YAClB,CAAC,CAAC,MAAM,CAAC,SAAS;gBAClB,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC;gBACpB,CAAC,CAAC,EAAE,CACP,CAAC;QACF,IAAI,CAAC,MAAM,GAAG,IAAI,MAAM,CAAC;YACvB,OAAO,EAAE;gBACP,iBAAiB,CAAC,MAAM;gBACxB,iBAAiB,CAAC,aAAa;gBAC/B,iBAAiB,CAAC,cAAc;gBAChC,iBAAiB,CAAC,cAAc;gBAChC,iBAAiB,CAAC,qBAAqB;aACxC;YACD,QAAQ,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC;SAC/C,CAAC,CAAC;IACL,CAAC;IAED,SAAS,CAAC,OAAuC;QAC/C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YAC3B,MAAM,CAAC,IAAI,CAAC,8BAA8B,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;YACnE,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;YACxB,qEAAqE;YACrE,0CAA0C;YAC1C,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,eAAe,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YAChD,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;YACpC,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,CAAC,KAAK,CAAC,kCAAkC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;YAC7F,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YAC9B,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC;YAC7B,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC;YACtB,MAAM,CAAC,KAAK,CAAC,yBAAyB,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,IAAI;QACR,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;QACxB,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QAC5B,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;IAC3C,CAAC;IAED,eAAe;QACb,OAAO;YACL,SAAS,EAAE,IAAI;YACf,YAAY,EAAE,IAAI;YAClB,SAAS,EAAE,IAAI;YACf,WAAW,EAAE,IAAI;SAClB,CAAC;IACJ,CAAC;IAED,SAAS;QACP,OAAO;YACL,MAAM,EAAE,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;YAC7F,MAAM,EAAE,IAAI,CAAC,SAAS,IAAI,SAAS;YACnC,YAAY,EAAE,IAAI,CAAC,eAAe,EAAE;SACrC,CAAC;IACJ,CAAC;IAED,iBAAiB,CAAC,YAAwD;QACxE,MAAM,GAAG,GAAG,CAAC,YAAY,IAAI,EAAE,CAAkC,CAAC;QAClE,OAAO;YACL,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,EAAE;YAC1B,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,SAAS;YAC/B,SAAS,EAAE,GAAG,CAAC,SAAS,IAAI,SAAS;SACtC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAAc,EAAE,IAAY;QAC5C,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACjE,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;gBAAE,OAAO;YAC/C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAClC,EAAE,OAAO,EAAE,OAAkD,EAAE,EAC/D,IAAI,CACL,CAAC;YACF,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS;gBAAE,MAAM,MAAM,CAAC,KAAK,CAAC;YACnD,OAAO,MAAM,CAAC,MAAM,CAAC;QACvB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,KAAK,CAAC,8BAA8B,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;QACzF,CAAC;IACH,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,MAAc,EAAE,IAAY;QAC7C,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC;YAClF,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;gBAAE,OAAO;YAC/C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,uBAAuB,CACpD,OAAkD,EAClD,MAAM,CACP,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;YACxD,yDAAyD;YACzD,oEAAoE;YACpE,qEAAqE;YACrE,mEAAmE;YACnE,qEAAqE;YACrE,yDAAyD;YACzD,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS,IAAI,MAAM,CAAC,SAAS,KAAK,CAAC,IAAI,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;gBAC3F,mEAAmE;gBACnE,+DAA+D;gBAC/D,gCAAgC;gBAChC,MAAM,MAAM,GAAG,WAAW,CAAC,cAAc;oBACvC,CAAC,CAAE,OAAuB;oBAC1B,CAAC,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ;yBACvB,KAAK,CAAE,WAAW,CAAC,OAAyB,CAAC,QAAQ,IAAI,EAAE,CAAC;yBAC5D,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;gBACzB,iEAAiE;gBACjE,6DAA6D;gBAC7D,iEAAiE;gBACjE,uCAAuC;gBACvC,MAAM,IAAI,GAAI,MAAM,CAAC,KAA2B,CAAC,IAAI,CAAC;gBACtD,IAAI,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;oBACrC,MAAM,QAAQ,GAAG,WAAW,CAAC,cAAc;wBACzC,CAAC,CAAC,OAAO,CAAC,EAAE;wBACZ,CAAC,CAAE,WAAW,CAAC,OAAyB,CAAC,QAAQ,CAAC;oBACpD,IAAI,QAAQ;wBAAE,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;gBACrD,CAAC;gBACD,MAAM,CAAC,IAAI,CACT,iCAAiC,WAAW,CAAC,OAAO,CAAC,EAAE,YAAY,MAAM,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,mDAAmD,CAC1L,CAAC;gBACF,IAAI,MAAM,IAAI,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;oBACzD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU;oBACjC,gEAAgE;oBAChE,2DAA2D;oBAC3D,gEAAgE;oBAChE,+DAA+D;oBAC/D,8DAA8D;oBAC9D,8BAA8B;oBAC9B,EAAE,OAAO,EAAE,MAAiC,EAAE,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,EAAE,EAC/E,IAAI,CACL,CAAC;oBACF,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS;wBAAE,MAAM,KAAK,CAAC,KAAK,CAAC;oBACjD,OAAO,KAAK,CAAC,MAAM,CAAC;gBACtB,CAAC;gBACD,MAAM,MAAM,CAAC,KAAK,CAAC;YACrB,CAAC;YACD,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS,IAAI,MAAM,CAAC,SAAS,KAAK,CAAC;gBAAE,MAAM,MAAM,CAAC,KAAK,CAAC;YAC7E,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;gBAC/B,MAAM,CAAC,KAAK,CACV,sCAAsC,MAAM,CAAC,SAAS,yBAAyB,MAAM,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,CACrJ,CAAC;YACJ,CAAC;YACD,OAAO,MAAM,CAAC,MAAM,CAAC;QACvB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,KAAK,CAAC,+BAA+B,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;QAC1F,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACK,KAAK,CAAC,UAAU,CACtB,WAAmF,EACnF,IAAY;QAEZ,MAAM,MAAM,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;QACpC,IAAI,MAA0B,CAAC;QAC/B,IAAI,SAAS,GAAG,CAAC,CAAC;QAClB,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC;YAC9C,IAAI,CAAC;gBACH,MAAM,IAAI,GACR,WAAW,CAAC,OAAO,KAAK,SAAS,IAAI,KAAK,KAAK,CAAC;oBAC9C,CAAC,CAAC,MAAM,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC;wBAC7B,OAAO,EAAE,KAAK;wBACd,KAAK,EAAE,EAAE,gBAAgB,EAAE,WAAW,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE;qBACzE,CAAC;oBACJ,CAAC,CAAC,MAAM,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC5C,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;gBACjB,SAAS,IAAI,CAAC,CAAC;gBACf,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;YACtD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;YACtC,CAAC;QACH,CAAC;QACD,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;IAC/B,CAAC;IAED;;;;;;;;;OASG;IACK,KAAK,CAAC,uBAAuB,CACnC,OAAgD,EAChD,MAAc;QAMd,IAAI,OAAO,CAAC,QAAQ,EAAE,IAAI,OAAO,CAAC,SAAS,EAAE;YAAE,OAAO,EAAE,OAAO,EAAE,CAAC;QAClE,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS;YAAE,OAAO,EAAE,OAAO,EAAE,CAAC;QAC3E,IACE,IAAI,CAAC,UAAU,KAAK,OAAO;YAC3B,CAAC,sBAAsB,CAAC,OAAO,CAAC;YAChC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YACtC,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAC7B,CAAC;YACD,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC;QAChD,CAAC;QACD,IAAI,CAAC;YACH,kEAAkE;YAClE,iEAAiE;YACjE,4CAA4C;YAC5C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;YACtF,IAAI,QAAQ,EAAE,QAAQ,EAAE,EAAE,CAAC;gBACzB,OAAO,EAAE,OAAO,EAAE,QAAyB,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC;YACtE,CAAC;YACD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAC/D,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACnF,OAAO,EAAE,OAAO,EAAE,MAAuB,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC;QACpE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,IAAI,GAAI,GAAyB,CAAC,IAAI,CAAC;YAC7C,oEAAoE;YACpE,mEAAmE;YACnE,mDAAmD;YACnD,IAAI,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK;gBAAE,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAC7E,MAAM,CAAC,IAAI,CACT,gDAAgD,MAAM,CAAC,SAAS,KAAK,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,6BAA6B,CAC3I,CAAC;YACF,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC;QAChD,CAAC;IACH,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAAc,EAAE,IAAY;QAC5C,IAAI,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,SAAS;gBAAE,OAAO;YAC9B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACjE,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;gBAAE,OAAO;YAC/C,MAAM,GAAG,GAAG,MAAO,OAAuB,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAC5E,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;QACtC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,KAAK,CAAC,8BAA8B,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;QACzF,CAAC;IACH,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAAc,EAAE,KAAa;QAC7C,IAAI,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,SAAS;gBAAE,OAAO;YAC9B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC;YAClF,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;gBAAE,OAAO;YAC/C,MAAM,GAAG,GAAG,MAAO,OAAuB,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAC5E,MAAM,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACvB,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;QACnD,CAAC;QAAC,MAAM,CAAC;YACP,YAAY;QACd,CAAC;IACH,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,MAAc,EAAE,KAAa;QAChD,IAAI,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,SAAS;gBAAE,OAAO;YAC9B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC;YAClF,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;gBAAE,OAAO;YAC/C,MAAM,GAAG,GAAG,MAAO,OAAuB,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAC5E,MAAM,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC3E,CAAC;QAAC,MAAM,CAAC;YACP,YAAY;QACd,CAAC;IACH,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,SAAiB,EAAE,SAA6B,EAAE,MAAc;QACpF,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACrD,IAAI,QAAQ,EAAE,CAAC;YACb,aAAa,CAAC,QAAQ,CAAC,CAAC;YACxB,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACzC,CAAC;QACD,IAAI,CAAC,MAAM;YAAE,OAAO;QACpB,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YAC5D,IAAI,OAAO,IAAI,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC;gBACrC,MAAO,OAAuB,CAAC,UAAU,EAAE,CAAC;gBAC5C,sDAAsD;gBACtD,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;oBACtC,IAAI,CAAC;wBACH,MAAO,OAAuB,CAAC,UAAU,EAAE,CAAC;oBAC9C,CAAC;oBAAC,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC;gBAC7B,CAAC,EAAE,KAAK,CAAC,CAAC;gBACV,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;YAChD,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,YAAY;QACd,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,OAAgB;QAC1C,uEAAuE;QACvE,0EAA0E;QAC1E,IAAI,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,SAAS;YAAE,OAAO;QACtE,MAAM,CAAC,KAAK,CAAC,wBAAwB,OAAO,CAAC,MAAM,CAAC,QAAQ,eAAe,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QAEjG,8BAA8B;QAC9B,IACE,IAAI,CAAC,MAAM,CAAC,uBAAuB,KAAK,KAAK;YAC7C,YAAY,CAAC,OAAO,CAAC,gBAAgB,EAAE,IAAI,CAAC,UAAU,CAAC;YACvD,OAAO;QAET,oBAAoB;QACpB,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,EAAE,KAAK,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,OAAO;QAE7E,uEAAuE;QACvE,wEAAwE;QACxE,+DAA+D;QAC/D,mEAAmE;QACnE,uEAAuE;QACvE,uEAAuE;QACvE,uEAAuE;QACvE,kEAAkE;QAClE,YAAY;QACZ,MAAM,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE;YAChD,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,IAAI,SAAS;YACvC,CAAC,CAAC,SAAS,CAAC;QACd,MAAM,KAAK,GACT,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YAChC,CAAC,eAAe,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAC9E,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,CAAC,KAAK,CAAC,wCAAwC,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;YAC3F,sEAAsE;YACtE,qEAAqE;YACrE,2DAA2D;YAC3D,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE;gBACvD,UAAU,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE;aACzC,CAAC,CAAC;YACH,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;YACrD,OAAO;QACT,CAAC;QAED,sEAAsE;QACtE,qDAAqD;QACrD,IACE,IAAI,CAAC,MAAM,CAAC,SAAS;YACrB,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,IAAI,CAAC,MAAM,CAAC,SAAS;YAC5C,eAAe,KAAK,IAAI,CAAC,MAAM,CAAC,SAAS;YACzC,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE;YAC5B,OAAO;QAET,iBAAiB;QACjB,IAAI,IAAI,CAAC,cAAc,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAAE,OAAO;QAExF,qEAAqE;QACrE,iEAAiE;QACjE,uEAAuE;QACvE,kEAAkE;QAClE,uEAAuE;QACvE,oEAAoE;QACpE,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;QACzC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE;YACvD,UAAU,EAAE,CAAC,IAAI,IAAI,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,SAAS;SACnF,CAAC,CAAC;QACH,MAAM,eAAe,GAAG,qBAAqB,CAAC;YAC5C,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS;YAC7B,IAAI;YACJ,YAAY,EAAE,eAAe,CAAC,UAAU,CAAC;YACzC,eAAe,EACb,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;SAC5E,CAAC,CAAC;QACH,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC;YAC3B,MAAM,CAAC,IAAI,CACT,sCAAsC,eAAe,CAAC,MAAM,iBAAiB,OAAO,CAAC,EAAE,EAAE,CAC1F,CAAC;YACF,OAAO;QACT,CAAC;QAED,sEAAsE;QACtE,sEAAsE;QACtE,uEAAuE;QACvE,wDAAwD;QACxD,IAAI,CAAC,IAAI,IAAI,mBAAmB,CAAC,UAAU,CAAC,EAAE,CAAC;YAC7C,MAAM,CAAC,IAAI,CACT,0EAA0E,OAAO,CAAC,EAAE,EAAE,CACvF,CAAC;YACF,OAAO;QACT,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,OAAO;QAE1B,MAAM,UAAU,GAAG,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE;YAC5D,gBAAgB,EAAE,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC;SACtD,CAAC,CAAC;QACH,MAAM,YAAY,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAEhD,uBAAuB;QACvB,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,GAAG,CACnC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YACzD,IAAI,CAAC;gBACH,MAAM,SAAS,GAAG,MAAM,kBAAkB,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;gBACvE,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,CAAC,WAAW,IAAI,0BAA0B,EAAE,CAAC;YAChG,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC,CAAC,CACH,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAiE,CAAC,CAAC;QAE7G,MAAM,eAAe,GAAoB;YACvC,SAAS,EAAE,IAAI,CAAC,UAAU;YAC1B,MAAM,EAAE,SAAS;YACjB,UAAU;YACV,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE;YAC3B,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS;YACnE,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ;YAC7B,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE;YACzB,IAAI,EAAE,OAAO,CAAC,OAAO;YACrB,WAAW,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACnC,IAAI,EAAE,CAAC,CAAC,IAAI;gBACZ,GAAG,EAAE,EAAE;gBACP,QAAQ,EAAE,CAAC,CAAC,QAAQ;gBACpB,SAAS,EAAE,CAAC,CAAC,SAAS;aACvB,CAAC,CAAC;YACH,YAAY;YACZ,SAAS,EAAE,OAAO,CAAC,EAAE;YACrB,GAAG,EAAE,OAAO;YACZ,aAAa,EAAE;gBACb,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,MAAM,IAAI,OAAO,CAAC,OAAO;oBACrE,CAAC,CAAE,OAAO,CAAC,OAAuB,CAAC,IAAI;oBACvC,CAAC,CAAC,IAAI;gBACR,OAAO,EAAE,OAAO,CAAC,KAAK,EAAE,EAAE,IAAI,IAAI;gBAClC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE;gBACjC,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,OAAO;gBACvD,GAAG,WAAW,CAAC,OAAO,CAAC;aACxB;SACF,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IAChC,CAAC;IAED;;;;;;;;;OASG;IACK,qBAAqB,CAAC,OAAgB;QAC5C,OAAO,CACL,IAAI,CAAC,UAAU,KAAK,QAAQ;YAC5B,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE;YAC5B,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE;YAC3B,sBAAsB,CAAC,OAAO,CAAC,OAAO,CAAC;YACvC,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YAC/C,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CACrC,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACK,cAAc,CAAC,OAEtB;QACC,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;QAC5B,IAAI,CAAC,EAAE,IAAI,OAAO,OAAO,CAAC,cAAc,KAAK,UAAU;YAAE,OAAO,IAAI,CAAC;QACrE,MAAM,KAAK,GAAG,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;QACzC,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QACxB,OAAO,CACL,KAAK,CAAC,GAAG,CAAC,mBAAmB,CAAC,mBAAmB,CAAC;YAClD,KAAK,CAAC,GAAG,CAAC,mBAAmB,CAAC,qBAAqB,CAAC,CACrD,CAAC;IACJ,CAAC;IAED;;;;;;;OAOG;IACK,gBAAgB,CACtB,OAA4F,EAC5F,eAAwB;QAExB,IAAI,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;YACvB,IAAI,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,QAAQ,IAAI,SAAS,CAAC,EAAE,CAAC;gBACvE,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACzC,CAAC;YACD,OAAO;QACT,CAAC;QACD,IACE,eAAe;YACf,CAAC,OAAO,CAAC,SAAS,EAAE;YACpB,IAAI,CAAC,kBAAkB,CAAC,eAAe,EAAE,OAAO,CAAC,EAAE,CAAC,EACpD,CAAC;YACD,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC;IAED;;;;;;;;OAQG;IACK,kBAAkB,CAAC,EAAU,EAAE,eAAwB;QAC7D,IACE,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,KAAK,SAAS;YAClE,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,cAAc,KAAK,KAAK,EAC/C,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC;QAChD,OAAO,eAAe,KAAK,SAAS,IAAI,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,SAAS,CAAC;IACtF,CAAC;IAED;;;;;;;;OAQG;IACK,KAAK,CAAC,iBAAiB,CAC7B,OAAgB,EAChB,IAA6B;QAM7B,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,KAAK,CAAC;QACnD,IAAI,eAAe,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QAC7E,IAAI,OAAO,IAAI,eAAe,KAAK,SAAS,IAAI,IAAI,CAAC,UAAU,IAAI,OAAO,CAAC,SAAS,EAAE,SAAS,EAAE,CAAC;YAChG,IAAI,CAAC;gBACH,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,cAAc,EAAE,CAAC;gBAClD,eAAe,GAAG,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC;YAC1C,CAAC;YAAC,MAAM,CAAC;gBACP,8CAA8C;YAChD,CAAC;QACH,CAAC;QACD,OAAO;YACL,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE;YAC/B,gBAAgB,EAAE,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YACxD,eAAe;SAChB,CAAC;IACJ,CAAC;IAED,2DAA2D;IACnD,KAAK,CAAC,aAAa,CACzB,KAAsC,EACtC,OAAgB,EAChB,UAAiD;QAEjD,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBACzE,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,GAAG,EAAE,GAAG,CAAC,GAAG;gBACZ,QAAQ,EAAE,GAAG,CAAC,WAAW,IAAI,0BAA0B;aACxD,CAAC,CAAC,CAAC;YAEJ,MAAM,OAAO,GAAG;gBACd,8DAA8D;gBAC9D,qEAAqE;gBACrE,UAAU,EAAE,gBAAgB,CAAC,OAAO,EAAE,SAAS,EAAE;oBAC/C,gBAAgB,EAAE,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC;iBACtD,CAAC;gBACF,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE;gBAC3B,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS;gBACnE,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ;gBAC7B,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE;gBACzB,IAAI,EAAE,OAAO,CAAC,OAAO;gBACrB,SAAS,EAAE,OAAO,CAAC,EAAE;gBACrB,WAAW;gBACX,YAAY,EAAE,iBAAiB,CAAC,OAAO,CAAC;gBACxC,aAAa,EAAE;oBACb,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,MAAM,IAAI,OAAO,CAAC,OAAO;wBACrE,CAAC,CAAE,OAAO,CAAC,OAAuB,CAAC,IAAI;wBACvC,CAAC,CAAC,IAAI;oBACR,OAAO,EAAE,OAAO,CAAC,KAAK,EAAE,EAAE,IAAI,IAAI;oBAClC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE;oBACjC,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,OAAO;oBACvD,GAAG,WAAW,CAAC,OAAO,CAAC;oBACvB,2DAA2D;oBAC3D,+DAA+D;oBAC/D,4DAA4D;oBAC5D,sBAAsB;oBACtB,GAAI;wBACF,eAAe,EAAE,eAAe,CAAC,UAAU,CAAC;wBAC5C,mBAAmB,EAAE,mBAAmB,CAAC,UAAU,CAAC;wBACpD,eAAe,EACb,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;qBAC7C;iBACjC;aACF,CAAC;YAEF,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,kCAAkC,EAAE;gBAC1F,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;oBAClC,+DAA+D;oBAC/D,wDAAwD;oBACxD,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,UAAU,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBACnE;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;aAC9B,CAAC,CAAC;YAEH,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;gBACZ,MAAM,CAAC,KAAK,CAAC,sCAAsC,KAAK,CAAC,GAAG,KAAK,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC;YACnG,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,KAAK,CAAC,0BAA0B,KAAK,CAAC,GAAG,KAAK,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;QACnG,CAAC;IACH,CAAC;CACF"}
|
|
@@ -1,9 +1,21 @@
|
|
|
1
|
-
import type { Connector, ConnectorCapabilities, ConnectorHealth, IncomingMessage, Target } from "../../shared/types.js";
|
|
1
|
+
import type { Connector, ConnectorCapabilities, ConnectorHealth, DiscordRespondToConfig, IncomingMessage, Target } from "../../shared/types.js";
|
|
2
2
|
export interface RemoteDiscordConfig {
|
|
3
3
|
/** URL of the primary Jinn instance that holds the Discord WebSocket connection */
|
|
4
4
|
proxyVia: string;
|
|
5
|
+
/** Bearer token for the primary's gateway — required when its /api/* auth is enabled. */
|
|
6
|
+
proxyViaToken?: string;
|
|
5
7
|
channelId?: string;
|
|
8
|
+
/** Deterministic per-scope response gate, applied to proxied messages. */
|
|
9
|
+
respondTo?: DiscordRespondToConfig;
|
|
6
10
|
}
|
|
11
|
+
/**
|
|
12
|
+
* Allowlist a routed Discord payload's transportMeta at the receiving
|
|
13
|
+
* boundary. This endpoint carries Discord traffic, so only the fields the
|
|
14
|
+
* Discord primary actually produces pass through — a forged Slack identity
|
|
15
|
+
* (or any future field we haven't reasoned about) must never reach the
|
|
16
|
+
* platform-bound operator check or the MEMORY.md gate.
|
|
17
|
+
*/
|
|
18
|
+
export declare function sanitizeIncomingDiscordMeta(meta: unknown): Record<string, unknown>;
|
|
7
19
|
/**
|
|
8
20
|
* A Discord connector that doesn't hold its own WebSocket connection.
|
|
9
21
|
* Instead, it receives messages from the primary Jinn instance via HTTP
|
|
@@ -13,6 +25,9 @@ export declare class RemoteDiscordConnector implements Connector {
|
|
|
13
25
|
name: string;
|
|
14
26
|
private handler;
|
|
15
27
|
private baseUrl;
|
|
28
|
+
private readonly proxyToken;
|
|
29
|
+
private readonly respondTo;
|
|
30
|
+
private warnedMissingAddressing;
|
|
16
31
|
constructor(config: RemoteDiscordConfig);
|
|
17
32
|
onMessage(handler: (msg: IncomingMessage) => void): void;
|
|
18
33
|
/** Called by the /api/connectors/discord/incoming endpoint to deliver proxied messages */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote.d.ts","sourceRoot":"","sources":["../../../../src/connectors/discord/remote.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EACT,qBAAqB,EACrB,eAAe,EACf,eAAe,EACf,MAAM,EACP,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"remote.d.ts","sourceRoot":"","sources":["../../../../src/connectors/discord/remote.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EACT,qBAAqB,EACrB,eAAe,EACf,sBAAsB,EACtB,eAAe,EACf,MAAM,EACP,MAAM,uBAAuB,CAAC;AAS/B,MAAM,WAAW,mBAAmB;IAClC,mFAAmF;IACnF,QAAQ,EAAE,MAAM,CAAC;IACjB,yFAAyF;IACzF,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,0EAA0E;IAC1E,SAAS,CAAC,EAAE,sBAAsB,CAAC;CACpC;AAoBD;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAKlF;AAED;;;;GAIG;AACH,qBAAa,sBAAuB,YAAW,SAAS;IACtD,IAAI,SAAa;IACjB,OAAO,CAAC,OAAO,CAAiD;IAChE,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAqB;IAChD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAqC;IAC/D,OAAO,CAAC,uBAAuB,CAAS;gBAE5B,MAAM,EAAE,mBAAmB;IAMvC,SAAS,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,eAAe,KAAK,IAAI,GAAG,IAAI;IAIxD,0FAA0F;IAC1F,cAAc,CAAC,GAAG,EAAE,eAAe,GAAG,IAAI;IA6CpC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAItB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B,eAAe,IAAI,qBAAqB;IASxC,SAAS,IAAI,eAAe;IAO5B,iBAAiB,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM;IAS7E,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAItE,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAIvE,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxD,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIzD,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5D,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAIvF,WAAW;CAsB1B"}
|