mockaton 7.2.0 → 7.2.1

package/README.md

@@ -271,8 +271,8 @@ Config.corsOrigins = ['*']
 Config.corsMethods = ['GET', 'PUT', 'DELETE', 'POST', 'PATCH', 'HEAD', 'OPTIONS', 'TRACE', 'CONNECT']
 Config.corsHeaders = ['content-type']
 Config.corsCredentials = true
-Config.corsMaxAge = 0
-Config.corsExposedHeaders = []
+Config.corsMaxAge = 0 // seconds to cache the preflight req
+Config.corsExposedHeaders = [] // headers you need to access in client-side JS
 ```
 
 ## `Config.onReady`

package/package.json

@@ -2,7 +2,7 @@
 	"name": "mockaton",
 	"description": "A deterministic server-side for developing and testing frontend clients",
 	"type": "module",
-	"version": "7.2.0",
+	"version": "7.2.1",
 	"main": "index.js",
 	"types": "index.d.ts",
 	"license": "MIT",

package/src/Mockaton.test.js

@@ -11,7 +11,7 @@ import { mimeFor } from './utils/mime.js'
 import { Mockaton } from './Mockaton.js'
 import { Commander } from './Commander.js'
 import { parseFilename } from './Filename.js'
-import { PreflightHeader } from './utils/http-cors.js'
+import { CorsHeader } from './utils/http-cors.js'
 import { API, DEFAULT_500_COMMENT, DEFAULT_MOCK_COMMENT } from './ApiConstants.js'
 
 
@@ -444,13 +444,13 @@ async function testCorsAllowed() {
 		const res = await request('/does-not-matter', {
 			method: 'OPTIONS',
 			headers: {
-				[PreflightHeader.Origin]: 'http://example.com',
-				[PreflightHeader.AccessControlRequestMethod]: 'GET'
+				[CorsHeader.Origin]: 'http://example.com',
+				[CorsHeader.AccessControlRequestMethod]: 'GET'
 			}
 		})
 		equal(res.status, 204)
-		equal(res.headers.get(PreflightHeader.AccessControlAllowOrigin), 'http://example.com')
-		equal(res.headers.get(PreflightHeader.AccessControlAllowMethods), 'GET')
+		equal(res.headers.get(CorsHeader.AccessControlAllowOrigin), 'http://example.com')
+		equal(res.headers.get(CorsHeader.AccessControlAllowMethods), 'GET')
 	})
 }
 

package/src/utils/http-cors.js

@@ -2,7 +2,7 @@ import { StandardMethods } from './http-request.js'
 
 // https://www.w3.org/TR/2020/SPSD-cors-20200602/#resource-processing-model
 
-export const PreflightHeader = {
+export const CorsHeader = {
 	// request
 	Origin: 'origin',
 	AccessControlRequestMethod: 'access-control-request-method',
@@ -16,13 +16,13 @@ export const PreflightHeader = {
 	AccessControlExposeHeaders: 'Access-Control-Expose-Headers', // '*' | Comma delimited 
 	AccessControlAllowCredentials: 'Access-Control-Allow-Credentials' // 'true'
 }
-const PH = PreflightHeader
+const CH = CorsHeader
 
 
 export function isPreflight(req) {
 	return req.method === 'OPTIONS'
-		&& URL.canParse(req.headers[PH.Origin])
-		&& StandardMethods.includes(req.headers[PH.AccessControlRequestMethod])
+		&& URL.canParse(req.headers[CH.Origin])
+		&& StandardMethods.includes(req.headers[CH.AccessControlRequestMethod])
 }
 
 
@@ -34,16 +34,16 @@ export function setCorsHeaders(req, response, {
 	credentials = false,
 	maxAge = 0
 }) {
-	const reqOrigin = req.headers[PH.Origin]
+	const reqOrigin = req.headers[CH.Origin]
 	const hasWildcard = origins.some(ao => ao === '*')
 	if (!reqOrigin || (!hasWildcard && !origins.includes(reqOrigin)))
 		return
-	response.setHeader(PH.AccessControlAllowOrigin, reqOrigin) // Never '*', so no need to `Vary` it
+	response.setHeader(CH.AccessControlAllowOrigin, reqOrigin) // Never '*', so no need to `Vary` it
 
 	if (credentials)
-		response.setHeader(PH.AccessControlAllowCredentials, 'true')
+		response.setHeader(CH.AccessControlAllowCredentials, 'true')
 
-	if (req.headers[PH.AccessControlRequestMethod])
+	if (req.headers[CH.AccessControlRequestMethod])
 		setPreflightSpecificHeaders(req, response, methods, headers, maxAge)
 	else
 		setActualRequestHeaders(response, exposedHeaders)
@@ -51,20 +51,20 @@ export function setCorsHeaders(req, response, {
 
 
 function setPreflightSpecificHeaders(req, response, methods, headers, maxAge) {
-	const methodAskingFor = req.headers[PH.AccessControlRequestMethod]
+	const methodAskingFor = req.headers[CH.AccessControlRequestMethod]
 	if (!methods.includes(methodAskingFor))
 		return
 
-	response.setHeader(PH.AccessControlAllowMethods, methodAskingFor)
+	response.setHeader(CH.AccessControlAllowMethods, methodAskingFor)
 	if (headers.length)
-		response.setHeader(PH.AccessControlAllowHeaders, headers.join(','))
+		response.setHeader(CH.AccessControlAllowHeaders, headers.join(','))
 
-	response.setHeader(PH.AccessControlMaxAge, maxAge)
+	response.setHeader(CH.AccessControlMaxAge, maxAge)
 }
 
 
 function setActualRequestHeaders(response, exposedHeaders) {
 	// Exposed means the client-side JavaScript can read them
 	if (exposedHeaders.length)
-		response.setHeader(PH.AccessControlExposeHeaders, exposedHeaders.join(','))
+		response.setHeader(CH.AccessControlExposeHeaders, exposedHeaders.join(','))
 }

package/src/utils/http-cors.test.js

@@ -2,7 +2,7 @@ import { equal } from 'node:assert/strict'
 import { promisify } from 'node:util'
 import { createServer } from 'node:http'
 import { describe, it, after } from 'node:test'
-import { isPreflight, setCorsHeaders, PreflightHeader as PH } from './http-cors.js'
+import { isPreflight, setCorsHeaders, CorsHeader as PH } from './http-cors.js'
 
 
 function headerIs(response, header, value) {