@vgroup/dialbox 0.2.60 → 0.2.62

package/fesm2020/vgroup-dialbox.mjs

@@ -2110,6 +2110,7 @@ class CallProgressComponent {
                 scope: 'local',
             };
             const response = await this.initiateCall(payload);
+            this.conferenceId = response?.callauth?.id;
             if (response.status == 200) {
                 const { id: callAuthId, recordCall } = await this.getCallAuthId(response);
                 this.getUserInformation(callAuthId);
@@ -2337,118 +2338,114 @@ class CallProgressComponent {
         this.isAddRemoveParticipant = !this.isAddRemoveParticipant;
         this.GetContactsList();
     }
-    async callContact(contact) {
-        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 = await this.getOutgoingCallToken(callAuthId);
-                // Connect to new call
-                const options = {
-                    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.updateToken) {
-                            await this.device.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);
-        }
-    }
+    // 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
@@ -2471,6 +2468,99 @@ class CallProgressComponent {
     //   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");
+            return;
+        }
+        const phoneNumber = contact?.numbersList?.[0]?.number;
+        if (!phoneNumber) {
+            console.error("No phone number found");
+            return;
+        }
+        try {
+            // ---- HOLD CALL A ----
+            this.heldCall = this.call;
+            this.isCallOnHold = true;
+            this.heldCall.mute(true);
+            console.log("Call A placed on hold");
+            this.showContactsPanel = false;
+            this.showRingAnimation = true;
+            // ---- START CALL B ----
+            await this.startSecondOutboundCall(phoneNumber, contact);
+            this.showRingAnimation = false;
+            console.log("Second call started successfully");
+        }
+        catch (err) {
+            console.error("Error starting second call:", err);
+            // Restore call A
+            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);
+        }
+        // 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) {
         if (!incomingCall)
             return;
@@ -2528,14 +2618,43 @@ 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;
+    // 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;
             this.isConference = true;
-            this.cdr.detectChanges();
+            swal("Success", "Calls have been merged", "success");
+        }
+        catch (error) {
+            console.error("Merge failed:", error);
+            this.showRingAnimation = false;
+            swal("Error", "Failed to merge calls", "error");
         }
     }
     endHeldCall() {