@zhin.js/adapter-slack 4.0.1 → 4.1.0

package/src/transport-http.ts

@@ -0,0 +1,95 @@
+/**
+ * HTTP 传输 — 在 zhin Router 上注册 /slack/events webhook
+ */
+import { verifySlackSignature } from './signing.js';
+import type { SlackEventDispatcher } from './event-dispatcher.js';
+import type { SlackEndpointConfig, SlackEventEnvelope, SlackInteractionPayload, SlackSlashCommand, SlackUrlVerification } from './types.js';
+import type { Logger } from '@zhin.js/logger';
+
+export type RouterLike = {
+  post: (path: string, ...args: any[]) => void;
+};
+
+export class SlackHttpTransport {
+  constructor(
+    private config: SlackEndpointConfig,
+    private dispatcher: SlackEventDispatcher,
+    private logger: Logger,
+  ) {}
+
+  registerRoutes(router: RouterLike): void {
+    const signingSecret = this.config.signingSecret;
+
+    router.post('/slack/events', async (ctx: any) => {
+      const rawBody = await this.getRawBody(ctx);
+      const timestamp = ctx.get?.('X-Slack-Request-Timestamp') ?? ctx.headers?.['x-slack-request-timestamp'] ?? '';
+      const signature = ctx.get?.('X-Slack-Signature') ?? ctx.headers?.['x-slack-signature'] ?? '';
+
+      if (!verifySlackSignature(signingSecret, rawBody, timestamp, signature)) {
+        ctx.status = 401;
+        ctx.body = 'Invalid signature';
+        return;
+      }
+
+      const contentType: string = ctx.get?.('content-type') ?? ctx.headers?.['content-type'] ?? '';
+      let body: unknown;
+
+      if (contentType.includes('application/x-www-form-urlencoded')) {
+        const params = new URLSearchParams(rawBody);
+        const payloadStr = params.get('payload');
+        if (payloadStr) {
+          body = JSON.parse(payloadStr);
+          ctx.status = 200;
+          ctx.body = '';
+          this.handleInteraction(body as SlackInteractionPayload);
+          return;
+        }
+        body = Object.fromEntries(params);
+        if ((body as any).command) {
+          ctx.status = 200;
+          ctx.body = '';
+          this.dispatcher.routeSlashCommand(body as SlackSlashCommand);
+          return;
+        }
+      } else {
+        body = JSON.parse(rawBody);
+      }
+
+      const envelope = body as any;
+
+      if (envelope.type === 'url_verification') {
+        ctx.status = 200;
+        ctx.body = { challenge: (envelope as SlackUrlVerification).challenge };
+        return;
+      }
+
+      if (envelope.type === 'event_callback' && envelope.event) {
+        ctx.status = 200;
+        ctx.body = '';
+        this.dispatcher.routeEvent((envelope as SlackEventEnvelope).event);
+        return;
+      }
+
+      ctx.status = 200;
+      ctx.body = '';
+    });
+  }
+
+  private async getRawBody(ctx: any): Promise<string> {
+    if (ctx.request?.rawBody) return ctx.request.rawBody;
+    if (typeof ctx.request?.body === 'string') return ctx.request.body;
+    if (ctx.req) {
+      return new Promise<string>((resolve, reject) => {
+        let data = '';
+        ctx.req.on('data', (chunk: Buffer) => { data += chunk.toString(); });
+        ctx.req.on('end', () => resolve(data));
+        ctx.req.on('error', reject);
+      });
+    }
+    return JSON.stringify(ctx.request?.body ?? {});
+  }
+
+  private handleInteraction(payload: SlackInteractionPayload): void {
+    this.dispatcher.routeInteraction(payload);
+  }
+}

package/src/transport-socket.ts

