@alemonjs/bubble 2.1.0-alpha.9 → 2.1.1

package/lib/format.d.ts

@@ -0,0 +1,4 @@
+import type { DataEnums, DataMarkDown } from 'alemonjs';
+export declare const markdownToBubbleText: (items: DataMarkDown["value"]) => string;
+export declare const markdownRawToBubbleText: (raw: string) => string;
+export declare const dataEnumToBubbleText: (item: DataEnums) => string;

package/lib/format.js

@@ -0,0 +1,81 @@
+const markdownToBubbleText = (items) => {
+    return items
+        .map(item => {
+        switch (item.type) {
+            case 'MD.text':
+                return item.value;
+            case 'MD.title':
+                return `# ${item.value}\n`;
+            case 'MD.subtitle':
+                return `## ${item.value}\n`;
+            case 'MD.bold':
+                return `**${item.value}**`;
+            case 'MD.italic':
+            case 'MD.italicStar':
+                return `*${item.value}*`;
+            case 'MD.strikethrough':
+                return `~~${item.value}~~`;
+            case 'MD.link': {
+                const v = item.value;
+                return `[${v.text}](${v.url})`;
+            }
+            case 'MD.image':
+                return `![image](${item.value})`;
+            case 'MD.list':
+                return (item.value
+                    .map(li => {
+                    if (typeof li.value === 'object') {
+                        return `${li.value.index}. ${li.value.text ?? ''}`;
+                    }
+                    return `- ${li.value}`;
+                })
+                    .join('\n') + '\n');
+            case 'MD.blockquote':
+                return `> ${item.value}\n`;
+            case 'MD.divider':
+                return '\n————————\n';
+            case 'MD.newline':
+                return '\n';
+            case 'MD.code': {
+                const lang = item?.options?.language || '';
+                return `\`\`\`${lang}\n${item.value}\n\`\`\`\n`;
+            }
+            case 'MD.mention':
+                if (item.value === 'everyone') {
+                    return '<@everyone>';
+                }
+                return `<@${item.value ?? ''}>`;
+            case 'MD.content':
+                return item.value;
+            case 'MD.button': {
+                const options = item?.options;
+                const autoEnter = options?.autoEnter ?? false;
+                const label = typeof item.value === 'object' ? item.value.title : item.value;
+                const command = options?.data || label;
+                return `<btn variant="borderless" command="${command}" enter="${String(autoEnter)}" >${label}</btn> `;
+            }
+            default:
+                return String(item?.value ?? '');
+        }
+    })
+        .join('');
+};
+const markdownRawToBubbleText = (raw) => {
+    return raw;
+};
+const dataEnumToBubbleText = (item) => {
+    switch (item.type) {
+        case 'MarkdownOriginal':
+            return markdownRawToBubbleText(String(item.value));
+        case 'Attachment':
+            return `[附件${item.options?.filename ? ': ' + item.options.filename : ''}]`;
+        case 'Audio':
+            return '[音频]';
+        case 'Video':
+            return '[视频]';
+        default:
+            return '';
+    }
+};
+
+export { dataEnumToBubbleText, markdownRawToBubbleText, markdownToBubbleText };

package/lib/index.d.ts

@@ -7,5 +7,5 @@ export { OpCode } from './sdk/wss.types';
 export type { BUBBLEOptions, HelloPayload, SubscribePayload } from './sdk/wss.types';
 export * from './hook';
 export { type Options } from './config';
-declare const main: () => void;
-export default main;
+declare const _default: () => any;
+export default _default;

package/lib/index.js

@@ -1,5 +1,5 @@
 import { BubbleClient } from './sdk/wss.js';
