@nexrender/core 1.31.0 → 1.35.0

package/src/assets/{commandLineRenderer.jsx → commandLineRenderer-default.jsx}

@@ -1,4 +1,4 @@
-module.exports = /*syntax:js*/ `// Command line renderer for After Effects. (nexrender-patch-v1.0.2)
+module.exports = /*syntax:js*/ `// Command line renderer for After Effects. (nexrender-patch-v1.0.3)
 
 // This function constructs an AECommandLineRenderer object.
 // One and only one of these will be created to perform rendering tasks
@@ -120,7 +120,7 @@ function AECommandLineRenderer() {
     // Report an error. This writes errors to the log file, if present.
     // This is called from the context of the application, so we
     // need to precede variable names with gAECommandLineRenderer
-    // 
+    //
     function checkParentDied() {
         var result = false;
         if (gAECommandLineRenderer.log_file instanceof Socket) {
@@ -143,13 +143,13 @@ function AECommandLineRenderer() {
         checkParentDied();
         if (severity_string == "PROBLEM" || severity_string == "FATAL") {
             // These two errors cause us to change the exit code.
-            // We don't write an error or throw here, because we got here as part of a thrown 
+            // We don't write an error or throw here, because we got here as part of a thrown
             // error already, and the message will be printed as part of the catch.
             gAECommandLineRenderer.SetExitCode(gAECommandLineRenderer.EXIT_AE_RUNTIME);
         } else {
             // PROBLEM and FATAL will throw exceptions, and so will be logged to the file
             // when we catch the exception.
-            // All other errors (NAKED, INFO, WARNING, PROGRESS, and DEBUG) will not 
+            // All other errors (NAKED, INFO, WARNING, PROGRESS, and DEBUG) will not
             // throw exceptions.  So we log them to the file right here:
             if (gAECommandLineRenderer.is_verbose_mode) {
                 if (gAECommandLineRenderer.log_file != null) {
@@ -177,7 +177,7 @@ function AECommandLineRenderer() {
 
     // Report an error. This establishes exitCodes for reporting errors from AfterFX.
     function my_SetExitCode(code) {
-        // Some codes are set differently depending on whether we have a custom user 
+        // Some codes are set differently depending on whether we have a custom user
         // log file.  Check for these and use the alternate if appropriate.
         var real_code = code;
         if (gAECommandLineRenderer.has_user_log_file) {
@@ -203,7 +203,7 @@ function AECommandLineRenderer() {
         }
     }
 
-    // Arguments may be enclosed in quotes.  This 
+    // Arguments may be enclosed in quotes.  This
     // will remove them and return the result.
     function my_StripAnyEnclosingQuotes(inString) {
         var result = inString;
@@ -514,7 +514,7 @@ function AECommandLineRenderer() {
         try {
             // While rendering we'll report errors to the log file.
             if (app.onError == this.onError) {
-                // If the previous error handler is just this one, don't store it. 
+                // If the previous error handler is just this one, don't store it.
                 // That can happen in extreme cases where this script does not get a
                 // chance to clean up and put back the oldErrorHandler when it's done.
                 this.oldErrorHandler = null;
@@ -719,10 +719,10 @@ function AECommandLineRenderer() {
                     }
                 } else {
                     // Render times are stored as timeSpanStart and timeSpanDuration.
-                    // Setting only the timeSpanStart will not change the timeSpanDuration and 
-                    // so will move the end time, but we want the end time unchanged if 
+                    // Setting only the timeSpanStart will not change the timeSpanDuration and
+                    // so will move the end time, but we want the end time unchanged if
                     // it was not specified.
-                    // So we must calculate both start_time and end_time, 
+                    // So we must calculate both start_time and end_time,
                     // then set both timeSpanStart and timeSpanDuration.
                     // Note: frameDuration is stored in the comp.
                     var start_time = rqi.timeSpanStart;
@@ -760,12 +760,12 @@ function AECommandLineRenderer() {
                     // Increment as defined here is one greater then the
                     // the render queue item's skipFrames.
                     // skipFrames 0 is the same as increment of 1.
-                    // 
+                    //
                     rqi.skipFrames = (this.in_increment - 1);
                 }
             }
 
-            // If we are in verbose mode, set the log type to ERRORS_AND_PER_FRAME_INFO 
+            // If we are in verbose mode, set the log type to ERRORS_AND_PER_FRAME_INFO
             // for all RQ items we are about to render.
             if (this.is_verbose_mode) {
                 this.SetLogPerFrameInfoInRQ();

package/src/helpers/autofind.js

@@ -12,7 +12,9 @@ const defaultPaths = {
         '/Applications/Adobe After Effects CC 2019',
         '/Applications/Adobe After Effects 2020',
         '/Applications/Adobe After Effects 2021',
+        '/Applications/Adobe After Effects 2022',
         '/Applications/Adobe After Effects CC 2021',
+        '/Applications/Adobe After Effects CC 2022',
     ],
     win32: [
         'C:\\Program Files\\Adobe\\After Effects CC',
@@ -25,6 +27,7 @@ const defaultPaths = {
         'C:\\Program Files\\Adobe\\After Effects CC 2020\\Support Files',
         'C:\\Program Files\\Adobe\\After Effects 2020\\Support Files',
         'C:\\Program Files\\Adobe\\After Effects 2021\\Support Files',
+        'C:\\Program Files\\Adobe\\After Effects 2022\\Support Files',
 
         'C:\\Program Files\\Adobe\\Adobe After Effects CC',
         'C:\\Program Files\\Adobe\\Adobe After Effects CC\\Support Files',
@@ -36,6 +39,7 @@ const defaultPaths = {
         'C:\\Program Files\\Adobe\\Adobe After Effects CC 2020\\Support Files',
         'C:\\Program Files\\Adobe\\Adobe After Effects 2020\\Support Files',
         'C:\\Program Files\\Adobe\\Adobe After Effects 2021\\Support Files',
+        'C:\\Program Files\\Adobe\\Adobe After Effects 2022\\Support Files',
     ],
     wsl: [
         '/mnt/c/Program Files/Adobe/After Effects CC',
@@ -48,6 +52,7 @@ const defaultPaths = {
         '/mnt/c/Program Files/Adobe/After Effects CC 2020/Support Files',
         '/mnt/c/Program Files/Adobe/After Effects 2020/Support Files',
         '/mnt/c/Program Files/Adobe/After Effects 2021/Support Files',
+        '/mnt/c/Program Files/Adobe/After Effects 2022/Support Files',
 
         '/mnt/c/Program Files/Adobe/Adobe After Effects CC',
         '/mnt/c/Program Files/Adobe/Adobe After Effects CC/Support Files',
@@ -59,6 +64,7 @@ const defaultPaths = {
         '/mnt/c/Program Files/Adobe/Adobe After Effects CC 2020/Support Files',
         '/mnt/c/Program Files/Adobe/Adobe After Effects 2020/Support Files',
         '/mnt/c/Program Files/Adobe/Adobe After Effects 2021/Support Files',
+        '/mnt/c/Program Files/Adobe/Adobe After Effects 2022/Support Files',
     ],
 }
 

package/src/helpers/patch.js

@@ -1,7 +1,8 @@
 const fs      = require('fs')
 const path    = require('path')
 const mkdirp  = require('mkdirp')
-const patched = require('../assets/commandLineRenderer.jsx')
+const patchedDefault = require('../assets/commandLineRenderer-default.jsx')
+const patched2022 = require('../assets/commandLineRenderer-2022.jsx')
 
 const writeTo = (data, dst) => fs.writeFileSync(dst, data)
 const copyTo = (src, dst) => fs.writeFileSync(dst, fs.readFileSync(src))
@@ -14,6 +15,13 @@ module.exports = (settings) => {
     const targetScript  = 'commandLineRenderer.jsx';
 
     const afterEffects = path.dirname(settings.binary)
+    const afterEffectsYearMatch = afterEffects.match(/(20[0-9]{2})/);
+
+    let patched = patchedDefault;
+    if (afterEffectsYearMatch && afterEffectsYearMatch[0] >= "2022") {
+        patched = patched2022;
+    }
+
     const originalFile = path.join(afterEffects, 'Scripts', 'Startup', targetScript)
     const backupFile   = path.join(afterEffects, 'Backup.Scripts', 'Startup', targetScript)
 

package/src/index.js

@@ -67,6 +67,7 @@ const init = (settings) => {
 
         debug: false,
         multiFrames: false,
+        multiFramesCPU: 90,
         maxMemoryPercent: undefined,
         imageCachePercent: undefined,
         wslMap: undefined,

package/src/tasks/actions.js

@@ -21,9 +21,13 @@ module.exports = actionType => (job, settings) => {
     settings.logger.log(`[${job.uid}] applying ${actionType} actions...`);
 
     return PromiseSerial((job.actions[actionType] || []).map(action => () => {
-        return requireg(action.module)(job, settings, action, actionType).catch(err => {
-            return Promise.reject(new Error(`Error loading ${actionType} module ${action.module}: ${err}`))
-        });
+        if(settings.actions && settings.actions[action.module]){
+            return settings.actions[action.module](job, settings, action, actionType);
+        }else{
+            return requireg(action.module)(job, settings, action, actionType).catch(err => {
+                return Promise.reject(new Error(`Error loading ${actionType} module ${action.module}: ${err}`));
+            });
+        }
     })).then(() => {
         return Promise.resolve(job)
     });

package/src/tasks/render.js

@@ -53,7 +53,7 @@ module.exports = (job, settings) => {
 
     option(params, '-r', jobScriptFile);
 
-    if (!settings.skipRender && settings.multiFrames) params.push('-mp');
+    if (!settings.skipRender && settings.multiFrames) params.push('-mfr', 'ON', settings.multiFramesCPU);
     if (settings.reuse) params.push('-reuse');
     if (job.template.continueOnMissing) params.push('-continueOnMissingFootage')
 
@@ -186,7 +186,17 @@ module.exports = (job, settings) => {
                 return resolve(job)
             }
 
-            if (!fs.existsSync(outputFile)) {
+            // When a render has finished, look for a .mov file too, on AE 2022
+            // the outputfile appears to be forced as .mov.
+            // We need to maintain this here while we have 2022 and 2020
+            // workers simultaneously
+            const movOutputFile = outputFile.replace(/\.avi$/g, '.mov')
+            const existsMovOutputFile = fs.existsSync(movOutputFile)
+            if (existsMovOutputFile) {
+              job.output = movOutputFile
+            }
+
+            if (!fs.existsSync(job.output)) {
                 if (fs.existsSync(logPath)) {
                     settings.logger.log(`[${job.uid}] dumping aerender log:`)
                     settings.logger.log(fs.readFileSync(logPath, 'utf8'))
@@ -195,7 +205,7 @@ module.exports = (job, settings) => {
                 return reject(new Error(`Couldn't find a result file: ${outputFile}`))
             }
 
-            const stats = fs.statSync(outputFile)
+            const stats = fs.statSync(job.output)
 
             /* file smaller than 1000 bytes */
             if (stats.size < 1000) {