mockaton 13.3.4 → 13.4.0

package/src/client/graphics.js

@@ -1,10 +1,10 @@
-import { createSvgElement as s } from './dom-utils.js'
+import { createSvgElement as s } from './utils/dom.js'
 
 
 export const Logo = () =>
 	s('svg', { viewBox: '0 0 556 100' },
 		s('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' }),
-		s('path', { opacity: 1, fill: 'currentColor', 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' }),
+		s('path', { fill: 'currentColor', 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' }),
 		s('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' }))
 
 export const TimerIcon = () =>

package/src/client/utils/LocalStorage.js

@@ -0,0 +1,69 @@
+export class QueryParamBool {
+	constructor(param) {
+		this.param = param
+		this.value = this.#init()
+	}
+
+	#init() {
+		const qs = new URLSearchParams(globalThis.location?.search)
+		if (qs.has(this.param))
+			return qs.get(this.param) !== '0'
+		const stored = globalThis.localStorage?.getItem(this.param) !== '0'
+		if (!stored)
+			this.#applyToUrl(false)
+		return stored
+	}
+
+	toggle() {
+		this.value = !this.value
+		if (this.value)
+			globalThis.localStorage?.removeItem(this.param)
+		else
+			globalThis.localStorage?.setItem(this.param, '0')
+		this.#applyToUrl(this.value)
+	}
+
+	#applyToUrl(nextVal) {
+		const url = new URL(globalThis.location?.href)
+		if (nextVal)
+			url.searchParams.delete(this.param)
+		else
+			url.searchParams.set(this.param, '0')
+		history.replaceState(null, '', url)
+	}
+}
+
+
+export class LocalStorageSet {
+	constructor(key) {
+		this.key = key
+		this.value = this.#parse()
+	}
+
+	add(item) {
+		this.value.add(item)
+		this.#persist()
+	}
+
+	delete(item) {
+		this.value.delete(item)
+		this.#persist()
+	}
+
+	has(item) {
+		return this.value.has(item)
+	}
+
+	#parse() {
+		try {
+			return new Set(JSON.parse(globalThis.localStorage?.getItem(this.key) || '[]'))
+		}
+		catch {
+			return new Set()
+		}
+	}
+
+	#persist() {
+		globalThis.localStorage?.setItem(this.key, JSON.stringify([...this.value]))
+	}
+}

package/src/client/utils/css.js

