@alemonjs/onebot 0.2.2 → 0.2.3

package/README.md

@@ -1,7 +1,5 @@
 # [https://alemonjs.com/](https://alemonjs.com/)
 
-跨平台开发的事件驱动机器人
-
 - alemomn.config.yaml
 
 ```yaml

package/lib/index.d.ts

@@ -4,6 +4,7 @@ import { OneBotClient } from './sdk/wss.js';
 type Client = typeof OneBotClient.prototype;
 declare const client: Client;
 declare const platform = "onebot";
-declare const _default: () => alemonjs.ClientAPI;
+declare const _default: alemonjs.DefinePlatformValue;
 
-export { type Client, client, _default as default, platform };
+export { client, _default as default, platform };
+export type { Client };

package/lib/index.js

@@ -1,5 +1,6 @@
-import { defineBot, getConfigValue, useUserHashKey, OnProcessor } from 'alemonjs';
+import { getConfigValue, useUserHashKey, onProcessor, createResult, ResultCode } from 'alemonjs';
 import { OneBotClient } from './sdk/wss.js';
+import { createServer } from './server/index.js';
 
 const client = new Proxy({}, {
     get: (_, prop) => {
@@ -12,12 +13,11 @@ const client = new Proxy({}, {
     }
 });
 const platform = 'onebot';
-var index = defineBot(() => {
+var index = definePlatform(() => {
     let value = getConfigValue();
     if (!value)
         value = {};
     const config = value[platform];
-    //
     const client = new OneBotClient({
         // url
         url: config?.url ?? '',
@@ -28,20 +28,16 @@ var index = defineBot(() => {
         // 反向连接端口
         reverse_port: config?.reverse_port ?? 17158
     });
-    //
     client.connect();
-    //
     client.on('META', event => {
         if (event?.self_id) {
             String(event.self_id);
         }
     });
-    //
     client.on('MESSAGES', event => {
         const uis = config.master_uids ?? [];
         let msg = '';
         const arr = [];
-        // let at_users = []
         for (const item of event.message) {
             if (item.type == 'text') {
                 msg = item.data.text;
@@ -76,7 +72,6 @@ var index = defineBot(() => {
             Platform: platform,
             // 频道
             GuildId: String(event.group_id),
-            // guild_name: event.group_name,
             // 子频道
             ChannelId: String(event.group_id),
             IsMaster: uis.includes(String(event.user_id)),
@@ -93,74 +88,204 @@ var index = defineBot(() => {
             // 创建时间
             CreateAt: Date.now(),
             // 标签
-            tag: 'MESSAGES',
+            tag: 'message.create',
             //
             value: null
         };
-        // 当访问的时候获取
-        Object.defineProperty(e, 'value', {
-            get() {
-                return event;
+        // 处理消息
+        onProcessor('message.create', e, event);
+    });
+    client.on('DIRECT_MESSAGE', (event) => {
+        const uis = config.master_uids ?? [];
+        let msg = '';
+        const arr = [];
+        for (const item of event.message) {
+            if (item.type == 'text') {
+                msg = item.data.text;
+            }
+        }
+        for (const item of arr) {
+            msg = msg.replace(item.text, '').trim();
+        }
+        const url = `https://q1.qlogo.cn/g?b=qq&s=0&nk=${event.user_id}`;
+        const UserAvatar = {
+            toBuffer: async () => {
+                const arrayBuffer = await fetch(url).then(res => res.arrayBuffer());
+                return Buffer.from(arrayBuffer);
+            },
+            toBase64: async () => {
+                const arrayBuffer = await fetch(url).then(res => res.arrayBuffer());
+                return Buffer.from(arrayBuffer).toString('base64');
+            },
+            toURL: async () => {
+                return url;
             }
+        };
+        const UserId = String(event.user_id);
+        const UserKey = useUserHashKey({
+            Platform: platform,
+            UserId
         });
