@alemonjs/onebot 2.1.0-alpha.7 → 2.1.0-alpha.9

package/lib/index.js

@@ -260,32 +260,86 @@ var index = () => {
                     return Metions;
                 }
                 return [];
+            },
+            delete(message_id) {
+                return client.deleteMsg({ message_id: Number(message_id) });
+            },
+            file: {
+                channel: client.uploadGroupFile.bind(client),
+                user: client.uploadPrivateFile.bind(client)
+            },
+            forward: {
+                channel: client.sendGroupForward.bind(client),
+                user: client.sendPrivateForward.bind(client)
             }
         }
     };
     cbp.onactions(async (data, consume) => {
-        if (data.action === 'message.send') {
-            const event = data.payload.event;
-            const paramFormat = data.payload.params.format;
-            const res = await api.use.send(event, paramFormat);
-            consume(res);
-        }
-        else if (data.action === 'message.send.channel') {
-            const channel_id = data.payload.ChannelId;
-            const val = data.payload.params.format;
-            const res = await api.active.send.channel(channel_id, val);
-            consume(res);
-        }
-        else if (data.action === 'message.send.user') {
-            const user_id = data.payload.UserId;
-            const val = data.payload.params.format;
-            const res = await api.active.send.user(user_id, val);
-            consume(res);
-        }
-        else if (data.action === 'mention.get') {
-            const event = data.payload.event;
-            const res = await api.use.mention(event);
-            consume([createResult(ResultCode.Ok, '请求完成', res)]);
+        switch (data.action) {
+            case 'message.send': {
+                const event = data.payload.event;
+                const paramFormat = data.payload.params.format;
+                const res = await api.use.send(event, paramFormat);
+                return consume(res);
+            }
+            case 'message.send.channel': {
+                const channel_id = data.payload.ChannelId;
+                const val = data.payload.params.format;
+                const res = await api.active.send.channel(channel_id, val);
+                return consume(res);
+            }
+            case 'message.send.user': {
+                const user_id = data.payload.UserId;
+                const val = data.payload.params.format;
+                const res = await api.active.send.user(user_id, val);
+                return consume(res);
+            }
+            case 'mention.get': {
+                const event = data.payload.event;
+                const res = await api.use.mention(event);
+                return consume([createResult(ResultCode.Ok, '请求完成', res)]);
+            }
+            case 'message.delete': {
+                const res = await api.use
+                    .delete(data.payload.MessageId)
+                    .then(res => createResult(ResultCode.Ok, data.action, res))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                return consume([res]);
+            }
+            case 'file.send.channel': {
+                const res = await api.use.file
+                    .channel(data.payload.ChannelId, data.payload.params)
+                    .then(res => createResult(ResultCode.Ok, data.action, res))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                return consume([res]);
+            }
+            case 'file.send.user': {
+                const res = await api.use.file
+                    .user(data.payload.UserId, data.payload.params)
+                    .then(res => createResult(ResultCode.Ok, data.action, res))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                return consume([res]);
+            }
+            case 'message.forward.channel': {
+                const res = await api.use.forward
+                    .channel(data.payload.ChannelId, data.payload.params.map(i => ({
+                    ...i,
+                    content: DataToMessage(i.content)
+                })))
+                    .then(res => createResult(ResultCode.Ok, data.action, res))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                return consume([res]);
+            }
+            case 'message.forward.user': {
+                const res = await api.use.forward
+                    .user(data.payload.UserId, data.payload.params.map(i => ({
+                    ...i,
+                    content: DataToMessage(i.content)
+                })))
+                    .then(res => createResult(ResultCode.Ok, data.action, res))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                return consume([res]);
+            }
         }
     });
     // 处理 api 调用

package/lib/sdk/api.d.ts

@@ -68,6 +68,43 @@ declare class OneBotAPI {
         approve: boolean;
         reason?: string;
     }): Promise<any>;
