buzzk 2.0.0 → 2.1.0

package/README.md

@@ -9,16 +9,13 @@
 <p align="center">
 뿌지직은 치지직 챗봇을 더욱 쉽게 개발할 수 있도록 돕는 비공식 라이브러리 입니다.
 </p>
-<p align="center">
-챗봇 개발에 초점이 맞춰저 있어, 여러 계정에 동시 로그인할 수 없습니다.
-</p>
 
 ---
 
 ##  📖 업데이트 내역
 
- ### 🎉 2.0 업데이트
- - 공식 API를 일부 지원하기 시작했어요!
+ ### 🎉 2.1 업데이트
+ - 공식 API로 거의 대부분의 작업을 대체했어요!
 
 > [!CAUTION]
 > 이 버전 이후부터는 공식 API와 비공식 API를 혼용하여 사용합니다.
@@ -29,6 +26,59 @@
 > * 비공식 API로만 이루어진 모듈을 사용하시려면
 > `npm install buzzk@1.11.3`
 
+---
+
+##  ✒️ 마이그레이션 가이드 (v.2.0.x -> v.2.1.0)
+
+<details>
+<summary>펼쳐보기</summary>
+
+	buzzkChat
+
+| <img src="https://github.com/Emin-G/Img/blob/main/tags/tag_change-min.png?raw=true"  alt="BUZZK"  width="70"> | new buzzkChat("channelID 값") |
+|--|--|
+|  | new buzzkChat("accessToken 값") |
+
+---
+
+| <img src="https://github.com/Emin-G/Img/blob/main/tags/tag_delete-min.png?raw=true"  alt="BUZZK"  width="70"> | 삭제 |
+|--|--|
+|  | (chat).getRecentChat() |
+
+---
+
+	buzzkChat.onMessage
+
+| <img src="https://github.com/Emin-G/Img/blob/main/tags/tag_delete-min.png?raw=true"  alt="BUZZK"  width="70"> | 삭제 |
+|--|--|
+|  | (callback).author.imageURL |
+
+---
+
+	buzzkChat.onDonation
+
+| <img src="https://github.com/Emin-G/Img/blob/main/tags/tag_delete-min.png?raw=true"  alt="BUZZK"  width="70"> | 삭제 |
+|--|--|
+|  | (callback).author.imageURL |
+
+---
+
+| <img src="https://github.com/Emin-G/Img/blob/main/tags/tag_delete-min.png?raw=true"  alt="BUZZK"  width="70"> | 삭제 |
+|--|--|
+|  | (callback).time |
+
+---
+
+	buzzk.live
+
+| <img src="https://github.com/Emin-G/Img/blob/main/tags/tag_delete-min.png?raw=true"  alt="BUZZK"  width="70"> | 삭제 |
+|--|--|
+|  | buzzk.live.getAccess() |
+
+</details>
+
+---
+
 ##  ✒️ 마이그레이션 가이드 (v.1.x -> v.2.0.0)
 
 <details>
@@ -83,37 +133,37 @@
 
     const buzzk = require("buzzk");
 	buzzk.auth("ClientID 값", "ClientSecret 값");