+        // 定义消
+        const e = {
+            name: 'private.message.create',
+            // 平台类型
+            Platform: platform,
+            // 频道
+            // GuildId: String(event.group_id),
+            // 子频道
+            // ChannelId: String(event.group_id),
+            IsMaster: uis.includes(String(event.user_id)),
+            IsBot: false,
+            UserId: UserId,
+            UserName: event.sender.nickname,
+            UserKey,
+            UserAvatar: UserAvatar,
+            // message
+            MessageId: String(event.message_id),
+            MessageText: msg,
+            // 用户openId
+            OpenId: String(event.user_id),
+            // 创建时间
+            CreateAt: Date.now(),
+            // 标签
+            tag: 'private.message.create',
+            //
+            value: null
+        };
         // 处理消息
-        OnProcessor(e, 'message.create');
-    });
-    client.on('DIRECT_MESSAGE', () => {
-        // const e = {
-        //   isMaster: event.user_id == masterId,
-        //   msg_txt: event.raw_message,
-        //   msg: event.raw_message.trim(),
-        //   msg_id: event.message_id,
-        //   open_id: event.user_id,
-        //   user_id: event.user_id,
-        //   user_avatar:
-        //     event.platform == 'qq'
-        //       ? `https://q1.qlogo.cn/g?b=qq&s=0&nk=${event.user_id}`
-        //       : '',
-        //   user_name: event.sender.nickname,
+        onProcessor('private.message.create', e, event);
     });
     // 错误处理
     client.on('ERROR', event => {
         console.error('ERROR', event);
     });
     global.client = client;
