@zhin.js/adapter-discord 5.0.2 → 6.0.0

package/lib/webhook.js

@@ -0,0 +1,86 @@
+import { getLogger } from '@zhin.js/logger';
+import { interactionToInboundMessage, verifyDiscordInteractionSignature, } from './protocol.js';
+const logger = getLogger('discord');
+const INTERACTION_TYPE_PING = 1;
+const INTERACTION_TYPE_APPLICATION_COMMAND = 2;
+const INTERACTION_RESPONSE_PONG = 1;
+const INTERACTION_RESPONSE_CHANNEL_MESSAGE_WITH_SOURCE = 4;
+/** EPHEHEMERAL — 仅发起者可见（对齐旧 endpoint-interactions 默认响应）。 */
+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'] }),
+    ];
+}
+export async function handleDiscordInteractionRequest(request, response, handler) {
+    try {
+        const signature = headerValue(request.headers['x-signature-ed25519']);
+        const timestamp = headerValue(request.headers['x-signature-timestamp']);
+        const rawBody = await readInteractionBody(request);
+        if (!signature || !timestamp) {
+            response.writeHead(401, { 'Content-Type': 'text/plain' });
+            response.end('Unauthorized');
+            return;
+        }
+        if (!verifyDiscordInteractionSignature(handler.config.publicKey, rawBody, signature, timestamp)) {
+            response.writeHead(401, { 'Content-Type': 'text/plain' });
+            response.end('Unauthorized');
+            return;
+        }
+        const interaction = JSON.parse(rawBody);
+        if (interaction.type === INTERACTION_TYPE_PING) {
+            writeJson(response, 200, { type: INTERACTION_RESPONSE_PONG });
+            return;
+        }
+        if (interaction.type === INTERACTION_TYPE_APPLICATION_COMMAND) {
+            if (handler.isOpen) {
+                handler.admit(interactionToInboundMessage(interaction));
+            }
+            // 即时响应（type 4）：defer(type 5) 需要 followup PATCH，未实现会让用户端一直转圈
+            const commandName = String(interaction.data?.name ?? '');
+            writeJson(response, 200, {
+                type: INTERACTION_RESPONSE_CHANNEL_MESSAGE_WITH_SOURCE,
+                data: {
+                    content: `处理命令: ${commandName}`,
+                    flags: INTERACTION_FLAG_EPHEMERAL,
+                },
+            });
+            return;
+        }
+        response.writeHead(400, { 'Content-Type': 'text/plain' });
+        response.end('Unsupported interaction type');
+    }
+    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 Buffer.concat(chunks).toString('utf8');
+}
+function writeJson(response, status, body) {
+    response.writeHead(status, { 'Content-Type': 'application/json' });
+    response.end(JSON.stringify(body));
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zhin.js/adapter-discord",
-  "version": "5.0.2",
-  "description": "Zhin.js adapter for Discord",
+  "version": "6.0.0",
+  "description": "Zhin.js Discord adapter for Plugin Runtime (Gateway WebSocket)",
   "type": "module",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -33,55 +33,48 @@
   },
   "dependencies": {
     "discord.js": "^14.26.4",
-    "tweetnacl": "^1.0.3"
-  },
-  "devDependencies": {
-    "@types/node": "^26.1.0",
-    "@types/react": "^19.2.17",
-    "@types/react-dom": "^19.2.3",
-    "lucide-react": "^1.22.0",
-    "typescript": "^6.0.3",
-    "zod": "^4.4.3",
-    "@zhin.js/cli": "1.0.93",
-    "@zhin.js/client": "2.0.5",
-    "@zhin.js/contract": "1.0.3",
-    "@zhin.js/host-api": "2.0.5",
-    "@zhin.js/host-router": "2.0.3",
-    "zhin.js": "4.1.2",
-    "@zhin.js/agent": "1.0.3"
+    "@zhin.js/adapter": "1.1.0",
+    "@zhin.js/core": "1.4.0",
+    "@zhin.js/host-http": "1.0.2",
+    "@zhin.js/logger": "1.0.75",
+    "@zhin.js/plugin-runtime": "1.1.0"
   },
   "peerDependencies": {
     "zod": "^4.0.0",
-    "@zhin.js/client": "2.0.5",
-    "@zhin.js/host-api": "2.0.5",
-    "@zhin.js/contract": "1.0.3",
-    "@zhin.js/host-router": "2.0.3",
-    "zhin.js": "4.1.2",
-    "@zhin.js/agent": "1.0.3"
+    "@zhin.js/adapter": "1.1.0",
+    "@zhin.js/agent": "1.0.5",
+    "@zhin.js/core": "1.4.0",
+    "@zhin.js/plugin-runtime": "1.1.0",
+    "zhin.js": "5.0.0"
   },
   "peerDependenciesMeta": {
-    "@zhin.js/agent": {
-      "optional": true
-    },
-    "@zhin.js/client": {
+    "zhin.js": {
       "optional": true
     },
-    "@zhin.js/host-api": {
+    "@zhin.js/agent": {
       "optional": true
     },
     "zod": {
       "optional": true
     }
   },
+  "devDependencies": {
+    "@types/node": "^26.1.0",
+    "typescript": "^6.0.3",
+    "vitest": "^4.1.10",
+    "zod": "^4.4.3",
+    "@zhin.js/agent": "1.0.5",
+    "@zhin.js/host-http": "1.0.2",
+    "zhin.js": "5.0.0"
+  },
   "files": [
+    "adapters",
+    "plugin.ts",
+    "schema.json",
     "src",
     "lib",
-    "client",
-    "dist",
     "agent",
-    "plugin.yml",
     "README.md",
-    "node",
     "CHANGELOG.md"
   ],
   "publishConfig": {
@@ -91,9 +84,23 @@
   "engines": {
     "node": "^20.19.0 || >=22.12.0"
   },
+  "zhin": {
+    "protocol": 1,
+    "type": "plugin",
+    "entry": "./plugin.ts",
+    "engine": "^1.0.0",
+    "runtime": "trusted",
+    "features": [
+      {
+        "package": "@zhin.js/adapter",
+        "api": "^1.0.0"
+      }
+    ],
+    "plugins": []
+  },
   "scripts": {
-    "build": "zhin build",
-    "clean": "rimraf lib dist",
-    "build:node": "tsc"
+    "build": "tsc",
+    "clean": "rimraf lib",
+    "test": "NODE_OPTIONS=--experimental-strip-types vitest run --root ../../.. plugins/adapters/discord/tests"
   }
 }

package/plugin.ts

@@ -0,0 +1,13 @@
+import { definePlugin } from '@zhin.js/plugin-runtime';
+import { registerDiscordPlatformPermitChecker } from './src/platform-permit.js';
+
+export default definePlugin({
+  name: 'discord',
+  metadata: {
+    displayName: 'Discord Gateway Adapter',
+  },
+  setup() {
+    // 平台权限门禁：guild_owner / moderate_members 等（agent 工具 platformPermit）
+    return registerDiscordPlatformPermitChecker();
+  },
+});

package/schema.json

@@ -0,0 +1,105 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "type": "object",
+  "additionalProperties": false,
+  "properties": {
+    "connection": {
+      "type": "string",
+      "enum": [
+        "gateway",
+        "interactions"
+      ],
+      "default": "gateway",
+      "description": "Gateway WebSocket (default). interactions uses httpHostToken POST + Ed25519 verify."
+    },
+    "intents": {
+      "type": "array",
+      "items": {
+        "type": "number"
+      }
+    },
+    "enableSlashCommands": {
+      "type": "boolean",
+      "default": false
+    },
+    "globalCommands": {
+      "type": "boolean",
+      "default": false
+    },
+    "defaultActivity": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "PLAYING",
+            "STREAMING",
+            "LISTENING",
+            "WATCHING",
+            "COMPETING"
+          ]
+        },
+        "url": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "name",
+        "type"
+      ]
+    },
+    "slashCommands": {
+      "type": "array",
+      "items": {
+        "type": "object"
+      }
+    },
+    "applicationId": {
+      "type": "string",
+      "description": "Required when connection is interactions."
+    },
+    "publicKey": {
+      "type": "string",
+      "description": "Required when connection is interactions (hex Ed25519 public key)."
+    },
+    "interactionsPath": {
+      "type": "string",
+      "default": "/discord/interactions",
+      "description": "POST path on httpHostToken when connection is interactions."
+    },
+    "endpoints": {
+      "type": "array",
+      "description": "多账号：一个插件实例挂多个 endpoint。每项与顶层字段同构（name 必填，其余覆盖顶层）",
+      "items": {
+        "type": "object",
+        "additionalProperties": true,
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "Discord bot name"
+          },
+          "token": {
+            "type": "string",
+            "description": "Discord bot token"
+          }
+        },
+        "required": [
+          "name",
+          "token"
+        ]
+      }
+    },
+    "commandPrefix": {
+      "type": "string",
+      "default": "",
+      "description": "命令前缀（默认 '' 无前缀，任意文本按命令匹配；如 '/' 要求 / 开头）。endpoints[i] 可逐项覆盖"
+    }
+  },
+  "required": [
+    "endpoints"
+  ]
+}

