@nexrender/core 1.41.0 → 1.42.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nexrender/core",
-  "version": "1.41.0",
+  "version": "1.42.0",
   "main": "src/index.js",
   "author": "Inlife",
   "scripts": {
@@ -11,10 +11,10 @@
     "data-uri-to-buffer": "^3.0.0",
     "file-uri-to-path": "^2.0.0",
     "is-wsl": "^2.2.0",
+    "make-fetch-happen": "^11.0.2",
     "match-all": "^1.2.5",
     "mime-types": "^2.1.29",
     "mkdirp": "^1.0.4",
-    "node-fetch": "^2.6.7",
     "requireg": "^0.2.1",
     "rimraf": "^3.0.2"
   },
@@ -30,5 +30,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "01e3428a9194eb50e40f22a66bb236c9fc70a03c"
+  "gitHead": "8f7fb490c786fa1532e0f6608b2c18d1b690affb"
 }

package/readme.md

@@ -72,3 +72,4 @@ Second one is responsible for mainly job-related operations of the full cycle: d
 * `forceCommandLinePatch` - boolean, providing true will force patch re-installation
 * `onInstanceSpawn` - a callback, if provided, gets called when **aerender** instance is getting spawned, with instance pointer. Can be later used to kill a hung aerender process. Callback signature: `function (instance, job, settings) {}`
 * `actions` - an object with keys corresponding to the `module` field when defining an action, value should be a function matching expected signature of an action. Used for defining actions programmatically without needing to package the action as a separate package
+* `cache` - boolean or string. Set the cache folder used by HTTP assets. If `true` will use the default path of `${workpath}/http-cache`, if set to a string it will be interpreted as a filesystem path to the cache folder.

package/src/tasks/download.js

@@ -1,7 +1,7 @@
 const fs       = require('fs')
 const url      = require('url')
 const path     = require('path')
-const fetch    = require('node-fetch').default
+const fetch    = require('make-fetch-happen')
 const uri2path = require('file-uri-to-path')
 const data2buf = require('data-uri-to-buffer')
 const mime = require('mime-types')
@@ -66,17 +66,29 @@ const download = (job, settings, asset) => {
 
         case 'http':
         case 'https':
+            // Use default cache path if `settings.cache` param is set to simply `true`
+            // Otherwise use value directly (can be string to file path or undefined)
+            const cachePath = settings.cache === true ?
+                path.join(settings.workpath, "http-cache") :
+                settings.cache;
+
+            if(!asset.params) asset.params = {};
+            // Asset's own `params.cachePath` takes precedence (including falsy values)
+            asset.params.cachePath = Object.hasOwn(asset.params, 'cachePath') ?
+                asset.params.cachePath :
+                cachePath;
+
             /* TODO: maybe move to external package ?? */
             const src = decodeURI(asset.src) === asset.src ? encodeURI(asset.src): asset.src
-            return fetch(src, asset.params || {})
+            return fetch(src, asset.params)
                 .then(res => res.ok ? res : Promise.reject({reason: 'Initial error downloading file', meta: {src, error: res.error}}))
                 .then(res => {
                     // Set a file extension based on content-type header if not already set
                     if (!asset.extension) {
-                      const contentType = res.headers.get('content-type')
-                      const fileExt = mime.extension(contentType) || undefined
+                        const contentType = res.headers.get('content-type')
+                        const fileExt = mime.extension(contentType) || undefined
 
-                       asset.extension = fileExt
+                        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
                         if (asset.extension && !destHasExtension) {

package/src/tasks/render.js

@@ -205,19 +205,26 @@ module.exports = (job, settings) => {
             // 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
-            } else {
-                // AE 2023 use mp4 output files
-                const mp4OutputFile = outputFile.replace(/\.avi$/g, '.mp4')
-                const existsMp4OutputFile = fs.existsSync(mp4OutputFile)
-                if (existsMp4OutputFile) {
-                    job.output = mp4OutputFile
-                }
+
+            const defaultOutputs = [
+                job.output,
+                job.output.replace(/\.avi$/g, '.mov'),
+                job.output.replace(/\.avi$/g, '.mp4'),
+                job.output.replace(/\.mov$/g, '.avi'),
+                job.output.replace(/\.mov$/g, '.mp4'),
+            ]
+
+            while (!fs.existsSync(defaultOutputs[0]) && defaultOutputs.length > 0) {
+                defaultOutputs.shift();
             }
 
+            if (defaultOutputs.length === 0) {
+                clearTimeout(timeoutID);
+                return reject(new Error(`Output file not found: ${job.output}`));
+            }
+
+            job.output = defaultOutputs[0];
+
             if (!fs.existsSync(job.output)) {
                 if (fs.existsSync(logPath)) {
                     settings.logger.log(`[${job.uid}] dumping aerender log:`)