mockaton 8.27.0 → 9.1.2

package/src/config.js

@@ -18,29 +18,24 @@ import { validateCorsAllowedMethods, validateCorsAllowedOrigins } from './utils/
 const schema = {
 	mocksDir: [join(process.cwd(), 'mockaton-mocks'), isDirectory],
 	staticDir: [join(process.cwd(), 'mockaton-static-mocks'), optional(isDirectory)],
-	ignore: [/(\.DS_Store|~)$/, is(RegExp)],
+	ignore: [/(\.DS_Store|~)$/, is(RegExp)], // TODO think about .well-known/appspecific/com.chrome.devtools
 
 	host: ['127.0.0.1', is(String)],
 	port: [0, port => Number.isInteger(port) && port >= 0 && port < 2 ** 16], // 0 means auto-assigned
 
-	proxyFallback: ['', optional(URL.canParse)], // e.g. http://localhost:9999
-	collectProxied: [false, is(Boolean)],
-	formatCollectedJSON: [true, is(Boolean)],
+	logLevel: ['normal', val => ['normal', 'quiet'].includes(val)],
 
 	delay: [1200, ms => Number.isInteger(ms) && ms >= 0],
 	delayJitter: [0, percent => percent >= 0 && percent <= 3],
 
-	cookies: [{}, is(Object)], // defaults to the first kv
+	proxyFallback: ['', optional(URL.canParse)], // e.g. http://localhost:9999
+	collectProxied: [false, is(Boolean)],
+	formatCollectedJSON: [true, is(Boolean)],
 
+	cookies: [{}, is(Object)], // defaults to the first kv
 	extraHeaders: [[], val => Array.isArray(val) && val.length % 2 === 0],
-
 	extraMimes: [{}, is(Object)],
 
-	plugins: [
-		[
-			[/\.(js|ts)$/, jsToJsonPlugin]
-		], Array.isArray],
-
 	corsAllowed: [true, is(Boolean)],
 	corsOrigins: [['*'], validateCorsAllowedOrigins],
 	corsMethods: [SUPPORTED_METHODS, validateCorsAllowedMethods],
@@ -49,9 +44,12 @@ const schema = {
 	corsCredentials: [true, is(Boolean)],
 	corsMaxAge: [0, is(Number)],
 
-	onReady: [await openInBrowser, is(Function)],
+	plugins: [
+		[
+			[/\.(js|ts)$/, jsToJsonPlugin]
+		], Array.isArray],
 
-	logLevel: ['normal', val => ['normal', 'quiet'].includes(val)]
+	onReady: [await openInBrowser, is(Function)]
 }
 
 
@@ -80,14 +78,9 @@ 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()
 }

package/src/utils/mime.js

@@ -1,11 +1,14 @@
 import { config } from '../config.js'
 import { EXT_FOR_UNKNOWN_MIME } from '../ApiConstants.js'
 
+
+// Generated with:
 // https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types
-// m = {}; 
+// m = {}
 // for (const row of tbody.children)
-//   m[row.children[0].querySelector('code').innerText] = row.children[2].querySelector('code').innerText
-const mimes = {
+//  m[row.children[0].querySelector('code').innerText] = row.children[2].querySelector('code').innerText
+
+const extToMime = {
 	'3g2': 'video/3gpp2',
 	'3gp': 'video/3gpp',
 	'7z': 'application/x-7z-compressed',
@@ -38,7 +41,7 @@ const mimes = {
 	jar: 'application/java-archive',
 	jpeg: 'image/jpeg',
 	jpg: 'image/jpeg',
-	js: 'text/javascript',
+	js: 'application/javascript',
 	json: 'application/json',
 	jsonld: 'application/ld+json',
 	mid: 'audio/midi',
@@ -87,9 +90,18 @@ const mimes = {
 	zip: 'application/zip'
 }
 
+const mimeToExt = mapMimeToExt(extToMime)
+
+function mapMimeToExt(e2m) {
+	const m = {}
+	for (const [ext, mime] of Object.entries(e2m))
+		m[mime] = ext
+	return m
+}
+
 export function mimeFor(filename) {
 	const ext = extname(filename).toLowerCase()
-	return config.extraMimes[ext] || mimes[ext] || ''
+	return config.extraMimes[ext] || extToMime[ext] || ''
 }
 function extname(filename) {
 	const i = filename.lastIndexOf('.')
@@ -104,12 +116,13 @@ export function extFor(mime) {
 		? findExt(mime)
 		: 'empty'
 }
-function findExt(targetMime) {
-	for (const [ext, mime] of Object.entries(config.extraMimes))
-		if (targetMime === mime)
-			return ext
-	for (const [ext, mime] of Object.entries(mimes))
-		if (targetMime === mime)
-			return ext
-	return EXT_FOR_UNKNOWN_MIME
+function findExt(rawMime) {
+	const m = parseMime(rawMime)
+	const extraMimeToExt = mapMimeToExt(config.extraMimes)
+	return extraMimeToExt[m] || mimeToExt[m] || EXT_FOR_UNKNOWN_MIME
+}
+
+export function parseMime(mime) {
+	return mime.split(';')[0].toLowerCase()
+	// RFC 9110 §8.3.1
 }