@xmobitea/gn-server 2.6.0 → 2.6.1

package/dist/GN-app-api/handler/controller/handler/dashboard/model/EmailSettingsParam.d.ts

@@ -1,4 +1,8 @@
 export declare class EmailSettingsParam {
     sendFrom: string;
-    sendGridApiKey: string;
+    secure: boolean;
+    host: string;
+    port: number;
+    username: string;
+    password: string;
 }

package/dist/GN-app-api/service/EmailService.d.ts

@@ -1,11 +1,16 @@
 import { IEmailService, OnSendMailError, OnSendMailSuccess } from "./IEmailService";
 export declare class EmailService implements IEmailService {
     private isInit;
-    private sendGridApiKey;
+    private host;
+    private port;
+    private secure;
+    private username;
+    private password;
     private fromEmail;
     private needSetup;
-    init(sendGridApiKey: string, fromEmail: string): void;
+    private transporter;
+    init(host: string, port: number, secure: boolean, username: string, password: string, fromEmail: string): void;
     run(): void;
-    sendMail(toEmail: string, subject: string, contentHtml: string, onSendMailSuccess?: OnSendMailSuccess, onSendMailError?: OnSendMailError): Promise<void>;
-    sendMailToMore(toEmails: string[], subject: string, contentHtml: string, onSendMailSuccess?: OnSendMailSuccess, onSendMailError?: OnSendMailError): Promise<void>;
+    sendMail(toEmail: string, subject: string, contentHtml: string, onSendMailSuccess?: OnSendMailSuccess, onSendMailError?: OnSendMailError): void;
+    sendMailToMore(toEmails: string[], subject: string, contentHtml: string, onSendMailSuccess?: OnSendMailSuccess, onSendMailError?: OnSendMailError): void;
 }

package/dist/GN-app-api/service/IEmailService.d.ts

@@ -5,6 +5,6 @@ export interface OnSendMailError {
     (error: string): void;
 }
 export interface IEmailService {
-    sendMail(toEmail: string, subject: string, contentHtml: string, onSendMailSuccess?: OnSendMailSuccess, onSendMailError?: OnSendMailError): Promise<void>;
-    sendMailToMore(toEmails: string[], subject: string, contentHtml: string, onSendMailSuccess?: OnSendMailSuccess, onSendMailError?: OnSendMailError): Promise<void>;
+    sendMail(toEmail: string, subject: string, contentHtml: string, onSendMailSuccess?: OnSendMailSuccess, onSendMailError?: OnSendMailError): void;
+    sendMailToMore(toEmails: string[], subject: string, contentHtml: string, onSendMailSuccess?: OnSendMailSuccess, onSendMailError?: OnSendMailError): void;
 }

package/dist/GN-app-api/service/IPlayStationNetworkService.d.ts

@@ -0,0 +1,5 @@
+export interface IPlayStationNetworkService {
+    verifyPSNToken(token: string): Promise<{
+        [k: string]: any;
+    }>;
+}

package/dist/GN-app-api/service/ISteamService.d.ts

@@ -0,0 +1,5 @@
+export interface ISteamService {
+    verifyTicket(ticket: string, identity: string): Promise<{
+        [k: string]: any;
+    }>;
+}

package/dist/GN-app-api/service/PlayStationNetworkService.d.ts

@@ -0,0 +1,14 @@
+import { IPlayStationNetworkService } from "./IPlayStationNetworkService";
+export declare class PlayStationNetworkService implements IPlayStationNetworkService {
+    private static readonly MAIN_iss;
+    private static readonly MAIN_iss_auth_keys;
+    private client;
+    private appleClientId;
+    constructor();
+    init(): void;
+    private getSigningKey;
+    private verifyToken;
+    verifyPSNToken(token: string): Promise<{
+        [k: string]: any;
+    }>;
+}

package/dist/GN-app-api/service/SteamService.d.ts

@@ -0,0 +1,12 @@
+import { ISteamService } from "./ISteamService";
+export declare class SteamService implements ISteamService {
+    private steamApiKey;
+    private steamAppId;
+    init(request: {
+        steamApiKey: string;
+        steamAppId: string;
+    }): void;
+    verifyTicket(ticket: string, identity: string): Promise<{
+        [k: string]: any;
+    }>;
+}

package/dist/GN-common/constant/parameterCode/GNParameterCode.d.ts

