@vgroup/dialbox 0.2.62 → 0.2.63

package/fesm2020/vgroup-dialbox.mjs

@@ -2123,7 +2123,7 @@ class CallProgressComponent {
                         from: callData?.from,
                         route: "OUTGOING",
                         participantNumber: callData?.phone,
-                        conferenceId: response?.callauth?.id
+                        conferenceId: this.conferenceId
                     });
                 }, 1000);
                 // Poll the status for 30-45 seconds
@@ -2338,229 +2338,85 @@ class CallProgressComponent {
         this.isAddRemoveParticipant = !this.isAddRemoveParticipant;
         this.GetContactsList();
     }
-    // async callContact(contact: any) {
-    //   console.log('Adding contact to call:', contact);
-    //   // Check if there's an active call
-    //   if (!this.call || this.call.status() !== 'open') {
-    //     console.error('No active call to add participant to');
-    //     return;
-    //   }
-    //   // Get the phone number from the contact
-    //   const phoneNumber = contact.numbersList && contact.numbersList[0]?.number;
-    //   if (!phoneNumber) {
-    //     console.error('No phone number found for contact');
-    //     return;
-    //   }
-    //   try {
-    //     // Put current call on hold
-    //     if (this.call) {
-    //       this.heldCall = this.call;
-    //       this.isCallOnHold = true;
-    //       this.heldCall.mute(true);
-    //       console.log('Current call put on hold');
-    //     }
-    //     // Close contacts panel
-    //     this.showContactsPanel = false;
-    //     // Prepare new call data
-    //     const newCallData = {
-    //       phone: phoneNumber,
-    //       from: this.callData.from,
-    //       extNum: this.callData.extNum,
-    //       name: `${contact.firstName} ${contact.middleName || ''} ${contact.lastName || ''}`.trim(),
-    //       img: contact.img || 'assets/images/user.jpg',
-    //       displayNum: phoneNumber
-    //     };
-    //     // Initiate new call
-    //     this.showRingAnimation = true;
-    //     const payload = {
-    //       channelId: environment.channelId,
-    //       userId: localStorage.getItem('userId'),
-    //       to: phoneNumber,
-    //       scope: 'local',
-    //       fromNumber: this.callData.from
-    //     };
-    //     const response = await this.initiateCall(payload);
-    //     if (response.status == 200) {
-    //       const { id: callAuthId, recordCall } = await this.getCallAuthId(response);
-    //       this.getUserInformation(callAuthId);
-    //       this.recordCall = recordCall;
-    //       const tokenData: any = await this.getOutgoingCallToken(callAuthId);
-    //       // Connect to new call
-    //       const options: any = {
-    //         codecPreferences: ['opus', 'pcmu'],
-    //         closeProtection: true,
-    //       };
-    //       // Reuse existing Device if available; otherwise create and register once
-    //       if (!this.device) {
-    //         this.device = new Device(tokenData.token.value, options);
-    //         await this.device.register();
-    //       } else {
-    //         // Update token if Device supports it and token changed/rotated
-    //         try {
-    //           if ((this.device as any).updateToken) {
-    //             await (this.device as any).updateToken(tokenData.token.value);
-    //           }
-    //         } catch (e) {
-    //           console.warn('Device updateToken failed, proceeding with existing token', e);
-    //         }
-    //       }
-    //       const newCall = await this.device.connect({
-    //         params: {
-    //           From: this.callData.from,
-    //           To: phoneNumber,
-    //           Env: environment.abb,
-    //           Token: tokenData.token.id,
-    //           Ext: this.callData.extNum
-    //         },
-    //         rtcConstraints: { audio: { deviceId: 'default' } },
-    //       });
-    //       // Set new call as active
-    //       this.call = newCall;
-    //       this.callData = newCallData;
-    //       // Setup event listeners for new call
-    //       this.setupEventListeners();
-    //       // Poll call status
-    //       this.pollCallStatus(callAuthId);
-    //       console.log('New call initiated to:', phoneNumber);
-    //       this.cdr.detectChanges();
-    //     } else if (response.status == 201) {
-    //       swal("Error", response.message.join("<br/>"), "error");
-    //       // Restore held call if new call fails
-    //       if (this.heldCall) {
-    //         this.call = this.heldCall;
-    //         this.heldCall = undefined;
-    //         this.isCallOnHold = false;
-    //         this.call.mute(false);
-    //       }
-    //     }
-    //   } catch (error) {
-    //     console.error('Error adding participant:', error);
-    //     this.showRingAnimation = false;
-    //     // Restore held call on error
-    //     if (this.heldCall) {
-    //       this.call = this.heldCall;
-    //       this.heldCall = undefined;
-    //       this.isCallOnHold = false;
-    //       this.call.mute(false);
-    //     }
-    //     this.handleError(error);
-    //   }
-    // }
-    // acceptConcurrentCall(incomingCall: any) {
-    //   if (!incomingCall) return;
-    //   // Put current call on hold instead of disconnecting
-    //   if (this.call) {
-    //     this.heldCall = this.call;
-    //     this.isCallOnHold = true;
-    //     // Mute the held call
-    //     this.heldCall.mute(true);
-    //   }
-    //   incomingCall.accept();
-    //   this.call = incomingCall;
-    //   this.callData.phone = incomingCall.parameters['From'];
-    //   this.callData.name = incomingCall.customParameters?.get('name') || '-';
-    //   this.callData.img = incomingCall.customParameters?.get('image') || 'assets/images/user.jpg';
-    //   this.isConcurrentIncoming = false;
-    //   this.incomingCallDiv = false;
-    //   this.disbaleEndCallBtn = false;
-    //   // Reset timer for new call
-    //   this.stopTimer();
-    //   this.startTimer();
-    //   this.cdr.detectChanges();
-    // }
     async callContact(contact) {
-        console.log("Starting second call:", contact);
-        // Must have active Call A
-        if (!this.call || this.call.status() !== "open") {
-            console.error("No active call to start second call");
+        console.log('Adding participant:', contact);
+        // Check if there's an active call
+        if (!this.call || this.call.status() !== 'open') {
+            console.error('No active call');
+            swal("Error", "No active call found", "error");
             return;
         }
+        // Get the phone number from the contact
         const phoneNumber = contact?.numbersList?.[0]?.number;
         if (!phoneNumber) {
-            console.error("No phone number found");
+            console.error('No phone number found for contact');
             return;
         }
         try {
-            // ---- HOLD CALL A ----
+            // Put current call on hold
             this.heldCall = this.call;
             this.isCallOnHold = true;
             this.heldCall.mute(true);
-            console.log("Call A placed on hold");
+            // Close contacts panel and show ring animation
             this.showContactsPanel = false;
             this.showRingAnimation = true;
-            // ---- START CALL B ----
-            await this.startSecondOutboundCall(phoneNumber, contact);
+            // Get the conference ID from the current call or use the stored one
+            const conferenceId = this.conferenceId;
+            if (!conferenceId) {
+                console.error("No conferenceId found for active call");
+                swal("Error", "Cannot add participant: conference not found", "error");
+                this.showRingAnimation = false;
+                return;
+            }
+            // Add participant to the conference
+            await this.addParticipantToCall({
+                from: this.callData?.from,
+                route: "OUTGOING",
+                participantNumber: phoneNumber,
+                conferenceId: conferenceId
+            });
+            console.log("Participant added to conference:", phoneNumber);
             this.showRingAnimation = false;
-            console.log("Second call started successfully");
+            // Update UI to show conference mode
+            this.isConference = true;
+            // Show success message
+            swal("Success", "Participant is being added to your call", "success");
         }
-        catch (err) {
-            console.error("Error starting second call:", err);
-            // Restore call A
+        catch (error) {
+            console.error('Error adding participant:', error);
+            this.showRingAnimation = false;
+            // Restore held call on error
             if (this.heldCall) {
                 this.call = this.heldCall;
                 this.heldCall = undefined;
                 this.isCallOnHold = false;
                 this.call.mute(false);
             }
-            this.showRingAnimation = false;
-            swal("Error", "Failed to start second call", "error");
-        }
-    }
-    async startSecondOutboundCall(phoneNumber, contact) {
-        console.log("Dialing second call to", phoneNumber);
-        // 1️⃣ Prepare data for new call
-        const payload = {
-            channelId: environment.channelId,
-            userId: localStorage.getItem("userId"),
-            to: phoneNumber,
-            scope: "local",
-            fromNumber: this.callData.from
-        };
-        const response = await this.initiateCall(payload);
-        if (response.status !== 200) {
-            throw new Error("Backend failed to initiate call");
-        }
-        const { id: callAuthId, recordCall } = await this.getCallAuthId(response);
-        this.recordCall = recordCall;
-        const tokenData = await this.getOutgoingCallToken(callAuthId);
-        // 2️⃣ Setup Twilio Device (same as your current code)
-        const options = {
-            codecPreferences: ["opus", "pcmu"],
-            closeProtection: true,
-        };
-        if (!this.device) {
-            this.device = new Device(tokenData.token.value, options);
-            await this.device.register();
-        }
-        else if (this.device.updateToken) {
-            await this.device.updateToken(tokenData.token.value);
+            this.handleError(error);
         }
-        // 3️⃣ Start NEW CALL B
-        const newCall = await this.device.connect({
-            params: {
-                From: this.callData.from,
-                To: phoneNumber,
-                Env: environment.abb,
-                Token: tokenData.token.id,
-                Ext: this.callData.extNum
-            },
-            rtcConstraints: { audio: { deviceId: "default" } }
-        });
-        // 4️⃣ Set new call B as active call
-        this.call = newCall;
-        // Update call data UI
-        this.callData = {
-            phone: phoneNumber,
-            from: this.callData.from,
-            extNum: this.callData.extNum,
-            name: `${contact.firstName} ${contact.middleName || ""} ${contact.lastName || ""}`.trim(),
-            img: contact.img || "assets/images/user.jpg",
-            displayNum: phoneNumber
-        };
-        this.setupEventListeners();
-        this.pollCallStatus(callAuthId);
-        console.log("Call B is now active");
     }
+    // acceptConcurrentCall(incomingCall: any) {
+    //   if (!incomingCall) return;
+    //   // Put current call on hold instead of disconnecting
+    //   if (this.call) {
+    //     this.heldCall = this.call;
+    //     this.isCallOnHold = true;
+    //     // Mute the held call
+    //     this.heldCall.mute(true);
+    //   }
+    //   incomingCall.accept();
+    //   this.call = incomingCall;
+    //   this.callData.phone = incomingCall.parameters['From'];
+    //   this.callData.name = incomingCall.customParameters?.get('name') || '-';
+    //   this.callData.img = incomingCall.customParameters?.get('image') || 'assets/images/user.jpg';
+    //   this.isConcurrentIncoming = false;
+    //   this.incomingCallDiv = false;
+    //   this.disbaleEndCallBtn = false;
+    //   // Reset timer for new call
+    //   this.stopTimer();
+    //   this.startTimer();
+    //   this.cdr.detectChanges();
+    // }
     acceptConcurrentCall(incomingCall) {
         if (!incomingCall)
             return;
@@ -2618,43 +2474,14 @@ class CallProgressComponent {
         console.log('Updated callData:', this.callData);
         this.cdr.detectChanges();
     }
-    // mergeCalls() {
-    //   // Merge functionality - unmute both calls for conference
-    //   if (this.heldCall && this.call) {
-    //     this.heldCall.mute(false);
-    //     this.call.mute(false);
-    //     this.isCallOnHold = false;
-    //     this.isConference = true;
-    //     this.cdr.detectChanges();
-    //   }
-    // }
-    async mergeCalls() {
-        if (!this.conferenceId) {
-            swal("Error", "Unable to merge: conference ID missing", "error");
-            return;
-        }
-        if (!this.callData?.phone) {
-            swal("Error", "Second call number is missing", "error");
-            return;
-        }
-        try {
-            this.showRingAnimation = true;
-            const payload = {
-                from: this.callData.from,
-                route: "OUTGOING",
-                participantNumber: this.callData.phone,
-                conferenceId: this.conferenceId
-            };
-            console.log("Calling addParticipant API:", payload);
-            await this.addParticipantToCall(payload);
-            this.showRingAnimation = false;
+    mergeCalls() {
+        // Merge functionality - unmute both calls for conference
+        if (this.heldCall && this.call) {
+            this.heldCall.mute(false);
+            this.call.mute(false);
+            this.isCallOnHold = false;
             this.isConference = true;
-            swal("Success", "Calls have been merged", "success");
-        }
-        catch (error) {
-            console.error("Merge failed:", error);
-            this.showRingAnimation = false;
-            swal("Error", "Failed to merge calls", "error");
+            this.cdr.detectChanges();
         }
     }
     endHeldCall() {