node-red-contrib-knx - npm Package Compare versions

Comparing version 0.1.0 to 0.2.0

knx.js

@@ -225,3 +225,3 @@ /**
         this.name = config.name;
-        this.inconn = null;
+        this.connection = null;
         var node = this;
@@ -234,10 +234,9 @@ var knxjsController = RED.nodes.getNode(config.controller);
             }
-            ;
         });
+        var that = this;
         this.on("close", function () {
-            log('knxjsIn.close');
-            if (this.inconn) {
-                log('closing knxjsIn connection');
-                this.inconn.end();
-            }
+            if (that.receiveEvent && that.connection)
+                that.connection.off('event', that.receiveEvent);
+            if (that.receiveStatus && that.connection)
+                that.connection.off('status', that.receiveStatus);
         });
@@ -249,23 +248,33 @@ //		this.on("error", function(msg) {});
         // there's only one connection for knxjs-in:
-        knxjsController.initializeKnxConnection(function (conn) {
-            this.inconn = conn;
-            this.inconn.openGroupSocket(0, function (parser) {
-                parser.on('write', function (src, dest, dpt, val) {
-                    log('Write from ' + src + ' to ' + dest + ': ' + val);
-                    node.send({
-                        topic: 'knx: write',
-                        payload: {'srcphy': src, 'dstgad': dest, 'dpt': dpt, 'value': val}
-                    });
+        knxjsController.initializeKnxConnection(function (connection) {
+
+            that.receiveEvent = function (gad, data, datagram) {
+                log('knx event gad[' + gad + ']data[' + data.toString('hex') + ']');
+                node.send({
+                    topic: 'knx:event',
+                    payload: {
+                        'srcphy': datagram.source_address,
+                        'dstgad': gad,
+                        'dpt': 'no_dpt',
+                        'value': data.toString(),
+                        'type': 'event'
+                    }
                 });
-                //
-                parser.on('response', function (src, dest, val) {
-                    log('Response from %s to %s: %s', src, dest, val);
-                    node.send({topic: 'knx: response', payload: {'srcphy': src, 'dstgad': dest, 'value': val}});
+            };
+            that.receiveStatus = function (gad, data, datagram) {
+                log('knx status gad[' + gad + ']data[' + data.toString('hex') + ']');
+                node.send({
+                    topic: 'knx:status',
+                    payload: {
+                        'srcphy': datagram.source_address,
+                        'dstgad': gad,
+                        'dpt': 'no_dpt',
+                        'value': data.toString(),
+                        'type': 'status'
+                    }
                 });
-                //
-                parser.on('read', function (src, dest) {
-                    log('Read from %s to %s', src, dest);
-                    node.send({topic: 'knx: read', payload: {'srcphy': src, 'dstgad': dest}});
-                });
-            });
+            };
+            that.connection = connection;
+            that.connection.on('event', that.receiveEvent);
+            that.connection.on('status', that.receiveStatus);
         });
@@ -272,0 +281,0 @@ }

package.json

 {
   "name": "node-red-contrib-knx",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "KNX for node-red, utilizing pure JavaScript KNXnet/IP driver (both works: tunelling & routing)",
@@ -30,4 +30,4 @@ "main": "knx.js",
   "dependencies": {
-    "knx.js": "^0.2.0"
+    "knx.js": "^0.2.5"
   }
 }

No alert changes

Improved metrics

Total package byte prevSize

26230

1.32%

Lines of code

264

3.13%

Dependency changes

• Updated

  knx.js@^0.2.5