improve chat

src/app/home/home.page.ts

@@ -98,6 +98,12 @@ export class HomePage implements OnInit {
         //send message                              // roomId                // Message
         this.RocketChatClientService.send('fsMwcNdufWvdnChj7ya9nF9cX2HizxxWAM', 'Mensagem enviada programaticamente.'+ new Date().toISOString())
       }
+
+      
+      this.RocketChatClientService.registerCallback({type:'Onmessage',requestId:'asdfasdfasdf',funx:(message)=>{
+        // console.log('message', message)
+      }})
+
     
     // this.RocketChatClientService.send()
     /* this.webNotificationPopupService.askNotificationPermission() */

src/app/pages/chat/chat.page.html

@@ -45,7 +45,7 @@
           <ion-list *ngSwitchCase="'Contactos'">
             <ion-item-sliding>
               <div class="item item-hover width-100 d-flex ion-no-padding ion-no-margin"
-                *ngFor="let room of ChatServiceGPR.individual | keyvalue"
+                *ngFor="let room of wsChatService.individual | keyvalue"
                 [class.item-active]="room.value.id == idSelected">
                   <div class="item-icon">
                     <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon" slot="start" src="assets/images/icons-chat-chat-40.svg"></ion-icon>
@@ -86,7 +86,7 @@
                   </div>
                 </div>
             </ion-item-sliding>
-            <ion-item-sliding *ngIf=" ChatServiceGPR.individualCount < 1">
+            <ion-item-sliding *ngIf=" wsChatService.individualCount < 1">
                 <div *ngFor="let n of numSequence(8); let i = index;" class="item item-hover width-100 d-flex ion-no-padding ion-no-margin">
                   <div class="item-icon"><ion-icon class="icon" slot="start" src="assets/icon/icons-chat-grey.svg"></ion-icon></div>
                   <div class="item-content flex-grow-1 cursor-pointer">

src/app/pages/chat/chat.page.ts

@@ -12,7 +12,7 @@ import {
 import { ModalController, Platform } from '@ionic/angular';
 import { AuthService } from 'src/app/services/auth.service';
 import { ChatService } from 'src/app/services/chat.service';
-import { ChatService as ChatServiceGPR} from 'src/app/services/chat/chat.service'
+import { wsChatService as wsChatService} from 'src/app/services/chat/chat.service'
 import { GroupMessagesPage } from './group-messages/group-messages.page';
 import { ContactsPage } from './messages/contacts/contacts.page';
 import { MessagesPage } from './messages/messages.page';
@@ -125,7 +125,7 @@ export class ChatPage implements OnInit {
     private sqlservice: SqliteService,
     private platform: Platform,
     private storageservice: StorageService,
-    public ChatServiceGPR: ChatServiceGPR
+    public wsChatService: wsChatService
 
   ) {
 

src/app/pages/chat/messages/messages.page.html

@@ -49,7 +49,7 @@
     </ion-refresher-content>
   </ion-refresher> -->
   <div (click)="handleClick()" class="messages" #scrollMe>
-    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of ChatServiceGPR.getRoom(this.roomId).massages; let last = last"
+    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of wsChatService.getRoom(this.roomId).massages; let last = last"
     [class.messages-list-item-wrapper-active]="msg._id == selectedMsgId"  >
       <div (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}' (click)="openPreview(msg)" *ngIf="msg.msg !=''">
         <div class="title">

src/app/pages/chat/messages/messages.page.ts

@@ -28,7 +28,7 @@ import { SqliteService } from 'src/app/services/sqlite.service';
 import { elementAt } from 'rxjs-compat/operator/elementAt';
 import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
 import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
-import { ChatService as ChatServiceGPR} from 'src/app/services/chat/chat.service'
+import { wsChatService as wsChatService} from 'src/app/services/chat/chat.service'
 
 const IMAGE_DIR = 'stored-images';
 
@@ -96,7 +96,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     private changeDetectorRef: ChangeDetectorRef,
     private platform: Platform,
     private sqlservice: SqliteService,
-    public ChatServiceGPR: ChatServiceGPR
+    public wsChatService: wsChatService
   ) {
     this.loggedUser = authService.ValidatedUserChat['data'];
     this.roomId = this.navParams.get('roomId');
@@ -108,7 +108,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
       }
     };
 
