Fixed the1laz#4 and fixed the1laz#5. Added auto-reconnect to C-Gate a…

…nd better handling for any disconnects. Added automatic getall on start (l on start (if enabled) and periodically (if enabled). Added gettree for requesting network tree.
rbswift · Oct 9, 2017 · 1608946 · 1608946
1 parent 9b28e63
commit 1608946
Show file tree

Hide file tree

Showing 738 changed files with 169,223 additions and 39 deletions.
diff --git a/README.md b/README.md
@@ -20,14 +20,20 @@ Publish to these topics to control the lights. Wildcards don't work:
 
 cbus/write/#1/#2/#3/switch  -  Publish ON/OFF to these topics to turn lights on/off
 
-cbus/write/#1/#2/#3/ramp  -  Publish a % to ramp to that %. Optionally add a comma then a time (e.g. 50,4s or 100,2m). Also, INCREASE/DECREASE ramp by 5% up or down and ON/OFF turns on/off. 
+cbus/write/#1/#2/#3/ramp  -  Publish a % to ramp to that %. Optionally add a comma then a time (e.g. 50,4s or 100,2m). Also, INCREASE/DECREASE ramp by 5% up or down and ON/OFF turns on/off.
 
 This requests an update from all lights:
 
 cbus/write/#1/#2//getall - current values get published on the cbus/read topics
 
  #1,#2 and #3 should be replaced by your c-bus network number, application number, and the group number.
 
+Requesting an update on start or periodic updates can be set in the settings file.
+
+This requests the network tree:
+
+cbus/write/#1///gettree - result gets published on cbus/read/#1///tree
+
 Other notes:
 I made this for working with OpenHAB
 It assumes the default cgate ports
diff --git a/index.js b/index.js
@@ -2,7 +2,17 @@ var mqtt = require('mqtt'), url = require('url');
 var net = require('net');
 var events = require('events');
 var settings = require('./settings.js');
+var parseString = require('xml2js').parseString;
 
+var tree = '';
+var treenet = 0;
+
+var interval = {};
+var commandInterval = {};
+var eventInterval = {};
+var clientConnected = false;
+var commandConnected = false;
+var eventConnected = false;
 var buffer = "";
 var eventEmitter = new events.EventEmitter();
 
@@ -18,6 +28,8 @@ if(settings.mqttusername && settings.mqttpassword) {
 
 // Create an MQTT client connection
 var client = mqtt.createClient(mqtt_url.port, mqtt_url.hostname,OPTIONS);
+var command = new net.Socket();
+var event = new net.Socket();
 
 var HOST = settings.cbusip;
 var COMPORT = 20023;
@@ -26,26 +38,38 @@ var EVENTPORT = 20025;
 var logging = settings.logging;
 
 // Connect to cgate via telnet
-var command = new net.Socket();
-command.connect(COMPORT, HOST, function() {
-
-  console.log('CONNECTED TO C-GATE COMMAND PORT: ' + HOST + ':' + COMPORT);
-  command.write('EVENT ON\n');
-
-});
+command.connect(COMPORT, HOST);
 
 
 // Connect to cgate event port via telnet
-var event = new net.Socket();
-event.connect(EVENTPORT, HOST, function() {
-
-  console.log('CONNECTED TO C-GATE EVENT PORT: ' + HOST + ':' + EVENTPORT);
+event.connect(EVENTPORT, HOST);
+
+function started(){
+  if(commandConnected && eventConnected && client.connected){
+    console.log('ALL CONNECTED');
+    if(settings.getallnetapp && settings.getallonstart) {
+      console.log('Getting all values');
+      command.write('GET //'+settings.cbusname+'/'+settings.getallnetapp+'/* level\n');
+    }
+    if(settings.getallnetapp && settings.getallperiod) {
+      clearInterval(interval);
+      setInterval(function(){
+        console.log('Getting all values');
+        command.write('GET //'+settings.cbusname+'/'+settings.getallnetapp+'/* level\n');
+      },settings.getallperiod*1000);
+    }
+  }
 
-});
+}
 
+client.on('disconnect',function(){
+  clientConnected = false;
+})
 
 client.on('connect', function() { // When connected
+  clientConnected = true;
   console.log('CONNECTED TO MQTT: ' + settings.mqtt);
+  started()
 
   // Subscribe to MQTT
   client.subscribe('cbus/write/#', function() {
@@ -59,6 +83,13 @@ client.on('connect', function() { // When connected
 
       switch(parts[5].toLowerCase()) {
 
+        // Get updates from all groups
+        case "gettree":
+          treenet = parts[2];
+          command.write('TREEXML '+parts[2]+'\n');
+          break;
+
+
         // Get updates from all groups
         case "getall":
           command.write('GET //'+settings.cbusname+'/'+parts[2]+'/'+parts[3]+'/* level\n');
@@ -68,7 +99,7 @@ client.on('connect', function() { // When connected
         case "switch":
 
           if(message == "ON") {command.write('ON //'+settings.cbusname+'/'+parts[2]+'/'+parts[3]+'/'+parts[4]+'\n')};
-          if(message == "OFF") {command.write('OFF //'+settings.cbusname+'/'+parts[2]+'/'+parts[3]+'/'+parts[4]+'\n')}; 
+          if(message == "OFF") {command.write('OFF //'+settings.cbusname+'/'+parts[2]+'/'+parts[3]+'/'+parts[4]+'\n')};
           break;
 
         // Ramp, increase/decrease, on/off control
@@ -82,7 +113,7 @@ client.on('connect', function() { // When connected
                 }
               });
               command.write('GET //'+settings.cbusname+'/'+parts[2]+'/'+parts[3]+'/'+parts[4]+' level\n');
-              
+
               break;
 
             case "DECREASE":
@@ -102,11 +133,11 @@ client.on('connect', function() { // When connected
             case "OFF":
               command.write('OFF //'+settings.cbusname+'/'+parts[2]+'/'+parts[3]+'/'+parts[4]+'\n');
               break;
-            default:           
+            default:
               var ramp = message.split(",");
               var num = Math.round(parseInt(ramp[0])*255/100)
               if (!isNaN(num) && num < 256) {
-                
+
                 if (ramp.length > 1) {
                   command.write('RAMP //'+settings.cbusname+'/'+parts[2]+'/'+parts[3]+'/'+parts[4]+' '+num+' '+ramp[1]+'\n');
                 } else {
@@ -125,9 +156,50 @@ client.on('connect', function() { // When connected
   });
 });
 
+command.on('error',function(err){
+  console.log('COMMAND ERROR:'+JSON.stringify(err))
+})
 
+event.on('error',function(err){
+  console.log('EVENT ERROR:'+JSON.stringify(err))
+})
+
+command.on('connect',function(err){
+  commandConnected = true;
+  console.log('CONNECTED TO C-GATE COMMAND PORT: ' + HOST + ':' + COMPORT);
+  command.write('EVENT ON\n');
+  started()
+  clearInterval(commandInterval);
+})
+
+event.on('connect',function(err){
+  eventConnected = true;
+  console.log('CONNECTED TO C-GATE EVENT PORT: ' + HOST + ':' + EVENTPORT);
+  started()
+  clearInterval(eventInterval);
+})
+
+
+command.on('close',function(){
+  commandConnected = false;
+  console.log('COMMAND PORT DISCONNECTED')
+  commandInterval = setTimeout(function(){
+    console.log('COMMAND PORT RECONNECTING...')
+    command.connect(COMPORT, HOST)
+  },10000)
+})
+
+event.on('close',function(){
+  eventConnected = false;
+  console.log('EVENT PORT DISCONNECTED')
+  eventInterval = setTimeout(function(){
+    console.log('EVENT PORT RECONNECTING...')
+    event.connect(EVENTPORT, HOST)
+  },10000)
+})
 
 command.on('data',function(data) {
+  // if (logging == true) {console.log('Command data: ' + data);}
   var lines = (buffer+data.toString()).split("\n");
   buffer = lines[lines.length-1];
   if (lines.length > 1) {
@@ -142,7 +214,7 @@ command.on('data',function(data) {
           if (logging == true) {console.log('C-Bus status received: '+address[3] +'/'+address[4]+'/'+address[5]+' OFF');}
           if (logging == true) {console.log('C-Bus status received: '+address[3] +'/'+address[4]+'/'+address[5]+' 0%');}
           client.publish('cbus/read/'+address[3]+'/'+address[4]+'/'+address[5]+'/state' , 'OFF', function() {});
-          client.publish('cbus/read/'+address[3]+'/'+address[4]+'/'+address[5]+'/level' , '0', function() {});          
+          client.publish('cbus/read/'+address[3]+'/'+address[4]+'/'+address[5]+'/level' , '0', function() {});
           eventEmitter.emit('level',address[3]+'/'+address[4]+'/'+address[5],0);
         } else {
           if (logging == true) {console.log('C-Bus status received: '+address[3] +'/'+address[4]+'/'+address[5]+' ON');}
@@ -152,26 +224,40 @@ command.on('data',function(data) {
           eventEmitter.emit('level',address[3]+'/'+address[4]+'/'+address[5],Math.round(parseInt(level[1])));
 
         }
+      } else if(parts1[0] == "347"){
+        tree += parts1[1]+'\n';
+      } else if(parts1[0] == "343"){
+        tree = '';
+      } else if(parts1[0].split(" ")[0] == "344"){
+        parseString(tree, function (err, result) {
+          try{
+            if(logging === true) {console.log("C-Bus tree received:"+JSON.stringify(result))}
+            client.publish('cbus/read/'+treenet+'///tree',JSON.stringify(result))
+          }catch(err){
+            console.log(err)
+          }
+          tree = '';
+        });
       } else {
         var parts2 = parts1[0].toString().split(" ");
         if (parts2[0] == "300") {
-        address = (parts2[1].substring(0,parts2[1].length-1)).split("/");
-        var level = parts2[2].split("=");
-        if (parseInt(level[1]) == 0) {
-          if (logging == true) {console.log('C-Bus status received: '+address[3] +'/'+address[4]+'/'+address[5]+' OFF');}
-          if (logging == true) {console.log('C-Bus status received: '+address[3] +'/'+address[4]+'/'+address[5]+' 0%');}
-          client.publish('cbus/read/'+address[3]+'/'+address[4]+'/'+address[5]+'/state' , 'OFF', function() {});
-          client.publish('cbus/read/'+address[3]+'/'+address[4]+'/'+address[5]+'/level' , '0', function() {});          
-          eventEmitter.emit('level',address[3]+'/'+address[4]+'/'+address[5],0);
-        } else {
-          if (logging == true) {console.log('C-Bus status received: '+address[3] +'/'+address[4]+'/'+address[5]+' ON');}
-          if (logging == true) {console.log('C-Bus status received: '+address[3] +'/'+address[4]+'/'+address[5]+' '+Math.round(parseInt(level[1])*100/255).toString()+'%');}
-          client.publish('cbus/read/'+address[3]+'/'+address[4]+'/'+address[5]+'/state' , 'ON', function() {});
-          client.publish('cbus/read/'+address[3]+'/'+address[4]+'/'+address[5]+'/level' , Math.round(parseInt(level[1])*100/255).toString(), function() {});
-          eventEmitter.emit('level',address[3]+'/'+address[4]+'/'+address[5],Math.round(parseInt(level[1])));
+          address = (parts2[1].substring(0,parts2[1].length-1)).split("/");
+          var level = parts2[2].split("=");
+          if (parseInt(level[1]) == 0) {
+            if (logging == true) {console.log('C-Bus status received: '+address[3] +'/'+address[4]+'/'+address[5]+' OFF');}
+            if (logging == true) {console.log('C-Bus status received: '+address[3] +'/'+address[4]+'/'+address[5]+' 0%');}
+            client.publish('cbus/read/'+address[3]+'/'+address[4]+'/'+address[5]+'/state' , 'OFF', function() {});
+            client.publish('cbus/read/'+address[3]+'/'+address[4]+'/'+address[5]+'/level' , '0', function() {});
+            eventEmitter.emit('level',address[3]+'/'+address[4]+'/'+address[5],0);
+          } else {
+            if (logging == true) {console.log('C-Bus status received: '+address[3] +'/'+address[4]+'/'+address[5]+' ON');}
+            if (logging == true) {console.log('C-Bus status received: '+address[3] +'/'+address[4]+'/'+address[5]+' '+Math.round(parseInt(level[1])*100/255).toString()+'%');}
+            client.publish('cbus/read/'+address[3]+'/'+address[4]+'/'+address[5]+'/state' , 'ON', function() {});
+            client.publish('cbus/read/'+address[3]+'/'+address[4]+'/'+address[5]+'/level' , Math.round(parseInt(level[1])*100/255).toString(), function() {});
+            eventEmitter.emit('level',address[3]+'/'+address[4]+'/'+address[5],Math.round(parseInt(level[1])));
+
+          }
 
-        }
-
         }
       }
     }
@@ -182,12 +268,12 @@ command.on('data',function(data) {
 // Add a 'data' event handler for the client socket
 // data is what the server sent to this socket
 event.on('data', function(data) {
-
+    // if (logging == true) {console.log('Event data: ' + data);}
     var parts = data.toString().split(" ");
     if(parts[0] == "lighting") {
       address = parts[2].split("/");
       switch(parts[1]) {
-        case "on":	
+        case "on":
           if (logging == true) {console.log('C-Bus status received: '+address[3] +'/'+address[4]+'/'+address[5]+' ON');}
           if (logging == true) {console.log('C-Bus status received: '+address[3] +'/'+address[4]+'/'+address[5]+' 100%');}
           client.publish('cbus/read/'+address[3]+'/'+address[4]+'/'+address[5]+'/state' , 'ON', function() {});
@@ -215,5 +301,5 @@ event.on('data', function(data) {
         default:
       }
     }
-    
+
 });
diff --git a/node_modules/.bin/mqtt_pub b/node_modules/.bin/mqtt_pub
diff --git a/node_modules/.bin/mqtt_sub b/node_modules/.bin/mqtt_sub
diff --git a/node_modules/.bin/xml2json b/node_modules/.bin/xml2json
diff --git a/node_modules/bindings/README.md b/node_modules/bindings/README.md