Merge pull request #23 from aymenn/utils-tests

Utils tests

Author: cweems

.gitignore

@@ -1,4 +1,5 @@
 node_modules
 .env.local
 .env
-launch.json
+launch.json
+coverage/

src/utils/addParticipant.util.ts

@@ -1,10 +1,12 @@
 import retry from 'async-retry';
 import client from "../twilioClient";
 import { ParticipantInstance, ParticipantListInstanceCreateOptions } from "twilio/lib/rest/conversations/v1/conversation/participant";
+import { retryConfig } from '../config/retry.config';
 
 export const addParticipant = async (
   conversationSid: string,
-  participant: ParticipantListInstanceCreateOptions
+  participant: ParticipantListInstanceCreateOptions,
+  retryOptions = retryConfig
 ) : Promise<ParticipantInstance> => {
   return retry(async (quit) => {
     try {
@@ -16,12 +18,13 @@ export const addParticipant = async (
       return createdParticipant
     } catch (err) {
       if (err.status !== 429) {
+        console.log('Quit without retry')
         quit(new Error(err));
         return;
       }
 
       console.log('Re-trying on 429 error');
       throw new Error(err);
     }
-  })
+  }, retryOptions)
 }

src/utils/deleteConversation.util.ts

@@ -1,20 +1,24 @@
 import client from "../twilioClient"
 
 import retry from 'async-retry'
+import { retryConfig } from "../config/retry.config";
 
-export const deleteConversation = async (conversationSid: string) : Promise<boolean> => {
+export const deleteConversation = async (conversationSid: string, retryOptions = retryConfig) : Promise<boolean> => {
   return retry(async(quit) => {
     try {
+      console.log(client['conversations']['conversations']['remove'])
       await client.conversations.conversations(conversationSid).remove()
       return true
     } catch (err) {
       if (err.status !== 429) {
-        quit(new Error(err));
+        console.log('Quit without retry')
+        console.log(err)
+        quit(new Error('Quit without retry'));
         return;
       }
 
       console.log('Re-trying on 429 error');
       throw new Error(err);
     } 
-  })
+  }, retryOptions)
 }

src/utils/getConversationByAddressPair.util.ts

@@ -1,25 +1,21 @@
 import { ParticipantConversationInstance } from 'twilio/lib/rest/conversations/v1/participantConversation';
 import retry from 'async-retry'
 import client from '../twilioClient'
+import { retryConfig } from '../config/retry.config';
 
