feat: danmuMsg in live-mini

ddiu8081 · ddiu8081 · commit a9efcfe824fa · 2022-10-24T03:01:31.000+08:00
diff --git a/packages/bilicli/package.json b/packages/bilicli/package.json
@@ -14,7 +14,9 @@
   "bin": {
     "bilicli": "bin/bilicli.js"
   },
+  "type": "module",
   "main": "dist/main.js",
+  "exports": "./dist/main.js",
   "files": [
     "bin",
     "dist"
diff --git a/packages/bilicli/tsup.config.ts b/packages/bilicli/tsup.config.ts
@@ -1,7 +1,7 @@
 import { defineConfig } from 'tsup'
 
 export default defineConfig({
-  format: ['cjs', 'esm'],
+  format: ['esm'],
   entry: [
     'src/index.ts',
   ],
diff --git a/packages/live-full/package.json b/packages/live-full/package.json
@@ -6,19 +6,14 @@
     "dev": "temir src/index.ts",
     "build": "temir build src/index.ts"
   },
-  "main": "dist/main.js",
-  "module": "dist/index.mjs",
+  "type": "module",
+  "main": "dist/index.js",
+  "exports": "./dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
     "bin",
     "dist"
   ],
-  "exports": {
-    ".": {
-      "require": "./dist/index.js",
-      "import": "./dist/index.mjs"
-    }
-  },
   "keywords": [
     "bilibili",
     "bilibili-live",
diff --git a/packages/live-full/tsup.config.ts b/packages/live-full/tsup.config.ts
@@ -1,5 +1,5 @@
 export default {
-  format: ['cjs', 'esm'],
+  format: ['esm'],
   entry: [
     'src/index.ts',
   ],
diff --git a/packages/live-mini/package.json b/packages/live-mini/package.json
@@ -2,19 +2,14 @@
   "name": "@bilicli/live-mini",
   "version": "0.0.1",
   "description": "Bili-Live danmu client, lite version",
+  "type": "module",
   "main": "dist/index.js",
-  "module": "dist/index.mjs",
+  "exports": "./dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "dev": "tsup --watch",
     "build": "tsup"
   },
-  "exports": {
-    ".": {
-      "require": "./dist/index.js",
-      "import": "./dist/index.mjs"
-    }
-  },
   "files": [
     "dist"
   ],
@@ -31,7 +26,7 @@
   "license": "MIT",
   "dependencies": {
     "blive-message-listener": "^0.3.1",
-    "colorette": "^2.0.19",
+    "chalk": "^5.1.2",
     "ohmyfetch": "^0.4.20"
   }
 }
diff --git a/packages/live-mini/src/component/msg/danmu.ts b/packages/live-mini/src/component/msg/danmu.ts
@@ -1,7 +1,6 @@
 import type { DanmuMsg } from 'blive-message-listener'
-import { username } from '../username'
+import { usernameCom } from '../username'
 
-export const danmuMsg = (msg: DanmuMsg) => {
-  const userCom = username(msg.user)
-  return `${userCom}: ${msg.content}`
+export const danmuMsgCom = (msg: DanmuMsg) => {
+  return `${usernameCom(msg.user)}: ${msg.content}`
 }
diff --git a/packages/live-mini/src/component/roomInfo.ts b/packages/live-mini/src/component/roomInfo.ts
@@ -0,0 +1,11 @@
+import chalk from 'chalk'
+import type { RoomInfo } from '../utils/getInfo'
+
+export const roomInfoCom = (roomInfo: RoomInfo) => {
+  const components = [
+    chalk.bold(chalk.green(roomInfo.room_id)),
+    chalk.green(`(${roomInfo.parent_area_name}·${roomInfo.area_name})`),
+    roomInfo.title
+  ]
+  return components.join(' ')
+}
diff --git a/packages/live-mini/src/component/username.ts b/packages/live-mini/src/component/username.ts
@@ -1,6 +1,25 @@
-import { blue } from 'colorette'
+import chalk from 'chalk'
 import type { User } from 'blive-message-listener'
+import { getGuardColor } from '../utils/parse'
 
-export const username = (user: User) => {
-  return blue(user.uname)
+export const usernameCom = (user: User) => {
+  let badge, rank, admin
+  if (user.badge) {
+    const badgeColor = user.badge.anchor.is_same_room ? user.badge.color : '#999999'
+    badge = chalk.bgHex(badgeColor)(` ${user.badge.name} `) + chalk.bgHex('#ffffff').hex(badgeColor)(` ${user.badge.level} `)
+  }
+  if (user.identity?.rank) {
+    rank = chalk.bgBlue(` 榜${user.identity.rank} `)
+  }
+  if (user.identity?.room_admin) {
+    admin = chalk.bgRed(` 房 `)
+  }
+  const uname = chalk.hex(getGuardColor(user.identity?.guard_level))(user.uname)
+  const components = [
+    badge,
+    rank,
+    admin,
+    uname,
+  ].filter(Boolean)
+  return components.join(' ')
 }
diff --git a/packages/live-mini/src/index.ts b/packages/live-mini/src/index.ts
@@ -1,13 +1,15 @@
 import { startInstance } from './instance'
 import { getRoomInfo } from './utils/getInfo'
+import { roomInfoCom } from './component/roomInfo'
 
 const startApp = async (roomId: number, options: AppOptions) => {
   const roomInfo = await getRoomInfo(roomId)
   if (!roomInfo) {
     console.log('房间不存在')
     return process.exit(1)
   }
-  console.log(roomId, `(${roomInfo.parent_area_name}·${roomInfo.area_name})`, roomInfo.title)
+  // Room Info
+  console.log(roomInfoCom(roomInfo))
   startInstance(roomInfo.room_id, options)
 }
 
diff --git a/packages/live-mini/src/instance.ts b/packages/live-mini/src/instance.ts
@@ -3,12 +3,12 @@ import type {
   MsgHandler, Message,
   DanmuMsg, SuperChatMsg, GiftMsg, GuardBuyMsg, UserActionMsg
 } from 'blive-message-listener'
-import { danmuMsg } from './component/msg'
+import { danmuMsgCom } from './component/msg'
 
 export const startInstance = (roomId: number, options: AppOptions) => {
   const handler: MsgHandler = {
     onIncomeDanmu: (msg) => {
-      console.log(danmuMsg(msg.body))
+      console.log(danmuMsgCom(msg.body))
     },
   }
   startListen(roomId, handler)
diff --git a/packages/live-mini/src/utils/parse.ts b/packages/live-mini/src/utils/parse.ts
@@ -0,0 +1,6 @@
+import type { GuardLevel } from "blive-message-listener"
+
+export const getGuardColor = (level: GuardLevel = 0) => {
+  const colorDict = ['#967E76', '#FF7C28', '#E17AFF', '#00D1F1']
+  return colorDict[level]
+}
diff --git a/packages/live-mini/tsup.config.ts b/packages/live-mini/tsup.config.ts
@@ -1,7 +1,7 @@
 import { defineConfig } from 'tsup'
 
 export default defineConfig({
-  format: ['cjs', 'esm'],
+  format: ['esm'],
   entry: [
     'src/index.ts',
   ],
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
