@alemonjs/onebot 2.1.0-alpha.11 → 2.1.0-alpha.12

package/lib/config.d.ts

@@ -1,3 +1,11 @@
-declare const platform = "onebot";
-
-export { platform };
+export declare const platform = "onebot";
+export type Options = {
+    url: string;
+    token?: string;
+    reverse_enable?: boolean;
+    reverse_port: number;
+    master_key?: string[];
+    master_id?: string[];
+};
+export declare const getOneBotConfig: () => Options;
+export declare const getMaster: (UserId: string) => readonly [boolean, string];

package/lib/db.d.ts

@@ -0,0 +1,5 @@
+export declare const BotMe: {
+    id: string;
+    name: string;
+    avatar: string;
+};

package/lib/db.js

@@ -1,4 +1,7 @@
 const BotMe = {
-    id: ''};
+    id: '',
+    name: '',
+    avatar: ''
+};
 
 export { BotMe };

package/lib/hook.d.ts

@@ -1,7 +1,6 @@
 import { EventKeys, Events } from 'alemonjs';
-import { OneBotAPI } from './sdk/api.js';
-import { MESSAGES_TYPE, DIRECT_MESSAGE_TYPE } from './sdk/types.js';
-
+import { OneBotAPI as API } from './sdk/api';
+import { DIRECT_MESSAGE_TYPE, MESSAGES_TYPE } from './sdk/types';
 type MAP = {
     'message.create': MESSAGES_TYPE;
     'private.message.create': DIRECT_MESSAGE_TYPE;
@@ -11,8 +10,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;
@@ -22,17 +21,6 @@ type MAP = {
     'private.friend.add': undefined;
     'private.guild.add': undefined;
 };
-/**
- *
- * @param event
- * @returns
- */
-declare const useValue: <T extends EventKeys>(event: Events[T]) => readonly [MAP[T]];
-/**
- *
- * @param event
- * @returns
- */
-declare const useClient: <T extends EventKeys>(event: Events[T]) => readonly [OneBotAPI, MAP[T]];
-
-export { useClient, useValue };
+export declare const useValue: <T extends EventKeys>(event: Events[T]) => readonly [MAP[T]];
+export declare const useClient: <T extends EventKeys>(event: Events[T]) => readonly [API, MAP[T]];
+export {};

package/lib/hook.js

@@ -1,20 +1,10 @@
 import { createEventValue, useClient as useClient$1 } from 'alemonjs';
 import { OneBotAPI } from './sdk/api.js';
 
-/**
- *
- * @param event
- * @returns
- */
 const useValue = (event) => {
     const value = createEventValue(event);
     return [value];
 };
-/**
- *
- * @param event
- * @returns
- */
 const useClient = (event) => {
     const [client] = useClient$1(event, OneBotAPI);
     const value = createEventValue(event);

package/lib/index.d.ts

@@ -1,7 +1,5 @@
-export { platform } from './config.js';
-export { OneBotAPI as API } from './sdk/api.js';
-export { useClient, useValue } from './hook.js';
-
+export { platform } from './config';
+export { OneBotAPI as API } from './sdk/api';
+export * from './hook';
 declare const main: () => void;
-
-export { main as default };
+export default main;

package/lib/index.js

@@ -10,13 +10,9 @@ export { useClient, useValue } from './hook.js';
 const main = () => {
     const config = getOneBotConfig();
     const client = new OneBotClient({
-        // url
         url: config?.url ?? '',
-        // token
         access_token: config?.token ?? '',
-        // 是否开启反向连接，正向连接失效
         reverse_enable: config?.reverse_enable ?? false,
-        // 反向连接端口
         reverse_port: config?.reverse_port ?? 17158
     });
     void client.connect();
@@ -31,6 +27,7 @@ const main = () => {
             if (item.type === 'text') {
                 msg += item.data.text;
             }
+            else if (item.type === 'at') ;
         }
         return msg.trim();
     };
@@ -45,7 +42,7 @@ const main = () => {
         const UserAvatar = createUserAvatar(UserId);
         const [isMaster, UserKey] = getMaster(UserId);
         const groupId = String(event.group_id);
-        // 定义消
+        const readyId = event.message.find(item => item.type === 'reply')?.data?.id;
         const e = {
             name: 'message.create',
             Platform: platform,
@@ -61,6 +58,7 @@ const main = () => {
             MessageId: String(event.message_id),
             MessageText: msg.trim(),
             OpenId: UserId,
+            readyId,
             CreateAt: Date.now(),
             tag: 'message.create',
             value: event
@@ -72,7 +70,7 @@ const main = () => {
         const UserId = String(event.user_id);
         const UserAvatar = createUserAvatar(UserId);
         const [isMaster, UserKey] = getMaster(UserId);
-        // 定义消
+        const readyId = event.message.find(item => item.type === 'reply')?.data?.id;
         const e = {
             name: 'private.message.create',
             Platform: platform,
@@ -86,17 +84,13 @@ const main = () => {
             MessageText: msg.trim(),
             OpenId: String(event.user_id),
             CreateAt: Date.now(),
+            readyId,
             tag: 'private.message.create',
             value: event
         };
         cbp.send(e);
     });
-    /**
-     * @param val
-     * @returns
-     */
     const DataToMessage = async (val = []) => {
-        // 空元素
         const empty = {
             type: 'text',
             data: {
@@ -163,12 +157,6 @@ const main = () => {
         }));
         return message;
     };
-    /**
-     *
-     * @param ChannelId
-     * @param val
-     * @returns
-     */
     const sendGroup = async (ChannelId, val) => {
         if (val.length < 0) {
             return [];
@@ -185,12 +173,6 @@ const main = () => {
             return [createResult(ResultCode.Fail, 'client.groupOpenMessages', error)];
         }
     };
-    /**
-     *
-     * @param UserId
-     * @param val
-     * @returns
-     */
     const sendPrivate = async (UserId, val) => {
         if (val.length < 0) {
             return [];
@@ -279,6 +261,20 @@ const main = () => {
     };
     const onactions = async (data, consume) => {
         switch (data.action) {
+            case 'me.info': {
+                const res = await client.getLoginInfo();
+                const UserId = String(res?.user_id);
+                const [isMaster, UserKey] = getMaster(UserId);
+                const user = {
+                    UserId: UserId,
+                    UserName: res?.nickname,
+                    IsBot: true,
+                    IsMaster: isMaster,
+                    UserAvatar: '',
+                    UserKey: UserKey
+                };
+                return consume([createResult(ResultCode.Ok, '请求完成', user)]);
+            }
             case 'message.send': {
                 const event = data.payload.event;
                 const paramFormat = data.payload.params.format;
@@ -286,15 +282,15 @@ const main = () => {
                 return consume(res);
             }
             case 'message.send.channel': {
-                const channel_id = data.payload.ChannelId;
+                const ChannelId = data.payload.ChannelId;
                 const val = data.payload.params.format;
-                const res = await api.active.send.channel(channel_id, val);
+                const res = await api.active.send.channel(ChannelId, val);
                 return consume(res);
             }
             case 'message.send.user': {
-                const user_id = data.payload.UserId;
+                const UserId = data.payload.UserId;
                 const val = data.payload.params.format;
-                const res = await api.active.send.user(user_id, val);
+                const res = await api.active.send.user(UserId, val);
                 return consume(res);
             }
             case 'mention.get': {
@@ -343,6 +339,9 @@ const main = () => {
                     .catch(err => createResult(ResultCode.Fail, data.action, err));
                 return consume([res]);
             }
+            default: {
+                return consume([createResult(ResultCode.Fail, '未知请求，请尝试升级版本', null)]);
+            }
         }
     };
     cbp.onactions((data, consume) => void onactions(data, consume));
@@ -353,21 +352,22 @@ const main = () => {
             const res = await client[key](...params);
             consume([createResult(ResultCode.Ok, '请求完成', res)]);
         }
+        else {
+            consume([createResult(ResultCode.Fail, '未知请求，请尝试升级版本', null)]);
+        }
     };
-    // 处理 api 调用
     cbp.onapis((data, consume) => void onapis(data, consume));
 };
 const mainProcess = () => {
     ['SIGINT', 'SIGTERM', 'SIGQUIT', 'disconnect'].forEach(sig => {
         process?.on?.(sig, () => {
-            logger?.info?.(`[@alemonjs/onebot][${sig}] 收到信号，正在关闭...`);
+            logger.info?.(`[@alemonjs/onebot][${sig}] 收到信号，正在关闭...`);
             setImmediate(() => process.exit(0));
         });
     });
     process?.on?.('exit', code => {
-        logger?.info?.(`[@alemonjs/onebot][exit] 进程退出，code=${code}`);
+        logger.info?.(`[@alemonjs/onebot][exit] 进程退出，code=${code}`);
     });
-    // 监听主进程消息
     process.on('message', msg => {
         try {
             const data = typeof msg === 'string' ? JSON.parse(msg) : msg;
@@ -380,7 +380,6 @@ const mainProcess = () => {
         }
         catch { }
     });
-    // 主动发送 ready 消息
     if (process.send) {
         process.send(JSON.stringify({ type: 'ready' }));
     }

package/lib/sdk/api.d.ts

@@ -1,91 +1,55 @@
 import WebSocket from 'ws';
-
-declare class OneBotAPI {
+export declare const consume: (parsedMessage: any) => void;
+export 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>;
-    /**
-     * 好友列表
-     */
+    getLoginInfo(): Promise<any>;
+    getMsg(options: {
+        message_id: number;
+    }): 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>;
-    /** 撤回消息 */
     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: {
@@ -95,7 +59,6 @@ declare class OneBotAPI {
             nickname?: string;
         }[];
     }): Promise<any>;
-    /** 发送群转发 */
     sendGroupForward(options: {
         group_id: number;
         messages: {
@@ -106,5 +69,3 @@ declare class OneBotAPI {
         }[];
     }): Promise<any>;
 }
-
-export { OneBotAPI };

package/lib/sdk/api.js

@@ -1,42 +1,26 @@
 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);
@@ -53,11 +37,6 @@ const consume = (parsedMessage) => {
 };
 class OneBotAPI {
     ws = null;
-    /**
-     * 发送私聊消息
-     * @param options
-     * @returns
-     */
     sendPrivateMessage(options) {
         if (!this.ws) {
             return;
@@ -67,11 +46,6 @@ class OneBotAPI {
             params: options
         });
     }
-    /**
-     * 发送群消息
-     * @param options
-     * @returns
-     */
     sendGroupMessage(options) {
         if (!this.ws) {
             return;
@@ -81,11 +55,6 @@ class OneBotAPI {
             params: options
         });
     }
-    /**
-     * 发送消息
-     * @param options
-     * @returns
-     */
     sendMessage(options) {
         if (!this.ws) {
             return;
@@ -95,9 +64,24 @@ class OneBotAPI {
             params: options
         });
     }
-    /**
-     * 好友列表
-     */
+    getLoginInfo() {
+        if (!this.ws) {
+            return;
+        }
+        return send(this.ws, {
+            action: 'get_login_info',
+            params: {}
+        });
+    }
+    getMsg(options) {
+        if (!this.ws) {
+            return;
+        }
+        return send(this.ws, {
+            action: 'get_msg',
+            params: options
+        });
+    }
     getFriendList() {
         if (!this.ws) {
             return;
@@ -107,9 +91,6 @@ class OneBotAPI {
             params: {}
         });
     }
-    /**
-     * 群列表
-     */
     getGroupList() {
         if (!this.ws) {
             return;
@@ -119,11 +100,6 @@ class OneBotAPI {
             params: {}
         });
     }
-    /**
-     * 群成员列表
-     * @param options
-     * @returns
-     */
     getGroupMemberList(options) {
         if (!this.ws) {
             return;
@@ -133,11 +109,6 @@ class OneBotAPI {
             params: options
         });
     }
-    /**
-     * 处理好友请求
-     * @param options
-     * @returns
-     */
     setFriendAddRequest(options) {
         if (!this.ws) {
             return;
@@ -147,11 +118,6 @@ class OneBotAPI {
             params: options
         });
     }
-    /**
-     * 处理群请求
-     * @param options
-     * @returns
-     */
     setGroupAddRequest(options) {
         if (!this.ws) {
             return;
@@ -161,7 +127,6 @@ class OneBotAPI {
             params: options
         });
     }
-    /** 撤回消息 */
     deleteMsg(options) {
         if (!this.ws) {
             return;
@@ -171,7 +136,6 @@ class OneBotAPI {
             params: options
         });
     }
-    /** 上传私聊文件 */
     uploadPrivateFile(options) {
         if (!this.ws) {
             return;
@@ -181,7 +145,6 @@ class OneBotAPI {
             params: options
         });
     }
-    /** 上传群文件 */
     uploadGroupFile(options) {
         if (!this.ws) {
             return;
@@ -191,7 +154,6 @@ class OneBotAPI {
             params: options
         });
     }
-    /** 发送私聊转发 */
     sendPrivateForward(options) {
         if (!this.ws) {
             return;
@@ -206,7 +168,6 @@ class OneBotAPI {
             }
         });
     }
-    /** 发送群转发 */
     sendGroupForward(options) {
         if (!this.ws) {
             return;

package/lib/sdk/config.d.ts

@@ -0,0 +1,7 @@
+export declare const actionResolves: Map<string, {
+    resolve: (value: any) => void;
+    reject: (reason?: any) => void;
+}>;
+export declare const actionTimeouts: Map<string, NodeJS.Timeout>;
+export declare const generateUniqueId: () => string;
+export declare const timeoutTime: number;

package/lib/sdk/config.js

@@ -1,12 +1,8 @@
-// 行为回调
 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秒
+const timeoutTime = 1000 * 12;
 
 export { actionResolves, actionTimeouts, generateUniqueId, timeoutTime };

package/lib/sdk/types.d.ts

@@ -28,8 +28,13 @@ type Message = {
         id: number;
         content: any[];
     };
+} | {
+    type: 'reply';
+    data: {
+        id: string;
+    };
 };
-interface MESSAGES_TYPE {
+export interface MESSAGES_TYPE {
     self_id: number;
     user_id: number;
     time: number;
@@ -46,7 +51,7 @@ interface MESSAGES_TYPE {
     post_type: 'message';
     group_id: number;
 }
-interface DIRECT_MESSAGE_TYPE {
+export interface DIRECT_MESSAGE_TYPE {
     self_id: number;
     user_id: number;
     time: number;
@@ -68,5 +73,41 @@ interface DIRECT_MESSAGE_TYPE {
     group_id: number;
     temp_source: number;
 }
-
-export type { DIRECT_MESSAGE_TYPE, MESSAGES_TYPE };
+export interface meta_event_lifecycle {
+    time: number;
+    self_id: number;
+    post_type: 'meta_event';
+    meta_event_type: 'lifecycle';
+    sub_type: 'connect';
+}
+export 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 interface group_recall {
+    time: number;
+    self_id: number;
+    post_type: 'notice';
+    group_id: number;
+    user_id: number;
+    notice_type: 'group_recall';
+    operator_id: number;
+    message_id: number;
+}
+export interface request_friend {
+    time: number;
+    self_id: number;
+    post_type: 'request';
+    request_type: 'friend';
+    user_id: number;
+    comment: string;
+    flag: string;
+}
+export {};

package/lib/sdk/types.js

@@ -0,0 +1 @@
+

package/lib/sdk/typing.d.ts

@@ -0,0 +1,10 @@
+import { MESSAGES_TYPE, DIRECT_MESSAGE_TYPE, meta_event_lifecycle, meta_event_heartbeat } from './types';
+export 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;
+};

package/lib/sdk/typing.js

@@ -0,0 +1 @@
+

package/lib/sdk/wss.d.ts

@@ -0,0 +1,13 @@
+import { OneBotAPI } from './api';
+import { OneBotEventMap } from './typing';
+export declare class OneBotClient extends OneBotAPI {
+    #private;
+    constructor(opstion: {
+        url: string;
+        access_token: string;
+        reverse_enable: boolean;
+        reverse_port: number;
+    });
+    on<T extends keyof OneBotEventMap>(key: T, val: (event: OneBotEventMap[T]) => any): this;
+    connect(): void;
+}

package/lib/sdk/wss.js

@@ -2,9 +2,6 @@ import WebSocket, { WebSocketServer } from 'ws';
 import { OneBotAPI, consume } from './api.js';
 import dayjs from 'dayjs';
 
-/**
- * 连接
- */
 class OneBotClient extends OneBotAPI {
     #options = {
         url: '',
@@ -12,10 +9,6 @@ class OneBotClient extends OneBotAPI {
         reverse_enable: false,
         reverse_port: 17158
     };
-    /**
-     * 设置配置
-     * @param opstion
-     */
     constructor(opstion) {
         super();
         for (const key in opstion) {
@@ -25,7 +18,6 @@ class OneBotClient extends OneBotAPI {
         }
     }
     #events = {};
-    // 重连次数
     #count = 0;
     #getReConnectTime() {
         const time = this.#count > 3 ? 1000 * 6 : 1000 * 1;
@@ -34,20 +26,10 @@ class OneBotClient extends OneBotAPI {
         this.#count++;
         return curTime;
     }
-    /**
-     * 注册事件处理程序
-     * @param key 事件名称
-     * @param val 事件处理函数
-     */
     on(key, val) {
         this.#events[key] = val;
         return this;
     }
-    /**
-     *
-     * @param cfg
-     * @param conversation
-     */
     connect() {
         const { url, access_token: token, reverse_enable, reverse_port } = this.#options;
         const notToken = !token || token === '';
@@ -83,20 +65,17 @@ class OneBotClient extends OneBotAPI {
                 }
                 else if (event?.post_type === 'notice') {
                     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);
                         }
                     }
                 }
                 else if (event?.post_type === 'request') {
-                    // 收到加群 或 加好友的请求。
                     if (event?.request_type === 'friend') {
                         if (this.#events['REQUEST_ADD_FRIEND']) {
                             this.#events['REQUEST_ADD_FRIEND'](event);
@@ -109,7 +88,6 @@ class OneBotClient extends OneBotAPI {
                     }
                 }
                 else if (event?.echo) {
-                    // 消费
                     consume(event);
                 }
             }
@@ -129,27 +107,21 @@ class OneBotClient extends OneBotAPI {
         };
         if (!this.ws) {
             if (reverse_enable) {
-                // reverse_open
                 const server = new WebSocketServer({ port: reverse_port ?? 17158 });
                 server.on('connection', ws => {
                     this.ws = ws;
-                    // message
                     this.ws.on('message', onMessage);
-                    // close
                     this.ws.on('close', onClose);
                     logger.info(`[OneBot] connected: ws://127.0.0.1:${reverse_port}`);
                 });
             }
             else {
-                // forward_open
                 this.ws = new WebSocket(url, c);
                 this.ws.on('open', () => {
                     logger.info(`[OneBot] connected: ${url}`);
                     this.#count = 0;
                 });
-                // message
                 this.ws.on('message', onMessage);
-                // close
                 this.ws.on('close', onClose);
             }
         }

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@alemonjs/onebot",
-  "version": "2.1.0-alpha.11",
-  "description": "onebot v11",
+  "version": "2.1.0-alpha.12",
+  "description": "oneBot v11",
   "author": "lemonade",
   "license": "MIT",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib",
   "scripts": {
-    "build": "node bundle.js"
+    "build": "lvy build"
   },
   "exports": {
     ".": {
@@ -47,4 +47,4 @@
     "type": "git",
     "url": "https://github.com/lemonade-lab/alemonjs.git"
   }
-}
+}