Add compress option for app Config

Author: ije

server/api.ts

@@ -8,31 +8,40 @@ import type { APIRequest, ServerRequest, ServerResponse } from '../types.ts'
 let brotli: ((data: Uint8Array) => Uint8Array) | null = null
 let gzip: ((data: Uint8Array) => Uint8Array) | null = null
 
+type Response = {
+  status: number
+  headers: Headers
+  compress: boolean
+  done: boolean
+}
+
 export class Request implements APIRequest {
   #req: ServerRequest
   #params: Record<string, string>
   #query: URLSearchParams
   #cookies: ReadonlyMap<string, string>
-  #resp = {
-    status: 200,
-    headers: new Headers({
-      Server: 'Aleph.js',
-    }),
-    done: false
-  }
+  #resp: Response
 
-  constructor(req: ServerRequest, params: Record<string, string>, query: URLSearchParams) {
+  constructor(req: ServerRequest, params: Record<string, string>, query: URLSearchParams, compress: boolean = true) {
     this.#req = req
     this.#params = params
     this.#query = query
     const cookies = new Map()
     this.headers.get('cookie')?.split(';').forEach(cookie => {
-      const p = cookie.trim().split('=')
+      const p = cookie.split('=')
       if (p.length >= 2) {
-        cookies.set(p.shift()!.trim(), decodeURI(p.join('=')))
+        cookies.set(p.shift()!, decodeURI(p.join('=')))
       }
     })
     this.#cookies = cookies
+    this.#resp = {
+      status: 200,
+      headers: new Headers({
+        Server: 'Aleph.js',
+      }),
+      compress,
+      done: false
+    }
   }
 
   get url(): string {
@@ -159,12 +168,12 @@ export class Request implements APIRequest {
       contentType = 'text/plain; charset=utf-8'
       this.#resp.headers.set('Content-Type', contentType)
     }
-    if (Deno.env.get('ALEPH_BUILD_MODE') !== 'development') {
+    if (this.#resp.compress) {
       let shouldCompress = false
       if (contentType) {
         if (contentType.startsWith('text/')) {
           shouldCompress = true
-        } else if (/^application\/(javascript|typecript|wasm|json|xml)/i.test(contentType)) {
+        } else if (/^application\/(javascript|json|xml|wasm)/i.test(contentType)) {
           shouldCompress = true
         } else if (/^image\/svg\+xml/i.test(contentType)) {
           shouldCompress = true

server/config.ts

@@ -30,6 +30,7 @@ export const defaultConfig: Readonly<RequiredConfig> = {
     postcss: { plugins: ['autoprefixer'] },
   },
   headers: {},
+  compress: true,
   env: {},
   react: {
     version: defaultReactVersion,
@@ -76,6 +77,7 @@ export async function loadConfig(workingDir: string): Promise<Config> {
     plugins,
     css,
     headers,
+    compress,
     env,
   } = data
   if (isFramework(framework)) {
@@ -118,6 +120,9 @@ export async function loadConfig(workingDir: string): Promise<Config> {
   if (util.isPlainObject(headers)) {
     config.headers = toPlainStringRecord(headers)
   }
+  if (typeof compress === 'boolean') {
+    config.compress = compress
+  }
   if (util.isPlainObject(env)) {
     config.env = toPlainStringRecord(env)
     Object.entries(env).forEach(([key, value]) => Deno.env.set(key, value))

server/server.ts

@@ -28,14 +28,14 @@ export class Server {
     }
 
     const app = this.#app
-    const { baseUrl, rewrites } = app.config
+    const { baseUrl, compress, headers, rewrites } = app.config
     const url = rewriteURL(r.url, baseUrl, rewrites)
     const pathname = decodeURI(url.pathname)
-    const req = new Request(r, {}, url.searchParams)
+    const req = new Request(r, {}, url.searchParams, !app.isDev && compress)
 
     // set custom headers
-    for (const key in app.config.headers) {
-      req.setHeader(key, app.config.headers[key])
+    for (const key in headers) {
+      req.setHeader(key, headers[key])
     }
     if (app.isDev) {
       req.setHeader('Cache-Control', 'max-age=0')
@@ -158,7 +158,7 @@ export class Server {
             const [{ params, query }, { jsFile, hash }] = route
             const { default: handle } = await import(`file://${jsFile}#${hash.slice(0, 6)}`)
             if (util.isFunction(handle)) {
-              await handle(new Request(req, params, query))
+              await handle(new Request(req, params, query, !app.isDev && compress))
             } else {
               req.status(500).json({ status: 500, message: 'bad api handler' })
             }

types.ts

@@ -79,6 +79,8 @@ export type Config = {
   headers?: Record<string, string>
   /** `rewrites` specifies the server rewrite map. */
   rewrites?: Record<string, string>
+  /** `compress` enbles gzip/brotli compression for static files and SSR content. */
+  compress?: boolean
   /** `env` appends system env variables. */
   env?: Record<string, string>
 }