@vgroup/dialbox 0.0.55 → 0.0.57

package/fesm2020/vgroup-dialbox.mjs

@@ -1317,18 +1317,30 @@ class TwilioService {
         this.triggerSMSReload = new BehaviorSubject(false);
         this.isInitialized = false;
         this.initializationInProgress = false;
-        // Initialize when token is available
         this.initializeTwilioDevice();
     }
     initializeTwilioDevice() {
-        if (this.initializationInProgress || !this.token)
+        if (this.initializationInProgress || this.isInitialized)
             return;
         this.initializationInProgress = true;
         this.extensionService.getIncomingCallToken().subscribe({
             next: (data) => {
                 if (data?.token) {
-                    this.setupDevice(data.token);
+                    this.incomingCallToken = data.token;
+                    localStorage.setItem('in-token', data.token);
+                    // Clean up existing device if any
+                    if (this.device) {
+                        this.device.destroy();
+                    }
+                    // Initialize new device
+                    this.device = new Device(data.token, {
+                        allowIncomingWhileBusy: true,
+                        closeProtection: true
+                    });
+                    this.setupDeviceEventListeners();
+                    this.device.register();
                     this.isInitialized = true;
+                    this.initializationInProgress = false;
                 }
             },
             error: (error) => {
@@ -1339,21 +1351,13 @@ class TwilioService {
             }
         });
     }
-    setupDevice(token) {
-        // Clean up existing device if any
-        if (this.device) {
-            this.device.destroy();
-        }
-        this.incomingCallToken = token;
-        localStorage.setItem('in-token', token);
-        this.device = new Device(token, {
-            allowIncomingWhileBusy: true,
-            closeProtection: true
-        });
-        // Set up event listeners
+    setupDeviceEventListeners() {
+        if (!this.device)
+            return;
+        // Clean up existing listeners
+        this.device.removeAllListeners();
         this.device.on('registered', () => {
             console.log('Twilio Device registered successfully');
-            this.initializationInProgress = false;
         });
         this.device.on('incoming', (call) => {
             console.log('Incoming call received');
@@ -1364,7 +1368,6 @@ class TwilioService {
         this.device.on('error', (error) => {
             console.error('Twilio Device Error:', error);
             this.isInitialized = false;
-            this.initializationInProgress = false;
             // Attempt to reinitialize after error
             setTimeout(() => this.initializeTwilioDevice(), 5000);
         });
@@ -1374,11 +1377,15 @@ class TwilioService {
             // Attempt to re-register
             this.initializeTwilioDevice();
         });
-        this.device.register();
     }
-    //     //call.accept();
-    //   });
-    // }
+    onIncomingCall() {
+        if (this.device) {
+            this.device.on('incoming', (call) => {
+                console.log('Incoming call:', 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);
@@ -2163,29 +2170,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImpo
             }] } });
 
 class DialboxComponent {
-    set isDialpadHidden(value) {
-        this._isDialpadHidden = value;
-        if (!value && !this.isInitialized) {
-            this.initializeTwilio();
-        }
-    }
-    get isDialpadHidden() {
-        return this._isDialpadHidden;
-    }
-    initializeTwilio() {
-        if (this.isInitialized || !this.token)
-            return;
-        this.twilioService.initializeTwilioDevice();
-        this.isInitialized = true;
-        // Subscribe to incoming calls
-        const callSub = this.twilioService.currentCall.subscribe(call => {
-            if (call) {
-                this.isCallInProgress = true;
-                this.isDialpadHidden = false; // Show dialpad on incoming call
-            }
-        });
-        this.subscriptions.add(callSub);
-    }
     constructor(twilioService, extService, dialog, ipService, extensionService, router) {
         this.twilioService = twilioService;
         this.extService = extService;
@@ -2193,7 +2177,7 @@ class DialboxComponent {
         this.ipService = ipService;
         this.extensionService = extensionService;
         this.router = router;
-        this._isDialpadHidden = true;
+        this.isDialpadHidden = true;
         this.closeDialpadEvent = new EventEmitter();
         this.callInitiated = new EventEmitter();
         this.endCallEvent = new EventEmitter();
@@ -2239,21 +2223,75 @@ class DialboxComponent {
         this.subscriptions = new Subscription();
         this.shakeDedicatedBtn = false;
         this.isSmartDialCall = false;
-        this.isInitialized = false;
         this.isMinimised = false;
     }
+    initializeTwilio() {
+        if (!this.twilioService || !this.token) {
+            return;
+        }
+        this.twilioService.initializeTwilioDevice();
+        this.setupIncomingCallSubscription();
+    }
+    setupIncomingCallSubscription() {
+        this.subscriptions.add(this.twilioService.currentCall.subscribe(incomingCallData => {
+            if (incomingCallData) {
+                if (this.isCallInProgress) {
+                    this.newIncomingCalls.push(incomingCallData);
+                    this.getUserInformation(incomingCallData);
+                }
+                else {
+                    this.handleNewIncomingCall(incomingCallData);
+                }
+            }
+        }));
+    }
+    handleNewIncomingCall(call) {
+        this.isCallInProgress = true;
+        this.isDialpadHidden = false; // Show the dialpad when there's an incoming call
+        this.callData = {
+            phone: call.parameters['From'],
+            displayNum: call.parameters['From'],
+            dial: true,
+            name: call.customParameters?.get('name') || 'Unknown',
+            img: call.customParameters?.get('image') || 'assets/images/user.jpg',
+            isIncomingCall: true,
+            extNum: ''
+        };
+        call.on('cancel', () => this.handleCallEnd(call));
+        call.on('disconnect', () => this.handleCallEnd(call));
+        this.incomingCallInitiated.emit();
+    }
+    handleCallEnd(call) {
+        this.incomingCallsList = this.incomingCallsList.filter((item) => item.parameters.CallSid !== call.parameters['CallSid']);
+        if (this.incomingCallsList.length === 0) {
+            this.isCallInProgress = false;
+            this.resetCallData();
+        }
+    }
+    resetCallData() {
+        this.callData = {
+            phone: '',
+            displayNum: '',
+            dial: false,
+            name: '',
+            img: 'assets/images/user.jpg',
+            isIncomingCall: false,
+            extNum: ''
+        };
+    }
     ngOnInit() {
         try {
             this.token = localStorage.getItem('ext_token') || '';
             this.initializeTwilio();
+            this.getUserCallSetting();
+            this.getContactList();
             this.getContactList();
             this.getUserCallSetting();
-            // Subscribe to dial number events
             const sub1 = this.twilioService.dialNumberFromOtherModule.subscribe((contact) => {
-                if (contact?.number) {
+                if (contact.number) {
                     this.isSmartDialCall = false;
                     if (contact.isDialFromHistory) {
-                        // Handle dialing from history page
+                        //handle dialing from history page
                         if (contact.callerId == 'smartDialing') {
                             this.selectedCallerId = { number: contact.from };
                             this.isSmartDialCall = true;
@@ -2367,12 +2405,15 @@ class DialboxComponent {
         this.registerDragElement();
     }
     ngOnChanges(changes) {
-        if (changes['isDialpadHidden'] && !this.isDialpadHidden) {
-            this.getContactList();
-            this.getUserCallSetting();
-            setTimeout(() => {
-                this.dialInputElement.nativeElement.focus();
-            }, 0);
+        if (changes['isDialpadHidden']) {
+            if (!this.isDialpadHidden) {
+                // Focus the input when dialpad becomes visible
+                setTimeout(() => {
+                    if (this.dialInputElement?.nativeElement) {
+                        this.dialInputElement.nativeElement.focus();
+                    }
+                }, 0);
+            }
         }
     }
     registerDragElement() {
@@ -2582,6 +2623,232 @@ class DialboxComponent {
             this.endCallEvent.emit();
         }
     }
+    // async initiateCall() {
+    //   try {
+    //     console.log('Initiating call with number:', this.dialedNumber);
+    //     if (!this.dialedNumber && this.lastDialed) {
+    //       console.log('Using last dialed number:', this.lastDialed.number);
+    //       this.sanitizedNum = this.lastDialed.number;
+    //     }
+    //     const isInvalid = await this.isInvalidNumber();
+    //     if (isInvalid) {
+    //       console.error('Invalid number format');
+    //       return false;
+    //     }
+    //     this.saveLastDialed();
+    //     this.isSavedContactDialled();
+    //     // Check payment status
+    //     this.isPaymentDue = localStorage.getItem('paymentDue') === 'true';
+    //     if (this.isPaymentDue) {
+    //       console.warn('Payment is due');
+    //       swal('Warning', 'Please note that your payment is due. To continue using our services, kindly subscribe to avoid interruptions.');
+    //       return false;
+    //     }
+    //     // Check if dialing own number
+    //     if (this.sanitizedNum === localStorage.getItem('twilioNumber')) {
+    //       console.error('Attempted to dial own number');
+    //       swal('Error', 'You cannot dial your own number');
+    //       return false;
+    //     }
+    //     // Check microphone permissions
+    //     const hasPermission = await this.checkMicrophonePermission();
+    //     if (!hasPermission) {
+    //       console.warn('Microphone permission not granted');
+    //       await this.askForMicrophonePermission();
+    //       return false;
+    //     }
+    //     if (!this.selectedCallerId) {
+    //       console.error('No caller ID selected');
+    //       this.shakeDedicatedBtn = true;
+    //       this.showDialAlert('Please select a C2C number to call from');
+    //       setTimeout(() => {
+    //         this.shakeDedicatedBtn = false;
+    //       }, 3000);
+    //       return false;
+    //     }
+    //     console.log('Getting number with country code...');
+    //     this.callData.displayNum = '';
+    //     try {
+    //       await this.getToNumber(this.sanitizedNum);
+    //     } catch (error) {
+    //       console.error('Error getting number with country code:', error);
+    //       this.showDialAlert('Error processing number. Please try again.');
+    //       return false;
+    //     }
+    //     if (this.terminateCall) {
+    //       console.log('Call terminated by user');
+    //       this.terminateCall = false;
+    //       return false;
+    //     }
+    //     // Prepare call data
+    //     this.callData = {
+    //       ...this.callData,
+    //       phone: this.sanitizedNum,
+    //       isIncomingCall: false,
+    //       dial: true,
+    //       from: this.isSmartDialCall ? this.callData.from : this.selectedCallerId.number,
+    //       timestamp: new Date().toISOString()
+    //     };
+    //     console.log('Initiating call with data:', this.callData);
+    //     this.isCallInProgress = true;
+    //     this.callInitiated.emit({ ...this.callData });
+    //     return true;
+    //   } catch (error) {
+    //     console.error('Error in initiateCall:', error);
+    //     this.showDialAlert('Failed to initiate call. Please try again.');
+    //     this.isCallInProgress = false;
+    //     return false;
+    //   }
+    //     //this.clearAllDialed();
+    //   // } else {
+    //   //   swal('Error', 'Trial period is over. Please setup payment method to continue services')
+    //   // }
+    // }
+    //  async initiateCall() {
+    //   if (!this.dialedNumber && this.lastDialed) {
+    //     this.sanitizedNum = this.lastDialed.number;
+    //   }
+    //   const isInvalid = await this.isInvalidNumber();
+    //   if (isInvalid) {
+    //     return false;
+    //   }
+    //   this.saveLastDialed();
+    //   this.isSavedContactDialled();
+    //   //let isCallerIdSet = await this.isCallerIdSet();
+    //   this.isPaymentDue = localStorage.getItem('paymentDue') == 'false' ? false : true;
+    //   if (this.isPaymentDue) {
+    //     swal('Warning', 'Please note that your payment is due, To continue on your services kindly subscribe to use uninterrupted services.');
+    //     return;
+    //   }
+    //   this.isTrialPeriodOver = localStorage.getItem('trialOver') == 'false' ? false : true;
+    //   // if (!this.isTrialPeriodOver) {
+    //     if (this.sanitizedNum == localStorage.getItem('twilioNumber')) {
+    //       swal('Error', 'You can not dial this number');
+    //       return;
+    //     }
+    //     const hasPermission = await this.checkMicrophonePermission();
+    //     if (hasPermission) {
+    //       if (this.selectedCallerId) {
+    //         //clear displayNum if value is binded from previous call
+    //         this.callData.displayNum = '';
+    //         // get number to be dialled from backend
+    //         await this.getToNumber(this.sanitizedNum);
+    //         if (this.terminateCall) {
+    //           this.terminateCall = false;
+    //           return;
+    //         }
+    //         this.callData.phone = this.sanitizedNum;
+    //         this.callData.isIncomingCall = false;
+    //         this.callData.dial = true;
+    //         if (!this.isSmartDialCall) {
+    //           this.callData.from = this.selectedCallerId.number;
+    //         }
+    //         this.isCallInProgress = true;
+    //               this.callData = {
+    //               ...this.callData,
+    //               phone: this.sanitizedNum,
+    //               isIncomingCall: false,
+    //               dial: true,
+    //               from: this.isSmartDialCall ? this.callData.from : this.selectedCallerId.number,
+    //               timestamp: new Date().toISOString()
+    //             };
+    //             console.log('Initiating call with data:', this.callData);
+    //             this.isCallInProgress = true;
+    //             this.callInitiated.emit({ ...this.callData });
+    //         return true;
+    //       } else {
+    //         this.shakeDedicatedBtn = true;
+    //         this.showDialAlert('Select a C2C number to call');
+    //         setTimeout(() => {
+    //           this.shakeDedicatedBtn = false;
+    //         }, 3000);
+    //         return false;
+    //       }
+    //       //this.callingOpenEvent.emit({ phone: this.dialedNumber });
+    //     } else {
+    //       await this.askForMicrophonePermission();
+    //     }
+    //     //this.clearAllDialed();
+    //   // } else {
+    //   //   swal('Error', 'Trial period is over. Please setup payment method to continue services')
+    //   // }
+    // }
+    // async initiateCall() {
+    //   try{
+    //     if (!this.dialedNumber && this.lastDialed) {
+    //       this.sanitizedNum = this.lastDialed.number;
+    //     }
+    //     const isInvalid = await this.isInvalidNumber();
+    //     if (isInvalid) {
+    //       return false;
+    //     }
+    //     this.saveLastDialed();
+    //     this.isSavedContactDialled();
+    //     //let isCallerIdSet = await this.isCallerIdSet();
+    //     this.isPaymentDue = localStorage.getItem('paymentDue') == 'false' ? false : true;
+    //     if (this.isPaymentDue) {
+    //       swal('Warning', 'Please note that your payment is due, To continue on your services kindly subscribe to use uninterrupted services.');
+    //       return false;
+    //     }
+    //     this.isTrialPeriodOver = localStorage.getItem('trialOver') == 'false' ? false : true;
+    //     // if (!this.isTrialPeriodOver) {
+    //       if (this.sanitizedNum == localStorage.getItem('twilioNumber')) {
+    //         swal('Error', 'You can not dial this number');
+    //         return false;
+    //       }
+    //       const hasPermission = await this.checkMicrophonePermission();
+    //       if (hasPermission) {
+    //         if (this.selectedCallerId) {
+    //           //clear displayNum if value is binded from previous call
+    //           this.callData.displayNum = '';
+    //           // get number to be dialled from backend
+    //           await this.getToNumber(this.sanitizedNum);
+    //           if (this.terminateCall) {
+    //             this.terminateCall = false;
+    //             return;
+    //           }
+    //           this.callData.phone = this.sanitizedNum;
+    //           this.callData.isIncomingCall = false;
+    //           this.callData.dial = true;
+    //           if (!this.isSmartDialCall) {
+    //             this.callData.from = this.selectedCallerId.number;
+    //           }
+    //           this.isCallInProgress = true;
+    //                 this.callData = {
+    //                 ...this.callData,
+    //                 phone: this.sanitizedNum,
+    //                 isIncomingCall: false,
+    //                 dial: true,
+    //                 from: this.isSmartDialCall ? this.callData.from : this.selectedCallerId.number,
+    //                 timestamp: new Date().toISOString()
+    //               };
+    //               console.log('Initiating call with data:', this.callData);
+    //               this.isCallInProgress = true;
+    //               this.callInitiated.emit({ ...this.callData });
+    //           return true;
+    //         } else {
+    //           this.shakeDedicatedBtn = true;
+    //           this.showDialAlert('Select a C2C number to call');
+    //           setTimeout(() => {
+    //             this.shakeDedicatedBtn = false;
+    //           }, 3000);
+    //           return false;
+    //         }
+    //         //this.callingOpenEvent.emit({ phone: this.dialedNumber });
+    //       } else {
+    //         await this.askForMicrophonePermission();
+    //       }
+    //       //this.clearAllDialed();
+    //     // } else {
+    //     //   swal('Error', 'Trial period is over. Please setup payment method to continue services')
+    //     // }
+    //   }catch(e){
+    //     console.error('Error in initiateCall:', e);
+    //     this.showDialAlert('Failed to initiate call. Please try again.');
+    //     this.isCallInProgress = false;
+    //     return false;
+    //   }
+    // }
     async initiateCall() {
         try {
             if (!this.dialedNumber && this.lastDialed) {