@alemonjs/discord 2.1.0-alpha.0 → 2.1.0-alpha.12

package/lib/sdk/api.js

@@ -1,23 +1,30 @@
 import FormData from 'form-data';
 import axios from 'axios';
-import { config } from './config.js';
-import { createPicFrom } from './core/from.js';
+import { getDiscordConfig } from '../config.js';
+import { HttpsProxyAgent } from 'https-proxy-agent';
+import { createPicFrom } from './createPicFrom.js';
 
+const API_URL = 'https://discord.com/api/v10';
+const CDB_URL = 'https://cdn.discordapp.com';
 /**
  * api接口
  */
 class DCAPI {
-    API_URL = 'https://discord.com/api/v10';
-    CDB_URL = 'https://cdn.discordapp.com';
     /**
      * 基础请求
      * @param opstion
      * @returns
      */
     request(options) {
-        const token = config.get('token');
+        const value = getDiscordConfig();
+        const token = value.token;
+        const requestConfig = value.request_config || {};
+        if (value.request_proxy) {
+            requestConfig.httpsAgent = new HttpsProxyAgent(value.request_proxy);
+        }
         const service = axios.create({
-            baseURL: this.API_URL,
+            ...requestConfig,
+            baseURL: API_URL,
             timeout: 6000,
             headers: {
                 'Content-Type': 'application/json',
@@ -32,16 +39,10 @@ class DCAPI {
      * @returns
      */
     requestCDN(options) {
-        const token = config.get('token');
-        const service = axios.create({
-            baseURL: this.CDB_URL,
-            timeout: 6000,
-            headers: {
-                'Content-Type': 'application/json',
-                'Authorization': `Bot ${token}`
-            }
+        return this.request({
+            baseURL: CDB_URL,
+            ...options
         });
-        return service(options);
     }
     /**
      * 创建用户url地址
@@ -50,7 +51,7 @@ class DCAPI {
      * @returns
      */
     userAvatar(user_id, avatar_hash) {
-        return `${this.CDB_URL}/avatars/${user_id}/${avatar_hash}.png`;
+        return `${CDB_URL}/avatars/${user_id}/${avatar_hash}.png`;
     }
     /**
      *
@@ -72,34 +73,20 @@ class DCAPI {
      * @param headers
      * @returns
      */
-    async channelsMessages(channel_id, data, headers) {
-        return this.request({
-            url: `channels/${channel_id}/messages`,
-            method: 'post',
-            headers: headers,
-            data
-        }).then(res => res?.data);
-    }
-    /**
-     *
-     * @param channel_id
-     * @param img
-     * @returns
-     */
-    async channelsMessagesImage(channel_id, img, param) {
-        const from = await createPicFrom(img);
-        if (!from)
-            return;
-        const { picData, name } = from;
+    async channelsMessagesForm(channel_id, param = {}, img) {
         const formData = new FormData();
-        if (param) {
-            for (const key in param) {
-                if (param[key]) {
-                    formData.append(key, param[key]);
-                }
+        for (const key in param) {
+            if (param[key]) {
+                formData.append(key, param[key]);
+            }
+        }
+        if (img) {
+            const from = await createPicFrom(img);
+            if (from) {
+                const { picData, name } = from;
+                formData.append('file', picData, name);
             }
         }
-        formData.append('file', picData, name);
         return this.request({
             method: 'post',
             url: `channels/${channel_id}/messages`,
@@ -107,7 +94,7 @@ class DCAPI {
             headers: {
                 'Content-Type': 'multipart/form-data'
             }
-        });
+        }).then(res => res.data);
     }
     /**
      * ************
@@ -1571,4 +1558,4 @@ class DCAPI {
     }
 }
 
-export { DCAPI };
+export { API_URL, CDB_URL, DCAPI };

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

@@ -1,126 +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
+    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: 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
-}
+    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[]
-}
+    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
-}
+    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
+    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
+    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
-}
+    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
+    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 }
+export type { INTERACTION_CREATE_TYPE };

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

@@ -3,57 +3,57 @@
  * @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
-}
+    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 }
+export type { MESSAGE_CREATE_TYPE };

package/lib/sdk/types.d.ts

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