packaton 0.0.27 → 0.0.28

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "packaton",
-	"version": "0.0.27",
+	"version": "0.0.28",
 	"type": "module",
 	"author": "Eric Fortis",
 	"license": "MIT",

package/src/plugins-dev/openInBrowser.js

@@ -1,23 +1,32 @@
-import { execFileSync } from 'node:child_process'
+import { spawnSync } from 'node:child_process'
 
 
 export const openInBrowser = (async () => {
 	try {
 		return (await import('open')).default
 	}
-	catch (error) {
+	catch {
 		return _openInBrowser
 	}
 })()
 
 function _openInBrowser(address) {
+	let opener
 	switch (process.platform) {
 		case 'darwin':
-			execFileSync('open', [address])
+			opener = 'open'
 			break
 		case 'win32':
-			execFileSync('start', [address])
+			opener = 'start'
 			break
+		default:
+			opener = ['xdg-open', 'gnome-open', 'kde-open'].find(hasCommand)
 	}
+	if (opener)
+		spawnSync(opener, [address])
 }
 
+function hasCommand(cmd) {
+	const { status } = spawnSync('command', ['-v', cmd], { stdio: 'ignore' })
+	return status === 0
+}

package/src/router.js

@@ -21,8 +21,7 @@ const API = {
 const WATCHER_DEV = `/plugins-dev/watcherDev.js`
 
 /** @param {Config} config */
-export function router({ srcPath, ignore, mode }) {
-	const DEV = mode === 'development'
+export function router({ srcPath, ignore, hotReload }) {
 	const WORKSPACE_ID = randomUUID()
 	docs.init(srcPath, ignore)
 
@@ -60,18 +59,18 @@ export function router({ srcPath, ignore, mode }) {
 				})
 
 			else if (docs.hasRoute(url))
-				await serveDocument(response, docs.fileFor(url), url, DEV)
+				await serveDocument(response, docs.fileFor(url), url, hotReload)
 			else if (docs.hasRoute(join(url, 'index')))
-				await serveDocument(response, docs.fileFor(join(url, 'index')), '', DEV)
+				await serveDocument(response, docs.fileFor(join(url, 'index')), '', hotReload)
 
 			else {
 				const f = await resolveIn(srcPath, url)
 				if (!f)
 					response.forbidden('Filename path resolves outside config.srcPath')
 				else if (req.headers.range)
-					response.partialContent(f)
+					await response.partialContent(f)
 				else
-					response.file(f)
+					await response.file(f)
 			}
 		}
 		catch (err) {
@@ -81,11 +80,11 @@ export function router({ srcPath, ignore, mode }) {
 	}
 }
 
-async function serveDocument(response, file, url, isDev) {
+async function serveDocument(response, file, url, hotReload) {
 	let html = file.endsWith('.html')
 		? await readFile(file, 'utf8')
 		: (await import(pathToFileURL(file))).default(url)
-	if (isDev)
+	if (hotReload)
 		html += `<script type="module" src="${WATCHER_DEV}?url=${API.watchHotReload}"></script>`
 	response.setHeader('Content-Type', mimeFor('.html'))
 	response.end(html)

package/src/utils/HttpServerResponse.js

@@ -19,7 +19,9 @@ export class ServerResponse extends http.ServerResponse {
 			await pipeline(fs.createReadStream(file), this)
 		}
 		catch (err) {
-			if (this.headersSent)
+			if (this.headersSent
+				|| err.code === 'ERR_STREAM_PREMATURE_CLOSE'
+				|| err.code === 'ERR_STREAM_UNABLE_TO_PIPE')
 				this.destroy()
 			else if (err.code === 'ENOENT')
 				this.notFound()
@@ -56,7 +58,9 @@ export class ServerResponse extends http.ServerResponse {
 			await pipeline(fs.createReadStream(file, { start, end }), this)
 		}
 		catch (err) {
-			if (this.headersSent)
+			if (this.headersSent
+				|| err.code === 'ERR_STREAM_PREMATURE_CLOSE'
+				|| err.code === 'ERR_STREAM_UNABLE_TO_PIPE')
 				this.destroy()
 			else if (err.code === 'ENOENT')
 				this.notFound()
@@ -64,7 +68,7 @@ export class ServerResponse extends http.ServerResponse {
 				throw err
 		}
 	}
-	
+
 	badRequest() {
 		this.statusCode = 400
 		this.end()