feat: 房间被超管警告、切断消息

Author: ddiu8081

README.md

@@ -525,12 +525,42 @@ export interface GuardBuyMsg {
 ```
 </details>
 
+#### 房间管理相关
+
+| Handler | Description |
+| --- | --- |
+| onRoomWarn | 房间被警告/切断 |
+
+<details>
+<summary>Type Definitions</summary>
+
+##### handler.onRoomWarn
+
+房间被超管警告、切断
+
+```ts
+export type Handler = {
+  /** 房间被超管警告、切断 */
+  onRoomWarn: (msg: Message<GiftMsg>) => void
+}
+
+type msgType = 'WARNING' ｜ 'CUT_OFF'
+
+export interface RoomWarnMsg {
+  /** 处理类型 */
+  type: 'warning' | 'cut'
+  /** 处理原因 */
+  msg: string
+}
+```
+</details>
+
 #### 监听原始消息
 
 ```ts
 export type Handler = {
   /** 原始消息 */
-  raw: Record<string, (msg: any) => void>
+  raw: Record<'msg' | string, (msg: any) => void>
 }
 ```
 

src/listener/index.ts

@@ -10,6 +10,7 @@ import {
   ROOM_CHANGE, type RoomInfoChangeHandler,
   SEND_GIFT, type GiftHandler,
   SUPER_CHAT_MESSAGE, type SuperChatHandler,
+  WARNING, CUT_OFF, type RoomWarnHandler,
   WATCHED_CHANGE, type WatchedChangeHandler,
 } from '../parser'
 import type { KeepLiveTCP, KeepLiveWS, Message as WSMessage } from 'tiny-bilibili-ws'
@@ -37,10 +38,11 @@ export type MsgHandler = Partial<
   & RoomInfoChangeHandler
   & GiftHandler
   & SuperChatHandler
+  & RoomWarnHandler
   & WatchedChangeHandler
   & {
     /** 原始消息 */
-    raw: Record<string, (msg: any) => void>
+    raw: Record<'msg' | string, (msg: any) => void>
   }
 >
 
@@ -120,9 +122,11 @@ export const listenAll = (instance: KeepLiveTCP | KeepLiveWS, roomId: number, ha
   }
 
   // INTERACT_WORD, ENTRY_EFFECT, LIKE_INFO_V3_CLICK
-  if (handler[INTERACT_WORD.handlerName] || handler[ENTRY_EFFECT.handlerName] || rawHandlerNames.has(INTERACT_WORD.eventName) || rawHandlerNames.has(ENTRY_EFFECT.eventName)) {
+  if (handler[INTERACT_WORD.handlerName] || handler[ENTRY_EFFECT.handlerName] || handler[LIKE_INFO_V3_CLICK.handlerName] ||
+    rawHandlerNames.has(INTERACT_WORD.eventName) || rawHandlerNames.has(ENTRY_EFFECT.eventName) || rawHandlerNames.has(LIKE_INFO_V3_CLICK.eventName)) {
     rawHandlerNames.delete(INTERACT_WORD.eventName)
     rawHandlerNames.delete(ENTRY_EFFECT.eventName)
+    rawHandlerNames.delete(LIKE_INFO_V3_CLICK.eventName)
     instance.on(INTERACT_WORD.eventName, (data: WSMessage<any>) => {
       isHandleRaw && rawHandler[INTERACT_WORD.eventName]?.(data.data)
       const parsedData = INTERACT_WORD.parser(data.data, roomId)
@@ -190,6 +194,22 @@ export const listenAll = (instance: KeepLiveTCP | KeepLiveWS, roomId: number, ha
     })
   }
 
+  // WARNING, CUT_OFF
+  if (handler[WARNING.handlerName] || handler[CUT_OFF.handlerName] || rawHandlerNames.has(WARNING.eventName) || rawHandlerNames.has(CUT_OFF.eventName)) {
+    rawHandlerNames.delete(WARNING.eventName)
+    rawHandlerNames.delete(CUT_OFF.eventName)
+    instance.on(WARNING.eventName as any, (data: WSMessage<any>) => {
+      isHandleRaw && rawHandler[WARNING.eventName]?.(data.data)
+      const parsedData = WARNING.parser(data.data, roomId)
+      handler[WARNING.handlerName]?.(normalizeDanmu(WARNING.eventName, parsedData, data.data))
+    })
+    instance.on(CUT_OFF.eventName as any, (data: WSMessage<any>) => {
+      isHandleRaw && rawHandler[CUT_OFF.eventName]?.(data.data)
+      const parsedData = CUT_OFF.parser(data.data, roomId)
+      handler[CUT_OFF.handlerName]?.(normalizeDanmu(CUT_OFF.eventName, parsedData, data.data))
+    })
+  }
+
   // WATCHED_CHANGE
   if (handler[WATCHED_CHANGE.handlerName] || rawHandlerNames.has(WATCHED_CHANGE.eventName)) {
     rawHandlerNames.delete(WATCHED_CHANGE.eventName)

src/parser/WARNING_CUT_OFF.ts

@@ -0,0 +1,35 @@
+import type { Message } from '../types/app'
+
+export interface RoomWarnMsg {
+  /** 处理类型 */
+  type: 'warning' | 'cut'
+  /** 处理原因 */
+  msg: string
+}
+
+const parser = (data: any, roomId: number): RoomWarnMsg => {
+  const msgType = data.cmd
+  const rawData = data
+
+  return {
+    type: msgType === 'WARNING' ? 'warning' : 'cut',
+    msg: rawData.msg,
+  }
+}
+
+export const WARNING = {
+  parser,
+  eventName: 'WARNING' as const,
+  handlerName: 'onRoomWarn' as const,
+}
+
+export const CUT_OFF = {
+  parser,
+  eventName: 'CUT_OFF' as const,
+  handlerName: 'onRoomWarn' as const,
+}
+
+export type Handler = {
+  /** 房间被超管警告、切断 */
+  onRoomWarn: (msg: Message<RoomWarnMsg>) => void
+}

src/parser/index.ts

@@ -9,5 +9,6 @@ export { ONLINE_RANK_COUNT, type Handler as RankCountChangeMsgHandler, type Rank
 export { ROOM_CHANGE, type Handler as RoomInfoChangeHandler, type RoomInfoChangeMsg } from './ROOM_CHANGE'
 export { SEND_GIFT, type Handler as GiftHandler, type GiftMsg } from './SEND_GIFT'
 export { SUPER_CHAT_MESSAGE, type Handler as SuperChatHandler, type SuperChatMsg } from './SUPER_CHAT_MESSAGE'
+export { WARNING, CUT_OFF, type Handler as RoomWarnHandler, type RoomWarnMsg } from './WARNING_CUT_OFF'
 export { WATCHED_CHANGE, type Handler as WatchedChangeHandler, type WatchedChangeMsg } from './WATCHED_CHANGE'