hmpo-model 4.0.1 → 4.0.2

package/lib/model-error.js

@@ -0,0 +1,51 @@
+
+class ModelError extends Error {
+    constructor(e) {
+        super(e);
+        Object.defineProperties(this, {
+            original: {
+                value: e,
+                enumerable: false,
+                writable: false,
+                configurable: true,
+            },
+            name: {
+                value: e.name,
+                enumerable: false,
+                writable: true,
+                configurable: true,
+            },
+            code: {
+                value: e.code,
+                enumerable: false,
+                writable: true,
+                configurable: true,
+            },
+            errno: {
+                value: e.errno,
+                enumerable: false,
+                writable: true,
+                configurable: true,
+            },
+            info: {
+                get: () => this.original.info,
+                enumerable: false,
+                configurable: true
+            },
+            stack: {
+                get: () => this.original.stack,
+                enumerable: false,
+                configurable: true
+            },
+        });
+        this.code = e.code;
+
+        if (this.code === 'ETIMEDOUT') {
+            this.message = 'Connection timed out';
+            this.status = 504;
+        }
+        this.status = this.status || (e.response && e.response.statusCode) || 503;
+    }
+}
+
+module.exports = ModelError;

package/lib/remote-model.js

@@ -5,6 +5,7 @@ const LocalModel = require('./local-model');
 const got = require('got');
 const kebabCase = require('lodash.kebabcase');
 const { URL } = require('url');
+const ModelError = require('./model-error');
 
 const DEFAULT_TIMEOUT = 60000;
 
@@ -174,20 +175,19 @@ class RemoteModel extends LocalModel {
         };
 
         this.got(settings)
-            .catch(err => {
-                debug('request got error', err);
-                setResponseTime();
-                if (err.code === 'ETIMEDOUT') {
-                    err.message = 'Connection timed out';
-                    err.status = 504;
-                }
-                err.status = err.status || (err.response && err.response.statusCode) || 503;
-                return _callback(err, null, err.status, err.response);
-            })
             .then(response => {
                 debug('request got response', response);
                 setResponseTime();
                 this.handleResponse(response, _callback);
+            })
+            .catch(err => {
+                setResponseTime();
+                if (err.code === 'ERR_NON_2XX_3XX_RESPONSE' && err.response) {
+                    return this.handleResponse(err.response, _callback);
+                }
+                err = new ModelError(err);
+                debug('request got error', err);
+                _callback(err, null, err.status);
             });
     }
 
@@ -199,7 +199,7 @@ class RemoteModel extends LocalModel {
         } catch (err) {
             err.status = response.statusCode;
             err.body = response.body;
-            return callback(err, null, response.statusCode);
+            return callback(err, null, err.status);
         }
         this.parseResponse(response.statusCode, data, callback);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hmpo-model",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "description": "Simple model for interacting with http/rest apis.",
   "main": "index.js",
   "scripts": {

package/test/lib/spec.remote-model.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const Model = require('../../lib/remote-model');
+const ModelError = require('../../lib/model-error');
 const BaseModel = require('../../lib/local-model');
 const logger = require('hmpo-logger');
 
@@ -649,9 +650,16 @@ describe('Remote Model', () => {
                     settings: settings,
                     statusCode: 418,
                     responseTime: sinon.match.number,
-                    err: error,
+                    err: sinon.match.instanceOf(ModelError),
                     data: null
                 });
+                model.logError.args[0][0].err.should.include({
+                    name: 'Error',
+                    message: 'Error: Lorem Ipsum',
+                    status: 418,
+                    info: undefined,
+                });
+                model.logError.args[0][0].err.stack.should.be.a('string');
             });
 
             it('should emit a fail event', () => {
@@ -659,15 +667,17 @@ describe('Remote Model', () => {
 
                 model.emit.should.have.been.calledWithExactly(
                     'fail',
-                    sinon.match({
-                        message: error.message,
-                        status: 418
-                    }),
+                    sinon.match.instanceOf(ModelError),
                     null,
                     settings,
                     418,
                     sinon.match.number
                 );
+                model.emit.args[1][1].should.include({
+                    name: 'Error',
+                    message: 'Error: Lorem Ipsum',
+                    status: 418,
+                });
             });
 
             it('should translate timeout errors with status codes', () => {
@@ -679,11 +689,14 @@ describe('Remote Model', () => {
                     settings: settings,
                     statusCode: 504,
                     responseTime: sinon.match.number,
-                    err: sinon.match({
-                        message: 'Connection timed out'
-                    }),
+                    err: sinon.match.instanceOf(ModelError),
                     data: null
                 });
+                model.logError.args[0][0].err.should.include({
+                    name: 'Error',
+                    message: 'Connection timed out',
+                    status: 504
+                });
             });
 
             it('should translate errors without status codes', () => {
@@ -695,12 +708,14 @@ describe('Remote Model', () => {
                     settings: settings,
                     statusCode: 503,
                     responseTime: sinon.match.number,
-                    err: sinon.match({
-                        message: error.message,
-                        status: 503,
-                    }),
+                    err: sinon.match.instanceOf(ModelError),
                     data: null
                 });
+                model.logError.args[0][0].err.should.include({
+                    name: 'Error',
+                    message: 'Error: Lorem Ipsum',
+                    status: 503
+                });
             });
 
             it('should fire fail hook', () => {
@@ -713,11 +728,44 @@ describe('Remote Model', () => {
                     settings: settings,
                     statusCode: 418,
                     responseTime: sinon.match.number,
-                    err: error,
+                    err: sinon.match.instanceOf(ModelError),
                     data: null
                 });
                 hook.should.have.been.calledOn(model);
             });
+
+            it('should handle response for ERR_NON_2XX_3XX_RESPONSE errors', () => {
+                error.code = 'ERR_NON_2XX_3XX_RESPONSE';
+                error.response = {
+                    'body': JSON.stringify({'data': 'value'}),
+                    'statusCode': 404
+                };
+
+                model.request(settings, cb);
+                console.log(model.logError.args[0][0]);
+                model.logError.should.have.been.calledWithExactly({
+                    settings: settings,
+                    statusCode: 404,
+                    responseTime: sinon.match.number,
+                    err: {
+                        status: 404,
+                        data: 'value'
+                    },
+                    data: { data: 'value' }
+                });
+
+                cb.should.have.been.calledWithExactly(
+                    {
+                        status: 404,
+                        data: 'value'
+                    },
+                    {
+                        data: 'value'
+                    },
+                    sinon.match.number
+                );
+            });
+
         });
 
         context('on success', () => {