@nexrender/core 1.39.8 → 1.40.1

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nexrender/core",
-  "version": "1.39.8",
+  "version": "1.40.1",
   "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": "a2bfede0125fcc1d13113df5f3de48b99fcb4348"
+  "gitHead": "6eac7cdfed90cc8705320f29b4efe239d559707e"
 }

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/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/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 {