frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Add error codes to api responses

Browse Source
This commit is contained in:
Nick O'Leary 2015-03-31 22:29:15 +01:00
parent 31b018c80e
commit fbfc5c8a2d
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
red/api/flows.js
View File

@ -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});
});
}
}

2
red/api/index.js
View File

@ -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) {

2
red/api/library.js
View File

@ -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()});
});
});
}

28
red/api/nodes.js
View File

@ -37,7 +37,7 @@ 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;
@ -45,12 +45,12 @@ module.exports = {
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()});
}
}
};

4
red/nodes/index.js
View File

@ -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;
}
}
}