mockaton 12.3.5 → 12.3.7

package/README.md

@@ -35,15 +35,15 @@ For example, for [/api/company/123](#), the filename could be:
 
 ## Quick Start (Docker)
 This will spin up Mockaton with the sample directories
-included in this repo mounted on the container ([mockaton-mocks/](./mockaton-mocks)
-and [mockaton-static-mocks/](./mockaton-static-mocks))
+included in this repo mounted on the container. Mentioned dirs are: [mockaton-mocks/](./mockaton-mocks)
+and [mockaton-static-mocks/](./mockaton-static-mocks).
 
 ```sh
 git clone https://github.com/ericfortis/mockaton.git --depth 1
 cd mockaton
 make docker
 ```
-Dashboard: http://localhost:2020/mockaton
+Dashboard: [localhost:2020/mockaton](http://localhost:2020/mockaton)
 
 Test it:
 ```shell

package/package.json

@@ -2,7 +2,7 @@
 	"name": "mockaton",
 	"description": "HTTP Mock Server",
 	"type": "module",
-	"version": "12.3.5",
+	"version": "12.3.7",
 	"exports": {
 		".": {
 			"import": "./index.js",

package/src/client/styles.css

@@ -6,45 +6,45 @@
 @media (prefers-color-scheme: light) {
 	:root {
 		color-scheme: light;
-		--color4xxBackground: #ffedd1;
-		--colorAccent: #0059dd;
 		--colorBackground: #fff;
 		--colorComboBoxHeaderBackground: #fff;
-		--colorComboBoxBackground: #eee;
-		--colorHeaderBackground: #f2f2f3;
 		--colorSecondaryButtonBackground: #fcfcfc;
+		--colorHeaderBackground: #f2f2f3;
+		--colorComboBoxBackground: #eee;
 		--colorSecondaryActionBorder: #e0e0e0;
 		--colorSecondaryAction: #666;
+		--colorLabel: #555;
 		--colorDisabledMockSelector: #444;
+		--colorText: #000;
+		--colorAccent: #0059dd;
 		--colorHover: rgba(119, 193, 255, 0.4);
-		--colorLabel: #555;
 		--colorRed: #da0f00;
-		--colorText: #000;
 		--colorPink: #ed206a;
 		--colorPurple: #9b71e8;
 		--colorGreen: #388e3c;
+		--color4xxBackground: #ffedd1;
 	}
 }
 @media (prefers-color-scheme: dark) {
 	:root {
 		color-scheme: dark;
-		--color4xxBackground: #68554a;
-		--colorAccent: #2495ff;
 		--colorBackground: #181818;
+		--colorComboBoxHeaderBackground: #222;
+		--colorSecondaryButtonBackground: #2c2c2c;
 		--colorHeaderBackground: #141414;
 		--colorComboBoxBackground: #2a2a2a;
-		--colorSecondaryButtonBackground: #2c2c2c;
 		--colorSecondaryActionBorder: #333;
 		--colorSecondaryAction: #aaa;
-		--colorComboBoxHeaderBackground: #222;
-		--colorDisabledMockSelector: #b9b9b9;
-		--colorHover: rgba(0, 63, 115, 0.5);
 		--colorLabel: #aaa;
-		--colorRed: #f41606;
+		--colorDisabledMockSelector: #a9b9b9;
 		--colorText: #fff;
+		--colorAccent: #2495ff;
+		--colorHover: rgba(0, 63, 115, 0.5);
+		--colorRed: #f41606;
 		--colorPink: #f92672;
 		--colorPurple: #ae81ff;
 		--colorGreen: #a6e22e;
+		--color4xxBackground: #68554a;
 	}
 }
 
@@ -181,7 +181,7 @@ header {
 		background: transparent;
 		border-radius: 50px;
 		color: var(--colorRed);
-		
+
 		@media (prefers-color-scheme: dark) {
 			color: var(--colorText);
 		}
@@ -663,7 +663,7 @@ main {
 		animation-timing-function: linear;
 		animation-iteration-count: infinite;
 		animation-direction: alternate;
-		/* duration in JavaScript */
+		/* animation-duration is set in JS */
 	}
 }
 @keyframes _kfProgress {

package/src/server/Mockaton.js

@@ -26,13 +26,12 @@ import { watchMocksDir, watchStaticDir } from './Watcher.js'
 
 export function Mockaton(options) {
 	return new Promise((resolve, reject) => {
-		register('./cacheBustResolver.js', import.meta.url)
 		setup(options)
-
 		mockBrokerCollection.init()
 		staticCollection.init()
 
 		if (config.watcherEnabled) {
+			register('./cacheBustResolver.js', import.meta.url)
 			watchMocksDir()
 			watchStaticDir()
 		}

package/src/server/cacheBustResolver.js

@@ -1,11 +1,16 @@
 // We register this hook at runtime so it doesn’t interfere with non-dynamic imports. 
 export async function resolve(specifier, context, nextResolve) {
 	const result = await nextResolve(specifier, context)
-	const url = new URL(result.url)
-	url.searchParams.set('t', performance.now())
-	return {
-		...result,
-		url: url.href,
-		shortCircuit: true
+	if (specifier === 'debug')
+		return result
+	if (result.url?.startsWith('file:')) {
+		const url = new URL(result.url)
+		url.searchParams.set('t', performance.now())
+		return {
+			...result,
+			url: url.href,
+			shortCircuit: true
+		}
 	}
+	return result
 }

package/src/server/cli.js

@@ -60,9 +60,9 @@ Options:
   -v, --version          Show version
 
 Notes:
-  * mockaton.config.js supports more options, see:
-      https://github.com/ericfortis/mockaton?tab=readme-ov-file#mockatonconfigjs-optional
-  * CLI options override their mockaton.config.js counterparts`)
+  * mockaton.config.js supports more options, see: https://mockaton.com/config
+  * CLI options override their mockaton.config.js counterparts
+`.trim())
 
 else if (args.config && !isFile(args.config)) {
 	console.error(`Invalid config file: ${args.config}`)

package/src/server/utils/HttpServerResponse.js

@@ -26,7 +26,7 @@ export class ServerResponse extends http.ServerResponse {
 
 	json(payload) {
 		logger.access(this)
-		this.setHeader('Content-Type', 'application/json')
+		this.setHeader('Content-Type', mimeFor('json'))
 		this.end(JSON.stringify(payload))
 	}