+    createServer(client);
+    const sendGroup = async (event, val) => {
+        if (val.length < 0)
+            return Promise.all([]);
+        const content = val
+            .filter(item => item.type == 'Link' || item.type == 'Mention' || item.type == 'Text')
+            .map(item => item.value)
+            .join('');
+        if (content) {
+            return Promise.all([content].map(item => {
+                client.sendGroupMessage({
+                    group_id: event.ChannelId,
+                    message: [
+                        {
+                            type: 'text',
+                            data: {
+                                text: item
+                            }
+                        }
+                    ]
+                });
+                return createResult(ResultCode.Ok, 'client.groupOpenMessages', {
+                    id: null
+                });
+            }));
+        }
+        const images = val.filter(item => item.type == 'Image').map(item => item.value);
+        if (images) {
+            return Promise.all(images.map(item => {
+                client.sendGroupMessage({
+                    group_id: event.ChannelId,
+                    message: [
+                        {
+                            type: 'image',
+                            data: {
+                                file: `base64://${item.toString('base64')}`
+                            }
+                        }
+                    ]
+                });
+                return createResult(ResultCode.Ok, 'client.groupOpenMessages', {
+                    id: null
+                });
+            }));
+        }
+        return Promise.all([]);
+    };
+    /**
+     *
+     * @param event
+     * @param val
+     * @returns
+     */
+    const sendPrivate = async (event, val) => {
+        if (val.length < 0)
+            return Promise.all([]);
+        const content = val
+            .filter(item => item.type == 'Link' || item.type == 'Mention' || item.type == 'Text')
+            .map(item => item.value)
+            .join('');
+        if (content) {
+            return Promise.all([content].map(item => {
+                client.sendGroupMessage({
+                    group_id: event.ChannelId,
+                    message: [
+                        {
+                            type: 'text',
+                            data: {
+                                text: item
+                            }
+                        }
+                    ]
+                });
+                return createResult(ResultCode.Ok, 'client.groupOpenMessages', {
+                    id: null
+                });
+            })).catch(err => [
+                createResult(ResultCode.Fail, err?.response?.data ?? err?.message ?? err, null)
+            ]);
+        }
+        const images = val.filter(item => item.type == 'Image').map(item => item.value);
+        if (images) {
+            return Promise.all(images.map(item => {
+                client.sendGroupMessage({
+                    group_id: event.ChannelId,
+                    message: [
+                        {
+                            type: 'image',
+                            data: {
+                                file: `base64://${item.toString('base64')}`
+                            }
+                        }
+                    ]
+                });
+                return createResult(ResultCode.Ok, 'client.groupOpenMessages', {
+                    id: null
+                });
+            })).catch(err => [
+                createResult(ResultCode.Fail, err?.response?.data ?? err?.message ?? err, null)
+            ]);
+        }
+        return Promise.all([]);
+    };
     return {
+        platform,
         api: {
+            active: {
+                send: {
+                    channel: (event, val) => {
+                        return sendGroup(event, val);
+                    },
+                    user: (event, val) => {
+                        return sendPrivate(event, val);
+                    }
+                }
+            },
             use: {
                 send: (event, val) => {
                     if (val.length < 0)
                         return Promise.all([]);
-                    const content = val
-                        .filter(item => item.type == 'Link' || item.type == 'Mention' || item.type == 'Text')
-                        .map(item => item.value)
-                        .join('');
-                    if (content) {
-                        return Promise.all([content].map(item => client.sendGroupMessage({
-                            group_id: event.ChannelId,
-                            message: [
-                                {
-                                    type: 'text',
-                                    data: {
-                                        text: item
-                                    }
-                                }
-                            ]
-                        })));
+                    if (event['name'] == 'private.message.create') {
+                        return sendPrivate(event, val);
                     }
-                    const images = val.filter(item => item.type == 'Image').map(item => item.value);
-                    if (images) {
-                        return Promise.all(images.map(item => client.sendGroupMessage({
-                            group_id: event.ChannelId,
-                            message: [
-                                {
-                                    type: 'image',
-                                    data: {
-                                        file: `base64://${item.toString('base64')}`
-                                    }
-                                }
-                            ]
-                        })));
+                    else if (event['name'] == 'message.create') {
+                        return sendGroup(event, val);
                     }
                     return Promise.all([]);
                 },

package/lib/sdk/wss.d.ts

@@ -4,6 +4,10 @@ type OneBotEventMap = {
     DIRECT_MESSAGE: DIRECT_MESSAGE_TYPE;
     MESSAGES: MESSAGES_TYPE;
     META: meta_event_lifecycle | meta_event_heartbeat;
+    REQUEST_ADD_FRIEND: any;
+    REQUEST_ADD_GROUP: any;
+    NOTICE_GROUP_MEMBER_INCREASE: any;
+    NOTICE_GROUP_MEMBER_REDUCE: any;
     ERROR: any;
 };
 /**
@@ -35,7 +39,16 @@ declare class OneBotClient {
      */
     connect(): Promise<void>;
     /**
-     *
+     * 发送私聊消息
+     * @param options
+     * @returns
+     */
+    sendPrivateMessage(options: {
+        user_id: number;
+        message: any[];
+    }): void;
+    /**
+     * 发送群消息
      * @param options
      * @returns
      */
@@ -44,13 +57,53 @@ declare class OneBotClient {
         message: any[];
     }): void;
     /**
+     * 发送消息
      * @param options
      * @returns
      */
-    sendPrivateMessage(options: {
-        user_id: number;
+    sendMessage(options: {
+        message_type: 'private' | 'group';
+        group_id?: number;
+        user_id?: number;
         message: any[];
     }): void;
+    /**
+     * 好友列表
+     */
+    getFriendList(): void;
+    /**
+     * 群列表
+     */
+    getGroupList(): void;
+    /**
+     * 群成员列表
+     * @param options
+     * @returns
+     */
+    getGroupMemberList(options: {
+        group_id: number;
+    }): void;
+    /**
+     * 处理好友请求
+     * @param options
+     * @returns
+     */
+    setFriendAddRequest(options: {
+        flag: string;
+        approve: boolean;
+        remark?: string;
+    }): void;
+    /**
+     * 处理群请求
+     * @param options
+     * @returns
+     */
+    setGroupAddRequest(options: {
+        flag: string;
+        sub_type: string;
+        approve: boolean;
+        reason?: string;
+    }): void;
     /**
      * @param options
      * @returns
@@ -61,7 +114,7 @@ declare class OneBotClient {
             [key: string]: any;
         };
         echo?: string;
-    }): Promise<unknown> | undefined;
+    }): Promise<unknown>;
 }
 
 export { OneBotClient };

package/lib/sdk/wss.js

@@ -1,4 +1,4 @@
-import ws from 'ws';
+import WebSocket, { WebSocketServer } from 'ws';
 import { randomUUID } from 'crypto';
 
 /**
@@ -72,20 +72,40 @@ class OneBotClient {
                             this.#events['DIRECT_MESSAGE'](event);
                     }
                     else {
-                        console.info('未知消息类型', event);
+                        // console.info('未知消息类型', event)
                     }
                     return;
                 }
                 else if (event?.post_type == 'notice') {
-                    console.info('暂未处理事件', event);
+                    if (event?.notice_type == 'group_increase') {
+                        // 群成员增加
+                        if (this.#events['NOTICE_GROUP_MEMBER_INCREASE'])
+                            this.#events['NOTICE_GROUP_MEMBER_INCREASE'](event);
+                    }
+                    else if (event?.notice_type == 'group_decrease') {
+                        // 群成员减少
+                        if (this.#events['NOTICE_GROUP_MEMBER_REDUCE'])
+                            this.#events['NOTICE_GROUP_MEMBER_REDUCE'](event);
+                    }
                     return;
                 }
                 else if (event?.post_type == 'request') {
-                    console.info('暂未处理事件', event);
+                    // 收到加群 或 加好友的请求。
+                    if (event?.request_type == 'friend') {
+                        if (this.#events['REQUEST_ADD_FRIEND'])
+                            this.#events['REQUEST_ADD_FRIEND'](event);
+                    }
+                    else if (event?.request_type == 'group') {
+                        if (this.#events['REQUEST_ADD_GROUP'])
+                            this.#events['REQUEST_ADD_GROUP'](event);
+                    }
                     return;
                 }
-                else {
-                    console.info('未知事件', event);
+                else if (event?.echo === 'get_friend_list' || event?.echo === 'get_group_list' || event?.echo === 'get_group_member_list') {
+                    // 处理获取好友列表和群列表的响应
+                    // if (this.#events['META']) this.#events['META'](event)
+                    // console.debug('响应', event)
+                    return;
                 }
                 if (!event?.post_type && event?.echo && this.#echo[event?.echo]) {
                     if (![0, 1].includes(event?.retcode))
@@ -115,7 +135,7 @@ class OneBotClient {
         if (!this.#ws) {
             if (reverse_enable) {
                 // reverse_open
-                const server = new ws.Server({ port: reverse_port ?? 17158 });
+                const server = new WebSocketServer({ port: reverse_port ?? 17158 });
                 server.on('connection', ws => {
                     this.#ws = ws;
                     // message
@@ -127,7 +147,7 @@ class OneBotClient {
             }
             else {
                 // forward_open
-                this.#ws = new ws(url, c);
+                this.#ws = new WebSocket(url, c);
                 this.#ws.on('open', () => {
                     console.debug(`open:${url}`);
                 });
@@ -139,7 +159,21 @@ class OneBotClient {
         }
     }
     /**
-     *
+     * 发送私聊消息
+     * @param options
+     * @returns
+     */
+    sendPrivateMessage(options) {
+        if (!this.#ws)
+            return;
+        return this.#ws.send(JSON.stringify({
+            action: 'send_private_msg',
+            params: options,
+            echo: randomUUID()
+        }));
+    }
+    /**
+     * 发送群消息
      * @param options
      * @returns
      */
@@ -153,14 +187,81 @@ class OneBotClient {
         }));
     }
     /**
+     * 发送消息
      * @param options
      * @returns
      */
-    sendPrivateMessage(options) {
+    sendMessage(options) {
         if (!this.#ws)
             return;
         return this.#ws.send(JSON.stringify({
-            action: 'send_private_msg',
+            action: 'send_msg',
+            params: options,
+            echo: randomUUID()
+        }));
+    }
+    /**
+     * 好友列表
+     */
+    getFriendList() {
+        if (!this.#ws)
+            return;
+        return this.#ws.send(JSON.stringify({
+            action: 'get_friend_list',
+            params: {},
+            echo: 'get_friend_list'
+        }));
+    }
+    /**
+     * 群列表
+     */
+    getGroupList() {
+        if (!this.#ws)
+            return;
+        return this.#ws.send(JSON.stringify({
+            action: 'get_group_list',
+            params: {},
+            echo: 'get_group_list'
+        }));
+    }
+    /**
+     * 群成员列表
+     * @param options
+     * @returns
+     */
+    getGroupMemberList(options) {
+        if (!this.#ws)
+            return;
+        return this.#ws.send(JSON.stringify({
+            action: 'get_group_member_list',
+            params: options,
+            echo: 'get_group_member_list'
+        }));
+    }
+    /**
+     * 处理好友请求
+     * @param options
+     * @returns
+     */
+    setFriendAddRequest(options) {
+        if (!this.#ws)
+            return;
+        return this.#ws.send(JSON.stringify({
+            action: 'set_friend_add_request',
+            params: options,
+            echo: randomUUID()
+        }));
+    }
+    /**
+     * 处理群请求
+     * @param options
+     * @returns
+     */
+    setGroupAddRequest(options) {
+        if (!this.#ws)
+            return;
+        return this.#ws.send(JSON.stringify({
+            action: 'set_group_add_request',
             params: options,
             echo: randomUUID()
         }));

