@zhin.js/adapter-discord 7.0.8 → 7.0.9

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @zhin.js/adapter-discord
 
+## 7.0.9
+
+### Patch Changes
+
+- Updated dependencies [63253bb]
+- Updated dependencies [6fb24dd]
+- Updated dependencies [d162216]
+- Updated dependencies [7427818]
+- Updated dependencies [90da255]
+- Updated dependencies [8e973dc]
+- Updated dependencies [953cfe1]
+- Updated dependencies [0e73866]
+  - @zhin.js/plugin-runtime@1.1.6
+  - @zhin.js/core@1.5.8
+  - @zhin.js/adapter@1.1.8
+  - @zhin.js/host-http@1.0.9
+  - @zhin.js/agent@1.1.9
+  - zhin.js@6.0.8
+  - @zhin.js/command@1.0.12
+  - @zhin.js/permission@1.0.2
+
 ## 7.0.8
 
 ### Patch Changes

package/lib/endpoint.d.ts

@@ -1,6 +1,7 @@
 import type { EndpointControl, EndpointInstance, EndpointManagement, EndpointSendRequest } from '@zhin.js/adapter';
 import type { MessageGateway } from '@zhin.js/core/runtime';
 import type { HttpHost } from '@zhin.js/host-http';
+import { type MessageRef } from '@zhin.js/im-contract';
 import type { CapabilityId } from '@zhin.js/plugin-runtime';
 import { type CreateDiscordClient, type DiscordClientTransport } from './gateway.js';
 import { type DiscordButtonInbound, type DiscordInboundMessage, type ResolvedDiscordGatewayConfig, type ResolvedDiscordInteractionsConfig } from './protocol.js';
@@ -21,7 +22,7 @@ export declare class DiscordGatewayEndpoint implements EndpointInstance {
     close(): void;
     stop(): Promise<void>;
     send({ conversation, payload }: EndpointSendRequest): Promise<string>;
-    recallMessage(messageId: string): Promise<void>;
+    recallMessage(message: MessageRef): Promise<void>;
     /** Test / internal: admit a message when open. */
     admit(msg: DiscordInboundMessage): void;
     /** Test / internal: admit a button interaction when open. */
@@ -65,7 +66,7 @@ export declare class DiscordInteractionsEndpoint implements EndpointInstance {
     close(): void;
     stop(): Promise<void>;
     send({ conversation, payload }: EndpointSendRequest): Promise<string>;
-    recallMessage(messageId: string): Promise<void>;
+    recallMessage(message: MessageRef): Promise<void>;
     admit(msg: DiscordInboundMessage): void;
 }
 /**

package/lib/endpoint.js

@@ -2,7 +2,6 @@
  * DiscordEndpoint — lifecycle, outbound, admit, gateway / interactions modes, agent tool surface.
  */
 import { ChannelType } from 'discord.js';
-import { formatLegacyConversationRef, formatLegacyMessageRef, nativeConversationId, parseLegacyMessageReference, } from '@zhin.js/im-contract';
 import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import { registerDiscordAgentEndpoint } from './discord-agent-deps.js';
 import { connectDiscordGatewayClient, defaultCreateClient, DEFAULT_INTENTS, resolveSenderRole, toMessageCreateOptions, } from './gateway.js';
@@ -24,15 +23,12 @@ export class DiscordGatewayEndpoint {
         getMembers: (guildId) => this.getMembers(guildId),
     });
     control = Object.freeze({
-        recall: (messageId) => this.recallMessage(messageId),
-        addReaction: async (messageId, emoji, hint) => {
-            const reference = parseLegacyMessageReference(messageId);
-            const channelId = hint?.channelId
-                ?? (reference ? nativeConversationId(reference.target) : undefined);
-            const nativeMessageId = reference?.messageId ?? messageId;
-            if (!channelId || !nativeMessageId)
+        recall: (message) => this.recallMessage(message),
+        addReaction: async (message, emoji, hint) => {
+            const channelId = hint?.channelId ?? message.conversation.id;
+            if (!channelId || !message.id)
                 return null;
-            await this.addReaction(channelId, nativeMessageId, emoji);
+            await this.addReaction(channelId, message.id, emoji);
             return emoji;
         },
     });
@@ -93,29 +89,22 @@ export class DiscordGatewayEndpoint {
     }
     async send({ conversation, payload }) {
         const body = formatOutboundBody(payload);
-        // recall 链路仍是本端点编码的 legacy 引用，在边界内部从 conversation 派生
         const snowflake = await this.#sendBody(conversation.id, body);
-        const messageId = formatLegacyMessageRef({ conversation, id: snowflake });
         this.#logger.debug(formatCompact({
             op: 'discord_send',
             endpoint: this.#options.config.id,
-            target: formatLegacyConversationRef(conversation),
-            messageId,
+            target: conversation.id,
+            messageId: snowflake,
         }));