@@ -0,0 +1,77 @@
+/**
+ * Socket Mode 传输 — 包装 @slack/socket-mode SocketModeClient
+ */
+import { SocketModeClient } from '@slack/socket-mode';
+import type { SlackEventDispatcher } from './event-dispatcher.js';
+import type { SlackEndpointConfig, SlackEventEnvelope, SlackInteractionPayload, SlackSlashCommand } from './types.js';
+import type { Logger } from '@zhin.js/logger';
+
+export class SlackSocketTransport {
+  private socketClient: SocketModeClient;
+  private connected = false;
+
+  constructor(
+    private config: SlackEndpointConfig,
+    private dispatcher: SlackEventDispatcher,
+    private logger: Logger,
+  ) {
+    if (!config.appToken) {
+      throw new Error('Socket Mode requires appToken (xapp-...)');
+    }
+    this.socketClient = new SocketModeClient({
+      appToken: config.appToken,
+      clientPingTimeout: config.clientPingTimeout ?? 15_000,
+    });
+  }
+
+  async connect(): Promise<void> {
+    this.socketClient.on('slack_event', async ({ ack, body }) => {
+      await ack();
+      this.handleEnvelope(body);
+    });
+
+    this.socketClient.on('interactive', async ({ ack, body }) => {
+      await ack();
+      this.handleInteraction(body);
+    });
+
+    this.socketClient.on('slash_commands', async ({ ack, body }) => {
+      await ack();
+      this.handleSlashCommand(body);
+    });
+
+    await this.socketClient.start();
+    this.connected = true;
+  }
+
+  async disconnect(): Promise<void> {
+    if (!this.connected) return;
+    try {
+      await this.socketClient.disconnect();
+    } catch { /* ignore */ }
+    this.connected = false;
+  }
+
+  get isConnected(): boolean { return this.connected; }
+
+  private handleEnvelope(body: unknown): void {
+    const envelope = body as SlackEventEnvelope;
+    if (envelope?.type === 'event_callback' && envelope.event) {
+      this.dispatcher.routeEvent(envelope.event);
+    }
+  }
+
+  private handleInteraction(body: unknown): void {
+    const payload = body as SlackInteractionPayload;
+    if (payload?.type) {
+      this.dispatcher.routeInteraction(payload);
+    }
+  }
+
+  private handleSlashCommand(body: unknown): void {
+    const cmd = body as SlackSlashCommand;
+    if (cmd?.command) {
+      this.dispatcher.routeSlashCommand(cmd);
+    }
+  }
+}

package/src/types.ts

@@ -1,8 +1,6 @@
 /**
  * Slack 适配器类型定义
  */