-export const getConversationByAddressPair = async (address: string, proxyAddress: string) : Promise<ParticipantConversationInstance> => {
+export const getConversationByAddressPair = async (address: string, proxyAddress: string, retryOptions = retryConfig) : Promise<ParticipantConversationInstance> => {
   return retry(async(quit) => {
     try {
-      if (address === undefined) {
-        throw "getOpenConversationsForAddressPair: address is missing";
-      }
-    
       const participantConversations = await client.conversations.v1
         .participantConversations
         .list({ address: address });
-    
+      
       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}`);
           return p;
         }
       });
-    
       return conversation;
     } catch(err) {
       if (err.status !== 429) {
@@ -30,5 +26,5 @@ export const getConversationByAddressPair = async (address: string, proxyAddress
       console.log('Re-trying on 429 error');
       throw new Error(err);
     }
-  })
+  }, retryOptions)
 }

src/utils/index.ts

@@ -6,4 +6,4 @@ export * from "./retryAddParticipant.util"
 export * from "./listConversationParticipants.util"
 export * from "./participantsToDial.util"
 export * from "./getConversationByAddressPair.util"
-export * from "./generateConferenceName.util"
+export * from "./generateConferenceName.util"

src/utils/listConversationParticipants.util.ts

@@ -1,8 +1,9 @@
 import retry from 'async-retry'
 import { ParticipantInstance } from 'twilio/lib/rest/conversations/v1/conversation/participant'
 import client from '../twilioClient'
+import { retryConfig } from '../config/retry.config'
 
-export const listConversationParticipants = async (conversation: string) : Promise<ParticipantInstance[]> => {
+export const listConversationParticipants = async (conversation: string, retryOptions = retryConfig) : Promise<ParticipantInstance[]> => {
   return retry(async (quit) => {
     try {
       const participants = await client.conversations
@@ -20,6 +21,6 @@ export const listConversationParticipants = async (conversation: string) : Promi
       console.log('Re-trying on 429 error');
       throw new Error(err);
     }
-  })
+  }, retryOptions)
 
 }

src/utils/listParticipantConversations.util.ts

@@ -1,21 +1,24 @@
 import retry from 'async-retry'
 import { ParticipantConversationInstance } from 'twilio/lib/rest/conversations/v1/participantConversation'
 import client from '../twilioClient'
+import { retryConfig } from "../config/retry.config";
 
-export const listParticipantConversations = async (phoneNumber: string) : Promise<ParticipantConversationInstance[]> => {
+export const listParticipantConversations = async (phoneNumber: string, retryOptions = retryConfig) : Promise<ParticipantConversationInstance[]> => {
   return retry(async (quit) => {
     try {
       const activeConversations = await client.conversations.participantConversations.list({address: phoneNumber})
       return activeConversations
     } catch (err) {
       if (err.status !== 429) {
-        quit(new Error(err));
+        console.log('Quit without retry')
+        console.log(err)
+        quit(new Error('Quit without retry'));
         return;
       }
 
       console.log('Re-trying on 429 error');
       throw new Error(err);
     }
-  })
+  }, retryOptions)
 
 }

src/utils/participantsToDial.util.ts

@@ -5,12 +5,12 @@ export const participantsToDial = (participants: Array<ParticipantInstance>, fro
 
   const output = participants.reduce((result, p) => {
     if (p.messagingBinding.type === "sms" && p.messagingBinding.address != from) {
-        console.log(`Adding ${p.messagingBinding.address} to list of numbers to dial.\n`)
-  
-        result.push({
-            address: p.messagingBinding.address,
-            proxyAddress: p.messagingBinding.proxy_address
-        })
+      console.log(`Adding ${p.messagingBinding.address} to list of numbers to dial.\n`)
+
+      result.push({
+          address: p.messagingBinding.address,
+          proxyAddress: p.messagingBinding.proxy_address
+      })
     }
 
     return result;

src/utils/retryAddParticipant.util.ts

@@ -1,29 +1,25 @@
 import { addParticipant } from "./addParticipant.util"
 
-export const retryAddParticipant = async (conversationSid: string, participantAddress: string, proxyAddresses: Array<string>) => {
-  try {
-    while(proxyAddresses.length > 0) {
-      try {
-        const participant = {
-          'messagingBinding.address': participantAddress,
-          'messagingBinding.proxyAddress': proxyAddresses[0]
-        } as any
-  
-        return addParticipant(conversationSid, participant)
+export async function retryAddParticipant(conversationSid: string, participantAddress: string, proxyAddresses: Array<string>) {
+  if(proxyAddresses.length < 1) {
+    throw new Error(`No available proxy addresses for ${participantAddress}`)
+  }
 
-      } catch(err) {
-        if (err.code === 50416) {
-          const remainingProxyAddresses = proxyAddresses.shift()
-          retryAddParticipant(conversationSid, participantAddress, remainingProxyAddresses as any)
-        }
-        console.log(err)
-        throw new Error(err)
-      }
-    }
+  try {
+    const participant = {
+      'messagingBinding.address': participantAddress,
+      'messagingBinding.proxyAddress': proxyAddresses[0]
+    } as any
 
-    throw new Error(`No proxy addresses available for ${participantAddress}`)
+    const result = await addParticipant(conversationSid, participant)
+    return result
   } catch(err) {
-    console.log(err)
-    throw new Error(err)
+    if (err.code === 50416) {
+      proxyAddresses.shift()
+      return retryAddParticipant(conversationSid, participantAddress, proxyAddresses)
+    } else {
+      console.log(err)
+      throw new Error(err)
+    }
   }
 }

tests/loadtest.js

@@ -16,10 +16,16 @@ async function makeRequest(contacts) {
 
   return new Promise((resolve, reject) => {
 
+    const stringBuffer = new Buffer.from(`${process.env.AUTH_USERNAME}:${process.env.AUTH_PASSWORD}`, "utf-8")
+    const basicAuthToken = stringBuffer.toString('base64')
+
     fetch(`http://localhost:${port}/sessions`, {
       method: 'post',
       body: JSON.stringify(body),
-      headers: {'Content-Type': 'application/json'}
+      headers: {
+        'Content-Type': 'application/json',
+        'Authorization': `Basic ${basicAuthToken}`
+      }
     })
     .then(res => {
       const data = res.json()
@@ -39,13 +45,13 @@ async function runTest() {
   let results = [];
   try {
     const requests = [];
-    for (let i = 0; i < 300; ++i) {
+    for (let i = 0; i < 1000; ++i) {
       const contacts = ['+1925215'+ ('0000'+i).slice(-4), '+1925635'+ ('0000'+i).slice(-4)];
       console.log(contacts)
 
       const promise = makeRequest(contacts)
       requests.push(promise);
-      await sleep(2)
+      await sleep(100)
     }
 
     results = await Promise.allSettled(requests);