@laplace.live/ws 7.1.7 → 7.1.9

package/dist/browser.js

@@ -1822,7 +1822,7 @@ var KeepLive = class extends LaplaceEventTarget {
     super();
     this.createConnection = createConnection;
     this.closed = false;
-    this.interval = 100;
+    this.interval = 3e3;
     this.timeout = 45 * 1e3;
     this.connection = this.createConnection();
     this.connect(false);
@@ -1836,8 +1836,9 @@ var KeepLive = class extends LaplaceEventTarget {
    */
   connect(reconnect = true) {
     if (reconnect) {
-      this.connection.close();
+      const old = this.connection;
       this.connection = this.createConnection();
+      old.close();
     }
     const connection = this.connection;
     let timeout = setTimeout(() => {
@@ -1845,6 +1846,7 @@ var KeepLive = class extends LaplaceEventTarget {
       connection.dispatchEvent(new Event("timeout"));
     }, this.timeout);
     connection.addEventListener("event", (e) => {
+      if (this.connection !== connection) return;
       const evt = e.data;
       if (evt.type !== "error") {
         if (evt instanceof LaplaceRawEvent) {
@@ -1856,11 +1858,12 @@ var KeepLive = class extends LaplaceEventTarget {
     });
     connection.addEventListener("error", () => this.dispatchEvent(new Event("e")));
     connection.addEventListener("close", () => {
-      if (!this.closed) {
+      if (!this.closed && this.connection === connection) {
         setTimeout(() => this.connect(), this.interval);
       }
     });
     connection.addEventListener("heartbeat", () => {
+      if (this.connection !== connection) return;
       clearTimeout(timeout);
       timeout = setTimeout(() => {
         connection.close();
@@ -2026,8 +2029,10 @@ var Live = class extends LaplaceEventTarget {
     }, 0);
     this.send = send;
     this.close = () => {
+      if (this.closed) return;
       this.closed = true;
       close();
+      this.dispatchEvent(new Event("close"));
     };
     const decode = makeDecoder(inflates2);
     this.addEventListener("message", async (e) => {
@@ -2049,11 +2054,7 @@ var Live = class extends LaplaceEventTarget {
           this.dispatchEvent(new LaplaceRawEvent("msg", data));
           const cmd = data.cmd || data.msg?.cmd;
           if (cmd) {
-            if (cmd.includes("DANMU_MSG")) {
-              this.dispatchEvent(new LaplaceRawEvent("DANMU_MSG", data));
-            } else {
-              this.dispatchEvent(new LaplaceRawEvent(cmd, data));
-            }
+            this.dispatchEvent(new LaplaceRawEvent(cmd, data));
           }
         }
       });
@@ -2112,7 +2113,11 @@ var LiveWSBase = class extends Live {
     ws.binaryType = "arraybuffer";
     ws.addEventListener("open", (e) => this.dispatchEvent(new Event(e.type)));
     ws.addEventListener("message", (e) => this.dispatchEvent(new LaplaceRawEvent("message", new Uint8Array(e.data))));
-    ws.addEventListener("close", (e) => this.dispatchEvent(new Event(e.type)));
+    ws.addEventListener("close", (e) => {
+      if (!this.closed) {
+        this.dispatchEvent(new Event(e.type));
+      }
+    });
     ws.addEventListener("error", () => this.dispatchEvent(new Event("_error")));
     this.ws = ws;
   }

package/dist/index.js

@@ -39,7 +39,7 @@ var KeepLive = class extends LaplaceEventTarget {
     super();
     this.createConnection = createConnection;
     this.closed = false;
-    this.interval = 100;
+    this.interval = 3e3;
     this.timeout = 45 * 1e3;
     this.connection = this.createConnection();
     this.connect(false);
@@ -53,8 +53,9 @@ var KeepLive = class extends LaplaceEventTarget {
    */
   connect(reconnect = true) {
     if (reconnect) {
-      this.connection.close();
+      const old = this.connection;
       this.connection = this.createConnection();
+      old.close();
     }
     const connection = this.connection;
     let timeout = setTimeout(() => {
@@ -62,6 +63,7 @@ var KeepLive = class extends LaplaceEventTarget {
       connection.dispatchEvent(new Event("timeout"));
     }, this.timeout);
     connection.addEventListener("event", (e) => {
+      if (this.connection !== connection) return;
       const evt = e.data;
       if (evt.type !== "error") {
         if (evt instanceof LaplaceRawEvent) {
@@ -73,11 +75,12 @@ var KeepLive = class extends LaplaceEventTarget {
     });
     connection.addEventListener("error", () => this.dispatchEvent(new Event("e")));
     connection.addEventListener("close", () => {
-      if (!this.closed) {
+      if (!this.closed && this.connection === connection) {
         setTimeout(() => this.connect(), this.interval);
       }
     });
     connection.addEventListener("heartbeat", () => {
+      if (this.connection !== connection) return;
       clearTimeout(timeout);
       timeout = setTimeout(() => {
         connection.close();
@@ -246,8 +249,10 @@ var Live = class extends LaplaceEventTarget {
     }, 0);
     this.send = send;
     this.close = () => {
+      if (this.closed) return;
       this.closed = true;
       close();
+      this.dispatchEvent(new Event("close"));
     };
     const decode = makeDecoder(inflates2);
     this.addEventListener("message", async (e) => {
@@ -269,11 +274,7 @@ var Live = class extends LaplaceEventTarget {
           this.dispatchEvent(new LaplaceRawEvent("msg", data));
           const cmd = data.cmd || data.msg?.cmd;
           if (cmd) {
-            if (cmd.includes("DANMU_MSG")) {
-              this.dispatchEvent(new LaplaceRawEvent("DANMU_MSG", data));
-            } else {
-              this.dispatchEvent(new LaplaceRawEvent(cmd, data));
-            }
+            this.dispatchEvent(new LaplaceRawEvent(cmd, data));
           }
         }
       });
@@ -334,7 +335,11 @@ var LiveTCPBase = class extends Live {
     this.i = 0;
     this.buf = Buffer.alloc(0);
     socket.on("ready", () => this.dispatchEvent(new Event("open")));
-    socket.on("close", () => this.dispatchEvent(new Event("close")));
+    socket.on("close", () => {
+      if (!this.closed) {
+        this.dispatchEvent(new Event("close"));
+      }
+    });
     socket.on("error", () => this.dispatchEvent(new Event("_error")));
     socket.on("data", (buffer) => {
       this.buf = Buffer.concat([this.buf, buffer]);
@@ -379,7 +384,11 @@ var LiveWSBase = class extends Live {
     ws.binaryType = "arraybuffer";
     ws.addEventListener("open", (e) => this.dispatchEvent(new Event(e.type)));
     ws.addEventListener("message", (e) => this.dispatchEvent(new LaplaceRawEvent("message", new Uint8Array(e.data))));
-    ws.addEventListener("close", (e) => this.dispatchEvent(new Event(e.type)));
+    ws.addEventListener("close", (e) => {
+      if (!this.closed) {
+        this.dispatchEvent(new Event(e.type));
+      }
+    });
     ws.addEventListener("error", () => this.dispatchEvent(new Event("_error")));
     this.ws = ws;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@laplace.live/ws",
-  "version": "7.1.7",
+  "version": "7.1.9",
   "description": "LAPLACE Live! flavored bilibili live WebSocket/TCP API",
   "type": "module",
   "main": "./dist/index.js",
@@ -62,13 +62,13 @@
     "provenance": true
   },
   "dependencies": {
-    "@laplace.live/internal": "^1.3.4"
+    "@laplace.live/internal": "^1.3.7"
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.4.6",
+    "@biomejs/biome": "^2.4.12",
     "@changesets/cli": "^2.30.0",
-    "@types/bun": "^1.3.10",
-    "playwright": "^1.58.2",
+    "@types/bun": "^1.3.12",
+    "playwright": "^1.59.1",
     "tsup": "^8.5.1",
     "typescript": "^5.9.3"
   }