@alemonjs/discord 2.1.0-alpha.5 → 2.1.0-alpha.8

package/README.md

@@ -18,12 +18,16 @@ yarn add @alemonjs/discord
 discord:
   # 令牌
   token: ''
-  # 主人
-  master_key: null
   # 前缀（非必填）
   intent: null
   # 活动 非必填）
   shard: null
+  # 使用 user_key
+  master_key:
+     - 'xxx'
+  # 使用 user_id
+  master_id:
+     - 'yyy'
 ```
 
 ```sh

package/lib/config.d.ts

@@ -0,0 +1,3 @@
+declare const platform = "discord";
+
+export { platform };

package/lib/config.js

@@ -0,0 +1,22 @@
+import { getConfigValue, useUserHashKey } from 'alemonjs';
+
+// 平台
+const platform = 'discord';
+const getDiscordConfigValue = () => {
+    const value = getConfigValue() || {};
+    const config = value[platform] || {};
+    return config;
+};
+const getMaster = (UserId) => {
+    const config = getDiscordConfigValue();
+    const master_key = config.master_key || [];
+    const master_id = config.master_id || [];
+    const UserKey = useUserHashKey({
+        Platform: platform,
+        UserId: UserId
+    });
+    const is = master_key.includes(UserKey) || master_id.includes(UserId);
+    return [is, UserKey];
+};
+
+export { getDiscordConfigValue, getMaster, platform };

package/lib/index.d.ts

@@ -1,4 +1,6 @@
-declare const platform = "discord";
+export { platform } from './config.js';
+export { DCAPI as API } from './sdk/api.js';
+
 declare const _default: () => void;
 
-export { _default as default, platform };
+export { _default as default };

package/lib/index.js

@@ -1,30 +1,24 @@
 import './env.js';
-import { getConfigValue, cbpPlatform, useUserHashKey, createResult, ResultCode } from 'alemonjs';
+import { cbpPlatform, createResult, ResultCode } from 'alemonjs';
 import { sendchannel, senduser } from './send.js';
 import { DCClient } from './sdk/wss.js';
-import { AvailableIntentsEventsEnum } from './sdk/types.js';
+import { getDiscordConfigValue, getMaster, platform } from './config.js';
+export { DCAPI as API } from './sdk/api.js';
 
-const platform = 'discord';
+// main
 var index = () => {
-    let value = getConfigValue();
-    if (!value)
-        value = {};
-    const config = value[platform];
-    // 创建客户端
-    const client = new DCClient({
-        gatewayURL: config?.gatewayURL,
-        token: config.token,
-        shard: config?.shard ?? [0, 1],
-        intent: config?.intent ?? AvailableIntentsEventsEnum
-    });
+    const value = getDiscordConfigValue();
+    const port = process.env?.port || value?.port || 17117;
     /**
      * 连接 alemonjs 服务器。
      * 向 alemonjs 推送标准信息
      */
-    const url = `ws://127.0.0.1:${process.env?.port || config?.port || 17117}`;
+    const url = `ws://127.0.0.1:${port}`;
     const cbp = cbpPlatform(url);
+    // 创建客户端
+    const client = new DCClient();
     // 连接
-    client.connect(config?.gatewayURL);
+    client.connect();
     /**
      * 创建用户头像
      * @param UserId
@@ -53,12 +47,7 @@ var index = () => {
             msg = msg.replace(`<@${item.id}>`, '').trim();
         }
         const UserId = event.author.id;
-        const UserKey = useUserHashKey({
-            Platform: platform,
-            UserId: UserId
-        });
-        const master_key = config?.master_key ?? [];
-        const isMaster = master_key.includes(UserKey);
+        const [isMaster, UserKey] = getMaster(UserId);
         const UserAvatar = createUserAvatar(UserId, event.author.avatar);
         if (event.type == 0 && event.member) {
             const e = {
@@ -68,6 +57,7 @@ var index = () => {
                 // guild
                 GuildId: event.guild_id,
                 ChannelId: event.channel_id,
+                SpaceId: event.channel_id,
                 // user
                 UserId: UserId,
                 UserKey,
@@ -92,9 +82,6 @@ var index = () => {
                 name: 'private.message.create',
                 // 事件类型
                 Platform: platform,
-                // guild
-                // GuildId: event.guild_id,
-                // ChannelId: event.channel_id,
                 // user
                 UserId: UserId,
                 UserKey,
@@ -116,18 +103,12 @@ var index = () => {
         else ;
     });
     client.on('INTERACTION_CREATE', event => {
-        console.log('event', event);
         const isPrivate = typeof event['user'] === 'object' ? true : false;
         const user = isPrivate ? event['user'] : event['member'].user;
         const UserId = user.id;
-        const UserKey = useUserHashKey({
-            Platform: platform,
-            UserId: UserId
-        });
         const UserAvatar = createUserAvatar(UserId, user.avatar);
         const UserName = user.username;
-        const master_key = config?.master_key ?? [];
-        const isMaster = master_key.includes(UserKey);
+        const [isMaster, UserKey] = getMaster(UserId);
         const MessageText = event.data.custom_id;
         if (isPrivate) {
             // 处理消息
@@ -164,6 +145,7 @@ var index = () => {
                 // guild
                 GuildId: event['guild_id'],
                 ChannelId: event.channel_id,
+                SpaceId: event.channel_id,
                 // user
                 UserId: UserId,
                 UserKey,
@@ -240,17 +222,11 @@ var index = () => {
                 const MessageMention = event.mentions.map(item => {
                     const UserId = item.id;
                     const avatar = event.author.avatar;
-                    const value = getConfigValue();
-                    const config = value?.discord;
-                    const master_key = config?.master_key ?? [];
                     const UserAvatar = createUserAvatar(UserId, avatar);
-                    const UserKey = useUserHashKey({
-                        Platform: platform,
-                        UserId: UserId
-                    });
+                    const [isMaster, UserKey] = getMaster(UserId);
                     return {
                         UserId: item.id,
-                        IsMaster: master_key.includes(UserId),
+                        IsMaster: isMaster,
                         IsBot: item.bot,
                         UserAvatar,
                         UserKey
@@ -285,6 +261,15 @@ var index = () => {
             consume([createResult(ResultCode.Ok, '请求完成', res)]);
         }
     });
+    cbp.onapis(async (data, consume) => {
+        const key = data.payload?.key;
+        if (client[key]) {
+            // 如果 client 上有对应的 key，直接调用。
+            const params = data.payload.params;
+            const res = await client[key](...params);
+            consume([createResult(ResultCode.Ok, '请求完成', res)]);
+        }
+    });
 };
 
 export { index as default, platform };