@floating-live/bilibili 0.16.16 → 0.17.0-alpha.0

package/LICENSE

@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

package/{parser.js → dist/parser.js}

@@ -549,6 +549,7 @@ export function parseGetInfoByRoom(data) {
         openStatus: 0,
         opened: false,
         connectionStatus: 0,
+        valid: true,
     };
 }
 /** 转换bilibili直播间信息为floating通用格式 */
@@ -580,6 +581,7 @@ export function parseRoomBaseInfo(data) {
         openStatus: 0,
         opened: false,
         connectionStatus: 0,
+        valid: true,
     };
 }
 export function mergeLiveRoomData(...list) {

package/{plugin.js → dist/plugin.js}

@@ -25,11 +25,12 @@ export class PluginBilibili extends BasePlugin {
         this.room = null;
     }
     init(ctx) {
-        ctx.whenRegister("platform", (platform) => {
+        ctx.whenRegister("platform", () => {
+            const platform = ctx.getPluginExposes("platform");
             platform.register("bilibili", platformInfo, ctx.signal);
         });
-        ctx.whenRegister("room", (room) => {
-            this.room = room;
+        ctx.whenRegister("room", () => {
+            this.room = ctx.getPluginExposes("room");
             return () => {
                 this.room = null;
             };

package/{room.d.ts → dist/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 → dist/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", () => {

package/package.json

@@ -1,37 +1,45 @@
 {
   "name": "@floating-live/bilibili",
-  "version": "0.16.16",
+  "version": "0.17.0-alpha.0",
   "type": "module",
-  "main": "index.js",
-  "types": "index.d.ts",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "author": "Minteea",
   "license": "MIT",
   "scripts": {
     "check": "tsc --noEmit",
-    "clear": "rimraf **/*.js **/*.d.ts --glob",
+    "clear": "rimraf ./dist",
     "build": "npm run clear && npm run check &&  tsc --build && tsc-alias",
     "prepack": "npm run build",
-    "postpack": "npm run clear"
+    "postpack": "npm run clear",
+    "build:plugin": "vite build --config plugin.vite.config.ts",
+    "version": "floating-live-plugin-tools version && git add plugin.json"
   },
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
     "@floating-live/cookies": "^0.1.0",
-    "bilibili-live-danmaku": "^0.7.13",
+    "bilibili-live-danmaku": "^0.7.15",
     "md5": "^2.3.0"
   },
   "devDependencies": {
+    "@floating-live/plugin-tools": "^0.1.0-alpha.5",
     "@types/md5": "^2.3.0",
     "@types/websocket": "^1.0.5",
     "@types/ws": "^8.5.3",
-    "floating-live": "^0.16.6",
+    "floating-live": "^0.17.0-alpha.1",
     "rimraf": "^3.0.2",
     "tsc-alias": "^1.8.16",
-    "typescript": "^5.9.3"
+    "typescript": "^5.9.3",
+    "vite": "^8.0.11"
   },
   "peerDependencies": {
-    "floating-live": "^0.16.6"
+    "floating-live": "0.17.0-alpha.1"
   },
-  "gitHead": "67c413a99f964efabfec55c90fc5803c653a6c62"
+  "files": [
+    "dist",
+    "plugin.json"
+  ],
+  "gitHead": "eb7c02f5dba6b6abc223b747cdf391942ae9e734"
 }

package/plugin.json

@@ -0,0 +1,7 @@
+{
+  "name": "bilibili",
+  "author": "FloatingLive",
+  "version": "0.17.0-alpha.0",
+  "description": "Bilibili plugin for FloatingLive",
+  "main": "plugin.js"
+}