@alemonjs/discord 2.1.0-alpha.8 → 2.1.0

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

@@ -0,0 +1,57 @@
+export type PRESENCE_UPDATE_TYPE = {
+    user: {
+        id: number;
+    } | {
+        username: string;
+        public_flags: number;
+        id: string;
+        global_name: string;
+        discriminator: string;
+        avatar_decoration_data: {
+            sku_id: string;
+            asset: string;
+        };
+        avatar: string;
+    };
+    status: string;
+    guild_id: string;
+    client_status: {
+        desktop: string;
+    };
+    broadcast: null;
+    activities: {
+        type: number;
+        timestamps: any;
+        state: string;
+        name: string;
+        id: string;
+        details: string;
+        created_at: number;
+        assets: any;
+        application_id: string;
+    }[] | {
+        type: number;
+        state: string;
+        name: string;
+        id: string;
+        emoji: any;
+        created_at: number;
+    }[] | {
+        type: number;
+        name: string;
+        id: string;
+        created_at: number;
+    }[] | {
+        type: number;
+        timestamps: any;
+        state: string;
+        session_id: string;
+        name: string;
+        id: string;
+        details: string;
+        created_at: number;
+        buttons: any[];
+        assets: any;
+        application_id: string;
+    }[];
+};

package/lib/sdk/message/PRESENCE_UPDATE.js

@@ -0,0 +1 @@
+

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

@@ -0,0 +1,7 @@
+export type READY_TYPE = {
+    user: {
+        id: any;
+        avatar: string;
+        username: string;
+    };
+};

package/lib/sdk/message/READY.js

@@ -0,0 +1 @@
+

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

@@ -0,0 +1,29 @@
+export type TYPING_START_TYPE = {
+    user_id: string;
+    timestamp: number;
+    member: {
+        user: {
+            username: string;
+            public_flags: number;
+            id: string;
+            global_name: string;
+            display_name: string;
+            discriminator: string;
+            bot: boolean;
+            avatar_decoration_data: null;
+            avatar: string;
+        };
+        roles: string[];
+        premium_since: string;
+        pending: boolean;
+        nick: string;
+        mute: boolean;
+        joined_at: string;
+        flags: number;
+        deaf: boolean;
+        communication_disabled_until: null;
+        avatar: null;
+    };
+    channel_id: string;
+    guild_id: string;
+};

package/lib/sdk/message/TYPING_START.js

@@ -0,0 +1 @@
+

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

@@ -0,0 +1,5 @@
+export type VOICE_CHANNEL_STATUS_UPDATE_TYPE = {
+    status: null;
+    id: string;
+    guild_id: string;
+};

package/lib/sdk/message/VOICE_CHANNEL_STATUS_UPDATE.js

@@ -0,0 +1 @@
+

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

@@ -0,0 +1,36 @@
+export type VOICE_STATE_UPDATE_TYPE = {
+    member: {
+        user: {
+            username: string;
+            public_flags: number;
+            id: string;
+            global_name: string;
+            display_name: string;
+            discriminator: string;
+            bot: boolean;
+            avatar_decoration_data: any;
+            avatar: string;
+        };
+        roles: string[];
+        premium_since: null;
+        pending: boolean;
+        nick: null;
+        mute: boolean;
+        joined_at: string;
+        flags: number;
+        deaf: boolean;
+        communication_disabled_until: null;
+        avatar: string;
+    };
+    user_id: string;
+    suppress: boolean;
+    session_id: string;
+    self_video: boolean;
+    self_mute: true;
+    self_deaf: boolean;
+    request_to_speak_timestamp: null;
+    mute: boolean;
+    guild_id: string;
+    deaf: boolean;
+    channel_id: string;
+};

package/lib/sdk/message/VOICE_STATE_UPDATE.js

@@ -0,0 +1 @@
+

package/lib/sdk/message.d.ts