-import type { LogLevel } from "@slack/bolt";
-import type { KnownEventFromType } from "@slack/bolt";
 
 export interface SlackEndpointConfig {
   context: "slack";
@@ -11,8 +9,105 @@ export interface SlackEndpointConfig {
   signingSecret: string;
   appToken?: string;
   socketMode?: boolean;
+  /** Socket Mode 客户端 ping 超时（ms），默认 15000 */
+  clientPingTimeout?: number;
   port?: number;
-  logLevel?: LogLevel;
 }
 
-export type SlackMessageEvent = KnownEventFromType<"message">;
+/** Slack Events API event_callback 外层包装 */
+export interface SlackEventEnvelope {
+  token?: string;
+  team_id?: string;
+  api_app_id?: string;
+  event: SlackEvent;
+  type: "event_callback";
+  event_id?: string;
+  event_time?: number;
+  authorizations?: unknown[];
+}
+
+/** Slack URL verification challenge */
+export interface SlackUrlVerification {
+  type: "url_verification";
+  token: string;
+  challenge: string;
+}
+
+/** Slack interactive payload (block_actions, etc.) */
+export interface SlackInteractionPayload {
+  type: "block_actions" | "message_action" | "shortcut" | "view_submission" | "view_closed";
+  trigger_id?: string;
+  user: { id: string; username?: string; name?: string; team_id?: string };
+  channel?: { id: string; name?: string };
+  message?: { ts: string; text?: string; [key: string]: unknown };
+  actions?: SlackBlockAction[];
+  response_url?: string;
+  [key: string]: unknown;
+}
+
+export interface SlackBlockAction {
+  type: string;
+  action_id: string;
+  block_id: string;
+  value?: string;
+  text?: { type: string; text: string };
+  action_ts?: string;
+  [key: string]: unknown;
+}
+
+/** Slack slash command payload */
+export interface SlackSlashCommand {
+  token: string;
+  team_id: string;
+  channel_id: string;
+  channel_name: string;
+  user_id: string;
+  user_name: string;
+  command: string;
+  text: string;
+  response_url: string;
+  trigger_id: string;
+  api_app_id?: string;
+}
+
+/** Union of known Slack event shapes */
+export interface SlackEvent {
+  type: string;
+  ts?: string;
+  event_ts?: string;
+  user?: string;
+  channel?: string;
+  channel_type?: string;
+  text?: string;
+  thread_ts?: string;
+  subtype?: string;
+  [key: string]: unknown;
+}
+
+/** Slack message event (narrowed from SlackEvent) */
+export type SlackMessageEvent = SlackEvent & {
+  type: "message" | "app_mention";
+  ts: string;
+  channel: string;
+};
+
+/** Assistant thread events */
+export interface SlackAssistantThreadStarted extends SlackEvent {
+  type: "assistant_thread_started";
+  assistant_thread: {
+    user_id: string;
+    context: Record<string, unknown>;
+    channel_id: string;
+    thread_ts: string;
+  };
+}
+
+export interface SlackAssistantThreadContextChanged extends SlackEvent {
+  type: "assistant_thread_context_changed";
+  assistant_thread: {
+    user_id: string;
+    context: Record<string, unknown>;
+    channel_id: string;
+    thread_ts: string;
+  };
+}

package/lib/adapter.d.ts

@@ -1,19 +0,0 @@
-/**
- * Slack 适配器
- */
-import { Adapter, Plugin } from 'zhin.js';
-import { SlackEndpoint } from "./endpoint.js";
-import type { SlackEndpointConfig } from "./types.js";
-export declare class SlackAdapter extends Adapter<SlackEndpoint> {
-    static readonly capabilities: readonly ["inbound", "outbound"];
-    static outboundRichSegmentPolicy: import("zhin.js").OutboundRichSegmentPolicy;
-    static interactivePolicy: "text";
-    constructor(plugin: Plugin);
-    createEndpoint(config: SlackEndpointConfig): SlackEndpoint;
-    removeMember(endpointId: string, sceneId: string, userId: string): Promise<boolean>;
-    renameScene(endpointId: string, sceneId: string, name: string): Promise<boolean>;
-    listMembers(endpointId: string, sceneId: string): Promise<string[]>;
-    getSceneInfo(endpointId: string, sceneId: string): Promise<any>;
-    start(): Promise<void>;
-}
-//# sourceMappingURL=adapter.d.ts.map

package/lib/adapter.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,OAAO,EACd,MAAM,EAAwC,MAAM,SAAS,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEtD,qBAAa,YAAa,SAAQ,OAAO,CAAC,aAAa,CAAC;IACtD,gBAAyB,YAAY,mCAAoC;IACzE,OAAgB,yBAAyB,8CAAwC;IACjF,OAAgB,iBAAiB,EAAG,MAAM,CAAU;gBAExC,MAAM,EAAE,MAAM;IAI1B,cAAc,CAAC,MAAM,EAAE,mBAAmB,GAAG,aAAa;IAMpD,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAMhE,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAM7D,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAM/C,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAQhD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAI7B"}

package/lib/adapter.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,OAAO,EACN,oCAAoC,EAAE,MAAM,SAAS,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAG9C,MAAM,OAAO,YAAa,SAAQ,OAAsB;IACtD,MAAM,CAAmB,YAAY,GAAG,CAAC,SAAS,EAAE,UAAU,CAAU,CAAC;IACzE,MAAM,CAAU,yBAAyB,GAAG,oCAAoC,CAAC;IACjF,MAAM,CAAU,iBAAiB,GAAG,MAAe,CAAC;IAEpD,YAAY,MAAc;QACxB,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;IAC7B,CAAC;IAED,cAAc,CAAC,MAA2B;QACxC,OAAO,IAAI,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACzC,CAAC;IAED,gEAAgE;IAEhE,KAAK,CAAC,YAAY,CAAC,UAAkB,EAAE,OAAe,EAAE,MAAc;QACpE,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAChD,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,YAAY,UAAU,MAAM,CAAC,CAAC;QAC7D,OAAO,QAAQ,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,UAAkB,EAAE,OAAe,EAAE,IAAY;QACjE,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAChD,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,YAAY,UAAU,MAAM,CAAC,CAAC;QAC7D,OAAO,QAAQ,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,UAAkB,EAAE,OAAe;QACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAChD,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,YAAY,UAAU,MAAM,CAAC,CAAC;QAC7D,OAAO,QAAQ,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,UAAkB,EAAE,OAAe;QACpD,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAChD,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,YAAY,UAAU,MAAM,CAAC,CAAC;QAC7D,OAAO,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;IAED,kEAAkE;IAElE,KAAK,CAAC,KAAK;QACT,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC"}

package/lib/endpoint.d.ts

@@ -1,108 +0,0 @@
-import { Endpoint, Message, SendOptions } from 'zhin.js';
-import type { SlackEndpointConfig, SlackMessageEvent } from "./types.js";
-import type { SlackAdapter } from "./adapter.js";
-export declare class SlackEndpoint implements Endpoint<SlackEndpointConfig, SlackMessageEvent> {
-    #private;
-    adapter: SlackAdapter;
-    $config: SlackEndpointConfig;
-    $connected: boolean;
-    /** 延迟到 `$connect`，避免子类 mock `$connect` 时仍在构造函数里创建 Bolt/WebClient（会在后台触发 Slack API） */
-    private app?;
-    private client?;
-    get logger(): import("zhin.js").Logger;
-    get $id(): string;
-    constructor(adapter: SlackAdapter, $config: SlackEndpointConfig);
-    $connect(): Promise<void>;
-    $disconnect(): Promise<void>;
-    private senderPermitCache;
-    private enrichChannelSender;
-    private handleSlackMessage;
-    $formatMessage(msg: SlackMessageEvent): Message<SlackMessageEvent>;
-    private parseMessageContent;
-    private parseSlackText;
-    $sendMessage(options: SendOptions): Promise<string>;
-    private sendContentToChannel;
-    $recallMessage(id: string): Promise<void>;
-    /**
-     * 邀请用户到频道
-     * @param channel 频道 ID
-     * @param users 用户 ID 列表
-     */
-    inviteToChannel(channel: string, users: string[]): Promise<boolean>;
-    /**
-     * 从频道踢出用户
-     * @param channel 频道 ID
-     * @param user 用户 ID
-     */
-    kickFromChannel(channel: string, user: string): Promise<boolean>;
-    /**
-     * 设置频道话题
-     * @param channel 频道 ID
-     * @param topic 话题
-     */
-    setChannelTopic(channel: string, topic: string): Promise<boolean>;
-    /**
-     * 设置频道目的
-     * @param channel 频道 ID
-     * @param purpose 目的
-     */
-    setChannelPurpose(channel: string, purpose: string): Promise<boolean>;
-    /**
-     * 归档频道
-     * @param channel 频道 ID
-     */
-    archiveChannel(channel: string): Promise<boolean>;
-    /**
-     * 取消归档频道
-     * @param channel 频道 ID
-     */
-    unarchiveChannel(channel: string): Promise<boolean>;
-    /**
-     * 重命名频道
-     * @param channel 频道 ID
-     * @param name 新名称
-     */
-    renameChannel(channel: string, name: string): Promise<boolean>;
-    /**
-     * 获取频道成员列表
-     * @param channel 频道 ID
-     */
-    getChannelMembers(channel: string): Promise<string[]>;
-    /**
-     * 获取频道信息
-     * @param channel 频道 ID
-     */
-    getChannelInfo(channel: string): Promise<any>;
-    /**
-     * 获取用户信息
-     * @param user 用户 ID
-     */
-    getUserInfo(user: string): Promise<any>;
-    /**
-     * 添加消息反应
-     * @param channel 频道 ID
-     * @param timestamp 消息时间戳
-     * @param name 表情名称
-     */
-    addReaction(channel: string, timestamp: string, name: string): Promise<boolean>;
-    /**
-     * 移除消息反应
-     * @param channel 频道 ID
-     * @param timestamp 消息时间戳
-     * @param name 表情名称
-     */
-    removeReaction(channel: string, timestamp: string, name: string): Promise<boolean>;
-    /**
-     * 置顶消息
-     * @param channel 频道 ID
-     * @param timestamp 消息时间戳
-     */
-    pinMessage(channel: string, timestamp: string): Promise<boolean>;
-    /**
-     * 取消置顶消息
-     * @param channel 频道 ID
-     * @param timestamp 消息时间戳
-     */
-    unpinMessage(channel: string, timestamp: string): Promise<boolean>;
-}
-//# sourceMappingURL=endpoint.d.ts.map

package/lib/endpoint.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"endpoint.d.ts","sourceRoot":"","sources":["../src/endpoint.ts"],"names":[],"mappings":"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"}