@zhin.js/adapter-discord 1.1.27 → 1.1.28

package/lib/gateway.js

@@ -4,6 +4,7 @@ import path from 'node:path';
 import { Partials, GatewayIntentBits, EmbedBuilder, AttachmentBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle, REST, Routes, PermissionFlagsBits, } from 'discord.js';
 import { formatCompact, getLogger } from '@zhin.js/logger';
 import { activityTypeCode, resolveChannelKind, } from './protocol.js';
+import { discordPermissionNames, discordSenderStanding } from './sender-standing.js';
 const logger = getLogger('discord');
 export const DEFAULT_INTENTS = [
     GatewayIntentBits.Guilds,
@@ -16,15 +17,14 @@ export const DEFAULT_INTENTS = [
 export function discordClientOptions(intents, gatewayFaultProxyUrl, restOptions = {}) {
     return { rest: { ...restOptions, retries: 0, rejectOnRateLimit: () => true }, intents: [...intents], partials: [Partials.Channel], ...(gatewayFaultProxyUrl ? { ws: { buildStrategy: manager => new DiscordFaultProxyStrategy(manager, gatewayFaultProxyUrl) } } : {}) };
 }
+/** Normalized standing word (`owner` / `admin` / `member`); `undefined` outside a guild. */
 export function resolveSenderRole(msg) {
-    if (msg.isGuildOwner)
-        return 'owner';
-    const tokens = msg.permissionTokens ?? [];
-    if (tokens.includes('ADMINISTRATOR') || tokens.includes('MODERATE_MEMBERS'))
-        return 'admin';
-    if (msg.guildId)
-        return 'member';
-    return undefined;
+    return discordSenderStanding(msg)?.standing;
+}
+/** A discord.js thread channel's parent channel id (threads share their parent's conversation key, ADR 0056 §2). */
+function threadParentOf(channel) {
+    const thread = channel;
+    return thread && typeof thread.isThread === 'function' && thread.isThread() && thread.parentId ? thread.parentId : undefined;
 }
 export function normalizeDiscordMessage(raw) {
     if (!raw || typeof raw !== 'object')
@@ -33,6 +33,8 @@ export function normalizeDiscordMessage(raw) {
     if (!msg.author || !msg.channel)
         return null;
     const permissionTokens = [];
+    let platformPermissions = [];
+    let authorRoles = [];
     let isGuildOwner = false;
     const member = msg.member;
     const guild = msg.guild;
@@ -48,6 +50,13 @@ export function normalizeDiscordMessage(raw) {
             if (member.permissions.has(bit))
                 permissionTokens.push(name);
         }
+        platformPermissions = discordPermissionNames(bit => member.permissions.has(bit));
+        const cache = member.roles?.cache;
+        if (cache && typeof cache.values === 'function') {
+            authorRoles = [...cache.values()]
+                .filter((role) => role && role.id && role.id !== guild.id)
+                .map((role) => (role.name ? { id: String(role.id), name: String(role.name) } : { id: String(role.id) }));
+        }
         if (guild.ownerId === msg.author.id) {
             isGuildOwner = true;
             permissionTokens.push('guild_owner', 'ADMINISTRATOR');
@@ -60,6 +69,7 @@ export function normalizeDiscordMessage(raw) {
         content: msg.content ?? '',
         channelId: msg.channel.id,
         channelKind: resolveChannelKind(msg.channel.type),
+        ...(threadParentOf(msg.channel) ? { threadParentId: threadParentOf(msg.channel) } : {}),
         authorId: msg.author.id,
         authorName: member?.displayName || msg.author.displayName || msg.author.username,
         authorBot: msg.author.bot,
@@ -67,6 +77,8 @@ export function normalizeDiscordMessage(raw) {
         guildId: guild?.id,
         isGuildOwner,
         permissionTokens,
+        ...(platformPermissions.length ? { platformPermissions } : {}),
+        ...(authorRoles.length ? { authorRoles } : {}),
         attachments: [...msg.attachments.values()].map((a) => ({
             id: a.id,
             name: a.name ?? undefined,
@@ -256,6 +268,7 @@ export async function connectDiscordGatewayClient(client, config, handlers, sign
                     customId: interaction.customId,
                     channelId,
                     channelKind: interaction.channel ? resolveChannelKind(interaction.channel.type) : interaction.guildId ? 'channel' : 'private',
+                    ...(threadParentOf(interaction.channel) ? { threadParentId: threadParentOf(interaction.channel) } : {}),
                     ...(interaction.guildId ? { guildId: interaction.guildId } : {}),
                     userId: interaction.user.id,
                     userName: interaction.user.username || interaction.user.displayName || interaction.user.id,

package/lib/index.d.ts

@@ -1,6 +1,6 @@
 export { activityTypeCode, formatButtonContent, formatInboundContent, formatOutboundBody, resolveChannelKind, resolveDiscordConfig, senderDisplayName, type DiscordActivity, type DiscordEndpointConfig, type DiscordButtonInbound, type DiscordInboundAttachment, type DiscordInboundMessage, type DiscordOutboundBody, type DiscordWireSegment, type ResolvedDiscordConfig, type ResolvedDiscordGatewayConfig, type ResolvedDiscordInteractionsConfig, } from './protocol.js';
 export { requireDiscordGatewayClient, type DiscordClient, type DiscordClientEventMap, } from './client.js';
-export { checkDiscordPlatformPermit, discordGroupPermitResolver, normalizeDiscordSenderForPermit, platformPermit, } from './platform-permit.js';
+export { platformPermit } from './platform-permit.js';
 export { DiscordGatewayEndpoint, DiscordInteractionsEndpoint, type DiscordClientTransport, type DiscordEndpointOptions, type DiscordInteractionsEndpointOptions, } from './endpoint.js';
 export { connectDiscordGatewayClient, discordClientOptions, normalizeDiscordMessage, resolveSenderRole, toMessageCreateOptions, type DiscordGatewayConnectHandlers, } from './gateway.js';
 export { handleDiscordInteractionRequest, registerDiscordInteractionRoutes, type DiscordInteractionsHandler, } from './webhook.js';

package/lib/index.js

@@ -1,6 +1,6 @@
 export { activityTypeCode, formatButtonContent, formatInboundContent, formatOutboundBody, resolveChannelKind, resolveDiscordConfig, senderDisplayName, } from './protocol.js';
 export { requireDiscordGatewayClient, } from './client.js';
-export { checkDiscordPlatformPermit, discordGroupPermitResolver, normalizeDiscordSenderForPermit, platformPermit, } from './platform-permit.js';
+export { platformPermit } from './platform-permit.js';
 export { DiscordGatewayEndpoint, DiscordInteractionsEndpoint, } from './endpoint.js';
 export { connectDiscordGatewayClient, discordClientOptions, normalizeDiscordMessage, resolveSenderRole, toMessageCreateOptions, } from './gateway.js';
 export { handleDiscordInteractionRequest, registerDiscordInteractionRoutes, } from './webhook.js';

package/lib/platform-permit.d.ts

@@ -1,14 +1,7 @@
 /**
- * Discord platform permit — Guild 权限位
+ * Discord platform permit helper（ADR 0056 §5）。
+ *
+ * 平台身份由适配器上报到 `sender.platform`，permit 由内置评估器（`@zhin.js/permission`）判断；
+ * 适配器不再导出自有的 permit 解析器或检查函数。
  */
-import type { PermissionSubject } from '@zhin.js/permission';
 export declare function platformPermit(perm: string): string;
-export declare function discordGroupPermitResolver(logicalPerm: string): string;
-export declare function normalizeDiscordSenderForPermit(input: {
-    isOwner?: boolean;
-    permissions?: string[];
-}): {
-    role?: string;
-    permissions?: string[];
-};
-export declare function checkDiscordPlatformPermit(perm: string, subject: PermissionSubject): boolean;

package/lib/platform-permit.js

@@ -1,42 +1,9 @@
-const ADAPTER = 'discord';
+/**
+ * Discord platform permit helper（ADR 0056 §5）。
+ *
+ * 平台身份由适配器上报到 `sender.platform`，permit 由内置评估器（`@zhin.js/permission`）判断；
+ * 适配器不再导出自有的 permit 解析器或检查函数。
+ */
 export function platformPermit(perm) {
-    return `platform(${ADAPTER},${perm})`;
-}
-const FACTORY_PERM_MAP = {
-    scene_admin: 'moderate_members',
-    scene_owner: 'guild_owner',
-};
-export function discordGroupPermitResolver(logicalPerm) {
-    return platformPermit(FACTORY_PERM_MAP[logicalPerm] ?? logicalPerm);
-}
-export function normalizeDiscordSenderForPermit(input) {
-    const permissions = [...(input.permissions ?? [])];
-    if (input.isOwner) {
-        permissions.push('guild_owner', 'ADMINISTRATOR');
-        return { role: 'owner', permissions };
-    }
-    if (permissions.includes('ADMINISTRATOR')) {
-        return { role: 'admin', permissions };
-    }
-    if (permissions.includes('MODERATE_MEMBERS') || permissions.includes('MANAGE_GUILD')) {
-        return { role: 'admin', permissions };
-    }
-    return { role: 'member', permissions };
-}
-export function checkDiscordPlatformPermit(perm, subject) {
-    const role = subject.sender?.role?.[0];
-    const permissions = subject.sender?.permissions ?? [];
-    const has = (t) => permissions.includes(t);
-    switch (perm) {
-        case 'guild_owner':
-            return role === 'owner' || has('guild_owner');
-        case 'moderate_members':
-            return role === 'owner' || role === 'admin' || has('ADMINISTRATOR') || has('MODERATE_MEMBERS');
-        case 'manage_roles':
-            return role === 'owner' || has('ADMINISTRATOR') || has('MANAGE_ROLES');
-        case 'manage_channels':
-            return role === 'owner' || has('ADMINISTRATOR') || has('MANAGE_CHANNELS');
-        default:
-            return false;
-    }
+    return `platform-permission:${perm}`;
 }

package/lib/protocol.d.ts

@@ -68,8 +68,17 @@ export interface DiscordInboundMessage {
     readonly authorBot?: boolean;
     readonly createdTimestamp: number;
     readonly guildId?: string;
+    /** The message was sent in a thread: its parent channel (the thread itself is `channelId`). */
+    readonly threadParentId?: string;
     readonly isGuildOwner?: boolean;
     readonly permissionTokens?: readonly string[];
+    /** ADR 0056 §1: guild permission flags as snake_case names (`ban_members`, …). */
+    readonly platformPermissions?: readonly string[];
+    /** ADR 0056 §1: the member's guild roles (`@everyone` excluded). */
+    readonly authorRoles?: readonly {
+        readonly id: string;
+        readonly name?: string;
+    }[];
     readonly attachments?: readonly DiscordInboundAttachment[];
     readonly embedTitles?: readonly string[];
     readonly stickerNames?: readonly string[];
@@ -85,6 +94,8 @@ export interface DiscordButtonInbound {
     readonly customId: string;
     readonly channelId: string;
     readonly channelKind: 'private' | 'group' | 'channel';
+    /** Pressed inside a thread: its parent channel. */
+    readonly threadParentId?: string;
     readonly userId: string;
     readonly userName: string;
     readonly sourceMessageId?: string;
@@ -125,13 +136,18 @@ export declare function resolveChannelKind(channelType: number | string | undefi
 /**
  * 入站归一化 → ConversationRef：DM → 'private'；GroupDM → 'group'；
  * guild 频道 → 'channel' + guild 容器进 parent（guild 是频道容器，kind 'channel'）。
+ * 线程（thread）：会话 id 是父频道、`threadId` 是线程频道（ConversationRef 的子话题约定），
+ * 所以父频道上的角色 / 功能配置在线程里同样生效（ADR 0056 §2）；出站用 {@link discordChannelOf}。
  * endpoint.adapter = owner PluginId（CapabilityId 以 \0 分隔）。
  */
 export declare function discordInboundConversation(endpointKey: string, msg: {
     readonly channelId: string;
     readonly channelKind: 'private' | 'group' | 'channel';
     readonly guildId?: string;
+    readonly threadParentId?: string;
 }): ConversationRef;
+/** The Discord channel a conversation's messages live in: the thread when there is one. */
+export declare function discordChannelOf(conversation: Pick<ConversationRef, 'id' | 'threadId'>): string;
 export declare function senderDisplayName(msg: DiscordInboundMessage): string;
 /** Build inbound text for OutboundMessageService.receive (gateway owns reply routing). */
 export declare function formatInboundContent(msg: DiscordInboundMessage): string;
@@ -158,4 +174,6 @@ export declare function activityTypeCode(type: DiscordActivity['type']): number;
 export declare const DISCORD_SIGNATURE_MAX_AGE_MS: number;
 export declare function verifyDiscordInteractionSignature(publicKeyHex: string, body: string, signature: string, timestamp: string, nowMs?: number): boolean;
 export declare function formatSlashCommandContent(interaction: Record<string, unknown>): string;
+/** Parent channel of a raw API channel object when it is a thread. */
+export declare function discordThreadParentOf(channel: unknown): string | undefined;
 export declare function interactionToInboundMessage(interaction: Record<string, unknown>): DiscordInboundMessage;

package/lib/protocol.js

@@ -2,6 +2,7 @@ import { validateDiscordGatewayFaultProxy } from './gateway-fault-proxy.js';
 /** Discord Gateway protocol helpers. Canonicalization is owned by Core. */
 import { createPublicKey, verify as cryptoVerify } from 'node:crypto';
 import { isMediaRef } from '@zhin.js/im-contract';
+import { discordGuildPermissionNamesFromChannelBitfield } from './sender-standing.js';
 import { formatCompact, getLogger } from '@zhin.js/logger';
 const logger = getLogger('discord');
 export function resolveDiscordConfig(config) {
@@ -56,18 +57,26 @@ export function resolveChannelKind(channelType) {
 /**
  * 入站归一化 → ConversationRef：DM → 'private'；GroupDM → 'group'；
  * guild 频道 → 'channel' + guild 容器进 parent（guild 是频道容器，kind 'channel'）。
+ * 线程（thread）：会话 id 是父频道、`threadId` 是线程频道（ConversationRef 的子话题约定），
+ * 所以父频道上的角色 / 功能配置在线程里同样生效（ADR 0056 §2）；出站用 {@link discordChannelOf}。
  * endpoint.adapter = owner PluginId（CapabilityId 以 \0 分隔）。
  */
 export function discordInboundConversation(endpointKey, msg) {
+    const thread = msg.channelKind === 'channel' && msg.threadParentId && msg.threadParentId !== msg.channelId;
     return {
         endpoint: { id: endpointKey, adapter: endpointKey.split('\0')[0] ?? endpointKey },
         kind: msg.channelKind,
-        id: msg.channelId,
+        id: thread ? msg.threadParentId : msg.channelId,
+        ...(thread ? { threadId: msg.channelId } : {}),
         ...(msg.guildId && msg.channelKind === 'channel'
             ? { parent: { kind: 'channel', id: msg.guildId } }
             : {}),
     };
 }
+/** The Discord channel a conversation's messages live in: the thread when there is one. */
+export function discordChannelOf(conversation) {
+    return conversation.threadId ?? conversation.id;
+}
 export function senderDisplayName(msg) {
     return msg.authorName || msg.authorId;
 }
@@ -253,6 +262,7 @@ export function formatOutboundBody(payload) {
                 embeds.push({ title: String(data.title ?? ''), url: String(data.url ?? ''), description: String(data.description ?? data.content ?? ''), ...(data.image ? { image: { url: String(data.image) } } : {}) });
                 break;
             case 'embed':
+            case 'discord:embed':
                 embeds.push({ ...data });
                 break;
             case 'keyboard': {
@@ -338,18 +348,37 @@ export function formatSlashCommandContent(interaction) {
     }
     return parts.join(' ');
 }
+/** Thread channel types (announcement / public / private thread) carry `parent_id`, the channel they belong to. */
+const THREAD_CHANNEL_TYPES = new Set([10, 11, 12]);
+/** Parent channel of a raw API channel object when it is a thread. */
+export function discordThreadParentOf(channel) {
+    if (!channel || typeof channel !== 'object')
+        return undefined;
+    const raw = channel;
+    return THREAD_CHANNEL_TYPES.has(Number(raw.type)) && typeof raw.parent_id === 'string' && raw.parent_id ? raw.parent_id : undefined;
+}
 export function interactionToInboundMessage(interaction) {
-    const user = interaction.member?.user
+    const member = interaction.member;
+    const user = member?.user
         ?? interaction.user;
+    const guildId = interaction.guild_id != null ? String(interaction.guild_id) : undefined;
+    // ADR 0056 §1: guild-level names only (the interaction bitfield includes channel overwrites).
+    const platformPermissions = guildId ? discordGuildPermissionNamesFromChannelBitfield(member?.permissions) : [];
+    const authorRoles = guildId && Array.isArray(member?.roles)
+        ? member.roles.map(String).filter((id) => id && id !== guildId).map((id) => ({ id }))
+        : [];
     return {
         event: interaction,
         id: String(interaction.id),
         content: formatSlashCommandContent(interaction),
         channelId: String(interaction.channel_id ?? ''),
         channelKind: interaction.guild_id ? 'channel' : 'private',
+        ...(discordThreadParentOf(interaction.channel) ? { threadParentId: discordThreadParentOf(interaction.channel) } : {}),
         authorId: String(user?.id ?? ''),
         authorName: String(user?.username ?? user?.id ?? ''),
         createdTimestamp: Date.now(),
-        guildId: interaction.guild_id != null ? String(interaction.guild_id) : undefined,
+        guildId,
+        ...(platformPermissions.length ? { platformPermissions } : {}),
+        ...(authorRoles.length ? { authorRoles } : {}),
     };
 }

package/lib/sender-standing.d.ts

@@ -0,0 +1,18 @@
+import type { PlatformStanding } from '@zhin.js/im-contract';
+import type { DiscordInboundMessage } from './protocol.js';
+/** `ManageRoles` → `manage_roles`, `SendTTSMessages` → `send_tts_messages`. */
+export declare function discordPermissionName(flag: string): string;
+/** All permission flag names the predicate grants. */
+export declare function discordPermissionNames(has: (bit: bigint) => boolean): string[];
+/** Permission names from an interaction's decimal bitfield string (`member.permissions`). */
+export declare function discordPermissionNamesFromBitfield(bitfield: unknown): string[];
+/**
+ * Guild-level permission names from a channel-level bitfield (interaction `member.permissions` /
+ * `app_permissions`): an administrator holds every flag server-wide; otherwise only the flags that
+ * channel overwrites cannot change are reported, so a channel overwrite (e.g. "Manage Permissions" in
+ * one channel) never reads as a server-wide `manage_roles`.
+ */
+export declare function discordGuildPermissionNamesFromChannelBitfield(bitfield: unknown): string[];
+/** Normalized standing from guild-level permission names (the guild owner is reported separately). */
+export declare function discordStandingFromPermissions(permissions: readonly string[], isOwner?: boolean): PlatformStanding['standing'];
+export declare function discordSenderStanding(msg: DiscordInboundMessage): PlatformStanding | undefined;

package/lib/sender-standing.js

@@ -0,0 +1,91 @@
+/**
+ * ADR 0056 §1: Discord guild member → normalized `sender.platform`.
+ *
+ * - `standing`: guild owner → `owner`; `Administrator` / `ModerateMembers` → `admin`; other members →
+ *   `member`. Direct messages report nothing.
+ * - `roles`: the member's guild roles (`@everyone` excluded), with names when the event carries them.
+ * - `permissions`: the member's **guild-level** permission flags as snake_case names (`ban_members`,
+ *   `manage_roles`, …). Gateway mode reads `GuildMember.permissions` (server-wide, no channel overwrites)
+ *   for senders and the Bot alike. Interactions only carry channel-level bitfields (overwrites applied),
+ *   so they report just the flags that cannot be overwritten per channel (identical at both levels) —
+ *   all flags when the member is an administrator.
+ */
+import { PermissionFlagsBits } from 'discord.js';
+const FLAG_ENTRIES = Object.entries(PermissionFlagsBits);
+/** `ManageRoles` → `manage_roles`, `SendTTSMessages` → `send_tts_messages`. */
+export function discordPermissionName(flag) {
+    return flag.replace(/([A-Z]+)([A-Z][a-z])/gu, '$1_$2').replace(/([a-z0-9])([A-Z])/gu, '$1_$2').toLowerCase();
+}
+/** All permission flag names the predicate grants. */
+export function discordPermissionNames(has) {
+    const names = [];
+    for (const [flag, bit] of FLAG_ENTRIES) {
+        try {
+            if (has(bit))
+                names.push(discordPermissionName(flag));
+        }
+        catch {
+            // A partial permission view cannot answer this bit; leave it out.
+        }
+    }
+    return names;
+}
+/** Permission names from an interaction's decimal bitfield string (`member.permissions`). */
+export function discordPermissionNamesFromBitfield(bitfield) {
+    const value = parseBitfield(bitfield);
+    return value === undefined ? [] : discordPermissionNames(bit => (value & bit) === bit);
+}
+function parseBitfield(bitfield) {
+    if (typeof bitfield !== 'string' && typeof bitfield !== 'number' && typeof bitfield !== 'bigint')
+        return undefined;
+    try {
+        return BigInt(bitfield);
+    }
+    catch {
+        return undefined;
+    }
+}
+/** Flags Discord does not allow in channel overwrites: a channel-level bitfield shows their guild value. */
+const GUILD_ONLY_FLAGS = [
+    PermissionFlagsBits.Administrator, PermissionFlagsBits.KickMembers, PermissionFlagsBits.BanMembers,
+    PermissionFlagsBits.ManageGuild, PermissionFlagsBits.ViewAuditLog, PermissionFlagsBits.ViewGuildInsights,
+    PermissionFlagsBits.ChangeNickname, PermissionFlagsBits.ManageNicknames, PermissionFlagsBits.ManageGuildExpressions,
+    PermissionFlagsBits.ModerateMembers, PermissionFlagsBits.ViewCreatorMonetizationAnalytics,
+    PermissionFlagsBits.CreateGuildExpressions,
+];
+/**
+ * Guild-level permission names from a channel-level bitfield (interaction `member.permissions` /
+ * `app_permissions`): an administrator holds every flag server-wide; otherwise only the flags that
+ * channel overwrites cannot change are reported, so a channel overwrite (e.g. "Manage Permissions" in
+ * one channel) never reads as a server-wide `manage_roles`.
+ */
+export function discordGuildPermissionNamesFromChannelBitfield(bitfield) {
+    const value = parseBitfield(bitfield);
+    if (value === undefined)
+        return [];
+    if ((value & PermissionFlagsBits.Administrator) === PermissionFlagsBits.Administrator)
+        return discordPermissionNames(() => true);
+    return discordPermissionNames(bit => GUILD_ONLY_FLAGS.includes(bit) && (value & bit) === bit);
+}
+/** Normalized standing from guild-level permission names (the guild owner is reported separately). */
+export function discordStandingFromPermissions(permissions, isOwner = false) {
+    return isOwner ? 'owner'
+        : permissions.includes('administrator') || permissions.includes('moderate_members') ? 'admin' : 'member';
+}
+export function discordSenderStanding(msg) {
+    if (!msg.guildId)
+        return undefined;
+    const permissions = msg.platformPermissions ?? [];
+    const legacy = msg.permissionTokens ?? [];
+    const standing = msg.isGuildOwner
+        ? 'owner'
+        : permissions.includes('administrator') || permissions.includes('moderate_members')
+            || legacy.includes('ADMINISTRATOR') || legacy.includes('MODERATE_MEMBERS')
+            ? 'admin'
+            : 'member';
+    return {
+        standing,
+        ...(msg.authorRoles?.length ? { roles: msg.authorRoles } : {}),
+        ...(permissions.length ? { permissions } : {}),
+    };
+}

package/lib/webhook.d.ts

@@ -1,9 +1,5 @@
 import { type Endpoint } from 'zhin.js/adapter';
-/**
- * Discord interactions HTTP: signature → parse → admit.
- */
-import type { IncomingMessage, ServerResponse } from 'node:http';
-import type { HttpHost, HttpRouteRegistration } from '@zhin.js/host-http';
+import { type HttpHost, type HttpRouteRegistration } from '@zhin.js/host-http';
 import { type DiscordInboundMessage, type DiscordButtonInbound, type ResolvedDiscordInteractionsConfig } from './protocol.js';
 export interface DiscordInteractionsHandler extends Endpoint {
     readonly config: ResolvedDiscordInteractionsConfig;
@@ -13,4 +9,4 @@ export interface DiscordInteractionsHandler extends Endpoint {
     admitPlatform(event: Record<string, unknown>): void;
 }
 export declare function registerDiscordInteractionRoutes(http: HttpHost, handler: DiscordInteractionsHandler): HttpRouteRegistration[];
-export declare function handleDiscordInteractionRequest(request: IncomingMessage, response: ServerResponse, handler: DiscordInteractionsHandler): Promise<void>;
+export declare function handleDiscordInteractionRequest(request: Request, handler: DiscordInteractionsHandler): Promise<Response>;

package/lib/webhook.js

@@ -1,5 +1,9 @@
 import { endpointSpec } from 'zhin.js/adapter';
+/**
+ * Discord interactions HTTP: signature → parse → admit.
+ */
 import { createMessages } from 'zhin.js/i18n';
+import { readTextBody } from '@zhin.js/host-http';
 import { getLogger } from '@zhin.js/logger';
 import { interactionToInboundMessage, verifyDiscordInteractionSignature, } from './protocol.js';
 const logger = getLogger('discord');
@@ -15,55 +19,44 @@ const INTERACTION_FLAG_EPHEMERAL = 64;
 export function registerDiscordInteractionRoutes(http, handler) {
     const path = handler.config.interactionsPath;
     return [
-        http.route('POST', path, async (request, response) => {
-            await handleDiscordInteractionRequest(request, response, handler);
-        }, { summary: 'Discord interactions callback', tags: ['discord'] }),
+        http.route('POST', path, (request) => handleDiscordInteractionRequest(request, handler), { summary: 'Discord interactions callback', tags: ['discord'] }),
     ];
 }
-export async function handleDiscordInteractionRequest(request, response, handler) {
+export async function handleDiscordInteractionRequest(request, handler) {
     try {
-        const signature = headerValue(request.headers['x-signature-ed25519']);
-        const timestamp = headerValue(request.headers['x-signature-timestamp']);
-        const rawBody = await readInteractionBody(request);
+        const signature = request.headers.get('x-signature-ed25519') ?? '';
+        const timestamp = request.headers.get('x-signature-timestamp') ?? '';
+        // Oversize bodies (> 1 MiB) fail and answer 500, as before.
+        const rawBody = await readTextBody(request);
         if (!signature || !timestamp) {
-            response.writeHead(401, { 'Content-Type': 'text/plain' });
-            response.end('Unauthorized');
-            return;
+            return new Response('Unauthorized', { status: 401, headers: { 'Content-Type': 'text/plain' } });
         }
         if (!verifyDiscordInteractionSignature(handler.config.publicKey, rawBody, signature, timestamp)) {
-            response.writeHead(401, { 'Content-Type': 'text/plain' });
-            response.end('Unauthorized');
-            return;
+            return new Response('Unauthorized', { status: 401, headers: { 'Content-Type': 'text/plain' } });
         }
         const interaction = JSON.parse(rawBody);
         if (!interaction || interaction.application_id !== handler.config.applicationId) {
-            response.writeHead(401, { 'Content-Type': 'text/plain' });
-            response.end('Unauthorized');
-            return;
+            return new Response('Unauthorized', { status: 401, headers: { 'Content-Type': 'text/plain' } });
         }
         // A verified protocol challenge is not a business message and keeps its immediate ACK.
         if (interaction.type === INTERACTION_TYPE_PING) {
             if (handler.isOpen)
                 void handler[endpointSpec].events.run(() => handler.admitPlatform(interaction))
                     .catch(() => logger.debug('Protocol event dispatch did not complete'));
-            writeJson(response, 200, { type: INTERACTION_RESPONSE_PONG });
-            return;
+            return writeJson(200, { type: INTERACTION_RESPONSE_PONG });
         }
-        await handler[endpointSpec].events.run(async () => {
+        return await handler[endpointSpec].events.run(async () => {
             if (handler.isOpen)
                 handler.admitPlatform(interaction);
             if (interaction.type === 3) {
                 const data = interaction.data;
                 if (data?.component_type === 2 && typeof data.custom_id === 'string') {
                     if (!handler.isOpen) {
-                        response.writeHead(503);
-                        response.end('Unavailable');
-                        return;
+                        return new Response('Unavailable', { status: 503 });
                     }
                     const message = interactionToInboundMessage(interaction);
-                    handler.admitButton({ event: interaction, id: message.id, customId: data.custom_id, channelId: message.channelId, channelKind: message.channelKind, userId: message.authorId, userName: message.authorName, ...(message.guildId ? { guildId: message.guildId } : {}), sourceMessageId: interaction.message?.id });
-                    writeJson(response, 200, { type: 6 });
-                    return;
+                    handler.admitButton({ event: interaction, id: message.id, customId: data.custom_id, channelId: message.channelId, channelKind: message.channelKind, userId: message.authorId, userName: message.authorName, ...(message.guildId ? { guildId: message.guildId } : {}), ...(message.threadParentId ? { threadParentId: message.threadParentId } : {}), sourceMessageId: interaction.message?.id });
+                    return writeJson(200, { type: 6 });
                 }
             }
             if (interaction.type === INTERACTION_TYPE_APPLICATION_COMMAND) {
@@ -74,47 +67,22 @@ export async function handleDiscordInteractionRequest(request, response, handler
                 const locale = await handler[endpointSpec].resolveLocale(message.authorId);
                 // 即时响应（type 4）：defer(type 5) 需要 followup PATCH，未实现会让用户端一直转圈
                 const commandName = String(interaction.data?.name ?? '');
-                writeJson(response, 200, {
+                return writeJson(200, {
                     type: INTERACTION_RESPONSE_CHANNEL_MESSAGE_WITH_SOURCE,
                     data: {
                         content: messages(locale, 'processing', { command: commandName }),
                         flags: INTERACTION_FLAG_EPHEMERAL,
                     },
                 });
-                return;
             }
-            response.writeHead(400, { 'Content-Type': 'text/plain' });
-            response.end('Unsupported interaction type');
+            return new Response('Unsupported interaction type', { status: 400, headers: { 'Content-Type': 'text/plain' } });
         });
     }
     catch (error) {
         logger.error('Discord interactions error:', error);
-        if (!response.headersSent) {
-            response.writeHead(500, { 'Content-Type': 'text/plain' });
-            response.end('Internal Server Error');
-        }
-    }
-}
-function headerValue(value) {
-    if (Array.isArray(value))
-        return value[0] ?? '';
-    return value ?? '';
-}
-async function readInteractionBody(request) {
-    const chunks = [];
-    let size = 0;
-    for await (const chunk of request) {
-        const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
-        size += buffer.length;
-        if (size > 1_048_576) {
-            request.destroy();
-            throw new Error('Request body exceeds 1MB');
-        }
-        chunks.push(buffer);
+        return new Response('Internal Server Error', { status: 500, headers: { 'Content-Type': 'text/plain' } });
     }
-    return Buffer.concat(chunks).toString('utf8');
 }
-function writeJson(response, status, body) {
-    response.writeHead(status, { 'Content-Type': 'application/json' });
-    response.end(JSON.stringify(body));
+function writeJson(status, body) {
+    return new Response(JSON.stringify(body), { status, headers: { 'Content-Type': 'application/json' } });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-discord",
-  "version": "1.1.27",
+  "version": "1.1.28",
   "description": "Zhin.js Discord adapter for Plugin Runtime (Gateway WebSocket)",
   "type": "module",
   "main": "./lib/index.js",
@@ -35,25 +35,25 @@
     "@discordjs/ws": "1.2.3",
     "discord.js": "^14.27.0",
     "undici": "6.29.1",
-    "@zhin.js/adapter": "1.1.32",
-    "@zhin.js/console-contract": "1.1.5",
-    "@zhin.js/feature-kit": "1.1.15",
-    "@zhin.js/core": "1.1.60",
-    "@zhin.js/host-http": "1.1.17",
-    "@zhin.js/im-contract": "1.1.13",
-    "@zhin.js/logger": "1.1.2",
-    "@zhin.js/skill": "1.1.16",
-    "@zhin.js/agent-feature": "1.1.16",
-    "@zhin.js/permission": "1.1.15",
-    "@zhin.js/tool": "1.1.18",
-    "@zhin.js/page": "1.1.17"
+    "zod": "^4.6.7",
+    "@zhin.js/adapter": "1.1.33",
+    "@zhin.js/agent-feature": "1.1.17",
+    "@zhin.js/console-contract": "1.1.6",
+    "@zhin.js/core": "1.2.0",
+    "@zhin.js/feature-kit": "1.1.16",
+    "@zhin.js/host-http": "1.2.0",
+    "@zhin.js/im-contract": "1.1.14",
+    "@zhin.js/logger": "1.1.3",
+    "@zhin.js/page": "1.1.18",
+    "@zhin.js/permission": "1.2.0",
+    "@zhin.js/skill": "1.1.17",
+    "@zhin.js/tool": "1.1.19"
   },
   "peerDependencies": {
-    "zod": "^4.0.0",
-    "@zhin.js/command": "^1.1.17",
-    "zhin.js": "^1.1.25",
-    "@zhin.js/adapter": "^1.1.32",
-    "@zhin.js/core": "^1.1.60"
+    "@zhin.js/adapter": "^1.1.33",
+    "@zhin.js/command": "^1.2.0",
+    "@zhin.js/core": "^1.2.0",
+    "zhin.js": "^1.1.26"
   },
   "peerDependenciesMeta": {
     "@zhin.js/command": {
@@ -61,18 +61,16 @@
     },
     "zhin.js": {
       "optional": true
-    },
-    "zod": {
-      "optional": true
     }
   },
   "devDependencies": {
     "@types/node": "^26.1.2",
+    "ajv": "8.18.0",
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
-    "zod": "^4.4.3",
-    "@zhin.js/host-http": "1.1.17",
-    "zhin.js": "1.1.25"
+    "ws": "^8.21.1",
+    "@zhin.js/host-http": "1.2.0",
+    "zhin.js": "1.1.26"
   },
   "files": [
     "adapters",
@@ -131,6 +129,6 @@
   "scripts": {
     "build": "tsc",
     "clean": "rimraf lib",
-    "test": "NODE_OPTIONS=--experimental-strip-types vitest run --root ../../.. plugins/adapters/discord/tests"
+    "test": "vitest run --root ../../.. plugins/adapters/discord/tests"
   }
 }