Add support for changing room type

Author: Tim Mendoza

src/commands/rtc/apps/video/deploy.js

@@ -42,6 +42,12 @@ DeployCommand.flags = Object.assign(
       default: false,
       description: 'Override an existing App deployment',
     }),
+    'room-type': flags.enum({
+      options: ['group', 'group-small', 'peer-to-peer'],
+      description: 'Type of room to use',
+      required: false,
+      default: 'group',
+    }),
   },
   TwilioClientCommand.flags
 );

src/helpers.js

@@ -81,9 +81,11 @@ async function getAppInfo() {
 
   const passcodeVar = variables.find(v => v.key === 'API_PASSCODE');
   const expiryVar = variables.find(v => v.key === 'API_PASSCODE_EXPIRY');
+  const roomTypeVar = variables.find(v => v.key === 'ROOM_TYPE');
 
   const passcode = passcodeVar ? passcodeVar.value : '';
   const expiry = expiryVar ? expiryVar.value : '';
+  const roomType = roomTypeVar ? roomTypeVar.value : '';
 
   const fullPasscode = getPasscode(environment.domainName, passcode);
 
@@ -93,6 +95,7 @@ async function getAppInfo() {
     sid: app.sid,
     passcode: fullPasscode,
     hasAssets: Boolean(assets.length),
+    roomType,
   };
 }
 
@@ -107,8 +110,13 @@ async function displayAppInfo() {
   if (appInfo.hasAssets) {
     console.log(`Web App URL: ${appInfo.url}`);
   }
+
   console.log(`Passcode: ${appInfo.passcode.replace(/(\d{3})(\d{3})(\d{4})(\d{4})/, '$1 $2 $3 $4')}`);
   console.log(`Expires: ${appInfo.expiry}`);
+
+  if (appInfo.roomType) {
+    console.log(`Room Type: ${appInfo.roomType}`);
+  }
 }
 
 async function deploy() {
@@ -151,6 +159,7 @@ TWILIO_API_SECRET = the secret for the API Key`);
       TWILIO_API_KEY_SECRET: this.twilioClient.password,
       API_PASSCODE: pin,
       API_PASSCODE_EXPIRY: expiryTime,
+      ROOM_TYPE: this.flags['room-type'],
     },
     pkgJson: {},
     functionsEnv: 'dev',

src/video-token-server.js

@@ -5,14 +5,15 @@ const AccessToken = Twilio.jwt.AccessToken;
 const VideoGrant = AccessToken.VideoGrant;
 const MAX_ALLOWED_SESSION_DURATION = 14400;
 
-module.exports.handler = (context, event, callback) => {
+module.exports.handler = async (context, event, callback) => {
   const {
     ACCOUNT_SID,
     TWILIO_API_KEY_SID,
     TWILIO_API_KEY_SECRET,
     API_PASSCODE,
     API_PASSCODE_EXPIRY,
     DOMAIN_NAME,
+    ROOM_TYPE,
   } = context;
 
   const { user_identity, room_name, passcode } = event;
@@ -30,20 +31,18 @@ module.exports.handler = (context, event, callback) => {
           'The passcode used to validate application users has expired. Re-deploy the application to refresh the passcode.',
       },
     });
-    callback(null, response);
-    return;
+    return callback(null, response);
   }
 
-  if (API_PASSCODE + appID + serverlessID !== passcode) {
+  if (API_PASSCODE + appID + serverlessID !== passcode.replace(/\s+/g, '')) {
     response.setStatusCode(401);
     response.setBody({
       error: {
         message: 'passcode incorrect',
         explanation: 'The passcode used to validate application users is incorrect.',
       },
     });
-    callback(null, response);
-    return;
+    return callback(null, response);
   }
 
   if (!user_identity) {
@@ -54,8 +53,24 @@ module.exports.handler = (context, event, callback) => {
         explanation: 'The user_identity parameter is missing.',
       },
     });
-    callback(null, response);
-    return;
+    return callback(null, response);
+  }
+
+  const client = context.getTwilioClient();
+
+  try {
+    await client.video.rooms.create({ uniqueName: room_name, type: ROOM_TYPE });
+  } catch (e) {
+    if (e.code !== 53113) {
+      response.setStatusCode(401);
+      response.setBody({
+        error: {
+          message: 'error creating room',
+          explanation: 'Something went wrong when creating a room.',
+        },
+      });
+      return callback(null, response);
+    }
   }
 
   const token = new AccessToken(ACCOUNT_SID, TWILIO_API_KEY_SID, TWILIO_API_KEY_SECRET, {
@@ -65,6 +80,6 @@ module.exports.handler = (context, event, callback) => {
   const videoGrant = new VideoGrant({ room: room_name });
   token.addGrant(videoGrant);
   response.setStatusCode(200);
-  response.setBody({ token: token.toJwt() });
-  callback(null, response);
+  response.setBody({ token: token.toJwt(), room_type: ROOM_TYPE });
+  return callback(null, response);
 };