using logger

edit all message
add some condition for check server instace

Author: armada45-pixel

bun.lockb

@@ -1,20 +1,39 @@
 import { headersToCheck } from "../constants"
 import { IPHeaders } from "../types"
+import { logger } from "./logger"
 
 export const getIP = (
   headers: Headers,
   checkHeaders: IPHeaders[] = headersToCheck,
 ) => {
-  if (typeof checkHeaders === "string" && headers.get(checkHeaders))
+  if (typeof checkHeaders === "string" && headers.get(checkHeaders)) {
+    logger("getIP", `Found ip from header ${checkHeaders}`)
     return headers.get(checkHeaders)
+  }
+
   // X-Forwarded-For is the de-facto standard header
-  if (headers.get("x-forwarded-for"))
+  if (headers.get("x-forwarded-for")) {
+    logger("getIP", "IP From Header x-forwarded-for")
     return headers.get("x-forwarded-for")?.split(",")[0]
+  }
+
+  if (!checkHeaders) {
+    logger("getIP", "checkHeaders `false` return `null`")
+    return null
+  }
+
   let clientIP: string | undefined | null = null
-  if (!checkHeaders) return null
   for (const header of checkHeaders) {
     clientIP = headers.get(header)
-    if (clientIP) break
+    if (clientIP) {
+      logger("getIP", `Found ip from header ${header}`)
+      break
+    }
+  }
+
+  if (!clientIP) {
+    logger("getIP", "Failed to get ip from header!")
+    return
   }
   return clientIP
 }

src/services/getip.ts

@@ -1,6 +1,8 @@
 import { Elysia } from "elysia"
 import { getIP } from "./getip"
 import { defaultOptions } from "../constants"
+import { logger } from "./logger"
+
 import type { Options } from "../types"
 
 export const plugin = (userOptions?: Partial<Options>) => (app: Elysia) => {
@@ -13,23 +15,38 @@ export const plugin = (userOptions?: Partial<Options>) => (app: Elysia) => {
     new Elysia({
       name: "elysia-ip",
     }).derive({ as: "global" }, ({ request }): { ip: string } => {
-      if (!options.headersOnly && globalThis.Bun) {
-        const socketAddress = options.injectServer(app)?.requestIP(request)
-        if (socketAddress) return { ip: socketAddress.address }
-        else {
-          console.log(
-            `Elysia server is not initialized. Make sure to call Elyisa.listen()`,
-          )
-          console.log(`use injectServer to inject Server instance`)
+      serverIP: {
+        if (!options.headersOnly && globalThis.Bun) {
+          const server = options.injectServer(app)
+          if (!server) {
+            logger(
+              "plugin",
+              "Elysia server is not initialized. Make sure to call Elyisa.listen()",
+            )
+            logger("plugin", "use injectServer to inject Server instance")
+            break serverIP
+          }
+
+          if (!server.requestIP) {
+            logger("plugin", "server.requestIP is null")
+            logger("plugin", "Please check server instace")
+            break serverIP
+          }
+
+          const socketAddress = server.requestIP(request)
+          logger("plugin", "socketAddress", socketAddress)
+          if (!socketAddress) {
+            logger(
+              "plugin",
+              `ip from server.requestIP return ${typeof socketAddress}`,
+            )
+            break serverIP
+          }
+          return { ip: socketAddress.address }
         }
       }
       return {
-        ip:
-          getIP(request.headers, options.checkHeaders) ||
-          (function () {
-            console.log("Failed to get ip from header!")
-            return ""
-          })(),
+        ip: getIP(request.headers, options.checkHeaders) || "",
       }
     }),
   )