Use Promise.all when generating stream thumbnails

Author: DylanRodgers98

server/routes/events.js

@@ -500,39 +500,42 @@ router.get('/:eventId', async (req, res, next) => {
         return res.status(404).send(`Event (_id: ${escape(eventId)}) not found`);
     }
 
-    const stages = [];
-    for (const stage of event.stages) {
-        const streamKey = stage.streamInfo.streamKey;
-        const {data: {isLive}} = await axios.get(`http://localhost:${process.env.RTMP_SERVER_HTTP_PORT}/api/streams/live/${streamKey}`, {
-            headers: {Authorization: rtmpServer.auth.header}
-        });
+    const stages = await Promise.all(event.stages.map(stage => {
+        return async () => {
+            const streamKey = stage.streamInfo.streamKey;
+            const rtmpServerURL = `http://localhost:${process.env.RTMP_SERVER_HTTP_PORT}/api/streams/live/${streamKey}`;
+            const {data: {isLive}} = await axios.get(rtmpServerURL, {
+                headers: {Authorization: rtmpServer.auth.header}
+            });
 
-        let thumbnailURL;
-        if (isLive) {
-            try {
-                thumbnailURL = await getThumbnail(streamKey);
-            } catch (err) {
-                LOGGER.info('An error occurred when getting thumbnail for stream (stream key: {}). Returning splash thumbnail. Error: {}', streamKey, err);
+            let thumbnailURL;
+            if (isLive) {
+                try {
+                    thumbnailURL = await getThumbnail(streamKey);
+                } catch (err) {
+                    LOGGER.info('An error occurred when getting thumbnail for stream (stream key: {}). ' +
+                        'Returning splash thumbnail. Error: {}', streamKey, err);
+                    thumbnailURL = stage.getSplashThumbnailURL();
+                }
+            } else {
                 thumbnailURL = stage.getSplashThumbnailURL();
             }
-        } else {
-            thumbnailURL = stage.getSplashThumbnailURL();
-        }
 
-        stages.push({
-            _id: stage._id,
-            isLive,
-            stageName: stage.stageName,
-            thumbnailURL,
-            streamInfo: {
-                streamKey: stage.streamInfo.streamKey,
-                title: stage.streamInfo.title,
-                genre: stage.streamInfo.genre,
-                category: stage.streamInfo.category,
-                viewCount: stage.streamInfo.viewCount
-            }
-        });
-    }
+            return {
+                _id: stage._id,
+                isLive,
+                stageName: stage.stageName,
+                thumbnailURL,
+                streamInfo: {
+                    streamKey: stage.streamInfo.streamKey,
+                    title: stage.streamInfo.title,
+                    genre: stage.streamInfo.genre,
+                    category: stage.streamInfo.category,
+                    viewCount: stage.streamInfo.viewCount
+                }
+            };
+        };
+    }));
 
     const socketIOURL = (process.env.NODE_ENV === 'production' ? 'https' : 'http')
         + `://${process.env.SERVER_HOST}:${process.env.SOCKET_IO_PORT}?eventId=${eventId}`;

server/routes/livestreams.js

@@ -50,19 +50,21 @@ router.get('/', async (req, res, next) => {
     User.paginate(query, options, async (err, result) => {
         if (err) {
             LOGGER.error('An error occurred when finding User livestream info: {}', err);
-            next(err);
-        } else {
-            const streams = [];
-            for (const user of result.docs) {
+            return next(err);
+        }
+
+        const streams = await Promise.all(result.docs.map(user => {
+            return async () => {
                 const streamKey = user.streamInfo.streamKey;
                 let thumbnailURL;
                 try {
                     thumbnailURL = await getThumbnail(streamKey);
                 } catch (err) {
-                    LOGGER.info('An error occurred when getting thumbnail for stream (stream key: {}). Returning default thumbnail. Error: {}', streamKey, err);
+                    LOGGER.info('An error occurred when getting thumbnail for stream (stream key: {}). ' +
+                        'Returning default thumbnail. Error: {}', streamKey, err);
                     thumbnailURL = config.defaultThumbnailURL;
                 }
-                streams.push({
+                return {
                     username: user.username,
                     displayName: user.displayName,
                     profilePicURL: user.getProfilePicURL(),
@@ -72,13 +74,14 @@ router.get('/', async (req, res, next) => {
                     viewCount: user.streamInfo.viewCount,
                     startTime: user.streamInfo.startTime,
                     thumbnailURL
-                });
-            }
-            res.json({
-                streams,
-                nextPage: result.nextPage
-            });
-        }
+                };
+            };
+        }));
+
+        res.json({
+            streams,
+            nextPage: result.nextPage
+        });
     });
 });
 
@@ -151,28 +154,31 @@ router.get('/event-stages', async (req, res, next) => {
             return next(err);
         }
 
-        const streams = [];
-        for (const eventStage of result.docs) {
-            const streamKey = eventStage.streamInfo.streamKey;
-            let thumbnailURL;
-            try {
-                thumbnailURL = await getThumbnail(streamKey);
-            } catch (err) {
-                LOGGER.info('An error occurred when getting thumbnail for stream (stream key: {}). Returning default thumbnail. Error: {}', streamKey, err);
-                thumbnailURL = config.defaultThumbnailURL;
-            }
-            streams.push({
-                eventStageId: eventStage._id,
-                stageName: eventStage.stageName,
-                event: eventStage.event,
-                title: eventStage.streamInfo.title,
-                genre: eventStage.streamInfo.genre,
-                category: eventStage.streamInfo.category,
-                viewCount: eventStage.streamInfo.viewCount,
-                startTime: eventStage.streamInfo.startTime,
-                thumbnailURL
-            });
-        }
+        const streams = await Promise.all(result.docs.map(eventStage => {
+            return async () => {
+                const streamKey = eventStage.streamInfo.streamKey;
+                let thumbnailURL;
+                try {
+                    thumbnailURL = await getThumbnail(streamKey);
+                } catch (err) {
+                    LOGGER.info('An error occurred when getting thumbnail for stream (stream key: {}). ' +
+                        'Returning default thumbnail. Error: {}', streamKey, err);
+                    thumbnailURL = config.defaultThumbnailURL;
+                }
+                return {
+                    eventStageId: eventStage._id,
+                    stageName: eventStage.stageName,
+                    event: eventStage.event,
+                    title: eventStage.streamInfo.title,
+                    genre: eventStage.streamInfo.genre,
+                    category: eventStage.streamInfo.category,
+                    viewCount: eventStage.streamInfo.viewCount,
+                    startTime: eventStage.streamInfo.startTime,
+                    thumbnailURL
+                };
+            };
+        }));
+
         res.json({
             streams,
             nextPage: result.nextPage