mockaton 10.2.0 → 10.3.0

package/README.md

@@ -754,6 +754,13 @@ const mockaton = new Commander(myMockatonAddr)
 await mockaton.select('api/foo.200.GET.json')
 ```
 
+### Toggle 500
+Either selects the first found 500, which could be
+the autogenerated one, or selects the default file.
+```js
+await mockaton.toggle500('GET', '/api/foo')
+```
+
 ### Select all mocks that have a particular comment
 ```js
 await mockaton.bulkSelectByComment('(demo-a)')

package/package.json

@@ -2,7 +2,7 @@
 	"name": "mockaton",
 	"description": "HTTP Mock Server",
 	"type": "module",
-	"version": "10.2.0",
+	"version": "10.3.0",
 	"main": "index.js",
 	"types": "index.d.ts",
 	"license": "MIT",

package/src/Api.js

@@ -38,6 +38,7 @@ export const apiPatchRequests = new Map([
 	[API.proxied, setRouteIsProxied],
 	[API.cookies, selectCookie],
 	[API.fallback, updateProxyFallback],
+	[API.toggle500, toggle500],
 	[API.bulkSelect, bulkUpdateBrokersByCommentTag],
 	[API.globalDelay, setGlobalDelay],
 	[API.collectProxied, setCollectProxied],
@@ -120,6 +121,19 @@ async function selectMock(req, response) {
 	}
 }
 
+async function toggle500(req, response) {
+	const body = await parseJSON(req)
+	const broker = mockBrokersCollection.brokerByRoute(
+		body[DF.routeMethod],
+		body[DF.routeUrlMask])
+	if (!broker)
+		sendUnprocessableContent(response, `Route does not exist: ${body[DF.routeMethod]} ${body[DF.routeUrlMask]}`)
+	else {
+		broker.toggle500()
+		sendOK(response)
+	}
+}
+
 async function setRouteIsDelayed(req, response) {
 	const body = await parseJSON(req)
 	const delayed = body[DF.delayed]

package/src/ApiCommander.js

@@ -19,7 +19,7 @@ export class Commander {
 	getState() {
 		return fetch(this.#addr + API.state)
 	}
-	
+
 	/** @returns {JsonPromise<number>} */
 	getSyncVersion(currentSyncVersion, abortSignal) {
 		return fetch(this.#addr + API.syncVersion, {
@@ -39,6 +39,13 @@ export class Commander {
 		return this.#patch(API.select, file)
 	}
 
+	toggle500(routeMethod, routeUrlMask) {
+		return this.#patch(API.toggle500, {
+			[DF.routeMethod]: routeMethod,
+			[DF.routeUrlMask]: routeUrlMask,
+		})
+	}
+
 	bulkSelectByComment(comment) {
 		return this.#patch(API.bulkSelect, comment)
 	}

package/src/ApiConstants.js

@@ -16,6 +16,7 @@ export const API = {
 	staticStatus: MOUNT + '/static-status',
 	syncVersion: MOUNT + '/sync-version',
 	throws: MOUNT + '/throws',
+	toggle500: MOUNT + '/toggle500'
 }
 
 export const DF = { // Dashboard Fields (XHR)
@@ -27,10 +28,9 @@ export const DF = { // Dashboard Fields (XHR)
 	syncVersion: 'last_received_sync_version'
 }
 
-export const DEFAULT_500_COMMENT = '(Mockaton 500)'
+export const AUTOGENERATED_500_COMMENT = '(Mockaton 500)'
 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'
+export const HEADER_FOR_502 = 'Mockaton502'

package/src/Dashboard.css

@@ -485,7 +485,6 @@ table {
 }
 
 .ProxyToggler {
-	padding: 1px 3px;
 	border: 1px solid var(--colorSecondaryActionBorder);
 	margin-right: 8px;
 	border-radius: var(--radius);
@@ -504,7 +503,7 @@ table {
 			path:last-of-type { /* inner cloud curve */
 				stroke: var(--colorBackground);
 			}
-			transform: scale(1.2);
+			transform: scale(1.1);
 		}
 
 		&:enabled:hover:not(:checked) ~ svg {
@@ -526,8 +525,9 @@ table {
 	}
 
 	> svg {
-		width: 18px;
-		height: 18px;
+		width: 22px;
+		height: 22px;
+		padding: 1px 3px;
 		stroke-width: 2px;
 		border-radius: var(--radius);
 	}
@@ -543,7 +543,7 @@ table {
 	> input {
 		appearance: none;
 
-		&:focus-visible {
+		&:focus {
 			outline: 0;
 			& ~ span {
 				outline: 2px solid var(--colorAccent)

package/src/Dashboard.js

@@ -1,9 +1,10 @@
-import { DEFAULT_500_COMMENT, HEADER_FOR_502 } from './ApiConstants.js'
+import { AUTOGENERATED_500_COMMENT, HEADER_FOR_502, DEFAULT_MOCK_COMMENT } from './ApiConstants.js'
 import { parseFilename, extractComments } from './Filename.js'
 import { Commander } from './ApiCommander.js'
 
 
 const Strings = {
+	auto500: 'Auto500',
 	bulk_select: 'Bulk Select',
 	bulk_select_disabled_title: 'No mock files have comments, which are anything within parentheses on the filename.',
 	click_link_to_preview: 'Click a link to preview it',
@@ -89,7 +90,7 @@ const state = {
 	cookies: [],
 	comments: [],
 	delay: 0,
-	
+
 	collectProxied: false,
 	proxyFallback: '',
 	get canProxy() {
@@ -229,7 +230,10 @@ function BulkSelector() {
 	const disabled = !comments.length
 	const list = disabled
 		? []
-		: [firstOption].concat(comments)
+		: [firstOption, ...comments].map(c => [
+			c,
+			c === AUTOGENERATED_500_COMMENT ? Strings.auto500 : c
+		])
 	return (
 		r('label', className(CSS.Field),
 			r('span', null, Strings.bulk_select),
@@ -240,8 +244,8 @@ function BulkSelector() {
 				disabled,
 				title: disabled ? Strings.bulk_select_disabled_title : '',
 				onChange
-			}, list.map(value =>
-				r('option', { value }, value)))))
+			}, list.map(([value, name]) =>
+				r('option', { value }, name)))))
 }
 
 function GlobalDelayField() {
@@ -424,7 +428,7 @@ function MockSelector(broker) {
 	const { status, urlMask } = parseFilename(selected)
 	const files = broker.mocks.filter(item =>
 		status === 500 ||
-		!item.includes(DEFAULT_500_COMMENT))
+		!item.includes(AUTOGENERATED_500_COMMENT))
 	if (!selected) {
 		selected = Strings.proxied
 		files.push(selected)
@@ -434,9 +438,14 @@ function MockSelector(broker) {
 		if (file === Strings.proxied)
 			return Strings.proxied
 		const { status, ext, method } = parseFilename(file)
-		return groupByMethod
-			? `${status} ${ext} ${extractComments(file).join(' ')}`
-			: `${method} ${status} ${ext} ${extractComments(file).join(' ')}`
+		const comments = extractComments(file)
+		const isAutogen500 = comments.includes(AUTOGENERATED_500_COMMENT)
+		return [
+			groupByMethod ? '' : method,
+			isAutogen500 ? '' : status,
+			ext === 'empty' || ext === 'unknown' ? '' : ext,
+			isAutogen500 ? Strings.auto500 : comments.join(' ')
+		].filter(Boolean).join(' ')
 	}
 
 	return (
@@ -474,11 +483,8 @@ function DelayRouteToggler(broker) {
 /** @param {ClientMockBroker} broker */
 function InternalServerErrorToggler(broker) {
 	function onChange() {
-		const { urlMask, method } = parseFilename(broker.mocks[0])
-		mockaton.select(
-			this.checked
-				? broker.mocks.find(f => parseFilename(f).status === 500)
-				: broker.mocks[0])
+		const { method, urlMask } = parseFilename(broker.mocks[0])
+		mockaton.toggle500(method, urlMask)
 			.then(parseError)
 			.then(updateState)
 			.then(() => linkFor(method, urlMask)?.click())

package/src/MockBroker.js

@@ -1,5 +1,5 @@
 import { includesComment, extractComments, parseFilename } from './Filename.js'
-import { DEFAULT_500_COMMENT, DEFAULT_MOCK_COMMENT } from './ApiConstants.js'
+import { AUTOGENERATED_500_COMMENT, DEFAULT_MOCK_COMMENT } from './ApiConstants.js'
 
 
 /** MockBroker is a state for a particular route. It knows the available mock files
@@ -42,7 +42,7 @@ export class MockBroker {
 	}
 
 	#isTemp500(file) {
-		return includesComment(file, DEFAULT_500_COMMENT)
+		return includesComment(file, AUTOGENERATED_500_COMMENT)
 	}
 
 	#sortMocks() {
@@ -63,7 +63,7 @@ export class MockBroker {
 	#registerTemp500() {
 		const { urlMask, method } = parseFilename(this.mocks[0])
 		const file = urlMask.replace(/^\//, '') // Removes leading slash
-		this.mocks.push(`${file}${DEFAULT_500_COMMENT}.${method}.500.empty`)
+		this.mocks.push(`${file}${AUTOGENERATED_500_COMMENT}.${method}.500.empty`)
 	}
 
 	unregister(file) {
@@ -82,6 +82,12 @@ export class MockBroker {
 	selectFile(filename) {
 		this.currentMock.file = filename
 	}
+	
+	toggle500() {
+		this.#is500(this.currentMock.file)
+			? this.selectDefaultFile()
+			: this.selectFile(this.mocks.find(this.#is500))
+	}
 
 	setDelayed(delayed) {
 		this.currentMock.delayed = delayed

package/src/MockDispatcher.js

@@ -19,7 +19,7 @@ export async function dispatchMock(req, response) {
 			broker = mockBrokerCollection.brokerByRoute('GET', req.url)
 		if (!broker || broker.proxied) {
 			if (config.proxyFallback)
-				await proxy(req, response, Number(broker?.delayed && calcDelay()))
+				await proxy(req, response, broker?.delayed ? calcDelay() : 0)
 			else
 				sendNotFound(response)
 			return

package/src/utils/http-response.js

@@ -54,7 +54,7 @@ export function sendUnprocessableContent(response, error) {
 
 
 export function sendInternalServerError(response, error) {
-	logger.error(500, logger.sanitizeURL(response.req.url), error?.message || error, error?.stack || '')
+	logger.error(500, response.req.url, error?.message || error, error?.stack || '')
 	response.statusCode = 500
 	response.end()
 }

package/src/utils/logger.js

@@ -15,16 +15,16 @@ export const logger = new class {
 
 	accessMock(url, ...msg) {
 		if (this.#level !== 'quiet')
-			console.log(this.#msg('MOCK', this.sanitizeURL(url), ...msg))
+			console.log(this.#msg('MOCK', url, ...msg))
 	}
 
-	access(response, error) {
+	access(response, error = '') {
 		if (this.#level === 'verbose')
 			console.log(this.#msg(
 				'ACCESS',
 				response.req.method,
 				response.statusCode,
-				this.sanitizeURL(response.req.url),
+				response.req.url,
 				error))
 	}
 
@@ -39,20 +39,20 @@ export const logger = new class {
 	#msg(...msg) {
 		if (!msg.at(-1))
 			msg.pop()
-		return [new Date().toISOString(), ...msg].join('::')
+		return [new Date().toISOString(), ...msg.map(this.#sanitize)].join('::')
 	}
 
-	sanitizeURL(url) {
+	#sanitize(url) {
 		try {
 			const decoded = decode(url)
 			if (!decoded)
-				return '__MULTI_ENCODED_URL__'
+				return '__MULTI_ENCODED__'
 			return decoded
 				.replace(reControlAndDelChars, '')
 				.slice(0, 200)
 		}
 		catch {
-			return '__NON_DECODABLE_URL__'
+			return '__NON_DECODABLE__'
 		}
 	}
 }