mockaton 8.3.0 → 8.3.2

package/README.md

@@ -51,7 +51,7 @@ import { Mockaton } from 'mockaton'
 
 // See the Config section for more options
 Mockaton({
-  mocksDir: resolve('my-mocks-dir'),
+  mocksDir: resolve('my-mocks-dir'), // must exist
   port: 2345
 })
 ```
@@ -296,9 +296,13 @@ On the other hand, newly saved mocks get overwritten while they are unregistered
 <details>
   <summary>Extension Details</summary>
 <p>
-If you see an <code>.unknown</code> extension, that’s because the
-<code>Content-Type</code> sent by your backend is either missing or not present
-in the predefined list. For the latter, add it to <code>config.extraMimes</code>
+An <code>.empty</code> extension means the <code>Content-Type</code>
+header was not sent by your backend.
+</p>
+
+<p>
+An <code>.unknown</code> extension means the <code>Content-Type</code> is not in
+Mockaton’s predefined list. For that, you can add it to <code>config.extraMimes</code>
 </p>
 </details>
 
@@ -494,7 +498,3 @@ await mockaton.reset()
   <img src="./sample-mocks/api/user/avatar.GET.200.png" width="170"/>
   <p style="font-size: 18px">“Use Mockaton”</p>
 </div>
-
-
-## TODO
-- Refactor Tests

package/TODO.md

@@ -0,0 +1,7 @@
+# TODO
+
+- Refactor tests
+- Rename 'Reset' to 'Reload'
+- Add Collect Proxied checkbox to the dashboard
+- Subscribe button for newly added mocks
+  - or perhaps registering them automatically without full reset?

package/package.json

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

package/src/MockDispatcher.js

@@ -5,7 +5,7 @@ import { cookie } from './cookie.js'
 import { Config } from './Config.js'
 import { applyPlugins } from './MockDispatcherPlugins.js'
 import * as mockBrokerCollection from './mockBrokersCollection.js'
-import { JsonBodyParserError } from './utils/http-request.js'
+import { BodyReaderError } from './utils/http-request.js'
 import { sendInternalServerError, sendNotFound, sendBadRequest } from './utils/http-response.js'
 
 
@@ -37,7 +37,7 @@ export async function dispatchMock(req, response) {
 		setTimeout(() => response.end(body), broker.delay)
 	}
 	catch (error) {
-		if (error instanceof JsonBodyParserError)
+		if (error instanceof BodyReaderError)
 			sendBadRequest(response, error)
 		else if (error.code === 'ENOENT') // mock-file has been deleted
 			sendNotFound(response)

package/src/Mockaton.test.js

@@ -9,6 +9,7 @@ import { writeFileSync, mkdtempSync, mkdirSync } from 'node:fs'
 import { Config } from './Config.js'
 import { mimeFor } from './utils/mime.js'
 import { Mockaton } from './Mockaton.js'
+import { readBody } from './utils/http-request.js'
 import { Commander } from './Commander.js'
 import { parseFilename } from './Filename.js'
 import { CorsHeader } from './utils/http-cors.js'
@@ -421,19 +422,28 @@ async function testInvalidFilenamesAreIgnored() {
 
 async function testEnableFallbackSoRoutesWithoutMocksGetRelayed() {
 	await describe('Fallback', async () => {
-		const fallbackServer = createServer((_, response) => {
-			response.setHeader('custom_header', 'my_custom_header')
-			response.statusCode = 423
-			response.end('From_Fallback_Server')
+		const fallbackServer = createServer(async (req, response) => {
+			response.writeHead(423, {
+				'custom_header': 'my_custom_header',
+				'set-cookie': [
+					'cookieA=A',
+					'cookieB=B'
+				]
+			})
+			response.end(await readBody(req)) // echoes they req body payload
 		})
 		await promisify(fallbackServer.listen).bind(fallbackServer, 0, '127.0.0.1')()
 
 		await commander.setProxyFallback(`http://localhost:${fallbackServer.address().port}`)
 		await it('Relays to fallback server', async () => {
-			const res = await request('/non-existing-mock')
-			equal(res.headers.get('custom_header'), 'my_custom_header')
+			const res = await request('/non-existing-mock', {
+				method: 'POST',
+				body: 'text_body'
+			})
 			equal(res.status, 423)
-			equal(await res.text(), 'From_Fallback_Server')
+			equal(res.headers.get('custom_header'), 'my_custom_header')
+			equal(res.headers.get('set-cookie'), ['cookieA=A', 'cookieB=B'].join(', '))
+			equal(await res.text(), 'text_body')
 			fallbackServer.close()
 		})
 	})

