fix: merged upstream master with test/app

.github/workflows/main.yml

@@ -10,7 +10,10 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
       - uses: denoland/[email protected]
@@ -21,6 +24,7 @@ jobs:
       - name: Create coverage report
         run: deno task cov
       - name: Coveralls
+        if: ${{ matrix.os == 'ubuntu-latest' }}
         uses: coverallsapp/github-action@master
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}

deps.ts

@@ -1,9 +1,9 @@
 export { parse as parseRange } from 'https://deno.land/x/[email protected]/parse.ts'
 export type { RangesSpecifier } from 'https://deno.land/x/[email protected]/types.ts'
-export { typeByExtension } from 'https://deno.land/std@0.185.0/media_types/type_by_extension.ts'
-export { getCharset } from 'https://deno.land/std@0.185.0/media_types/get_charset.ts'
-export { contentType } from 'https://deno.land/std@0.185.0/media_types/content_type.ts'
-export * as path from 'https://deno.land/std@0.185.0/path/mod.ts'
+export { typeByExtension } from 'https://deno.land/std@0.192.0/media_types/type_by_extension.ts'
+export { getCharset } from 'https://deno.land/std@0.192.0/media_types/get_charset.ts'
+export { contentType } from 'https://deno.land/std@0.192.0/media_types/content_type.ts'
+export * as path from 'https://deno.land/std@0.192.0/path/mod.ts'
 export { default as Negotiator } from 'https://deno.land/x/[email protected]/mod.ts'
 export { vary } from 'https://deno.land/x/[email protected]/mod.ts'
 export { encodeUrl } from 'https://deno.land/x/[email protected]/mod.ts'
@@ -15,20 +15,20 @@ export {
 export { status } from 'https://deno.land/x/[email protected]/status.ts'
 export { isIP } from 'https://deno.land/x/[email protected]/mod.ts'
 export { escapeHtml } from 'https://deno.land/x/[email protected]/mod.ts'
-export * as base64 from 'https://deno.land/std@0.185.0/encoding/base64.ts'
-export { parseMediaType } from 'https://deno.land/std@0.185.0/media_types/parse_media_type.ts'
+export * as base64 from 'https://deno.land/std@0.192.0/encoding/base64.ts'
+export { parseMediaType } from 'https://deno.land/std@0.192.0/media_types/parse_media_type.ts'
 export * as mediaTyper from 'https://deno.land/x/[email protected]/mod.ts'
-export { contentDisposition } from 'https://esm.sh/@tinyhttp/content-disposition@2.0.9'
-export { basename, extname } from 'https://deno.land/std@0.185.0/path/mod.ts'
+export { contentDisposition } from 'https://cdn.skypack.dev/@tinyhttp/content-disposition@2.1.0'
+export { basename, extname } from 'https://deno.land/std@0.192.0/path/mod.ts'
 export {
   accepts,
   acceptsEncodings,
   acceptsLanguages,
-} from 'https://deno.land/std@0.185.0/http/negotiation.ts'
-export { setCookie } from 'https://deno.land/std@0.185.0/http/cookie.ts'
-export type { Cookie } from 'https://deno.land/std@0.185.0/http/cookie.ts'
+} from 'https://deno.land/std@0.192.0/http/negotiation.ts'
+export { setCookie } from 'https://deno.land/std@0.192.0/http/cookie.ts'
+export type { Cookie } from 'https://deno.land/std@0.192.0/http/cookie.ts'
 export {
   Status,
   STATUS_TEXT,
-} from 'https://deno.land/std@0.185.0/http/http_status.ts'
-export { CookieMap } from 'https://deno.land/std@0.185.0/http/cookie_map.ts'
+} from 'https://deno.land/std@0.192.0/http/http_status.ts'
+export { CookieMap } from 'https://deno.land/std@0.192.0/http/cookie_map.ts'

examples/eta/mod.ts

@@ -1,30 +1,20 @@
-import { renderFileAsync } from 'https://deno.land/x/eta@v2.0.1/mod.ts'
-import type { EtaConfig } from 'https://deno.land/x/eta@v2.0.1/config.ts'
+import { Eta } from 'https://deno.land/x/eta@v3.0.3/src/index.ts'
+import type { EtaConfig } from 'https://deno.land/x/eta@v3.0.3/src/config.ts'
 import { App } from '../../mod.ts'
+import { path } from '../../deps.ts'
 
+const eta = new Eta({
+  views: path.join(Deno.cwd(), 'views'),
+})
 const app = new App<EtaConfig>()
 
