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

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,54 @@ const main = () => {
                 return empty;
             }
             else if (item.type === 'Image') {
+                if (Buffer.isBuffer(item.value)) {
+                    return {
+                        type: 'image',
+                        data: {
+                            file: `base64://${item.value.toString('base64')}`
+                        }
+                    };
+                }
+                if (typeof item.value === 'string' && (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.slice(7));
+                    return {
+                        type: 'image',
+                        data: {
+                            file: `base64://${db.toString('base64')}`
+                        }
+                    };
+                }
                 return {
                     type: 'image',
                     data: {
-                        file: `base64://${item.value}`
+                        file: `base64://${item.value.toString('base64')}`
                     }
                 };
             }
@@ -158,7 +202,7 @@ const main = () => {
         return message;
     };
     const sendGroup = async (ChannelId, val) => {
-        if (val.length < 0) {
+        if (!val || val.length <= 0) {
             return [];
         }
         try {
@@ -174,7 +218,7 @@ const main = () => {
         }
     };
     const sendPrivate = async (UserId, val) => {
-        if (val.length < 0) {
+        if (!val || val.length <= 0) {
             return [];
         }
         try {
@@ -202,8 +246,8 @@ const main = () => {
         },
         use: {
             send: (event, val) => {
-                if (val.length < 0) {
-                    return Promise.all([]);
+                if (!val || val.length <= 0) {
+                    return [];
                 }
                 if (event['name'] === 'private.message.create') {
                     const UserId = Number(event.UserId);
@@ -320,21 +364,23 @@ const main = () => {
                 return consume([res]);
             }
             case 'message.forward.channel': {
-                const res = await api.use.forward
-                    .channel(data.payload.ChannelId, data.payload.params.map(i => ({
+                const params = await Promise.all(data.payload.params.map(async (i) => ({
                     ...i,
-                    content: DataToMessage(i.content)
-                })))
+                    content: await DataToMessage(i.content)
+                })));
+                const res = await api.use.forward
+                    .channel(data.payload.ChannelId, params)
                     .then(res => createResult(ResultCode.Ok, data.action, res))
                     .catch(err => createResult(ResultCode.Fail, data.action, err));
                 return consume([res]);
             }
             case 'message.forward.user': {
-                const res = await api.use.forward
-                    .user(data.payload.UserId, data.payload.params.map(i => ({
+                const params = await Promise.all(data.payload.params.map(async (i) => ({
                     ...i,
-                    content: DataToMessage(i.content)
-                })))
+                    content: await DataToMessage(i.content)
+                })));
+                const res = await api.use.forward
+                    .user(data.payload.UserId, params)
                     .then(res => createResult(ResultCode.Ok, data.action, res))
                     .catch(err => createResult(ResultCode.Fail, data.action, err));
                 return consume([res]);
@@ -349,8 +395,13 @@ const main = () => {
         const key = data.payload?.key;
         if (client[key]) {
             const params = data.payload.params;
-            const res = await client[key](...params);
-            consume([createResult(ResultCode.Ok, '请求完成', res)]);
+            try {
+                const res = await client[key](...params);
+                consume([createResult(ResultCode.Ok, '请求完成', res)]);
+            }
+            catch (error) {
+                consume([createResult(ResultCode.Fail, '请求失败', error)]);
+            }
         }
         else {
             consume([createResult(ResultCode.Fail, '未知请求，请尝试升级版本', null)]);
@@ -358,32 +409,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/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@alemonjs/onebot",
-  "version": "2.1.0-alpha.14",
+  "version": "2.1.0-alpha.17",
   "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": {