@alemonjs/discord 2.1.0-alpha.6 → 2.1.0-alpha.9

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.js

@@ -1,11 +1,22 @@
-import { getConfigValue } from 'alemonjs';
+import { getConfigValue, useUserHashKey } from 'alemonjs';
 
 // 平台
 const platform = 'discord';
-const getDiscordConfigValue = () => {
+const getDiscordConfig = () => {
     const value = getConfigValue() || {};
     const config = value[platform] || {};
     return config;
 };
+const getMaster = (UserId) => {
+    const config = getDiscordConfig();
+    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, platform };
+export { getDiscordConfig, getMaster, platform };

package/lib/hook.d.ts

@@ -0,0 +1,39 @@
+import { EventKeys, Events } from 'alemonjs';
+import { DCAPI } from './sdk/api.js';
+import { MESSAGE_CREATE_TYPE } from './sdk/message/MESSAGE_CREATE.js';
+import { INTERACTION_CREATE_TYPE } from './sdk/message/INTERACTION_CREATE.js';
+
+type MAP = {
+    'message.create': MESSAGE_CREATE_TYPE;
+    'private.message.create': MESSAGE_CREATE_TYPE;
+    'interaction.create': INTERACTION_CREATE_TYPE;
+    'private.interaction.create': INTERACTION_CREATE_TYPE;
+    'message.update': undefined;
+    'message.delete': undefined;
+    'message.reaction.add': undefined;
+    'message.reaction.remove': undefined;
+    'channal.create': undefined;
+    'channal.delete': undefined;
+    'guild.join': undefined;
+    'guild.exit': undefined;
+    'member.add': undefined;
+    'member.remove': undefined;
+    'private.message.update': undefined;
+    'private.message.delete': undefined;
+    'private.friend.add': undefined;
+    'private.guild.add': undefined;
+};
+/**
+ *
+ * @param event
+ * @returns
+ */
+declare const useValue: <T extends EventKeys>(event: Events[T]) => readonly [MAP[T]];
+/**
+ *
+ * @param event
+ * @returns
+ */
+declare const useClient: <T extends EventKeys>(event: Events[T]) => readonly [DCAPI, MAP[T]];
+
+export { useClient, useValue };

package/lib/hook.js

@@ -0,0 +1,24 @@
+import { createEventValue, useClient as useClient$1 } from 'alemonjs';
+import { DCAPI } from './sdk/api.js';
+
+/**
+ *
+ * @param event
+ * @returns
+ */
+const useValue = (event) => {
+    const value = createEventValue(event);
+    return [value];
+};
+/**
+ *
+ * @param event
+ * @returns
+ */
+const useClient = (event) => {
+    const [client] = useClient$1(event, DCAPI);
+    const value = createEventValue(event);
+    return [client, value];
+};
+
+export { useClient, useValue };

package/lib/index.d.ts

@@ -1,5 +1,6 @@
 export { platform } from './config.js';
 export { DCAPI as API } from './sdk/api.js';
+export { useClient, useValue } from './hook.js';
 
 declare const _default: () => void;
 

package/lib/index.js

@@ -1,13 +1,14 @@
 import './env.js';
-import { 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 { getDiscordConfigValue, platform } from './config.js';
+import { getDiscordConfig, getMaster, platform } from './config.js';
 export { DCAPI as API } from './sdk/api.js';
+export { useClient, useValue } from './hook.js';
 
 // main
 var index = () => {
-    const value = getDiscordConfigValue();
+    const value = getDiscordConfig();
     const port = process.env?.port || value?.port || 17117;
     /**
      * 连接 alemonjs 服务器。
@@ -47,13 +48,7 @@ var index = () => {
             msg = msg.replace(`<@${item.id}>`, '').trim();
         }
         const UserId = event.author.id;
-        const UserKey = useUserHashKey({
-            Platform: platform,
-            UserId: UserId
-        });
-        const value = getDiscordConfigValue();
-        const master_key = value?.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 = {
@@ -63,6 +58,7 @@ var index = () => {
                 // guild
                 GuildId: event.guild_id,
                 ChannelId: event.channel_id,
+                SpaceId: event.channel_id,
                 // user
                 UserId: UserId,
                 UserKey,
@@ -87,9 +83,6 @@ var index = () => {
                 name: 'private.message.create',
                 // 事件类型
                 Platform: platform,
-                // guild
-                // GuildId: event.guild_id,
-                // ChannelId: event.channel_id,
                 // user
                 UserId: UserId,
                 UserKey,
@@ -111,19 +104,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 value = getDiscordConfigValue();
-        const master_key = value?.master_key ?? [];
-        const isMaster = master_key.includes(UserKey);
+        const [isMaster, UserKey] = getMaster(UserId);
         const MessageText = event.data.custom_id;
         if (isPrivate) {
             // 处理消息
@@ -160,6 +146,7 @@ var index = () => {
                 // guild
                 GuildId: event['guild_id'],
                 ChannelId: event.channel_id,
+                SpaceId: event.channel_id,
                 // user
                 UserId: UserId,
                 UserKey,
@@ -236,16 +223,11 @@ var index = () => {
                 const MessageMention = event.mentions.map(item => {
                     const UserId = item.id;
                     const avatar = event.author.avatar;
-                    const value = getDiscordConfigValue();
-                    const master_key = value?.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
@@ -280,8 +262,7 @@ var index = () => {
             consume([createResult(ResultCode.Ok, '请求完成', res)]);
         }
     });
-    // 处理 api 调用
-    cbp?.onapis(async (data, consume) => {
+    cbp.onapis(async (data, consume) => {
         const key = data.payload?.key;
         if (client[key]) {
             // 如果 client 上有对应的 key，直接调用。

package/lib/sdk/api.js

@@ -4,7 +4,7 @@ import { existsSync, createReadStream } from 'fs';
 import { Readable, isReadable } from 'stream';
 import { basename } from 'path';
 import { fileTypeFromBuffer, fileTypeFromStream } from 'file-type';
-import { getDiscordConfigValue } from '../config.js';
+import { getDiscordConfig } from '../config.js';
 
 /**
  * 创建form
@@ -53,7 +53,7 @@ class DCAPI {
      * @returns
      */
     request(options) {
-        const value = getDiscordConfigValue();
+        const value = getDiscordConfig();
         const token = value.token;
         const service = axios.create({
             baseURL: API_URL,
@@ -71,7 +71,7 @@ class DCAPI {
      * @returns
      */
     requestCDN(options) {
-        const value = getDiscordConfigValue();
+        const value = getDiscordConfig();
         const token = value.token;
         const service = axios.create({
             baseURL: CDB_URL,

package/lib/sdk/message/INTERACTION_CREATE.d.ts

@@ -0,0 +1,126 @@
+interface User {
+    username: string;
+    public_flags: number;
+    primary_guild: null;
+    id: string;
+    global_name: string | null;
+    discriminator: string;
+    collectibles: null;
+    clan: null;
+    avatar_decoration_data: null;
+    avatar: string;
+}
+type Message = {
+    type: number;
+    tts: boolean;
+    timestamp: string;
+    pinned: boolean;
+    mentions: unknown[];
+    mention_roles: unknown[];
+    mention_everyone: boolean;
+    id: string;
+    flags: number;
+    embeds: unknown[];
+    edited_timestamp: string | null;
+    content: string;
+    components: unknown[];
+    channel_id: string;
+    author: User;
+    attachments: unknown[];
+};
+type Member = {
+    user: User;
+    unusual_dm_activity_until: string | null;
+    roles: string[];
+    premium_since: string | null;
+    permissions: string;
+    pending: boolean;
+    nick: string | null;
+    mute: boolean;
+    joined_at: string;
+    flags: number;
+    deaf: boolean;
+    communication_disabled_until: string | null;
+    banner: string | null;
+    avatar: string | null;
+};
+type DiscordGuild = {
+    locale: string;
+    id: string;
+    features: string[];
+};
+type PublicChannel = {
+    type: number;
+    topic: string | null;
+    theme_color: number | null;
+    rate_limit_per_user: number;
+    position: number;
+    permissions: string;
+    parent_id: string;
+    nsfw: boolean;
+    name: string;
+    last_message_id: string;
+    id: string;
+    icon_emoji: {
+        name: string;
+        id: string | null;
+    };
+    guild_id: string;
+    flags: number;
+};
+interface Channel {
+    type: number;
+    recipients: any[];
+    recipient_flags: number;
+    last_message_id: string;
+    id: string;
+    flags: number;
+}
+interface Data {
+    id: number;
+    custom_id: string;
+    component_type: number;
+}
+type Public = {
+    version: number;
+    type: number;
+    token: string;
+    member: Member;
+    message: Message;
+    locale: string;
+    id: string;
+    guild_locale: string;
+    guild_id: string;
+    guild: DiscordGuild;
+    entitlement_sku_ids: any[];
+    entitlements: any[];
+    data: Data;
+    context: number;
+    channel_id: string;
+    channel: PublicChannel;
+    authorizing_integration_owners: Record<string, string>;
+    attachment_size_limit: number;
+    application_id: string;
+    app_permissions: string;
+};
+type Private = {
+    version: number;
+    type: number;
+    token: string;
+    user: User;
+    message: Message;
+    locale: string;
+    id: string;
+    entitlements: any[];
+    data: Data;
+    context: number;
+    channel_id: string;
+    channel: Channel;
+    authorizing_integration_owners: Record<string, string>;
+    attachment_size_limit: number;
+    application_id: string;
+    app_permissions: string;
+};
+type INTERACTION_CREATE_TYPE = Public | Private;
+
+export type { INTERACTION_CREATE_TYPE };

package/lib/sdk/message/MESSAGE_CREATE.d.ts

@@ -0,0 +1,59 @@
+/**
+ * 基础消息
+ * @param event
+ */
+type MESSAGE_CREATE_TYPE = {
+    type: number;
+    tts: boolean;
+    timestamp: string;
+    referenced_message: null;
+    pinned: boolean;
+    nonce: string;
+    mentions: {
+        username: string;
+        public_flags: number;
+        member: any;
+        id: string;
+        global_name: null;
+        discriminator: string;
+        bot: boolean;
+        avatar_decoration_data: null;
+        avatar: string;
+    }[];
+    mention_roles: any[];
+    mention_everyone: boolean;
+    member: {
+        roles: any[];
+        premium_since: null;
+        pending: boolean;
+        nick: null;
+        mute: boolean;
+        joined_at: string;
+        flags: number;
+        deaf: boolean;
+        communication_disabled_until: null;
+        avatar: null;
+    };
+    id: string;
+    flags: number;
+    embeds: any[];
+    edited_timestamp: null;
+    content: string;
+    components: any[];
+    channel_id: string;
+    author: {
+        username: string;
+        public_flags: number;
+        premium_type: number;
+        id: string;
+        global_name: string;
+        discriminator: string;
+        avatar_decoration_data: null;
+        avatar: string;
+        bot?: boolean;
+    };
+    attachments: any[];
+    guild_id: string;
+};
+
+export type { MESSAGE_CREATE_TYPE };

package/lib/sdk/wss.js

@@ -1,7 +1,7 @@
 import WebSocket from 'ws';
 import { DCAPI } from './api.js';
 import { getIntents } from './intents.js';
-import { getDiscordConfigValue } from '../config.js';
+import { getDiscordConfig } from '../config.js';
 
 class DCClient extends DCAPI {
     #heartbeat_interval = 0;
@@ -19,7 +19,7 @@ class DCClient extends DCAPI {
      * @returns
      */
     #aut() {
-        const value = getDiscordConfigValue();
+        const value = getDiscordConfig();
         const token = value.token;
         const intent = value.intent || [];
         const shard = value.shard || [0, 1];
@@ -55,7 +55,7 @@ class DCClient extends DCAPI {
      * @returns
      */
     async connect() {
-        const value = getDiscordConfigValue();
+        const value = getDiscordConfig();
         const gatewayURL = value.gatewayURL;
         // 清除序列号
         this.#seq = null;

package/lib/send.js

@@ -95,7 +95,7 @@ const sendchannel = async (client, param, val) => {
                 }
             }
             const res = await client.channelsMessagesForm(channel_id, {
-                content: content,
+                content: content
             }, bufferData);
             return [createResult(ResultCode.Ok, '完成', {})];
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@alemonjs/discord",
-  "version": "2.1.0-alpha.6",
-  "description": "阿柠檬discord平台连接",
+  "version": "2.1.0-alpha.9",
+  "description": "discord platform connection",
   "author": "lemonade",
   "license": "MIT",
   "type": "module",