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

package/lib/config.js

@@ -7,13 +7,13 @@ const getOneBotConfig = () => {
 };
 const getMaster = (UserId) => {
     const config = getOneBotConfig();
-    const master_key = config.master_key || [];
-    const master_id = config.master_id || [];
+    const masterKey = config.master_key || [];
+    const masterId = config.master_id || [];
     const UserKey = useUserHashKey({
         Platform: platform,
         UserId: UserId
     });
-    const is = master_key.includes(UserKey) || master_id.includes(UserId);
+    const is = masterKey.includes(UserKey) || masterId.includes(UserId);
     return [is, UserKey];
 };
 

package/lib/index.js

@@ -42,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 replyId = event.message.find(item => item.type === 'reply')?.data?.id;
         const e = {
             name: 'message.create',
             Platform: platform,
@@ -58,7 +58,7 @@ const main = () => {
             MessageId: String(event.message_id),
             MessageText: msg.trim(),
             OpenId: UserId,
-            readyId,
+            replyId,
             CreateAt: Date.now(),
             tag: 'message.create',
             value: event
@@ -70,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 replyId = event.message.find(item => item.type === 'reply')?.data?.id;
         const e = {
             name: 'private.message.create',
             Platform: platform,
@@ -84,7 +84,7 @@ const main = () => {
             MessageText: msg.trim(),
             OpenId: String(event.user_id),
             CreateAt: Date.now(),
-            readyId,
+            replyId,
             tag: 'private.message.create',
             value: event
         };

package/lib/sdk/api.d.ts

@@ -1,7 +1,10 @@
 import WebSocket from 'ws';
 export declare const consume: (parsedMessage: any) => void;
 export declare class OneBotAPI {
-    ws: WebSocket | null;
+    __ws: WebSocket | null;
+    send(options: {
+        [key: string]: any;
+    }): Promise<any>;
     sendPrivateMessage(options: {
         user_id: number;
         message: any[];
@@ -16,14 +19,68 @@ export declare class OneBotAPI {
         user_id?: number;
         message: any[];
     }): Promise<any>;
-    getLoginInfo(): Promise<any>;
+    deleteMsg(options: {
+        message_id: number;
+    }): Promise<any>;
     getMsg(options: {
         message_id: number;
     }): Promise<any>;
-    getFriendList(): Promise<any>;
-    getGroupList(): Promise<any>;
-    getGroupMemberList(options: {
+    getForwardMsg(options: {
+        id: string;
+    }): Promise<any>;
+    sendLike(options: {
+        user_id: number;
+        times?: number;
+    }): Promise<any>;
+    setGroupKick(options: {
+        group_id: number;
+        user_id: number;
+        reject_add_request?: boolean;
+    }): Promise<any>;
+    setGroupBan(options: {
+        group_id: number;
+        user_id: number;
+        duration: number;
+    }): Promise<any>;
+    setGroupAnonymousBan(options: {
+        group_id: number;
+        anonymous: {
+            id: string;
+            name: string;
+        };
+        duration: number;
+    }): Promise<any>;
+    setGroupWholeBan(options: {
+        group_id: number;
+        enable: boolean;
+    }): Promise<any>;
+    setGroupAdmin(options: {
+        group_id: number;
+        user_id: number;
+        enable: boolean;
+    }): Promise<any>;
+    setGroupAnonymous(options: {
+        group_id: number;
+        enable: boolean;
+    }): Promise<any>;
+    setGroupCard(options: {
+        group_id: number;
+        user_id: number;
+        card: string;
+    }): Promise<any>;
+    setGroupName(options: {
+        group_id: number;
+        group_name: string;
+    }): Promise<any>;
+    setGroupLeave(options: {
         group_id: number;
+        is_dismiss?: boolean;
+    }): Promise<any>;
+    setGroupSpecialTitle(options: {
+        group_id: number;
+        user_id: number;
+        special_title: string;
+        duration: number;
     }): Promise<any>;
     setFriendAddRequest(options: {
         flag: string;
@@ -36,9 +93,44 @@ export declare class OneBotAPI {
         approve: boolean;
         reason?: string;
     }): Promise<any>;
-    deleteMsg(options: {
-        message_id: number;
+    getLoginInfo(): Promise<any>;
+    getStrangerInfo(options: {
+        user_id: number;
+        no_cache?: boolean;
+    }): Promise<any>;
+    getFriendList(): Promise<any>;
+    getGroupInfo(params?: {
+        group_id: number;
+        no_cache?: boolean;
+    }): Promise<any>;
+    getGroupList(): Promise<any>;
+    getGroupMemberInfo(options: {
+        group_id: number;
+        user_id: number;
+        no_cache?: boolean;
+    }): Promise<any>;
+    getGroupMemberList(options: {
+        group_id: number;
+    }): Promise<any>;
+    getGroupHonorInfo(options: {
+        group_id: number;
+        type: 'talkative' | 'performer' | 'legend' | 'strong_newbie';
+    }): Promise<any>;
+    getCookies(): Promise<any>;
+    getCsrfToken(): Promise<any>;
+    getCredentials(): Promise<any>;
+    getRecord(options: {
+        file: string;
+    }): Promise<any>;
+    getImage(options: {
+        file: string;
     }): Promise<any>;
+    canSendImage(): Promise<any>;
+    canSendRecord(): Promise<any>;
+    getStatus(): Promise<any>;
+    getVersionInfo(): Promise<any>;
+    setRestart(): Promise<any>;
+    cleanCache(): Promise<any>;
     uploadPrivateFile(options: {
         user_id: number;
         file: string;

package/lib/sdk/api.js

@@ -36,129 +36,378 @@ const consume = (parsedMessage) => {
     resolve(parsedMessage?.data);
 };
 class OneBotAPI {
-    ws = null;
+    __ws = null;
+    send(options) {
+        if (!this.__ws) {
+            return;
+        }
+        return send(this.__ws, options);
+    }
     sendPrivateMessage(options) {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'send_private_msg',
             params: options
         });
     }
     sendGroupMessage(options) {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'send_group_msg',
             params: options
         });
     }
     sendMessage(options) {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'send_msg',
             params: options
         });
     }
+    deleteMsg(options) {
+        if (!this.__ws) {
+            return;
+        }
+        return send(this.__ws, {
+            action: 'delete_msg',
+            params: options
+        });
+    }
+    getMsg(options) {
+        if (!this.__ws) {
+            return;
+        }
+        return send(this.__ws, {
+            action: 'get_msg',
+            params: options
+        });
+    }
+    getForwardMsg(options) {
+        if (!this.__ws) {
+            return;
+        }
+        return send(this.__ws, {
+            action: 'get_forward_msg',
+            params: options
+        });
+    }
+    sendLike(options) {
+        if (!this.__ws) {
+            return;
+        }
+        return send(this.__ws, {
+            action: 'send_like',
+            params: options
+        });
+    }
+    setGroupKick(options) {
+        if (!this.__ws) {
+            return;
+        }
+        return send(this.__ws, {
+            action: 'set_group_kick',
+            params: options
+        });
+    }
+    setGroupBan(options) {
+        if (!this.__ws) {
+            return;
+        }
+        return send(this.__ws, {
+            action: 'set_group_ban',
+            params: options
+        });
+    }
+    setGroupAnonymousBan(options) {
+        if (!this.__ws) {
+            return;
+        }
+        return send(this.__ws, {
+            action: 'set_group_anonymous_ban',
+            params: options
+        });
+    }
+    setGroupWholeBan(options) {
+        if (!this.__ws) {
+            return;
+        }
+        return send(this.__ws, {
+            action: 'set_group_whole_ban',
+            params: options
+        });
+    }
+    setGroupAdmin(options) {
+        if (!this.__ws) {
+            return;
+        }
+        return send(this.__ws, {
+            action: 'set_group_admin',
+            params: options
+        });
+    }
+    setGroupAnonymous(options) {
+        if (!this.__ws) {
+            return;
+        }
+        return send(this.__ws, {
+            action: 'set_group_anonymous',
+            params: options
+        });
+    }
+    setGroupCard(options) {
+        if (!this.__ws) {
+            return;
+        }
+        return send(this.__ws, {
+            action: 'set_group_card',
+            params: options
+        });
+    }
+    setGroupName(options) {
+        if (!this.__ws) {
+            return;
+        }
+        return send(this.__ws, {
+            action: 'set_group_name',
+            params: options
+        });
+    }
+    setGroupLeave(options) {
+        if (!this.__ws) {
+            return;
+        }
+        return send(this.__ws, {
+            action: 'set_group_leave',
+            params: options
+        });
+    }
+    setGroupSpecialTitle(options) {
+        if (!this.__ws) {
+            return;
+        }
+        return send(this.__ws, {
+            action: 'set_group_special_title',
+            params: options
+        });
+    }
+    setFriendAddRequest(options) {
+        if (!this.__ws) {
+            return;
+        }
+        return send(this.__ws, {
+            action: 'set_friend_add_request',
+            params: options
+        });
+    }
+    setGroupAddRequest(options) {
+        if (!this.__ws) {
+            return;
+        }
+        return send(this.__ws, {
+            action: 'set_group_add_request',
+            params: options
+        });
+    }
     getLoginInfo() {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'get_login_info',
             params: {}
         });
     }
-    getMsg(options) {
-        if (!this.ws) {
+    getStrangerInfo(options) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
-            action: 'get_msg',
+        return send(this.__ws, {
+            action: 'get_stranger_info',
             params: options
         });
     }
     getFriendList() {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'get_friend_list',
             params: {}
         });
     }
+    getGroupInfo(params) {
+        if (!this.__ws) {
+            return;
+        }
+        return send(this.__ws, {
+            action: 'get_group_info',
+            params: params
+        });
+    }
     getGroupList() {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'get_group_list',
             params: {}
         });
     }
+    getGroupMemberInfo(options) {
+        if (!this.__ws) {
+            return;
+        }
+        return send(this.__ws, {
+            action: 'get_group_member_info',
+            params: options
+        });
+    }
     getGroupMemberList(options) {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'get_group_member_list',
             params: options
         });
     }
