Clean up API logic
This commit is contained in:
Andrew Stewart
parent
49b2e91daf
commit
34324dabd5
159
lib/api.js
159
lib/api.js
|
|
@ -20,25 +20,33 @@ namespace("Cylon", function() {
|
|||
master = null;
|
||||
|
||||
function ApiServer(opts) {
|
||||
var _this = this;
|
||||
if (opts == null) {
|
||||
opts = {};
|
||||
}
|
||||
var self = this;
|
||||
|
||||
if (opts == null) { opts = {}; }
|
||||
|
||||
this.host = opts.host || "127.0.0.1";
|
||||
this.port = opts.port || "3000";
|
||||
|
||||
master = opts.master;
|
||||
|
||||
this.server = express().http().io();
|
||||
|
||||
this.server.set('title', 'Cylon API Server');
|
||||
|
||||
this.server.use(express.json());
|
||||
this.server.use(express.urlencoded());
|
||||
this.server.use(express["static"](__dirname + "/../node_modules/robeaux/"));
|
||||
|
||||
this.server.get("/*", function(req, res, next) {
|
||||
res.set('Content-Type', 'application/json');
|
||||
return next();
|
||||
});
|
||||
|
||||
this.configureRoutes();
|
||||
|
||||
this.server.listen(this.port, this.host, function() {
|
||||
return Logger.info("" + (_this.server.get('title')) + " is listening on " + _this.host + ":" + _this.port);
|
||||
var title = self.server.get('title');
|
||||
Logger.info(title + " is listening on " + self.host + ":" + self.port);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -46,133 +54,124 @@ namespace("Cylon", function() {
|
|||
//
|
||||
// Returns an array of params
|
||||
ApiServer.prototype.parseCommandParams = function(req) {
|
||||
var param_container, params, v, _;
|
||||
params = [];
|
||||
param_container = {};
|
||||
var param_container = {},
|
||||
params = [];
|
||||
|
||||
if (req.method === 'GET' || Object.keys(req.query).length > 0) {
|
||||
param_container = req.query;
|
||||
} else if (typeof req.body === 'object') {
|
||||
param_container = req.body;
|
||||
}
|
||||
for (_ in param_container) {
|
||||
v = param_container[_];
|
||||
params.push(v);
|
||||
}
|
||||
|
||||
for (var p in param_container) { params.push(param_container[p]); }
|
||||
|
||||
return params;
|
||||
};
|
||||
|
||||
ApiServer.prototype.configureRoutes = function() {
|
||||
var _this = this;
|
||||
var self = this;
|
||||
|
||||
this.server.get("/robots", function(req, res) {
|
||||
var robot;
|
||||
return res.json((function() {
|
||||
var _i, _len, _ref, _results;
|
||||
_ref = master.robots;
|
||||
_results = [];
|
||||
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
|
||||
robot = _ref[_i];
|
||||
_results.push(robot.data());
|
||||
}
|
||||
return _results;
|
||||
})());
|
||||
var data = [];
|
||||
|
||||
for (var i = 0; i < master.robots.length; i++) {
|
||||
var robot = master.robots[i];
|
||||
data.push(robot.data());
|
||||
}
|
||||
|
||||
res.json(data);
|
||||
});
|
||||
|
||||
this.server.get("/robots/:robotname", function(req, res) {
|
||||
return master.findRobot(req.params.robotname, function(err, robot) {
|
||||
return res.json(err ? err : robot.data());
|
||||
master.findRobot(req.params.robotname, function(err, robot) {
|
||||
res.json(err ? err : robot.data());
|
||||
});
|
||||
});
|
||||
|
||||
this.server.get("/robots/:robotname/commands", function(req, res) {
|
||||
return master.findRobot(req.params.robotname, function(err, robot) {
|
||||
return res.json(err ? err : robot.data().commands);
|
||||
master.findRobot(req.params.robotname, function(err, robot) {
|
||||
res.json(err ? err : robot.data().commands);
|
||||
});
|
||||
});
|
||||
|
||||
this.server.all("/robots/:robotname/commands/:commandname", function(req, res) {
|
||||
var params;
|
||||
params = _this.parseCommandParams(req);
|
||||
return master.findRobot(req.params.robotname, function(err, robot) {
|
||||
var result;
|
||||
if (err) {
|
||||
return res.json(err);
|
||||
}
|
||||
result = robot[req.params.commandname].apply(robot, params);
|
||||
return res.json({
|
||||
result: result
|
||||
});
|
||||
var params = self.parseCommandParams(req);
|
||||
|
||||
master.findRobot(req.params.robotname, function(err, robot) {
|
||||
if (err) { return res.json(err); }
|
||||
|
||||
var result = robot[req.params.commandname].apply(robot, params);
|
||||
res.json({ result: result });
|
||||
});
|
||||
});
|
||||
|
||||
this.server.get("/robots/:robotname/devices", function(req, res) {
|
||||
return master.findRobot(req.params.robotname, function(err, robot) {
|
||||
return res.json(err ? err : robot.data().devices);
|
||||
master.findRobot(req.params.robotname, function(err, robot) {
|
||||
res.json(err ? err : robot.data().devices);
|
||||
});
|
||||
});
|
||||
|
||||
this.server.get("/robots/:robotname/devices/:devicename", function(req, res) {
|
||||
var devicename, robotname, _ref;
|
||||
_ref = [req.params.robotname, req.params.devicename], robotname = _ref[0], devicename = _ref[1];
|
||||
return master.findRobotDevice(robotname, devicename, function(err, device) {
|
||||
return res.json(err ? err : device.data());
|
||||
var robotname = req.params.robotname,
|
||||
devicename = req.params.devicename;
|
||||
|
||||
master.findRobotDevice(robotname, devicename, function(err, device) {
|
||||
res.json(err ? err : device.data());
|
||||
});
|
||||
});
|
||||
|
||||
this.server.get("/robots/:robotname/devices/:devicename/commands", function(req, res) {
|
||||
var devicename, robotname, _ref;
|
||||
_ref = [req.params.robotname, req.params.devicename], robotname = _ref[0], devicename = _ref[1];
|
||||
return master.findRobotDevice(robotname, devicename, function(err, device) {
|
||||
return res.json(err ? err : device.data().commands);
|
||||
var robotname = req.params.robotname,
|
||||
devicename = req.params.devicename;
|
||||
|
||||
master.findRobotDevice(robotname, devicename, function(err, device) {
|
||||
res.json(err ? err : device.data().commands);
|
||||
});
|
||||
});
|
||||
|
||||
this.server.all("/robots/:robot/devices/:device/commands/:commandname", function(req, res) {
|
||||
var commandname, devicename, params, robotname;
|
||||
params = [req.params.robot, req.params.device, req.params.commandname];
|
||||
robotname = params[0], devicename = params[1], commandname = params[2];
|
||||
params = _this.parseCommandParams(req);
|
||||
return master.findRobotDevice(robotname, devicename, function(err, device) {
|
||||
var result;
|
||||
if (err) {
|
||||
return res.json(err);
|
||||
}
|
||||
result = device[commandname].apply(device, params);
|
||||
return res.json({
|
||||
result: result
|
||||
});
|
||||
var robotname = req.params.robot,
|
||||
devicename = req.params.device,
|
||||
commandname = req.params.commandname;
|
||||
|
||||
var params = self.parseCommandParams(req);
|
||||
|
||||
master.findRobotDevice(robotname, devicename, function(err, device) {
|
||||
if (err) { return res.json(err); }
|
||||
|
||||
var result = device[commandname].apply(device, params);
|
||||
res.json({ result: result });
|
||||
});
|
||||
});
|
||||
|
||||
this.server.get("/robots/:robotname/connections", function(req, res) {
|
||||
return master.findRobot(req.params.robotname, function(err, robot) {
|
||||
return res.json(err ? err : robot.data().connections);
|
||||
master.findRobot(req.params.robotname, function(err, robot) {
|
||||
res.json(err ? err : robot.data().connections);
|
||||
});
|
||||
});
|
||||
|
||||
this.server.get("/robots/:robot/connections/:connection", function(req, res) {
|
||||
var connectionname, robotname, _ref;
|
||||
_ref = [req.params.robot, req.params.connection], robotname = _ref[0], connectionname = _ref[1];
|
||||
return master.findRobotConnection(robotname, connectionname, function(err, connection) {
|
||||
return res.json(err ? err : connection.data());
|
||||
var robotname = req.params.robot,
|
||||
connectionname = req.params.connection;
|
||||
|
||||
master.findRobotConnection(robotname, connectionname, function(err, connection) {
|
||||
res.json(err ? err : connection.data());
|
||||
});
|
||||
});
|
||||
|
||||
this.server.get("/robots/:robotname/devices/:devicename/events", function(req, res) {
|
||||
return req.io.route('events');
|
||||
req.io.route('events');
|
||||
});
|
||||
|
||||
return this.server.io.route('events', function(req) {
|
||||
var devicename, robotname, _ref;
|
||||
_ref = [req.params.robotname, req.params.devicename], robotname = _ref[0], devicename = _ref[1];
|
||||
return master.findRobotDevice(robotname, devicename, function(err, device) {
|
||||
if (err) {
|
||||
req.io.respond(err);
|
||||
}
|
||||
return device.on('update', function(data) {
|
||||
return req.io.emit('update', {
|
||||
data: data
|
||||
});
|
||||
this.server.io.route('events', function(req) {
|
||||
var robotname = req.params.robotname,
|
||||
devicename = req.params.devicename
|
||||
|
||||
master.findRobotDevice(robotname, devicename, function(err, device) {
|
||||
if (err) { return req.io.respond(err); }
|
||||
|
||||
device.on('update', function(data) {
|
||||
req.io.emit('update', { data: data });
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in New Issue