@johntalton/http-util 6.0.0 → 7.0.1

package/src/headers/forwarded.js

@@ -41,6 +41,8 @@ export class Forwarded {
 	 * @returns {Map<string, string>|undefined}
 	 */
 	static selectRightMost(forwardedList, skipList = []) {
+		if(forwardedList === undefined) { return undefined }
+
 		const iter = skipList[Symbol.iterator]()
 
 		for(const forwarded of forwardedList.toReversed()) {
@@ -54,39 +56,6 @@ export class Forwarded {
 	}
 }
 
-
-/*
-const examples = [
-	{ f: [], s: [], ef: undefined },
-
-	{ f: [], s: [ '1.1.1.1' ] , ef: undefined },
-	{ f: [], s: [ '*' ] , ef: undefined },
-
-	{ f: [ { for: '1.1.1.1' } ], s: [], ef: '1.1.1.1' },
-	{ f: [ { for: '1.1.1.1' } ], s: [ '*' ], ef: undefined },
-	{ f: [ { for: '1.1.1.1' }, { for: '2.2.2.2' } ], s: [], ef: '2.2.2.2' },
-	{ f: [ { for: '1.1.1.1' }, { for: '2.2.2.2' } ], s: [ '2.2.2.2' ], ef: '1.1.1.1' },
-	{ f: [ { for: '1.1.1.1' }, { for: '2.2.2.2' }, { for: '3.3.3.3' } ], s: [ '3.3.3.3', '2.2.2.2' ], ef: '1.1.1.1' },
-	{ f: [ { for: '1.1.1.1' }, { for: '2.2.2.2' }, { for: '3.3.3.3' } ], s: [ '3.3.3.3', '*' ], ef: '1.1.1.1' },
-	{ f: [ { for: '1.1.1.1' }, { for: '2.2.2.2' }, { for: '3.3.3.3' } ], s: [ '*', '*' ], ef: '1.1.1.1' },
-	{ f: [ { for: '1.1.1.1' }, { for: '2.2.2.2' }, { for: '3.3.3.3' } ], s: [ '*', '*', '*' ], ef: undefined },
-
-	{ f: [ { for: '1.1.1.1' } ], s: [ '*', '*' ], ef: undefined },
-
-	{ f: [ { for: '1.1.1.1' }, { for: '2.2.2.2' }, { for: '3.3.3.3' } ], s: [ '3.3.3.3'], ef: '2.2.2.2' },
-	{ f: [ { for: '1.1.1.1' }, { for: '2.2.2.2' }, { for: '3.3.3.3' } ], s: [ '*'], ef: '2.2.2.2' },
-]
-
-for(const { f, s, ef } of examples) {
-	const result = Forwarded.selectRightMost(f.map(i => new Map(Object.entries(i))), s)
-	const resultFor = result?.get('for')
-	if(resultFor !== ef) {
-		console.log(`mismatch ${ef} !== ${resultFor}`)
-	}
-}
-*/
-
-
 /*
 	const examples = [
 		null,

package/src/headers/link.js

@@ -1,6 +1,6 @@
 /**
  * @typedef {Object} LinkItem
- * @property {string} url
+ * @property {URL|string} url
  * @property {string|undefined} [relation]
  * @property {Map<string, string>|undefined} [parameters]
  */
@@ -9,8 +9,8 @@ export class Link {
 	/**
 	 * @param {LinkItem} link
 	 */
-	static  *#encode(link) {
-		const encodedUri = encodeURI(link.url)
+	static *#encode(link) {
+		const encodedUri = (link.url instanceof URL) ? link.url : encodeURI(link.url)
 
 		yield `<${encodedUri}>`
 		if(link.relation !== undefined) { yield `rel="${link.relation}"` }
@@ -20,16 +20,15 @@ export class Link {
 		}
 	}
 
-
 	/**
-	 * @param {LinkItem} link
+	 * @param {Array<LinkItem>|LinkItem|undefined} links
 	 */
-	static encode(link) {
-		return [ ...Link.#encode(link) ].join('; ')
+	static encode(links) {
+		if(links === undefined) { return undefined }
+		const linkAry = Array.isArray(links) ? links : [ links ]
+		if(linkAry.length === 0) { return undefined }
+		return linkAry
+			.map(link => [ ...Link.#encode(link) ].join('; '))
+			.join(', ')
 	}
 }
-
-// console.log(Link.encode({ url: '/index.html', parameters: new Map([ [ 'as', 'style' ], [ 'fetchpriority', 'high' ] ]) }))
-//  console.log(Link.encode({ url: '/index.html', relation: 'next', parameters: new Map([  [ 'fetchpriority', 'high' ] ]) }))
-//  console.log(Link.encode({ url: '/index.html', relation: 'next' }))
-// console.log(Link.encode({ url: 'https://example.com/苗条', relation: 'preconnect' }))

package/src/headers/multipart.js

@@ -49,11 +49,14 @@ export class Multipart {
 	 * @param {string} text
 	 * @param {string} boundary
 	 * @param {string} [_charset='utf8']
+	 * @returns {FormData}
 	 */
 	static parse_FormData(text, boundary, _charset = 'utf8') {
-		// console.log({ boundary, text })
 		const formData = new FormData()
 
+		if(text === undefined) { return formData }
+		if(boundary === undefined) { return formData }
+
 		if(text === '') {
 			// empty body
 			return formData
@@ -61,11 +64,6 @@ export class Multipart {
 
 		const lines = text.split(MULTIPART_SEPARATOR)
 
-		if(lines.length === 0) {
-			// missing body?
-			return formData
-		}
-
 		const boundaryBegin = `${BOUNDARY_MARK}${boundary}`
 		const boundaryEnd = `${BOUNDARY_MARK}${boundary}${BOUNDARY_MARK}`
 
@@ -94,8 +92,8 @@ export class Multipart {
 					const name = rawName?.toLowerCase()
 					// console.log('header', name, value)
 					if(name === MULTIPART_HEADER.CONTENT_TYPE) {
-						const _contentType = ContentType.parse(value)
-						// console.log({ contentType })
+						const contentType = ContentType.parse(value)
+						//console.log({ contentType })
 					}
 					else if(name === MULTIPART_HEADER.CONTENT_DISPOSITION) {
 						const disposition = ContentDisposition.parse(value)
@@ -103,8 +101,7 @@ export class Multipart {
 							throw new Error('disposition not form-data')
 						}
 
-						// todo: are names always quoted?
-						partName = disposition.name?.slice(1, -1)
+						partName = disposition.name
 					}
 					else {
 						// unsupported part header - ignore
@@ -128,10 +125,9 @@ export class Multipart {
 				}
 				state = MULTIPART_STATE.HEADERS
 			}
-			else {
-				throw new Error('unknown state')
-			}
-
+			// else {
+			// 	throw new Error('unknown state')
+			// }
 		}
 
 		return formData
@@ -150,6 +146,7 @@ export class Multipart {
 
 		return new ReadableStream({
 			type: 'bytes',
+			// async pull(controller) {},
 			async start(controller) {
 				const encoder = new TextEncoder()
 
@@ -158,7 +155,6 @@ export class Multipart {
 					controller.enqueue(encoder.encode(`${MULTIPART_HEADER.CONTENT_TYPE}: ${contentType}${MULTIPART_SEPARATOR}`))
 					controller.enqueue(encoder.encode(`${MULTIPART_HEADER.CONTENT_RANGE}: ${ContentRange.encode({ ...part.range, size: contentLength })}${MULTIPART_SEPARATOR}`))
 					controller.enqueue(encoder.encode(MULTIPART_SEPARATOR))
-					// controller.enqueue(encoder.encode(MULTIPART_SEPARATOR))
 
 					if(part.obj instanceof ReadableStream) {
 						// biome-ignore lint/performance/noAwaitInLoops: readable
@@ -175,7 +171,10 @@ export class Multipart {
 							}
 						}
 					}
-					else if(part.obj instanceof ArrayBuffer || ArrayBuffer.isView(part.obj)) {
+					else if(part.obj instanceof ArrayBuffer) {
+						controller.enqueue(new Uint8Array(part.obj))
+					}
+					else if(ArrayBuffer.isView(part.obj)) {
 						controller.enqueue(part.obj)
 					}
 					else if(typeof part.obj === 'string'){
@@ -183,7 +182,7 @@ export class Multipart {
 					}
 					else {
 						// console.log('error', typeof part.obj, part.obj)
-						throw new Error('unknown part type')
+						controller.error(new Error('unknown part type'))
 					}
 
 					controller.enqueue(encoder.encode(MULTIPART_SEPARATOR))
@@ -191,7 +190,9 @@ export class Multipart {
 
 				controller.enqueue(encoder.encode(boundaryEnd))
 
-      	controller.close()
+				// controller.enqueue(encoder.encode(MULTIPART_SEPARATOR))
+
+				controller.close()
 			}
 		})
 	}

package/src/headers/preference.js

@@ -128,46 +128,3 @@ export class AppliedPreferences {
 		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/headers/range.js

@@ -1,5 +1,7 @@
 import { RANGE_UNITS_BYTES } from '../defs.js'
 
+/** @import { AcceptRangeUnits } from '../defs.js' */
+
 export const RANGE_EQUAL = '='
 export const RANGE_SEPARATOR = '-'
 export const RANGE_LIST_SEPARATOR = ','
@@ -32,7 +34,7 @@ export const RANGE_EMPTY = ''
 /**
  * @template RV
  * @typedef {Object} RangeDirective
- * @property {'bytes'|'none'|undefined} units
+ * @property {AcceptRangeUnits|undefined} units
  * @property {Array<RV>} ranges
  */
 
@@ -97,6 +99,8 @@ export class Range {
 	 */
 	static normalize(directive, contentLength) {
 		if(directive === undefined) { return undefined }
+		if(!Number.isInteger(contentLength)) { return undefined }
+		if(contentLength <= 0) { return undefined }
 
 		/** @type {Array<NormalizedRangeValue>} */
 		const normalizedRanges = directive.ranges.map(({ start, end }) => {
@@ -122,33 +126,3 @@ export class Range {
 		}
 	}
 }
-
-// console.log(Range.parse(''))
-// console.log(Range.parse('='))
-// console.log(Range.parse('foo'))
-// console.log(Range.parse('bytes'))
-// console.log(Range.parse('bytes='))
-// console.log(Range.parse('bytes=-'))
-// console.log(Range.parse('bytes=foo'))
-// console.log(Range.parse('bytes=0-foo'))
-// console.log(Range.parse('bytes=0-0xff'))
-// console.log()
-// console.log(Range.parse('bytes=1024-'))
-// console.log(Range.parse('bytes=-1024'))
-// console.log(Range.parse('bytes=0-1024'))
-// console.log()
-// console.log(Range.parse('bytes=0-0,-1'))
-// console.log(Range.parse('bytes=0-1024, -1024'))
-// console.log(Range.parse('bytes= 0-999, 4500-5499, -1000'))
-// console.log(Range.parse('bytes=500-600,601-999'))
-
-// console.log('------')
-// console.log(Range.normalize(Range.parse('bytes=1024-'), 5000))
-// console.log(Range.normalize(Range.parse('bytes=-1024'), 5000))
-// console.log(Range.normalize(Range.parse('bytes=0-1024'), 5000))
-// console.log(Range.normalize(Range.parse('bytes=0-0,-1'), 10000)) // 0 and 9999
-// console.log(Range.normalize(Range.parse('bytes=0-1024, -1024'), 5000))
-// console.log(Range.normalize(Range.parse('bytes= 0-999, 4500-5499, -1000'), 5000))
-// console.log(Range.normalize(Range.parse('bytes=500-600,601-999'), 5000))
-
-// console.log(Range.normalize(Range.parse('bytes=-500'), 10000)) // 9500-9999

package/src/headers/rate-limit.js

@@ -1,6 +1,6 @@
 // https://www.ietf.org/archive/id/draft-ietf-httpapi-ratelimit-headers-10.html
 
-export  const HTTP_HEADER_RATE_LIMIT = 'RateLimit'
+export const HTTP_HEADER_RATE_LIMIT = 'RateLimit'
 export const HTTP_HEADER_RATE_LIMIT_POLICY = 'RateLimit-Policy'
 
 /**
@@ -45,6 +45,7 @@ export class RateLimit {
 	 * @param {RateLimitInfo} limitInfo
 	 */
 	static from(limitInfo) {
+		if(limitInfo === undefined) { return undefined }
 		const { name, remaining, resetSeconds, partitionKey } = limitInfo
 
 		if(name === undefined || remaining === undefined) { return undefined }
@@ -61,8 +62,12 @@ export class RateLimitPolicy {
 	 */
 	static from(...policies) {
 		if(policies === undefined) { return undefined }
+		if(policies.length === 0) { return undefined }
 
-		return policies
+		const remainingPolicies = policies.filter(pol => pol !== undefined)
+		if(remainingPolicies.length === 0) { return undefined }
+
+		return remainingPolicies
 			.filter(policy => policy.name !== undefined && policy.quota !== undefined)
 			.map(policy => {
 				const {

package/src/headers/server-timing.js

@@ -19,7 +19,7 @@ export const SERVER_TIMING_SEPARATOR = {
 
 export class ServerTiming {
 	/**
-	 * @param {Array<TimingsInfo>} timings
+	 * @param {Array<TimingsInfo>|undefined} timings
 	 */
 	static encode(timings) {
 		if(timings === undefined) { return undefined }
@@ -36,16 +36,3 @@ export class ServerTiming {
 			.join(SERVER_TIMING_SEPARATOR.METRIC)
 	}
 }
-
-
-// console.log(ServerTiming.encode([{ name: 'missedCache' }]))
-// console.log(ServerTiming.encode([{ name: 'cpu', duration: 2.4 }]))
-
-// // cache;desc="Cache Read";dur=23.2
-// console.log(ServerTiming.encode([{ name: 'cache', duration: 23.2, description: "Cache Read" }]))
-
-// // db;dur=53, app;dur=47.2
-// console.log(ServerTiming.encode([
-// 	{ name: 'db', duration: 54 },
-// 	{ name: 'app', duration: 47.2 }
-// ]))

package/src/headers/strict-transport-security.js

@@ -33,6 +33,7 @@ export class StrictTransportSecurity {
 	 * @param {StrictTransportSecurityOptions} sts
 	 */
 	static encode(sts) {
+		if(sts === undefined) { return undefined }
 		return [ ...StrictTransportSecurity.#encode(sts) ].join('; ')
 	}
 }

package/src/headers/util/mime.js

@@ -19,7 +19,7 @@ export const SPECIAL_CHARS = [
 	'{', '}',
 	'@', ',', ';', ':',
 	'\\', '"', '/', '?', '=', // '.',
-	// '%', // '!', '$', '&', // #  ^ * | ~ `
+	// '%', // '!', '$', '&', // # ^ * | ~ `
 	// space
 	' ', '\u000B', '\u000C',
 	// control
@@ -66,10 +66,10 @@ export class Mime {
 		// if(candidateSubtype === '') { return undefined }
 		if(hasSpecialChar(candidateSubtype)) { return undefined }
 
-		const subtype = (candidateSubtype === '') ? MIME_ANY : candidateSubtype ?? MIME_ANY
+		const subtype = (candidateSubtype === '') ? MIME_ANY : (candidateSubtype ?? MIME_ANY)
 
 		return {
-			mimetype: `${type}${MIME_SEPARATOR.SUBTYPE}${subtype ?? MIME_ANY}`,
+			mimetype: `${type}${MIME_SEPARATOR.SUBTYPE}${subtype}`,
 			type,
 			subtype
 		}

package/src/headers/util/whitespace.js

@@ -3,4 +3,6 @@ export const WHITESPACE_REGEX = /\s/
 /**
  * @param {string} c
  */
-export function isWhitespace(c){ return WHITESPACE_REGEX.test(c) }
+export function isWhitespace(c){
+	return WHITESPACE_REGEX.test(c)
+}

package/src/headers/www-authenticate.js

@@ -31,7 +31,6 @@ export function paramNeedQuotes(paramName) {
 	return PARAMETERS_THAT_NEED_QUOTES.includes(paramName.toLowerCase())
 }
 
-
 export class Challenge {
 	/**
 	 * @param {string} realm

package/src/response/2xx/bytes.js

@@ -3,25 +3,31 @@ import http2 from 'node:http2'
 import { send_bytes } from '../send-util.js'
 
 /** @import { ServerHttp2Stream } from 'node:http2' */
-/** @import { Metadata } from '../../defs.js' */
-/** @import { EtagItem } from '../../headers/conditional.js' */
-/** @import { CacheControlOptions } from '../../headers/cache-control.js' */
-/** @import { SendBody } from '../send-util.js' */
+/** @import { SendContent, SendInfo, Metadata, SendBody } from '../../defs.js' */
 
 const { HTTP_STATUS_OK } = http2.constants
 
 /**
  * @param {ServerHttp2Stream} stream
  * @param {SendBody|undefined} obj
- * @param {string|undefined} contentType
- * @param {number|undefined} contentLength
- * @param {string|undefined} encoding
- * @param {EtagItem|undefined} etag
- * @param {number|undefined} age
- * @param {CacheControlOptions} cacheControl
- * @param {'bytes'|'none'|undefined} acceptRanges
+ * @param {Omit<SendContent, 'rangeDirective'>} content
+ * @param {Pick<SendInfo, 'acceptRanges'>} info
  * @param {Metadata} meta
  */
-export function sendBytes(stream, contentType, obj, contentLength, encoding, etag, age, cacheControl, acceptRanges, meta) {
-	send_bytes(stream, HTTP_STATUS_OK, contentType, obj, undefined, contentLength, encoding, etag, age, cacheControl, acceptRanges, undefined, meta)
+export function sendBytes(stream, obj, content, info, meta) {
+	const {
+		contentType,
+		contentLength,
+		encoding,
+		etag,
+		lastModified,
+		age,
+		cacheControl,
+	} = content
+
+	const { acceptRanges } = info
+
+	const supportedQueryType = undefined
+	const range = undefined
+	send_bytes(stream, HTTP_STATUS_OK, contentType, obj, range, contentLength, encoding, etag, lastModified, age, cacheControl, acceptRanges, supportedQueryType, meta)
 }

package/src/response/2xx/created.js

@@ -4,25 +4,33 @@ import { Conditional } from '../../headers/conditional.js'
 import { send } from '../send-util.js'
 
 /** @import { ServerHttp2Stream } from 'node:http2' */
-/** @import { Metadata } from '../../defs.js' */
-/** @import { EtagItem } from '../../headers/conditional.js' */
+/** @import { SendContent, Metadata } from '../../defs.js' */
 
 const {
 	HTTP2_HEADER_LOCATION,
-	HTTP2_HEADER_ETAG
+	HTTP2_HEADER_ETAG,
+	HTTP2_HEADER_LAST_MODIFIED
 } = http2.constants
 
 const { HTTP_STATUS_CREATED } = http2.constants
 
 /**
  * @param {ServerHttp2Stream} stream
- * @param {URL} location
- * @param {EtagItem|undefined} etag
+ * @param {URL|string} location
+ * @param {Pick<SendContent, 'etag' | 'lastModified'>} content
  * @param {Metadata} meta
  */
-export function sendCreated(stream, location, etag, meta) {
+export function sendCreated(stream, location, content, meta) {
+	const {
+		etag,
+		lastModified
+	} = content
+
+	const loc = (location instanceof URL) ? location.href : location
+
 	send(stream, HTTP_STATUS_CREATED, {
-			[HTTP2_HEADER_LOCATION]: location.href,
-			[HTTP2_HEADER_ETAG]: Conditional.encodeEtag(etag)
+			[HTTP2_HEADER_LOCATION]: loc,
+			[HTTP2_HEADER_ETAG]: Conditional.encodeEtag(etag),
+			[HTTP2_HEADER_LAST_MODIFIED]: Conditional.encodeFixDate(lastModified)
 		}, [ HTTP2_HEADER_LOCATION ], undefined, undefined, meta)
 }

package/src/response/2xx/json.js

@@ -4,25 +4,44 @@ import { CONTENT_TYPE_JSON } from '../../headers/content-type.js'
 import { send_encoded } from '../send-util.js'
 
 /** @import { ServerHttp2Stream } from 'node:http2' */
-/** @import { Metadata } from '../../defs.js' */
-/** @import { EtagItem } from '../../headers/conditional.js' */
-/** @import { CacheControlOptions } from '../../headers/cache-control.js' */
+/** @import { SendContent, SendInfo, Metadata } from '../../defs.js' */
 
 const { HTTP_STATUS_OK } = http2.constants
 
 /**
+ * @deprecated
  * @param {ServerHttp2Stream} stream
  * @param {Object} obj
- * @param {string|undefined} encoding
- * @param {EtagItem|undefined} etag
- * @param {number|undefined} age
- * @param {CacheControlOptions} cacheControl
- * @param {Array<string>|undefined} supportedQueryTypes
+ * @param {Omit<SendContent, 'contentType' | 'contentLength' | 'rangeDirective'>} content
+ * @param {Pick<SendInfo, 'supportedQueryTypes'>} info
  * @param {Metadata} meta
  */
-export function sendJSON_Encoded(stream, obj, encoding, etag, age, cacheControl, supportedQueryTypes, meta) {
+export function sendJSON_Encoded(stream, obj, content, info, meta) {
+	sendJSON(stream, obj, content, info, meta)
+}
+
+/**
+ * @param {ServerHttp2Stream} stream
+ * @param {Object} obj
+ * @param {Omit<SendContent, 'contentType' | 'contentLength' | 'rangeDirective'>} content
+ * @param {Pick<SendInfo, 'supportedQueryTypes'>} info
+ * @param {Metadata} meta
+ */
+export function sendJSON(stream, obj, content, info, meta) {
+	const {
+		encoding,
+		etag,
+		lastModified,
+		age,
+		cacheControl
+	} = content
+
+	const {
+		supportedQueryTypes
+	} = info
+
 	if(stream.closed) { return }
 
 	const json = JSON.stringify(obj)
-	send_encoded(stream, HTTP_STATUS_OK, CONTENT_TYPE_JSON, json, encoding, etag, age, cacheControl, undefined, supportedQueryTypes, meta)
+	send_encoded(stream, HTTP_STATUS_OK, CONTENT_TYPE_JSON, json, encoding, etag, lastModified, age, cacheControl, undefined, supportedQueryTypes, meta)
 }

package/src/response/2xx/no-content.js

@@ -4,22 +4,28 @@ import { Conditional } from '../../headers/conditional.js'
 import { send } from '../send-util.js'
 
 /** @import { ServerHttp2Stream } from 'node:http2' */
-/** @import { Metadata } from '../../defs.js' */
-/** @import { EtagItem } from '../../headers/conditional.js' */
+/** @import { SendContent, Metadata } from '../../defs.js' */
 
 const {
-	HTTP2_HEADER_ETAG
+	HTTP2_HEADER_ETAG,
+	HTTP2_HEADER_LAST_MODIFIED
 } = http2.constants
 
 const { HTTP_STATUS_NO_CONTENT } = http2.constants
 
 /**
  * @param {ServerHttp2Stream} stream
- * @param {EtagItem|undefined} etag
+ * @param {Pick<SendContent, 'etag' | 'lastModified'>} content
  * @param {Metadata} meta
  */
-export function sendNoContent(stream, etag, meta) {
+export function sendNoContent(stream, content, meta) {
+	const {
+		etag,
+		lastModified
+	} = content
+
 	send(stream, HTTP_STATUS_NO_CONTENT, {
-			[HTTP2_HEADER_ETAG]: Conditional.encodeEtag(etag)
+			[HTTP2_HEADER_ETAG]: Conditional.encodeEtag(etag),
+			[HTTP2_HEADER_LAST_MODIFIED]: Conditional.encodeFixDate(lastModified)
 		}, [], undefined, undefined, meta)
 }

package/src/response/2xx/partial-content.js

@@ -1,16 +1,13 @@
 import http2 from 'node:http2'
 
 import { RANGE_UNITS_BYTES } from '../../defs.js'
-import { MIME_TYPE_MULTIPART_RANGE } from '../../headers/content-type.js'
+import { MIME_TYPE_MULTIPART_RANGE, MIME_TYPE_OCTET_STREAM } from '../../headers/content-type.js'
 import { Multipart } from '../../headers/multipart.js'
 import { send_bytes } from '../send-util.js'
 
 /** @import { ServerHttp2Stream } from 'node:http2' */
-/** @import { Metadata } from '../../defs.js' */
-/** @import { EtagItem } from '../../headers/conditional.js' */
-/** @import { CacheControlOptions } from '../../headers/cache-control.js' */
+/** @import { SendContent, Metadata, SendBody } from '../../defs.js' */
 /** @import { ContentRangeDirective } from '../../headers/content-range.js' */
-/** @import { SendBody } from '../send-util.js' */
 
 const { HTTP_STATUS_PARTIAL_CONTENT } = http2.constants
 
@@ -27,23 +24,28 @@ const { HTTP_STATUS_PARTIAL_CONTENT } = http2.constants
 
 /**
  * @param {ServerHttp2Stream} stream
- * @param {string} contentType
  * @param {NonEmptyArray<PartialBytes>|PartialBytes} objs
- * @param {number|undefined} contentLength
- * @param {string|undefined} encoding
- * @param {EtagItem|undefined} etag
- * @param {number|undefined} age
- * @param {CacheControlOptions} cacheControl
+ * @param {Omit<SendContent, 'rangeDirective'>} content
  * @param {Metadata} meta
  */
-export function sendPartialContent(stream, contentType, objs, contentLength, encoding, etag, age, cacheControl, meta) {
+export function sendPartialContent(stream, objs, content, meta) {
+	const {
+		contentType,
+		contentLength,
+		encoding,
+		etag,
+		lastModified,
+		age,
+		cacheControl
+	} = content
+
 	const acceptRanges = RANGE_UNITS_BYTES
 	const supportedQueryTypes = undefined
 
 	if(Array.isArray(objs) && objs.length > 1) {
 		// send using multipart bytes
 		const boundary = 'PARTIAL_CONTENT_BOUNDARY' // todo make unique for content
-		const obj = Multipart.encode_Bytes(contentType, objs, contentLength, boundary)
+		const obj = Multipart.encode_Bytes(contentType ?? MIME_TYPE_OCTET_STREAM, objs, contentLength, boundary)
 
 		const multipartContentType = `${MIME_TYPE_MULTIPART_RANGE}; boundary=${boundary}`
 
@@ -56,6 +58,7 @@ export function sendPartialContent(stream, contentType, objs, contentLength, enc
 			undefined,
 			encoding,
 			etag,
+			lastModified,
 			age,
 			cacheControl,
 			acceptRanges,
@@ -67,5 +70,5 @@ export function sendPartialContent(stream, contentType, objs, contentLength, enc
 
 	// single range, send as regular object
 	const obj = Array.isArray(objs) ? objs[0] : objs
-	send_bytes(stream, HTTP_STATUS_PARTIAL_CONTENT, contentType, obj.obj, obj.range, undefined, encoding, etag, age, cacheControl, acceptRanges, supportedQueryTypes, meta)
+	send_bytes(stream, HTTP_STATUS_PARTIAL_CONTENT, contentType, obj.obj, obj.range, undefined, encoding, etag, lastModified, age, cacheControl, acceptRanges, supportedQueryTypes, meta)
 }