@chat21/chat21-web-widget 5.0.55 → 5.0.56-rc.2

package/src/chat21-core/providers/firebase/firebase-conversation-handler.ts

@@ -1,14 +1,10 @@
 import { LIVE_PAGE, MEMBER_LEFT_GROUP, TOUCHING_OPERATOR } from './../../utils/constants';
-import { CustomLogger } from './../logger/customLogger';
 
-import { Inject, Injectable, Optional } from '@angular/core';
+import { Inject, Injectable } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 
 // firebase
-import firebase from 'firebase/app';
-import 'firebase/messaging';
-import 'firebase/database';
-import 'firebase/firestore';
+// import firebase from 'firebase/app';
 
 
 // models
@@ -60,7 +56,10 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
     private CLIENT_BROWSER: string;
     private startTime: Date = new Date();
     private logger:LoggerService = LoggerInstance.getInstance()
-    private ref: firebase.database.Query;
+    // private ref: firebase.database.Query;
+
+    private firebase: any;
+    private ref: any;
 
     constructor(@Inject('skipMessage') private skipInfoMessage: boolean) {
         super();
@@ -69,7 +68,7 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
     /**
      * inizializzo conversation handler
      */
-    initialize(recipientId: string,recipientFullName: string,loggedUser: UserModel,
+    async initialize(recipientId: string,recipientFullName: string,loggedUser: UserModel,
                 tenant: string, translationMap: Map<string, string>, showInfoMessage: string[]) {
         this.logger.debug('[FIREBASEConversationHandlerSERVICE] initWithRecipient',recipientId, recipientFullName, loggedUser, tenant, translationMap)
         this.recipientId = recipientId;
@@ -87,6 +86,9 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
         this.messages = [];
         this.showInfoMessage = showInfoMessage
         // this.attributes = this.setAttributes();
+        const { default: firebase} = await import("firebase/app");
+        this.firebase = firebase
+        this.ref = this.firebase.database['Query'];
     }
 
     /**
@@ -100,7 +102,7 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
         this.urlNodeFirebase = conversationMessagesRef(this.tenant, this.loggedUser.uid);
         this.urlNodeFirebase = this.urlNodeFirebase + this.conversationWith;
         this.logger.debug('[FIREBASEConversationHandlerSERVICE] urlNodeFirebase *****', this.urlNodeFirebase);
-        const firebaseMessages = firebase.database().ref(this.urlNodeFirebase);
+        const firebaseMessages = this.firebase.database().ref(this.urlNodeFirebase);
         this.ref = firebaseMessages.orderByChild('timestamp').limitToLast(100);
         this.ref.on('child_added', (childSnapshot) => {
             that.logger.debug('[FIREBASEConversationHandlerSERVICE] >>>>>>>>>>>>>> child_added: ', childSnapshot.val())
@@ -151,12 +153,12 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
         if (!channelType || channelType === 'undefined') {
             channelType = TYPE_DIRECT;
         }
-        const firebaseMessagesCustomUid = firebase.database().ref(this.urlNodeFirebase);
+        const firebaseMessagesCustomUid = this.firebase.database().ref(this.urlNodeFirebase);
 
         // const key = messageRef.key;
         const lang = document.documentElement.lang;
         const recipientFullname = conversationWithFullname;
-        const timestamp = firebase.database.ServerValue.TIMESTAMP
+        const timestamp = this.firebase.database.ServerValue.TIMESTAMP
         const message = new MessageModel(
             '',
             lang,
@@ -183,7 +185,7 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
                 status: 0,
                 metadata: metadataMsg,
                 text: msg,
-                timestamp: firebase.database.ServerValue.TIMESTAMP,
+                timestamp: this.firebase.database.ServerValue.TIMESTAMP,
                 type: typeMsg,
                 attributes: attributes,
                 channel_type: channelType
@@ -447,7 +449,7 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
             if (msg.sender !== this.loggedUser.uid && msg.status < MSG_STATUS_RECEIVED) {
                 const urlNodeMessagesUpdate  = this.urlNodeFirebase + '/' + uid;
                 this.logger.debug('[FIREBASEConversationHandlerSERVICE] update message status', urlNodeMessagesUpdate);
-                firebase.database().ref(urlNodeMessagesUpdate).update({ status: MSG_STATUS_RECEIVED });
+                this.firebase.database().ref(urlNodeMessagesUpdate).update({ status: MSG_STATUS_RECEIVED });
             }
         }
     }

package/src/chat21-core/providers/firebase/firebase-conversations-handler.ts

@@ -2,11 +2,7 @@ import { Injectable } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 
 // firebase
-import firebase from 'firebase/app';
-import 'firebase/messaging';
-import 'firebase/database';
-import 'firebase/auth';
-import 'firebase/storage';
+// import firebase from 'firebase/app';
 
 // models
 import { ConversationModel } from '../../models/conversation';
@@ -20,8 +16,7 @@ import { LoggerInstance } from '../logger/loggerInstance';
 
 // utils
 import { avatarPlaceholder, getColorBck } from '../../utils/utils-user';
-import { compareValues, getFromNow, conversationsPathForUserId, searchIndexInArrayForUid, isGroup } from '../../utils/utils';
-
+import { compareValues, conversationsPathForUserId, searchIndexInArrayForUid, isGroup } from '../../utils/utils';
 
 
 
@@ -48,13 +43,16 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
     private translationMap: Map<string, string>;
     private isConversationClosingMap: Map<string, boolean>;
     private logger:LoggerService = LoggerInstance.getInstance()
-    private ref: firebase.database.Query;
+    // private ref: firebase.database.Query;
     private BASE_URL: string;
     private BASE_URL_DATABASE: string;
     // private audio: any;
     // private setTimeoutSound: any;
     private subscribe: any
 
+    private firebase: any;
+    private ref: any;
+
     constructor(
         public http: HttpClient,
         public appConfig: AppConfigService
@@ -65,7 +63,7 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
     /**
      * inizializzo conversations handler
      */
-    initialize(tenant: string,userId: string,translationMap: Map<string, string>) {
+    async initialize(tenant: string,userId: string,translationMap: Map<string, string>) {
         this.tenant = tenant;
         this.loggedUserId = userId;
         this.translationMap = translationMap;
@@ -75,6 +73,11 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
         //this.getConversationsFromStorage();
         this.BASE_URL = this.appConfig.getConfig().firebaseConfig.chat21ApiUrl;
         this.BASE_URL_DATABASE = this.appConfig.getConfig().firebaseConfig.databaseURL;
+
+        const { default: firebase} = await import("firebase/app");
+        await Promise.all([import("firebase/database"), import("firebase/auth")]);
+        this.firebase = firebase
+        this.ref = this.firebase.database['Query'];
     }
 
     /**
@@ -115,7 +118,7 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
         const that = this;
         const urlNodeFirebase = conversationsPathForUserId(this.tenant, this.loggedUserId);
         this.logger.debug('[FIREBASEConversationsHandlerSERVICE] SubscribeToConversations conversations::ACTIVE urlNodeFirebase', urlNodeFirebase)
-        this.ref = firebase.database().ref(urlNodeFirebase).orderByChild('timestamp').limitToLast(200);
+        this.ref = this.firebase.database().ref(urlNodeFirebase).orderByChild('timestamp').limitToLast(200);
         this.ref.on('child_changed', (childSnapshot) => {
             that.changed(childSnapshot);
         });
@@ -192,7 +195,7 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
         const urlUpdate = conversationsPathForUserId(this.tenant, this.loggedUserId) + '/' + conversationrecipient;
         const update = {};
         update['/is_new'] = false;
-        firebase.database().ref(urlUpdate).update(update);
+        this.firebase.database().ref(urlUpdate).update(update);
     }
 
     /**
@@ -281,7 +284,7 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
 
 
     getFirebaseToken(callback:(error: any, idToken: string)=>void) {
-        const firebase_currentUser = firebase.auth().currentUser;
+        const firebase_currentUser = this.firebase.auth().currentUser;
         this.logger.debug(' // firebase current user ', firebase_currentUser);
         if (firebase_currentUser) {
             firebase_currentUser.getIdToken(/* forceRefresh */ true)
@@ -310,7 +313,7 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
             // const urlNodeFirebase = '/apps/' + this.tenant + '/users/' + this.loggedUserId + '/conversations/' + conversationId;
             const urlNodeFirebase = conversationsPathForUserId(this.tenant, this.loggedUserId) // + '/' + conversationId;
             this.logger.debug('[FIREBASEConversationsHandlerSERVICE] conversationDetail urlNodeFirebase *****', urlNodeFirebase)
-            const firebaseMessages = firebase.database().ref(urlNodeFirebase);
+            const firebaseMessages = this.firebase.database().ref(urlNodeFirebase);
             // if(this.subscribe){
             //     this.logger.log('[FIREBASEConversationsHandlerSERVICE] getConversationDetail ALREADY SUBSCRIBED')
             //     return;
@@ -565,16 +568,6 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
         return status;
     }
 
-    /**
-     * calcolo il tempo trascorso da ora al timestamp passato
-     * @param timestamp
-     */
-    private getTimeLastMessage(timestamp: string) {
-        const timestampNumber = parseInt(timestamp, 10) / 1000;
-        const time = getFromNow(timestampNumber);
-        return time;
-    }
-
     /**
      *  check if the conversations is valid or not
      */

package/src/chat21-core/providers/firebase/firebase-groups-handler.ts

@@ -3,11 +3,7 @@ import { Injectable } from '@angular/core';
 import { BehaviorSubject, Observable, Subject } from 'rxjs';
 
 // firebase
-import firebase from 'firebase/app';
-import 'firebase/messaging';
-import 'firebase/database';
-import 'firebase/auth';
-import 'firebase/storage';
+// import firebase from 'firebase/app';
 
 // models
 import { ConversationModel } from '../../models/conversation';
@@ -40,13 +36,16 @@ export class FirebaseGroupsHandler extends GroupsHandlerService {
     // private params
     private tenant: string;
     private loggedUserId: string;
-    private ref: firebase.database.Query;
+    // private ref: firebase.database.Query;
     private BASE_URL: string;
     private logger:LoggerService = LoggerInstance.getInstance()
 
     // private audio: any;
     // private setTimeoutSound: any;
 
+    private firebase: any;
+    private ref: any;
+
     constructor(
         public http: HttpClient,
         public appConfig: AppConfigService
@@ -57,11 +56,16 @@ export class FirebaseGroupsHandler extends GroupsHandlerService {
     /**
      * inizializzo groups handler
      */
-    initialize(tenant: string, loggedUserId: string) {
+    async initialize(tenant: string, loggedUserId: string) {
         this.tenant = tenant;
         this.loggedUserId = loggedUserId;
         this.BASE_URL = this.appConfig.getConfig().firebaseConfig.chat21ApiUrl;
         this.logger.debug('[FIREBASEGroupHandlerSERVICE] initialize', this.tenant, this.loggedUserId);
+    
+        const { default: firebase} = await import("firebase/app");
+        await Promise.all([import("firebase/database")]);
+        this.firebase = firebase
+        this.ref = this.firebase.database['Query'];
     }
 
     /**
@@ -74,7 +78,7 @@ export class FirebaseGroupsHandler extends GroupsHandlerService {
         const that = this;
         const urlNodeGroups = '/apps/' + this.tenant + '/users/' + this.loggedUserId + '/groups';
         this.logger.debug('[FIREBASEGroupHandlerSERVICE] connect -------> groups::', urlNodeGroups)
-        this.ref = firebase.database().ref(urlNodeGroups)
+        this.ref = this.firebase.database().ref(urlNodeGroups)
         this.ref.on('child_added', (childSnapshot) => {
             that.logger.debug('[FIREBASEGroupHandlerSERVICE]  child_added ------->', childSnapshot.val())
             // that.added(childSnapshot);
@@ -97,7 +101,7 @@ export class FirebaseGroupsHandler extends GroupsHandlerService {
     getDetail(groupId: string, callback?: (group: GroupModel)=>void): Promise<GroupModel>{
         const urlNodeGroupById = '/apps/' + this.tenant + '/users/' + this.loggedUserId + '/groups/' + groupId;
         this.logger.debug('[FIREBASEGroupHandlerSERVICE] getDetail -------> urlNodeGroupById::', urlNodeGroupById)
-        const ref = firebase.database().ref(urlNodeGroupById)
+        const ref = this.firebase.database().ref(urlNodeGroupById)
         return new Promise((resolve) => {
             ref.off()
             ref.on('value', (childSnapshot) => {
@@ -118,7 +122,7 @@ export class FirebaseGroupsHandler extends GroupsHandlerService {
         let SgroupDetail = new Subject<GroupModel>();
         const urlNodeGroupById = '/apps/' + this.tenant + '/users/' + this.loggedUserId + '/groups/' + groupId;
         this.logger.log('[FIREBASEGroupHandlerSERVICE] onGroupChange -------> urlNodeGroupById::', urlNodeGroupById)
-        const ref = firebase.database().ref(urlNodeGroupById)
+        const ref = this.firebase.database().ref(urlNodeGroupById)
         ref.off()
         ref.on('value', (childSnapshot) => {
             // this.groupValue(childSnapshot)
@@ -270,7 +274,7 @@ export class FirebaseGroupsHandler extends GroupsHandlerService {
 
     // // -------->>>> PRIVATE METHOD SECTION START <<<<---------------//
     private getFirebaseToken(callback) {
-        const firebase_currentUser = firebase.auth().currentUser;
+        const firebase_currentUser = this.firebase.auth().currentUser;
         this.logger.debug('[FIREBASEGroupHandlerSERVICE]  // firebase current user ', firebase_currentUser);
         if (firebase_currentUser) {
             const that = this;

package/src/chat21-core/providers/firebase/firebase-image-repo.ts

@@ -6,8 +6,8 @@ import { environment } from '../../../environments/environment';
 import { ImageRepoService } from '../abstract/image-repo.service';
 
 // firebase
-import firebase from 'firebase/app';
-import 'firebase/storage';
+// import firebase from 'firebase/app';
+// import 'firebase/storage';
 
 // @Injectable({ providedIn: 'root' })
 @Injectable()
@@ -16,9 +16,12 @@ export class FirebaseImageRepoService extends ImageRepoService {
     // private params
     private urlStorageBucket = environment.firebaseConfig.storageBucket + '/o/profiles%2F';
     private baseImageURL: string;
+
+    private firebase: any
     
     constructor(public http: HttpClient) {
         super();
+        this.initialize()
     }
 
     /**
@@ -34,8 +37,7 @@ export class FirebaseImageRepoService extends ImageRepoService {
         }
         const firebase_photo = '/o/profiles%2F'+ sender_id + '%2Fphoto.jpg?alt=media'
         const firebase_thumbnail = '/o/profiles%2F'+ sender_id + '%2Fthumb_photo.jpg?alt=media'
-        const imageurl = this.baseImageURL + firebase.storage().ref().bucket + firebase_thumbnail
-
+        const imageurl = this.baseImageURL + this.firebase.storage().ref().bucket + firebase_thumbnail
         return imageurl;
     }
 
@@ -47,4 +49,11 @@ export class FirebaseImageRepoService extends ImageRepoService {
             callback(false)
         })
     }
+
+
+    private async initialize(){
+        const { default: firebase} = await import("firebase/app");
+        await Promise.all([import("firebase/storage")]);
+        this.firebase = firebase
+    }
 }

package/src/chat21-core/providers/firebase/firebase-init-service.ts

@@ -1,8 +1,7 @@
 import { Injectable } from '@angular/core';
 
 // firebase
-import firebase from 'firebase/app';
-import 'firebase/app';
+// import firebase from 'firebase/app';
 /*
   Generated class for the AuthService provider.
   See https://angular.io/docs/ts/latest/guide/dependency-injection.html
@@ -19,7 +18,8 @@ export class FirebaseInitService {
   constructor() {
   }
 
-  public static initFirebase(firebaseConfig: any) {
+  public static async initFirebase(firebaseConfig: any) {
+    const { default: firebase} = await import("firebase/app");
     if(!FirebaseInitService.firebaseInit){
       if (!firebaseConfig || firebaseConfig.apiKey === 'CHANGEIT') {
         throw new Error('Firebase config is not defined. Please create your widget-config.json. See the Chat21-Web_widget Installation Page');

package/src/chat21-core/providers/firebase/firebase-notifications.ts

@@ -4,9 +4,7 @@ import { Injectable } from '@angular/core';
 import { NotificationsService } from '../abstract/notifications.service';
 
 // firebase
-import firebase from 'firebase/app';
-import 'firebase/messaging';
-import 'firebase/auth';
+// import firebase from 'firebase/app';
 
 import { LoggerService } from '../abstract/logger.service';
 
@@ -19,16 +17,20 @@ export class FirebaseNotifications extends NotificationsService {
     private userId: string;
     private tenant: string;
     private vapidkey: string;
+    private firebase: any;
+
     private logger: LoggerService = LoggerInstance.getInstance();
     constructor() {
         super();
     }
 
-    initialize(tenant: string, vapId: string): void {
+    async initialize(tenant: string, vapId: string) {
         this.tenant = tenant
         this.vapidkey = vapId
         this.logger.debug('[FIREBASE-NOTIFICATIONS] initialize - tenant ', this.tenant)
 
+        const { default: firebase} = await import("firebase/app");
+        this.firebase = firebase
 
         if (!('serviceWorker' in navigator)) {
             // , disable or hide UI.
@@ -70,8 +72,8 @@ export class FirebaseNotifications extends NotificationsService {
 
 
       
-        if (firebase.messaging.isSupported()) {
-            const messaging = firebase.messaging(); 
+        if (this.firebase.messaging.isSupported()) {
+            const messaging = this.firebase.messaging(); 
             // messaging.requestPermission()
             Notification.requestPermission().then((permission) => {
                 if (permission === 'granted') {
@@ -94,7 +96,7 @@ export class FirebaseNotifications extends NotificationsService {
 
     removeNotificationsInstance(callback: (string) => void) {
         var self = this;
-        firebase.auth().onAuthStateChanged(function (user) {
+        this.firebase.auth().onAuthStateChanged(function (user) {
             if (user) {
                 self.logger.debug('[FIREBASE-NOTIFICATIONS] - User is signed in. ', user)
 
@@ -112,7 +114,7 @@ export class FirebaseNotifications extends NotificationsService {
         let connectionsRefURL = '';
         if (connectionsRefinstancesId) {
             connectionsRefURL = connectionsRefinstancesId + this.FCMcurrentToken;
-            const connectionsRef = firebase.database().ref().child(connectionsRefURL);
+            const connectionsRef = this.firebase.database().ref().child(connectionsRefURL);
             this.logger.log('[FIREBASE-NOTIFICATIONS] >>>> connectionsRef ', connectionsRef);
             this.logger.log('[FIREBASE-NOTIFICATIONS] >>>> connectionsRef url ', connectionsRefURL);
             connectionsRef.off()
@@ -154,7 +156,7 @@ export class FirebaseNotifications extends NotificationsService {
         updates[connectionsRefinstancesId + connection] = device_model;
 
         this.logger.log('[FIREBASE-NOTIFICATIONS] >>>> getPermission > updateToken in DB', updates);
-        firebase.database().ref().update(updates)
+        this.firebase.database().ref().update(updates)
     }
     // ********** PRIVATE METHOD - END ****************//
 

package/src/chat21-core/providers/firebase/firebase-presence.service.ts

@@ -3,12 +3,9 @@ import { Injectable } from '@angular/core';
 import { BehaviorSubject, Observable } from 'rxjs';
 
 // firebase
-import firebase from 'firebase/app';
-import 'firebase/messaging';
-import 'firebase/database';
+// import firebase from 'firebase/app';
 
 // services
-// import { EventsService } from '../events-service';
 import { PresenceService } from '../abstract/presence.service';
 import { LoggerService } from '../abstract/logger.service';
 import { LoggerInstance } from '../logger/loggerInstance';
@@ -33,6 +30,9 @@ export class FirebasePresenceService extends PresenceService {
   private keyConnectionRef: any;
   private logger: LoggerService = LoggerInstance.getInstance();
   online_member = []
+
+  private firebase: any;
+
   constructor() {
     super();
   }
@@ -40,11 +40,14 @@ export class FirebasePresenceService extends PresenceService {
   /**
    *
    */
-  public initialize(tenant: string) {
+  public async initialize(tenant: string) {
     // this.tenant = this.getTenant();
     this.tenant = tenant;
     this.logger.debug('[FIREBASEPresenceSERVICE] initialize this.tenant', this.tenant);
     this.urlNodePresence = '/apps/' + this.tenant + '/presence/';
+
+    const { default: firebase} = await import("firebase/app");
+    this.firebase = firebase
   }
 
   /**
@@ -76,7 +79,7 @@ export class FirebasePresenceService extends PresenceService {
     let local_BSIsOnline = new BehaviorSubject<any>(null);
     const urlNodeConnections = this.urlNodePresence + userid + '/connections';
     this.logger.debug('[FIREBASEPresenceSERVICE] userIsOnline: ', urlNodeConnections);
-    const connectionsRef = firebase.database().ref().child(urlNodeConnections);
+    const connectionsRef = this.firebase.database().ref().child(urlNodeConnections);
     connectionsRef.off()
     connectionsRef.on('value', (child) => {
       that.logger.debug('[FIREBASEPresenceSERVICE] CONVERSATION-DETAIL group detail userIsOnline id user', userid, '- child.val: ', child.val());
@@ -126,7 +129,7 @@ export class FirebasePresenceService extends PresenceService {
     this.onlineConnectionsRef = this.referenceOnlineForUser(userid);
     this.lastOnlineConnectionsRef = this.referenceLastOnlineForUser(userid);
     const connectedRefURL = '/.info/connected';
-    const conn = firebase.database().ref(connectedRefURL);
+    const conn = this.firebase.database().ref(connectedRefURL);
     conn.on('value', (dataSnapshot) => {
       this.logger.debug('[FIREBASEPresenceSERVICE] self.deviceConnectionRef: ', dataSnapshot.val());
       if (dataSnapshot.val()) {
@@ -163,9 +166,9 @@ export class FirebasePresenceService extends PresenceService {
    * usata in setupMyPresence
    * @param userid
    */
-  private referenceLastOnlineForUser(userid: string): firebase.database.Reference {
+  private referenceLastOnlineForUser(userid: string): any {
     const urlNodeLastOnLine = this.urlNodePresence + userid + '/lastOnline';
-    const lastOnlineRef = firebase.database().ref().child(urlNodeLastOnLine);
+    const lastOnlineRef = this.firebase.database().ref().child(urlNodeLastOnLine);
     return lastOnlineRef;
   }
 
@@ -174,9 +177,9 @@ export class FirebasePresenceService extends PresenceService {
    * usata in setupMyPresence
    * @param userid
    */
-  private referenceOnlineForUser(userid: string): firebase.database.Reference {
+  private referenceOnlineForUser(userid: string): any {
     const urlNodeConnections = this.urlNodePresence + userid + '/connections';
-    const connectionsRef = firebase.database().ref().child(urlNodeConnections);
+    const connectionsRef = this.firebase.database().ref().child(urlNodeConnections);
     return connectionsRef;
   }
 

package/src/chat21-core/providers/firebase/firebase-typing.service.ts

@@ -3,9 +3,7 @@ import { Injectable } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 
 // firebase
-import firebase from 'firebase/app';
-import 'firebase/messaging';
-import 'firebase/database';
+// import firebase from 'firebase/app';
 
 // services
 import { TypingService } from '../abstract/typing.service';
@@ -37,18 +35,26 @@ export class FirebaseTypingService extends TypingService {
   private setTimeoutWritingMessages: any;
   private tenant: string;
   private logger: LoggerService = LoggerInstance.getInstance();
-  private ref: firebase.database.Query;
+  // private ref: firebase.database.Query;
+
+  private firebase: any;
+  private ref: any;
 
   constructor() {
     super();
   }
 
   /** */
-  public initialize(tenant: string) {
-    // this.tenant = this.getTenant();
+  public async initialize(tenant: string) {
     this.tenant = tenant;
     this.logger.debug('[FIREBASETypingSERVICE] initialize - tenant ', this.tenant)
     this.urlNodeTypings = '/apps/' + this.tenant + '/typings/';
+
+    const { default: firebase} = await import("firebase/app");
+    await Promise.all([import("firebase/database")]);
+    this.firebase = firebase
+    this.ref = this.firebase.database['Query'];
+
   }
 
   /** */
@@ -59,11 +65,11 @@ export class FirebaseTypingService extends TypingService {
       urlTyping = this.urlNodeTypings + idCurrentUser + '/' + idConversation;
     }
     this.logger.debug('[FIREBASETypingSERVICE] urlTyping: ', urlTyping);
-    this.ref = firebase.database().ref(urlTyping);
+    this.ref = this.firebase.database().ref(urlTyping);
     this.ref.on('child_changed', (childSnapshot) => {
       const precence: TypingModel = childSnapshot.val();
-      this.logger.debug('[FIREBASETypingSERVICE] child_changed: ', precence);
-      this.BSIsTyping.next({uid: idConversation, uidUserTypingNow: precence.uid, nameUserTypingNow: precence.name, waitTime: TIME_TYPING_MESSAGE});
+      that.logger.debug('[FIREBASETypingSERVICE] child_changed: ', precence);
+      that.BSIsTyping.next({uid: idConversation, uidUserTypingNow: precence.uid, nameUserTypingNow: precence.name, waitTime: TIME_TYPING_MESSAGE});
     });
   }
 
@@ -74,9 +80,9 @@ export class FirebaseTypingService extends TypingService {
     this.setTimeoutWritingMessages = setTimeout(() => {
       const urlTyping = this.urlNodeTypings + idConversation + '/' + recipientId;// + '/user';
       this.logger.debug('[FIREBASETypingSERVICE] setWritingMessages:', urlTyping, userFullname);
-      const timestampData =  firebase.database.ServerValue.TIMESTAMP;
+      const timestampData =  that.firebase.database.ServerValue.TIMESTAMP;
       const precence = new TypingModel(recipientId, timestampData, message, userFullname);
-      firebase.database().ref(urlTyping).set(precence, ( error ) => {
+      that.firebase.database().ref(urlTyping).set(precence, ( error ) => {
         if (error) {
           this.logger.error('[FIREBASETypingSERVICE] setTyping error', error);
         } else {

package/src/chat21-core/providers/firebase/firebase-upload.service.ts

@@ -3,11 +3,8 @@ import { Injectable } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 
 // firebase
-import firebase from 'firebase/app';
-import 'firebase/messaging';
-import 'firebase/database';
-import 'firebase/firestore';
-import 'firebase/storage';
+// import firebase from 'firebase/app';
+// import 'firebase/storage';
 
 // services
 import { UploadService } from '../abstract/upload.service';
@@ -28,13 +25,19 @@ export class FirebaseUploadService extends UploadService {
 
   //private
   private logger:LoggerService = LoggerInstance.getInstance()
+  private firebase: any;
 
   constructor() {
     super();
   }
 
-  public initialize() {
+  public async initialize() {
     this.logger.debug('[FIREBASEUploadSERVICE] initialize');
+
+    const { default: firebase} = await import("firebase/app");
+    await Promise.all([import("firebase/storage")]);
+    this.firebase = firebase
+
   }
   
   public upload(userId: string, upload: UploadModel): Promise<any> {
@@ -44,7 +47,7 @@ export class FirebaseUploadService extends UploadService {
     this.logger.debug('[FIREBASEUploadSERVICE] pushUpload ', urlImagesNodeFirebase, upload.file);
 
     // Create a root reference
-    const storageRef = firebase.storage().ref();
+    const storageRef = this.firebase.storage().ref();
     this.logger.debug('[FIREBASEUploadSERVICE] storageRef', storageRef);
     
     // Create a reference to 'mountains.jpg'
@@ -70,11 +73,11 @@ export class FirebaseUploadService extends UploadService {
         that.BSStateUpload.next({ upload: progress, type: upload.file.type });
         
         switch (snapshot.state) {
-          case firebase.storage.TaskState.PAUSED: // or 'paused'
+          case that.firebase.storage.TaskState.PAUSED: // or 'paused'
             that.logger.debug('[FIREBASEUploadSERVICE] Upload is paused');
             
             break;
-          case firebase.storage.TaskState.RUNNING: // or 'running'
+          case that.firebase.storage.TaskState.RUNNING: // or 'running'
             that.logger.debug('[FIREBASEUploadSERVICE] Upload is running');
             
             break;