mockaton 13.11.2 → 13.11.3

package/package.json

@@ -2,7 +2,7 @@
 	"name": "mockaton",
 	"description": "HTTP Mock Server",
 	"type": "module",
-	"version": "13.11.2",
+	"version": "13.11.3",
 	"exports": {
 		".": {
 			"import": "./index.js",

package/src/server/Api.js

@@ -4,21 +4,21 @@
  */
 
 import { join, relative } from 'node:path'
+
 import { write, rm, isFile, resolveIn } from './utils/fs.js'
+import { removeQueryStringAndFragment } from './utils/HttpIncomingMessage.js'
+import { sseClientHotReload } from './utils/WatcherDevClient.js'
 
-import openapi from '../../www/src/assets/openapi.json' with { type: 'json' }
 import pkgJSON from '../../package.json' with { type: 'json' }
-
-import { sseClientHotReload } from './utils/WatcherDevClient.js'
-import { stopMocksDirWatcher, sseClientSyncVersion, uiSyncVersion, watchMocksDir } from './Watcher.js'
+import openapi from '../../www/src/assets/openapi.json' with { type: 'json' }
 
 import { API } from '../client/ApiConstants.js'
 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 { removeQueryStringAndFragment } from './utils/HttpIncomingMessage.js'
+import { cookie } from './stores/cookies.js'
+import { config, ConfigValidator, reinitConfig } from './stores/config.js'
+import * as brokers from './stores/brokers.js'
+import * as Watcher  from './stores/Watcher.js'
 
 
 export const CLIENT_ASSETS = join(import.meta.dirname, '../client')
@@ -32,7 +32,7 @@ const getReqs = new Map([
 
 	[API.root, serveDashboard],
 	[API.state, getState],
-	[API.syncVersion, sseClientSyncVersion],
+	[API.syncVersion, Watcher.sseClientSyncVersion],
 
 	[API.watchHotReload, onDevWatch],
 	[API.openAPI, (_, response) => response.json(openapi)],
@@ -94,9 +94,9 @@ function serveDashboard(_, response) {
 function getState(_, response) {
 	response.json({
 		cookies: cookie.list(),
-		comments: mockBrokersCollection.extractAllComments(),
+		comments: brokers.extractAllComments(),
 
-		brokersByMethod: mockBrokersCollection.all(),
+		brokersByMethod: brokers.all(),
 
 		delay: config.delay,
 		delayJitter: config.delayJitter,
@@ -118,10 +118,11 @@ function onDevWatch(req, response) {
 /** # PATCH */
 
 function reset(_, response) {
-	mockBrokersCollection.init()
+	reinitConfig()
+	brokers.init()
 	cookie.init(config.cookies)
 	response.ok()
-	uiSyncVersion.increment()
+	Watcher.emitChange()
 }
 
 
@@ -133,7 +134,7 @@ async function setCorsAllowed(req, response) {
 	else {
 		config.corsAllowed = corsAllowed
 		response.ok()
-		uiSyncVersion.increment()
+		Watcher.emitChange()
 	}
 }
 
@@ -146,7 +147,7 @@ async function setGlobalDelay(req, response) {
 	else {
 		config.delay = delay
 		response.ok()
-		uiSyncVersion.increment()
+		Watcher.emitChange()
 	}
 }
 
@@ -158,7 +159,7 @@ async function setGlobalDelayJitter(req, response) {
 	else {
 		config.delayJitter = jitter
 		response.ok()
-		uiSyncVersion.increment()
+		Watcher.emitChange()
 	}
 }
 
@@ -170,7 +171,7 @@ async function selectCookie(req, response) {
 		response.unprocessable(error?.message || error)
 	else {
 		response.json(cookie.list())
-		uiSyncVersion.increment()
+		Watcher.emitChange()
 	}
 }
 
@@ -183,7 +184,7 @@ async function setProxyFallback(req, response) {
 	else {
 		config.proxyFallback = fallback
 		response.ok()
-		uiSyncVersion.increment()
+		Watcher.emitChange()
 	}
 }
 
@@ -195,7 +196,7 @@ async function setCollectProxied(req, response) {
 	else {
 		config.collectProxied = collectProxied
 		response.ok()
-		uiSyncVersion.increment()
+		Watcher.emitChange()
 	}
 }
 
@@ -203,41 +204,41 @@ async function setCollectProxied(req, response) {
 
 async function bulkUpdateBrokersByCommentTag(req, response) {
 	const comment = await req.json()
-	mockBrokersCollection.setMocksMatchingComment(comment)
+	brokers.setMocksMatchingComment(comment)
 	response.ok()
-	uiSyncVersion.increment()
+	Watcher.emitChange()
 }
 
 
 async function selectMock(req, response) {
 	const file = await req.json()
-	const broker = mockBrokersCollection.brokerByFilename(file)
+	const broker = brokers.brokerByFilename(file)
 	if (!broker || !broker.hasMock(file))
 		response.unprocessable(`Missing Mock: ${file}`)
 	else {
 		broker.selectFile(file)
 		response.json(broker)
-		uiSyncVersion.increment()
+		Watcher.emitChange()
 	}
 }
 
 
 async function toggleRouteStatus(req, response) {
 	const [method, urlMask, status] = await req.json()
-	const broker = mockBrokersCollection.brokerByRoute(method, urlMask)
+	const broker = brokers.brokerByRoute(method, urlMask)
 	if (!broker)
 		response.unprocessable(`Route does not exist: ${method} ${urlMask}`)
 	else {
 		broker.toggleStatus(status)
 		response.json(broker)
-		uiSyncVersion.increment()
+		Watcher.emitChange()
 	}
 }
 
 
 async function setRouteIsDelayed(req, response) {
 	const [method, urlMask, delayed] = await req.json()
-	const broker = mockBrokersCollection.brokerByRoute(method, urlMask)
+	const broker = brokers.brokerByRoute(method, urlMask)
 	if (!broker)
 		response.unprocessable(`Route does not exist: ${method} ${urlMask}`)
 	else if (typeof delayed !== 'boolean')
@@ -245,14 +246,14 @@ async function setRouteIsDelayed(req, response) {
 	else {
 		broker.setDelayed(delayed)
 		response.json(broker)
-		uiSyncVersion.increment()
+		Watcher.emitChange()
 	}
 }
 
 
 async function setRouteIsProxied(req, response) {
 	const [method, urlMask, proxied] = await req.json()
-	const broker = mockBrokersCollection.brokerByRoute(method, urlMask)
+	const broker = brokers.brokerByRoute(method, urlMask)
 	if (!broker)
 		response.unprocessable(`Route does not exist: ${method} ${urlMask}`)
 	else if (typeof proxied !== 'boolean')
@@ -262,7 +263,7 @@ async function setRouteIsProxied(req, response) {
 	else {
 		broker.setProxied(proxied)
 		response.json(broker)
-		uiSyncVersion.increment()
+		Watcher.emitChange()
 	}
 }
 
@@ -282,8 +283,8 @@ async function writeMock(req, response) {
 	await write(path, content)
 
 	if (!config.watcherEnabled) {
-		mockBrokersCollection.registerMock(file, true)
-		uiSyncVersion.increment()
+		brokers.registerMock(file, true)
+		Watcher.emitChange()
 	}
 	response.ok()
 }
@@ -305,8 +306,8 @@ async function deleteMock(req, response) {
 	await rm(path)
 
 	if (!config.watcherEnabled) {
-		mockBrokersCollection.unregisterMock(file)
-		uiSyncVersion.increment()
+		brokers.unregisterMock(file)
+		Watcher.emitChange()
 	}
 	response.ok()
 }
@@ -319,9 +320,9 @@ async function setWatchMocks(req, response) {
 		response.unprocessable(`Expected boolean for "watchMocks"`)
 	else {
 		if (enabled)
-			watchMocksDir()
+			Watcher.watchMocksDir()
 		else
-			stopMocksDirWatcher()
+			Watcher.unwatchMocksDir()
 		response.ok()
 	}
 }

package/src/server/MockDispatcher.js

@@ -1,12 +1,13 @@
 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 { cookie } from './stores/cookies.js'
 import { echoFilePlugin } from './MockDispatcherPlugins.js'
-import { brokerByRoute } from './mockBrokersCollection.js'
-import { config, calcDelay } from './config.js'
+import { brokerByRoute } from './stores/brokers.js'
+import { config, calcDelay } from './stores/config.js'
+
+import { logger } from './utils/logger.js'
+import { parseFilename } from '../client/Filename.js'
 
 
 export async function dispatchMock(req, response) {

package/src/server/Mockaton.js

@@ -7,29 +7,28 @@ import { logger } from './utils/logger.js'
 import { ServerResponse } from './utils/HttpServerResponse.js'
 import { setCorsHeaders, isPreflight } from './utils/http-cors.js'
 import { IncomingMessage, BodyReaderError, hasControlChars } from './utils/HttpIncomingMessage.js'
+import { watchDevSPA } from './utils/WatcherDevClient.js'
 
 import { API } from '../client/ApiConstants.js'
-import { cookie } from './cookie.js'
-import { config, setup } from './config.js'
-import { CLIENT_ASSETS, handleApiRequest } from './Api.js'
 
+import { CLIENT_ASSETS, handleApiRequest } from './Api.js'
+import { cookie } from './stores/cookies.js'
+import { config, initConfig } from './stores/config.js'
+import * as brokers from './stores/brokers.js'
 import { dispatchMock } from './MockDispatcher.js'
-import * as mockBrokerCollection from './mockBrokersCollection.js'
-
-import { watchDevSPA } from './utils/WatcherDevClient.js'
-import { watchMocksDir } from './Watcher.js'
+import { watchMocksDir } from './stores/Watcher.js'
 
 
 export function Mockaton(options) {
 	return new Promise((resolve, reject) => {
-		setup(options)
+		initConfig(options)
 		cookie.init(config.cookies)
-		mockBrokerCollection.init()
+		brokers.init()
 
-		register('./resolverResolveExtensionless.js', import.meta.url)
+		register('./ResolverResolveExtensionless.js', import.meta.url)
 
 		if (config.bypassImportCache)
-			register('./resolverBypassImportCache.js', import.meta.url)
+			register('./ResolverBypassImportCache.js', import.meta.url)
 
 		if (config.watcherEnabled)
 			watchMocksDir()

package/src/server/Mockaton.test.js

@@ -1,3 +1,4 @@
+import fs from 'node:fs/promises'
 import { join } from 'node:path'
 import { spawn } from 'node:child_process'
 import { tmpdir } from 'node:os'
@@ -7,23 +8,32 @@ import { mkdtempSync } from 'node:fs'
 import { randomUUID } from 'node:crypto'
 import { equal, deepEqual, match } from 'node:assert/strict'
 import { describe, test, before, beforeEach, after } from 'node:test'
-import { unlink, mkdir, readFile, rename, readdir, writeFile, rm } from 'node:fs/promises'
 
+import CONFIG from './Mockaton.test.config.js'
+import { config } from './stores/config.js'
 import { mimeFor } from './utils/mime.js'
 import { API } from '../client/ApiConstants.js'
 import { Commander } from '../client/ApiCommander.js'
 import { parseFilename } from '../client/Filename.js'
 
-import CONFIG from './Mockaton.test.config.js'
-import { config } from './config.js'
 
+const mocksDir = new class {
+	value = mkdtempSync(join(tmpdir(), 'mocks'))
+
+	rm = f => fs.unlink(join(this.value, f))
+	read = f => fs.readFile(join(this.value, f), 'utf8')
+	write = (f, data) => fs.writeFile(join(this.value, f), data)
+	rename = (src, target) => fs.rename(join(this.value, src), join(this.value, target))
 
-const mocksDir = mkdtempSync(join(tmpdir(), 'mocks'))
+	list = d => fs.readdir(join(this.value, d))
+	rmdir = d => fs.rm(join(this.value, d), { recursive: true })
+	mkdir = d => fs.mkdir(join(this.value, d), { recursive: true })
+}
 
 const stdout = []
 const stderr = []
 const proc = spawn(join(import.meta.dirname, 'cli.js'), [
-	mocksDir,
+	mocksDir.value,
 	'--config', join(import.meta.dirname, 'Mockaton.test.config.js'),
 	'--no-open'
 ])
@@ -48,17 +58,6 @@ const serverAddr = await new Promise((resolve, reject) => {
 
 after(() => proc.kill('SIGUSR2'))
 
-
-const rmFromMocksDir = f => unlink(join(mocksDir, f))
-const readFromMocksDir = f => readFile(join(mocksDir, f), 'utf8')
-const writeInMocksDir = (f, data) => writeFile(join(mocksDir, f), data)
-const renameInMocksDir = (src, target) => rename(join(mocksDir, src), join(mocksDir, target))
-
-const listFromMocksDir = d => readdir(join(mocksDir, d))
-const rmDirFromMocks = d => rm(join(mocksDir, d), { recursive: true })
-const makeDirInMocks = dir => mkdir(join(mocksDir, dir), { recursive: true })
-
-
 const api = new Commander(serverAddr)
 
 
@@ -304,6 +303,7 @@ describe('Delay', () => {
 			const r = await api.setGlobalDelayJitter(0.1)
 			equal(r.status, 200)
 			equal((await fetchState()).delayJitter, 0.1)
+			await api.setGlobalDelayJitter(0)
 		})
 	})
 
@@ -389,14 +389,14 @@ describe('Proxy Fallback', () => {
 			deepEqual(await r2.json(), BODY_PAYLOAD)
 			deepEqual(await r1.json(), BODY_PAYLOAD)
 
-			const savedMocks = await listFromMocksDir('non-existing-mock')
+			const savedMocks = await mocksDir.list('non-existing-mock')
 			equal(savedMocks.length, 2)
 
-			equal(await readFromMocksDir('non-existing-mock/[id].POST.423.json'), expectedBody)
+			equal(await mocksDir.read('non-existing-mock/[id].POST.423.json'), expectedBody)
 			for (const m of savedMocks) {
 				const f = join('non-existing-mock', m)
-				equal(await readFromMocksDir(f), expectedBody)
-				await rmFromMocksDir(f)
+				equal(await mocksDir.read(f), expectedBody)
+				await mocksDir.rm(f)
 			}
 		})
 	})
@@ -920,7 +920,7 @@ describe('Dynamic Params', () => {
 	const fx2 = new Fixture('dynamic-params/[id]/suffix/[id].GET.200.txt')
 	const fx3 = new Fixture('dynamic-params/exact-route.GET.200.txt')
 	before(async () => {
-		await makeDirInMocks('dynamic-params/[id]/suffix/[id]')
+		await mocksDir.mkdir('dynamic-params/[id]/suffix/[id]')
 		await fx0.write()
 		await fx1.write()
 		await fx2.write()
@@ -956,7 +956,7 @@ describe('Dynamic Params', () => {
 
 test('Dynamic Params on partial segments', async () => {
 	const fx = new Fixture('dynamic-params-partial-[id]/foo.GET.200.txt')
-	await makeDirInMocks('dynamic-params-partial-[id]')
+	await mocksDir.mkdir('dynamic-params-partial-[id]')
 	await fx.write()
 	const r = await request('/dynamic-params-partial-999/foo')
 	equal(await r.text(), fx.body)
@@ -968,7 +968,7 @@ describe('Query String', () => {
 	const fx0 = new Fixture('query-string?foo=[foo]&bar=[bar].GET.200.json')
 	const fx1 = new Fixture('query-string/[id]?limit=[limit].GET.200.json')
 	before(async () => {
-		await makeDirInMocks('query-string')
+		await mocksDir.mkdir('query-string')
 		await fx0.write()
 		await fx1.write()
 		await api.reset()
@@ -1127,10 +1127,10 @@ describe('Registering Mocks', () => {
 	test('when watcher is off, newly added mocks do not get registered', async () => {
 		await api.setWatchMocks(false)
 		const fx = new FixtureExternal('non-auto-registered-file.GET.200.json')
-		await writeInMocksDir(fx.file, fx.body)
+		await mocksDir.write(fx.file, fx.body)
 		await sleep(100)
 		equal(await fx.fetchBroker(), undefined)
-		await rmFromMocksDir(fx.file)
+		await mocksDir.rm(fx.file)
 	})
 
 	test('register', async () => {
@@ -1176,27 +1176,27 @@ describe('Registering Mocks', () => {
 		const fx0 = new FixtureExternal('reg0/runtime0.GET.200.txt')
 		let version
 		before(async () => {
-			await makeDirInMocks('reg0')
-			await writeInMocksDir(fx0.file, fx0.body)
+			await mocksDir.mkdir('reg0')
+			await mocksDir.write(fx0.file, fx0.body)
 			version = await resolveOnNextSyncVersion(-1)
 		})
 
 		const fx = new FixtureExternal('runtime1.GET.200.txt')
 		test('responds when a file is added', async () => {
 			const prom = resolveOnNextSyncVersion(version)
-			await writeInMocksDir(fx.file, fx.body)
+			await mocksDir.write(fx.file, fx.body)
 			equal(await prom, version + 1)
 		})
 
 		test('responds when a file is deleted', async () => {
 			const prom = resolveOnNextSyncVersion(version + 1)
-			await rmFromMocksDir(fx.file)
+			await mocksDir.rm(fx.file)
 			equal(await prom, version + 2)
 		})
 
 		test('responds when dir is renamed', async () => {
 			const prom = resolveOnNextSyncVersion(version + 2)
-			await renameInMocksDir('reg0', 'reg1')
+			await mocksDir.rename('reg0', 'reg1')
 			equal(await prom, version + 3)
 
 			const s = await fetchState()
@@ -1209,7 +1209,7 @@ describe('Registering Mocks', () => {
 		await fx.writeExternally()
 		config.watcherDebounceMs = 100 // Because on macOS rmdir triggers a few events
 		const nextVerPromise = resolveOnNextSyncVersion()
-		await rmDirFromMocks('api/bulk-delete')
+		await mocksDir.rmdir('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 
@@ -1221,24 +1221,37 @@ describe('Registering Mocks', () => {
  * This is for listening to real-time updates. It responds when a new mock is added, deleted, or renamed. */
 async function resolveOnNextSyncVersion(currSyncVer = undefined) {
 	let skipFirst = currSyncVer === undefined
-	const response = await api.getSyncVersion()
-	const stream = response.body.pipeThrough(new TextDecoderStream())
+	const reader = (await api.getSyncVersion())
+		.body.pipeThrough(new TextDecoderStream())
+		.getReader()
 	let buffer = ''
 
-	for await (const chunk of stream) {
-		buffer += chunk
-		const parts = buffer.split('\n\n')
-		buffer = parts.pop() || ''
-
-		for (const event of parts)
-			for (const line of event.split(/\r?\n/))
-				if (line.startsWith('data:')) {
-					const v = Number(line.slice(5).trim())
-					if (skipFirst || v === currSyncVer)
-						skipFirst = false
-					else
-						return v
-				}
+	try {
+		while (true) {
+			try {
+				const { done, value } = await reader.read()
+				if (done) break
+				buffer += value
+			}
+			catch {
+				break
+			}
+			const parts = buffer.split('\n\n')
+			buffer = parts.pop() || ''
+
+			for (const event of parts)
+				for (const line of event.split(/\r?\n/))
+					if (line.startsWith('data:')) {
+						const v = Number(line.slice(5).trim())
+						if (skipFirst || v === currSyncVer)
+							skipFirst = false
+						else
+							return v
+					}
+		}
+	}
+	finally {
+		reader.cancel().catch(() => {})
 	}
 }
 

package/src/server/ProxyRelay.js

@@ -4,12 +4,13 @@ import { randomUUID } from 'node:crypto'
 import { extFor } from './utils/mime.js'
 import { write, isFile, resolveIn } from './utils/fs.js'
 import { 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'
 
+import { config } from './stores/config.js'
+
 
 export async function proxy(req, response, delay) {
 	let proxyResponse

package/src/server/UrlParsers.js

@@ -1,5 +1,5 @@
 import { relative } from 'node:path'
-import { config } from './config.js'
+import { config } from './stores/config.js'
 import { decode, removeQueryStringAndFragment } from './utils/HttpIncomingMessage.js'
 import { parseFilename, removeTrailingSlash } from '../client/Filename.js'
 

package/src/server/UrlParsers.test.js

@@ -1,7 +1,7 @@
 import { test, describe } from 'node:test'
 import { deepEqual, equal } from 'node:assert/strict'
 import { parseSegments, parseQueryParams } from './UrlParsers.js'
-import { config } from './config.js'
+import { config } from './stores/config.js'
 
 test('parseQueryParams', () => {
 	const searchParams = parseQueryParams('/api/foo?limit=123')

package/src/server/cli.js

@@ -4,9 +4,9 @@ import { pathToFileURL } from 'node:url'
 import { resolve, join } from 'node:path'
 import { parseArgs } from 'node:util'
 
+import { config } from './stores/config.js'
 import { isFile, isDirectory } from './utils/fs.js'
 import { Mockaton } from '../../index.js'
-import { config } from './config.js'
 import pkgJSON from '../../package.json' with { type: 'json' }
 
 
@@ -19,14 +19,14 @@ SYNOPSIS
 
 OPTIONS
   -c, --config <file>  (default: ./${DEFAULT_CONFIG_FILE})
-  
-  -H, --host <host>    (default: 127.0.0.1)
-  -p, --port <port>    (default: 0) which means auto-assigned
-  
+ 
+  -H, --host <host>    (default: ${config.host})
+  -p, --port <port>    (default: ${config.port}) 0 means auto-assigned
+ 
   -q, --quiet          Show errors only
   --no-open            Don't open dashboard in a browser
   --no-read-only       Allow writing and deleting mocks via API
-  
+ 
   --skills             Show AI agent SKILL.md file path
   -h, --help
   -v, --version

package/src/server/{Watcher.js → stores/Watcher.js}

@@ -3,8 +3,8 @@ import { watch } from 'node:fs'
 import { EventEmitter } from 'node:events'
 
 import { config } from './config.js'
-import { isFile, isDirectory } from './utils/fs.js'
-import * as mockBrokerCollection from './mockBrokersCollection.js'
+import * as brokers from './brokers.js'
+import { isFile, isDirectory } from '../utils/fs.js'
 
 
 let mocksWatcher = null
@@ -38,6 +38,10 @@ export const uiSyncVersion = new class extends EventEmitter {
 	}
 }
 
+export function emitChange() {
+	uiSyncVersion.increment()
+}
+
 
 export function watchMocksDir() {
 	const dir = config.mocksDir
@@ -46,22 +50,25 @@ export function watchMocksDir() {
 			return
 
 		if (isDirectory(join(dir, file))) {
-			mockBrokerCollection.init()
+			brokers.init()
 			uiSyncVersion.increment()
 		}
 		else if (!isFile(join(dir, file))) { // file deleted
-			mockBrokerCollection.unregisterMock(file)
+			brokers.unregisterMock(file)
 			uiSyncVersion.increment()
 		}
-		else if (mockBrokerCollection.registerMock(file, Boolean('isFromWatcher')))
+		else if (brokers.registerMock(file, Boolean('isFromWatcher')))
 			uiSyncVersion.increment()
 		else {
 			// ignore file edits
 		}
 	})
+	mocksWatcher?.on('error', () => {
+		// on linux, subdir deletion can trigger inotify IN_IGNORED
+	})
 }
 
-export function stopMocksDirWatcher() {
+export function unwatchMocksDir() {
 	mocksWatcher?.close()
 	mocksWatcher = null
 }
@@ -75,19 +82,21 @@ export function sseClientSyncVersion(req, response) {
 	})
 	response.flushHeaders()
 
-	function sendVersion() {
-		response.write(`data: ${uiSyncVersion.version}\n\n`)
-	}
 
 	sendVersion()
 	uiSyncVersion.subscribe(sendVersion)
 
+	function sendVersion() {
+		response.write(`data: ${uiSyncVersion.version}\n\n`)
+	}
+
 	const keepAlive = setInterval(() => {
 		response.write(': ping\n\n')
 	}, 10_000)
 
 	req.on('close', cleanup)
 	req.on('error', cleanup)
+	response.on('error', cleanup)
 	function cleanup() {
 		clearInterval(keepAlive)
 		uiSyncVersion.unsubscribe(sendVersion)

package/src/server/{mockBrokersCollection.js → stores/brokers.js}

@@ -1,9 +1,9 @@
 import { basename } from 'node:path'
 
-import { MockBroker } from './MockBroker.js'
-import { parseFilename } from '../client/Filename.js'
-import { listFilesRecursively } from './utils/fs.js'
 import { config, isFileAllowed } from './config.js'
+import { MockBroker } from '../MockBroker.js'
+import { listFilesRecursively } from '../utils/fs.js'
+import { parseFilename } from '../../client/Filename.js'
 
 
 /**

package/src/server/{config.js → stores/config.js}

@@ -2,13 +2,13 @@ import { resolve } from 'node:path'
 import { lstatSync } from 'node:fs'
 import { METHODS } from 'node:http'
 
-import { logger } from './utils/logger.js'
-import { registerMimes } from './utils/mime.js'
-import { openInBrowser } from './utils/openInBrowser.js'
-import { is, validate, isInt, isFloat, isOneOf, optionalURL } from './utils/validate.js'
-import { validateCorsAllowedMethods, validateCorsAllowedOrigins } from './utils/http-cors.js'
+import { logger } from '../utils/logger.js'
+import { registerMimes } from '../utils/mime.js'
+import { openInBrowser } from '../utils/openInBrowser.js'
+import { is, validate, isInt, isFloat, isOneOf, optionalURL } from '../utils/validate.js'
+import { validateCorsAllowedMethods, validateCorsAllowedOrigins } from '../utils/http-cors.js'
 
-import { jsToJsonPlugin } from './MockDispatcherPlugins.js'
+import { jsToJsonPlugin } from '../MockDispatcherPlugins.js'
 
 /** @type {{
  * 	[K in keyof Config]-?: [
@@ -47,15 +47,12 @@ const schema = {
 	corsCredentials: [true, is(Boolean)],
 	corsMaxAge: [0, is(Number)],
 
-	plugins: [
-		[
-			[/\.(js|ts)$/, jsToJsonPlugin]
-		], is(Array)],
+	hotReload: [false, is(Boolean)],
+	bypassImportCache: [true, is(Boolean)],
 
+	// Non-serializable
+	plugins: [[[/\.(js|ts)$/, jsToJsonPlugin]], is(Array)],
 	onReady: [await openInBrowser, is(Function)],
-
-	hotReload: [false, is(Boolean)],
-	bypassImportCache: [true, is(Boolean)]
 }
 
 
@@ -73,19 +70,36 @@ export const config = Object.seal(defaults)
 export const ConfigValidator = Object.freeze(validators)
 
 
+let originalOpts = {}
+
 /** @param {Partial<Config>} opts */
-export function setup(opts) {
+export function initConfig(opts) {
 	if (opts.mocksDir)
 		opts.mocksDir = resolve(opts.mocksDir)
 
 	Object.assign(config, opts)
+	originalOpts = deepCloneExcluding(config, 'plugins', 'onReady')
+
 	validate(config, ConfigValidator)
 	logger.setLevel(config.logLevel)
 	registerMimes(config.extraMimes)
 }
 
+export function reinitConfig() {
+	initConfig(originalOpts)
+}
+
 export const isFileAllowed = f => !config.ignore.test(f)
 
 export const calcDelay = () => config.delayJitter
 	? config.delay * (1 + Math.random() * config.delayJitter)
 	: config.delay
+
+
+function deepCloneExcluding(obj, ...exclude) {
+	const res = {}
+	for (const [k, v] of Object.entries(obj))
+		if (!exclude.includes(k))
+			res[k] = structuredClone(v)
+	return res
+}

package/src/server/utils/HttpServerResponse.test.js

@@ -4,7 +4,7 @@ import { createServer } from 'node:http'
 import { tmpdir } from 'node:os'
 import { equal } from 'node:assert/strict'
 import { join } from 'node:path'
-import { rmdir } from 'node:fs/promises'
+import { rm } from 'node:fs/promises'
 
 import { ServerResponse } from './HttpServerResponse.js'
 
@@ -31,7 +31,7 @@ describe('ServerResponse', { concurrency: true }, () => {
 
 	after(async () => {
 		server?.close()
-		await rmdir(tmpDir, { recursive: true, force: true })
+		await rm(tmpDir, { recursive: true, force: true })
 	})
 
 

package/www/src/assets/openapi.json

@@ -116,7 +116,7 @@
 		"/mockaton/reset": {
 			"patch": {
 				"summary": "Re-initialize Mockaton",
-				"description": "The selected mocks, cookies, and delays go back to their defaults, but `proxyFallback`, `collectProxied`, and `corsAllowed` are not affected.",
+				"description": "Initializes the brokers collections and config options",
 				"x-js-client-example": "await mockaton.reset()",
 				"responses": {
 					"200": {