mockaton 13.11.0 → 13.11.2

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

@@ -4,19 +4,17 @@ 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 { rmdir } from 'node:fs/promises'
 
 import { ServerResponse } from './HttpServerResponse.js'
 
-describe('ServerResponse', () => {
+describe('ServerResponse', { concurrency: true }, () => {
 	const FILE = '0123456789'
+	const tmpDir = mkdtempSync(join(tmpdir(), 'response-'))
+	writeFileSync(join(tmpDir, 'test.txt'), FILE)
 
-	let tmpDir, tmpFile, server, addr
+	let server, addr
 	before(async () => {
-		tmpDir = mkdtempSync(join(tmpdir(), 'response-'))
-		tmpFile = join(tmpDir, 'test.txt')
-		writeFileSync(tmpFile, FILE)
-
 		server = createServer({ ServerResponse }, (req, response) => {
 			const file = join(tmpDir, req.url)
 			if (req.headers.range)
@@ -26,14 +24,14 @@ describe('ServerResponse', () => {
 		})
 
 		await new Promise(resolve => server.listen(0, () => {
-			addr = `http://127.0.0.1:${(server.address().port)}`
+			addr = `http://127.0.0.1:${server.address().port}`
 			resolve()
 		}))
 	})
 
 	after(async () => {
 		server?.close()
-		await rm(tmpDir, { recursive: true, force: true })
+		await rmdir(tmpDir, { recursive: true, force: true })
 	})
 
 

package/src/server/utils/WatcherDevClient.js

@@ -12,7 +12,7 @@ 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(dir) {
-	watch(dir, (_, file) => {
+	watch(dir, { recursive: true }, (_, file) => {
 		devClientWatcher.emit(file)
 	})
 }

package/src/server/utils/fs.js

@@ -34,7 +34,7 @@ export async function rm(path) {
 export async function resolveIn(baseDir, file) {
 	try {
 		const parent = await realpath(baseDir)
-		const child = resolve(join(parent, file))
+		const child = resolve(join(parent, file)) // realpath not needed because we don't write symlinks
 		return child.startsWith(join(parent, sep))
 			? child
 			: null

package/src/server/utils/openInBrowser.js

@@ -11,22 +11,27 @@ export const openInBrowser = (async () => {
 })()
 
 function _openInBrowser(address) {
-	let opener
+	let command = ''
+	let args = [address]
+
 	switch (process.platform) {
 		case 'darwin':
-			opener = 'open'
+			command = '/usr/bin/open'
 			break
+
 		case 'win32':
-			opener = 'start'
+			command = 'cmd'
+			args = ['/c', 'start', '', address]
 			break
+
 		default:
-			opener = ['xdg-open', 'gnome-open', 'kde-open'].find(hasCommand)
+			command = ['xdg-open', 'gnome-open', 'kde-open'].find(function hasCommand(cmd) {
+				const { status } = spawnSync('command', ['-v', cmd], { stdio: 'ignore' })
+				return status === 0
+			})
 	}
-	if (opener)
-		spawnSync(opener, [address])
-}
 
-function hasCommand(cmd) {
-	const { status } = spawnSync('command', ['-v', cmd], { stdio: 'ignore' })
-	return status === 0
+	if (command)
+		spawnSync(command, args)
 }
+