Avoid blocking other requests while validating large output

holidayextras · Nov 16, 2017 · c21ba47 · c21ba47
1 parent aee1ba0
commit c21ba47
Showing 1 changed file with 24 additions and 16 deletions.
diff --git a/lib/responseHelper.js b/lib/responseHelper.js
@@ -21,7 +21,13 @@ responseHelper._enforceSchemaOnArray = (items, schema, callback) => {
   if (!(Array.isArray(items))) {
     items = [ items ]
   }
-  async.map(items, (item, done) => responseHelper._enforceSchemaOnObject(item, schema, done), (err, results) => {
+  // the validation process can take a lengthy amount of time when processing large responses.
+  // to prevent other requests from being blocked by this syncronous process, we break it up using
+  // setImmediate (see _enforceSchemaOnObject below), and force this map to run in series instead of in parallel.
+  // It really will not make much of a difference to individual requests, but
+  // splitting it up this way makes a HUGE difference if a small request arrives on the server while a large request's
+  // output is still being validated.
+  async.mapSeries(items, (item, done) => responseHelper._enforceSchemaOnObject(item, schema, done), (err, results) => {
     if (err) return callback(err)
 
     results = results.filter(result => !!result)
@@ -30,24 +36,26 @@ responseHelper._enforceSchemaOnArray = (items, schema, callback) => {
 }
 
 responseHelper._enforceSchemaOnObject = (item, schema, callback) => {
-  debug.validationOutput(JSON.stringify(item))
-  Joi.validate(item, schema, (err, sanitisedItem) => {
-    if (err) {
-      debug.validationError(err.message, JSON.stringify(item))
-      const res = {
-        status: '500',
-        code: 'EINVALIDITEM',
-        title: 'Item in response does not validate',
-        detail: {
-          item: item,
-          error: err.message
+  setImmediate(() => {
+    debug.validationOutput(JSON.stringify(item))
+    Joi.validate(item, schema, (err, sanitisedItem) => {
+      if (err) {
+        debug.validationError(err.message, JSON.stringify(item))
+        const res = {
+          status: '500',
+          code: 'EINVALIDITEM',
+          title: 'Item in response does not validate',
+          detail: {
+            item: item,
+            error: err.message
+          }
         }
+        return callback(res)
       }
-      return callback(res)
-    }
 
-    const dataItem = responseHelper._generateDataItem(sanitisedItem, schema)
-    return callback(null, dataItem)
+      const dataItem = responseHelper._generateDataItem(sanitisedItem, schema)
+      return callback(null, dataItem)
+    })
   })
 }