@nexrender/worker 1.42.1 → 1.42.2

package/package.json

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

package/src/index.js

@@ -14,12 +14,10 @@ const delay = amount => (
 const nextJob = async (client, settings) => {
     do {
         try {
-            let job = {};
-            if(settings.tagSelector){
-                job = await client.pickupJob(settings.tagSelector);
-            }else{
-                job = await client.pickupJob();
-            }
+            let job = await (settings.tagSelector ?
+                await client.pickupJob(settings.tagSelector) :
+                await client.pickupJob()
+            );
 
             if (job && job.uid) {
                 return job
@@ -51,7 +49,7 @@ const start = async (host, secret, settings, headers) => {
         logger: console,
     }))
 
-    if( typeof settings.tagSelector == 'string' ){
+    if (typeof settings.tagSelector == 'string') {
         settings.tagSelector = settings.tagSelector.replace(/[^a-z0-9, ]/gi, '')
     }
 
@@ -72,12 +70,11 @@ const start = async (host, secret, settings, headers) => {
         }
 
         try {
-            job.onRenderProgress = function (job, /* progress */) {
+            job.onRenderProgress = (job) => {
                 try {
                     /* send render progress to our server */
                     client.updateJob(job.uid, getRenderingStatus(job))
                 } catch (err) {
-                    
                     if (settings.stopOnError) {
                         throw err;
                     } else {
@@ -88,13 +85,8 @@ const start = async (host, secret, settings, headers) => {
                 }
             }
 
-            job.onRenderError = function (_, 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.onRenderError = (job, err /* on render error */) => {
+                job.error = [].concat(job.error || [], [err.toString()]);
             }
 
             job = await render(job, settings); {
@@ -104,38 +96,10 @@ const start = async (host, secret, settings, headers) => {
 
             await client.updateJob(job.uid, getRenderingStatus(job))
         } catch (err) {
+            job.error = [].concat(job.error || [], [err.toString()]);
+            job.errorAt = new Date();
             job.state = 'error';
 
-            /* 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) => {
                 if (settings.stopOnError) {
                     throw err;
@@ -143,7 +107,6 @@ const start = async (host, secret, settings, headers) => {
                     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...`)
-
                 }
             });