@nexrender/core 1.60.3 → 1.60.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nexrender/core",
-  "version": "1.60.3",
+  "version": "1.60.6",
   "main": "src/index.js",
   "author": "Inlife",
   "homepage": "https://www.nexrender.com",
@@ -43,5 +43,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8bbcd822b8823438b4956bffbcf0237e760c52a7"
+  "gitHead": "11a6be2cf0daffc3da0acfcacbf53cdd84ab434f"
 }

package/src/helpers/timeout.js

@@ -0,0 +1,20 @@
+const withTimeout = (promise, timeoutMs, errorMsg) => {
+    let timeoutHandle;
+
+    const timeoutPromise = new Promise((_, reject) => {
+        timeoutHandle = setTimeout(() => {
+            reject(new Error(errorMsg));
+        }, timeoutMs);
+    });
+
+    return Promise.race([
+        promise,
+        timeoutPromise,
+    ]).finally(() => {
+        clearTimeout(timeoutHandle);
+    });
+};
+
+module.exports = {
+    withTimeout,
+};

package/src/tasks/download.js

@@ -7,6 +7,9 @@ const uri2path = require('file-uri-to-path')
 const data2buf = require('data-uri-to-buffer')
 const mime     = require('mime-types')
 const {expandEnvironmentVariables} = require('../helpers/path')
+const { withTimeout } = require('../helpers/timeout');
+
+const NEXRENDER_DOWNLOAD_TIMEOUT = process.env.NEXRENDER_DOWNLOAD_TIMEOUT || 3 * 60 * 1000; // 3 minutes timeout by default
 
 const download = (job, settings, asset) => {
     if (asset.type == 'data') return Promise.resolve();
@@ -104,7 +107,7 @@ const download = (job, settings, asset) => {
 
                     const stream = fs.createWriteStream(asset.dest)
 
-                    return new Promise((resolve, reject) => {
+                    return withTimeout(new Promise((resolve, reject) => {
                         const errorHandler = (error) => {
                             reject(new Error({reason: 'Unable to download file', meta: {src, error}}))
                         };
@@ -116,7 +119,7 @@ const download = (job, settings, asset) => {
                         stream
                             .on('error', errorHandler)
                             .on('finish', resolve)
-                    })
+                    }), NEXRENDER_DOWNLOAD_TIMEOUT, 'Download timed out for asset ' + asset.src)
                 });
 
         case 'file':