fix req.ip and req.ips

Author: v1rtl

.prettierignore

@@ -0,0 +1 @@
+egg.json

egg.json

@@ -4,9 +4,14 @@
   "entry": "./app.ts",
   "description": "0-legacy, tiny & fast web framework as a replacement of Express",
   "homepage": "https://github.com/talentlessguy/tinyhttp-deno",
-  "version": "0.0.10",
-  "ignore": ["./examples/**/*.ts"],
-  "files": ["./**/*.ts", "README.md"],
+  "version": "0.0.11",
+  "ignore": [
+    "./examples/**/*.ts"
+  ],
+  "files": [
+    "./**/*.ts",
+    "README.md"
+  ],
   "checkFormat": false,
   "checkTests": false,
   "checkInstallation": false,

extend.ts

@@ -56,6 +56,10 @@ export const extendMiddleware = <
 
   req.query = getQueryParams(req.url)
 
+  req.connection = {
+    remoteAddress: (req.conn.remoteAddr as Deno.NetAddr).hostname
+  }
+
   req.get = getRequestHeader(req)
 
   if (settings?.freshnessTesting) {
@@ -72,9 +76,6 @@ export const extendMiddleware = <
   req.xhr = checkIfXMLHttpRequest(req)
   req.is = reqIs(req)
 
-  req.ip = getIP(req)
-  req.ips = getIPs(req)
-
   if (settings?.networkExtensions) {
     req.protocol = getProtocol(req)
     req.secure = req.protocol === 'https'

extensions/req/security.ts

@@ -45,7 +45,7 @@ export const getHostname = (req: Request): string | undefined => {
 
   return index !== -1 ? host.substring(0, index) : host
 }
-export const getIP = (req: Request): string | undefined => proxyaddr(req, trustRemoteAddress(req)).replace(/^.*:/, '') // striping the redundant prefix addeded by OS to IPv4 address
+export const getIP = (req: Request): string | undefined => proxyaddr(req, trustRemoteAddress(req))?.replace(/^.*:/, '') // striping the redundant prefix addeded by OS to IPv4 address
 
 export const getIPs = (req: Request): string[] | undefined => all(req, trustRemoteAddress(req))
 

onError.ts

@@ -1,4 +1,4 @@
-import { ServerRequest } from 'https://deno.land/std@0.87.0/http/server.ts'
+import { Request } from './request.ts'
 import { NextFunction } from 'https://esm.sh/@tinyhttp/router'
 import { ALL as STATUS_CODES } from 'https://deno.land/x/status@0.1.0/codes.ts'
 import { status } from 'https://deno.land/x/status@0.1.0/status.ts'
@@ -9,9 +9,9 @@ export type ServerError = Partial<{
   message: string
 }>
 
-export type ErrorHandler = (err: ServerError, req: ServerRequest, next?: NextFunction) => void
+export type ErrorHandler = (err: ServerError, req: Request, next?: NextFunction) => void
 
-export const onErrorHandler: ErrorHandler = async (err: ServerError, req: ServerRequest) => {
+export const onErrorHandler: ErrorHandler = async (err: ServerError, req: Request) => {
   let code = 500
 
   if (err.code && err.code in STATUS_CODES) code = err.code

request.ts

@@ -40,4 +40,8 @@ export interface Request extends ServerRequest {
 
   cookies?: any
   signedCookies?: any
+
+  connection: {
+    remoteAddress: string
+  }
 }