Merge branch 'release/3.3.0'

yentsun · Mar 30, 2018 · cd53227 · cd53227
2 parents 1d18142 + 92bc9c7
commit cd53227
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+[3.3.0] - 2018-03-30
+--------------------
+- [x] Add custom error class #8
+
+
 [3.2.2] - 2018-03-30
 --------------------
 - [x] Change `nats` to `tasu` @ logger

diff --git a/index.js b/index.js
@@ -3,6 +3,7 @@ const {EventEmitter} = require('events');
 const merge = require('lodash/merge');
 const hyperid = require('hyperid');
 const Logger = require('./lib/logger');
+const RequestError = require('./lib/RequestError');
 
 
 module.exports = class extends EventEmitter {
@@ -126,12 +127,12 @@ module.exports = class extends EventEmitter {
             this._nats.requestOne(subject, JSON.stringify(message), null, this._options.requestTimeout, (response) => {
                 if (response.code && response.code === nats.REQ_TIMEOUT) {
                     this._logger.error('[!!', id, '!!] timeout', subject, message);
-                    reject(new Error('response timeout'));
+                    reject(new RequestError('response timeout', id));
                 } else {
                     const [error, res] = JSON.parse(response);
                     if (error) {
                         this._logger.error('[!!', id, '!!] ', error.message, error.stack);
-                        reject(new Error(error.message));
+                        reject(new RequestError(error.message, id));
                     } else {
                         const meta = JSON.parse(JSON.stringify(res));
                         this._logger.debug('[<<', id, '<<]', subject, meta);

diff --git a/lib/RequestError.js b/lib/RequestError.js
@@ -0,0 +1,10 @@
+module.exports = class RequestError extends Error {
+
+    constructor (message, requestId) {
+
+        super(message || 'request error');
+        this.name = this.constructor.name;
+        Error.captureStackTrace(this, this.constructor);
+        this.requestId = requestId;
+    }
+};
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tasu",
-  "version": "3.2.2",
+  "version": "3.3.0",
   "description": "A NATS-based message transport for Node.js services",
   "main": "index.js",
   "scripts": {

diff --git a/test.js b/test.js
@@ -74,6 +74,7 @@ describe('tasu: options set', () => {
                 await tasu.request('request.error', {foo: 'bar'});
             } catch (error) {
                 assert.equal(error.message, 'service error');
+                assert.isOk(error.requestId);
             }
         });
 
@@ -87,6 +88,7 @@ describe('tasu: options set', () => {
                 await tasu.request('request.error.detail', {foo: 'bar'});
             } catch (error) {
                 assert.equal(error.message, 'service error');
+                assert.isOk(error.requestId);
             }
         });
 
@@ -95,6 +97,7 @@ describe('tasu: options set', () => {
                 await tasu.request('request.timeout', {foo: 'bar'});
             } catch (error) {
                 assert.equal(error.message, 'response timeout');
+                assert.isOk(error.requestId);
             }
         }).timeout(110);
     });