@vgroup/dialbox 0.0.80 → 0.0.81

package/fesm2020/vgroup-dialbox.mjs

@@ -1366,14 +1366,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImpo
         }], ctorParameters: function () { return [{ type: TwilioService }]; } });
 
 class TwilioService {
-    constructor(http, extensionService, notificationService) {
+    constructor(http, extensionService, notificationSerivce) {
         this.http = http;
         this.extensionService = extensionService;
-        this.notificationService = notificationService;
+        this.notificationSerivce = notificationSerivce;
         this.openInProgressDialpad = new BehaviorSubject(false);
         this.currentCall = new BehaviorSubject(null);
-        this.currentCallState = new BehaviorSubject('none'); // 'incoming', 'in-progress', 'out-progress', 'none'
-        this._currentCall = null;
+        this.currentCallState = new BehaviorSubject('none'); //in-progress, out-progress, none
         this.callType = new BehaviorSubject('NIL');
         this.isIncomingCallPicked = new BehaviorSubject(false); // for both incoming and outgoing
         this.token = localStorage.getItem('ext_token');
@@ -1388,92 +1387,37 @@ class TwilioService {
         this.isAvailableNumber = new BehaviorSubject(false);
         this.callerIdList = new BehaviorSubject([]);
         this.triggerSMSReload = new BehaviorSubject(false);
-        this.isInitialized = false;
-        this.autoAnswer = false; // Default to manual answer
-        // Don't initialize here - let the component handle it
+        this.initializeTwilioDevice();
     }
     initializeTwilioDevice() {
-        return new Promise((resolve, reject) => {
-            if (this.device) {
-                console.log('Twilio device already initialized');
-                resolve();
-                return;
-            }
-            const token = localStorage.getItem('ext_token');
-            if (!token) {
-                const error = new Error('No authentication token found in localStorage');
-                console.error(error);
-                reject(error);
-                return;
-            }
-            // Store token in a const to ensure TypeScript knows it's not null
-            const authToken = token;
+        if (this.token) {
             this.extensionService.getIncomingCallToken().subscribe((data) => {
-                if (!data || !data.token) {
-                    const error = 'No token received from getIncomingCallToken';
-                    console.error(error);
-                    reject(new Error(error));
-                    return;
-                }
                 this.incomingCallToken = data.token;
                 localStorage.setItem('in-token', data.token);
-                try {
-                    this.device = new Device(authToken, {
-                        allowIncomingWhileBusy: true,
-                        // Add any other necessary options
-                    });
-                    // Setup device with token
-                    this.setupDevice(this.device);
-                    this.device.register();
-                    console.log('Twilio device initialized successfully');
-                    resolve();
-                }
-                catch (error) {
-                    console.error('Error initializing Twilio device:', error);
-                    reject(error);
-                }
-            });
-        });
-    }
-    setupDevice(device) {
-        device.on('incoming', (call) => {
-            console.log('Incoming call from:', call.parameters['From']);
-            this._currentCall = call;
-            this.currentCall.next(call);
-            this.currentCallState.next('incoming');
-            // Auto-answer if configured
-            if (this.autoAnswer) {
-                console.log('Auto-answering incoming call');
-                // Call accept() without promise chaining since it returns void
-                call.accept();
-                this.currentCallState.next('in-progress');
-            }
-            // Handle call end
-            call.on('disconnect', () => {
-                if (this._currentCall && this._currentCall.parameters['CallSid'] === call.parameters['CallSid']) {
-                    this._currentCall = null;
-                    this.currentCall.next(null);
-                    this.currentCallState.next('none');
-                }
-            });
-            // Handle call cancel
-            call.on('cancel', () => {
-                if (this._currentCall && this._currentCall.parameters['CallSid'] === call.parameters['CallSid']) {
-                    this._currentCall = null;
-                    this.currentCall.next(null);
-                    this.currentCallState.next('none');
-                }
+                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.notificationSerivce.showNotification(call);
+                });
+                this.device.on('error', (error) => {
+                    console.error('Twilio Device Error:', error);
+                    // Add error handling and reconnection logic
+                });
             });
-        });
-        device.on('error', (error) => {
-            console.error('Twilio Device Error:', error);
-            // Handle specific error codes if needed
-            if (error.code === 31201) { // Token expired
-                console.log('Token expired, attempting to refresh...');
-                this.initializeTwilioDevice();
-            }
-        });
+        }
     }
+    // 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);
@@ -1502,6 +1446,9 @@ class TwilioService {
         return this.http.get(environment.apiUrl + '/utilities/phonebook/favourite/contacts', httpOptions);
     }
     getRecentCalls(pageIndex, pageSize) {
+        // let params = new HttpParams();
+        // params = params.set('size', pageSize);
+        // params = params.set('page', pageIndex);
         const headers = { 'Content-Type': 'application/json', 'Auth-Key': "Bearer " + localStorage.getItem('ext_token') };
         const httpOptions = { headers };
         return this.http.get(environment.apiUrl + '/utilities/phonebook/recent/calls', httpOptions);
@@ -1532,6 +1479,14 @@ class TwilioService {
         };
         return this.http.post(environment.apiUrl + '/utilities/phonebook/delete/photo/' + id, payload, httpOptions);
     }
+    // toggleCallerIdAlertFn(val: any) {
+    //   let httpOptions = {
+    //     headers: new HttpHeaders({
+    //       'Auth-Key': "Bearer " + localStorage.getItem('ext_token')
+    //     })
+    //   };
+    //   return this.http.put<[]>(environment.apiUrl + '/utilities/softphone/callerid/alert/' + val, {}, httpOptions);
+    // }
     toggleCoutryCodeToast(val) {
         let httpOptions = {
             headers: new HttpHeaders({
@@ -1545,35 +1500,9 @@ class TwilioService {
             headers: new HttpHeaders({ 'Content-Type': 'application/json', 'Auth-Key': "Bearer " + localStorage.getItem('ext_token') }),
             params: new HttpParams().set('isoCode', isoCode)
         };
+        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;
-    }
-    /**
-     * Set whether to automatically answer incoming calls
-     * @param autoAnswer - Whether to automatically answer calls
-     */
-    setAutoAnswer(autoAnswer) {
-        this.autoAnswer = autoAnswer;
-    }
-    /**
-     * Toggle auto-answer for incoming calls
-     * @returns The new auto-answer state
-     */
-    toggleAutoAnswer() {
-        this.autoAnswer = !this.autoAnswer;
-        return this.autoAnswer;
-    }
 }
 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' });
@@ -2204,8 +2133,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImpo
 class DialboxComponent {
     set isDialpadHidden(value) {
         this._isDialpadHidden = value;
-        if (!value && !this.isInitialized) {
-            // When dialpad becomes visible, ensure Twilio is initialized if not already
+        if (!value) {
+            // When dialpad becomes visible, ensure Twilio is initialized
             this.initializeTwilio();
         }
     }
@@ -2267,106 +2196,31 @@ class DialboxComponent {
         this.isSmartDialCall = false;
         this.isInitialized = false;
         this.isMinimised = false;
-        // Initialize Twilio when component loads
-        this.token = localStorage.getItem('ext_token') || '';
-        if (this.token) {
+        // Initialize if dialpad is visible by default
+        if (!this.isDialpadHidden) {
             this.initializeTwilio();
         }
-        else {
-            console.warn('No auth token found, Twilio not initialized');
-        }
     }
     initializeTwilio() {
         if (this.isInitialized)
             return;
-        console.log('Initializing Twilio service...');
+        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.isInitialized = true;
-        // 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 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') {
+                console.log('Incoming call received:', call);
                 this.isCallInProgress = true;
-                this._isDialpadHidden = false; // Force show the dialpad for incoming/active calls
-            }
-            else if (state === 'none') {
-                this.isCallInProgress = false;
+                this.isDialpadHidden = false; // Show dialpad on incoming call
             }
         });
         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();