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

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,8 @@
 import WebSocket from 'ws';
 import { DCAPI } from './api.js';
-import { config } from './config.js';
 import { getIntents } from './intents.js';
+import { getDiscordConfig } from '../config.js';
+import { HttpsProxyAgent } from 'https-proxy-agent';
 
 class DCClient extends DCAPI {
     #heartbeat_interval = 0;
@@ -10,16 +11,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 +20,10 @@ class DCClient extends DCAPI {
      * @returns
      */
     #aut() {
-        const token = config.get('token');
-        const intent = config.get('intent');
-        const shard = config.get('shard');
+        const value = getDiscordConfig();
+        const token = value.token;
+        const intent = value.intent || [];
+        const shard = value.shard || [0, 1];
         return {
             op: 2,
             d: {
@@ -45,24 +39,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 +55,9 @@ class DCClient extends DCAPI {
      * @param shard
      * @returns
      */
-    async connect(gatewayURL) {
+    async connect() {
+        const value = getDiscordConfig();
+        const gatewayURL = value.gatewayURL;
         // 清除序列号
         this.#seq = null;
         // 清除心跳
@@ -131,11 +109,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 {
@@ -181,7 +154,11 @@ class DCClient extends DCAPI {
                 console.info('[ws] 心跳确认');
             }
         };
-        this.#ws = new WebSocket(`${url}?v=10&encoding=json`);
+        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`, ClientOptions);
         this.#ws.on('open', async () => {
             console.info('[ws] open');
         });

package/lib/send.js

@@ -29,98 +29,182 @@ const createButtonsData = (rows) => {
         };
     });
 };
-const sendchannel = (client, param, val) => {
-    if (val.length < 0)
-        return Promise.all([]);
-    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}\``;
+const sendchannel = async (client, param, val) => {
+    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');
+        // markdown
+        const mds = val.filter(item => item.type == 'Markdown');
+        // 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, '完成', res)];
         }
-    })
-        .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, item.value, { 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, {
-                content: content,
-                components: data
+        // discord 的 md。会替代掉 content
+        let contentMd = '';
+        if (mds && mds.length > 0) {
+            mds.forEach(item => {
+                if (item.type == 'Markdown') {
+                    const md = item.value;
+                    md.forEach(line => {
+                        if (line.type == 'MD.text') {
+                            // 普通文本
+                            contentMd += line.value;
+                        }
+                        else if (line.type === 'MD.blockquote') {
+                            // 引用
+                            contentMd += `> ${line.value}\n`;
+                        }
+                        else if (line.type === 'MD.bold') {
+                            // 粗体
+                            contentMd += `**${line.value}**`;
+                        }
+                        else if (line.type === 'MD.italic') {
+                            // 斜体
+                            contentMd += `*${line.value}*`;
+                        }
+                        else if (line.type === 'MD.divider') {
+                            // 分割线
+                            contentMd += `---\n`;
+                        }
+                        else if (line.type === 'MD.image') {
+                            // 图片
+                            contentMd += `![${line.value}](${line.value})`;
+                        }
+                        else if (line.type === 'MD.italicStar') {
+                            // 星号斜体
+                            contentMd += `*${line.value}*`;
+                        }
+                        else if (line.type === 'MD.link') {
+                            // 链接
+                            contentMd += `[${line.value}](${line.value})`;
+                        }
+                        else if (line.type === 'MD.list') {
+                            const listStr = line.value.map(listItem => {
+                                // 有序
+                                if (typeof listItem.value === 'object') {
+                                    return `\n${listItem.value.index}. ${listItem.value.text}`;
+                                }
+                                return `\n- ${listItem.value}`;
+                            });
+                            contentMd += `${listStr}\n`;
+                        }
+                        else if (line.type === 'MD.newline') {
+                            // 换行
+                            contentMd += `\n`;
+                        }
+                        else if (line.type === 'MD.strikethrough') {
+                            // 删除线
+                            contentMd += `~~${line.value}~~`;
+                        }
+                        else if (line.type === 'MD.subtitle') {
+                            // 副标题
+                            contentMd += `## ${line.value}\n`;
+                        }
+                        else if (line.type === 'MD.title') {
+                            // 标题
+                            contentMd += `# ${line.value}\n`;
+                        }
+                        else if (line.type === 'MD.code') {
+                            // 代码块
+                            const language = line?.options?.language || '';
+                            contentMd += `\`\`\`${language}\n${line.value}\n\`\`\`\n`;
+                        }
+                        else {
+                            const value = line['value'] || '';
+                            contentMd += String(value);
+                        }
+                    });
+                }
+            });
+        }
+        if (buttons && buttons.length > 0) {
+            let components = null;
+            buttons.forEach(item => {
+                if (components)
+                    return;
+                const rows = item.value;
+                // 构造成按钮
+                components = createButtonsData(rows);
             });
-            return createResult(ResultCode.Ok, 'client.groupOpenMessages', {
-                id: res.id
+            const res = await client.channelsMessagesForm(channel_id, {
+                content: contentMd || content,
+                components: components
             });
-        })).catch(err => [
-            createResult(ResultCode.Fail, err?.response?.data ?? err?.message ?? err, null)
-        ]);
+            return [createResult(ResultCode.Ok, '完成', res)];
+        }
+        if (content) {
+            const res = await client.channelsMessagesForm(channel_id, {
+                content: contentMd || content
+            });
+            return [createResult(ResultCode.Ok, '完成', res)];
+        }
+        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,7 +1,7 @@
 {
   "name": "@alemonjs/discord",
-  "version": "2.1.0-alpha.0",
-  "description": "阿柠檬discord平台连接",
+  "version": "2.1.0-alpha.12",
+  "description": "discord platform connection",
   "author": "lemonade",
   "license": "MIT",
   "type": "module",
@@ -18,9 +18,16 @@
     "./package": "./package.json",
     "./desktop": "./lib/desktop.js"
   },
+  "dependencies": {
+    "http-proxy-agent": "^7.0.2",
+    "https-proxy-agent": "^7"
+  },
   "devDependencies": {
     "@types/qrcode": "^1.5.5"
   },
+  "peerDependencies": {
+    "alemonjs": "^2.1.0-alpha.15"
+  },
   "alemonjs": {
     "desktop": {
       "platform": [

package/lib/sdk/config.js

@@ -1,10 +0,0 @@
-import { BaseConfig } from './core/config.js';
-import { AvailableIntentsEventsEnum } from './types.js';
-
-const config = new BaseConfig({
-    token: '',
-    intent: AvailableIntentsEventsEnum,
-    shard: [0, 1]
-});
-
-export { config };

package/lib/sdk/core/config.js

@@ -1,46 +0,0 @@
-/**
- * 基础配置结构
- */
-class BaseConfig {
-    #data = null;
-    constructor(val) {
-        this.#data = val;
-    }
-    /**
-     * 设置配置
-     * @param key
-     * @param val
-     */
-    set(key, val) {
-        if (val !== undefined)
-            this.#data[key] = val;
-        return this;
-    }
-    /**
-     *
-     * @param key
-     * @returns
-     */
-    has(key) {
-        if (Object.prototype.hasOwnProperty.call(this.#data, key)) ;
-        return false;
-    }
-    /**
-     * 读取配置
-     * @param key
-     * @returns
-     */
-    all() {
-        return this.#data;
-    }
-    /**
-     * 读取配置
-     * @param key
-     * @returns
-     */
-    get(key) {
-        return this.#data[key];
-    }
-}
-
-export { BaseConfig };

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

@@ -1,11 +0,0 @@
-/**
- * 子频道
- * @param event
- */
-type CHANNEL_TOPIC_UPDATE_TYPE = {
-  topic: null
-  id: string
-  guild_id: string
-}
-
-export type { CHANNEL_TOPIC_UPDATE_TYPE }