@vgroup/dialbox 0.0.54 → 0.0.55

package/fesm2020/vgroup-dialbox.mjs

@@ -1315,19 +1315,45 @@ class TwilioService {
         this.isAvailableNumber = new BehaviorSubject(false);
         this.callerIdList = new BehaviorSubject([]);
         this.triggerSMSReload = new BehaviorSubject(false);
+        this.isInitialized = false;
+        this.initializationInProgress = false;
+        // Initialize when token is available
         this.initializeTwilioDevice();
     }
-    setupDeviceListeners() {
-        if (!this.device)
+    initializeTwilioDevice() {
+        if (this.initializationInProgress || !this.token)
             return;
-        // Remove any existing listeners first
-        this.device.off('incoming');
-        this.device.off('error');
-        this.device.off('registered');
-        this.device.off('unregistered');
-        // Set up new listeners
+        this.initializationInProgress = true;
+        this.extensionService.getIncomingCallToken().subscribe({
+            next: (data) => {
+                if (data?.token) {
+                    this.setupDevice(data.token);
+                    this.isInitialized = true;
+                }
+            },
+            error: (error) => {
+                console.error('Error initializing Twilio:', error);
+                this.initializationInProgress = false;
+                // Retry after delay
+                setTimeout(() => this.initializeTwilioDevice(), 5000);
+            }
+        });
+    }
+    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
         this.device.on('registered', () => {
-            console.log('Twilio Device registered');
+            console.log('Twilio Device registered successfully');
+            this.initializationInProgress = false;
         });
         this.device.on('incoming', (call) => {
             console.log('Incoming call received');
@@ -1337,40 +1363,19 @@ 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);
         });
+        this.device.on('unregistered', () => {
+            console.log('Twilio Device unregistered');
+            this.isInitialized = false;
+            // Attempt to re-register
+            this.initializeTwilioDevice();
+        });
+        this.device.register();
     }
-    initializeTwilioDevice() {
-        if (this.device) {
-            // If device already exists, just re-register
-            this.device.register();
-            return;
-        }
-        if (this.token) {
-            this.extensionService.getIncomingCallToken().subscribe({
-                next: (data) => {
-                    this.incomingCallToken = data.token;
-                    localStorage.setItem('in-token', data.token);
-                    // Destroy existing device if any
-                    if (this.device) {
-                        this.device.destroy();
-                    }
-                    this.device = new Device(this.incomingCallToken, {
-                        allowIncomingWhileBusy: true,
-                        closeProtection: true
-                    });
-                    this.setupDeviceListeners();
-                    this.device.register();
-                },
-                error: (error) => {
-                    console.error('Error getting Twilio token:', error);
-                    // Add retry logic here if needed
-                }
-            });
-        }
-    }
-    // onIncomingCall(){
-    //   this.device.on('incoming', (call:any) => {
-    //     console.log(call);
     //     //call.accept();
     //   });
     // }
@@ -2158,6 +2163,29 @@ 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;
@@ -2165,7 +2193,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();
@@ -2211,14 +2239,8 @@ class DialboxComponent {
         this.subscriptions = new Subscription();
         this.shakeDedicatedBtn = false;
         this.isSmartDialCall = false;
-        this.isTwilioInitialized = false;
+        this.isInitialized = false;
         this.isMinimised = false;
-        // Subscribe to incoming calls
-        this.subscriptions.add(this.twilioService.currentCall.subscribe(call => {
-            if (call) {
-                this.handleIncomingCall(call);
-            }
-        }));
     }
     ngOnInit() {
         try {
@@ -2228,10 +2250,10 @@ class DialboxComponent {
             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;
@@ -2345,56 +2367,12 @@ class DialboxComponent {
         this.registerDragElement();
     }
     ngOnChanges(changes) {
-        if (changes['isDialpadHidden']) {
-            if (!changes['isDialpadHidden'].firstChange && !this.isDialpadHidden) {
-                // Re-initialize Twilio when dialpad becomes visible
-                this.initializeTwilio();
-            }
-            if (!this.isDialpadHidden) {
-                this.getContactList();
-                this.getUserCallSetting();
-                setTimeout(() => {
-                    if (this.dialInputElement?.nativeElement) {
-                        this.dialInputElement.nativeElement.focus();
-                    }
-                }, 0);
-            }
-        }
-    }
-    initializeTwilio() {
-        if (this.isTwilioInitialized || !this.token)
-            return;
-        this.isTwilioInitialized = true;
-        // Clear any existing device first
-        if (this.twilioService.device) {
-            this.twilioService.device.destroy();
-            this.twilioService.device = null;
-        }
-        // Initialize new device
-        this.twilioService.initializeTwilioDevice();
-        // Reset the current call state
-        this.twilioService.currentCall.next(null);
-        this.twilioService.currentCallState.next('none');
-    }
-    handleIncomingCall(call) {
-        try {
-            if (!call)
-                return;
-            this.incomingCallInitiated.emit();
-            this.newIncomingCallData = call;
-            // Add to incoming calls list if not already present
-            const existingCall = this.incomingCallsList.find((c) => c.parameters.CallSid === call.parameters.CallSid);
-            if (!existingCall) {
-                this.incomingCallsList.unshift(call);
-                this.incomingCallsNewInfoEvent.emit(this.incomingCallsList);
-            }
-            // Show the dialpad if it's hidden
-            if (this.isDialpadHidden) {
-                this.isDialpadHidden = false;
-            }
-        }
-        catch (error) {
-            console.error('Error handling incoming call:', error);
+        if (changes['isDialpadHidden'] && !this.isDialpadHidden) {
+            this.getContactList();
+            this.getUserCallSetting();
+            setTimeout(() => {
+                this.dialInputElement.nativeElement.focus();
+            }, 0);
         }
     }
     registerDragElement() {
@@ -2604,232 +2582,6 @@ 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) {
@@ -3122,22 +2874,19 @@ class DialboxComponent {
     }
     ngOnDestroy() {
         try {
+            console.log('Cleaning up C2cDialpadComponent');
+            // Unsubscribe from all subscriptions
+            if (this.subscriptions) {
+                this.subscriptions.unsubscribe();
+            }
+            // End any active call
+            if (this.isCallInProgress) {
+                this.endCall();
+            }
             // Clear any timeouts or intervals if they exist
             if (this.toastTimeout) {
                 clearTimeout(this.toastTimeout);
             }
-            // Unsubscribe from all subscriptions
-            this.subscriptions.unsubscribe();
-            // Clean up Twilio device if it exists
-            if (this.twilioService.device) {
-                try {
-                    this.twilioService.device.destroy();
-                    this.twilioService.device = null;
-                }
-                catch (error) {
-                    console.error('Error cleaning up Twilio device:', error);
-                }
-            }
             console.log('C2cDialpadComponent cleanup complete');
         }
         catch (error) {