From 1b4af30a49c3f31fdf42ce26a9333bd64a6bdf00 Mon Sep 17 00:00:00 2001
From: MoeFurina <noreply@focalors.ltd>
Date: Fri, 29 May 2026 17:19:41 +0800
Subject: [PATCH] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit 02242eecf6ceadf8be32466502d4ab531e7dfc65
Author: Sunset Mikoto <26019675+SunsetMkt@users.noreply.github.com>
Date:   Sun May 24 18:00:36 2026 +0000

    fix: randomCNIP 不工作
---
 server.js | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/server.js b/server.js
index a28f081..dae8d7b 100644
--- a/server.js
+++ b/server.js
@@ -303,8 +303,13 @@ async function constructServer(moduleDefs) {
           // 参数注入客户端IP
           const obj = [...params]
           const options = obj[2] || {}
-          if (!options.randomCNIP) {
-            let ip = req.ip
+          let ip = ''
+          
+          if (options.randomCNIP) {
+            ip = global.cnIp
+            // logger.info('Using random Chinese IP for request:', ip)
+          } else {
+            ip = req.ip
 
             if (ip.substring(0, 7) == '::ffff:') {
               ip = ip.substring(7)
@@ -313,10 +318,11 @@ async function constructServer(moduleDefs) {
               ip = global.cnIp
             }
             // logger.info('Requested from ip:', ip)
-            obj[2] = {
-              ...options,
-              ip,
-            }
+          }
+          
+          obj[2] = {
+            ...options,
+            ip,
           }
 
           return request(...obj)