@nexrender/worker 1.39.7 → 1.40.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nexrender/worker",
-  "version": "1.39.7",
+  "version": "1.40.0",
   "author": "inlife",
   "main": "src/index.js",
   "scripts": {
@@ -16,9 +16,9 @@
     ]
   },
   "dependencies": {
-    "@nexrender/api": "^1.39.7",
-    "@nexrender/core": "^1.39.4",
-    "@nexrender/types": "^1.38.0",
+    "@nexrender/api": "^1.40.0",
+    "@nexrender/core": "^1.40.0",
+    "@nexrender/types": "^1.40.0",
     "arg": "^4.1.0",
     "chalk": "^2.4.2",
     "rimraf": "^3.0.2"
@@ -26,5 +26,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "15564b834ed85c5f7d0d44757815dd043ac1ed5c"
+  "gitHead": "9c2ab173beeed9a531a924841576ee71943817d3"
 }

package/readme.md

@@ -50,6 +50,7 @@ const main = async () => {
         workpath: '/Users/myname/.nexrender/',
         binary: '/Users/mynames/Applications/aerender',
         skipCleanup: true,
+        tagSelector: false,
         addLicense: false,
         debug: true,
         actions: {
@@ -81,6 +82,7 @@ Available settings (almost same as for `nexrender-core`):
 * `forceCommandLinePatch` - boolean, providing true will force patch re-installation
 * `stopOnError` - boolean, stop the pick-up-and-render process if an error occurs (false by default)
 * `polling` - number, amount of miliseconds to wait before checking queued projects from the api, if specified will be used instead of NEXRENDER_API_POLLING env variable
+* `tagSelector` - string, (optional) provide the string tags (example `primary,plugins,halowell` : comma delimited) to pickup the job with specific tags. Leave it false to ignore and pick a random job from the server with no specific tags. Tags name must be an alphanumeric.
 * `wslMap` - string, drive letter of your WSL mapping in Windows
 * `aeParams` - array of strings, any additional params that will be passed to the aerender binary, a name-value parameter pair separated by a space,
 * `actions` - an object with keys corresponding to the `module` field when defining an action, value should be a function matching expected signature of an action. Used for defining actions programmatically without needing to package the action as a separate package

package/src/bin.js

@@ -9,36 +9,38 @@ const rimraf    = require('rimraf')
 
 const args = arg({
     // Types
-    '--help':       Boolean,
-    '--version':    Boolean,
-    '--cleanup':    Boolean,
+    '--help':                   Boolean,
+    '--version':                Boolean,
+    '--cleanup':                Boolean,
 
-    '--host':       String,
-    '--secret':     String,
+    '--host':                   String,
+    '--secret':                 String,
 
-    '--binary':     String,
-    '--workpath':   String,
-    '--wsl-map':    String,
+    '--binary':                 String,
+    '--workpath':               String,
+    '--wsl-map':                String,
+    '--tag-selector':           String,
 
-    '--stop-on-error':  Boolean,
+    '--stop-on-error':          Boolean,
 
-    '--skip-cleanup':   Boolean,
-    '--skip-render':    Boolean,
-    '--no-license':     Boolean,
-    '--force-patch':    Boolean,
-    '--debug':          Boolean,
-    '--multi-frames':   Boolean,
-    '--multi-frames-cpu': Number,
-    '--reuse':          Boolean,
+    '--skip-cleanup':           Boolean,
+    '--skip-render':            Boolean,
+    '--no-license':             Boolean,
+    '--force-patch':            Boolean,
+    '--debug':                  Boolean,
+    '--multi-frames':           Boolean,
+    '--multi-frames-cpu':       Number,
+    '--reuse':                  Boolean,
 
-    '--max-memory-percent':  Number,
-    '--image-cache-percent': Number,
-    '--polling':             Number,
+    '--max-memory-percent':     Number,
+    '--image-cache-percent':    Number,
+    '--polling':                Number,
 
-    '--aerender-parameter': [String],
+    '--aerender-parameter':     [String],
 
     // Aliases
     '-v':           '--version',
+    '-t':           '--tag-selector',
     '-c':           '--cleanup',
     '-h':           '--help',
     '-s':           '--secret',
@@ -87,11 +89,13 @@ if (args['--help']) {
       -w, --workpath {underline absolute_path}          manually override path to the working directory
                                             by default nexrender is using os tmpdir/nexrender folder
 
-      -m, --wsl-map                       drive letter of your WSL mapping in Windows
+      -m, --wsl-map                         drive letter of your WSL mapping in Windows
 
-  {bold ADVANCED OPTIONS}
+      -t, --tag-selector                    the string tags (comma delimited) to pickup the job with specific tag.
 
+  {bold ADVANCED OPTIONS}
 
+  
     --stop-on-error                         forces worker to stop if processing/rendering error occures,
                                             otherwise worker will report an error, and continue working
 
@@ -188,6 +192,7 @@ opt('imageCachePercent',    '--image-cache-percent');
 opt('polling',              '--polling');
 opt('wslMap',               '--wsl-map');
 opt('aeParams',             '--aerender-parameter');
+opt('tagSelector',          '--tag-selector');
 
 if (args['--cleanup']) {
     settings = init(Object.assign(settings, {

package/src/index.js

@@ -14,7 +14,12 @@ const delay = amount => (
 const nextJob = async (client, settings) => {
     do {
         try {
-            const job = await client.pickupJob();
+            let job = {};
+            if(settings.tagSelector){
+                job = await client.pickupJob(settings.tagSelector);
+            }else{
+                job = await client.pickupJob();
+            }
 
             if (job && job.uid) {
                 return job
@@ -24,6 +29,8 @@ const nextJob = async (client, settings) => {
                 throw err;
             } else {
                 console.error(err)
+                console.error("render proccess stopped with error...")
+                console.error("continue listening next job...")
             }
         }
 
@@ -44,6 +51,10 @@ const start = async (host, secret, settings) => {
         logger: console,
     }))
 
+    if( typeof settings.tagSelector == 'string' ){
+        settings.tagSelector = settings.tagSelector.replace(/[^a-z0-9, ]/gi, '')
+    }
+
     const client = createClient({ host, secret });
 
     do {
@@ -66,14 +77,26 @@ const start = async (host, secret, settings) => {
                     /* send render progress to our server */
                     client.updateJob(job.uid, getRenderingStatus(job))
                 } catch (err) {
+                    
                     if (settings.stopOnError) {
                         throw err;
                     } else {
                         console.log(`[${job.uid}] error occurred: ${err.stack}`)
+                        console.log(`[${job.uid}] render proccess stopped with error...`)
+                        console.log(`[${job.uid}] continue listening next job...`)
                     }
                 }
             }
 
+            job.onRenderError = function (undefined, err /* on render error */) {
+                /* set job render error to send to our server */
+                if( typeof err.toString == "function" ){
+                    job.error = [err.toString()];
+                }else{
+                    job.error = [err];
+                }
+            }
+
             job = await render(job, settings); {
                 job.state = 'finished';
                 job.finishedAt = new Date()
@@ -82,7 +105,35 @@ const start = async (host, secret, settings) => {
             await client.updateJob(job.uid, getRenderingStatus(job))
         } catch (err) {
             job.state = 'error';
-            job.error = err;
+
+            /* append existing error message with another error message */
+            if( job.hasOwnProperty("error") && job.error ) {
+                if(Array.isArray(job.error)){
+                    if( typeof job.error.toString == "function" ){ /* Use toString as possible to prevent JSON stringify null return */
+                        job.error = [].concat.apply(job.error,[err.toString()]);
+                    }else{
+                        job.error = [].concat.apply(job.error,[err]);
+                    }
+                }else{
+                    if( typeof job.error.toString == "function" ){ /* Use toString as possible to prevent JSON stringify null return */
+                        job.error = [job.error.toString()];
+                    }else{
+                        job.error = [job.error];
+                    }
+
+                    if( typeof err.toString == "function" ){ /* Use toString as possible to prevent JSON stringify null return */
+                        job.error.push(err.toString());
+                    }else{
+                        job.error.push(err);
+                    }
+                }
+            }else{
+                if( typeof err.toString == "function" ){  /* Use toString as possible to prevent JSON stringify null return */
+                    job.error = err.toString();
+                }else{
+                    job.error = err;
+                }
+            }
             job.errorAt = new Date()
 
             await client.updateJob(job.uid, getRenderingStatus(job)).catch((err) => {
@@ -90,6 +141,9 @@ const start = async (host, secret, settings) => {
                     throw err;
                 } else {
                     console.log(`[${job.uid}] error occurred: ${err.stack}`)
+                    console.log(`[${job.uid}] render proccess stopped with error...`)
+                    console.log(`[${job.uid}] continue listening next job...`)
+
                 }
             });
 
@@ -97,6 +151,8 @@ const start = async (host, secret, settings) => {
                 throw err;
             } else {
                 console.log(`[${job.uid}] error occurred: ${err.stack}`)
+                console.log(`[${job.uid}] render proccess stopped with error...`)
+                console.log(`[${job.uid}] continue listening next job...`)
             }
         }
     } while (active)