mockaton 12.7.2 → 13.0.1

package/src/server/cli.test.js

@@ -12,7 +12,7 @@ const cli = (...args) => spawnSync(rel('cli.js'), args, { encoding: 'utf8' })
 describe('CLI', () => {
 	test('invalid flag', () => {
 		const { stderr, status } = cli('--invalid-flag')
-		equal(stderr.trim(), `Unknown option '--invalid-flag'`)
+		equal(stderr.startsWith(`Unknown option '--invalid-flag'`), true)
 		equal(status, 1)
 	})
 
@@ -24,9 +24,8 @@ describe('CLI', () => {
 
 	test('invalid port', () => {
 		const { stderr, status } = cli(
-			'--mocks-dir', rel('../../mockaton-mocks'),
-			'--port', 'not-a-number',
-		)
+			rel('../../mockaton-mocks'),
+			'--port', 'not-a-number')
 		equal(stderr.trim(), `port="not-a-number" is invalid`)
 		equal(status, 1)
 	})
@@ -39,7 +38,7 @@ describe('CLI', () => {
 
 	test('-h outputs usage message', () => {
 		const { stdout, status } = cli('-h')
-		equal(stdout.split('\n')[0], 'Usage: mockaton [options]')
+		equal(stdout.split('\n')[0], 'Usage: mockaton [mocks-dir] [options]')
 		equal(status, 0)
 	})
 

package/src/server/config.js

@@ -7,7 +7,6 @@ import { openInBrowser } from './utils/openInBrowser.js'
 import { optional, is, validate } from './utils/validate.js'
 import { validateCorsAllowedMethods, validateCorsAllowedOrigins } from './utils/http-cors.js'
 
-
 import { jsToJsonPlugin } from './MockDispatcherPlugins.js'
 
 
@@ -19,7 +18,6 @@ import { jsToJsonPlugin } from './MockDispatcherPlugins.js'
  * }} */
 const schema = {
 	mocksDir: [resolve('mockaton-mocks'), isDirectory],
-	staticDir: [resolve('mockaton-static-mocks'), optional(isDirectory)],
 	ignore: [/(\.DS_Store|~)$/, is(RegExp)],
 	watcherEnabled: [true, is(Boolean)],
 	watcherDebounceMs: [80, ms => Number.isInteger(ms) && ms >= 0],
@@ -78,11 +76,6 @@ export function setup(opts) {
 	if (opts.mocksDir)
 		opts.mocksDir = resolve(opts.mocksDir)
 
-	if (opts.staticDir)
-		opts.staticDir = resolve(opts.staticDir)
-	else if (!isDirectory(defaults.staticDir))
-		opts.staticDir = ''
-
 	Object.assign(config, opts)
 	validate(config, ConfigValidator)
 	logger.setLevel(config.logLevel)

package/src/server/mockBrokersCollection.js

@@ -1,12 +1,10 @@
 import { basename } from 'node:path'
 
-import { logger } from './utils/logger.js'
-import { listFilesRecursively } from './utils/fs.js'
-
 import { cookie } from './cookie.js'
 import { MockBroker } from './MockBroker.js'
+import { parseFilename } from '../client/Filename.js'
+import { listFilesRecursively } from './utils/fs.js'
 import { config, isFileAllowed } from './config.js'
-import { parseFilename, validateFilename } from '../client/Filename.js'
 
 
 /**
@@ -42,8 +40,7 @@ export function init() {
 /** @returns {boolean} registered */
 export function registerMock(file, isFromWatcher = false) {
 	if (brokerByFilename(file)?.hasMock(file)
-		|| !isFileAllowed(basename(file))
-		|| !filenameIsValid(file))
+		|| !isFileAllowed(basename(file)))
 		return false
 
 	const { method, urlMask } = parseFilename(file)
@@ -62,13 +59,6 @@ export function registerMock(file, isFromWatcher = false) {
 	return true
 }
 
-function filenameIsValid(file) {
-	const error = validateFilename(file)
-	if (error)
-		logger.warn(error, file)
-	return !error
-}
-
 export function unregisterMock(file) {
 	const broker = brokerByFilename(file)
 	const hasNoMoreMocks = broker?.unregister(file)
@@ -99,6 +89,14 @@ export function brokerByRoute(method, url) {
 	for (let i = brokers.length - 1; i >= 0; i--)
 		if (brokers[i].urlMaskMatches(url))
 			return brokers[i]
+
+	// TODO Verify
+	if (method === 'GET') {
+		const indexUrl = url.endsWith('/') ? url + 'index.html' : url + '/index.html'
+		for (let i = brokers.length - 1; i >= 0; i--)
+			if (brokers[i].urlMaskMatches(indexUrl))
+				return brokers[i]
+	}
 }
 
 export function extractAllComments() {

package/src/server/StaticDispatcher.js

@@ -1,36 +0,0 @@
-import { join } from 'node:path'
-import { readFileSync } from 'node:fs'
-
-import { isFile } from './utils/fs.js'
-import { logger } from './utils/logger.js'
-import { mimeFor } from './utils/mime.js'
-
-import { brokerByRoute } from './staticCollection.js'
-import { config, calcDelay } from './config.js'
-
-
-// TODO HEAD
-export async function dispatchStatic(req, response) {
-	const broker = brokerByRoute(req.url)
-
-	setTimeout(async () => {
-		if (!broker || broker.status === 404) {
-			response.mockNotFound()
-			return
-		}
-
-		const file = join(config.staticDir, broker.route)
-		if (!isFile(file)) {
-			response.mockNotFound()
-			return
-		}
-
-		logger.accessMock(req.url, 'static200')
-		if (req.headers.range)
-			await response.partialContent(req.headers.range, file)
-		else {
-			response.setHeader('Content-Type', mimeFor(file))
-			response.end(readFileSync(file))
-		}
-	}, Number(broker.delayed && calcDelay()))
-}

package/src/server/staticCollection.js

@@ -1,56 +0,0 @@
-import { join, basename } from 'node:path'
-import { listFilesRecursively } from './utils/fs.js'
-import { config, isFileAllowed } from './config.js'
-
-
-class StaticBroker {
-	constructor(route) {
-		this.route = route
-		this.delayed = false
-		this.status = 200 // 200 or 404
-	}
-
-	setDelayed(value) { this.delayed = value }
-	setStatus(value) { this.status = value }
-}
-
-/** @type {{ [route:string]: StaticBroker }} */
-let collection = {}
-
-export const all = () => collection
-
-export function init() {
-	collection = {}
-	listFilesRecursively(config.staticDir)
-		.sort()
-		.forEach(registerMock)
-}
-
-
-/** @returns {boolean} registered */
-export function registerMock(relativeFile) {
-	if (!isFileAllowed(basename(relativeFile)))
-		return false
-
-	const route = '/' + relativeFile
-	if (brokerByRoute(route))
-		return false
-
-	collection[route] = new StaticBroker(route)
-	return true
-}
-
-
-export function unregisterMock(relativeFile) {
-	delete collection['/' + relativeFile]
-}
-
-
-/** @returns {StaticBroker | undefined} */
-export function brokerByRoute(route) {
-	return collection[route] || collection[join(route, 'index.html')]
-}
-
-
-
-