feat: add is_same_room in user badge; add random id

Author: ddiu8081

package.json

@@ -1,6 +1,6 @@
 {
   "name": "blive-message-listener",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "Bilibili-live danmu listener with type",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

src/index.ts

@@ -5,7 +5,7 @@ import { listenAll, type MsgHandler } from './listener'
 export const startListen = (roomId: number, handler: MsgHandler) => {
   const live = new KeepLiveTCP(roomId)
 
-  listenAll(live, handler)
+  listenAll(live, roomId, handler)
 }
 
 export type { MsgHandler }

src/listener/index.ts

@@ -20,8 +20,9 @@ export type MsgHandler = Partial<
 
 const normalizeDanmu = <T>(msgType: string, body: T): Message<T> => {
   const timestamp = Date.now()
+  const randomText = Math.floor(Math.random() * 100).toString()
   // @ts-ignore
-  const id = `${timestamp}_${msgType}_${body.user?.uid}`
+  const id = `${timestamp}_${msgType}_${body.user?.uid}_${randomText}`
   return {
     id,
     timestamp,
@@ -30,7 +31,7 @@ const normalizeDanmu = <T>(msgType: string, body: T): Message<T> => {
   }
 }
 
-export const listenAll = (instance: KeepLiveTCP, handler?: MsgHandler) => {
+export const listenAll = (instance: KeepLiveTCP, roomId: number, handler?: MsgHandler) => {
   if (!handler) return
 
   // HEARTBEAT
@@ -44,7 +45,7 @@ export const listenAll = (instance: KeepLiveTCP, handler?: MsgHandler) => {
   // DANMU_MSG
   if (handler[DANMU_MSG.handlerName]) {
     instance.on(DANMU_MSG.eventName, (data: any) => {
-      const parsedData = DANMU_MSG.parser(data)
+      const parsedData = DANMU_MSG.parser(data, roomId)
       handler[DANMU_MSG.handlerName]?.(normalizeDanmu(DANMU_MSG.eventName, parsedData))
     })
   }
@@ -68,7 +69,7 @@ export const listenAll = (instance: KeepLiveTCP, handler?: MsgHandler) => {
   // SUPER_CHAT_MESSAGE
   if (handler[SUPER_CHAT_MESSAGE.handlerName]) {
     instance.on(SUPER_CHAT_MESSAGE.eventName, (data: any) => {
-      const parsedData = SUPER_CHAT_MESSAGE.parser(data)
+      const parsedData = SUPER_CHAT_MESSAGE.parser(data, roomId)
       handler[SUPER_CHAT_MESSAGE.handlerName]?.(normalizeDanmu(SUPER_CHAT_MESSAGE.eventName, parsedData))
     })
   }

src/parser/DANMU_MSG.ts

@@ -13,7 +13,7 @@ export interface DanmuMsg {
   }
 }
 
-const parser = (data: any): DanmuMsg => {
+const parser = (data: any, roomId: number): DanmuMsg => {
   const content = data.info[1]
   const username = data.info[2][1]
   const badge: DanmuMsg['user']['badge'] = data.info[3].length ? {
@@ -25,6 +25,7 @@ const parser = (data: any): DanmuMsg => {
       uid: data.info[3][12],
       uname: data.info[3][2],
       room_id: data.info[3][3],
+      is_same_room: data.info[3][3] === roomId,
     },
   } : undefined
   return {

src/parser/SUPER_CHAT_MESSAGE.ts

@@ -12,7 +12,7 @@ export interface SuperChatMsg {
   time: number
 }
 
-const parser = (data: any): SuperChatMsg => {
+const parser = (data: any, roomId: number): SuperChatMsg => {
   const rawData = data.data
   const { medal_info, user_info } = data.data
   return {
@@ -28,6 +28,7 @@ const parser = (data: any): SuperChatMsg => {
           uid: medal_info.target_id,
           uname: medal_info.anchor_uname,
           room_id: medal_info.anchor_roomid,
+          is_same_room: medal_info.anchor_roomid === roomId,
         },
       } : undefined,
       identity: {

src/types/app.d.ts

@@ -17,9 +17,14 @@ export interface User {
     color: string
     /** 主播信息 */
     anchor: {
+      /** 主播uid */
       uid: number
+      /** 主播用户名 */
       uname: string
+      /** 主播房间号 */
       room_id: number
+      /** 是否为本直播间 */
+      is_same_room?: boolean
     }
   }
   /** 用户身份 */