mockaton 13.6.4 → 13.7.1

package/package.json

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

package/src/client/ApiConstants.js

@@ -37,5 +37,3 @@ export const DEFAULT_MOCK_COMMENT = '(default)'
 
 export const EXT_UNKNOWN_MIME = 'unknown'
 export const EXT_EMPTY = 'empty'
-
-export const FILENAME_HEADER = 'Mockaton-File'

package/src/client/app-payload-viewer.js

@@ -113,13 +113,15 @@ async function updatePayloadViewer(proxied, file, response) {
 	else if (mime.startsWith('video/'))
 		codeRef.elem.replaceChildren(r('video', {
 			src: store.chosenLink.urlMask,
-			controls: true
+			controls: true,
+			autoPlay: true
 		}))
 
 	else if (mime.startsWith('audio/'))
 		codeRef.elem.replaceChildren(r('audio', {
 			src: store.chosenLink.urlMask,
-			controls: true
+			controls: true,
+			autoPlay: true
 		}))
 
 	else if (['text/html', 'application/pdf'].includes(mime))

package/src/server/MockBroker.js

@@ -107,15 +107,20 @@ class UrlMatcher {
 		this.#urlRegex = this.#buildUrlRegex(file)
 	}
 
+	#escapeRegex(str) {
+		return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+	}
+
 	#buildUrlRegex(file) {
 		let { urlMask } = parseFilename(file)
 		urlMask = removeQueryStringAndFragment(urlMask)
+		urlMask = this.#escapeRegex(urlMask)
 		urlMask = this.#disregardVariables(urlMask)
 		return new RegExp('^' + urlMask + '/*$')
 	}
 
-	#disregardVariables(str) { // Stars out all parts that are in square brackets
-		return str.replace(/\[.*?]/g, '[^/]+')
+	#disregardVariables(str) {
+		return str.replace(/\\\[.*?\\]/g, '[^/]+')
 	}
 
 	// Appending a '/' so URLs ending with variables don't match

package/src/server/MockDispatcher.js

@@ -7,7 +7,6 @@ import { parseFilename } from '../client/Filename.js'
 import { echoFilePlugin } from './MockDispatcherPlugins.js'
 import { brokerByRoute } from './mockBrokersCollection.js'
 import { config, calcDelay } from './config.js'
-import { FILENAME_HEADER } from '../client/ApiConstants.js'
 
 
 export async function dispatchMock(req, response) {
@@ -29,7 +28,9 @@ export async function dispatchMock(req, response) {
 			return
 		}
 
-		response.setHeader(FILENAME_HEADER, broker.file)
+		response.on('finish', () => {
+			logger.normal('MOCK', req.url, broker.file)
+		})
 
 		if (cookie.getCurrent())
 			response.setHeader('Set-Cookie', cookie.getCurrent())

package/src/server/Mockaton.js

@@ -8,8 +8,7 @@ import { ServerResponse } from './utils/HttpServerResponse.js'
 import { setCorsHeaders, isPreflight } from './utils/http-cors.js'
 import { IncomingMessage, BodyReaderError, hasControlChars } from './utils/HttpIncomingMessage.js'
 
-import { API, FILENAME_HEADER } from '../client/ApiConstants.js'
-
+import { API } from '../client/ApiConstants.js'
 import { cookie } from './cookie.js'
 import { config, setup } from './config.js'
 import { apiPatchReqs, apiGetReqs, CLIENT_DIR } from './Api.js'
@@ -49,15 +48,12 @@ export function Mockaton(options) {
 
 async function onRequest(req, response) {
 	response.setHeader('Server', `Mockaton ${pkgJSON.version}`)
-
 	response.on('error', logger.warn)
 
+	let handledByMockDispatcher = false
 	response.on('finish', () => {
-		const f = response.getHeader(FILENAME_HEADER)
-		if (f)
-			logger.normal('MOCK', req.url, f)
-		else
-			logger.verbose('API', response)
+		if (!handledByMockDispatcher)
+			logger.verbose('APP', response)
 	})
 
 	const url = req.url || ''
@@ -87,8 +83,10 @@ async function onRequest(req, response) {
 		else if (method === 'GET' && apiGetReqs.has(pathname))
 			apiGetReqs.get(pathname)(req, response)
 
-		else
+		else {
+			handledByMockDispatcher = true
 			await dispatchMock(req, response)
+		}
 	}
 	catch (error) {
 		if (error instanceof BodyReaderError)

package/src/server/Mockaton.test.js

@@ -940,6 +940,15 @@ 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 fx.write()
+	const r = await request('/dynamic-params-partial-999/foo')
+	equal(await r.text(), fx.body)
+	await fx.delete()
+})
+
 
 describe('Query String', () => {
 	const fx0 = new Fixture('query-string?foo=[foo]&bar=[bar].GET.200.json')