fix: don't use instanceOf Response when handling response (#117)

package.json

@@ -66,6 +66,7 @@
  "@types/jest": "^29.5.3",
  "@types/node": "^20.10.0",
  "@types/supertest": "^2.0.12",
+ "@whatwg-node/fetch": "^0.9.14",
  "eslint": "^8.55.0",
  "hono": "^3.11.7",
  "jest": "^29.6.1",

src/listener.ts

@@ -56,19 +56,13 @@ const responseViaResponseObject = async (
  if (res instanceof Promise) {
  res = await res.catch(handleFetchError)
  }
- if (!(res instanceof Response)) {
- return handleResponseError(
- // @ts-expect-error the object must have `toString()`
- new Error(`The response is not an instance of Response, but ${res.toString()}`),
- outgoing
- )
- }
- if (cacheKey in res) {
- try {
+
+ try {
+ if (cacheKey in res) {
  return responseViaCache(res as Response, outgoing)
- } catch (e: unknown) {
- return handleResponseError(e, outgoing)
  }
+ } catch (e: unknown) {
+ return handleResponseError(e, outgoing)
  }
 
  const resHeaderRecord: OutgoingHttpHeaders = buildOutgoingHttpHeaders(res.headers)

test/server.test.ts

@@ -1,6 +1,7 @@
 import fs from 'node:fs'
 import { createServer as createHttp2Server } from 'node:http2'
 import { createServer as createHTTPSServer } from 'node:https'
+import { Response as PonyfillResponse } from '@whatwg-node/fetch'
 import { Hono } from 'hono'
 import { basicAuth } from 'hono/basic-auth'
 import { compress } from 'hono/compress'
@@ -28,6 +29,9 @@ describe('Basic', () => {
  app.get('/invalid', () => {
  return '<h1>HTML</h1>'
  })
+ app.get('/ponyfill', () => {
+ return new PonyfillResponse('Pony')
+ })
 
  const server = createAdaptorServer(app)
 
@@ -67,8 +71,13 @@ describe('Basic', () => {
  const res = await request(server).get('/invalid')
  expect(res.status).toBe(500)
  expect(res.headers['content-type']).toBe('text/plain')
- // The error message might be changed.
- expect(res.text).toBe('Error: The response is not an instance of Response, but <h1>HTML</h1>')
+ })
+
+ it('Should return 200 response - GET /ponyfill', async () => {
+ const res = await request(server).get('/ponyfill')
+ expect(res.status).toBe(200)
+ expect(res.headers['content-type']).toMatch(/text\/plain/)
+ expect(res.text).toBe('Pony')
  })
 })
 

yarn.lock

@@ -758,6 +758,11 @@
  "@jridgewell/resolve-uri" "3.1.0"
  "@jridgewell/sourcemap-codec" "1.4.14"
 
+"@kamilkisiela/fast-url-parser@^1.1.4":
+ version "1.1.4"
+ resolved "https://registry.yarnpkg.com/@kamilkisiela/fast-url-parser/-/fast-url-parser-1.1.4.tgz#9d68877a489107411b953c54ea65d0658b515809"
+ integrity sha512-gbkePEBupNydxCelHCESvFSFM8XPh1Zs/OAVRW/rKpEqPAl5PbOM90Si8mv9bvnR53uPD2s/FiRxdvSejpRJew==
+
 "@nodelib/fs.scandir@2.1.5":
  version "2.1.5"
  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -1109,6 +1114,30 @@
  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
  integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
 
+"@whatwg-node/events@^0.1.0":
+ version "0.1.1"
+ resolved "https://registry.yarnpkg.com/@whatwg-node/events/-/events-0.1.1.tgz#0ca718508249419587e130da26d40e29d99b5356"
+ integrity sha512-AyQEn5hIPV7Ze+xFoXVU3QTHXVbWPrzaOkxtENMPMuNL6VVHrp4hHfDt9nrQpjO7BgvuM95dMtkycX5M/DZR3w==
+
+"@whatwg-node/fetch@^0.9.14":
+ version "0.9.14"
+ resolved "https://registry.yarnpkg.com/@whatwg-node/fetch/-/fetch-0.9.14.tgz#262039fd8aea52a9c8aac2ec20f316382eae1a3c"
+ integrity sha512-wurZC82zzZwXRDSW0OS9l141DynaJQh7Yt0FD1xZ8niX7/Et/7RoiLiltbVU1fSF1RR9z6ndEaTUQBAmddTm1w==
+ dependencies:
+ "@whatwg-node/node-fetch" "^0.5.0"
+ urlpattern-polyfill "^9.0.0"
+
+"@whatwg-node/node-fetch@^0.5.0":
+ version "0.5.3"
+ resolved "https://registry.yarnpkg.com/@whatwg-node/node-fetch/-/node-fetch-0.5.3.tgz#2fa19211695c1e89f3f15bf9c92edadcb5435873"
+ integrity sha512-toMC8N53RxgprcuU7Fc05KOrJhZV49njJCHPZvXBsjZMQBKrDm9o14Y56CsrUC85cvjQu862MaYOjd8rKgHdDw==
+ dependencies:
+ "@kamilkisiela/fast-url-parser" "^1.1.4"
+ "@whatwg-node/events" "^0.1.0"
+ busboy "^1.6.0"
+ fast-querystring "^1.1.1"
+ tslib "^2.3.1"
+
 acorn-jsx@^5.3.2:
  version "5.3.2"
  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
@@ -1483,6 +1512,13 @@ bundle-require@^4.0.0:
  dependencies:
  load-tsconfig "^0.2.3"
 
+busboy@^1.6.0:
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/busboy/-/busboy-1.6.0.tgz#966ea36a9502e43cdb9146962523b92f531f6893"
+ integrity sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==
+ dependencies:
+ streamsearch "^1.1.0"
+
 cac@^6.7.12:
  version "6.7.14"
  resolved "https://registry.yarnpkg.com/cac/-/cac-6.7.14.tgz#804e1e6f506ee363cb0e3ccbb09cad5dd9870959"
@@ -2396,6 +2432,11 @@ external-editor@^3.0.3:
  iconv-lite "^0.4.24"
  tmp "^0.0.33"
 
+fast-decode-uri-component@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/fast-decode-uri-component/-/fast-decode-uri-component-1.0.1.tgz#46f8b6c22b30ff7a81357d4f59abfae938202543"
+ integrity sha512-WKgKWg5eUxvRZGwW8FvfbaH7AXSh2cL+3j5fMGzUMCxWBJ3dV3a7Wz8y2f/uQ0e3B6WmodD3oS54jTQ9HVTIIg==
+
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
  version "3.1.3"
  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
@@ -2433,6 +2474,13 @@ fast-levenshtein@^2.0.6:
  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
  integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
+fast-querystring@^1.1.1:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/fast-querystring/-/fast-querystring-1.1.2.tgz#a6d24937b4fc6f791b4ee31dcb6f53aeafb89f53"
+ integrity sha512-g6KuKWmFXc0fID8WWH0jit4g0AGBoJhCkJMb1RmbsSEUNvQ+ZC8D6CUZ+GtF8nMzSPXnhiePyyqqipzNNEnHjg==
+ dependencies:
+ fast-decode-uri-component "^1.0.1"
+
 fast-safe-stringify@^2.1.1:
  version "2.1.1"
  resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884"
@@ -5234,6 +5282,11 @@ stack-utils@^2.0.3:
  dependencies:
  escape-string-regexp "^2.0.0"
 
+streamsearch@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-1.1.0.tgz#404dd1e2247ca94af554e841a8ef0eaa238da764"
+ integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==
+
 string-length@^4.0.1:
  version "4.0.2"
  resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a"
@@ -5577,6 +5630,11 @@ tslib@^1.9.0:
  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
+tslib@^2.3.1:
+ version "2.6.2"
+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
+ integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
+
 tsup@^7.2.0:
  version "7.2.0"
  resolved "https://registry.yarnpkg.com/tsup/-/tsup-7.2.0.tgz#bb24c0d5e436477900c712e42adc67200607303c"
@@ -5759,6 +5817,11 @@ url-parse-lax@^3.0.0:
  dependencies:
  prepend-http "^2.0.0"
 
+urlpattern-polyfill@^9.0.0:
+ version "9.0.0"
+ resolved "https://registry.yarnpkg.com/urlpattern-polyfill/-/urlpattern-polyfill-9.0.0.tgz#bc7e386bb12fd7898b58d1509df21d3c29ab3460"
+ integrity sha512-WHN8KDQblxd32odxeIgo83rdVDE2bvdkb86it7bMhYZwWKJz0+O0RK/eZiHYnM+zgt/U7hAHOlCQGfjjvSkw2g==
+
 v8-to-istanbul@^9.0.1:
  version "9.0.1"
  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz#b6f994b0b5d4ef255e17a0d17dc444a9f5132fa4"