Add error codes to api responses

knolleary · knolleary · commit fbfc5c8a2d5b · 2015-03-31T22:29:42.000+01:00
diff --git a/red/api/flows.js b/red/api/flows.js
@@ -34,7 +34,7 @@ module.exports = {
         }).otherwise(function(err) {
             log.warn("Error saving flows : "+err.message);
             log.warn(err.stack);
-            res.json(500,{message:err.message});
+            res.json(500,{error:"unexpected_error", message:err.message});
         });
     }
 }
diff --git a/red/api/index.js b/red/api/index.js
@@ -32,7 +32,7 @@ var settings = require("../settings");
 
 var errorHandler = function(err,req,res,next) {
     console.log(err.stack);
-    res.json(400,{message:err.toString()});
+    res.json(400,{error:"unexpected_error", message:err.toString()});
 };
 
 function init(adminApp,storage) {
diff --git a/red/api/library.js b/red/api/library.js
@@ -57,7 +57,7 @@ function createLibrary(type) {
                     res.send(403);
                     return;
                 }
-                res.json(500,{message:err.toString()});
+                res.json(500,{error:"unexpected_error", message:err.toString()});
             });
         });
     }
diff --git a/red/api/nodes.js b/red/api/nodes.js
@@ -37,20 +37,20 @@ module.exports = {
 
     post: function(req,res) {
         if (!settings.available()) {
-            res.json(400,{message:"Settings unavailable"});
+            res.json(400,{error:"settings_unavailable", message:"Settings unavailable"});
             return;
         }
         var node = req.body;
         var promise;
         if (node.module) {
             var module = redNodes.getModuleInfo(node.module);
             if (module) {
-                res.json(400,{message:"Module already loaded"});
+                res.json(400,{error:"module_already_loaded", message:"Module already loaded"});
                 return;
             }
             promise = server.installModule(node.module);
         } else {
-            res.json(400,{message:"Invalid request"});
+            res.json(400,{error:"invalid_request", message:"Invalid request"});
             return;
         }
         promise.then(function(info) {
@@ -59,14 +59,14 @@ module.exports = {
             if (err.code === 404) {
                 res.send(404);
             } else {
-                res.json(400,{message:err.toString()});
+                res.json(400,{error:err.code||"unexpected_error", message:err.toString()});
             }
         });
     },
 
     delete: function(req,res) {
         if (!settings.available()) {
-            res.json(400,{message:"Settings unavailable"});
+            res.json(400,{error:"settings_unavailable", message:"Settings unavailable"});
             return;
         }
         var mod = req.params.mod;
@@ -83,12 +83,10 @@ module.exports = {
             promise.then(function() {
                 res.send(204);
             }).otherwise(function(err) {
-            console.log(err.stack);
-                    res.json(400,{message:err.toString()});
+                res.json(400,{error:err.code||"unexpected_error", message:err.toString()});
             });
         } catch(err) {
-            console.log(err.stack);
-            res.json(400,{message:err.toString()});
+            res.json(400,{error:err.code||"unexpected_error", message:err.toString()});
         }
     },
 
@@ -122,12 +120,12 @@ module.exports = {
 
     putSet: function(req,res) {
         if (!settings.available()) {
-            res.json(400,{message:"Settings unavailable"});
+            res.json(400,{error:"settings_unavailable", message:"Settings unavailable"});
             return;
         }
         var body = req.body;
         if (!body.hasOwnProperty("enabled")) {
-            res.json(400,{message:"Invalid request"});
+            res.json(400,{error:"invalid_request", message:"Invalid request"});
             return;
         }
         try {
@@ -141,18 +139,18 @@ module.exports = {
                 res.json(putNode(node, body.enabled));
             }
         } catch(err) {
-            res.json(400,{message:err.toString()});
+            res.json(400,{error:err.code||"unexpected_error", message:err.toString()});
         }
     },
 
     putModule: function(req,res) {
         if (!settings.available()) {
-            res.json(400,{message:"Settings unavailable"});
+            res.json(400,{error:"settings_unavailable", message:"Settings unavailable"});
             return;
         }
         var body = req.body;
         if (!body.hasOwnProperty("enabled")) {
-            res.json(400,{message:"Invalid request"});
+            res.json(400,{error:"invalid_request", message:"Invalid request"});
             return;
         }
         try {
@@ -186,7 +184,7 @@ module.exports = {
             }
             res.json(redNodes.getModuleInfo(mod));
         } catch(err) {
-            res.json(400,{message:err.toString()});
+            res.json(400,{error:err.code||"unexpected_error", message:err.toString()});
         }
     }
 };
diff --git a/red/nodes/index.js b/red/nodes/index.js
@@ -74,7 +74,9 @@ function checkTypeInUse(id) {
         });
         if (nodesInUse.length > 0) {
             var msg = nodesInUse.join(", ");
-            throw new Error("Type in use: "+msg);
+            var err = new Error("Type in use: "+msg);
+            err.code = "type_in_use";
+            throw err;
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ module.exports = {`
`34`	`34`	`}).otherwise(function(err) {`
`35`	`35`	`log.warn("Error saving flows : "+err.message);`
`36`	`36`	`log.warn(err.stack);`
`37`		`- res.json(500,{message:err.message});`
	`37`	`+ res.json(500,{error:"unexpected_error", message:err.message});`
`38`	`38`	`});`
`39`	`39`	`}`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ function createLibrary(type) {`
`57`	`57`	`res.send(403);`
`58`	`58`	`return;`
`59`	`59`	`}`
`60`		`- res.json(500,{message:err.toString()});`
	`60`	`+ res.json(500,{error:"unexpected_error", message:err.toString()});`
`61`	`61`	`});`
`62`	`62`	`});`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,9 @@ function checkTypeInUse(id) {`
`74`	`74`	`});`
`75`	`75`	`if (nodesInUse.length > 0) {`
`76`	`76`	`var msg = nodesInUse.join(", ");`
`77`		`- throw new Error("Type in use: "+msg);`
	`77`	`+ var err = new Error("Type in use: "+msg);`
	`78`	`+ err.code = "type_in_use";`
	`79`	`+ throw err;`
`78`	`80`	`}`
`79`	`81`	`}`
`80`	`82`	`}`