@nexrender/core 1.32.3 → 1.36.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,6 +12,7 @@ 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',
     ],

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)
 
@@ -25,8 +33,8 @@ module.exports = (settings) => {
     if (data.indexOf('nexrender-patch') !== -1) {
         settings.logger.log('command line patch already is in place')
 
-        const patchedMatch = patched.match(/nexrender-patch-v([0-9\.]+)/)
-        const existingMatch = data.match(/nexrender-patch-v([0-9\.]+)/)
+        const patchedMatch = patched.match(/nexrender-patch-v([0-9.]+)/)
+        const existingMatch = data.match(/nexrender-patch-v([0-9.]+)/)
 
         if (patchedMatch[1] !== existingMatch[1]) {
             try {

package/src/index.js

@@ -48,7 +48,7 @@ const init = (settings) => {
     const binaryUser = settings.binary && fs.existsSync(settings.binary) ? settings.binary : null;
 
     if (!binaryUser && !binaryAuto) {
-        throw new Error('you should provide a proper path to After Effects\' \"aerender\" binary')
+        throw new Error('you should provide a proper path to After Effects\' "aerender" binary')
     }
 
     if (binaryAuto && !binaryUser) {
@@ -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/cleanup.js

@@ -1,5 +1,3 @@
-const fs     = require('fs')
-const path   = require('path')
 const rimraf = require('rimraf')
 
 /**
@@ -11,7 +9,7 @@ module.exports = function(job, settings) {
         return Promise.resolve(job)
     }
 
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve) => {
         settings.logger.log(`[${job.uid}] cleaning up...`);
 
         rimraf(job.workpath, {glob: false}, (err) => {

package/src/tasks/download.js

@@ -13,8 +13,9 @@ const requireg = require('requireg')
 const download = (job, settings, asset) => {
     if (asset.type == 'data') return Promise.resolve();
 
+    // eslint-disable-next-line
     const uri = global.URL ? new URL(asset.src) : url.parse(asset.src)
-    const protocol = uri.protocol.replace(/\:$/, '');
+    const protocol = uri.protocol.replace(/:$/, '');
     let destName = '';
 
     /* if asset doesnt have a file name, make up a random one */
@@ -23,7 +24,7 @@ const download = (job, settings, asset) => {
     } else {
         destName = path.basename(asset.src)
         destName = destName.indexOf('?') !== -1 ? destName.slice(0, destName.indexOf('?')) : destName;
-        /* ^ remove possible query search string params ^ */;
+        /* ^ remove possible query search string params ^ */
 
         /* prevent same name file collisions */
         if (fs.existsSync(path.join(job.workpath, destName))) {
@@ -61,7 +62,6 @@ const download = (job, settings, asset) => {
                     reject(err)
                 }
             });
-            break;
 
         case 'http':
         case 'https':
@@ -77,14 +77,13 @@ const download = (job, settings, asset) => {
 
                        asset.extension = fileExt
                         const destHasExtension = path.extname(asset.dest) ? true : false
-                        //don't do this if asset.dest already has extension else it gives you example.jpg.jpg  like file in case of  assets and aep/aepx file 
+                        //don't do this if asset.dest already has extension else it gives you example.jpg.jpg  like file in case of  assets and aep/aepx file
                         if (asset.extension && !destHasExtension) {
                             asset.dest += `.${fileExt}`
                         }
                     }
 
                     const stream = fs.createWriteStream(asset.dest)
-                    let timer
 
                     return new Promise((resolve, reject) => {
                         const errorHandler = (error) => {
@@ -100,7 +99,6 @@ const download = (job, settings, asset) => {
                             .on('finish', resolve)
                     })
                 });
-            break;
 
         case 'file':
             const filepath = uri2path(expandEnvironmentVariables(asset.src))
@@ -125,7 +123,6 @@ const download = (job, settings, asset) => {
                 wr.end()
                 throw error
             })
-            break;
 
         /* custom/external handlers */
         default:
@@ -134,13 +131,12 @@ const download = (job, settings, asset) => {
                 return requireg('@nexrender/provider-' + protocol).download(job, settings, asset.src, asset.dest, asset.params || {});
             } catch (e) {
                 if (e.message.indexOf('Could not require module') !== -1) {
-                    return Promise.reject(new Error(`Couldn\'t find module @nexrender/provider-${protocol}, Unknown protocol provided.`))
+                    return Promise.reject(new Error(`Couldn't find module @nexrender/provider-${protocol}, Unknown protocol provided.`))
                 }
 
                 throw e;
             }
 
-            break;
     }
 }
 
@@ -156,5 +152,5 @@ module.exports = function(job, settings) {
         job.assets.map(asset => download(job, settings, asset))
     )
 
-    return Promise.all(promises).then(_ => job);
+    return Promise.all(promises).then(() => job);
 }

package/src/tasks/render.js

@@ -29,7 +29,7 @@ module.exports = (job, settings) => {
     let outputFile = expandEnvironmentVariables(job.output)
     let projectFile = expandEnvironmentVariables(job.template.dest)
 
-    outputFileAE = checkForWSL(outputFile, settings)
+    const outputFileAE = checkForWSL(outputFile, settings)
     projectFile = checkForWSL(projectFile, settings)
     let jobScriptFile = checkForWSL(job.scriptfile, settings)
 
@@ -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')
 
@@ -62,7 +62,7 @@ module.exports = (job, settings) => {
     }
 
     if (settings['aeParams']) {
-        for (param of settings['aeParams']) {
+        for (const param of settings['aeParams']) {
             let ps = param.split(" ");
 
             if (ps.length > 0) {

package/src/tasks/script.js

@@ -8,7 +8,7 @@ const { checkForWSL } = require('../helpers/path')
 const escape = str => {
     str = JSON.stringify(str)
     str = str.substring(1, str.length-1)
-    str = `'${str.replace(/\'/g, '\\\'')}'`
+    str = `'${str.replace(/'/g, '\\\'')}'`
     return str
 }
 
@@ -50,9 +50,9 @@ const wrapData = ({ property, value, expression, ...asset }) => (`(function() {
 })();\n`)
 
 // @deprecated in favor of wrapEnhancedScript (implementation below)
-const wrapScript = ({ dest }) => (`(function() {
-    ${fs.readFileSync(dest, 'utf8')}
-})();\n`)
+// const wrapScript = ({ dest }) => (`(function() {
+//     ${fs.readFileSync(dest, 'utf8')}
+// })();\n`)
 
 
 /*
@@ -72,7 +72,8 @@ const wrapScript = ({ dest }) => (`(function() {
 
     @return string             (String)         The compiled script with parameter injection outside its original scope to avoid user-defined defaults collision.
 */
-const wrapEnhancedScript = ({ dest, src, parameters = [], keyword, defaults,  ...asset }, jobID, settings) => {
+const wrapEnhancedScript = ({ dest, src, parameters = [], keyword, defaults,  /* ...asset */ }, jobID, settings) => {
+    let arg, fullMatch;
 
     function EnhancedScript (
             dest,
@@ -238,7 +239,8 @@ const wrapEnhancedScript = ({ dest, src, parameters = [], keyword, defaults,  ..
             this.getLogger().log("We found a self-invoking method with arguments!");
             this.getLogger().log(JSON.stringify(methodArgs));
             const foundArgument = methodArgs.filter( argMatch => {
-                [fullMatch, method, arg] = argMatch;
+                fullMatch = argMatch[0]
+                arg = argMatch[2]
 
                 return parameter.arguments && parameter.arguments.find(o => o.key == arg);
             });
@@ -315,7 +317,7 @@ const wrapEnhancedScript = ({ dest, src, parameters = [], keyword, defaults,  ..
         if (nxMatches && nxMatches.length > 0 ) {
 
             nxMatches.forEach( match => {
-                const [fullMatch, method, keyword] = match;
+                const keyword = match[2];
 
                 var nxMatch = {
                     key: keyword.replace(/\s/g, ''),
@@ -357,7 +359,7 @@ const wrapEnhancedScript = ({ dest, src, parameters = [], keyword, defaults,  ..
 
         return `
             "parameters" : [
-                ${missingParams.map((k, i) => template(k.key)).join("\n")}
+                ${missingParams.map((k) => template(k.key)).join("\n")}
             ]
         `
     }
@@ -406,7 +408,7 @@ const wrapEnhancedScript = ({ dest, src, parameters = [], keyword, defaults,  ..
     EnhancedScript.prototype.buildParameterConfigurator = function ()               {
 
         const defaultGlobalValue = this.getStringifiedDefaultValue( this.defaults.global );
-        const defaultFnValue = this.getDefaultValue( this.defaults.function );
+        // const defaultFnValue = this.getDefaultValue( this.defaults.function );
         const createParameterConfigurator = () => `
     function ParameterConfigurator () {
         this.params = [];

package/src/tasks/setup.js

@@ -1,5 +1,4 @@
 const os      = require('os')
-const fs      = require('fs')
 const path    = require('path')
 const mkdirp  = require('mkdirp')
 const assert  = require('assert')

package/test/mytest.js

@@ -1,9 +1,7 @@
-module.exports = (job, settings) => {
+module.exports = (job, /* settings */) => {
     console.log('custom module hello world!')
     return Promise.resolve(job)
 }
 
-const url = require('url');
-
 console.log(new URL('d:/Documents/resource.txt'))
 console.log(new URL('data:text/plain;base64,SGVsbG8sIFdvcmxkIQ%3D%3D'))