@alemonjs/bubble 2.1.0-alpha.2 → 2.1.0-alpha.4

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';
 
@@ -80,11 +80,11 @@ const main = () => {
         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)];
                 }
             }
@@ -97,15 +97,16 @@ const main = () => {
                 const tag = event.tag;
                 if (tag === 'message.create') {
                     const ChannelId = String(event.value.channelId || '');
-                    const res = await sendchannel(client, { channel_id: ChannelId }, val);
+                    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.authorId || '');
                     const ChannelId = String(event.value.channelId || '');
-                    const res = await senduser(client, {
+                    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/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,38 +5,15 @@ 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 content = val
             .filter(item => item.type === 'Mention' || item.type === 'Text' || item.type === 'Link')
@@ -92,19 +69,28 @@ 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('文件上传失败：未返回文件信息');
             }
-            const attachments = [fileAttachment];
-            const payload = {
-                content: content,
-                type: 'text',
-                attachments
-            };
-            const res = await client.sendMessage(channelId, payload);
-            return [createResult(ResultCode.Ok, '完成', res)];
+            if (channelId) {
+                const res = await client.sendMessage(channelId, {
+                    content: content,
+                    type: 'text',
+                    attachments: [fileAttachment]
+                });
+                return [createResult(ResultCode.Ok, '完成', res)];
+            }
+            if (threadId) {
+                const res = await client.sendDm(threadId, {
+                    content: content,
+                    type: 'text',
+                    attachments: [fileAttachment]
+                });
+                return [createResult(ResultCode.Ok, '完成', res)];
+            }
+            return [createResult(ResultCode.Ok, '完成', null)];
         }
         let contentMd = '';
         if (mds && mds.length > 0) {
@@ -157,24 +143,16 @@ const sendchannel = async (client, param, val) => {
                 }
             });
         }
-        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.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 ?? contentMd, type: 'text' });
+                return [createResult(ResultCode.Ok, '完成', res)];
+            }
+            if (threadId) {
+                const res = await client.sendDm(threadId, { content: content ?? contentMd, type: 'text' });
+                return [createResult(ResultCode.Ok, '完成', res)];
+            }
+            return [createResult(ResultCode.Ok, '完成', null)];
         }
         return [];
     }
@@ -182,20 +160,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.2",
+  "version": "2.1.0-alpha.4",
   "description": "bubble platform",
   "author": "lemonade",
   "license": "MIT",