feat(game, db): 更新数据库的版本和socket使用

lovezhangchuangxin · Dec 5, 2024 · 18ae616 · 18ae616
1 parent 9cd4f2c
commit 18ae616
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 41 deletions.
diff --git a/packages/db/src/gamedb.ts b/packages/db/src/gamedb.ts
@@ -61,7 +61,7 @@ export class GameDB extends DB {
 
   initData() {
     return {
-      version: '0.0.1',
+      version: '0.0.2',
       user: [],
       messages: {},
       userDataMap: {},

diff --git a/packages/game/src/components/game-map/index.vue b/packages/game/src/components/game-map/index.vue
@@ -92,11 +92,13 @@ const getMapObject = (
   if (!socket?.value) {
     return
   }
+
   socket.value
     .timeout(5000)
     .emit('getObjectsFromChunks', chunkIds, (err: any, response: any) => {
       if (err) {
-        toast.error('获取游戏数据失败')
+        toast.error('获取地图数据失败')
+        console.log(err)
       } else if (response.code === 0) {
         mapObjectData.value = response.data
         callback(mapObjectData.value!)

diff --git a/packages/game/src/views/chat/ChatPage.vue b/packages/game/src/views/chat/ChatPage.vue
@@ -18,8 +18,8 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, onUnmounted, ref } from 'vue'
-import { io, Socket } from 'socket.io-client'
+import { inject, onMounted, Ref, ref } from 'vue'
+import { Socket } from 'socket.io-client'
 import PersonList from './PersonList.vue'
 import ChatWindow from './ChatWindow.vue'
 import { message as toast } from '@/utils/message'
@@ -34,27 +34,16 @@ const personList = ref<{ id: string; username: string }[]>([
 const toId = ref('')
 const toName = ref('')
 const messages = ref<MessageInfo[]>([])
-const socket = ref<Socket | null>(null)
+const socket = inject<Ref<Socket>>('socket')
 
 onMounted(() => {
-  socket.value = io('', {
-    query: {
-      token: localStorage.getItem('token'),
-    },
-    path: '/ws',
-  })
-
-  socket.value.on('connect', () => {
-    console.log('connect')
-  })
-
   // 从本地存储中获取已聊天用户列表
   try {
     const chatPersonList = JSON.parse(
       localStorage.getItem('chatPersonList') || '[]',
     ) as string[]
     if (chatPersonList.length) {
-      socket.value
+      socket?.value
         .timeout(5000)
         .emit(
           'queryUsers',
@@ -76,24 +65,20 @@ onMounted(() => {
     localStorage.setItem('chatPersonList', '[]')
   }
 
-  socket.value.on('receiveChat', (fromId: string, message: MessageInfo) => {
+  socket?.value.on('receiveChat', (fromId: string, message: MessageInfo) => {
     if (fromId === userStore.id) {
       return
     }
     messages.value.push(message)
   })
 })
 
-onUnmounted(() => {
-  socket.value?.disconnect()
-})
-
 const handleSelectPerson = (id: string, name: string) => {
   getChat(id, name)
 }
 
 const getChat = (id: string, name: string) => {
-  socket.value
+  socket?.value
     ?.timeout(5000)
     .emit('getChat', id, (err: any, response: ResponseData<MessageInfo[]>) => {
       if (err) {
@@ -114,7 +99,7 @@ const handleSendMessage = (message: string, ok: () => void) => {
     return
   }
 
-  socket.value
+  socket?.value
     ?.timeout(5000)
     .emit(
       'sendChat',

diff --git a/packages/game/src/views/planet/PlanetPage.vue b/packages/game/src/views/planet/PlanetPage.vue
@@ -39,9 +39,9 @@
 </template>
 
 <script setup lang="ts">
-import { computed, onMounted, onUnmounted, ref } from 'vue'
+import { computed, onMounted, onUnmounted, Ref, ref } from 'vue'
 import { ElTabs, ElTabPane } from 'element-plus'
-import { io, Socket } from 'socket.io-client'
+import { Socket } from 'socket.io-client'
 import {
   AllStructureData,
   PlanetData,
@@ -55,8 +55,9 @@ import {
 import { message as toast } from '@/utils/message'
 import NumberFormat from '@/components/number/NumberFormat.vue'
 import ShowPanel from './ShowPanel.vue'
+import { inject } from 'vue'
 
-const socket = ref<Socket | null>(null)
+const socket = inject<Ref<Socket>>('socket')
 const userData = ref<UserData>()
 const planetId = ref('')
 const planetData = ref<PlanetData>()
@@ -84,30 +85,18 @@ const allResources = computed(() => {
 })
 
 onMounted(() => {
-  socket.value = io('', {
-    query: {
-      token: localStorage.getItem('token'),
-    },
-    path: '/ws',
-  })
-
-  socket.value.on('connect', () => {
-    console.log('connect')
-  })
-
   timerId.value = setInterval(() => {
     getMyData()
   }, 1000) as unknown as number
 })
 
 onUnmounted(() => {
   clearInterval(timerId.value!)
-  socket.value?.disconnect()
 })
 
 // 获取我的游戏数据
 const getMyData = () => {
-  socket.value?.timeout(5000).emit('getMyData', (err: any, response: any) => {
+  socket?.value?.timeout(5000).emit('getMyData', (err: any, response: any) => {
     if (err) {
       toast.error('获取游戏数据失败')
     } else if (response.code === 0) {
@@ -143,7 +132,7 @@ const addOperation = (
     return
   }
 
-  socket.value
+  socket?.value
     ?.timeout(5000)
     .emit('addOperation', params, (err: any, response: any) => {
       if (err) {