@@ -0,0 +1,16 @@
+export function classNames(...args) {
+	return args.filter(Boolean).join(' ')
+}
+
+
+export function extractClassNames({ cssRules }) {
+	// Class names must begin with _ or a letter, then it can have numbers and hyphens
+	// TODO think about tag.className selectors
+	const reClassName = /(?:^|[\s,{>])&?\s*\.([a-zA-Z_][\w-]*)/g
+	const cNames = {}
+	let match
+	for (const rule of cssRules)
+		while (match = reClassName.exec(rule.cssText))
+			cNames[match[1]] = match[1]
+	return cNames
+}

package/src/client/utils/css.test.js

@@ -0,0 +1,74 @@
+import { test } from 'node:test'
+import { deepEqual, equal } from 'node:assert/strict'
+import { extractClassNames, classNames } from './css.js'
+
+
+test('classNames', () => equal(classNames('a', false && 'b'), 'a'))
+
+
+test('extractClassNames', () => {
+	const cssRules = [
+		{ cssText: '.TopLevelPascal { color: red; }' },
+		{ cssText: '.topLevelCamel { color: blue; }' },
+		{ cssText: '.top_level_snake { color: green; }' },
+		{ cssText: '.top-level-kebab { color: yellow; }' },
+		{ cssText: '.Level2Parent {\n  & .level2ChildCamel { color: purple; }\n}' },
+		{ cssText: '.level2Base {\n  &.level2ModifierCamel { font-weight: bold; }\n}' },
+		{ cssText: '.Level3Parent {\n  & .level3ChildCamel {\n  & .level3_grand_child_snake { color: orange; }\n}\n}' },
+		{ cssText: '.pseudoParent {\n  &:hover { background: red; }\n  & .pseudoNestedChild { color: pink; }\n}' },
+		{ cssText: '.multiClass1, .multi_class_2 { padding: 10px; }' },
+		{ cssText: '.combParent {\n  & > .combChildDirect { margin: 5px; }\n}' },
+		{ cssText: '.siblingBase {\n  & + .siblingAdjacent { border: 1px solid; }\n}' },
+		{ cssText: '@media (max-width: 768px) {\n  .mediaQueryClass {\n  & .mqNestedChild { display: none; }\n}\n}' },
+		{ cssText: '.class_with_123_numbers { color: cyan; }' },
+		{ cssText: '._privateStyleClass { opacity: 0.5; }' },
+		{ cssText: '.stringTest { content: ".shouldNotBeExtracted"; background: url(".alsoIgnored"); }' },
+		{ cssText: '.ComplexRoot {\n  & .level2-kebab {\n  &.level2ModCamel { color: red; }\n  & .level3_snake {\n  & .level4PascalChild { color: blue; }\n}\n}\n}' }
+	]
+
+	const expected = {
+		TopLevelPascal: null,
+		topLevelCamel: null,
+		top_level_snake: null,
+		'top-level-kebab': null,
+
+		Level2Parent: null,
+		level2ChildCamel: null,
+		level2Base: null,
+		level2ModifierCamel: null,
+
+		Level3Parent: null,
+		level3ChildCamel: null,
+		level3_grand_child_snake: null,
+
+		pseudoParent: null,
+		pseudoNestedChild: null,
+
+		multiClass1: null,
+		multi_class_2: null,
+
+		combParent: null,
+		combChildDirect: null,
+
+		siblingBase: null,
+		siblingAdjacent: null,
+
+		mediaQueryClass: null,
+		mqNestedChild: null,
+
+		class_with_123_numbers: null,
+		_privateStyleClass: null,
+
+		stringTest: null,
+
+		ComplexRoot: null,
+		'level2-kebab': null,
+		level2ModCamel: null,
+		level3_snake: null,
+		level4PascalChild: null
+	}
+	for (const k of Object.keys(expected))
+		expected[k] = k
+
+	deepEqual(extractClassNames({ cssRules }), expected)
+})

package/src/client/{dom-utils.js → utils/dom.js}

@@ -2,9 +2,6 @@ export function t(translation) {
 	return translation[0]
 }
 
-export function classNames(...args) {
-	return args.filter(Boolean).join(' ')
-}
 
 export function createElement(tag, props, ...children) {
 	const elem = document.createElement(tag)
@@ -20,6 +17,7 @@ export function createElement(tag, props, ...children) {
 	return elem
 }
 
+
 export function createSvgElement(tag, props, ...children) {
 	const elem = document.createElementNS('http://www.w3.org/2000/svg', tag)
 	for (const [k, v] of Object.entries(props))
@@ -28,6 +26,7 @@ export function createSvgElement(tag, props, ...children) {
 	return elem
 }
 
+
 export function Fragment(...args) {
 	const frag = new DocumentFragment()
 	for (const arg of args)
@@ -45,7 +44,6 @@ export function restoreFocus(cb) {
 	if (focusQuery)
 		document.querySelector(focusQuery)?.focus()
 }
-
 function selectorFor(elem) {
 	if (!(elem instanceof Element))
 		return
@@ -68,20 +66,3 @@ function selectorFor(elem) {
 	}
 	return path.reverse().join('>')
 }
-
-
-export function defineClassNames(sheet) {
-	Object.assign(sheet, extractClassNames(sheet))
-}
-
-export function extractClassNames({ cssRules }) {
-	// Class names must begin with _ or a letter, then it can have numbers and hyphens
-	const reClassName = /(?:^|[\s,{>])&?\s*\.([a-zA-Z_][\w-]*)/g
-	const cNames = {}
-	let match
-	for (const rule of cssRules)
-		while (match = reClassName.exec(rule.cssText))
-			cNames[match[1]] = match[1]
-	return cNames
-}
-

package/src/client/utils/watcherDev.js

@@ -0,0 +1,46 @@
+const url = new URL(import.meta.url).searchParams.get('url')
+
+if (!url)
+	console.warn('Missing ?url=')
+else
+	init()
+
+function init() {
+	let conn = null
+	let timer = null
+
+	connect()
+	window.addEventListener('beforeunload', teardown)
+
+	function connect() {
+		if (conn) return
+
+		clearTimeout(timer)
+		conn = new EventSource(url)
+
+		conn.onmessage = function (event) {
+			const file = event.data
+			if (file.endsWith('.css'))
+				hotReloadCSS(file)
+			else if (file)
+				location.reload()
+		}
+
+		conn.onerror = function () {
+			console.error('hot reload')
+			teardown()
+			timer = setTimeout(connect, 3000)
+		}
+	}
+
+	function teardown() {
+		clearTimeout(timer)
+		conn?.close()
+		conn = null
+	}
+
+	async function hotReloadCSS(file) {
+		const mod = await import(`${document.baseURI}${file}?${Date.now()}`, { with: { type: 'css' } })
+		document.adoptedStyleSheets = [mod.default]
+	}
+}

package/src/server/Api.js

@@ -4,10 +4,12 @@
  */
 
 import { join } from 'node:path'
+import { readdirSync } from 'node:fs'
+import { write, rm, isFile, resolveIn } from './utils/fs.js'
 
 import pkgJSON from '../../package.json' with { type: 'json' }
 
-import { sseClientHotReload, DASHBOARD_ASSETS, CLIENT_DIR } from './WatcherDevClient.js'
+import { sseClientHotReload } from './utils/WatcherDevClient.js'
 import { stopMocksDirWatcher, sseClientSyncVersion, uiSyncVersion, watchMocksDir } from './Watcher.js'
 
 import { API } from '../client/ApiConstants.js'
@@ -16,7 +18,11 @@ import { IndexHtml, CSP } from '../client/IndexHtml.js'
 import { cookie } from './cookie.js'
 import { config, ConfigValidator } from './config.js'
 import * as mockBrokersCollection from './mockBrokersCollection.js'
-import { write, rm, isFile, resolveIn } from './utils/fs.js'
+
+
+export const CLIENT_DIR = join(import.meta.dirname, '../client')
+const DASHBOARD_ASSETS = readdirSync(CLIENT_DIR, { recursive: true })
+
 
 
 export const apiGetReqs = new Map([
@@ -26,11 +32,12 @@ export const apiGetReqs = new Map([
 	[API.state, getState],
 	[API.syncVersion, sseClientSyncVersion],
 
-	[API.watchHotReload, sseClientHotReload],
+	[API.watchHotReload, onDevWatch],
 	[API.throws, () => { throw new Error('Test500') }]
 ])
 
 
+
 export const apiPatchReqs = new Map([
 	[API.cors, setCorsAllowed],
 	[API.reset, reset],
@@ -83,6 +90,12 @@ function getState(_, response) {
 	})
 }
 
+function onDevWatch(req, response) {
+	if (config.hotReload)
+		sseClientHotReload(req, response)
+	else
+		response.notFound()
+}
 
 /** # PATCH */
 

package/src/server/MockDispatcher.js

@@ -1,16 +1,18 @@
 import { join } from 'node:path'
 
 import { logger } from './utils/logger.js'
-
 import { proxy } from './ProxyRelay.js'
 import { cookie } from './cookie.js'
 import { parseFilename } from '../client/Filename.js'
 import { echoFilePlugin } from './MockDispatcherPlugins.js'
 import { brokerByRoute } from './mockBrokersCollection.js'
 import { config, calcDelay } from './config.js'
+import { FILENAME_HEADER } from '../client/ApiConstants.js'
 
 
 export async function dispatchMock(req, response) {
+	response.setHeaderList(config.extraHeaders)
+
 	try {
 		const isHead = req.method === 'HEAD'
 
@@ -23,10 +25,12 @@ export async function dispatchMock(req, response) {
 			return
 		}
 		if (!broker) {
-			response.mockNotFound()
+			response.notFound()
 			return
 		}
 
+		response.setHeader(FILENAME_HEADER, broker.file)
+
 		if (cookie.getCurrent())
 			response.setHeader('Set-Cookie', cookie.getCurrent())
 
@@ -36,7 +40,6 @@ export async function dispatchMock(req, response) {
 			setTimeout(async () => {
 				await response.partialContent(req.headers.range, join(config.mocksDir, broker.file))
 			}, Number(broker.delayed && calcDelay()))
-			logger.accessMock(req.url, broker.file)
 			return
 		}
 
@@ -55,14 +58,14 @@ export async function dispatchMock(req, response) {
 
 		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
-			response.mockNotFound()
-		else
-			response.internalServerError(error)
+			response.notFound()
+		else {
+			response.internalServerError()
+			logger.error(500, req.url, error?.message || error, error?.stack || '')
+		}
 	}
 }
 

package/src/server/Mockaton.js

@@ -8,22 +8,23 @@ import { ServerResponse } from './utils/HttpServerResponse.js'
 import { setCorsHeaders, isPreflight } from './utils/http-cors.js'
 import { IncomingMessage, BodyReaderError, hasControlChars } from './utils/HttpIncomingMessage.js'
 
-import { API } from '../client/ApiConstants.js'
+import { API, FILENAME_HEADER } from '../client/ApiConstants.js'
 
+import { cookie } from './cookie.js'
 import { config, setup } from './config.js'
-import { apiPatchReqs, apiGetReqs } from './Api.js'
+import { apiPatchReqs, apiGetReqs, CLIENT_DIR } from './Api.js'
 
 import { dispatchMock } from './MockDispatcher.js'
-
 import * as mockBrokerCollection from './mockBrokersCollection.js'
 
-import { watchDevSPA } from './WatcherDevClient.js'
+import { watchDevSPA } from './utils/WatcherDevClient.js'
 import { watchMocksDir } from './Watcher.js'
 
 
 export function Mockaton(options) {
 	return new Promise((resolve, reject) => {
 		setup(options)
+		cookie.init(config.cookies)
 		mockBrokerCollection.init()
 
 		if (config.watcherEnabled) {
@@ -31,7 +32,7 @@ export function Mockaton(options) {
 			watchMocksDir()
 		}
 		if (config.hotReload)
-			watchDevSPA()
+			watchDevSPA(CLIENT_DIR)
 
 		const server = createServer({ IncomingMessage, ServerResponse }, onRequest)
 		server.on('error', reject)
@@ -47,10 +48,17 @@ export function Mockaton(options) {
 }
 
 async function onRequest(req, response) {
+	response.setHeader('Server', `Mockaton ${pkgJSON.version}`)
+
 	response.on('error', logger.warn)
 
-	response.setHeader('Server', `Mockaton ${pkgJSON.version}`)
-	response.setHeaderList(config.extraHeaders)
+	response.on('finish', () => {
+		const f = response.getHeader(FILENAME_HEADER)
+		if (f)
+			logger.normal('MOCK', req.url, f)
+		else
+			logger.verbose('API', response)
+	})
 
 	const url = req.url || ''
 
@@ -85,7 +93,9 @@ async function onRequest(req, response) {
 	catch (error) {
 		if (error instanceof BodyReaderError)
 			response.unprocessable(`${error.name}: ${error.message}`)
-		else
+		else {
+			logger.error(500, req.url, error?.message || error, error?.stack || '')
 			response.internalServerError(error)
+		}
 	}
 }

package/src/server/Mockaton.test.js

@@ -14,6 +14,7 @@ import { parseFilename } from '../client/Filename.js'
 import { API, Commander } from '../../index.js'
 
 import CONFIG from './Mockaton.test.config.js'
+import { config } from './config.js'
 
 
 const mocksDir = mkdtempSync(join(tmpdir(), 'mocks'))
@@ -33,7 +34,7 @@ proc.stdout.on('data', data => {
 })
 proc.stderr.on('data', data => {
 	stderr.push(data.toString())
-	DEBUG && process.stderr.write(stdout.at(-1))
+	DEBUG && process.stderr.write(stderr.at(-1))
 })
 
 const serverAddr = await new Promise((resolve, reject) => {
@@ -149,7 +150,7 @@ describe('Filename Convention', () => {
 			body: '[invalid_json]'
 		})
 		equal(r.status, 422)
-		match(stdout.at(-1), /BodyReaderError: Could not parse/)
+		equal(await r.text(), 'BodyReaderError: Could not parse')
 	})
 
 	test('returns 500 when a handler throws', async () => {
@@ -764,15 +765,18 @@ describe('MIME', () => {
 
 
 describe('Headers', () => {
-	test('responses have version in "Server" header', async () => {
+	test('api responses have version in "Server" header', async () => {
 		const r = await api.getState()
 		const val = r.headers.get('server')
 		match(val, /^Mockaton \d+\.\d+\.\d+$/)
 	})
 
-	test('custom headers are included', async () => {
-		const { headers } = await api.getState()
-		equal(headers.get(CONFIG.extraHeaders[0]), CONFIG.extraHeaders[1])
+	test('mock responses have version in "Server" header and custom headers', async () => {
+		const fx = new Fixture('header.GET.200.json')
+		await fx.write()
+		const r = await fx.request()
+		match(r.headers.get('server'), /^Mockaton \d+\.\d+\.\d+$/)
+		equal(r.headers.get(CONFIG.extraHeaders[0]), CONFIG.extraHeaders[1])
 	})
 })
 
@@ -1131,13 +1135,14 @@ describe('Registering Mocks', () => {
 	})
 
 	test('deleting a folder unregisters mocks in it', async () => {
-		const fx = new Fixture('api/bulk-delete/bar.GET.200.json')
-		await fx.write()
-		await sleep(0)
+		const fx = new FixtureExternal('api/bulk-delete/bar.GET.200.json')
+		await fx.writeExternally()
+		config.watcherDebounceMs = 100 // Because on macOS rmdir triggers a few events
 		const nextVerPromise = resolveOnNextSyncVersion()
 		await rmDirFromMocks('api/bulk-delete')
 		await nextVerPromise
 		equal(await fx.fetchBroker(), undefined)
+		await sleep(50) // Only for Docker, not sure why we need to delay the server teardown 
 	})
 })
 

package/src/server/ProxyRelay.js

@@ -8,6 +8,7 @@ import { readBody, BodyReaderError } from './utils/HttpIncomingMessage.js'
 import { config } from './config.js'
 import { logger } from './utils/logger.js'
 import { makeMockFilename } from '../client/Filename.js'
+import { EXT_EMPTY, EXT_UNKNOWN_MIME } from '../client/ApiConstants.js'
 
 
 export async function proxy(req, response, delay) {
@@ -24,8 +25,10 @@ export async function proxy(req, response, delay) {
 	catch (error) { // TESTME
 		if (error instanceof BodyReaderError)
 			response.unprocessable(error.name)
-		else
-			response.badGateway(error)
+		else {
+			response.badGateway()
+			logger.warn(error.cause.message)
+		}
 		return
 	}
 
@@ -37,7 +40,10 @@ export async function proxy(req, response, delay) {
 	setTimeout(() => response.end(body), delay) // TESTME
 
 	if (config.collectProxied) {
-		const ext = extFor(proxyResponse.headers.get('content-type'))
+		const mime = proxyResponse.headers.get('content-type')
+		const ext = mime
+			? extFor(mime) || EXT_UNKNOWN_MIME
+			: EXT_EMPTY
 		await saveMockToDisk(req.url, req.method, proxyResponse.status, ext, body)
 	}
 }

package/src/server/{utils/UrlParsers.js → UrlParsers.js}

@@ -1,15 +1,21 @@
 import { relative } from 'node:path'
-import { config } from '../config.js'
-import { decode } from './HttpIncomingMessage.js'
-import { parseFilename, removeTrailingSlash, removeQueryStringAndFragment } from '../../client/Filename.js'
+import { config } from './config.js'
+import { decode } from './utils/HttpIncomingMessage.js'
+import { parseFilename, removeTrailingSlash, removeQueryStringAndFragment } from '../client/Filename.js'
 
 
 export function parseQueryParams(url) {
 	return new URL(url, 'http://_').searchParams
 }
 
-
+/** @deprecated Use parseSegments */
 export function parseSplats(url, filename) {
+	console.info('parseSplats is deprecated in favor of parseSegments')
+	return parseSegments(url, filename)
+}
+
+
+export function parseSegments(url, filename) {
 	const { urlMask } = parseFilename(relative(config.mocksDir, filename))
 
 	const splats = []

package/src/server/{utils/UrlParsers.test.js → UrlParsers.test.js}

@@ -1,7 +1,7 @@
 import { test, describe } from 'node:test'
 import { deepEqual, equal } from 'node:assert/strict'
-import { parseSplats, parseQueryParams } from './UrlParsers.js'
-import { config } from '../config.js'
+import { parseSegments, parseQueryParams } from './UrlParsers.js'
+import { config } from './config.js'
 
 test('parseQueryParams', () => {
 	const searchParams = parseQueryParams('/api/foo?limit=123')
@@ -9,44 +9,44 @@ test('parseQueryParams', () => {
 })
 
 
-describe('parseSplats', () => {
-	test('one splat', () => {
-		const splats = parseSplats(
+describe('parseSegments', () => {
+	test('one segment', () => {
+		const segments = parseSegments(
 			'/api/company/123',
 			`${config.mocksDir}/api/company/[companyId].GET.200.js`
 		)
-		deepEqual(splats, {
+		deepEqual(segments, {
 			companyId: '123'
 		})
 	})
 
-	test('one splat with trailing slash', () => {
-		const splats = parseSplats(
+	test('one segment with trailing slash', () => {
+		const segments = parseSegments(
 			'/api/company/123/',
 			`${config.mocksDir}/api/company/[companyId].GET.200.js`
 		)
-		deepEqual(splats, {
+		deepEqual(segments, {
 			companyId: '123'
 		})
 	})
 
-	test('two splats and comment', () => {
-		const splats = parseSplats(
+	test('two segments and comment', () => {
+		const segments = parseSegments(
 			'/api/company/123/user/456',
 			`${config.mocksDir}/api/company/[companyId]/user/[userId](comments).GET.200.js`
 		)
-		deepEqual(splats, {
+		deepEqual(segments, {
 			companyId: '123',
 			userId: '456',
 		})
 	})
 
 	test('ignores query string', () => {
-		const splats = parseSplats(
+		const segments = parseSegments(
 			'/api/company/123?foo=456',
 			`${config.mocksDir}/api/company/[companyId]?foo=[fooId].GET.200.js`
 		)
-		deepEqual(splats, {
+		deepEqual(segments, {
 			companyId: '123'
 		})
 	})

package/src/server/config.js

@@ -3,6 +3,7 @@ import { METHODS } from 'node:http'
 
 import { logger } from './utils/logger.js'
 import { isDirectory } from './utils/fs.js'
+import { registerMimes } from './utils/mime.js'
 import { openInBrowser } from './utils/openInBrowser.js'
 import { optional, is, validate } from './utils/validate.js'
 import { validateCorsAllowedMethods, validateCorsAllowedOrigins } from './utils/http-cors.js'
@@ -80,6 +81,7 @@ export function setup(opts) {
 	Object.assign(config, opts)
 	validate(config, ConfigValidator)
 	logger.setLevel(config.logLevel)
+	registerMimes(config.extraMimes)
 }
 
 export const isFileAllowed = f => !config.ignore.test(f)