mockaton 13.9.6 → 13.9.8

package/README.md

@@ -1,4 +1,6 @@
 <!-- SKILLS_IGNORE_BEGIN -->
+<img src="logo.svg" alt="Mockaton Logo" width="180" style="margin-top: 30px"/>
+
 ![NPM Version](https://img.shields.io/npm/v/mockaton)
 [![Test](https://github.com/ericfortis/mockaton/actions/workflows/test.yml/badge.svg)](https://github.com/ericfortis/mockaton/actions/workflows/test.yml)
 [![codecov](https://codecov.io/github/ericfortis/mockaton/graph/badge.svg?token=90NYLMMG1J)](https://codecov.io/github/ericfortis/mockaton)
@@ -37,26 +39,25 @@ Dashboard: [localhost:2020/mockaton](http://localhost:2020/mockaton)
 npx mockaton --port 2020 my-mocks-dir/
 ```
 
-Mockaton will serve the files on the given directory. It's a file-system based router, so filenames can have dynamic
-parameters.
-Also, filenames can have comments, which are anything within parentheses, this way each route can have different mock
-file variants.
+Mockaton will serve the files on the given directory. It's a file-system based router, so
+filenames can have dynamic parameters. Also, filenames can have comments, which are
+anything within parentheses, this way each route can have different mock file variants.
+Similarly, each route can have different response status code variants.
 
 
 | Route | Filename | Description |
 | -----| -----| ---|
 | /api/company/123 | api/company/[id].GET.200.ts | `[id]` is a dynamic parameter. `.ts`, and `.js` are sent as JSON by default |
 | /media/avatar.png | media/avatar.png | Statics assets don't need the above extension |
-| /api/login | api/login(invalid attempt).POST.401.ts | Anything within parenthesis is a **comment**, they are ignored when routing |
+| /api/login | api/login(invalid attempt).POST.401.ts | **Anything within parenthesis is a comment**, they are ignored when routing |
 | /api/login | api/login(default).GET.200.ts | `(default)` is a special comment; otherwise, the first mock variant in alphabetical order wins  |
 | /api/login | api/login(locked out user).POST.423.json | `.json` is allowed too |
 
 
 ## Docs
-- How to **configure** Mockaton? See [CLI and mockaton.config.js](https://mockaton.com/config) docs.
-- How to **control** Mockaton? Besides the dashboard, there's a [Programmatic API](https://mockaton.com/api), in which
+- [Configuration: CLI and mockaton.config.js](https://mockaton.com/config).
+- [Programmatic API](https://mockaton.com/api), in which
   you can delay a route, select a different mock file, such as a 500 error, among other options.
-- How to **add plugins**? You can write [Plugins](https://mockaton.com/plugins) for customizing responses.
 
 <!-- SKILLS_IGNORE_BEGIN -->
 ## How to scrape your backend APIs?
@@ -70,37 +71,33 @@ npx skills add ericfortis/mockaton
 ```
 <!-- SKILLS_IGNORE_END -->
 
-## How to create mocks?
-
+## Installation ([more options  ↗](https://mockaton.com/installation))
 ```sh
 npm install mockaton
 ```
 
-Write to your mocks directory, `.ts` files are served as JSON by default.
+## How to create mocks?
+Write it to your mocks directory. `.ts` files are served as JSON by default.
 ```sh
 mkdir -p my-mocks-dir/api
-cat > my-mocks-dir/api/user.GET.200.ts << EOF
-interface User {
-  name: string
-}
-
-export default {
-  "name": "John"
-} satisfies User
-EOF
+echo "export default { name: 'John' }" > my-mocks-dir/api/user.GET.200.ts
 ```
 
 ### Example A: JSON
-For JSON responses, use TypeScript (or JavaScript), and export an Object, Array, or String.
+For JSON responses, use TypeScript (or JS), and `export default` an Object, Array, or 
+String.
 
 - **Route:** /api/company/123
 - **Filename:** api/company/[id].GET.200.ts
 
 ```ts
+interface Company {
+  name: string
+}
+
 export default {
-  id: 123,
   name: 'Acme, Inc.'
-}
+} satisfies Company
 ```
 
 ### Example B: Non-JSON
@@ -109,7 +106,6 @@ export default {
 
 ```xml
 <company>
- <id>123</id>
  <name>Acme, Inc.</name>
 </company>
 ```

package/package.json

@@ -2,23 +2,23 @@
 	"name": "mockaton",
 	"description": "HTTP Mock Server",
 	"type": "module",
-	"version": "13.9.6",
+	"version": "13.9.8",
 	"exports": {
 		".": {
 			"import": "./index.js",
 			"types": "./index.d.ts"
 		},
 		"./vite": "./vite-plugin/index.js",
-		"./openapi.json": "./www/src/assets/openapi.json",
-		"./SKILLS.md": "./www/src/.well-known/agent-skills/mockaton/SKILLS.md"
+		"./SKILL.md": "./skills/mockaton/SKILL.md",
+		"./openapi.json": "./www/src/assets/openapi.json"
 	},
 	"files": [
 		"src",
 		"index.js",
 		"index.d.ts",
 		"vite-plugin",
-		"www/src/assets/openapi.json",
-		"www/src/.well-known/agent-skills/mockaton/SKILLS.md"
+		"skills/mockaton/SKILL.md",
+		"www/src/assets/openapi.json"
 	],
 	"license": "MIT",
 	"homepage": "https://mockaton.com",

package/{www/src/.well-known/agent-skills/mockaton/SKILLS.md → skills/mockaton/SKILL.md}

@@ -8,59 +8,55 @@ user-invocable: false
 npx mockaton --port 2020 my-mocks-dir/
 ```
 
-Mockaton will serve the files on the given directory. It's a file-system
-based router, so filenames can have dynamic parameters and comments.
-Also, each route can have different mock file variants.
+Mockaton will serve the files on the given directory. It's a file-system based router, so
+filenames can have dynamic parameters. Also, filenames can have comments, which are
+anything within parentheses, this way each route can have different mock file variants.
+Similarly, each route can have different response status code variants.
 
 
 | Route | Filename | Description |
 | -----| -----| ---|
 | /api/company/123 | api/company/[id].GET.200.ts | `[id]` is a dynamic parameter. `.ts`, and `.js` are sent as JSON by default |
 | /media/avatar.png | media/avatar.png | Statics assets don't need the above extension |
-| /api/login | api/login(invalid attempt).POST.401.ts | Anything within parenthesis is a **comment**, they are ignored when routing |
+| /api/login | api/login(invalid attempt).POST.401.ts | **Anything within parenthesis is a comment**, they are ignored when routing |
 | /api/login | api/login(default).GET.200.ts | `(default)` is a special comment; otherwise, the first mock variant in alphabetical order wins  |
 | /api/login | api/login(locked out user).POST.423.json | `.json` is allowed too |
 
 
 ## Docs
-- How to **configure** Mockaton? See [CLI and mockaton.config.js](https://mockaton.com/config) docs.
-- How to **control** Mockaton? Besides the dashboard, there's a [Programmatic API](https://mockaton.com/api), in which
+- [Configuration: CLI and mockaton.config.js](https://mockaton.com/config).
+- [Programmatic API](https://mockaton.com/api), in which
   you can delay a route, select a different mock file, such as a 500 error, among other options.
-- How to **add plugins**? You can write [Plugins](https://mockaton.com/plugins) for customizing responses.
 
 
 
-## How to create mocks?
-
+## Installation ([more options  ↗](https://mockaton.com/installation))
 ```sh
 npm install mockaton
 ```
 
-Write to your mocks directory, `.ts` files are served as JSON by default.
+## How to create mocks?
+Write it to your mocks directory. `.ts` files are served as JSON by default.
 ```sh
 mkdir -p my-mocks-dir/api
-cat << EOF >> my-mocks-dir/api/user.GET.200.ts
-interface User {
-  name: string
-}
-
-export default {
-  "name": "John"
-} satisfies User
-EOF
+echo "export default { name: 'John' }" > my-mocks-dir/api/user.GET.200.ts
 ```
 
 ### Example A: JSON
-For JSON responses, use TypeScript (or JavaScript), and export an Object, Array, or String.
+For JSON responses, use TypeScript (or JS), and `export default` an Object, Array, or 
+String.
 
 - **Route:** /api/company/123
 - **Filename:** api/company/[id].GET.200.ts
 
 ```ts
+interface Company {
+  name: string
+}
+
 export default {
-  id: 123,
   name: 'Acme, Inc.'
-}
+} satisfies Company
 ```
 
 ### Example B: Non-JSON
@@ -69,7 +65,6 @@ export default {
 
 ```xml
 <company>
- <id>123</id>
  <name>Acme, Inc.</name>
 </company>
 ```

package/src/client/Filename.js

@@ -50,10 +50,6 @@ export function removeTrailingSlash(url = '') {
 		.replace('/#', '#')
 }
 
-export function removeQueryStringAndFragment(url = '') {
-	return new URL(url, 'http://_').pathname
-}
-
 function responseStatusIsValid(status) {
 	return Number.isInteger(status)
 		&& status >= 100

package/src/server/Api.js

@@ -18,11 +18,12 @@ import { IndexHtml, CSP } from '../client/IndexHtml.js'
 import { cookie } from './cookie.js'
 import { config, ConfigValidator } from './config.js'
 import * as mockBrokersCollection from './mockBrokersCollection.js'
+import { removeQueryStringAndFragment } from './utils/HttpIncomingMessage.js'
 
 
 export const CLIENT_ASSETS = join(import.meta.dirname, '../client')
 
-export const apiGetReqs = new Map([
+const getReqs = new Map([
 	[API.dashboard, serveDashboard],
 
 	...listFilesRecursively(CLIENT_ASSETS).map(f => [
@@ -38,8 +39,7 @@ export const apiGetReqs = new Map([
 	[API.throws, () => { throw new Error('Test500') }]
 ])
 
-
-export const apiPatchReqs = new Map([
+const patchReqs = new Map([
 	[API.cors, setCorsAllowed],
 	[API.reset, reset],
 	[API.cookies, selectCookie],
@@ -61,6 +61,17 @@ export const apiPatchReqs = new Map([
 	[API.watchMocks, setWatchMocks]
 ])
 
+export async function handleApiRequest(req, response) {
+	const url = removeQueryStringAndFragment(req.url)
+	const handler = (
+		req.method === 'GET' && getReqs.get(url) ||
+		req.method === 'PATCH' && patchReqs.get(url))
+	if (handler) {
+		await handler(req, response)
+		return true
+	}
+}
+
 
 /** # GET */
 

package/src/server/MockBroker.js

@@ -1,5 +1,6 @@
 import { DEFAULT_MOCK_COMMENT } from '../client/ApiConstants.js'
-import { parseFilename, includesComment, extractComments, removeQueryStringAndFragment } from '../client/Filename.js'
+import { parseFilename, includesComment, extractComments } from '../client/Filename.js'
+import { removeQueryStringAndFragment } from './utils/HttpIncomingMessage.js'
 
 
 /**

package/src/server/MockDispatcherPlugins.js

@@ -1,8 +1,8 @@
 import { readFileSync } from 'node:fs'
 import { pathToFileURL } from 'node:url'
-
 import { mimeFor } from './utils/mime.js'
 
+
 export function echoFilePlugin(filePath) {
 	return {
 		mime: mimeFor(filePath),
@@ -10,6 +10,7 @@ export function echoFilePlugin(filePath) {
 	}
 }
 
+
 export async function jsToJsonPlugin(filePath, req, response) {
 	const jsExport = (await import(pathToFileURL(filePath))).default
 	const body = typeof jsExport === 'function'

package/src/server/Mockaton.js

@@ -11,7 +11,7 @@ import { IncomingMessage, BodyReaderError, hasControlChars } from './utils/HttpI
 import { API } from '../client/ApiConstants.js'
 import { cookie } from './cookie.js'
 import { config, setup } from './config.js'
-import { apiPatchReqs, apiGetReqs, CLIENT_ASSETS } from './Api.js'
+import { CLIENT_ASSETS, handleApiRequest } from './Api.js'
 
 import { dispatchMock } from './MockDispatcher.js'
 import * as mockBrokerCollection from './mockBrokersCollection.js'
@@ -50,6 +50,7 @@ export function Mockaton(options) {
 	})
 }
 
+
 async function onRequest(req, response) {
 	response.setHeader('Server', `Mockaton ${pkgJSON.version}`)
 	response.on('error', logger.warn)
@@ -71,23 +72,13 @@ async function onRequest(req, response) {
 		return
 	}
 
-	try {
-		if (config.corsAllowed)
-			setCorsHeaders(req, response, config)
-
-		const { method } = req
-		const { pathname } = new URL(url, 'http://_')
+	if (config.corsAllowed)
+		setCorsHeaders(req, response, config)
 
+	try {
 		if (isPreflight(req))
 			response.noContent()
-
-		else if (method === 'PATCH' && apiPatchReqs.has(pathname))
-			await apiPatchReqs.get(pathname)(req, response)
-
-		else if (method === 'GET' && apiGetReqs.has(pathname))
-			apiGetReqs.get(pathname)(req, response)
-
-		else {
+		else if (!(await handleApiRequest(req, response))) {
 			handledByMockDispatcher = true
 			await dispatchMock(req, response)
 		}
@@ -97,7 +88,7 @@ async function onRequest(req, response) {
 			response.unprocessable(`${error.name}: ${error.message}`)
 		else {
 			logger.error(500, req.url, error?.message || error, error?.stack || '')
-			response.internalServerError(error)
+			response.internalServerError()
 		}
 	}
 }

package/src/server/ProxyRelay.js

@@ -3,7 +3,7 @@ import { randomUUID } from 'node:crypto'
 
 import { extFor } from './utils/mime.js'
 import { write, isFile, resolveIn } from './utils/fs.js'
-import { readBody, BodyReaderError } from './utils/HttpIncomingMessage.js'
+import { BodyReaderError } from './utils/HttpIncomingMessage.js'
 
 import { config } from './config.js'
 import { logger } from './utils/logger.js'
@@ -19,7 +19,7 @@ export async function proxy(req, response, delay) {
 			headers: req.headers,
 			body: req.method === 'GET' || req.method === 'HEAD'
 				? undefined
-				: await readBody(req)
+				: await req.body()
 		})
 	}
 	catch (error) { // TESTME

package/src/server/UrlParsers.js

@@ -1,7 +1,7 @@
 import { relative } from 'node:path'
 import { config } from './config.js'
-import { decode } from './utils/HttpIncomingMessage.js'
-import { parseFilename, removeTrailingSlash, removeQueryStringAndFragment } from '../client/Filename.js'
+import { decode, removeQueryStringAndFragment } from './utils/HttpIncomingMessage.js'
+import { parseFilename, removeTrailingSlash } from '../client/Filename.js'
 
 
 export function parseQueryParams(url) {

package/src/server/cli.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 
+import { pathToFileURL } from 'node:url'
 import { resolve, join } from 'node:path'
 import { parseArgs } from 'node:util'
 
@@ -11,7 +12,7 @@ import pkgJSON from '../../package.json' with { type: 'json' }
 process.on('unhandledRejection', error => { throw error })
 
 const DEFAULT_CONFIG_FILE = 'mockaton.config.js'
-const SKILLS_PATH = join(import.meta.dirname, '../../www/src/.well-known/agent-skills/mockaton/SKILL.md')
+const SKILLS_PATH = join(import.meta.dirname, '../../skills/mockaton/SKILL.md')
 
 let args, positionals
 try {
@@ -63,7 +64,7 @@ Options:
   --no-open            Don't open dashboard in a browser
   --no-read-only       Allow writing and deleting mocks via API
   
-  --skills             Show AI agent SKILLS.md file path
+  --skills             Show AI agent SKILL.md file path
   -h, --help
   -v, --version
 
@@ -79,7 +80,7 @@ else if (args.config && !isFile(args.config)) {
 else {
 	const userConf = resolve(args.config ?? DEFAULT_CONFIG_FILE)
 	const opts = isFile(userConf)
-		? (await import(userConf)).default ?? {}
+		? (await import(pathToFileURL(userConf))).default ?? {}
 		: {}
 
 	if (args.host) opts.host = args.host

package/src/server/utils/HttpIncomingMessage.js

@@ -3,6 +3,10 @@ import http, { METHODS } from 'node:http'
 
 export const methodIsSupported = method => METHODS.includes(method)
 
+export function removeQueryStringAndFragment(url = '') {
+	return new URL(url, 'http://_').pathname
+}
+
 export class BodyReaderError extends Error {
 	name = 'BodyReaderError'
 	constructor(msg) {
@@ -13,47 +17,39 @@ export class BodyReaderError extends Error {
 
 export class IncomingMessage extends http.IncomingMessage {
 	json() {
-		return readBody(this, JSON.parse)
+		return this.body(JSON.parse)
 	}
-}
-
-export const parseJSON = req => readBody(req, JSON.parse)
 
-export function readBody(req, parser = a => a) {
-	return new Promise((resolve, reject) => {
+	async body(parser = a => a) {
 		const MAX_BODY_SIZE = 200 * 1024
-		const expectedLength = req.headers['content-length'] | 0
-		let lengthSoFar = 0
-		const body = []
-		req.on('data', onData)
-		req.on('end', onEnd)
-		req.on('error', onEnd)
+		const expectedLength = this.headers['content-length'] | 0
 
-		function onData(chunk) {
+		const chunks = []
+		let lengthSoFar = 0
+		for await (const chunk of this) {
 			lengthSoFar += chunk.length
 			if (lengthSoFar > MAX_BODY_SIZE)
-				onEnd()
-			else
-				body.push(chunk)
+				throw new BodyReaderError(`Body too large. Max is ${MAX_BODY_SIZE} bytes`)
+			chunks.push(chunk)
 		}
 
-		function onEnd() {
-			req.removeListener('data', onData)
-			req.removeListener('end', onEnd)
-			req.removeListener('error', onEnd)
-			if (lengthSoFar !== expectedLength)
-				reject(new BodyReaderError('Length mismatch'))
-			else
-				try {
-					resolve(parser(Buffer.concat(body).toString()))
-				}
-				catch (_) {
-					reject(new BodyReaderError('Could not parse'))
-				}
+		if (lengthSoFar !== expectedLength)
+			throw new BodyReaderError('Length mismatch')
+
+		try {
+			return parser(Buffer.concat(chunks).toString())
 		}
-	})
+		catch (_) {
+			throw new BodyReaderError('Could not parse')
+		}
+	}
 }
 
+export const parseJSON = req =>
+	IncomingMessage.prototype.body.call(req, JSON.parse)
+
+
+
 export const reControlAndDelChars = /[\x00-\x1f\x7f]/
 
 export function hasControlChars(url) {
@@ -72,4 +68,3 @@ export function decode(url) {
 		? candidate
 		: '' // reject multiple encodings
 }
-

package/src/server/utils/HttpServerResponse.js

@@ -15,6 +15,11 @@ export class ServerResponse extends http.ServerResponse {
 		this.end()
 	}
 
+	noContent() {
+		this.statusCode = 204
+		this.end()
+	}
+
 	html(html, csp) {
 		this.setHeader('Content-Type', mimeFor('.html'))
 		this.setHeader('Content-Security-Policy', csp)
@@ -27,15 +32,59 @@ export class ServerResponse extends http.ServerResponse {
 	}
 
 	async file(file) {
-		this.setHeader('Content-Type', mimeFor(file))
-		await pipeline(fs.createReadStream(file), this)
+		try {
+			const { size } = await fs.promises.stat(file)
+			this.setHeader('Content-Length', size)
+			this.setHeader('Content-Type', mimeFor(file))
+			await pipeline(fs.createReadStream(file), this)
+		}
+		catch (err) {
+			if (this.headersSent)
+				this.destroy()
+			else if (err.code === 'ENOENT')
+				this.notFound()
+			else
+				throw err
+		}
 	}
 
-	noContent() {
-		this.statusCode = 204
-		this.end()
+	async partialContent(file) {
+		try {
+			const { size } = await fs.promises.lstat(file)
+			let [start, end] = this.req.headers.range.replace(/bytes=/, '').split('-').map(n => parseInt(n, 10))
+
+			if (isNaN(start)) {
+				start = size - end
+				end = size - 1
+			}
+			else if (isNaN(end))
+				end = size - 1
+
+			if (start < 0 || end >= size || start > end) {
+				this.statusCode = 416 // Range Not Satisfiable
+				this.setHeader('Content-Range', `bytes */${size}`)
+				this.end()
+				return
+			}
+
+			this.statusCode = 206 // Partial Content
+			this.setHeader('Accept-Ranges', 'bytes')
+			this.setHeader('Content-Range', `bytes ${start}-${end}/${size}`)
+			this.setHeader('Content-Length', (end - start) + 1)
+			this.setHeader('Content-Type', mimeFor(file))
+
+			await pipeline(fs.createReadStream(file, { start, end }), this)
+		}
+		catch (err) {
+			if (this.headersSent)
+				this.destroy()
+			else if (err.code === 'ENOENT')
+				this.notFound()
+			else
+				throw err
+		}
 	}
-
+	
 
 	badRequest() {
 		this.statusCode = 400
@@ -62,7 +111,6 @@ export class ServerResponse extends http.ServerResponse {
 		this.end(error)
 	}
 
-
 	internalServerError() {
 		this.statusCode = 500
 		this.end()
@@ -72,34 +120,4 @@ export class ServerResponse extends http.ServerResponse {
 		this.statusCode = 502
 		this.end()
 	}
-
-
-	async partialContent(file) {
-		const { size } = await fs.promises.lstat(file)
-		let [start, end] = this.req.headers.range.replace(/bytes=/, '').split('-').map(n => parseInt(n, 10))
-
-		if (isNaN(start)) {
-			start = size - end
-			end = size - 1
-		}
-		else if (isNaN(end))
-			end = size - 1
-
-		if (start < 0 || end >= size || start > end) {
-			this.statusCode = 416 // Range Not Satisfiable
-			this.setHeader('Content-Range', `bytes */${size}`)
-			this.end()
-			return
-		}
-
-		this.statusCode = 206 // Partial Content
-		this.setHeader('Accept-Ranges', 'bytes')
-		this.setHeader('Content-Range', `bytes ${start}-${end}/${size}`)
-		this.setHeader('Content-Length', (end - start) + 1)
-		this.setHeader('Content-Type', mimeFor(file))
-
-		const stream = fs.createReadStream(file, { start, end })
-		this.on('close', () => stream.destroy())
-		stream.pipe(this)
-	}
 }

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

@@ -1,84 +1,101 @@
 import { describe, test, before, after } from 'node:test'
 import { mkdtempSync, writeFileSync } from 'node:fs'
-import http, { createServer } from 'node:http'
-import { join, dirname } from 'node:path'
-import { strictEqual } from 'node:assert'
+import { createServer } from 'node:http'
 import { tmpdir } from 'node:os'
+import { equal } from 'node:assert/strict'
+import { join } from 'node:path'
 import { rm } from 'node:fs/promises'
 
 import { ServerResponse } from './HttpServerResponse.js'
 
-describe('ServerResponse.partialContent (real HTTP)', () => {
+describe('ServerResponse', () => {
 	const FILE = '0123456789'
-	const FILE_SIZE = FILE.length
-
-	let tmpFile, server, baseUrl
 
+	let tmpDir, tmpFile, server, addr
 	before(async () => {
-		const tmpDir = mkdtempSync(join(tmpdir(), 'response-'))
+		tmpDir = mkdtempSync(join(tmpdir(), 'response-'))
 		tmpFile = join(tmpDir, 'test.txt')
 		writeFileSync(tmpFile, FILE)
-		server = createServer({ ServerResponse }, async (_, response) => {
-			await response.partialContent(tmpFile)
+
+		server = createServer({ ServerResponse }, (req, response) => {
+			const file = join(tmpDir, req.url)
+			if (req.headers.range)
+				response.partialContent(file)
+			else
+				response.file(file)
 		})
+
 		await new Promise(resolve => server.listen(0, () => {
-			const { port } = server.address()
-			baseUrl = `http://127.0.0.1:${port}`
+			addr = `http://127.0.0.1:${(server.address().port)}`
 			resolve()
 		}))
 	})
 
 	after(async () => {
 		server?.close()
-		await rm(dirname(tmpFile), { recursive: true, force: true })
+		await rm(tmpDir, { recursive: true, force: true })
 	})
 
-	function request(range) {
-		return new Promise((resolve, reject) => {
-			const req = http.get(baseUrl, { headers: { range } }, response => {
-				let data = ''
-				response.setEncoding('utf8')
-				response.on('data', chunk => data += chunk)
-				response.on('end', () => resolve({
-					statusCode: response.statusCode,
-					headers: response.headers,
-					data
-				}))
-			})
-			req.on('error', reject)
+
+	describe('partialContent', () => {
+		const GET = (path, range) => fetch(addr + path, { headers: { range } })
+
+		test('404', async () => {
+			const r = await GET('/not-found', 'bytes=0-')
+			equal(r.status, 404)
+			equal(r.headers.get('content-length'), '0')
 		})
-	}
-
-	test('416 - out of bounds', async () => {
-		for (const range of ['bytes=10-12', 'bytes=5-2', 'bytes=12-', 'bytes=-15']) {
-			const { statusCode, headers } = await request(range)
-			strictEqual(statusCode, 416)
-			strictEqual(headers['content-range'], `bytes */${FILE_SIZE}`)
-		}
-	})
 
-	test('206 - normal range', async () => {
-		const { statusCode, headers, data } = await request('bytes=0-4')
-		strictEqual(statusCode, 206)
-		strictEqual(headers['content-range'], `bytes 0-4/${FILE_SIZE}`)
-		strictEqual(headers['content-length'], '5')
-		strictEqual(headers['content-type'], 'text/plain')
-		strictEqual(data, '01234')
-	})
+		test('416 - out of bounds', async () => {
+			for (const range of ['bytes=10-12', 'bytes=5-2', 'bytes=12-', 'bytes=-15']) {
+				const r = await GET('/test.txt', range)
+				equal(r.status, 416)
+				equal(r.headers.get('content-range'), `bytes */${FILE.length}`)
+			}
+		})
+
+		test('206 - normal range', async () => {
+			const r = await GET('/test.txt', 'bytes=0-4')
+			equal(r.status, 206)
+			equal(r.headers.get('content-range'), `bytes 0-4/${FILE.length}`)
+			equal(r.headers.get('content-length'), '5')
+			equal(r.headers.get('content-type'), 'text/plain')
+			equal(await r.text(), '01234')
+		})
+
+		test('206 - suffix range', async () => {
+			const r = await GET('/test.txt', 'bytes=-3')
+			equal(r.status, 206)
+			equal(r.headers.get('content-range'), `bytes 7-9/${FILE.length}`)
+			equal(r.headers.get('content-length'), '3')
+			equal(await r.text(), '789')
+		})
 
-	test('206 - suffix range', async () => {
-		const { statusCode, headers, data } = await request('bytes=-3')
-		strictEqual(statusCode, 206)
-		strictEqual(headers['content-range'], `bytes 7-9/${FILE_SIZE}`)
-		strictEqual(headers['content-length'], '3')
-		strictEqual(data, '789')
+		test('206 - open ended range', async () => {
+			const r = await GET('/test.txt', 'bytes=5-')
+			equal(r.status, 206)
+			equal(r.headers.get('content-range'), `bytes 5-9/${FILE.length}`)
+			equal(r.headers.get('content-length'), '5')
+			equal(await r.text(), '56789')
+		})
 	})
 
-	test('206 - open ended range', async () => {
-		const { statusCode, headers, data } = await request('bytes=5-')
-		strictEqual(statusCode, 206)
-		strictEqual(headers['content-range'], `bytes 5-9/${FILE_SIZE}`)
-		strictEqual(headers['content-length'], '5')
-		strictEqual(data, '56789')
+
+	describe('file', () => {
+		const GET = path => fetch(addr + path)
+
+		test('404', async () => {
+			const r = await GET('/not-found')
+			equal(r.status, 404)
+			equal(r.headers.get('content-length'), '0')
+		})
+
+		test('200', async () => {
+			const r = await GET('/test.txt')
+			equal(r.status, 200)
+			equal(r.headers.get('content-type'), 'text/plain')
+			equal(r.headers.get('content-length'), String(FILE.length))
+			equal(await r.text(), FILE)
+		})
 	})
 })

package/src/server/utils/fs.js

@@ -39,7 +39,7 @@ export async function resolveIn(baseDir, file) {
 			? child
 			: null
 	}
-	catch (e) {
+	catch {
 		return null
 	}
 }

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

@@ -6,9 +6,9 @@ import { mkdtempSync, rmSync, realpathSync } from 'node:fs'
 
 import { resolveIn } from './fs.js'
 
-const isNull = v => equal(v, null)
-
 describe('resolveIn', () => {
+	const isNull = v => equal(v, null)
+	
 	const baseDir = mkdtempSync(join(tmpdir(), '_resolveIn'))
 	const baseParentDir = join(baseDir, '..')
 	after(() => rmSync(baseDir, { recursive: true, force: true }))