-    buzzk.login("NID_AUT 쿠키 값", "NID_SES 쿠키 값");
+
+    //buzzk.login("NID_AUT 쿠키 값", "NID_SES 쿠키 값");
+	//buzzk.channel.follow, unfollow 시에만 사용.
     
     const buzzkChat = buzzk.chat;
     
     async function test () {
     
-        let chSearch = await buzzk.channel.search("녹두로로"); //채널 검색
-        
-        let channel = chSearch[0]; //검색 결과 첫번째 채널
-    
-        const lvDetail = await buzzk.live.getDetail(channel.channelID); //현재 방송 정보
+		let oauth = buzzk.oauth.get("code 값");
     
-        let chat = new buzzkChat(channel.channelID);
+        let chat = new buzzkChat(oauth.accessToken);
         await chat.connect(); //채팅창 연결
     
-        let recentChat = await chat.getRecentChat(); //최근 채팅 가져오기 (기본값 50개)
-        console.log(recentChat);
-    
         chat.onMessage(async (data) => { //채팅이 왔을 때
-            for (let o in data) {
-                console.log(data[o].message);
+			console.log(data.message);
+
+			if (data.message == "!ping") await chat.send("pong!");
+			//채팅 보내기
 
-				if (data[o].message === "!ping") await chat.send("pong!");
-				//채팅 보내기 (login 후에만 가능)
+			if (data.message == "!공지") await chat.setNotice("테스트!");
+			//채팅 상단 고정 (공지)
 
-				let userInfo = await chat.getUserInfo(data[o].author.id);
-            	console.log(userInfo);
-				//채팅 보낸 유저의 정보
-            }
+			let userInfo = await chat.getUserInfo(data.author.id);
+			console.log(userInfo);
+			//채팅 보낸 유저의 정보
         });
 
+		chat.onDonation(async (data) => { //후원이 왔을 때
+			//TODO
+		});
+
 		chat.onDisconnect(async () => { //채팅창 연결이 끊겼을 때
 			//TODO
     	});
@@ -144,6 +194,7 @@ dotenv와 함께 사용하는 것을 매우 권장합니다.
 
     buzzk.login("NID_AUT 쿠키 값", "NID_SES 쿠키 값");
 
+* 해당 함수는 이제 buzzk.channel.follow, unfollow 시에만 사용됩니다.
 dotenv와 함께 사용하는 것을 매우 권장합니다.
 
     buzzk.login(process.env.NID_AUT, process.env.NID_SES);
@@ -298,95 +349,69 @@ dotenv와 함께 사용하는 것을 매우 권장합니다.
 
 ###  chat
 
+✅ Official API
+
     const buzzkChat = buzzk.chat;
-    let chat = new buzzkChat("channelID 값");
+    let chat = new buzzkChat("accessToken 값");
     await chat.connect(); //채팅창 연결
 
 >
 
-    let recentChat = await chat.getRecentChat(갯수); //최근 채팅 가져오기 (기본값 50개)
-    console.log(recentChat);
-
-<details>
-<summary>return</summary>
-
- - Return
-	 - 0
-		 - author
-			 - id
-			 - name
-			 - imageURL
-			 - hasMod //관리 권한을 가졌는지 (false / true)
-		 - message
-		 - time
-	 - 1
-	 - 2
-	 - 3
-	 - ...
-
-</details>
+✅ Official API
 
     chat.onMessage((data) => { //채팅이 왔을 때
     	console.log(data);
-    
-	    for (let o in data) {
-	        console.log(data[o].message); //메세지만 전부 꺼내기
-        }
     });
 
 <details>
 <summary>callback</summary>
 
  - Return
-	 - 0
 		 - author
 			 - id
 			 - name
-			 - imageURL
 			 - hasMod //관리 권한을 가졌는지 (false / true)
 		 - message
+		 - emoji (Object - Key: 이모지 이름, Value: 이미지 URL)
 		 - time
-	 - 1
-	 - 2
-	 - 3
-	 - ...
 
 </details>
 
+>
+
+✅ Official API
+
     chat.onDonation((data) => { //도네이션이 왔을 때
     	console.log(data);
-    
-	    for (let o in data) {
-	        console.log(data[o].amount); //후원 금액만 전부 꺼내기
-        }
     });
 
 <details>
 <summary>callback</summary>
 
  - Return
-	 - 0
-	 	 - amount //후원 금액
-		 - author
-			 - id
-			 - name
-			 - imageURL
-			 - hasMod //관리 권한을 가졌는지 (false / true)
-		 - message
-		 - time
-	 - 1
-	 - 2
-	 - 3
-	 - ...
+	- type //CHAT or VIDEO
+	- amount //후원 금액
+	- author
+		- id
+		- name
+		- hasMod //관리 권한을 가졌는지 (false / true)
+	- message
+	- emoji (Object - Key: 이모지 이름, Value: 이미지 URL)
 
 </details>
 
+>
+
+✅ Official API
+
     chat.onDisconnect(() => { //채팅창 연결이 끊겼을 때
 		//TODO
     });
 
 >
 
+✅ Official API
+
     await chat.send("ㅋㅋㅋㅋㅋㅋ"); //채팅 보내기 (login 후에만 가능)
 
 >

package/lib/chat.js

@@ -1,33 +1,54 @@
 const { getStatus } = require("./live.js");
-const { reqChzzk, reqGame } = require("./tool.js");
-const vm = require("./vm.js");
+const oauth = require("./oauth.js");
+const { USER, reqGame } = require("./tool.js");
 
-const { WebSocket } = require("ws");
+const io = require("socket.io-client");
+
+class chzzkChatData {
+    constructor(id, name, hasMod, message, emojis, time) {
+        this.author = {
+            id: id,
+            name: name,
+            hasMod: hasMod
+        };
+        this.message = message;
+        this.emojis = emojis;
+        this.time = time;
+    }
+}
+
+class chzzkDonationData {
+    constructor(type, amount, id, name, hasMod, message, emojis) {
+        this.type = type;
+        this.amount = amount;
+        this.author = {
+            id: id,
+            name: name,
+            hasMod: hasMod
+        };
+        this.message = message;
+        this.emojis = emojis;
+    }
+}
 
 class chzzkChat {
-    constructor(channelID) {
-        this.channelID = channelID;
+    constructor(accessToken) {
+        this.accessToken = accessToken;
     }
 
     //Private
     #ws; //Chat Web Socket
-    #ssID; //kr-ss?.chat.naver.com/chat
-    #accTkn; //Account Access Token
-    #extTkn //for RealName Auth
-    #svcid; //game
-    #uid;
-    #sid;
-    #chatID;
-    #callbacks = new Map();
+    #channelID;
+    #session;
+    #callbacks = {
+        message: null,
+        donation: null,
+        disconnect: null
+    };
 
     #status = {
-        polling: false,
-        pollingID: 0,
-        ping: false,
-        pingID: 0,
         ws: false,
-        wsID: 0,
-        reconnect: false
+        established: false
     }
     //Private
 
@@ -36,176 +57,104 @@ class chzzkChat {
      */
     connect() {
         return new Promise(async (resolve, reject) => {
-            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) {
-                if (!this.#status.polling) {
-                    this.#status.polling = true;
-                    this.#polling();
-                }
+            
+            if (this.#status.ws) return resolve(false);
+            this.#status.ws = true;
+
+            let channel = await oauth.resolve(this.accessToken);
+            if (!channel) {
+                this.#status.ws = false;
                 return resolve(null);
             }
-            this.#chatID = cidRes.chatID;
-            //Get ChatID
+            this.#channelID = channel.channelID;
 
-            //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);
-            this.#accTkn = accRes.content.accessToken;
-            this.#extTkn = accRes.content.extraToken;
-            //Get accTkn
-    
-            //Load Balancing
-            this.#ssID = Math.floor(Math.random() * 10) + 1;
-            //Load Balancing
-    
-            //Connect Web Socket
-            this.#ws = new WebSocket("wss://kr-ss" + this.#ssID + ".chat.naver.com/chat", {
-                handshakeTimeout: 60000
-            });
-            this.#status.wsID++;
-            //Connect Web Socket
+            let session = await USER.get(this.accessToken, "open/v1/sessions/auth");
+            if (!session || session.code != 200) {
+                this.#status.ws = false;
+                return resolve(null);
+            }
+            session = session.content.url;
+            console.log(session);
+ 
+            const socketOption = {
+                reconnection: false,
+                "force new connection": true,
+                "connect timeout": 6000,
+                transports: ["websocket"]
+            };
+            
+            this.#ws = io.connect(session, socketOption);
 
-            //WS Open
-            await this.#openHandler(this.#status.wsID);
-            //WS Open
+            this.#ws.on("connect", async (data) => { 
+                console.log("[WS] Connected!");
+            });
 
-            this.#ws.on("error", console.error);
+            this.#ws.on("SYSTEM", async (data) => {
+                data = JSON.parse(data);
+                console.log(data);
 
-            this.#closeHandler(this.#status.wsID);
+                if (data.type == "connected") {
+                    this.#session = data.data.sessionKey;
+    
+                    let subChat = await USER.post(this.accessToken, "open/v1/sessions/events/subscribe/chat?sessionKey=" + this.#session, null);
+                    let subDona = await USER.post(this.accessToken, "open/v1/sessions/events/subscribe/donation?sessionKey=" + this.#session, null);
+                    if (!subChat || subChat.type == "subscribed" || !subDona || subDona.type == "subscribed") return resolve(null);
+                    this.#status.established = true;
+                    console.log("[WS] Subscribed!");
+                    return resolve(true);
+                }
+            });
 
-            //WS Message
-            await this.#connectHandler(this.#status.wsID);
-            return resolve(true);
-            //WS Message
+            this.#ws.on("CHAT", (data) => {
+                data = JSON.parse(data);
+                console.log(data);
 
-        });
-    }
+                let hasMod = false;
+                for (let o in data.profile.badges) {
+                    if (data.profile.badges[o].imageUrl == "https://ssl.pstatic.net/static/nng/glive/icon/streamer.png") hasMod = true;
+                    if (data.profile.badges[o].imageUrl == "https://ssl.pstatic.net/static/nng/glive/icon/manager.png") hasMod = true;
+                }
 
