From 1793ad8e8ae3636d568212a78c918866c66e31a6 Mon Sep 17 00:00:00 2001 From: Luk Date: Mon, 5 Feb 2024 09:49:11 +0800 Subject: [PATCH] console.xxx({_at, ...}) --- unisocket.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/unisocket.js b/unisocket.js index 30dac32..2fa6ccb 100644 --- a/unisocket.js +++ b/unisocket.js @@ -8,19 +8,19 @@ const my = { export default { initSocket (url, relogin = false) { if (!my.socket || (my.socket.readyState !== my.socket.OPEN && typeof url === 'string')) { - console.log(new Date().toJSON(), `WebSocket is connecting to ${url}...`) + console.log({ _at: new Date().toJSON(), about: `WebSocket is connecting to ${url}...` }) my.socket = uni.connectSocket({ url: url.replace(/^http/, 'ws'), complete: () => { }, }) my.socket.onOpen((res) => { - console.log(new Date().toJSON(), 'WebSocket onOpen: ', res) + console.log({ _at: new Date().toJSON(), about: 'WebSocket onOpen: ', res }) clearInterval(my.reconnecting) delete my.reconnecting // 前端断线重连时,并不会自动提供 _passtoken。在前端的initSocket时,应当把_passtoken送过来,而后台则对_passtoken做验证后再加socketPool。 if (relogin && uni.getStorageSync('_passtoken')) { - console.log(new Date().toJSON(), 'Reporting owner for reconnecting socket') + console.log({ _at: new Date().toJSON(), about: 'Reporting owner for reconnecting socket' }) my.socket.send({ data: JSON.stringify({ skevent: 'SOCKET_OWNER_RECONNECT', _passtoken: uni.getStorageSync('_passtoken') }) }) } @@ -34,27 +34,27 @@ export default { }, 20000) // 定期发送心跳,避免被关闭 }) my.socket.onClose((res) => { - console.log(new Date().toJSON(), 'Websocket onClose: ', res) + console.log({ _at: new Date().toJSON(), about: 'Websocket onClose: ', res }) if (!my.reconnecting) my.reconnecting = setInterval(() => { - console.log(new Date().toJSON(), 'Websocket reconnecting...') + console.log({ _at: new Date().toJSON(), about: 'Websocket reconnecting...' }) this.initSocket(url, true) }, 5000) // 每5秒尝试重连 }) my.socket.onError((err) => { - console.log(new Date().toJSON(), 'Websocket onError: ', err) + console.log({ _at: new Date().toJSON(), about: 'Websocket onError: ', err }) }) my.socket.onMessage(({ data }) => { // 在这里统一分发消息(用户端通常不需要返回结果给服务器,因此不用 rpc 模式,而用 event 模式。 try { let { skevent, ...apiWhat } = JSON.parse(data) - console.log(new Date().toJSON(), 'Websocket onMessage for skevent: ', skevent) + 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(new Date().toJSON(), 'Websocket onMessage unknown', data, exception) + console.log({ _at: new Date().toJSON(), about: 'Websocket onMessage unknown', data, exception }) return } })