@xmobitea/gn-server 2.6.8 → 2.6.9

package/dist/GN-startup/settings/HttpAppSettings.d.ts

@@ -9,6 +9,7 @@ declare abstract class BuilderBase {
     protected enableSendAndReceiveDebug: boolean;
     protected enablePostViaMsgPack: boolean;
     protected enablePostViaJson: boolean;
+    protected trustProxy: boolean;
     getEnable(): boolean;
     getOrigin(): string;
     getMethods(): MethodType[];
@@ -17,6 +18,7 @@ declare abstract class BuilderBase {
     getEnableSendAndReceiveDebug(): boolean;
     getEnablePostViaMsgPack(): boolean;
     getEnablePostViaJson(): boolean;
+    getTrustProxy(): boolean;
     constructor();
 }
 declare class Builder extends BuilderBase implements IBuilder<HttpAppSettings> {
@@ -31,6 +33,7 @@ declare class Builder extends BuilderBase implements IBuilder<HttpAppSettings> {
     setEnableSendAndReceiveDebug(enableSendAndReceiveDebug: boolean): Builder;
     setEnablePostViaMsgPack(enablePostViaMsgPack: boolean): Builder;
     setEnablePostViaJson(enablePostViaJson: boolean): Builder;
+    setTrustProxy(trustProxy: boolean): Builder;
     build(): HttpAppSettings;
     constructor();
 }

package/dist/index.js

@@ -15100,6 +15100,9 @@ class ApiMiddleware {
         if (this.headerIP != null) {
             ip = req.header(this.headerIP);
         }
+        if (ip == null) {
+            ip = req.ip;
+        }
         if (ip == null) {
             ip = req.socket.remoteAddress;
         }
@@ -16694,6 +16697,7 @@ class HttpAppSettings_BuilderBase {
     enableSendAndReceiveDebug;
     enablePostViaMsgPack;
     enablePostViaJson;
+    trustProxy;
     getEnable() {
         return this.enable;
     }
@@ -16718,6 +16722,9 @@ class HttpAppSettings_BuilderBase {
     getEnablePostViaJson() {
         return this.enablePostViaJson;
     }
+    getTrustProxy() {
+        return this.trustProxy;
+    }
     constructor() { }
 }
 class HttpAppSettings_Builder extends HttpAppSettings_BuilderBase {
@@ -16770,6 +16777,10 @@ class HttpAppSettings_Builder extends HttpAppSettings_BuilderBase {
         this.enablePostViaJson = enablePostViaJson;
         return this;
     }
+    setTrustProxy(trustProxy) {
+        this.trustProxy = trustProxy;
+        return this;
+    }
     build() {
         return new HttpAppSettings(this);
     }
@@ -16783,6 +16794,7 @@ class HttpAppSettings_Builder extends HttpAppSettings_BuilderBase {
         this.enableSendAndReceiveDebug = false;
         this.enablePostViaMsgPack = false;
         this.enablePostViaJson = false;
+        this.trustProxy = false;
     }
 }
 class HttpAppSettings extends HttpAppSettings_BuilderBase {
@@ -16796,6 +16808,7 @@ class HttpAppSettings extends HttpAppSettings_BuilderBase {
         this.enableSendAndReceiveDebug = builder.getEnableSendAndReceiveDebug();
         this.enablePostViaMsgPack = builder.getEnablePostViaMsgPack();
         this.enablePostViaJson = builder.getEnablePostViaJson();
+        this.trustProxy = builder.getTrustProxy();
     }
     static Builder() {
         return new HttpAppSettings_Builder();
@@ -17170,8 +17183,8 @@ class ClusterHandler {
     init() {
         this.clusterRouter = external_express_default().Router();
         this.router.use("/cluster", wrap((req, res, next) => {
-            let pkt = req.header("privateKeyToken");
-            if (!pkt || pkt != this.privateKeyToken) {
+            let privateKeyToken = req.header("pkt");
+            if (!privateKeyToken || privateKeyToken != this.privateKeyToken) {
                 return res.sendStatus(401);
             }
             return next();
@@ -17287,12 +17300,13 @@ class ClusterHandler {
         let okPrimaryInstanceInfos = [];
         for (let i = 0; i < currentPrimaryInstanceInfos.length; i++) {
             let currentPrimaryInstanceInfo = currentPrimaryInstanceInfos[i];
-            if (currentPrimaryInstanceInfo.lostPing > 1) {
+            if (currentPrimaryInstanceInfo.lostPing < 1) {
                 okPrimaryInstanceInfos.push(currentPrimaryInstanceInfo);
             }
         }
         if (okPrimaryInstanceInfos.length == 0) {
             if (!this.instanceInfoStatus.isPrimary) {
+                this.isPrimary = true;
                 this.instanceInfoStatus.isPrimary = true;
                 this.instanceInfoStatus.tsPrimary = xDatetime.getCurrentMilliseconds();
                 this.instanceInfoStatus.currentInstanceIdPrimary = this.instanceId;
@@ -17307,7 +17321,7 @@ class ClusterHandler {
             }
         }
         else {
-            okPrimaryInstanceInfos.sort((a, b) => a.tsPrimary - b.tsPrimary);
+            okPrimaryInstanceInfos.sort((a, b) => a.tsPrimary < b.tsPrimary ? -1 : 1);
             let primaryInstanceInfo = okPrimaryInstanceInfos[0];
             // neu khong phai la primary thi cap nhat thong tin primary hien tai
             if (!this.instanceInfoStatus.isPrimary) {
@@ -17326,6 +17340,7 @@ class ClusterHandler {
             // neu dang la primary thi conflict va can phai thong nhat xem ai la primary
             else {
                 if (this.instanceInfoStatus.tsPrimary > primaryInstanceInfo.tsPrimary) {
+                    this.isPrimary = false;
                     this.instanceInfoStatus.isPrimary = false;
                     this.instanceInfoStatus.tsPrimary = 0;
                     this.instanceInfoStatus.currentInstanceIdPrimary = primaryInstanceInfo.instanceId;
@@ -17442,6 +17457,8 @@ class HttpApp {
         this.logSettings = logSettings;
     }
     run() {
+        if (this.appSettings.getTrustProxy())
+            this.app.enable("trust proxy");
         this.app.use(external_express_default().urlencoded({ extended: false }));
         this.app.get("/", (req, res) => {
             return res.sendStatus(403);
@@ -87354,6 +87371,7 @@ class DefaultApplicationStartup {
             .setEnableSendAndReceiveDebug(true)
             .setEnablePostViaJson(true)
             .setEnablePostViaMsgPack(true)
+            .setTrustProxy(true)
             .build();
         let socketAppSettings = SocketAppSettings.Builder()
             .setEnable(true)
@@ -87493,6 +87511,7 @@ class ServerApplicationStartup extends DefaultApplicationStartup {
                 "enableSendAndReceiveDebug": true,
                 "enablePostViaMsgPack": true,
                 "enablePostViaJson": true,
+                "trustProxy": true,
             };
         let httpAppSettings = HttpAppSettings.Builder()
             .setEnable(gnHttpAppSettings["enable"] ?? true)
@@ -87503,6 +87522,7 @@ class ServerApplicationStartup extends DefaultApplicationStartup {
             .setEnableSendAndReceiveDebug(gnHttpAppSettings["enableSendAndReceiveDebug"] ?? true)
             .setEnablePostViaMsgPack(gnHttpAppSettings["enablePostViaMsgPack"] ?? true)
             .setEnablePostViaJson(gnHttpAppSettings["enablePostViaJson"] ?? true)
+            .setTrustProxy(gnHttpAppSettings["trustProxy"] ?? true)
             .build();
         let gnSocketAppSettings = this.gnConfig["socketAppSettings"];
         if (gnSocketAppSettings == null)

package/gn.sh

@@ -110,7 +110,8 @@ init_create_GNConfigDebugJson() {
 			"allowHeaders": ["Auth-Token", "Content-Type", "Secret-Key", "Game-Id", "Content-Length", "User-Agent", "X-Real-IP"],
 			"enableSendAndReceiveDebug": true,
 			"enablePostViaMsgPack": true,
-			"enablePostViaJson": true
+			"enablePostViaJson": true,
+            "trustProxy": true
 		},
 
 		"socketAppSettings": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmobitea/gn-server",
-  "version": "2.6.8",
+  "version": "2.6.9",
   "description": "GearN Server by XmobiTea (Pro)",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
@@ -32,7 +32,7 @@
     "@msgpack/msgpack": "^2.8.0",
     "@socket.io/mongo-adapter": "^0.3.2",
     "@socket.io/mongo-emitter": "^0.2.0",
-    "@xmobitea/gn-typescript-client": "^2.6.9",
+    "@xmobitea/gn-typescript-client": "^2.6.10",
     "axios": "^1.10.0",
     "bcrypt": "^5.1.1",
     "cors": "^2.8.5",