mockaton 13.3.4 → 13.4.0

package/src/server/utils/HttpServerResponse.js

@@ -1,9 +1,7 @@
 import http from 'node:http'
-import fs, { readFileSync } from 'node:fs'
+import fs from 'node:fs'
 
-import { logger } from './logger.js'
 import { mimeFor } from './mime.js'
-import { HEADER_502 } from '../../client/ApiConstants.js'
 
 
 export class ServerResponse extends http.ServerResponse {
@@ -13,83 +11,64 @@ export class ServerResponse extends http.ServerResponse {
 	}
 
 	ok() {
-		logger.access(this)
 		this.end()
 	}
 
 	html(html, csp) {
-		logger.access(this)
 		this.setHeader('Content-Type', mimeFor('.html'))
 		this.setHeader('Content-Security-Policy', csp)
 		this.end(html)
 	}
 
 	json(payload) {
-		logger.access(this)
 		this.setHeader('Content-Type', mimeFor('.json'))
 		this.end(JSON.stringify(payload))
 	}
 
-	file(file) {
-		logger.access(this)
+	async file(file) {
 		this.setHeader('Content-Type', mimeFor(file))
-		this.end(readFileSync(file, 'utf8'))
+		this.end(await fs.promises.readFile(file, 'utf8'))
 	}
 
 	noContent() {
 		this.statusCode = 204
-		logger.access(this)
 		this.end()
 	}
 
 
 	badRequest() {
 		this.statusCode = 400
-		logger.access(this)
 		this.end()
 	}
 
 	forbidden() {
 		this.statusCode = 403
-		logger.access(this)
 		this.end()
 	}
 
 	notFound() {
 		this.statusCode = 404
-		logger.access(this)
-		this.end()
-	}
-
-	mockNotFound() {
-		this.statusCode = 404
-		logger.accessMock(this.req.url, '404')
 		this.end()
 	}
 
 	uriTooLong() {
 		this.statusCode = 414
-		logger.access(this)
 		this.end()
 	}
 
 	unprocessable(error) {
-		logger.access(this, error)
 		this.statusCode = 422
 		this.end(error)
 	}
 
 
-	internalServerError(error) {
-		logger.error(500, this.req.url, error?.message || error, error?.stack || '')
+	internalServerError() {
 		this.statusCode = 500
 		this.end()
 	}
 
-	badGateway(error) {
-		logger.warn('Fallback Proxy Error:', error.cause.message)
+	badGateway() {
 		this.statusCode = 502
-		this.setHeader(HEADER_502, 1)
 		this.end()
 	}
 
@@ -104,20 +83,20 @@ export class ServerResponse extends http.ServerResponse {
 			this.statusCode = 416 // Range Not Satisfiable
 			this.setHeader('Content-Range', `bytes */${size}`)
 			this.end()
+			return
 		}
-		else {
-			this.statusCode = 206 // Partial Content
-			this.setHeader('Accept-Ranges', 'bytes')
-			this.setHeader('Content-Range', `bytes ${start}-${end}/${size}`)
-			this.setHeader('Content-Type', mimeFor(file))
+
+		this.statusCode = 206 // Partial Content
+		this.setHeader('Accept-Ranges', 'bytes')
+		this.setHeader('Content-Range', `bytes ${start}-${end}/${size}`)
+		this.setHeader('Content-Type', mimeFor(file))
+
+		return new Promise((resolve, reject) => {
 			const reader = fs.createReadStream(file, { start, end })
-			const response = this
-			reader.on('open', function () {
-				this.pipe(response)
-			})
-			reader.on('error', error => {
-				this.internalServerError(error)
-			})
-		}
+			this.on('error', reject)
+			reader.on('error', reject)
+			reader.on('end', resolve)
+			reader.pipe(this)
+		})
 	}
 }

package/src/server/{WatcherDevClient.js → utils/WatcherDevClient.js}

@@ -1,12 +1,5 @@
-import { join } from 'node:path'
+import { watch } from 'node:fs'
 import { EventEmitter } from 'node:events'
-import { watch, readdirSync } from 'node:fs'
-
-import { config } from './config.js'
-
-
-export const CLIENT_DIR = join(import.meta.dirname, '../client')
-export const DASHBOARD_ASSETS = readdirSync(CLIENT_DIR)
 
 
 const devClientWatcher = new class extends EventEmitter {
@@ -18,20 +11,14 @@ const devClientWatcher = new class extends EventEmitter {
 
 // Although `client/IndexHtml.js` is watched, it returns a stale version.
 // i.e., it would need to be a dynamic import + cache busting.
-export function watchDevSPA() {
-	watch(CLIENT_DIR, (_, file) => {
+export function watchDevSPA(dir) {
+	watch(dir, (_, file) => {
 		devClientWatcher.emit(file)
 	})
 }
 
-
 /** Realtime notify Dev UI changes */
 export function sseClientHotReload(req, response) {
-	if (!config.hotReload) {
-		response.notFound()
-		return
-	}
-
 	response.writeHead(200, {
 		'Content-Type': 'text/event-stream',
 		'Cache-Control': 'no-cache',
@@ -42,7 +29,6 @@ export function sseClientHotReload(req, response) {
 	function onDevChange(file = '') {
 		response.write(`data: ${file}\n\n`)
 	}
-
 	devClientWatcher.subscribe(onDevChange)
 
 	const keepAlive = setInterval(() => {

package/src/server/utils/fs.js

@@ -1,5 +1,5 @@
-import { join, dirname, sep, posix, resolve } from 'node:path'
 import { lstatSync, readdirSync } from 'node:fs'
+import { join, dirname, sep, posix, resolve } from 'node:path'
 import { mkdir, writeFile, unlink, realpath } from 'node:fs/promises'
 
 

package/src/server/utils/logger.js

@@ -13,15 +13,15 @@ export const logger = new class {
 			console.info(this.#msg('INFO', ...msg))
 	}
 
-	accessMock(url, ...msg) {
+	normal(tag = 'NORMAL', url, ...msg) {
 		if (this.#level !== 'quiet')
-			console.log(this.#msg('MOCK', url, ...msg))
+			console.log(this.#msg(tag, url, ...msg))
 	}
 
-	access(response, error = '') {
+	verbose(tag = 'VERBOSE', response, error = '') {
 		if (this.#level === 'verbose')
 			console.log(this.#msg(
-				'ACCESS',
+				tag,
 				response.req.method,
 				response.statusCode,
 				response.req.url,

package/src/server/utils/mime.js

@@ -1,6 +1,4 @@
 import { MIMEType } from 'node:util'
-import { config } from '../config.js'
-import { EXT_UNKNOWN_MIME, EXT_EMPTY } from '../../client/ApiConstants.js'
 
 
 // Generated with:
@@ -119,7 +117,14 @@ const extToMime = {
 	zst: 'application/zstd'
 }
 
-const mimeToExt = mapMimeToExt(extToMime)
+const mimeToExt = {
+	data: mapMimeToExt(extToMime)
+}
+
+export function registerMimes(obj) {
+	Object.assign(extToMime, obj)
+	mimeToExt.data = mapMimeToExt(extToMime)
+}
 
 function mapMimeToExt(e2m) {
 	const m = {}
@@ -130,7 +135,7 @@ function mapMimeToExt(e2m) {
 
 export function mimeFor(filename) {
 	const ext = extname(filename).toLowerCase()
-	return config.extraMimes[ext] || extToMime[ext] || ''
+	return extToMime[ext] || ''
 }
 function extname(filename) {
 	const i = filename.lastIndexOf('.')
@@ -142,12 +147,7 @@ function extname(filename) {
 
 export function extFor(mime) {
 	return mime
-		? findExt(mime)
-		: EXT_EMPTY
-}
-function findExt(rawMime) {
-	const m = new MIMEType(rawMime).essence
-	const extraMimeToExt = mapMimeToExt(config.extraMimes)
-	return extraMimeToExt[m] || mimeToExt[m] || EXT_UNKNOWN_MIME
+		? mimeToExt.data[new MIMEType(mime).essence]
+		: ''
 }
 

package/src/server/utils/mime.test.js

@@ -3,15 +3,19 @@ import { equal } from 'node:assert/strict'
 import { extFor, mimeFor } from './mime.js'
 
 
-test('extFor', () => [
-	'text/html',
-	'Text/html',
-	'text/Html; charset=UTF-16'
-].map(input =>
-	equal(extFor(input), 'html')))
+test('extFor', () => {
+	[
+		'text/html',
+		'Text/html',
+		'text/Html; charset=UTF-16'
+	].map(input =>
+		equal(extFor(input), 'html'))
+})
 
-test('mimeFor', () => [
-	'file.html',
-	'file.HTmL'
-].map(input =>
-	equal(mimeFor(input), 'text/html')))
+test('mimeFor', () => {
+	[
+		'file.html',
+		'file.HTmL'
+	].map(input =>
+		equal(mimeFor(input), 'text/html'))
+})