mockaton 5.0.2 → 5.0.3

package/package.json

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

package/src/Api.js

@@ -31,21 +31,12 @@ export const apiPatchRequests = new Map([
 	[API.bulkSelect, bulkUpdateBrokersByCommentTag]
 ])
 
-function serveDashboard(_, response) {
-	sendFile(response, join(import.meta.dirname, 'Dashboard.html'))
-}
-function serveDashboardAsset(req, response) {
-	sendFile(response, join(import.meta.dirname, req.url))
-}
-function listCookies(_, response) {
-	sendJSON(response, cookie.list())
-}
-function listComments(_, response) {
-	sendJSON(response, mockBrokersCollection.extractAllComments())
-}
-function listMockBrokers(_, response) {
-	sendJSON(response, mockBrokersCollection.getAll())
-}
+function serveDashboard(_, response) { sendFile(response, join(import.meta.dirname, 'Dashboard.html')) }
+function serveDashboardAsset(req, response) { sendFile(response, join(import.meta.dirname, req.url)) }
+
+function listCookies(_, response) { sendJSON(response, cookie.list()) }
+function listComments(_, response) { sendJSON(response, mockBrokersCollection.extractAllComments()) }
+function listMockBrokers(_, response) { sendJSON(response, mockBrokersCollection.getAll()) }
 
 
 function reinitialize(_, response) {

package/src/Config.js

@@ -1,5 +1,6 @@
 import { openInBrowser } from './utils/openInBrowser.js'
-import { validate, is, optional, isDirectory } from './utils/validate.js'
+import { validate, is, optional } from './utils/validate.js'
+import { isDirectory } from './utils/fs.js'
 
 
 export const Config = {

package/src/MockBroker.js

@@ -1,8 +1,7 @@
 import { join } from 'node:path'
-import { existsSync, lstatSync } from 'node:fs'
-
 import { Route } from './Route.js'
 import { Config } from './Config.js'
+import { isDirectory } from './utils/fs.js'
 import { DEFAULT_500_COMMENT } from './ApiConstants.js'
 
 
@@ -80,8 +79,7 @@ export class MockBroker {
 	#registerTemp500() {
 		const { urlMask, method } = Route.parseFilename(this.mocks[0] || this.documentation)
 		let mask = urlMask
-		const t = join(Config.mocksDir, urlMask)
-		if (existsSync(t) && lstatSync(t).isDirectory())
+		if (isDirectory(join(Config.mocksDir, urlMask)))
 			mask = urlMask + '/'
 		mask = mask.replace(/^\//, '') // remove initial slash
 		const file = `${mask}${DEFAULT_500_COMMENT}.${method}.500.txt`

package/src/StaticDispatcher.js

@@ -1,28 +1,29 @@
 import { join } from 'node:path'
-import { existsSync as exists, lstatSync as lstat } from 'node:fs'
-
 import { Config } from './Config.js'
-import { sendFile, sendPartialContent } from './utils/http-response.js'
+import { isDirectory, isFile } from './utils/fs.js'
+import { sendFile, sendPartialContent, sendNotFound } from './utils/http-response.js'
 
 
 export function isStatic(req) {
-	return Config.staticDir && exists(resolvePath(req))
+	return Config.staticDir && resolvePath(req)
 }
 
 export async function dispatchStatic(req, response) {
 	const file = resolvePath(req)
-	if (req.headers.range)
+	if (!file)
+		sendNotFound(response)
+	else if (req.headers.range)
 		await sendPartialContent(response, req.headers.range, file)
 	else
 		sendFile(response, file)
 }
 
 function resolvePath(req) {
-	const candidate = join(Config.staticDir, req.url)
-	if (exists(candidate))
-		return lstat(candidate).isDirectory()
-			? candidate + '/index.html'
-			: candidate
+	let candidate = join(Config.staticDir, req.url)
+	if (isDirectory(candidate))
+		candidate += '/index.html'
+	if (isFile(candidate))
+		return candidate
 }
 
 

package/src/mockBrokersCollection.js

@@ -1,9 +1,10 @@
 import { join } from 'node:path'
-import { readdirSync as readDir, lstatSync } from 'node:fs'
+import { readdirSync as readDir } from 'node:fs'
 
 import { Route } from './Route.js'
 import { Config } from './Config.js'
 import { cookie } from './cookie.js'
+import { isFile } from './utils/fs.js'
 import { MockBroker } from './MockBroker.js'
 
 
@@ -24,7 +25,7 @@ export function init() {
 	cookie.init(Config.cookies)
 
 	const files = readDir(Config.mocksDir, { recursive: true })
-		.filter(f => Config.allowedExt.test(f) && lstatSync(join(Config.mocksDir, f)).isFile())
+		.filter(f => Config.allowedExt.test(f) && isFile(join(Config.mocksDir, f)))
 		.sort()
 
 	for (const file of files) {

package/src/utils/fs.js

@@ -0,0 +1,7 @@
+import { lstatSync, readFileSync } 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)

package/src/utils/http-response.js

@@ -1,5 +1,6 @@
-import fs, { existsSync, readFileSync } from 'node:fs'
+import fs from 'node:fs'
 import { mimeFor } from './mime.js'
+import { isFile, read } from './fs.js'
 
 
 export function sendOK(response) {
@@ -7,17 +8,17 @@ export function sendOK(response) {
 }
 
 export function sendJSON(response, payload) {
-	response.setHeader('content-type', 'application/json')
+	response.setHeader('Content-Type', 'application/json')
 	response.end(JSON.stringify(payload))
 }
 
 export function sendFile(response, file) {
-	if (!existsSync(file))
+	if (!isFile(file))
 		sendNotFound(response)
 	else {
-		response.setHeader('content-type', mimeFor(file))
-		response.end(readFileSync(file))
-	}	
+		response.setHeader('Content-Type', mimeFor(file))
+		response.end(read(file))
+	}
 }
 
 export async function sendPartialContent(response, range, file) {
@@ -28,14 +29,14 @@ export async function sendPartialContent(response, range, file) {
 
 	if (start < 0 || start > end || start >= size || end >= size) {
 		response.statusCode = 416 // Range Not Satisfiable
-		response.setHeader('content-range', `bytes */${size}`)
+		response.setHeader('Content-Range', `bytes */${size}`)
 		response.end()
 	}
 	else {
 		response.statusCode = 206 // Partial Content
-		response.setHeader('accept-ranges', 'bytes')
-		response.setHeader('content-range', `bytes ${start}-${end}/${size}`)
-		response.setHeader('content-type', mimeFor(file))
+		response.setHeader('Accept-Ranges', 'bytes')
+		response.setHeader('Content-Range', `bytes ${start}-${end}/${size}`)
+		response.setHeader('Content-Type', mimeFor(file))
 		const reader = fs.createReadStream(file, { start, end })
 		reader.on('open', function () {
 			this.pipe(response)

package/src/utils/validate.js

@@ -1,6 +1,3 @@
-import { existsSync as exists, lstatSync } from 'node:fs'
-
-
 export function validate(obj, shape) {
 	for (const [field, value] of Object.entries(obj))
 		if (!shape[field](value))
@@ -9,4 +6,3 @@ export function validate(obj, shape) {
 
 export const is = ctor => val => val.constructor === ctor
 export const optional = tester => val => !val || tester(val)
-export const isDirectory = dir => exists(dir) && lstatSync(dir).isDirectory()