alchemymvc 1.3.22 → 1.3.23

package/lib/class/conduit.js

@@ -1,5 +1,6 @@
 const FILECACHE = alchemy.getCache('served_files'),
-      RX_TEXT = /svg|xml|javascript|text/i;
+      RX_TEXT = /svg|xml|javascript|text/i,
+      ENDING = Symbol('ending');
 
 var libstream  = alchemy.use('stream'),
     libpath = alchemy.use('path'),
@@ -16,7 +17,7 @@ var libstream  = alchemy.use('stream'),
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.2.0
+ * @version  1.3.23
  *
  * @param    {IncomingMessage}   req
  * @param    {ServerResponse}    res
@@ -54,6 +55,9 @@ var Conduit = Function.inherits('Alchemy.Base', 'Alchemy.Conduit', function Cond
 	// Where the files will go
 	this.files = {};
 
+	// Are we in the process of ending?
+	this[ENDING] = false;
+
 	this.initValues();
 	this.setReqRes(req, res);
 });
@@ -1456,13 +1460,18 @@ Conduit.setMethod(function setResponseUrl(new_url) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.17
+ * @version  1.3.23
  *
  * @param    {Number}          status    3xx redirection codes. 302 (temporary redirect) by default
  * @param    {String|Object}   options   Options or url
  */
 Conduit.setMethod(function redirect(status, options) {
 
+	if (this.ended) {
+		console.warn('Conduit#redirect() called after response has already ended', this);
+		return;
+	}
+
 	let hard_refresh = false,
 	    url;
 
@@ -1578,7 +1587,7 @@ Conduit.setMethod(function redirect(status, options) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.21
+ * @version  1.3.23
  *
  * @param    {Nulber}  status       Response statuscode
  * @param    {Error}   message      Optional error to send
@@ -1586,6 +1595,11 @@ Conduit.setMethod(function redirect(status, options) {
  */
 Conduit.setMethod(function error(status, message, print_error) {
 
+	if (this.ended) {
+		console.warn('Conduit#error() called after response has already ended', this);
+		return;
+	}
+
 	let print_dev = false;
 
 	if (status instanceof Classes.Alchemy.Error.HTTP) {
@@ -1783,7 +1797,7 @@ Conduit.setMethod(function notModified() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.0
+ * @version  1.3.23
  *
  * @param    {String|Object}   message
  */
@@ -1796,6 +1810,13 @@ Conduit.setMethod(function end(message) {
 	    etag,
 	    temp;
 
+	if (this[ENDING]) {
+		console.warn('Conduit#end() called after conduit has already ended', this);
+		return false;
+	}
+
+	this[ENDING] = true;
+
 	if (this.websocket) {
 		throw new Error('You can not end a websocket, use the callback instead');
 	}
@@ -1887,10 +1908,16 @@ Conduit.setMethod(function end(message) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.3.22
- * @version  1.3.22
+ * @version  1.3.23
  */
 Conduit.setMethod(function _endWithStream(stream) {
 
+	if (this.ended) {
+		console.warn('Conduit#_endWithStream() called after conduit has already ended', this);
+		return false;
+	}
+
+	this[ENDING] = true;
 	this.ended = new Date();
 	this.emit('ending');
 
@@ -1904,10 +1931,16 @@ Conduit.setMethod(function _endWithStream(stream) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.22
+ * @version  1.3.23
  */
 Conduit.setMethod(function _end(message, encoding = 'utf-8') {
 
+	if (this.ended) {
+		console.warn('Conduit#_end() called after conduit has already ended', this);
+		return false;
+	}
+
+	this[ENDING] = true;
 	this.ended = new Date();
 
 	this.emit('ending');

package/lib/class/postponement.js

@@ -293,9 +293,9 @@ Postponement.setMethod(function handleRequest(conduit) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.3.1
- * @version  1.3.2
+ * @version  1.3.23
  *
- * @return   {Boolean}   True if the request is being resumed
+ * @return   {Boolean}   True if the request can be resumed
  */
 Postponement.setMethod(function attemptUnlock() {
 
@@ -307,11 +307,21 @@ Postponement.setMethod(function attemptUnlock() {
 
 	Postponement.scheduleQueueCheck();
 
-	if (this.position_in_queue > 5) {
+	let max_position = alchemy.settings.postpone_max_unlock_position ?? 5;
+
+	if (this.position_in_queue > max_position) {
+		return false;
+	}
+
+	let max_event_loop_lag = alchemy.settings.postpone_max_unlock_event_loop_lag ?? 100;
+
+	if (alchemy.lagInMs() > max_event_loop_lag) {
 		return false;
 	}
 
-	if (alchemy.lagInMs() > 100) {
+	let max_system_load = alchemy.settings.postpone_max_unlock_system_load ?? 110;
+
+	if (alchemy.systemLoad() > max_system_load) {
 		return false;
 	}
 

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "alchemymvc",
 	"description": "MVC framework for Node.js",
-	"version": "1.3.22",
+	"version": "1.3.23",
 	"author": "Jelle De Loecker <jelle@elevenways.be>",
 	"keywords": [
 		"alchemy",
@@ -22,7 +22,7 @@
 		"chokidar"         : "~3.5.3",
 		"formidable"       : "~3.5.1",
 		"graceful-fs"      : "~4.2.11",
-		"hawkejs"          : "~2.3.15",
+		"hawkejs"          : "~2.3.19",
 		"jsondiffpatch"    : "~0.5.0",
 		"mime"             : "~3.0.0",
 		"minimist"         : "~1.2.5",
@@ -31,7 +31,7 @@
 		"mongodb"          : "~6.1.0",
 		"ncp"              : "~2.0.0",
 		"postcss"          : "~8.4.31",
-		"protoblast"       : "~0.8.15",
+		"protoblast"       : "~0.8.19",
 		"semver"           : "~7.5.4",
 		"socket.io"        : "~4.7.2",
 		"@11ways/socket.io-stream" : "~0.9.2",