@alemonjs/bubble 2.1.0-alpha.1 → 2.1.0-alpha.11

package/README.md

@@ -18,30 +18,30 @@ yarn add @alemonjs/bubble
 bubble:
   # Bot Token（必填）
   token: 'YOUR_BOT_TOKEN'
-  
+
   # WebSocket Gateway URL（可选，默认: wss://bubble.alemonjs.com/api/bot/gateway）
   GATEWAY_URL: 'wss://bubble.alemonjs.com/api/bot/gateway'
-  
+
   # API Base URL（可选，默认: https://bubble.alemonjs.com/api/bot/v1）
   API_URL: 'https://bubble.alemonjs.com/api/bot/v1'
-  
+
   # CDN Base URL（可选，默认: https://bubble-oss-files.alemonjs.com）
   CDN_URL: 'https://bubble-oss-files.alemonjs.com'
-  
+
   # 订阅的事件类型（可选，默认: 所有可用事件）
   intent:
     - MESSAGE_CREATE
     - DM_MESSAGE_CREATE
     - GUILD_MEMBER_ADD
-  
+
   # 主人配置（可选）
   master_key: []
   master_id: []
-  
+
   # 代理配置（可选）
   websocket_proxy: ''
   request_proxy: ''
-  
+
   # 客户端名称（可选，默认: alemonjs-bot）
   clientName: 'alemonjs-bot'
 ```
@@ -75,4 +75,4 @@ bubble:
 - `BOT_READY` - 机器人就绪
 - `EVENTS_SUBSCRIBED` - 事件订阅成功
 - `EVENTS_UNSUBSCRIBED` - 事件取消订阅成功
-- `SUBSCRIBE_DENIED` - 订阅被拒绝
+- `SUBSCRIBE_DENIED` - 订阅被拒绝

package/lib/hook.d.ts

@@ -9,8 +9,8 @@ type MAP = {
     'message.delete': undefined;
     'message.reaction.add': undefined;
     'message.reaction.remove': undefined;
-    'channal.create': undefined;
-    'channal.delete': undefined;
+    'channel.create': undefined;
+    'channel.delete': undefined;
     'guild.join': undefined;
     'guild.exit': undefined;
     'member.add': undefined;

package/lib/index.js

@@ -3,7 +3,7 @@ import { cbpPlatform, createResult, ResultCode } from 'alemonjs';
 import { getMaster, platform } from './config.js';
 import { CDN_URL } from './sdk/api.js';
 export { BubbleAPI as API, API_URL, GATEWAY_URL } from './sdk/api.js';
-import { sendchannel, senduser } from './send.js';
+import { sendToRoom, sendToUser } from './send.js';
 export { OpCode } from './sdk/wss.types.js';
 export { useClient, useValue } from './hook.js';
 
@@ -17,7 +17,7 @@ const main = () => {
         return `${CDN_URL}/${avatar}`;
     };
     client.on('MESSAGE_CREATE', event => {
-        if (event.author?.bot) {
+        if (event.author?.is_bot) {
             return;
         }
         const atUsers = [];
@@ -30,61 +30,61 @@ const main = () => {
         for (const item of atUsers) {
             msg = msg.replace(`<@${item.id}>`, '').trim();
         }
-        const UserId = String(event.author.id);
+        const UserId = String(event.authorId);
         const [isMaster, UserKey] = getMaster(UserId);
-        const UserAvatar = createUserAvatar(UserId, event.author.avatar);
-        if (event.type === 0 && event.member) {
-            const e = {
-                name: 'message.create',
-                Platform: platform,
-                GuildId: String(event.guild_id || ''),
-                ChannelId: String(event.channel_id || ''),
-                SpaceId: String(event.channel_id || ''),
-                UserId: UserId,
-                UserKey,
-                UserName: event.author.username,
-                UserAvatar: UserAvatar,
-                IsMaster: isMaster,
-                IsBot: false,
-                OpenId: UserId,
-                MessageId: String(event.id),
-                MessageText: msg,
-                CreateAt: Date.now(),
-                tag: 'message.create',
-                value: event
-            };
-            cbp.send(e);
-        }
-        else if (event.type === 0 && !event.member) {
-            const e = {
-                name: 'private.message.create',
-                Platform: platform,
-                UserId: UserId,
-                UserKey,
-                UserName: event.author.username,
-                UserAvatar: UserAvatar,
-                IsMaster: isMaster,
-                IsBot: false,
-                OpenId: UserId,
-                MessageId: String(event.id),
-                MessageText: msg,
-                CreateAt: Date.now(),
-                tag: 'private.message.create',
-                value: event
-            };
-            cbp.send(e);
-        }
-        else ;
+        const UserAvatar = createUserAvatar(UserId, event?.author?.avatar);
+        const e = {
+            name: 'message.create',
+            Platform: platform,
+            GuildId: String(event.channelId || ''),
+            ChannelId: String(event.channelId || ''),
+            SpaceId: String(event.channelId || ''),
+            UserId: UserId,
+            UserKey,
+            UserName: event?.author?.username,
+            UserAvatar: UserAvatar,
+            IsMaster: isMaster,
+            IsBot: false,
+            OpenId: UserId,
+            MessageId: String(event.id),
+            MessageText: msg,
+            CreateAt: Date.now(),
+            tag: 'message.create',
+            value: event
+        };
+        cbp.send(e);
+    });
+    client.on('DM_MESSAGE_CREATE', event => {
+        const UserId = String(event.authorId);
+        const [isMaster, UserKey] = getMaster(UserId);
+        const UserAvatar = createUserAvatar(UserId, event?.author?.avatar);
+        const e = {
+            name: 'private.message.create',
+            Platform: platform,
+            UserId: UserId,
+            UserKey,
+            UserName: event?.author?.username,
+            UserAvatar: UserAvatar,
+            IsMaster: isMaster,
+            IsBot: false,
+            OpenId: UserId,
+            MessageId: String(event.id),
+            MessageText: event.content,
+            CreateAt: Date.now(),
+            tag: 'private.message.create',
+            value: event
+        };
+        cbp.send(e);
     });
     const api = {
         active: {
             send: {
                 channel: async (UserId, val) => {
-                    const res = await sendchannel(client, { channel_id: UserId }, val);
+                    const res = await sendToRoom(client, { channel_id: UserId }, val);
                     return [createResult(ResultCode.Ok, '请求完成', res)];
                 },
                 user: async (OpenId, val) => {
-                    const res = await senduser(client, { author_id: OpenId }, val);
+                    const res = await sendToUser(client, { author_id: OpenId }, val);
                     return [createResult(ResultCode.Ok, '请求完成', res)];
                 }
             }
@@ -96,30 +96,17 @@ const main = () => {
                 }
                 const tag = event.tag;
                 if (tag === 'message.create') {
-                    const ChannelId = String(event.value.channel_id || '');
-                    const res = await sendchannel(client, { channel_id: ChannelId }, val);
+                    const ChannelId = String(event.value.channelId || '');
+                    const res = await sendToRoom(client, { channel_id: ChannelId, message_id: String(event.value.id || '') }, val);
                     return [createResult(ResultCode.Ok, '请求完成', res)];
                 }
                 else if (tag === 'private.message.create') {
-                    const UserId = String(event.value.author.id || '');
-                    const ChannelId = String(event.value.channel_id || '');
-                    const res = await senduser(client, {
-                        channel_id: ChannelId,
-                        author_id: UserId
-                    }, val);
-                    return [createResult(ResultCode.Ok, '请求完成', res)];
-                }
-                else if (tag === 'interaction.create') {
-                    const ChannelId = String(event.value.channel_id || '');
-                    const res = await sendchannel(client, { channel_id: ChannelId }, val);
-                    return [createResult(ResultCode.Ok, '请求完成', res)];
-                }
-                else if (tag === 'private.interaction.create') {
-                    const UserId = String(event.value.user.id || '');
-                    const ChannelId = String(event.value.channel_id || '');
-                    const res = await senduser(client, {
+                    const UserId = String(event.value.authorId || '');
+                    const ChannelId = String(event.value.channelId || '');
+                    const res = await sendToUser(client, {
                         channel_id: ChannelId,
-                        author_id: UserId
+                        author_id: UserId,
+                        message_id: String(event.value.id || '')
                     }, val);
                     return [createResult(ResultCode.Ok, '请求完成', res)];
                 }

package/lib/sdk/api.d.ts

@@ -24,6 +24,8 @@ export declare class BubbleAPI {
         channelId?: string | number;
         threadId?: string | number;
         messageId?: string | number;
-    }): Promise<FileUploadResponse>;
+    }): Promise<{
+        data: FileUploadResponse;
+    }>;
     filesQuota(): Promise<FileQuota>;
 }

package/lib/sdk/api.js

@@ -71,9 +71,6 @@ class BubbleAPI {
         if (extra.threadId) {
             form.append('threadId', String(extra.threadId));
         }
-        if (extra.messageId) {
-            form.append('messageId', String(extra.messageId));
-        }
         const value = getBubbleConfig();
         const token = value.token;
         const requestConfig = value.request_config ?? {};

package/lib/sdk/types.d.ts

@@ -30,23 +30,23 @@ export interface BaseMessage {
     id: string | number;
     content: string;
     type?: string | number;
-    channel_id?: string | number;
-    guild_id?: string | number;
-    author_id?: string | number;
-    author?: User;
-    mentions?: User[];
-    attachments?: Attachment[];
-    created_at?: string;
-    timestamp?: string;
+    channelId?: string | number;
+    guildId?: string | number;
+    authorId?: string | number;
+    author: {
+        id: number;
+        is_bot?: boolean;
+        avatar?: string | null;
+        username: string;
+    };
+    attachment?: Attachment[];
+    createdAt?: string;
 }
 export interface MessageCreateEvent extends BaseMessage {
-    member?: {
-        nickname?: string;
-        roles?: number[];
-    };
+    mentions?: any[];
 }
 export interface DmMessageCreateEvent extends BaseMessage {
-    thread_id?: string | number;
+    threadId?: string | number;
 }
 export type MessageUpdateEvent = BaseMessage;
 export interface MessageDeleteEvent {
@@ -110,18 +110,5 @@ export interface FileQuota {
 }
 export interface BubbleEventMap {
     MESSAGE_CREATE: MessageCreateEvent;
-    MESSAGE_UPDATE: MessageUpdateEvent;
-    MESSAGE_DELETE: MessageDeleteEvent;
-    MESSAGE_UNPIN: MessageDeleteEvent;
     DM_MESSAGE_CREATE: DmMessageCreateEvent;
-    DM_MESSAGE_UPDATE: DmMessageCreateEvent;
-    DM_MESSAGE_DELETE: MessageDeleteEvent;
-    DM_MESSAGE_UNPIN: MessageDeleteEvent;
-    GUILD_MEMBER_ADD: GuildMemberEvent;
-    GUILD_MEMBER_UPDATE: GuildMemberEvent;
-    GUILD_MEMBER_REMOVE: GuildMemberEvent;
-    BOT_READY: BotReadyEvent;
-    EVENTS_SUBSCRIBED: EventsSubscribedEvent;
-    EVENTS_UNSUBSCRIBED: EventsUnsubscribedEvent;
-    SUBSCRIBE_DENIED: SubscribeDeniedEvent;
 }

package/lib/send.d.ts

@@ -1,12 +1,16 @@
 import { DataEnums } from 'alemonjs';
 import { BubbleClient } from './sdk/wss';
 type Client = typeof BubbleClient.prototype;
-export declare const sendchannel: (client: Client, param: {
-    channel_id: string | number;
+export declare const sendToRoom: (client: Client, param: {
+    channel_id: string | number | null;
+    thread_id?: string | number | null;
+    message_id?: string | number | null;
 }, val: DataEnums[]) => Promise<import("alemonjs").Result<any>[]>;
-export declare const senduser: (client: Client, param: {
+export declare const sendToUser: (client: Client, param: {
     author_id?: string | number;
     channel_id?: string | number;
+    thread_id?: string | number;
+    message_id?: string | number;
 }, val: DataEnums[]) => Promise<import("alemonjs").Result<any>[]>;
 declare const _default: {};
 export default _default;

package/lib/send.js

@@ -5,39 +5,16 @@ const ImageURLToBuffer = async (url) => {
     const arrayBuffer = await fetch(url).then(res => res.arrayBuffer());
     return Buffer.from(arrayBuffer);
 };
-const createButtonsData = (rows) => {
-    return rows.map(row => {
-        const val = row.value;
-        return {
-            type: 1,
-            components: val.map(button => {
-                const value = button.value;
-                let text = '';
-                if (typeof button.options?.data === 'object') {
-                    text = button.options?.data.click;
-                }
-                else {
-                    text = button.options.data;
-                }
-                return {
-                    type: 2,
-                    custom_id: text,
-                    style: 1,
-                    label: typeof value === 'object' ? value.title : value
-                };
-            })
-        };
-    });
-};
-const sendchannel = async (client, param, val) => {
+const sendToRoom = async (client, param, val) => {
     try {
         if (!val || val.length <= 0) {
             return [];
         }
         const channelId = String(param?.channel_id ?? '');
+        const threadId = String(param?.thread_id ?? '');
+        const messageId = param?.message_id ? String(param?.message_id) : undefined;
         const images = val.filter(item => item.type === 'Image' || item.type === 'ImageURL' || item.type === 'ImageFile');
-        const buttons = val.filter(item => item.type === 'BT.group');
-        const mds = val.filter(item => item.type === 'Markdown');
+        const mdAndButtons = val.filter(item => item.type === 'Markdown' || item.type === 'BT.group');
         const content = val
             .filter(item => item.type === 'Mention' || item.type === 'Text' || item.type === 'Link')
             .map(item => {
@@ -92,48 +69,55 @@ const sendchannel = async (client, param, val) => {
                     bufferData = readFileSync(item.value);
                 }
             }
-            const uploadRes = await client.uploadFile(bufferData, undefined, { channelId });
-            const fileAttachment = uploadRes?.file;
+            const uploadRes = await client.uploadFile(bufferData, undefined, { channelId, threadId, messageId: messageId });
+            const fileAttachment = uploadRes?.data?.file;
             if (!fileAttachment) {
-                throw new Error('文件上传失败：未返回文件信息');
+                return [createResult(ResultCode.Ok, '文件上传失败：未返回文件信息', uploadRes)];
+            }
+            if (channelId) {
+                const res = await client.sendMessage(channelId, {
+                    content: content,
+                    type: 'image',
+                    attachments: [fileAttachment]
+                });
+                return [createResult(ResultCode.Ok, '完成', res)];
+            }
+            if (threadId) {
+                const res = await client.sendDm(threadId, {
+                    content: content,
+                    type: 'image',
+                    attachments: [fileAttachment]
+                });
+                return [createResult(ResultCode.Ok, '完成', res)];
             }
-            const attachments = [fileAttachment];
-            const payload = {
-                content: content,
-                type: 'text',
-                attachments
-            };
-            const res = await client.sendMessage(channelId, payload);
-            return [createResult(ResultCode.Ok, '完成', res)];
+            return [createResult(ResultCode.Ok, '完成', null)];
         }
         let contentMd = '';
-        if (mds && mds.length > 0) {
-            mds.forEach(item => {
+        if (mdAndButtons && mdAndButtons.length > 0) {
+            mdAndButtons.forEach(item => {
                 if (item.type === 'Markdown') {
                     const md = item.value;
+                    const map = {
+                        'MD.title': value => `# ${value}`,
+                        'MD.subtitle': value => `## ${value}`,
+                        'MD.text': value => `${value} `,
+                        'MD.bold': value => `**${value}** `,
+                        'MD.divider': () => '\n————————\n',
+                        'MD.italic': value => `_${value}_ `,
+                        'MD.italicStar': value => `*${value}* `,
+                        'MD.strikethrough': value => `~~${value}~~ `,
+                        'MD.blockquote': value => `\n> ${value}`,
+                        'MD.newline': () => '\n',
+                        'MD.link': value => `[🔗${value.text}](${value.url}) `,
+                        'MD.image': value => `\n![${value}](${value})\n`
+                    };
                     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';
