frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Let MQTT input node receive binary packets

Browse Source 
Try to auto select output type to be string or buffer to be backwards compatible
Fixes #435
This commit is contained in:
Dave C-J 2014-11-04 21:56:15 +00:00
parent 1153619a03
commit 273acc0ec4
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nodes/core/io/10-mqtt.js
View File

@ -17,6 +17,7 @@
module.exports = function(RED) { module.exports = function(RED) {
"use strict"; "use strict";
var connectionPool = require("./lib/mqttConnectionPool"); var connectionPool = require("./lib/mqttConnectionPool");
var isUtf8 = require('is-utf8');
function MQTTBrokerNode(n) { function MQTTBrokerNode(n) {
RED.nodes.createNode(this,n); RED.nodes.createNode(this,n);
@ -45,11 +46,12 @@ module.exports = function(RED) {
this.client = connectionPool.get(this.brokerConfig.broker,this.brokerConfig.port,this.brokerConfig.clientid,this.brokerConfig.username,this.brokerConfig.password); this.client = connectionPool.get(this.brokerConfig.broker,this.brokerConfig.port,this.brokerConfig.clientid,this.brokerConfig.username,this.brokerConfig.password);
var node = this; var node = this;
this.client.subscribe(this.topic,2,function(topic,payload,qos,retain) { this.client.subscribe(this.topic,2,function(topic,payload,qos,retain) {
var msg = {topic:topic,payload:payload,qos:qos,retain:retain}; if (isUtf8(payload)) { payload = payload.toString(); }
if ((node.brokerConfig.broker == "localhost")||(node.brokerConfig.broker == "127.0.0.1")) { var msg = {topic:topic,payload:payload,qos:qos,retain:retain};
msg._topic = topic; if ((node.brokerConfig.broker === "localhost")||(node.brokerConfig.broker === "127.0.0.1")) {
} msg._topic = topic;
node.send(msg); }
node.send(msg);
}); });
this.client.on("connectionlost",function() { this.client.on("connectionlost",function() {
node.status({fill:"red",shape:"ring",text:"disconnected"}); node.status({fill:"red",shape:"ring",text:"disconnected"});
@ -78,7 +80,7 @@ module.exports = function(RED) {
this.brokerConfig = RED.nodes.getNode(this.broker); this.brokerConfig = RED.nodes.getNode(this.broker);
if (this.brokerConfig) { if (this.brokerConfig) {
this.status({fill:"red",shape:"ring",text:"disconnected"},true); this.status({fill:"red",shape:"ring",text:"disconnected"});
this.client = connectionPool.get(this.brokerConfig.broker,this.brokerConfig.port,this.brokerConfig.clientid,this.brokerConfig.username,this.brokerConfig.password); this.client = connectionPool.get(this.brokerConfig.broker,this.brokerConfig.port,this.brokerConfig.clientid,this.brokerConfig.username,this.brokerConfig.password);
var node = this; var node = this;
this.on("input",function(msg) { this.on("input",function(msg) {

28
nodes/core/io/lib/mqtt.js
View File

@ -19,7 +19,7 @@ var events = require("events");
//var inspect = require("sys").inspect; //var inspect = require("sys").inspect;
//var Client = module.exports.Client = function( //var Client = module.exports.Client = function(
var port = 1883; var port = 1883;
var host = "localhost"; var host = "localhost";
@ -32,7 +32,7 @@ function MQTTClient(port,host) {
this.lastOutbound = (new Date()).getTime(); this.lastOutbound = (new Date()).getTime();
this.lastInbound = (new Date()).getTime(); this.lastInbound = (new Date()).getTime();
this.connected = false; this.connected = false;
this._nextMessageId = function() { this._nextMessageId = function() {
this.messageId += 1; this.messageId += 1;
if (this.messageId > 0xFFFF) { if (this.messageId > 0xFFFF) {
@ -53,7 +53,7 @@ MQTTClient.prototype.connect = function(options) {
self.options.clean = self.options.clean||true; self.options.clean = self.options.clean||true;
self.options.protocolId = 'MQIsdp'; self.options.protocolId = 'MQIsdp';
self.options.protocolVersion = 3; self.options.protocolVersion = 3;
self.client = mqtt.createConnection(this.port,this.host,function(err,client) { self.client = mqtt.createConnection(this.port,this.host,function(err,client) {
if (err) { if (err) {
self.connected = false; self.connected = false;
@ -87,9 +87,9 @@ MQTTClient.prototype.connect = function(options) {
if (packet.returnCode == 0) { if (packet.returnCode == 0) {
self.watchdog = setInterval(function(self) { self.watchdog = setInterval(function(self) {
var now = (new Date()).getTime(); var now = (new Date()).getTime();
//util.log('[mqtt] ['+self.uid+'] watchdog '+inspect({connected:self.connected,connectionError:self.connectionError,pingOutstanding:self.pingOutstanding,now:now,lastOutbound:self.lastOutbound,lastInbound:self.lastInbound})); //util.log('[mqtt] ['+self.uid+'] watchdog '+inspect({connected:self.connected,connectionError:self.connectionError,pingOutstanding:self.pingOutstanding,now:now,lastOutbound:self.lastOutbound,lastInbound:self.lastInbound}));
if (now - self.lastOutbound > self.options.keepalive*500 || now - self.lastInbound > self.options.keepalive*500) { if (now - self.lastOutbound > self.options.keepalive*500 || now - self.lastInbound > self.options.keepalive*500) {
if (self.pingOutstanding) { if (self.pingOutstanding) {
//util.log('[mqtt] ['+self.uid+'] watchdog pingOustanding - disconnect'); //util.log('[mqtt] ['+self.uid+'] watchdog pingOustanding - disconnect');
@ -105,7 +105,7 @@ MQTTClient.prototype.connect = function(options) {
self.client.pingreq(); self.client.pingreq();
} }
} }
},self.options.keepalive*500,self); },self.options.keepalive*500,self);
self.pingOutstanding = false; self.pingOutstanding = false;
self.lastInbound = (new Date()).getTime() self.lastInbound = (new Date()).getTime()
@ -131,7 +131,7 @@ MQTTClient.prototype.connect = function(options) {
delete self.pendingSubscriptions[packet.messageId]; delete self.pendingSubscriptions[packet.messageId];
}); });
client.on('publish',function(packet) { client.on('publish',function(packet) {
self.lastInbound = (new Date()).getTime() self.lastInbound = (new Date()).getTime();
if (packet.qos < 2) { if (packet.qos < 2) {
var p = packet; var p = packet;
self.emit('message',p.topic,p.payload,p.qos,p.retain); self.emit('message',p.topic,p.payload,p.qos,p.retain);
@ -145,7 +145,7 @@ MQTTClient.prototype.connect = function(options) {
self.client.puback(packet); self.client.puback(packet);
} }
}); });
client.on('pubrel',function(packet) { client.on('pubrel',function(packet) {
self.lastInbound = (new Date()).getTime() self.lastInbound = (new Date()).getTime()
var p = self.inboundMessages[packet.messageId]; var p = self.inboundMessages[packet.messageId];
@ -156,12 +156,12 @@ MQTTClient.prototype.connect = function(options) {
self.lastOutbound = (new Date()).getTime() self.lastOutbound = (new Date()).getTime()
self.client.pubcomp(packet); self.client.pubcomp(packet);
}); });
client.on('puback',function(packet) { client.on('puback',function(packet) {
self.lastInbound = (new Date()).getTime() self.lastInbound = (new Date()).getTime()
// outbound qos-1 complete // outbound qos-1 complete
}); });
client.on('pubrec',function(packet) { client.on('pubrec',function(packet) {
self.lastInbound = (new Date()).getTime() self.lastInbound = (new Date()).getTime()
self.lastOutbound = (new Date()).getTime() self.lastOutbound = (new Date()).getTime()
@ -176,7 +176,7 @@ MQTTClient.prototype.connect = function(options) {
self.lastInbound = (new Date()).getTime() self.lastInbound = (new Date()).getTime()
self.pingOutstanding = false; self.pingOutstanding = false;
}); });
this.lastOutbound = (new Date()).getTime() this.lastOutbound = (new Date()).getTime()
this.connectionError = false; this.connectionError = false;
client.connect(self.options); client.connect(self.options);
@ -192,8 +192,9 @@ MQTTClient.prototype.subscribe = function(topic,qos) {
messageId: self._nextMessageId() messageId: self._nextMessageId()
}; };
this.pendingSubscriptions[options.messageId] = topic; this.pendingSubscriptions[options.messageId] = topic;
this.lastOutbound = (new Date()).getTime() this.lastOutbound = (new Date()).getTime();
self.client.subscribe(options); self.client.subscribe(options);
self.client.setPacketEncoding('binary');
} }
} }
MQTTClient.prototype.unsubscribe = function(topic) { MQTTClient.prototype.unsubscribe = function(topic) {
@ -212,7 +213,7 @@ MQTTClient.prototype.unsubscribe = function(topic) {
MQTTClient.prototype.publish = function(topic,payload,qos,retain) { MQTTClient.prototype.publish = function(topic,payload,qos,retain) {
var self = this; var self = this;
if (self.connected) { if (self.connected) {
if (!Buffer.isBuffer(payload)) { if (!Buffer.isBuffer(payload)) {
if (typeof payload === "object") { if (typeof payload === "object") {
payload = JSON.stringify(payload); payload = JSON.stringify(payload);
@ -251,4 +252,3 @@ module.exports.createClient = function(port,host) {
var mqtt_client = new MQTTClient(port,host); var mqtt_client = new MQTTClient(port,host);
return mqtt_client; return mqtt_client;
} }