From e830a8f372169ddceacb691e9c2fa38e5c60ee0f Mon Sep 17 00:00:00 2001
From: lolcat <will@lolcat.ca>
Date: Mon, 3 Aug 2026 15:20:09 -0400
Subject: [PATCH] fix failstates not triggering properly

---
 extra/4play/page-render.js | 92 ++++++++++++++++++--------------------
 1 file changed, 44 insertions(+), 48 deletions(-)

diff --git a/extra/4play/page-render.js b/extra/4play/page-render.js
index 72f5583..d9dddb7 100644
--- a/extra/4play/page-render.js
+++ b/extra/4play/page-render.js
@@ -239,60 +239,15 @@ fplay.event.on("web_response", async function(page){
 	var fail_url_match = page.url.match(new RegExp(callback_data.fail_url_match, "i"));
 	var fail_content_match = body.match(new RegExp(callback_data.fail_content_match, "i"));
 	
-	// handle positive response
-	if(
-		(
-			callback_data.url_match === null &&
-			callback_data.content_match === null
-		) ||
-		(
-			url_match &&
-			content_match
-		) ||
-		(
-			url_match &&
-			callback_data.content_match === null
-		) ||
-		(
-			callback_data.url_match === null &&
-			content_match
-		)
-	){
-		
-		callback_data.http_res.writeHead(
-			200,
-			{
-				"Content-Type": "text/plain;charset=UTF-8",
-				"X-Proxy": callback_data.proxy.raw,
-				"X-Container-ID": typeof callback_data.container.id == "undefined" ? callback_data.container : callback_data.container.id
-			}
-		);
-		
-		callback_data.http_res.end(body);
-		
-		callback_q.delete(page.id); // cleanup callback only
-		return;
-	}
-	
 	// handle negative response
 	if(
 		(
-			callback_data.fail_url_match !== null &&
+			callback_data.fail_url_match !== null ||
 			callback_data.fail_content_match !== null
 		) &&
 		(
-			(
-				fail_url_match &&
-				fail_content_match
-			) ||
-			(
-				fail_url_match &&
-				callback_data.fail_content_match === null
-			) ||
-			(
-				callback_data.fail_url_match === null &&
-				fail_content_match
-			)
+			fail_url_match !== null ||
+			fail_content_match !== null
 		)
 	){
 		
@@ -311,6 +266,47 @@ fplay.event.on("web_response", async function(page){
 		await fplay.tab_close(global_ws, page.id);
 		await fplay.container_delete(global_ws, callback_data.container);
 		callback_q.delete(page.id);
+		
+		return;
+	}
+	
+	// handle positive response
+	if(
+		(
+			callback_data.url_match === null &&
+			callback_data.content_match === null
+		) ||
+		(
+			callback_data.url_match !== null &&
+			callback_data.content_match !== null &&
+			url_match &&
+			content_match
+		) ||
+		(
+			callback_data.url_match === null &&
+			callback_data.content_match !== null &&
+			content_match
+		) ||
+		(
+			callback_data.url_match !== null &&
+			callback_data.content_match === null &&
+			url_match
+		)
+	){
+		
+		callback_data.http_res.writeHead(
+			200,
+			{
+				"Content-Type": "text/plain;charset=UTF-8",
+				"X-Proxy": callback_data.proxy.raw,
+				"X-Container-ID": typeof callback_data.container.id == "undefined" ? callback_data.container : callback_data.container.id
+			}
+		);
+		
+		callback_data.http_res.end(body);
+		
+		callback_q.delete(page.id); // cleanup callback only
+		return;
 	}
 });