@vgroup/dialbox 0.0.60 → 0.0.61

package/fesm2020/vgroup-dialbox.mjs

@@ -1294,10 +1294,83 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImpo
                 }]
         }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: IpAddressService }]; } });
 
+class NotificationService {
+    constructor(twilioService) {
+        this.twilioService = twilioService;
+        this.redirectUrl = window.location.href;
+        if ('serviceWorker' in navigator) {
+            navigator.serviceWorker.addEventListener('message', this.handleServiceWorkerMessage.bind(this));
+        }
+    }
+    showNotification(callData) {
+        this.twilioAuthId = callData.customParameters.get('twilioAuthId');
+        this.twilioCallData = callData;
+        const incomingNumber = callData.parameters.From;
+        const callerName = callData.customParameters.get('name');
+        const callerImage = callData.customParameters.get('image');
+        if (('serviceWorker' in navigator)) {
+            navigator.serviceWorker.ready.then((registration) => {
+                const options = {
+                    body: `Incoming call from ${callerName || incomingNumber}`,
+                    icon: callerImage,
+                    actions: [
+                        {
+                            action: 'accept',
+                            title: 'Accept',
+                            icon: '../../../assets/images/notification-icons/call-accept-icon.png'
+                        },
+                        {
+                            action: 'reject',
+                            title: 'Reject',
+                            icon: '../../../assets/images/notification-icons/call-reject-icon.jpg'
+                        }
+                    ],
+                    data: {
+                        url: this.redirectUrl,
+                    },
+                    requireInteraction: true,
+                };
+                registration.showNotification('Icoming Call', options);
+            });
+        }
+    }
+    handleServiceWorkerMessage(event) {
+        if (!event.data)
+            return;
+        switch (event.data.action) {
+            case 'accept':
+                this.onNotificationAccept();
+                break;
+            case 'reject':
+                this.onNotificationReject();
+                break;
+            default:
+                console.log('default action:');
+                break;
+        }
+    }
+    onNotificationAccept() {
+        this.twilioService.callhandleFromNotification.next({ callStatus: 'accept' });
+    }
+    onNotificationReject() {
+        this.twilioService.callhandleFromNotification.next({ callStatus: 'reject' });
+    }
+}
+NotificationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: NotificationService, deps: [{ token: TwilioService }], target: i0.ɵɵFactoryTarget.Injectable });
+NotificationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: NotificationService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: NotificationService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: TwilioService }]; } });
+
 class TwilioService {
-    constructor(http, extensionService) {
+    constructor(http, extensionService, notificationSerivce, twilioService) {
         this.http = http;
         this.extensionService = extensionService;
+        this.notificationSerivce = notificationSerivce;
+        this.twilioService = twilioService;
         this.openInProgressDialpad = new BehaviorSubject(false);
         this.currentCall = new BehaviorSubject(null);
         this.currentCallState = new BehaviorSubject('none'); //in-progress, out-progress, none
@@ -1315,26 +1388,53 @@ class TwilioService {
         this.isAvailableNumber = new BehaviorSubject(false);
         this.callerIdList = new BehaviorSubject([]);
         this.triggerSMSReload = new BehaviorSubject(false);
+        this.isTwilioConnected = false;
+        this.doNotDisturb = true;
         this.initializeTwilioDevice();
     }
     initializeTwilioDevice() {
-        if (this.token) {
+        // if (this.token) {
+        //   this.extensionService.getIncomingCallToken().subscribe((data: any) => {
+        //     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: Call) => {
+        //       this.currentCall.next(call);
+        //       this.callType.next('INCOMING');
+        //       this.currentCallState.next('incoming');
+        //       this.notificationSerivce.showNotification(call);
+        //     });
+        //     this.device.on('error', (error: any) => {
+        //       console.error('Twilio Device Error:', error);
+        //       // Add error handling and reconnection logic
+        //     });
+        //   });
+        // }
+        if (localStorage.getItem('in-token')) {
+            this.isTwilioConnected = true;
+            this.doNotDisturb = false;
             this.extensionService.getIncomingCallToken().subscribe((data) => {
-                this.incomingCallToken = data.token;
+                this.twilioService.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.isTwilioConnected = true;
+                if (!this.twilioService.incomingCallToken) {
+                    console.error('Cannot initialize Twilio device: No incoming call token available');
+                    return;
+                }
+                this.twilioService.device = new Device(this.twilioService.incomingCallToken, { allowIncomingWhileBusy: true });
+                this.twilioService.device.register();
+                this.twilioService.device.on('incoming', (call) => {
+                    this.twilioService.currentCall.next(call);
+                    this.twilioService.callType.next('INCOMING');
+                    this.notificationSerivce.showNotification(call);
+                    //this.twilioService.openInProgressDialpad.next(true);
                 });
-                this.device.on('error', (error) => {
-                    console.error('Twilio Device Error:', error);
-                    // Add error handling and reconnection logic
+                this.twilioService.device.on('error', (err) => {
+                    console.log(err);
                 });
             });
         }
@@ -1431,14 +1531,14 @@ class TwilioService {
         return this.http.get(environment.apiUrl + '/utilities/softphone/check/countryCode/' + dialledNo, httpOptions);
     }
 }
-TwilioService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: TwilioService, deps: [{ token: i1.HttpClient }, { token: ExtensionService }], target: i0.ɵɵFactoryTarget.Injectable });
+TwilioService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: TwilioService, deps: [{ token: i1.HttpClient }, { token: ExtensionService }, { token: NotificationService }, { token: TwilioService }], target: i0.ɵɵFactoryTarget.Injectable });
 TwilioService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: TwilioService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: TwilioService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: ExtensionService }]; } });