package/src/discord-agent-deps.ts

@@ -1,22 +1,79 @@
 /**
- * Shared runtime deps for discord agent/ authoring tools.
- * Set once from plugin index during init — never call getPlugin() from tool execute.
+ * Agent tool deps for discord.
+ * Endpoints register themselves on start; tools look up by config name / endpoint id.
  */
-import type { DiscordAdapter, DiscordEndpointLike } from './adapter.js';
+
+export interface DiscordAgentEndpoint {
+  addRole(guildId: string, userId: string, roleId: string): Promise<boolean>;
+  removeRole(guildId: string, userId: string, roleId: string): Promise<boolean>;
+  getRoles(guildId: string): Promise<unknown[]>;
+  createThread(
+    channelId: string,
+    name: string,
+    messageId?: string,
+    autoArchiveDuration?: number,
+  ): Promise<{ id: string }>;
+  addReaction(channelId: string, messageId: string, emoji: string): Promise<void>;
+  sendEmbed(
+    channelId: string,
+    embedData: Record<string, unknown>,
+  ): Promise<{ id: string }>;
+  createForumPost(
+    channelId: string,
+    name: string,
+    content: string,
+    tags?: string[],
+  ): Promise<{ id: string }>;
+  kickMember(guildId: string, userId: string, reason?: string): Promise<boolean>;
+  banMember(guildId: string, userId: string, reason?: string): Promise<boolean>;
+  unbanMember(guildId: string, userId: string, reason?: string): Promise<boolean>;
+  timeoutMember(
+    guildId: string,
+    userId: string,
+    duration?: number,
+    reason?: string,
+  ): Promise<boolean>;
+  setNickname(guildId: string, userId: string, nickname: string): Promise<boolean>;
+  getMembers(guildId: string, limit?: number): Promise<unknown[]>;
+  getGuildInfo(guildId: string): Promise<unknown>;
+}
 
 export interface DiscordAgentDeps {
-  getEndpoint: (endpointId: string) => DiscordEndpointLike;
-  getGatewayEndpoint: (endpointId: string) => DiscordEndpointLike;
-  getAdapter: () => DiscordAdapter;
+  getEndpoint: (endpointId: string) => DiscordAgentEndpoint;
+  /** Alias kept for existing agent/tools that call getGatewayEndpoint. */
+  getGatewayEndpoint: (endpointId: string) => DiscordAgentEndpoint;
+}
+
+const endpoints = new Map<string, DiscordAgentEndpoint>();
+let override: DiscordAgentDeps | null = null;
+
+export function registerDiscordAgentEndpoint(
+  endpointId: string,
+  endpoint: DiscordAgentEndpoint,
+): () => void {
+  endpoints.set(endpointId, endpoint);
+  return () => {
+    if (endpoints.get(endpointId) === endpoint) {
+      endpoints.delete(endpointId);
+    }
+  };
 }
 
-let _deps: DiscordAgentDeps | null = null;
+/** Optional override used by tests / transitional callers. Pass `null` to clear. */
+export function setDiscordAgentDeps(deps: DiscordAgentDeps | null): void {
+  override = deps;
+}
 
-export function setDiscordAgentDeps(deps: DiscordAgentDeps): void {
-  _deps = deps;
+function lookup(endpointId: string): DiscordAgentEndpoint {
+  const registered = endpoints.get(endpointId);
+  if (!registered) throw new Error(`Endpoint ${endpointId} 不存在`);
+  return registered;
 }
 
 export function getDiscordAgentDeps(): DiscordAgentDeps {
-  if (!_deps) throw new Error('discord agent deps not initialized');
-  return _deps;
+  if (override) return override;
+  return {
+    getEndpoint: lookup,
+    getGatewayEndpoint: lookup,
+  };
 }