@nexrender/core 1.49.0 → 1.49.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nexrender/core",
-  "version": "1.49.0",
+  "version": "1.49.1",
   "main": "src/index.js",
   "author": "Inlife",
   "homepage": "https://www.nexrender.com",
@@ -38,5 +38,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "09d4fa21b61322d4c208d1f95c4271a1d1bb7f62"
+  "gitHead": "86d7305136005f777e14a7ce538b0dd930946536"
 }

package/src/index.js

@@ -91,6 +91,9 @@ const init = (settings) => {
 
         onInstanceSpawn: undefined,
 
+        // amount of seconds before job will be marked as "stuck"
+        maxUpdateTimeout: process.env.NEXRENDER_MAX_UPDATE_TIMEOUT || 60,
+
         __initialized: true,
     }, settings, {
         binary: binaryUser || binaryAuto,

package/src/tasks/render.js

@@ -186,6 +186,19 @@ Estimated date of change to the new behavior: 2023-06-01.\n`);
         renderStopwatch = Date.now();
 
         let timeoutID = 0;
+        let updateTimeout = 0;
+
+        const updateTimeoutInterval = setInterval(() => {
+            if (projectStart === null) return;
+
+            const now = Date.now()
+            if (now - updateTimeout > settings.maxUpdateTimeout * 1000) {
+                clearInterval(updateTimeoutInterval);
+                clearTimeout(timeoutID);
+                settings.trackSync('Job Render Failed', { job_id: job.uid, error: 'aerender_no_update' });
+                reject(new Error(`No update from aerender for ${settings.maxUpdateTimeout} seconds`));
+            }
+        }, 5000)
 
         if (settings.debug) {
             settings.logger.log(`[${job.uid}] spawning aerender process: ${settings.binary} ${params.join(' ')}`);
@@ -201,6 +214,7 @@ Estimated date of change to the new behavior: 2023-06-01.\n`);
 
         instance.on('error', err => {
             clearTimeout(timeoutID);
+            clearInterval(updateTimeoutInterval);
             settings.trackSync('Job Render Failed', { job_id: job.uid, error: 'aerender_spawn_error' });
             return reject(new Error(`Error starting aerender process: ${err}`));
         });
@@ -208,17 +222,21 @@ Estimated date of change to the new behavior: 2023-06-01.\n`);
         instance.stdout.on('data', (data) => {
             output.push(parse(data.toString('utf8')));
             (settings.verbose && settings.logger.log(data.toString('utf8')));
+            updateTimeout = Date.now()
         });
 
         instance.stderr.on('data', (data) => {
             output.push(data.toString('utf8'));
             (settings.verbose && settings.logger.log(data.toString('utf8')));
+            updateTimeout = Date.now()
         });
 
         if (settings.maxRenderTimeout && settings.maxRenderTimeout > 0) {
             const timeout = 1000 * settings.maxRenderTimeout;
             timeoutID = setTimeout(
                 () => {
+                    clearInterval(updateTimeoutInterval);
+                    clearTimeout(timeoutID);
                     settings.trackSync('Job Render Failed', { job_id: job.uid, error: 'aerender_timeout' });
                     reject(new Error(`Maximum rendering time exceeded`));
                     instance.kill('SIGINT');
@@ -245,6 +263,7 @@ Estimated date of change to the new behavior: 2023-06-01.\n`);
                     error: 'aerender_exit_code',
                 });
 
+                clearInterval(updateTimeoutInterval);
                 clearTimeout(timeoutID);
                 return reject(new Error(outputStr || 'aerender.exe failed to render the output into the file due to an unknown reason'));
             }
@@ -263,6 +282,7 @@ Estimated date of change to the new behavior: 2023-06-01.\n`);
                     job_render_time: renderTime,
                 })
 
+                clearInterval(updateTimeoutInterval);
                 clearTimeout(timeoutID);
                 return resolve(job)
             }
@@ -292,6 +312,7 @@ Estimated date of change to the new behavior: 2023-06-01.\n`);
 
                 settings.trackSync('Job Render Failed', { job_id: job.uid, error: 'aerender_output_not_found' });
                 clearTimeout(timeoutID);
+                clearInterval(updateTimeoutInterval);
                 return reject(new Error(`Couldn't find a result file: ${outputFile}`))
             }
 
@@ -310,6 +331,7 @@ Estimated date of change to the new behavior: 2023-06-01.\n`);
             });
 
             clearTimeout(timeoutID);
+            clearInterval(updateTimeoutInterval);
             resolve(job)
         });