@nexrender/core 1.60.11 → 1.60.12

package/package.json

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

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);
+    }
 }