mockaton 6.3.5 → 6.3.7

package/Tests.js

@@ -9,7 +9,8 @@ import { equal, deepEqual, match } from 'node:assert/strict'
 import { writeFileSync, mkdtempSync, mkdirSync } from 'node:fs'
 
 import { Route } from './src/Route.js'
-import { mimeFor } from './src/mime.js'
+import { Config } from './src/Config.js'
+import { mimeFor } from './src/utils/mime.js'
 import { Mockaton } from './src/Mockaton.js'
 import { API, DF, DEFAULT_500_COMMENT } from './src/ApiConstants.js'
 
@@ -51,6 +52,14 @@ const fixtures = [
 		'/api/alternative',
 		'api/alternative(comment-1).GET.200.json',
 		'With_Comment_1'
+	], [
+		'/api/dot.in.path',
+		'api/dot.in.path.GET.200.json',
+		'Dot_in_Path'
+	], [
+		'/api/space & colon:',
+		'api/space & colon:.GET.200.json',
+		'Decodes URI'
 	],
 
 
@@ -115,6 +124,7 @@ writeStatic('another-entry/index.html', '<h1>Another</h1>')
 const server = Mockaton({
 	mocksDir: tmpDir,
 	staticDir: staticTmpDir,
+	delay: 40,
 	onReady: () => {},
 	cookies: {
 		userA: 'CookieA',
@@ -209,10 +219,9 @@ async function test404() {
 	})
 }
 
-async function testMockDispatching(url, file, expectedBody, forcedMime = void 0) {
+async function testMockDispatching(url, file, expectedBody, forcedMime = undefined) {
 	const { urlMask, method, status } = Route.parseFilename(file)
 	const mime = forcedMime || mimeFor(file)
-	const now = new Date()
 	const res = await request(url, { method })
 	const body = mime === 'application/json'
 		? await res.json()
@@ -222,7 +231,6 @@ async function testMockDispatching(url, file, expectedBody, forcedMime = void 0)
 		it('mime: ' + mime, () => equal(res.headers.get('content-type'), mime))
 		it('status: ' + status, () => equal(res.status, status))
 		it('cookie: ' + mime, () => equal(res.headers.get('set-cookie'), 'CookieA'))
-		it('delay is under 1 sec', () => equal((new Date()).getTime() - now.getTime() < 1000, true))
 		it('extra header', () => equal(res.headers.get('server'), 'MockatonTester'))
 	})
 }
@@ -253,7 +261,7 @@ async function testItUpdatesDelayAndFile(url, file, expectedBody) {
 	const body = await res.text()
 	await describe('url: ' + url, () => {
 		it('body is: ' + expectedBody, () => equal(body, expectedBody))
-		it('delay is over 1 sec', () => equal((new Date()).getTime() - now.getTime() > 1000, true))
+		it('delay', () => equal((new Date()).getTime() - now.getTime() > Config.delay, true))
 	})
 }
 

package/package.json

@@ -2,7 +2,7 @@
 	"name": "mockaton",
 	"description": "A deterministic server-side for developing and testing frontend clients",
 	"type": "module",
-	"version": "6.3.5",
+	"version": "6.3.7",
 	"main": "index.js",
 	"types": "index.d.ts",
 	"license": "MIT",

package/src/MockDispatcher.js

@@ -4,7 +4,7 @@ import { readFileSync } from 'node:fs'
 import { proxy } from './ProxyRelay.js'
 import { cookie } from './cookie.js'
 import { Config } from './Config.js'
-import { mimeFor } from './mime.js'
+import { mimeFor } from './utils/mime.js'
 import * as mockBrokerCollection from './mockBrokersCollection.js'
 import { JsonBodyParserError } from './utils/http-request.js'
 import { sendInternalServerError, sendNotFound, sendBadRequest } from './utils/http-response.js'
@@ -22,7 +22,7 @@ export async function dispatchMock(req, response) {
 
 	try {
 		const { file, status, delay } = broker
-		console.log(req.url, ' → ', file)
+		console.log(decodeURIComponent(req.url), ' → ', file)
 
 		let mockText
 		if (file.endsWith('.js')) {

package/src/Route.js

@@ -26,7 +26,7 @@ export class Route {
 		//   api/foo/[route_id]/suffix => api/foo/.*/suffix
 		// By the same token, the regex handles many trailing
 		// slashes. For instance, for routing api/foo/[id]?qs…
-		return this.#urlRegex.test(removeQueryStringAndFragment(url) + '/')
+		return this.#urlRegex.test(removeQueryStringAndFragment(decodeURIComponent(url)) + '/')
 	}
 
 	// Anything within parentheses in the filename is a comment, including the parentheses.
@@ -46,16 +46,17 @@ export class Route {
 		if (tokens.length < 4)
 			return { error: 'Invalid Filename Convention' }
 
+		const method = tokens.at(-3)
 		const status = Number(tokens.at(-2))
-		if (!responseStatusIsValid(status))
-			return { error: `Invalid HTTP Response Status: "${status}"` }
 
-		const method = tokens.at(-3)
 		if (!httpMethods.includes(method))
 			return { error: `Unrecognized HTTP Method: "${method}"` }
 
+		if (!responseStatusIsValid(status))
+			return { error: `Invalid HTTP Response Status: "${status}"` }
+
 		return {
-			urlMask: '/' + removeTrailingSlash(tokens.at(-4)),
+			urlMask: '/' + removeTrailingSlash(tokens.slice(0, -3).join('.')),
 			method,
 			status
 		}
@@ -73,10 +74,10 @@ function removeQueryStringAndFragment(urlMask) {
 }
 
 function removeTrailingSlash(url = '') {
-	return decodeURIComponent(url
+	return url
 		.replace(/\/$/, '')
 		.replace('/?', '?')
-		.replace('/#', '#'))
+		.replace('/#', '#')
 }
 
 function responseStatusIsValid(status) {

package/src/utils/http-response.js

@@ -1,5 +1,5 @@
 import fs from 'node:fs'
-import { mimeFor } from '../mime.js'
+import { mimeFor } from './mime.js'
 import { isFile, read } from './fs.js'
 
 

package/src/{mime.js → utils/mime.js}

@@ -1,4 +1,4 @@
-import { Config } from './Config.js'
+import { Config } from '../Config.js'
 
 // https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types
 // m = {};