@nexrender/core 1.39.4 → 1.40.0

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nexrender/core",
-  "version": "1.39.4",
+  "version": "1.40.0",
   "main": "src/index.js",
   "author": "Inlife",
   "scripts": {
     "pkg-prelink": "node ../../misc/prelink.js"
   },
   "dependencies": {
-    "@nexrender/types": "^1.38.0",
+    "@nexrender/types": "^1.40.0",
     "data-uri-to-buffer": "^3.0.0",
     "file-uri-to-path": "^2.0.0",
     "is-wsl": "^2.2.0",
@@ -30,5 +30,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fd2070cc094a218062eecb4169ce732e045cfccc"
+  "gitHead": "9c2ab173beeed9a531a924841576ee71943817d3"
 }

package/src/assets/nexrender.jsx

@@ -103,7 +103,7 @@ nexrender.selectCompositionsByName = function(name, callback) {
 };
 
 /* call callback for an every layer matching specific name and composition */
-nexrender.selectLayersByName = function(compositionName, name, callback, types) {
+nexrender.selectLayersByName = function(compositionName, name, callback, types, continueOnMissing) {
     var foundOnce = false;
 
     if (!compositionName) compositionName = nexrender.defaultCompositionName;
@@ -130,7 +130,7 @@ nexrender.selectLayersByName = function(compositionName, name, callback, types)
         }
     });
 
-    if (!foundOnce) {
+    if (!foundOnce && !continueOnMissing) {
         throw new Error("nexrender: Couldn't find any layers by provided name (" + name + ") inside a composition: " + compositionName);
     }
 };
@@ -140,7 +140,8 @@ nexrender.selectLayersByType = function(
   compositionName,
   type,
   callback,
-  types
+  types,
+  continueOnMissing
 ) {
   var foundOnce = false;
 
@@ -169,7 +170,7 @@ nexrender.selectLayersByType = function(
     }
   });
 
-  if (!foundOnce) {
+  if (!foundOnce && !continueOnMissing) {
     throw new Error( 
       "nexrender: Couldn't find any layers by provided type (" 
       + type +
@@ -180,7 +181,7 @@ nexrender.selectLayersByType = function(
 };
 
 /* call callback for an every layer matching specific index and composition */
-nexrender.selectLayersByIndex = function(compositionName, index, callback, types) {
+nexrender.selectLayersByIndex = function(compositionName, index, callback, types, continueOnMissing) {
     var foundOnce = false;
 
     if (!compositionName) compositionName = nexrender.defaultCompositionName;
@@ -194,7 +195,7 @@ nexrender.selectLayersByIndex = function(compositionName, index, callback, types
         }
     })
 
-    if (!foundOnce) {
+    if (!foundOnce && !continueOnMissing) {
         throw new Error("nexrender: Couldn't find any layers by provided index (" + index + ") inside a composition: " + compositionName);
     }
 };

package/src/helpers/autofind.js

@@ -15,6 +15,7 @@ const defaultPaths = {
         '/Applications/Adobe After Effects 2022',
         '/Applications/Adobe After Effects CC 2021',
         '/Applications/Adobe After Effects CC 2022',
+        '/Applications/Adobe After Effects CC 2023',
     ],
     win32: [
         'C:\\Program Files\\Adobe\\After Effects CC',
@@ -28,6 +29,7 @@ const defaultPaths = {
         '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\\After Effects 2023\\Support Files',
 
         'C:\\Program Files\\Adobe\\Adobe After Effects CC',
         'C:\\Program Files\\Adobe\\Adobe After Effects CC\\Support Files',
@@ -40,6 +42,7 @@ const defaultPaths = {
         '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',
+        'C:\\Program Files\\Adobe\\Adobe After Effects 2023\\Support Files',
     ],
     wsl: [
         '/mnt/c/Program Files/Adobe/After Effects CC',
@@ -53,6 +56,7 @@ const defaultPaths = {
         '/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/After Effects 2023/Support Files',
 
         '/mnt/c/Program Files/Adobe/Adobe After Effects CC',
         '/mnt/c/Program Files/Adobe/Adobe After Effects CC/Support Files',
@@ -65,6 +69,7 @@ const defaultPaths = {
         '/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',
+        '/mnt/c/Program Files/Adobe/Adobe After Effects 2023/Support Files',
     ],
 }
 

package/src/tasks/cleanup.js

@@ -1,4 +1,5 @@
 const rimraf = require('rimraf')
+const path = require('path')
 
 /**
  * Clean up all workpath files and remove folder
@@ -11,12 +12,12 @@ module.exports = function(job, settings) {
 
     return new Promise((resolve) => {
         settings.logger.log(`[${job.uid}] cleaning up...`);
-        
+
         // sometimes this attribute (workpath) is undefined
         if (!job.workpath) {
-            job.workpath = settings.workpath.concat('/', job.uid, '/')
+            job.workpath = path.join(settings.workpath, job.uid)
         }
-       	
+
         rimraf(job.workpath, {glob: false}, (err) => {
             if (!err) {
                 settings.logger.log(`[${job.uid}] Temporary AfterEffects project deleted. If you want to inspect it for debugging, use "--skip-cleanup"`)

package/src/tasks/render.js

@@ -190,6 +190,13 @@ module.exports = (job, settings) => {
             const existsMovOutputFile = fs.existsSync(movOutputFile)
             if (existsMovOutputFile) {
               job.output = movOutputFile
+            } else {
+                // AE 2023 use mp4 output files
+                const mp4OutputFile = outputFile.replace(/\.avi$/g, '.mp4')
+                const existsMp4OutputFile = fs.existsSync(mp4OutputFile)
+                if (existsMp4OutputFile) {
+                    job.output = mp4OutputFile
+                }
             }
 
             if (!fs.existsSync(job.output)) {

package/src/tasks/script.js

@@ -12,12 +12,11 @@ const escape = str => {
     return str
 }
 
-const selectLayers = ({ composition, layerName, layerIndex }, callbackString) => {
+const selectLayers = ({ composition, layerName, layerIndex, continueOnMissing }, callbackString) => {
     const method = layerName ? 'selectLayersByName' : 'selectLayersByIndex';
     const compo  = composition === undefined ? 'null' : escape(composition);
     const value  = layerName ? escape(layerName) : layerIndex;
-
-    return (`nexrender.${method}(${compo}, ${value}, ${callbackString});`);
+    return (`nexrender.${method}(${compo}, ${value}, ${callbackString},null,${continueOnMissing});`);
 }
 
 const renderIf = (value, string) => {