mockaton 6.3.8 → 6.3.9

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.9",
 	"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,26 @@ export const includesComment = (filename, search) =>
 	extractComments(filename).some(comment => comment.includes(search))
 
 
-export function parseFilename(file) {
+export function validateFilename(file) {
 	const tokens = file.replace(reComments, '').split('.')
 	if (tokens.length < 4)
-		return { error: 'Invalid Filename Convention' }
-
-	const method = tokens.at(-3)
-	const status = Number(tokens.at(-2))
+		return 'Invalid Filename Convention'
 
-	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/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

@@ -5,7 +5,7 @@ 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 { parseFilename, validateFilename } from './Filename.js'
 
 
 /**
@@ -29,11 +29,12 @@ export function init() {
 		.sort()
 
 	for (const file of files) {
-		const { error, method, urlMask } = parseFilename(file)
+		const error = validateFilename(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)

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
+	}
 }