@vgroup/dialbox 0.0.77 → 0.0.79

package/fesm2020/vgroup-dialbox.mjs

@@ -1372,7 +1372,8 @@ class TwilioService {
         this.notificationSerivce = notificationSerivce;
         this.openInProgressDialpad = new BehaviorSubject(false);
         this.currentCall = new BehaviorSubject(null);
-        this.currentCallState = new BehaviorSubject('none'); //in-progress, out-progress, none
+        this.currentCallState = new BehaviorSubject('none'); // 'incoming', 'in-progress', 'out-progress', 'none'
+        this._currentCall = null;
         this.callType = new BehaviorSubject('NIL');
         this.isIncomingCallPicked = new BehaviorSubject(false); // for both incoming and outgoing
         this.token = localStorage.getItem('ext_token');
@@ -1400,10 +1401,27 @@ class TwilioService {
                 });
                 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');
+                    });
+                    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);
@@ -1503,6 +1521,18 @@ class TwilioService {
         const params = new HttpParams().set('isoCode', isoCode);
         return this.http.get(environment.apiUrl + '/utilities/softphone/check/countryCode/' + dialledNo, httpOptions);
     }
+    /**
+     * Get the current active call
+     */
+    getCurrentCall() {
+        return this._currentCall;
+    }
+    /**
+     * Check if there's an active call
+     */
+    hasActiveCall() {
+        return this._currentCall !== null;
+    }
 }
 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' });
@@ -2196,10 +2226,8 @@ class DialboxComponent {
         this.isSmartDialCall = false;
         this.isInitialized = false;
         this.isMinimised = false;
-        // Initialize if dialpad is visible by default
-        if (!this.isDialpadHidden) {
-            this.initializeTwilio();
-        }
+        // Always initialize Twilio when component loads to receive calls immediately
+        this.initializeTwilio();
     }
     initializeTwilio() {
         if (this.isInitialized)
@@ -2210,17 +2238,93 @@ class DialboxComponent {
             return;
         }
         this.isInitialized = true;
+        console.log('Initializing Twilio service...');
         // Initialize Twilio service
         this.twilioService.initializeTwilioDevice();
+        // Check for any existing call first
+        const currentCall = this.twilioService.getCurrentCall();
+        if (currentCall) {
+            this.handleIncomingCall(currentCall);
+        }
         // Subscribe to incoming calls to show dialpad when call comes in
         const callSub = this.twilioService.currentCall.subscribe(call => {
             if (call) {
-                console.log('Incoming call received:', call);
+                console.log('Incoming call received in component:', call);
+                this.handleIncomingCall(call);
+            }
+        });
+        // Subscribe to call state changes
+        const callStateSub = this.twilioService.currentCallState.subscribe(state => {
+            console.log('Call state changed to:', state);
+            if (state === 'incoming' || state === 'in-progress') {
                 this.isCallInProgress = true;
-                this.isDialpadHidden = false; // Show dialpad on incoming call
+                this._isDialpadHidden = false; // Force show the dialpad for incoming/active calls
+            }
+            else if (state === 'none') {
+                this.isCallInProgress = false;
             }
         });
         this.subscriptions.add(callSub);
+        this.subscriptions.add(callStateSub);
+    }
+    handleIncomingCall(call) {
+        console.log('Handling incoming call:', call);
+        // Update call state
+        this.isCallInProgress = true;
+        // Force show the dialpad by directly setting the private field
+        // to bypass any setter logic that might prevent showing it
+        this._isDialpadHidden = false;
+        // Update call data
+        const callerNumber = call.parameters['From'] || 'Unknown';
+        const callerName = call.parameters['CallerName'] || 'Unknown Caller';
+        this.callData = {
+            ...this.callData,
+            phone: callerNumber,
+            name: callerName,
+            img: 'assets/images/user.jpg',
+            isIncomingCall: true,
+            dial: true
+        };
+        // Add to incoming calls list if not already present
+        const callExists = this.newIncomingCalls.some((c) => c.parameters['CallSid'] === call.parameters['CallSid']);
+        if (!callExists) {
+            this.newIncomingCalls = [...this.newIncomingCalls, call];
+            this.incomingCallsList = [...this.newIncomingCalls];
+        }
+        // Emit event to notify parent components
+        this.incomingCallInitiated.emit();
+        // Set up call event handlers if not already set
+        if (!call.listenerCount('accept')) {
+            call.on('accept', () => {
+                console.log('Call accepted:', call.parameters['CallSid']);
+                this.isCallInProgress = true;
+                this._isDialpadHidden = false; // Ensure dialpad stays open
+            });
+        }
+        if (!call.listenerCount('disconnect')) {
+            call.on('disconnect', () => {
+                console.log('Call disconnected:', call.parameters['CallSid']);
+                this.isCallInProgress = false;
+                // Remove from incoming calls list
+                this.incomingCallsList = this.incomingCallsList.filter((item) => item.parameters['CallSid'] !== call.parameters['CallSid']);
+                this.newIncomingCalls = this.newIncomingCalls.filter((item) => item.parameters['CallSid'] !== call.parameters['CallSid']);
+                // If no more calls, reset the state
+                if (this.incomingCallsList.length === 0) {
+                    this.isCallInProgress = false;
+                    // Don't hide the dialpad if there are no more calls
+                    // Let the user decide when to close it
+                }
+            });
+        }
+        if (!call.listenerCount('cancel')) {
+            call.on('cancel', () => {
+                console.log('Call cancelled by caller:', call.parameters['CallSid']);
+                this.isCallInProgress = false;
+                // Remove from incoming calls list
+                this.incomingCallsList = this.incomingCallsList.filter((item) => item.parameters['CallSid'] !== call.parameters['CallSid']);
+                this.newIncomingCalls = this.newIncomingCalls.filter((item) => item.parameters['CallSid'] !== call.parameters['CallSid']);
+            });
+        }
     }
     // ngOnChange() {
     //   this.initializeTwilio();