buzzk 1.9.4 → 1.9.5

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2023 Emin-G
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-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
+MIT License
+
+Copyright (c) 2023 Emin-G
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+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.

package/lib/chat.js

@@ -19,8 +19,15 @@ class chzzkChat {
     #chatID;
     #callbacks = new Map();
 
-    #pollingStatus = false;
-    #pingStatus = false;
+    #status = {
+        polling: false,
+        pollingID: 0,
+        ping: false,
+        pingID: 0,
+        ws: false,
+        wsID: 0,
+        reconnect: false
+    }
     //Private
 
     /**
@@ -28,29 +35,32 @@ class chzzkChat {
      */
     connect() {
         return new Promise(async (resolve, reject) => {
-            if (this.#ws) return resolve(null);
-
-            //Get UID
-            let myInfo = await reqGame("nng_main/v1/user/getUserStatus");
-            if (myInfo.code != 200) return resolve(null);
-            this.#uid = myInfo.content.userIdHash;
-
-            //SetPolling
-            if (!this.#pollingStatus) {
-                this.#pollingStatus = true;
-                
-                setTimeout(async () => {
-                    this.#polling();
-                }, 30000);
-            }
-            //SetPolling
+            if (this.#status.ws) return resolve(null);
+            if (this.#status.polling && !this.#status.reconnect) return resolve(null);
+            else this.#status.reconnect = false;
 
             //Get ChatID
             let cidRes = await getStatus(this.channelID);
-            if (!cidRes) return resolve(null);
+            if (!cidRes) {
+                if (!this.#status.polling) {
+                    this.#status.polling = true;
+                    this.#polling();
+                }
+                return resolve(null);
+            }
             this.#chatID = cidRes.chatID;
             //Get ChatID
 
+            //Set Status
+            this.#status.ws = true;
+            //Set Status
+
+            //Get UID
+            let myInfo = await reqGame("nng_main/v1/user/getUserStatus");
+            if (myInfo.code != 200) return resolve(null);
+            this.#uid = myInfo.content.userIdHash;
+            //Get UID
+
             //Get accTkn
             let accRes = await reqGame("nng_main/v1/chats/access-token?channelId=" + this.#chatID + "&chatType=STREAMING");
             if (accRes.code != 200) return resolve(null);
@@ -64,6 +74,7 @@ class chzzkChat {
     
             //Connect Web Socket
             this.#ws = new WebSocket("wss://kr-ss" + this.#ssID + ".chat.naver.com/chat");
+            this.#status.wsID++;
             //Connect Web Socket
 
             //WS Open
@@ -94,6 +105,8 @@ class chzzkChat {
 
             this.#ws.on("close", () => {
                 console.log("[WS] Disconnect!");
+                this.#status.ws = false;
+                this.#status.ping = false;
             });
 
             //WS Message
@@ -124,7 +137,21 @@ class chzzkChat {
     
                 //Connected
                 else if (data.cmd == 10100) {
-                    if (!this.#pingStatus) this.#ping();
+                    if (!this.#status.ping) {
+                        this.#status.ping = true;
+                        this.#status.pingID++;
+                        this.#ping(this.#status.pingID);
+                    }
+                    if (!this.#status.polling) {
+                        this.#status.polling = true;
+                        this.#polling();
+                    }
+
+                    for (let o in this.#callbacks) {
+                        if (this.#callbacks[o].type === "message") this.#onMessageHandler(this.#status.wsID, this.#callbacks[o].callback);
+                        else if (this.#callbacks[o].type === "donation") this.#onDonationHandler(this.#status.wsID, this.#callbacks[o].callback);
+                    }
+
                     resolve(true);
                 }
                 //Connected
@@ -140,7 +167,7 @@ class chzzkChat {
      */
     send(message) {
         return new Promise(async (resolve, reject) => {
-            if (!this.#ws) return resolve(null);
+            if (!this.#status.ws) return resolve(null);
 
             let extras = {
                 "chatType":"STREAMING",
@@ -204,13 +231,15 @@ class chzzkChat {
             type: "message",
             callback: callback
         };
-        this.#onMessageHandler(callback);
+        this.#onMessageHandler(this.#status.wsID, callback);
     }
 
-    #onMessageHandler (callback) {
-        if (!this.#ws) return callback(null);
+    #onMessageHandler (wsID, callback) {
+        if (!this.#status.ws) return callback(null);
 
         this.#ws.on("message", async (data) => {
+            if (wsID != this.#status.wsID) return;
+
             try {
                 data = await JSON.parse(data);
             }
@@ -278,7 +307,7 @@ class chzzkChat {
     }
 
     #onDonationHandler (callback) {
-        if (!this.#ws) return callback(null);
+        if (!this.#status.ws) return callback(null);
 
         this.#ws.on("message", async (data) => {
             try {
@@ -345,7 +374,7 @@ class chzzkChat {
      * @param {function} callback
      */
     onDisconnect(callback) {
-        if (!this.#ws) return callback(null);
+        if (!this.#status.ws) return callback(null);
 
         this.#ws.on("close", () => {
             callback();
@@ -358,7 +387,7 @@ class chzzkChat {
      */
     getRecentChat(size) {
         return new Promise(async (resolve, reject) => {
-            if (!this.#ws) return resolve(null);
+            if (!this.#status.ws) return resolve(null);
 
             let reqOpt = {
                 "ver": "2",
@@ -466,17 +495,18 @@ class chzzkChat {
      */
     async disconnect() {
         return new Promise(async (resolve, reject) => {
-            if (!this.#ws) return resolve(null);
+            if (!this.#status.ws) return resolve(null);
 
             await this.#ws.close();
             this.#ws = null;
+            this.#status.ws = false;
+            this.#status.wsID++;
             return resolve(true);
         });
     }
 
     async #polling () {
-        //if (!this.#ws) return this.#pollingStatus = false;
-        this.#pollingStatus = true;
+        if (!this.#status.polling) return;
 
         //Get ChatID
         let cidRes = await getStatus(this.channelID);
@@ -484,16 +514,9 @@ class chzzkChat {
             this.#chatID = cidRes.chatID;
 
             //Reconnect
-            this.#pollingStatus = false;
+            this.#status.reconnect = true;
             await this.disconnect();
-            let connectRes = await this.connect();
-            if (connectRes) {
-                for (let o in this.#callbacks) {
-                    if (this.#callbacks[o].type === "message") this.#onMessageHandler(this.#callbacks[o].callback);
-                    else if (this.#callbacks[o].type === "donation") this.#onDonationHandler(this.#callbacks[o].callback);
-                }
-                return;
-            }
+            await this.connect();
             //Reconnect
         }
         //Get ChatID
@@ -507,18 +530,18 @@ class chzzkChat {
         }, interval);
     }
 
-    async #ping () {
-        //if (!this.#ws) return this.#pingStatus = false;
-        this.#pingStatus = true;
+    async #ping (pingID) {
+        if (!this.#status.ws) return this.#status.ping = false;
+        if (!this.#status.ping || pingID != this.#status.pingID) return;
 
         let pingOpt = {
             "ver": "2",
             "cmd": 0
         };
-        if (this.#ws && this.#ws.readyState == WebSocket.OPEN) this.#ws.send(JSON.stringify(pingOpt));
+        if (this.#ws.readyState == WebSocket.OPEN) this.#ws.send(JSON.stringify(pingOpt));
 
         setTimeout(() => {
-            return this.#ping();
+            return this.#ping(pingID);
         }, 20000);
     }
 }

package/lib/live.js

@@ -83,7 +83,7 @@ async function getStatus (channelID) {
     return new Promise(async (resolve, reject) => {
 
         let res = await reqChzzk("polling/v2/channels/" + channelID + "/live-status");
-        if (res.code != 200) return resolve(null);
+        if (res.code != 200 || !res.content) return resolve(null);
         res = res.content;
 
         try {

package/package.json

@@ -1,36 +1,36 @@
-{
-  "name": "buzzk",
-  "displayName": "BUZZK",
-  "version": "1.9.4",
-  "description": "뿌지직 (BUZZK) - 치지직(CHZZK) 챗봇을 더욱 쉽게 개발할 수 있도록 돕는 비공식 라이브러리.",
-  "main": "lib/index.js",
-  "type": "commonjs",
-  "directories": {
-    "lib": "lib"
-  },
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": {
-    "name": "Emin-G",
-    "email": "dev.mingowo@gmail.com"
-  },
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Emin-G/buzzk.git"
-  },
-  "bugs": {
-    "url": "https://github.com/Emin-G/buzzk/issues"
-  },
-  "homepage": "https://github.com/Emin-G/buzzk",
-  "keywords": [
-    "chzzk",
-    "buzzk",
-    "치지직",
-    "뿌지직"
-  ],
-  "dependencies": {
-    "ws": "^8.16.0"
-  }
-}
+{
+  "name": "buzzk",
+  "displayName": "BUZZK",
+  "version": "1.9.5",
+  "description": "뿌지직 (BUZZK) - 치지직(CHZZK) 챗봇을 더욱 쉽게 개발할 수 있도록 돕는 비공식 라이브러리.",
+  "main": "lib/index.js",
+  "type": "commonjs",
+  "directories": {
+    "lib": "lib"
+  },
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": {
+    "name": "Emin-G",
+    "email": "dev.mingowo@gmail.com"
+  },
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Emin-G/buzzk.git"
+  },
+  "bugs": {
+    "url": "https://github.com/Emin-G/buzzk/issues"
+  },
+  "homepage": "https://github.com/Emin-G/buzzk",
+  "keywords": [
+    "chzzk",
+    "buzzk",
+    "치지직",
+    "뿌지직"
+  ],
+  "dependencies": {
+    "ws": "^8.16.0"
+  }
+}