@alemonjs/onebot 2.1.0-alpha.6 → 2.1.0-alpha.8

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,10 +91,6 @@ var index = () => {
         };
         cbp.send(e);
     });
-    // 错误处理
-    client.on('ERROR', event => {
-        logger.error(event);
-    });
     /**
      * @param val
      * @returns

package/lib/sdk/wss.js

@@ -1,5 +1,6 @@
 import WebSocket, { WebSocketServer } from 'ws';
 import { OneBotAPI, consume } from './api.js';
+import dayjs from 'dayjs';
 
 /**
  * 连接
@@ -24,6 +25,15 @@ class OneBotClient extends OneBotAPI {
         }
     }
     #events = {};
+    // 重连次数
+    #count = 0;
+    #getReConnectTime() {
+        const time = this.#count > 3 ? 1000 * 6 : 1000 * 1;
+        const curTime = this.#count > 6 ? 1000 * this.#count * 2 : time;
+        logger.info(`[OneBot] 等待 ${dayjs(curTime).format('mm:ss')} 后重新连接`);
+        this.#count++;
+        return curTime;
+    }
     /**
      * 注册事件处理程序
      * @param key 事件名称
@@ -51,8 +61,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 +111,17 @@ 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 (reverse_enable)
+                return;
+            const curTime = this.#getReConnectTime();
+            setTimeout(() => {
+                this.connect();
+            }, curTime);
         };
         if (!this.ws) {
             if (reverse_enable) {
@@ -123,14 +133,15 @@ 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}`);
+                    this.#count = 0;
                 });
                 // message
                 this.ws.on('message', onMessage);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/onebot",
-  "version": "2.1.0-alpha.6",
+  "version": "2.1.0-alpha.8",
   "description": "onebot v11",
   "author": "lemonade",
   "license": "MIT",
@@ -21,8 +21,12 @@
     "alemonjs"
   ],
   "dependencies": {
+    "dayjs": "^1.11.13",
     "ws": "^8.18.1"
   },
+  "peerDependencies": {
+    "alemonjs": "^2.1.0-alpha.15"
+  },
   "alemonjs": {
     "desktop": {
       "platform": [