mockaton 8.11.5 → 8.11.6

package/package.json

@@ -2,7 +2,7 @@
 	"name": "mockaton",
 	"description": "A deterministic server-side for developing and testing frontend clients",
 	"type": "module",
-	"version": "8.11.5",
+	"version": "8.11.6",
 	"main": "index.js",
 	"types": "index.d.ts",
 	"license": "MIT",

package/src/ApiConstants.js

@@ -30,3 +30,5 @@ export const DEFAULT_MOCK_COMMENT = '(default)'
 export const EXT_FOR_UNKNOWN_MIME = 'unknown'
 
 export const LONG_POLL_SERVER_TIMEOUT = 8_000
+
+export const HEADER_FOR_502 = 'mockaton502'

package/src/Dashboard.css

@@ -103,6 +103,10 @@ select {
 	}
 }
 
+.red {
+	color: var(--colorRed);
+}
+
 .Header {
 	position: fixed;
 	z-index: 100;

package/src/Dashboard.js

@@ -1,4 +1,4 @@
-import { DEFAULT_500_COMMENT } from './ApiConstants.js'
+import { DEFAULT_500_COMMENT, HEADER_FOR_502 } from './ApiConstants.js'
 import { parseFilename } from './Filename.js'
 import { Commander } from './Commander.js'
 
@@ -20,6 +20,7 @@ const Strings = {
 	delay_ms: 'Delay (ms)',
 	empty_response_body: '/* Empty Response Body */',
 	fallback_server: 'Fallback Backend',
+	fallback_server_error: '⛔ Fallback Backend Error',
 	fallback_server_placeholder: 'Type Server Address',
 	got: 'Got',
 	internal_server_error: 'Internal Server Error',
@@ -51,6 +52,7 @@ const CSS = {
 	SaveProxiedCheckbox: 'SaveProxiedCheckbox',
 	StaticFilesList: 'StaticFilesList',
 
+	red: 'red',
 	empty: 'empty',
 	chosen: 'chosen',
 	status4xx: 'status4xx',
@@ -425,10 +427,12 @@ function PayloadViewerTitle({ file, status, statusText }) {
 			r('abbr', { title: statusText }, status),
 			'.' + ext))
 }
-function PayloadViewerTitleWhenProxied({ mime, status, statusText }) {
+function PayloadViewerTitleWhenProxied({ mime, status, statusText, gatewayIsBad }) {
 	return (
 		r('span', null,
-			Strings.got + ' ',
+			gatewayIsBad
+				? r('span', { className: CSS.red }, Strings.fallback_server_error + ' ')
+				: r('span', null, Strings.got + ' '),
 			r('abbr', { title: statusText }, status),
 			' ' + mime))
 }
@@ -452,7 +456,8 @@ async function updatePayloadViewer(method, urlMask, response) {
 		payloadViewerTitleRef.current.replaceChildren(PayloadViewerTitleWhenProxied({
 			status: response.status,
 			statusText: response.statusText,
-			mime
+			mime,
+			gatewayIsBad: response.headers.get(HEADER_FOR_502)
 		}))
 	else
 		payloadViewerTitleRef.current.replaceChildren(PayloadViewerTitle({

package/src/ProxyRelay.js

@@ -3,25 +3,36 @@ import { randomUUID } from 'node:crypto'
 
 import { config } from './config.js'
 import { extFor } from './utils/mime.js'
-import { readBody } from './utils/http-request.js'
 import { write, isFile } from './utils/fs.js'
 import { makeMockFilename } from './Filename.js'
+import { readBody, BodyReaderError } from './utils/http-request.js'
+import { sendUnprocessableContent, sendBadGateway } from './utils/http-response.js'
 
 
 export async function proxy(req, response, delay) {
-	const proxyResponse = await fetch(config.proxyFallback + req.url, {
-		method: req.method,
-		headers: req.headers,
-		body: req.method === 'GET' || req.method === 'HEAD'
-			? undefined
-			: await readBody(req)
-	})
+	let proxyResponse
+	try {
+		proxyResponse = await fetch(config.proxyFallback + req.url, {
+			method: req.method,
+			headers: req.headers,
+			body: req.method === 'GET' || req.method === 'HEAD'
+				? undefined
+				: await readBody(req)
+		})
+	}
+	catch (error) { // TESTME
+		if (error instanceof BodyReaderError)
+			sendUnprocessableContent(response, error.name)
+		else
+			sendBadGateway(response, error)
+		return
+	}
 
 	const headers = Object.fromEntries(proxyResponse.headers)
 	headers['set-cookie'] = proxyResponse.headers.getSetCookie() // parses multiple into an array
 	response.writeHead(proxyResponse.status, headers)
 	const body = await proxyResponse.text()
-	setTimeout(() => response.end(body), delay) // TESTME (Note that when the proxy fails e.g. wrong addr it doesn't delay)
+	setTimeout(() => response.end(body), delay) // TESTME
 
 	if (config.collectProxied) {
 		const ext = extFor(proxyResponse.headers.get('content-type'))

package/src/utils/http-response.js

@@ -1,5 +1,6 @@
 import { readFileSync } from 'node:fs'
 import { mimeFor } from './mime.js'
+import { HEADER_FOR_502 } from '../ApiConstants.js'
 
 
 export function sendOK(response) {
@@ -42,3 +43,10 @@ export function sendInternalServerError(response, error) {
 	response.statusCode = 500
 	response.end()
 }
+
+export function sendBadGateway(response, error) {
+	console.error('Fallback Proxy Error:', error.cause.message)
+	response.statusCode = 502
+	response.setHeader(HEADER_FOR_502, 1)
+	response.end()
+}