Browse Source

修复断线重连期间消息丢失问题

master
xsx 2 years ago
parent
commit
9df8fa3f97
  1. 9
      im-ui/src/api/wssocket.js
  2. 9
      im-ui/src/view/Home.vue
  3. 2
      im-ui/src/view/Login.vue
  4. 12
      im-uniapp/App.vue
  5. 7
      im-uniapp/common/wssocket.js

9
im-ui/src/api/wssocket.js

@ -1,6 +1,7 @@
var websock = null; var websock = null;
let rec; //断线重连后,延迟5秒重新创建WebSocket连接 rec用来存储延迟请求的代码 let rec; //断线重连后,延迟5秒重新创建WebSocket连接 rec用来存储延迟请求的代码
let isConnect = false; //连接标识 避免重复连接 let isConnect = false; //连接标识 避免重复连接
let connectCallBack= null;
let messageCallBack = null; let messageCallBack = null;
let closeCallBack = null let closeCallBack = null
@ -16,6 +17,8 @@ let connect = (wsurl,accessToken) => {
let sendInfo = JSON.parse(e.data) let sendInfo = JSON.parse(e.data)
if (sendInfo.cmd == 0) { if (sendInfo.cmd == 0) {
heartCheck.start() heartCheck.start()
// 登录成功才算真正完成连接
connectCallBack && connectCallBack();
console.log('WebSocket登录成功') console.log('WebSocket登录成功')
} else if (sendInfo.cmd == 1) { } else if (sendInfo.cmd == 1) {
// 重新开启心跳定时 // 重新开启心跳定时
@ -119,6 +122,9 @@ let sendMessage = (agentData) => {
} }
} }
let onConnect = (callback) => {
connectCallBack = callback;
}
let onMessage = (callback) => { let onMessage = (callback) => {
messageCallBack = callback; messageCallBack = callback;
@ -134,6 +140,7 @@ export {
reconnect, reconnect,
close, close,
sendMessage, sendMessage,
onConnect,
onMessage, onMessage,
onClose onClose,
} }

9
im-ui/src/view/Home.vue

@ -80,11 +80,14 @@
methods: { methods: {
init() { init() {
this.$store.dispatch("load").then(() => { this.$store.dispatch("load").then(() => {
// ws
this.$wsApi.connect(process.env.VUE_APP_WS_URL, sessionStorage.getItem("accessToken"));
this.$wsApi.onConnect(()=>{
// 线 // 线
this.loadPrivateMessage(this.$store.state.chatStore.privateMsgMaxId); this.loadPrivateMessage(this.$store.state.chatStore.privateMsgMaxId);
this.loadGroupMessage(this.$store.state.chatStore.groupMsgMaxId); this.loadGroupMessage(this.$store.state.chatStore.groupMsgMaxId);
// ws });
this.$wsApi.connect(process.env.VUE_APP_WS_URL, sessionStorage.getItem("accessToken"));
this.$wsApi.onMessage((cmd, msgInfo) => { this.$wsApi.onMessage((cmd, msgInfo) => {
if (cmd == 2) { if (cmd == 2) {
// ws // ws
@ -104,7 +107,7 @@
// //
this.handleGroupMessage(msgInfo); this.handleGroupMessage(msgInfo);
} }
}) });
this.$wsApi.onClose((e) => { this.$wsApi.onClose((e) => {
console.log(e); console.log(e);
if (e.code != 3000) { if (e.code != 3000) {

2
im-ui/src/view/Login.vue

@ -35,7 +35,7 @@
<a class="login-icon" href="https://gitee.com/bluexsx/box-im" target="_blank"> <a class="login-icon" href="https://gitee.com/bluexsx/box-im" target="_blank">
<img src="https://gitee.com/bluexsx/box-im/badge/star.svg" /> <img src="https://gitee.com/bluexsx/box-im/badge/star.svg" />
</a> </a>
<a class="login-icon" href="https://gitee.com/bluexsx/box-im" target="_blank"> <a class="login-icon" href="https://github.com/bluexsx/box-im" target="_blank">
<img src="https://img.shields.io/github/stars/bluexsx/box-im.svg?style=flat&logo=GitHub" /> <img src="https://img.shields.io/github/stars/bluexsx/box-im.svg?style=flat&logo=GitHub" />
</a> </a>

12
im-uniapp/App.vue

@ -18,9 +18,6 @@
this.initAudit(); this.initAudit();
// websocket // websocket
this.initWebSocket(); this.initWebSocket();
// 线
this.loadPrivateMessage(store.state.chatStore.privateMsgMaxId);
this.loadGroupMessage(store.state.chatStore.groupMsgMaxId);
}).catch((e) => { }).catch((e) => {
console.log(e); console.log(e);
this.exit(); this.exit();
@ -30,6 +27,11 @@
let loginInfo = uni.getStorageSync("loginInfo") let loginInfo = uni.getStorageSync("loginInfo")
wsApi.init(); wsApi.init();
wsApi.connect(process.env.WS_URL, loginInfo.accessToken); wsApi.connect(process.env.WS_URL, loginInfo.accessToken);
wsApi.onConnect(() => {
// 线
this.loadPrivateMessage(store.state.chatStore.privateMsgMaxId);
this.loadGroupMessage(store.state.chatStore.groupMsgMaxId);
});
wsApi.onMessage((cmd, msgInfo) => { wsApi.onMessage((cmd, msgInfo) => {
if (cmd == 2) { if (cmd == 2) {
// 线 // 线
@ -119,7 +121,9 @@
store.commit("resetUnreadCount", chatInfo) store.commit("resetUnreadCount", chatInfo)
} else { } else {
// //
store.commit("readedMessage", {friendId:friendId}) store.commit("readedMessage", {
friendId: friendId
})
} }
return; return;

7
im-uniapp/common/wssocket.js

@ -2,6 +2,7 @@ let wsurl = "";
let accessToken = ""; let accessToken = "";
let messageCallBack = null; let messageCallBack = null;
let closeCallBack = null; let closeCallBack = null;
let connectCallBack = null;
let isConnect = false; //连接标识 避免重复连接 let isConnect = false; //连接标识 避免重复连接
let rec = null; let rec = null;
let isInit = false; let isInit = false;
@ -31,6 +32,7 @@ let init = () => {
let sendInfo = JSON.parse(res.data) let sendInfo = JSON.parse(res.data)
if (sendInfo.cmd == 0) { if (sendInfo.cmd == 0) {
heartCheck.start() heartCheck.start()
connectCallBack && connectCallBack();
console.log('WebSocket登录成功') console.log('WebSocket登录成功')
} else if (sendInfo.cmd == 1) { } else if (sendInfo.cmd == 1) {
// 重新开启心跳定时 // 重新开启心跳定时
@ -145,6 +147,10 @@ function sendMessage(agentData) {
}) })
} }
let onConnect = (callback) => {
connectCallBack = callback;
}
function onMessage(callback) { function onMessage(callback) {
messageCallBack = callback; messageCallBack = callback;
@ -163,6 +169,7 @@ export {
reconnect, reconnect,
close, close,
sendMessage, sendMessage,
onConnect,
onMessage, onMessage,
onClose onClose
} }
Loading…
Cancel
Save