@nexrender/core 1.53.1 → 1.54.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nexrender/core",
-  "version": "1.53.1",
+  "version": "1.54.3",
   "main": "src/index.js",
   "author": "Inlife",
   "homepage": "https://www.nexrender.com",
@@ -29,6 +29,7 @@
     "@nexrender/action-encode": "^1.1.4",
     "@nexrender/action-fonts": "^1.51.8",
     "@nexrender/action-image": "^1.49.4",
+    "@nexrender/action-mogrt": "^1.0.2",
     "@nexrender/action-upload": "^1.0.0",
     "@nexrender/action-webhook": "^1.51.3",
     "@nexrender/provider-ftp": "^1.17.2",
@@ -40,5 +41,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6cdcd6fec7f86d70adb1d0cf3b9c8ddc45e1fb65"
+  "gitHead": "824d935a15b522de53e52d78c5fc1fa54864e3fa"
 }

package/src/assets/nexrender.jsx

@@ -1,4 +1,6 @@
-module.exports = /*syntax:js*/`
+// simple string literal to avoid any syntax errors and highlight code in some editors
+const js = String.raw;
+module.exports = js`
 try{Object.defineProperty({},'a',{value:0})}catch(err){(function(){var defineProperty=Object.defineProperty;Object.defineProperty=function(object,property,descriptor){delete descriptor.configurable;delete descriptor.enumerable;delete descriptor.writable;try{return defineProperty(object,property,descriptor)}catch(err){object[property]=descriptor.value}}}())}Object.defineProperties||(Object.defineProperties=function defineProperties(object,descriptors){var property;for(property in descriptors){Object.defineProperty(object,property,descriptors[property])}return object});var lambda=function(l){var fn=l.match(/\((.*)\)\s*=>\s*(.*)/);var p=[];var b="";if(fn.length>0){fn.shift()}if(fn.length>0){b=fn.pop()}if(fn.length>0){p=fn.pop().replace(/^\s*|\s(?=\s)|\s*$|,/g,'').split(' ')}fn=((!/\s*return\s+/.test(b))?"return ":"")+b;p.push(fn);try{return Function.apply({},p)}catch(e){return null}};if(typeof(Array.prototype.where)==='undefined'){Array.prototype.where=function(f){var fn=f;if(typeof f=="string"){if((fn=lambda(fn))===null){throw "Syntax error in lambda string: "+f}}var res=[];var l=this.length;var p=[0,0,res];for(var i=1;i<arguments.length;i+=1){p.push(arguments[i])}for(var j=0;j<l;j+=1){if(typeof this[j]=="undefined"){continue}p[0]=this[j];p[1]=j;if(!!fn.apply(this,p)){res.push(this[j])}}return res}}if(!Array.prototype.forEach){Array.prototype.forEach=function(callback,thisArg){var T,k;if(this===null){throw new TypeError(' this is null or not defined')}var O=Object(this);var len=O.length>>>0;if(typeof callback!=="function"){throw new TypeError(callback+' is not a function')}if(arguments.length>1){T=thisArg}k=0;while(k<len){var kValue;if(k in O){kValue=O[k];callback.call(T,kValue,k,O)}k+=1}}}if(!Array.prototype.filter){Array.prototype.filter=function(fun ){'use strict';if(this===void 0||this===null){throw new TypeError()}var t=Object(this);var len=t.length>>>0;if(typeof fun!=='function'){throw new TypeError()}var res=[];var thisArg=arguments.length>=2?arguments[1]:void 0;for(var i=0;i<len;i+=1){if(i in t){var val=t[i];if(fun.call(thisArg,val,i,t)){res.push(val)}}}return res}}if(!Array.prototype.indexOf){Array.prototype.indexOf=function(searchElement,fromIndex){var k;if(this===null){throw new TypeError('"this" is null or not defined')}var O=Object(this);var len=O.length>>>0;if(len===0){return -1}var n= +fromIndex||0;if(Math.abs(n)===Infinity){n=0}if(n>=len){return -1}k=Math.max(n>=0?n:len-Math.abs(n),0);while(k<len){var kValue;if(k in O&&O[k]===searchElement){return k}k+=1}return -1}}if(typeof(String.prototype.localeCompare)==='undefined'){String.prototype.localeCompare=function(str,locale,options){return((this==str)?0:((this>str)?1:-1))}}
 (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
 "use strict";

package/src/index.js

@@ -34,6 +34,7 @@ if (process.env.NEXRENDER_REQUIRE_PLUGINS) {
     require('@nexrender/action-image');
     require('@nexrender/action-fonts');
     require('@nexrender/action-webhook');
+    require('@nexrender/action-mogrt');
 
     require('@nexrender/provider-s3');
     require('@nexrender/provider-ftp');

package/src/tasks/render.js

@@ -27,6 +27,15 @@ const seconds = (string) => string.split(':')
     .map((e, i) => (i < 3) ? +e * Math.pow(60, 2 - i) : +e * 10e-6)
     .reduce((acc, val) => acc + val);
 
+const crossPlatformKill = (instance) => {
+    if (process.platform === 'win32') {
+        // kill the aerender process and all its children
+        spawn('taskkill', ['/pid', instance.pid, '/f', '/t']);
+    } else {
+        instance.kill('SIGINT');
+    }
+}
+
 /**
  * This task creates rendering process
  */
@@ -249,7 +258,7 @@ Estimated date of change to the new behavior: 2023-06-01.\n`);
                 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`));
-                instance.kill('SIGINT');
+                crossPlatformKill(instance)
             }
         }, 5000)
 
@@ -261,7 +270,7 @@ Estimated date of change to the new behavior: 2023-06-01.\n`);
                     clearTimeout(timeoutID);
                     settings.trackSync('Job Render Failed', { job_id: job.uid, error: 'aerender_timeout' });
                     reject(new Error(`Maximum rendering time exceeded`));
-                    instance.kill('SIGINT');
+                    crossPlatformKill(instance)
                 },
                 timeout
             );