mockaton 0.9.6 → 0.9.8

package/Api.js

@@ -72,8 +72,7 @@ async function updateBroker(req, response) {
 		const broker = mockBrokersCollection.getBrokerByFilename(body[DF.file])
 		if (DF.delayed in body)
 			broker.updateDelay(body[DF.delayed])
-		else
-			broker.updateFile(body[DF.file])
+		broker.updateFile(body[DF.file])
 		sendOK(response)
 	}
 	catch (error) {

package/MockBroker.js

@@ -20,7 +20,6 @@ export class MockBroker {
 		this.mocks = [] // *.json,txt
 		this.currentMock = {
 			file: '',
-			status: 200,
 			delay: 0
 		}
 
@@ -36,10 +35,8 @@ export class MockBroker {
 		else if (file.endsWith('.mjs'))
 			this.transforms.push(file)
 		else {
-			if (!this.mocks.length) {
+			if (!this.mocks.length)
 				this.currentMock.file = file // The first mock file option for a particular route becomes the default
-				this.currentMock.status = Route.parseFilename(file).status
-			}
 			this.mocks.push(file)
 		}
 	}
@@ -47,12 +44,11 @@ export class MockBroker {
 	urlMaskMatches(url) { return this.#route.urlMaskMatches(url) }
 
 	get file() { return this.currentMock.file }
-	get status() { return this.currentMock.status }
 	get delay() { return this.currentMock.delay }
+	get status() { return Route.parseFilename(this.currentMock.file).status }
 
 	updateFile(filename) {
 		this.currentMock.file = filename
-		this.currentMock.status = Route.parseFilename(filename).status
 	}
 
 	updateDelay(delayed) {
@@ -83,24 +79,24 @@ export class MockBroker {
 		return comments
 	}
 
-	ensureItHas501() {
-		if (!this.#has501())
-			this.#write501()
+	ensureItHas500() {
+		if (!this.#has500())
+			this.#write500()
 	}
 
-	#has501() {
+	#has500() {
 		return this.mocks.some(mock =>
-			Route.parseFilename(mock).status === 501)
+			Route.parseFilename(mock).status === 500)
 	}
 
-	#write501() {
+	#write500() {
 		// TODO handle route with transforms but without mocks
 		const { urlMask, method } = Route.parseFilename(this.mocks[0])
 		let mask = urlMask
 		const t = join(Config.mocksDir, urlMask)
 		if (existsSync(t) && lstatSync(t).isDirectory())
 			mask = urlMask + '/'
-		const file = `${mask}.${method}.501.txt`
+		const file = `${mask}.${method}.500.txt`
 		writeFileSync(join(Config.mocksDir, file), '')
 		this.register(file)
 	}

package/MockDispatcher.js

@@ -10,46 +10,45 @@ import { parseJSON, JsonBodyParserError } from './utils/http-request.js'
 import { sendInternalServerError, sendNotFound, sendFile, sendBadRequest } from './utils/http-response.js'
 
 
-function serveDocumentation(req, response) {
-	sendFile(response, join(Config.mocksDir, decodeURIComponent(req.url)))
-}
-
 export async function dispatchMock(req, response) {
+	/* Serve Documentation */
 	if (req.method === 'GET' && req.url.endsWith('.md')) {
-		serveDocumentation(req, response)
+		sendFile(response, join(Config.mocksDir, decodeURIComponent(req.url)))
 		return
 	}
 
 	const mockBroker = MockBrokerCollection.findMatchingBroker(req.method, req.url)
-	if (!mockBroker)
+	if (!mockBroker) {
 		sendNotFound(response)
-	else
-		try {
-			const { file, status, delay, currentTransform } = mockBroker
-			console.log(decodeURIComponent(req.url), '->', file)
+		return
+	}
+	
+	try {
+		const { file, status, delay, currentTransform } = mockBroker
+		console.log('\n', req.url, '→\n ', file)
 
-			response.statusCode = status
-			response.setHeader('content-type', mimeFor(file))
-			if (cookie.getCurrent())
-				response.setHeader('set-cookie', cookie.getCurrent())
+		response.statusCode = status
+		response.setHeader('content-type', mimeFor(file))
+		if (cookie.getCurrent())
+			response.setHeader('set-cookie', cookie.getCurrent())
 
-			let mockAsText = readMock(file)
-			if (mockBroker.currentTransform) {
-				const body = await requestBodyForTransform(req, mockAsText)
-				const transformFunc = await importTransformFunc(currentTransform)
-				mockAsText = transformFunc(mockAsText, body, Config)
-			}
-			setTimeout(() => response.end(mockAsText), delay)
-		}
-		catch (error) {
-			console.error(error)
-			if (error instanceof JsonBodyParserError)
-				sendBadRequest(response)
-			else if (error.code === 'ENOENT')
-				sendNotFound(response) // file has been deleted
-			else
-				sendInternalServerError(response)
+		let mockAsText = readMock(file)
+		if (mockBroker.currentTransform) {
+			const body = await requestBodyForTransform(req, mockAsText)
+			const transformFunc = await importTransformFunc(currentTransform)
+			mockAsText = transformFunc(mockAsText, body, Config)
 		}
+		setTimeout(() => response.end(mockAsText), delay)
+	}
+	catch (error) {
+		console.error(error)
+		if (error instanceof JsonBodyParserError)
+			sendBadRequest(response)
+		else if (error.code === 'ENOENT')
+			sendNotFound(response) // file has been deleted
+		else
+			sendInternalServerError(response)
+	}
 }
 
 const nonSafeMethods = ['PATCH', 'POST', 'PUT', 'DELETE', 'CONNECT']

package/README.md

@@ -1,8 +1,9 @@
 # Mockaton 
 _Mockaton_ is a mock server for developing and testing frontends.
 
-It scans `Config.mocksDir` for files following a specific file name convention, which is
-similar to the URLs. For example, the following file will be served for `/api/user/1234`
+It scans `Config.mocksDir` for files following a specific
+file name convention, which is similar to the URL paths. For
+example, the following file will be served for `/api/user/1234`
 ```
 api/
 api/user/
@@ -22,12 +23,12 @@ Each route can have many mocks, which could either be:
 Those alternatives can be manually selected in the dashboard
 UI, or programmatically, for instance, for setting up tests.
 
-About the mock precedence, the first file in **alphabetical order** wins.
+About the default mock file, the first file in **alphabetical order** wins.
 
 
 ## Getting Started
 The best way to learn _Mockaton_ is by checking out this repo and
-exploring its [sample-mocks/](./sample-mocks) directory. Then run
+exploring its [sample-mocks/](./sample-mocks) directory. Then, run
 [`./_usage_example.js`](./_usage_example.js) and you’ll see this dashboard:
 
 ![](./README-dashboard.png)
@@ -38,8 +39,8 @@ The **sample-mocks/** directory has three mock alternatives for serving
 `/api/user/friends`:
 - _200 - OK_
 - _204 - No Content_ with an empty list of friends
-- _501 - Internal Server Error_
-	- BTW, 501 mocks get autogenerated for routes that have no 501’s.
+- _500 - Internal Server Error_
+	- BTW, 500 mocks get autogenerated for routes that have no 500’s.
 
 ![](./README-dashboard-dropdown.png)
 
@@ -48,7 +49,7 @@ Comments are anything within parentheses, including them.
 ![](./README-mocks-with-comments.png)
 
 ## Delay 🕓
-The clock icon next to the mock selector dropdown is a checkbox for delaying a
+The clock icon next to the mock selector is a checkbox for delaying a
 particular response. They are handy for testing spinners.
 
 The milliseconds for the delay is globally configurable via `Config.delay = 1200`
@@ -136,13 +137,13 @@ api/foo.GET.200.json
 ```
 api/video?limit=[limit].GET.200.json
 ```
-The query string behaves like comments in the sense it’s
-only used for documenting the URL API contract.
+The query string behaves like comments in the sense it’s only used for documenting
+the URL API contract. In other words, the query string is ignored when routing to it.
 
-In other words, the query string is ignored when routing to it. BTW, in Windows,
-filenames containing "?" are not permitted, but they are ignored anyway.
+BTW, in Windows, filenames containing "?" are [not
+permitted](https://learn.microsoft.com/en-us/windows/win32/fileio/naming-a-file),
+but since that’s part of the query string, it’s ignored anyway.
 
-https://learn.microsoft.com/en-us/windows/win32/fileio/naming-a-file
 
 
 ### Default (index-like) file
@@ -194,15 +195,6 @@ PATCH /mockaton/edit
 ---
 
 ### `/mockaton/bulk-select` Select all mocks that have a particular comment
-Many mocks can be changed at once. We do that by searching the
-comments on the filename. For example, `api/foo(demo-a).GET.200.json`
-
-Non-matching mocks are ignored. For instance, if for a
-particular API there is only `demo-a` and `demo-b`, changing to
-`demo-c` will preserve the last one that was successfully set.
-
-Similarly, if there’s no demo mock at all for
-a route, the first dev mock (a-z) will be served.
 
 ```
 PATCH /mockaton/bulk-select
@@ -220,7 +212,8 @@ PATCH /mockaton/reset
 ---
 
 ### `/mockaton/cookies` Select a cookie
-In `Config.cookies`, each key is a label used to change them.
+In `Config.cookies`, each key is the label used
+for changing it. Only one cookie can be set.
 ```
 PATCH /mockaton/cookies
 {
@@ -229,8 +222,7 @@ PATCH /mockaton/cookies
 ```
 
 ### `/mockaton/cookies` List Cookies
-Sends a list of the cookie labels (keys) and
-along with a flag indicated if it’s the selected.
+Sends a list of the available cookies along with a flag indicated if it’s the selected.
 ```
 GET /mockaton/cookies
 ```

package/Route.js

@@ -45,20 +45,18 @@ export class Route {
 	static parseFilename(file) {
 		const tokens = file.replace(Route.reComments, '').split('.')
 
-		let error = ''
 		if (tokens.length < 4)
-			error = 'Invalid Filename Convention'
-
-		const method = tokens.at(-3)
-		if (!httpMethods.includes(method))
-			error = `Unrecognized HTTP Method: "${method}"`
+			return { error: 'Invalid Filename Convention' }
 
 		const status = Number(tokens.at(-2))
 		if (!responseStatusIsValid(status))
-			error = `Invalid HTTP Response Status: "${status}"`
+			return { error: `Invalid HTTP Response Status: "${status}"` }
+
+		const method = tokens.at(-3)
+		if (!httpMethods.includes(method))
+			return { error: `Unrecognized HTTP Method: "${method}"` }
 
 		return {
-			error,
 			urlMask: '/' + removeTrailingSlash(tokens.at(-4)),
 			method,
 			status

package/Tests.js

@@ -90,15 +90,10 @@ const fixtures = [
 for (const [, file, body] of fixtures)
 	write(file, file.endsWith('.json') ? JSON.stringify(body) : body)
 
-write('api/.GET.501.txt', 'keeps non-autogenerated 501')
+write('api/.GET.500.txt', 'keeps non-autogenerated 500')
 write('api/alternative(comment-2).GET.200.json', JSON.stringify({ comment: 2 }))
 write('api/my-route(comment-2).GET.200.json', JSON.stringify({ comment: 2 }))
 
-// These files ensure the server doesn’t crash. We don’t test their console.error 
-write('api/bad-filename.200.json', 'missing method')
-write('api/bad-filename.GET.200', 'missing extension')
-write('api/bad-filename.GET.json', 'missing response status')
-
 writeStatic('index.html', '<h1>Static</h1>')
 writeStatic('assets/app.js', 'const app = 1')
 writeStatic('another-entry/index.html', '<h1>Another</h1>')
@@ -123,16 +118,17 @@ async function runTests() {
 
 	await testItUpdatesDelayAndFile(
 		'/api/alternative',
-		'api/alternative(comment-1).GET.200.json')
+		'api/alternative(comment-2).GET.200.json',
+		JSON.stringify({ comment: 2 }))
 
-	await testAutogenerates501(
+	await testAutogenerates500(
 		'/api/company-e/123?limit=9',
-		'api/company-e/[id]?limit=[limit].GET.501.txt')
+		'api/company-e/[id]?limit=[limit].GET.500.txt')
 
-	await testPreservesExiting501(
+	await testPreservesExiting500(
 		'/api',
-		'api/.GET.501.txt',
-		'keeps non-autogenerated 501')
+		'api/.GET.500.txt',
+		'keeps non-autogenerated 500')
 
 	await reset()
 	await testItUpdatesTheCurrentSelectedMock(
@@ -148,12 +144,10 @@ async function runTests() {
 		'(this is the actual comment)',
 		'(another comment)'
 	])
-	await testItBulkSelectsByComment('(comment-2)',
-		[
-			['/api/alternative', 'api/alternative(comment-2).GET.200.json', { comment: 2 }],
-			['/api/my-route', 'api/my-route(comment-2).GET.200.json', { comment: 2 }]
-		]
-	)
+	await testItBulkSelectsByComment('(comment-2)', [
+		['/api/alternative', 'api/alternative(comment-2).GET.200.json', { comment: 2 }],
+		['/api/my-route', 'api/my-route(comment-2).GET.200.json', { comment: 2 }]
+	])
 
 	await reset()
 	for (const [url, file, body] of fixtures)
@@ -161,9 +155,8 @@ async function runTests() {
 
 	await testItUpdatesUserRole()
 	await testTransforms()
-
 	await testStaticFileServing()
-
+	await testInvalidFilenamesAreIgnored()
 	server.close()
 }
 
@@ -208,7 +201,7 @@ async function testItUpdatesTheCurrentSelectedMock(url, file, expectedStatus, ex
 	})
 }
 
-async function testItUpdatesDelayAndFile(url, file) {
+async function testItUpdatesDelayAndFile(url, file, expectedBody) {
 	await request(DP.edit, {
 		method: 'PATCH',
 		body: JSON.stringify({
@@ -217,35 +210,38 @@ async function testItUpdatesDelayAndFile(url, file) {
 		})
 	})
 	const now = new Date()
-	await request(url)
-	await describe('url: ' + url, () =>
-		it('delay is over 1 sec', () => equal((new Date()).getTime() - now.getTime() > 1000, true)))
+	const res = await request(url)
+	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))
+	})
 }
 
 
-async function testAutogenerates501(url, file) {
+async function testAutogenerates500(url, file) {
 	await request(DP.edit, {
 		method: 'PATCH',
 		body: JSON.stringify({ [DF.file]: file })
 	})
 	const res = await request(url)
 	const body = await res.text()
-	await describe('autogenerated 501', () => {
+	await describe('autogenerated 500', () => {
 		it('body is empty', () => equal(body, ''))
-		it('status is: 501', () => equal(res.status, 501))
+		it('status is: 500', () => equal(res.status, 500))
 	})
 }
 
-async function testPreservesExiting501(url, file, expectedBody) {
+async function testPreservesExiting500(url, file, expectedBody) {
 	await request(DP.edit, {
 		method: 'PATCH',
 		body: JSON.stringify({ [DF.file]: file })
 	})
 	const res = await request(url)
 	const body = await res.text()
-	await describe('preserves existing 501', () => {
+	await describe('preserves existing 500', () => {
 		it('body is empty', () => equal(body, expectedBody))
-		it('status is: 501', () => equal(res.status, 501))
+		it('status is: 500', () => equal(res.status, 500))
 	})
 }
 
@@ -259,9 +255,7 @@ async function testExtractsAllComments(expected) {
 async function testItBulkSelectsByComment(comment, tests) {
 	await request(DP.bulkSelect, {
 		method: 'PATCH',
-		body: JSON.stringify({
-			[DF.comment]: comment
-		})
+		body: JSON.stringify({ [DF.comment]: comment })
 	})
 	for (const [url, file, body] of tests)
 		await testMockDispatching(url, file, body)
@@ -305,9 +299,7 @@ export default function (mock, reqBody, config) {
 		await reset() // for registering the files
 		await request(DP.transform, {
 			method: 'PATCH',
-			body: JSON.stringify({
-				[DF.file]: 'api/transform.POST.200.mjs'
-			})
+			body: JSON.stringify({ [DF.file]: 'api/transform.POST.200.mjs' })
 		})
 		await testMockDispatching('/api/transform',
 			'api/transform.POST.200.json',
@@ -342,6 +334,22 @@ async function testStaticFileServing() {
 	})
 }
 
+async function testInvalidFilenamesAreIgnored() {
+	await it('Invalid filenames get skipped, so they don’t crash the server', async (t) => {
+		const consoleErrorSpy = t.mock.method(console, 'error')
+		consoleErrorSpy.mock.mockImplementation(() => {}) // so they don’t render in the test report
+		
+		// An extension is needed for testing because of `Config.allowedExt`
+		write('api/_INVALID_FILENAME_CONVENTION_.json', '')
+		write('api/bad-filename.GET._INVALID_STATUS_.json', '')
+		write('api/bad-filename._INVALID_METHOD_.200.json', '')
+		await reset()
+		equal(consoleErrorSpy.mock.calls[0].arguments[0], 'Invalid Filename Convention')
+		equal(consoleErrorSpy.mock.calls[1].arguments[0], 'Invalid HTTP Response Status: "NaN"')
+		equal(consoleErrorSpy.mock.calls[2].arguments[0], 'Unrecognized HTTP Method: "_INVALID_METHOD_"')
+	})
+}
+
 
 // Utils
 

package/mockBrokersCollection.js

@@ -35,14 +35,13 @@ export function init() {
 				collection[method][urlMask].register(file)
 		}
 	}
-	forEachBroker(broker => broker.ensureItHas501())
+	forEachBroker(broker => broker.ensureItHas500())
 }
 
 export const getAll = () => collection
-export const getBroker = (method, urlMask) => collection[method][urlMask]
 export const getBrokerByFilename = file => {
 	const { method, urlMask } = Route.parseFilename(file)
-	return getBroker(method, urlMask)
+	return collection[method][urlMask]
 }
 
 

package/package.json

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

package/sample-mocks/api/user/.GET.500.txt

@@ -0,0 +1,7 @@
+This is a plain text response for (/api/user). 
+
+In this case, it’s for mocking up a 500 - Internal Server Error.
+
+This file could have been empty, or some JSON if it had a `.json` extension.
+
+By the way, on initialization an 500 is auto-generated for routes that don’t have a 500.

package/sample-mocks/api/user/.GET.501.txt

@@ -1,7 +0,0 @@
-This is a plain text response for (/api/user). 
-
-In this case, it’s for mocking up a 501 - Internal Server Error.
-
-This file could have been empty, or some JSON if it had a `.json` extension.
-
-By the way, on initialization an 501 is auto-generated for routes that don’t have a 501.