@johntalton/http-util 5.0.0 → 5.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@johntalton/http-util",
-  "version": "5.0.0",
+  "version": "5.1.0",
   "license": "MIT",
   "type": "module",
   "exports": {

package/src/accept-encoding.js

@@ -21,7 +21,7 @@ export class AcceptEncoding {
 	 */
 	static select(acceptEncodingHeader, supportedTypes) {
 		const accepts = AcceptEncoding.parse(acceptEncodingHeader)
-		return this.selectFrom(accepts, supportedTypes)
+		return AcceptEncoding.selectFrom(accepts, supportedTypes)
 	}
 
 	/**

package/src/accept-language.js

@@ -23,7 +23,7 @@ export class AcceptLanguage {
 	 */
 	static select(acceptLanguageHeader, supportedTypes) {
 		const accepts = AcceptLanguage.parse(acceptLanguageHeader)
-		return this.selectFrom(accepts, supportedTypes)
+		return AcceptLanguage.selectFrom(accepts, supportedTypes)
 	}
 
 	/**

package/src/accept-util.js

@@ -39,7 +39,7 @@ export function parseAcceptStyleHeader(header, wellKnown) {
 				}))
 
 				if(!parameters.has(QUALITY)) { parameters.set(QUALITY, DEFAULT_QUALITY_STRING) }
-				const quality = parseFloat(parameters.get(QUALITY) ?? DEFAULT_QUALITY_STRING)
+				const quality = Number.parseFloat(parameters.get(QUALITY) ?? DEFAULT_QUALITY_STRING)
 
 				return {
 					name,

package/src/accept.js

@@ -54,7 +54,6 @@ export class Accept {
 				const qualityB = entryB.quality ?? 0
 				const qualityA = entryA.quality ?? 0
 				return qualityB - qualityA
-				// return entryB.quality - entryA.quality
 			})
 	}
 
@@ -64,7 +63,7 @@ export class Accept {
 	 */
 	static select(acceptHeader, supportedTypes) {
 		const accepts = Accept.parse(acceptHeader)
-		return this.selectFrom(accepts, supportedTypes)
+		return Accept.selectFrom(accepts, supportedTypes)
 	}
 
 	/**
@@ -84,9 +83,7 @@ export class Accept {
 				quality
 			}
 		})
-		.filter(best => {
-			return best.supportedTypes.length > 0
-		})
+		.filter(best => best.supportedTypes.length > 0)
 
 		if(bests.length === 0) { return undefined }
 		const [ first ] = bests

package/src/body.js

@@ -5,7 +5,8 @@ import {
 } from './content-type.js'
 import { Multipart } from './multipart.js'
 
-export const DEFAULT_BYTE_LIMIT = 1024 * 1024 //
+export const BYTE_PER_K = 1024
+export const DEFAULT_BYTE_LIMIT = BYTE_PER_K * BYTE_PER_K //
 
 /** @import { Readable } from 'node:stream' */
 /** @import { ContentType } from './content-type.js' */
@@ -43,7 +44,7 @@ export function requestBody(stream, options) {
 	const charset = options?.contentType?.charset ?? CHARSET_UTF8
 	const contentType = options?.contentType
 
-	const invalidContentLength = (contentLength === undefined || isNaN(contentLength))
+	const invalidContentLength = (contentLength === undefined || Number.isNaN(contentLength))
 	// if(contentLength > byteLimit) {
 		// console.log(contentLength, invalidContentLength)
 	// 	throw new Error('contentLength exceeds limit')
@@ -278,7 +279,7 @@ export async function bodyJSON(reader, charset) {
  * @param {ReadableStream} reader
  * @param {ContentType} contentType
  */
-async function _bodyFormData_Multipart(reader, contentType) {
+export async function _bodyFormData_Multipart(reader, contentType) {
 	const MULTIPART_FORM_DATA_BOUNDARY_PARAMETER = 'boundary'
 
 	const text = await bodyText(reader, contentType.charset)
@@ -292,7 +293,7 @@ async function _bodyFormData_Multipart(reader, contentType) {
  * @param {ReadableStream} reader
  * @param {ContentType} contentType
  */
-async function _bodyFormData_URL(reader, contentType) {
+export async function _bodyFormData_URL(reader, contentType) {
 	const text = await bodyText(reader, contentType.charset)
 	const sp = new URLSearchParams(text)
 	const formData = new FormData()
@@ -320,4 +321,4 @@ export async function bodyFormData(reader, contentType) {
 	}
 
 	throw new TypeError('unknown mime type for form data')
-}
+}

package/src/clear-site-data.js

@@ -0,0 +1,59 @@
+
+/** @type {'*'} */
+export const WILDCARD = '*'
+
+export const CSD_DIRECTIVE_SEPARATOR = ','
+export const CSD_QUOTE = '"'
+
+export const CSD_DIRECTIVE_CACHE = 'cache'
+export const CSD_DIRECTIVE_CLIENT_HINTS = 'clientHints'
+export const CSD_DIRECTIVE_COOKIES = 'cookies'
+export const CSD_DIRECTIVE_EXECUTION_CONTEXTS = 'executionContexts'
+export const CSD_DIRECTIVE_PREFETCH_CACHE = 'prefetchCache'
+export const CSD_DIRECTIVE_PRERENDER_CACHE = 'prerenderCache'
+export const CSD_DIRECTIVE_STORAGE = 'storage'
+
+/**
+ * @typedef {Object} ClearOptions
+ * @property {boolean} cache
+ * @property {boolean} clientHints
+ * @property {boolean} cookies
+ * @property {boolean} executionContext
+ * @property {boolean} prefetchCache
+ * @property {boolean} prerenderCache
+ * @property {boolean} storage
+ */
+
+export class SiteData {
+	/**
+	 * @param {Partial<ClearOptions>|true|'*'|undefined} directives
+	 */
+	static encode(directives) {
+		if(directives === undefined) { return undefined }
+		if(directives === true) { return WILDCARD }
+		if(directives === WILDCARD) { return WILDCARD }
+
+		const result = []
+		if(directives.cache === true) { result.push(CSD_DIRECTIVE_CACHE) }
+		if(directives.clientHints === true) { result.push(CSD_DIRECTIVE_CLIENT_HINTS) }
+		if(directives.cookies === true) { result.push(CSD_DIRECTIVE_COOKIES) }
+		if(directives.executionContext === true) { result.push(CSD_DIRECTIVE_EXECUTION_CONTEXTS) }
+		if(directives.prefetchCache === true) { result.push(CSD_DIRECTIVE_PREFETCH_CACHE) }
+		if(directives.prerenderCache === true) { result.push(CSD_DIRECTIVE_PRERENDER_CACHE) }
+		if(directives.storage === true) { result.push(CSD_DIRECTIVE_STORAGE) }
+
+		return result
+			.map(item => `${CSD_QUOTE}${item}${CSD_QUOTE}`)
+			.join(CSD_DIRECTIVE_SEPARATOR)
+	}
+}
+
+// console.log(SiteData.encode())
+// console.log(SiteData.encode({}))
+// console.log(SiteData.encode(false))
+// console.log(SiteData.encode('true'))
+// console.log(SiteData.encode(true))
+// console.log(SiteData.encode('*'))
+// console.log(SiteData.encode({ storage: false }))
+// console.log(SiteData.encode({ storage: true }))
+// console.log(SiteData.encode({ storage: true, cookies: true }))

package/src/conditional.js

@@ -49,6 +49,9 @@ export const DATE_SEPARATOR = ','
 export const DATE_TIME_SEPARATOR = ':'
 export const DATE_ZONE = 'GMT'
 
+export const MINIMUM_YEAR = 1900
+export const MAXIMUM_DAY = 31
+
 /**
  * @param {string} etag
  */
@@ -201,7 +204,7 @@ export class Conditional {
 		// <day-name>, <day> <month> <year> <hour>:<minute>:<second> GMT
 		// day-name "," SP date1 SP time-of-day SP GMT
 
-		if(matchHeader.length != 29) { return undefined }
+		if(matchHeader.length !== 29) { return undefined }
 
 		//
 		const spaces = [
@@ -230,12 +233,12 @@ export class Conditional {
 
 		//
 		const dayName = matchHeader.substring(0, 3)
-		const day = parseInt(matchHeader.substring(5, 7))
+		const day = Number.parseInt(matchHeader.substring(5, 7))
 		const month = matchHeader.substring(8, 11)
-		const year = parseInt(matchHeader.substring(12, 16))
-		const hour = parseInt(matchHeader.substring(17, 19))
-		const minute = parseInt(matchHeader.substring(20, 22))
-		const second = parseInt(matchHeader.substring(23, 25))
+		const year = Number.parseInt(matchHeader.substring(12, 16))
+		const hour = Number.parseInt(matchHeader.substring(17, 19))
+		const minute = Number.parseInt(matchHeader.substring(20, 22))
+		const second = Number.parseInt(matchHeader.substring(23, 25))
 
 		//
 		if(!DATE_DAYS.includes(dayName)) { return undefined }
@@ -247,8 +250,8 @@ export class Conditional {
 		if(!Number.isInteger(second)) { return undefined }
 
 		//
-		if(day > 31 || day <= 0) { return undefined }
-		if(year < 1900) { return undefined }
+		if(day > MAXIMUM_DAY || day <= 0) { return undefined }
+		if(year < MINIMUM_YEAR) { return undefined }
 		if(hour > 24 || hour < 0) { return undefined }
 		if(minute > 60 || minute < 0) { return undefined }
 		if(second > 60 || second < 0) { return undefined }

package/src/content-disposition.js

@@ -1,9 +1,9 @@
 /**
  * @typedef {Object} Disposition
  * @property {string} disposition
- * @property {Map<string, string>} parameters
- * @property {string} [name]
- * @property {string} [filename]
+ * @property {Map<string, string|undefined>} parameters
+ * @property {string|undefined} [name]
+ * @property {string|undefined} [filename]
  */
 
 export const DISPOSITION_SEPARATOR = {
@@ -15,17 +15,22 @@ export const DISPOSITION_PARAM_NAME = 'name'
 export const DISPOSITION_PARAM_FILENAME = 'filename'
 
 /**
- * @param {string} contentDispositionHeader
+ * @param {string|undefined} contentDispositionHeader
  * @returns {Disposition|undefined}
  */
 export function parseContentDisposition(contentDispositionHeader) {
 	if(contentDispositionHeader === undefined) { return undefined }
 
 	const [ disposition, ...parameterSet ] = contentDispositionHeader.trim().split(DISPOSITION_SEPARATOR.PARAMETER).map(entry => entry.trim())
+	if(disposition === undefined) { return undefined }
 	const parameters = new Map(parameterSet.map(parameter => {
-		const [ key, value ] = parameter.split(DISPOSITION_SEPARATOR.KVP).map(p => p.trim())
-		return [ key, value ]
-	}))
+			const [ key, value ] = parameter.split(DISPOSITION_SEPARATOR.KVP).map(p => p.trim())
+			if(key === undefined) { return undefined }
+			return { key, value }
+		})
+		.filter(item => item !== undefined)
+		.map(({ key, value }) => ([ key, value ])))
+
 
 	const name = parameters.get(DISPOSITION_PARAM_NAME)
 	const filename = parameters.get(DISPOSITION_PARAM_FILENAME)

package/src/content-type.js

@@ -29,10 +29,12 @@ export const SPECIAL_CHARS = [
 	'\n', '\r', '\t'
 ]
 
+export const WHITESPACE_REGEX = /\s/
+
 /**
  * @param {string} c
  */
-export function isWhitespace(c){ return /\s/.test(c) }
+export function isWhitespace(c){ return WHITESPACE_REGEX.test(c) }
 
 /**
  * @param {string|undefined} value
@@ -116,22 +118,21 @@ export function parseContentType(contentTypeHeader) {
 
 	const parameters = new Map()
 
-	parameterSet
-			.forEach(parameter => {
-				const [ key, value ] = parameter.split(CONTENT_TYPE_SEPARATOR.KVP)
-				if(key === undefined || key === '') { return }
-				if(value === undefined || value === '') { return }
-				if(hasSpecialChar(key)) { return }
+	for(const parameter of parameterSet) {
+		const [ key, value ] = parameter.split(CONTENT_TYPE_SEPARATOR.KVP)
+		if(key === undefined || key === '') { continue }
+		if(value === undefined || value === '') { continue }
 
-				const actualKey = key?.trim().toLowerCase()
+		const actualKey = key?.trim().toLowerCase()
+		if(hasSpecialChar(actualKey)) { continue }
 
-				const quoted = (value.charAt(0) === '"' && value.charAt(value.length - 1) === '"')
-				const actualValue = quoted ? value.substring(1, value.length - 1) : value
+		const quoted = (value.at(0) === '"' && value.at(-1) === '"')
+		const actualValue = quoted ? value.substring(1, value.length - 1) : value
 
-				if(!parameters.has(actualKey)) {
-					parameters.set(actualKey, actualValue)
-				}
-			})
+		if(!parameters.has(actualKey)) {
+			parameters.set(actualKey, actualValue)
+		}
+	}
 
 	const charset = parameters.get(CHARSET)
 
@@ -142,3 +143,6 @@ export function parseContentType(contentTypeHeader) {
 		parameters
 	}
 }
+
+//
+// console.log(parseContentType('multipart/form-data; boundary=----WebKitFormBoundaryJZy5maoMBkBMoGjt'))

package/src/forwarded.js

@@ -49,7 +49,7 @@ export class Forwarded {
 					})
 					.filter(item => item !== undefined))
 			)
-			.filter(m => m.size !== 0)
+			.filter(m => m.size > 0)
 	}
 
 	/**

package/src/index.js

@@ -1,7 +1,9 @@
+/** biome-ignore-all lint/performance/noBarrelFile: entry point */
+/** biome-ignore-all lint/performance/noReExportAll: entry point */
+export * from './accept.js'
 export * from './accept-encoding.js'
 export * from './accept-language.js'
 export * from './accept-util.js'
-export * from './accept.js'
 export * from './cache-control.js'
 export * from './conditional.js'
 export * from './content-disposition.js'

package/src/multipart.js

@@ -1,8 +1,8 @@
 import { ReadableStream } from 'node:stream/web'
 
 import { parseContentDisposition } from './content-disposition.js'
-import { parseContentType } from './content-type.js'
 import { ContentRange } from './content-range.js'
+import { parseContentType } from './content-type.js'
 
 /** @import { ContentRangeDirective } from './content-range.js' */
 /** @import { SendBody } from './response/send-util.js' */
@@ -48,9 +48,9 @@ export class Multipart {
 	/**
 	 * @param {string} text
 	 * @param {string} boundary
-	 * @param {string} [charset='utf8']
+	 * @param {string} [_charset='utf8']
 	 */
-	static parse_FormData(text, boundary, charset = 'utf8') {
+	static parse_FormData(text, boundary, _charset = 'utf8') {
 		// console.log({ boundary, text })
 		const formData = new FormData()
 
@@ -91,10 +91,10 @@ export class Multipart {
 				if(line === EMPTY) { state = MULTIPART_STATE.VALUE }
 				else {
 					const [ rawName, value ] = line.split(HEADER_SEPARATOR)
-					const name = rawName.toLowerCase()
+					const name = rawName?.toLowerCase()
 					// console.log('header', name, value)
 					if(name === MULTIPART_HEADER.CONTENT_TYPE) {
-						const contentType = parseContentType(value)
+						const _contentType = parseContentType(value)
 						// console.log({ contentType })
 					}
 					else if(name === MULTIPART_HEADER.CONTENT_DISPOSITION) {

package/src/preference.js

@@ -0,0 +1,205 @@
+// https://datatracker.ietf.org/doc/html/rfc7240
+// https://www.rfc-editor.org/rfc/rfc7240#section-3
+
+export const SEPARATOR = {
+	PREFERENCE: ',',
+	PARAMS: ';',
+	PARAM_KVP: '=',
+	KVP: '='
+}
+
+export const QUOTE = '"'
+
+export const DIRECTIVE_RESPOND_ASYNC = 'respond-async'
+export const DIRECTIVE_WAIT = 'wait'
+export const DIRECTIVE_HANDLING = 'handling'
+export const DIRECTIVE_REPRESENTATION = 'return'
+export const DIRECTIVE_TIMEZONE = 'timezone'
+
+export const DIRECTIVE_HANDLING_STRICT = 'strict'
+export const DIRECTIVE_HANDLING_LENIENT = 'lenient'
+
+export const DIRECTIVE_REPRESENTATION_MINIMAL = 'minimal'
+export const DIRECTIVE_REPRESENTATION_HEADERS_ONLY = 'headers-only'
+export const DIRECTIVE_REPRESENTATION_FULL = 'representation'
+
+
+/**
+ * @param {string|undefined} value
+ */
+export function stripQuotes(value) {
+	if(value === undefined) { return undefined }
+	return value.substring(1, value.length - 1)
+}
+
+/**
+ * @param {string|undefined} value
+ */
+export function isQuoted(value) {
+	if(value === undefined) { return false }
+	if(value.length < 2) { return false }
+	if(!value.startsWith(QUOTE)) { return false }
+	if(!value.endsWith(QUOTE)) { return false }
+	return true
+}
+
+/**
+ * @typedef {Object} Preference
+ * @property {string|undefined} value
+ * @property {Map<string, string|undefined>} parameters
+ */
+
+/**
+ * @template P
+ * @typedef {Object} RequestPreferencesBase
+ * @property {boolean|undefined} [asynchronous]
+ * @property {string|undefined} [representation]
+ * @property {string|undefined} [handling]
+ * @property {number|undefined} [wait]
+ * @property {string|undefined} [timezone]
+ * @property {Map<string, P>} preferences
+ */
+
+/** @typedef {RequestPreferencesBase<Preference>} RequestPreferences */
+/** @typedef {RequestPreferencesBase<Partial<Omit<Preference,'parameters'>>|undefined>} AppliedRequestPreferences */
+
+export class Preferences {
+	/**
+	 * @param {string|undefined} header
+	 * @returns {RequestPreferences|undefined}
+	 */
+	static parse(header) {
+		if(header === undefined) { return undefined }
+
+		const preferences = new Map(header.split(SEPARATOR.PREFERENCE)
+			.map(pref => {
+				const [ kvp, ...params ] = pref.trim().split(SEPARATOR.PARAMS)
+				const [ key, rawValue ] = kvp?.split(SEPARATOR.KVP) ?? []
+
+				if(key === undefined) { return {} }
+				const valueOrEmpty = isQuoted(rawValue) ? stripQuotes(rawValue) : rawValue
+				const value = (valueOrEmpty !== '') ? valueOrEmpty : undefined
+
+				const parameters = new Map(params
+					.map(param => {
+						const [ pKey, rawPValue ] = param.split(SEPARATOR.PARAM_KVP)
+						if(pKey === undefined) { return {} }
+						const trimmedRawPValue = rawPValue?.trim()
+						const pValueOrEmpty = isQuoted(trimmedRawPValue) ? stripQuotes(trimmedRawPValue) : trimmedRawPValue
+						const pValue = (pValueOrEmpty !== '') ? pValueOrEmpty : undefined
+						return { key: pKey.trim(), value: pValue }
+					})
+					.filter(item => item.key !== undefined)
+					.map(item => ([ item.key, item.value ]))
+				)
+
+				return { key, value, parameters }
+			})
+			.filter(item => item.key !== undefined)
+			.map(item => ([
+				item.key,
+				{ value: item.value, parameters: item.parameters }
+			]))
+		)
+
+		//
+		const asynchronous = preferences.get(DIRECTIVE_RESPOND_ASYNC) !== undefined
+		const representation = preferences.get(DIRECTIVE_REPRESENTATION)?.value
+		const handling = preferences.get(DIRECTIVE_HANDLING)?.value
+		const wait = Number.parseInt(preferences.get(DIRECTIVE_WAIT)?.value ?? '')
+		const timezone = preferences.get(DIRECTIVE_TIMEZONE)?.value
+
+		return {
+			asynchronous,
+			representation,
+			handling,
+			wait: Number.isFinite(wait) ? wait : undefined,
+			timezone,
+			preferences
+		}
+	}
+}
+
+export class AppliedPreferences {
+
+	/**
+	 * @param {Map<string, string|undefined>} preferences
+	 */
+	static #encode_Map(preferences) {
+		return [ ...preferences.entries()
+			.map(([ key, value ]) => {
+				// todo check if value should be quoted
+				if(value !== undefined) { return `${key}${SEPARATOR.KVP}${value}` }
+				return key
+			}) ]
+			.join(SEPARATOR.PREFERENCE)
+	}
+
+	/**
+	 * @param {Partial<AppliedRequestPreferences>|Map<string, string|undefined>|undefined} preferences
+	 */
+	static encode(preferences) {
+		if(preferences === undefined) { return undefined}
+		if(preferences instanceof Map) {
+			return AppliedPreferences.#encode_Map(preferences)
+		}
+
+		const applied = new Map()
+
+		for(const [ key, pref ] of preferences.preferences?.entries() ?? []) {
+			applied.set(key, pref?.value)
+		}
+
+		if(preferences.asynchronous === true) { applied.set(DIRECTIVE_RESPOND_ASYNC, undefined) }
+		if(preferences.asynchronous === false) { applied.delete(DIRECTIVE_RESPOND_ASYNC) }
+		if(preferences.representation !== undefined) { applied.set(DIRECTIVE_REPRESENTATION, preferences.representation) }
+		if(preferences.handling !== undefined) { applied.set(DIRECTIVE_HANDLING, preferences.handling) }
+		if(preferences.wait !== undefined) { applied.set(DIRECTIVE_WAIT, preferences.wait) }
+		if(preferences.timezone !== undefined) { applied.set(DIRECTIVE_TIMEZONE, preferences.timezone) }
+
+		return AppliedPreferences.#encode_Map(applied)
+	}
+}
+
+
+// console.log(AppliedPreferences.encode(undefined))
+// console.log(AppliedPreferences.encode({ }))
+// console.log(AppliedPreferences.encode({ wait: 10 }))
+// console.log(AppliedPreferences.encode({ asynchronous: undefined }))
+// console.log(AppliedPreferences.encode({ asynchronous: false }))
+// console.log(AppliedPreferences.encode({ asynchronous: true }))
+// console.log(AppliedPreferences.encode({ preferences: new Map([
+// 	[ 'respond-async', { value: undefined } ]
+// ]) }))
+// console.log(AppliedPreferences.encode({
+// 	asynchronous: false,
+// 	preferences: new Map([
+// 	[ 'respond-async', { value: 'fake' } ]
+// ]) }))
+// console.log(AppliedPreferences.encode({ asynchronous: true, wait: 100 }))
+// console.log(AppliedPreferences.encode({
+// 	representation: DIRECTIVE_REPRESENTATION_MINIMAL,
+// 	preferences: new Map([
+// 		['foo', { value: 'bar', parameters: new Map([ [ 'biz', 'bang' ] ]) } ],
+// 		[ 'fake', undefined ]
+// 	])
+// }))
+
+// console.log(Preferences.parse('handling=lenient, wait=100, respond-async'))
+// console.log(Preferences.parse(' foo; bar')?.preferences)
+// console.log(Preferences.parse(' foo; bar=""')?.preferences)
+// console.log(Preferences.parse(' foo=""; bar')?.preferences)
+// console.log(Preferences.parse(' foo =""; bar;biz; bang ')?.preferences)
+// console.log(Preferences.parse('return=minimal; foo="some parameter"')?.preferences)
+
+// console.log(Preferences.parse('timezone=America/Los_Angeles'))
+// console.log(Preferences.parse('return=headers-only'))
+// console.log(Preferences.parse('return=minimal'))
+// console.log(Preferences.parse('return=representation'))
+// console.log(Preferences.parse('respond-async, wait=10`'))
+// console.log(Preferences.parse('priority=5'))
+// console.log(Preferences.parse('foo; bar'))
+// console.log(Preferences.parse('foo; bar=""'))
+// console.log(Preferences.parse('foo=""; bar'))
+// console.log(Preferences.parse('handling=lenient, wait=100, respond-async'))
+// console.log(Preferences.parse('return=minimal; foo="some parameter"'))

package/src/range.js

@@ -77,7 +77,7 @@ export class Range {
 					return { start, end: RANGE_EMPTY }
 				}
 
-				if(!Number.isInteger(start) || !Number.isInteger(end)) { return undefined }
+				if(!(Number.isInteger(start) && Number.isInteger(end))) { return undefined }
 				return { start, end }
 			})
 			.filter(range => range !== undefined)
@@ -105,19 +105,14 @@ export class Range {
 			return { start, end }
 		})
 
-		const exceeds = normalizedRanges.reduce((acc, value) => {
-			return acc || (value.start >= contentLength) || (value.end >= contentLength)
-		}, false)
+		const exceeds = normalizedRanges.reduce((acc, value) => (acc || (value.start >= contentLength) || (value.end >= contentLength)), false)
 
-		const overlap = normalizedRanges
+		const { overlap } = normalizedRanges
 			.toSorted((a, b) => a.start - b.start)
-			.reduce((acc, item) => {
-				return {
+			.reduce((acc, item) => ({
 					overlap: acc.overlap || acc.end > item.start,
 					end: item.end
-				}
-			}, { overlap: false, end: 0 })
-			.overlap
+				}), { overlap: false, end: 0 })
 
 		return {
 			units: directive.units,

package/src/response/accepted.js

@@ -1,4 +1,5 @@
 import http2 from 'node:http2'
+
 import { send } from './send-util.js'
 
 /** @import { ServerHttp2Stream } from 'node:http2' */

package/src/response/bytes.js

@@ -1,4 +1,5 @@
 import http2 from 'node:http2'
+
 import { send_bytes } from './send-util.js'
 
 /** @import { ServerHttp2Stream } from 'node:http2' */

package/src/response/conflict.js

@@ -1,4 +1,5 @@
 import http2 from 'node:http2'
+
 import { send } from './send-util.js'
 
 /** @import { ServerHttp2Stream } from 'node:http2' */

package/src/response/content-too-large.js

@@ -1,4 +1,5 @@
 import http2 from 'node:http2'
+
 import { send } from './send-util.js'
 
 /** @import { ServerHttp2Stream } from 'node:http2' */

package/src/response/created.js

@@ -1,6 +1,7 @@
 import http2 from 'node:http2'
-import { send } from './send-util.js'
+
 import { Conditional } from '../conditional.js'
+import { send } from './send-util.js'
 
 /** @import { ServerHttp2Stream } from 'node:http2' */
 /** @import { Metadata } from './defs.js' */

package/src/response/defs.js

@@ -10,6 +10,8 @@ export const HTTP_HEADER_SEC_FETCH_MODE = 'sec-fetch-mode'
 export const HTTP_HEADER_SEC_FETCH_DEST = 'sec-fetch-dest'
 export const HTTP_HEADER_ACCEPT_POST = 'accept-post'
 export const HTTP_HEADER_ACCEPT_PATCH = 'accept-patch'
+export const HTTP_HEADER_CLEAR_SITE_DATE = 'clear-site-data'
+export const HTTP_HEADER_PREFERENCE_APPLIED = 'preference-applied'
 
 export const HTTP_METHOD_QUERY = 'QUERY'
 export const HTTP_HEADER_ACCEPT_QUERY = 'accept-query'

package/src/response/error.js

@@ -1,4 +1,5 @@
 import http2 from 'node:http2'
+
 import { CONTENT_TYPE_TEXT } from '../content-type.js'
 import { send } from './send-util.js'
 

package/src/response/gone.js

@@ -1,4 +1,5 @@
 import http2 from 'node:http2'
+
 import { send } from './send-util.js'
 
 /** @import { ServerHttp2Stream } from 'node:http2' */

package/src/response/header-util.js

@@ -1,7 +1,8 @@
 import http2 from 'node:http2'
+
 import {
-	HTTP_HEADER_TIMING_ALLOW_ORIGIN,
 	HTTP_HEADER_SERVER_TIMING,
+	HTTP_HEADER_TIMING_ALLOW_ORIGIN,
 	ServerTiming
 } from '../server-timing.js'
 

package/src/response/im-a-teapot.js

@@ -1,4 +1,5 @@
 import http2 from 'node:http2'
+
 import { send } from './send-util.js'
 
 /** @import { ServerHttp2Stream } from 'node:http2' */

package/src/response/index.js

@@ -1,5 +1,8 @@
+/** biome-ignore-all lint/performance/noBarrelFile: entry point */
+/** biome-ignore-all lint/performance/noReExportAll: entry point */
 export * from './defs.js'
 export * from './send-util.js'
+// end common headers
 
 export * from './accepted.js'
 export * from './bytes.js'

package/src/response/insufficient-storage.js

@@ -1,4 +1,5 @@
 import http2 from 'node:http2'
+
 import { send } from './send-util.js'
 
 /** @import { ServerHttp2Stream } from 'node:http2' */

package/src/response/json.js

@@ -1,7 +1,7 @@
 import http2 from 'node:http2'
 
-import { send_encoded } from './send-util.js'
 import { CONTENT_TYPE_JSON } from '../content-type.js'
+import { send_encoded } from './send-util.js'
 
 /** @import { ServerHttp2Stream } from 'node:http2' */
 /** @import { Metadata } from './defs.js' */

package/src/response/moved-permanently.js

@@ -1,4 +1,5 @@
 import http2 from 'node:http2'
+
 import { send } from './send-util.js'
 
 /** @import { ServerHttp2Stream } from 'node:http2' */

package/src/response/multiple-choices.js

@@ -1,4 +1,5 @@
 import http2 from 'node:http2'
+
 import { send } from './send-util.js'
 
 /** @import { ServerHttp2Stream } from 'node:http2' */

package/src/response/no-content.js

@@ -1,6 +1,7 @@
 import http2 from 'node:http2'
-import { send } from './send-util.js'
+
 import { Conditional } from '../conditional.js'
+import { send } from './send-util.js'
 
 /** @import { ServerHttp2Stream } from 'node:http2' */
 /** @import { Metadata } from './defs.js' */

package/src/response/not-acceptable.js

@@ -1,4 +1,5 @@
 import http2 from 'node:http2'
+
 import { CONTENT_TYPE_JSON } from '../content-type.js'
 import { send } from './send-util.js'
 
@@ -14,7 +15,7 @@ const { HTTP_STATUS_NOT_ACCEPTABLE } = http2.constants
  */
 export function sendNotAcceptable(stream, supportedTypes, meta) {
 	const supportedTypesList = Array.isArray(supportedTypes) ? supportedTypes : [ supportedTypes ]
-	const has = supportedTypesList.length !== 0
+	const has = supportedTypesList.length > 0
 
 	send(stream,
 		HTTP_STATUS_NOT_ACCEPTABLE,

package/src/response/not-allowed.js

@@ -1,4 +1,5 @@
 import http2 from 'node:http2'
+
 import { send } from './send-util.js'
 
 /** @import { ServerHttp2Stream } from 'node:http2' */

package/src/response/not-found.js

@@ -1,4 +1,5 @@
 import http2 from 'node:http2'
+
 import { CONTENT_TYPE_TEXT } from '../content-type.js'
 import { send } from './send-util.js'
 

package/src/response/not-implemented.js

@@ -1,4 +1,5 @@
 import http2 from 'node:http2'
+
 import { CONTENT_TYPE_TEXT } from '../content-type.js'
 import { send } from './send-util.js'
 

package/src/response/not-modified.js

@@ -1,7 +1,8 @@
 import http2 from 'node:http2'
-import { send } from './send-util.js'
-import { Conditional } from '../conditional.js'
+
 import { CacheControl } from '../cache-control.js'
+import { Conditional } from '../conditional.js'
+import { send } from './send-util.js'
 
 /** @import { ServerHttp2Stream } from 'node:http2' */
 /** @import { Metadata } from './defs.js' */

package/src/response/partial-content.js

@@ -1,9 +1,9 @@
 import http2 from 'node:http2'
 
-import { send_bytes } from './send-util.js'
-import { RANGE_UNITS_BYTES } from "./defs.js"
-import { Multipart } from '../multipart.js'
 import { MIME_TYPE_MULTIPART_RANGE } from '../content-type.js'
+import { Multipart } from '../multipart.js'
+import { RANGE_UNITS_BYTES } from "./defs.js"
+import { send_bytes } from './send-util.js'
 
 /** @import { ServerHttp2Stream } from 'node:http2' */
 /** @import { Metadata } from './defs.js' */

package/src/response/precondition-failed.js

@@ -1,4 +1,5 @@
 import http2 from 'node:http2'
+
 import { send } from './send-util.js'
 
 /** @import { ServerHttp2Stream } from 'node:http2' */

package/src/response/preflight.js

@@ -1,8 +1,9 @@
 import http2 from 'node:http2'
+
 import {
-	HTTP2_HEADER_ACCESS_CONTROL_MAX_AGE,
 	HTTP_HEADER_ACCEPT_QUERY,
 	HTTP_METHOD_QUERY,
+	HTTP2_HEADER_ACCESS_CONTROL_MAX_AGE,
 	PREFLIGHT_AGE_SECONDS
 } from './defs.js'
 import { send } from './send-util.js'

package/src/response/range-not-satisfiable.js

@@ -1,6 +1,7 @@
 import http2 from 'node:http2'
-import { send } from './send-util.js'
+
 import { CONTENT_RANGE_UNKNOWN, ContentRange } from '../content-range.js'
+import { send } from './send-util.js'
 
 /** @import { ServerHttp2Stream } from 'node:http2' */
 /** @import { Metadata } from './defs.js' */

package/src/response/see-other.js

@@ -1,4 +1,5 @@
 import http2 from 'node:http2'
+
 import { send } from './send-util.js'
 
 /** @import { ServerHttp2Stream } from 'node:http2' */

package/src/response/send-util.js

@@ -8,16 +8,16 @@ import {
 	zstdCompressSync
 } from 'node:zlib'
 
+import { CacheControl } from '../cache-control.js'
+import { Conditional } from '../conditional.js'
+import { ContentRange } from '../content-range.js'
+import { CHARSET_UTF8 } from '../content-type.js'
+import { HTTP_HEADER_ACCEPT_QUERY } from './defs.js'
 import {
 	coreHeaders,
 	customHeaders,
 	performanceHeaders
 } from './header-util.js'
-import { ContentRange } from '../content-range.js'
-import { CacheControl } from '../cache-control.js'
-import { Conditional } from '../conditional.js'
-import { HTTP_HEADER_ACCEPT_QUERY } from './defs.js'
-import { CHARSET_UTF8 } from '../content-type.js'
 
 /** @import { ServerHttp2Stream } from 'node:http2' */
 /** @import { IncomingHttpHeaders } from 'node:http2' */
@@ -29,6 +29,12 @@ import { CHARSET_UTF8 } from '../content-type.js'
 
 /** @typedef {ArrayBufferLike|ArrayBufferView|ReadableStream|string} SendBody */
 
+const {
+	HTTP_STATUS_INTERNAL_SERVER_ERROR,
+	HTTP_STATUS_NOT_FOUND,
+	HTTP_STATUS_UNAUTHORIZED
+} = http2.constants
+
 const {
 	HTTP2_HEADER_CONTENT_ENCODING,
 	HTTP2_HEADER_VARY,
@@ -138,9 +144,9 @@ export function send_bytes(stream, status, contentType, obj, range, contentLengt
  */
 export function send(stream, status, headers, exposedHeaders, contentType, body, meta) {
 	// if(status >= 400) { console.warn(status, body) }
-	if(status === 401) { console.warn(status, body) }
-	if(status === 404) { console.warn(status, body) }
-	if(status >= 500) { console.warn(status, body) }
+	if(status === HTTP_STATUS_UNAUTHORIZED) { console.warn(status, body) }
+	if(status === HTTP_STATUS_NOT_FOUND) { console.warn(status, body) }
+	if(status >= HTTP_STATUS_INTERNAL_SERVER_ERROR) { console.warn(status, body) }
 	// console.log('SEND', status, body?.byteLength)
 
 	if(stream === undefined) { console.log('send - end stream undef'); return }

package/src/response/sse.js

@@ -1,9 +1,10 @@
 import http2 from 'node:http2'
+
 import {
-	SSE_MIME,
-	SSE_INACTIVE_STATUS_CODE,
-	SSE_BOM,
 	ENDING,
+	SSE_BOM,
+	SSE_INACTIVE_STATUS_CODE,
+	SSE_MIME,
 } from '@johntalton/sse-util'
 import { coreHeaders, performanceHeaders } from './header-util.js'
 

package/src/response/temporary-redirect.js

@@ -1,4 +1,5 @@
 import http2 from 'node:http2'
+
 import { send } from './send-util.js'
 
 /** @import { ServerHttp2Stream } from 'node:http2' */

package/src/response/timeout.js

@@ -1,4 +1,5 @@
 import http2 from 'node:http2'
+
 import { send } from './send-util.js'
 
 /** @import { ServerHttp2Stream } from 'node:http2' */

package/src/response/too-many-requests.js

@@ -1,4 +1,5 @@
 import http2 from 'node:http2'
+
 import { CONTENT_TYPE_TEXT } from '../content-type.js'
 import {
 	HTTP_HEADER_RATE_LIMIT,

package/src/response/trace.js

@@ -1,4 +1,5 @@
 import http2 from 'node:http2'
+
 import { CONTENT_TYPE_MESSAGE_HTTP } from '../content-type.js'
 import { send } from './send-util.js'
 
@@ -8,6 +9,9 @@ import { send } from './send-util.js'
 
 const { HTTP_STATUS_OK } = http2.constants
 
+const LINE_ENDING = '\n'
+const PSEUDO_HEADER_PREFIX = ':'
+
 /**
  * @param {ServerHttp2Stream} stream
  * @param {string} method
@@ -27,13 +31,13 @@ export function sendTrace(stream, method, url, headers, meta) {
 	const reconstructed = [
 		`${method} ${url.pathname}${url.search} ${version}`,
 		Object.entries(headers)
-			.filter(([ key ]) => !key.startsWith(':'))
+			.filter(([ key ]) => !key.startsWith(PSEUDO_HEADER_PREFIX))
 			.filter(([ key ]) => !FILTER_KEYS.includes(key))
 			.map(([ key, value ]) => `${key}: ${value}`)
-			.join('\n'),
-		'\n'
+			.join(LINE_ENDING),
+		LINE_ENDING
 		]
-		.join('\n')
+		.join(LINE_ENDING)
 
 	send(stream, HTTP_STATUS_OK, {}, [], CONTENT_TYPE_MESSAGE_HTTP, reconstructed, meta)
 }

package/src/response/unauthorized.js

@@ -1,4 +1,5 @@
 import http2 from 'node:http2'
+
 import { send } from './send-util.js'
 
 /** @import { ServerHttp2Stream } from 'node:http2' */

package/src/response/unavailable.js

@@ -1,4 +1,5 @@
 import http2 from 'node:http2'
+
 import { CONTENT_TYPE_TEXT } from '../content-type.js'
 import { send } from './send-util.js'
 

package/src/response/unprocessable.js

@@ -1,4 +1,5 @@
 import http2 from 'node:http2'
+
 import { send } from './send-util.js'
 
 /** @import { ServerHttp2Stream } from 'node:http2' */

package/src/response/unsupported-media.js

@@ -1,10 +1,13 @@
 import http2 from 'node:http2'
-import { HTTP_HEADER_ACCEPT_POST, HTTP_HEADER_ACCEPT_QUERY } from './defs.js'
+
+import { HTTP_HEADER_ACCEPT_PATCH, HTTP_HEADER_ACCEPT_POST, HTTP_HEADER_ACCEPT_QUERY } from './defs.js'
 import { send } from './send-util.js'
 
 /** @import { ServerHttp2Stream } from 'node:http2' */
 /** @import { Metadata } from './defs.js' */
 
+const { HTTP2_METHOD_POST, HTTP2_METHOD_PATCH } = http2.constants
+
 const { HTTP_STATUS_UNSUPPORTED_MEDIA_TYPE } = http2.constants
 
 /**
@@ -14,13 +17,16 @@ const { HTTP_STATUS_UNSUPPORTED_MEDIA_TYPE } = http2.constants
  * @param {Metadata} meta
  */
 export function sendUnsupportedMediaType(stream, acceptableMediaType, supportedQueryTypes, meta) {
-	const acceptable = Array.isArray(acceptableMediaType) ? acceptableMediaType : [ acceptableMediaType ]
-
 	const supportsQuery = supportedQueryTypes !== undefined && supportedQueryTypes.length > 0
 	const exposedHeaders = supportsQuery ? [ HTTP_HEADER_ACCEPT_QUERY, HTTP_HEADER_ACCEPT_POST ] : [ HTTP_HEADER_ACCEPT_POST ]
 
+	const method = HTTP2_METHOD_POST // todo pass in as parameter or split acceptable to post and patch types
+	const acceptable = Array.isArray(acceptableMediaType) ? acceptableMediaType : [ acceptableMediaType ]
+	const acceptHeader = (method === HTTP2_METHOD_POST) ? HTTP_HEADER_ACCEPT_POST : HTTP_HEADER_ACCEPT_PATCH
+	const acceptValue = ((method === HTTP2_METHOD_POST) || (method === HTTP2_METHOD_PATCH)) ? acceptable.join(',') : undefined
+
 	send(stream, HTTP_STATUS_UNSUPPORTED_MEDIA_TYPE, {
-			[HTTP_HEADER_ACCEPT_POST]: acceptable.join(','),
+			[acceptHeader]: acceptValue,
 			[HTTP_HEADER_ACCEPT_QUERY]: supportedQueryTypes?.join(',')
 		}, exposedHeaders, undefined, undefined, meta)
 }