frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add try/catch to websocket to fix #402

Browse Source 
Also allow buffer out as binary if required. (ie don't try and stringify a buffer)
This commit is contained in:
Dave C-J
2014-09-18 17:10:01 +01:00
parent a718f34c58
commit ed1da5cf7b
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
nodes/core/io/22-websocket.js
View File

@@ -59,7 +59,6 @@ module.exports = function(RED) {
node.server.on('connection', function(socket){ node.server.on('connection', function(socket){
var id = (1+Math.random()*4294967295).toString(16); var id = (1+Math.random()*4294967295).toString(16);
node._clients[id] = socket; node._clients[id] = socket;
socket.on('close',function() { socket.on('close',function() {
delete node._clients[id]; delete node._clients[id];
}); });
@@ -84,7 +83,6 @@ module.exports = function(RED) {
} }
} }
node._serverListeners = {}; node._serverListeners = {};
node.server.close(); node.server.close();
node._inputNodes = []; node._inputNodes = [];
}); });
@@ -117,10 +115,15 @@ module.exports = function(RED) {
} }
WebSocketListenerNode.prototype.broadcast = function(data){ WebSocketListenerNode.prototype.broadcast = function(data){
try {
for (var i = 0; i < this.server.clients.length; i++) { for (var i = 0; i < this.server.clients.length; i++) {
this.server.clients[i].send(data); this.server.clients[i].send(data);
} }
} }
catch(e) { // swallow any errors
this.warn("ws:"+i+" : "+e);
}
}
WebSocketListenerNode.prototype.send = function(id,data) { WebSocketListenerNode.prototype.send = function(id,data) {
var session = this._clients[id]; var session = this._clients[id];
@@ -160,8 +163,13 @@ module.exports = function(RED) {
delete msg._session; delete msg._session;
payload = JSON.stringify(msg); payload = JSON.stringify(msg);
} else { } else {
if (!Buffer.isBuffer(msg.payload)) { // if it's not a buffer make sure it's a string.
payload = RED.util.ensureString(msg.payload); payload = RED.util.ensureString(msg.payload);
} }
else {
payload = msg.payload;
}
}
if (msg._session && msg._session.type == "websocket") { if (msg._session && msg._session.type == "websocket") {
node.serverConfig.send(msg._session.id,payload); node.serverConfig.send(msg._session.id,payload);
} else { } else {