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

package/lib/sdk/api.js

@@ -1,23 +1,62 @@
 import FormData from 'form-data';
 import axios from 'axios';
-import { config } from './config.js';
-import { createPicFrom } from './core/from.js';
+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';
 
+/**
+ * 创建form
+ * @param image
+ * @param name
+ * @returns
+ */
+async function createPicFrom(image, name = 'image.jpg') {
+    let picData;
+    // 是 string
+    if (typeof image === 'string') {
+        if (!existsSync(image))
+            return false;
+        if (!name)
+            name = basename(image);
+        picData = createReadStream(image);
+        // 是 buffer
+    }
+    else if (Buffer.isBuffer(image)) {
+        if (!name)
+            name = 'file.' + (await fileTypeFromBuffer(image)).ext;
+        picData = new Readable();
+        picData.push(image);
+        picData.push(null);
+        // 是 文件流
+    }
+    else if (isReadable(image)) {
+        if (!name)
+            name = 'file.' + (await fileTypeFromStream(image)).ext;
+        picData = image;
+    }
+    else {
+        return false;
+    }
+    return { picData, image, name };
+}
+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 = getDiscordConfigValue();
+        const token = value.token;
         const service = axios.create({
-            baseURL: this.API_URL,
+            baseURL: API_URL,
             timeout: 6000,
             headers: {
                 'Content-Type': 'application/json',
@@ -32,9 +71,10 @@ class DCAPI {
      * @returns
      */
     requestCDN(options) {
-        const token = config.get('token');
+        const value = getDiscordConfigValue();
+        const token = value.token;
         const service = axios.create({
-            baseURL: this.CDB_URL,
+            baseURL: CDB_URL,
             timeout: 6000,
             headers: {
                 'Content-Type': 'application/json',
@@ -50,7 +90,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 +112,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`,
@@ -1571,4 +1597,4 @@ class DCAPI {
     }
 }
 
-export { DCAPI };
+export { API_URL, CDB_URL, DCAPI };

package/lib/sdk/typings.d.ts

@@ -0,0 +1,221 @@
+/**
+ * buttons start
+ */
+type ComponentButton = {
+    type: number;
+    style: 2;
+    label?: string;
+    emoji?: any;
+    custom_id?: string;
+    sku_id?: any;
+    url?: string;
+    disabled?: boolean;
+};
+type ComponentButtons = {
+    type: 1;
+    components: ComponentButton[];
+};
+/**
+ * buttons end
+ */
+/**
+ * select start
+ */
+type ComponentSelectsOption = {
+    label: string;
+    value: string;
+    description?: string;
+    emoji?: {
+        name?: string;
+        id?: string;
+    };
+};
+type ComponentChannelSelect = {
+    type: 8;
+    custom_id: string;
+    placeholder?: string;
+    channel_types?: number[];
+};
+type ComponentMentionSelect = {
+    type: 7;
+    custom_id: string;
+    placeholder?: string;
+};
+type ComponentRuleSelect = {
+    type: 6;
+    custom_id: string;
+    placeholder?: string;
+    max_values?: number;
+    min_values?: number;
+};
+type ComponentUserSelect = {
+    type: 5;
+    custom_id: string;
+    placeholder?: string;
+};
+type ComponentSelect = {
+    type: 3;
+    custom_id: string;
+    max_values?: number;
+    min_values?: number;
+    options: ComponentSelectsOption[];
+};
+type ComponentSelects = {
+    type: 1;
+    components: (ComponentSelect | ComponentUserSelect | ComponentRuleSelect | ComponentMentionSelect | ComponentChannelSelect)[];
+};
+/**
+ * select end
+ */
+/**
+ * input start
+ */
+type ComponentInput = {
+    id?: number;
+    type: 4;
+    custom_id: string;
+    label: string;
+    style: number;
+    min_length?: number;
+    max_length?: number;
+    placeholder?: string;
+    required?: boolean;
+};
+type ComponentModal = {
+    title: string;
+    custom_id: string;
+    components: {
+        type: 1;
+        components: ComponentInput[];
+    }[];
+};
+/**
+ * input end
+ */
+/**
+ * section start
+ */
+type ComponentText = {
+    type: 10;
+    content: string;
+};
+type ComponentSection = {
+    type: 9;
+    components: ComponentText[];
+    accessory?: {
+        type: 11;
+        media: {
+            url: string;
+        };
+    };
+};
+/**
+ * section end
+ */
+type ComponentMedia = {
+    type: 12;
+    items: {
+        media: {
+            url: string;
+        };
+        description?: string;
+    }[];
+};
+type ComponentFile = {
+    type: 13;
+    file: {
+        url: string;
+    };
+};
+type ComponentSeparator = {
+    type: 14;
+    divider: boolean;
+    spacing: number;
+};
+type ComponentContainer = {
+    type: 17;
+    accent_color: number;
+    components: (ComponentButtons | ComponentSelects | ComponentMedia | ComponentFile | ComponentText | ComponentSection | ComponentSeparator)[];
+};
+type MessageData = {
+    content?: string;
+    tts?: boolean;
+    /**
+     * 嵌入
+     */
+    embeds?: {
+        title?: string;
+        type?: string;
+        description?: string;
+        url?: string;
+        timestamp?: string;
+        color?: number;
+        footer?: {
+            text: string;
+            icon_url?: string;
+            proxy_icon_url?: string;
+        };
+        image?: {
+            url: string;
+            proxy_url?: string;
+            height?: number;
+            width?: number;
+        };
+        thumbnail?: {
+            url: string;
+            proxy_url?: string;
+            height?: number;
+            width?: number;
+        };
+        video?: {
+            url: string;
+            proxy_url?: string;
+            height?: number;
+            width?: number;
+        };
+        provider?: {
+            name: string;
+            url: string;
+        };
+        author?: {
+            name: string;
+            url?: string;
+            icon_url?: string;
+            proxy_icon_url?: string;
+        };
+        fields?: {
+            name: string;
+            value: string;
+            inline?: boolean;
+        }[];
+    }[];
+    allowed_mentions?: any;
+    message_reference?: any;
+    /**
+     * 组件
+     */
+    components?: (ComponentButtons | ComponentSelects | ComponentModal | ComponentMedia | ComponentFile | ComponentText | ComponentSection | ComponentSeparator | ComponentContainer)[];
+    sticker_ids?: any;
+    files?: any[];
+    payload_json?: string;
+    attachments?: {
+        id: string;
+        filename: string;
+        description?: string;
+        content_type?: string;
+        size: number;
+        url: string;
+        proxy_url?: string;
+        height?: number;
+        width?: number;
+        ephemeral?: boolean;
+        duration_secs?: number;
+        waveform?: string;
+        flags?: number;
+    }[];
+    flags?: number;
+    enforce_nonce?: boolean;
+    poll?: any;
+};
+
+export type { MessageData };

package/lib/sdk/wss.js

@@ -1,7 +1,7 @@
 import WebSocket from 'ws';
 import { DCAPI } from './api.js';
-import { config } from './config.js';
 import { getIntents } from './intents.js';
+import { getDiscordConfigValue } from '../config.js';
 
 class DCClient extends DCAPI {
     #heartbeat_interval = 0;
@@ -10,16 +10,8 @@ class DCClient extends DCAPI {
     #timeout_id = null;
     #seq = null;
     #ws;
-    /**
-     * 设置配置
-     * @param opstion
-     */
-    constructor(opstion) {
+    constructor() {
         super();
-        config.set('intent', opstion.intent);
-        config.set('shard', opstion.shard);
-        config.set('token', opstion.token);
-        config.set('gatewayURL', opstion.gatewayURL);
         return this;
     }
     /**
@@ -27,9 +19,10 @@ class DCClient extends DCAPI {
      * @returns
      */
     #aut() {
-        const token = config.get('token');
-        const intent = config.get('intent');
-        const shard = config.get('shard');
+        const value = getDiscordConfigValue();
+        const token = value.token;
+        const intent = value.intent || [];
+        const shard = value.shard || [0, 1];
         return {
             op: 2,
             d: {
@@ -45,24 +38,6 @@ class DCClient extends DCAPI {
             }
         };
     }
-    /**
-     * 重新确认
-     */
-    // #reAut() {
-    //   const token = config.get('token')
-    //   const c = {
-    //     op: 6,
-    //     d: {
-    //       // 会话token
-    //       token: token,
-    //       session_id: this.#session_id,
-    //       // 收到的最后一个序列号
-    //       seq: this.#seq
-    //     }
-    //   }
-    //   console.log('[ws] c', c)
-    //   return c
-    // }
     #events = {};
     /**
      * 注册事件处理程序
@@ -79,7 +54,9 @@ class DCClient extends DCAPI {
      * @param shard
      * @returns
      */
-    async connect(gatewayURL) {
+    async connect() {
+        const value = getDiscordConfigValue();
+        const gatewayURL = value.gatewayURL;
         // 清除序列号
         this.#seq = null;
         // 清除心跳
@@ -131,11 +108,6 @@ class DCClient extends DCAPI {
                         console.log('[ws] session_id', this.#session_id);
                     }
                 }
-                // const events = ['PRESENCE_UPDATE','TYPING_START']
-                // if (!events.includes(t)) {
-                //     console.log("t", t)
-                //     console.log("d", d)
-                // }
                 // 事件处理
                 if (this.#events[t]) {
                     try {

package/lib/send.js

@@ -1,3 +1,4 @@
+import { createResult, ResultCode } from 'alemonjs';
 import { readFileSync } from 'fs';
 
 const ImageURLToBuffer = async (url) => {
@@ -29,97 +30,101 @@ const createButtonsData = (rows) => {
     });
 };
 const sendchannel = async (client, param, val) => {
-    if (val.length < 0)
-        return [];
-    const channel_id = param?.channel_id ?? '';
-    // images
-    const images = val.filter(item => item.type == 'Image' || item.type == 'ImageURL' || item.type == 'ImageFile');
-    // buttons
-    const buttons = val.filter(item => item.type == 'BT.group');
-    // text
-    const content = val
-        .filter(item => item.type == 'Mention' || item.type == 'Text' || item.type == 'Link')
-        .map(item => {
-        if (item.type == 'Link') {
-            return `[${item.value}](${item?.options?.link ?? item.value})`;
-        }
-        else if (item.type == 'Mention') {
-            if (item.value == 'everyone' ||
-                item.value == 'all' ||
-                item.value == '' ||
-                typeof item.value != 'string') {
-                return `<@everyone>`;
-            }
-            if (item.options?.belong == 'user') {
-                return `<@${item.value}>`;
-            }
-            else if (item.options?.belong == 'channel') {
-                return `<#${item.value}>`;
-            }
-            return '';
-        }
-        else if (item.type == 'Text') {
-            if (item.options?.style == 'block') {
-                return `\`${item.value}\``;
+    try {
+        if (val.length < 0)
+            return [];
+        const channel_id = param?.channel_id ?? '';
+        // images
+        const images = val.filter(item => item.type == 'Image' || item.type == 'ImageURL' || item.type == 'ImageFile');
+        // buttons
+        const buttons = val.filter(item => item.type == 'BT.group');
+        // text
+        const content = val
+            .filter(item => item.type == 'Mention' || item.type == 'Text' || item.type == 'Link')
+            .map(item => {
+            if (item.type == 'Link') {
+                return `[${item.value}](${item?.options?.link ?? item.value})`;
             }
-            else if (item.options?.style == 'italic') {
-                return `*${item.value}*`;
+            else if (item.type == 'Mention') {
+                if (item.value == 'everyone' ||
+                    item.value == 'all' ||
+                    item.value == '' ||
+                    typeof item.value != 'string') {
+                    return `<@everyone>`;
+                }
+                if (item.options?.belong == 'user') {
+                    return `<@${item.value}>`;
+                }
+                else if (item.options?.belong == 'channel') {
+                    return `<#${item.value}>`;
+                }
+                return '';
             }
-            else if (item.options?.style == 'bold') {
-                return `**${item.value}**`;
+            else if (item.type == 'Text') {
+                if (item.options?.style == 'block') {
+                    return `\`${item.value}\``;
+                }
+                else if (item.options?.style == 'italic') {
+                    return `*${item.value}*`;
+                }
+                else if (item.options?.style == 'bold') {
+                    return `**${item.value}**`;
+                }
+                else if (item.options?.style == 'strikethrough') {
+                    return `~~${item.value}~~`;
+                }
+                return item.value;
             }
-            else if (item.options?.style == 'strikethrough') {
-                return `~~${item.value}~~`;
+        })
+            .join('');
+        if (images.length > 0) {
+            let bufferData = null;
+            for (let i = 0; i < images.length; i++) {
+                if (bufferData)
+                    break;
+                const item = images[i];
+                if (item.type == 'Image') {
+                    bufferData = Buffer.from(item.value, 'base64');
+                }
+                else if (item.type == 'ImageURL') {
+                    const res = await ImageURLToBuffer(item.value);
+                    bufferData = res;
+                }
+                else if (item.type == 'ImageFile') {
+                    bufferData = readFileSync(item.value);
+                }
             }
-            return item.value;
+            const res = await client.channelsMessagesForm(channel_id, {
+                content: content
+            }, bufferData);
+            return [createResult(ResultCode.Ok, '完成', {})];
         }
-    })
-        .join('');
-    if (images.length > 0) {
-        let isText = false;
-        return Promise.all(images.map(async (item) => {
-            // content
-            let text = null;
-            if (!isText) {
-                text = content;
-            }
-            isText = true;
-            if (item.type == 'Image') {
-                return client.channelsMessagesImage(channel_id, Buffer.from(item.value, 'base64'), {
-                    content: text
-                });
-            }
-            else if (item.type == 'ImageURL') {
-                return client.channelsMessagesImage(channel_id, await ImageURLToBuffer(item.value), {
-                    content: text
-                });
-            }
-            else if (item.type == 'ImageFile') {
-                const data = readFileSync(item.value);
-                return client.channelsMessagesImage(channel_id, data, { content: text });
-            }
-        }));
-    }
-    if (buttons && buttons.length > 0) {
-        return Promise.all(buttons.map(async (item) => {
-            const rows = item.value;
-            // 构造成按钮
-            const data = createButtonsData(rows);
-            const res = await client.channelsMessages(channel_id, {
+        if (buttons && buttons.length > 0) {
+            let components = null;
+            buttons.forEach(item => {
+                if (components)
+                    return;
+                const rows = item.value;
+                // 构造成按钮
+                components = createButtonsData(rows);
+            });
+            const res = await client.channelsMessagesForm(channel_id, {
                 content: content,
-                components: data
+                components: components
+            });
+            return [createResult(ResultCode.Ok, '完成', {})];
+        }
+        if (content) {
+            const res = await client.channelsMessagesForm(channel_id, {
+                content: content
             });
-            return {
-                id: res.id
-            };
-        }));
+            return [createResult(ResultCode.Ok, '完成', {})];
+        }
+        return [];
     }
-    if (content) {
-        return Promise.all([content].map(item => client.channelsMessages(channel_id, {
-            content: item
-        })));
+    catch (err) {
+        return [createResult(ResultCode.Fail, err?.response?.data ?? err?.message ?? err, null)];
     }
-    return Promise.all([]);
 };
 const senduser = async (client, param, val) => {
     if (val.length < 0)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/discord",
-  "version": "2.1.0-alpha.5",
+  "version": "2.1.0-alpha.8",
   "description": "阿柠檬discord平台连接",
   "author": "lemonade",
   "license": "MIT",