@zhin.js/adapter-discord 1.1.18 → 1.1.20

package/src/client.ts

@@ -1,10 +1,11 @@
-import { defineEndpointClient } from 'zhin.js/adapter';
-import type { DiscordRestClient } from './endpoint.js';
+import type { ClientEvents } from 'discord.js';
+import type { DiscordAdapter } from './adapter.js';
+import type { DiscordGatewayEndpoint, DiscordInteractionsEndpoint } from './endpoint.js';
 import type { DiscordClientTransport } from './gateway.js';
 
 /** Exact Client variants produced by the Gateway and Interactions Endpoints. */
-export type DiscordClient = DiscordClientTransport | DiscordRestClient;
-export type DiscordClientEventMap = Record<string, unknown>;
+export type DiscordClient = DiscordGatewayEndpoint | DiscordInteractionsEndpoint;
+export type DiscordClientEventMap = { readonly [K in keyof ClientEvents]: ClientEvents[K][0] } & Record<string, unknown>;
 
 /** Narrow an adapter Client for Gateway-only SDK operations. */
 export function requireDiscordGatewayClient(client: DiscordClient): DiscordClientTransport {
@@ -13,12 +14,5 @@ export function requireDiscordGatewayClient(client: DiscordClient): DiscordClien
 }
 
 declare module '@zhin.js/feature-kit' {
-  interface AdapterClientRegistry {
-    readonly discord: {
-      readonly client: DiscordClient;
-      readonly events: DiscordClientEventMap;
-    };
-  }
+  interface AdapterRegistry { readonly discord: DiscordAdapter; }
 }
-
-export const discordClient = defineEndpointClient<DiscordClient, DiscordClientEventMap>('discord');

package/src/console-spec.ts

@@ -8,6 +8,15 @@ export const discordConsoleSpec = {
   adapterDisplayName: 'Discord',
   fields: [
     { key: 'token', required: true, env: true, description: 'Discord bot token' },
+    { key: 'connection', description: 'gateway or interactions' },
+    { key: 'applicationId', description: 'Application ID for Interactions; identity changes replace the account' },
+    { key: 'publicKey', description: 'Application Ed25519 public key' },
+    { key: 'interactionsPath', description: 'Local Interactions route' },
+    { key: 'restApiProxy.port', type: 'number', description: 'Configured REST loopback proxy port' },
+    { key: 'gatewayFaultProxyUrl', description: 'Configured local Gateway fault proxy URL' },
+    { key: 'defaultActivity.name', description: 'SDK activity name' },
+    { key: 'defaultActivity.type', description: 'PLAYING, STREAMING, LISTENING, WATCHING or COMPETING' },
+    { key: 'defaultActivity.url', description: 'SDK activity URL' },
   ] as readonly AdapterConsoleField[],
   docsUrl: 'https://zhin.js.org/adapters/discord',
   readPermission: 'discord:read',

package/src/console.ts

@@ -3,19 +3,15 @@
  *
  * 页面绑定 `pages/index`，读取 / 写入分别要求 `<adapter>:read` / `<adapter>:write`。
  */
-import { createAdapterConsoleRpc, type AdapterConsoleResources } from 'zhin.js/adapter';
+import { createAdapterConsoleRpc } from 'zhin.js/adapter';
 import type { PluginConsoleRpc } from 'zhin.js';
-import { discordRuntimeStateToken } from './discord-runtime-state.js';
 import { discordConsoleSpec } from './console-spec.js';
 
 export function createDiscordConsoleRpc(
-  resources: AdapterConsoleResources,
   getConfig: () => unknown,
 ): PluginConsoleRpc {
-  const state = resources.use(discordRuntimeStateToken);
   return createAdapterConsoleRpc({
     ...discordConsoleSpec,
-    running: () => state.endpoints.values(),
     getConfig,
-  }, resources);
+  });
 }