Sorting out the options ad id magik

lib/protocols/base.js

@@ -3,6 +3,7 @@
 var util = require('util'),
 	events = require('events'),
 	product = require('../product'),
+	_ = require('underscore'),
 	uuid = require('node-uuid');
 
 var devnull = {
@@ -15,11 +16,17 @@ var client = function(options, log)
 {
 	events.EventEmitter.call(this);
 
+	this.defaults = {
+	};
+
 	this.product = product;
 	this.decoders = [];
 	this.log = log || devnull;
 
-	this.id = uuid.v4();
+	this.options = _.defaults(options, this.defaults);
+
+	if (!this.options.id)
+		this.id = uuid.v4()
 }
 
 util.inherits(client, events.EventEmitter);

lib/protocols/insim.js

@@ -10,17 +10,18 @@ var util = require('util'),
 var client = function(options, log)
 {
 	var self = this;
-	base.call(this, options, log);
 
-	this.options = _.defaults(options, {
+	this.defaults = {
 		protocol: 'tcp',
 		host: '127.0.0.1',
 		port: 29999,
 		udpport: -1,
 		admin: '',
 		prefix: '',
 		isiflags: 0
-	});
+	};
+
+	base.call(this, options, log);
 
 	this.connections = [];
 

lib/protocols/outgauge.js

@@ -7,6 +7,11 @@ var util = require('util'),
 
 var client = function(options, log)
 {
+	this.defaults = {
+		port: 12345,
+		host: null
+	};
+
 	base.call(this, options, log);
 
 	this.decoders = [
@@ -16,7 +21,7 @@ var client = function(options, log)
 	this.relay = relay;
 	this.insim = insim;
 
-	this.connection = new udp(null, null);
+	this.connection = new udp(this.options.port, this.options.host);
 }
 
 util.inherits(client, base);

lib/protocols/outsim.js

@@ -7,6 +7,11 @@ var util = require('util'),
 
 var client = function(options, log)
 {
+	this.defaults = {
+		port: 12345,
+		host: null
+	};
+
 	base.call(this, options, log);
 
 	this.decoders = [
@@ -16,7 +21,7 @@ var client = function(options, log)
 	this.relay = relay;
 	this.insim = insim;
 
-	this.connection = new udp(null, null);
+	this.connection = new udp(this.options.port, this.options.host);
 }
 
 util.inherits(client, base);

lib/protocols/relay.js

@@ -9,13 +9,14 @@ var util = require('util'),
 var client = function(options, log)
 {
 	var self = this;
-	base.call(this, options, log);
 
-	this.options = _.defaults(options, {
+	this.defaults = {
 		host: '',
 		admin: '',
 		spec: ''
-	});
+	};
+
+	base.call(this, options, log);
 
 	this.connection = null;