@vgroup/dialbox 0.1.98 → 0.1.99

package/fesm2020/vgroup-dialbox.mjs

@@ -2,7 +2,7 @@ import * as i0 from '@angular/core';
 import { Injectable, EventEmitter, Component, Input, Output, ViewChild, Inject, NgModule } from '@angular/core';
 import swal from 'sweetalert2';
 import { AsYouType } from 'libphonenumber-js';
-import { throwError, BehaviorSubject, of, interval, Subscription } from 'rxjs';
+import { throwError, BehaviorSubject, forkJoin, of, interval, Subscription } from 'rxjs';
 import * as i1 from '@angular/common/http';
 import { HttpHeaders, HttpParams, HttpClientModule } from '@angular/common/http';
 import { catchError, switchMap, map, tap, shareReplay } from 'rxjs/operators';
@@ -535,6 +535,38 @@ class ExtensionService {
         const httpOptions = { headers: new HttpHeaders(params) };
         return this.http.put(environment.apiUrl + '/utilities/softphone/update/callerid/label', dtModel, httpOptions);
     }
+    // initiateCall(payload: any): Observable<any> {
+    //   return this.fetchBlockedCountries().pipe(
+    //     switchMap(blockedCountries => {
+    //       return this.ipAddressService.getIpAddressInfo().pipe(
+    //         switchMap(ipAddressInfo => {
+    //             const params = {
+    //               'Content-Type': 'application/json',
+    //               'Auth-Key': 'Bearer ' + localStorage.getItem('ext_token'),
+    //               'ip-address': ipAddressInfo.ip,
+    //               'ip-country': ipAddressInfo.address.country,
+    //             };
+    //             payload = {...payload, proxy:ipAddressInfo.proxy.toString()}
+    //             const httpOptions = { headers: new HttpHeaders(params) };
+    //             return this.http.post<[]>(environment.apiUrl + '/utilities/ext/ur/initiate/call', payload, httpOptions).pipe(
+    //               catchError(error => {
+    //                 return throwError(error);
+    //               }), 
+    //             );
+    //             return this.http.post<[]>(environment.apiUrl + '/ur/initiate/conference/call', payload, httpOptions).pipe(
+    //               catchError(error => {
+    //                 return throwError(error);
+    //               }), 
+    //             );
+    //         }),
+    //         catchError(error => {
+    //           // Catch error from getIpAddressInfo
+    //           return throwError(error);
+    //         })
+    //       );
+    //     })
+    //   );
+    // }
     initiateCall(payload) {
         return this.fetchBlockedCountries().pipe(switchMap(blockedCountries => {
             return this.ipAddressService.getIpAddressInfo().pipe(switchMap(ipAddressInfo => {
@@ -544,15 +576,18 @@ class ExtensionService {
                     'ip-address': ipAddressInfo.ip,
                     'ip-country': ipAddressInfo.address.country,
                 };
+                const params1 = {
+                    "from": payload.from,
+                    "to": payload.to,
+                    "userId": payload.userId
+                };
                 payload = { ...payload, proxy: ipAddressInfo.proxy.toString() };
                 const httpOptions = { headers: new HttpHeaders(params) };
-                return this.http.post(environment.apiUrl + '/utilities/ext/ur/initiate/call', payload, httpOptions).pipe(catchError(error => {
-                    return throwError(error);
-                }));
-            }), catchError(error => {
-                // Catch error from getIpAddressInfo
-                return throwError(error);
-            }));
+                const api1$ = this.http.post(`${environment.apiUrl}/utilities/ext/ur/initiate/call`, payload, httpOptions);
+                const api2$ = this.http.post(`${environment.apiUrl}/ur/initiate/conference/call`, params1, httpOptions);
+                // Run both requests in parallel
+                return forkJoin([api1$, api2$]).pipe(catchError(error => throwError(() => error)));
+            }), catchError(error => throwError(() => error)));
         }));
     }
     fetchBlockedCountries() {
@@ -2138,10 +2173,6 @@ class CallProgressComponent {
                 name: callerName,
                 img: callerImg
             };
-            // Ensure UI flags are properly set
-            this.isConcurrentIncoming = false;
-            this.incomingCallDiv = false;
-            this.showRingAnimation = false;
             // Restart timer for the resumed call
             this.startTimer();
             this.disbaleEndCallBtn = false;
@@ -2296,7 +2327,6 @@ class CallProgressComponent {
             this.incomingCallDiv = false;
             const incomingDetail = this.extensionService.getCallSid();
             this.incomingRecordCall = incomingDetail.recordCall;
-            // Start recording if the call is answered and recording is enabled
             if (this.incomingRecordCall) {
                 this.startRecording();
             }
@@ -2307,49 +2337,12 @@ class CallProgressComponent {
         }
         else {
             // incoming call rejected or auto-cancelled
-            console.log('Incoming call rejected/cancelled');
-            console.log('Current call status:', this.call?.status());
-            console.log('Held call status:', this.heldCall?.status());
             this.isConcurrentIncoming = false;
             this.incomingCallDiv = false;
-            // Check if there's a held call that needs to be restored
-            if (this.heldCall && this.heldCall.status() === 'open') {
-                console.log('Restoring held call to active');
-                // Make held call the active call
-                this.call = this.heldCall;
-                this.heldCall = undefined;
-                this.isCallOnHold = false;
-                // Unmute the resumed call
-                this.call.mute(false);
-                this.isMute = false;
-                // Update UI with the resumed call info
-                const fromNumber = this.call.parameters['From'];
-                const callerName = this.call.customParameters?.get('name') || '-';
-                const callerImg = this.call.customParameters?.get('image') || 'assets/images/user.jpg';
-                this.callData = {
-                    ...this.callData,
-                    phone: fromNumber,
-                    displayNum: fromNumber,
-                    name: callerName,
-                    img: callerImg
-                };
-                this.disbaleEndCallBtn = false;
-                this.showRingAnimation = false;
-                console.log('Held call restored successfully');
-            }
-            // Check if there's an active call (for cases where incoming was rejected before being answered)
-            else if (this.call && this.call.status() === 'open') {
-                console.log('Active call exists, keeping UI visible');
-                // Just ensure UI flags are correct to show the active call
-                this.disbaleEndCallBtn = false;
-                this.showRingAnimation = false;
-            }
-            // No active or held call - completely end
-            else {
-                console.log('No active or held call, ending completely');
+            // If there is NO active call, then propagate end. Otherwise keep ongoing UI.
+            if (!this.call || this.call.status() !== 'open') {
                 this.endCallEvent.emit();
             }
-            this.cdr.detectChanges();
         }
     }
     clearInputs() {
@@ -2410,7 +2403,7 @@ class CallProgressComponent {
         this.extensionService.pauseOrResumeRecording(sid, 'pause').subscribe(response => {
             this.stopRecordingTimer();
             this.isPaused = true;
-        }, error => {
+        }, (error) => {
             console.error('Error pausing recording:', error);
             // Consider updating the UI to show the error state
         });