Feature/Add chatType option for fetching "LiveChat"

README.md

@@ -29,6 +29,9 @@
 
     // Or specify LiveID in Stream manually.
     const liveChat = new LiveChat({liveId: "LIVE_ID_HERE"})
+
+    // If the second argument is `true`, fetch "LiveChat" instead of "TopChat".
+    const liveChat = new LiveChat({handle: "HANDLE_NAME_HERE"}, true)
     ```
 4. Add events
     ```typescript

package.json

@@ -1,10 +1,10 @@
 {
   "name": "youtube-chat",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
-  "repository": "https://github.com/LinaTsukusu/youtube-chat.git",
-  "author": "LinaTsukusu <[email protected]>",
+  "repository": "https://github.com/advancedbear/youtube-chat.git",
+  "author": "advancedbear",
   "license": "MIT",
   "private": false,
   "scripts": {
@@ -27,21 +27,21 @@
     "stream"
   ],
   "devDependencies": {
-    "@types/jest": "^29.2.3",
-    "@types/node": "^18.11.9",
-    "@typescript-eslint/eslint-plugin": "^5.45.0",
-    "@typescript-eslint/parser": "^5.45.0",
-    "eslint": "^8.28.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-jest": "^27.1.6",
-    "jest": "^29.3.1",
-    "prettier": "^2.8.0",
-    "ts-jest": "^29.0.3",
+    "@types/jest": "^29.5.1",
+    "@types/node": "^18.16.3",
+    "@typescript-eslint/eslint-plugin": "^5.59.1",
+    "@typescript-eslint/parser": "^5.59.1",
+    "eslint": "^8.39.0",
+    "eslint-config-prettier": "^8.8.0",
+    "eslint-plugin-jest": "^27.2.1",
+    "jest": "^29.5.0",
+    "prettier": "^2.8.8",
+    "ts-jest": "^29.1.0",
     "ts-node": "^10.9.1",
-    "typescript": "^4.9.3"
+    "typescript": "^4.9.5"
   },
   "dependencies": {
-    "axios": "^1.2.0",
+    "axios": "^1.4.0",
     "typed-emitter": "^2.1.0"
   }
 }

src/live-chat.ts

