@vgroup/dialbox 0.0.57 → 0.0.58

package/fesm2020/vgroup-dialbox.mjs

@@ -1315,77 +1315,36 @@ class TwilioService {
         this.isAvailableNumber = new BehaviorSubject(false);
         this.callerIdList = new BehaviorSubject([]);
         this.triggerSMSReload = new BehaviorSubject(false);
-        this.isInitialized = false;
-        this.initializationInProgress = false;
         this.initializeTwilioDevice();
     }
     initializeTwilioDevice() {
-        if (this.initializationInProgress || this.isInitialized)
-            return;
-        this.initializationInProgress = true;
-        this.extensionService.getIncomingCallToken().subscribe({
-            next: (data) => {
-                if (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) => {
-                console.error('Error initializing Twilio:', error);
-                this.initializationInProgress = false;
-                // Retry after delay
-                setTimeout(() => this.initializeTwilioDevice(), 5000);
-            }
-        });
-    }
-    setupDeviceEventListeners() {
-        if (!this.device)
-            return;
-        // Clean up existing listeners
-        this.device.removeAllListeners();
-        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 error
-            setTimeout(() => this.initializeTwilioDevice(), 5000);
-        });
-        this.device.on('unregistered', () => {
-            console.log('Twilio Device unregistered');
-            this.isInitialized = false;
-            // Attempt to re-register
-            this.initializeTwilioDevice();
-        });
-    }
-    onIncomingCall() {
-        if (this.device) {
-            this.device.on('incoming', (call) => {
-                console.log('Incoming call:', call);
-                // call.accept();
+        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
+                });
             });
         }
     }
+    // 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);
@@ -2170,6 +2129,16 @@ 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
+            this.initializeTwilio();
+        }
+    }
+    get isDialpadHidden() {
+        return this._isDialpadHidden;
+    }
     constructor(twilioService, extService, dialog, ipService, extensionService, router) {
         this.twilioService = twilioService;
         this.extService = extService;
@@ -2177,7 +2146,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();
@@ -2223,70 +2192,38 @@ class DialboxComponent {
         this.subscriptions = new Subscription();
         this.shakeDedicatedBtn = false;
         this.isSmartDialCall = false;
+        this.isInitialized = false;
         this.isMinimised = false;
+        // Initialize if dialpad is visible by default
+        if (!this.isDialpadHidden) {
+            this.initializeTwilio();
+        }
     }
     initializeTwilio() {
-        if (!this.twilioService || !this.token) {
+        if (this.isInitialized)
+            return;
+        this.token = localStorage.getItem('ext_token') || '';
+        if (!this.token) {
+            console.error('No authentication token found');
             return;
         }
+        this.isInitialized = true;
+        // Initialize Twilio service
         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);
-                }
+        // Subscribe to incoming calls to show dialpad when call comes in
+        const callSub = this.twilioService.currentCall.subscribe(call => {
+            if (call) {
+                this.isCallInProgress = true;
+                this._isDialpadHidden = false; // Show dialpad on incoming call
             }
-        }));
-    }
-    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: ''
-        };
+        });
+        this.subscriptions.add(callSub);
     }
     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) {
                     this.isSmartDialCall = false;
@@ -2405,15 +2342,12 @@ class DialboxComponent {
         this.registerDragElement();
     }
     ngOnChanges(changes) {
-        if (changes['isDialpadHidden']) {
-            if (!this.isDialpadHidden) {
-                // Focus the input when dialpad becomes visible
-                setTimeout(() => {
-                    if (this.dialInputElement?.nativeElement) {
-                        this.dialInputElement.nativeElement.focus();
-                    }
-                }, 0);
-            }
+        if (changes['isDialpadHidden'] && !this.isDialpadHidden) {
+            this.getContactList();
+            this.getUserCallSetting();
+            setTimeout(() => {
+                this.dialInputElement.nativeElement.focus();
+            }, 0);
         }
     }
     registerDragElement() {
@@ -3146,6 +3080,10 @@ class DialboxComponent {
             if (this.subscriptions) {
                 this.subscriptions.unsubscribe();
             }
+            // Clean up Twilio device when component is destroyed
+            if (this.twilioService['device']) {
+                this.twilioService['device'].destroy();
+            }
             // End any active call
             if (this.isCallInProgress) {
                 this.endCall();