package/src/ProxyRelay.js

@@ -2,16 +2,22 @@ import { join } from 'node:path'
 import { write } from './utils/fs.js'
 import { Config } from './Config.js'
 import { extFor } from './utils/mime.js'
+import { readBody } from './utils/http-request.js'
 import { makeMockFilename } from './Filename.js'
 
 
 export async function proxy(req, response) {
 	const proxyResponse = await fetch(Config.proxyFallback + req.url, {
 		method: req.method,
-		headers: req.headers
+		headers: req.headers,
+		body: req.method === 'GET' || req.method === 'HEAD'
+			? undefined
+			: await readBody(req)
 	})
-	// TODO investigate how to include many repeated headers such as set-cookie
-	response.writeHead(proxyResponse.status, Object.fromEntries(proxyResponse.headers))
+
+	const headers = Object.fromEntries(proxyResponse.headers)
+	headers['set-cookie'] = proxyResponse.headers.getSetCookie() // parses multiple into an array
+	response.writeHead(proxyResponse.status, headers)
 	const body = await proxyResponse.text()
 	response.end(body)
 

package/src/utils/http-request.js

@@ -3,10 +3,11 @@ export const StandardMethods = [
 	'HEAD', 'OPTIONS', 'TRACE', 'CONNECT'
 ]
 
+export class BodyReaderError extends Error {}
 
-export class JsonBodyParserError extends Error {}
+export const parseJSON = req => readBody(req, JSON.parse)
 
-export function parseJSON(req) {
+export function readBody(req, parser = a => a) {
 	return new Promise((resolve, reject) => {
 		const MAX_BODY_SIZE = 200 * 1024
 		const expectedLength = req.headers['content-length'] | 0
@@ -29,13 +30,13 @@ export function parseJSON(req) {
 			req.removeListener('end', onEnd)
 			req.removeListener('error', onEnd)
 			if (lengthSoFar !== expectedLength)
-				reject(new JsonBodyParserError())
+				reject(new BodyReaderError())
 			else
 				try {
-					resolve(JSON.parse(Buffer.concat(body).toString()))
+					resolve(parser(Buffer.concat(body).toString()))
 				}
 				catch (_) {
-					reject(new JsonBodyParserError())
+					reject(new BodyReaderError())
 				}
 		}
 	})

package/src/utils/mime.js

@@ -89,19 +89,13 @@ const mimes = {
 
 export function mimeFor(filename) {
 	const ext = filename.replace(/.*\./, '').toLowerCase()
-	const mime = Config.extraMimes[ext] || mimes[ext] || ''
-	if (!mime)
-		console.info(`Missing MIME for ${filename}`)
-	return mime
+	return Config.extraMimes[ext] || mimes[ext] || ''
 }
 
 export function extFor(mime) {
-	const ext = findExt(mime)
-	if (!ext) {
-		console.info(`Missing extension for ${mime}`)
-		return EXT_FOR_UNKNOWN_MIME
-	}
-	return ext
+	return mime
+		? findExt(mime)
+		: 'empty'
 }
 
 function findExt(targetMime) {
@@ -111,5 +105,5 @@ function findExt(targetMime) {
 	for (const [ext, mime] of Object.entries(mimes))
 		if (targetMime === mime)
 			return ext
-	return ''
+	return EXT_FOR_UNKNOWN_MIME
 }