Refactor port & robot to pure JS style

This commit is contained in:
deadprogram 2014-02-27 11:17:02 -08:00
parent ddc24eeca9
commit 452f07d4ab
2 changed files with 273 additions and 296 deletions

View File

@ -2,60 +2,55 @@
* port * port
* cylonjs.com * cylonjs.com
* *
* Copyright (c) 2013 The Hybrid Group * Copyright (c) 2013-2014 The Hybrid Group
* Licensed under the Apache 2.0 license. * Licensed under the Apache 2.0 license.
*/ */
'use strict';
(function() { var namespace = require('node-namespace');
'use strict';
var namespace;
namespace = require('node-namespace'); namespace("Cylon", function() {
return this.Port = (function() {
function Port(data) {
this.self = this;
this.isTcp = this.isSerial = this.isPortless = false;
this.parse(data);
}
namespace('Cylon', function() { Port.prototype.parse = function(data) {
return this.Port = (function() { var match;
function Port(data) { if (data === void 0) {
this.self = this; this.port = void 0;
this.isTcp = this.isSerial = this.isPortless = false; return this.isPortless = true;
this.parse(data); } else if (match = /(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}):(\d{1,5})/.exec(data)) {
this.port = match[2];
this.host = match[1];
return this.isTcp = true;
} else if (/^[0-9]{1,5}$/.exec(data)) {
this.port = data;
this.host = "localhost";
return this.isTcp = true;
} else {
this.port = data;
this.host = void 0;
return this.isSerial = true;
} }
};
Port.prototype.parse = function(data) { Port.prototype.toString = function() {
var match; if (this.isPortless) {
if (data === void 0) { return "none";
this.port = void 0; } else if (this.isSerial) {
return this.isPortless = true; return this.port;
} else if (match = /(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}):(\d{1,5})/.exec(data)) { } else {
this.port = match[2]; return "" + this.host + ":" + this.port;
this.host = match[1]; }
return this.isTcp = true; };
} else if (/^[0-9]{1,5}$/.exec(data)) {
this.port = data;
this.host = "localhost";
return this.isTcp = true;
} else {
this.port = data;
this.host = void 0;
return this.isSerial = true;
}
};
Port.prototype.toString = function() { return Port;
if (this.isPortless) {
return "none";
} else if (this.isSerial) {
return this.port;
} else {
return "" + this.host + ":" + this.port;
}
};
return Port; })();
});
})(); module.exports = Cylon.Port;
});
module.exports = Cylon.Port;
}).call(this);

View File

