@nexrender/worker 1.51.5 → 1.52.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nexrender/worker",
-  "version": "1.51.5",
+  "version": "1.52.0",
   "author": "inlife",
   "main": "src/index.js",
   "homepage": "https://www.nexrender.com",
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@nexrender/api": "^1.50.1",
-    "@nexrender/core": "^1.51.5",
+    "@nexrender/core": "^1.51.8",
     "@nexrender/types": "^1.45.6",
     "arg": "^4.1.0",
     "chalk": "^2.4.2",
@@ -29,5 +29,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a1f932f311dd2b8a96c455b0cd5592a63c4832bd"
+  "gitHead": "3bea58d245779f156f588f5b012b77036684449a"
 }

package/src/bin.js

@@ -27,6 +27,8 @@ const args = arg({
     '--stop-on-error':          Boolean,
     '--exit-on-empty-queue':    Boolean,
     '--tolerate-empty-queues':  Number,
+    '--stop-at-time':           String,
+    '--stop-days':              String,
 
     '--skip-cleanup':           Boolean,
     '--skip-render':            Boolean,
@@ -123,7 +125,15 @@ if (args['--help']) {
     --tolerate-empty-queues                 worker will check an empty queue this many times before exiting (if that option has
                                             been set using --exit-on-empty-queues). Defaults to zero. If specified will be used instead of
                                             NEXRENDER_TOLERATE_EMPTY_QUEUES env variable
-
+                                            
+    --stop-at-time                          worker will exit at the given time if given.
+                                            example: 5:00 will stop at 5 am local time.  
+    
+    --stop-days                             comma separated list of weekdays when to stop. Must be used together with --stop-at-time
+                                            0 is sunday, 6 is saturday
+                                            example: --stop-at-time=5:00 stop-days=1,2,3,4,5
+                                            will stop at 5 am but not on weekend                                          
+                                            
     --no-license                            prevents creation of the ae_render_only_node.txt file (enabled by default),
                                             which allows free usage of trial version of Adobe After Effects
 
@@ -219,6 +229,8 @@ opt('reuse',                '--reuse');
 opt('stopOnError',          '--stop-on-error');
 opt('tolerateEmptyQueues',  '--tolerate-empty-queues');
 opt('exitOnEmptyQueue',     '--exit-on-empty-queue');
+opt('stopAtTime',           '--stop-at-time');
+opt('stopDays',             '--stop-days');
 opt('maxMemoryPercent',     '--max-memory-percent');
 opt('imageCachePercent',    '--image-cache-percent');
 opt('polling',              '--polling');

package/src/instance.js

@@ -12,10 +12,16 @@ const createWorker = () => {
     let emptyReturns = 0;
     let active = false;
     let settingsRef = null;
+    let stop_datetime = null;
 
     const nextJob = async (client, settings) => {
         do {
             try {
+                if (stop_datetime !== null && new Date() > stop_datetime) {
+                    active = false;
+                    return
+                }
+
                 let job = await (settings.tagSelector ?
                     await client.pickupJob(settings.tagSelector) :
                     await client.pickupJob()
@@ -89,7 +95,27 @@ const createWorker = () => {
             worker_setting_stop_on_error: settings.stopOnError,
         })
 
+        if(settings.stopAtTime) {
+            let stopTimeParts = settings.stopAtTime.split(':'); // split the hour and minute
+            let now = new Date(); // get current date object
+
+            stop_datetime = new Date(); // new date object for stopping time
+            stop_datetime.setHours(stopTimeParts[0], stopTimeParts[1], 0, 0); // set the stop time
+
+            if(stop_datetime.getTime() <= now.getTime()){
+                stop_datetime.setDate(stop_datetime.getDate() + 1); // if it's past the stop time, move it to next day
+            }
+
+            if(settings.stopDays) {
+                let stopDaysList = settings.stopDays.split(',').map(Number); // convert string weekdays into integer values
+                while(!stopDaysList.includes(stop_datetime.getDay())) {
+                    stop_datetime.setDate(stop_datetime.getDate() + 1); // if stop_datetime's weekday is not in the list, add one day
+                }
+            }
+        }
+
         do {
+
             let job = await nextJob(client, settings);
 
             // if the worker has been deactivated, exit this loop