mockaton 9.1.1 → 9.2.0

package/package.json

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

package/src/Api.js

@@ -27,6 +27,7 @@ export const apiGetRequests = new Map([
 
 	[API.state, getState],
 	[API.syncVersion, longPollClientSyncVersion],
+	[API.throws, () => { throw new Error('Test500') }]
 ])
 
 export const apiPatchRequests = new Map([
@@ -51,7 +52,7 @@ function serveDashboardAsset(f) {
 	return (_, response) => {
 		if (f.endsWith('.html'))
 			response.setHeader('Content-Security-Policy', `default-src 'self'; img-src data: blob: 'self'`)
-		return sendFile(response, join(import.meta.dirname, f))
+		sendFile(response, join(import.meta.dirname, f))
 	}
 }
 

package/src/ApiConstants.js

@@ -14,7 +14,8 @@ export const API = {
 	select: MOUNT + '/select',
 	state: MOUNT + '/state',
 	staticStatus: MOUNT + '/static-status',
-	syncVersion: MOUNT + '/sync-version'
+	syncVersion: MOUNT + '/sync-version',
+	throws: MOUNT + '/throws',
 }
 
 export const DF = { // Dashboard Fields (XHR)

package/src/Dashboard.js

@@ -87,7 +87,7 @@ const state = {
 	delay: 0,
 	collectProxied: false,
 	proxyFallback: '',
-	
+
 	groupByMethod: true, // TODO read from localstorage
 
 	get canProxy() {
@@ -692,13 +692,18 @@ async function updatePayloadViewer(method, urlMask, response) {
 		const body = await response.text() || Strings.empty_response_body
 		if (mime === 'application/json')
 			payloadViewerRef.current.replaceChildren(r('span', className(CSS.json), syntaxJSON(body)))
-		else if (mime === 'application/xml')
+		else if (isXML(mime))
 			payloadViewerRef.current.replaceChildren(syntaxXML(body))
 		else
 			payloadViewerRef.current.innerText = body
 	}
 }
 
+function isXML(mime) {
+	return ['text/html', 'text/xml', 'application/xml'].includes(mime)
+		|| /application\/.*\+xml/.test(mime)
+}
+
 
 function trFor(method, urlMask) {
 	return document.querySelector(`tr[data-method="${method}"][data-urlMask="${urlMask}"]`)
@@ -811,30 +816,25 @@ function className(...args) {
 }
 
 
-function createElement(elem, props, ...children) {
-	if (typeof elem === 'function')
-		return elem(props)
+function createElement(tag, props, ...children) {
+	if (typeof tag === 'function')
+		return tag(props)
 
-	const node = document.createElement(elem)
-	for (const [key, value] of Object.entries(props || {}))
-		if (key === 'ref')
-			value.current = node
-		else if (key.startsWith('on'))
-			node.addEventListener(key.replace(/^on/, '').toLowerCase(), value)
-		else if (key === 'style')
-			Object.assign(node.style, value)
-		else if (key in node)
-			node[key] = value
-		else
-			node.setAttribute(key, value)
+	const node = document.createElement(tag)
+	for (const [k, v] of Object.entries(props || {}))
+		if (k === 'ref') v.current = node
+		else if (k === 'style') Object.assign(node.style, v)
+		else if (k.startsWith('on')) node.addEventListener(k.replace(/^on/, '').toLowerCase(), v)
+		else if (k in node) node[k] = v
+		else node.setAttribute(k, v)
 	node.append(...children.flat().filter(Boolean))
 	return node
 }
 
 function createSvgElement(tagName, props, ...children) {
 	const elem = document.createElementNS('http://www.w3.org/2000/svg', tagName)
-	for (const [key, value] of Object.entries(props))
-		elem.setAttribute(key, value)
+	for (const [k, v] of Object.entries(props))
+		elem.setAttribute(k, v)
 	elem.append(...children.flat().filter(Boolean))
 	return elem
 }

package/src/MockDispatcher.js

@@ -7,9 +7,8 @@ import { proxy } from './ProxyRelay.js'
 import { cookie } from './cookie.js'
 import { mimeFor } from './utils/mime.js'
 import { config, calcDelay } from './config.js'
-import { BodyReaderError } from './utils/http-request.js'
 import * as mockBrokerCollection from './mockBrokersCollection.js'
-import { sendInternalServerError, sendNotFound, sendUnprocessableContent } from './utils/http-response.js'
+import { sendInternalServerError, sendNotFound } from './utils/http-response.js'
 
 
 export async function dispatchMock(req, response) {
@@ -40,11 +39,9 @@ export async function dispatchMock(req, response) {
 		setTimeout(() => response.end(body), Number(broker.delayed && calcDelay()))
 	}
 	catch (error) {
-		if (error instanceof BodyReaderError)
-			sendUnprocessableContent(response, error.name)
-		else if (error.code === 'ENOENT') // mock-file has been deleted
+		if (error?.code === 'ENOENT') // mock-file has been deleted
 			sendNotFound(response)
-		else if (error.code === 'ERR_UNKNOWN_FILE_EXTENSION') {
+		else if (error?.code === 'ERR_UNKNOWN_FILE_EXTENSION') {
 			if (error.toString().includes('Unknown file extension ".ts'))
 				log.warn('\nLooks like you need a TypeScript compiler\n')
 			sendInternalServerError(response, error)

package/src/Mockaton.js

@@ -14,15 +14,8 @@ import { apiPatchRequests, apiGetRequests } from './Api.js'
 import { sendNoContent, sendInternalServerError, sendUnprocessableContent } from './utils/http-response.js'
 
 
-process.on('unhandledRejection', error => { throw error })
-
 export function Mockaton(options) {
-	const error = setup(options)
-	if (error) {
-		log.error(error)
-		process.exitCode = 1
-		return
-	}
+	setup(options)
 
 	mockBrokerCollection.init()
 	staticCollection.init()
@@ -31,12 +24,7 @@ export function Mockaton(options) {
 
 	const server = createServer(onRequest)
 
-	server.listen(config.port, config.host, function (error) {
-		if (error) {
-			log.error(error)
-			process.exit(1)
-			return
-		}
+	server.listen(config.port, config.host, function () {
 		const { address, port } = this.address()
 		const url = `http://${address}:${port}`
 		log.info('Listening', url)
@@ -44,11 +32,6 @@ export function Mockaton(options) {
 		config.onReady(url + API.dashboard)
 	})
 
-	server.on('error', error => {
-		log.error(error.message)
-		process.exit(1)
-	})
-
 	return server
 }
 

package/src/cli.js

@@ -8,26 +8,35 @@ import { Mockaton } from '../index.js'
 import pkgJSON from '../package.json' with { type: 'json' }
 
 
-const args = parseArgs({
-	options: {
-		config: { short: 'c', type: 'string' },
+process.on('unhandledRejection', error => { throw error })
 
-		port: { short: 'p', type: 'string' },
-		host: { short: 'H', type: 'string' },
+let args
+try {
+	args = parseArgs({
+		options: {
+			config: { short: 'c', type: 'string' },
 
-		'mocks-dir': { short: 'm', type: 'string' },
-		'static-dir': { short: 's', type: 'string' },
+			port: { short: 'p', type: 'string' },
+			host: { short: 'H', type: 'string' },
 
-		quiet: { short: 'q', type: 'boolean' },
-		'no-open': { short: 'n', type: 'boolean' },
-		
-		help: { short: 'h', type: 'boolean' },
-		version: { short: 'v', type: 'boolean' },
-	}
-}).values
+			'mocks-dir': { short: 'm', type: 'string' },
+			'static-dir': { short: 's', type: 'string' },
+
+			quiet: { short: 'q', type: 'boolean' },
+			'no-open': { short: 'n', type: 'boolean' },
 
+			help: { short: 'h', type: 'boolean' },
+			version: { short: 'v', type: 'boolean' }
+		}
+	}).values
+}
+catch (error) {
+	console.error(error.message)
+	process.exit(1)
+}
 
-if (args.version)
+
+if (args.version) 
 	console.log(pkgJSON.version)
 
 else if (args.help)
@@ -73,5 +82,14 @@ else {
 	if (args.quiet) opts.logLevel = 'quiet'
 	if (args['no-open']) opts.onReady = () => {}
 
-	Mockaton(opts)
+	try {
+		Mockaton(opts).on('error', error => {
+			console.error(error.message)
+			process.exit(1)
+		})
+	}
+	catch (err) {
+		console.error(err?.message || err)
+		process.exit(1)
+	}
 }

package/src/config.js

@@ -22,9 +22,9 @@ const schema = {
 
 	host: ['127.0.0.1', is(String)],
 	port: [0, port => Number.isInteger(port) && port >= 0 && port < 2 ** 16], // 0 means auto-assigned
-	
+
 	logLevel: ['normal', val => ['normal', 'quiet'].includes(val)],
-	
+
 	delay: [1200, ms => Number.isInteger(ms) && ms >= 0],
 	delayJitter: [0, percent => percent >= 0 && percent <= 3],
 
@@ -43,13 +43,13 @@ const schema = {
 	corsExposedHeaders: [[], Array.isArray],
 	corsCredentials: [true, is(Boolean)],
 	corsMaxAge: [0, is(Number)],
-	
+
 	plugins: [
 		[
 			[/\.(js|ts)$/, jsToJsonPlugin]
 		], Array.isArray],
 
-	onReady: [await openInBrowser, is(Function)],
+	onReady: [await openInBrowser, is(Function)]
 }
 
 
@@ -77,15 +77,10 @@ export function setup(options) {
 
 	if (!options.staticDir && !isDirectory(defaults.staticDir))
 		options.staticDir = ''
-	
-	try {
-		Object.assign(config, options)
-		validate(config, ConfigValidator)
-		log.setLevel(config.logLevel)
-	}
-	catch (err) {
-		return err.message
-	}
+
+	Object.assign(config, options)
+	validate(config, ConfigValidator)
+	log.setLevel(config.logLevel)
 }
 
 

package/src/utils/http-response.js

@@ -35,7 +35,7 @@ export function sendUnprocessableContent(response, error) {
 }
 
 export function sendInternalServerError(response, error) {
-	log.error(error)
+	log.error(error?.message || error, error?.stack || undefined)
 	response.statusCode = 500
 	response.end()
 }