@floating-live/bilibili 0.16.16 → 0.16.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@floating-live/bilibili",
-  "version": "0.16.16",
+  "version": "0.16.17",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "@floating-live/cookies": "^0.1.0",
-    "bilibili-live-danmaku": "^0.7.13",
+    "bilibili-live-danmaku": "^0.7.15",
     "md5": "^2.3.0"
   },
   "devDependencies": {
@@ -33,5 +33,5 @@
   "peerDependencies": {
     "floating-live": "^0.16.6"
   },
-  "gitHead": "67c413a99f964efabfec55c90fc5803c653a6c62"
+  "gitHead": "a97aa84ee559b632c278f4cc14bf1958c1b1eb97"
 }

package/room.d.ts

@@ -59,6 +59,8 @@ export declare class RoomBilibili extends LiveRoom implements BilibiliRoomData {
     autoReconnect: boolean;
     /** 是否初始化 */
     whenInit: Promise<RoomBilibili>;
+    /** 重连次数 */
+    reconnectCount: number;
     get userAgent(): string;
     set userAgent(ua: string);
     /** 是否处于重连状态 */
@@ -94,6 +96,8 @@ export declare class RoomBilibili extends LiveRoom implements BilibiliRoomData {
     setTokens(tokens: ConnectTokens): void;
     /** 无缝重连 */
     reconnect(): void;
+    /** 间隔安全重连，等待一定连接间隔后可重连 */
+    safeReconnect(): void;
     private emitConnention;
     /** 打开直播弹幕客户端 */
     private openWebsocketClient;

package/room.js

@@ -53,6 +53,8 @@ export class RoomBilibili extends LiveRoom {
         this.anchor = { name: "", id: 0 };
         /** 直播间弹幕api客户端 */
         this.client = null;
+        /** 重连次数 */
+        this.reconnectCount = 0;
         /** 连接凭证 */
         _RoomBilibili_tokens.set(this, void 0);
         /** 用户cookie */
@@ -198,12 +200,41 @@ export class RoomBilibili extends LiveRoom {
         this.reconnecting = true;
         const lastClient = this.client;
         this.initClient();
+        console.log("reconnect - " + Date.now());
+        // 控制连接事件成功或失败
+        const connectionAbortController = new AbortController();
         // 重连成功后，关闭上一个连接
         this.client?.addEventListener("open", () => {
+            connectionAbortController.abort();
             lastClient?.[symbolAbortController].abort();
-            lastClient?.close();
+            lastClient && lastClient.ws.readyState < 2 && lastClient?.close();
             this.reconnecting = false;
-        }, { once: true });
+            this.reconnectCount = 0;
+        }, { once: true, signal: connectionAbortController.signal });
+        // 若重连失败，关闭该连接、恢复上一个连接并重连
+        this.client?.addEventListener("error", () => {
+            connectionAbortController.abort();
+            const failedClient = this.client;
+            this.client = lastClient;
+            failedClient?.[symbolAbortController].abort();
+            failedClient && failedClient.ws.readyState < 2 && failedClient?.close();
+            this.reconnecting = false;
+            this.reconnectCount += 1;
+            this.safeReconnect();
+        }, { once: true, signal: connectionAbortController.signal });
+    }
+    /** 间隔安全重连，等待一定连接间隔后可重连 */
+    safeReconnect() {
+        const timeout = this.lastConnectionTime + this.connectInterval - Date.now();
+        if (timeout > 0) {
+            const t = setTimeout(() => {
+                this.reconnect();
+                clearTimeout(t);
+            }, timeout);
+        }
+        else {
+            this.reconnect();
+        }
     }
     emitConnention(status) {
         this.connectionStatus = status;
@@ -255,17 +286,8 @@ export class RoomBilibili extends LiveRoom {
             this.opened && this.emitConnention(LiveConnectionStatus.disconnected);
             // 自动重连
             if (this.opened && this.autoReconnect) {
-                const timeout = this.lastConnectionTime + this.connectInterval - Date.now();
-                this.lastConnectionTime = Date.now();
-                if (timeout > 0) {
-                    const t = setTimeout(() => {
-                        this.reconnect();
-                        clearTimeout(t);
-                    }, timeout);
-                }
-                else {
-                    this.reconnect();
-                }
+                this.reconnectCount += 1;
+                this.safeReconnect();
             }
         }, { signal });
         client.addEventListener("CONNECT_SUCCESS", () => {