buzzk 2.3.2 → 2.3.4

package/lib/chat.js

@@ -48,7 +48,9 @@ class chzzkChat {
     #status = {
         ws: false,
         established: false,
-        reconnect: true
+        watchDogID: null,
+        reconnect: true,
+        reconnectID: null
     }
     //Private
 
@@ -80,13 +82,22 @@ class chzzkChat {
  
             const socketOption = {
                 reconnection: false,
-                "force new connection": true,
                 "connect timeout": 6000,
                 transports: ["websocket"]
             };
             
             this.#ws = io.connect(session, socketOption);
 
+            if (!this.#status.watchDogID) {
+                this.#status.watchDogID = setTimeout(() => {
+                    this.#status.watchDogID = null;
+
+                    if (this.#status.established) return;
+
+                    return this.#rePromise();
+                }, 20000);
+            }
+
             this.#ws.on("connect", async (data) => { 
                 console.log("[WS] Connected!");
             });
@@ -106,6 +117,7 @@ class chzzkChat {
                 }
             });
 
+            //Events
             this.#ws.on("CHAT", (data) => {
                 if (!this.#callbacks.message) return;
                 data = JSON.parse(data);
@@ -130,35 +142,84 @@ class chzzkChat {
                 let donationData = new chzzkDonationData(data.donationType, data.payAmount, data.donatorChannelId, data.donatorNickname, data.donationText, data.emojis);
                 return this.#callbacks.donation(donationData);
             });
+            //Events
 
+            //Disconnect Handle
             this.#ws.on("error", (error) => {
-                console.log(error);
+                if (!this.#status.reconnect) return;
 
-                if (!this.#status.established) return resolve(null);
+                console.log("[WS] Disconnected! (" + error + ")");
+
+                return this.#rePromise();
             });
 
             this.#ws.on("disconnect", (data) => {
                 if (this.#callbacks.disconnect) this.#callbacks.disconnect(data);
-                
                 if (!this.#status.reconnect) return;
 
                 console.log("[WS] Disconnected! (" + data + ")");
 
-                this.#status.ws = false;
-                this.#status.established = false;
+                return this.#rePromise();
+            });
 
-                if (this.#ws) this.#ws.off();
-                if (!this.#status.established) resolve(null);
+            this.#ws.on("connect_error", (data) => {
+                if (!this.#status.reconnect) return;
 
-                this.#ws = null;
-                this.#channelID = null;
-                this.#session = null;
-                return this.connect();
+                console.log("[WS] Disconnected! (" + data + ")");
+
+                return this.#rePromise();
+            });
+
+            this.#ws.on("connect_timeout", () => {
+                if (!this.#status.reconnect) return;
+
+                console.log("[WS] Disconnected! (Connect Timeout)");
+
+                return this.#rePromise();
             });
 
+            this.#ws.on("handshake_timeout", () => {
+                if (!this.#status.reconnect) return;
+
+                console.log("[WS] Disconnected! (Handshake Timeout)");
+
+                return this.#rePromise();
+            });
+            //Disconnect Handle
+
         });
     }
 
+    async #rePromise() {
+        if (!this.#status.reconnect) return;
+        if (this.#status.reconnectID) return;
+        
+        let reIntv = Math.floor(Math.random() * 15000) + 8000;
+
+        this.#status.reconnectID = setTimeout(() => {
+            try {
+                if (this.#ws) this.#ws.off();
+                if (this.#ws) this.#ws.disconnect();
+            }
+
+            catch(error) {
+                console.log("[WS] Cleanup Disconnect Failed.");
+            }
+
+            this.#status.ws = false;
+            this.#status.established = false;
+
+            this.#ws = null;
+            this.#channelID = null;
+            this.#session = null;
+
+            setTimeout(() => {
+                this.#status.reconnectID = null;
+                return this.connect();
+            }, 2000);
+        }, reIntv);
+    }
+
     /**
      * @param {string} message 
      * @returns {Promise<boolean>}
@@ -289,7 +350,7 @@ class chzzkChat {
             this.#status.reconnect = false;
 
             await this.#ws.off();
-            await this.#ws.close();
+            await this.#ws.disconnect();
 
             this.#status.ws = false;
             this.#status.established = false;

package/lib/tool.js

@@ -22,6 +22,7 @@ function clientGet (path) {
         })
         
         .catch((error) => {
+            console.log(error);
             return resolve({"code": 500});
         });
 
@@ -48,6 +49,7 @@ function clientPost (path, body) {
         })
         
         .catch((error) => {
+            console.log(error);
             return resolve({"code": 500});
         });
 
@@ -72,6 +74,7 @@ function userGet (token, path) {
         })
         
         .catch((error) => {
+            console.log(error);
             return resolve({"code": 500});
         });
 
@@ -97,6 +100,7 @@ function userPost (token, path, body) {
         })
         
         .catch((error) => {
+            console.log(error);
             return resolve({"code": 500});
         });
 
@@ -120,6 +124,7 @@ function reqChzzk (path) {
         })
         
         .catch((error) => {
+            console.log(error);
             return resolve({"code": 500});
         });
 
@@ -166,6 +171,7 @@ function reqGame (path) {
         })
         
         .catch((error) => {
+            console.log(error);
             return resolve({"code": 500});
         });
 
@@ -188,6 +194,7 @@ function reqNaver (path) {
         })
         
         .catch((error) => {
+            console.log(error);
             return resolve({"code": 500});
         });
 

package/lib/vm.js

@@ -7,8 +7,10 @@ function getVersion () {
 
 async function check () {
     let localPkg = require("../package.json");
-    let remotePkg = await axios.get("https://raw.githubusercontent.com/Emin-G/buzzk/master/package.json");
-    if (remotePkg.status != 200) return console.log("[BUZZK] 최신 버전에 대한 정보를 불러오지 못했습니다.");
+    let remotePkg = await axios.get("https://raw.githubusercontent.com/Emin-G/buzzk/master/package.json").catch((error) => {
+        return;
+    });
+    if (!remotePkg || remotePkg.status != 200) return console.log("[BUZZK] 최신 버전에 대한 정보를 불러오지 못했습니다.");
 
     remotePkg = remotePkg.data;
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "buzzk",
   "displayName": "BUZZK",
-  "version": "2.3.2",
+  "version": "2.3.4",
   "description": "뿌지직 (BUZZK) - 치지직(CHZZK) 챗봇을 더욱 쉽게 개발할 수 있도록 돕는 비공식 라이브러리.",
   "main": "lib/index.js",
   "type": "commonjs",