mockaton 8.27.0 → 9.1.2

package/package.json

@@ -2,7 +2,7 @@
 	"name": "mockaton",
 	"description": "HTTP Mock Server",
 	"type": "module",
-	"version": "8.27.0",
+	"version": "9.1.2",
 	"main": "index.js",
 	"types": "index.d.ts",
 	"license": "MIT",
@@ -19,8 +19,9 @@
 	},
 	"scripts": {
 		"test": "node --test 'src/**/*.test.js'",
-		"coverage": "node --test --test-reporter=lcov --test-reporter-destination=.coverage/lcov.info --experimental-test-coverage 'src/**/*.test.js'",
-		"start": "node --watch src/cli.js",
+		"coverage": "node --test --test-reporter=lcov --test-reporter-destination=lcov.info --experimental-test-coverage 'src/**/*.test.js'",
+		"start": "node src/cli.js",
+		"watch": "node --watch src/cli.js",
 		"pixaton": "node --test --import=./pixaton-tests/_setup.js --experimental-test-isolation=none 'pixaton-tests/**/*.test.js'",
 		"outdated": "npm outdated --parseable | awk -F: '{ printf \"npm i %-30s ;# %s\\n\", $4, $2 }'"
 	},

package/src/Api.js

@@ -25,15 +25,9 @@ export const apiGetRequests = new Map([
 		'/Logo.svg'
 	].map(f => [API.dashboard + f, serveDashboardAsset(f)]),
 
-	[API.cors, getIsCorsAllowed],
-	[API.static, listStaticFiles],
-	[API.mocks, listMockBrokers],
-	[API.cookies, listCookies],
-	[API.fallback, getProxyFallback],
-	[API.comments, listComments],
-	[API.globalDelay, getGlobalDelay],
+	[API.state, getState],
 	[API.syncVersion, longPollClientSyncVersion],
-	[API.collectProxied, getCollectProxied]
+	[API.throws, () => { throw new Error('Test500') }]
 ])
 
 export const apiPatchRequests = new Map([
@@ -55,19 +49,29 @@ export const apiPatchRequests = new Map([
 /** # GET */
 
 function serveDashboardAsset(f) {
-	return (_, response) => sendFile(response, join(import.meta.dirname, 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))
+	}
 }
 
-function listCookies(_, response) { sendJSON(response, cookie.list()) }
-function listComments(_, response) { sendJSON(response, mockBrokersCollection.extractAllComments()) }
+function getState(_, response) {
+	sendJSON(response, {
+		cookies: cookie.list(),
+		comments: mockBrokersCollection.extractAllComments(),
+
+		brokersByMethod: mockBrokersCollection.all(),
+		staticBrokers: staticCollection.all(),
 
-function listStaticFiles(_, response) { sendJSON(response, staticCollection.all()) }
-function listMockBrokers(_, response) { sendJSON(response, mockBrokersCollection.all()) }
+		delay: config.delay,
+		delayJitter: config.delayJitter,
 
-function getGlobalDelay(_, response) { sendJSON(response, config.delay) }
-function getProxyFallback(_, response) { sendJSON(response, config.proxyFallback) }
-function getCollectProxied(_, response) { sendJSON(response, config.collectProxied) }
-function getIsCorsAllowed(_, response) { sendJSON(response, config.corsAllowed) }
+		proxyFallback: config.proxyFallback,
+		collectProxied: config.collectProxied,
+		corsAllowed: config.corsAllowed
+	})
+}
 
 function longPollClientSyncVersion(req, response) {
 	if (uiSyncVersion.version !== Number(req.headers[DF.syncVersion])) {

package/src/ApiCommander.js

@@ -8,9 +8,6 @@ export class Commander {
 		this.#addr = addr
 	}
 
-	#get(api) {
-		return fetch(this.#addr + api)
-	}
 	#patch(api, body) {
 		return fetch(this.#addr + api, {
 			method: 'PATCH',
@@ -18,47 +15,12 @@ export class Commander {
 		})
 	}
 
-	/** @type {JsonPromise<ClientBrokersByMethod>} */
-	listMocks() {
-		return this.#get(API.mocks)
-	}
-
-	/** @type {JsonPromise<ClientStaticBrokers>} */
-	listStaticFiles() {
-		return this.#get(API.static)
-	}
-
-	/** @type {JsonPromise<[label:string, selected:boolean][]>} */
-	listCookies() {
-		return this.#get(API.cookies)
-	}
-
-	/** @type {JsonPromise<string[]>} */
-	listComments() {
-		return this.#get(API.comments)
-	}
-
-	/** @type {JsonPromise<string>} */
-	getProxyFallback() {
-		return this.#get(API.fallback)
-	}
-
-	/** @type {JsonPromise<boolean>} */
-	getCollectProxied() {
-		return this.#get(API.collectProxied)
-	}
-
-	/** @type {JsonPromise<boolean>} */
-	getCorsAllowed() {
-		return this.#get(API.cors)
-	}
-
-	/** @type {JsonPromise<number>} */
-	getGlobalDelay() {
-		return this.#get(API.globalDelay)
+	/** @returns {JsonPromise<State>} */
+	getState() {
+		return fetch(this.#addr + API.state)
 	}
-
-	/** @type {JsonPromise<number>} */
+	
+	/** @returns {JsonPromise<number>} */
 	getSyncVersion(currentSyncVersion, abortSignal) {
 		return fetch(this.#addr + API.syncVersion, {
 			signal: AbortSignal.any([abortSignal, AbortSignal.timeout(LONG_POLL_SERVER_TIMEOUT + 1000)]),

package/src/ApiConstants.js

@@ -3,20 +3,19 @@ export const API = {
 	dashboard: MOUNT,
 	bulkSelect: MOUNT + '/bulk-select-by-comment',
 	collectProxied: MOUNT + '/collect-proxied',
-	comments: MOUNT + '/comments',
 	cookies: MOUNT + '/cookies',
 	cors: MOUNT + '/cors',
 	delay: MOUNT + '/delay',
 	delayStatic: MOUNT + '/delay-static',
 	fallback: MOUNT + '/fallback',
 	globalDelay: MOUNT + '/global-delay',
-	mocks: MOUNT + '/mocks',
 	proxied: MOUNT + '/proxied',
 	reset: MOUNT + '/reset',
 	select: MOUNT + '/select',
-	static: MOUNT + '/static',
+	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.css

@@ -1,16 +1,16 @@
 :root {
-	--radius: 4px;
-	--boxShadow1: 0 3px 1px -1px rgba(0, 0, 0, 0.04), 0 1px 1px 0 rgba(0, 0, 0, 0.1), 0 1px 3px 0 rgba(0, 0, 0, 0.1);
+	--radius: 8px;
+	--boxShadow1: rgba(0, 0, 0, 0.18) 0 2px 1px -1px, rgba(0, 0, 0, 0.12) 0 1px 1px 0, rgba(0, 0, 0, 0.1) 0 1px 3px 0px;
 }
 
 @media (prefers-color-scheme: light) {
 	:root {
 		--color4xxBackground: #ffedd1;
-		--colorAccent: #0068c1;
+		--colorAccent: #0b61ec;
 		--colorBackground: #fff;
 		--colorComboBoxHeaderBackground: #fff;
 		--colorComboBoxBackground: #eee;
-		--colorHeaderBackground: #f0f0f0;
+		--colorHeaderBackground: #efefef;
 		--colorSecondaryButtonBackground: #fcfcfc;
 		--colorSecondaryActionBorder: #ddd;
 		--colorSecondaryAction: #666;
@@ -31,7 +31,7 @@
 		color: #9b71e8
 	}
 	.syntaxStr, .syntaxAttrVal {
-		color: #3e8300
+		color: #388E3C
 	}
 }
 @media (prefers-color-scheme: dark) {
@@ -94,12 +94,18 @@ body {
 	scrollbar-width: thin;
 }
 
-select, a, input, button, summary {
-	&:focus-visible {
+select, a, input, button {
+	&:focus {
 		outline: 2px solid var(--colorAccent);
 	}
 }
 
+input[type="checkbox"] {
+	&:focus {
+		outline: 0;
+	}
+}
+
 a,
 button,
 input[type=checkbox],
@@ -116,7 +122,6 @@ select {
 	font-size: 100%;
 	color: var(--colorText);
 	cursor: pointer;
-	outline: 0;
 	border-radius: var(--radius);
 	appearance: none;
 	background: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='%23888888'><path d='M16.59 8.59 12 13.17 7.41 8.59 6 10l6 6 6-6z'/></svg>") no-repeat;
@@ -141,14 +146,14 @@ header {
 	display: flex;
 	width: 100%;
 	padding: 16px;
+	border-bottom: 1px solid var(--colorSecondaryActionBorder);
 	background: var(--colorHeaderBackground);
-	box-shadow: var(--boxShadow1);
 
 	> div {
 		display: flex;
 		flex-wrap: wrap;
 		align-items: flex-end;
-		gap: 16px 10px;
+		gap: 16px 8px;
 
 		@media (max-width: 800px) {
 			max-width: 400px;
@@ -189,9 +194,9 @@ header {
 			height: 28px;
 			padding: 4px 8px;
 			border: 0;
+			border: 1px solid var(--colorSecondaryActionBorder);
 			border-right: 3px solid transparent;
 			margin-top: 4px;
-			outline: 1px solid var(--colorSecondaryActionBorder);
 			color: var(--colorText);
 			font-size: 11px;
 			background-color: var(--colorComboBoxHeaderBackground);
@@ -201,7 +206,7 @@ header {
 		select:enabled:hover {
 			background: var(--colorHover);
 		}
-
+		
 		&.GlobalDelayField {
 			width: 84px;
 
@@ -525,7 +530,7 @@ table {
 .StaticFilesList {
 	a {
 		display: inline-block;
-		padding: 8px 0;
+		padding: 6px 0;
 		margin-left: 4px;
 		border-radius: var(--radius);
 		color: var(--colorAccent);
@@ -585,8 +590,7 @@ table {
 }
 
 .dittoDir {
-	opacity: 0.9;
-	filter: saturate(0);
+	opacity: 0.6;
 }
 
 .ErrorToast {

package/src/Dashboard.js

@@ -27,7 +27,7 @@ const Strings = {
 	proxy_toggler: 'Proxy Toggler',
 	reset: 'Reset',
 	save_proxied: 'Save Mocks',
-	static_get: 'Static Folder GET',
+	static_get: 'Static GET',
 	title: 'Mockaton'
 }
 
@@ -75,56 +75,41 @@ for (const k of Object.keys(CSS))
 	CSS[k] = k
 
 
+/** @type {State & {
+ *   groupByMethod: boolean,
+ *   canProxy: boolean
+ *  }} */
 const state = {
-	/** @type {ClientBrokersByMethod} */
 	brokersByMethod: {},
-
-	/** @type {ClientStaticBrokers} */
 	staticBrokers: {},
-
-	/** @type {[label:string, selected:boolean][]} */
 	cookies: [],
-
-	/** @type {string[]} */
 	comments: [],
-
 	delay: 0,
-
 	collectProxied: false,
-
-	fallbackAddress: '',
-
+	proxyFallback: '',
+	
 	groupByMethod: true, // TODO read from localstorage
 
 	get canProxy() {
-		return Boolean(this.fallbackAddress)
+		return Boolean(this.proxyFallback)
 	}
 }
 
 const mockaton = new Commander(window.location.origin)
 updateState()
 initLongPoll()
-function updateState() {
-	Promise.all([
-		mockaton.listMocks(),
-		mockaton.listStaticFiles(),
-		mockaton.listCookies(),
-		mockaton.listComments(),
-		mockaton.getGlobalDelay(),
-		mockaton.getCollectProxied(),
-		mockaton.getProxyFallback()
-	].map(api => api.then(response => response.ok && response.json())))
-		.then(data => {
-			state.brokersByMethod = data[0]
-			state.staticBrokers = data[1]
-			state.cookies = data[2]
-			state.comments = data[3]
-			state.delay = data[4]
-			state.collectProxied = data[5]
-			state.fallbackAddress = data[6]
-			document.body.replaceChildren(...App())
-		})
-		.catch(onError)
+
+async function updateState() {
+	try {
+		const response = await mockaton.getState()
+		if (!response.ok)
+			throw response.status
+		Object.assign(state, await response.json())
+		document.body.replaceChildren(...App())
+	}
+	catch (error) {
+		onError(parseError(error))
+	}
 }
 
 const r = createElement
@@ -268,7 +253,7 @@ function GlobalDelayField() {
 
 
 function ProxyFallbackField() {
-	const { fallbackAddress, collectProxied } = state
+	const { proxyFallback, collectProxied } = state
 	function onChange() {
 		const saveCheckbox = this.closest(`.${CSS.FallbackBackend}`).querySelector('[type=checkbox]')
 		saveCheckbox.disabled = !this.validity.valid || !this.value.trim()
@@ -289,12 +274,12 @@ function ProxyFallbackField() {
 					type: 'url',
 					autocomplete: 'none',
 					placeholder: Strings.fallback_server_placeholder,
-					value: fallbackAddress,
+					value: proxyFallback,
 					onChange
 				})),
 			r(SaveProxiedCheckbox, {
 				collectProxied,
-				disabled: !fallbackAddress
+				disabled: !proxyFallback
 			})))
 }
 
@@ -337,6 +322,8 @@ function ResetButton() {
 
 function MockList() {
 	const { brokersByMethod, groupByMethod } = state
+	const canProxy = state.canProxy
+
 	if (!Object.keys(brokersByMethod).length)
 		return (
 			r('div', className(CSS.empty),
@@ -345,49 +332,19 @@ function MockList() {
 	if (groupByMethod)
 		return (
 			r('div', null,
-				r('table', null, Object.entries(brokersByMethod).map(([method, brokers]) =>
-					r(RowsByMethod, { method, brokers })))))
+				r('table', null, Object.keys(brokersByMethod).map(method =>
+					r('tbody', null,
+						r('tr', null,
+							r('th', { colspan: 2 + Number(canProxy) }),
+							r('th', null, method)),
+						rowsFor(method).map(Row))))))
 
 	return (
 		r('div', null,
 			r('table', null,
-				r(RowsUngrouped))))
+				r('tbody', null, rowsFor('*').map(Row)))))
 }
 
-function RowsByMethod({ method, brokers }) {
-	const canProxy = state.canProxy
-	const rawRows = Object.entries(brokers).map(([urlMask, broker]) => [urlMask, broker, method])
-	return (
-		r('tbody', null,
-			r('tr', null,
-				r('th', { colspan: 2 + Number(canProxy) }),
-				r('th', null, method)),
-			Rows(rawRows)))
-}
-
-function RowsUngrouped() {
-	const { brokersByMethod } = state
-	const rawRows = []
-	for (const [method, brokers] of Object.entries(brokersByMethod))
-		for (const [urlMask, broker] of Object.entries(brokers))
-			rawRows.push([urlMask, broker, method])
-
-	return r('tbody', null, Rows(rawRows))
-}
-
-function Rows(rawRows) {
-	const sorted = rawRows
-		.filter(([, broker]) => broker.mocks.length > 1) // >1 because of autogen500
-		.sort(([aUrl], [bUrl]) => aUrl.localeCompare(bUrl))
-	const urlMasksDittoed = dittoSplitPaths(sorted.map(([urlMask]) => urlMask))
-	return sorted.map(([urlMask, broker, method], i) =>
-		r(Row, {
-			broker,
-			method,
-			urlMask,
-			urlMaskDittoed: urlMasksDittoed[i]
-		}))
-}
 
 function Row({ method, urlMask, urlMaskDittoed, broker }) {
 	const canProxy = state.canProxy
@@ -397,8 +354,27 @@ function Row({ method, urlMask, urlMaskDittoed, 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 }))
-		))
+			r('td', null, r(MockSelector, { broker }))))
+}
+
+function rowsFor(targetMethod) {
+	const { brokersByMethod } = state
+
+	const rows = []
+	for (const [method, brokers] of Object.entries(brokersByMethod))
+		if (targetMethod === '*' || targetMethod === method)
+			for (const [urlMask, broker] of Object.entries(brokers))
+				rows.push({ method, urlMask, broker })
+
+	const sorted = rows
+		.filter((r) => r.broker.mocks.length > 1) // >1 because of autogen500
+		.sort((rA, rB) => rA.urlMask.localeCompare(rB.urlMask))
+
+	const urlMasksDittoed = dittoSplitPaths(sorted.map(r => r.urlMask))
+	return sorted.map((r, i) => ({
+		...r,
+		urlMaskDittoed: urlMasksDittoed[i]
+	}))
 }
 
 function PreviewLink({ method, urlMask, urlMaskDittoed }) {
@@ -746,6 +722,8 @@ async function parseError(response) {
 }
 
 function onError(error) {
+	if (error?.name === 'AbortError')
+		return
 	if (error?.message === 'Failed to fetch')
 		showErrorToast('Looks like the Mockaton server is not running')
 	else

package/src/Logo.svg

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="556" height="100" version="1.1" viewBox="0 0 556 100" xmlns="http://www.w3.org/2000/svg">
 	<style>:root { --color: #000000; }
-		@media (prefers-color-scheme: light) { :root { --color: #444 } }
+		@media (prefers-color-scheme: light) { :root { --color: #333 } }
 		@media (prefers-color-scheme: dark) { :root { --color: #eee } }
 		path { fill: var(--color) }
 	</style>
@@ -10,7 +10,7 @@
 			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"/>
 		<path
 			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"
-			opacity="0.8"/>
+			opacity="0.75"/>
 		<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"/>
 	</g>

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' },
 
-		help: { short: 'h', type: 'boolean' },
-		version: { short: 'v', type: 'boolean' },
+			'mocks-dir': { short: 'm', type: 'string' },
+			'static-dir': { short: 's', type: 'string' },
 
-		quiet: { short: 'q', type: 'boolean' },
-		debug: { type: 'boolean' }
-	}
-}).values
+			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)
@@ -44,6 +53,8 @@ Options:
   -p, --port <port>      (default: 0) which means auto-assigned
   
   -q, --quiet            Errors only
+  --no-open              Don’t open dashboard in a browser (noops onReady callback)
+  
   -h, --help             Show this help
   -v, --version          Show version
 
@@ -69,6 +80,16 @@ else {
 	if (args['static-dir']) opts.staticDir = args['static-dir']
 
 	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)
+	}
 }