mockaton 10.5.3 → 10.5.4

package/package.json

@@ -2,7 +2,7 @@
 	"name": "mockaton",
 	"description": "HTTP Mock Server",
 	"type": "module",
-	"version": "10.5.3",
+	"version": "10.5.4",
 	"main": "index.js",
 	"types": "index.d.ts",
 	"license": "MIT",

package/src/MockDispatcher.js

@@ -8,7 +8,7 @@ import { cookie } from './cookie.js'
 import { mimeFor } from './utils/mime.js'
 import { config, calcDelay } from './config.js'
 import * as mockBrokerCollection from './mockBrokersCollection.js'
-import { sendInternalServerError, sendNotFound } from './utils/http-response.js'
+import { sendInternalServerError, sendMockNotFound } from './utils/http-response.js'
 
 
 export async function dispatchMock(req, response) {
@@ -21,23 +21,22 @@ export async function dispatchMock(req, response) {
 			if (config.proxyFallback)
 				await proxy(req, response, broker?.delayed ? calcDelay() : 0)
 			else
-				sendNotFound(response)
+				sendMockNotFound(response)
 			return
 		}
 
-		logger.accessMock(req.url, broker.file)
-		response.statusCode = broker.status
-
 		if (cookie.getCurrent())
 			response.setHeader('Set-Cookie', cookie.getCurrent())
 
 		for (let i = 0; i < config.extraHeaders.length; i += 2)
 			response.setHeader(config.extraHeaders[i], config.extraHeaders[i + 1])
 
+		response.statusCode = broker.status // TESTME plugins can change it
 		const { mime, body } = broker.temp500IsSelected
 			? { mime: '', body: '' }
 			: await applyPlugins(join(config.mocksDir, broker.file), req, response)
 
+		logger.accessMock(req.url, broker.file)
 		response.setHeader('Content-Type', mime)
 		response.setHeader('Content-Length', length(body))
 		setTimeout(() => response.end(isHead ? null : body),
@@ -45,7 +44,7 @@ export async function dispatchMock(req, response) {
 	}
 	catch (error) {
 		if (error?.code === 'ENOENT') // mock-file has been deleted
-			sendNotFound(response)
+			sendMockNotFound(response)
 		else
 			sendInternalServerError(response, error)
 	}

package/src/StaticDispatcher.js

@@ -5,7 +5,9 @@ import { logger } from './utils/logger.js'
 import { mimeFor } from './utils/mime.js'
 import { brokerByRoute } from './staticCollection.js'
 import { config, calcDelay } from './config.js'
-import { sendNotFound, sendPartialContent } from './utils/http-response.js'
+import { sendMockNotFound, sendPartialContent } from './utils/http-response.js'
+import { execFileSync } from 'node:child_process'
+import { isFile } from './utils/fs.js'
 
 
 export async function dispatchStatic(req, response) {
@@ -13,14 +15,17 @@ export async function dispatchStatic(req, response) {
 
 	setTimeout(async () => {
 		if (!broker || broker.status === 404) { // TESTME
-			logger.accessMock(req.url, 'static404')
-			sendNotFound(response)
+			sendMockNotFound(response)
 			return
 		}
 
-		logger.accessMock(req.url, 'static200')
-
 		const file = join(config.staticDir, broker.route)
+		if (!isFile(file)) {
+			sendMockNotFound(response) // TESTME
+			return
+		}
+		
+		logger.accessMock(req.url, 'static200')
 		if (req.headers.range)
 			await sendPartialContent(response, req.headers.range, file)
 		else {

package/src/Watcher.js

@@ -3,24 +3,24 @@ import { watch } from 'node:fs'
 import { EventEmitter } from 'node:events'
 
 import { config } from './config.js'
-import { isFile } from './utils/fs.js'
+import { isFile, isDirectory } from './utils/fs.js'
+import * as staticCollection from './staticCollection.js'
 import * as mockBrokerCollection from './mockBrokersCollection.js'
-import { registerStaticMock, unregisterStaticMock } from './staticCollection.js'
 
 
-/** # AR = Add or Remove Mock Event */
+/** # ARR = Add, Remove, or Rename Mock Event */
 export const uiSyncVersion = new class extends EventEmitter {
 	version = 0
 
 	increment() {
 		this.version++
-		super.emit('AR')
+		super.emit('ARR')
 	}
 	subscribe(listener) {
-		this.once('AR', listener)
+		this.once('ARR', listener)
 	}
 	unsubscribe(listener) {
-		this.removeListener('AR', listener)
+		this.removeListener('ARR', listener)
 	}
 }
 
@@ -29,7 +29,16 @@ export function watchMocksDir() {
 	watch(dir, { recursive: true, persistent: false }, (_, file) => {
 		if (!file)
 			return
-		if (isFile(join(dir, file))) {
+		
+		const path = join(dir, file)
+
+		if (isDirectory(path)) {
+			mockBrokerCollection.init()
+			uiSyncVersion.increment()
+			return
+		}
+
+		if (isFile(path)) {
 			if (mockBrokerCollection.registerMock(file, Boolean('isFromWatcher')))
 				uiSyncVersion.increment()
 		}
@@ -47,12 +56,21 @@ export function watchStaticDir() {
 	watch(dir, { recursive: true, persistent: false }, (_, file) => {
 		if (!file)
 			return
-		if (isFile(join(dir, file))) {
-			if (registerStaticMock(file))
+		
+		const path = join(dir, file)
+
+		if (isDirectory(path)) {
+			staticCollection.init()
+			uiSyncVersion.increment()
+			return
+		}
+
+		if (isFile(path)) {
+			if (staticCollection.registerMock(file))
 				uiSyncVersion.increment()
 		}
 		else {
-			unregisterStaticMock(file)
+			staticCollection.unregisterMock(file)
 			uiSyncVersion.increment()
 		}
 	})

package/src/staticCollection.js

@@ -23,12 +23,12 @@ export function init() {
 	collection = {}
 	listFilesRecursively(config.staticDir)
 		.sort()
-		.forEach(registerStaticMock)
+		.forEach(registerMock)
 }
 
 
 /** @returns {boolean} registered */
-export function registerStaticMock(relativeFile) {
+export function registerMock(relativeFile) {
 	if (!isFileAllowed(basename(relativeFile)))
 		return false
 
@@ -41,7 +41,7 @@ export function registerStaticMock(relativeFile) {
 }
 
 
-export function unregisterStaticMock(relativeFile) {
+export function unregisterMock(relativeFile) {
 	delete collection['/' + relativeFile]
 }
 

package/src/utils/http-response.js

@@ -41,9 +41,9 @@ export function sendBadRequest(response) {
 	response.end()
 }
 
-export function sendNotFound(response) {
+export function sendMockNotFound(response) {
 	response.statusCode = 404
-	logger.access(response)
+	logger.accessMock(response.req.url, '404')
 	response.end()
 }