@@ -12,7 +12,6 @@ import * as FileSystem from "effect/FileSystem";
1212import * as Layer from "effect/Layer" ;
1313import * as Option from "effect/Option" ;
1414import * as Path from "effect/Path" ;
15- import * as Stream from "effect/Stream" ;
1615import { cast } from "effect/Function" ;
1716import {
1817 Headers ,
@@ -31,6 +30,7 @@ import * as ServerConfig from "./config.ts";
3130import { ASSET_ROUTE_PREFIX , resolveAsset } from "./assets/AssetAccess.ts" ;
3231import * as BrowserTraceCollector from "./observability/BrowserTraceCollector.ts" ;
3332import * as EnvironmentAuth from "./auth/EnvironmentAuth.ts" ;
33+ import * as HttpResponseCompression from "./httpCompression/HttpResponseCompression.ts" ;
3434import { traceRelayRequest } from "./cloud/traceRelayRequest.ts" ;
3535import {
3636 annotateEnvironmentRequest ,
@@ -67,10 +67,10 @@ function varyByAcceptEncoding(value: string | undefined): string {
6767 return values . has ( "*" ) || values . has ( "accept-encoding" ) ? value : `${ value } , Accept-Encoding` ;
6868}
6969
70- export function compressHttpResponse (
70+ const compressHttpResponse = Effect . fnUntraced ( function * (
7171 response : HttpServerResponse . HttpServerResponse ,
7272 acceptEncoding : string | undefined ,
73- ) : HttpServerResponse . HttpServerResponse {
73+ ) {
7474 const body = response . body ;
7575 if (
7676 body . _tag !== "Uint8Array" ||
@@ -88,30 +88,27 @@ export function compressHttpResponse(
8888 ) ;
8989 if ( ! acceptsGzip ( acceptEncoding ) ) return variedResponse ;
9090
91- const compressedBody = Stream . fromReadableStream ( {
92- evaluate : ( ) => new Response ( body . body ) . body ! . pipeThrough ( new CompressionStream ( "gzip" ) ) ,
93- onError : ( cause ) => cause ,
94- } ) ;
91+ const compression = yield * HttpResponseCompression . HttpResponseCompression ;
9592 const headers = Headers . set (
9693 Headers . remove ( variedResponse . headers , "content-length" ) ,
9794 "content-encoding" ,
9895 "gzip" ,
9996 ) ;
100- return HttpServerResponse . stream ( compressedBody , {
97+ return compression . gzip ( body . body , {
10198 status : response . status ,
10299 statusText : response . statusText ,
103100 headers,
104101 cookies : response . cookies ,
105102 contentType : body . contentType ,
106103 } ) ;
107- }
104+ } ) ;
108105
109106export const httpCompressionLayer = HttpRouter . middleware (
110107 ( httpEffect ) =>
111- Effect . gen ( function * ( ) {
112- const request = yield * HttpServerRequest . HttpServerRequest ;
113- return compressHttpResponse ( yield * httpEffect , request . headers [ "accept-encoding" ] ) ;
114- } ) ,
108+ Effect . flatMap (
109+ Effect . all ( [ httpEffect , HttpServerRequest . HttpServerRequest ] ) ,
110+ ( [ response , request ] ) => compressHttpResponse ( response , request . headers [ "accept-encoding" ] ) ,
111+ ) ,
115112 { global : true } ,
116113) ;
117114
0 commit comments