-    setFriendAddRequest(options) {
-        if (!this.ws) {
+    getGroupHonorInfo(options) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
-            action: 'set_friend_add_request',
+        return send(this.__ws, {
+            action: 'get_group_honor_info',
             params: options
         });
     }
-    setGroupAddRequest(options) {
-        if (!this.ws) {
+    getCookies() {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
-            action: 'set_group_add_request',
+        return send(this.__ws, {
+            action: 'get_cookies',
+            params: {}
+        });
+    }
+    getCsrfToken() {
+        if (!this.__ws) {
+            return;
+        }
+        return send(this.__ws, {
+            action: 'get_csrf_token',
+            params: {}
+        });
+    }
+    getCredentials() {
+        if (!this.__ws) {
+            return;
+        }
+        return send(this.__ws, {
+            action: 'get_credentials',
+            params: {}
+        });
+    }
+    getRecord(options) {
+        if (!this.__ws) {
+            return;
+        }
+        return send(this.__ws, {
+            action: 'get_record',
             params: options
         });
     }
-    deleteMsg(options) {
-        if (!this.ws) {
+    getImage(options) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
-            action: 'delete_msg',
+        return send(this.__ws, {
+            action: 'get_image',
             params: options
         });
     }
+    canSendImage() {
+        if (!this.__ws) {
+            return;
+        }
+        return send(this.__ws, {
+            action: 'can_send_image',
+            params: {}
+        });
+    }
+    canSendRecord() {
+        if (!this.__ws) {
+            return;
+        }
+        return send(this.__ws, {
+            action: 'can_send_record',
+            params: {}
+        });
+    }
+    getStatus() {
+        if (!this.__ws) {
+            return;
+        }
+        return send(this.__ws, {
+            action: 'get_status',
+            params: {}
+        });
+    }
+    getVersionInfo() {
+        if (!this.__ws) {
+            return;
+        }
+        return send(this.__ws, {
+            action: 'get_version_info',
+            params: {}
+        });
+    }
+    setRestart() {
+        if (!this.__ws) {
+            return;
+        }
+        return send(this.__ws, {
+            action: 'set_restart',
+            params: {}
+        });
+    }
+    cleanCache() {
+        if (!this.__ws) {
+            return;
+        }
+        return send(this.__ws, {
+            action: 'clean_cache',
+            params: {}
+        });
+    }
     uploadPrivateFile(options) {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'upload_private_file',
             params: options
         });
     }
     uploadGroupFile(options) {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'upload_group_file',
             params: options
         });
     }
     sendPrivateForward(options) {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'send_private_forward_msg',
             params: {
                 user_id: 80000000,
@@ -169,10 +418,10 @@ class OneBotAPI {
         });
     }
     sendGroupForward(options) {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'send_group_forward_msg',
             params: {
                 user_id: 80000000,

package/lib/sdk/config.d.ts

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

package/lib/sdk/types.d.ts

@@ -73,14 +73,14 @@ export interface DIRECT_MESSAGE_TYPE {
     group_id: number;
     temp_source: number;
 }
-export interface meta_event_lifecycle {
+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 {
+export interface META_EVENT_HEARTBEAT {
     time: number;
     self_id: number;
     post_type: 'meta_event';

package/lib/sdk/typing.d.ts

@@ -1,8 +1,8 @@
-import { MESSAGES_TYPE, DIRECT_MESSAGE_TYPE, meta_event_lifecycle, meta_event_heartbeat } from './types';
+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;
+    META: META_EVENT_LIFECYCLE | META_EVENT_HEARTBEAT;
     REQUEST_ADD_FRIEND: any;
     REQUEST_ADD_GROUP: any;
     NOTICE_GROUP_MEMBER_INCREASE: any;

package/lib/sdk/wss.js

@@ -105,24 +105,24 @@ class OneBotClient extends OneBotAPI {
                 this.connect();
             }, curTime);
         };
-        if (!this.ws) {
+        if (!this.__ws) {
             if (reverse_enable) {
                 const server = new WebSocketServer({ port: reverse_port ?? 17158 });
                 server.on('connection', ws => {
-                    this.ws = ws;
-                    this.ws.on('message', onMessage);
-                    this.ws.on('close', onClose);
+                    this.__ws = ws;
+                    this.__ws.on('message', onMessage);
+                    this.__ws.on('close', onClose);
                     logger.info(`[OneBot] connected: ws://127.0.0.1:${reverse_port}`);
                 });
             }
             else {
-                this.ws = new WebSocket(url, c);
-                this.ws.on('open', () => {
+                this.__ws = new WebSocket(url, c);
+                this.__ws.on('open', () => {
                     logger.info(`[OneBot] connected: ${url}`);
                     this.#count = 0;
                 });
-                this.ws.on('message', onMessage);
-                this.ws.on('close', onClose);
+                this.__ws.on('message', onMessage);
+                this.__ws.on('close', onClose);
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/onebot",
-  "version": "2.1.0-alpha.12",
+  "version": "2.1.0-alpha.14",
   "description": "oneBot v11",
   "author": "lemonade",
   "license": "MIT",