微调socket.ts

src/plugins/socket.ts

@@ -2,9 +2,11 @@ import { getToken } from '@/utils/auth'
 import { generateUUID } from '@/utils/geek';
 let _socket: UniApp.SocketTask;
 let _callback: { [key: string]: (data: any) => void } = {}
+const enableJSON = true // 开启JSON解析消息，需要开启JSON解析消息才能开启uuid和event
 const enableUUID = true // 需要接收信息中包含uuid字段，uuid优先级高于event
 const enableEvent = true // 需要接收信息中包含event字段
 
+
 interface ConnectSocketOption extends UniApp.ConnectSocketOption {
     headers: {
         isToken: boolean
@@ -24,6 +26,9 @@ export default {
             if (getToken() && !isToken) {
                 options.header['Authorization'] = 'Bearer ' + getToken()
             }
+            if(_socket !== undefined){
+                _socket.close({})
+            }
             _socket = uni.connectSocket({
                 url: options.url,
                 header: options.header,
@@ -33,12 +38,14 @@ export default {
             _socket.onError(reject)
             _socket.onOpen(resolve)
             _socket.onMessage(res => {
+                if(enableJSON){
                     let data = JSON.parse((res || {}).data)
                     if (enableUUID && (data || {}).uuid !== undefined) {
                         _callback[data.uuid](data)
                     } else if (enableEvent && (data || {}).event !== undefined) {
                         _callback[data.event](data)
                     }
+                }
             })
         })
     },
@@ -70,14 +77,15 @@ export default {
      */
     close() {
         return new Promise((resolve, reject) => {
-            _socket.close({
-                fail: reject
-            })
             let onclose = _socket.onClose
             _socket.onClose(res => {
                 resolve(res)
-                _socket.onClose(onclose)
+                _socket.onClose = onclose
             })
+            _socket.close({
+                fail: reject
+            })
+
         })
     },
     /**
@@ -103,6 +111,7 @@ export default {
      */
     onMessage(callback: (data: any) => void) {
         _socket.onMessage(res => {
+            if(enableJSON){
                 let data = JSON.parse((res || {}).data)
                 if (enableUUID && (data || {}).uuid !== undefined) {
                     _callback[data.uuid](res)
@@ -112,6 +121,9 @@ export default {
                 } else {
                     callback(data)
                 }
+            }else{
+                callback(res.data)
+            }
         })
     },
     /**