@johntalton/http-core 1.1.0 → 1.1.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@johntalton/http-core",
   "type": "module",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "license": "MIT",
   "exports": {
     ".": "./src/index.js"
@@ -16,7 +16,7 @@
     "lint": "biome check"
   },
   "dependencies": {
-    "@johntalton/http-util": "^7.0.1",
+    "@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 })
 
@@ -97,15 +96,8 @@ export function epilogue(state) {
 			if(active) { addSSEPortHandler(stream, port, state.streamId, state.shutdownSignal) }
 		} break
 		case 'json': {
-			const { obj, accept, etag, lastModified, age, supportedQueryTypes } = state
-
-			if(accept.type === MIME_TYPE_JSON) {
-				Response.json(stream, obj, { encoding: accept.encoding, etag, lastModified, age, cacheControl: state.cacheControl ?? {} }, { supportedQueryTypes }, meta)
-			}
-			else {
-				// todo: but we did process the request - is that ok?
-				Response.notAcceptable(stream, { supportedTypes: [ MIME_TYPE_JSON ] }, meta)
-			}
+			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
@@ -120,12 +112,12 @@ export function epilogue(state) {
 			cacheControl: state.cacheControl ?? {} }, meta)
 		} break
 		case 'bytes': {
-			const { contentType, contentLength, etag, lastModified, age, acceptRanges } = state
+			const { contentType, contentLength, encoding, etag, lastModified, age, acceptRanges } = state
 
 			Response.bytes(stream, state.obj, {
 				contentType,
 				contentLength,
-				encoding: 'identity',
+				encoding: encoding ?? 'identity',
 				etag,
 				lastModified,
 				age,

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' */
 
@@ -119,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
@@ -405,8 +423,9 @@ export const KNOWN_METHODS = [
  * @typedef {Object} RouteBytesBase
  * @property {'bytes'} type
  * @property {string} contentType
- * @property {number|undefined} [contentLength]
  * @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]
@@ -415,8 +434,6 @@ export const KNOWN_METHODS = [
  */
 /** @typedef {RouteBase & RouteBytesBase} RouteBytes */
 
-
-
  /**
  * @typedef {Object} RoutePartialBytesBase
  * @property {'partial-bytes'} type
@@ -433,8 +450,8 @@ export const KNOWN_METHODS = [
 /**
  * @typedef {Object} RouteJSONBase
  * @property {'json'} type
- * @property {RouteRequestAccept} accept
  * @property {Record<any, any>} obj
+ * @property {string | undefined} [encoding]
  * @property {IMFFixDateInput|string|undefined} [lastModified]
  * @property {EtagItem|undefined} [etag]
  * @property {number|undefined} [age]

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
 
@@ -258,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 })
@@ -283,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,