@xmobitea/gn-server 2.4.1 → 2.4.3

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

@@ -2,6 +2,7 @@ import { IBuilder } from "./../../GN-library/xbuilder/lib/IBuilder";
 type MethodType = "GET" | "HEAD" | "PUT" | "PATCH" | "POST" | "DELETE" | "UPDATE";
 declare abstract class BuilderBase {
     protected enable: boolean;
+    protected useEmitter: boolean;
     protected origin: string;
     protected methods: MethodType[];
     protected allowedHeaders: string[];
@@ -12,6 +13,7 @@ declare abstract class BuilderBase {
     protected pingInterval: number;
     protected pingTimeout: number;
     getEnable(): boolean;
+    getUseEmitter(): boolean;
     getOrigin(): string;
     getMethods(): MethodType[];
     getAllowedHeaders(): string[];
@@ -34,6 +36,7 @@ declare class Builder extends BuilderBase implements IBuilder<SocketAppSettings>
     setPingInterval(pingInterval: number): Builder;
     setPingTimeout(pingTimeout: number): Builder;
     setEnable(enable: boolean): Builder;
+    setUseEmitter(useEmitter: boolean): Builder;
     setEnableSendAndReceiveDebug(enableSendAndReceiveDebug: boolean): Builder;
     setEnablePostViaMsgPack(enablePostViaMsgPack: boolean): Builder;
     setEnablePostViaJson(enablePostViaJson: boolean): Builder;

package/dist/index.js

@@ -15528,22 +15528,23 @@ class GetBackupStatisticsLeaderboardVersionRequestHandler extends RequestHandler
             }
             operationResponse = new OperationResponse_1.OperationResponse(operationRequest.getOperationCode(), operationRequest.getRequestId(), operationRequest.isEncrypted());
             operationResponse.setReturnCode(ReturnCode_1.ReturnCode.Ok);
+            let type = request.type;
             let backupStatisticsLeaderboardCollection;
-            if (request.type == OwnerType_1.OwnerType.MasterPlayer) {
+            if (type == OwnerType_1.OwnerType.MasterPlayer) {
                 backupStatisticsLeaderboardCollection = this.gnServer.getDatabase().systemCollection("MasterPlayer.StatisticsBackup");
             }
             else {
                 let gameId = request.gameId;
-                if (request.type == OwnerType_1.OwnerType.GamePlayer) {
+                if (type == OwnerType_1.OwnerType.GamePlayer) {
                     backupStatisticsLeaderboardCollection = this.gnServer.getDatabase().systemGameCollection("GamePlayer.StatisticsBackup", gameId);
                 }
-                else if (request.type == OwnerType_1.OwnerType.CharacterPlayer) {
+                else if (type == OwnerType_1.OwnerType.CharacterPlayer) {
                     backupStatisticsLeaderboardCollection = this.gnServer.getDatabase().systemGameCollection("CharacterPlayer.StatisticsBackup", gameId);
                 }
-                else if (request.type == OwnerType_1.OwnerType.Inventory) {
+                else if (type == OwnerType_1.OwnerType.Inventory) {
                     backupStatisticsLeaderboardCollection = this.gnServer.getDatabase().systemGameCollection("Inventory.StatisticsBackup", gameId);
                 }
-                else if (request.type == OwnerType_1.OwnerType.Group) {
+                else if (type == OwnerType_1.OwnerType.Group) {
                     backupStatisticsLeaderboardCollection = this.gnServer.getDatabase().systemGameCollection("Group.StatisticsBackup", gameId);
                 }
                 else {
@@ -15551,9 +15552,8 @@ class GetBackupStatisticsLeaderboardVersionRequestHandler extends RequestHandler
                     return operationResponse;
                 }
             }
-            let type = request.type;
             let key = request.key;
-            let results = backupStatisticsLeaderboardCollection.find({ type: type, key: key }, {
+            let results = backupStatisticsLeaderboardCollection.find({ key: key }, {
                 projection: {
                     version: true,
                     log: true,
@@ -87765,7 +87765,9 @@ class SocketApp {
             }
         });
         this.socketAppHandler = new SocketAppHandler_1.SocketAppHandler();
-        this.socketAppHandler.setEmitter(this.emitter);
+        if (this.appSettings.getUseEmitter()) {
+            this.socketAppHandler.setEmitter(this.emitter);
+        }
         this.socketAppHandler.setServer(this.io);
         this.socketAppHandler.setApiMiddleware(this.apiMiddleware);
         this.socketAppHandler.setAntiDdosMiddleware(this.antiDdosMiddleware);
@@ -87779,8 +87781,9 @@ class SocketApp {
     }
     setEmitter(adapterEventCollection) {
         this.emitter = new mongo_emitter_1.Emitter(adapterEventCollection);
-        if (this.socketAppHandler != null)
+        if (this.appSettings.getUseEmitter() && this.socketAppHandler != null) {
             this.socketAppHandler.setEmitter(this.emitter);
+        }
         this.io.adapter((0, mongo_adapter_1.createAdapter)(adapterEventCollection, {}));
     }
     constructor() { }
@@ -89537,29 +89540,44 @@ class SocketAppHandler {
         let socketData = OperationHelper_1.OperationHelper.toResponseSocketData(operationResponse);
         if (this.enableSendAndReceiveDebug)
             xDebug_1.Debug.log("[SOCKET SEND] %O", JSON.stringify(socketData));
-        if (operationResponse.isEncrypted())
-            socket.emit(Commands_1.Commands.ResponseCmd_MsgPack, (0, msgpack_1.encode)(socketData));
-        else
+        if (operationResponse.isEncrypted()) {
+            let socketDataMsgPack = (0, msgpack_1.encode)(socketData);
+            socket.emit(Commands_1.Commands.ResponseCmd_MsgPack, socketDataMsgPack);
+        }
+        else {
             socket.emit(Commands_1.Commands.ResponseCmd_Json, socketData);
+        }
     }
     sendEventForSocket(socket, operationEvent) {
         let socketData = OperationHelper_1.OperationHelper.toEventSocketData(operationEvent);
         if (this.enableSendAndReceiveDebug)
             xDebug_1.Debug.log("[EVENT SEND] %O", JSON.stringify(socketData));
-        if (operationEvent.isEncrypted())
-            socket.emit(Commands_1.Commands.EventCmd_MsgPack, (0, msgpack_1.encode)(socketData));
-        else
+        if (operationEvent.isEncrypted()) {
+            let socketDataMsgPack = (0, msgpack_1.encode)(socketData);
+            socket.emit(Commands_1.Commands.EventCmd_MsgPack, socketDataMsgPack);
+        }
+        else {
             socket.emit(Commands_1.Commands.EventCmd_Json, socketData);
+        }
     }
     sendEventTo(userId, operationEvent) {
         return __awaiter(this, void 0, void 0, function* () {
             let socketData = OperationHelper_1.OperationHelper.toEventSocketData(operationEvent);
             if (this.enableSendAndReceiveDebug)
                 xDebug_1.Debug.log("[EVENT SEND EVENT TO] " + userId + " %O", JSON.stringify(socketData));
-            if (operationEvent.isEncrypted())
-                this.emitter.to(userId).emit(Commands_1.Commands.EventCmd_MsgPack, (0, msgpack_1.encode)(socketData));
-            else
-                this.emitter.to(userId).emit(Commands_1.Commands.EventCmd_Json, socketData);
+            if (operationEvent.isEncrypted()) {
+                let socketDataMsgPack = (0, msgpack_1.encode)(socketData);
+                if (this.emitter != null)
+                    this.emitter.to(userId).emit(Commands_1.Commands.EventCmd_MsgPack, socketDataMsgPack);
+                else
+                    this.server.to(userId).emit(Commands_1.Commands.EventCmd_MsgPack, (0, msgpack_1.encode)(socketData));
+            }
+            else {
+                if (this.emitter != null)
+                    this.emitter.to(userId).emit(Commands_1.Commands.EventCmd_Json, socketData);
+                else
+                    this.server.to(userId).emit(Commands_1.Commands.EventCmd_Json, socketData);
+            }
         });
     }
     sendEventToRoom(roomId, operationEvent) {
@@ -89567,10 +89585,19 @@ class SocketAppHandler {
             let socketData = OperationHelper_1.OperationHelper.toEventSocketData(operationEvent);
             if (this.enableSendAndReceiveDebug)
                 xDebug_1.Debug.log("[EVENT SEND EVENT TO ROOM] " + roomId + " %O", JSON.stringify(socketData));
-            if (operationEvent.isEncrypted())
-                this.emitter.to(roomId).emit(Commands_1.Commands.EventCmd_MsgPack, (0, msgpack_1.encode)(socketData));
-            else
-                this.emitter.to(roomId).emit(Commands_1.Commands.EventCmd_Json, socketData);
+            if (operationEvent.isEncrypted()) {
+                let socketDataMsgPack = (0, msgpack_1.encode)(socketData);
+                if (this.emitter != null)
+                    this.emitter.to(roomId).emit(Commands_1.Commands.EventCmd_MsgPack, socketDataMsgPack);
+                else
+                    this.server.to(roomId).emit(Commands_1.Commands.EventCmd_MsgPack, (0, msgpack_1.encode)(socketData));
+            }
+            else {
+                if (this.emitter != null)
+                    this.emitter.to(roomId).emit(Commands_1.Commands.EventCmd_Json, socketData);
+                else
+                    this.server.to(roomId).emit(Commands_1.Commands.EventCmd_Json, socketData);
+            }
         });
     }
     sendEventToMoreUser(userIds, operationEvent) {
@@ -89580,16 +89607,16 @@ class SocketAppHandler {
                 xDebug_1.Debug.log("[EVENT SEND EVENT TO MORE USER] %O", JSON.stringify(socketData));
             if (operationEvent.isEncrypted()) {
                 let socketDataMsgPack = (0, msgpack_1.encode)(socketData);
-                for (let i = 0; i < userIds.length; i++) {
-                    let userId = userIds[i];
-                    this.emitter.to(userId).emit(Commands_1.Commands.EventCmd_MsgPack, socketDataMsgPack);
-                }
+                if (this.emitter != null)
+                    this.emitter.to(userIds).emit(Commands_1.Commands.EventCmd_MsgPack, socketDataMsgPack);
+                else
+                    this.server.to(userIds).emit(Commands_1.Commands.EventCmd_MsgPack, socketDataMsgPack);
             }
             else {
-                for (let i = 0; i < userIds.length; i++) {
-                    let userId = userIds[i];
-                    this.emitter.to(userId).emit(Commands_1.Commands.EventCmd_Json, socketData);
-                }
+                if (this.emitter != null)
+                    this.emitter.to(userIds).emit(Commands_1.Commands.EventCmd_Json, socketData);
+                else
+                    this.server.to(userIds).emit(Commands_1.Commands.EventCmd_Json, socketData);
             }
         });
     }
@@ -89598,10 +89625,19 @@ class SocketAppHandler {
             let socketData = OperationHelper_1.OperationHelper.toEventSocketData(operationEvent);
             if (this.enableSendAndReceiveDebug)
                 xDebug_1.Debug.log("[EVENT SEND EVENT TO ALL PLAYER] %O", JSON.stringify(socketData));
-            if (operationEvent.isEncrypted())
-                this.emitter.of("/").emit(Commands_1.Commands.EventCmd_MsgPack, (0, msgpack_1.encode)(socketData));
-            else
-                this.emitter.of("/").emit(Commands_1.Commands.EventCmd_Json, socketData);
+            if (operationEvent.isEncrypted()) {
+                let socketDataMsgPack = (0, msgpack_1.encode)(socketData);
+                if (this.emitter != null)
+                    this.emitter.emit(Commands_1.Commands.EventCmd_MsgPack, socketDataMsgPack);
+                else
+                    this.server.emit(Commands_1.Commands.EventCmd_MsgPack, socketDataMsgPack);
+            }
+            else {
+                if (this.emitter != null)
+                    this.emitter.emit(Commands_1.Commands.EventCmd_Json, socketData);
+                else
+                    this.server.emit(Commands_1.Commands.EventCmd_Json, socketData);
+            }
         });
     }
     sendEventToNamespace(namespace, operationEvent) {
@@ -89609,10 +89645,19 @@ class SocketAppHandler {
             let socketData = OperationHelper_1.OperationHelper.toEventSocketData(operationEvent);
             if (this.enableSendAndReceiveDebug)
                 xDebug_1.Debug.log("[EVENT SEND EVENT TO NAME SPACE] %O", JSON.stringify(socketData));
-            if (operationEvent.isEncrypted())
-                this.emitter.of("/" + namespace).emit(Commands_1.Commands.EventCmd_MsgPack, (0, msgpack_1.encode)(socketData));
-            else
-                this.emitter.of("/" + namespace).emit(Commands_1.Commands.EventCmd_Json, socketData);
+            if (operationEvent.isEncrypted()) {
+                let socketDataMsgPack = (0, msgpack_1.encode)(socketData);
+                if (this.emitter != null)
+                    this.emitter.of("/" + namespace).emit(Commands_1.Commands.EventCmd_MsgPack, socketDataMsgPack);
+                else
+                    this.server.of("/" + namespace).emit(Commands_1.Commands.EventCmd_MsgPack, socketDataMsgPack);
+            }
+            else {
+                if (this.emitter != null)
+                    this.emitter.of("/" + namespace).emit(Commands_1.Commands.EventCmd_Json, socketData);
+                else
+                    this.server.of("/" + namespace).emit(Commands_1.Commands.EventCmd_Json, socketData);
+            }
         });
     }
     getSocketViaSocketId(socketId) {
@@ -90300,6 +90345,9 @@ class BuilderBase {
     getEnable() {
         return this.enable;
     }
+    getUseEmitter() {
+        return this.useEmitter;
+    }
     getOrigin() {
         return this.origin;
     }
@@ -90375,6 +90423,10 @@ class Builder extends BuilderBase {
         this.enable = enable;
         return this;
     }
+    setUseEmitter(useEmitter) {
+        this.useEmitter = useEmitter;
+        return this;
+    }
     setEnableSendAndReceiveDebug(enableSendAndReceiveDebug) {
         this.enableSendAndReceiveDebug = enableSendAndReceiveDebug;
         return this;
@@ -90390,6 +90442,7 @@ class Builder extends BuilderBase {
     constructor() {
         super();
         this.enable = false;
+        this.useEmitter = false;
         this.origin = "";
         this.methods = [];
         this.allowedHeaders = [];
@@ -90412,6 +90465,7 @@ class SocketAppSettings extends BuilderBase {
         this.origin = builder.getOrigin();
         this.methods = builder.getMethods();
         this.enable = builder.getEnable();
+        this.useEmitter = builder.getUseEmitter();
         this.allowedHeaders = builder.getAllowedHeaders();
         this.credentials = builder.getCredentials();
         this.enableSendAndReceiveDebug = builder.getEnableSendAndReceiveDebug();

package/gn.sh

@@ -111,6 +111,7 @@ init_create_GNConfigDebugJson() {
 
 		"socketAppSettings": {
 			"enable": true,
+			"useEmitter": false,
 			"allowOrigin": "*",
 			"credentials": true,
 			"allowMethods": ["GET"],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmobitea/gn-server",
-  "version": "2.4.1",
+  "version": "2.4.3",
   "description": "Game Networking Server by XmobiTea (Pro)",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",