Merge branch 'master' of github.com:node-red/node-red

nodes/core/20-inject.html

@@ -23,22 +23,154 @@
         <label for="node-input-payload"><i class="icon-envelope"></i> Payload</label>
         <input type="text" id="node-input-payload" placeholder="Payload">
     </div>
-    <div class="form-row node-input-repeat">
+
-        <label for="node-input-repeat"><i class="icon-repeat"></i> Repeat (S)</label>
-        <input type="text" id="node-input-repeat" placeholder="0">
-    </div>
     <div class="form-row">
         <label>&nbsp;</label>
         <input type="checkbox" id="node-input-once" placeholder="once" style="display: inline-block; width: auto; vertical-align: top;">
         <label for="node-input-once" style="width: 70%;">Fire once at start ?</label>
     </div>
+    
+    <div class="form-row">
+        <label for=""><i class="icon-repeat"></i> Repeat</label>
+        <select id="inject-time-type-select"><option value="none">None</option><option value="interval">interval</option><option value="interval-time">interval between times</option><option value="time">at a specific time</option></select>
+        <input type="hidden" id="node-input-repeat" placeholder="Payload">
+        <input type="hidden" id="node-input-crontab" placeholder="Payload">
+    </div>
+    
+    <div class="form-row inject-time-row hidden" id="inject-time-row-interval">
+        every <input id="inject-time-interval-count" class="inject-time-count" value="1"></input>
+              <select style="width: 100px" id="inject-time-interval-units"><option value="s">seconds</option><option value="m">minutes</option><option value="h">hours</option></select><br/>
+        on <select disabled id="inject-time-interval-days" class="inject-time-days"></select>
+    </div>
+    
+    <div class="form-row inject-time-row hidden" id="inject-time-row-interval-time">
+        every <input id="inject-time-interval-time-units" class="inject-time-count" value="1"></input> minutes<br/> 
+        between <select id="inject-time-interval-time-start" class="inject-time-times"></select>
+        and <select id="inject-time-interval-time-end" class="inject-time-times"></select><br/>
+        on <select id="inject-time-interval-time-days" class="inject-time-days"></select>
+    </div>
+    
+    <div class="form-row inject-time-row hidden" id="inject-time-row-time">
+        at <input id="inject-time-time" value="12:00"></input><br/>
+        on <select id="inject-time-time-days" class="inject-time-days"></select>
+    </div>
+    
     <div class="form-row">
         <label for="node-input-name"><i class="icon-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
-    <div class="form-tips">Tip: Injects Date.now() if no payload set.<br/>Repeat interval blank or 0 means no repeat.</div>
+    
-</script>
+    <div class="form-tips">Tip: Injects Date.now() if no payload set</div>
+    <script>
+    {
+    
+        $("#inject-time-type-select").change(function() {
+            var id = $("#inject-time-type-select option:selected").val();
+            $(".inject-time-row").hide();
+            $("#inject-time-row-"+id).show();
+        });
+    
+        var days = [
+            {v:"*",t:"every day"},
+            {v:"1-5",t:"Mondays to Fridays"},
+            {v:"6-7",t:"Saturdays and Sundays"},
+            {v:"1",t:"Mondays"},
+            {v:"2",t:"Tuesdays"},
+            {v:"3",t:"Wednesdays"},
+            {v:"4",t:"Thursdays"},
+            {v:"5",t:"Fridays"},
+            {v:"6",t:"Saturdays"},
+            {v:"7",t:"Sundays"}
+        ];
+        $(".inject-time-days").each(function() {
+            for (var d in days) {
+                $(this).append($("<option></option>").val(days[d].v).text(days[d].t));
+            }
+        });
+        
+        $(".inject-time-times").each(function() {
+            for (var i=0;i<24;i++) {
+                var l = (i<10?"0":"")+i+":00";
+                $(this).append($("<option></option>").val(i).text(l));
+            }
+        });
+        $(".inject-time-count").spinner({
+            min:1,
+            max:60
+        });
+        
+        $("#inject-time-interval-units").change(function() {
+            var units = $("#inject-time-interval-units option:selected").val();
+            $("#inject-time-interval-days").prop("disabled",(units == "s")?"disabled":false);
+            $(".inject-time-count").spinner("option","max",(units == "h")?24:60);
+            
+        });
+        
 
+        $.widget( "ui.injecttimespinner", $.ui.spinner, {
+            options: {
+                // seconds
+                step: 60 * 1000,
+                // hours
+                page: 60,
+                min:0,
+                max:(23*60+59)*60*1000
+            },
+            _parse: function( value ) {
+                if ( typeof value === "string" ) {
+                    // already a timestamp
+                    if ( Number( value ) == value ) {
+                        return Number( value );
+                    }
+                    var p = value.split(":");
+                    return ((p[0]*60)+Number(p[1]))*60*1000;
+                }
+                return value;
+            },
+            _format: function( value ) {
+                var d = new Date(value);
+                var h = d.getHours();
+                var m = d.getMinutes();
+                
+                return ((h<10)?"0":"")+h+":"+((m<10)?"0":"")+m;
+            }
+        });
+        
+        
+        $("#inject-time-time").injecttimespinner();
+    };
+
+        
+    </script>
+</script>
+<style>
+    .inject-time-row {
+        padding-left: 110px;
+    }
+    .inject-time-row select {
+        margin: 3px 0;
+    }
+    .inject-time-days {
+        width: 225px;
+    }
+    .inject-time-times {
+        width: 90px;
+    }
+    .inject-time-row > .ui-spinner {
+        height: 28px;
+        margin: 3px 0;
+        border-color: rgb(204, 204, 204);
+    }
+    #inject-time-time {
+        margin-top: 3px;
+        width: 75px;
+    }
+    .inject-time-count {
+        width: 30px !important;
+    }
+    .
+    
+</style>
 <script type="text/x-red" data-help-name="inject">
 	<p>Pressing the button on the left side of the node allows a message on a topic to be injected into the flow. This is mainly for test purposes.</p>
 	<p>If no payload is specified the payload is set to the current time in millisecs since 1970. This allows subsequent functions to perform time based actions.</p>
