Merge pull request #3144 from honojs/next

jsr.json

@@ -21,6 +21,7 @@
     "./basic-auth": "./src/middleware/basic-auth/index.ts",
     "./bearer-auth": "./src/middleware/bearer-auth/index.ts",
     "./body-limit": "./src/middleware/body-limit/index.ts",
+    "./ip-restriction": "./src/middleware/ip-restriction/index.ts",
     "./cache": "./src/middleware/cache/index.ts",
     "./cookie": "./src/helper/cookie/index.ts",
     "./accepts": "./src/helper/accepts/index.ts",
@@ -41,13 +42,16 @@
     "./jsx/dom/jsx-runtime": "./src/jsx/dom/jsx-runtime.ts",
     "./jsx/dom/client": "./src/jsx/dom/client.ts",
     "./jsx/dom/css": "./src/jsx/dom/css.ts",
+    "./jsx/dom/server": "./src/jsx/dom/server.ts",
     "./jwt": "./src/middleware/jwt/jwt.ts",
     "./timing": "./src/middleware/timing/timing.ts",
     "./logger": "./src/middleware/logger/index.ts",
     "./method-override": "./src/middleware/method-override/index.ts",
     "./powered-by": "./src/middleware/powered-by/index.ts",
     "./pretty-json": "./src/middleware/pretty-json/index.ts",
+    "./request-id": "./src/middleware/request-id/request-id.ts",
     "./secure-headers": "./src/middleware/secure-headers/secure-headers.ts",
+    "./combine": "./src/middleware/combine/index.ts",
     "./ssg": "./src/helper/ssg/index.ts",
     "./streaming": "./src/helper/streaming/index.ts",
     "./validator": "./src/validator/index.ts",
@@ -69,6 +73,7 @@
     "./vercel": "./src/adapter/vercel/index.ts",
     "./netlify": "./src/adapter/netlify/index.ts",
     "./lambda-edge": "./src/adapter/lambda-edge/index.ts",
+    "./service-worker": "./src/adapter/service-worker/index.ts",
     "./testing": "./src/helper/testing/index.ts",
     "./dev": "./src/helper/dev/index.ts",
     "./ws": "./src/helper/websocket/index.ts",
@@ -92,7 +97,8 @@
     "./utils/mime": "./src/utils/mime.ts",
     "./utils/stream": "./src/utils/stream.ts",
     "./utils/types": "./src/utils/types.ts",
-    "./utils/url": "./src/utils/url.ts"
+    "./utils/url": "./src/utils/url.ts",
+    "./utils/ipaddr": "./src/utils/ipaddr.ts"
   },
   "publish": {
     "include": [

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "4.4.13",
+  "version": "4.5.0-rc.2",
   "description": "Web framework built on Web Standards",
   "main": "dist/cjs/index.js",
   "type": "module",
@@ -78,6 +78,11 @@
       "import": "./dist/middleware/body-limit/index.js",
       "require": "./dist/cjs/middleware/body-limit/index.js"
     },
+    "./ip-restriction": {
+      "types": "./dist/types/middleware/ip-restriction/index.d.ts",
+      "import": "./dist/middleware/ip-restriction/index.js",
+      "require": "./dist/cjs/middleware/ip-restriction/index.js"
+    },
     "./cache": {
       "types": "./dist/types/middleware/cache/index.d.ts",
       "import": "./dist/middleware/cache/index.js",
@@ -178,6 +183,11 @@
       "import": "./dist/jsx/dom/css.js",
       "require": "./dist/cjs/jsx/dom/css.js"
     },
+    "./jsx/dom/server": {
+      "types": "./dist/types/jsx/dom/server.d.ts",
+      "import": "./dist/jsx/dom/server.js",
+      "require": "./dist/cjs/jsx/dom/server.js"
+    },
     "./jwt": {
       "types": "./dist/types/middleware/jwt/index.d.ts",
       "import": "./dist/middleware/jwt/index.js",
@@ -213,11 +223,21 @@
       "import": "./dist/middleware/pretty-json/index.js",
       "require": "./dist/cjs/middleware/pretty-json/index.js"
     },
+    "./request-id": {
+      "types": "./dist/types/middleware/request-id/index.d.ts",
+      "import": "./dist/middleware/request-id/index.js",
+      "require": "./dist/cjs/middleware/request-id/index.js"
+    },
     "./secure-headers": {
       "types": "./dist/types/middleware/secure-headers/index.d.ts",
       "import": "./dist/middleware/secure-headers/index.js",
       "require": "./dist/cjs/middleware/secure-headers/index.js"
     },
+    "./combine": {
+      "types": "./dist/types/middleware/combine/index.d.ts",
+      "import": "./dist/middleware/combine/index.js",
+      "require": "./dist/cjs/middleware/combine/index.js"
+    },
     "./ssg": {
       "types": "./dist/types/helper/ssg/index.d.ts",
       "import": "./dist/helper/ssg/index.js",
@@ -333,6 +353,11 @@
       "import": "./dist/adapter/lambda-edge/index.js",
       "require": "./dist/cjs/adapter/lambda-edge/index.js"
     },
+    "./service-worker": {
+      "types": "./dist/types/adapter/service-worker/index.d.ts",
+      "import": "./dist/adapter/service-worker/index.js",
+      "require": "./dist/cjs/adapter/service-worker/index.js"
+    },
     "./testing": {
       "types": "./dist/types/helper/testing/index.d.ts",
       "import": "./dist/helper/testing/index.js",
@@ -380,6 +405,9 @@
       "body-limit": [
         "./dist/types/middleware/body-limit"
       ],
+      "ip-restriction": [
+        "./dist/types/middleware/ip-restriction"
+      ],
       "cache": [
         "./dist/types/middleware/cache"
       ],
@@ -434,6 +462,9 @@
       "jsx/dom/css": [
         "./dist/types/jsx/dom/css.d.ts"
       ],
+      "jsx/dom/server": [
+        "./dist/types/jsx/dom/server.d.ts"
+      ],
       "jwt": [
         "./dist/types/middleware/jwt"
       ],
@@ -455,6 +486,9 @@
       "pretty-json": [
         "./dist/types/middleware/pretty-json"
       ],
+      "request-id": [
+        "./dist/types/middleware/request-id"
+      ],
       "streaming": [
         "./dist/types/helper/streaming"
       ],
@@ -464,6 +498,9 @@
       "secure-headers": [
         "./dist/types/middleware/secure-headers"
       ],
+      "combine": [
+        "./dist/types/middleware/combine"
+      ],
       "validator": [
         "./dist/types/validator/index.d.ts"
       ],
@@ -527,6 +564,9 @@
       "lambda-edge": [
         "./dist/types/adapter/lambda-edge"
       ],
+      "service-worker": [
+        "./dist/types/adapter/service-worker"
+      ],
       "testing": [
         "./dist/types/helper/testing"
       ],
@@ -599,4 +639,4 @@
   "engines": {
     "node": ">=16.0.0"
   }
-}
+}

