mockaton 11.2.5 → 11.3.0

package/src/server/Mockaton.js

@@ -1,20 +1,23 @@
 import { createServer } from 'node:http'
+
 import pkgJSON from '../../package.json' with { type: 'json' }
 
-import { API } from './ApiConstants.js'
 import { logger } from './utils/logger.js'
+import { ServerResponse } from './utils/HttpServerResponse.js'
+import { IncomingMessage } from './utils/HttpIncomingMessage.js'
+import { setCorsHeaders, isPreflight } from './utils/http-cors.js'
+import { BodyReaderError, hasControlChars } from './utils/HttpIncomingMessage.js'
+
+import { API } from './ApiConstants.js'
 import { config, setup } from './config.js'
+import { apiPatchReqs, apiGetReqs } from './Api.js'
+
 import { dispatchMock } from './MockDispatcher.js'
 import { dispatchStatic } from './StaticDispatcher.js'
+
 import * as staticCollection from './staticCollection.js'
 import * as mockBrokerCollection from './mockBrokersCollection.js'
-import { setCorsHeaders, isPreflight } from './utils/http-cors.js'
-import { apiPatchRequests, apiGetRequests } from './Api.js'
-import { BodyReaderError, hasControlChars } from './utils/http-request.js'
-import {
-	setHeaders, sendNoContent, sendInternalServerError,
-	sendUnprocessable, sendTooLongURI, sendBadRequest
-} from './utils/http-response.js'
+
 import { watchDevSPA } from './WatcherDevClient.js'
 import { watchMocksDir, watchStaticDir } from './Watcher.js'
 
@@ -33,7 +36,7 @@ export function Mockaton(options) {
 		if (config.hotReload)
 			watchDevSPA()
 
-		const server = createServer(onRequest)
+		const server = createServer({ IncomingMessage, ServerResponse }, onRequest)
 		server.on('error', reject)
 		server.listen(config.port, config.host, () => {
 			const url = `http://${server.address().address}:${server.address().port}`
@@ -49,17 +52,17 @@ export function Mockaton(options) {
 async function onRequest(req, response) {
 	response.on('error', logger.warn)
 
-	setHeaders(response, ['Server', `Mockaton ${pkgJSON.version}`])
-	setHeaders(response, config.extraHeaders)
+	response.setHeader('Server', `Mockaton ${pkgJSON.version}`)
+	response.setHeaderList(config.extraHeaders)
 
 	const url = req.url || ''
 
 	if (url.length > 2048) {
-		sendTooLongURI(response)
+		response.uriTooLong()
 		return
 	}
 	if (hasControlChars(url)) {
-		sendBadRequest(response)
+		response.badRequest()
 		return
 	}
 
@@ -71,13 +74,13 @@ async function onRequest(req, response) {
 		const { pathname } = new URL(url, 'http://_')
 
 		if (isPreflight(req))
-			sendNoContent(response)
+			response.noContent()
 
-		else if (method === 'PATCH' && apiPatchRequests.has(pathname))
-			await apiPatchRequests.get(pathname)(req, response)
+		else if (method === 'PATCH' && apiPatchReqs.has(pathname))
+			await apiPatchReqs.get(pathname)(req, response)
 
-		else if (method === 'GET' && apiGetRequests.has(pathname))
-			apiGetRequests.get(pathname)(req, response)
+		else if (method === 'GET' && apiGetReqs.has(pathname))
+			apiGetReqs.get(pathname)(req, response)
 
 		else if (method === 'GET' && staticCollection.brokerByRoute(pathname))
 			await dispatchStatic(req, response)
@@ -87,8 +90,8 @@ async function onRequest(req, response) {
 	}
 	catch (error) {
 		if (error instanceof BodyReaderError)
-			sendUnprocessable(response, `${error.name}: ${error.message}`)
+			response.unprocessable(`${error.name}: ${error.message}`)
 		else
-			sendInternalServerError(response, error)
+			response.internalServerError(error)
 	}
 }