mockaton 10.1.0 → 10.2.1

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/index.d.ts

@@ -97,5 +97,5 @@ export interface State {
 	collectProxied: boolean
 	proxyFallback: string
 	
-	corsAllowed: boolean
+	corsAllowed?: boolean
 }

package/package.json

@@ -2,7 +2,7 @@
 	"name": "mockaton",
 	"description": "HTTP Mock Server",
 	"type": "module",
-	"version": "10.1.0",
+	"version": "10.2.1",
 	"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],
@@ -104,7 +105,7 @@ function reinitialize(_, response) {
 async function selectCookie(req, response) {
 	const error = cookie.setCurrent(await parseJSON(req))
 	if (error)
-		sendUnprocessableContent(response, error)
+		sendUnprocessableContent(response, error?.message || error)
 	else
 		sendOK(response)
 }
@@ -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.html

@@ -5,7 +5,7 @@
 	<link rel="stylesheet" href="./mockaton/Dashboard.css">
 	<link rel="icon" href="data:image/svg+xml,%3Csvg viewBox='0 0 256 256' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='m235 33.7v202c0 9.19-5.81 14-17.4 14-11.6 0-17.4-4.83-17.4-14v-151c-0.115-4.49-6.72-5.88-8.46-0.87l-48.3 155c-2.22 7.01-7.72 10.1-16 9.9-3.63-0.191-7.01-1.14-9.66-2.89-2.89-1.72-4.83-4.34-5.57-7.72-11.1-37-22.6-74.3-34.1-111-4.34-14-8.95-31.4-14-48.3-1.82-4.83-8.16-5.32-8.46 1.16v156c0 9.19-5.81 14-17.4 14-11.6 0-17.4-4.83-17.4-14v-207c0-5.74 2.62-13.2 9.39-16.3 7.5-3.14 15-4.05 21.8-3.8 3.14 0 6.03 0.686 8.95 1.46 3.14 0.797 6.03 1.98 8.7 3.63 2.65 1.38 5.32 3.14 7.5 5.57 2.22 2.22 3.87 4.83 5.07 7.72l45.8 157c4.63-15.9 32.4-117 33.3-121 4.12-13.8 7.72-26.5 10.9-38.7 1.16-2.65 2.89-5.32 5.07-7.5 2.15-2.15 4.58-4.12 7.5-5.32 2.65-1.57 5.57-2.89 8.46-3.63 3.14-0.797 9.44-0.988 12.1-0.988 11.6 1.07 29.4 9.14 29.4 27z' fill='%23808080'/%3E%3C/svg%3E">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<meta name="description" content="Mock Server for developing UIs">
+	<meta name="description" content="HTTP Mock Server">
 	<title>Mockaton</title>
 </head>
 <body>

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',
@@ -78,8 +79,10 @@ for (const k of Object.keys(CSS))
 
 
 /** @type {State & {
- *   groupByMethod: boolean,
  *   canProxy: boolean
+ *   groupByMethod: boolean
+ *   toggleGroupByMethod: () => void
+ *   leftSideWidth?: number
  *  }} */
 const state = {
 	brokersByMethod: {},
@@ -87,6 +90,7 @@ const state = {
 	cookies: [],
 	comments: [],
 	delay: 0,
+
 	collectProxied: false,
 	proxyFallback: '',
 	get canProxy() {
@@ -127,19 +131,19 @@ const leftSideRef = useRef()
 function App() {
 	const { leftSideWidth } = state
 	return [
-		r(Header),
-		r(Menu),
+		Header(),
+		Menu(),
 		r('main', null,
 			r('div', {
 					ref: leftSideRef,
 					style: { width: leftSideWidth + 'px' },
 					className: CSS.leftSide
 				},
-				r(MockList),
-				r(StaticFilesList)),
+				MockList(),
+				StaticFilesList()),
 			r('div', { className: CSS.rightSide },
-				r(Resizer),
-				r(PayloadViewer)))
+				Resizer(),
+				PayloadViewer()))
 	]
 }
 
@@ -153,15 +157,15 @@ function Header() {
 				width: 160
 			}),
 			r('div', null,
-				r(GlobalDelayField),
-				r(CookieSelector),
-				r(BulkSelector),
-				r(ProxyFallbackField),
-				r(ResetButton)),
+				GlobalDelayField(),
+				CookieSelector(),
+				BulkSelector(),
+				ProxyFallbackField(),
+				ResetButton()),
 			r('button', {
 				className: CSS.MenuTrigger,
 				popovertarget: 'Menu'
-			}, r(SettingsIcon))
+			}, SettingsIcon())
 		))
 }
 
