@songsid/agend 2.2.1 → 2.2.5

package/dist/channel/adapters/discord-client-retirement.js

@@ -0,0 +1,57 @@
+const retirements = new WeakMap();
+const destroyers = new WeakMap();
+/** Client.login() also calls this.destroy() internally when gateway startup fails. */
+export function protectDiscordClientRetirement(client, report) {
+    if (destroyers.has(client))
+        return;
+    destroyers.set(client, client.destroy.bind(client));
+    client.destroy = () => retireDiscordClient(client, report);
+}
+/** Contain a retired gateway's errors until its underlying socket actually closes. */
+export function retireDiscordClient(client, report) {
+    const pending = retirements.get(client);
+    if (pending)
+        return pending;
+    // discord.js 14 / @discordjs/ws 1.2.3 destroy() clears connection.onerror,
+    // but leaves CONNECTING sockets and their ws handshake timers running. Their
+    // later timeout then emits an unhandled EventEmitter error in the fleet.
+    // These are deliberately scoped private internals of the default in-process
+    // strategy; a Client without a gateway (including before login) has no sockets.
+    const strategy = client.ws?._ws?.strategy;
+    // A pending GET gateway/bot can resume Client.login after destroy has finished.
+    // Fence the strategy permanently before our first await: spawning/connecting
+    // after retirement would create sockets outside the snapshot below. A spawn
+    // already awaiting gateway info may still finish, but cannot connect them.
+    if (strategy) {
+        strategy.spawn = async () => { };
+        strategy.connect = async () => { };
+    }
+    const shards = strategy?.shards;
+    for (const shard of shards?.values() ?? []) {
+        // A HELLO timeout can already have scheduled native recovery in 1.2.3's
+        // 500ms backoff. A retired shard must never open another socket after the
+        // manager has forgotten it. This instance is never reused.
+        if (typeof shard.internalConnect === "function")
+            shard.internalConnect = async () => { };
+    }
+    const sockets = [...(shards?.values() ?? [])].flatMap(shard => shard.connection ? [shard.connection] : []);
+    for (const socket of sockets) {
+        socket.on("error", report);
+        socket.once("close", () => socket.removeListener("error", report));
+    }
+    const retirement = (async () => {
+        try {
+            await (destroyers.get(client) ?? client.destroy.bind(client))();
+        }
+        finally {
+            // Destroy first: it disconnects shard callbacks, so terminating a pending
+            // handshake cannot start the retired shard's native reconnect loop.
+            for (const socket of sockets)
+                if (socket.readyState === 0)
+                    socket.terminate();
+        }
+    })();
+    retirements.set(client, retirement);
+    return retirement;
+}
+//# sourceMappingURL=discord-client-retirement.js.map

