@alemonjs/bubble 2.1.0 → 2.1.2

package/README.md

@@ -1,7 +1,5 @@
 # @alemonjs/bubble
 
-Bubble 平台适配器 for AlemonJS
-
 [文档 https://bubble.alemonjs.com/developer/docs](https://bubble.alemonjs.com/developer/docs)
 
 ## 安装
@@ -44,35 +42,10 @@ bubble:
 
   # 客户端名称（可选，默认: alemonjs-bot）
   clientName: 'alemonjs-bot'
-```
-
-## 功能特性
-
-- ✅ WebSocket Gateway 实时事件推送
-- ✅ 完整的 HTTP API 接口支持
-- ✅ 文件上传功能
-- ✅ 类型安全的 TypeScript 支持
-- ✅ 自动重连机制
-- ✅ 事件订阅管理
 
-## API 文档
-
-详细的 API 文档请参考：[https://bubble.alemonjs.com/developer/docs](https://bubble.alemonjs.com/developer/docs)
-
-## 支持的事件类型
-
-- `MESSAGE_CREATE` - 频道新消息创建
-- `MESSAGE_UPDATE` - 频道消息更新
-- `MESSAGE_DELETE` - 频道消息删除
-- `MESSAGE_UNPIN` - 频道消息取消置顶
-- `DM_MESSAGE_CREATE` - 私聊新消息创建
-- `DM_MESSAGE_UPDATE` - 私聊消息更新
-- `DM_MESSAGE_DELETE` - 私聊消息删除
-- `DM_MESSAGE_UNPIN` - 私聊消息取消置顶
-- `GUILD_MEMBER_ADD` - 成员加入服务器
-- `GUILD_MEMBER_UPDATE` - 成员更新
-- `GUILD_MEMBER_REMOVE` - 成员离开服务器
-- `BOT_READY` - 机器人就绪
-- `EVENTS_SUBSCRIBED` - 事件订阅成功
-- `EVENTS_UNSUBSCRIBED` - 事件取消订阅成功
-- `SUBSCRIBE_DENIED` - 订阅被拒绝
+  # 隐藏不支持的消息类型（可选，默认: false）
+  # 开启后，转为文本时不可读内容（如 [视频]、[音频]、[图片]、[附件] 等占位符）将被置空
+  # 可读内容（如标题、按钮文本、链接等）仍会保留为纯文本
+  # 转换后内容为空时，将跳过发送并输出 info 日志
+  hideUnsupported: true
+```

package/lib/config.d.ts

@@ -8,6 +8,7 @@ export type Options = BUBBLEOptions & {
     websocket_options?: any;
     clientName?: string;
     URL?: string;
+    hideUnsupported?: boolean;
 };
 export declare const platform = "bubble";
 export declare const getBubbleConfig: () => Options & {

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, hideUnsupported?: boolean) => string;
+export declare const dataEnumToBubbleText: (item: DataEnums, hideUnsupported?: boolean) => string;

package/lib/format.js

@@ -0,0 +1,84 @@
+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, hideUnsupported) => {
+    if (hideUnsupported) {
+        return raw.replace(/!\[([^\]]*)\]\([^)]*\)/g, '');
+    }
+    return raw;
+};
+const dataEnumToBubbleText = (item, hideUnsupported) => {
+    switch (item.type) {
+        case 'MarkdownOriginal':
+            return markdownRawToBubbleText(String(item.value), hideUnsupported);
+        case 'Attachment':
+            return hideUnsupported ? '' : `[附件${item.options?.filename ? ': ' + item.options.filename : ''}]`;
+        case 'Audio':
+            return hideUnsupported ? '' : '[音频]';
+        case 'Video':
+            return hideUnsupported ? '' : '[视频]';
+        default:
+            return '';
+    }
+};
+
+export { dataEnumToBubbleText, markdownRawToBubbleText, markdownToBubbleText };

package/lib/index.js

@@ -14,9 +14,12 @@ const main = () => {
     const client = new BubbleClient();
     void client.connect();
     let botId = '';
-    client.getMe().then(res => {
+    client
+        .getMe()
+        .then(res => {
         botId = String(res?.id ?? '');
-    }).catch(() => { });
+    })
+        .catch(() => { });
     const createUserAvatar = (_UserId, avatar) => {
         if (!avatar) {
             return '';

package/lib/send.js

@@ -1,10 +1,102 @@
 import { createResult, ResultCode } from 'alemonjs';
 import { readFileSync } from 'fs';
+import { dataEnumToBubbleText } from './format.js';
+import { getBubbleConfig } from './config.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 +107,13 @@ 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 hide = getBubbleConfig().hideUnsupported === true;
+        const fallbackText = unsupportedItems
+            .map(item => dataEnumToBubbleText(item, hide))
+            .filter(Boolean)
+            .join('\n');
         const content = val
             .filter(item => item.type === 'Mention' || item.type === 'Text' || item.type === 'Link')
             .map(item => {
@@ -51,6 +150,12 @@ const sendToRoom = async (client, param, val) => {
             return '';
         })
             .join('');
+        const contentMd = buildBubbleMdContent(mdAndButtons);
+        const finalContent = [content, contentMd, fallbackText].filter(Boolean).join('\n');
+        if (hide && !finalContent && images.length <= 0) {
+            logger.info('[bubble] hideUnsupported: 消息内容转换后为空，跳过发送');
+            return [];
+        }
         if (images.length > 0) {
             let bufferData = null;
             for (let i = 0; i < images.length; i++) {
@@ -89,7 +194,7 @@ const sendToRoom = async (client, param, val) => {
             }
             if (channelId) {
                 const res = await client.sendMessage(channelId, {
-                    content: content,
+                    content: finalContent,
                     type: 'image',
                     attachments: [fileAttachment]
                 });
@@ -97,7 +202,7 @@ const sendToRoom = async (client, param, val) => {
             }
             if (threadId) {
                 const res = await client.sendDm(threadId, {
-                    content: content,
+                    content: finalContent,
                     type: 'image',
                     attachments: [fileAttachment]
                 });
@@ -105,100 +210,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' && 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 = line?.value;
-                            const options = 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>`;
-                }
-            });
-        }
-        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",
+  "version": "2.1.2",
   "description": "bubble platform",
   "author": "lemonade",
   "license": "MIT",