@@ -14,10 +14,10 @@ import * as Option from "effect/Option";
1414import * as Path from "effect/Path" ;
1515import { cast } from "effect/Function" ;
1616import {
17- Headers ,
1817 HttpBody ,
1918 HttpClient ,
2019 HttpClientResponse ,
20+ HttpMiddleware ,
2121 HttpRouter ,
2222 HttpServerResponse ,
2323 HttpServerRequest ,
@@ -30,7 +30,6 @@ import * as ServerConfig from "./config.ts";
3030import { ASSET_ROUTE_PREFIX , resolveAsset } from "./assets/AssetAccess.ts" ;
3131import * as BrowserTraceCollector from "./observability/BrowserTraceCollector.ts" ;
3232import * as EnvironmentAuth from "./auth/EnvironmentAuth.ts" ;
33- import * as HttpResponseCompression from "./httpCompression/HttpResponseCompression.ts" ;
3433import { traceRelayRequest } from "./cloud/traceRelayRequest.ts" ;
3534import {
3635 annotateEnvironmentRequest ,
@@ -44,74 +43,10 @@ import { browserApiCorsAllowedHeaders, browserApiCorsAllowedMethods } from "./ht
4443const OTLP_TRACES_PROXY_PATH = "/api/observability/v1/traces" ;
4544const LOOPBACK_HOSTNAMES = new Set ( [ "127.0.0.1" , "::1" , "localhost" ] ) ;
4645const DESKTOP_RENDERER_ORIGINS = [ "t3code://app" , "t3code-dev://app" ] ;
47- const GZIP_MIN_BYTES = 1024 ;
48-
49- function acceptsGzip ( value : string | undefined ) : boolean {
50- if ( ! value ) return false ;
51-
52- const accepted = new Map (
53- value . split ( "," ) . map ( ( entry ) => {
54- const [ coding = "" , ...parameters ] = entry . trim ( ) . toLowerCase ( ) . split ( ";" ) ;
55- const quality = parameters
56- . map ( ( parameter ) => parameter . trim ( ) . match ( / ^ q = ( .+ ) $ / ) ?. [ 1 ] )
57- . find ( ( parameter ) => parameter !== undefined ) ;
58- return [ coding , quality === undefined ? 1 : Number ( quality ) ] as const ;
59- } ) ,
60- ) ;
61- return ( accepted . get ( "gzip" ) ?? accepted . get ( "*" ) ?? 0 ) > 0 ;
62- }
63-
64- function varyByAcceptEncoding ( value : string | undefined ) : string {
65- if ( ! value ) return "Accept-Encoding" ;
66- const values = new Set ( value . split ( "," ) . map ( ( entry ) => entry . trim ( ) . toLowerCase ( ) ) ) ;
67- return values . has ( "*" ) || values . has ( "accept-encoding" ) ? value : `${ value } , Accept-Encoding` ;
68- }
69-
70- const compressHttpResponse = Effect . fnUntraced ( function * (
71- response : HttpServerResponse . HttpServerResponse ,
72- acceptEncoding : string | undefined ,
73- ) {
74- const body = response . body ;
75- if (
76- body . _tag !== "Uint8Array" ||
77- body . contentLength < GZIP_MIN_BYTES ||
78- ! body . contentType . startsWith ( "application/json" ) ||
79- response . headers [ "content-encoding" ]
80- ) {
81- return response ;
82- }
83-
84- const variedResponse = HttpServerResponse . setHeader (
85- response ,
86- "vary" ,
87- varyByAcceptEncoding ( response . headers . vary ) ,
88- ) ;
89- if ( ! acceptsGzip ( acceptEncoding ) ) return variedResponse ;
90-
91- const compression = yield * HttpResponseCompression . HttpResponseCompression ;
92- const headers = Headers . set (
93- Headers . remove ( variedResponse . headers , "content-length" ) ,
94- "content-encoding" ,
95- "gzip" ,
96- ) ;
97- return compression . gzip ( body . body , {
98- status : response . status ,
99- statusText : response . statusText ,
100- headers,
101- cookies : response . cookies ,
102- contentType : body . contentType ,
103- } ) ;
46+ export const httpCompressionLayer = HttpRouter . middleware ( HttpMiddleware . compression ( ) , {
47+ global : true ,
10448} ) ;
10549
106- export const httpCompressionLayer = HttpRouter . middleware (
107- ( httpEffect ) =>
108- Effect . flatMap (
109- Effect . all ( [ httpEffect , HttpServerRequest . HttpServerRequest ] ) ,
110- ( [ response , request ] ) => compressHttpResponse ( response , request . headers [ "accept-encoding" ] ) ,
111- ) ,
112- { global : true } ,
113- ) ;
114-
11550export const browserApiCorsLayer = Layer . unwrap (
11651 Effect . gen ( function * ( ) {
11752 const config = yield * ServerConfig . ServerConfig ;
0 commit comments