mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 21:06:06 +00:00
improve
This commit is contained in:
@@ -74,13 +74,11 @@ export class WsChatService {
|
||||
if(message.id == requestId ) { // same request send
|
||||
|
||||
if(message.result) {
|
||||
console.log(message)
|
||||
if(message.result.token) {
|
||||
|
||||
this.isLogin = true
|
||||
this.loginResponse = message
|
||||
|
||||
console.log('wsMsgQueue', this.wsMsgQueue)
|
||||
this.ws.wsMsgQueue()
|
||||
|
||||
resolve(message)
|
||||
@@ -242,7 +240,7 @@ export class WsChatService {
|
||||
* @param key
|
||||
* @param funx
|
||||
*/
|
||||
receiveLiveMessageFromRoom(roomId, funx: Function) {
|
||||
receiveMyMessageConfirmation(roomId, funx: Function) {
|
||||
|
||||
this.ws.registerCallback({
|
||||
type:'Onmessage',
|
||||
@@ -261,6 +259,21 @@ export class WsChatService {
|
||||
|
||||
}
|
||||
|
||||
receiveLiveMessageFromRoom(roomId, funx: Function) {
|
||||
|
||||
this.ws.registerCallback({
|
||||
type:'Onmessage',
|
||||
funx:(message)=>{
|
||||
if(message.msg =='changed' && message.collection == 'stream-room-messages') {
|
||||
if(message.fields.args[0].rid == roomId) {
|
||||
funx(message)
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
streamRoomMessages(roomId : string) {
|
||||
|
||||
const requestId = uuidv4()
|
||||
@@ -270,7 +283,7 @@ export class WsChatService {
|
||||
"id": requestId,
|
||||
"name": "stream-room-messages",
|
||||
"params":[
|
||||
`${roomId}/event`,
|
||||
`${roomId}`,
|
||||
false
|
||||
]
|
||||
}
|
||||
@@ -279,7 +292,7 @@ export class WsChatService {
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
|
||||
if(message.msg == 'ready' || deepFind(message, 'subs.0') == requestId) { // same request send
|
||||
if(message.id == requestId) { // same request send
|
||||
resolve(message)
|
||||
return true
|
||||
}
|
||||
@@ -375,7 +388,6 @@ export class WsChatService {
|
||||
},
|
||||
|
||||
onmessage:(event: any)=> {
|
||||
// if(this.ws.connected == false) { return true }
|
||||
const data = JSON.parse(event.data)
|
||||
|
||||
for (const [key, value] of Object.entries(this.wsCallbacks)) {
|
||||
|
||||
Reference in New Issue
Block a user