mockaton 11.1.4 → 11.2.0

package/Makefile

@@ -1,7 +1,7 @@
 docker: docker-build docker-run
 
 docker-build:
-	@docker build --tag mockaton $(PWD)
+	@docker build --no-cache --tag mockaton $(PWD)
 
 docker-run: docker-stop
 	@docker run --name mockaton \

package/package.json

@@ -2,7 +2,7 @@
 	"name": "mockaton",
 	"description": "HTTP Mock Server",
 	"type": "module",
-	"version": "11.1.4",
+	"version": "11.2.0",
 	"types": "./index.d.ts",
 	"exports": {
 		".": {

package/src/Dashboard.css

@@ -235,6 +235,9 @@ header {
 					margin: 0;
 					margin-right: 4px;
 				}
+				input:enabled + span {
+					cursor: pointer;
+				}
 				input:disabled + span {
 					opacity: 0.8;
 				}
@@ -287,23 +290,30 @@ header {
 	top: 62px;
 	right: 10px;
 	left: auto;
-	padding: 20px;
 	border: 1px solid var(--colorSecondaryActionBorder);
-	text-align: left;
 	color: var(--colorText);
 	border-radius: var(--radius);
 	box-shadow: var(--boxShadow1);
 	background: var(--colorHeaderBackground);
 
-	a {
-		color: var(--colorAccent);
-	}
+	> div {
+		display: inline-flex;
+		flex-direction: column;
+		padding: 20px;
+		cursor: auto;
+		gap: 12px;
+		text-align: left;
 
-	.GroupByMethod {
-		display: flex;
-		align-items: center;
-		margin-bottom: 12px;
-		gap: 6px;
+		a {
+			color: var(--colorAccent);
+		}
+
+		.GroupByMethod {
+			display: flex;
+			align-items: center;
+			gap: 6px;
+			cursor: pointer;
+		}
 	}
 }
 

package/src/Dashboard.js

@@ -250,20 +250,24 @@ function SettingsMenu(id) {
 				}
 			},
 
-			r('label', className(CSS.GroupByMethod),
-				r('input', {
-					ref: firstInputRef,
-					type: 'checkbox',
-					checked: store.groupByMethod,
-					onChange: store.toggleGroupByMethod
-				}),
-				r('span', null, t`Group by Method`)),
+			r('div', null,
+				r('label', className(CSS.GroupByMethod),
+					r('input', {
+						ref: firstInputRef,
+						type: 'checkbox',
+						checked: store.groupByMethod,
+						onChange: store.toggleGroupByMethod
+					}),
+					r('span', null, t`Group by Method`)),
+
+				r('a', {
+					href: 'https://github.com/ericfortis/mockaton',
+					target: '_blank',
+					rel: 'noopener noreferrer'
+				}, t`Documentation`),
 
-			r('a', {
-				href: 'https://github.com/ericfortis/mockaton',
-				target: '_blank',
-				rel: 'noopener noreferrer'
-			}, t`Documentation`)))
+				r('p', null, `v${store.mockatonVersion}`)
+			)))
 }
 
 
@@ -648,7 +652,7 @@ async function updatePayloadViewer(proxied, file, response) {
 		}))
 	else {
 		const body = await response.text() || t`/* Empty Response Body */`
-		if (mime === 'application/json') 
+		if (mime === 'application/json')
 			payloadViewerCodeRef.elem.replaceChildren(SyntaxJSON(body))
 		else if (isXML(mime))
 			payloadViewerCodeRef.elem.replaceChildren(SyntaxXML(body))

package/src/DashboardStore.js

@@ -26,10 +26,13 @@ export const store = {
 
 	getSyncVersion: api.getSyncVersion,
 
+	mockatonVersion: '',
+	
 	async fetchState() {
 		try {
 			const response = await api.getState()
 			if (!response.ok) throw response
+			store.mockatonVersion = response.headers.get('server').split(' ').pop()
 			Object.assign(store, await response.json())
 			store.render()
 		}

package/src/MockDispatcher.js

@@ -31,9 +31,6 @@ export async function dispatchMock(req, response) {
 		if (cookie.getCurrent())
 			response.setHeader('Set-Cookie', cookie.getCurrent())
 
-		for (let i = 0; i < config.extraHeaders.length; i += 2) // TESTME
-			response.setHeader(config.extraHeaders[i], config.extraHeaders[i + 1])
-
 		response.statusCode = broker.auto500 ? 500 : broker.status // TESTME plugins can change it
 		const { mime, body } = broker.auto500
 			? { mime: '', body: '' }

package/src/Mockaton.js

@@ -41,7 +41,9 @@ export function Mockaton(options) {
 
 async function onRequest(req, response) {
 	response.on('error', logger.warn)
-	response.setHeader('Server', 'Mockaton')
+	
+	for (let i = 0; i < config.extraHeaders.length; i += 2)
+		response.setHeader(config.extraHeaders[i], config.extraHeaders[i + 1])
 
 	const url = req.url || ''
 

package/src/config.js

@@ -1,4 +1,5 @@
 import { resolve } from 'node:path'
+import pkgJSON from '../package.json' with { type: 'json' }
 
 import { logger } from './utils/logger.js'
 import { isDirectory } from './utils/fs.js'
@@ -81,6 +82,7 @@ export function setup(options) {
 	Object.assign(config, options)
 	validate(config, ConfigValidator)
 	logger.setLevel(config.logLevel)
+	config.extraHeaders.push('Server', `Mockaton ${pkgJSON.version}`)
 }