mockaton 13.10.1 → 13.11.1

package/package.json

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

package/src/client/ApiCommander.js

@@ -60,4 +60,6 @@ export class Commander {
 	getSyncVersion = () => fetch(this.addr + API.syncVersion)
 
 	getOpenAPI = () => fetch(this.addr + API.openAPI)
+
+	health = () => fetch(this.addr + API.health)
 }

package/src/client/ApiConstants.js

@@ -28,6 +28,7 @@ export const API = {
 	throws: MOUNT + '/throws',
 	syncVersion: MOUNT + '/sync-version',
 	watchHotReload: MOUNT + '/watch-hot-reload',
+	health: MOUNT + '/health',
 
 	openAPI: MOUNT + '/openapi'
 }

package/src/client/app-header.js

@@ -31,7 +31,7 @@ function GlobalDelayField() {
 	function onChange() {
 		store.setGlobalDelay(this.valueAsNumber)
 	}
-	return SlideableNumberField({
+	return SlidableNumberField({
 		className: CSS.GlobalDelay,
 		label: t`Delay (ms)`,
 		min: 0,
@@ -50,7 +50,7 @@ function GlobalDelayJitterField() {
 		this.value = Math.min(300, this.valueAsNumber)
 		store.setGlobalDelayJitter(this.valueAsNumber / 100)
 	}
-	return SlideableNumberField({
+	return SlidableNumberField({
 		className: CSS.GlobalDelayJitter,
 		label: t`Max Jitter %`,
 		min: 0,
@@ -140,38 +140,48 @@ function HelpLink() {
 }
 
 
-function SlideableNumberField({ className, label, onChange, min, max, step, value }) {
+function SlidableNumberField({ name, className, label, onChange, min, max, step, value }) {
+	function clamp(val) {
+		return Math.min(Math.max(val, min), max)
+	}
+
 	function onPointerDown(event) {
-		const input = event.target
 		let lastX = event.clientX
+		const input = /** @type {HTMLInputElement} */ event.target
+		const initialVal = input.value
+
 		input.setPointerCapture(event.pointerId)
+		window.addEventListener('pointerup', onPointerUp, { once: true })
+		window.addEventListener('pointermove', onPointerMove)
+
+		function onPointerUp(ev) {
+			input.releasePointerCapture(ev.pointerId)
+			window.removeEventListener('pointermove', onPointerMove)
+			if (input.value !== initialVal)
+				input.dispatchEvent(new Event('change'))
+		}
 
 		function onPointerMove(ev) {
 			const diff = ev.clientX - lastX
 			if (Math.abs(diff) > 10) {
-				const v = input.value
-				if (diff > 0)
-					input.stepUp()
-				else
-					input.stepDown()
-				if (v !== input.value)
-					input.dispatchEvent(new Event('change'))
 				lastX = ev.clientX
+
+				let s = step
+				if (ev.shiftKey) s *= 2
+				else if (ev.altKey) s /= 2
+
+				input.valueAsNumber = clamp(input.valueAsNumber + Math.sign(diff) * s)
 			}
 		}
-		function onPointerUp(ev) {
-			window.removeEventListener('pointermove', onPointerMove)
-			input.releasePointerCapture(ev.pointerId)
-		}
-		window.addEventListener('pointermove', onPointerMove)
-		window.addEventListener('pointerup', onPointerUp, { once: true })
 	}
+
 	return (
 		r('label', { className },
 			r('span', null, label),
 			r('input', {
 				type: 'number',
 				autocomplete: 'none',
+				style: { cursor: 'col-resize' },
 				min,
 				max,
 				step,

package/src/client/app.css

@@ -59,7 +59,8 @@ body {
 }
 
 label,
-button {
+button, 
+select {
 	user-select: none;
 }
 
@@ -260,8 +261,6 @@ header {
 	&.GlobalDelay,
 	&.GlobalDelayJitter {
 		input {
-			cursor: col-resize;
-			
 			&&::selection {
 				background-color: transparent;
 			}

package/src/server/Api.js

@@ -63,6 +63,12 @@ const patchReqs = new Map([
 
 export async function handleApiRequest(req, response) {
 	const url = removeQueryStringAndFragment(req.url)
+
+	if ((req.method === 'GET' || req.method === 'HEAD') && url === API.health) {
+		response.ok()
+		return
+	}
+
 	const handler = (
 		req.method === 'GET' && getReqs.get(url) ||
 		req.method === 'PATCH' && patchReqs.get(url))

package/src/server/Mockaton.test.js

@@ -161,6 +161,19 @@ describe('Filename Convention', () => {
 })
 
 
+describe('Health Check', () => {
+	test('HEAD', async () => {
+		const r = await request(API.health, { method: 'HEAD' })
+		equal(r.status, 200)
+	})
+
+	test('GET', async () => {
+		const r = await request(API.health)
+		equal(r.status, 200)
+	})
+})
+
+
 describe('CORS', () => {
 	describe('Set CORS allowed', () => {
 		test('422 for non boolean', async () => {

package/src/server/utils/fs.js

@@ -34,7 +34,7 @@ export async function rm(path) {
 export async function resolveIn(baseDir, file) {
 	try {
 		const parent = await realpath(baseDir)
-		const child = resolve(join(parent, file))
+		const child = resolve(join(parent, file)) // realpath not needed because we don't write symlinks
 		return child.startsWith(join(parent, sep))
 			? child
 			: null

package/www/src/assets/openapi.json

@@ -525,6 +525,18 @@
 					}
 				}
 			}
+		},
+		"/mockaton/health": {
+			"get": {
+				"summary": "Health check",
+				"description": "Returns 200 OK if the server is running. Accepts both GET and HEAD.",
+				"x-js-client-example": "await mockaton.health()",
+				"responses": {
+					"200": {
+						"description": "OK"
+					}
+				}
+			}
 		}
 	},
 	"components": {