mockaton 9.4.2 → 9.5.0

package/README.md

@@ -485,11 +485,12 @@ At any rate, you can trigger any command besides opening a browser.
 
 <br/>
 
-### `logLevel?: 'quiet' | 'normal'`
+### `logLevel?: 'quiet' | 'normal' | 'verbose'` 
 Defaults to `'normal'`.
 
 - `quiet`: only errors (stderr)
-- `normal`: info, access, warnings, and errors
+- `normal`: info, mock access, warnings, and errors
+- `verbose`: normal + API access
 
 </details>
 

package/index.d.ts

@@ -17,7 +17,7 @@ interface Config {
 	host?: string,
 	port?: number
 	
-	logLevel?: 'normal' | 'quiet'
+	logLevel?: 'normal' | 'verbose' | 'quiet'
 
 	delay?: number
 	delayJitter?: number

package/lcov.info

@@ -2202,7 +2202,7 @@ DA:75,3
 LH:69
 LF:75
 end_of_record
-SF:src/utils/log.js
+SF:src/utils/logger.js
 FN:2,<instance_members_initializer>
 FN:4,setLevel
 FN:8,info

package/package.json

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

package/src/MockDispatcher.js

@@ -2,7 +2,7 @@ import { join } from 'node:path'
 import { readFileSync } from 'node:fs'
 import { pathToFileURL } from 'node:url'
 
-import { log } from './utils/log.js'
+import { logger } from './utils/logger.js'
 import { proxy } from './ProxyRelay.js'
 import { cookie } from './cookie.js'
 import { mimeFor } from './utils/mime.js'
@@ -25,7 +25,7 @@ export async function dispatchMock(req, response) {
 			return
 		}
 
-		log.access(req.url, broker.file)
+		logger.accessMock(req.url, broker.file)
 		response.statusCode = broker.status
 
 		if (cookie.getCurrent())
@@ -46,11 +46,6 @@ export async function dispatchMock(req, response) {
 	catch (error) {
 		if (error?.code === 'ENOENT') // mock-file has been deleted
 			sendNotFound(response)
-		else if (error?.code === 'ERR_UNKNOWN_FILE_EXTENSION') {
-			if (error.toString().includes('Unknown file extension ".ts'))
-				log.warn('\nLooks like you need a TypeScript compiler\n')
-			sendInternalServerError(response, error)
-		}
 		else
 			sendInternalServerError(response, error)
 	}

package/src/Mockaton.js

@@ -1,6 +1,6 @@
 import { createServer } from 'node:http'
 
-import { log } from './utils/log.js'
+import { logger } from './utils/logger.js'
 import { API } from './ApiConstants.js'
 import { config, setup } from './config.js'
 import { dispatchMock } from './MockDispatcher.js'
@@ -27,8 +27,8 @@ export function Mockaton(options) {
 	server.listen(config.port, config.host, function () {
 		const { address, port } = this.address()
 		const url = `http://${address}:${port}`
-		log.info('Listening', url)
-		log.info('Dashboard', url + API.dashboard)
+		logger.info('Listening', url)
+		logger.info('Dashboard', url + API.dashboard)
 		config.onReady(url + API.dashboard)
 	})
 
@@ -37,7 +37,7 @@ export function Mockaton(options) {
 
 
 async function onRequest(req, response) {
-	response.on('error', log.warn)
+	response.on('error', logger.warn)
 
 	try {
 		response.setHeader('Server', 'Mockaton')

package/src/StaticDispatcher.js

@@ -1,7 +1,7 @@
 import { join } from 'node:path'
 import { readFileSync } from 'node:fs'
 
-import { log } from './utils/log.js'
+import { logger } from './utils/logger.js'
 import { mimeFor } from './utils/mime.js'
 import { brokerByRoute } from './staticCollection.js'
 import { config, calcDelay } from './config.js'
@@ -13,12 +13,12 @@ export async function dispatchStatic(req, response) {
 
 	setTimeout(async () => {
 		if (!broker || broker.status === 404) { // TESTME
-			log.access(req.url, 'static404')
+			logger.accessMock(req.url, 'static404')
 			sendNotFound(response)
 			return
 		}
 
-		log.access(req.url, 'static200')
+		logger.accessMock(req.url, 'static200')
 
 		const file = join(config.staticDir, broker.route)
 		if (req.headers.range)

package/src/config.js

@@ -1,6 +1,6 @@
 import { join, isAbsolute } from 'node:path'
 
-import { log } from './utils/log.js'
+import { logger } from './utils/logger.js'
 import { isDirectory } from './utils/fs.js'
 import { openInBrowser } from './utils/openInBrowser.js'
 import { jsToJsonPlugin } from './MockDispatcher.js'
@@ -23,7 +23,7 @@ const schema = {
 	host: ['127.0.0.1', is(String)],
 	port: [0, port => Number.isInteger(port) && port >= 0 && port < 2 ** 16], // 0 means auto-assigned
 
-	logLevel: ['normal', val => ['normal', 'quiet'].includes(val)],
+	logLevel: ['normal', val => ['normal', 'quiet', 'verbose'].includes(val)],
 
 	delay: [1200, ms => Number.isInteger(ms) && ms >= 0],
 	delayJitter: [0, percent => percent >= 0 && percent <= 3],
@@ -80,7 +80,7 @@ export function setup(options) {
 
 	Object.assign(config, options)
 	validate(config, ConfigValidator)
-	log.setLevel(config.logLevel)
+	logger.setLevel(config.logLevel)
 }
 
 

package/src/mockBrokersCollection.js

@@ -1,6 +1,6 @@
 import { basename } from 'node:path'
 
-import { log } from './utils/log.js'
+import { logger } from './utils/logger.js'
 import { cookie } from './cookie.js'
 import { MockBroker } from './MockBroker.js'
 import { listFilesRecursively } from './utils/fs.js'
@@ -68,7 +68,7 @@ export function registerMock(file, isFromWatcher = false) {
 function filenameIsValid(file) {
 	const error = validateFilename(file)
 	if (error)
-		log.warn(error, file)
+		logger.warn(error, file)
 	return !error
 }
 

package/src/utils/fs.js

@@ -1,6 +1,6 @@
 import { join, dirname, sep, posix } from 'node:path'
 import { lstatSync, readdirSync, writeFileSync, mkdirSync } from 'node:fs'
-import { log } from './log.js'
+import { logger } from './logger.js'
 
 
 export const isFile = path => lstatSync(path, { throwIfNoEntry: false })?.isFile()
@@ -25,6 +25,6 @@ export const write = (path, body) => {
 		writeFileSync(path, body)
 	}
 	catch (err) {
-		log.warn('Write access denied', err)
+		logger.warn('Write access denied', err)
 	}
 }

package/src/utils/http-response.js

@@ -1,47 +1,54 @@
 import fs, { readFileSync } from 'node:fs'
-import { log } from './log.js'
+import { logger } from './logger.js'
 import { mimeFor } from './mime.js'
 import { HEADER_FOR_502 } from '../ApiConstants.js'
 
 
 export function sendOK(response) {
-	response.end()
-}
-
-export function sendNoContent(response) {
-	response.statusCode = 204
+	logger.access(response)
 	response.end()
 }
 
 export function sendJSON(response, payload) {
+	logger.access(response)
 	response.setHeader('Content-Type', 'application/json')
 	response.end(JSON.stringify(payload))
 }
 
 export function sendFile(response, file) {
+	logger.access(response)
 	response.setHeader('Content-Type', mimeFor(file))
 	response.end(readFileSync(file, 'utf8'))
 }
 
+export function sendNoContent(response) {
+	response.statusCode = 204
+	logger.access(response)
+	response.end()
+}
+
+
 export function sendNotFound(response) {
 	response.statusCode = 404
+	logger.access(response)
 	response.end()
 }
 
 export function sendUnprocessableContent(response, error) {
-	log.warn(error)
+	logger.warn(error)
 	response.statusCode = 422
 	response.end(error)
 }
 
+
 export function sendInternalServerError(response, error) {
-	log.error(error?.message || error, error?.stack || undefined)
+	logger.error(error?.message || error, error?.stack || undefined)
 	response.statusCode = 500
 	response.end()
 }
 
 export function sendBadGateway(response, error) {
-	log.warn('Fallback Proxy Error:', error.cause.message)
+	logger.warn('Fallback Proxy Error:', error.cause.message)
 	response.statusCode = 502
 	response.setHeader(HEADER_FOR_502, 1)
 	response.end()

package/src/utils/logger.js

@@ -0,0 +1,42 @@
+export const logger = new class {
+	#level = 'normal'
+
+	setLevel(level) {
+		this.#level = level
+	}
+
+	info(...msg) {
+		if (this.#level !== 'quiet')
+			console.info(this.#msg('INFO', ...msg))
+	}
+
+	accessMock(url, ...msg) {
+		if (this.#level !== 'quiet')
+			console.log(this.#msg('MOCK', this.#sanitizeURL(url), ...msg))
+	}
+
+	access(response) {
+		if (this.#level === 'verbose')
+			console.log(this.#msg(
+				'ACCESS',
+				response.req.method,
+				response.statusCode,
+				this.#sanitizeURL(response.req.url)))
+	}
+
+	warn(...msg) {
+		console.warn(this.#msg('WARN', ...msg))
+	}
+
+	error(...msg) {
+		console.error(this.#msg('ERROR', ...msg))
+	}
+
+	#msg(...msg) {
+		return [new Date().toISOString(), ...msg].join('::')
+	}
+	
+	#sanitizeURL(url) {
+		return decodeURIComponent(url).replace(/[\x00-\x1F\x7F\x9B]/g, '')
+	}
+}

package/src/utils/log.js

@@ -1,34 +0,0 @@
-export const log = new class {
-	#level = 'normal'
-
-	setLevel(level) {
-		this.#level = level
-	}
-
-	info(...msg) {
-		if (this.#level !== 'quiet')
-			console.info([this.#date, 'INFO', ...msg].join('::'))
-	}
-
-	access(url, ...msg) {
-		if (this.#level !== 'quiet')
-			console.log([this.#date, 'ACCESS', this.#sanitizeURL(url), ...msg].join('::'))
-	}
-
-	warn(...msg) {
-		console.warn([this.#date, 'WARN', ...msg].join('::'))
-	}
-
-	error(...msg) {
-		console.error([this.#date, 'ERROR', ...msg].join('::'))
-	}
-
-
-	get #date() {
-		return new Date().toISOString()
-	}
-
-	#sanitizeURL(url) {
-		return decodeURIComponent(url).replace(/[\x00-\x1F\x7F\x9B]/g, '')
-	}
-}