mockaton 11.1.4 → 11.2.1

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/README.md

@@ -6,8 +6,8 @@
 [![CodeQL](https://github.com/ericfortis/mockaton/actions/workflows/github-code-scanning/codeql/badge.svg)](https://github.com/ericfortis/mockaton/actions/workflows/github-code-scanning/codeql)
 [![codecov](https://codecov.io/github/ericfortis/mockaton/graph/badge.svg?token=90NYLMMG1J)](https://codecov.io/github/ericfortis/mockaton)
 
-An HTTP mock server for simulating APIs with minimal setup
-— ideal for testing difficult to reproduce backend states.
+An HTTP mock server for simulating APIs with minimal setup — ideal
+for testing difficult to reproduce backend states. 
 
 ## Overview
 With Mockaton, you don’t need to write code for wiring up your
@@ -97,8 +97,8 @@ api/videos.GET.<b>500</b>.txt   # Internal Server Error
 ### Option 1: Browser extension
 The companion Chrome [devtools
 extension](https://github.com/ericfortis/download-http-requests-browser-ext)
-lets you download all the HTTP responses, and they
-get saved following Mockaton’s filename convention.
+lets you download all the HTTP responses and 
+save them following Mockaton’s filename convention.
 
 ### Option 2: Fallback to your backend
 <details>
@@ -123,24 +123,12 @@ They will be saved in your `config.mocksDir` following the filename convention.
 
 ## Motivation
 
-### Testing scenarios that would otherwise be skipped
-- Simulate errors on third-party APIs, or on your project’s backend (if you are a frontend dev, or unfamiliar with that code)
-- Trigger dynamic states on an API. You can do this by using comments on mock filenames, for example, for polled alerts or notifications.
-- Trigger empty (no content) responses
-- Sometimes, the ideal flow you need is just too difficult to reproduce from the actual backend
-
-### Works around unstable dev backends while developing UIs
-- Spinning up dev infrastructure
-- Syncing the database
-- Mitigates progress from being blocked by waiting for APIs
-
-### Time travel
-If you commit the mocks to your repo, you don’t have to downgrade backends when:
-- Checking out long-lived branches
-- Bisecting bugs
-
 ### Deterministic and comprehensive states
-- Ideal for setting up screenshot tests, e.g., with [pixaton](https://github.com/ericfortis/pixaton)
+Sometimes the flow you need to test is
+too difficult to reproduce from the actual backend.
+ 
+- Demo edge cases to PMs, Design, and clients
+- Set up screenshot tests, e.g., with [pixaton](https://github.com/ericfortis/pixaton)
 - Spot inadvertent regressions during development. For example, the demo app in
   this repo has a list of colors containing all of their possible states, such as
   permutations for out-of-stock, new-arrival, and discontinued. This way you’ll
@@ -148,6 +136,10 @@ If you commit the mocks to your repo, you don’t have to downgrade backends whe
 
 <img src="./demo-app-vite/pixaton-tests/pic-for-readme.vp740x880.light.gold.png" alt="Mockaton Demo App Screenshot" width="740" />
 
+<br/>
+
+
+## Benefits
 
 ### Standalone demo server (Docker)
 You can demo your app by compiling the frontend and putting
@@ -157,25 +149,52 @@ repo includes a demo which builds and runs a docker container.
 ```sh
 git clone https://github.com/ericfortis/mockaton.git --depth 1
 cd mockaton/demo-app-vite
-make start-standalone-demo
+make run-standalone-demo
 ```
 - App: http://localhost:4040
 - Dashboard: http://localhost:4040/mockaton
 
+### Testing scenarios that would otherwise be skipped
+- Trigger dynamic states on an API. You can do this by using comments on mock filenames, for example, for polled alerts or notifications.
+- Testing retries, on-the-fly you can change an endpoint from a 500 to a 200.
+- Simulate errors on third-party APIs, or on your project’s backend (if you are a frontend dev, or unfamiliar with that code)
+- Generating dynamic responses on the fly. Mockaton lets you use Node’s HTTP handlers (see function mocks) when using function mocks.
+So you can, e.g.:
+  - have an in-memory database
+  - read from disk
+  - read query string 
+  - pretty much anything you can do with a normal backend request handler
 
 ### Privacy and security
 - Does not write to disk. Except when you select ✅ **Save Mocks** for scraping mocks from a backend
 - Does not initiate network connections (no logs, no telemetry)
 - Does not hijack your HTTP client
-- Auditable, organized, and small. 4 KLoC (half is UI and tests)
+- Auditable
+  - Organized and small. 4 KLoC (half is UI and tests)
   - Zero dependencies. No runtime and no build packages.
 
 <br/>
 
+## Benefits of Mocking APIs in General
+The section above highlights benefits specific to Mockaton. There are more, but
+in general here are some benefits which Mockaton has but other tools have as well:
+
+### Works around unstable dev backends while developing UIs
+- Syncing the database and spinning up dev infrastructure can be complex
+- Mitigates progress from being blocked by waiting for APIs
+
+### Time travel
+If you commit the mocks to your repo, you don’t have to downgrade
+backends when checking out long-lived branches or bisecting bugs.
+
+<br/>
 
-## Usage Without Docker
 
-Requires Node.js. **v22.18+** support writing mocks in TypeScript.
+## Usage (without Docker)
+
+_For Docker, see the Quick-Start section above._
+
+Requires Node.js **v22.18+**, which supports mocks in TypeScript.
 
 1. Create a mock in the default mocks directory (`./mockaton-mocks`)
 ```sh
@@ -230,16 +249,11 @@ The CLI options override their counterparts in `mockaton.config.js`
 ## mockaton.config.js (Optional)
 Mockaton looks for a file `mockaton.config.js` in its current working directory.
 
-<details>
-<summary>Defaults Overview… </summary>
+### Defaults Overview
+The next section has the documentation, but here's an overview of the defaults:
 
 ```js
-import {
-  defineConfig,
-  jsToJsonPlugin,
-  openInBrowser,
-  SUPPORTED_METHODS
-} from 'mockaton'
+import { defineConfig, jsToJsonPlugin, openInBrowser, SUPPORTED_METHODS } from 'mockaton'
 
 export default defineConfig({
   mocksDir: 'mockaton-mocks',
@@ -248,11 +262,11 @@ export default defineConfig({
   watcherEnabled: true,
 
   host: '127.0.0.1',
-  port: 0,
+  port: 0, // auto-assigned
 
   logLevel: 'normal',
 
-  delay: 1200,
+  delay: 1200, // Global value in ms. But only applied to routes with the Delayed checkbox "ON"
   delayJitter: 0,
 
   proxyFallback: '',
@@ -280,8 +294,7 @@ export default defineConfig({
 })
 ```
 
-</details>
-
+<br/>
 <details>
 <summary><b>Config Documentation…</b></summary>
 
@@ -361,7 +374,7 @@ the filename will have `[id]` in their place. For example:
   my-mocks-dir<b>/api/user/</b>[id]<b>/likes</b>.GET.200.json
 </pre>
 
-Your existing mocks won’t be overwritten. In other words, responses of routes with
+Your existing mocks won’t be overwritten. Responses of routes with
 the ☁️ **Cloud Checkbox** selected will be saved with unique filename-comments.
 
 
@@ -411,7 +424,7 @@ If you need to send more than one cookie, you can inject them globally
 in `config.extraHeaders`, or individually in a function `.js` or `.ts` mock.
 
 By the way, the `jwtCookie` helper has a hardcoded header and signature.
-In other words, it’s useful only if you care about its payload.
+So it’s useful only if you care about its payload.
 
 <br/>
 
@@ -572,7 +585,7 @@ For example, `api/foo.GET.200.js`
 export default { foo: 'bar' }
 ```
 
-### Option B: Function (async or sync)
+### Option B: Function Mocks (async or sync)
 
 **Return** a `string | Buffer | Uint8Array`, but **don’t call** `response.end()`
 
@@ -632,7 +645,7 @@ export default function listColors() {
 **What if I need to serve a static .js or .ts?**
 
 **Option A:** Put it in your `config.staticDir` without the `.GET.200.js` extension.
-In other words, mocks in `staticDir` take precedence over `mocksDir/*`.
+Mocks in `staticDir` take precedence over `mocksDir/*`.
 
 **Option B:** Read it and return it. For example:
 ```js
@@ -715,7 +728,7 @@ api/user<b>(default)</b>.GET.200.json
 <br/>
 
 ### Query string params
-The query string is ignored for routing purposes. In other words, it’s only used for
+The query string is ignored for routing purposes. It’s only used for
 documenting the URL contract.
 <pre>
 api/video<b>?limit=[limit]</b>.GET.200.json
@@ -752,7 +765,6 @@ All of its methods return their `fetch` response promise.
 ```js
 import { Commander } from 'mockaton'
 
-
 const myMockatonAddr = 'http://localhost:4040'
 const mockaton = new Commander(myMockatonAddr)
 ```
@@ -875,6 +887,7 @@ programs hijack your browser’s HTTP client (and Node’s).
 - [Wire Mock](https://github.com/wiremock/wiremock)
 - [Mock](https://github.com/dhuan/mock)
 - [Swagger](https://swagger.io/)
+- [Mockoon](https://mockoon.com)
 
 
 <br/>

package/index.js

@@ -3,6 +3,6 @@ export { Commander } from './src/ApiCommander.js'
 
 export { jwtCookie } from './src/utils/jwt.js'
 export { jsToJsonPlugin } from './src/MockDispatcher.js'
-export { parseJSON } from './src/utils/http-request.js'
+export { parseJSON, BodyReaderError } from './src/utils/http-request.js'
 
 export const defineConfig = opts => opts

package/package.json

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

package/src/Dashboard.css

@@ -132,7 +132,7 @@ header {
 	border-bottom: 1px solid var(--colorSecondaryActionBorder);
 	background: var(--colorHeaderBackground);
 
-	> img {
+	> object {
 		align-self: end;
 		margin-right: 22px;
 		margin-bottom: 5px;
@@ -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

@@ -96,9 +96,9 @@ function App() {
 function Header() {
 	return (
 		r('header', null,
-			r('img', {
-				alt: t`Mockaton`,
-				src: 'Logo.svg',
+			r('object', {
+				data: 'Logo.svg',
+				type: 'image/svg+xml',
 				width: 120,
 				height: 22
 			}),
@@ -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/Filename.js

@@ -1,4 +1,4 @@
-const httpMethods = [ // @KeepSync with node:http.METHODS
+const httpMethods = [ // @KeepSync node:http.METHODS (this file is used on the client too)
 	'ACL', 'BIND', 'CHECKOUT', 'CONNECT', 'COPY', 'DELETE',
 	'GET', 'HEAD', 'LINK', 'LOCK', 'M-SEARCH', 'MERGE',
 	'MKACTIVITY', 'MKCALENDAR', 'MKCOL', 'MOVE', 'NOTIFY', 'OPTIONS',
@@ -28,7 +28,7 @@ export function validateFilename(file) {
 	if (!httpMethods.includes(method))
 		return `Unrecognized HTTP Method: "${method}"`
 } 
-// TODO ThinkAbout 206 (reject, handle, or send in full?)
+// TODO @ThinkAbout 206 (reject, handle, or send in full?)
 
 
 export function parseFilename(file) {
@@ -53,7 +53,7 @@ function responseStatusIsValid(status) {
 		&& status >= 100
 		&& status <= 599
 }
-// TODO ThinkAbout allowing custom status codes
+// TODO @ThinkAbout allowing custom status codes
 
 
 export function makeMockFilename(url, method, status, ext) {

package/src/Logo.svg

@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="556" height="100" version="1.1" viewBox="0 0 556 100" xmlns="http://www.w3.org/2000/svg">
-	<style>:root { --color: #000000; }
+	<style>
 		@media (prefers-color-scheme: light) { :root { --color: #333 } }
 		@media (prefers-color-scheme: dark) { :root { --color: #eee } }
-		path { fill: var(--color) }
+		path {
+		  fill: #777;
+		  fill: var(--color);
+		}
 	</style>
-	<g stroke-opacity=".99608">
-		<path
-			d="m13.75 1.8789c-5.9487 0.19352-10.865 4.5652-11.082 11.686v81.445c-1e-7 2.216 1.784 4 4 4h4.793c2.216 0 4-1.784 4-4v-64.982c0.02794-3.4488 3.0988-3.5551 4.2031-1.1562l16.615 59.059c1.4393 5.3711 5.1083 7.9633 8.7656 7.9473 3.6573 0.01603 7.3263-2.5762 8.7656-7.9473l16.615-59.059c1.1043-2.3989 4.1752-2.2925 4.2031 1.1562v64.982c0 2.216 1.784 4 4 4h4.793c2.216 0 4-1.784 4-4v-81.445c-0.17732-7.0807-5.1334-11.492-11.082-11.686-5.9487-0.19352-12.652 3.8309-15.609 13.619l-15.686 57.334-15.686-57.334c-2.9569-9.7882-9.6607-13.813-15.609-13.619zm239.19 0.074219c-2.216 0-4 1.784-4 4v89.057c0 2.216 1.784 4 4 4h4.793c2.216 0 3.9868-1.784 4-4l0.10644-17.94c0.0734-0.07237 12.175-13.75 12.175-13.75 5.6772 11.091 11.404 22.158 17.113 33.232 1.0168 1.9689 3.4217 2.7356 5.3906 1.7188l4.2578-2.1992c1.9689-1.0168 2.7356-3.4217 1.7188-5.3906-6.4691-12.585-12.958-25.16-19.442-37.738l17.223-19.771c1.4555-1.671 1.2803-4.189-0.39062-5.6445l-3.6133-3.1465c-0.73105-0.63679-1.6224-0.96212-2.5176-0.98633-1.151-0.03113-2.3063 0.43508-3.125 1.375l-28.896 33.174v-51.99c0-2.216-1.784-4-4-4zm-58.255 23.316c-10.699 0-19.312 8.6137-19.312 19.312v34.535c0 10.699 8.6137 19.312 19.312 19.312h19.717c10.699 0 19.311-8.6137 19.311-19.312l-0.125-7.8457c0-2.216-1.784-4-4-4h-4.6524c-2.216 0-4 1.784-4 4l3e-3 6.7888c3e-3 3.8063-1.5601 9.3694-8.4716 9.3694h-15.846c-6.9115 0-8.4766-5.5631-8.4766-12.475v-26.209c0-6.9115 1.5651-12.477 8.4766-12.477h15.846c6.6937 0 8.3697 5.2207 8.4687 11.828v2.2207c0 2.216 1.784 4 4 4h4.6524c2.216 0 4-1.784 4-4l0.125-5.7363c0-10.699-8.6117-19.312-19.311-19.312zm-72.182 0c-10.699 0-19.312 8.6137-19.312 19.312v34.535c0 10.699 8.6137 19.312 19.312 19.312h19.717c10.699 0 19.311-8.6137 19.311-19.312v-34.535c0-10.699-8.6117-19.312-19.311-19.312zm1.9356 11h15.846c6.9115 0 8.4746 5.5651 8.4746 12.477v26.209c0 6.9115-1.5631 12.475-8.4746 12.475h-15.846c-6.9115 0-8.4766-5.5631-8.4766-12.475v-26.209c0-6.9115 1.5651-12.477 8.4766-12.477z"/>
-		<path
-			d="m331.9 25.27c-10.699 0-19.312 8.6137-19.312 19.312v4.3682c0 2.216 1.784 4 4 4h4.7715c2.216 0 4-1.784 4-4v-0.20414c0-6.9115 1.5651-12.477 8.4766-12.477h15.846c6.9115 0 8.4746 5.5651 8.4746 12.477v7.0148h-28.059c-10.699 0-19.312 8.6117-19.312 19.311v4.0477c0 10.699 8.6137 19.313 19.312 19.312h17.812c2.216-1e-6 4-1.784 4-4v-4.7715c0-2.216-1.784-4-4-4h-13.648c-6.9115-2e-5 -12.477-1.5651-12.477-8.5649 0-6.9998 5.5651-8.5629 12.477-8.5629h23.895v25.897c0 2.216 1.784 4 4 4h4.7715c2.216-1e-6 4-1.784 4-4v-49.848c0-10.699-8.6117-19.312-19.311-19.312z"
-			opacity="0.75"/>
-		<path
-			d="m392.75 1.373c-2.216 0-4 1.784-4 4v18.043h-5.3086c-2.216 0-4 1.784-4 4v4.793c0 2.216 1.784 4 4 4h5.3086v51.398c0 6.1465 3.7064 10.823 9.232 10.823h16.531c2.216 0 4-1.784 4-4v-4.793c0-2.216-1.784-4-4-4h-12.97v-49.428h9.8711c2.216 0 4-1.784 4-4v-4.793c0-2.216-1.784-4-4-4h-9.8711v-18.043c0-2.216-1.784-4-4-4zm122.96 23.896c-10.699 0-19.312 8.6137-19.312 19.312v49.812c0 2.216 1.784 4 4 4h4.7715c2.216 0 4-1.784 4-4v-45.648c0-6.9115 1.5651-12.477 8.4766-12.477h15.846c6.9115 0 8.4746 5.5651 8.4746 12.477v45.684c0 2.216 1.784 4 4 4h4.7715c2.216-1e-6 4-1.784 4-4v-49.848c0-10.699-8.6117-19.312-19.311-19.312zm-69.999 0c-10.699 0-19.312 8.6137-19.312 19.312v34.535c0 10.699 8.6137 19.312 19.312 19.312h19.717c10.699 0 19.311-8.6137 19.311-19.312v-34.535c0-10.699-8.6117-19.312-19.311-19.312zm1.9356 11h15.846c6.9115 0 8.4746 5.5651 8.4746 12.477v26.209c0 6.9115-1.5631 12.475-8.4746 12.475h-15.846c-6.9115 0-8.4766-5.5631-8.4766-12.475v-26.209c0-6.9115 1.5651-12.477 8.4766-12.477z"/>
-	</g>
+	<path
+		d="m13.75 1.8789c-5.9487 0.19352-10.865 4.5652-11.082 11.686v81.445c-1e-7 2.216 1.784 4 4 4h4.793c2.216 0 4-1.784 4-4v-64.982c0.02794-3.4488 3.0988-3.5551 4.2031-1.1562l16.615 59.059c1.4393 5.3711 5.1083 7.9633 8.7656 7.9473 3.6573 0.01603 7.3263-2.5762 8.7656-7.9473l16.615-59.059c1.1043-2.3989 4.1752-2.2925 4.2031 1.1562v64.982c0 2.216 1.784 4 4 4h4.793c2.216 0 4-1.784 4-4v-81.445c-0.17732-7.0807-5.1334-11.492-11.082-11.686-5.9487-0.19352-12.652 3.8309-15.609 13.619l-15.686 57.334-15.686-57.334c-2.9569-9.7882-9.6607-13.813-15.609-13.619zm239.19 0.074219c-2.216 0-4 1.784-4 4v89.057c0 2.216 1.784 4 4 4h4.793c2.216 0 3.9868-1.784 4-4l0.10644-17.94c0.0734-0.07237 12.175-13.75 12.175-13.75 5.6772 11.091 11.404 22.158 17.113 33.232 1.0168 1.9689 3.4217 2.7356 5.3906 1.7188l4.2578-2.1992c1.9689-1.0168 2.7356-3.4217 1.7188-5.3906-6.4691-12.585-12.958-25.16-19.442-37.738l17.223-19.771c1.4555-1.671 1.2803-4.189-0.39062-5.6445l-3.6133-3.1465c-0.73105-0.63679-1.6224-0.96212-2.5176-0.98633-1.151-0.03113-2.3063 0.43508-3.125 1.375l-28.896 33.174v-51.99c0-2.216-1.784-4-4-4zm-58.255 23.316c-10.699 0-19.312 8.6137-19.312 19.312v34.535c0 10.699 8.6137 19.312 19.312 19.312h19.717c10.699 0 19.311-8.6137 19.311-19.312l-0.125-7.8457c0-2.216-1.784-4-4-4h-4.6524c-2.216 0-4 1.784-4 4l3e-3 6.7888c3e-3 3.8063-1.5601 9.3694-8.4716 9.3694h-15.846c-6.9115 0-8.4766-5.5631-8.4766-12.475v-26.209c0-6.9115 1.5651-12.477 8.4766-12.477h15.846c6.6937 0 8.3697 5.2207 8.4687 11.828v2.2207c0 2.216 1.784 4 4 4h4.6524c2.216 0 4-1.784 4-4l0.125-5.7363c0-10.699-8.6117-19.312-19.311-19.312zm-72.182 0c-10.699 0-19.312 8.6137-19.312 19.312v34.535c0 10.699 8.6137 19.312 19.312 19.312h19.717c10.699 0 19.311-8.6137 19.311-19.312v-34.535c0-10.699-8.6117-19.312-19.311-19.312zm1.9356 11h15.846c6.9115 0 8.4746 5.5651 8.4746 12.477v26.209c0 6.9115-1.5631 12.475-8.4746 12.475h-15.846c-6.9115 0-8.4766-5.5631-8.4766-12.475v-26.209c0-6.9115 1.5651-12.477 8.4766-12.477z"/>
+	<path
+		d="m331.9 25.27c-10.699 0-19.312 8.6137-19.312 19.312v4.3682c0 2.216 1.784 4 4 4h4.7715c2.216 0 4-1.784 4-4v-0.20414c0-6.9115 1.5651-12.477 8.4766-12.477h15.846c6.9115 0 8.4746 5.5651 8.4746 12.477v7.0148h-28.059c-10.699 0-19.312 8.6117-19.312 19.311v4.0477c0 10.699 8.6137 19.313 19.312 19.312h17.812c2.216-1e-6 4-1.784 4-4v-4.7715c0-2.216-1.784-4-4-4h-13.648c-6.9115-2e-5 -12.477-1.5651-12.477-8.5649 0-6.9998 5.5651-8.5629 12.477-8.5629h23.895v25.897c0 2.216 1.784 4 4 4h4.7715c2.216-1e-6 4-1.784 4-4v-49.848c0-10.699-8.6117-19.312-19.311-19.312z"
+		opacity="0.75"/>
+	<path
+		d="m392.75 1.373c-2.216 0-4 1.784-4 4v18.043h-5.3086c-2.216 0-4 1.784-4 4v4.793c0 2.216 1.784 4 4 4h5.3086v51.398c0 6.1465 3.7064 10.823 9.232 10.823h16.531c2.216 0 4-1.784 4-4v-4.793c0-2.216-1.784-4-4-4h-12.97v-49.428h9.8711c2.216 0 4-1.784 4-4v-4.793c0-2.216-1.784-4-4-4h-9.8711v-18.043c0-2.216-1.784-4-4-4zm122.96 23.896c-10.699 0-19.312 8.6137-19.312 19.312v49.812c0 2.216 1.784 4 4 4h4.7715c2.216 0 4-1.784 4-4v-45.648c0-6.9115 1.5651-12.477 8.4766-12.477h15.846c6.9115 0 8.4746 5.5651 8.4746 12.477v45.684c0 2.216 1.784 4 4 4h4.7715c2.216-1e-6 4-1.784 4-4v-49.848c0-10.699-8.6117-19.312-19.311-19.312zm-69.999 0c-10.699 0-19.312 8.6137-19.312 19.312v34.535c0 10.699 8.6137 19.312 19.312 19.312h19.717c10.699 0 19.311-8.6137 19.311-19.312v-34.535c0-10.699-8.6117-19.312-19.311-19.312zm1.9356 11h15.846c6.9115 0 8.4746 5.5651 8.4746 12.477v26.209c0 6.9115-1.5631 12.475-8.4746 12.475h-15.846c-6.9115 0-8.4766-5.5631-8.4766-12.475v-26.209c0-6.9115 1.5651-12.477 8.4766-12.477z"/>
 </svg>

package/src/MockBroker.js

@@ -22,7 +22,7 @@ export class MockBroker {
 
 	#sortMocks() {
 		this.mocks.sort()
-		const defaults = this.mocks.filter(file => includesComment(file, DEFAULT_MOCK_COMMENT))
+		const defaults = this.mocks.filter(f => includesComment(f, DEFAULT_MOCK_COMMENT))
 		this.mocks = Array.from(new Set(defaults).union(new Set(this.mocks)))
 	}
 
@@ -55,18 +55,19 @@ export class MockBroker {
 	}
 
 	toggle500() {
-		this.proxied = false
-		if (this.auto500 || this.status === 500)
+		const shouldUnset = this.auto500 || this.status === 500
+		if (shouldUnset)
 			this.selectDefaultFile()
 		else {
-			const f = this.mocks.find(this.#is500) // TESTME
-			if (f)
-				this.selectFile(f)
+			const f500 = this.mocks.find(this.#is500)
+			if (f500)
+				this.selectFile(f500)
 			else {
 				this.auto500 = true
-				this.status = 500 // TESTME
+				this.status = 500
 			}
 		}
+		this.proxied = false
 	}
 
 	setDelayed(delayed) {

package/src/MockDispatcher.js

@@ -31,20 +31,20 @@ 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
+		response.statusCode = broker.auto500 
+			? 500 
+			: broker.status
 		const { mime, body } = broker.auto500
 			? { mime: '', body: '' }
 			: await applyPlugins(join(config.mocksDir, broker.file), req, response)
 
-		logger.accessMock(req.url, broker.file)
 		response.setHeader('Content-Type', mime)
 		response.setHeader('Content-Length', length(body))
 		
 		setTimeout(() => response.end(isHead ? null : body),
 			Number(broker.delayed && calcDelay()))
+		
+		logger.accessMock(req.url, broker.file)
 	}
 	catch (error) { // TESTME
 		if (error?.code === 'ENOENT') // mock-file has been deleted
@@ -77,7 +77,7 @@ export async function jsToJsonPlugin(filePath, req, response) {
 
 function length(body) {
 	if (typeof body === 'string') return Buffer.byteLength(body)
-	if (Buffer.isBuffer(body)) return body.length
+	if (Buffer.isBuffer(body)) return body.length // TESTME
 	if (body instanceof Uint8Array) return body.byteLength
 	return 0
 }

package/src/Mockaton.js

@@ -1,4 +1,5 @@
 import { createServer } from 'node:http'
+import pkgJSON from '../package.json' with { type: 'json' }
 
 import { API } from './ApiConstants.js'
 import { logger } from './utils/logger.js'
@@ -11,7 +12,10 @@ import { setCorsHeaders, isPreflight } from './utils/http-cors.js'
 import { watchMocksDir, watchStaticDir } from './Watcher.js'
 import { apiPatchRequests, apiGetRequests } from './Api.js'
 import { BodyReaderError, hasControlChars } from './utils/http-request.js'
-import { sendNoContent, sendInternalServerError, sendUnprocessable, sendTooLongURI, sendBadRequest } from './utils/http-response.js'
+import {
+	setHeaders, sendNoContent, sendInternalServerError,
+	sendUnprocessable, sendTooLongURI, sendBadRequest
+} from './utils/http-response.js'
 
 
 export function Mockaton(options) {
@@ -41,7 +45,9 @@ export function Mockaton(options) {
 
 async function onRequest(req, response) {
 	response.on('error', logger.warn)
-	response.setHeader('Server', 'Mockaton')
+	
+	setHeaders(response, ['Server', `Mockaton ${pkgJSON.version}`])
+	setHeaders(response, config.extraHeaders)
 
 	const url = req.url || ''
 

package/src/config.js

@@ -83,10 +83,8 @@ export function setup(options) {
 	logger.setLevel(config.logLevel)
 }
 
-
 export const isFileAllowed = f => !config.ignore.test(f)
 
 export const calcDelay = () => config.delayJitter
 	? config.delay * (1 + Math.random() * config.delayJitter)
 	: config.delay
-

package/src/mockBrokersCollection.js

@@ -70,10 +70,8 @@ function filenameIsValid(file) {
 
 export function unregisterMock(file) {
 	const broker = brokerByFilename(file)
-	if (!broker) // TESTME
-		return
-	const isEmpty = broker.unregister(file)
-	if (isEmpty) {
+	const hasNoMoreMocks = broker?.unregister(file)
+	if (hasNoMoreMocks) {
 		const { method, urlMask } = parseFilename(file)
 		delete collection[method][urlMask]
 		if (!Object.keys(collection[method]).length)
@@ -96,9 +94,7 @@ export function brokerByFilename(file) {
  * worry about the primacy of array-like keys when iterating.
  @returns {MockBroker | undefined} */
 export function brokerByRoute(method, url) {
-	if (!collection[method])
-		return
-	const brokers = Object.values(collection[method])
+	const brokers = Object.values(collection[method] || {})
 	for (let i = brokers.length - 1; i >= 0; i--)
 		if (brokers[i].urlMaskMatches(url))
 			return brokers[i]

package/src/staticCollection.js

@@ -29,7 +29,7 @@ export function init() {
 
 /** @returns {boolean} registered */
 export function registerMock(relativeFile) {
-	if (!isFileAllowed(basename(relativeFile))) // TESTME
+	if (!isFileAllowed(basename(relativeFile)))
 		return false
 
 	const route = '/' + relativeFile

package/src/utils/http-response.js

@@ -1,9 +1,15 @@
 import fs, { readFileSync } from 'node:fs'
+
 import { logger } from './logger.js'
 import { mimeFor } from './mime.js'
 import { HEADER_502 } from '../ApiConstants.js'
 
 
+export function setHeaders(response, headers) {
+	for (let i = 0; i < headers.length; i += 2)
+		response.setHeader(headers[i], headers[i + 1])
+}
+
 export function sendOK(response) {
 	logger.access(response)
 	response.end()