package/dist/channel/adapters/discord-client-retirement.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"discord-client-retirement.js","sourceRoot":"","sources":["../../../src/channel/adapters/discord-client-retirement.ts"],"names":[],"mappings":"AAUA,MAAM,WAAW,GAAG,IAAI,OAAO,EAAyB,CAAC;AACzD,MAAM,UAAU,GAAG,IAAI,OAAO,EAAyB,CAAC;AAExD,sFAAsF;AACtF,MAAM,UAAU,8BAA8B,CAAC,MAAc,EAAE,MAA8B;IAC3F,IAAI,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC;QAAE,OAAO;IACnC,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IACpD,MAAM,CAAC,OAAO,GAAG,GAAG,EAAE,CAAC,mBAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAC7D,CAAC;AAED,sFAAsF;AACtF,MAAM,UAAU,mBAAmB,CAAC,MAAc,EAAE,MAA8B;IAChF,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACxC,IAAI,OAAO;QAAE,OAAO,OAAO,CAAC;IAC5B,2EAA2E;IAC3E,6EAA6E;IAC7E,yEAAyE;IACzE,4EAA4E;IAC5E,gFAAgF;IAChF,MAAM,QAAQ,GAAI,MAAM,CAAC,EAMvB,EAAE,GAAG,EAAE,QAAQ,CAAC;IAClB,gFAAgF;IAChF,6EAA6E;IAC7E,4EAA4E;IAC5E,2EAA2E;IAC3E,IAAI,QAAQ,EAAE,CAAC;QACb,QAAQ,CAAC,KAAK,GAAG,KAAK,IAAI,EAAE,GAAE,CAAC,CAAC;QAChC,QAAQ,CAAC,OAAO,GAAG,KAAK,IAAI,EAAE,GAAE,CAAC,CAAC;IACpC,CAAC;IACD,MAAM,MAAM,GAAG,QAAQ,EAAE,MAAM,CAAC;IAChC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC;QAC3C,wEAAwE;QACxE,0EAA0E;QAC1E,2DAA2D;QAC3D,IAAI,OAAO,KAAK,CAAC,eAAe,KAAK,UAAU;YAAE,KAAK,CAAC,eAAe,GAAG,KAAK,IAAI,EAAE,GAAE,CAAC,CAAC;IAC1F,CAAC;IACD,MAAM,OAAO,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAC3G,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC3B,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;IACrE,CAAC;IACD,MAAM,UAAU,GAAG,CAAC,KAAK,IAAI,EAAE;QAC7B,IAAI,CAAC;YACH,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;QAClE,CAAC;gBAAS,CAAC;YACT,0EAA0E;YAC1E,oEAAoE;YACpE,KAAK,MAAM,MAAM,IAAI,OAAO;gBAAE,IAAI,MAAM,CAAC,UAAU,KAAK,CAAC;oBAAE,MAAM,CAAC,SAAS,EAAE,CAAC;QAChF,CAAC;IACH,CAAC,CAAC,EAAE,CAAC;IACL,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACpC,OAAO,UAAU,CAAC;AACpB,CAAC"}

package/dist/channel/adapters/discord.d.ts

@@ -142,6 +142,8 @@ export declare class DiscordAdapter extends EventEmitter implements ChannelAdapt
     private emitFromClient;
     private emitHealthChanged;
     private loginFreshClient;
+    private retireClient;
+    private reportRetiredSocketError;
     /** Rebuild just this bot's gateway Client. Calls coalesce into one generation. */
     reconnectGateway(reason: string): Promise<void>;
     private readyClient;
@@ -199,6 +201,15 @@ export declare class DiscordAdapter extends EventEmitter implements ChannelAdapt
         r: Record<string, string>;
         c: Record<string, string>;
     };
+    /** #1990: whether `userId` is in the guild now (one member read; an unknown member or any error rejects). */
+    isGroupMember(groupId: string, userId: string): Promise<boolean>;
+    /**
+     * #1920 §3.2: whether a user can read this room as on Discord — a member of the channel's guild (read from Discord,
+     * force: never the member cache) with View Channel and Read Message History there (the web shows a room's history,
+     * #2092 review). A private thread (a ClassicBot room can be one) also needs the user in it, or Manage Threads:
+     * discord.js answers a thread's permissionsFor from its parent, which every guild member who sees the parent passes.
+     */
+    canViewChannel(channelId: string, userId: string): Promise<boolean>;
     /** Private delivery: a DM to the user (fails if the user disallows DMs from this server). */
     sendDirect(userId: string, text: string, opts?: SendOpts): Promise<SentMessage>;
     sendText(chatId: string, text: string, opts?: SendOpts): Promise<SentMessage>;

package/dist/channel/adapters/discord.js

