deno_dist/client/client.ts

@@ -84,7 +84,6 @@ class ClientRequestImpl {
     }
 
     let methodUpperCase = this.method.toUpperCase()
-    let setBody = !(methodUpperCase === 'GET' || methodUpperCase === 'HEAD')
 
     const headerValues: Record<string, string> = {
       ...(args?.header ?? {}),
@@ -117,7 +116,7 @@ class ClientRequestImpl {
       url = url + '?' + this.queryParams.toString()
     }
     methodUpperCase = this.method.toUpperCase()
-    setBody = !(methodUpperCase === 'GET' || methodUpperCase === 'HEAD')
+    const setBody = !(methodUpperCase === 'GET' || methodUpperCase === 'HEAD')
 
     // Pass URL string to 1st arg for testing with MSW and node-fetch
     return (opt?.fetch || fetch)(url, {

deno_dist/helper/ssg/ssg.ts

@@ -271,7 +271,7 @@ export interface ToSSGAdaptorInterface<
  * The API might be changed.
  */
 export const toSSG: ToSSGInterface = async (app, fs, options) => {
-  let result: ToSSGResult | undefined = undefined
+  let result: ToSSGResult | undefined
   const getInfoPromises: Promise<unknown>[] = []
   const savePromises: Promise<string | undefined>[] = []
   try {

deno_dist/helper/testing/index.ts

@@ -15,5 +15,5 @@ export const testClient = <T extends Hono<any, any, any>>(
     return app.request(input, init, Env, executionCtx)
   }
 
-  return hc<typeof app>('', { fetch: customFetch })
+  return hc<typeof app>('http://localhost', { fetch: customFetch })
 }

deno_dist/jsx/streaming.ts

@@ -116,48 +116,60 @@ const textEncoder = new TextEncoder()
  * The API might be changed.
  */
 export const renderToReadableStream = (
-  str: HtmlEscapedString | Promise<HtmlEscapedString>
+  str: HtmlEscapedString | Promise<HtmlEscapedString>,
+  onError: (e: unknown) => void = console.trace
 ): ReadableStream<Uint8Array> => {
   const reader = new ReadableStream<Uint8Array>({
     async start(controller) {
-      const tmp = str instanceof Promise ? await str : await str.toString()
-      const context = typeof tmp === 'object' ? tmp : {}
-      const resolved = await resolveCallback(
-        tmp,
-        HtmlEscapedCallbackPhase.BeforeStream,
-        true,
-        context
-      )
-      controller.enqueue(textEncoder.encode(resolved))
-
-      let resolvedCount = 0
-      const callbacks: Promise<void>[] = []
-      const then = (promise: Promise<string>) => {
-        callbacks.push(
-          promise
-            .catch((err) => {
-              console.trace(err)
-              return ''
-            })
-            .then(async (res) => {
-              res = await resolveCallback(res, HtmlEscapedCallbackPhase.BeforeStream, true, context)
-              ;(res as HtmlEscapedString).callbacks
-                ?.map((c) => c({ phase: HtmlEscapedCallbackPhase.Stream, context }))
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                .filter<Promise<string>>(Boolean as any)
-                .forEach(then)
-              resolvedCount++
-              controller.enqueue(textEncoder.encode(res))
-            })
+      try {
+        const tmp = str instanceof Promise ? await str : await str.toString()
+        const context = typeof tmp === 'object' ? tmp : {}
+        const resolved = await resolveCallback(
+          tmp,
+          HtmlEscapedCallbackPhase.BeforeStream,
+          true,
+          context
         )
-      }
-      ;(resolved as HtmlEscapedString).callbacks
-        ?.map((c) => c({ phase: HtmlEscapedCallbackPhase.Stream, context }))
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        .filter<Promise<string>>(Boolean as any)
-        .forEach(then)
-      while (resolvedCount !== callbacks.length) {
-        await Promise.all(callbacks)
+        controller.enqueue(textEncoder.encode(resolved))
+
+        let resolvedCount = 0
+        const callbacks: Promise<void>[] = []
+        const then = (promise: Promise<string>) => {
+          callbacks.push(
+            promise
+              .catch((err) => {
+                console.log(err)
+                onError(err)
+                return ''
+              })
+              .then(async (res) => {
+                res = await resolveCallback(
+                  res,
+                  HtmlEscapedCallbackPhase.BeforeStream,
+                  true,
+                  context
+                )
+                ;(res as HtmlEscapedString).callbacks
+                  ?.map((c) => c({ phase: HtmlEscapedCallbackPhase.Stream, context }))
+                  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                  .filter<Promise<string>>(Boolean as any)
+                  .forEach(then)
+                resolvedCount++
+                controller.enqueue(textEncoder.encode(res))
+              })
+          )
+        }
+        ;(resolved as HtmlEscapedString).callbacks
+          ?.map((c) => c({ phase: HtmlEscapedCallbackPhase.Stream, context }))
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          .filter<Promise<string>>(Boolean as any)
+          .forEach(then)
+        while (resolvedCount !== callbacks.length) {
+          await Promise.all(callbacks)
+        }
+      } catch (e) {
+        // maybe the connection was closed
+        onError(e)
       }
 
       controller.close()

deno_dist/middleware/serve-static/index.ts

@@ -68,7 +68,7 @@ export const serveStatic = <E extends Env = Env>(
     }
 
     if (content) {
-      let mimeType: string | undefined = undefined
+      let mimeType: string | undefined
       if (options.mimes) {
         mimeType = getMimeType(path, options.mimes) ?? getMimeType(path)
       } else {

deno_dist/router/trie-router/node.ts

@@ -44,13 +44,11 @@ export class Node<T> {
     const parts = splitRoutingPath(path)
 
     const possibleKeys: string[] = []
-    const parentPatterns: Pattern[] = []
 
     for (let i = 0, len = parts.length; i < len; i++) {
       const p: string = parts[i]
 
       if (Object.keys(curNode.children).includes(p)) {
-        parentPatterns.push(...curNode.patterns)
         curNode = curNode.children[p]
         const pattern = getPattern(p)
         if (pattern) {
@@ -64,10 +62,8 @@ export class Node<T> {
       const pattern = getPattern(p)
       if (pattern) {
         curNode.patterns.push(pattern)
-        parentPatterns.push(...curNode.patterns)
         possibleKeys.push(pattern[1])
       }
-      parentPatterns.push(...curNode.patterns)
       curNode = curNode.children[p]
     }
 

deno_dist/utils/jwt/jwt.ts

@@ -22,7 +22,7 @@ const decodeJwtPart = (part: string): unknown =>
 
 export interface TokenHeader {
   alg: SignatureAlgorithm
-  typ: 'JWT'
+  typ?: 'JWT'
 }
 
 // eslint-disable-next-line
@@ -32,8 +32,7 @@ export function isTokenHeader(obj: any): obj is TokenHeader {
     obj !== null &&
     'alg' in obj &&
     Object.values(AlgorithmTypes).includes(obj.alg) &&
-    'typ' in obj &&
-    obj.typ === 'JWT'
+    (!('typ' in obj) || obj.typ === 'JWT')
   )
 }
 

deno_dist/validator/validator.ts

@@ -34,14 +34,18 @@ export const validator = <
   V extends {
     in: {
       [K in U]: K extends 'json'
-        ? InputType
+        ? unknown extends InputType
+          ? OutputTypeExcludeResponseType
+          : InputType
         : { [K2 in keyof OutputTypeExcludeResponseType]: ValidationTargets[K][K2] }
     }
     out: { [K in U]: OutputTypeExcludeResponseType }
   } = {
     in: {
       [K in U]: K extends 'json'
-        ? InputType
+        ? unknown extends InputType
+          ? OutputTypeExcludeResponseType
+          : InputType
         : { [K2 in keyof OutputTypeExcludeResponseType]: ValidationTargets[K][K2] }
     }
     out: { [K in U]: OutputTypeExcludeResponseType }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "4.2.3",
+  "version": "4.2.4",
   "description": "Ultrafast web framework for the Edges",
   "main": "dist/cjs/index.js",
   "type": "module",

src/adapter/cloudflare-workers/utils.ts

@@ -12,7 +12,7 @@ export const getContentFromKVAsset = async (
   path: string,
   options?: KVAssetOptions
 ): Promise<ArrayBuffer | null> => {
-  let ASSET_MANIFEST: Record<string, string> = {}
+  let ASSET_MANIFEST: Record<string, string>
 
   if (options && options.manifest) {
     if (typeof options.manifest === 'string') {

src/adapter/cloudflare-workers/websocket.test.ts

@@ -20,6 +20,7 @@ describe('upgradeWebSocket middleware', () => {
     app.get(
       '/ws',
       upgradeWebSocket(() => ({
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
         onMessage(evt, ws) {
           console.log('evt')
           resolve(evt.data)

src/client/client.ts

@@ -84,7 +84,6 @@ class ClientRequestImpl {
     }
 
     let methodUpperCase = this.method.toUpperCase()
-    let setBody = !(methodUpperCase === 'GET' || methodUpperCase === 'HEAD')
 
     const headerValues: Record<string, string> = {
       ...(args?.header ?? {}),
@@ -117,7 +116,7 @@ class ClientRequestImpl {
       url = url + '?' + this.queryParams.toString()
     }
     methodUpperCase = this.method.toUpperCase()
-    setBody = !(methodUpperCase === 'GET' || methodUpperCase === 'HEAD')
+    const setBody = !(methodUpperCase === 'GET' || methodUpperCase === 'HEAD')
 
     // Pass URL string to 1st arg for testing with MSW and node-fetch
     return (opt?.fetch || fetch)(url, {

src/helper/ssg/ssg.ts

@@ -271,7 +271,7 @@ export interface ToSSGAdaptorInterface<
  * The API might be changed.
  */
 export const toSSG: ToSSGInterface = async (app, fs, options) => {
-  let result: ToSSGResult | undefined = undefined
+  let result: ToSSGResult | undefined
   const getInfoPromises: Promise<unknown>[] = []
   const savePromises: Promise<string | undefined>[] = []
   try {

src/helper/testing/index.test.ts

@@ -1,19 +1,32 @@
 import { Hono } from '../../hono'
 import { testClient } from '.'
 
-describe('hono testClinet', () => {
-  it('should return the correct search result', async () => {
+describe('hono testClient', () => {
+  it('Should return the correct search result', async () => {
     const app = new Hono().get('/search', (c) => c.json({ hello: 'world' }))
     const res = await testClient(app).search.$get()
     expect(await res.json()).toEqual({ hello: 'world' })
   })
 
-  it('should return the correct environment variables value', async () => {
+  it('Should return the correct environment variables value', async () => {
     type Bindings = { hello: string }
     const app = new Hono<{ Bindings: Bindings }>().get('/search', (c) => {
       return c.json({ hello: c.env.hello })
     })
     const res = await testClient(app, { hello: 'world' }).search.$get()
     expect(await res.json()).toEqual({ hello: 'world' })
   })
+
+  it('Should return a correct URL with out throwing an error', async () => {
+    const app = new Hono().get('/abc', (c) => c.json(0))
+    const url = testClient(app).abc.$url()
+    expect(url.pathname).toBe('/abc')
+  })
+
+  it('Should not throw an error with $ws()', async () => {
+    vi.stubGlobal('WebSocket', class {})
+    const app = new Hono().get('/ws', (c) => c.text('Fake response of a WebSocket'))
+    // @ts-expect-error $ws is not typed correctly
+    expect(() => testClient(app).ws.$ws()).not.toThrowError()
+  })
 })

src/helper/testing/index.ts

@@ -15,5 +15,5 @@ export const testClient = <T extends Hono<any, any, any>>(
     return app.request(input, init, Env, executionCtx)
   }
 
-  return hc<typeof app>('', { fetch: customFetch })
+  return hc<typeof app>('http://localhost', { fetch: customFetch })
 }

src/jsx/streaming.test.tsx

@@ -390,10 +390,12 @@ d.replaceWith(c.content)
       return <p>{content}</p>
     }
 
+    const onError = vi.fn()
     const stream = renderToReadableStream(
       <Suspense fallback={<p>Loading...</p>}>
         <Content />
-      </Suspense>
+      </Suspense>,
+      onError
     )
 
     const chunks = []
@@ -402,6 +404,8 @@ d.replaceWith(c.content)
       chunks.push(textDecoder.decode(chunk))
     }
 
+    expect(onError).toBeCalledTimes(1)
+
     expect(chunks).toEqual([
       `<template id="H:${suspenseCounter}"></template><p>Loading...</p><!--/$-->`,
       '',
@@ -412,6 +416,55 @@ d.replaceWith(c.content)
     )
   })
 
+  it('closed()', async () => {
+    const Content = async () => {
+      await new Promise<void>((resolve) =>
+        setTimeout(() => {
+          vi.spyOn(ReadableStreamDefaultController.prototype, 'enqueue').mockImplementation(() => {
+            throw new Error('closed')
+          })
+          resolve()
+        }, 10)
+      )
+      return <p>content</p>
+    }
+
+    const onError = vi.fn()
+    const stream = renderToReadableStream(
+      <>
+        <Suspense fallback={<p>Loading...</p>}>
+          <Content />
+        </Suspense>
+        <Suspense fallback={<p>Loading...</p>}>
+          <Content />
+        </Suspense>
+      </>,
+      onError
+    )
+
+    const chunks = []
+    const textDecoder = new TextDecoder()
+    for await (const chunk of stream as any) {
+      chunks.push(textDecoder.decode(chunk))
+    }
+
+    expect(onError).toBeCalledTimes(1)
+
+    expect(chunks).toEqual([
+      `<template id="H:${suspenseCounter}"></template><p>Loading...</p><!--/$--><template id="H:${
+        suspenseCounter + 1
+      }"></template><p>Loading...</p><!--/$-->`,
+    ])
+
+    expect(replacementResult(`<html><body>${chunks.join('')}</body></html>`)).toEqual(
+      '<p>Loading...</p><!--/$--><p>Loading...</p><!--/$-->'
+    )
+
+    suspenseCounter++
+    await new Promise((resolve) => setTimeout(resolve, 10))
+    vi.restoreAllMocks()
+  })
+
   it('Multiple "await" call', async () => {
     const delayedContent = new Promise<HtmlEscapedString>((resolve) =>
       setTimeout(() => resolve(<h1>Hello</h1>), 10)