@@ -0,0 +1,93 @@
+import { CHANNEL_TOPIC_UPDATE_TYPE } from './message/CHANNEL_TOPIC_UPDATE';
+import { CHANNEL_UPDATE_TYPE } from './message/CHANNEL_UPDATE';
+import { GUILD_MEMBER_ADD_TYPE } from './message/GUILD_MEMBER_ADD';
+import { GUILD_MEMBER_REMOVE_TYPE } from './message/GUILD_MEMBER_REMOVE';
+import { GUILD_MEMBER_UPDATE_TYPE } from './message/GUILD_MEMBER_UPDATE';
+import { INTERACTION_CREATE_TYPE } from './message/INTERACTION_CREATE';
+import { MESSAGE_CREATE_TYPE } from './message/MESSAGE_CREATE';
+import { MESSAGE_DELETE_TYPE } from './message/MESSAGE_DELETE';
+import { MESSAGE_REACTION_ADD_TYPE } from './message/MESSAGE_REACTION_ADD';
+import { MESSAGE_UPDATE_TYPE } from './message/MESSAGE_UPDATE';
+import { PRESENCE_UPDATE_TYPE } from './message/PRESENCE_UPDATE';
+import { READY_TYPE } from './message/READY';
+import { TYPING_START_TYPE } from './message/TYPING_START';
+import { VOICE_CHANNEL_STATUS_UPDATE_TYPE } from './message/VOICE_CHANNEL_STATUS_UPDATE';
+import { VOICE_STATE_UPDATE_TYPE } from './message/VOICE_STATE_UPDATE';
+export type DCEventMap = {
+    GUILD_CREATE: any;
+    GUILD_UPDATE: any;
+    GUILD_DELETE: any;
+    GUILD_ROLE_CREATE: any;
+    GUILD_ROLE_UPDATE: any;
+    GUILD_ROLE_DELETE: any;
+    CHANNEL_CREATE: any;
+    CHANNEL_UPDATE: CHANNEL_UPDATE_TYPE;
+    CHANNEL_DELETE: any;
+    CHANNEL_PINS_UPDATE: any;
+    CHANNEL_TOPIC_UPDATE: CHANNEL_TOPIC_UPDATE_TYPE;
+    THREAD_CREATE: any;
+    THREAD_UPDATE: any;
+    THREAD_DELETE: any;
+    THREAD_LIST_SYNC: any;
+    THREAD_MEMBER_UPDATE: any;
+    THREAD_MEMBERS_UPDATE: any;
+    STAGE_INSTANCE_CREATE: any;
+    STAGE_INSTANCE_UPDATE: any;
+    STAGE_INSTANCE_DELETE: any;
+    GUILD_MEMBER_ADD: GUILD_MEMBER_ADD_TYPE;
+    GUILD_MEMBER_UPDATE: GUILD_MEMBER_UPDATE_TYPE;
+    GUILD_MEMBER_REMOVE: GUILD_MEMBER_REMOVE_TYPE;
+    GUILD_AUDIT_LOG_ENTRY_CREATE: any;
+    GUILD_BAN_ADD: any;
+    GUILD_BAN_REMOVE: any;
+    GUILD_EMOJIS_UPDATE: any;
+    GUILD_STICKERS_UPDATE: any;
+    GUILD_SOUNDBOARD_SOUND_CREATE: any;
+    GUILD_SOUNDBOARD_SOUND_UPDATE: any;
+    GUILD_SOUNDBOARD_SOUND_DELETE: any;
+    GUILD_SOUNDBOARD_SOUNDS_UPDATE: any;
+    GUILD_INTEGRATIONS_UPDATE: any;
+    INTEGRATION_CREATE: any;
+    INTEGRATION_UPDATE: any;
+    INTEGRATION_DELETE: any;
+    WEBHOOKS_UPDATE: any;
+    INVITE_CREATE: any;
+    INVITE_DELETE: any;
+    VOICE_STATE_UPDATE: VOICE_STATE_UPDATE_TYPE;
+    VOICE_CHANNEL_STATUS_UPDATE: VOICE_CHANNEL_STATUS_UPDATE_TYPE;
+    VOICE_CHANNEL_EFFECT_SEND: any;
+    PRESENCE_UPDATE: PRESENCE_UPDATE_TYPE;
+    MESSAGE_CREATE: MESSAGE_CREATE_TYPE;
+    MESSAGE_UPDATE: MESSAGE_UPDATE_TYPE;
+    MESSAGE_DELETE: MESSAGE_DELETE_TYPE;
+    MESSAGE_DELETE_BULK: any;
+    MESSAGE_REACTION_ADD: MESSAGE_REACTION_ADD_TYPE;
+    MESSAGE_REACTION_REMOVE: any;
+    MESSAGE_REACTION_REMOVE_ALL: any;
+    MESSAGE_REACTION_REMOVE_EMOJI: any;
+    TYPING_START: TYPING_START_TYPE;
+    DIRECT_MESSAGE_CREATE: any;
+    DIRECT_MESSAGE_UPDATE: any;
+    DIRECT_MESSAGE_DELETE: any;
+    DIRECT_MESSAGE_PINS_UPDATE: any;
+    DIRECT_MESSAGE_REACTION_ADD: any;
+    DIRECT_MESSAGE_REACTION_REMOVE: any;
+    DIRECT_MESSAGE_REACTION_REMOVE_ALL: any;
+    DIRECT_MESSAGE_REACTION_REMOVE_EMOJI: any;
+    DIRECT_MESSAGE_TYPING_START: any;
+    GUILD_SCHEDULED_EVENT_CREATE: any;
+    GUILD_SCHEDULED_EVENT_UPDATE: any;
+    GUILD_SCHEDULED_EVENT_DELETE: any;
+    GUILD_SCHEDULED_EVENT_USER_ADD: any;
+    GUILD_SCHEDULED_EVENT_USER_REMOVE: any;
+    AUTO_MODERATION_RULE_CREATE: any;
+    AUTO_MODERATION_RULE_UPDATE: any;
+    AUTO_MODERATION_RULE_DELETE: any;
+    AUTO_MODERATION_ACTION_EXECUTION: any;
+    MESSAGE_POLL_VOTE_ADD: any;
+    MESSAGE_POLL_VOTE_REMOVE: any;
+    DIRECT_MESSAGE_POLL_VOTE_ADD: any;
+    DIRECT_MESSAGE_POLL_VOTE_REMOVE: any;
+    READY: READY_TYPE;
+    INTERACTION_CREATE: INTERACTION_CREATE_TYPE;
+};

