@alemonjs/onebot 2.1.0-alpha.13 → 2.1.0-alpha.16

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/db.d.ts

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

package/lib/db.js

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

package/lib/index.d.ts

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

package/lib/index.js

@@ -1,4 +1,4 @@
-import { cbpPlatform, createResult, ResultCode } from 'alemonjs';
+import { definePlatform, cbpPlatform, createResult, ResultCode } from 'alemonjs';
 import { getBufferByURL } from 'alemonjs/utils';
 import { readFileSync } from 'fs';
 import { getOneBotConfig, getMaster, platform } from './config.js';
@@ -128,10 +128,46 @@ const main = () => {
                 return empty;
             }
             else if (item.type === 'Image') {
+                if (item.value.startsWith('http://') || item.value.startsWith('https://')) {
+                    const res = await getBufferByURL(item.value);
+                    return {
+                        type: 'image',
+                        data: {
+                            file: `base64://${res.toString('base64')}`
+                        }
+                    };
+                }
+                else if (item.value.startsWith('base64://')) {
+                    const base64Str = item.value.replace('base64://', '');
+                    return {
+                        type: 'image',
+                        data: {
+                            file: `base64://${base64Str}`
+                        }
+                    };
+                }
+                else if (item.value.startsWith('buffer://')) {
+                    const base64Str = item.value.replace('buffer://', '');
+                    return {
+                        type: 'image',
+                        data: {
+                            file: `base64://${base64Str}`
+                        }
+                    };
+                }
+                else if (item.value.startsWith('file://')) {
+                    const db = readFileSync(item.value);
+                    return {
+                        type: 'image',
+                        data: {
+                            file: `base64://${db.toString('base64')}`
+                        }
+                    };
+                }
                 return {
                     type: 'image',
                     data: {
-                        file: `base64://${item.value}`
+                        file: `base64://${item.value.toString('base64')}`
                     }
                 };
             }
@@ -358,32 +394,6 @@ const main = () => {
     };
     cbp.onapis((data, consume) => void onapis(data, consume));
 };
-const mainProcess = () => {
-    ['SIGINT', 'SIGTERM', 'SIGQUIT', 'disconnect'].forEach(sig => {
-        process?.on?.(sig, () => {
-            logger.info?.(`[@alemonjs/onebot][${sig}] 收到信号，正在关闭...`);
-            setImmediate(() => process.exit(0));
-        });
-    });
-    process?.on?.('exit', code => {
-        logger.info?.(`[@alemonjs/onebot][exit] 进程退出，code=${code}`);
-    });
-    process.on('message', msg => {
-        try {
-            const data = typeof msg === 'string' ? JSON.parse(msg) : msg;
-            if (data?.type === 'start') {
-                main();
-            }
-            else if (data?.type === 'stop') {
-                process.exit(0);
-            }
-        }
-        catch { }
-    });
-    if (process.send) {
-        process.send(JSON.stringify({ type: 'ready' }));
-    }
-};
-mainProcess();
+var index = definePlatform({ main });
 
-export { main as default, platform };
+export { index as default, platform };

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[];

package/lib/sdk/api.js

@@ -36,372 +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) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'delete_msg',
             params: options
         });
     }
     getMsg(options) {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'get_msg',
             params: options
         });
     }
     getForwardMsg(options) {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'get_forward_msg',
             params: options
         });
     }
     sendLike(options) {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'send_like',
             params: options
         });
     }
     setGroupKick(options) {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'set_group_kick',
             params: options
         });
     }
     setGroupBan(options) {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'set_group_ban',
             params: options
         });
     }
     setGroupAnonymousBan(options) {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'set_group_anonymous_ban',
             params: options
         });
     }
     setGroupWholeBan(options) {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'set_group_whole_ban',
             params: options
         });
     }
     setGroupAdmin(options) {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'set_group_admin',
             params: options
         });
     }
     setGroupAnonymous(options) {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'set_group_anonymous',
             params: options
         });
     }
     setGroupCard(options) {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'set_group_card',
             params: options
         });
     }
     setGroupName(options) {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'set_group_name',
             params: options
         });
     }
     setGroupLeave(options) {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'set_group_leave',
             params: options
         });
     }
     setGroupSpecialTitle(options) {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'set_group_special_title',
             params: options
         });
     }
     setFriendAddRequest(options) {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'set_friend_add_request',
             params: options
         });
     }
     setGroupAddRequest(options) {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        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: {}
         });
     }
     getStrangerInfo(options) {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        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) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        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) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        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
         });
     }
     getGroupHonorInfo(options) {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'get_group_honor_info',
             params: options
         });
     }
     getCookies() {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'get_cookies',
             params: {}
         });
     }
     getCsrfToken() {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'get_csrf_token',
             params: {}
         });
     }
     getCredentials() {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'get_credentials',
             params: {}
         });
     }
     getRecord(options) {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'get_record',
             params: options
         });
     }
     getImage(options) {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'get_image',
             params: options
         });
     }
     canSendImage() {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'can_send_image',
             params: {}
         });
     }
     canSendRecord() {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'can_send_record',
             params: {}
         });
     }
     getStatus() {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'get_status',
             params: {}
         });
     }
     getVersionInfo() {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'get_version_info',
             params: {}
         });
     }
     setRestart() {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        return send(this.__ws, {
             action: 'set_restart',
             params: {}
         });
     }
     cleanCache() {
-        if (!this.ws) {
+        if (!this.__ws) {
             return;
         }
-        return send(this.ws, {
+        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,
@@ -412,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,12 +1,11 @@
 {
   "name": "@alemonjs/onebot",
-  "version": "2.1.0-alpha.13",
+  "version": "2.1.0-alpha.16",
   "description": "oneBot v11",
   "author": "lemonade",
   "license": "MIT",
   "type": "module",
   "main": "lib/index.js",
-  "types": "lib",
   "scripts": {
     "build": "lvy build"
   },
@@ -26,7 +25,7 @@
     "ws": "^8.18.1"
   },
   "peerDependencies": {
-    "alemonjs": "^2.1.0-alpha.15"
+    "alemonjs": "^2.1.14"
   },
   "alemonjs": {
     "desktop": {