hof 19.13.4-betav7 → 19.13.4-betav8

package/model/index.js

@@ -2,6 +2,7 @@
 'use strict';
 
 const _ = require('lodash');
+const requestJS = require('request');
 const url = require('url');
 const EventEmitter = require('events').EventEmitter;
 
@@ -16,58 +17,36 @@ function timeDiff(from, to, d) {
   return +ms.toFixed(digits);
 }
 
-/*
-async function fetchRequest(settings, callback) {
-  //Fetch doesn't like undefined headers
-  settings.headers = settings.headers || [];
-  var response = await fetch(settings.uri, settings);
-  var responseText = await response.text();
-  var responseObj = { status: response.status, statusCode: response.status, statusText: response.statusText, body: responseText };
-  if(response.ok) {
-    callback(null,responseObj);
+function fetchRequest(settings, callback) {
+  if(!!settings.isUpload || 
+    (settings.formData && settings.formData.document && settings.formData.document.options && settings.formData.document.options.filename)
+  ) {
+    //We're currently continuing to use requestJS for uploads as the Node Fetch API doesn't work with Multer
+    //TODO: Remove this once Fetch is compatible with Multer
+    //We can either pass in the isUpload flag or we'll assume it's an upload since we've passed a document with options and a filename
+    requestJS(settings, (err, response) => {
+      callback(err,response);
+    });
   } else {
-    callback({ status: response.status, code: response.status, message: response.statusText },responseObj);  
+    //Fetch doesn't like undefined headers
+    settings.headers = settings.headers || [];
+    settings.uri = settings.uri || settings.url || url.format(settings);
+    let response;
+    console.log(settings);
+    fetch(settings.uri, settings).then((_response) => {
+      response = _response;
+    })
+    .then(() => response.text())
+    .then((responseText) => {
+      var result = { status: response.status, statusCode: response.status, statusText: response.statusText, body: responseText };
+      if(response.ok) {
+        callback(null,result);
+      } else {
+        callback({ status: response.status, code: response.status, message: response.statusText }, result);  
+      }
+    });
   }
 }
-*/
-
-/*
-function fetchRequest(settings, callback) {
-  //Fetch doesn't like undefined headers
-  settings.headers = settings.headers || [];
-  settings.uri = settings.uri || settings.url || url.format(settings);
-  fetch(settings.uri, settings).then(async function(response) {
-    var responseText = await response.text();
-    var responseObj = { status: response.status, statusCode: response.status, statusText: response.statusText, body: responseText };
-    if(response.ok) {
-      callback(null,responseObj);
-    } else {
-      callback({ status: response.status, code: response.status, message: response.statusText },responseObj);  
-      //callback({ status: response.status, code: response.status, message: response.statusText },responseObj);  
-    }
-    //return { status: response.status, statusCode: response.status, statusText: response.statusText, body: responseText };
-  })
-*/
-
-function fetchRequest(settings, callback) {
-  //Fetch doesn't like undefined headers
-  settings.headers = settings.headers || [];
-  settings.uri = settings.uri || settings.url || url.format(settings);
-  let response;
-  console.log(settings);
-  fetch(settings.uri, settings).then((gottenResponse) => {
-    response = gottenResponse;
-  })
-  .then(() => response.text())
-  .then((responseText) => {
-    var result = { status: response.status, statusCode: response.status, statusText: response.statusText, body: responseText };
-    if(response.ok) {
-      callback(null,result);
-    } else {
-      callback({ status: response.status, code: response.status, message: response.statusText }, result);  
-    }
-  });
-}
 
 const urlKeys = Object.keys(url.parse(''));
 
@@ -139,21 +118,6 @@ module.exports = class Model extends EventEmitter {
   }
   
   request(originalSettings, body, callback) {
-    /*
-    async function fetchRequest(settings, callback) {
-      //Fetch doesn't like undefined headers
-      settings.headers = settings.headers || [];
-      var response = await fetch(settings.uri, settings);
-      var responseText = await response.text();
-      var responseObj = { status: response.status, statusCode: response.status, statusText: response.statusText, body: responseText };
-      if(response.ok) {
-        callback(null,responseObj);
-      } else {
-        callback({ status: response.status, code: response.status, message: response.statusText },responseObj);  
-      }
-    }
-    */
-
     if (typeof body === 'function' && arguments.length === 2) {
       callback = body;
       body = undefined;
@@ -206,11 +170,11 @@ module.exports = class Model extends EventEmitter {
 
           fetchRequest(settings, (err, response) => {
             if (err) {
-              if (err.status === 408) {
+              if (err.status === 408 || err.code === 'ETIMEDOUT' || err.code === 'ESOCKETTIMEDOUT') {
                 err.message = 'Connection timed out';
                 err.status = 504;
               }
-              err.status = err.status || (response && response.status) || 503;
+              err.status = err.status || err.statusCode || (response && response.status) || 503;
               return _callback(err, null, err.status);
             }
             return this.handleResponse(response, (error, data, status) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hof",
   "description": "A bootstrap for HOF projects",
-  "version": "19.13.4-betav7",
+  "version": "19.13.4-betav8",
   "license": "MIT",
   "main": "index.js",
   "author": "HomeOffice",