-app.engine('eta', renderFileAsync)
-
-function func() {
-  return new Promise((resolve) => {
-    setTimeout(() => {
-      resolve('HI FROM ASYNC')
-    }, 20)
-  })
-}
-
 app.use(
-  async (_, res) => {
-    await res.render(
-      'index.eta',
-      { name: 'Eta', func },
-      {
-        renderOptions: {
-          async: true,
-          cache: true,
-        },
-      },
+  (_, res) => {
+    res.end(
+      eta.render(
+        'index',
+        { name: 'Eta' },
+      ),
     )
   },
 )

examples/eta/views/index.eta

@@ -1,3 +1 @@
-Hello from <%= it.name %>
-
-Async func: <%= await it.func() %>
+Hello from <%= it.name %>

examples/https/mod.ts

@@ -1,5 +1,5 @@
 import { App } from '../../app.ts'
-import { serveTls } from 'https://deno.land/std@0.185.0/http/server.ts'
+import { serveTls } from 'https://deno.land/std@0.192.0/http/server.ts'
 
 const app = new App()
 

extensions/res/send/send.ts

@@ -3,73 +3,72 @@ import { json } from './json.ts'
 import { createETag, setCharset } from '../utils.ts'
 import { end } from './end.ts'
 
+const isBuffer = (body: unknown) =>
+  body instanceof Uint8Array || body instanceof Blob ||
+  body instanceof ArrayBuffer || body instanceof ReadableStream<Uint8Array>
+
 export const send = <
   Req extends Request & { fresh?: boolean } = Request & { fresh?: boolean },
   Res extends DummyResponse = DummyResponse,
 >(req: Req, res: Res) =>
 async (body: unknown) => {
   let bodyToSend = body
-  // in case of object - turn it to json
 
-  if (ArrayBuffer.isView(body)) {
-    body = bodyToSend
-  } else if (typeof bodyToSend === 'object' && bodyToSend !== null) {
+  if (isBuffer(body)) {
+    bodyToSend = body
+  } else if (typeof body === 'object' && body !== null) {
+    // in case of object - turn it to json
     bodyToSend = JSON.stringify(body, null, 2)
     res._init.headers?.set('Content-Type', 'application/json')
-  } else {
-    if (typeof bodyToSend === 'string') {
-      // reflect this in content-type
-      const type = res._init.headers?.get('Content-Type')
+  } else if (typeof body === 'string') {
+    // reflect this in content-type
+    const type = res._init.headers.get('Content-Type')
 
-      if (type && typeof type === 'string') {
-        res._init.headers?.set('Content-Type', setCharset(type))
-      } else {res._init.headers?.set(
-          'Content-Type',
-          setCharset('text/html'),
-        )}
-    }
+    if (type && typeof type === 'string') {
+      res._init.headers.set('Content-Type', setCharset(type))
+    } else {res._init.headers.set(
+        'Content-Type',
+        setCharset('text/html'),
+      )}
   }
-
   // populate ETag
   let etag: string | undefined
   if (
-    bodyToSend && !res._init.headers?.get('etag') &&
-    (etag = await createETag(bodyToSend as string))
+    typeof body === 'string' && !res._init.headers.get('etag')
   ) {
-    res._init.headers?.set('etag', etag)
+    etag = await createETag(bodyToSend as string)
   }
+  {
+    if (etag) res._init.headers.set('etag', etag!)
+  }
+
   // freshness
   if (req.fresh) res._init.status = 304
+
   // strip irrelevant headers
   if (res._init.status === 204 || res._init.status === 304) {
-    res._init.headers?.delete('Content-Type')
-    res._init.headers?.delete('Content-Length')
-    res._init.headers?.delete('Transfer-Encoding')
+    res._init.headers.delete('Content-Type')
+    res._init.headers.delete('Content-Length')
+    res._init.headers.delete('Transfer-Encoding')
     bodyToSend = ''
   }
 
   if (req.method === 'HEAD') {
     return end(res)(bodyToSend as BodyInit)
   }
 
-  if (typeof bodyToSend === 'object') {
+  if (typeof body === 'object') {
     if (body == null) {
-      return end(res)('')
-    } else if (
-      bodyToSend instanceof Uint8Array || bodyToSend instanceof File
-    ) {
-      if (!res._init.headers?.get('Content-Type')) {
+      return end(res)(null)
+    } else if (isBuffer(body)) {
+      if (!res._init.headers.get('Content-Type')) {
         res._init.headers.set('content-type', 'application/octet-stream')
       }
-      return end(res)(bodyToSend)
-    } else {
-      return json(res)(bodyToSend)
-    }
-  } else {
-    if (typeof bodyToSend !== 'string' && bodyToSend) {
-      bodyToSend = (bodyToSend as string).toString()
-    }
-
-    return end(res)(bodyToSend as BodyInit)
+      return end(res)(bodyToSend as BodyInit)
+    } else return json(res)(bodyToSend)
+  }
+  if (typeof bodyToSend !== 'string') {
+    bodyToSend = (bodyToSend as string).toString()
   }
+  return end(res)(bodyToSend as string)
 }

tests/modules/send.test.ts

@@ -3,6 +3,8 @@ import { json, send, sendStatus, status } from '../../extensions/res/mod.ts'
 import { runServer } from '../util.test.ts'
 import { App } from '../../mod.ts'
 
+const te = new TextEncoder()
+
 describe('json(body)', () => {
   it('should send a JSON reply when an object is passed', async () => {
     const app = runServer((_, res) => {
@@ -118,12 +120,11 @@ describe('send(body)', () => {
       .expectHeader('Content-Type', null)
       .expectHeader('Transfer-Encoding', null)
   })
-  it.skip('should set Content-Type to application/octet-stream for buffers if the header hasn\'t been set before', async () => {
-    const app = runServer((req, res) =>
-      send(req, res)(
-        new TextEncoder().encode('Hello World'),
-      ) as unknown as Response
-    )
+  it('should set Content-Type to application/octet-stream for buffers if the header hasn\'t been set before', async () => {
+    const app = runServer(async (req, res) => {
+      const r = await send(req, res)(te.encode('Hello World'))
+      return new Response(r._body, r._init)
+    })
 
     const res = await makeFetch(app)('/')
     res.expectHeader(