@@ -20,8 +20,9 @@ export class LiveChat extends (EventEmitter as new () => TypedEmitter<LiveChatEv
   #options?: FetchOptions
   readonly #interval: number = 1000
   readonly #id: YoutubeId
+  readonly #chatType: boolean = false
 
-  constructor(id: YoutubeId, interval = 1000) {
+  constructor(id: YoutubeId, chatType = false, interval = 1000) {
     super()
     if (!id || (!("channelId" in id) && !("liveId" in id) && !("handle" in id))) {
       throw TypeError("Required channelId or liveId or handle.")
@@ -31,14 +32,17 @@ export class LiveChat extends (EventEmitter as new () => TypedEmitter<LiveChatEv
 
     this.#id = id
     this.#interval = interval
+    this.#chatType = chatType
   }
 
   async start(): Promise<boolean> {
-    if (this.#observer) {
-      return false
-    }
     try {
-      const options = await fetchLivePage(this.#id)
+      const options = await fetchLivePage(this.#id, this.#chatType)
+      if (this.#observer && this.liveId == options.liveId) {
+        return false
+      } else if (this.#observer && this.liveId != options.liveId) {
+        this.stop("liveID is changed")
+      }
       this.liveId = options.liveId
       this.#options = options
 

src/parser.ts

@@ -3,6 +3,7 @@ import {
   FetchOptions,
   GetLiveChatResponse,
   LiveChatMembershipItemRenderer,
+  LiveChatMembershipMilestoneRenderer,
   LiveChatPaidMessageRenderer,
   LiveChatPaidStickerRenderer,
   LiveChatTextMessageRenderer,
@@ -11,7 +12,7 @@ import {
 } from "./types/yt-response"
 import { ChatItem, ImageItem, MessageItem } from "./types/data"
 
-export function getOptionsFromLivePage(data: string): FetchOptions & { liveId: string } {
+export function getOptionsFromLivePage(data: string, chatType?: boolean): FetchOptions & { liveId: string } {
   let liveId: string
   const idResult = data.match(/<link rel="canonical" href="https:\/\/www.youtube.com\/watch\?v=(.+?)">/)
   if (idResult) {
@@ -42,9 +43,16 @@ export function getOptionsFromLivePage(data: string): FetchOptions & { liveId: s
   }
 
   let continuation: string
-  const continuationResult = data.match(/['"]continuation['"]:\s*['"](.+?)['"]/)
+  const continuationResult = data.matchAll(/['"]continuation['"]:\s*['"](.+?)['"]/g)
   if (continuationResult) {
-    continuation = continuationResult[1]
+    const list = Array.from(continuationResult)
+    if (chatType) {
+      /** すべてのチャットの取得時に利用するcontinuation */
+      continuation = list[2][1]
+    } else {
+      /** トップチャットの取得時に利用するcontinuation */
+      continuation = list[1][1]
+    }
   } else {
     throw new Error("Continuation was not found")
   }
@@ -125,6 +133,7 @@ function rendererFromAction(
   | LiveChatPaidMessageRenderer
   | LiveChatPaidStickerRenderer
   | LiveChatMembershipItemRenderer
+  | LiveChatMembershipMilestoneRenderer
   | null {
   if (!action.addChatItemAction) {
     return null
@@ -138,6 +147,8 @@ function rendererFromAction(
     return item.liveChatPaidStickerRenderer
   } else if (item.liveChatMembershipItemRenderer) {
     return item.liveChatMembershipItemRenderer
+  } else if (item.LiveChatMembershipMilestoneRenderer) {
+    return item.LiveChatMembershipMilestoneRenderer
   }
   return null
 }
@@ -151,10 +162,11 @@ function parseActionToChatItem(data: Action): ChatItem | null {
   let message: MessageRun[] = []
   if ("message" in messageRenderer) {
     message = messageRenderer.message.runs
+  } else if ("empty" in messageRenderer) {
+    message = messageRenderer.headerPrimaryText.runs
   } else if ("headerSubtext" in messageRenderer) {
     message = messageRenderer.headerSubtext.runs
   }
-
   const authorNameText = messageRenderer.authorName?.simpleText ?? ""
   const ret: ChatItem = {
     id: messageRenderer.id,

src/requests.ts

@@ -20,13 +20,16 @@ export async function fetchChat(options: FetchOptions): Promise<[ChatItem[], str
   return parseChatData(res.data)
 }
 
-export async function fetchLivePage(id: { channelId: string } | { liveId: string } | { handle: string }) {
+export async function fetchLivePage(
+  id: { channelId: string } | { liveId: string } | { handle: string },
+  chatType?: boolean
+) {
   const url = generateLiveUrl(id)
   if (!url) {
     throw TypeError("not found id")
   }
   const res = await axios.get(url)
-  return getOptionsFromLivePage(res.data.toString())
+  return getOptionsFromLivePage(res.data.toString(), chatType)
 }
 
 function generateLiveUrl(id: YoutubeId) {

src/types/yt-response.ts

@@ -148,6 +148,9 @@ export interface LiveChatPaidStickerRenderer extends MessageRendererBase {
   stickerDisplayHeight: number
   backgroundColor: number
   authorNameTextColor: number
+  headerPrimaryText: {
+    runs: MessageRun[]
+  }
 }
 
 export interface LiveChatMembershipItemRenderer extends MessageRendererBase {
@@ -157,12 +160,21 @@ export interface LiveChatMembershipItemRenderer extends MessageRendererBase {
   authorBadges: AuthorBadge[]
 }
 
+export interface LiveChatMembershipMilestoneRenderer extends MessageRendererBase {
+  headerPrimaryText: {
+    runs: MessageRun[]
+  }
+  empty: boolean
+  authorBadges: AuthorBadge[]
+}
+
 export interface AddChatItemAction {
   item: {
     liveChatTextMessageRenderer?: LiveChatTextMessageRenderer
     liveChatPaidMessageRenderer?: LiveChatPaidMessageRenderer
     liveChatMembershipItemRenderer?: LiveChatMembershipItemRenderer
     liveChatPaidStickerRenderer?: LiveChatPaidStickerRenderer
+    LiveChatMembershipMilestoneRenderer?: LiveChatMembershipMilestoneRenderer
     liveChatViewerEngagementMessageRenderer?: object
   }
   clientId: string