Validated multi-party conferencing is working, pull request cleanup

Author: cweems

src/controllers/conversationsPreEvent.ts

@@ -1,5 +1,4 @@
 export * as conversationsPostEvent from "./conversationsPostEvent";
-export * as conversationsPreEvent from "./conversationsPreEvent";
 export * as inboundCall from "./inboundCall";
 export * as session from "./session";
 export * as joinConference from "./joinConference"

src/controllers/index.ts

@@ -12,17 +12,24 @@ export const post = async (
   req: Request<{}, {}, SessionPostBody>,
   res: Response
 ) => {
-  const phoneNumbers = req.body.addresses;
-  const activeProxyAddresses = await getActiveProxyAddresses(phoneNumbers);
-  const proxyAddresses = await matchAvailableProxyAddresses(activeProxyAddresses);
-  const conversation = await createConversation(req.body)
 
   try {
-    await addParticipantsToConversation(conversation.sid, proxyAddresses)
-    res.setHeader('content-type', 'application/json');
-    return res.status(200).send(`${JSON.stringify(conversation)}`);
+    const phoneNumbers = req.body.addresses;
+    const activeProxyAddresses = await getActiveProxyAddresses(phoneNumbers);
+    const proxyAddresses = await matchAvailableProxyAddresses(activeProxyAddresses);
+    const conversation = await createConversation(req.body)
+    
+    try {
+      await addParticipantsToConversation(conversation.sid, proxyAddresses)
+      res.setHeader('content-type', 'application/json');
+      return res.status(200).send(`${JSON.stringify(conversation)}`);
+    } catch(err) {
+      await deleteConversation(conversation.sid);
+      return res.status(500).send(`${conversation.sid} failed to create session: ${err}`)
+    }
+
   } catch(err) {
-    await deleteConversation(conversation.sid);
-    return res.status(500).send(`${conversation.sid} failed to create session: ${err}`)
-  }
+    return res.status(500).send(`Failed to create session: ${err}`)
+  }   
+
 };

src/controllers/session.ts

@@ -3,7 +3,6 @@ import * as controllers from "../controllers";
 
 const router = Router();
 
-router.post("/conversations-pre-event", controllers.conversationsPreEvent.post);
 router.post("/conversations-post-event", controllers.conversationsPostEvent.post);
 
 router.post("/inbound-call", controllers.inboundCall.post);

src/routes/index.ts

@@ -52,7 +52,12 @@ export const generateTwiml = async (from: string, to: string) => {
           });
       });
 
-      await Promise.all(callPromises)
+      try {
+        await Promise.all(callPromises)
+      } catch(err) {
+        console.log(err)
+        throw new Error(err)
+      }
 
       const dial = response.dial();
       dial.conference({

src/services/inboundCall.service.ts

@@ -10,7 +10,6 @@ export const getConversationByAddressPair = async (address: string, proxyAddress
     .participantConversations
     .list({ address: address });
 
-  console.log(participantConversations)
   const conversation = participantConversations.find(p => {
     if (p.conversationState !== 'closed' && p.participantMessagingBinding.proxy_address === proxyAddress) {
       console.log(`Found a non-closed conversation ${p.conversationSid} with proxy address ${p.participantMessagingBinding.proxy_address} for address ${address}`);

src/services/index.ts

@@ -3,6 +3,11 @@ import { ParticipantConversationInstance } from 'twilio/lib/rest/conversations/v
 import client from '../twilioClient'
 
 export const listParticipantConversations = async (phoneNumber: string) : Promise<ParticipantConversationInstance[]> => {
-  const activeConversations = await client.conversations.participantConversations.list({address: phoneNumber})
-  return activeConversations
+  try {
+    const activeConversations = await client.conversations.participantConversations.list({address: phoneNumber})
+    return activeConversations
+  } catch (err) {
+    console.log(phoneNumber, err)
+    throw new Error(err)
+  }
 }