@johntalton/http-core 1.0.7 → 1.1.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@johntalton/http-core",
   "type": "module",
-  "version": "1.0.7",
+  "version": "1.1.1",
   "license": "MIT",
   "exports": {
     ".": "./src/index.js"
@@ -16,7 +16,7 @@
     "lint": "biome check"
   },
   "dependencies": {
-    "@johntalton/http-util": "^6.1.0",
+    "@johntalton/http-util": "^7.0.2",
     "@johntalton/sse-util": "^1.0.0"
   },
   "devDependencies": {

package/src/epilogue.js

@@ -1,4 +1,3 @@
-import { MIME_TYPE_JSON } from '@johntalton/http-util/headers'
 import { Response } from '@johntalton/http-util/response/object'
 import { ServerSentEvents } from '@johntalton/sse-util'
 
@@ -18,11 +17,11 @@ function addSSEPortHandler(stream, port, streamId, shutdownSignal) {
 		stream.end()
 	}
 
-	stream.once('close', (() => {
+	stream.once('close', () => {
 		console.log('stream close in sse handler', streamId)
 		shutdownSignal.removeEventListener('abort', signalHandler)
 		port.close()
-	}))
+	})
 
 	shutdownSignal.addEventListener('abort', signalHandler, { once: true })
 
@@ -52,12 +51,14 @@ export function epilogue(state) {
 	switch(type) {
 		//
 		case 'trace': { Response.trace(stream, state.method, state.url, state.headers, meta) } break
+		// case 'im-a-teapot': { Response.imATeapot(stream, meta) } break
 		//
-		case 'preflight': { Response.preflight(stream, state.methods, state.supportedQueryTypes, undefined, meta) } break
-		case 'no-content': { Response.noContent(stream, state.etag, state.lastModified, meta)} break
 		// case 'accepted': { Response.accepted(stream, meta) } break
-		case 'created': { Response.created(stream, new URL(state.location, meta.origin), state.etag, state.lastModified, meta) } break
-		case 'not-modified': { Response.notModified(stream, state.etag, state.lastModified, state.age, state.cacheControl ?? {}, meta) } break
+		case 'created': { Response.created(stream, new URL(state.location, meta.origin), { etag: state.etag, lastModified: state.lastModified }, meta) } break
+		case 'preflight': { Response.preflight(stream, { supportedMethods: state.methods, supportedQueryTypes: state.supportedQueryTypes, acceptRanges: undefined }, meta) } break
+		case 'no-content': { Response.noContent(stream, { etag: state.etag, lastModified: state.lastModified }, meta)} break
+		case 'not-modified': { Response.notModified(stream, { etag: state.etag, lastModified: state.lastModified, age: state.age, cacheControl: state.cacheControl ?? {} }, meta) } break
+		case 'found': { Response.found(stream, state.location, meta) } break
 
 		//
 		// case 'multiple-choices': { Response.multipleChoices(stream, meta) } break
@@ -69,21 +70,23 @@ export function epilogue(state) {
 
 		//
 		case '404': { Response.notFound(stream, state.message, meta) } break
+		// case 'bad-request': { Response.badRequest(stream, meta) } break
 		case 'conflict': { Response.conflict(stream, meta) } break
-		case 'not-allowed': { Response.notAllowed(stream, state.methods, meta) } break
-		case 'not-acceptable': { Response.notAcceptable(stream, state.acceptableMediaTypes ?? [], meta)} break
-		case 'unsupported-media': { Response.unsupportedMediaType(stream, state.acceptableMediaTypes, state.supportedQueryTypes, meta) } break
-		case 'unprocessable': { Response.unprocessable(stream, meta) } break
-		case 'precondition-failed': { Response.preconditionFailed(stream, state.etag, state.lastModified, meta) } break
-		case 'not-satisfiable': { Response.rangeNotSatisfiable(stream, { size: state.contentLength }, meta) } break
 		case 'content-too-large': { Response.contentTooLarge(stream, meta) } break
-		case 'insufficient-storage': { Response.insufficientStorage(stream, meta) } break
-		case 'too-many-requests': { Response.tooManyRequests(stream, state.limit, state.policies, meta) } break
-		case 'unauthorized': { Response.unauthorized(stream, state.challenge, meta) } break
 		case 'forbidden': { Response.forbidden(stream, meta) } break
-		case 'unavailable': { Response.unavailable(stream, state.message, state.retryAfter, meta)} break
-		case 'not-implemented': { Response.notImplemented(stream, state.message, meta)} break
+		case 'not-acceptable': { Response.notAcceptable(stream, { supportedTypes: state.acceptableMediaTypes ?? [] }, meta) } break
+		case 'not-allowed': { Response.notAllowed(stream, { supportedMethods: state.methods }, meta) } break
+		// case 'payment-required': {} break
+		case 'precondition-failed': { Response.preconditionFailed(stream, { etag: state.etag, lastModified: state.lastModified }, meta) } break
+		case 'not-satisfiable': { Response.rangeNotSatisfiable(stream, { rangeDirective: { size: state.contentLength } }, meta) } break
 		case 'timeout': { Response.timeout(stream, meta) } break
+		case 'too-many-requests': { Response.tooManyRequests(stream, { limitInfo: state.limit, policies: state.policies }, meta) } break
+		case 'unauthorized': { Response.unauthorized(stream, state.challenge, meta) } break
+		case 'unprocessable': { Response.unprocessable(stream, meta) } break
+		case 'unsupported-media': { Response.unsupportedMediaType(stream, { acceptableMediaType: state.acceptableMediaTypes, supportedQueryTypes: state.supportedQueryTypes }, meta) } break
+		case 'insufficient-storage': { Response.insufficientStorage(stream, meta) } break
+		case 'not-implemented': { Response.notImplemented(stream, state.message, meta) } break
+		case 'unavailable': { Response.unavailable(stream, state.message, { retryAfter: state.retryAfter }, meta) } break
 
 		//
 		case 'sse': {
@@ -91,22 +94,38 @@ export function epilogue(state) {
 
 			Response.sse(stream, { ...meta, active, bom })
 			if(active) { addSSEPortHandler(stream, port, state.streamId, state.shutdownSignal) }
-		}
-		break
+		} break
 		case 'json': {
-			const { obj, accept, etag, lastModified } = state
-
-			if(accept.type === MIME_TYPE_JSON) {
-				Response.json(stream, obj, accept.encoding, etag, lastModified, state.age, state.cacheControl ?? {}, state.supportedQueryTypes, meta)
-			}
-			else {
-				// todo: but we did process the request - is that ok?
-				Response.notAcceptable(stream, [ MIME_TYPE_JSON ], meta)
-			}
-		}
-		break
-		case 'partial-bytes': { Response.partialContent(stream, state.contentType, state.objs, state.contentLength, undefined, state.etag, state.lastModified, state.age, state.cacheControl ?? {}, meta) } break
-		case 'bytes': { Response.bytes(stream, state.contentType, state.obj, state.contentLength, 'identity', state.etag, state.lastModified, state.age, state.cacheControl ?? {}, state.acceptRanges, meta) } break
+			const { obj, encoding, etag, lastModified, age, supportedQueryTypes } = state
+			Response.json(stream, obj, { encoding, etag, lastModified, age, cacheControl: state.cacheControl ?? {} }, { supportedQueryTypes }, meta)
+		} break
+		case 'partial-bytes': {
+			const { contentType, contentLength, etag, lastModified, age } = state
+
+			Response.partialContent(stream, state.objs, {
+			contentType,
+			contentLength,
+			encoding: undefined,
+			etag,
+			lastModified,
+			age,
+			cacheControl: state.cacheControl ?? {} }, meta)
+		} break
+		case 'bytes': {
+			const { contentType, contentLength, encoding, etag, lastModified, age, acceptRanges } = state
+
+			Response.bytes(stream, state.obj, {
+				contentType,
+				contentLength,
+				encoding: encoding ?? 'identity',
+				etag,
+				lastModified,
+				age,
+				cacheControl: state.cacheControl ?? {}
+			}, {
+				acceptRanges
+			}, meta)
+		} break
 
 		//
 		case 'error': {

package/src/index.js

@@ -43,6 +43,7 @@ export const KNOWN_METHODS = [
 /** @import { Metadata } from '@johntalton/http-util/response' */
 /** @import { BodyFuture } from '@johntalton/http-util/body' */
 /** @import {
+ AcceptItem,
  EtagItem,
  IMFFixDate,
  IMFFixDateInput,
@@ -52,6 +53,7 @@ export const KNOWN_METHODS = [
  ChallengeItem,
  CacheControlOptions
 } from '@johntalton/http-util/headers' */
+/** @import { AcceptStyleItem } from '@johntalton/http-util/util' */
 /** @import { SendBody } from '@johntalton/http-util/response' */
 /** @import { SecFetchSite, SecFetchMode, SecFetchDest } from '@johntalton/http-util/headers' */
 
@@ -60,37 +62,45 @@ export const KNOWN_METHODS = [
 
 /** @typedef {'request'} RouteTypeRequest */
 /** @typedef {
-	'partial-bytes' |
-	'bytes' |
-	'json' |
-	'404' |
-	'sse' |
-	'error' |
-	'preflight' |
-	'not-allowed' |
 	'trace' |
+	'im-a-teapot' |
+	'accepted' |
 	'created' |
-	'unsupported-media' |
+	'preflight' |
+	'no-content' |
 	'not-modified' |
-	'precondition-failed' |
-	'unprocessable' |
-	'not-acceptable' |
-	'conflict' |
-	'not-implemented' |
-	'unavailable' |
-	'not-satisfiable' |
+	'found' |
+
+	'gone' |
+	'moved-permanently' |
 	'see-other' |
 	'temporary-redirect' |
 	'permanent-redirect' |
-	'moved-permanently' |
-	'gone' |
-	'no-content' |
+
+	'404' |
+	'bad-request' |
+	'conflict' |
 	'content-too-large' |
-	'insufficient-storage' |
+	'forbidden' |
+	'not-acceptable' |
+	'not-allowed' |
+	'payment-required' |
+	'precondition-failed' |
+	'not-satisfiable' |
+	'timeout' |
 	'too-many-requests' |
 	'unauthorized' |
-	'forbidden' |
-	'timeout'
+	'unprocessable' |
+	'unsupported-media' |
+	'insufficient-storage' |
+	'not-implemented' |
+	'unavailable' |
+
+	'sse' |
+	'bytes' |
+	'partial-bytes' |
+	'json' |
+	'error'
 } RouteType */
 /** @typedef {'GET'|'HEAD'|'POST'|'PUT'|'PATCH'|'OPTIONS'|'DELETE'|'TRACE'|'QUERY'} RouteMethod */
 
@@ -111,8 +121,24 @@ export const KNOWN_METHODS = [
  * @property {AbortSignal} shutdownSignal
  */
 
+/**
+ * @typedef {Object} RouteRequestAcceptParsed
+ * @property {Array<AcceptItem> | undefined} type
+ * @property {Array<AcceptStyleItem> | undefined} encoding
+ * @property {Array<AcceptStyleItem>} language
+ */
+
+/**
+ * @typedef {Object} RouteRequestAcceptFn
+ * @property {(a: Array<string>|undefined) => AcceptItem|undefined} type
+ * @property {(a: Array<string>|undefined) => AcceptStyleItem|undefined} encoding
+ * @property {(a: Array<string>|undefined) => AcceptStyleItem|undefined} language
+ */
+
 /**
  * @typedef {Object} RouteRequestAccept
+ * @property {RouteRequestAcceptParsed} parsed
+ * @property {RouteRequestAcceptFn} select
  * @property {string|undefined} type
  * @property {string|undefined} encoding
  * @property {string|undefined} language
@@ -125,6 +151,22 @@ export const KNOWN_METHODS = [
  * @property {number|undefined} port
  */
 
+/**
+ * @typedef {Object} RouteConditions
+ * @property {Array<EtagItem>} match
+ * @property {Array<EtagItem>} noneMatch
+ * @property {IMFFixDate|undefined} modifiedSince
+ * @property {IMFFixDate|undefined} unmodifiedSince
+ * @property {IMFFixDate|EtagItem|undefined} [range]
+ */
+
+/**
+ * @typedef {Object} SecFetchMetadata
+ * @property {SecFetchSite|undefined} site
+ * @property {SecFetchMode|undefined} mode
+ * @property {SecFetchDest|undefined} dest
+ */
+
 /**
  * @typedef {Object} RouteRequestBase
  * @property {'request'} type
@@ -141,21 +183,20 @@ export const KNOWN_METHODS = [
 /** @typedef {RouteBase & RouteRequestBase} RouteRequest */
 
 /**
- * @typedef {Object} RouteErrorBase
- * @property {'error'} type
- * @property {string} cause
- * @property {Error|undefined} [error]
+ * @template T
+ * @typedef {[ T, ...T[] ]} NonEmptyArray
  */
-/** @typedef {RouteBase & RouteErrorBase } RouteError */
 
 /**
- * @typedef {Object} RouteNotAllowedBase
- * @property {'not-allowed'} type
- * @property {RouteMethod} method
- * @property {URL} url
- * @property {Array<RouteMethod>} methods
+ * @typedef {Object} PartialBytes
+ * @property {SendBody} obj
+ * @property {ContentRangeDirective} range
  */
-/** @typedef {RouteBase & RouteNotAllowedBase} RouteNotAllowed */
+
+
+
+
+
 
 /**
  * @typedef {Object} RouteTraceBase
@@ -164,25 +205,17 @@ export const KNOWN_METHODS = [
  * @property {URL} url
  * @property {IncomingHttpHeaders} headers
  * @property {number} maxForwards
- */
+*/
 /** @typedef {RouteBase & RouteTraceBase} RouteTrace */
 
 /**
- * @typedef {Object} RouteConditions
- * @property {Array<EtagItem>} match
- * @property {Array<EtagItem>} noneMatch
- * @property {IMFFixDate|undefined} modifiedSince
- * @property {IMFFixDate|undefined} unmodifiedSince
- * @property {IMFFixDate|EtagItem|undefined} [range]
- */
-
-/**
- * @typedef {Object} SecFetchMetadata
- * @property {SecFetchSite|undefined} site
- * @property {SecFetchMode|undefined} mode
- * @property {SecFetchDest|undefined} dest
+ * @typedef {Object} RouteCreatedBase
+ * @property {'created'} type
+ * @property {URL|string} location
+ * @property {EtagItem|undefined} [etag]
+ * @property {IMFFixDateInput|string|undefined} [lastModified]
  */
-
+/** @typedef {RouteBase & RouteCreatedBase} RouteCreated */
 
 /**
  * @typedef {Object} RoutePreflightBase
@@ -195,78 +228,77 @@ export const KNOWN_METHODS = [
 /** @typedef {RouteBase & RoutePreflightBase} RoutePreflight */
 
 /**
- * @typedef {Object} RouteJSONBase
- * @property {'json'} type
- * @property {RouteRequestAccept} accept
- * @property {Record<any, any>} obj
+ * @typedef {Object} RouteNoContentBase
+ * @property {'no-content'} type
+ * @property {EtagItem|undefined} [etag]
  * @property {IMFFixDateInput|string|undefined} [lastModified]
+ */
+/** @typedef {RouteBase & RouteNoContentBase} RouteNoContent */
+
+/**
+ * @typedef {Object} RouteNotModifiedBase
+ * @property {'not-modified'} type
+ * @property {number} age
  * @property {EtagItem|undefined} [etag]
+ * @property {IMFFixDateInput|string|undefined} [lastModified]
  * @property {number|undefined} [age]
  * @property {CacheControlOptions|undefined} [cacheControl]
- * @property {Array<string>|undefined} [supportedQueryTypes]
  */
-/** @typedef {RouteBase & RouteJSONBase} RouteJSON */
+/** @typedef {RouteBase & RouteNotModifiedBase} RouteNotModified */
 
 /**
- * @typedef {Object} Route404Base
- * @property {'404'} type
- * @property {string} method
- * @property {URL} url
- * @property {string} message
+ * @typedef {Object} RouteFoundBase
+ * @property {'found'} type
+ * @property {URL|string} location
  */
-/** @typedef {RouteBase & Route404Base} Route404 */
+/** @typedef {RouteBase & RouteFoundBase} RouteFound */
+
+
 
 /**
- * @typedef {Object} RouteCreatedBase
- * @property {'created'} type
- * @property {URL|string} location
- * @property {EtagItem|undefined} [etag]
- * @property {IMFFixDateInput|string|undefined} [lastModified]
+ * @typedef {Object} RouteGoneBase
+ * @property {'gone'} type
  */
-/** @typedef {RouteBase & RouteCreatedBase} RouteCreated */
+/** @typedef {RouteBase & RouteGoneBase} RouteGone */
 
 /**
- * @typedef {Object} RouteUnsupportedMediaTypeBase
- * @property {'unsupported-media'} type
- * @property {Array<string>|string} acceptableMediaTypes
- * @property {Array<string>|undefined} [supportedQueryTypes]
+ * @typedef {Object} RouteMovedPermanentlyBase
+ * @property {'moved-permanently'} type
+ * @property {URL|string} location
  */
-/** @typedef {RouteBase & RouteUnsupportedMediaTypeBase} RouteUnsupportedMediaType */
+/** @typedef {RouteBase & RouteMovedPermanentlyBase} RouteMovedPermanently */
 
 /**
- * @typedef {Object} RouteNotModifiedBase
- * @property {'not-modified'} type
- * @property {number} age
- * @property {EtagItem|undefined} [etag]
- * @property {IMFFixDateInput|string|undefined} [lastModified]
- * @property {number|undefined} [age]
- * @property {CacheControlOptions|undefined} [cacheControl]
+ * @typedef {Object} RouteSeeOtherBase
+ * @property {'see-other'} type
+ * @property {URL|string} location
  */
-/** @typedef {RouteBase & RouteNotModifiedBase} RouteNotModified */
+/** @typedef {RouteBase & RouteSeeOtherBase} RouteSeeOther */
 
 /**
- * @typedef {Object} RoutePreconditionFailedBase
- * @property {'precondition-failed'} type
- * @property {EtagItem|undefined} [etag]
- * @property {IMFFixDateInput|string|undefined} [lastModified]
+ * @typedef {Object} RouteTemporaryRedirectBase
+ * @property {'temporary-redirect'} type
+ * @property {URL|string} location
  */
-/** @typedef {RouteBase & RoutePreconditionFailedBase} RoutePreconditionFailed */
+/** @typedef {RouteBase & RouteTemporaryRedirectBase} RouteTemporaryRedirect */
 
 /**
- * @typedef {Object} RouteNotAcceptableBase
- * @property {'not-acceptable'} type
- * @property {Array<string>|undefined} [acceptableMediaTypes]
- * @property {Array<string>|undefined} [acceptableEncodings]
- * @property {Array<string>|undefined} [acceptableLanguages]
+ * @typedef {Object} RoutePermanentRedirectBase
+ * @property {'permanent-redirect'} type
+ * @property {URL|string} location
  */
-/** @typedef {RouteBase & RouteNotAcceptableBase} RouteNotAcceptable */
+/** @typedef {RouteBase & RoutePermanentRedirectBase} RoutePermanentRedirect */
+
+
+
 
 /**
- * @typedef {Object} RouteUnprocessableBase
- * @property {'unprocessable'} type
+ * @typedef {Object} Route404Base
+ * @property {'404'} type
+ * @property {string} method
  * @property {string} message
  */
-/** @typedef {RouteBase & RouteUnprocessableBase} RouteUnprocessable */
+/** @typedef {RouteBase & Route404Base} Route404 */
 
 /**
  * @typedef {Object} RouteConflictBase
@@ -276,57 +308,41 @@ export const KNOWN_METHODS = [
 /** @typedef {RouteBase & RouteConflictBase} RouteConflict */
 
 /**
- * @typedef {Object} RouteNotImplementedBase
- * @property {'not-implemented'} type
- * @property {string|undefined} [message]
- */
-/** @typedef {RouteBase & RouteNotImplementedBase} RouteNotImplemented */
-
-/**
- * @typedef {Object} RouteUnavailableBase
- * @property {'unavailable'} type
- * @property {string|undefined} [message]
- * @property {number|undefined} [retryAfter]
+ * @typedef {Object} RouteContentTooLargeBase
+ * @property {'content-too-large'} type
  */
-/** @typedef {RouteBase & RouteUnavailableBase} RouteUnavailable */
+/** @typedef {RouteBase & RouteContentTooLargeBase} RouteContentTooLarge */
 
 /**
- * @typedef {Object} RouteBytesBase
- * @property {'bytes'} type
- * @property {string} contentType
- * @property {number|undefined} [contentLength]
- * @property {SendBody|undefined} obj
- * @property {IMFFixDateInput|string|undefined} [lastModified]
- * @property {EtagItem|undefined} [etag]
- * @property {number|undefined} [age]
- * @property {CacheControlOptions|undefined} [cacheControl]
- * @property {'bytes'|'none'|undefined} [acceptRanges]
+ * @typedef {Object} RouteForbiddenBase
+ * @property {'forbidden'} type
  */
-/** @typedef {RouteBase & RouteBytesBase} RouteBytes */
+/** @typedef {RouteBase & RouteForbiddenBase} RouteForbidden */
 
 /**
- * @typedef {Object} PartialBytes
- * @property {SendBody} obj
- * @property {ContentRangeDirective} range
+ * @typedef {Object} RouteNotAcceptableBase
+ * @property {'not-acceptable'} type
+ * @property {Array<string>|undefined} [acceptableMediaTypes]
+ * @property {Array<string>|undefined} [acceptableEncodings]
+ * @property {Array<string>|undefined} [acceptableLanguages]
  */
+/** @typedef {RouteBase & RouteNotAcceptableBase} RouteNotAcceptable */
 
 /**
- * @template T
- * @typedef {[ T, ...T[] ]} NonEmptyArray
+ * @typedef {Object} RouteNotAllowedBase
+ * @property {'not-allowed'} type
+ * @property {RouteMethod} method
+ * @property {Array<RouteMethod>} methods
  */
+/** @typedef {RouteBase & RouteNotAllowedBase} RouteNotAllowed */
 
 /**
- * @typedef {Object} RoutePartialBytesBase
- * @property {'partial-bytes'} type
- * @property {NonEmptyArray<PartialBytes>} objs
- * @property {string} contentType
- * @property {number|undefined} [contentLength]
+ * @typedef {Object} RoutePreconditionFailedBase
+ * @property {'precondition-failed'} type
  * @property {EtagItem|undefined} [etag]
  * @property {IMFFixDateInput|string|undefined} [lastModified]
- * @property {number|undefined} [age]
- * @property {CacheControlOptions|undefined} [cacheControl]
  */
-/** @typedef {RouteBase & RoutePartialBytesBase} RoutePartialBytes */
+/** @typedef {RouteBase & RoutePreconditionFailedBase} RoutePreconditionFailed */
 
 /**
  * @typedef {Object} RouteNotSatisfiableBase
@@ -336,52 +352,40 @@ export const KNOWN_METHODS = [
 /** @typedef {RouteBase & RouteNotSatisfiableBase} RouteNotSatisfiable */
 
 /**
- * @typedef {Object} RouteSeeOtherBase
- * @property {'see-other'} type
- * @property {URL} location
- */
-/** @typedef {RouteBase & RouteSeeOtherBase} RouteSeeOther */
-
-/**
- * @typedef {Object} RouteTemporaryRedirectBase
- * @property {'temporary-redirect'} type
- * @property {URL} location
- */
-/** @typedef {RouteBase & RouteTemporaryRedirectBase} RouteTemporaryRedirect */
-
-/**
- * @typedef {Object} RoutePermanentRedirectBase
- * @property {'permanent-redirect'} type
- * @property {URL} location
+ * @typedef {Object} RouteTimeoutBase
+ * @property {'timeout'} type
  */
-/** @typedef {RouteBase & RoutePermanentRedirectBase} RoutePermanentRedirect */
+/** @typedef {RouteBase & RouteTimeoutBase} RouteTimeout */
 
 /**
- * @typedef {Object} RouteMovedPermanentlyBase
- * @property {'moved-permanently'} type
- * @property {URL} location
+ * @typedef {Object} RouteTooManyRequestsBase
+ * @property {'too-many-requests'} type
+ * @property {RateLimitInfo} limit
+ * @property {Array<RateLimitPolicyInfo>} policies
  */
-/** @typedef {RouteBase & RouteMovedPermanentlyBase} RouteMovedPermanently */
+/** @typedef {RouteBase & RouteTooManyRequestsBase} RouteTooManyRequests */
 
 /**
- * @typedef {Object} RouteNoContentBase
- * @property {'no-content'} type
- * @property {EtagItem|undefined} [etag]
- * @property {IMFFixDateInput|string|undefined} [lastModified]
+ * @typedef {Object} RouteUnauthorizedBase
+ * @property {'unauthorized'} type
+ * @property {Array<ChallengeItem>} challenge
  */
-/** @typedef {RouteBase & RouteNoContentBase} RouteNoContent */
+/** @typedef {RouteBase & RouteUnauthorizedBase} RouteUnauthorized */
 
 /**
- * @typedef {Object} RouteGoneBase
- * @property {'gone'} type
+ * @typedef {Object} RouteUnprocessableBase
+ * @property {'unprocessable'} type
+ * @property {string} message
  */
-/** @typedef {RouteBase & RouteGoneBase} RouteGone */
+/** @typedef {RouteBase & RouteUnprocessableBase} RouteUnprocessable */
 
 /**
- * @typedef {Object} RouteContentTooLargeBase
- * @property {'content-too-large'} type
+ * @typedef {Object} RouteUnsupportedMediaTypeBase
+ * @property {'unsupported-media'} type
+ * @property {Array<string>|string} acceptableMediaTypes
+ * @property {Array<string>|undefined} [supportedQueryTypes]
  */
-/** @typedef {RouteBase & RouteContentTooLargeBase} RouteContentTooLarge */
+/** @typedef {RouteBase & RouteUnsupportedMediaTypeBase} RouteUnsupportedMediaType */
 
 /**
  * @typedef {Object} RouteInsufficientStorageBase
@@ -390,31 +394,21 @@ export const KNOWN_METHODS = [
 /** @typedef {RouteBase & RouteInsufficientStorageBase} RouteInsufficientStorage */
 
 /**
- * @typedef {Object} RouteTooManyRequestsBase
- * @property {'too-many-requests'} type
- * @property {RateLimitInfo} limit
- * @property {Array<RateLimitPolicyInfo>} policies
+ * @typedef {Object} RouteNotImplementedBase
+ * @property {'not-implemented'} type
+ * @property {string|undefined} [message]
  */
-/** @typedef {RouteBase & RouteTooManyRequestsBase} RouteTooManyRequests */
+/** @typedef {RouteBase & RouteNotImplementedBase} RouteNotImplemented */
 
 /**
- * @typedef {Object} RouteUnauthorizedBase
- * @property {'unauthorized'} type
- * @property {Array<ChallengeItem>} challenge
+ * @typedef {Object} RouteUnavailableBase
+ * @property {'unavailable'} type
+ * @property {string|undefined} [message]
+ * @property {number|undefined} [retryAfter]
  */
-/** @typedef {RouteBase & RouteUnauthorizedBase} RouteUnauthorized */
+/** @typedef {RouteBase & RouteUnavailableBase} RouteUnavailable */
 
-/**
- * @typedef {Object} RouteForbiddenBase
- * @property {'forbidden'} type
- */
-/** @typedef {RouteBase & RouteForbiddenBase} RouteForbidden */
 
-/**
- * @typedef {Object} RouteTimeoutBase
- * @property {'timeout'} type
- */
-/** @typedef {RouteBase & RouteTimeoutBase} RouteTimeout */
 
 /**
  * @typedef {Object} RouteSSEBase
@@ -425,38 +419,92 @@ export const KNOWN_METHODS = [
  */
 /** @typedef {RouteBase & RouteSSEBase} RouteSSE */
 
+/**
+ * @typedef {Object} RouteBytesBase
+ * @property {'bytes'} type
+ * @property {string} contentType
+ * @property {SendBody|undefined} obj
+ * @property {number|undefined} [contentLength]
+ * @property {string | undefined} [encoding]
+ * @property {IMFFixDateInput|string|undefined} [lastModified]
+ * @property {EtagItem|undefined} [etag]
+ * @property {number|undefined} [age]
+ * @property {CacheControlOptions|undefined} [cacheControl]
+ * @property {'bytes'|'none'|undefined} [acceptRanges]
+ */
+/** @typedef {RouteBase & RouteBytesBase} RouteBytes */
+
+ /**
+ * @typedef {Object} RoutePartialBytesBase
+ * @property {'partial-bytes'} type
+ * @property {NonEmptyArray<PartialBytes>} objs
+ * @property {string} contentType
+ * @property {number|undefined} [contentLength]
+ * @property {EtagItem|undefined} [etag]
+ * @property {IMFFixDateInput|string|undefined} [lastModified]
+ * @property {number|undefined} [age]
+ * @property {CacheControlOptions|undefined} [cacheControl]
+ */
+/** @typedef {RouteBase & RoutePartialBytesBase} RoutePartialBytes */
+
+/**
+ * @typedef {Object} RouteJSONBase
+ * @property {'json'} type
+ * @property {Record<any, any>} obj
+ * @property {string | undefined} [encoding]
+ * @property {IMFFixDateInput|string|undefined} [lastModified]
+ * @property {EtagItem|undefined} [etag]
+ * @property {number|undefined} [age]
+ * @property {CacheControlOptions|undefined} [cacheControl]
+ * @property {Array<string>|undefined} [supportedQueryTypes]
+ */
+/** @typedef {RouteBase & RouteJSONBase} RouteJSON */
+
+/**
+ * @typedef {Object} RouteErrorBase
+ * @property {'error'} type
+ * @property {string} cause
+ * @property {Error|undefined} [error]
+ */
+/** @typedef {RouteBase & RouteErrorBase } RouteError */
+
+
 /** @typedef {
-	RouteError |
-	RouteNotAllowed |
-	RoutePreflight |
-	RouteBytes |
-	RouteJSON |
-	Route404 |
-	RouteSSE |
 	RouteTrace |
 	RouteCreated |
-	RouteUnsupportedMediaType |
+	RoutePreflight |
+	RouteNoContent |
 	RouteNotModified |
-	RoutePreconditionFailed |
-	RouteUnprocessable |
-	RouteNotAcceptable |
-	RouteConflict |
-	RouteNotImplemented |
-	RouteUnavailable |
-	RoutePartialBytes |
-	RouteNotSatisfiable |
+	RouteFound |
+
+	RouteGone |
+	RouteMovedPermanently |
 	RouteSeeOther |
 	RouteTemporaryRedirect |
 	RoutePermanentRedirect |
-	RouteMovedPermanently |
-	RouteNoContent |
-	RouteGone |
+
+	Route404 |
+	RouteConflict |
 	RouteContentTooLarge |
-	RouteInsufficientStorage |
+	RouteForbidden |
+	RouteNotAcceptable |
+	RouteNotAllowed |
+	RoutePreconditionFailed |
+	RouteNotSatisfiable |
+	RouteTimeout |
 	RouteTooManyRequests |
 	RouteUnauthorized |
-	RouteForbidden |
-	RouteTimeout
+	RouteUnprocessable |
+	RouteUnsupportedMediaType |
+	RouteInsufficientStorage |
+	RouteNotImplemented |
+	RouteUnavailable |
+
+	RouteSSE |
+	RouteBytes |
+	RoutePartialBytes |
+	RouteJSON |
+	RouteError
 } RouteAction */
 
 /** @typedef {Record<string, string|undefined>} RouteMatches */

package/src/preamble.js

@@ -35,7 +35,7 @@ import {
 import { isValidHeader, isValidLikeHeader, isValidMethod } from './index.js'
 
 /** @import { ServerHttp2Stream, IncomingHttpHeaders } from 'node:http2' */
-/** @import { Config, RouteRequest, RouteAction, StreamID, RouteConditions, SecFetchMetadata } from './index.js' */
+/** @import { Config, RouteRequest, RouteAction, StreamID, RouteConditions, SecFetchMetadata, RouteRequestAccept } from './index.js' */
 
 const { HTTP2_METHOD_OPTIONS, HTTP2_METHOD_TRACE } = http2.constants
 
@@ -162,7 +162,6 @@ export  function preamble(preState, headers, servername) {
 	//
 	const allowedOrigin = (ALLOWED_ORIGINS.includes('*') || ((origin !== undefined) && URL.canParse(origin) && ALLOWED_ORIGINS.includes(origin))) ? origin : undefined
 
-
 	/** @type {RouteRequest|RouteAction} */
 	const state = {
 		type: 'error',
@@ -259,21 +258,34 @@ export  function preamble(preState, headers, servername) {
 	//
 	// content negotiation
 	//
-	const contentType = ContentType.parse(fullContentType)
-	const acceptedEncoding = AcceptEncoding.select(fullAcceptEncoding, DEFAULT_SUPPORTED_ENCODINGS)
-	const accept = Accept.select(fullAccept, DEFAULT_SUPPORTED_MIME_TYPES)
-	const acceptedLanguage = AcceptLanguage.select(fullAcceptLanguage, DEFAULT_SUPPORTED_LANGUAGES)
+	const acceptItem = Accept.parse(fullAccept)
+	const acceptEncodingItem = AcceptEncoding.parse(fullAcceptEncoding)
+	const acceptLanguageItem = AcceptLanguage.parse(fullAcceptLanguage)
+
+	/** @type {RouteRequestAccept} */
 	const acceptObject = {
-		type: accept,
-		encoding: acceptedEncoding,
-		language: acceptedLanguage
+		parsed: {
+			type: acceptItem,
+			encoding: acceptEncodingItem,
+			language: acceptLanguageItem,
+		},
+
+		get type() { return Accept.selectFrom(acceptItem, DEFAULT_SUPPORTED_MIME_TYPES) },
+		get encoding() { return AcceptEncoding.selectFrom(acceptEncodingItem, DEFAULT_SUPPORTED_ENCODINGS) },
+		get language() { return AcceptLanguage.selectFrom(acceptLanguageItem, DEFAULT_SUPPORTED_LANGUAGES) },
+
+		select: {
+			type: acceptableTypes => Accept.selectItemFrom(acceptItem, acceptableTypes ?? DEFAULT_SUPPORTED_MIME_TYPES),
+			encoding: acceptableEncodings => AcceptEncoding.selectItemFrom(acceptEncodingItem, acceptableEncodings ?? DEFAULT_SUPPORTED_ENCODINGS),
+			language: acceptableLanguages => AcceptLanguage.selectItemFrom(acceptLanguageItem, acceptableLanguages ?? DEFAULT_SUPPORTED_LANGUAGES)
+		}
 	}
 
 	//
 	// Trace
 	//
 	if(method === HTTP2_METHOD_TRACE) {
-		if(!ALLOW_TRACE) { return { ...state, type: 'not-allowed', method, methods: [], url: requestUrl }}
+		if(!ALLOW_TRACE) { return { ...state, type: 'not-allowed', method, methods: [] }}
 		const maxForwardsValue = maxForwards === undefined ? 0 : Number.parseInt(maxForwards)
 		const preambleEnd = performance.now()
 		state.meta.performance.push({ name: 'preamble-trace', duration: preambleEnd - preambleStart })
@@ -284,6 +296,7 @@ export  function preamble(preState, headers, servername) {
 	//
 	// setup future body
 	//
+	const contentType = ContentType.parse(fullContentType)
 	const contentLength = fullContentLength === undefined ? undefined : Number.parseInt(fullContentLength, 10)
 	const body = requestBody(stream, {
 		byteLimit: BODY_BYTE_LENGTH,