Fix potential hard timeouts (#2072)

celo-org · Dec 5, 2019 · ddb7f4a · ddb7f4a
1 parent 6980fd8
commit ddb7f4a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/packages/web/server-env-config.js.enc b/packages/web/server-env-config.js.enc
diff --git a/packages/web/server/EventHelpers.ts b/packages/web/server/EventHelpers.ts
@@ -1,8 +1,8 @@
-import airtableInit, { AirRecord } from '../server/airtable'
-
 import getConfig from 'next/config'
 import { EventProps } from '../fullstack/EventProps'
 import Sentry from '../fullstack/sentry'
+import airtableInit, { AirRecord } from '../server/airtable'
+import { abort } from '../src/utils/abortableFetch'
 const TABLE_NAME = 'Community Calendar'
 // Intermediate step Event With all String Values
 interface IncomingEvent {
@@ -57,7 +57,10 @@ export interface RawAirTableEvent {
 }
 
 export default async function getFormattedEvents() {
-  const eventData = await fetchEventsFromAirtable()
+  const eventData = await Promise.race([
+    fetchEventsFromAirtable(),
+    abort('Events from Airtable', 1000),
+  ])
   return splitEvents(normalizeEvents(eventData as RawAirTableEvent[]))
 }
 

diff --git a/packages/web/server/index.ts b/packages/web/server/index.ts
@@ -169,13 +169,21 @@ function wwwRedirect(req, res, nextAction) {
   })
 
   server.get('/proxy/medium', async (_, res) => {
-    const articlesdata = await getFormattedMediumArticles()
-    res.json(articlesdata)
+    try {
+      const articlesdata = await getFormattedMediumArticles()
+      res.json(articlesdata)
+    } catch (e) {
+      res.status(e.statusCode || 500).json({ message: e.message || 'unknownError' })
+    }
   })
 
   server.get('/proxy/events/', async (_, res) => {
-    const events = await getFormattedEvents()
-    res.json(events)
+    try {
+      const events = await getFormattedEvents()
+      res.json(events)
+    } catch (e) {
+      res.status(e.statusCode || 500).json({ message: e.message || 'unknownError' })
+    }
   })
 
   server.get('*', (req, res) => {

diff --git a/packages/web/src/utils/abortableFetch.ts b/packages/web/src/utils/abortableFetch.ts
@@ -4,10 +4,10 @@ export default async function abortableFetch(url: string, options = {}) {
   return Promise.race([fetch(url, { ...options }), abort(url)])
 }
 
-export async function abort(url: string, milliseconds = 800) {
+export async function abort(message: string, milliseconds = 800) {
   return new Promise((_, reject) =>
     setTimeout(() => {
-      reject(new Error(`from abortableFetch: Took to Long to Fetch ${url}`))
+      reject(new Error(`from abortableFetch: Took to Long to Fetch ${message}`))
     }, milliseconds)
   )
 }