node-schedule - npm Package Compare versions

Comparing version 1.1.1 to 1.2.0

lib/schedule.js

@@ -96,3 +96,3 @@
       if (reschedule && inv.recurrenceRule.recurs) {
-        newInv = scheduleNextRecurrence(inv.recurrenceRule, this, inv.fireDate);
+        newInv = scheduleNextRecurrence(inv.recurrenceRule, this, inv.fireDate, inv.endDate);
         if (newInv !== null) {
@@ -132,3 +132,3 @@ newInvs.push(newInv);
     if (reschedule && nextInv.recurrenceRule.recurs) {
-      newInv = scheduleNextRecurrence(nextInv.recurrenceRule, this, nextInv.fireDate);
+      newInv = scheduleNextRecurrence(nextInv.recurrenceRule, this, nextInv.fireDate, nextInv.endDate);
       if (newInv !== null) {
@@ -191,5 +191,27 @@ this.trackInvocation(newInv);
   var inv;
+  var start;
+  var end;
+
+  if (typeof spec === 'object' && spec.rule) {
+    start = spec.start || null;
+    end = spec.end || null;
+    spec = spec.rule;
+
+    if (start != null) {
+      if (!(start instanceof Date)) {
+        start = new Date(start);
+      }
+      if (!isValidDate(start) || start.getTime() < Date.now()) {
+        start = null;
+      }
+    }
+
+    if (end != null && !(end instanceof Date) && !isValidDate(end = new Date(end))) {
+      end = null;
+    }
+  }
+
   try {
-    var res = cronParser.parseExpression(spec);
-    inv = scheduleNextRecurrence(res, self);
+    var res = cronParser.parseExpression(spec, { currentDate: start });
+    inv = scheduleNextRecurrence(res, self, start, end);
     if (inv !== null) {
@@ -239,3 +261,3 @@ success = self.trackInvocation(inv);
 
-      inv = scheduleNextRecurrence(spec, self);
+      inv = scheduleNextRecurrence(spec, self, start, end);
       if (inv !== null) {
@@ -268,5 +290,6 @@ success = self.trackInvocation(inv);
 /* Invocation object */
-function Invocation(job, fireDate, recurrenceRule) {
+function Invocation(job, fireDate, recurrenceRule, endDate) {
   this.job = job;
   this.fireDate = fireDate;
+  this.endDate = endDate;
   this.recurrenceRule = recurrenceRule || DoesntRecur;
@@ -453,3 +476,3 @@
       if (cinv.recurrenceRule.recurs || cinv.recurrenceRule._endDate === null) {
-        var inv = scheduleNextRecurrence(cinv.recurrenceRule, cinv.job, cinv.fireDate);
+        var inv = scheduleNextRecurrence(cinv.recurrenceRule, cinv.job, cinv.fireDate, cinv.endDate);
         if (inv !== null) {
@@ -492,3 +515,4 @@ inv.job.trackInvocation(inv);
 /* Recurrence scheduler */
-function scheduleNextRecurrence(rule, job, prevDate) {
+function scheduleNextRecurrence(rule, job, prevDate, endDate) {
+
   prevDate = (prevDate instanceof Date) ? prevDate : (new Date());
@@ -501,3 +525,7 @@
 
-  var inv = new Invocation(job, date, rule);
+  if ((endDate instanceof Date) && date.getTime() > endDate.getTime()) {
+    return null;
+  }
+
+  var inv = new Invocation(job, date, rule, endDate);
   scheduleInvocation(inv);
@@ -504,0 +532,0 @@

package.json

 {
   "name": "node-schedule",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "A cron-like and not-cron-like job scheduler for Node.",
@@ -11,2 +11,3 @@ "keywords": [
   ],
+  "license": "MIT",
   "main": "./lib/schedule.js",
@@ -13,0 +14,0 @@ "scripts": {

Fixed alerts

No README

Quality

Package does not have a README. This may indicate a failed publish or a low quality package.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

75381

increased by24.29%

Lines of code

2152

increased by12.38%

Number of medium quality alerts

0

decreased by-100%

Number of lines in readme file

222

increased byInfinity%

Worsened metrics

Number of package files

16

decreased by-5.88%

Number of low supply chain risk alerts

7

increased by16.67%

No dependency changes