@geminixiang/mikan 1.0.0-beta.95 → 1.0.0

package/dist/adapters/slack/bot.js

@@ -8,6 +8,7 @@ import { COMMAND_MANIFEST } from "../commands/manifest.js";
 import { slackConversationAutoReplyMode, resolveConversationSettings, } from "../../settings/index.js";
 import { evaluateWithJev, JevNotConfiguredError } from "../../harness/jev.js";
 import * as log from "../../log.js";
+import { SlackSocketAgent } from "./socket-agent.js";
 import { readTextFileNoFollowIfExists } from "../../file-guards.js";
 import { PRODUCT_NAME, formatForceStopped } from "../messages.js";
 import { MessagingEventQueue, MessagingIntakeTracker, AttachmentRejectedError, saveIncomingAttachments, writeResponseToFile, withRetry, } from "../shared.js";
@@ -257,6 +258,7 @@ export class SlackMessagingBot {
                 new SocketModeClient({
                     appToken: config.appToken,
                     clientPingTimeout: 12_000,
+                    clientOptions: { agent: new SlackSocketAgent() },
                 });
         this.webClient = config.webApi ?? new WebClient(config.botToken, { fetch: config.fetch });
         this.statusClient = new WebClient(config.botToken, {
@@ -282,7 +284,14 @@ export class SlackMessagingBot {
         this.backfillChannelKinds();
         this.startupTs = (Date.now() / 1000).toFixed(6);
         this.setupEventHandlers();
-        await this.socketClient.start();
+        try {
+            await this.socketClient.start();
+        }
+        catch (error) {
+            if (this.stopped)
+                return;
+            throw error;
+        }
         log.logConnected("Slack");
         void this.backfillAllChannels(this.startupTs).catch((error) => {
             log.logWarning("Slack backfill failed", String(error));
@@ -399,55 +408,6 @@ export class SlackMessagingBot {
             return channelId;
         });
     }
-    async fetchHistory(channel, options) {
-        const limit = Math.min(Math.max(options?.limit ?? 200, 1), 999);
-        const threadTs = options?.threadTs;
-        return slackRetry(async () => {
-            const result = threadTs
-                ? await this.webClient.conversations.replies({
-                    channel,
-                    ts: threadTs,
-                    oldest: options?.oldest || undefined,
-                    inclusive: options?.oldest ? false : undefined,
-                    limit,
-                })
-                : await this.webClient.conversations.history({
-                    channel,
-                    oldest: options?.oldest || undefined,
-                    inclusive: options?.oldest ? false : undefined,
-                    limit,
-                });
-            const messages = (result.messages ?? []);
-            const mapped = messages
-                .filter((msg) => !!msg.ts)
-                .filter((msg) => msg.ts !== threadTs)
-                .map((msg) => {
-                const user = msg.user ? this.users.get(msg.user) : undefined;
-                const message = {
-                    ts: msg.ts,
-                    text: unescapeSlackText(msg.text ?? ""),
-                    isBot: !!msg.bot_id || msg.subtype === "bot_message" || user?.isBot === true,
-                };
-                if (msg.thread_ts && msg.thread_ts !== msg.ts)
-                    message.threadTs = msg.thread_ts;
-                if (msg.user)
-                    message.userId = msg.user;
-                if (user)
-                    message.userName = user.userName;
-                return message;
-            });
-            return threadTs ? mapped : mapped.toReversed();
-        });
-    }
-    async listUsers() {
-        await slackRetry(() => this.fetchUsers());
-        return this.getAllUsers().map((user) => ({
-            id: user.id,
-            userName: user.userName,
-            displayName: user.displayName,
-            isBot: user.isBot === true,
-        }));
-    }
     async updateMessage(channel, ts, text) {
         return slackRetry(async () => {
             const payload = { channel, ts, ...renderSlackBlocks(this.resolveMentions(text)) };
@@ -1059,14 +1019,22 @@ export class SlackMessagingBot {
         await this.handler.handleEvent(event, this, context);
     }
     setupEventHandlers() {
-        this.socketClient.on("disconnect", (err) => {
-            log.logWarning("Slack socket disconnect", err ? String(err) : "");
-        });
         this.socketClient.on("error", (err) => {
             log.logWarning("Slack socket error", err ? String(err) : "");
         });
-        this.socketClient.on("unable_to_socket_mode_start", (err) => {
-            log.logWarning("Slack socket unable_to_start", err ? String(err) : "");
+        let connectionLostAt;
+        this.socketClient.on("close", () => {
+            if (this.stopped || connectionLostAt !== undefined)
+                return;
+            connectionLostAt = Date.now();
+            log.logWarning("Slack connection lost; reconnecting");
+        });
+        this.socketClient.on("connected", () => {
+            if (connectionLostAt === undefined)
+                return;
+            const seconds = Math.round((Date.now() - connectionLostAt) / 1000);
+            connectionLostAt = undefined;
+            log.logInfo(`Slack reconnected after ${seconds}s`);
         });
         const on = (event, handle) => this.socketClient.on(event, (payload) => this.intake.run(() => handle(withLoggedAck(event, payload))));
         on("app_mention", (payload) => this.handleAppMention(payload));
@@ -1378,7 +1346,11 @@ export class SlackMessagingBot {
             return;
         }
         ack();
-        const sessionKey = action.value ?? action.action_id.replace("force_stop_", "").replace(/_/g, ":");
+        const sessionKey = action.value;
+        if (!sessionKey) {
+            log.logWarning("[Force Stop] Ignored a button without a session key", action.action_id);
+            return;
+        }
         const userId = body.user?.id;
         const channelId = body.container?.channel_id || conversationIdOf(sessionKey);
         log.logInfo(`[Force Stop] User ${userId} requested force stop for ${sessionKey}`);