+    /** 撤回消息 */
+    deleteMsg(options: {
+        message_id: number;
+    }): Promise<any>;
+    /** 上传私聊文件 */
+    uploadPrivateFile(options: {
+        user_id: number;
+        file: string;
+        name?: string;
+    }): Promise<any>;
+    /** 上传群文件 */
+    uploadGroupFile(options: {
+        group_id: number;
+        file: string;
+        name?: string;
+        folder?: string;
+    }): Promise<any>;
+    /** 发送私聊转发 */
+    sendPrivateForward(options: {
+        user_id: number;
+        messages: {
+            time?: number;
+            content: any[];
+            user_id?: string;
+            nickname?: string;
+        }[];
+    }): Promise<any>;
+    /** 发送群转发 */
+    sendGroupForward(options: {
+        group_id: number;
+        messages: {
+            time?: number;
+            content: any[];
+            user_id?: string;
+            nickname?: string;
+        }[];
+    }): Promise<any>;
 }
 
 export { OneBotAPI };

package/lib/sdk/api.js

@@ -153,6 +153,61 @@ class OneBotAPI {
             params: options
         });
     }
+    /** 撤回消息 */
+    deleteMsg(options) {
+        if (!this.ws)
+            return;
+        return send(this.ws, {
+            action: 'delete_msg',
+            params: options
+        });
+    }
+    /** 上传私聊文件 */
+    uploadPrivateFile(options) {
+        if (!this.ws)
+            return;
+        return send(this.ws, {
+            action: 'upload_private_file',
+            params: options
+        });
+    }
+    /** 上传群文件 */
+    uploadGroupFile(options) {
+        if (!this.ws)
+            return;
+        return send(this.ws, {
+            action: 'upload_group_file',
+            params: options
+        });
+    }
+    /** 发送私聊转发 */
+    sendPrivateForward(options) {
+        if (!this.ws)
+            return;
+        return send(this.ws, {
+            action: 'send_private_forward_msg',
+            params: {
+                user_id: 80000000,
+                nickname: '匿名消息',
+                ...options,
+                messages: options.messages.map(data => ({ data, type: 'node' }))
+            }
+        });
+    }
+    /** 发送群转发 */
+    sendGroupForward(options) {
+        if (!this.ws)
+            return;
+        return send(this.ws, {
+            action: 'send_group_forward_msg',
+            params: {
+                user_id: 80000000,
+                nickname: '匿名消息',
+                ...options,
+                messages: options.messages.map(data => ({ data, type: 'node' }))
+            }
+        });
+    }
 }
 
 export { OneBotAPI, consume };

package/lib/sdk/wss.js

@@ -1,5 +1,6 @@
 import WebSocket, { WebSocketServer } from 'ws';
 import { OneBotAPI, consume } from './api.js';
+import dayjs from 'dayjs';
 
 /**
  * 连接
@@ -24,6 +25,15 @@ class OneBotClient extends OneBotAPI {
         }
     }
     #events = {};
+    // 重连次数
+    #count = 0;
+    #getReConnectTime() {
+        const time = this.#count > 3 ? 1000 * 6 : 1000 * 1;
+        const curTime = this.#count > 6 ? 1000 * this.#count * 2 : time;
+        logger.info(`[OneBot] 等待 ${dayjs(curTime).format('mm:ss')} 后重新连接`);
+        this.#count++;
+        return curTime;
+    }
     /**
      * 注册事件处理程序
      * @param key 事件名称
@@ -106,6 +116,12 @@ class OneBotClient extends OneBotAPI {
         };
         const onClose = (code, reason) => {
             logger.error(`[OneBot] WebSocket closed: ${code} - ${reason.toString('utf8')}`);
+            if (reverse_enable)
+                return;
+            const curTime = this.#getReConnectTime();
+            setTimeout(() => {
+                this.connect();
+            }, curTime);
         };
         if (!this.ws) {
             if (reverse_enable) {
@@ -125,6 +141,7 @@ class OneBotClient extends OneBotAPI {
                 this.ws = new WebSocket(url, c);
                 this.ws.on('open', () => {
                     logger.info(`[OneBot] connected: ${url}`);
+                    this.#count = 0;
                 });
                 // message
                 this.ws.on('message', onMessage);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/onebot",
-  "version": "2.1.0-alpha.7",
+  "version": "2.1.0-alpha.9",
   "description": "onebot v11",
   "author": "lemonade",
   "license": "MIT",
@@ -21,6 +21,7 @@
     "alemonjs"
   ],
   "dependencies": {
+    "dayjs": "^1.11.13",
     "ws": "^8.18.1"
   },
   "peerDependencies": {