This commit is contained in:
Peter Maquiran
2022-01-12 16:10:59 +01:00
parent bf6211229c
commit b40b7c9360
2 changed files with 17 additions and 6 deletions
+4 -1
View File
@@ -25,7 +25,6 @@ export class RoomService {
) {}
setData({id, name, lastMessage, _updatedAt}) {
this.id = id
this.name = name
this.lastMessage = lastMessage
@@ -93,4 +92,8 @@ export class RoomService {
return message
}
// to add
countDownDate(){}
}
+13 -5
View File
@@ -46,7 +46,6 @@ export class WsChatService {
return new Promise((resolve, reject) => {
this.ws.registerCallback({type:'Onmessage', requestId, funx:(message)=>{
console.log('message login', message)
if(message.id == requestId ) { // same request send
console.log('message login', message)
@@ -303,18 +302,26 @@ export class WsChatService {
this.ws.wsMsgQueue()
},
wsMsgQueue:()=> {
let RunsQueue = []
this.wsMsgQueue.forEach((item, index, object) => {
if(item.loginRequired == true && this.isLogin == true) {
console.log('run msgQueue ',index)
this.ws.send(item.message, item.requestId, item.loginRequired);
delete this.wsMsgQueue[item.requestId]
RunsQueue.push(item.requestId)
} else if(item.loginRequired == false) {
console.log('run msgQueue ',index)
this.ws.send(item.message, item.requestId, item.loginRequired);
delete this.wsMsgQueue[item.requestId]
RunsQueue.push(item.requestId)
}
})
RunsQueue.forEach((requestId)=>{
this.wsMsgQueue = this.wsMsgQueue.filter(e=> e.requestId != requestId)
console.log('wsMsgQueue', this.wsMsgQueue)
})
},
send: (message: object, requestId = uuidv4(), loginRequired) => {
@@ -347,11 +354,12 @@ export class WsChatService {
},
onclose:(event: any)=> {
this.ws.connected = false
this.isLogin = false
this.connect()
this.login()
this.ws.connected = false
console.log(`[close] Connection closed cleanly, code=${event.code} reason=${event.reason}`);
},