-import { cbpPlatform, createResult, ResultCode } from 'alemonjs';
+import { definePlatform, 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';
@@ -13,11 +13,21 @@ const main = () => {
     const cbp = cbpPlatform(url);
     const client = new BubbleClient();
     void client.connect();
+    let botId = '';
+    client
+        .getMe()
+        .then(res => {
+        botId = String(res?.id ?? '');
+    })
+        .catch(() => { });
     const createUserAvatar = (_UserId, avatar) => {
+        if (!avatar) {
+            return '';
+        }
         return `${CDN_URL}/${avatar}`;
     };
     client.on('MESSAGE_CREATE', event => {
-        if (event.author?.is_bot) {
+        if (event.author?.is_bot || event.author?.isBot) {
             return;
         }
         const atUsers = [];
@@ -48,8 +58,8 @@ const main = () => {
             OpenId: UserId,
             MessageId: String(event.id),
             MessageText: msg,
-            CreateAt: Date.now(),
-            tag: 'message.create',
+            BotId: botId,
+            _tag: 'message.create',
             value: event
         };
         cbp.send(e);
@@ -70,8 +80,118 @@ const main = () => {
             OpenId: UserId,
             MessageId: String(event.id),
             MessageText: event.content,
-            CreateAt: Date.now(),
-            tag: 'private.message.create',
+            BotId: botId,
+            _tag: 'private.message.create',
+            value: event
+        };
+        cbp.send(e);
+    });
+    client.on('MESSAGE_UPDATE', event => {
+        const UserId = String(event.authorId);
+        const [isMaster, UserKey] = getMaster(UserId);
+        const UserAvatar = createUserAvatar(UserId, event?.author?.avatar);
+        const e = {
+            name: 'message.update',
+            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,
+            MessageId: String(event.id),
+            BotId: botId,
+            _tag: 'MESSAGE_UPDATE',
+            value: event
+        };
+        cbp.send(e);
+    });
+    client.on('MESSAGE_DELETE', event => {
+        const e = {
+            name: 'message.delete',
+            Platform: platform,
+            GuildId: String(event.guild_id || ''),
+            ChannelId: String(event.channel_id || ''),
+            SpaceId: String(event.channel_id || ''),
+            MessageId: String(event.id),
+            BotId: botId,
+            _tag: 'MESSAGE_DELETE',
+            value: event
+        };
+        cbp.send(e);
+    });
+    client.on('DM_MESSAGE_UPDATE', event => {
+        const UserId = String(event.authorId);
+        const [isMaster, UserKey] = getMaster(UserId);
+        const UserAvatar = createUserAvatar(UserId, event?.author?.avatar);
+        const e = {
+            name: 'private.message.update',
+            Platform: platform,
+            UserId: UserId,
+            UserKey,
+            UserName: event?.author?.username,
+            UserAvatar: UserAvatar,
+            IsMaster: isMaster,
+            IsBot: false,
+            MessageId: String(event.id),
+            BotId: botId,
+            _tag: 'DM_MESSAGE_UPDATE',
+            value: event
+        };
+        cbp.send(e);
+    });
+    client.on('DM_MESSAGE_DELETE', event => {
+        const e = {
+            name: 'private.message.delete',
+            Platform: platform,
+            MessageId: String(event.id),
+            BotId: botId,
+            _tag: 'DM_MESSAGE_DELETE',
+            value: event
+        };
+        cbp.send(e);
+    });
+    client.on('GUILD_MEMBER_ADD', event => {
+        const UserId = String(event.user_id || event.user?.id || '');
+        const [isMaster, UserKey] = getMaster(UserId);
+        const e = {
+            name: 'member.add',
+            Platform: platform,
+            GuildId: String(event.guild_id || ''),
+            ChannelId: '',
+            SpaceId: String(event.guild_id || ''),
+            UserId: UserId,
+            UserKey,
+            UserName: event.user?.username ?? event.nickname,
+            IsMaster: isMaster,
+            IsBot: false,
+            MessageId: '',
+            BotId: botId,
+            _tag: 'GUILD_MEMBER_ADD',
+            value: event
+        };
+        cbp.send(e);
+    });
+    client.on('GUILD_MEMBER_REMOVE', event => {
+        const UserId = String(event.user_id || event.user?.id || '');
+        const [isMaster, UserKey] = getMaster(UserId);
+        const e = {
+            name: 'member.remove',
+            Platform: platform,
+            GuildId: String(event.guild_id || ''),
+            ChannelId: '',
+            SpaceId: String(event.guild_id || ''),
+            UserId: UserId,
+            UserKey,
+            UserName: event.user?.username ?? event.nickname,
+            IsMaster: isMaster,
+            IsBot: false,
+            MessageId: '',
+            BotId: botId,
+            _tag: 'GUILD_MEMBER_REMOVE',
             value: event
         };
         cbp.send(e);
@@ -91,10 +211,10 @@ const main = () => {
         },
         use: {
             send: async (event, val) => {
-                if (val.length < 0) {
+                if (!val || val.length <= 0) {
                     return [];
                 }
-                const tag = event.tag;
+                const tag = event._tag;
                 if (tag === 'message.create') {
                     const ChannelId = String(event.value.channelId || '');
                     const res = await sendToRoom(client, { channel_id: ChannelId, message_id: String(event.value.id || '') }, val);
@@ -114,9 +234,9 @@ const main = () => {
             },
             mention: e => {
                 const event = e.value;
-                const MessageMention = event.mentions.map(item => {
+                const MessageMention = (event.mentions || []).map(item => {
                     const UserId = item.id;
-                    const avatar = event.author.avatar;
+                    const avatar = item.avatar;
                     const UserAvatar = createUserAvatar(UserId, avatar);
                     const [isMaster, UserKey] = getMaster(UserId);
                     return {
@@ -135,7 +255,21 @@ const main = () => {
     };
     const onactions = async (data, consume) => {
         try {
-            if (data.action === 'message.send') {
+            if (data.action === 'me.info') {
+                const res = await client.getMe();
+                const UserId = String(res.id);
+                const [isMaster, UserKey] = getMaster(UserId);
+                const user = {
+                    UserId: UserId,
+                    UserName: res.name,
+                    IsBot: true,
+                    IsMaster: isMaster,
+                    UserAvatar: '',
+                    UserKey: UserKey
+                };
+                consume([createResult(ResultCode.Ok, '请求完成', user)]);
+            }
+            else if (data.action === 'message.send') {
                 const event = data.payload.event;
                 const paramFormat = data.payload.params.format;
                 const res = await api.use.send(event, paramFormat);
@@ -158,6 +292,9 @@ const main = () => {
                 const res = await api.use.mention(event);
                 consume([createResult(ResultCode.Ok, '请求完成', res)]);
             }
+            else {
+                consume([createResult(ResultCode.Fail, '未知请求，请尝试升级版本', null)]);
+            }
         }
         catch (error) {
             consume([createResult(ResultCode.Fail, '请求失败', error)]);
@@ -176,35 +313,12 @@ const main = () => {
                 consume([createResult(ResultCode.Fail, '请求失败', error)]);
             }
         }
+        else {
+            consume([createResult(ResultCode.Fail, '未知请求，请尝试升级版本', null)]);
+        }
     };
     cbp.onapis((data, consume) => void onapis(data, consume));
 };
-const mainProcess = () => {
-    ['SIGINT', 'SIGTERM', 'SIGQUIT', 'disconnect'].forEach(sig => {
-        process?.on?.(sig, () => {
-            logger.info?.(`[alemonjs][${sig}] 收到信号，正在关闭...`);
-            setImmediate(() => process.exit(0));
-        });
-    });
-    process?.on?.('exit', code => {
-        logger.info?.(`[alemonjs][exit] 进程退出，code=${code}`);
-    });
-    process.on('message', msg => {
-        try {
-            const data = typeof msg === 'string' ? JSON.parse(msg) : msg;
-            if (data?.type === 'start') {
-                main();
-            }
-            else if (data?.type === 'stop') {
-                process.exit(0);
-            }
-        }
-        catch { }
-    });
-    if (process.send) {
-        process.send(JSON.stringify({ type: 'ready' }));
-    }
-};
-mainProcess();
+var index = definePlatform({ main });
 
-export { BubbleClient, CDN_URL, main as default, platform };
+export { BubbleClient, CDN_URL, index as default, platform };

package/lib/sdk/instance.js

@@ -79,15 +79,15 @@ const loggerError = err => {
         message: err?.message
     });
 };
-const createAxiosInstance = (service, options) => {
-    return new Promise((resolve, reject) => {
-        service(options)
-            .then(res => resolve(res?.data ?? {}))
-            .catch(err => {
-            loggerError(err);
-            reject(err?.response?.data);
-        });
-    });
+const createAxiosInstance = async (service, options) => {
+    try {
+        const res = await service(options);
+        return res?.data ?? {};
+    }
+    catch (err) {
+        loggerError(err);
+        throw err?.response?.data ?? err;
+    }
 };
 
 export { createAxiosInstance };

package/lib/sdk/types.d.ts

@@ -35,6 +35,7 @@ export interface BaseMessage {
     authorId?: string | number;
     author: {
         id: number;
+        isBot?: boolean;
         is_bot?: boolean;
         avatar?: string | null;
         username: string;
@@ -110,5 +111,11 @@ export interface FileQuota {
 }
 export interface BubbleEventMap {
     MESSAGE_CREATE: MessageCreateEvent;
+    MESSAGE_UPDATE: MessageUpdateEvent;
+    MESSAGE_DELETE: MessageDeleteEvent;
     DM_MESSAGE_CREATE: DmMessageCreateEvent;
+    DM_MESSAGE_UPDATE: MessageUpdateEvent;
+    DM_MESSAGE_DELETE: MessageDeleteEvent;
+    GUILD_MEMBER_ADD: GuildMemberEvent;
+    GUILD_MEMBER_REMOVE: GuildMemberEvent;
 }

package/lib/send.js

@@ -1,10 +1,101 @@
 import { createResult, ResultCode } from 'alemonjs';
 import { readFileSync } from 'fs';
+import { dataEnumToBubbleText } from './format.js';
 
 const ImageURLToBuffer = async (url) => {
     const arrayBuffer = await fetch(url).then(res => res.arrayBuffer());
     return Buffer.from(arrayBuffer);
 };
+const buildBubbleMdContent = (mdAndButtons) => {
+    let contentMd = '';
+    if (mdAndButtons && mdAndButtons.length > 0) {
+        mdAndButtons.forEach(item => {
+            if (item.type === 'Markdown' && typeof item.value !== 'string') {
+                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.mention': (value, options) => {
+                        const { belong } = options || {};
+                        if (value === 'everyone' || value === 'all' || value === '' || typeof value !== 'string') {
+                            return '<@everyone> ';
+                        }
+                        if (belong === 'user') {
+                            return `<@${value}> `;
+                        }
+                        else if (belong === 'channel') {
+                            return `<#${value}> `;
+                        }
+                        return '';
+                    },
+                    'MD.button': (value, options) => {
+                        const autoEnter = options?.autoEnter ?? false;
+                        const label = typeof value === 'object' ? value.title : value;
+                        const command = options?.data || label;
+                        return `<btn variant="borderless" command="${command}" enter="${String(autoEnter)}" >${label}</btn> `;
+                    },
+                    'MD.content': value => `${value}`
+                };
+                md.forEach(line => {
+                    if (map[line.type]) {
+                        const value = 'value' in line ? line.value : undefined;
+                        const options = 'options' in line ? line.options : {};
+                        contentMd += map[line.type](value, options);
+                        return;
+                    }
+                    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.join('')}\n`;
+                    }
+                    else if (line.type === 'MD.code') {
+                        const language = line?.options?.language || '';
+                        contentMd += `\n\`\`\`${language}\n${line.value}\n\`\`\`\n`;
+                    }
+                    else {
+                        const value = line['value'] || '';
+                        contentMd += String(value);
+                    }
+                });
+            }
+            else if (item.type === 'BT.group' && item.value.length > 0 && typeof item.value !== 'string') {
+                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 = value;
+                        const command = options?.data || label;
+                        return `<btn command="${command}" enter="${String(autoEnter)}" >${label}</btn>`;
+                    })
+                        .join('')}</flex>`;
+                })
+                    .join('')}</box>`;
+            }
+        });
+    }
+    return contentMd;
+};
 const sendToRoom = async (client, param, val) => {
     try {
         if (!val || val.length <= 0) {
@@ -15,6 +106,9 @@ const sendToRoom = async (client, param, val) => {
         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 mdAndButtons = val.filter(item => item.type === 'Markdown' || item.type === 'BT.group');
+        const nativeTypes = new Set(['Image', 'ImageURL', 'ImageFile', 'Markdown', 'BT.group', 'Mention', 'Text', 'Link']);
+        const unsupportedItems = val.filter(item => !nativeTypes.has(item.type));
+        const fallbackText = unsupportedItems.map(item => dataEnumToBubbleText(item)).filter(Boolean).join('\n');
         const content = val
             .filter(item => item.type === 'Mention' || item.type === 'Text' || item.type === 'Link')
             .map(item => {
@@ -51,6 +145,8 @@ const sendToRoom = async (client, param, val) => {
             return '';
         })
             .join('');
+        const contentMd = buildBubbleMdContent(mdAndButtons);
+        const finalContent = [content, contentMd, fallbackText].filter(Boolean).join('\n');
         if (images.length > 0) {
             let bufferData = null;
             for (let i = 0; i < images.length; i++) {
@@ -59,7 +155,20 @@ const sendToRoom = async (client, param, val) => {
                 }
                 const item = images[i];
                 if (item.type === 'Image') {
-                    bufferData = Buffer.from(item.value, 'base64');
+                    if (Buffer.isBuffer(item.value)) {
+                        bufferData = item.value;
+                    }
+                    else if (item.value.startsWith('http://') || item.value.startsWith('https://')) {
+                        const res = await ImageURLToBuffer(item.value);
+                        bufferData = res;
+                    }
+                    else if (item.value.startsWith('base64://')) {
+                        const base64Str = item.value.slice(9);
+                        bufferData = Buffer.from(base64Str, 'base64');
+                    }
+                    else if (item.value.startsWith('file://')) {
+                        bufferData = readFileSync(item.value.slice(7));
+                    }
                 }
                 else if (item.type === 'ImageURL') {
                     const res = await ImageURLToBuffer(item.value);
@@ -76,7 +185,7 @@ const sendToRoom = async (client, param, val) => {
             }
             if (channelId) {
                 const res = await client.sendMessage(channelId, {
-                    content: content,
+                    content: finalContent,
                     type: 'image',
                     attachments: [fileAttachment]
                 });
@@ -84,7 +193,7 @@ const sendToRoom = async (client, param, val) => {
             }
             if (threadId) {
                 const res = await client.sendDm(threadId, {
-                    content: content,
+                    content: finalContent,
                     type: 'image',
                     attachments: [fileAttachment]
                 });
@@ -92,84 +201,13 @@ const sendToRoom = async (client, param, val) => {
             }
             return [createResult(ResultCode.Ok, '完成', null)];
         }
-        let contentMd = '';
-        if (mdAndButtons && mdAndButtons.length > 0) {
-            mdAndButtons.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 += `\n> ${line.value}`;
-                        }
-                        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---\n';
-                        }
-                        else if (line.type === 'MD.image') {
-                            contentMd += `\n![${line.value}](${line.value})\n`;
-                        }
-                        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.code') {
-                            const language = line?.options?.language || '';
-                            contentMd += `\n\`\`\`${language}\n${line.value}\n\`\`\`\n`;
-                        }
-                        else {
-                            const value = line['value'] || '';
-                            contentMd += String(value);
-                        }
-                    });
-                }
-                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>`;
-                }
-            });
-        }
-        if ((content && content.length > 0) || (contentMd && contentMd.length > 0)) {
+        if (finalContent && finalContent.length > 0) {
             if (channelId) {
-                const res = await client.sendMessage(channelId, { content: content !== '' ? content : contentMd, type: 'text' });
+                const res = await client.sendMessage(channelId, { content: finalContent, type: 'text' });
                 return [createResult(ResultCode.Ok, '完成', res)];
             }
             if (threadId) {
-                const res = await client.sendDm(threadId, { content: content !== '' ? content : contentMd, type: 'text' });
+                const res = await client.sendDm(threadId, { content: finalContent, type: 'text' });
                 return [createResult(ResultCode.Ok, '完成', res)];
             }
             return [createResult(ResultCode.Ok, '完成', null)];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/bubble",
-  "version": "2.1.0-alpha.9",
+  "version": "2.1.1",
   "description": "bubble platform",
   "author": "lemonade",
   "license": "MIT",