@alemonjs/onebot 2.1.0-alpha.5 → 2.1.0-alpha.7

package/lib/index.js

@@ -20,7 +20,7 @@ var index = () => {
         reverse_port: config?.reverse_port ?? 17158
     });
     client.connect();
-    const url = `ws://127.0.0.1:${process.env?.port || config?.port || 17117}`;
+    const url = `ws://127.0.0.1:${process.env?.port || 17117}`;
     const cbp = cbpPlatform(url);
     const createUserAvatar = (id) => {
         return `https://q1.qlogo.cn/g?b=qq&s=0&nk=${id}`;
@@ -91,15 +91,18 @@ var index = () => {
         };
         cbp.send(e);
     });
-    // 错误处理
-    client.on('ERROR', event => {
-        logger.error(event);
-    });
     /**
      * @param val
      * @returns
      */
     const DataToMessage = async (val = []) => {
+        // 空元素
+        const empty = {
+            type: 'text',
+            data: {
+                text: ''
+            }
+        };
         const message = await Promise.all(val.map(async (item) => {
             if (item.type == 'Text') {
                 return {
@@ -124,16 +127,11 @@ var index = () => {
                     return {
                         type: 'at',
                         data: {
-                            qq: item.value,
+                            qq: item.value
                         }
                     };
                 }
-                return {
-                    type: 'text',
-                    data: {
-                        text: ''
-                    }
-                };
+                return empty;
             }
             else if (item.type == 'Image') {
                 return {
@@ -161,6 +159,7 @@ var index = () => {
                     }
                 };
             }
+            return empty;
         }));
         return message;
     };

package/lib/sdk/wss.js

@@ -51,8 +51,7 @@ class OneBotClient extends OneBotAPI {
             try {
                 const event = JSON.parse(data.toString());
                 if (!event) {
-                    if (this.#events['ERROR'])
-                        this.#events['ERROR'](event);
+                    logger.error('[OneBot] WebSocket message is empty');
                     return;
                 }
                 else if (event?.post_type == 'meta_event') {
@@ -102,16 +101,11 @@ class OneBotClient extends OneBotAPI {
                 }
             }
             catch (err) {
-                if (this.#events['ERROR'])
-                    this.#events['ERROR'](err);
+                logger.error('[OneBot] WebSocket error: ', err);
             }
         };
         const onClose = (code, reason) => {
-            if (this.#events['ERROR'])
-                this.#events['ERROR']({
-                    de: code,
-                    reason: reason.toString('utf8')
-                });
+            logger.error(`[OneBot] WebSocket closed: ${code} - ${reason.toString('utf8')}`);
         };
         if (!this.ws) {
             if (reverse_enable) {
@@ -123,14 +117,14 @@ class OneBotClient extends OneBotAPI {
                     this.ws.on('message', onMessage);
                     // close
                     this.ws.on('close', onClose);
-                    console.info('connected: ws://127.0.0.1:' + reverse_port);
+                    logger.info(`[OneBot] connected: ws://127.0.0.1:${reverse_port}`);
                 });
             }
             else {
                 // forward_open
                 this.ws = new WebSocket(url, c);
                 this.ws.on('open', () => {
-                    console.debug(`open:${url}`);
+                    logger.info(`[OneBot] connected: ${url}`);
                 });
                 // message
                 this.ws.on('message', onMessage);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/onebot",
-  "version": "2.1.0-alpha.5",
+  "version": "2.1.0-alpha.7",
   "description": "onebot v11",
   "author": "lemonade",
   "license": "MIT",
@@ -23,6 +23,9 @@
   "dependencies": {
     "ws": "^8.18.1"
   },
+  "peerDependencies": {
+    "alemonjs": "^2.1.0-alpha.15"
+  },
   "alemonjs": {
     "desktop": {
       "platform": [