From b46d179dfe415bcd5a7cd453ef55827e090577fc Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 27 Sep 2023 08:44:35 +0100 Subject: [PATCH] remove console logs --- src/app/pages/chat/chat.page.ts | 53 ------------------- src/app/services/chat/chat-system.service.ts | 31 +++++++++-- src/app/services/chat/message.service.ts | 31 ++++++++--- .../chat/rochet-chat-connector.service.ts | 13 ++--- 4 files changed, 57 insertions(+), 71 deletions(-) diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index 212e1b1b1..f1f30fc82 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -31,7 +31,6 @@ import { ChatDebuggingPage } from 'src/app/shared/popover/chat-debugging/chat-de import { EventTrigger } from 'src/app/services/eventTrigger.service'; import { RochetChatConnectorService } from 'src/app/services/chat/rochet-chat-connector.service'; - import { Plugins } from '@capacitor/core'; const { App } = Plugins; @@ -175,58 +174,6 @@ export class ChatPage implements OnInit { }); this.routeCheck() - - - if (!this.platform.is('desktop')) { - App.addListener('appStateChange', ({ isActive }) => { - if (isActive) { - // The app is in the foreground. - console.log('App is in the foreground'); - - setTimeout(() => { - this.ChatSystemService.subscribeToRoom() - this.RochetChatConnectorService.setStatus('online') - },1000); - - /* const webSocketURL = environment.apiWsChatUrl; - const ws = new WebSocket(webSocketURL); - - ws.addEventListener('open', () => { - console.log('WebSocket connection opened'); - }); - - ws.addEventListener('message', (event) => { - const data = JSON.parse(event.data); - // Handle incoming messages from the Rocket.Chat server. - console.log('Received message:', data); - }); - - ws.addEventListener('close', (event) => { - console.log('WebSocket connection closed', event); - // Optionally, attempt to reopen the connection when it's closed. - // You can implement a reconnect strategy here. - setTimeout(() => { - this.reopenWebSocketConnection(); - }, 5000); // Reopen the connection after 5 seconds (adjust as needed). - }); - - this.RochetChatConnectorService.sendStreamNotifyRoom("26XgGhKghKN8fN6v8KvDfW9jrjhKhoAWhM", SessionStore.user.UserName, 'typing', true).catch((error) => console.error(error)); - - ws.addEventListener('error', (error) => { - console.error('WebSocket error:', error); - // Handle WebSocket errors here. - }); - */ - - - /* this.reloadComponent(true) */ - } else { - // The app is in the background. - console.log('App is in the background'); - // You can perform actions specific to the background state here. - } - }); - } } reopenWebSocketConnection() { diff --git a/src/app/services/chat/chat-system.service.ts b/src/app/services/chat/chat-system.service.ts index e347b4d5e..6bb333899 100644 --- a/src/app/services/chat/chat-system.service.ts +++ b/src/app/services/chat/chat-system.service.ts @@ -21,6 +21,10 @@ import { NetworkServiceService} from 'src/app/services/network-service.service'; import { ViewedMessageService } from './viewed-message.service' import { NotificationsService } from '../notifications.service'; import { Subscribe } from '../subcribe'; +import { Plugins } from '@capacitor/core'; + +const { App } = Plugins; + @Injectable({ providedIn: 'root' }) @@ -103,16 +107,37 @@ export class ChatSystemService { } - document.addEventListener('resume', function () { + if(SessionStore.user?.ChatData?.data) { + this.restoreRooms(); + } + + document.addEventListener('resume', () => { this.RochetChatConnectorService.setStatus('online') if(this._dm?.length == 0 && this._group?.length == 0) { this.getAllRooms(); } }); + if (!this.platform.is('desktop')) { + App.addListener('appStateChange', ({ isActive }) => { + if (isActive) { + // The app is in the foreground. + console.log('App is in the foreground'); - if(SessionStore.user?.ChatData?.data) { - this.restoreRooms(); + this.currentRoom?.loadHistory({forceUpdate: true}) + + setTimeout(() => { + this.subscribeToRoom() + this.RochetChatConnectorService.setStatus('online') + },1000); + + /* this.reloadComponent(true) */ + } else { + // The app is in the background. + console.log('App is in the background'); + // You can perform actions specific to the background state here. + } + }); } } diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts index 9dc3d0ccd..1dc915f52 100644 --- a/src/app/services/chat/message.service.ts +++ b/src/app/services/chat/message.service.ts @@ -252,6 +252,7 @@ export class MessageService { functionTimer = null; + functionTimer2 = null; async sendRequestAttachment() { @@ -295,7 +296,11 @@ export class MessageService { return uploadSuccessfully } + sendToRocketChatAttemp = 0 + async sendRequest(params) { + this.sendToRocketChatAttemp++; + if(params?.attachments) { if(params?.attachments[0]?.image_url) { delete params?.attachments[0]?.image_url @@ -320,6 +325,7 @@ export class MessageService { } } else { + // console.log('online') this.RochetChatConnectorService.send(params).then( (ChatMessage: any) => { @@ -336,16 +342,16 @@ export class MessageService { } this.functionTimer = setTimeout(() => { + //console.log('functionTimer') + this.RochetChatConnectorService.registerCallback({ type:'Onmessage', key:'ping-pong-message', funx:(message: any) => { + + // clearTimeout(this.functionTimer2); if(message.msg == "ping") { - if(this.sendAttempt >= 3) { - this.manualRetry = true - } else { - this.send() - } + this.sendRequest(params) return true } @@ -353,11 +359,24 @@ export class MessageService { } }) + // this.functionTimer2 = setTimeout(() => { + // console.log('set to callback') + // this.RochetChatConnectorService.registerCallback({ + // type: 'reConnect', + // funx: async ()=> { + // this.sendRequest(params) + + // return true + // } + // }) + // }, 4000) + this.RochetChatConnectorService.wsSend({message:{msg:"pong"}, loginRequired: false}) - }, 3000) + }, 5000) } else { + // console.log('offline') this.RochetChatConnectorService.registerCallback({ type: 'reConnect', funx: async ()=> { diff --git a/src/app/services/chat/rochet-chat-connector.service.ts b/src/app/services/chat/rochet-chat-connector.service.ts index 5aa3546fe..4babc28d7 100644 --- a/src/app/services/chat/rochet-chat-connector.service.ts +++ b/src/app/services/chat/rochet-chat-connector.service.ts @@ -23,15 +23,11 @@ export class RochetChatConnectorService { } connect() { - console.log('Check conetion 11') - console.log(this.ws.connected) // dont connect if is already connected if(this.ws.connected == true) { - console.log('Check conetion 22') return false } - console.log('Check conetion 33') this.ws.connect(); const message = { @@ -759,11 +755,10 @@ export class RochetChatConnectorService { this.socket.onclose = this.ws.onclose; this.socket.onerror = this.ws.onerror; - console.log(' === on open connection ===') }, onopen: async ()=> { - console.log('===socket on connection open===') + this.ws.connected = true this.backgroundservice.online(); @@ -842,7 +837,7 @@ export class RochetChatConnectorService { onclose: async (event: any)=> { this.ws.connected = false this.isLogin = false - console.error('===close socket connection===') + this.connect() this.login() @@ -864,10 +859,10 @@ export class RochetChatConnectorService { }, onerror: (event: any) => { - console.log(' ==== error ====') + }, disconnect:() => { - console.log('==== desconnect ====') + if(this.socket) { this.socket.onopen = (event: any) => {} this.socket.onmessage = (event: any) => {}