@vgroup/dialbox 0.0.79 → 0.0.80

package/fesm2020/vgroup-dialbox.mjs

@@ -1366,10 +1366,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImpo
         }], ctorParameters: function () { return [{ type: TwilioService }]; } });
 
 class TwilioService {
-    constructor(http, extensionService, notificationSerivce) {
+    constructor(http, extensionService, notificationService) {
         this.http = http;
         this.extensionService = extensionService;
-        this.notificationSerivce = notificationSerivce;
+        this.notificationService = notificationService;
         this.openInProgressDialpad = new BehaviorSubject(false);
         this.currentCall = new BehaviorSubject(null);
         this.currentCallState = new BehaviorSubject('none'); // 'incoming', 'in-progress', 'out-progress', 'none'
@@ -1388,54 +1388,92 @@ class TwilioService {
         this.isAvailableNumber = new BehaviorSubject(false);
         this.callerIdList = new BehaviorSubject([]);
         this.triggerSMSReload = new BehaviorSubject(false);
-        this.initializeTwilioDevice();
+        this.isInitialized = false;
+        this.autoAnswer = false; // Default to manual answer
+        // Don't initialize here - let the component handle it
     }
     initializeTwilioDevice() {
-        if (this.token) {
+        return new Promise((resolve, reject) => {
+            if (this.device) {
+                console.log('Twilio device already initialized');
+                resolve();
+                return;
+            }
+            const token = localStorage.getItem('ext_token');
+            if (!token) {
+                const error = new Error('No authentication token found in localStorage');
+                console.error(error);
+                reject(error);
+                return;
+            }
+            // Store token in a const to ensure TypeScript knows it's not null
+            const authToken = token;
             this.extensionService.getIncomingCallToken().subscribe((data) => {
+                if (!data || !data.token) {
+                    const error = 'No token received from getIncomingCallToken';
+                    console.error(error);
+                    reject(new Error(error));
+                    return;
+                }
                 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 = call;
-                    this.currentCall.next(call);
-                    this.callType.next('INCOMING');
-                    this.currentCallState.next('incoming');
-                    this.notificationSerivce.showNotification(call);
-                    // Set up call event handlers
-                    call.on('accept', () => {
-                        this.currentCallState.next('in-progress');
-                    });
-                    call.on('disconnect', () => {
-                        this._currentCall = null;
-                        this.currentCall.next(null);
-                        this.currentCallState.next('none');
-                        this.callType.next('NIL');
+                try {
+                    this.device = new Device(authToken, {
+                        allowIncomingWhileBusy: true,
+                        // Add any other necessary options
                     });
-                    call.on('cancel', () => {
-                        this._currentCall = null;
-                        this.currentCall.next(null);
-                        this.currentCallState.next('none');
-                        this.callType.next('NIL');
-                    });
-                });
-                this.device.on('error', (error) => {
-                    console.error('Twilio Device Error:', error);
-                    // Add error handling and reconnection logic
-                });
+                    // Setup device with token
+                    this.setupDevice(this.device);
+                    this.device.register();
+                    console.log('Twilio device initialized successfully');
+                    resolve();
+                }
+                catch (error) {
+                    console.error('Error initializing Twilio device:', error);
+                    reject(error);
+                }
             });
-        }
+        });
+    }
+    setupDevice(device) {
+        device.on('incoming', (call) => {
+            console.log('Incoming call from:', call.parameters['From']);
+            this._currentCall = call;
+            this.currentCall.next(call);
+            this.currentCallState.next('incoming');
+            // Auto-answer if configured
+            if (this.autoAnswer) {
+                console.log('Auto-answering incoming call');
+                // Call accept() without promise chaining since it returns void
+                call.accept();
+                this.currentCallState.next('in-progress');
+            }
+            // Handle call end
+            call.on('disconnect', () => {
+                if (this._currentCall && this._currentCall.parameters['CallSid'] === call.parameters['CallSid']) {
+                    this._currentCall = null;
+                    this.currentCall.next(null);
+                    this.currentCallState.next('none');
+                }
+            });
+            // Handle call cancel
+            call.on('cancel', () => {
+                if (this._currentCall && this._currentCall.parameters['CallSid'] === call.parameters['CallSid']) {
+                    this._currentCall = null;
+                    this.currentCall.next(null);
+                    this.currentCallState.next('none');
+                }
+            });
+        });
+        device.on('error', (error) => {
+            console.error('Twilio Device Error:', error);
+            // Handle specific error codes if needed
+            if (error.code === 31201) { // Token expired
+                console.log('Token expired, attempting to refresh...');
+                this.initializeTwilioDevice();
+            }
+        });
     }
-    // onIncomingCall(){
-    //   this.device.on('incoming', (call:any) => {
-    //     console.log(call);
-    //     //call.accept();
-    //   });
-    // }
     saveContact(payload) {
         const httpOptions = { headers: new HttpHeaders({ 'Content-Type': 'application/json', 'Auth-Key': "Bearer " + localStorage.getItem('ext_token') }) };
         return this.http.post(environment.apiUrl + '/utilities/phonebook/add/contacts/manually', payload, httpOptions);
@@ -1464,9 +1502,6 @@ class TwilioService {
         return this.http.get(environment.apiUrl + '/utilities/phonebook/favourite/contacts', httpOptions);
     }
     getRecentCalls(pageIndex, pageSize) {
-        // let params = new HttpParams();
-        // params = params.set('size', pageSize);
-        // params = params.set('page', pageIndex);
         const headers = { 'Content-Type': 'application/json', 'Auth-Key': "Bearer " + localStorage.getItem('ext_token') };
         const httpOptions = { headers };
         return this.http.get(environment.apiUrl + '/utilities/phonebook/recent/calls', httpOptions);
@@ -1497,14 +1532,6 @@ class TwilioService {
         };
         return this.http.post(environment.apiUrl + '/utilities/phonebook/delete/photo/' + id, payload, httpOptions);
     }
-    // toggleCallerIdAlertFn(val: any) {
-    //   let httpOptions = {
-    //     headers: new HttpHeaders({
-    //       'Auth-Key': "Bearer " + localStorage.getItem('ext_token')
-    //     })
-    //   };
-    //   return this.http.put<[]>(environment.apiUrl + '/utilities/softphone/callerid/alert/' + val, {}, httpOptions);
-    // }
     toggleCoutryCodeToast(val) {
         let httpOptions = {
             headers: new HttpHeaders({
@@ -1518,7 +1545,6 @@ class TwilioService {
             headers: new HttpHeaders({ 'Content-Type': 'application/json', 'Auth-Key': "Bearer " + localStorage.getItem('ext_token') }),
             params: new HttpParams().set('isoCode', isoCode)
         };
-        const params = new HttpParams().set('isoCode', isoCode);
         return this.http.get(environment.apiUrl + '/utilities/softphone/check/countryCode/' + dialledNo, httpOptions);
     }
     /**
@@ -1533,6 +1559,21 @@ class TwilioService {
     hasActiveCall() {
         return this._currentCall !== null;
     }
+    /**
+     * Set whether to automatically answer incoming calls
+     * @param autoAnswer - Whether to automatically answer calls
+     */
+    setAutoAnswer(autoAnswer) {
+        this.autoAnswer = autoAnswer;
+    }
+    /**
+     * Toggle auto-answer for incoming calls
+     * @returns The new auto-answer state
+     */
+    toggleAutoAnswer() {
+        this.autoAnswer = !this.autoAnswer;
+        return this.autoAnswer;
+    }
 }
 TwilioService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: TwilioService, deps: [{ token: i1.HttpClient }, { token: ExtensionService }, { token: NotificationService }], target: i0.ɵɵFactoryTarget.Injectable });
 TwilioService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: TwilioService, providedIn: 'root' });
@@ -2163,8 +2204,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImpo
 class DialboxComponent {
     set isDialpadHidden(value) {
         this._isDialpadHidden = value;
-        if (!value) {
-            // When dialpad becomes visible, ensure Twilio is initialized
+        if (!value && !this.isInitialized) {
+            // When dialpad becomes visible, ensure Twilio is initialized if not already
             this.initializeTwilio();
         }
     }
@@ -2226,21 +2267,22 @@ class DialboxComponent {
         this.isSmartDialCall = false;
         this.isInitialized = false;
         this.isMinimised = false;
-        // Always initialize Twilio when component loads to receive calls immediately
-        this.initializeTwilio();
+        // Initialize Twilio when component loads
+        this.token = localStorage.getItem('ext_token') || '';
+        if (this.token) {
+            this.initializeTwilio();
+        }
+        else {
+            console.warn('No auth token found, Twilio not initialized');
+        }
     }
     initializeTwilio() {
         if (this.isInitialized)
             return;
-        this.token = localStorage.getItem('ext_token') || '';
-        if (!this.token) {
-            console.error('No authentication token found');
-            return;
-        }
-        this.isInitialized = true;
         console.log('Initializing Twilio service...');
         // Initialize Twilio service
         this.twilioService.initializeTwilioDevice();
+        this.isInitialized = true;
         // Check for any existing call first
         const currentCall = this.twilioService.getCurrentCall();
         if (currentCall) {