@vgroup/dialbox 0.0.49 → 0.0.51

package/fesm2020/vgroup-dialbox.mjs

@@ -2,11 +2,11 @@ import * as i0 from '@angular/core';
 import { Injectable, EventEmitter, Component, Input, Output, ViewChild, Inject, NgModule } from '@angular/core';
 import swal from 'sweetalert2';
 import { AsYouType } from 'libphonenumber-js';
-import { throwError, BehaviorSubject, interval, Subscription } from 'rxjs';
+import { throwError, BehaviorSubject, timer, interval, Subscription } from 'rxjs';
 import * as i1 from '@angular/common/http';
 import { HttpHeaders, HttpParams, HttpClientModule } from '@angular/common/http';
 import { Device } from '@twilio/voice-sdk';
-import { catchError, switchMap, map } from 'rxjs/operators';
+import { catchError, map, switchMap } from 'rxjs/operators';
 import * as i3$1 from '@angular/material/dialog';
 import { MAT_DIALOG_DATA } from '@angular/material/dialog';
 import * as i5 from '@angular/router';
@@ -154,6 +154,22 @@ class ExtensionService {
         this.isProfileUpdated = new BehaviorSubject(false);
         this.callerIdSubject = new BehaviorSubject(null);
         this.callerId$ = this.callerIdSubject.asObservable();
+        // initiateCall(payload: any): Observable<any> {
+        //   return this.ipAddressService.getIpAddressInfo().pipe(
+        //     switchMap(ipAddressInfo => {
+        //       const params = {
+        //         'Content-Type': 'application/json',
+        //         'Auth-Key': 'Bearer ' + localStorage.getItem('ext_token'),
+        //         'ip-address': ipAddressInfo.ip,
+        //         'ip-country': ipAddressInfo.address.country
+        //       };
+        //       const httpOptions = { headers: new HttpHeaders(params) };
+        //       return this.http.post<[]>(environment.apiUrl + '/utilities/ext/ur/initiate/call', payload, httpOptions);
+        //     })
+        //   );
+        // }
+        this.maxRetries = 3;
+        this.retryDelay = 2000; // 2 seconds
     }
     changeMessage(message) {
         this.messageSource.next(message);
@@ -404,13 +420,34 @@ class ExtensionService {
         const httpOptions = { headers: new HttpHeaders(params) };
         return this.http.post(environment.apiUrl + '/utilities/softphone/purchase/number', dtModel, httpOptions);
     }
-    fetchCallerId(token) {
-        const params = {
+    fetchCallerId(token, retryCount = 0) {
+        if (!token) {
+            return throwError(() => new Error('No authentication token provided'));
+        }
+        const headers = new HttpHeaders({
             'Content-Type': 'application/json',
-            'Auth-Key': "Bearer " + token
+            'Auth-Key': `Bearer ${token}`,
+            'Cache-Control': 'no-cache',
+            'Pragma': 'no-cache'
+        });
+        const httpOptions = {
+            headers: headers,
+            withCredentials: true,
+            observe: 'response'
         };
-        const httpOptions = { headers: new HttpHeaders(params) };
-        return this.http.get(environment.apiUrl + '/utilities/softphone/fetch/callerid', httpOptions);
+        return this.http.get(`${environment.apiUrl}/utilities/softphone/fetch/callerid`, httpOptions).pipe(map(response => {
+            if (!response.body) {
+                throw new Error('Empty response from server');
+            }
+            return response.body;
+        }), catchError(error => {
+            console.error('Error fetching caller ID:', error);
+            if (retryCount < this.maxRetries) {
+                console.log(`Retrying... (${retryCount + 1}/${this.maxRetries})`);
+                return timer(this.retryDelay).pipe(switchMap(() => this.fetchCallerId(token, retryCount + 1)));
+            }
+            return throwError(() => new Error(`Failed to fetch caller ID after ${this.maxRetries} attempts`));
+        }));
     }
     updateNumberLabel(token, dtModel) {
         const params = {
@@ -565,36 +602,66 @@ class ExtensionService {
             }
         }));
     }
-    // initiateCall(payload: any): Observable<any> {
-    //   return this.ipAddressService.getIpAddressInfo().pipe(
-    //     switchMap(ipAddressInfo => {
-    //       const params = {
-    //         'Content-Type': 'application/json',
-    //         'Auth-Key': 'Bearer ' + localStorage.getItem('ext_token'),
-    //         'ip-address': ipAddressInfo.ip,
-    //         'ip-country': ipAddressInfo.address.country
-    //       };
-    //       const httpOptions = { headers: new HttpHeaders(params) };
-    //       return this.http.post<[]>(environment.apiUrl + '/utilities/ext/ur/initiate/call', payload, httpOptions);
-    //     })
-    //   );
-    // }
-    getIncomingCallToken() {
-        const params = {
+    getIncomingCallToken(retryCount = 0) {
+        const token = localStorage.getItem('ext_token');
+        if (!token) {
+            return throwError(() => new Error('No authentication token found'));
+        }
+        const params = new HttpHeaders({
             'Content-Type': 'application/json',
-            'Auth-Key': "Bearer " + localStorage.getItem('ext_token')
+            'Auth-Key': `Bearer ${token}`,
+            'Cache-Control': 'no-cache',
+            'Pragma': 'no-cache'
+        });
+        const httpOptions = {
+            headers: params,
+            withCredentials: true,
+            observe: 'response'
         };
-        const httpOptions = { headers: new HttpHeaders(params) };
-        return this.http.get(environment.apiUrl + '/utilities/twilio/incomingcall/token/web', httpOptions);
+        return this.http.get(`${environment.apiUrl}/utilities/twilio/incomingcall/token/web`, httpOptions).pipe(map(response => {
+            if (!response.body) {
+                throw new Error('Empty response from server');
+            }
+            return response.body;
+        }), catchError(error => {
+            console.error('Error fetching Twilio token:', error);
+            if (retryCount < this.maxRetries) {
+                console.log(`Retrying... (${retryCount + 1}/${this.maxRetries})`);
+                return timer(this.retryDelay).pipe(switchMap(() => this.getIncomingCallToken(retryCount + 1)));
+            }
+            return throwError(() => new Error(`Failed to get Twilio token after ${this.maxRetries} attempts`));
+        }));
     }
-    getOutgoingCallToken(payload) {
-        const params = {
+    getOutgoingCallToken(payload, retryCount = 0) {
+        const token = localStorage.getItem('ext_token');
+        if (!token) {
+            return throwError(() => new Error('No authentication token found'));
+        }
+        const headers = new HttpHeaders({
             'Content-Type': 'application/json',
-            'Auth-Key': "Bearer " + localStorage.getItem('ext_token'),
-            'c2c-request': window.location.hostname
+            'Auth-Key': `Bearer ${token}`,
+            'c2c-request': window.location.hostname,
+            'Cache-Control': 'no-cache',
+            'Pragma': 'no-cache'
+        });
+        const httpOptions = {
+            headers: headers,
+            withCredentials: true,
+            observe: 'response'
         };
-        const httpOptions = { headers: new HttpHeaders(params) };
-        return this.http.post(environment.apiUrl + '/utilities/ext/ur/generate/token', payload, httpOptions);
+        return this.http.post(`${environment.apiUrl}/utilities/ext/ur/generate/token`, payload, httpOptions).pipe(map(response => {
+            if (!response.body) {
+                throw new Error('Empty response from server');
+            }
+            return response.body;
+        }), catchError(error => {
+            console.error('Error fetching outgoing call token:', error);
+            if (retryCount < this.maxRetries) {
+                console.log(`Retrying... (${retryCount + 1}/${this.maxRetries})`);
+                return timer(this.retryDelay).pipe(switchMap(() => this.getOutgoingCallToken(payload, retryCount + 1)));
+            }
+            return throwError(() => new Error(`Failed to get outgoing call token after ${this.maxRetries} attempts`));
+        }));
     }
     getCallRecording(callSid) {
         const headers = new HttpHeaders({
@@ -1315,29 +1382,89 @@ class TwilioService {
         this.isAvailableNumber = new BehaviorSubject(false);
         this.callerIdList = new BehaviorSubject([]);
         this.triggerSMSReload = new BehaviorSubject(false);
-        this.initializeTwilioDevice();
+        this.isInitialized = false;
+        // Initialize when token is available
+        if (this.token) {
+            this.initializeTwilioDevice();
+        }
+        else {
+            // If token is not available, listen for it
+            const tokenCheck = setInterval(() => {
+                const token = localStorage.getItem('ext_token');
+                if (token) {
+                    this.token = token;
+                    this.initializeTwilioDevice();
+                    clearInterval(tokenCheck);
+                }
+            }, 1000);
+        }
     }
     initializeTwilioDevice() {
-        if (this.token) {
-            this.extensionService.getIncomingCallToken().subscribe((data) => {
-                this.incomingCallToken = data.token;
-                localStorage.setItem('in-token', data.token);
-                this.device = new Device(this.incomingCallToken, {
-                    allowIncomingWhileBusy: true,
-                    // Add any other necessary options
-                });
-                this.device.register();
-                this.device.on('incoming', (call) => {
-                    this.currentCall.next(call);
-                    this.callType.next('INCOMING');
-                    this.currentCallState.next('incoming');
-                });
-                this.device.on('error', (error) => {
-                    console.error('Twilio Device Error:', error);
-                    // Add error handling and reconnection logic
-                });
-            });
+        if (this.isInitialized || !this.token) {
+            return;
         }
+        console.log('Initializing Twilio Device...');
+        this.extensionService.getIncomingCallToken().subscribe({
+            next: (data) => {
+                if (!data?.token) {
+                    console.error('No token received from server');
+                    return;
+                }
+                try {
+                    console.log('Setting up Twilio Device with token');
+                    this.incomingCallToken = data.token;
+                    localStorage.setItem('in-token', data.token);
+                    // Destroy existing device if any
+                    if (this.device) {
+                        this.device.destroy();
+                    }
+                    // Create new device instance
+                    this.device = new Device(data.token, {
+                        allowIncomingWhileBusy: true,
+                        closeProtection: true
+                    });
+                    // Set up event listeners
+                    this.setupDeviceListeners();
+                    // Register the device
+                    this.device.register();
+                    this.isInitialized = true;
+                }
+                catch (error) {
+                    console.error('Error initializing Twilio Device:', error);
+                    this.isInitialized = false;
+                }
+            },
+            error: (error) => {
+                console.error('Error getting Twilio token:', error);
+                // Retry after delay
+                setTimeout(() => this.initializeTwilioDevice(), 5000);
+            }
+        });
+    }
+    setupDeviceListeners() {
+        if (!this.device)
+            return;
+        this.device.on('registered', () => {
+            console.log('Twilio Device registered successfully');
+        });
+        this.device.on('incoming', (call) => {
+            console.log('Incoming call received');
+            this.currentCall.next(call);
+            this.callType.next('INCOMING');
+            this.currentCallState.next('incoming');
+        });
+        this.device.on('error', (error) => {
+            console.error('Twilio Device Error:', error);
+            this.isInitialized = false;
+            // Attempt to reinitialize after delay
+            setTimeout(() => this.initializeTwilioDevice(), 5000);
+        });
+        this.device.on('unregistered', () => {
+            console.log('Twilio Device unregistered');
+            this.isInitialized = false;
+            // Attempt to re-register
+            setTimeout(() => this.initializeTwilioDevice(), 5000);
+        });
     }
     // onIncomingCall(){
     //   this.device.on('incoming', (call:any) => {