From 5e570531f13a2acaa75032038b2345b0caf1f7b0 Mon Sep 17 00:00:00 2001
From: Megghy <megghy@qq.com>
Date: Sun, 19 Jan 2025 14:59:20 +0800
Subject: [PATCH] fix read danmaku

---
 src/views/OpenLiveLayout.vue        | 53 +++++++----------------------
 src/views/TestView.vue              |  2 +-
 src/views/open_live/OpenLottery.vue |  2 +-
 src/views/open_live/OpenQueue.vue   |  2 +-
 src/views/open_live/ReadDanmaku.vue |  2 +-
 5 files changed, 17 insertions(+), 44 deletions(-)

diff --git a/src/views/OpenLiveLayout.vue b/src/views/OpenLiveLayout.vue
index 8c2f482..2eaebe8 100644
--- a/src/views/OpenLiveLayout.vue
+++ b/src/views/OpenLiveLayout.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { isDarkMode } from '@/Utils'
 import { ThemeType } from '@/api/api-models'
-import DanmakuClient, { AuthInfo } from '@/data/DanmakuClient'
+import { AuthInfo } from '@/data/DanmakuClients/OpenLiveClient'
 import { useDanmakuClient } from '@/store/useDanmakuClient'
 import { Lottery24Filled, PeopleQueue24Filled, TabletSpeaker24Filled } from '@vicons/fluent'
 import { Moon, MusicalNote, Sunny } from '@vicons/ionicons5'
@@ -39,7 +39,7 @@ const sider = ref()
 const { width } = useElementSize(sider)
 
 const authInfo = ref<AuthInfo>()
-const danmakuClient = useDanmakuClient()
+const danmakuClient = await useDanmakuClient().initClient()
 
 const menuOptions = [
   {
@@ -125,13 +125,8 @@ onUnmounted(() => {
     <NResult status="error" title="无效访问">
       <template #footer>
         请前往
-        <NButton
-          text
-          type="primary"
-          tag="a"
-          href="https://play-live.bilibili.com/details/1698742711771"
-          target="_blank"
-        >
+        <NButton text type="primary" tag="a" href="https://play-live.bilibili.com/details/1698742711771"
+          target="_blank">
           幻星平台 | VTsuru
         </NButton>
         并点击 获取 , 再点击 获取 H5 插件链接来获取可用链接
@@ -148,12 +143,8 @@ onUnmounted(() => {
             <NTag :type="danmakuClient.connected ? 'success' : 'warning'">
               {{ danmakuClient.connected ? `已连接 | ${danmakuClient.authInfo?.anchor_info?.uname}` : '未连接' }}
             </NTag>
-            <NSwitch
-              :default-value="!isDarkMode"
-              @update:value="
-                (value: string & number & boolean) => (themeType = value ? ThemeType.Light : ThemeType.Dark)
-              "
-            >
+            <NSwitch :default-value="!isDarkMode" @update:value="(value: string & number & boolean) => (themeType = value ? ThemeType.Light : ThemeType.Dark)
+              ">
               <template #checked>
                 <NIcon :component="Sunny" />
               </template>
@@ -173,29 +164,15 @@ onUnmounted(() => {
       </NPageHeader>
     </NLayoutHeader>
     <NLayout has-sider style="height: calc(100vh - 45px - 30px)">
-      <NLayoutSider
-        bordered
-        ref="sider"
-        show-trigger
-        default-collapsed
-        collapse-mode="width"
-        :collapsed-width="64"
-        :width="180"
-        :native-scrollbar="false"
-        style="height: 100%"
-      >
+      <NLayoutSider bordered ref="sider" show-trigger default-collapsed collapse-mode="width" :collapsed-width="64"
+        :width="180" :native-scrollbar="false" style="height: 100%">
         <Transition>
           <div v-if="danmakuClient.authInfo" style="margin-top: 8px">
             <NSpace vertical justify="center" align="center">
-              <NAvatar
-                :src="danmakuClient.authInfo?.anchor_info?.uface"
-                :img-props="{ referrerpolicy: 'no-referrer' }"
-                round
-                bordered
-                :style="{
+              <NAvatar :src="danmakuClient.authInfo?.anchor_info?.uface" :img-props="{ referrerpolicy: 'no-referrer' }"
+                round bordered :style="{
                   boxShadow: isDarkMode ? 'rgb(195 192 192 / 35%) 0px 0px 8px' : '0 2px 3px rgba(0, 0, 0, 0.1)',
-                }"
-              />
+                }" />
               <NEllipsis v-if="width > 100" style="max-width: 100%">
                 <NText strong>
                   {{ danmakuClient.authInfo?.anchor_info?.uname }}
@@ -204,12 +181,8 @@ onUnmounted(() => {
             </NSpace>
           </div>
         </Transition>
-        <NMenu
-          :default-value="$route.name?.toString()"
-          :collapsed-width="64"
-          :collapsed-icon-size="22"
-          :options="menuOptions"
-        />
+        <NMenu :default-value="$route.name?.toString()" :collapsed-width="64" :collapsed-icon-size="22"
+          :options="menuOptions" />
         <NSpace justify="center">
           <NText depth="3" v-if="width > 150">
             有更多功能建议请
diff --git a/src/views/TestView.vue b/src/views/TestView.vue
index 0b1ea34..cdbd7ac 100644
--- a/src/views/TestView.vue
+++ b/src/views/TestView.vue
@@ -16,7 +16,7 @@ const inputMsg = ref('')
 const isMaster = computed(() => {
   return route.query.slave == null || route.query.slave == undefined
 })
-const dc = useDanmakuClient()
+const dc = await useDanmakuClient().initClient()
 const customCss = ref('')
 
 let rtc= useWebRTC()
diff --git a/src/views/open_live/OpenLottery.vue b/src/views/open_live/OpenLottery.vue
index e90f138..a4b1fc3 100644
--- a/src/views/open_live/OpenLottery.vue
+++ b/src/views/open_live/OpenLottery.vue
@@ -84,7 +84,7 @@ const route = useRoute()
 const message = useMessage()
 const accountInfo = useAccount()
 const notification = useNotification()
-const client = useDanmakuClient()
+const client = await useDanmakuClient().initClient()
 
 const originUsers = ref<OpenLiveLotteryUserInfo[]>([])
 const currentUsers = ref<OpenLiveLotteryUserInfo[]>([])
diff --git a/src/views/open_live/OpenQueue.vue b/src/views/open_live/OpenQueue.vue
index 598be7a..c39806a 100644
--- a/src/views/open_live/OpenQueue.vue
+++ b/src/views/open_live/OpenQueue.vue
@@ -113,7 +113,7 @@ const route = useRoute()
 const accountInfo = useAccount()
 const message = useMessage()
 const notice = useNotification()
-const client = useDanmakuClient()
+const client = await useDanmakuClient().initClient()
 
 const isWarnMessageAutoClose = useStorage('Queue.Settings.WarnMessageAutoClose', false)
 const isReverse = useStorage('Queue.Settings.Reverse', false)
diff --git a/src/views/open_live/ReadDanmaku.vue b/src/views/open_live/ReadDanmaku.vue
index 6cbdb50..0f7e55d 100644
--- a/src/views/open_live/ReadDanmaku.vue
+++ b/src/views/open_live/ReadDanmaku.vue
@@ -74,7 +74,7 @@ type SpeechInfo = {
 const accountInfo = useAccount()
 const message = useMessage()
 const route = useRoute()
-const client = useDanmakuClient()
+const client = await useDanmakuClient().initClient()
 const settings = useStorage<SpeechSettings>('Setting.Speech', {
   speechInfo: {
     volume: 1,