diff --git a/bin/bilicli.js b/bin/bilicli.js old mode 100644 new mode 100755 diff --git a/package.json b/package.json index ec36d3c..ad74e7c 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "@temir/core": "^0.0.20", "@temir/link": "^0.0.20", "@temir/tab": "^0.0.20", - "blive-message-listener": "^0.2.1", + "blive-message-listener": "^0.3.0", "dayjs": "^1.11.5", "mri": "^1.2.0", "ohmyfetch": "^0.4.19", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1ff61b0..36aafca 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,7 +6,7 @@ specifiers: '@temir/link': ^0.0.20 '@temir/tab': ^0.0.20 '@types/node': ^18.8.3 - blive-message-listener: ^0.2.1 + blive-message-listener: ^0.3.0 dayjs: ^1.11.5 mri: ^1.2.0 ohmyfetch: ^0.4.19 @@ -17,7 +17,7 @@ dependencies: '@temir/core': 0.0.20 '@temir/link': 0.0.20 '@temir/tab': 0.0.20 - blive-message-listener: 0.2.1 + blive-message-listener: 0.3.0 dayjs: 1.11.5 mri: 1.2.0 ohmyfetch: 0.4.19 @@ -690,10 +690,10 @@ packages: engines: {node: '>=8'} dev: true - /blive-message-listener/0.2.1: - resolution: {integrity: sha512-ITd7/doenWfhr6X+rDpf/pFvWm33gkYKI2rAlsM/1PjNfn/m6uTiHW904S15D2dONB/GHVyL81LGA86Cxy6bvg==} + /blive-message-listener/0.3.0: + resolution: {integrity: sha512-+NDiQH3udqKNeOYvY/MWx9iM5uDCkS7zNr8D5gUzgZR/fsJDGWlOpthqxvcYOFbEcOKeQuNwxh46WZn8ahEDzw==} dependencies: - tiny-bilibili-ws: 0.0.2 + tiny-bilibili-ws: 0.0.5 transitivePeerDependencies: - bufferutil - utf-8-validate @@ -1526,14 +1526,6 @@ packages: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} dev: true - /isomorphic-ws/5.0.0_ws@8.9.0: - resolution: {integrity: sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw==} - peerDependencies: - ws: '*' - dependencies: - ws: 8.9.0 - dev: false - /joycon/3.1.1: resolution: {integrity: sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==} engines: {node: '>=10'} @@ -1987,11 +1979,10 @@ packages: any-promise: 1.3.0 dev: true - /tiny-bilibili-ws/0.0.2: - resolution: {integrity: sha512-DckKSO14WT40G+u+ZsUN89eHT23QE8VsSk26HD9tE5LLg85MgOcs++m0wgElpKXCmiKCdo+bvqCNOAgkvRUs6w==} + /tiny-bilibili-ws/0.0.5: + resolution: {integrity: sha512-MRJfp4h2BOuJE05RGEXP+chVa+6xlvKZXFVKWrXW+B50kuF5R4q0sX6P6ZzRS3gV8rsXCKgdWI9vk5DvbUkGHw==} dependencies: eventemitter3: 4.0.7 - isomorphic-ws: 5.0.0_ws@8.9.0 pako: 2.0.4 ws: 8.9.0 transitivePeerDependencies: diff --git a/src/App.vue b/src/App.vue index a008759..e562c29 100644 --- a/src/App.vue +++ b/src/App.vue @@ -3,7 +3,7 @@ import { provide, onMounted, ref } from 'vue' import { startListen } from 'blive-message-listener' import type { MsgHandler, Message, - DanmuMsg, SuperChatMsg, GiftMsg, GuardBuyMsg, NewComerMsg + DanmuMsg, SuperChatMsg, GiftMsg, GuardBuyMsg, UserActionMsg } from 'blive-message-listener' import { TBox } from '@temir/core' import { getRoomInfo, type RoomInfo } from './utils/getInfo' @@ -20,7 +20,7 @@ import DanmuMsgCom from './components/msgCom/DanmuMsgCom.vue' import SuperChatMsgCom from './components/msgCom/SuperChatMsgCom.vue' import GiftMsgCom from './components/msgCom/GiftMsgCom.vue' import GuardBuyMsgCom from './components/msgCom/GuardBuyMsgCom.vue' -import NewComerCom from './components/msgCom/NewComerMsgCom.vue' +import UserActionMsgCom from './components/msgCom/UserActionMsgCom.vue' const options = parseCliArgs() provide('options', options) @@ -39,7 +39,7 @@ const danmuList = ref[]>([]) const superChatList = ref[]>([]) const giftList = ref[]>([]) const guardBuyList = ref[]>([]) -const newComerList = ref[]>([]) +const userActionList = ref[]>([]) onMounted(async () => { listenQuitCommand() @@ -90,8 +90,8 @@ onMounted(async () => { allList.value.push(msg) guardBuyList.value.push(msg) }, - onNewComer: (msg) => { - newComerList.value.push(msg) + onUserAction: (msg) => { + userActionList.value.push(msg) }, } startListen(roomInfo.room_id, handler) @@ -138,9 +138,9 @@ const handleTabChange = (index: number) => { - + - + @@ -160,7 +160,7 @@ const handleTabChange = (index: number) => { @@ -168,7 +168,7 @@ const handleTabChange = (index: number) => { diff --git a/src/components/CliFooter.vue b/src/components/CliFooter.vue index 9d82472..0fb0955 100644 --- a/src/components/CliFooter.vue +++ b/src/components/CliFooter.vue @@ -2,8 +2,8 @@ import { ref, watch } from 'vue' import { TBox, TText } from '@temir/core' import dayjs from 'dayjs' -import type { Message, NewComerMsg } from 'blive-message-listener' -import NewComerCom from './msgCom/NewComerMsgCom.vue' +import type { Message, UserActionMsg } from 'blive-message-listener' +import UserActionMsgCom from './msgCom/UserActionMsgCom.vue' interface LiveStatus { isLive: boolean @@ -11,7 +11,7 @@ interface LiveStatus { } const props = defineProps<{ - newestWatcher: Message | null + newestWatcher: Message | null liveStatus: LiveStatus watchers: number attention: number @@ -65,7 +65,7 @@ const formatSeconds = (seconds: number) => {