Bring staging up to date with main

demos/client-bundle-example/package.json

@@ -3,7 +3,7 @@
 	"main": "index.js",
 	"type": "module",
 	"engines": {
-		"node": ">=20",
+		"node": "20",
 		"npm": ">=9"
 	},
 	"scripts": {

demos/client-example-server/package.json

@@ -5,7 +5,7 @@
 	"main": "dist/app.js",
 	"type": "module",
 	"engines": {
-		"node": ">=20",
+		"node": "20",
 		"npm": ">=9"
 	},
 	"scripts": {

demos/client-example/package.json

@@ -4,7 +4,7 @@
 	"private": true,
 	"type": "module",
 	"engines": {
-		"node": ">=20",
+		"node": "20",
 		"npm": ">=9"
 	},
 	"dependencies": {

demos/cypress-shared/package.json

@@ -4,7 +4,7 @@
 	"private": true,
 	"type": "module",
 	"engines": {
-		"node": ">=20",
+		"node": "20",
 		"npm": ">=9"
 	},
 	"dependencies": {

demos/provider-mock/package.json

@@ -6,7 +6,7 @@
 	"main": "./dist/index.js",
 	"type": "module",
 	"engines": {
-		"node": ">=20",
+		"node": "20",
 		"npm": ">=9"
 	},
 	"scripts": {

dev/config/package.json

@@ -25,7 +25,7 @@
 		"build:cjs": "vite build --config vite.cjs.config.ts"
 	},
 	"engines": {
-		"node": ">=20",
+		"node": "20",
 		"npm": ">=9"
 	},
 	"author": "Prosopo Limited",

dev/flux/package.json

@@ -8,7 +8,7 @@
 	},
 	"type": "module",
 	"engines": {
-		"node": ">=20",
+		"node": "20",
 		"npm": ">=9"
 	},
 	"scripts": {

dev/gh-actions/package.json

@@ -30,7 +30,7 @@
 	"main": "dist/index.js",
 	"type": "module",
 	"engines": {
-		"node": ">=20",
+		"node": "20",
 		"npm": ">=9"
 	}
 }

dev/lint/package.json

@@ -33,7 +33,7 @@
 	"main": "dist/index.js",
 	"type": "module",
 	"engines": {
-		"node": ">=20",
+		"node": "20",
 		"npm": ">=9"
 	},
 	"dependencies": {

dev/prosoponator-bot/package.json

@@ -30,7 +30,7 @@
 	"main": "dist/index.js",
 	"type": "module",
 	"engines": {
-		"node": ">=20",
+		"node": "20",
 		"npm": ">=9"
 	}
 }

dev/scripts/package.json

@@ -5,7 +5,7 @@
 	"main": "dist/index.js",
 	"type": "module",
 	"engines": {
-		"node": ">=20",
+		"node": "20",
 		"npm": ">=9"
 	},
 	"scripts": {

dev/ts-brand/package.json

@@ -5,7 +5,7 @@
 	"main": "./dist/index.js",
 	"type": "module",
 	"engines": {
-		"node": ">=20",
+		"node": "20",
 		"npm": ">=9"
 	},
 	"exports": {

dev/vite-plugin-watch-workspace/package.json

@@ -17,7 +17,7 @@
 		"build:cjs": "npx vite --config vite.cjs.config.ts build"
 	},
 	"engines": {
-		"node": ">=20",
+		"node": "20",
 		"npm": ">=9"
 	},
 	"author": "Prosopo Limited",

docker/docker-compose.provider.yml

@@ -111,7 +111,7 @@ services:
         profiles:
             - production
             - staging
-        image: caddy:2
+        image: prosopo/caddy:latest
         env_file:
             - ../.env.${NODE_ENV}
         labels:

docker/images/provider/package.json

@@ -2,7 +2,7 @@
 	"name": "@prosopo/provider-container",
 	"type": "module",
 	"engines": {
-		"node": ">=20",
+		"node": "20",
 		"npm": ">=9"
 	},
 	"version": "2.1.10"

docker/provider.Caddyfile

@@ -1,10 +1,19 @@
 # usage: `caddy run --config ./docker/provider.Caddyfile --envfile docker/env.development`
 {
+	# debug
 	http_port {$CADDY_HTTP_PORT:80}
 	auto_https {$CADDY_AUTO_HTTPS:disable_redirects}
 	admin {$CADDY_ADMIN_API::2020} # set the admin api to run on localhost:2020 (default is 2019 which can conflict with caddy daemon)
 
+	# Caddy must be told custom rate_limit module its order
+	order rate_limit before basicauth
+	order ja3 before rate_limit
 	servers {
+		listener_wrappers {
+			http_redirect
+			ja3
+			tls
+		}
 		timeouts {
 			read_body 15s
 			read_header 10s
@@ -24,12 +33,36 @@
 	# reverse proxy the metrics path to the metrics emitted by caddy on the admin api
 	# reverse_proxy /metrics {$CADDY_ADMIN_API}
 
+	rate_limit {
+		distributed
+
+		# Means that the rate limit is applied to all GET requests, with a limit of 100 requests per minute.
+		# zone get_rate_limit {
+		# 	match {
+		# 		method GET
+		# 	}
+		# 	key static
+		# 	events 100
+		# 	window 1m
+		# }
+
+		# The rate limit is applied to `remote_host` with a limit of 6 requests per 6 seconds (60 requests per minute).
+		zone dynamic_example {
+			key {remote_host}
+			events 6
+			window 6s
+		}
+		log_key
+	}
+
+	ja3 sort_ja3 true
+
 	# reverse proxy to the provider container
 	reverse_proxy {$CADDY_PROVIDER_CONTAINER_NAME:provider}:{$CADDY_PROVIDER_PORT:9229} {
 		# https://caddyserver.com/docs/caddyfile/concepts#placeholders
 		# https://caddyserver.com/docs/json/apps/http/#docs
-		
-        header_up x-tls-version "{tls_version}"
+
+		header_up x-tls-version "{tls_version}"
 		header_up x-tls-version "^{tls_version}$" ""
 
 		header_up x-tls-client-subject "{tls_client_subject}"