Jdiscovery update

lib/jamserver/constants.js

@@ -45,13 +45,14 @@ module.exports = Object.freeze({
         retryInterval: 2000, // 2 seconds
         longRetryInterval: 60000, // 1 minute
         localBrokerUrl: 'http://localhost:1883',
-        brokerUrl: 'tcp://jamscript.madhacker.biz:1883'
+        brokerUrl: 'http://localhost:1884'
     },
 
     mdns: {
-        retries: 5,
-        retryInterval: 2000, // 2 seconds
-        longRetryInterval: 60000 // 1 minute
+        retryInterval: 2000,
+        heartBeatPort: 5454,
+        heartBeatMulticastAddress: '239.0.0.251',
+        heartBeatTTL: 1000
     },
 
     localStorage: {

lib/jamserver/jamlib.js

@@ -6,7 +6,7 @@
 
 // Load the global modules
 const mqtt = require('mqtt'),
-	  os = require('os'),
+      os = require('os'),
       globals = require('./constants').globals;
 
 // Do command line processing...
@@ -26,11 +26,11 @@ var machType = getMachineType(cmdopts);
 deviceParams.setItem('machType', machType);
 
 var reggie = new Registrar(cmdopts.app, machType, deviceParams.getItem('deviceId'),
-						cmdopts.port, {long: cmdopts.long, lat: cmdopts.lat}, { protocols: { mqtt: false, mdns: true, localStorage: false } });
+                            cmdopts.port, { protocols: { mqtt: true, mdns: true } });
 
 var jamsys = require('./jamsys');
 jamsys.init(reggie, machType, cmdopts.tags, cmdopts.iflow, cmdopts.oflow, deviceParams.getItem('deviceId'),
-								cmdopts.link, cmdopts.long, cmdopts.lat);
+                                cmdopts.link, cmdopts.long, cmdopts.lat);
 jamsys.setMQTT(getMachineAddr(), cmdopts.port);
 
 
@@ -39,60 +39,60 @@ jnode.init(reggie, machType);
 
 
 module.exports = new function() {
-	this.registerFuncs = registerFuncs;
-	this.run = run;
+    this.registerFuncs = registerFuncs;
+    this.run = run;
 }
 
 function run(callback) {
 
-	// Check the presence of the MQTT server.
-	// If not, report an error and quit
+    // Check the presence of the MQTT server.
+    // If not, report an error and quit
 
-	checkMQTTServer(function(present) {
-		if (!present) {
-			console.log("ERROR! Cannot connect to MQTT server. Exiting.");
-			process.exit(1);
-		}
+    checkMQTTServer(function(present) {
+        if (!present) {
+            console.log("ERROR! Cannot connect to MQTT server. Exiting.");
+            process.exit(1);
+        }
 
         if (machType === globals.NodeType.CLOUD) {
             reggie.registerAndDiscover();
-			jnode.startService();
-			jnode.startRunner();
-		} else {
-			jnode.doRegister();
-			jnode.startService();
-			jnode.startRunner();
+            jnode.startService();
+            jnode.startRunner();
+        } else {
+            jnode.doRegister();
+            jnode.startService();
+            jnode.startRunner();
 
-		}
+        }
 
-		if (callback !== undefined)
-			callback();
-	});
+        if (callback !== undefined)
+            callback();
+    });
 
 }
 
 function registerFuncs(machbox) {
 
-	// Register all callbacks in the machbox.
-	// These are functions registered by the application
-	fkeys = Object.keys(machbox.functions);
-	for (i in fkeys) {
-		tkey = fkeys[i];
-		jnode.registerCallback(tkey, machbox.functions[tkey], machbox.signatures[tkey]);
-	}
+    // Register all callbacks in the machbox.
+    // These are functions registered by the application
+    fkeys = Object.keys(machbox.functions);
+    for (i in fkeys) {
+        tkey = fkeys[i];
+        jnode.registerCallback(tkey, machbox.functions[tkey], machbox.signatures[tkey]);
+    }
 }
 
 // Check whether the MQTT server is up and running..
 function checkMQTTServer(callback) {
-	var tserv = mqtt.connect("mqtt://localhost:" + cmdopts.port );
-	tserv.on('connect', function() {
-		tserv.end();
-		callback(true);
-	});
-	tserv.on('offline', function() {
+    var tserv = mqtt.connect("mqtt://localhost:" + cmdopts.port );
+    tserv.on('connect', function() {
+        tserv.end();
+        callback(true);
+    });
+    tserv.on('offline', function() {
         tserv.end();
-		callback(false);
-	});
+        callback(false);
+    });
 }
 
 

lib/jamserver/jamsys.js

@@ -96,7 +96,7 @@ module.exports = new function() {
             this.setupAdvertisement(aname);
         }
 
-        reggie.addAttributes(attr);
+        reggie.setAttributes(attr);
     }
 
     // Advertise aname off