+        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: ExtensionService }, { type: NotificationService }, { type: TwilioService }]; } });
 
 const GlobalConstant = {
     ErrorMsg500: "Unable to process request. Please try again later.",
@@ -1446,77 +1546,6 @@ const GlobalConstant = {
     dedicatedNumText: 'C2C Number'
 };
 
-class NotificationService {
-    constructor(twilioService) {
-        this.twilioService = twilioService;
-        this.redirectUrl = window.location.href;
-        if ('serviceWorker' in navigator) {
-            navigator.serviceWorker.addEventListener('message', this.handleServiceWorkerMessage.bind(this));
-        }
-    }
-    showNotification(callData) {
-        this.twilioAuthId = callData.customParameters.get('twilioAuthId');
-        this.twilioCallData = callData;
-        const incomingNumber = callData.parameters.From;
-        const callerName = callData.customParameters.get('name');
-        const callerImage = callData.customParameters.get('image');
-        if (('serviceWorker' in navigator)) {
-            navigator.serviceWorker.ready.then((registration) => {
-                const options = {
-                    body: `Incoming call from ${callerName || incomingNumber}`,
-                    icon: callerImage,
-                    actions: [
-                        {
-                            action: 'accept',
-                            title: 'Accept',
-                            icon: '../../../assets/images/notification-icons/call-accept-icon.png'
-                        },
-                        {
-                            action: 'reject',
-                            title: 'Reject',
-                            icon: '../../../assets/images/notification-icons/call-reject-icon.jpg'
-                        }
-                    ],
-                    data: {
-                        url: this.redirectUrl,
-                    },
-                    requireInteraction: true,
-                };
-                registration.showNotification('Icoming Call', options);
-            });
-        }
-    }
-    handleServiceWorkerMessage(event) {
-        if (!event.data)
-            return;
-        switch (event.data.action) {
-            case 'accept':
-                this.onNotificationAccept();
-                break;
-            case 'reject':
-                this.onNotificationReject();
-                break;
-            default:
-                console.log('default action:');
-                break;
-        }
-    }
-    onNotificationAccept() {
-        this.twilioService.callhandleFromNotification.next({ callStatus: 'accept' });
-    }
-    onNotificationReject() {
-        this.twilioService.callhandleFromNotification.next({ callStatus: 'reject' });
-    }
-}
-NotificationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: NotificationService, deps: [{ token: TwilioService }], target: i0.ɵɵFactoryTarget.Injectable });
-NotificationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: NotificationService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: NotificationService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }], ctorParameters: function () { return [{ type: TwilioService }]; } });
-
 class IncomingCallComponent {
     constructor(extensionService, twilioService, notificationSerivce) {
         this.extensionService = extensionService;
@@ -2223,14 +2252,6 @@ class DialboxComponent {
         try {
             this.getContactList();
             this.getUserCallSetting();
-            // Subscribe to incoming calls and show dialpad when a call comes in
-            this.subscriptions.add(this.twilioService.currentCall.subscribe((call) => {
-                if (call && call.parameters && call.parameters.Direction === 'incoming') {
-                    // Show the dialpad when an incoming call is received
-                    this._isDialpadHidden = false;
-                    this.incomingCallInitiated.emit();
-                }
-            }));
             // Subscribe to dial number events
             const sub1 = this.twilioService.dialNumberFromOtherModule.subscribe((contact) => {
                 if (contact.number) {