@johntalton/http-core 1.0.3 → 1.0.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@johntalton/http-core",
   "type": "module",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "license": "MIT",
   "exports": {
     ".": "./src/index.js"
@@ -15,7 +15,7 @@
   "scripts": {
   },
   "dependencies": {
-    "@johntalton/http-util": "^5.1.2",
+    "@johntalton/http-util": "^6.0.0",
     "@johntalton/sse-util": "^1.0.0"
   }
 }

package/src/epilogue.js

@@ -24,7 +24,7 @@ function addSSEPortHandler(stream, port, streamId, shutdownSignal) {
 		port.close()
 	}))
 
-	shutdownSignal.addEventListener('abort', signalHandler)
+	shutdownSignal.addEventListener('abort', signalHandler, { once: true })
 
 	// ServerSentEvents.messageToEventStreamLines({
 	// 		comment: 'Welcome',
@@ -47,7 +47,7 @@ function addSSEPortHandler(stream, port, streamId, shutdownSignal) {
 export function epilogue(state) {
 	const { type, stream, meta, streamId } = state
 
-	meta.customHeaders.push([ 'X-Request-Id', streamId ])
+	meta.customHeaders?.push([ 'X-Request-Id', streamId ])
 
 	switch(type) {
 		//

package/src/index.js

@@ -44,6 +44,8 @@ export const KNOWN_METHODS = [
 /** @import { BodyFuture } from '@johntalton/http-util/body' */
 /** @import { EtagItem, IMFFixDate, ContentRangeDirective, RateLimitPolicyInfo, RateLimitInfo, ChallengeItem } from '@johntalton/http-util/headers' */
 /** @import { SendBody } from '@johntalton/http-util/response' */
+/** @import { SecFetchSite, SecFetchMode, SecFetchDest } from '@johntalton/http-util/headers' */
+
 
 /** @typedef {(state: RouteRequest|RouteAction) => Promise<RouteAction>} Router */
 
@@ -110,6 +112,7 @@ export const KNOWN_METHODS = [
  * @property {RouteRequestAccept} accept
  * @property {RouteRemoteClient} client
  * @property {RouteConditions} conditions
+ * @property {SecFetchMetadata} secFetchMetadata
  * @property {string} SNI
  */
 /** @typedef {RouteBase & RouteRequestBase} RouteRequest */
@@ -165,6 +168,14 @@ export const KNOWN_METHODS = [
  * @property {IMFFixDate|EtagItem|undefined} [range]
  */
 
+/**
+ * @typedef {Object} SecFetchMetadata
+ * @property {SecFetchSite|undefined} site
+ * @property {SecFetchMode|undefined} mode
+ * @property {SecFetchDest|undefined} dest
+ */
+
+
 /**
  * @typedef {Object} RoutePreflightBase
  * @property {'preflight'} type

package/src/preamble.js

@@ -1,3 +1,4 @@
+/** biome-ignore-all lint/nursery/noExcessiveLinesPerFile: does all the work */
 import http2 from 'node:http2'
 import { TLSSocket } from 'node:tls'
 
@@ -8,6 +9,7 @@ import {
 	AcceptLanguage,
 
 	Conditional,
+	ContentType,
 	ETag,
 
 	FORWARDED_KEY_FOR,
@@ -19,18 +21,21 @@ import {
 	MIME_TYPE_MESSAGE_HTTP,
 	MIME_TYPE_TEXT,
 	MIME_TYPE_XML,
-	parseContentType
+	SecFetch
 } from '@johntalton/http-util/headers'
 import {
 	ENCODER_MAP,
 	HTTP_HEADER_FORWARDED,
-	HTTP_HEADER_ORIGIN
+	HTTP_HEADER_ORIGIN,
+	HTTP_HEADER_SEC_FETCH_DEST,
+	HTTP_HEADER_SEC_FETCH_MODE,
+	HTTP_HEADER_SEC_FETCH_SITE
 } from '@johntalton/http-util/response'
 
 import { isValidHeader, isValidLikeHeader, isValidMethod } from './index.js'
 
 /** @import { ServerHttp2Stream, IncomingHttpHeaders } from 'node:http2' */
-/** @import { Config, RouteRequest, RouteAction, StreamID, RouteConditions } from './index.js' */
+/** @import { Config, RouteRequest, RouteAction, StreamID, RouteConditions, SecFetchMetadata } from './index.js' */
 
 const { HTTP2_METHOD_OPTIONS, HTTP2_METHOD_TRACE } = http2.constants
 
@@ -142,9 +147,9 @@ export function preamble(config, streamId, stream, headers, servername, shutdown
 	// const secUA = header[HTTP_HEADER_SEC_CH_UA]
 	// const secPlatform = header[HTTP_HEADER_SEC_CH_PLATFORM]
 	// const secMobile = header[HTTP_HEADER_SEC_CH_MOBILE]
-	// const secFetchSite = header[HTTP_HEADER_SEC_FETCH_SITE]
-	// const secFetchMode = header[HTTP_HEADER_SEC_FETCH_MODE]
-	// const secFetchDest = header[HTTP_HEADER_SEC_FETCH_DEST]
+	const secFetchSite = headers[HTTP_HEADER_SEC_FETCH_SITE]
+	const secFetchMode = headers[HTTP_HEADER_SEC_FETCH_MODE]
+	const secFetchDest = headers[HTTP_HEADER_SEC_FETCH_DEST]
 
 	//
 	const allowedOrigin = (ALLOWED_ORIGINS.includes('*') || ((origin !== undefined) && URL.canParse(origin) && ALLOWED_ORIGINS.includes(origin))) ? origin : undefined
@@ -200,6 +205,15 @@ export function preamble(config, streamId, stream, headers, servername, shutdown
 	//
 	const requestUrl = new URL(fullPathAndQuery, `${scheme}://${authority}`)
 
+	// Sec Fetch Metadata
+	/** @type {SecFetchMetadata} */
+	const secFetchMetadata = {
+		site: SecFetch.parseSite(secFetchSite),
+		mode: SecFetch.parseMode(secFetchMode),
+		dest: SecFetch.parseDestination(secFetchDest)
+	}
+
+
 	//
 	/** @type {RouteConditions} */
 	const conditions = {
@@ -240,7 +254,7 @@ export function preamble(config, streamId, stream, headers, servername, shutdown
 	//
 	// content negotiation
 	//
-	const contentType = parseContentType(fullContentType)
+	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)
@@ -255,7 +269,7 @@ export function preamble(config, streamId, stream, headers, servername, shutdown
 	//
 	if(method === HTTP2_METHOD_TRACE) {
 		if(!ALLOW_TRACE) { return { ...state, type: 'not-allowed', method, methods: [], url: requestUrl }}
-		const maxForwardsValue = maxForwards !== undefined ? Number.parseInt(maxForwards) : 0
+		const maxForwardsValue = maxForwards === undefined ? 0 : Number.parseInt(maxForwards)
 		const preambleEnd = performance.now()
 		state.meta.performance.push({ name: 'preamble-trace', duration: preambleEnd - preambleStart })
 		if(acceptObject.type !== MIME_TYPE_MESSAGE_HTTP) { return { ...state, type: 'not-acceptable', acceptableMediaTypes: [ MIME_TYPE_MESSAGE_HTTP ] } }
@@ -294,6 +308,7 @@ export function preamble(config, streamId, stream, headers, servername, shutdown
 		body,
 		// tokens,
 		conditions,
+		secFetchMetadata,
 		accept: acceptObject,
 		client: { family, ip, port },
 		SNI