-    getwsID() {
-        return this.#status.wsID;
-    }
+                let chatData = new chzzkChatData(data.senderChannelId, data.profile.nickname, hasMod, data.content, data.emojis, data.messageTime);
+                return this.#callbacks.message(chatData);
+            });
 
-    getwsStatus() {
-        return this.#status.ws;
-    }
+            this.#ws.on("DONATION", (data) => {
+                data = JSON.parse(data);
+                console.log(data);
 
-    #openHandler(wsID) {
-        return new Promise(async (resolve, reject) => {
-            this.#ws.on("open", () => {
-                if (wsID != this.#status.wsID) return;
-                console.log("[WS] Connected!");
+                let hasMod = false;
+                for (let o in data.profile.badges) {
+                    if (data.profile.badges[o].imageUrl == "https://ssl.pstatic.net/static/nng/glive/icon/streamer.png") hasMod = true;
+                    if (data.profile.badges[o].imageUrl == "https://ssl.pstatic.net/static/nng/glive/icon/manager.png") hasMod = true;
+                }
 
-                //WS First Connect
-                let connectOpt = {
-                    "ver": "3",
-                    "cmd": 100,
-                    "svcid": "game",
-                    "cid": this.#chatID,
-                    "bdy": {
-                        "uid": this.#uid,
-                        "devType":2001,
-                        "accTkn": this.#accTkn,
-                        "auth":"SEND",
-                        "devName": "BUZZK/" + vm.getVersion(),
-                        "libVer": vm.getVersion(),
-                        "locale": "ko",
-                        "osVer": "Windows/10",
-                        "timezone": "Asia/Seoul"
-                    },
-                    "tid": 1
-                };
-
-                this.#ws.send(JSON.stringify(connectOpt));
-                return resolve(true);
-                //WS First Connect
+                let donationData = new chzzkDonationData(data.donationType, data.payAmount, data.donatorChannelId, data.donatorNickname, hasMod, data.donationText, data.emojis);
+                return this.#callbacks.donation(donationData);
             });
-        });
-    }
 
