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

Comparing version 0.1.1 to 0.1.2

denon.js

@@ -9,276 +9,274 @@ /**
 
-module.exports = function (RED) {
+module.exports = function(RED) {
 
+  /**
+   * ====== Denon-controller ================
+   * Holds configuration for denonjs host+port,
+   * initializes new denonjs connections
+   * =======================================
+   */
+  function DenonControllerNode(config) {
+    RED.nodes.createNode(this, config);
+    this.name = config.name;
+    this.host = config.host;
+    this.port = config.port;
+    this.denon = null;
+    var node = this;
+
     /**
-     * ====== Denon-controller ================
-     * Holds configuration for denonjs host+port,
-     * initializes new denonjs connections
-     * =======================================
+     * Initialize an denon_telnet socket, calling the handler function
+     * when successfully connected, passing it the denon_telnet connection
      */
-    function DenonControllerNode(config) {
-        RED.nodes.createNode(this, config);
-        this.name = config.name;
-        this.host = config.host;
-        this.port = config.port;
-        this.denon = null;
-        var node = this;
-
-        /**
-         * Initialize an denon_telnet socket, calling the handler function
-         * when successfully connected, passing it the denon_telnet connection
-         */
-        this.initializeDenonConnection = function (handler) {
-            if (node.denon) {
-                DEBUG && RED.comms.publish("debug", {
-                    name: node.name,
-                    msg: 'already configured connection to Denon player at ' + config.host + ':' + config.port
-                });
-                if (handler && (typeof handler === 'function')) {
-                    if (node.denon.connection && node.denon.connected)
-                        handler(node.denon);
-                    else {
-                        if (node.denon.connection && !node.denon.connected)
-                            node.denon.connect();
-                        node.denon.on('connected', function () {
-                            handler(node.denon);
-                        });
-
-                    }
-                }
-                return node.denon;
-            }
-            node.log('configuring connection to Denon player at ' + config.host + ':' + config.port);
-            node.denon = new connectionFSM({
-                host: config.host,
-                port: config.port,
-                debug: DEBUG
+    this.initializeDenonConnection = function(handler) {
+      if (node.denon) {
+        DEBUG && RED.comms.publish("debug", {
+          name: node.name,
+          msg: 'already configured connection to Denon player at ' + config.host + ':' + config.port
+        });
+        if (handler && (typeof handler === 'function')) {
+          if (node.denon.connection && node.denon.connected)
+            handler(node.denon);
+          else {
+            if (node.denon.connection && !node.denon.connected)
+              node.denon.connect();
+            node.denon.on('connected', function() {
+              handler(node.denon);
             });
-            node.denon.connect();
-            if (handler && (typeof handler === 'function')) {
-                node.denon.on('connected', function () {
-                    handler(node.denon);
-                });
-            }
-            DEBUG && RED.comms.publish("debug", {
-                name: node.name,
-                msg: 'Denon: successfully connected to ' + config.host + ':' + config.port
-            });
 
-            return node.denon;
-        };
-        this.on("close", function () {
-            node.log('disconnecting from denon device at ' + config.host + ':' + config.port);
-            node.denon && node.denon.disconnect && node.denon.disconnect();
-            node.denon = null;
+          }
+        }
+        return node.denon;
+      }
+      node.log('configuring connection to Denon player at ' + config.host + ':' + config.port);
+      node.denon = new connectionFSM({
+        host: config.host,
+        port: config.port,
+        debug: DEBUG
+      });
+      node.denon.connect();
+      if (handler && (typeof handler === 'function')) {
+        node.denon.on('connected', function() {
+          handler(node.denon);
         });
-    }
+      }
+      DEBUG && RED.comms.publish("debug", {
+        name: node.name,
+        msg: 'Denon: successfully connected to ' + config.host + ':' + config.port
+      });
 
-    RED.nodes.registerType("denon-controller", DenonControllerNode);
+      return node.denon;
+    };
+    this.on("close", function() {
+      node.log('disconnecting from denon device at ' + config.host + ':' + config.port);
+      node.denon && node.denon.disconnect && node.denon.disconnect();
+      node.denon = null;
+    });
+  }
 
-    /**
-     * ====== Denon-out =======================
-     * Sends outgoing Denon player from
-     * messages received via node-red flows
-     * =======================================
-     */
-    function DenonOut(config) {
-        RED.nodes.createNode(this, config);
-        this.name = config.name;
-        var controllerNode = RED.nodes.getNode(config.controller);
-        this.unit_number = config.unit_number;
-        this.denoncommand = config.denoncommand;
-        var node = this;
-        //node.log('new Denon-out, config: ' + util.inspect(config));
-        //
-        this.on("input", function (msg) {
-            DEBUG && RED.comms.publish("debug", {
-                name: node.name,
-                msg: 'denonout.onInput msg[' + util.inspect(msg) + ']'
-            });
-            //node.log('denonout.onInput msg[' + util.inspect(msg) + ']');
-            if (!(msg && msg.hasOwnProperty('payload'))) return;
-            var payload = msg.payload;
-            console.log('------------- ' + JSON.stringify(msg) + '');
-            if (typeof(msg.payload) === "object") {
-                payload = msg.payload;
-            } else if (typeof(msg.payload) === "string") {
-                try {
-                    payload = JSON.parse(msg.payload);
-                    if (typeof (payload) === 'number')
-                        payload = {cmd: msg.payload.toString()};
-                } catch (e) {
-                    payload = {cmd: msg.payload.toString()};
-                }
-            }
-            if (payload == null) {
-                node.log('denonout.onInput: illegal msg.payload!');
-                return;
-            }
+  RED.nodes.registerType("denon-controller", DenonControllerNode);
 
-            //If msg.topic is filled, than set it as cmd
-            if (msg.topic) {
-                if (payload.value === null || payload.value === undefined)
-                    payload.value = payload.cmd;
-                payload = {cmd: msg.topic.toString(), value: payload.value};
-            }
+  /**
+   * ====== Denon-out =======================
+   * Sends outgoing Denon player from
+   * messages received via node-red flows
+   * =======================================
+   */
+  function DenonOut(config) {
+    RED.nodes.createNode(this, config);
+    this.name = config.name;
+    var controllerNode = RED.nodes.getNode(config.controller);
+    this.unit_number = config.unit_number;
+    this.denoncommand = config.denoncommand;
+    var node = this;
+    this.on("input", function(msg) {
+      DEBUG && RED.comms.publish("debug", {
+        name: node.name,
+        msg: 'denonout.onInput msg[' + util.inspect(msg) + ']'
+      });
+      //node.log('denonout.onInput msg[' + util.inspect(msg) + ']');
+      if (!(msg && msg.hasOwnProperty('payload'))) return;
+      var payload = msg.payload;
+      if (typeof(msg.payload) === "object") {
+        payload = msg.payload;
+      } else if (typeof(msg.payload) === "string") {
+        try {
+          payload = JSON.parse(msg.payload);
+          if (typeof (payload) === 'number')
+            payload = {cmd: msg.payload.toString()};
+        } catch (e) {
+          payload = {cmd: msg.payload.toString()};
+        }
+      }
+      else
+        payload = {cmd: msg.payload.toString()};
+      if (payload == null) {
+        node.log('denonout.onInput: illegal msg.payload!');
+        return;
+      }
 
-            if (node.denoncommand && node.denoncommand !== 'empty') {
-                try {
-                    payload = JSON.parse(node.denoncommand);
-                    if (typeof (payload) === 'number')
-                        payload.cmd = node.denoncommand.toString();
-                } catch (e) {
-                    payload.cmd = node.denoncommand.toString();
-                }
-            }
+      //If msg.topic is filled, than set it as cmd
+      if (msg.topic) {
+        if (payload.value === null || payload.value === undefined)
+          payload.value = payload.cmd;
+        payload = {cmd: msg.topic.toString(), value: payload.value};
+      }
 
-            node.send(payload, function (err) {
-                if (err) {
-                    node.error('send error: ' + err);
-                }
-                if (typeof(msg.cb) === 'function')
-                    msg.cb(err);
-            });
+      if (node.denoncommand && node.denoncommand !== 'empty') {
+        try {
+          payload = JSON.parse(node.denoncommand);
+          if (typeof (payload) === 'number')
+            payload.cmd = node.denoncommand.toString();
+        } catch (e) {
+          payload.cmd = node.denoncommand.toString();
+        }
+      }
 
-        });
-        this.on("close", function () {
-            node.log('denonOut.close');
-        });
+      node.send(payload, function(err) {
+        if (err) {
+          node.error('send error: ' + err);
+        }
+        if (typeof(msg.cb) === 'function')
+          msg.cb(err);
+      });
 
-        node.status({fill: "yellow", shape: "dot", text: "inactive"});
+    });
+    this.on("close", function() {
+      node.log('denonOut.close');
+    });
 
-        function nodeStatusConnected() {
-            node.status({fill: "green", shape: "dot", text: "connected"});
-        }
+    node.status({fill: "yellow", shape: "dot", text: "inactive"});
 
-        function nodeStatusDisconnected() {
-            node.status({fill: "red", shape: "dot", text: "disconnected"});
-        }
+    function nodeStatusConnected() {
+      node.status({fill: "green", shape: "dot", text: "connected"});
+    }
 
-        function nodeStatusReconnect() {
-            node.status({fill: "yellow", shape: "ring", text: "reconnecting"});
-        }
+    function nodeStatusDisconnected() {
+      node.status({fill: "red", shape: "dot", text: "disconnected"});
+    }
 
-        function nodeStatusConnecting() {
-            node.status({fill: "green", shape: "ring", text: "connecting"});
-        }
+    function nodeStatusReconnect() {
+      node.status({fill: "yellow", shape: "ring", text: "reconnecting"});
+    }
 
-        controllerNode.initializeDenonConnection(function (fsm) {
-            if (fsm.connected)
-                nodeStatusConnected();
-            else
-                nodeStatusDisconnected();
-            fsm.off('connecting', nodeStatusConnecting);
-            fsm.on('connecting', nodeStatusConnecting);
-            fsm.off('connected', nodeStatusConnected);
-            fsm.on('connected', nodeStatusConnected);
-            fsm.off('disconnected', nodeStatusDisconnected);
-            fsm.on('disconnected', nodeStatusDisconnected);
-            fsm.off('reconnect', nodeStatusReconnect);
-            fsm.on('reconnect', nodeStatusReconnect);
-        });
+    function nodeStatusConnecting() {
+      node.status({fill: "green", shape: "ring", text: "connecting"});
+    }
 
-        this.send = function (data, callback) {
-            DEBUG && RED.comms.publish("debug", {name: node.name, msg: 'send data[' + JSON.stringify(data) + ']'});
-            controllerNode.initializeDenonConnection(function (fsm) {
-                try {
-                    DEBUG && RED.comms.publish("debug", {name: node.name, msg: "send:  " + JSON.stringify(data)});
-                    data.cmd = data.cmd || data.method;
-                    data.value = data.value || data.params;
+    controllerNode.initializeDenonConnection(function(fsm) {
+      if (fsm.connected)
+        nodeStatusConnected();
+      else
+        nodeStatusDisconnected();
+      fsm.off('connecting', nodeStatusConnecting);
+      fsm.on('connecting', nodeStatusConnecting);
+      fsm.off('connected', nodeStatusConnected);
+      fsm.on('connected', nodeStatusConnected);
+      fsm.off('disconnected', nodeStatusDisconnected);
+      fsm.on('disconnected', nodeStatusDisconnected);
+      fsm.off('reconnect', nodeStatusReconnect);
+      fsm.on('reconnect', nodeStatusReconnect);
+    });
 
-                    switch (data.cmd.toLowerCase()) {
-                        case 'setvolumedb':
-                            fsm.connection.setVolumeDb(parseFloat(data.value), function (error, response) {
-                                if (!callback)
-                                    return;
-                                if (error)
-                                    callback && callback(error, response);
-                                else
-                                    callback(response);
-                            });
-                            break;
-                        default:
-                            fsm.connection.send(data.cmd, function (error, response) {
-                                if (!callback)
-                                    return;
-                                if (error)
-                                    callback && callback(error, response);
-                                else
-                                    callback(response);
-                            });
-                    }
-                }
-                catch (err) {
-                    node.error('error calling send: ' + err);
-                    callback(err);
-                }
-            });
+    this.send = function(data, callback) {
+      DEBUG && RED.comms.publish("debug", {name: node.name, msg: 'send data[' + JSON.stringify(data) + ']'});
+      controllerNode.initializeDenonConnection(function(fsm) {
+        try {
+          DEBUG && RED.comms.publish("debug", {name: node.name, msg: "send:  " + JSON.stringify(data)});
+          data.cmd = data.cmd || data.method;
+          data.value = data.value || data.params;
+          switch (data.cmd.toLowerCase()) {
+            case 'setvolumedb':
+              fsm.connection.setVolumeDb(parseFloat(data.value), function(error, response) {
+                if (!callback)
+                  return;
+                if (error)
+                  callback && callback(error, response);
+                else
+                  callback(response);
+              });
+              break;
+            default:
+              fsm.connection.send(data.cmd, function(error, response) {
+                if (!callback)
+                  return;
+                if (error)
+                  callback && callback(error, response);
+                else
+                  callback(response);
+              });
+          }
         }
+        catch (err) {
+          node.error('error calling send: ' + err);
+          callback(err);
+        }
+      });
     }
+  }
 
-    //
-    RED.nodes.registerType("denon-out", DenonOut);
+  //
+  RED.nodes.registerType("denon-out", DenonOut);
 
-    /**
-     * ====== Denon-IN ========================
-     * Handles incoming Global Cache, injecting
-     * json into node-red flows
-     * =======================================
-     */
-    function DenonIn(config) {
-        RED.nodes.createNode(this, config);
-        this.name = config.name;
-        this.connection = null;
-        var node = this;
-        //node.log('new DenonIn, config: %j', config);
-        var controllerNode = RED.nodes.getNode(config.controller);
+  /**
+   * ====== Denon-IN ========================
+   * Handles incoming Global Cache, injecting
+   * json into node-red flows
+   * =======================================
+   */
+  function DenonIn(config) {
+    RED.nodes.createNode(this, config);
+    this.name = config.name;
+    this.connection = null;
+    var node = this;
+    //node.log('new DenonIn, config: %j', config);
+    var controllerNode = RED.nodes.getNode(config.controller);
 
-        /* ===== Node-Red events ===== */
-        function nodeStatusConnecting() {
-            node.status({fill: "green", shape: "ring", text: "connecting"});
-        }
+    /* ===== Node-Red events ===== */
+    function nodeStatusConnecting() {
+      node.status({fill: "green", shape: "ring", text: "connecting"});
+    }
 
-        function nodeStatusConnected() {
-            node.status({fill: "green", shape: "dot", text: "connected"});
-        }
+    function nodeStatusConnected() {
+      node.status({fill: "green", shape: "dot", text: "connected"});
+    }
 
-        function nodeStatusDisconnected() {
-            node.status({fill: "red", shape: "dot", text: "disconnected"});
-        }
+    function nodeStatusDisconnected() {
+      node.status({fill: "red", shape: "dot", text: "disconnected"});
+    }
 
-        function nodeStatusReconnect() {
-            node.status({fill: "yellow", shape: "ring", text: "reconnecting"});
+    function nodeStatusReconnect() {
+      node.status({fill: "yellow", shape: "ring", text: "reconnecting"});
+    }
+
+    node.receiveNotification = function(notification, data) {
+      DEBUG && RED.comms.publish("debug", {
+        name: node.name,
+        msg: 'denon event data[' + JSON.stringify(data) + ']'
+      });
+      node.send({
+        topic: 'denon',
+        payload: {
+          'notification': notification,
+          'data': data
         }
+      });
+    };
 
-        node.receiveNotification = function (notification, data) {
-            DEBUG && RED.comms.publish("debug", {
-                name: node.name,
-                msg: 'denon event data[' + JSON.stringify(data) + ']'
-            });
-            node.send({
-                topic: 'denon',
-                payload: {
-                    'notification': notification,
-                    'data': data
-                }
-            });
-        };
+    controllerNode.initializeDenonConnection(function(fsm) {
+      if (fsm.connected)
+        nodeStatusConnected();
+      else
+        nodeStatusDisconnected();
+      fsm.off('connecting', nodeStatusConnecting);
+      fsm.on('connecting', nodeStatusConnecting);
+      fsm.off('connected', nodeStatusConnected);
+      fsm.on('connected', nodeStatusConnected);
+      fsm.off('disconnected', nodeStatusDisconnected);
+      fsm.on('disconnected', nodeStatusDisconnected);
+      fsm.off('reconnect', nodeStatusReconnect);
+      fsm.on('reconnect', nodeStatusReconnect);
+    });
+  }
 
-        controllerNode.initializeDenonConnection(function (fsm) {
-            if (fsm.connected)
-                nodeStatusConnected();
-            else
-                nodeStatusDisconnected();
-            fsm.off('connecting', nodeStatusConnecting);
-            fsm.on('connecting', nodeStatusConnecting);
-            fsm.off('connected', nodeStatusConnected);
-            fsm.on('connected', nodeStatusConnected);
-            fsm.off('disconnected', nodeStatusDisconnected);
-            fsm.on('disconnected', nodeStatusDisconnected);
-            fsm.off('reconnect', nodeStatusReconnect);
-            fsm.on('reconnect', nodeStatusReconnect);
-        });
-    }
-
-    RED.nodes.registerType("denon-in", DenonIn);
+  RED.nodes.registerType("denon-in", DenonIn);
 }

lib/connectionFSM.js

@@ -11,3 +11,3 @@ ~function (undefined) {
             PING_TIMEOUT: options.pingTimeout || options['ping-timeout'] || 5000,
-            PING_INTERVAL: options.pingInterval || options['ping-interval'] || 20000,
+            PING_INTERVAL: options.pingInterval || options['ping-interval'] || 60000,
             RECONNECT_INTERVAL: options.reconnectInterval || options['reconnect-interval'] || 5000,
@@ -14,0 +14,0 @@ initialize: function (options) {

package.json

 {
   "name": "node-red-contrib-denon",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Node-RED nodes for communicating with a Denon AVR.",
@@ -5,0 +5,0 @@ "repository": {

No alert changes

Worsened metrics

Total package byte prevSize

705627

decreased by-0.25%

Lines of code

402

decreased by-0.25%

No dependency changes