package/lib/sdk/message.js

@@ -0,0 +1 @@
+

package/lib/sdk/types.d.ts

@@ -0,0 +1,2 @@
+export declare const AvailableIntentsEventsEnum: string[];
+export type DCIntentsEnum = (typeof AvailableIntentsEventsEnum)[number];

package/lib/sdk/types.js

@@ -0,0 +1,25 @@
+const AvailableIntentsEventsEnum = [
+    'GUILDS',
+    'GUILD_MEMBERS',
+    'GUILD_MODERATION',
+    'GUILD_EXPRESSIONS',
+    'GUILD_INTEGRATIONS',
+    'GUILD_WEBHOOKS',
+    'GUILD_INVITES',
+    'GUILD_VOICE_STATES',
+    'GUILD_PRESENCES',
+    'GUILD_MESSAGES',
+    'GUILD_MESSAGE_REACTIONS',
+    'GUILD_MESSAGE_TYPING',
+    'DIRECT_MESSAGES',
+    'DIRECT_MESSAGE_REACTIONS',
+    'DIRECT_MESSAGE_TYPING',
+    'MESSAGE_CONTENT',
+    'GUILD_SCHEDULED_EVENTS',
+    'AUTO_MODERATION_CONFIGURATION',
+    'AUTO_MODERATION_EXECUTION',
+    'GUILD_MESSAGE_POLLS',
+    'DIRECT_MESSAGE_POLLS'
+];
+
+export { AvailableIntentsEventsEnum };

