mockaton 6.3.8 → 6.3.10

package/Tests.js

@@ -17,6 +17,7 @@ import { API, DF, DEFAULT_500_COMMENT } from './src/ApiConstants.js'
 
 const tmpDir = mkdtempSync(tmpdir()) + '/'
 const staticTmpDir = mkdtempSync(tmpdir()) + '/'
+console.log(tmpDir)
 
 const fixtureCustomMime = [
 	'/api/custom-mime',
@@ -380,12 +381,12 @@ async function testInvalidFilenamesAreIgnored() {
 		consoleErrorSpy.mock.mockImplementation(() => {}) // so they don’t render in the test report
 
 		write('api/_INVALID_FILENAME_CONVENTION_.json', '')
-		write('api/bad-filename.GET._INVALID_STATUS_.json', '')
-		write('api/bad-filename._INVALID_METHOD_.200.json', '')
+		write('api/bad-filename-method._INVALID_METHOD_.200.json', '')
+		write('api/bad-filename-status.GET._INVALID_STATUS_.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_"')
+		equal(consoleErrorSpy.mock.calls[1].arguments[0], 'Unrecognized HTTP Method: "_INVALID_METHOD_"')
+		equal(consoleErrorSpy.mock.calls[2].arguments[0], 'Invalid HTTP Response Status: "NaN"')
 	})
 }
 

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.8",
+	"version": "6.3.10",
 	"main": "index.js",
 	"types": "index.d.ts",
 	"license": "MIT",

package/src/Api.js

@@ -50,8 +50,7 @@ async function selectCookie(req, response) {
 		sendOK(response)
 	}
 	catch (error) {
-		console.error(error)
-		sendBadRequest(response)
+		sendBadRequest(response, error)
 	}
 }
 
@@ -69,8 +68,7 @@ async function updateBroker(req, response) {
 		sendOK(response)
 	}
 	catch (error) {
-		console.error(error)
-		sendBadRequest(response)
+		sendBadRequest(response, error)
 	}
 }
 
@@ -80,8 +78,7 @@ async function updateProxyFallback(req, response) {
 		sendOK(response)
 	}
 	catch (error) {
-		console.error(error)
-		sendBadRequest(response)
+		sendBadRequest(response, error)
 	}
 }
 
@@ -91,7 +88,6 @@ async function bulkUpdateBrokersByCommentTag(req, response) {
 		sendOK(response)
 	}
 	catch (error) {
-		console.error(error)
-		sendBadRequest(response)
+		sendBadRequest(response, error)
 	}
 }

package/src/Filename.js

@@ -14,24 +14,33 @@ export const includesComment = (filename, search) =>
 	extractComments(filename).some(comment => comment.includes(search))
 
 
