From 7e2c78666edddc3bdbaa92ec87832896a5e72e4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Tue, 31 Dec 2019 19:31:13 +0000 Subject: [PATCH 1/3] Revert "stop helper class being erased" This reverts commit 2fbedca746655f38fa89a6436afa888f88d518db. --- modules/node_modules/node_helper/index.js | 125 ++++++++++++++++++++++ package.json | 1 - 2 files changed, 125 insertions(+), 1 deletion(-) create mode 100644 modules/node_modules/node_helper/index.js diff --git a/modules/node_modules/node_helper/index.js b/modules/node_modules/node_helper/index.js new file mode 100644 index 00000000..92931140 --- /dev/null +++ b/modules/node_modules/node_helper/index.js @@ -0,0 +1,125 @@ +/* Magic Mirror + * Node Helper Superclass + * + * By Michael Teeuw http://michaelteeuw.nl + * MIT Licensed. + */ + +var Class = require("../../../js/class.js"); +var express = require("express"); +var path = require("path"); + +NodeHelper = Class.extend({ + init: function() { + console.log("Initializing new module helper ..."); + }, + + loaded: function(callback) { + console.log("Module helper loaded: " + this.name); + callback(); + }, + + start: function() { + console.log("Starting module helper: " + this.name); + }, + + /* stop() + * Called when the MagicMirror server receives a `SIGINT` + * Close any open connections, stop any sub-processes and + * gracefully exit the module. + * + */ + stop: function() { + console.log("Stopping module helper: " + this.name); + }, + + /* socketNotificationReceived(notification, payload) + * This method is called when a socket notification arrives. + * + * argument notification string - The identifier of the notification. + * argument payload mixed - The payload of the notification. + */ + socketNotificationReceived: function(notification, payload) { + console.log(this.name + " received a socket notification: " + notification + " - Payload: " + payload); + }, + + /* setName(name) + * Set the module name. + * + * argument name string - Module name. + */ + setName: function(name) { + this.name = name; + }, + + /* setPath(path) + * Set the module path. + * + * argument path string - Module path. + */ + setPath: function(path) { + this.path = path; + }, + + /* sendSocketNotification(notification, payload) + * Send a socket notification to the node helper. + * + * argument notification string - The identifier of the notification. + * argument payload mixed - The payload of the notification. + */ + sendSocketNotification: function(notification, payload) { + this.io.of(this.name).emit(notification, payload); + }, + + /* setExpressApp(app) + * Sets the express app object for this module. + * This allows you to host files from the created webserver. + * + * argument app Express app - The Express app object. + */ + setExpressApp: function(app) { + this.expressApp = app; + + var publicPath = this.path + "/public"; + app.use("/" + this.name, express.static(publicPath)); + }, + + /* 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); + } + }); + }); + + } +}); + +NodeHelper.create = function(moduleDefinition) { + return NodeHelper.extend(moduleDefinition); +}; + +module.exports = NodeHelper; diff --git a/package.json b/package.json index 65012a64..8d8867f0 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,6 @@ "iconv-lite": "latest", "lodash": "^4.17.15", "moment": "latest", - "node_helper": "git://github.com/sdetweil/nodehelper.git", "request": "^2.88.0", "rrule": "^2.6.2", "rrule-alt": "^2.2.8", From 905d0ca40996c8a9b59049a8d0d8fea30b22b480 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Tue, 31 Dec 2019 19:33:21 +0000 Subject: [PATCH 2/3] Update package-lock* --- package-lock.json | 10 +++------- vendor/package-lock.json | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 83e3114e..a8399e6c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5764,10 +5764,6 @@ } } }, - "node_helper": { - "version": "git://github.com/sdetweil/nodehelper.git#c01ad10b38c81938a9ba3e55ab72ffd81d4bc0d4", - "from": "git://github.com/sdetweil/nodehelper.git" - }, "nopt": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", @@ -6275,9 +6271,9 @@ "dev": true }, "postcss": { - "version": "7.0.25", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.25.tgz", - "integrity": "sha512-NXXVvWq9icrm/TgQC0O6YVFi4StfJz46M1iNd/h6B26Nvh/HKI+q4YZtFN/EjcInZliEscO/WL10BXnc1E5nwg==", + "version": "7.0.26", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.26.tgz", + "integrity": "sha512-IY4oRjpXWYshuTDFxMVkJDtWIk2LhsTlu8bZnbEJA4+bYT16Lvpo8Qv6EvDumhYRgzjZl489pmsY3qVgJQ08nA==", "dev": true, "requires": { "chalk": "^2.4.2", diff --git a/vendor/package-lock.json b/vendor/package-lock.json index 3253cc4e..369827fa 100644 --- a/vendor/package-lock.json +++ b/vendor/package-lock.json @@ -5,7 +5,7 @@ "dependencies": { "@fortawesome/fontawesome-free": { "version": "5.6.3", - "resolved": "https://npm.fontawesome.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.6.3.tgz", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.6.3.tgz", "integrity": "sha512-s5PLdI9NYgjBvfrv6rhirPHlAHWx+Sfo/IjsAeiXYfmemC/GSjwsyz1wLnGPazbLPXWfk62ks980o9AmsxYUEQ==" }, "a-sync-waterfall": { From 3a42663deaaa555f72814bdb04997a7f0fe7e057 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Tue, 31 Dec 2019 19:40:31 +0000 Subject: [PATCH 3/3] Update changelog for revert commit --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6fad7572..77965ed6 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,6 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Added - Timestamps in log output. - Padding in dateheader mode of the calendar module . -- Move node_helper module to dedicated github repo, to prevent being erased accidentally. - New upgrade script to help users consume regular updates installers/upgrade-script.sh. - New script to help setup pm2, without install installers/fixuppm2.sh.