runtime_tests/deno-jsx/deno.precompile.json

@@ -4,7 +4,8 @@
     "jsxImportSource": "hono/jsx",
     "lib": [
       "deno.ns",
-      "dom"
+      "dom",
+      "dom.iterable"
     ]
   },
   "unstable": [

runtime_tests/deno-jsx/deno.react-jsx.json

@@ -4,7 +4,8 @@
     "jsxImportSource": "hono/jsx",
     "lib": [
       "deno.ns",
-      "dom"
+      "dom",
+      "dom.iterable"
     ]
   },
   "unstable": [

src/adapter/bun/conninfo.test.ts

@@ -1,17 +1,24 @@
 import { Context } from '../../context'
 import { getConnInfo } from './conninfo'
+import type { AddressType } from '../../helper/conninfo'
 
-const createRandomBunServer = () => {
-  const address = Math.random().toString()
-  const port = Math.floor(Math.random() * (65535 + 1))
+const createRandomBunServer = ({
+  address = Math.random().toString(),
+  port = Math.floor(Math.random() * (65535 + 1)),
+  family = 'IPv6',
+}: {
+  address?: string
+  port?: number
+  family?: AddressType | string
+} = {}) => {
   return {
     address,
     port,
     server: {
       requestIP() {
         return {
           address,
-          family: 'IPv6',
+          family,
           port,
         }
       },
@@ -40,6 +47,14 @@ describe('getConnInfo', () => {
     expect(info.remote.addressType).toBe('IPv6')
     expect(info.remote.transport).toBeUndefined()
   })
+  it('should return undefined when addressType is invalid string', () => {
+    const { server } = createRandomBunServer({ family: 'invalid' })
+    const c = new Context(new Request('http://localhost/'), { env: { server } })
+
+    const info = getConnInfo(c)
+
+    expect(info.remote.addressType).toBeUndefined()
+  })
   it('Should throw error when user did not give server', () => {
     const c = new Context(new Request('http://localhost/'), { env: {} })
 

src/adapter/bun/conninfo.ts

@@ -21,7 +21,7 @@ export const getConnInfo: GetConnInfo = (c: Context) => {
   return {
     remote: {
       address: info.address,
-      addressType: info.family === 'IPv6' || info.family === 'IPv4' ? info.family : 'unknown',
+      addressType: info.family === 'IPv6' || info.family === 'IPv4' ? info.family : undefined,
       port: info.port,
     },
   }