@nexrender/core 1.40.0 → 1.41.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nexrender/core",
-  "version": "1.40.0",
+  "version": "1.41.0",
   "main": "src/index.js",
   "author": "Inlife",
   "scripts": {
@@ -30,5 +30,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9c2ab173beeed9a531a924841576ee71943817d3"
+  "gitHead": "01e3428a9194eb50e40f22a66bb236c9fc70a03c"
 }

package/src/helpers/autofind.js

@@ -13,6 +13,7 @@ const defaultPaths = {
         '/Applications/Adobe After Effects 2020',
         '/Applications/Adobe After Effects 2021',
         '/Applications/Adobe After Effects 2022',
+        '/Applications/Adobe After Effects 2023',
         '/Applications/Adobe After Effects CC 2021',
         '/Applications/Adobe After Effects CC 2022',
         '/Applications/Adobe After Effects CC 2023',

package/src/index.js

@@ -21,6 +21,8 @@ const dorender     = require('./tasks/render')
 const postrender   = require('./tasks/actions')('postrender')
 const cleanup      = require('./tasks/cleanup')
 
+const { create } = require('@nexrender/types/job')
+
 /* place to register all plugins */
 /* so they will be picked up and resolved by pkg */
 if (process.env.NEXRENDER_REQUIRE_PLUGINS) {
@@ -103,11 +105,13 @@ const init = (settings) => {
 }
 
 
-const render = (job, settings = {}) => {
+const render = (jobConfig, settings = {}) => {
     if (!settings.__initialized) {
         settings = init(settings)
     }
 
+     /* fill default job fields */
+    const job = create(jobConfig)
     return Promise.resolve(job)
         .then(job => state(job, settings, setup, 'setup'))
         .then(job => state(job, settings, predownload, 'predownload'))

package/src/tasks/render.js

@@ -14,6 +14,7 @@ const option = (params, name, ...values) => {
         values.every(value => value !== undefined) ? params.push(name, ...values) : undefined
     }
 }
+
 const seconds = (string) => string.split(':')
     .map((e, i) => (i < 3) ? +e * Math.pow(60, 2 - i) : +e * 10e-6)
     .reduce((acc, val) => acc + val);
@@ -117,7 +118,7 @@ module.exports = (job, settings) => {
 
         // There will be multiple error messages parsed when nexrender throws an error,
         // but we want only the first
-        if(matchError !== null && !errorSent){
+        if (matchError !== null && !errorSent) {
             settings.logger.log(`[${job.uid}] rendering reached an error: ${matchError[1]}`);
             if (job.hasOwnProperty('onRenderError') && typeof job['onRenderError'] == 'function') {
                 job.onRenderError(job, matchError[1]);
@@ -132,6 +133,8 @@ module.exports = (job, settings) => {
     return new Promise((resolve, reject) => {
         renderStopwatch = Date.now();
 
+        let timeoutID = 0;
+
         if (settings.debug) {
             settings.logger.log(`[${job.uid}] spawning aerender process: ${settings.binary} ${params.join(' ')}`);
         }
@@ -145,7 +148,10 @@ module.exports = (job, settings) => {
             // env: { PATH: path.dirname(settings.binary) },
         });
 
-        instance.on('error', err => reject(new Error(`Error starting aerender process: ${err}`)));
+        instance.on('error', err => {
+            clearTimeout(timeoutID);
+            return reject(new Error(`Error starting aerender process: ${err}`));
+        });
 
         instance.stdout.on('data', (data) => {
             output.push(parse(data.toString('utf8')));
@@ -157,6 +163,17 @@ module.exports = (job, settings) => {
             (settings.verbose && settings.logger.log(data.toString('utf8')));
         });
 
+        if (settings.maxRenderTimeout && settings.maxRenderTimeout > 0) {
+            const timeout = 1000 * settings.maxRenderTimeout;
+            timeoutID = setTimeout(
+                () => {
+                    reject(new Error(`Maximum rendering time exceeded`));
+                    instance.kill('SIGINT');
+                },
+                timeout
+            );
+        }
+
         /* on finish (code 0 - success, other - error) */
         instance.on('close', (code) => {
 
@@ -169,6 +186,7 @@ module.exports = (job, settings) => {
                     settings.logger.log(fs.readFileSync(logPath, 'utf8'))
                 }
 
+                clearTimeout(timeoutID);
                 return reject(new Error(outputStr || 'aerender.exe failed to render the output into the file due to an unknown reason'));
             }
 
@@ -179,6 +197,7 @@ module.exports = (job, settings) => {
 
             /* resolve job without checking if file exists, or its size for image sequences */
             if (settings.skipRender || job.template.imageSequence || ['jpeg', 'jpg', 'png'].indexOf(outputFile) !== -1) {
+                clearTimeout(timeoutID);
                 return resolve(job)
             }
 
@@ -205,6 +224,7 @@ module.exports = (job, settings) => {
                     settings.logger.log(fs.readFileSync(logPath, 'utf8'))
                 }
 
+                clearTimeout(timeoutID);
                 return reject(new Error(`Couldn't find a result file: ${outputFile}`))
             }
 
@@ -215,6 +235,7 @@ module.exports = (job, settings) => {
                 settings.logger.log(`[${job.uid}] Warning: output file size is less than 1000 bytes (${stats.size} bytes), be advised that file is corrupted, or rendering is still being finished`)
             }
 
+            clearTimeout(timeoutID);
             resolve(job)
         });
 

package/src/tasks/setup.js

@@ -3,15 +3,12 @@ const path    = require('path')
 const mkdirp  = require('mkdirp')
 const assert  = require('assert')
 
-const { create, validate } = require('@nexrender/types/job')
+const { validate } = require('@nexrender/types/job')
 
 /**
  * This task creates working directory for current job
  */
 module.exports = (job, settings) => {
-    /* fill default job fields */
-    job = create(job)
-
     settings.logger.log(`[${job.uid}] setting up job...`);
 
     try {