remove writeTo method

Author: ije

server/response.ts

@@ -1,6 +1,4 @@
 import { APIResponse as IResponse } from '../types.d.ts'
-import log from '../shared/log.ts'
-import compress from './compress.ts'
 
 export class APIResponse implements IResponse {
   status = 200
@@ -33,42 +31,4 @@ export class APIResponse implements IResponse {
     this.body = JSON.stringify(data, undefined, space)
     return this
   }
-
-  async writeTo({ request, respondWith }: Deno.RequestEvent, status?: number): Promise<void> {
-    let { body, headers, } = this
-    let contentType: string | null = null
-    if (headers.has('Content-Type')) {
-      contentType = headers.get('Content-Type')!
-    } else if (typeof body === 'string') {
-      contentType = 'text/plain; charset=utf-8'
-      headers.set('Content-Type', contentType)
-    }
-    if (!headers.has('Date')) {
-      headers.set('Date', (new Date).toUTCString())
-    }
-
-    const acceptEncoding = request.headers.get('accept-encoding')
-    if (acceptEncoding && body && contentType) {
-      let data = new Uint8Array()
-      if (typeof body === 'string') {
-        data = new TextEncoder().encode(body)
-      } else if (body instanceof Uint8Array) {
-        data = body
-      } else if (body instanceof ArrayBuffer) {
-        data = new Uint8Array(body)
-      }
-      const contentEncoding = compress.accept(acceptEncoding, contentType, data.length)
-      if (contentEncoding) {
-        body = await compress.compress(data, contentEncoding)
-        headers.set('Vary', 'Origin')
-        headers.set('Content-Encoding', contentEncoding)
-      }
-    }
-
-    try {
-      await respondWith(new Response(body, { headers, status: status || this.status }))
-    } catch (err) {
-      log.warn('http:', err.message)
-    }
-  }
 }

server/server.ts

@@ -85,6 +85,40 @@ export class Server {
       }
 
       const resp = new APIResponse()
+      const end = async (status?: number): Promise<void> => {
+        let { body, headers, } = resp
+        let contentType: string | null = null
+        if (headers.has('Content-Type')) {
+          contentType = headers.get('Content-Type')!
+        } else if (typeof body === 'string') {
+          contentType = 'text/plain; charset=utf-8'
+          headers.set('Content-Type', contentType)
+        }
+
+        const acceptEncoding = req.headers.get('accept-encoding')
+        if (acceptEncoding && body && contentType) {
+          let data = new Uint8Array()
+          if (typeof body === 'string') {
+            data = new TextEncoder().encode(body)
+          } else if (body instanceof Uint8Array) {
+            data = body
+          } else if (body instanceof ArrayBuffer) {
+            data = new Uint8Array(body)
+          }
+          const contentEncoding = compress.accept(acceptEncoding, contentType, data.length)
+          if (contentEncoding) {
+            body = await compress.compress(data, contentEncoding)
+            headers.set('Vary', 'Origin')
+            headers.set('Content-Encoding', contentEncoding)
+          }
+        }
+
+        try {
+          await respondWith(new Response(body, { headers, status: status || resp.status }))
+        } catch (err) {
+          log.warn('http:', err.message)
+        }
+      }
 
       // set server header
       resp.setHeader('Server', 'Aleph.js')
@@ -107,9 +141,11 @@ export class Server {
           const [path, search] = util.splitBy(util.atobUrl(util.trimSuffix(util.trimPrefix(pathname, '/_aleph/data/'), '.json')), '?')
           const data = await aleph.getSSRData({ pathname: path, search: search ? '?' + search : undefined })
           if (data === null) {
-            resp.json(null).writeTo(e)
+            resp.json(null)
+            end()
           } else {
-            resp.json(data).writeTo(e)
+            resp.json(data)
+            end()
           }
           return
         }
@@ -118,7 +154,7 @@ export class Server {
         if (relPath == '/main.js') {
           resp.body = await aleph.createMainJS(false)
           resp.setHeader('Content-Type', 'application/javascript; charset=utf-8')
-          resp.writeTo(e)
+          end()
           return
         }
 
@@ -139,14 +175,14 @@ export class Server {
             if (content) {
               const hash = aleph.gteModuleHash(module)
               if (hash === req.headers.get('If-None-Match')) {
-                resp.writeTo(e, 304)
+                end(304)
                 return
               }
 
               resp.setHeader('ETag', hash)
               resp.setHeader('Content-Type', 'application/javascript; charset=utf-8')
               resp.body = content
-              resp.writeTo(e)
+              end()
               return
             }
           }
@@ -158,19 +194,19 @@ export class Server {
           const info = Deno.lstatSync(filePath)
           const lastModified = info.mtime?.toUTCString() ?? (new Date).toUTCString()
           if (lastModified === req.headers.get('If-Modified-Since')) {
-            resp.writeTo(e, 304)
+            end(304)
             return
           }
 
           resp.body = await Deno.readFile(filePath)
           resp.setHeader('Last-Modified', lastModified)
           resp.setHeader('Content-Type', getContentType(filePath))
-          resp.writeTo(e)
+          end()
           return
         }
 
         resp.body = 'file not found'
-        resp.writeTo(e, 404)
+        end(404)
         return
       }
 
@@ -180,14 +216,14 @@ export class Server {
         const info = Deno.lstatSync(filePath)
         const lastModified = info.mtime?.toUTCString() ?? (new Date).toUTCString()
         if (lastModified === req.headers.get('If-Modified-Since')) {
-          resp.writeTo(e, 304)
+          end(304)
           return
         }
 
         resp.body = await Deno.readFile(filePath)
         resp.setHeader('Last-Modified', lastModified)
         resp.setHeader('Content-Type', getContentType(filePath))
-        resp.writeTo(e)
+        end()
         return
       }
 
@@ -207,7 +243,8 @@ export class Server {
               if (util.isFunction(h)) {
                 await h(context)
               } else {
-                await resp.json({ status: 500, message: 'bad api handler' }).writeTo(e, 500)
+                resp.json({ status: 500, message: 'bad api handler' })
+                end(500)
               }
             }]
             let pointer = 0
@@ -246,14 +283,16 @@ export class Server {
             }
             await next()
             if (!responded) {
-              resp.writeTo(e)
+              end()
             }
           } catch (err) {
-            resp.json({ status: 500, message: err.message }).writeTo(e, 500)
+            resp.json({ status: 500, message: err.message })
+            end(500)
             log.error('invoke API:', err)
           }
         } else {
-          resp.json({ status: 404, message: 'not found' }).writeTo(e, 404)
+          resp.json({ status: 404, message: 'not found' })
+          end(404)
         }
         return
       }
@@ -265,7 +304,7 @@ export class Server {
       })
       resp.body = html
       resp.setHeader('Content-Type', 'text/html; charset=utf-8')
-      resp.writeTo(e, status)
+      end(status)
     } catch (err) {
       try {
         // todo: custom error page