buzzk 2.1.8 → 2.2.0

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/README.md

@@ -14,6 +14,10 @@
 
 ##  📖 업데이트 내역
 
+ ### 🎉 2.2 업데이트
+ - 이제 Axios를 사용하여 API를 불러옵니다!
+ - 더욱 안정적이고 빠른 성능을 보일 것으로 기대됩니다!
+
  ### 🎉 2.1 업데이트
  - 공식 API로 거의 대부분의 작업을 대체했어요!
 

package/lib/channel.js

@@ -32,7 +32,7 @@ async function search (keyword) {
         if (chSearch.code != 200) return resolve(null);
         chSearch = chSearch.content.data;
 
-        if (!chSearch) return resolve(null);
+        if (!chSearch || Object.keys(chSearch).length < 1) return resolve(null);
 
         let chRes = new Map();
 
@@ -58,6 +58,7 @@ async function get (channelID) {
         if (chGet.code != 200) return resolve(null);
 
         chGet = chGet.content.data[0];
+        if (!chGet) return resolve(null);
 
         let chRes = new chzzkChannel(chGet.channelId, chGet.channelName, chGet.followerCount, chGet.channelImageUrl);
 

package/lib/chat.js

@@ -114,6 +114,7 @@ class chzzkChat {
                         if (data.profile.badges[o].imageUrl == "https://ssl.pstatic.net/static/nng/glive/icon/manager.png") hasMod = true;
                     }
                 }
+                else return;
 
                 let chatData = new chzzkChatData(data.senderChannelId, data.profile.nickname, hasMod, data.content, data.emojis, data.messageTime);
                 return this.#callbacks.message(chatData);

package/lib/live.js

@@ -38,7 +38,6 @@ async function getDetail (channelID) {
     return new Promise(async (resolve, reject) => {
 
         let res = await reqChzzk("service/v3/channels/" + channelID + "/live-detail");
-        console.log(res);
         if (res.code != 200 || !res.content) return resolve(null);
         res = res.content;
 

package/lib/tool.js

@@ -1,11 +1,14 @@
 const { chzzkAPIURL, chzzkBaseURL, gameBaseURL, naverBaseURL, NID, AUTH } = require("./val.js");
 const vm = require("./vm.js");
 
+const axios = require("axios");
+
 function clientGet (path) {
     return new Promise(async (resolve, reject) => {
 
-        fetch(chzzkAPIURL + path, {
+        axios({
             method: "GET",
+            url: chzzkAPIURL + path,
             headers: {
                 "Client-Id": AUTH.id,
                 "Client-Secret": AUTH.secret,
@@ -14,17 +17,12 @@ function clientGet (path) {
             }
         })
 
-        .then(async (response) => {
-            let json;
-            try {
-                json = await response.json();
-            }
-
-            catch(error) {
-                return resolve({"code": 500});
-            }
-
-            return resolve(json);
+        .then((response) => {
+            return resolve(response.data);
+        })
+        
+        .catch((error) => {
+            return resolve({"code": 500});
         });
 
     });
@@ -33,8 +31,9 @@ function clientGet (path) {
 function clientPost (path, body) {
     return new Promise(async (resolve, reject) => {
 
-        fetch(chzzkAPIURL + path, {
+        axios({
             method: "POST",
+            url: chzzkAPIURL + path,
             headers: {
                 "Client-Id": AUTH.id,
                 "Client-Secret": AUTH.secret,
@@ -44,17 +43,12 @@ function clientPost (path, body) {
             body: body
         })
 
-        .then(async (response) => {
-            let json;
-            try {
-                json = await response.json();
-            }
-
-            catch(error) {
-                return resolve({"code": 500});
-            }
-
-            return resolve(json);
+        .then((response) => {
+            return resolve(response.data);
+        })
+        
+        .catch((error) => {
+            return resolve({"code": 500});
         });
 
     });
@@ -63,8 +57,9 @@ function clientPost (path, body) {
 function userGet (token, path) {
     return new Promise(async (resolve, reject) => {
 
-        fetch(chzzkAPIURL + path, {
+        axios({
             method: "GET",
+            url: chzzkAPIURL + path,
             headers: {
                 "Authorization": "Bearer " + token,
                 "Content-Type": "application/json",
@@ -72,17 +67,12 @@ function userGet (token, path) {
             }
         })
 
-        .then(async (response) => {
-            let json;
-            try {
-                json = await response.json();
-            }
-
-            catch(error) {
-                return resolve({"code": 500});
-            }
-
-            return resolve(json);
+        .then((response) => {
+            return resolve(response.data);
+        })
+        
+        .catch((error) => {
+            return resolve({"code": 500});
         });
 
     });
@@ -91,8 +81,9 @@ function userGet (token, path) {
 function userPost (token, path, body) {
     return new Promise(async (resolve, reject) => {
 
-        fetch(chzzkAPIURL + path, {
+        axios({
             method: "POST",
+            url: chzzkAPIURL + path,
             headers: {
                 "Authorization": "Bearer " + token,
                 "Content-Type": "application/json",
@@ -101,17 +92,12 @@ function userPost (token, path, body) {
             body: body
         })
 
-        .then(async (response) => {
-            let json;
-            try {
-                json = await response.json();
-            }
-
-            catch(error) {
-                return resolve({"code": 500});
-            }
-
-            return resolve(json);
+        .then((response) => {
+            return resolve(response.data);
+        })
+        
+        .catch((error) => {
+            return resolve({"code": 500});
         });
 
     });
@@ -120,101 +106,90 @@ function userPost (token, path, body) {
 function reqChzzk (path) {
     return new Promise(async (resolve, reject) => {
 
-        fetch(chzzkBaseURL + path, {
+        axios({
             method: "GET",
+            url: chzzkBaseURL + path,
             headers: {
                 "User-Agent": "BuzzkLib/" + vm.getVersion() + " (Node)"
             }
         })
 
-        .then(async (response) => {
-            let json;
-            try {
-                json = await response.json();
-            }
-
-            catch(error) {
-                return resolve({"code": 500});
-            }
-
-            return resolve(json);
+        .then((response) => {
+            return resolve(response.data);
+        })
+        
+        .catch((error) => {
+            return resolve({"code": 500});
         });
+
     });
 }
 
 function exChzzk (method, path) {
     return new Promise(async (resolve, reject) => {
 
-        fetch(chzzkBaseURL + path, {
+        axios({
             method: method,
+            url: chzzkBaseURL + path,
             headers: {
                 "Cookie": "NID_AUT=" + NID.AUT + ";NID_SES=" + NID.SES,
                 "User-Agent": "BuzzkLib/" + vm.getVersion() + " (Node)"
             }
         })
 
-        .then(async (response) => {
-            let json;
-            try {
-                json = await response.json();
-            }
-
-            catch(error) {
-                return resolve({"code": 500});
-            }
-
-            return resolve(json);
+        .then((response) => {
+            return resolve(response.data);
+        })
+        
+        .catch((error) => {
+            console.log(error);
+            return resolve({"code": 500});
         });
+
     });
 }
 
 function reqGame (path) {
     return new Promise(async (resolve, reject) => {
 
-        fetch(gameBaseURL + path, {
+        axios({
             method: "GET",
+            url: gameBaseURL + path,
             headers: {
                 "User-Agent": "BuzzkLib/" + vm.getVersion() + " (Node)"
             }
         })
 
-        .then(async (response) => {
-            let json;
-            try {
-                json = await response.json();
-            }
-
-            catch(error) {
-                return resolve({"code": 500});
-            }
-
-            return resolve(json);
+        .then((response) => {
+            return resolve(response.data);
+        })
+        
+        .catch((error) => {
+            return resolve({"code": 500});
         });
+
     });
 }
 
 function reqNaver (path) {
     return new Promise(async (resolve, reject) => {
 
-        fetch(naverBaseURL + path, {
+        axios({
             method: "GET",
+            url: naverBaseURL + path,
             headers: {
                 "User-Agent": "BuzzkLib/" + vm.getVersion() + " (Node)"
             }
         })
 
-        .then(async (response) => {
-            let json;
-            try {
-                json = await response.json();
-            }
-
-            catch(error) {
-                return resolve(null);
-            }
-
-            return resolve(json);
+        .then((response) => {
+            return resolve(response.data);
+        })
+        
+        .catch((error) => {
+            return resolve({"code": 500});
         });
+
     });
 }
 

package/lib/video.js

@@ -26,6 +26,8 @@ async function getList (channelID, size) {
         let res = await reqChzzk("service/v1/channels/" + channelID + "/videos?sortType=LATEST&pagingType=PAGE&page=0&size=" + size || 24);
         if (res.code != 200 || !res.content) return resolve(null);
         let videos = res.content.data;
+        if (Object.keys(videos).length < 1) return resolve(null);
+
         let data = new Map();
 
         try {

package/lib/vm.js

@@ -1,3 +1,5 @@
+const axios = require("axios");
+
 function getVersion () {
     let localPkg = require("../package.json");
     return localPkg.version;
@@ -5,11 +7,10 @@ function getVersion () {
 
 async function check () {
     let localPkg = require("../package.json");
-    let remotePkg = await fetch("https://raw.githubusercontent.com/Emin-G/buzzk/master/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] 최신 버전에 대한 정보를 불러오지 못했습니다.");
 
-    remotePkg = await remotePkg.json();
+    remotePkg = remotePkg.data;
 
     localPkg = String(localPkg.version).split(".");
     remotePkg = String(remotePkg.version).split(".");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "buzzk",
   "displayName": "BUZZK",
-  "version": "2.1.8",
+  "version": "2.2.0",
   "description": "뿌지직 (BUZZK) - 치지직(CHZZK) 챗봇을 더욱 쉽게 개발할 수 있도록 돕는 비공식 라이브러리.",
   "main": "lib/index.js",
   "type": "commonjs",
@@ -31,6 +31,7 @@
     "뿌지직"
   ],
   "dependencies": {
+    "axios": "^1.9.0",
     "socket.io-client": "^2.0.3"
   }
 }