-    #closeHandler(wsID) {
-        return new Promise(async (resolve, reject) => {
-            this.#ws.on("close", () => {
-                console.log("[WS] Disconnect!");
-                if (wsID != this.#status.wsID) return;
-                if (this.#status.reconnect) return;
-                this.#ws = null;
-                this.#status.ws = false;
-                this.#status.wsID++;
-                this.#status.ping = false;
-                this.#status.pingID++;
-                setTimeout(() => {
-                    this.#status.reconnect = true;
-                    this.connect();
-                }, 2000);
+            this.#ws.on("error", (error) => {
+                console.log(error);
+
+                if (!this.#status.established) return resolve(null);
             });
-        });
-    }
 
-    #connectHandler(wsID) {
-        return new Promise(async (resolve, reject) => {
-            this.#ws.on("message", async (data) => {   
-                if (wsID != this.#status.wsID) return;
+            this.#ws.on("disconnect", (data) => {
+                console.log("[WS] Disconnected! (" + data + ")");
 
-                try {
-                    data = await JSON.parse(data);
-                }
+                this.#status.ws = false;
+                this.#status.established = false;
+                this.#callbacks.disconnect(data);
 
-                catch (error) {
-                    return;
-                }
+                if (this.#ws) this.#ws.off();
+                if (!this.#status.established) resolve(null);
 
-                //Update Var
-                if (data.cid) this.#chatID = data.cid;
-                if (data.svcid) this.#svcid = data.svcid;
-                if (data.bdy && data.bdy.sid) this.#sid = data.bdy.sid;
-                //Update Var
-
-                //Ping Pong
-                if (data.cmd == 0) {
-                    let pongOpt = {
-                        "ver": "2",
-                        "cmd": 10000
-                    };
-                    this.#ws.send(JSON.stringify(pongOpt));
-                }
-                //Ping Pong
-
-                //Connected
-                else if (data.cmd == 10100) {
-                    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
+                this.#ws = null;
+                this.#channelID = null;
+                this.#session = null;
+                return this.connect();
             });
+
         });
     }
 
@@ -215,299 +164,83 @@ class chzzkChat {
      */
     send(message) {
         return new Promise(async (resolve, reject) => {
-            if (!this.#status.ws) return resolve(null);
+            if (!this.#ws || !this.#status.ws || !this.#status.established) return resolve(false);
+            console.log(message);
 
-            let extras = {
-                "chatType":"STREAMING",
-                "osType":"PC",
-                "streamingChannelId": this.channelID,
-                "emojis":"",
-                "extraToken": this.#extTkn
+            let reqMessage = {
+                message: message
             }
 
-            //WS Send
-            let date = new Date();
-            let sendOpt = {
-                "ver": "3",
-                "cmd": 3101,
-                "svcid": this.#svcid,
-                "cid": this.#chatID,
-                "sid": this.#sid,
-                "retry": false,
-                "bdy": {
-                    "msg": message,
-                    "msgTypeCode": 1,
-                    "extras": JSON.stringify(extras),
-
-                    "msgTime": date.getTime()
-                },
-                "tid": 3
-            };
+            let chatRes = await USER.post(this.accessToken, "open/v1/chats/send", JSON.stringify(reqMessage));
+            if (!chatRes || chatRes.code != 200) return resolve(false);
 
-            try {
-                this.#ws.send(JSON.stringify(sendOpt));
-            }
+            return resolve(true);
+        });
+    }
 
-            catch (error) {
-                return resolve(false);
+    /**
+     * @param {string} message 
+     * @returns {Promise<boolean>}
+     */
+    setNotice(message) {
+        return new Promise(async (resolve, reject) => {
+            if (!this.#ws || !this.#status.ws || !this.#status.established) return resolve(false);
+
+            let reqMessage = {
+                message: message
             }
 
-            return resolve(true);
-            //WS Send
+            let noticeRes = await USER.post(this.accessToken, "open/v1/chats/notice", JSON.stringify(reqMessage));
+            if (!noticeRes || noticeRes.code != 200) return resolve(false);
 
+            return resolve(true);
         });
     }
 
     /**
-     * @typedef {Object.<number, chzzkMessage>} chzzkMessages
+     * @typedef {Object} chzzkMessage
+     * @property {chzzkAuthor} author
+     * @property {string} message
+     * @property {Object} emoji
+     * @property {number} time
      */
 
     /**
-     * @typedef {Object} chzzkMessage
-     * @property {chzzkMessageAuthor} author
+     * @typedef {Object} chzzkDonation
+     * @property {string} type
+     * @property {string} amount
+     * @property {chzzkAuthor} author
      * @property {string} message
+     * @property {Object} emoji
      * @property {number} time
      */
 
     /**
-     * @typedef {Object} chzzkMessageAuthor
+     * @typedef {Object} chzzkAuthor
      * @property {string} id
      * @property {string} name
-     * @property {string} imageURL
      * @property {boolean} hasMod
      */
 
     /**
-     * @param {function(chzzkMessages)} callback
+     * @param {function(chzzkMessage)} callback
      */
     onMessage(callback) {
-        this.#callbacks[Object.keys(this.#callbacks).length] = {
-            type: "message",
-            callback: callback
-        };
-        this.#onMessageHandler(this.#status.wsID, callback);
-    }
-
-    #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);
-            }
-
-            catch (error) {
-                return;
-            }
-
-            if (data.cmd == 93101) {
-                
-                data = data.bdy;
-                let msgList = new Map();
-
-                for (let o in data) {
-                    if (data[o].profile) {
-                        try {
-                            data[o].profile = await JSON.parse(data[o].profile);
-                        }
-
-                        catch (error) {
-                            return;
-                        }
-                    }
-                    else {
-                        data[o].profile = {
-                            nickname: null,
-                            profileImageUrl: null,
-                            userRoleCode: null
-                        };
-                    }
-
-                    try {
-                        let modVal = false;
-                        if (data[o].profile.userRoleCode === "streamer" || data[o].profile.userRoleCode === "streaming_channel_manager" || data[o].profile.userRoleCode === "streaming_chat_manager") modVal = true;
-
-                        msgList[Object.keys(msgList).length] = {
-                            author: {
-                                id: data[o].uid,
-                                name: data[o].profile.nickname,
-                                imageURL: data[o].profile.profileImageUrl,
-                                hasMod: modVal
-                            },
-                            message: data[o].msg,
-                            time: data[o].msgTime
-                        };
-                    }
-
-                    catch(error) {
-                        return;
-                    }
-                }
-
-                callback(msgList);
-
-            }
-        });
+        this.#callbacks.message = callback;
     }
 
+    /**
+     * @param {function(chzzkDonation)} callback
+     */
     onDonation(callback) {
-        this.#callbacks[Object.keys(this.#callbacks).length] = {
-            type: "donation",
-            callback: callback
-        };
-        this.#onDonationHandler(callback);
-    }
-
-    #onDonationHandler (callback) {
-        if (!this.#status.ws) return callback(null);
-
-        this.#ws.on("message", async (data) => {
-            try {
-                data = await JSON.parse(data);
-            }
-
-            catch (error) {
-                return;
-            }
-
-            if (data.cmd == 93102) {
-                
-                data = data.bdy;
-                let msgList = new Map();
-
-                for (let o in data) {
-                    if (data[o].profile) {
-                        try {
-                            data[o].profile = await JSON.parse(data[o].profile);
-                            data[o].extras = await JSON.parse(data[o].extras);
-                        }
-
-                        catch (error) {
-                            return;
-                        }
-                    }
-                    else {
-                        data[o].profile = {
-                            nickname: null,
-                            profileImageUrl: null,
-                            userRoleCode: null
-                        };
-                    }
-
-                    try {
-                        let modVal = false;
-                        if (data[o].profile.userRoleCode === "streamer" || data[o].profile.userRoleCode === "streaming_channel_manager" || data[o].profile.userRoleCode === "streaming_chat_manager") modVal = true;
-
-                        msgList[Object.keys(msgList).length] = {
-                            amount: data[o].extras.payAmount,
-                            author: {
-                                id: data[o].uid,
-                                name: data[o].profile.nickname,
-                                imageURL: data[o].profile.profileImageUrl,
-                                hasMod: modVal
-                            },
-                            message: data[o].msg,
-                            time: data[o].msgTime
-                        };
-                    }
-
-                    catch(error) {
-                        return;
-                    }
-                }
-
-                callback(msgList);
-
-            }
-        });
+        this.#callbacks.donation = callback;
     }
 
     /**
      * @param {function} callback
      */
     onDisconnect(callback) {
-        if (!this.#status.ws) return callback(null);
-
-        this.#ws.on("close", () => {
-            callback();
-        });
-    }
-
-    /**
-     * @param {?number} size
-     * @return {Promise<chzzkMessages>}
-     */
-    getRecentChat(size) {
-        return new Promise(async (resolve, reject) => {
-            if (!this.#status.ws) return resolve(null);
-
-            let reqOpt = {
-                "ver": "3",
-                "cmd": 5101,
-                "svcid": this.#svcid,
-                "cid": this.#chatID,
-                "sid": this.#sid,
-                "bdy": {
-                    "recentMessageCount": size || 50
-                },
-                "tid": 2
-            };
-
-            this.#ws.send(JSON.stringify(reqOpt));
-
-            this.#ws.on("message", async (data) => {
-                try {
-                    data = await JSON.parse(data);
-                }
-
-                catch (error) {
-                    return;
-                }
-
-                if (data.cmd == 15101) {
-                    data = data.bdy.messageList;
-                    let msgList = new Map();
-    
-                    for (let o in data) {
-                        try {
-                            data[o].profile = await JSON.parse(data[o].profile);
-                        }
-
-                        catch (error) {
-                            return;
-                        }
-
-                        if (!data[o].profile) {
-                            data[o].profile = {
-                                nickname: null,
-                                profileImageUrl: null,
-                                userRoleCode: null
-                            }
-                        }
-
-                        let modVal = false;
-                        if (data[o].profile.userRoleCode === "streamer" || data[o].profile.userRoleCode === "streaming_channel_manager" || data[o].profile.userRoleCode === "streaming_chat_manager") modVal = true;
-    
-                        msgList[Object.keys(msgList).length] = {
-                            author: {
-                                id: data[o].userId,
-                                name: data[o].profile.nickname,
-                                imageURL: data[o].profile.profileImageUrl,
-                                hasMod: modVal
-                            },
-                            message: data[o].content,
-                            time: data[o].messageTime
-                        };
-                    }
-    
-                    return resolve(msgList);
-                }
-
-            });
-
-        });
+        this.#callbacks.disconnect = callback;
     }
 
     /**
@@ -526,8 +259,11 @@ class chzzkChat {
      */
     async getUserInfo (authorID) {
         return new Promise(async (resolve, reject) => {
-            let profileCard = await reqGame("nng_main/v1/chats/" + this.#chatID + "/users/" + authorID + "/profile-card?chatType=STREAMING");
-            if (profileCard.code != 200) return resolve(null);
+            let status = await getStatus(this.#channelID);
+            if (!status) return resolve(null);
+
+            let profileCard = await reqGame("nng_main/v1/chats/" + status.chatID + "/users/" + authorID + "/profile-card?chatType=STREAMING");
+            if (!profileCard || profileCard.code != 200) return resolve(null);
             profileCard = profileCard.content;
 
             let userInfo = {
@@ -551,60 +287,15 @@ class chzzkChat {
         return new Promise(async (resolve, reject) => {
             if (!this.#status.ws) return resolve(null);
 
+            await this.#ws.off();
             await this.#ws.close();
-            this.#ws = null;
+
             this.#status.ws = false;
-            this.#status.wsID++;
+            this.#status.established = false;
+            console.log("[WS] Disconnected! (Force)");
             return resolve(true);
         });
     }
-
-    async #polling () {
-        if (!this.#status.polling) return;
-
-        //Get ChatID
-        let cidRes = await getStatus(this.channelID);
-        if (cidRes && cidRes.chatID && cidRes.chatID != this.#chatID) {
-            this.#chatID = cidRes.chatID;
-
-            //Reconnect
-            this.#status.reconnect = true;
-            await this.disconnect();
-            await this.connect();
-            //Reconnect
-        }
-        //Get ChatID
-
-        let interval = Math.floor(Math.random() * 20000) + 30000;
-
-        setTimeout(() => {
-            return this.#polling();
-        }, interval);
-    }
-
-    async #ping (pingID) {
-        if (!this.#status.ws) return this.#status.ping = false;
-        if (!this.#status.ping || pingID != this.#status.pingID) return;
-
-        let interval = Math.floor(Math.random() * 20000) + 30000;
-
-        let pingOpt = {
-            "ver": "3",
-            "cmd": 0
-        };
-        try {
-            await this.#ws.send(JSON.stringify(pingOpt));
-        }
-        catch (error) {
-            return setTimeout(async () => {
-                return this.#ping(pingID);
-            }, Math.floor(Math.random() * 20000) + 30000);
-        }
-
-        setTimeout(() => {
-            return this.#ping(pingID);
-        }, interval);
-    }
 }
 
 module.exports = {

package/lib/live.js

@@ -1,4 +1,4 @@
-const { reqChzzk, reqGame } = require("./tool.js");
+const { reqChzzk } = require("./tool.js");
 
 /**
  * @typedef {Object} chzzkLiveDetail
@@ -38,6 +38,7 @@ 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;
 
@@ -112,16 +113,7 @@ async function getStatus (channelID) {
     });
 }
 
-async function getAccess (chatID) {
-    return new Promise(async (resolve, reject) => {
-        let accRes = await reqGame("nng_main/v1/chats/access-token?channelId=" + chatID + "&chatType=STREAMING");
-        if (accRes.code != 200) return resolve(null);
-        return resolve(accRes.content.accessToken);
-    });
-}
-
 module.exports = {
     getDetail: getDetail,
-    getStatus: getStatus,
-    getAccess: getAccess
+    getStatus: getStatus
 }

package/lib/oauth.js

@@ -11,6 +11,25 @@ class chzzkToken {
     }
 }
 
+/**
+ * @typedef {Object} chzzkChannel
+ * @property {string} channelID
+ * @property {string} name
+ * @property {string} follower
+ * @property {string} imageURL
+ */
+
+/**
+ * @typedef {Object} chzzkTokenData
+ * @property {string} access
+ * @property {string} refresh
+ * @property {string} expireIn
+ */
+
+/**
+ * @param {string} code
+ * @returns {Promise<chzzkTokenData>}
+ */
 async function get (code) {
     return new Promise(async (resolve, reject) => {
         let options = {
@@ -34,6 +53,10 @@ async function get (code) {
     });
 }
 
+/**
+ * @param {string} refreshToken
+ * @returns {Promise<chzzkTokenData>}
+ */
 async function refresh (refreshToken) {
     return new Promise(async (resolve, reject) => {
         let options = {
@@ -56,6 +79,10 @@ async function refresh (refreshToken) {
     });
 }
 
+/**
+ * @param {string} accessToken
+ * @returns {Promise<chzzkChannel>}
+ */
 async function resolve (accessToken) {
     return new Promise(async (resolve, reject) => {
 

package/lib/tool.js

@@ -123,7 +123,6 @@ function reqChzzk (path) {
         fetch(chzzkBaseURL + path, {
             method: "GET",
             headers: {
-                "Cookie": "NID_AUT=" + NID.AUT + ";NID_SES=" + NID.SES,
                 "User-Agent": "BuzzkLib/" + vm.getVersion() + " (Node)"
             }
         })
@@ -175,7 +174,7 @@ function reqGame (path) {
         fetch(gameBaseURL + path, {
             method: "GET",
             headers: {
-                "Cookie": "NID_AUT=" + NID.AUT + ";NID_SES=" + NID.SES
+                "User-Agent": "BuzzkLib/" + vm.getVersion() + " (Node)"
             }
         })
 
@@ -200,7 +199,7 @@ function reqNaver (path) {
         fetch(naverBaseURL + path, {
             method: "GET",
             headers: {
-                "Cookie": "NID_AUT=" + NID.AUT + ";NID_SES=" + NID.SES
+                "User-Agent": "BuzzkLib/" + vm.getVersion() + " (Node)"
             }
         })
 

package/package.json

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