@@ -55,6 +187,7 @@
             topic: {value:""},
             payload: {value:""},
             repeat: {value:""},
+            crontab: {value:""},
             once: {value:false}
         },
         inputs:0,
@@ -66,6 +199,150 @@
         labelStyle: function() {
             return this.name?"node_label_italic":"";
         },
+        oneditprepare: function() {
+            var repeattype = "none";
+            if (Number(this.repeat) != 0) {
+                repeattype = "interval";
+                $("#inject-time-interval-units option").filter(function() {return $(this).val() == "s";}).attr('selected',true);
+                $("#inject-time-interval-count").val(this.repeat);
+                $("#inject-time-interval-days").prop("disabled","disabled");
+            } else if (this.crontab) {
+                var cronparts = this.crontab.split(" ");
+                var days = cronparts[4];
+                if (Number(cronparts[0]) && Number(cronparts[1])) {
+                    repeattype = "time";
+                    // Fixed time
+                    var time = cronparts[1]+":"+cronparts[0];
+                    $("#inject-time-time").val(time);
+                    $("#inject-time-type-select option").filter(function() {return $(this).val() == "s";}).attr('selected',true);
+                    $("#inject-time-time-days option").filter(function() {return $(this).val() == days;}).attr('selected',true);
+                    
+                } else if (cronparts[0] == "0") {
+                    // interval - hours
+                    var hours = cronparts[1].slice(2);
+                    repeattype = "interval";
+                    $("#inject-time-interval-days").prop("disabled",false);
+                    $("#inject-time-interval-days option").filter(function() {return $(this).val() == days;}).attr('selected',true);
+                    $("#inject-time-interval-count").val(hours)
+                    $("#inject-time-interval-units option").filter(function() {return $(this).val() == "h";}).attr('selected',true);
+                } else if (cronparts[1] == "*") {
+                    // interval - minutes
+                    var minutes = cronparts[0].slice(2);
+                    repeattype = "interval";
+                    $("#inject-time-interval-days").prop("disabled",false);
+                    $("#inject-time-interval-days option").filter(function() {return $(this).val() == days;}).attr('selected',true);
+                    $("#inject-time-interval-count").val(minutes)
+                    $("#inject-time-interval-units option").filter(function() {return $(this).val() == "m";}).attr('selected',true);
+                } else {
+                    repeattype = "interval-time";
+                    // interval - time period
+                    var minutes = cronparts[0].slice(2);
+                    $("#inject-time-interval-time-units").val(minutes);
+                    $("#inject-time-interval-time-days option").filter(function() {return $(this).val() == days;}).attr('selected',true);
+                    var time = cronparts[1];
+                    var timeparts = time.split(",");
+                    var start;
+                    var end;
+                    if (timeparts.length == 1) {
+                        // 0 or 0-10
+                        var hours = timeparts[0].split("-");
+                        if (hours.length == 1) {
+                            start = hours[0];
+                            end = Number(hours[0])+1;
+                        } else {
+                            start = hours[0];
+                            end = (Number(hours[1])+1)%24;
+                        }
+                    } else {
+                        // 23,0 or 17-23,0-10 or 23,0-2 or 17-23,0
+                        var startparts = timeparts[0].split("-");
+                        start = startparts[0];
+                        
+                        var endparts = timeparts[1].split("-");
+                        if (endparts.length == 1) {
+                            end = Number(endparts[0])+1;
+                        } else {
+                            end = Number(endparts[1])+1;
+                        }
+                    }
+                    $("#inject-time-interval-time-start option").filter(function() {return $(this).val() == start;}).attr('selected',true);
+                    $("#inject-time-interval-time-end option").filter(function() {return $(this).val() == end;}).attr('selected',true);
+
+                }
+            } else {
+                $("#inject-time-type-select option").filter(function() {return $(this).val() == "none";}).attr('selected',true);
+            }
+            
+            $(".inject-time-row").hide();
+            $("#inject-time-type-select option").filter(function() {return $(this).val() == repeattype;}).attr('selected',true);
+            $("#inject-time-row-"+repeattype).show();
+
+        
+        },
+        oneditsave: function() {
+            var repeat = "";
+            var crontab = "";
+            var type = $("#inject-time-type-select option:selected").val();
+            if (type == "none") {
+                // nothing
+            } else if (type == "interval") {
+                var count = $("#inject-time-interval-count").val();
+                var units = $("#inject-time-interval-units option:selected").val();
+                var days = $("#inject-time-interval-days option:selected").val();
+                if (units == "s") {
+                    repeat = count;
+                } else {
+                    if (units == "m") {
+                        crontab = "*/"+count+" * * * "+days;
+                    } else if (units == "h") {
+                        crontab = "0 */"+count+" * * "+days;
+                    }
+                } 
+            } else if (type == "interval-time") {
+                var count = $("#inject-time-interval-time-units").val();
+                var startTime = Number($("#inject-time-interval-time-start option:selected").val());
+                var endTime = Number($("#inject-time-interval-time-end option:selected").val());
+                var days = $("#inject-time-interval-time-days option:selected").val();
+                var timerange = "";
+                if (startTime == endTime) {
+                    //TODO: invalid
+                    repeat = 0;
+                    crontab = "";
+                } else if (endTime == 0) {
+                    timerange = startTime+"-23";
+                } else if (startTime+1 < endTime) {
+                    timerange = startTime+"-"+(endTime-1);
+                } else if (startTime+1 == endTime) {
+                    timerange = startTime;
+                } else {
+                    var startpart = "";
+                    var endpart = "";
+                    if (startTime == 23) {
+                        startpart = "23";
+                    } else {
+                        startpart = startTime+"-23";
+                    }
+                    if (endTime == 1) {
+                        endpart = "0";
+                    } else {
+                        endpart = "0-"+(endTime-1);
+                    }
+                    timerange = startpart+","+endpart;
+                }
+                repeat = 0;
+                crontab = "*/"+count+" "+timerange+" * * "+days;
+            } else if (type == "time") {
+                var time = $("#inject-time-time").val();
+                var days = $("#inject-time-time-days option:selected").val();
+                var parts = time.split(":");
+                repeat = 0;
+                crontab = parts[1]+" "+parts[0]+" * * "+days;
+            }
+            
+            $("#node-input-repeat").val(repeat);
+            $("#node-input-crontab").val(crontab);
+            
+        },
         button: {
             onclick: function() {
                 var label = this.name||this.payload;

nodes/core/20-inject.js

@@ -15,15 +15,22 @@
  **/
 
 var RED = require("../../red/red");
+try {
+    var cron = require("cron");
+} catch(err) {
+    require("util").log("[inject] Warning: cannot find module 'cron'");
+}
 
 function InjectNode(n) {
 	RED.nodes.createNode(this,n);
 	this.topic = n.topic;
 	this.payload = n.payload;
 	this.repeat = n.repeat;
+	this.crontab = n.crontab;
 	this.once = n.once;
 	var node = this;
 	this.interval_id = null;
+	this.cronjob = null;
 
 	if (this.repeat && !isNaN(this.repeat) && this.repeat > 0) {
 		this.repeat = this.repeat * 1000;
@@ -31,6 +38,17 @@ function InjectNode(n) {
 		this.interval_id = setInterval( function() {
 			node.emit("input",{});
 		}, this.repeat );
+	} else if (this.crontab) {
+	    if (cron) {
+	        this.log("crontab = "+this.crontab);
+	        this.cronjob = new cron.CronJob(this.crontab,
+	            function() {
+	                node.emit("input",{});
+	            },
+	            null,true);
+	    } else {
+	        this.error("'cron' module not found");
+	    }
 	}
 
 	if (this.once) {
@@ -51,6 +69,10 @@ InjectNode.prototype.close = function() {
     if (this.interval_id != null) {
         clearInterval(this.interval_id);
         this.log("inject: repeat stopped");
+    } else if (this.cronjob != null) {
+        this.cronjob.stop();
+        this.log("inject: cronjob stopped");
+        delete this.cronjob;
     }
 }
 

package.json

@@ -14,7 +14,8 @@
     "express": "3.x",
     "mqtt": "*",
     "ws": "*",
-    "mustache": "*"
+    "mustache": "*",
+    "cron":"*"
   },
   "engines": { "node": ">=0.8" }
 }