-        return messageId;
+        return snowflake;
     }
-    async recallMessage(messageId) {
-        if (!messageId)
+    async recallMessage(message) {
+        if (!message.id)
             return;
-        const reference = parseLegacyMessageReference(messageId);
-        if (!reference)
-            return;
-        const channelId = nativeConversationId(reference.target);
-        const snowflake = reference.messageId;
-        const channel = await this.#requireClient().channels.fetch(channelId);
+        const channel = await this.#requireClient().channels.fetch(message.conversation.id);
         if (!channel?.isTextBased() || !channel.messages)
             return;
-        const msg = await channel.messages.fetch(snowflake);
+        const msg = await channel.messages.fetch(message.id);
         await msg.delete();
     }
     /** Test / internal: admit a message when open. */
@@ -318,7 +307,7 @@ export class DiscordInteractionsEndpoint {
     #open = false;
     #started = false;
     control = Object.freeze({
-        recall: (messageId) => this.recallMessage(messageId),
+        recall: (message) => this.recallMessage(message),
     });
     constructor(options) {
         this.#logger = getAdapterLogger('discord', options.config.id);
@@ -374,18 +363,12 @@ export class DiscordInteractionsEndpoint {
         }
         const data = JSON.parse(text);
         const snowflake = data.id ?? '';
-        // recall 链路仍是本端点编码的 legacy 引用，在边界内部从 conversation 派生
-        return snowflake ? formatLegacyMessageRef({ conversation, id: snowflake }) : '';
+        return snowflake;
     }
-    async recallMessage(messageId) {
-        if (!messageId)
-            return;
-        const reference = parseLegacyMessageReference(messageId);
-        if (!reference)
+    async recallMessage(message) {
+        if (!message.id)
             return;
-        const channelId = nativeConversationId(reference.target);
-        const snowflake = reference.messageId;
-        const response = await this.#fetch(`${DISCORD_API}/channels/${channelId}/messages/${snowflake}`, {
+        const response = await this.#fetch(`${DISCORD_API}/channels/${message.conversation.id}/messages/${message.id}`, {
             method: 'DELETE',
             headers: { Authorization: `Bot ${this.#options.config.token}` },
             signal: AbortSignal.timeout(OUTBOUND_TIMEOUT_MS),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-discord",
-  "version": "7.0.8",
+  "version": "7.0.9",
   "description": "Zhin.js Discord adapter for Plugin Runtime (Gateway WebSocket)",
   "type": "module",
   "main": "./lib/index.js",
@@ -33,22 +33,22 @@
   },
   "dependencies": {
     "discord.js": "^14.27.0",
-    "@zhin.js/adapter": "1.1.7",
-    "@zhin.js/command": "1.0.11",
-    "@zhin.js/core": "1.5.7",
-    "@zhin.js/host-http": "1.0.8",
+    "@zhin.js/adapter": "1.1.8",
+    "@zhin.js/command": "1.0.12",
+    "@zhin.js/core": "1.5.8",
+    "@zhin.js/host-http": "1.0.9",
     "@zhin.js/im-contract": "1.0.3",
     "@zhin.js/logger": "1.0.76",
-    "@zhin.js/permission": "1.0.1",
-    "@zhin.js/plugin-runtime": "1.1.5"
+    "@zhin.js/permission": "1.0.2",
+    "@zhin.js/plugin-runtime": "1.1.6"
   },
   "peerDependencies": {
     "zod": "^4.0.0",
-    "@zhin.js/adapter": "1.1.7",
-    "@zhin.js/agent": "1.1.8",
-    "@zhin.js/core": "1.5.7",
-    "@zhin.js/plugin-runtime": "1.1.5",
-    "zhin.js": "6.0.7"
+    "@zhin.js/adapter": "1.1.8",
+    "@zhin.js/agent": "1.1.9",
+    "@zhin.js/core": "1.5.8",
+    "@zhin.js/plugin-runtime": "1.1.6",
+    "zhin.js": "6.0.8"
   },
   "peerDependenciesMeta": {
     "zhin.js": {
@@ -66,9 +66,9 @@
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
     "zod": "^4.4.3",
-    "@zhin.js/agent": "1.1.8",
-    "@zhin.js/host-http": "1.0.8",
-    "zhin.js": "6.0.7"
+    "@zhin.js/agent": "1.1.9",
+    "@zhin.js/host-http": "1.0.9",
+    "zhin.js": "6.0.8"
   },
   "files": [
     "adapters",

package/src/endpoint.ts

@@ -13,10 +13,7 @@ import type {
 import type { MessageGateway } from '@zhin.js/core/runtime';
 import type { HttpHost, HttpRouteRegistration } from '@zhin.js/host-http';
 import {
-  formatLegacyConversationRef,
-  formatLegacyMessageRef,
-  nativeConversationId,
-  parseLegacyMessageReference,
+  type MessageRef,
 } from '@zhin.js/im-contract';
 import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import type { CapabilityId } from '@zhin.js/plugin-runtime';
@@ -75,18 +72,15 @@ export class DiscordGatewayEndpoint implements EndpointInstance {
     getMembers: (guildId) => this.getMembers(guildId),
   });
   readonly control: EndpointControl = Object.freeze({
-    recall: (messageId: string) => this.recallMessage(messageId),
+    recall: (message: MessageRef) => this.recallMessage(message),
     addReaction: async (
-      messageId: string,
+      message: MessageRef,
       emoji: string,
       hint?: { readonly sceneType?: string; readonly channelId?: string },
     ) => {
-      const reference = parseLegacyMessageReference(messageId);
-      const channelId = hint?.channelId
-        ?? (reference ? nativeConversationId(reference.target) : undefined);
-      const nativeMessageId = reference?.messageId ?? messageId;
-      if (!channelId || !nativeMessageId) return null;
-      await this.addReaction(channelId, nativeMessageId, emoji);
+      const channelId = hint?.channelId ?? message.conversation.id;
+      if (!channelId || !message.id) return null;
+      await this.addReaction(channelId, message.id, emoji);
       return emoji;
     },
   });
@@ -150,27 +144,21 @@ export class DiscordGatewayEndpoint implements EndpointInstance {
 
   async send({ conversation, payload }: EndpointSendRequest): Promise<string> {
     const body = formatOutboundBody(payload);
-    // recall 链路仍是本端点编码的 legacy 引用，在边界内部从 conversation 派生
     const snowflake = await this.#sendBody(conversation.id, body);
-    const messageId = formatLegacyMessageRef({ conversation, id: snowflake });
     this.#logger.debug(formatCompact({
       op: 'discord_send',
       endpoint: this.#options.config.id,
-      target: formatLegacyConversationRef(conversation),
-      messageId,
+      target: conversation.id,
+      messageId: snowflake,
     }));
-    return messageId;
+    return snowflake;
   }
 
-  async recallMessage(messageId: string): Promise<void> {
-    if (!messageId) return;
-    const reference = parseLegacyMessageReference(messageId);
-    if (!reference) return;
-    const channelId = nativeConversationId(reference.target);
-    const snowflake = reference.messageId;
-    const channel = await this.#requireClient().channels.fetch(channelId);
+  async recallMessage(message: MessageRef): Promise<void> {
+    if (!message.id) return;
+    const channel = await this.#requireClient().channels.fetch(message.conversation.id);
     if (!channel?.isTextBased() || !channel.messages) return;
-    const msg = await channel.messages.fetch(snowflake);
+    const msg = await channel.messages.fetch(message.id);
     await msg.delete();
   }
 
@@ -431,7 +419,7 @@ export class DiscordInteractionsEndpoint implements EndpointInstance {
   #open = false;
   #started = false;
   readonly control: EndpointControl = Object.freeze({
-    recall: (messageId: string) => this.recallMessage(messageId),
+    recall: (message: MessageRef) => this.recallMessage(message),
   });
 
   constructor(options: DiscordInteractionsEndpointOptions) {
@@ -493,17 +481,12 @@ export class DiscordInteractionsEndpoint implements EndpointInstance {
     }
     const data = JSON.parse(text) as { id?: string };
     const snowflake = data.id ?? '';
-    // recall 链路仍是本端点编码的 legacy 引用，在边界内部从 conversation 派生
-    return snowflake ? formatLegacyMessageRef({ conversation, id: snowflake }) : '';
+    return snowflake;
   }
 
-  async recallMessage(messageId: string): Promise<void> {
-    if (!messageId) return;
-    const reference = parseLegacyMessageReference(messageId);
-    if (!reference) return;
-    const channelId = nativeConversationId(reference.target);
-    const snowflake = reference.messageId;
-    const response = await this.#fetch(`${DISCORD_API}/channels/${channelId}/messages/${snowflake}`, {
+  async recallMessage(message: MessageRef): Promise<void> {
+    if (!message.id) return;
+    const response = await this.#fetch(`${DISCORD_API}/channels/${message.conversation.id}/messages/${message.id}`, {
       method: 'DELETE',
       headers: { Authorization: `Bot ${this.#options.config.token}` },
       signal: AbortSignal.timeout(OUTBOUND_TIMEOUT_MS),