From 4df2c12997d8964863c5f1d9bf0a24addaeb1476 Mon Sep 17 00:00:00 2001 From: Luk Date: Sat, 21 Sep 2024 11:26:26 +0800 Subject: [PATCH] standardize console.log format --- unisocket.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/unisocket.js b/unisocket.js index 9d6eb80..fe22a63 100644 --- a/unisocket.js +++ b/unisocket.js @@ -17,17 +17,17 @@ export default { }, initSocket ({ url, relogin = false, stateManager = {}, heartbeat = false, heartbeatInterval, reconnectInterval } = {}) { if (!my.socket || (my.socket.readyState !== my.socket.OPEN && typeof url === 'string')) { - console.log({ _at: new Date().toJSON(), about: `WebSocket is connecting to ${url}...` }) + console.log({ _at: new Date().toJSON(), about: `WebSocket_initSocket connecting to ${url}...` }) my.socket = uni.connectSocket({ url: url.replace(/^http/, 'ws'), complete: () => {}, }) my.socket.onOpen((res) => { - console.log({ _at: new Date().toJSON(), about: 'WebSocket onOpen: ', res }) + console.log({ _at: new Date().toJSON(), about: 'WebSocket_onOpen: ', res }) stateManager.socketAlive = true if (my.messageQueue.length) { - console.log('WebSocket_onOpen: sending messageQueue') + console.log({ _at: new Date().toJSON(), about: 'WebSocket_onOpen: sending messageQueue' }) my.messageQueue.forEach((dataObj) => { this.sendObject(dataObj) }) @@ -55,29 +55,29 @@ export default { } }) my.socket.onClose((res) => { - console.log({ _at: new Date().toJSON(), about: 'Websocket onClose: ', res }) + console.log({ _at: new Date().toJSON(), about: 'Websocket_onClose: ', res }) stateManager.socketAlive = false if (!my.reconnecting) my.reconnecting = setInterval(() => { - console.log({ _at: new Date().toJSON(), about: 'Websocket reconnecting...' }) + console.log({ _at: new Date().toJSON(), about: 'Websocket_reconnecting...' }) this.initSocket({ url, relogin: true, stateManager }) }, reconnectInterval || my.reconnectInterval) // 定时尝试重连 }) my.socket.onError((err) => { - console.log({ _at: new Date().toJSON(), about: 'Websocket onError: ', err }) + console.log({ _at: new Date().toJSON(), about: 'Websocket_onError: ', err }) stateManager.socketAlive = false }) my.socket.onMessage(({ data }) => { // 在这里统一分发消息(用户端通常不需要返回结果给服务器,因此不用 rpc 模式,而用 event 模式。 try { let { skevent, ...apiWhat } = JSON.parse(data) - console.log({ _at: new Date().toJSON(), about: 'Websocket onMessage', skevent, apiWhat }) + console.log({ _at: new Date().toJSON(), about: 'Websocket_onMessage', skevent, apiWhat }) let listeners = my.listeners[skevent] || [] for (let listener of listeners) { listener(apiWhat) } } catch (exception) { - console.log({ _at: new Date().toJSON(), about: 'Websocket onMessage unknown', data, exception }) + console.log({ _at: new Date().toJSON(), about: 'Websocket_onMessage unknown data format', data, exception }) return } }) @@ -111,7 +111,7 @@ export default { return 0 }, sendObject (dataObj = {}) { - console.log('sendObject! socket.readyState =', my.socket.readyState) + console.log({ _at: new Date().toJSON(), about: 'WebSocket_sendObject', readyState: my.socket.readyState, dataObj }) // 把 sendObject({_passtoken}) 从其他零散地方迁移到这里来 if (!dataObj._passtoken) { dataObj._passtoken = uni.getStorageSync('_passtoken') || undefined