@nexrender/core 1.60.11 → 1.61.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nexrender/core",
-  "version": "1.60.11",
+  "version": "1.61.0",
   "main": "src/index.js",
   "author": "Inlife",
   "homepage": "https://www.nexrender.com",
@@ -43,5 +43,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "50f8168326645ea39d97035b5548dfd73a0b32fc"
+  "gitHead": "99fd5549ea07d74a864ca160cded9e6147a61ec6"
 }

package/src/assets/nexrender.jsx

@@ -253,6 +253,12 @@ nexrender.changeValueForKeypath = function (layer, keys, val) {
     change(layer, keys, val);
 };
 
+nexrender.log = function(message) {
+    if (gAECommandLineRenderer && gAECommandLineRenderer.log_file) {
+        gAECommandLineRenderer.log_file.writeln("NX:" + message);
+    }
+}
+
 
 /* end of nexrender script */
 /* start of custom user script */

package/src/tasks/download.js

@@ -16,11 +16,19 @@ const download = (job, settings, asset) => {
 
     settings.logger.log(`[${job.uid}] > Downloading asset ${asset.src}...`);
 
-    // eslint-disable-next-line
-    const uri = global.URL ? new URL(asset.src) : url.parse(asset.src)
-    const protocol = uri.protocol.replace(/:$/, '');
+    let uri;
+    let protocol;
     let destName = '';
 
+    try {
+        // eslint-disable-next-line
+        uri = global.URL ? new URL(asset.src) : url.parse(asset.src)
+        protocol = uri.protocol.replace(/:$/, '');
+    } catch (error) {
+        settings.logger.log(`[download] error parsing asset ${asset.src}: ${error}`);
+        return Promise.reject(error);
+    }
+
     /* if asset doesnt have a file name, make up a random one */
     if (protocol === 'data' && !asset.layerName) {
         destName = Math.random().toString(36).substring(2);
@@ -181,10 +189,15 @@ const download = (job, settings, asset) => {
 module.exports = function(job, settings) {
     settings.logger.log(`[${job.uid}] downloading assets...`)
 
-    const promises = [].concat(
-        download(job, settings, job.template),
-        job.assets.map(asset => download(job, settings, asset))
-    )
+    try {
+        const promises = [].concat(
+            download(job, settings, job.template),
+            job.assets.map(asset => download(job, settings, asset))
+        )
 
-    return Promise.all(promises).then(() => job);
+        return Promise.all(promises).then(() => job);
+    } catch (error) {
+        settings.logger.log(`[download] error downloading assets: ${error}`);
+        return Promise.reject(error);
+    }
 }

package/src/tasks/script/wrap-enhanced-script.js

@@ -18,8 +18,22 @@ const EnhancedScript = require('./EnhancedScript')
  *   @return string             (String)         The compiled script with parameter injection outside its original scope to avoid user-defined defaults collision.
  */
 const wrapEnhancedScript = (job, settings, { dest, src, parameters = [], keyword, defaults,  /* ...asset */ }) => {
-    const enhancedScript = new EnhancedScript(dest, src, parameters, keyword, defaults, job.uid, settings.logger);
+    const builtInParameters = [
+        { type: 'string', key: 'nxWorkpath', value: job.workpath },
+        { type: 'string', key: 'nxUID', value: job.uid },
+    ];
+
+    const enhancedScript = new EnhancedScript(
+        dest,
+        src,
+        [...builtInParameters, ...parameters],
+        keyword,
+        defaults,
+        job.uid,
+        settings.logger
+    );
+
     return enhancedScript.build();
 }
 
-module.exports = wrapEnhancedScript
+module.exports = wrapEnhancedScript