@@ -14,8 +14,10 @@ import { Client, GatewayIntentBits, Partials, ActionRowBuilder, ButtonBuilder, B
 import { downloadStickerImage } from "../sticker-download.js";
 import { MessageQueue } from "../message-queue.js";
 import { splitTextFenceAware, truncatePreview, fenceBlock } from "../markdown-chunk.js";
+import { stripPlaceRefs } from "../../topic-link.js";
 import { CROSS_INSTANCE_VISIBILITY_MODES } from "../../cross-instance-notice.js";
 import { POLL_STATUS_CALLBACK } from "../../reply-polls.js";
+import { protectDiscordClientRetirement, retireDiscordClient } from "./discord-client-retirement.js";
 const DISCORD_MAX_LENGTH = 2000;
 const GATEWAY_WATCHDOG_INTERVAL_MS = 30_000;
 const GATEWAY_STALE_MIN_MS = 180_000;
@@ -287,6 +289,7 @@ export class DiscordAdapter extends EventEmitter {
         return channel;
     }
     registerClientHandlers(client, generation) {
+        protectDiscordClientRetirement(client, error => this.reportRetiredSocketError(error));
         // Client/shard errors (WebSocket hiccups, gateway resumes, etc.). discord.js
         // auto-reconnects; we just need a listener so Node's EventEmitter doesn't
         // rethrow on "error" — without one it surfaces as an uncaughtException and
@@ -841,7 +844,10 @@ export class DiscordAdapter extends EventEmitter {
         const oldClient = this.client;
         // A destroyed discord.js Client cannot be logged in again. Destroy first to
         // avoid overlapping gateway sessions delivering MESSAGE_CREATE twice.
-        oldClient.destroy();
+        await this.retireClient(oldClient);
+        if (!this.desiredRunning || epoch !== this.lifecycleEpoch) {
+            throw new Error("Discord gateway login superseded by lifecycle change");
+        }
         const client = this.clientFactory();
         const generation = ++this.clientGeneration;
         this.client = client;
@@ -855,7 +861,6 @@ export class DiscordAdapter extends EventEmitter {
         try {
             await client.login(this.botToken);
             if (!this.desiredRunning || epoch !== this.lifecycleEpoch || this.client !== client) {
-                client.destroy();
                 throw new Error("Discord gateway login superseded by lifecycle change");
             }
             this.lastReconnectAt = this.now();
@@ -864,10 +869,16 @@ export class DiscordAdapter extends EventEmitter {
             this.emitHealthChanged();
         }
         catch (err) {
-            client.destroy();
+            await this.retireClient(client);
             throw err;
         }
     }
+    retireClient(client) {
+        return retireDiscordClient(client, error => this.reportRetiredSocketError(error));
+    }
+    reportRetiredSocketError(error) {
+        console.warn(`[discord:${this.id}] retired gateway socket error: ${error.message}`);
+    }
     /** Rebuild just this bot's gateway Client. Calls coalesce into one generation. */
     reconnectGateway(reason) {
         if (this.reconnectPromise)
@@ -1341,7 +1352,7 @@ export class DiscordAdapter extends EventEmitter {
             clearInterval(this.watchdogTimer);
         this.watchdogTimer = null;
         this.queue.stop();
-        this.client.destroy();
+        await this.retireClient(this.client);
     }
     // ── Text / file sending ────────────────────────────────────────────────
     /**
@@ -1406,14 +1417,61 @@ export class DiscordAdapter extends EventEmitter {
         }
         return out;
     }
+    /** #1990: whether `userId` is in the guild now (one member read; an unknown member or any error rejects). */
+    async isGroupMember(groupId, userId) {
+        if (!/^\d{5,25}$/.test(userId) || !groupId || groupId !== this.guildId)
+            return false;
+        const guild = await (await this.readyClient()).guilds.fetch(this.guildId);
+        // force: a read from Discord, never the member cache — without the GuildMembers intent a member who left can
+        // stay cached, and each ten-minute recheck would confirm them again.
+        await guild.members.fetch({ user: userId, force: true });
+        return true;
+    }
+    /**
+     * #1920 §3.2: whether a user can read this room as on Discord — a member of the channel's guild (read from Discord,
+     * force: never the member cache) with View Channel and Read Message History there (the web shows a room's history,
+     * #2092 review). A private thread (a ClassicBot room can be one) also needs the user in it, or Manage Threads:
+     * discord.js answers a thread's permissionsFor from its parent, which every guild member who sees the parent passes.
+     */
+    async canViewChannel(channelId, userId) {
+        if (!/^\d{5,25}$/.test(userId) || !/^\d{5,25}$/.test(channelId))
+            return false;
+        const channel = await (await this.readyClient()).channels.fetch(channelId);
+        if (!channel || !("guild" in channel) || !channel.guild || typeof channel.permissionsFor !== "function")
+            return false;
+        // 10007 Unknown Member / 10013 Unknown User: a definite "not in it"; anything else is no answer (rethrown).
+        const notIn = (err) => { if ([10007, 10013].includes(err.code))
+            return false; throw err; };
+        let member;
+        try {
+            member = await channel.guild.members.fetch({ user: userId, force: true });
+        }
+        catch (err) {
+            return notIn(err);
+        }
+        const perms = channel.permissionsFor(member);
+        if (perms?.has(PermissionFlagsBits.ViewChannel) !== true || perms.has(PermissionFlagsBits.ReadMessageHistory) !== true)
+            return false;
+        if (channel.type !== ChannelType.PrivateThread || perms.has(PermissionFlagsBits.ManageThreads))
+            return true;
+        try {
+            await channel.members.fetch({ member: userId, force: true });
+            return true;
+        }
+        catch (err) {
+            return notIn(err);
+        }
+    }
     /** Private delivery: a DM to the user (fails if the user disallows DMs from this server). */
     async sendDirect(userId, text, opts) {
+        text = stripPlaceRefs(text);
         const user = await this.client.users.fetch(userId);
         const dm = await user.createDM();
         const sent = await dm.send({ content: text, ...(opts?.disablePreview ? { flags: MessageFlags.SuppressEmbeds } : {}), ...(opts?.choices ? { components: buttonRows(opts.choices) } : {}), allowedMentions: { parse: [] } });
         return { messageId: sent.id, chatId: dm.id };
     }
     async sendText(chatId, text, opts) {
+        text = stripPlaceRefs(text);
         const channelId = opts?.threadId ?? chatId;
         const channel = await this._fetchTextChannel(channelId);
         const chunkLimit = opts?.chunkLimit ?? DISCORD_MAX_LENGTH;
@@ -1483,6 +1541,7 @@ export class DiscordAdapter extends EventEmitter {
     }
     /** #1651: `_opts.format` changes nothing here — Discord always renders Markdown (as sendText ignores it too). */
     async editMessage(chatId, messageId, text, threadId, _opts) {
+        text = stripPlaceRefs(text);
         // Prefer the exact channel (handles forum-topic threads, which a GuildText
         // scan misses). chatId is the guild id in the channels topology, so the
         // message actually lives in threadId (when set) or a specific text channel.
@@ -1535,6 +1594,7 @@ export class DiscordAdapter extends EventEmitter {
         await msg.edit({ components: [] });
     }
     async editMessageRemoveButtons(chatId, messageId, text, threadId) {
+        text = stripPlaceRefs(text);
         // Prefer the exact channel (handles forum-topic threads, which a GuildText
         // scan misses); fall back to scanning top-level text channels.
         let exactError;
@@ -1908,7 +1968,7 @@ export class DiscordAdapter extends EventEmitter {
         if (alert.choices && alert.choices.length > 0) {
             const channelId = opts?.threadId ?? chatId;
             const channel = await this._fetchTextChannel(channelId);
-            const msg = await channel.send({ content: alert.message, components: buttonRows(alert.choices) });
+            const msg = await channel.send({ content: stripPlaceRefs(alert.message), components: buttonRows(alert.choices) });
             // The address this adapter's own callbacks report for these buttons
             // (guild + channel as thread), not the caller's spelling of it (#1131).
             // A native slash command addresses its channel as the chat; the button
@@ -1937,7 +1997,7 @@ export class DiscordAdapter extends EventEmitter {
         const channel = await this._fetchTextChannel(opts?.threadId ?? chatId);
         const msg = await channel.messages.fetch(messageId);
         await msg.edit({
-            content: truncatePreview(alert.message, DISCORD_MAX_LENGTH),
+            content: truncatePreview(stripPlaceRefs(alert.message), DISCORD_MAX_LENGTH),
             components: buttonRows(alert.choices ?? []),
         });
     }