+                        if (map[line.type]) {
+                            const value = line?.value;
+                            contentMd += map[line.type](value);
+                            return;
                         }
-                        else if (line.type === 'MD.image') {
-                            contentMd += `![${line.value}](${line.value})`;
-                        }
-                        else if (line.type === 'MD.link') {
-                            contentMd += `[${line.value}](${line.value})`;
-                        }
-                        else if (line.type === 'MD.list') {
+                        if (line.type === 'MD.list') {
                             const listStr = line.value.map(listItem => {
                                 if (typeof listItem.value === 'object') {
                                     return `\n${listItem.value.index}. ${listItem.value.text}`;
@@ -142,12 +126,9 @@ const sendchannel = async (client, param, val) => {
                             });
                             contentMd += `${listStr}\n`;
                         }
-                        else if (line.type === 'MD.newline') {
-                            contentMd += '\n';
-                        }
                         else if (line.type === 'MD.code') {
                             const language = line?.options?.language || '';
-                            contentMd += `\`\`\`${language}\n${line.value}\n\`\`\`\n`;
+                            contentMd += `\n\`\`\`${language}\n${line.value}\n\`\`\`\n`;
                         }
                         else {
                             const value = line['value'] || '';
@@ -155,26 +136,38 @@ const sendchannel = async (client, param, val) => {
                         }
                     });
                 }
-            });
-        }
-        if (buttons && buttons.length > 0) {
-            let components = null;
-            buttons.forEach(item => {
-                if (components) {
-                    return;
+                else if (item.type === 'BT.group' && item.value.length > 0) {
+                    contentMd += `<box  classWind="mt-2" variant="borderless" >${item.value
+                        ?.map(row => {
+                        const val = row.value;
+                        if (val.length === 0) {
+                            return '';
+                        }
+                        return `<flex>${val
+                            .map(button => {
+                            const value = button.value;
+                            const options = button.options;
+                            const autoEnter = options?.autoEnter ?? false;
+                            const label = typeof value === 'object' ? value.title : value;
+                            const command = options?.data || label;
+                            return `<btn command="${command}" enter="${String(autoEnter)}" >${label}</btn>`;
+                        })
+                            .join('')}</flex>`;
+                    })
+                        .join('')}</box>`;
                 }
-                const rows = item.value;
-                components = createButtonsData(rows);
-            });
-            const res = await client.sendMessage(channelId, {
-                content: contentMd || content,
-                components
             });
-            return [createResult(ResultCode.Ok, '完成', res)];
         }
-        if (content && content.length > 0) {
-            const res = await client.sendMessage(channelId, { content: contentMd || content });
-            return [createResult(ResultCode.Ok, '完成', res)];
+        if ((content && content.length > 0) || (contentMd && contentMd.length > 0)) {
+            if (channelId) {
+                const res = await client.sendMessage(channelId, { content: content !== '' ? content : contentMd, type: 'text' });
+                return [createResult(ResultCode.Ok, '完成', res)];
+            }
+            if (threadId) {
+                const res = await client.sendDm(threadId, { content: content !== '' ? content : contentMd, type: 'text' });
+                return [createResult(ResultCode.Ok, '完成', res)];
+            }
+            return [createResult(ResultCode.Ok, '完成', null)];
         }
         return [];
     }
@@ -182,20 +175,21 @@ const sendchannel = async (client, param, val) => {
         return [createResult(ResultCode.Fail, err?.response?.data ?? err?.message ?? err, null)];
     }
 };
-const senduser = async (client, param, val) => {
+const sendToUser = async (client, param, val) => {
     if (!val || val.length <= 0) {
         return [];
     }
-    let channelId = param?.channel_id;
-    if (!channelId && param.author_id) {
+    let threadId = param?.channel_id || param?.thread_id;
+    const messageId = param?.message_id;
+    if (!threadId && param.author_id) {
         const dm = await client.getOrCreateDm(param.author_id);
-        channelId = dm?.id;
+        threadId = dm?.id;
     }
-    if (!channelId) {
+    if (!threadId) {
         return [];
     }
-    return sendchannel(client, { channel_id: channelId }, val);
+    return sendToRoom(client, { channel_id: null, thread_id: threadId, message_id: messageId }, val);
 };
 var send = {};
 
-export { send as default, sendchannel, senduser };
+export { send as default, sendToRoom, sendToUser };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/bubble",
-  "version": "2.1.0-alpha.1",
+  "version": "2.1.0-alpha.11",
   "description": "bubble platform",
   "author": "lemonade",
   "license": "MIT",
@@ -65,4 +65,4 @@
     "type": "git",
     "url": "https://github.com/lemonade-lab/alemonjs.git"
   }
-}
+}