-export function parseFilename(file) {
+export function filenameIsValid(file) {
+	const error = validateFilename(file)
+	if (error)
+		console.error(error, file)
+	return !error
+}
+
+function validateFilename(file) {
 	const tokens = file.replace(reComments, '').split('.')
 	if (tokens.length < 4)
-		return { error: 'Invalid Filename Convention' }
+		return 'Invalid Filename Convention'
 
-	const method = tokens.at(-3)
-	const status = Number(tokens.at(-2))
-
-	if (!httpMethods.includes(method))
-		return { error: `Unrecognized HTTP Method: "${method}"` }
+	const { status, method } = parseFilename(file)
 
 	if (!responseStatusIsValid(status))
-		return { error: `Invalid HTTP Response Status: "${status}"` }
+		return `Invalid HTTP Response Status: "${status}"`
 
+	if (!httpMethods.includes(method))
+		return `Unrecognized HTTP Method: "${method}"`
+}
+
+export function parseFilename(file) {
+	const tokens = file.replace(reComments, '').split('.')
 	return {
 		urlMask: '/' + removeTrailingSlash(tokens.slice(0, -3).join('.')),
-		method,
-		status
+		method: tokens.at(-3),
+		status: Number(tokens.at(-2))
 	}
 }
 

package/src/MockBroker.js

@@ -41,7 +41,6 @@ export class MockBroker {
 	get file() { return this.currentMock.file }
 	get delay() { return this.currentMock.delay }
 	get status() { return parseFilename(this.file).status }
-	get isTemp500() { return includesComment(this.file, DEFAULT_500_COMMENT) }
 
 	updateFile(filename) {
 		this.currentMock.file = filename
@@ -78,6 +77,9 @@ export class MockBroker {
 		const file = urlMask.replace(/^\//, '') // Removes leading slash TESTME
 		this.register(`${file}${DEFAULT_500_COMMENT}.${method}.500.txt`)
 	}
+	get isTemp500() {
+		return includesComment(this.file, DEFAULT_500_COMMENT)
+	}
 }
 
 // Stars out (for regex) all the paths that are in square brackets

package/src/MockDispatcher.js

@@ -41,13 +41,12 @@ export async function dispatchMock(req, response) {
 		setTimeout(() => response.end(mockText), delay)
 	}
 	catch (error) {
-		console.error(error)
 		if (error instanceof JsonBodyParserError)
-			sendBadRequest(response)
+			sendBadRequest(response, error)
 		else if (error.code === 'ENOENT')
 			sendNotFound(response) // file has been deleted
 		else
-			sendInternalServerError(response)
+			sendInternalServerError(response, error)
 	}
 }
 

package/src/mockBrokersCollection.js

@@ -1,11 +1,8 @@
-import { join } from 'node:path'
-import { readdirSync as readDir } from 'node:fs'
-
 import { Config } from './Config.js'
 import { cookie } from './cookie.js'
-import { isFile } from './utils/fs.js'
 import { MockBroker } from './MockBroker.js'
-import { parseFilename } from './Filename.js'
+import { listFilesRecursively } from './utils/fs.js'
+import { parseFilename, filenameIsValid } from './Filename.js'
 
 
 /**
@@ -24,16 +21,12 @@ export function init() {
 	collection = {}
 	cookie.init(Config.cookies)
 
-	const files = readDir(Config.mocksDir, { recursive: true })
-		.filter(f => !Config.ignore.test(f) && isFile(join(Config.mocksDir, f)))
+	const files = listFilesRecursively(Config.mocksDir)
 		.sort()
+		.filter(f => !Config.ignore.test(f) && filenameIsValid(f))
 
 	for (const file of files) {
-		const { error, method, urlMask } = parseFilename(file)
-		if (error) {
-			console.error(error, file)
-			continue
-		}
+		const { method, urlMask } = parseFilename(file)
 		collection[method] ??= {}
 		if (!collection[method][urlMask])
 			collection[method][urlMask] = new MockBroker(file)
@@ -74,8 +67,8 @@ export function getBrokerForUrl(method, url) {
 export function extractAllComments() {
 	const comments = new Set()
 	forEachBroker(broker => {
-		for (const comment of broker.extractComments())
-			comments.add(comment)
+		for (const c of broker.extractComments())
+			comments.add(c)
 	})
 	return Array.from(comments)
 }

package/src/utils/fs.js

@@ -1,7 +1,11 @@
-import { lstatSync, readFileSync } from 'node:fs'
+import { join } from 'node:path'
+import { lstatSync, readFileSync, readdirSync } from 'node:fs'
 
 
 export const isFile = path => lstatSync(path, { throwIfNoEntry: false })?.isFile()
 export const isDirectory = path => lstatSync(path, { throwIfNoEntry: false })?.isDirectory()
 
 export const read = path => readFileSync(path)
+
+export const listFilesRecursively = dir => readdirSync(dir, { recursive: true })
+	.filter(f => isFile(join(dir, f)))

package/src/utils/http-response.js

@@ -42,14 +42,14 @@ export async function sendPartialContent(response, range, file) {
 			this.pipe(response)
 		})
 		reader.on('error', function (error) {
-			console.error(error)
-			sendInternalServerError(response)
+			sendInternalServerError(response, error)
 		})
 	}
 }
 
 
-export function sendBadRequest(response) {
+export function sendBadRequest(response, error) {
+	console.error(error);
 	response.statusCode = 400
 	response.end()
 }
@@ -64,7 +64,8 @@ export function sendUnprocessableContent(response) {
 	response.end()
 }
 
-export function sendInternalServerError(response) {
+export function sendInternalServerError(response, error) {
+	console.error(error);
 	response.statusCode = 500
 	response.end()
 }

package/src/utils/openInBrowser.js

@@ -2,7 +2,13 @@ import { exec } from 'node:child_process'
 
 
 export function openInBrowser(address) {
-	if (process.platform === 'darwin')
-		exec(`open ${address}`)
+	switch (process.platform) {
+		case 'darwin':
+			exec(`open ${address}`)
+			break
+		case 'win32': // TESTME
+			exec(`start ${address}`)
+			break
+	}
 }