@@ -549,6 +549,9 @@ export declare class GNParameterCode {
     static readonly PushNotificationSettings: string;
     static readonly SendFrom: string;
     static readonly SendGridApiKey: string;
+    static readonly Host: string;
+    static readonly Port: string;
+    static readonly Secure: string;
     static readonly Subject: string;
     static readonly ContentHtml: string;
     static readonly PushNotifications: string;

package/dist/GN-library/xsettings/lib/entity/xEmailSettings.d.ts

@@ -1,4 +1,8 @@
 export interface xEmailSettings {
     sendFrom: string;
-    sendGridApiKey: string;
+    secure: boolean;
+    host: string;
+    port: number;
+    username: string;
+    password: string;
 }

package/dist/GN-startup/routes/SocketAppHandler.d.ts

@@ -44,16 +44,15 @@ export declare class SocketAppHandler {
     private onSocketResponse;
     private onSocketDisconnect;
     private sendResponseForSocket;
-    private sendEventForSocket;
-    sendEventTo(userId: string, operationEvent: OperationEvent): Promise<void>;
-    sendEventToRoom(roomId: string, operationEvent: OperationEvent): Promise<void>;
-    sendEventToMoreUser(userIds: string[], operationEvent: OperationEvent): Promise<void>;
-    sendEventToAllPlayer(operationEvent: OperationEvent): Promise<void>;
-    sendEventToNamespace(namespace: string, operationEvent: OperationEvent): Promise<void>;
+    sendEventTo(userId: string, operationEvent: OperationEvent, useMsgPack?: boolean): void;
+    sendEventToRoom(roomId: string, operationEvent: OperationEvent, useMsgPack?: boolean): void;
+    sendEventToMoreUser(userIds: string[], operationEvent: OperationEvent, useMsgPack?: boolean): void;
+    sendEventToAllPlayer(operationEvent: OperationEvent, useMsgPack?: boolean): void;
+    sendEventToNamespace(namespace: string, operationEvent: OperationEvent): void;
     getSocketViaSocketId(socketId: string): Socket;
     getSockets(userId: string): import("socket.io").BroadcastOperator<import("socket.io/dist/typed-events").DecorateAcknowledgementsWithMultipleResponses<import("socket.io").DefaultEventsMap>, any>;
-    joinRoom(userId: string, roomId: string): Promise<void>;
-    leaveRoom(userId: string, roomId: string): Promise<void>;
+    joinRoom(userId: string, roomId: string): void;
+    leaveRoom(userId: string, roomId: string): void;
     getRooms(userId: string): Promise<string[]>;
 }
 export {};

package/dist/GNServer.d.ts

@@ -103,11 +103,15 @@ export declare class GNServer {
     getCloudScriptService(gameId: string): ICloudScriptService;
     setCloudScriptService(gameId: string, cloudScriptService: ICloudScriptService): Map<string, ICloudScriptService>;
     sendEventTo(userId: string, operationEvent: OperationEvent): Promise<void>;
+    private executeSendEventTo;
     sendEventToRoom(roomId: string, operationEvent: OperationEvent): Promise<void>;
+    private executeSendEventToRoom;
     sendEventToMoreUser(userIds: string[], operationEvent: OperationEvent): Promise<void>;
+    private executeSendEventToMoreUser;
     sendEventToAllPlayer(operationEvent: OperationEvent): Promise<void>;
-    joinRoom(userId: string, roomId: string): Promise<void>;
-    leaveRoom(userId: string, roomId: string): Promise<void>;
+    private executeSendEventToAllPlayer;
+    joinRoom(userId: string, roomId: string): void;
+    leaveRoom(userId: string, roomId: string): void;
     getRooms(userId: string): Promise<string[]>;
     private handleSocketDisconnect;
     private handleOnRequest;

package/dist/index.js

@@ -1749,6 +1749,15 @@ class AppleService {
             else if (answer.aud !== this.appleClientId) {
                 answer["error"] = "unexpected audience (aud claim): " + answer.aud;
             }
+            else {
+                let now = Math.floor(Date.now() / 1000); // thời gian hiện tại (epoch seconds)
+                if (answer.exp && answer.exp < now) {
+                    answer["error"] = "token expired at " + new Date(answer.exp * 1000).toISOString();
+                }
+                else if (answer.iat && answer.iat > now + 10) {
+                    answer["error"] = "token issued in the future: " + new Date(answer.iat * 1000).toISOString();
+                }
+            }
             return answer;
         }
         catch (error) {
@@ -2532,6 +2541,9 @@ class GNParameterCode {
     static PushNotificationSettings = "pushNotificationSettings";
     static SendFrom = "sendFrom";
     static SendGridApiKey = "sendGridApiKey";
+    static Host = "host";
+    static Port = "port";
+    static Secure = "secure";
     static Subject = "subject";
     static ContentHtml = "contentHtml";
     static PushNotifications = "pushNotifications";
@@ -5651,34 +5663,61 @@ class RequestConverterService {
     }
 }
 
-;// external "@sendgrid/mail"
-const mail_namespaceObject = require("@sendgrid/mail");
-var mail_default = /*#__PURE__*/__webpack_require__.n(mail_namespaceObject);
+;// external "nodemailer"
+const external_nodemailer_namespaceObject = require("nodemailer");
+var external_nodemailer_default = /*#__PURE__*/__webpack_require__.n(external_nodemailer_namespaceObject);
 ;// ./src/GN-app-api/service/EmailService.ts
 
 class EmailService {
     isInit = false;
-    sendGridApiKey;
+    host;
+    port;
+    secure;
+    username;
+    password;
     fromEmail;
     needSetup = false;
-    init(sendGridApiKey, fromEmail) {
+    transporter;
+    init(host, port, secure, username, password, fromEmail) {
         this.isInit = false;
-        let oldSendGridApiKey = this.sendGridApiKey;
-        this.sendGridApiKey = sendGridApiKey;
+        let oldHost = this.host;
+        let oldPort = this.port;
+        let oldSecure = this.secure;
+        let oldUsername = this.username;
+        let oldPassword = this.password;
+        this.host = host;
+        this.port = port;
+        this.secure = secure;
+        this.username = username;
+        this.password = password;
         this.fromEmail = fromEmail;
-        if (oldSendGridApiKey != sendGridApiKey) {
+        if (oldHost != host || oldPort != port || oldSecure != secure || oldUsername != username || oldPassword != password) {
             this.needSetup = true;
         }
     }
     run() {
-        if (!this.sendGridApiKey)
+        if (!this.host)
+            return;
+        if (!this.port)
+            return;
+        if (!this.username)
+            return;
+        if (!this.password)
             return;
         if (!this.needSetup)
             return;
-        mail_default().setApiKey(this.sendGridApiKey);
+        this.transporter = external_nodemailer_default().createTransport({
+            host: this.host,
+            port: this.port,
+            secure: this.secure,
+            auth: {
+                user: this.username,
+                pass: this.password,
+            }
+        });
         this.isInit = true;
     }
-    async sendMail(toEmail, subject, contentHtml, onSendMailSuccess, onSendMailError) {
+    sendMail(toEmail, subject, contentHtml, onSendMailSuccess, onSendMailError) {
         if (!this.isInit)
             return;
         let msg = {
@@ -5687,24 +5726,18 @@ class EmailService {
             subject: subject,
             html: contentHtml,
         };
-        try {
-            let response = await mail_default().send(msg);
-            let statusCode = response;
-            if (statusCode > 399) {
+        this.transporter.sendMail(msg, (error, info) => {
+            if (error) {
                 if (onSendMailError != null)
-                    onSendMailError(response.toString());
+                    onSendMailError(error.message);
             }
             else {
                 if (onSendMailSuccess != null)
                     onSendMailSuccess();
             }
-        }
-        catch (err) {
-            if (onSendMailError != null)
-                onSendMailError(err.message);
-        }
+        });
     }
-    async sendMailToMore(toEmails, subject, contentHtml, onSendMailSuccess, onSendMailError) {
+    sendMailToMore(toEmails, subject, contentHtml, onSendMailSuccess, onSendMailError) {
         if (!this.isInit)
             return;
         let msg = {
@@ -5713,22 +5746,16 @@ class EmailService {
             subject: subject,
             html: contentHtml,
         };
-        try {
-            let response = await mail_default().send(msg);
-            let statusCode = response;
-            if (statusCode > 399) {
+        this.transporter.sendMail(msg, (error, info) => {
+            if (error) {
                 if (onSendMailError != null)
-                    onSendMailError(response.toString());
+                    onSendMailError(error.message);
             }
             else {
                 if (onSendMailSuccess != null)
                     onSendMailSuccess();
             }
-        }
-        catch (err) {
-            if (onSendMailError != null)
-                onSendMailError(err.message);
-        }
+        });
     }
 }
 
@@ -15336,15 +15363,10 @@ class HttpAppHandler {
                         Debug.log("[HTTP SEND] %O", JSON.stringify(httpData));
                     }
                     if (operationResponse.isEncrypted()) {
-                        let content = Buffer.from((0,msgpack_namespaceObject.encode)(httpData));
-                        res.setHeader(Commands.CONTENT_TYPE, Commands.APPLICATION_MSGPACK);
-                        res.setHeader(Commands.CONTENT_LENGTH, content.length);
-                        return res.send(content);
-                    }
-                    else {
-                        res.setHeader(Commands.CONTENT_TYPE, Commands.APPLICATION_JSON);
-                        return res.send(httpData);
+                        // TODO Encrypt data here
                     }
+                    res.setHeader(Commands.CONTENT_TYPE, Commands.APPLICATION_JSON);
+                    return res.send(httpData);
                 }
                 res.setHeader(Commands.CONTENT_TYPE, Commands.APPLICATION_JSON);
                 return res.send([ReturnCode.OperationInvalid]);
@@ -15390,16 +15412,12 @@ class HttpAppHandler {
                         Debug.log("[HTTP SEND] %O", JSON.stringify(httpData));
                     }
                     if (operationResponse.isEncrypted()) {
-                        let content = Buffer.from((0,msgpack_namespaceObject.encode)(httpData));
-                        res.setHeader(Commands.CONTENT_TYPE, Commands.APPLICATION_MSGPACK);
-                        res.setHeader(Commands.CONTENT_LENGTH, content.length);
-                        return res.send(content);
-                    }
-                    else {
-                        let content = httpData;
-                        res.setHeader(Commands.CONTENT_TYPE, Commands.APPLICATION_JSON);
-                        return res.send(content);
+                        // TODO Encrypt data here
                     }
+                    let content = Buffer.from((0,msgpack_namespaceObject.encode)(httpData));
+                    res.setHeader(Commands.CONTENT_TYPE, Commands.APPLICATION_MSGPACK);
+                    res.setHeader(Commands.CONTENT_LENGTH, content.length);
+                    return res.send(content);
                 }
                 let content = Buffer.from((0,msgpack_namespaceObject.encode)([ReturnCode.OperationInvalid]));
                 res.setHeader(Commands.CONTENT_TYPE, Commands.APPLICATION_MSGPACK);
@@ -15518,7 +15536,7 @@ class SocketAppHandler {
                                 this.apiMiddleware.socketAuthenticateToken(socket, async (returnCode) => {
                                     let operationResponse = await this.onSocketRequestMsgPack(socket, data, returnCode);
                                     if (operationResponse != null) {
-                                        this.sendResponseForSocket(socket, operationResponse);
+                                        this.sendResponseForSocket(socket, operationResponse, true);
                                     }
                                     this.antiDdosMiddleware.removePendingRequestViaSocket(socket, data);
                                 });
@@ -15537,7 +15555,7 @@ class SocketAppHandler {
                                 this.apiMiddleware.socketAuthenticateToken(socket, async (returnCode) => {
                                     let operationResponse = await this.onSocketRequestJson(socket, data, returnCode);
                                     if (operationResponse != null) {
-                                        this.sendResponseForSocket(socket, operationResponse);
+                                        this.sendResponseForSocket(socket, operationResponse, false);
                                     }
                                     this.antiDdosMiddleware.removePendingRequestViaSocket(socket, data);
                                 });
@@ -15720,11 +15738,14 @@ class SocketAppHandler {
         if (this._onDisconnectCb != null)
             this._onDisconnectCb(socket, data);
     }
-    sendResponseForSocket(socket, operationResponse) {
+    sendResponseForSocket(socket, operationResponse, useMsgPack) {
         let socketData = OperationHelper.toResponseSocketData(operationResponse);
         if (this.enableSendAndReceiveDebug)
             Debug.log("[SOCKET SEND] %O", JSON.stringify(socketData));
         if (operationResponse.isEncrypted()) {
+            // TODO Encrypt data
+        }
+        if (useMsgPack) {
             let socketDataMsgPack = (0,msgpack_namespaceObject.encode)(socketData);
             socket.emit(Commands.ResponseCmd_MsgPack, socketDataMsgPack);
         }
@@ -15732,28 +15753,32 @@ class SocketAppHandler {
             socket.emit(Commands.ResponseCmd_Json, socketData);
         }
     }
-    sendEventForSocket(socket, operationEvent) {
-        let socketData = OperationHelper.toEventSocketData(operationEvent);
-        if (this.enableSendAndReceiveDebug)
-            Debug.log("[EVENT SEND] %O", JSON.stringify(socketData));
-        if (operationEvent.isEncrypted()) {
-            let socketDataMsgPack = (0,msgpack_namespaceObject.encode)(socketData);
-            socket.emit(Commands.EventCmd_MsgPack, socketDataMsgPack);
-        }
-        else {
-            socket.emit(Commands.EventCmd_Json, socketData);
-        }
-    }
-    async sendEventTo(userId, operationEvent) {
+    // private sendEventForSocket(socket: Socket, operationEvent: OperationEvent) {
+    // 	let socketData = OperationHelper.toEventSocketData(operationEvent);
+    // 	if (this.enableSendAndReceiveDebug) Debug.log("[EVENT SEND] %O", JSON.stringify(socketData));
+    // 	if (operationEvent.isEncrypted())
+    // 	{
+    // 		let socketDataMsgPack = encode(socketData);
+    // 		socket.emit(Commands.EventCmd_MsgPack, socketDataMsgPack);
+    // 	}
+    // 	else
+    // 	{
+    // 		socket.emit(Commands.EventCmd_Json, socketData);
+    // 	}
+    // }
+    sendEventTo(userId, operationEvent, useMsgPack = true) {
         let socketData = OperationHelper.toEventSocketData(operationEvent);
         if (this.enableSendAndReceiveDebug)
             Debug.log("[EVENT SEND EVENT TO] " + userId + " %O", JSON.stringify(socketData));
         if (operationEvent.isEncrypted()) {
+            // TODO Encrypt data
+        }
+        if (useMsgPack) {
             let socketDataMsgPack = (0,msgpack_namespaceObject.encode)(socketData);
             if (this.emitter != null)
                 this.emitter.to(userId).emit(Commands.EventCmd_MsgPack, socketDataMsgPack);
             else
-                this.server.to(userId).emit(Commands.EventCmd_MsgPack, (0,msgpack_namespaceObject.encode)(socketData));
+                this.server.to(userId).emit(Commands.EventCmd_MsgPack, socketDataMsgPack);
         }
         else {
             if (this.emitter != null)
@@ -15762,16 +15787,19 @@ class SocketAppHandler {
                 this.server.to(userId).emit(Commands.EventCmd_Json, socketData);
         }
     }
-    async sendEventToRoom(roomId, operationEvent) {
+    sendEventToRoom(roomId, operationEvent, useMsgPack = true) {
         let socketData = OperationHelper.toEventSocketData(operationEvent);
         if (this.enableSendAndReceiveDebug)
             Debug.log("[EVENT SEND EVENT TO ROOM] " + roomId + " %O", JSON.stringify(socketData));
         if (operationEvent.isEncrypted()) {
+            // TODO Encrypt data
+        }
+        if (useMsgPack) {
             let socketDataMsgPack = (0,msgpack_namespaceObject.encode)(socketData);
             if (this.emitter != null)
                 this.emitter.to(roomId).emit(Commands.EventCmd_MsgPack, socketDataMsgPack);
             else
-                this.server.to(roomId).emit(Commands.EventCmd_MsgPack, (0,msgpack_namespaceObject.encode)(socketData));
+                this.server.to(roomId).emit(Commands.EventCmd_MsgPack, socketDataMsgPack);
         }
         else {
             if (this.emitter != null)
@@ -15780,11 +15808,14 @@ class SocketAppHandler {
                 this.server.to(roomId).emit(Commands.EventCmd_Json, socketData);
         }
     }
-    async sendEventToMoreUser(userIds, operationEvent) {
+    sendEventToMoreUser(userIds, operationEvent, useMsgPack = true) {
         let socketData = OperationHelper.toEventSocketData(operationEvent);
         if (this.enableSendAndReceiveDebug)
             Debug.log("[EVENT SEND EVENT TO MORE USER] %O", JSON.stringify(socketData));
         if (operationEvent.isEncrypted()) {
+            // TODO Encrypt data
+        }
+        if (useMsgPack) {
             let socketDataMsgPack = (0,msgpack_namespaceObject.encode)(socketData);
             if (this.emitter != null)
                 this.emitter.to(userIds).emit(Commands.EventCmd_MsgPack, socketDataMsgPack);
@@ -15798,11 +15829,14 @@ class SocketAppHandler {
                 this.server.to(userIds).emit(Commands.EventCmd_Json, socketData);
         }
     }
-    async sendEventToAllPlayer(operationEvent) {
+    sendEventToAllPlayer(operationEvent, useMsgPack = true) {
         let socketData = OperationHelper.toEventSocketData(operationEvent);
         if (this.enableSendAndReceiveDebug)
             Debug.log("[EVENT SEND EVENT TO ALL PLAYER] %O", JSON.stringify(socketData));
         if (operationEvent.isEncrypted()) {
+            // TODO Encrypt data
+        }
+        if (useMsgPack) {
             let socketDataMsgPack = (0,msgpack_namespaceObject.encode)(socketData);
             if (this.emitter != null)
                 this.emitter.emit(Commands.EventCmd_MsgPack, socketDataMsgPack);
@@ -15816,7 +15850,7 @@ class SocketAppHandler {
                 this.server.emit(Commands.EventCmd_Json, socketData);
         }
     }
-    async sendEventToNamespace(namespace, operationEvent) {
+    sendEventToNamespace(namespace, operationEvent) {
         let socketData = OperationHelper.toEventSocketData(operationEvent);
         if (this.enableSendAndReceiveDebug)
             Debug.log("[EVENT SEND EVENT TO NAME SPACE] %O", JSON.stringify(socketData));
@@ -15840,10 +15874,10 @@ class SocketAppHandler {
     getSockets(userId) {
         return this.server.in(userId);
     }
-    async joinRoom(userId, roomId) {
+    joinRoom(userId, roomId) {
         this.getSockets(userId).socketsJoin(roomId);
     }
-    async leaveRoom(userId, roomId) {
+    leaveRoom(userId, roomId) {
         this.getSockets(userId).socketsLeave(roomId);
     }
     async getRooms(userId) {
@@ -70593,16 +70627,36 @@ var EmailSettingsParam_metadata = (undefined && undefined.__metadata) || functio
 
 class EmailSettingsParam {
     sendFrom;
-    sendGridApiKey;
+    secure;
+    host;
+    port;
+    username;
+    password;
 }
 EmailSettingsParam_decorate([
     StringDataMember({ code: GNParameterCode.SendFrom }),
     EmailSettingsParam_metadata("design:type", String)
 ], EmailSettingsParam.prototype, "sendFrom", void 0);
 EmailSettingsParam_decorate([
-    StringDataMember({ code: GNParameterCode.SendGridApiKey }),
+    BooleanDataMember({ code: GNParameterCode.Secure }),
+    EmailSettingsParam_metadata("design:type", Boolean)
+], EmailSettingsParam.prototype, "secure", void 0);
+EmailSettingsParam_decorate([
+    StringDataMember({ code: GNParameterCode.Host }),
+    EmailSettingsParam_metadata("design:type", String)
+], EmailSettingsParam.prototype, "host", void 0);
+EmailSettingsParam_decorate([
+    NumberDataMember({ code: GNParameterCode.Port }),
+    EmailSettingsParam_metadata("design:type", Number)
+], EmailSettingsParam.prototype, "port", void 0);
+EmailSettingsParam_decorate([
+    StringDataMember({ code: GNParameterCode.Username }),
+    EmailSettingsParam_metadata("design:type", String)
+], EmailSettingsParam.prototype, "username", void 0);
+EmailSettingsParam_decorate([
+    StringDataMember({ code: GNParameterCode.Password }),
     EmailSettingsParam_metadata("design:type", String)
-], EmailSettingsParam.prototype, "sendGridApiKey", void 0);
+], EmailSettingsParam.prototype, "password", void 0);
 
 ;// ./src/GN-app-api/handler/controller/handler/dashboard/model/PushNotificationSettingsParam.ts
 var PushNotificationSettingsParam_decorate = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
@@ -71058,9 +71112,17 @@ class SetMasterGameSettingsRequestHandler extends RequestHandler {
             let emailSettings = masterGameSettings.getEmailSettings();
             if (request.emailSettings.sendFrom)
                 emailSettings.sendFrom = request.emailSettings.sendFrom;
-            if (request.emailSettings.sendGridApiKey)
-                emailSettings.sendGridApiKey = request.emailSettings.sendGridApiKey;
-            this.gnServer.getEmailService().init(emailSettings.sendGridApiKey, emailSettings.sendFrom);
+            if (request.emailSettings.secure != null)
+                emailSettings.secure = request.emailSettings.secure;
+            if (request.emailSettings.host)
+                emailSettings.host = request.emailSettings.host;
+            if (request.emailSettings.port)
+                emailSettings.port = request.emailSettings.port;
+            if (request.emailSettings.username)
+                emailSettings.username = request.emailSettings.username;
+            if (request.emailSettings.password)
+                emailSettings.password = request.emailSettings.password;
+            this.gnServer.getEmailService().init(emailSettings.host, emailSettings.port, emailSettings.secure, emailSettings.username, emailSettings.password, emailSettings.sendFrom);
             this.gnServer.getEmailService().run();
             masterGameSettings.setEmailSettings(emailSettings);
         }
@@ -75583,7 +75645,11 @@ class GetMasterGameSettingsRequestHandler extends RequestHandler {
             let emailSettings = masterGameSettings.getEmailSettings();
             let gnEmailSettings = new GNHashtable();
             gnEmailSettings.add(GNParameterCode.SendFrom, emailSettings.sendFrom);
-            gnEmailSettings.add(GNParameterCode.SendGridApiKey, emailSettings.sendGridApiKey);
+            gnEmailSettings.add(GNParameterCode.Host, emailSettings.host);
+            gnEmailSettings.add(GNParameterCode.Port, emailSettings.port);
+            gnEmailSettings.add(GNParameterCode.Secure, emailSettings.secure);
+            gnEmailSettings.add(GNParameterCode.Username, emailSettings.username);
+            gnEmailSettings.add(GNParameterCode.Password, emailSettings.password);
             operationResponse.setParameter(GNParameterCode.EmailSettings, gnEmailSettings);
         }
         {
@@ -84844,6 +84910,8 @@ const GN_VERSION = "2.6";
 
 
 
+
+
 
 
 
@@ -85316,6 +85384,18 @@ class GNServer {
         tempAnalyticsService.run();
         this.analyticsService = tempAnalyticsService;
         this.postEventCallbackCollection = this.xDatabase.systemCollection("EventCallback.Post");
+        this.getHttpApp().getClusterHandler().onEvent("sendEventTo", data => {
+            this.executeSendEventTo(data);
+        });
+        this.getHttpApp().getClusterHandler().onEvent("sendEventToRoom", data => {
+            this.executeSendEventToRoom(data);
+        });
+        this.getHttpApp().getClusterHandler().onEvent("sendEventToMoreUser", data => {
+            this.executeSendEventToMoreUser(data);
+        });
+        this.getHttpApp().getClusterHandler().onEvent("executeSendEventToAllPlayer", data => {
+            this.executeSendEventToAllPlayer(data);
+        });
         if (onRunSuccess != null)
             onRunSuccess();
     }
@@ -85443,7 +85523,15 @@ class GNServer {
             operationEvent: operationEventToData,
             responseSize: Buffer.byteLength(JSON.stringify(operationEventToData), "utf-8"),
         });
-        return await this.socketApp.getSocketAppHandler().sendEventTo(userId, operationEvent);
+        this.getHttpApp().getClusterHandler().sendEvent("sendEventTo", {
+            userId: userId,
+            operationEvent: operationEventToData,
+            useMsgPack: true,
+        });
+    }
+    executeSendEventTo(data) {
+        let operationEvent = new OperationEvent(data.operationEvent.eventCode, data.operationEvent.parameters != null ? GNHashtable.builder().addAll(data.operationEvent.parameters).build() : null, data.operationEvent.encrypted);
+        return this.socketApp.getSocketAppHandler().sendEventTo(data.userId, operationEvent, data.useMsgPack);
     }
     async sendEventToRoom(roomId, operationEvent) {
         await this.eventCallbackCloudScriptService.executeEvent("system_SendEventToRoom", { roomId: roomId }, operationEvent);
@@ -85461,7 +85549,15 @@ class GNServer {
             operationEvent: operationEventToData,
             responseSize: Buffer.byteLength(JSON.stringify(operationEventToData), "utf-8"),
         });
-        return await this.socketApp.getSocketAppHandler().sendEventToRoom(roomId, operationEvent);
+        this.getHttpApp().getClusterHandler().sendEvent("sendEventToRoom", {
+            roomId: roomId,
+            operationEvent: operationEventToData,
+            useMsgPack: true,
+        });
+    }
+    executeSendEventToRoom(data) {
+        let operationEvent = new OperationEvent(data.operationEvent.eventCode, data.operationEvent.parameters != null ? GNHashtable.builder().addAll(data.operationEvent.parameters).build() : null, data.operationEvent.encrypted);
+        return this.socketApp.getSocketAppHandler().sendEventToRoom(data.roomId, operationEvent, data.useMsgPack);
     }
     async sendEventToMoreUser(userIds, operationEvent) {
         await this.eventCallbackCloudScriptService.executeEvent("system_SendEventToMoreUser", { userIds: userIds }, operationEvent);
@@ -85479,7 +85575,15 @@ class GNServer {
             operationEvent: operationEventToData,
             responseSize: Buffer.byteLength(JSON.stringify(operationEventToData), "utf-8") * userIds.length,
         });
-        return await this.socketApp.getSocketAppHandler().sendEventToMoreUser(userIds, operationEvent);
+        this.getHttpApp().getClusterHandler().sendEvent("sendEventToMoreUser", {
+            userIds: userIds,
+            operationEvent: operationEventToData,
+            useMsgPack: true,
+        });
+    }
+    executeSendEventToMoreUser(data) {
+        let operationEvent = new OperationEvent(data.operationEvent.eventCode, data.operationEvent.parameters != null ? GNHashtable.builder().addAll(data.operationEvent.parameters).build() : null, data.operationEvent.encrypted);
+        return this.socketApp.getSocketAppHandler().sendEventToMoreUser(data.userIds, operationEvent, data.useMsgPack);
     }
     async sendEventToAllPlayer(operationEvent) {
         await this.eventCallbackCloudScriptService.executeEvent("system_SendEventToAllPlayer", {}, operationEvent);
@@ -85495,16 +85599,23 @@ class GNServer {
             operationEvent: operationEventToData,
             responseSize: Buffer.byteLength(JSON.stringify(operationEventToData), "utf-8"),
         });
-        return await this.socketApp.getSocketAppHandler().sendEventToAllPlayer(operationEvent);
+        this.getHttpApp().getClusterHandler().sendEvent("sendEventToAllPlayer", {
+            operationEvent: operationEventToData,
+            useMsgPack: true,
+        });
+    }
+    executeSendEventToAllPlayer(data) {
+        let operationEvent = new OperationEvent(data.operationEvent.eventCode, data.operationEvent.parameters != null ? GNHashtable.builder().addAll(data.operationEvent.parameters).build() : null, data.operationEvent.encrypted);
+        return this.socketApp.getSocketAppHandler().sendEventToAllPlayer(operationEvent, data.useMsgPack);
     }
     // public async sendEventToNamespace(namespace: string, operationEvent: OperationEvent): Promise<void> {
     // 	return await this.socketApp.getSocketAppHandler().sendEventToNamespace(namespace, operationEvent);
     // }
-    async joinRoom(userId, roomId) {
-        return await this.socketApp.getSocketAppHandler().joinRoom(userId, roomId);
+    joinRoom(userId, roomId) {
+        return this.socketApp.getSocketAppHandler().joinRoom(userId, roomId);
     }
-    async leaveRoom(userId, roomId) {
-        return await this.socketApp.getSocketAppHandler().leaveRoom(userId, roomId);
+    leaveRoom(userId, roomId) {
+        return this.socketApp.getSocketAppHandler().leaveRoom(userId, roomId);
     }
     async getRooms(userId) {
         return await this.socketApp.getSocketAppHandler().getRooms(userId);
@@ -85597,6 +85708,8 @@ class GNServer {
 
 ;// external "@xmobitea/gn-typescript-client"
 const gn_typescript_client_namespaceObject = require("@xmobitea/gn-typescript-client");
+;// external "@xmobitea/gn-typescript-client/dist/runtime/config/GNServerSettings"
+const GNServerSettings_namespaceObject = require("@xmobitea/gn-typescript-client/dist/runtime/config/GNServerSettings");
 ;// ./src/GN-startup/ServerApplication.ts
 
 
@@ -85620,6 +85733,7 @@ const gn_typescript_client_namespaceObject = require("@xmobitea/gn-typescript-cl
 
 
 
+
 
 
 class ServerApplication_BuilderBase {
@@ -85835,7 +85949,8 @@ class ServerApplication extends ServerApplication_BuilderBase {
             useSsl: false,
             useSocket: false,
             useHttp: true,
-            sendRate: 20,
+            messageType: GNServerSettings_namespaceObject.MessageType.MsgPack,
+            sendRate: 2000,
             reconnectDelay: 5000,
             pingInterval: 20000,
             pingTimeout: 20000,
@@ -86118,8 +86233,8 @@ class ServerApplication extends ServerApplication_BuilderBase {
                     this.gnServer.getApiMiddleware().updateSecretInfo(newSecretInfo);
                 }
             }
-            let password = process.env["defaultPassword"] ?? "gnpassword";
-            let username = process.env["defaultUsername"] ?? "gnadmin";
+            let username = process.env["GEARN_INIT_ROOT_USERNAME"] ?? "gearnadmin";
+            let password = process.env["GEARN_INIT_ROOT_PASSWORD"] ?? "gearnpassword";
             // create secretInfo for admin account
             {
                 let permission = GrantSecretInfoRequestHandler.generateDefaultPermission(true, true, true, true);
@@ -86854,7 +86969,7 @@ class ServerApplication extends ServerApplication_BuilderBase {
             }
             {
                 let emailSettings = masterGameSettings.getEmailSettings();
-                this.gnServer.getEmailService().init(emailSettings.sendGridApiKey, emailSettings.sendFrom);
+                this.gnServer.getEmailService().init(emailSettings.host, emailSettings.port, emailSettings.secure, emailSettings.username, emailSettings.password, emailSettings.sendFrom);
                 this.gnServer.getEmailService().run();
             }
             {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmobitea/gn-server",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "description": "GearN Server by XmobiTea (Pro)",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
@@ -19,6 +19,7 @@
     "@types/jsonwebtoken": "^9.0.7",
     "@types/multer": "^1.4.12",
     "@types/node": "^22.10.5",
+    "@types/nodemailer": "^6.4.17",
     "terser-webpack-plugin": "^5.3.10",
     "ts-loader": "^9.5.1",
     "typescript": "^5.7.2",
@@ -28,10 +29,9 @@
   },
   "dependencies": {
     "@msgpack/msgpack": "^2.8.0",
-    "@sendgrid/mail": "^8.1.4",
     "@socket.io/mongo-adapter": "^0.3.2",
     "@socket.io/mongo-emitter": "^0.2.0",
-    "@xmobitea/gn-typescript-client": "^2.6.1",
+    "@xmobitea/gn-typescript-client": "^2.6.2",
     "axios": "^1.10.0",
     "bcrypt": "^5.1.1",
     "cors": "^2.8.5",
@@ -42,6 +42,7 @@
     "log4js": "^6.9.1",
     "mongodb": "^6.12.0",
     "multer": "^1.4.5-lts.1",
+    "nodemailer": "^7.0.5",
     "reflect-metadata": "^0.2.2",
     "socket.io": "^4.8.1",
     "systeminformation": "^5.25.11"