@ -2,290 +2,272 @@
* robot * robot
* cylonjs.com * cylonjs.com
* *
* Copyright (c) 2013 The Hybrid Group * Copyright (c) 2013-2014 The Hybrid Group
* Licensed under the Apache 2.0 license. * Licensed under the Apache 2.0 license.
*/ */
'use strict';
(function() { var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }
'use strict'; var __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
var Async, EventEmitter, namespace,
__bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
__hasProp = {}.hasOwnProperty,
__extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
__indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
require('./cylon'); require('./cylon');
require('./basestar');
require("./connection");
require("./adaptor");
require("./device");
require("./driver");
require('./digital-pin');
var Async = require("async");
var EventEmitter = require('events').EventEmitter;
require('./basestar'); var namespace = require('node-namespace');
require("./connection"); namespace("Cylon", function() {
this.Robot = (function(klass) {
subclass(Robot, klass);
require("./adaptor"); function Robot(opts) {
var func, n, reserved;
require("./device"); if (opts == null) {
opts = {};
require("./driver"); }
this.toString = __bind(this.toString, this);
require('./digital-pin'); this.registerDriver = __bind(this.registerDriver, this);
this.requireDriver = __bind(this.requireDriver, this);
namespace = require('node-namespace'); this.registerAdaptor = __bind(this.registerAdaptor, this);
this.requireAdaptor = __bind(this.requireAdaptor, this);
Async = require("async"); this.stop = __bind(this.stop, this);
this.startDevices = __bind(this.startDevices, this);
EventEmitter = require('events').EventEmitter; this.startConnections = __bind(this.startConnections, this);
this.start = __bind(this.start, this);
namespace('Cylon', function() { this.initDevices = __bind(this.initDevices, this);
return this.Robot = (function(_super) { this.initConnections = __bind(this.initConnections, this);
var klass; this.robot = this;
this.name = opts.name || this.constructor.randomName();
__extends(Robot, _super); this.master = opts.master;
this.connections = {};
klass = Robot; this.devices = {};
this.adaptors = {};
function Robot(opts) { this.drivers = {};
var func, n, reserved; this.commands = [];
if (opts == null) { this.running = false;
opts = {}; this.registerAdaptor("./test/loopback", "loopback");
} this.registerAdaptor("./test/test-adaptor", "test");
this.toString = __bind(this.toString, this); this.registerDriver("./test/ping", "ping");
this.registerDriver = __bind(this.registerDriver, this); this.registerDriver("./test/test-driver", "test");
this.requireDriver = __bind(this.requireDriver, this); this.initConnections(opts.connection || opts.connections);
this.registerAdaptor = __bind(this.registerAdaptor, this); this.initDevices(opts.device || opts.devices);
this.requireAdaptor = __bind(this.requireAdaptor, this); this.work = opts.work || function() {
this.stop = __bind(this.stop, this); return Logger.info("No work yet");
this.startDevices = __bind(this.startDevices, this); };
this.startConnections = __bind(this.startConnections, this); for (n in opts) {
this.start = __bind(this.start, this); func = opts[n];
this.initDevices = __bind(this.initDevices, this); reserved = ['connection', 'connections', 'device', 'devices', 'work'];
this.initConnections = __bind(this.initConnections, this); if (__indexOf.call(reserved, n) < 0) {
this.robot = this; this.robot[n] = func;
this.name = opts.name || this.constructor.randomName();
this.master = opts.master;
this.connections = {};
this.devices = {};
this.adaptors = {};
this.drivers = {};
this.commands = [];
this.running = false;
this.registerAdaptor("./test/loopback", "loopback");
this.registerAdaptor("./test/test-adaptor", "test");
this.registerDriver("./test/ping", "ping");
this.registerDriver("./test/test-driver", "test");
this.initConnections(opts.connection || opts.connections);
this.initDevices(opts.device || opts.devices);
this.work = opts.work || function() {
return Logger.info("No work yet");
};
for (n in opts) {
func = opts[n];
reserved = ['connection', 'connections', 'device', 'devices', 'work'];
if (__indexOf.call(reserved, n) < 0) {
this.robot[n] = func;
}
} }
} }
}
Robot.randomName = function() { Robot.randomName = function() {
return "Robot " + (Math.floor(Math.random() * 100000)); return "Robot " + (Math.floor(Math.random() * 100000));
};
Robot.prototype.data = function() {
var connection, device, n;
return {
name: this.name,
connections: (function() {
var _ref, _results;
_ref = this.connections;
_results = [];
for (n in _ref) {
connection = _ref[n];
_results.push(connection.data());
}
return _results;
}).call(this),
devices: (function() {
var _ref, _results;
_ref = this.devices;
_results = [];
for (n in _ref) {
device = _ref[n];
_results.push(device.data());
}
return _results;
}).call(this),
commands: this.commands
}; };
};
Robot.prototype.data = function() { Robot.prototype.initConnections = function(connections) {
var connection, device, n; var connection, _i, _len;
return { Logger.info("Initializing connections...");
name: this.name, if (connections == null) {
connections: (function() { return;
var _ref, _results; }
_ref = this.connections; connections = [].concat(connections);
_results = []; for (_i = 0, _len = connections.length; _i < _len; _i++) {
for (n in _ref) { connection = connections[_i];
connection = _ref[n]; Logger.info("Initializing connection '" + connection.name + "'...");
_results.push(connection.data()); connection['robot'] = this;
} this.connections[connection.name] = new Cylon.Connection(connection);
return _results; }
}).call(this), return this.connections;
devices: (function() { };
var _ref, _results;
_ref = this.devices;
_results = [];
for (n in _ref) {
device = _ref[n];
_results.push(device.data());
}
return _results;
}).call(this),
commands: this.commands
};
};
Robot.prototype.initConnections = function(connections) { Robot.prototype.initDevices = function(devices) {
var connection, _i, _len; var device, _i, _len, _results;
Logger.info("Initializing connections..."); Logger.info("Initializing devices...");
if (connections == null) { if (devices == null) {
return; return;
} }
connections = [].concat(connections); devices = [].concat(devices);
for (_i = 0, _len = connections.length; _i < _len; _i++) { _results = [];
connection = connections[_i]; for (_i = 0, _len = devices.length; _i < _len; _i++) {
Logger.info("Initializing connection '" + connection.name + "'..."); device = devices[_i];
connection['robot'] = this; Logger.info("Initializing device '" + device.name + "'...");
this.connections[connection.name] = new Cylon.Connection(connection); device['robot'] = this;
} _results.push(this.devices[device.name] = new Cylon.Device(device));
return this.connections; }
}; return _results;
};
Robot.prototype.initDevices = function(devices) { Robot.prototype.start = function() {
var device, _i, _len, _results; var _this = this;
Logger.info("Initializing devices..."); return this.startConnections(function() {
if (devices == null) { return _this.robot.startDevices(function() {
return; _this.robot.work.call(_this.robot, _this.robot);
} _this.running = true;
devices = [].concat(devices); Logger.info("Working...");
_results = []; return _this.robot.emit('working');
for (_i = 0, _len = devices.length; _i < _len; _i++) {
device = devices[_i];
Logger.info("Initializing device '" + device.name + "'...");
device['robot'] = this;
_results.push(this.devices[device.name] = new Cylon.Device(device));
}
return _results;
};
Robot.prototype.start = function() {
var _this = this;
return this.startConnections(function() {
return _this.robot.startDevices(function() {
_this.robot.work.call(_this.robot, _this.robot);
_this.running = true;
Logger.info("Working...");
return _this.robot.emit('working');
});
}); });
}; });
};
Robot.prototype.startConnections = function(callback) { Robot.prototype.startConnections = function(callback) {
var connection, n, starters, _ref; var connection, n, starters, _ref;
Logger.info("Starting connections..."); Logger.info("Starting connections...");
starters = {}; starters = {};
_ref = this.connections; _ref = this.connections;
for (n in _ref) { for (n in _ref) {
connection = _ref[n]; connection = _ref[n];
this.robot[n] = connection; this.robot[n] = connection;
starters[n] = connection.connect; starters[n] = connection.connect;
} }
return Async.parallel(starters, callback); return Async.parallel(starters, callback);
}; };
Robot.prototype.startDevices = function(callback) { Robot.prototype.startDevices = function(callback) {
var device, n, starters, _ref; var device, n, starters, _ref;
Logger.info("Starting devices..."); Logger.info("Starting devices...");
starters = {}; starters = {};
_ref = this.devices; _ref = this.devices;
for (n in _ref) { for (n in _ref) {
device = _ref[n]; device = _ref[n];
this.robot[n] = device; this.robot[n] = device;
starters[n] = device.start; starters[n] = device.start;
} }
return Async.parallel(starters, callback); return Async.parallel(starters, callback);
}; };
Robot.prototype.stop = function() { Robot.prototype.stop = function() {
var connection, device, n, _ref, _ref1, _results; var connection, device, n, _ref, _ref1, _results;
_ref = this.devices; _ref = this.devices;
for (n in _ref) { for (n in _ref) {
device = _ref[n]; device = _ref[n];
device.stop(); device.stop();
} }
_ref1 = this.connections; _ref1 = this.connections;
_results = []; _results = [];
for (n in _ref1) { for (n in _ref1) {
connection = _ref1[n]; connection = _ref1[n];
_results.push(connection.disconnect()); _results.push(connection.disconnect());
} }
return _results; return _results;
}; };
Robot.prototype.initAdaptor = function(adaptorName, connection, opts) { Robot.prototype.initAdaptor = function(adaptorName, connection, opts) {
var realAdaptor, testAdaptor; var realAdaptor, testAdaptor;
if (opts == null) { if (opts == null) {
opts = {}; opts = {};
} }
realAdaptor = this.robot.requireAdaptor(adaptorName).adaptor({ realAdaptor = this.robot.requireAdaptor(adaptorName).adaptor({
name: adaptorName,
connection: connection,
extraParams: opts
});
if (CylonConfig.testing_mode) {
testAdaptor = this.robot.requireAdaptor('test').adaptor({
name: adaptorName, name: adaptorName,
connection: connection, connection: connection,
extraParams: opts extraParams: opts
}); });
if (CylonConfig.testing_mode) { return proxyTestStubs(realAdaptor.commands(), testAdaptor);
testAdaptor = this.robot.requireAdaptor('test').adaptor({ } else {
name: adaptorName, return realAdaptor;
connection: connection, }
extraParams: opts };
});
return proxyTestStubs(realAdaptor.commands(), testAdaptor);
} else {
return realAdaptor;
}
};
Robot.prototype.requireAdaptor = function(adaptorName) { Robot.prototype.requireAdaptor = function(adaptorName) {
if (this.robot.adaptors[adaptorName] == null) { if (this.robot.adaptors[adaptorName] == null) {
this.robot.registerAdaptor("cylon-" + adaptorName, adaptorName); this.robot.registerAdaptor("cylon-" + adaptorName, adaptorName);
this.robot.adaptors[adaptorName].register(this); this.robot.adaptors[adaptorName].register(this);
} }
return this.robot.adaptors[adaptorName]; return this.robot.adaptors[adaptorName];
}; };
Robot.prototype.registerAdaptor = function(moduleName, adaptorName) { Robot.prototype.registerAdaptor = function(moduleName, adaptorName) {
if (this.adaptors[adaptorName] == null) { if (this.adaptors[adaptorName] == null) {
return this.adaptors[adaptorName] = require(moduleName); return this.adaptors[adaptorName] = require(moduleName);
} }
}; };
Robot.prototype.initDriver = function(driverName, device, opts) { Robot.prototype.initDriver = function(driverName, device, opts) {
var realDriver, testDriver; var realDriver, testDriver;
if (opts == null) { if (opts == null) {
opts = {}; opts = {};
} }
realDriver = this.robot.requireDriver(driverName).driver({ realDriver = this.robot.requireDriver(driverName).driver({
name: driverName,
device: device,
extraParams: opts
});
if (CylonConfig.testing_mode) {
testDriver = this.robot.requireDriver('test').driver({
name: driverName, name: driverName,
device: device, device: device,
extraParams: opts extraParams: opts
}); });
if (CylonConfig.testing_mode) { return proxyTestStubs(realDriver.commands(), testDriver);
testDriver = this.robot.requireDriver('test').driver({ } else {
name: driverName, return realDriver;
device: device, }
extraParams: opts };
});
return proxyTestStubs(realDriver.commands(), testDriver);
} else {
return realDriver;
}
};
Robot.prototype.requireDriver = function(driverName) { Robot.prototype.requireDriver = function(driverName) {
if (this.robot.drivers[driverName] == null) { if (this.robot.drivers[driverName] == null) {
this.robot.registerDriver("cylon-" + driverName, driverName); this.robot.registerDriver("cylon-" + driverName, driverName);
this.robot.drivers[driverName].register(this); this.robot.drivers[driverName].register(this);
} }
return this.robot.drivers[driverName]; return this.robot.drivers[driverName];
}; };
Robot.prototype.registerDriver = function(moduleName, driverName) { Robot.prototype.registerDriver = function(moduleName, driverName) {
if (this.drivers[driverName] == null) { if (this.drivers[driverName] == null) {
return this.drivers[driverName] = require(moduleName); return this.drivers[driverName] = require(moduleName);
} }
}; };
Robot.prototype.toString = function() { Robot.prototype.toString = function() {
return "[Robot name='" + this.name + "']"; return "[Robot name='" + this.name + "']";
}; };
return Robot; return Robot;
})(EventEmitter); })(EventEmitter);
}); });
module.exports = Cylon.Robot; module.exports = Cylon.Robot;
}).call(this);