package/lib/server/index.js

@@ -0,0 +1,41 @@
+import Koa from 'koa';
+import Router from 'koa-router';
+
+// 使用koa + router 写 hello world
+const createServer = (client) => {
+    const app = new Koa();
+    const router = new Router();
+    const port = 8080; // 端口号
+    // 检测
+    router.get('/', (ctx) => {
+        ctx.body = 'Hello, World!';
+    });
+    // 获取群列表
+    router.get('/get_group_list', async (ctx) => {
+        client.getGroupList();
+        ctx.body = 'Hello, World!';
+    });
+    // 获取好友列表
+    router.get('/get_friend_list', async (ctx) => {
+        client.getFriendList();
+        ctx.body = 'Hello, World!';
+    });
+    // 获取群成员列表
+    router.get('/get_group_member_list', async (ctx) => {
+        const group_id = ctx.query.group_id;
+        if (!group_id) {
+            ctx.status = 400;
+            ctx.body = 'group_id is required';
+            return;
+        }
+        client.getGroupMemberList({ group_id: Number(group_id) });
+        ctx.body = 'Hello, World!';
+    });
+    app.use(router.routes());
+    app.use(router.allowedMethods());
+    app.listen(port, () => {
+        console.log(`Server is running at http://localhost:${port}`);
+    });
+};
+
+export { createServer };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/onebot",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "onebot",
   "author": "lemonade",
   "license": "MIT",
@@ -17,16 +17,22 @@
     },
     "./package": "./package.json"
   },
-  "devDependencies": {
-    "@rollup/plugin-typescript": "^11.1.6",
-    "lvyjs": "^0.2.13",
-    "rollup": "^4.18.1",
-    "rollup-plugin-dts": "^6.1.1",
-    "tsx": "^4.19.1"
-  },
   "keywords": [
     "alemonjs"
   ],
+  "dependencies": {
+    "ws": "^8.18.1"
+  },
+  "alemonjs": {
+    "desktop": {
+      "platform": [
+        {
+          "name": "onebot"
+        }
+      ],
+      "logo": "antd.RobotOutlined"
+    }
+  },
   "publishConfig": {
     "registry": "https://registry.npmjs.org",
     "access": "public"