@@ -226,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),
@@ -237,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() {
@@ -251,7 +258,7 @@ function GlobalDelayField() {
 	}
 	return (
 		r('label', className(CSS.Field, CSS.GlobalDelayField),
-			r('span', null, r(TimerIcon), Strings.delay_ms),
+			r('span', null, TimerIcon(), Strings.delay_ms),
 			r('input', {
 				type: 'number',
 				min: 0,
@@ -263,7 +270,7 @@ function GlobalDelayField() {
 }
 
 function ProxyFallbackField() {
-	const { proxyFallback, collectProxied } = state
+	const { proxyFallback } = state
 	function onChange() {
 		const saveCheckbox = this.closest(`.${CSS.FallbackBackend}`).querySelector('[type=checkbox]')
 		saveCheckbox.disabled = !this.validity.valid || !this.value.trim()
@@ -279,7 +286,7 @@ function ProxyFallbackField() {
 	return (
 		r('div', className(CSS.Field, CSS.FallbackBackend),
 			r('label', null,
-				r('span', null, r(CloudIcon), Strings.fallback_server),
+				r('span', null, CloudIcon(), Strings.fallback_server),
 				r('input', {
 					type: 'url',
 					autocomplete: 'none',
@@ -287,14 +294,11 @@ function ProxyFallbackField() {
 					value: proxyFallback,
 					onChange
 				})),
-			r(SaveProxiedCheckbox, {
-				collectProxied,
-				disabled: !proxyFallback
-			})))
+			SaveProxiedCheckbox()))
 }
 
-function SaveProxiedCheckbox({ disabled }) {
-	const { collectProxied } = state
+function SaveProxiedCheckbox() {
+	const { collectProxied, canProxy } = state
 	function onChange() {
 		mockaton.setCollectProxied(this.checked)
 			.then(parseError)
@@ -304,7 +308,7 @@ function SaveProxiedCheckbox({ disabled }) {
 		r('label', className(CSS.SaveProxiedCheckbox),
 			r('input', {
 				type: 'checkbox',
-				disabled,
+				disabled: !canProxy,
 				checked: collectProxied,
 				onChange
 			}),
@@ -330,8 +334,7 @@ function ResetButton() {
 /** # MockList */
 
 function MockList() {
-	const { brokersByMethod, groupByMethod } = state
-	const canProxy = state.canProxy
+	const { brokersByMethod, groupByMethod, canProxy } = state
 
 	if (!Object.keys(brokersByMethod).length)
 		return (
@@ -355,14 +358,14 @@ function MockList() {
 }
 
 function Row({ method, urlMask, urlMaskDittoed, broker }) {
-	const canProxy = state.canProxy
+	const { canProxy } = state
 	return (
 		r('tr', { 'data-method': method, 'data-urlMask': urlMask },
-			canProxy && r('td', null, r(ProxyToggler, { broker })),
-			r('td', null, r(DelayRouteToggler, { broker })),
-			r('td', null, r(InternalServerErrorToggler, { broker })),
-			r('td', null, r(PreviewLink, { method, urlMask, urlMaskDittoed })),
-			r('td', null, r(MockSelector, { broker }))))
+			canProxy && r('td', null, ProxyToggler(broker)),
+			r('td', null, DelayRouteToggler(broker)),
+			r('td', null, InternalServerErrorToggler(broker)),
+			r('td', null, PreviewLink(method, urlMask, urlMaskDittoed)),
+			r('td', null, MockSelector(broker))))
 }
 
 function rowsFor(targetMethod) {
@@ -385,7 +388,7 @@ function rowsFor(targetMethod) {
 	}))
 }
 
-function PreviewLink({ method, urlMask, urlMaskDittoed }) {
+function PreviewLink(method, urlMask, urlMaskDittoed) {
 	async function onClick(event) {
 		event.preventDefault()
 		try {
@@ -408,8 +411,8 @@ function PreviewLink({ method, urlMask, urlMaskDittoed }) {
 			: tail))
 }
 
-/** @param {{ broker: ClientMockBroker }} props */
-function MockSelector({ broker }) {
+/** @param {ClientMockBroker} broker */
+function MockSelector(broker) {
 	const { groupByMethod } = state
 
 	function onChange() {
@@ -425,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)
@@ -435,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 (
@@ -457,8 +465,8 @@ function MockSelector({ broker }) {
 			}, nameFor(file))))))
 }
 
-/** @param {{ broker: ClientMockBroker }} props */
-function DelayRouteToggler({ broker }) {
+/** @param {ClientMockBroker} broker */
+function DelayRouteToggler(broker) {
 	function commit(checked) {
 		const { method, urlMask } = parseFilename(broker.mocks[0])
 		mockaton.setRouteIsDelayed(method, urlMask, checked)
@@ -472,14 +480,11 @@ function DelayRouteToggler({ broker }) {
 }
 
 
-/** @param {{ broker: ClientMockBroker }} props */
-function InternalServerErrorToggler({ 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())
@@ -499,8 +504,8 @@ function InternalServerErrorToggler({ broker }) {
 			r('span', null, '500')))
 }
 
-/** @param {{ broker: ClientMockBroker }} props */
-function ProxyToggler({ broker }) {
+/** @param {ClientMockBroker} broker */
+function ProxyToggler(broker) {
 	function onChange() {
 		const { urlMask, method } = parseFilename(broker.mocks[0])
 		mockaton.setRouteIsProxied(method, urlMask, this.checked)
@@ -519,7 +524,7 @@ function ProxyToggler({ broker }) {
 				checked: !broker.currentMock.file,
 				onChange
 			}),
-			r(CloudIcon)))
+			CloudIcon()))
 }
 
 
@@ -527,8 +532,7 @@ function ProxyToggler({ broker }) {
 /** # StaticFilesList */
 
 function StaticFilesList() {
-	const { staticBrokers } = state
-	const canProxy = state.canProxy
+	const { staticBrokers, canProxy } = state
 	if (!Object.keys(staticBrokers).length)
 		return null
 	const dp = dittoSplitPaths(Object.keys(staticBrokers)).map(([ditto, tail]) => ditto
@@ -543,15 +547,15 @@ function StaticFilesList() {
 			r('tbody', null,
 				Object.values(staticBrokers).map((broker, i) =>
 					r('tr', null,
-						canProxy && r('td', null, r(ProxyStaticToggler, {})),
-						r('td', null, r(DelayStaticRouteToggler, { broker })),
-						r('td', null, r(NotFoundToggler, { broker })),
+						canProxy && r('td', null, ProxyStaticToggler()),
+						r('td', null, DelayStaticRouteToggler(broker)),
+						r('td', null, NotFoundToggler(broker)),
 						r('td', null, r('a', { href: broker.route, target: '_blank' }, dp[i]))
 					)))))
 }
 
-/** @param {{ broker: ClientStaticBroker }} props */
-function DelayStaticRouteToggler({ broker }) {
+/** @param {ClientStaticBroker} broker */
+function DelayStaticRouteToggler(broker) {
 	function commit(checked) {
 		mockaton.setStaticRouteIsDelayed(broker.route, checked)
 			.then(parseError)
@@ -563,8 +567,8 @@ function DelayStaticRouteToggler({ broker }) {
 	})
 }
 
-/** @param {{ broker: ClientStaticBroker }} props */
-function NotFoundToggler({ broker }) {
+/** @param {ClientStaticBroker} broker */
+function NotFoundToggler(broker) {
 	function onChange() {
 		mockaton.setStaticRouteStatus(broker.route, this.checked ? 404 : 200)
 			.then(parseError)
@@ -583,7 +587,7 @@ function NotFoundToggler({ broker }) {
 			r('span', null, '404')))
 }
 
-function ProxyStaticToggler({}) { // TODO
+function ProxyStaticToggler() { // TODO
 	function onChange() {
 	}
 	return (
@@ -597,13 +601,13 @@ function ProxyStaticToggler({}) { // TODO
 				disabled: true,
 				onChange
 			}),
-			r(CloudIcon)))
+			CloudIcon()))
 }
 
 
 function ClickDragToggler({ checked, commit }) {
 	function onPointerEnter(event) {
-		if (event.buttons === 1) 
+		if (event.buttons === 1)
 			onPointerDown.call(this)
 	}
 	function onPointerDown() {
@@ -881,9 +885,6 @@ function className(...args) {
 
 
 function createElement(tag, props, ...children) {
-	if (typeof tag === 'function')
-		return tag(props)
-
 	const node = document.createElement(tag)
 	for (const [k, v] of Object.entries(props || {}))
 		if (k === 'ref') v.current = node

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/Mockaton.js

@@ -6,12 +6,12 @@ import { config, setup } from './config.js'
 import { dispatchMock } from './MockDispatcher.js'
 import { dispatchStatic } from './StaticDispatcher.js'
 import * as staticCollection from './staticCollection.js'
-import { BodyReaderError } from './utils/http-request.js'
 import * as mockBrokerCollection from './mockBrokersCollection.js'
 import { setCorsHeaders, isPreflight } from './utils/http-cors.js'
 import { watchMocksDir, watchStaticDir } from './Watcher.js'
 import { apiPatchRequests, apiGetRequests } from './Api.js'
-import { sendNoContent, sendInternalServerError, sendUnprocessableContent } from './utils/http-response.js'
+import { BodyReaderError, isControlCharFree } from './utils/http-request.js'
+import { sendNoContent, sendInternalServerError, sendUnprocessableContent, sendTooLongURI, sendBadRequest } from './utils/http-response.js'
 
 
 export function Mockaton(options) {
@@ -39,27 +39,34 @@ export function Mockaton(options) {
 
 async function onRequest(req, response) {
 	response.on('error', logger.warn)
+	response.setHeader('Server', 'Mockaton')
+
+	const url = req.url || ''
+
+	if (url.length > 2048) {
+		sendTooLongURI(response)
+		return
+	}
+
+	if (!isControlCharFree(url)) {
+		sendBadRequest(response)               
+		return
+	}
 
 	try {
-		response.setHeader('Server', 'Mockaton')
+		const { method } = req
 
 		if (config.corsAllowed)
 			setCorsHeaders(req, response, config)
 
-		const { url, method } = req
-
 		if (isPreflight(req))
 			sendNoContent(response)
-
 		else if (method === 'PATCH' && apiPatchRequests.has(url))
 			await apiPatchRequests.get(url)(req, response)
-
 		else if (method === 'GET' && apiGetRequests.has(url))
 			apiGetRequests.get(url)(req, response)
-
 		else if (method === 'GET' && staticCollection.brokerByRoute(url))
 			await dispatchStatic(req, response)
-
 		else
 			await dispatchMock(req, response)
 	}

package/src/utils/http-request.js

@@ -48,3 +48,21 @@ export function readBody(req, parser = a => a) {
 		}
 	})
 }
+
+export const reControlAndDelChars = /[\x00-\x1f\x7f]/
+export function isControlCharFree(url) {
+	try {
+		const decoded = decode(url)
+		return decoded && !reControlAndDelChars.test(decoded)
+	}
+	catch {
+		return false
+	}
+}
+
+export function decode(url) {
+	const candidate = decodeURIComponent(url)
+	return candidate === decodeURIComponent(candidate) 
+		? candidate 
+		: '' // reject multiple encodings
+}

package/src/utils/http-response.js

@@ -28,21 +28,33 @@ export function sendNoContent(response) {
 }
 
 
+export function sendBadRequest(response) {
+	response.statusCode = 400
+	logger.access(response)
+	response.end()
+}
+
 export function sendNotFound(response) {
 	response.statusCode = 404
 	logger.access(response)
 	response.end()
 }
 
+export function sendTooLongURI(response) {
+	response.statusCode = 414
+	logger.access(response)
+	response.end()
+}
+
 export function sendUnprocessableContent(response, error) {
-	logger.warn(error)
+	logger.access(response, error)
 	response.statusCode = 422
 	response.end(error)
 }
 
 
 export function sendInternalServerError(response, error) {
-	logger.error(error?.message || error, error?.stack || undefined)
+	logger.error(500, response.req.url, error?.message || error, error?.stack || '')
 	response.statusCode = 500
 	response.end()
 }

package/src/utils/logger.js

@@ -1,3 +1,6 @@
+import { decode, reControlAndDelChars } from './http-request.js'
+
+
 export const logger = new class {
 	#level = 'normal'
 
@@ -12,16 +15,17 @@ 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) {
+	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))
 	}
 
 	warn(...msg) {
@@ -33,10 +37,22 @@ export const logger = new class {
 	}
 
 	#msg(...msg) {
-		return [new Date().toISOString(), ...msg].join('::')
+		if (!msg.at(-1))
+			msg.pop()
+		return [new Date().toISOString(), ...msg.map(this.#sanitize)].join('::')
 	}
-	
-	#sanitizeURL(url) {
-		return decodeURIComponent(url).replace(/[\x00-\x1F\x7F\x9B]/g, '')
+
+	#sanitize(url) {
+		try {
+			const decoded = decode(url)
+			if (!decoded)
+				return '__MULTI_ENCODED__'
+			return decoded
+				.replace(reControlAndDelChars, '')
+				.slice(0, 200)
+		}
+		catch {
+			return '__NON_DECODABLE__'
+		}
 	}
 }