version 1.3

Author: Ax-LED

MMM-Navigate.js

@@ -20,9 +20,12 @@ Module.register("MMM-Navigate",{
     sendAction: function(description) {
         this.show(0,{force: true});
 
-        if((description.payload.action == "SHUTDOWN" || description.payload.action == "RESTART" || description.payload.action == "REBOOT") && (vconfirm==0)){
+        if((description.notification == "SHELLCOMMAND") && (vconfirm==0)){
             vconfirm = 1;
-            this.sendNotification("SHOW_ALERT",{type:"notification",message:"Ausführen von "+ description.payload.action +" bitte durch 2.Klick bestätigen"});
+            this.sendNotification("SHOW_ALERT",{type:"notification",message:"Ausführen von SHELLCOMMAND "+ description.payload +" bitte durch 2.Klick bestätigen"});
+        }else if((description.notification == "SHELLCOMMAND") && (vconfirm==1)){
+            vconfirm = 0;
+            this.sendSocketNotification(description.notification, description.payload);
         }else{
             vconfirm = 0;
             this.sendNotification(description.notification, description.payload);
@@ -149,6 +152,10 @@ Module.register("MMM-Navigate",{
         if(notification === "CW" || notification === "CCW" || notification === "PRESSED"){
             this.naviaction({inputtype: ""+ notification +""});
         }
+
+        if(notification === "SHELLCOMMAND"){
+             this.sendSocketNotification(notification, payload);
+        }
     },
 
     // socketNotificationReceived from helper
@@ -157,5 +164,4 @@ Module.register("MMM-Navigate",{
             this.naviaction(payload);
         }
     },
-    
-});
+});

README.md

@@ -42,12 +42,12 @@ To use this module, add it to the modules array in the `config/config.js` file:
 			Action: [
 				[{notification:'PAGE_INCREMENT',payload:''},{notification:'PAGE_DECREMENT',payload:''}],//action array, first press locks menu, after this rotation CW/CCW executes, second press release lock mode
 				[{notification:'ARTICLE_MORE_DETAILS',payload:''},{notification:'ARTICLE_LESS_DETAILS',payload:''}],
-				{notification: "SHOW_ALERT", payload: {type:"notification",message:"Dies ist eine Testnachricht"}},//single action, execute on press
+				{notification: 'SHOW_ALERT', payload: {type:'notification',message:'Dies ist eine Testnachricht'}},//single action, execute on press
 				{notification:'ARTICLE_MORE_DETAILS',payload:''},
 				{notification:'ARTICLE_LESS_DETAILS',payload:''},
-				{notification: "REMOTE_ACTION", payload: {action: "RESTART"}},
-				{notification: "REMOTE_ACTION", payload: {action: "REBOOT"}},
-				{notification: "REMOTE_ACTION", payload: {action: "SHUTDOWN"}}
+				{notification: 'SHELLCOMMAND', payload:'pm2 restart mm'},
+				{notification: 'SHELLCOMMAND', payload:'sudo reboot'},
+				{notification: 'SHELLCOMMAND', payload:'sudo shutdown -h now'}
 			],
 			GPIOPins: [26,20,19]//rotary cw, rotary ccw, rotary press (BCM Numbering)
 			},
@@ -80,21 +80,30 @@ The following properties can be configured:
 			<td><code>GPIOPins</code></td>
 			<td>Array for Definition of GPIO-Pins (BMC) to connect the rotary encoder for the following actions: Clockwise, Counterclockwise and Press</td>
 		</tr>
+		<tr>
+			<td><code>SHELLCOMMAND</code></td>
+			<td>Executes code in a terminal of you pi, so you can do almost everything you want. Example you want to shutdown your pi; Config: <code>
+			{notification: 'SHELLCOMMAND', payload:'sudo shutdown -h now'}</code><br>
+			</td>
+		</tr>
    </table>
-   Further information:<br>In version 1.1 of the module, i added a 'second click confirmation notification' for the following <code>REMOTE_ACTIONs</code>.<br>
-   - SHUTDOWN<br>
-   - RESTART<br>
-   - REBOOT<br>
-   This means, if you select one of these entries and press the rotary, you get a notification to do a second press to execute the selected entry.
+   Further information:<br>In version 1.1 of the module, i added a 'second click confirmation notification' for the following <code>SHELLCOMMAND</code>.<br>
+   This means, if you are using SHELLCOMMAND and press the rotary, you get a notification to do a second press to execute the selected entry.
 
    ## Further options
    You can communication with this module also by sending notifications.
    Examples:
-   <code>yourmmip:8080/remote?action=NOTIFICATION&notification=CCW</code> emulates turning rotary counterclockwise
-   <code>yourmmip:8080/remote?action=NOTIFICATION&notification=CW</code> emulates turning rotary clockwise
-   <code>yourmmip:8080/remote?action=NOTIFICATION&notification=PRESSED</code> emulates pressing rotary encoder
+   <code>yourmmip:8080/MMM-Navigate/remote?action=NOTIFICATION&notification=CCW</code> emulates turning rotary counterclockwise
+   <code>yourmmip:8080/MMM-Navigate/remote?action=NOTIFICATION&notification=CW</code> emulates turning rotary clockwise
+   <code>yourmmip:8080/MMM-Navigate/remote?action=NOTIFICATION&notification=PRESSED</code> emulates pressing rotary encoder
+   <code>yourmmip:8080/MMM-Navigate/remote?notification=SHELLCOMMAND&action=sudo%20shutdown%20-h%20now</code> send command to shutdown your pi
 
    ## Version
+   1.3 Changelog:
+   - added some functions to no longer have a dependency to MMM-Remote-Control
+      - SHELLCOMMAND
+	  - module is now listening to <code>yourmmip:8080/MMM-Navigate/remote?</code>
+
    1.2 Changelog:
    - added lock icon next to navigation alias, if locked
    - code cleaned
@@ -104,6 +113,6 @@ The following properties can be configured:
    - added ability to send notifications to MMM-Navigate by other modules
    - added locked mode, so you can put two(2) actions in one(1) navigation link which belong together (like PAGE_INCREMENT and PAGE_DECREMENT). More details see Configuration options (Action).
    - modified css, so locked mode is visual (red frame when locked) in MM
-   - added second click confirmation notification' for the following REMOTE_ACTIONs (SHUTDOWN, RESTART, REBOOT)
+   - added second click confirmation notification for SHELLCOMMAND
 
    1.0 initial release

node_helper.js

@@ -12,6 +12,9 @@
 const Gpio = require('onoff').Gpio;
 const moment = require('moment');//needed for time
 var NodeHelper = require("node_helper");
+const exec = require("child_process").exec;
+const url = require("url");
+const express = require("express");
 //Variables
 action = '';
 helfer = '';
@@ -23,6 +26,7 @@ module.exports = NodeHelper.create({
   start: function() {
 		var self = this;
 		this.loaded = false;
+		this.createRoutes();
 	},
 
 	intializeButtons: function() {
@@ -91,14 +95,26 @@ module.exports = NodeHelper.create({
 
 	// Override socketNotificationReceived method.
 	socketNotificationReceived: function(notification, payload) {
-		if (notification === 'START') {
-			console.log("Working notification system. Notification:", notification, "payload: ", payload);
-			// Send notification
-			this.sendSocketNotification('MSG', {message: 'test'});
-		}else if (notification === 'BUTTON_CONFIG') {     
+		if (notification === 'BUTTON_CONFIG') {     
 			this.config = payload.config;
 			this.intializeButtons();
 		}
+
+		if (notification === 'SHELLCOMMAND') {
+			console.log("MMM-Navigate, received Shellcommand:", payload);
+			exec(payload, null);
+		}
 	},
-	
-});
+
+	createRoutes: function() {
+		var self = this;
+
+		this.expressApp.get("/MMM-Navigate/remote", function(req, res) {
+				var query = url.parse(req.url, true).query;
+				if(query.notification=='CW' || query.notification=='CCW' || query.notification=='PRESSED'){
+					self.sendSocketNotification(query.notification,{inputtype: ""+query.notification+""});
+				}
+				res.send("MMM-Navigate, data received: "+ JSON.stringify(query));
+		});
+	},
+});