@alemonjs/onebot 0.2.8 → 2.1.0-alpha.0

package/lib/config.d.ts

@@ -0,0 +1,3 @@
+declare const platform = "onebot";
+
+export { platform };

package/lib/config.js

@@ -0,0 +1,9 @@
+import { getConfigValue } from 'alemonjs';
+
+const platform = 'onebot';
+const getOneBotConfig = () => {
+    const value = getConfigValue() || {};
+    return value[platform] || {};
+};
+
+export { getOneBotConfig, platform };

package/lib/index.d.ts

@@ -1,10 +1,6 @@
-import * as alemonjs from 'alemonjs';
-import { OneBotClient } from './sdk/wss.js';
+export { platform } from './config.js';
+export { OneBotAPI as API } from './sdk/api.js';
 
-type Client = typeof OneBotClient.prototype;
-declare const client: Client;
-declare const platform = "onebot";
-declare const _default: alemonjs.DefinePlatformValue;
+declare const _default: () => void;
 
-export { client, _default as default, platform };
-export type { Client };
+export { _default as default };

package/lib/index.js

@@ -1,29 +1,14 @@
-import { getConfigValue, useUserHashKey, onProcessor, createResult, ResultCode } from 'alemonjs';
+import { cbpPlatform, useUserHashKey, createResult, ResultCode } from 'alemonjs';
+import { getBufferByURL } from 'alemonjs/utils';
 import { OneBotClient } from './sdk/wss.js';
 import { readFileSync } from 'fs';
+import { getOneBotConfig, platform } from './config.js';
+export { OneBotAPI as API } from './sdk/api.js';
 
 const MyBot = {
     id: ''};
