@nexrender/core 1.60.10 → 1.60.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nexrender/core",
-  "version": "1.60.10",
+  "version": "1.60.12",
   "main": "src/index.js",
   "author": "Inlife",
   "homepage": "https://www.nexrender.com",
@@ -43,5 +43,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "248afa43b4467ef3ae61bdbe74392d159e41f386"
+  "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);
@@ -90,43 +98,49 @@ const download = (job, settings, asset) => {
 
             /* TODO: maybe move to external package ?? */
             const src = asset.src
-            return withTimeout(
-                fetch(src, {
-                    ...asset.params,
-                    timeout: NEXRENDER_DOWNLOAD_TIMEOUT
-                })
-                .then(res => res.ok ? res : Promise.reject(new Error(`Unable to download file ${src}`)))
-                .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
-
-                        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) {
-                            asset.dest += `.${fileExt}`
+
+            try {
+                return withTimeout(
+                    fetch(src, {
+                        ...asset.params,
+                        timeout: NEXRENDER_DOWNLOAD_TIMEOUT
+                    })
+                    .then(res => res.ok ? res : Promise.reject(new Error(`Unable to download file ${src}`)))
+                    .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
+
+                            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) {
+                                asset.dest += `.${fileExt}`
+                            }
                         }
-                    }
 
-                    const stream = fs.createWriteStream(asset.dest)
+                        const stream = fs.createWriteStream(asset.dest)
 
-                    return withTimeout(new Promise((resolve, reject) => {
-                        const errorHandler = (error) => {
-                            reject(new Error('Unable to download file ' + asset.src + ' due to ' + error))
-                        };
+                        return withTimeout(new Promise((resolve, reject) => {
+                            const errorHandler = (error) => {
+                                reject(new Error('Unable to download file ' + asset.src + ' due to ' + error))
+                            };
 
-                        res.body
-                            .on('error', errorHandler)
-                            .pipe(stream)
+                            res.body
+                                .on('error', errorHandler)
+                                .pipe(stream)
 
-                        stream
-                            .on('error', errorHandler)
-                            .on('finish', resolve)
+                            stream
+                                .on('error', errorHandler)
+                                .on('finish', resolve)
+                        }), NEXRENDER_DOWNLOAD_TIMEOUT, 'Download timed out for asset ' + asset.src)
                     }), NEXRENDER_DOWNLOAD_TIMEOUT, 'Download timed out for asset ' + asset.src)
-                }), NEXRENDER_DOWNLOAD_TIMEOUT, 'Download timed out for asset ' + asset.src)
+            } catch (error) {
+                settings.logger.log(`[download] error downloading asset ${asset.src}: ${error}`);
+                return Promise.reject(error);
+            }
 
         case 'file':
             const filepath = uri2path(expandEnvironmentVariables(asset.src))
@@ -175,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);
+    }
 }