@alemonjs/kook 2.1.0-alpha.3 → 2.1.0

package/lib/sdk/wss.js

@@ -4,38 +4,21 @@ import { KOOKAPI } from './api.js';
 import { ConversationMap } from './conversation.js';
 
 class KOOKClient extends KOOKAPI {
-    // 标记是否已连接
     #isConnected = false;
-    // 存储 session Id
     #sessionId = null;
-    // 存储最新的消息序号
     #lastMessageSN = 0;
-    /**
-     *
-     * @param opstion
-     */
     constructor(opstion) {
         super();
         config.set('token', opstion.token);
     }
     #ws;
+    #heartbeatInterval = null;
     #events = {};
-    /**
-     * 注册事件处理程序
-     * @param key 事件名称
-     * @param val 事件处理函数
-     */
     on(key, val) {
         this.#events[key] = val;
         return this;
     }
-    /**
-     * 使用获取到的网关连接地址建立 WebSocket 连接
-     * @param token
-     * @param conversation
-     */
     async connect() {
-        // 请求url
         const gatewayUrl = await this.gateway()
             .then(res => res?.data?.url)
             .catch(err => {
@@ -43,22 +26,13 @@ class KOOKClient extends KOOKAPI {
                 this.#events['ERROR'](err);
             }
         });
-        if (!gatewayUrl && gatewayUrl === '') {
+        if (!gatewayUrl || gatewayUrl === '') {
             return;
         }
-        // 建立连接
         const map = {
             0: async ({ d, sn }) => {
-                /**
-                 * 处理 EVENT 信令
-                 * 包括按序处理消息和记录最新的消息序号
-                 */
                 if (d && sn) {
                     if (sn === this.#lastMessageSN + 1) {
-                        /**
-                         * 消息序号正确
-                         * 按序处理消息
-                         */
                         this.#lastMessageSN = sn;
                         try {
                             if (d.channel_type === 'GROUP') {
@@ -79,13 +53,8 @@ class KOOKClient extends KOOKAPI {
                                 this.#events['ERROR'](err);
                             }
                         }
-                        //
                     }
                     else if (sn > this.#lastMessageSN + 1) ;
-                    /**
-                     * 如果收到已处理过的消息序号
-                     * 则直接丢弃
-                     */
                 }
             },
             1: ({ d }) => {
@@ -112,13 +81,14 @@ class KOOKClient extends KOOKAPI {
             },
             5: () => {
                 console.info('[ws] Connection failed, reconnect');
-                /**
-                 * 处理 RECONNECT 信令
-                 * 断开当前连接并进行重新连接
-                 */
                 this.#isConnected = false;
                 this.#sessionId = null;
-                console.info('[ws] sessionId', this.#sessionId);
+                if (this.#heartbeatInterval) {
+                    clearInterval(this.#heartbeatInterval);
+                    this.#heartbeatInterval = null;
+                }
+                this.#ws.close();
+                void this.connect();
             },
             6: () => {
                 console.info('[ws] resume ack');
@@ -138,8 +108,10 @@ class KOOKClient extends KOOKAPI {
             }
         };
         this.#ws.on('message', msg => void onMessage(msg));
-        // 心跳定时发送
-        setInterval(() => {
+        if (this.#heartbeatInterval) {
+            clearInterval(this.#heartbeatInterval);
+        }
+        this.#heartbeatInterval = setInterval(() => {
             if (this.#isConnected) {
                 this.#ws.send(JSON.stringify({
                     s: 2,
@@ -148,7 +120,18 @@ class KOOKClient extends KOOKAPI {
             }
         }, 30000);
         this.#ws.on('close', () => {
+            if (this.#heartbeatInterval) {
+                clearInterval(this.#heartbeatInterval);
+                this.#heartbeatInterval = null;
+            }
             console.error('[ws] close');
+            if (this.#isConnected) {
+                this.#isConnected = false;
+                this.#sessionId = null;
+                setTimeout(() => {
+                    void this.connect();
+                }, 5000);
+            }
         });
         this.#ws.on('error', err => {
             console.error('[ws] error', err);

package/lib/sdk/wss.types.d.ts

@@ -0,0 +1,3 @@
+export interface KOOKOptions {
+    token: string;
+}

package/lib/sdk/wss.types.js

@@ -0,0 +1 @@
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/kook",
-  "version": "2.1.0-alpha.3",
+  "version": "2.1.0",
   "description": "kook platform connection",
   "author": "lemonade",
   "license": "MIT",
@@ -8,7 +8,7 @@
   "main": "lib/index.js",
   "types": "lib",
   "scripts": {
-    "build": "node bundle.js"
+    "build": "lvy build"
   },
   "exports": {
     ".": {
@@ -59,4 +59,4 @@
     "type": "git",
     "url": "https://github.com/lemonade-lab/alemonjs.git"
   }
-}
+}