-    this.ChatServiceGPR.getRoom(this.roomId).loadHistory()
+    this.wsChatService.getRoom(this.roomId).loadHistory()
 
   }
 
@@ -335,8 +335,6 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     window.removeEventListener('scroll', this.scrollChangeCallback, true);
   }
 
-
-
   sendMessage() {
     let body = {
       "message":

src/app/services/auth.service.ts

@@ -39,6 +39,7 @@ export class AuthService {
 
         console.log('login', SessionStore.user.RochetChatUser, SessionStore.user.Password)
         this.RocketChatClientService.connect(()=>{
+          
           this.RocketChatClientService.login({
             username: SessionStore.user.RochetChatUser,
             password: SessionStore.user.Password
@@ -47,6 +48,7 @@ export class AuthService {
           }).catch((message)=>{
             console.log('rocket chat login failed', message)
           })
+
         })
 
       }

src/app/services/chat/chat.service.ts

@@ -7,7 +7,7 @@ import { SessionStore } from 'src/app/store/session.service';
 @Injectable({
   providedIn: 'root'
 })
-export class ChatService {
+export class wsChatService {
 
 
   individual: {[key: string]:  RoomService} = {}
@@ -23,17 +23,19 @@ export class ChatService {
   ) {
 
     (async()=>{
-      await this.getAllRoom();
+      await this.getAllRooms();
       this.subscribeToRoom()
     })()
     
   }
 
-  async getAllRoom () {
+  async getAllRooms () {
     this.loadingWholeList = true
 
     const rooms: any = await this.RocketChatClientService.getRooms();
 
+    console.log(rooms)
+
     rooms.result.update.forEach((roomData:any) => {
       let room:RoomService;
       

src/app/services/chat/message.service.ts

@@ -31,4 +31,7 @@ export class MessageService {
 
   showDateDuration() {}
 
+
+  
+
 }

src/app/services/chat/room.service.ts

@@ -2,8 +2,6 @@ import { Injectable } from '@angular/core'
 import { RocketChatClientService } from 'src/app/services/socket/rocket-chat-client.service';
 import { MessageService } from 'src/app/services/chat/message.service'
 import { ChatUserService } from 'src/app/services/chat/chat-user.service'
-import { TimeService } from 'src/app/services/functions/time.service';
-import { ChatService } from '../chat.service';
 import { showDateDuration } from 'src/plugin/showDateDuration'
 @Injectable({
   providedIn: 'root'
@@ -47,6 +45,7 @@ export class RoomService {
         message.setData(Chatmessage.result)
         this.massages.push(message)
         this.calDateDuration(Chatmessage.result._updatedAt)
+
       }
     )
   }
@@ -58,7 +57,7 @@ export class RoomService {
   // runs onces only
   loadHistory(limit= 100) {
 
-    if(this.hasLoadHistory){ return false }
+    if(this.hasLoadHistory){ return false}
 
     this.RocketChatClientService.loadHistory(this.id, limit).then((message:any) => {
       console.log('loadHistory', message)

src/app/services/socket/rocket-chat-client.service.ts

@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
 import { v4 as uuidv4 } from 'uuid'
 import { wsCallbacksParams, msgQueue } from 'src/app/models/rochet-chat-cliente-service'
 import { deepFind } from 'src/plugin/deep'
+import { environment } from 'src/environments/environment';
 /**
  * Use this class to interact with rocketChat realtime API
  */
@@ -10,17 +11,15 @@ import { deepFind } from 'src/plugin/deep'
 })
  export class RocketChatClientService {
 
-  private hasPing = false
   private firstPingFunx: Function
   isLogin = false;
   
   constructor() {}
 
   connect(firstPingFunx: Function) {
-    this.hasPing = false
-    this.firstPingFunx = firstPingFunx
+    this.firstPingFunx = firstPingFunx // 
 
-    this.ws.connect('wss://gabinetedigitalchat.dyndns.info/websocket');
+    this.ws.connect(environment.apiWsChatUrl);
 
     const connectMessage = {
       msg: "connect",
@@ -29,19 +28,8 @@ import { deepFind } from 'src/plugin/deep'
     }
 
     this.ws.send(connectMessage, 'connect', false)
-    
-    this.ws.registerCallback({type:'Onmessage', funx:(message: any) => {
-
-      if(message.msg == "ping") {
-        this.ws.send({msg:"pong"},'recoonect', false)
-        if(this.hasPing == false) {
-          // first ping
-          firstPingFunx()
-          this.hasPing = true
-        }
-      }
-
-    }})
+    this.ws.send({msg:"pong"},'recoonect', false)
+    firstPingFunx()
 
   }
 
@@ -65,13 +53,12 @@ import { deepFind } from 'src/plugin/deep'
 
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', requestId, funx:(message)=>{
-        if(message.id == requestId || deepFind(message, 'result.id') == requestId) { // same request send
+        if(message.id == requestId ) { // same request send
           
           if(message.result.token) {
             this.isLogin = true
-            setTimeout(()=>{
-              this.ws.wsMsgQueue()
-            },0)
+
+            this.ws.wsMsgQueue()
             
             resolve(message)
           } else {
@@ -88,7 +75,7 @@ import { deepFind } from 'src/plugin/deep'
 
   }
 
-  getRooms() {
+  getRooms(roomOlder = 1480377601) {
 
     const requestId =  uuidv4()
 
@@ -281,6 +268,10 @@ import { deepFind } from 'src/plugin/deep'
 
   }
   
+  registerCallback(data:wsCallbacksParams) {
+    return this.ws.registerCallback(data)
+  }
+
   // socket class ==================================================================
   private socket!: WebSocket;
   private wsUrl = ''

src/app/shared/chat/messages/messages.page.html

@@ -3,7 +3,7 @@
     <div class="main-header">
       <div class="header-top">
         <div class="middle" *ngFor="let users of dmUsers">
-          <ion-label class="title">{{users.name}}</ion-label>
+          <ion-label class="title">{{ wsChatService.getRoom(roomId).name }}</ion-label>
           <span><ion-icon class="{{users.status}}" name="ellipse"></ion-icon></span>
         </div>
         <div hidden class="right">
@@ -37,7 +37,7 @@
     </ion-refresher-content>
   </ion-refresher>
   <div class="messages" #scrollMe>
-    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of ChatServiceGPR.getRoom(roomId).massages; let last = last">
+    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of wsChatService.getRoom(roomId).massages; let last = last">
       <div class='message-item incoming-{{msg.u.username!=loggedUser.me.username}} max-width-45' *ngIf="msg.msg !=''">
         <div class="message-item-options d-flex justify-content-end">
           <fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer"></fa-icon>

src/app/shared/chat/messages/messages.page.ts

@@ -19,7 +19,7 @@ import { ThemeService } from 'src/app/services/theme.service'
 import { PreviewCameraPage } from 'src/app/modals/preview-camera/preview-camera.page';
 import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
 import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
-import { ChatService as ChatServiceGPR} from 'src/app/services/chat/chat.service'
+import { wsChatService as wsChatService} from 'src/app/services/chat/chat.service'
 
 @Component({
   selector: 'app-messages',
@@ -78,13 +78,13 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     public ThemeService: ThemeService,
     private changeDetectorRef: ChangeDetectorRef,
     private router: Router,
-    public ChatServiceGPR: ChatServiceGPR
+    public wsChatService: wsChatService
   ) {
     
     this.loggedUser = authService.ValidatedUserChat['data'];
   }
   ngOnChanges(changes: SimpleChanges): void {
-    this.ChatServiceGPR.getRoom(this.roomId).loadHistory()
+    this.wsChatService.getRoom(this.roomId).loadHistory()
   }
 
   ngOnInit() {
@@ -214,7 +214,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   }
 
   sendMessage() {
-    this.ChatServiceGPR.getRoom(this.roomId).send(this.message)
+    this.wsChatService.getRoom(this.roomId).send(this.message)
     this.message = "";
   }
 

src/environments/environment.ts

@@ -7,6 +7,7 @@ export const environment = {
   apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
   //apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
   apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/',
+  apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket',
   //apiChatUrl: 'https://www.tabularium.pt/api/v1/',
   /* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */
   domain: 'gabinetedigital.local', //gabinetedigital.local