kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-08-21 12:55:22 +00:00
Code Issues Projects Releases Wiki Activity

Improved socket connection for node_helper.

Browse Source
This commit is contained in:
Michael Teeuw
2016-03-30 16:25:24 +02:00
parent 59b339aba5
commit b243d25399
6 changed files with 55 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
modules/node_modules/node_helper/index.js generated vendored
View File

@@ -6,7 +6,6 @@
*/
var Class = require('../../../js/class.js');
var MMSocket = require('../../../js/socketclient.js');
NodeHelper = Class.extend({
init: function() {
@@ -34,24 +33,6 @@ NodeHelper = Class.extend({
*/
setName: function(name) {
this.name = name;
this.socket();
},
/* socket()
* Returns a socket object. If it doesn't exsist, it's created.
* It also registers the notification callback.
*/
socket: function() {
if (typeof this._socket === 'undefined') {
this._socket = this._socket = new MMSocket(this.name);
}
var self = this;
this._socket.setNotificationCallback(function(notification, payload) {
self.socketNotificationReceived(notification, payload);
});
return this._socket;
},
/* sendSocketNotification(notification, payload)
@@ -61,7 +42,39 @@ NodeHelper = Class.extend({
* argument payload mixed - The payload of the notification.
*/
sendSocketNotification: function(notification, payload) {
this.socket().sendNotification(notification, payload);
this.io.of(this.name).emit(notification, payload);
},
/* setSocketIO(io)
* Sets the socket io object for this module.
* Binds message receiver.
*
* argument io Socket.io - The Socket io object.
*/
setSocketIO: function(io) {
var self = this;
self.io = io;
console.log('Connecting socket for: ' + this.name);
var namespace = this.name;
io.of(namespace).on('connection', function (socket) {
// add a catch all event.
var onevent = socket.onevent;
socket.onevent = function (packet) {
var args = packet.data || [];
onevent.call (this, packet); // original call
packet.data = ["*"].concat(args);
onevent.call(this, packet); // additional call to catch-all
};
// register catch all.
socket.on('*', function (notification, payload) {
if (notification !== '*')
console.log('received message in namespace: ' + namespace);
self.socketNotificationReceived(notification, payload);
});
});
}
});