fixed error handling

Author: epoberezkin

index.js

@@ -66,7 +66,8 @@ function jsonscriptProxy(options) {
       return new (options.Promise || Promise)(function (resolve, reject) {
         request[args.method](opts, function (err, resp) {
           if (err) return reject(err);
-          resolve(processResponse(resp, args));
+          try { resolve(processResponse(resp, args)); }
+          catch(e) { reject(e); }
         });
       });
     }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsonscript-proxy",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Proxy server for scripted processing of other services using JSONScript",
   "main": "index.js",
   "scripts": {

spec/proxy_handler.spec.js

@@ -205,7 +205,7 @@ describe('jsonscript proxy handler', function() {
   });
 
   describe('error handling', function() {
-    it('should return error if script is invalid', function() {
+    it('should return error if script is invalid', function (done) {
       send({
         script: {
           $exec: 'service1',
@@ -216,7 +216,7 @@ describe('jsonscript proxy handler', function() {
           $wrongProperty: true
         }
       }, function (err, resp) {
-        assert(!!err);
+        assert.equal(err.message, 'expected 200 "OK", got 400 "Bad Request"');
         assert.equal(resp.statusCode, 400);
         assert.equal(resp.body.error, 'script is invalid');
         done();
@@ -299,6 +299,23 @@ describe('jsonscript proxy handler', function() {
           done();
         });
       });
+
+      it('should return error if statusCode is >= 300', function (done) {
+        send({
+          script: {
+            '$$service1.get': { path: '/object/1/error' }
+          }
+        }, function (err, resp) {
+          assert.equal(err.message, 'expected 200 "OK", got 500 "Internal Server Error"');
+          assert.deepEqual(JSON.parse(resp.body.error), {
+            name: 'object',
+            id: 1,
+            service: 'service1',
+            info: 'resource object id 1'
+          });
+          done();
+        });
+      });
     });
   });
 

spec/service.js

@@ -11,15 +11,18 @@ module.exports = function startService(serviceName, port) {
   app.use(bodyParser.json());
 
   app.get('/api/:name/:id', function (req, res) {
-    var id = req.params.id;
-    send(res, req.params.name, id);
+    send(res, req.params.name, req.params.id);
   });
 
   app.post('/api/:name', function (req, res) {
     var id = Date.now();
     send(res, req.params.name, id, req.body);
   });
 
+  app.get('/api/:name/:id/error', function (req, res) {
+    send(res.status(500), req.params.name, req.params.id);
+  });
+
 
   function send(res, name, id, data) {
     res.send({