-const ImageURLToBuffer = async (url) => {
-    const arrayBuffer = await fetch(url).then(res => res.arrayBuffer());
-    return Buffer.from(arrayBuffer);
-};
-const client = new Proxy({}, {
-    get: (_, prop) => {
-        if (prop in global.client) {
-            const original = global.client[prop];
-            // 防止函数内this丢失
-            return typeof original === 'function' ? original.bind(global.client) : original;
-        }
-        return undefined;
-    }
-});
-const platform = 'onebot';
-var index = definePlatform(() => {
-    let value = getConfigValue();
-    if (!value)
-        value = {};
-    const config = value[platform];
+var index = () => {
+    const config = getOneBotConfig();
     const client = new OneBotClient({
         // url
         url: config?.url ?? '',
@@ -35,6 +20,20 @@ var index = definePlatform(() => {
         reverse_port: config?.reverse_port ?? 17158
     });
     client.connect();
+    const url = `ws://127.0.0.1:${process.env?.port || config?.port || 17117}`;
+    const cbp = cbpPlatform(url);
+    const createUserAvatar = (id) => {
+        return `https://q1.qlogo.cn/g?b=qq&s=0&nk=${id}`;
+    };
+    const getMessageText = (message) => {
+        let msg = '';
+        for (const item of message) {
+            if (item.type == 'text') {
+                msg += item.data.text;
+            }
+        }
+        return msg.trim();
+    };
     client.on('META', event => {
         if (event?.self_id) {
             MyBot.id = String(event.self_id);
@@ -42,92 +41,41 @@ var index = definePlatform(() => {
     });
     client.on('MESSAGES', event => {
         const uis = config?.master_id ?? [];
-        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 msg = getMessageText(event.message);
         const UserId = String(event.user_id);
+        const UserAvatar = createUserAvatar(UserId);
         const UserKey = useUserHashKey({
             Platform: platform,
             UserId
         });
+        const groupId = String(event.group_id);
         // 定义消
         const e = {
             name: 'message.create',
-            // 平台类型
             Platform: platform,
-            // 频道
-            GuildId: String(event.group_id),
-            // 子频道
-            ChannelId: String(event.group_id),
-            IsMaster: uis.includes(String(event.user_id)),
+            GuildId: groupId,
+            ChannelId: groupId,
+            IsMaster: uis.includes(UserId),
+            SpaceId: groupId,
             IsBot: false,
             UserId: UserId,
             UserName: event.sender.nickname,
             UserKey,
             UserAvatar: UserAvatar,
-            // message
             MessageId: String(event.message_id),
             MessageText: msg.trim(),
-            // 用户openId
-            OpenId: String(event.user_id),
-            // 创建时间
+            OpenId: UserId,
             CreateAt: Date.now(),
-            // 标签
             tag: 'message.create',
-            //
-            value: null
+            value: event
         };
-        // 处理消息
-        onProcessor('message.create', e, event);
+        cbp.send(e);
     });
     client.on('DIRECT_MESSAGE', event => {
         const uis = config?.master_id ?? [];
-        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 msg = getMessageText(event.message);
         const UserId = String(event.user_id);
+        const UserAvatar = createUserAvatar(UserId);
         const UserKey = useUserHashKey({
             Platform: platform,
             UserId
@@ -135,95 +83,85 @@ var index = definePlatform(() => {
         // 定义消
         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.trim(),
-            // 用户openId
             OpenId: String(event.user_id),
-            // 创建时间
             CreateAt: Date.now(),
-            // 标签
             tag: 'private.message.create',
-            //
-            value: null
+            value: event
         };
-        // 处理消息
-        onProcessor('private.message.create', e, event);
+        cbp.send(e);
     });
     // 错误处理
     client.on('ERROR', event => {
-        console.error('ERROR', event);
+        logger.error(event);
     });
-    global.client = client;
     const sendGroup = async (event, val) => {
         if (val.length < 0)
-            return Promise.all([]);
+            return [];
         const content = val
             .filter(item => item.type == 'Mention' || item.type == 'Text')
             .map(item => item.value)
             .join('');
-        if (content) {
-            return Promise.all([content].map(item => {
-                client.sendGroupMessage({
+        try {
+            if (content) {
+                const res = await client.sendGroupMessage({
                     group_id: event.ChannelId,
                     message: [
                         {
                             type: 'text',
                             data: {
-                                text: item
+                                text: content
                             }
                         }
                     ]
                 });
-                return createResult(ResultCode.Ok, 'client.groupOpenMessages', {
-                    id: null
-                });
-            }));
-        }
-        const images = val.filter(item => item.type == 'Image' || item.type == 'ImageFile' || item.type == 'ImageURL');
-        if (images) {
-            return Promise.all(images.map(async (item) => {
-                let data = null;
-                if (item.type === 'ImageFile') {
-                    const db = readFileSync(item.value);
-                    data = db;
-                }
-                else if (item.type === 'ImageURL') {
-                    const db = await ImageURLToBuffer(item.value);
-                    data = db;
-                }
-                else {
-                    data = item.value;
-                }
-                client.sendGroupMessage({
-                    group_id: event.ChannelId,
-                    message: [
-                        {
-                            type: 'image',
-                            data: {
-                                file: `base64://${data.toString('base64')}`
+                return [createResult(ResultCode.Ok, 'client.groupOpenMessages', res)];
+            }
+            const images = val.filter(item => item.type == 'Image' || item.type == 'ImageFile' || item.type == 'ImageURL');
+            if (images) {
+                return Promise.all(images.map(async (item) => {
+                    let data = null;
+                    if (item.type === 'ImageFile') {
+                        const db = readFileSync(item.value);
+                        data = db;
+                    }
+                    else if (item.type === 'ImageURL') {
+                        const db = await getBufferByURL(item.value);
+                        data = db;
+                    }
+                    else {
+                        // data = item.value
+                        data = Buffer.from(item.value, 'base64');
+                    }
+                    client.sendGroupMessage({
+                        group_id: event.ChannelId,
+                        message: [
+                            {
+                                type: 'image',
+                                data: {
+                                    file: `base64://${data.toString('base64')}`
+                                }
                             }
-                        }
-                    ]
-                });
-                return createResult(ResultCode.Ok, 'client.groupOpenMessages', {
-                    id: null
-                });
-            }));
+                        ]
+                    });
+                    return createResult(ResultCode.Ok, 'client.groupOpenMessages', {
+                        id: null
+                    });
+                }));
+            }
+        }
+        catch (error) {
+            return [createResult(ResultCode.Fail, 'client.groupOpenMessages', error)];
         }
-        return Promise.all([]);
+        return [];
     };
     /**
      *
@@ -238,134 +176,151 @@ var index = definePlatform(() => {
             .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,
+        try {
+            if (content) {
+                const res = await client.sendPrivateMessage({
+                    user_id: event.UserId,
                     message: [
                         {
                             type: 'text',
                             data: {
-                                text: item
+                                text: content
                             }
                         }
                     ]
                 });
-                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' || item.type == 'ImageFile' || item.type == 'ImageURL');
-        if (images) {
-            return Promise.all(images.map(async (item) => {
-                let data = null;
-                if (item.type === 'ImageFile') {
-                    const db = readFileSync(item.value);
-                    data = db;
-                }
-                else if (item.type === 'ImageURL') {
-                    const db = await ImageURLToBuffer(item.value);
-                    data = db;
-                }
-                else {
-                    data = item.value;
-                }
-                client.sendGroupMessage({
-                    group_id: event.ChannelId,
-                    message: [
-                        {
-                            type: 'image',
-                            data: {
-                                file: `base64://${data.toString('base64')}`
+                return [createResult(ResultCode.Ok, 'client.sendPrivateMessage', res)];
+            }
+            const images = val.filter(item => item.type == 'Image' || item.type == 'ImageFile' || item.type == 'ImageURL');
+            if (images) {
+                return Promise.all(images.map(async (item) => {
+                    let data = null;
+                    if (item.type === 'ImageFile') {
+                        const db = readFileSync(item.value);
+                        data = db;
+                    }
+                    else if (item.type === 'ImageURL') {
+                        const db = await getBufferByURL(item.value);
+                        data = db;
+                    }
+                    else {
+                        // data = item.value
+                        data = Buffer.from(item.value, 'base64');
+                    }
+                    client.sendPrivateMessage({
+                        user_id: event.UserId,
+                        message: [
+                            {
+                                type: 'image',
+                                data: {
+                                    file: `base64://${data.toString('base64')}`
+                                }
                             }
-                        }
-                    ]
-                });
-                return createResult(ResultCode.Ok, 'client.groupOpenMessages', {
-                    id: null
-                });
-            })).catch(err => [
-                createResult(ResultCode.Fail, err?.response?.data ?? err?.message ?? err, null)
-            ]);
+                        ]
+                    });
+                    return createResult(ResultCode.Ok, 'client.sendPrivateMessage', {
+                        id: null
+                    });
+                }));
+            }
         }
-        return Promise.all([]);
+        catch (error) {
+            return [createResult(ResultCode.Fail, 'client.sendPrivateMessage', error)];
+        }
+        return [];
     };
-    return {
-        platform,
-        api: {
-            active: {
-                send: {
-                    channel: (event, val) => {
-                        return sendGroup(event, val);
-                    },
-                    user: (event, val) => {
-                        return sendPrivate(event, val);
-                    }
+    const 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([]);
-                    if (event['name'] == 'private.message.create') {
-                        return sendPrivate(event, val);
-                    }
-                    else if (event['name'] == 'message.create') {
-                        return sendGroup(event, val);
-                    }
+            }
+        },
+        use: {
+            send: (event, val) => {
+                if (val.length < 0)
                     return Promise.all([]);
-                },
-                mention: async (event) => {
-                    const uis = config?.master_id ?? [];
-                    const e = event.value;
-                    if (event['name'] == 'message.create' || event['name'] == 'private.message.create') {
-                        const Metions = [];
-                        for (const item of e.message) {
-                            if (item.type == 'at') {
-                                let isBot = false;
-                                const uid = String(item.data.qq);
-                                if (uid == 'all') {
-                                    continue;
-                                }
-                                if (uid == MyBot.id) {
-                                    isBot = true;
-                                }
-                                const avatar = `https://q1.qlogo.cn/g?b=qq&s=0&nk=${uid}`;
-                                Metions.push({
-                                    UserId: uid,
-                                    UserKey: useUserHashKey({
-                                        Platform: platform,
-                                        UserId: uid
-                                    }),
-                                    UserName: item.data?.nickname,
-                                    UserAvatar: {
-                                        toBuffer: async () => {
-                                            const arrayBuffer = await fetch(avatar).then(res => res.arrayBuffer());
-                                            return Buffer.from(arrayBuffer);
-                                        },
-                                        toBase64: async () => {
-                                            const arrayBuffer = await fetch(avatar).then(res => res.arrayBuffer());
-                                            return Buffer.from(arrayBuffer).toString('base64');
-                                        },
-                                        toURL: async () => {
-                                            return avatar;
-                                        }
-                                    },
-                                    IsMaster: uis.includes(uid),
-                                    IsBot: isBot
-                                });
+                if (event['name'] == 'private.message.create') {
+                    return sendPrivate(event, val);
+                }
+                else if (event['name'] == 'message.create') {
+                    return sendGroup(event, val);
+                }
+                return Promise.all([]);
+            },
+            mention: async (event) => {
+                const uis = config?.master_id ?? [];
+                const e = event.value;
+                if (event['name'] == 'message.create' || event['name'] == 'private.message.create') {
+                    const Metions = [];
+                    for (const item of e.message) {
+                        if (item.type == 'at') {
+                            let isBot = false;
+                            const uid = String(item.data.qq);
+                            if (uid == 'all') {
+                                continue;
+                            }
+                            if (uid == MyBot.id) {
+                                isBot = true;
                             }
+                            const avatar = createUserAvatar(uid);
+                            Metions.push({
+                                UserId: uid,
+                                UserKey: useUserHashKey({
+                                    Platform: platform,
+                                    UserId: uid
+                                }),
+                                UserName: item.data?.nickname,
+                                UserAvatar: avatar,
+                                IsMaster: uis.includes(uid),
+                                IsBot: isBot
+                            });
                         }
-                        return Metions;
                     }
-                    return [];
+                    return Metions;
                 }
+                return [];
             }
         }
     };
-});
+    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)]);
+        }
+    });
+    // 处理 api 调用
+    cbp.onapis(async (data, consume) => {
+        const key = data.payload?.key;
+        if (client[key]) {
+            const params = data.payload.params;
+            const res = await client[key](...params);
+            consume([createResult(ResultCode.Ok, '请求完成', res)]);
+        }
+    });
+};
 
-export { client, index as default, platform };
+export { index as default, platform };

package/lib/sdk/api.d.ts

@@ -0,0 +1,73 @@
+import WebSocket from 'ws';
+
+declare class OneBotAPI {
+    ws: WebSocket | null;
+    /**
+     * 发送私聊消息
+     * @param options
+     * @returns
+     */
+    sendPrivateMessage(options: {
+        user_id: number;
+        message: any[];
+    }): Promise<any>;
+    /**
+     * 发送群消息
+     * @param options
+     * @returns
+     */
+    sendGroupMessage(options: {
+        group_id: number;
+        message: any[];
+    }): Promise<any>;
+    /**
+     * 发送消息
+     * @param options
+     * @returns
+     */
+    sendMessage(options: {
+        message_type: 'private' | 'group';
+        group_id?: number;
+        user_id?: number;
+        message: any[];
+    }): Promise<any>;
+    /**
+     * 好友列表
+     */
+    getFriendList(): Promise<any>;
+    /**
+     * 群列表
+     */
+    getGroupList(): Promise<any>;
+    /**
+     * 群成员列表
+     * @param options
+     * @returns
+     */
+    getGroupMemberList(options: {
+        group_id: number;
+    }): Promise<any>;
+    /**
+     * 处理好友请求
+     * @param options
+     * @returns
+     */
+    setFriendAddRequest(options: {
+        flag: string;
+        approve: boolean;
+        remark?: string;
+    }): Promise<any>;
+    /**
+     * 处理群请求
+     * @param options
+     * @returns
+     */
+    setGroupAddRequest(options: {
+        flag: string;
+        sub_type: string;
+        approve: boolean;
+        reason?: string;
+    }): Promise<any>;
+}
+
+export { OneBotAPI };

package/lib/sdk/api.js

@@ -0,0 +1,158 @@
+import { generateUniqueId, actionResolves, actionTimeouts, timeoutTime } from './config.js';
+
+/**
+ *
+ * @param ws
+ * @param data
+ * @returns
+ */
+const send = (ws, data) => {
+    const id = generateUniqueId();
+    // 设置唯一标识符
+    data.echo = id;
+    return new Promise((resolve, reject) => {
+        actionResolves.set(id, { resolve, reject });
+        // 发送消息
+        ws.send(JSON.stringify(data));
+        // 30 秒后超时
+        const timeout = setTimeout(() => {
+            // 被清理了
+            if (!actionResolves.has(id) || !actionTimeouts.has(id)) {
+                return;
+            }
+            // 删除回调
+            actionResolves.delete(id);
+            // 删除超时器
+            actionTimeouts.delete(id);
+            // 不会当错误进行处理。而是传入错误码
+            resolve(null);
+        }, timeoutTime);
+        actionTimeouts.set(id, timeout);
+    });
+};
+// 消费
+const consume = (parsedMessage) => {
+    // 读取 唯一标识
+    const id = parsedMessage.echo;
+    const { resolve, reject } = actionResolves.get(id) || {};
+    actionResolves.delete(id);
+    // 清除超时器
+    const timeout = actionTimeouts.get(id);
+    if (timeout) {
+        actionTimeouts.delete(id);
+        clearTimeout(timeout);
+    }
+    if (!resolve || !reject) {
+        return;
+    }
+    if (![0, 1].includes(parsedMessage?.retcode)) {
+        reject(parsedMessage?.data);
+        return;
+    }
+    resolve(parsedMessage?.data);
+};
+class OneBotAPI {
+    ws = null;
+    /**
+     * 发送私聊消息
+     * @param options
+     * @returns
+     */
+    sendPrivateMessage(options) {
+        if (!this.ws)
+            return;
+        return send(this.ws, {
+            action: 'send_private_msg',
+            params: options
+        });
+    }
+    /**
+     * 发送群消息
+     * @param options
+     * @returns
+     */
+    sendGroupMessage(options) {
+        if (!this.ws)
+            return;
+        return send(this.ws, {
+            action: 'send_group_msg',
+            params: options
+        });
+    }
+    /**
+     * 发送消息
+     * @param options
+     * @returns
+     */
+    sendMessage(options) {
+        if (!this.ws)
+            return;
+        return send(this.ws, {
+            action: 'send_msg',
+            params: options
+        });
+    }
+    /**
+     * 好友列表
+     */
+    getFriendList() {
+        if (!this.ws)
+            return;
+        return send(this.ws, {
+            action: 'get_friend_list',
+            params: {}
+        });
+    }
+    /**
+     * 群列表
+     */
+    getGroupList() {
+        if (!this.ws)
+            return;
+        return send(this.ws, {
+            action: 'get_group_list',
+            params: {}
+        });
+    }
+    /**
+     * 群成员列表
+     * @param options
+     * @returns
+     */
+    getGroupMemberList(options) {
+        if (!this.ws)
+            return;
+        return send(this.ws, {
+            action: 'get_group_member_list',
+            params: options
+        });
+    }
+    /**
+     * 处理好友请求
+     * @param options
+     * @returns
+     */
+    setFriendAddRequest(options) {
+        if (!this.ws)
+            return;
+        return send(this.ws, {
+            action: 'set_friend_add_request',
+            params: options
+        });
+    }
+    /**
+     * 处理群请求
+     * @param options
+     * @returns
+     */
+    setGroupAddRequest(options) {
+        if (!this.ws)
+            return;
+        return send(this.ws, {
+            action: 'set_group_add_request',
+            params: options
+        });
+    }
+}
+
+export { OneBotAPI, consume };

package/lib/sdk/config.js

@@ -0,0 +1,12 @@
+// 行为回调
+const actionResolves = new Map();
+// 超时器
+const actionTimeouts = new Map();
+// 生成唯一标识符
+const generateUniqueId = () => {
+    return Date.now().toString(36) + Math.random().toString(36).substring(2);
+};
+// 超时时间
+const timeoutTime = 1000 * 12; // 12秒
+
+export { actionResolves, actionTimeouts, generateUniqueId, timeoutTime };

package/lib/sdk/wss.js

@@ -1,10 +1,10 @@
 import WebSocket, { WebSocketServer } from 'ws';
-import { randomUUID } from 'crypto';
+import { OneBotAPI, consume } from './api.js';
 
 /**
  * 连接
  */
-class OneBotClient {
+class OneBotClient extends OneBotAPI {
     #options = {
         url: '',
         access_token: '',
@@ -16,16 +16,14 @@ class OneBotClient {
      * @param opstion
      */
     constructor(opstion) {
+        super();
         for (const key in opstion) {
             if (Object.prototype.hasOwnProperty.call(opstion, key)) {
                 this.#options[key] = opstion[key];
             }
         }
     }
-    #ws = null;
     #events = {};
-    #echo = {};
-    timeout = 30000;
     /**
      * 注册事件处理程序
      * @param key 事件名称
@@ -98,25 +96,9 @@ class OneBotClient {
                     }
                     return;
                 }
-                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))
-                        this.#echo[event?.echo].reject(Object.assign(this.#echo[event?.echo].request, { error: event }));
-                    else
-                        this.#echo[event?.echo].resolve(event?.data
-                            ? new Proxy(event, {
-                                get: (target, prop) => target.event[prop] ?? target[prop]
-                            })
-                            : event);
-                    clearTimeout(this.#echo[event?.echo].timeout);
-                    delete this.#echo[event?.echo];
+                else if (event?.echo) {
+                    // 消费
+                    consume(event);
                 }
             }
             catch (err) {
@@ -131,161 +113,32 @@ class OneBotClient {
                     reason: reason.toString('utf8')
                 });
         };
-        if (!this.#ws) {
+        if (!this.ws) {
             if (reverse_enable) {
                 // reverse_open
                 const server = new WebSocketServer({ port: reverse_port ?? 17158 });
                 server.on('connection', ws => {
-                    this.#ws = ws;
+                    this.ws = ws;
                     // message
-                    this.#ws.on('message', onMessage);
+                    this.ws.on('message', onMessage);
                     // close
-                    this.#ws.on('close', onClose);
+                    this.ws.on('close', onClose);
                     console.info('connected: ws://127.0.0.1:' + reverse_port);
                 });
             }
             else {
                 // forward_open
-                this.#ws = new WebSocket(url, c);
-                this.#ws.on('open', () => {
+                this.ws = new WebSocket(url, c);
+                this.ws.on('open', () => {
                     console.debug(`open:${url}`);
                 });
                 // message
-                this.#ws.on('message', onMessage);
+                this.ws.on('message', onMessage);
                 // close
-                this.#ws.on('close', onClose);
+                this.ws.on('close', onClose);
             }
         }
     }
-    /**
-     * 发送私聊消息
-     * @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
-     */
-    sendGroupMessage(options) {
-        if (!this.#ws)
-            return;
-        return this.#ws.send(JSON.stringify({
-            action: 'send_group_msg',
-            params: options,
-            echo: randomUUID()
-        }));
-    }
-    /**
-     * 发送消息
-     * @param options
-     * @returns
-     */
-    sendMessage(options) {
-        if (!this.#ws)
-            return;
-        return this.#ws.send(JSON.stringify({
-            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()
-        }));
-    }
-    /**
-     * @param options
-     * @returns
-     */
-    sendApi(options) {
-        if (!this.#ws)
-            return;
-        if (!options.echo)
-            options.echo = randomUUID();
-        this.#ws.send(JSON.stringify(options));
-        return new Promise((resolve, reject) => (this.#echo[options.echo] = {
-            request: options,
-            resolve,
-            reject,
-            timeout: setTimeout(() => {
-                reject(Object.assign(options, { timeout: this.timeout }));
-                delete this.#echo[options.echo];
-                console.error('请求超时:', options);
-            }, this.timeout)
-        }));
-    }
 }
 
 export { OneBotClient };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@alemonjs/onebot",
-  "version": "0.2.8",
-  "description": "onebot",
+  "version": "2.1.0-alpha.0",
+  "description": "onebot v11",
   "author": "lemonade",
   "license": "MIT",
   "type": "module",

package/lib/sdk/type.d.ts

@@ -1,90 +0,0 @@
-interface Sender {
-    user_id: number;
-    nickname: string;
-    card: string;
-    role: 'admin' | 'member';
-}
-type Message = {
-    type: 'image';
-    data: {
-        file: string;
-        sub_type: number;
-        file_id: string;
-        url: string;
-        file_size: string;
-        file_unique: string;
-    };
-} | {
-    type: 'text';
-    data: {
-        text: string;
-    };
-} | {
-    type: 'json';
-    data: string;
-} | {
-    type: 'forward';
-    data: {
-        id: number;
-        content: any[];
-    };
-};
-interface MESSAGES_TYPE {
-    self_id: number;
-    user_id: number;
-    time: number;
-    message_id: number;
-    message_seq: number;
-    real_id: number;
-    message_type: 'group';
-    sender: Sender;
-    raw_message: string;
-    font: number;
-    sub_type: 'normal';
-    message: Message[];
-    message_format: 'array';
-    post_type: 'message';
-    group_id: number;
-}
-interface DIRECT_MESSAGE_TYPE {
-    self_id: number;
-    user_id: number;
-    time: number;
-    message_id: number;
-    message_seq: number;
-    real_id: number;
-    message_type: 'private';
-    sender: {
-        user_id: 1715713638;
-        nickname: string;
-        card: '';
-    };
-    raw_message: string;
-    font: 14;
-    sub_type: 'group' | 'friend';
-    message: Message[];
-    message_format: 'array';
-    post_type: 'message';
-    group_id: number;
-    temp_source: number;
-}
-interface meta_event_lifecycle {
-    time: number;
-    self_id: number;
-    post_type: 'meta_event';
-    meta_event_type: 'lifecycle';
-    sub_type: 'connect';
-}
-interface meta_event_heartbeat {
-    time: number;
-    self_id: number;
-    post_type: 'meta_event';
-    meta_event_type: 'heartbeat';
-    status: {
-        online: boolean;
-        good: boolean;
-    };
-    interval: number;
-}
-
-export type { DIRECT_MESSAGE_TYPE, MESSAGES_TYPE, meta_event_heartbeat, meta_event_lifecycle };

package/lib/sdk/wss.d.ts

@@ -1,120 +0,0 @@
-import { DIRECT_MESSAGE_TYPE, MESSAGES_TYPE, meta_event_lifecycle, meta_event_heartbeat } from './type.js';
-
-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;
-};
-/**
- * 连接
- */
-declare class OneBotClient {
-    #private;
-    /**
-     * 设置配置
-     * @param opstion
-     */
-    constructor(opstion: {
-        url: string;
-        access_token: string;
-        reverse_enable: boolean;
-        reverse_port: number;
-    });
-    timeout: number;
-    /**
-     * 注册事件处理程序
-     * @param key 事件名称
-     * @param val 事件处理函数
-     */
-    on<T extends keyof OneBotEventMap>(key: T, val: (event: OneBotEventMap[T]) => any): this;
-    /**
-     *
-     * @param cfg
-     * @param conversation
-     */
-    connect(): Promise<void>;
-    /**
-     * 发送私聊消息
-     * @param options
-     * @returns
-     */
-    sendPrivateMessage(options: {
-        user_id: number;
-        message: any[];
-    }): void;
-    /**
-     * 发送群消息
-     * @param options
-     * @returns
-     */
-    sendGroupMessage(options: {
-        group_id: number;
-        message: any[];
-    }): void;
-    /**
-     * 发送消息
-     * @param options
-     * @returns
-     */
-    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
-     */
-    sendApi(options: {
-        action: string;
-        params?: {
-            [key: string]: any;
-        };
-        echo?: string;
-    }): Promise<unknown>;
-}
-
-export { OneBotClient };

package/lib/server/index.js

@@ -1,73 +0,0 @@
-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!'
-  })
-  // 同意加群
-  router.get('/set_group_add_request', async ctx => {
-    const flag = ctx.query.flag
-    const sub_type = ctx.query.sub_type
-    const approve = ctx.query.approve
-    if (!flag || !sub_type || !approve) {
-      ctx.status = 400
-      ctx.body = 'flag, sub_type and approve are required'
-      return
-    }
-    client.setGroupAddRequest({
-      flag: String(flag),
-      sub_type: String(sub_type),
-      approve: Boolean(approve)
-    })
-    ctx.body = 'Hello, World!'
-  })
-  // 同意加好友
-  router.get('/set_friend_add_request', async ctx => {
-    const flag = ctx.query.flag
-    const approve = ctx.query.approve
-    if (!flag || !approve) {
-      ctx.status = 400
-      ctx.body = 'flag and approve are required'
-      return
-    }
-    client.setFriendAddRequest({
-      flag: String(flag),
-      approve: Boolean(approve)
-    })
-    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 }