package/lib/sdk/typings.d.ts

@@ -1,6 +1,3 @@
-/**
- * buttons start
- */
 type ComponentButton = {
     type: number;
     style: 2;
@@ -15,12 +12,6 @@ type ComponentButtons = {
     type: 1;
     components: ComponentButton[];
 };
-/**
- * buttons end
- */
-/**
- * select start
- */
 type ComponentSelectsOption = {
     label: string;
     value: string;
@@ -64,12 +55,6 @@ type ComponentSelects = {
     type: 1;
     components: (ComponentSelect | ComponentUserSelect | ComponentRuleSelect | ComponentMentionSelect | ComponentChannelSelect)[];
 };
-/**
- * select end
- */
-/**
- * input start
- */
 type ComponentInput = {
     id?: number;
     type: 4;
@@ -89,12 +74,6 @@ type ComponentModal = {
         components: ComponentInput[];
     }[];
 };
-/**
- * input end
- */
-/**
- * section start
- */
 type ComponentText = {
     type: 10;
     content: string;
@@ -109,9 +88,6 @@ type ComponentSection = {
         };
     };
 };
-/**
- * section end
- */
 type ComponentMedia = {
     type: 12;
     items: {
@@ -137,12 +113,9 @@ type ComponentContainer = {
     accent_color: number;
     components: (ComponentButtons | ComponentSelects | ComponentMedia | ComponentFile | ComponentText | ComponentSection | ComponentSeparator)[];
 };
-type MessageData = {
+export type MessageData = {
     content?: string;
     tts?: boolean;
-    /**
-     * 嵌入
-     */
     embeds?: {
         title?: string;
         type?: string;
@@ -191,9 +164,6 @@ type MessageData = {
     }[];
     allowed_mentions?: any;
     message_reference?: any;
-    /**
-     * 组件
-     */
     components?: (ComponentButtons | ComponentSelects | ComponentModal | ComponentMedia | ComponentFile | ComponentText | ComponentSection | ComponentSeparator | ComponentContainer)[];
     sticker_ids?: any;
     files?: any[];
@@ -217,5 +187,4 @@ type MessageData = {
     enforce_nonce?: boolean;
     poll?: any;
 };
-
-export type { MessageData };
+export {};

package/lib/sdk/typings.js

@@ -0,0 +1 @@
+

package/lib/sdk/wss.d.ts

@@ -0,0 +1,8 @@
+import { DCAPI } from './api.js';
+import { DCEventMap } from './message.js';
+export declare class DCClient extends DCAPI {
+    #private;
+    constructor();
+    on<T extends keyof DCEventMap>(key: T, val: (event: DCEventMap[T]) => any): this;
+    connect(): Promise<void>;
+}

package/lib/sdk/wss.js

@@ -1,7 +1,10 @@
 import WebSocket from 'ws';
 import { DCAPI } from './api.js';
 import { getIntents } from './intents.js';
-import { getDiscordConfigValue } from '../config.js';
+import { getDiscordConfig } from '../config.js';
+import { HttpsProxyAgent } from 'https-proxy-agent';
+import { AvailableIntentsEventsEnum } from './types.js';
+import dayjs from 'dayjs';
 
 class DCClient extends DCAPI {
     #heartbeat_interval = 0;
@@ -10,24 +13,21 @@ class DCClient extends DCAPI {
     #timeout_id = null;
     #seq = null;
     #ws;
+    #count = 0;
+    #events = {};
     constructor() {
         super();
         return this;
     }
-    /**
-     * 连接确认
-     * @returns
-     */
     #aut() {
-        const value = getDiscordConfigValue();
+        const value = getDiscordConfig();
         const token = value.token;
-        const intent = value.intent || [];
+        const intent = value.intent || AvailableIntentsEventsEnum;
         const shard = value.shard || [0, 1];
         return {
             op: 2,
             d: {
                 shard: shard,
-                // 验证token
                 token: `Bot ${token}`,
                 intents: getIntents(intent),
                 properties: {
@@ -38,142 +38,119 @@ class DCClient extends DCAPI {
             }
         };
     }
-    #events = {};
-    /**
-     * 注册事件处理程序
-     * @param key 事件名称
-     * @param val 事件处理函数
-     */
+    #getReConnectTime() {
+        const time = this.#count > 3 ? 1000 * 6 : 1000 * 1;
+        const curTime = this.#count > 6 ? 1000 * this.#count * 2 : time;
+        logger.info(`[ws-discord] 等待 ${dayjs(curTime).format('mm:ss')} 后重新连接`);
+        return curTime;
+    }
     on(key, val) {
         this.#events[key] = val;
         return this;
     }
-    /**
-     * 创建ws监听
-     * @param conversation
-     * @param shard
-     * @returns
-     */
     async connect() {
-        const value = getDiscordConfigValue();
+        this.#count++;
+        const value = getDiscordConfig();
         const gatewayURL = value.gatewayURL;
-        // 清除序列号
         this.#seq = null;
-        // 清除心跳
         clearTimeout(this.#timeout_id);
-        // 获取网关
-        const url = gatewayURL ??
-            (await this.gateway()
+        const gateway = async () => {
+            if (gatewayURL) {
+                return gatewayURL;
+            }
+            const currentGateway = await this.gateway()
                 .then(res => res?.url)
-                .catch(err => {
-                if (this.#events['ERROR'])
-                    this.#events['ERROR'](err?.message ?? err);
-            }));
-        // 没有网关
-        if (!url) {
-            console.error('[ws] 无法获取网关');
-            return;
-        }
-        /**
-         * 心跳恢复
-         */
-        const call = async () => {
-            this.#ws.send(JSON.stringify({
-                op: 1, //  op = 1
-                d: this.#seq // 如果是第一次连接，传null
-            }));
-            // 确保清除
-            clearTimeout(this.#timeout_id);
-            // 开始心跳
-            this.#timeout_id = setTimeout(call, this.#heartbeat_interval);
+                .catch(() => null);
+            return currentGateway;
         };
-        const map = {
-            /**
-             * 事件接收到
-             * @param param0
-             */
-            0: async ({ d, t, s }) => {
-                if (s) {
-                    // 序列号
-                    this.#seq = s;
-                }
-                // 准备
-                if (t == 'READY') {
-                    if (d?.resume_gateway_url) {
-                        this.#gateway_url = d?.resume_gateway_url;
-                        console.log('[ws] gateway_url', this.#gateway_url);
-                    }
-                    if (d?.session_id) {
-                        this.#session_id = d?.session_id;
-                        console.log('[ws] session_id', this.#session_id);
+        try {
+            const url = gatewayURL ?? (await gateway());
+            if (!url) {
+                logger.error('[ws-discord] 获取网关失败～');
+                const curTime = this.#getReConnectTime();
+                setTimeout(() => {
+                    void this.connect();
+                }, curTime);
+                return;
+            }
+            const call = () => {
+                this.#ws.send(JSON.stringify({
+                    op: 1,
+                    d: this.#seq
+                }));
+                clearTimeout(this.#timeout_id);
+                this.#timeout_id = setTimeout(call, this.#heartbeat_interval);
+            };
+            const map = {
+                0: ({ d, t, s }) => {
+                    if (s) {
+                        this.#seq = s;
                     }
-                }
-                // 事件处理
-                if (this.#events[t]) {
-                    try {
-                        await this.#events[t](d);
+                    if (t === 'READY') {
+                        if (d?.resume_gateway_url) {
+                            this.#gateway_url = d?.resume_gateway_url;
+                            logger.info('[ws-discord] gateway_url', this.#gateway_url);
+                        }
+                        if (d?.session_id) {
+                            this.#session_id = d?.session_id;
+                            logger.info('[ws-discord] session_id', this.#session_id);
+                        }
                     }
-                    catch (err) {
-                        if (this.#events['ERROR'])
-                            this.#events['ERROR'](err);
+                    if (this.#events[t]) {
+                        try {
+                            this.#events[t](d);
+                        }
+                        catch (err) {
+                            logger.error('[ws-discord] 事件处理错误', err);
+                        }
                     }
+                },
+                7: () => {
+                    logger.info('[ws-discord] 重新连接');
+                    clearTimeout(this.#timeout_id);
+                    this.#ws.close();
+                },
+                9: ({ d }) => {
+                    logger.error('[ws-discord] 无效会话', d);
+                },
+                10: ({ d }) => {
+                    this.#heartbeat_interval = d.heartbeat_interval;
+                    call();
+                    this.#ws.send(JSON.stringify(this.#aut()));
+                },
+                11: () => {
+                    logger.debug('[ws-discord] 心跳确认');
                 }
-                //
-            },
-            /**
-             * 重新连接
-             */
-            7: () => {
-                console.info('[ws] 重新连接');
-                // this.#ws.send(JSON.stringify(this.#reAut()))
-            },
-            /**
-             * 无效会话
-             * @param message
-             */
-            9: ({ d }) => {
-                console.error('[ws] 无效会话 ', d);
-            },
-            /**
-             * 你好
-             * @param param0
-             */
-            10: ({ d }) => {
-                // 得到心跳间隔
-                this.#heartbeat_interval = d.heartbeat_interval;
-                // 开始心跳
-                call();
-                // 开启会话
-                this.#ws.send(JSON.stringify(this.#aut()));
-            },
-            /**
-             * 心跳确认
-             */
-            11: () => {
-                console.info('[ws] 心跳确认');
+            };
+            const ClientOptions = value.websocket_options || {};
+            if (value.websocket_proxy) {
+                ClientOptions.agent = new HttpsProxyAgent(value.websocket_proxy);
             }
-        };
-        this.#ws = new WebSocket(`${url}?v=10&encoding=json`);
-        this.#ws.on('open', async () => {
-            console.info('[ws] open');
-        });
-        // 消息
-        this.#ws.on('message', data => {
-            const message = JSON.parse(data.toString());
-            if (map[message.op])
-                map[message.op](message);
-        });
-        // 关闭
-        this.#ws.on('close', err => {
-            console.error('[ws] 连接已关闭', err);
-            console.log('[ws] 等待重连');
-            this.connect();
-        });
-        // 出错
-        this.#ws.on('error', err => {
-            console.error('[ws] error:', err);
-        });
-        ///
+            this.#ws = new WebSocket(`${url}?v=10&encoding=json`, ClientOptions);
+            this.#ws.on('open', () => {
+                logger.info('[ws-discord] 打开连接');
+                this.#count = 0;
+            });
+            this.#ws.on('message', data => {
+                const message = JSON.parse(data.toString());
+                if (map[message.op]) {
+                    map[message.op](message);
+                }
+            });
+            this.#ws.on('close', err => {
+                logger.info('[ws-discord] 连接关闭', err);
+                const curTime = this.#getReConnectTime();
+                setTimeout(() => {
+                    void this.connect();
+                }, curTime);
+            });
+            this.#ws.on('error', err => {
+                logger.error('[ws-discord] 出错', err?.message || err);
+            });
+        }
+        catch (err) {
+            logger.error('[ws-discord] 内部错误', err);
+        }
     }
 }
 

package/lib/sdk/wss.types.d.ts

@@ -0,0 +1,7 @@
+import { DCIntentsEnum } from './types.js';
+export interface DISOCRDOptions {
+    gatewayURL?: string;
+    token: string;
+    intent?: DCIntentsEnum[];
+    shard?: number[];
+}

package/lib/sdk/wss.types.js

@@ -0,0 +1 @@
+