@xmobitea/gn-server 2.4.16 → 2.5.0

package/dist/GN-startup/cloudScript/templateEventCallback.ts

@@ -1,5 +1,3 @@
-import { parentPort, workerData } from "worker_threads";
-
 import { SecretInfo, SecretPermissionItem } from "../../index";
 import { AuthInfo } from "../../index";
 import { authenticate_InfoRequestParam as authenticate_InfoRequestParam } from "../../index";
@@ -138,12 +136,14 @@ import {
 	GroupStatus,
 	GNDebug,
 	ItemType,
+    StoreItemType,
 	LogType,
 	GNSupport,
 	PostType,
 	GetAuthInfoResponse,
 	PushPlatformType,
 	StoreReceiveType,
+    GNUtils,
 } from "@xmobitea/gn-typescript-client";
 
 import * as mongodb from "mongodb";
@@ -347,121 +347,128 @@ class CloudScriptSocket {
 	}
 
 	private async sendEvent(event: CloudScriptEvent) {
-		parentPort?.postMessage(event);
+        if (process?.send)
+		    process.send(event);
 	}
 }
 
 class CloudScriptMatchmaking {
 	public async confirmServerDetail(gameId: string, matchmakingTicketCanMatch: MatchmakingTicketCanMatch, serverDetail: ServerDetail) {
-		parentPort?.postMessage({
-			eventType: 10,
-			receiver: null,
-			operationEvent: {
-				eventCode: 0,
-				encrypted: false,
-				parameters: {
-					gameId: gameId,
-					matchmakingTicketCanMatch: matchmakingTicketCanMatch,
-					serverDetail: serverDetail,
-				},
-			},
-		});
+		if (process?.send)
+		    process.send({
+                eventType: 10,
+                receiver: null,
+                operationEvent: {
+                    eventCode: 0,
+                    encrypted: false,
+                    parameters: {
+                        gameId: gameId,
+                        matchmakingTicketCanMatch: matchmakingTicketCanMatch,
+                        serverDetail: serverDetail,
+                    },
+                },
+            });
 	}
 }
 
 class CloudScriptMail {
 	public async send(email: string, subject: string, contentHtml: string) {
-		parentPort?.postMessage({
-			eventType: 20,
-			receiver: null,
-			operationEvent: {
-				eventCode: 0,
-				encrypted: false,
-				parameters: {
-					email: email,
-					subject: subject,
-					contentHtml: contentHtml,
-				},
-			},
-		});
+		if (process?.send)
+		    process.send({
+                eventType: 20,
+                receiver: null,
+                operationEvent: {
+                    eventCode: 0,
+                    encrypted: false,
+                    parameters: {
+                        email: email,
+                        subject: subject,
+                        contentHtml: contentHtml,
+                    },
+                },
+            });
 	}
 
 	public async sendToMore(emails: string[], subject: string, contentHtml: string) {
-		parentPort?.postMessage({
-			eventType: 21,
-			receiver: null,
-			operationEvent: {
-				eventCode: 0,
-				encrypted: false,
-				parameters: {
-					emails: emails,
-					subject: subject,
-					contentHtml: contentHtml,
-				},
-			},
-		});
+		if (process?.send)
+		    process.send({
+                eventType: 21,
+                receiver: null,
+                operationEvent: {
+                    eventCode: 0,
+                    encrypted: false,
+                    parameters: {
+                        emails: emails,
+                        subject: subject,
+                        contentHtml: contentHtml,
+                    },
+                },
+            });
 	}
 }
 
 class CloudScriptPushNotification {
 	public async send(token: string, title: string, body: string, badge?: number, sound?: string, icon?: string, data?: { [k: string]: any }) {
-		parentPort?.postMessage({
-			eventType: 30,
-			receiver: null,
-			operationEvent: {
-				eventCode: 0,
-				encrypted: false,
-				parameters: {
-					token: token,
-					title: title,
-					body: body,
-					badge: badge,
-					sound: sound,
-					icon: icon,
-					data: data,
-				},
-			},
-		});
+		if (process?.send)
+		    process.send({
+                eventType: 30,
+                receiver: null,
+                operationEvent: {
+                    eventCode: 0,
+                    encrypted: false,
+                    parameters: {
+                        token: token,
+                        title: title,
+                        body: body,
+                        badge: badge,
+                        sound: sound,
+                        icon: icon,
+                        data: data,
+                    },
+                },
+            });
 	}
 
 	public async sendToMore(tokens: string[], title: string, body: string, badge?: number, sound?: string, icon?: string, data?: { [k: string]: any }) {
-		parentPort?.postMessage({
-			eventType: 31,
-			receiver: null,
-			operationEvent: {
-				eventCode: 0,
-				encrypted: false,
-				parameters: {
-					tokens: tokens,
-					title: title,
-					body: body,
-					badge: badge,
-					sound: sound,
-					icon: icon,
-					data: data,
-				},
-			},
-		});
+		if (process?.send)
+		    process.send({
+                eventType: 31,
+                receiver: null,
+                operationEvent: {
+                    eventCode: 0,
+                    encrypted: false,
+                    parameters: {
+                        tokens: tokens,
+                        title: title,
+                        body: body,
+                        badge: badge,
+                        sound: sound,
+                        icon: icon,
+                        data: data,
+                    },
+                },
+            });
 	}
 
 	public async sendToTopic(topic: string, title: string, body: string, badge?: number, sound?: string, icon?: string, data?: { [k: string]: any }) {
-		parentPort?.postMessage({
-			eventType: 32,
-			receiver: null,
-			operationEvent: {
-				eventCode: 0,
-				encrypted: false,
-				parameters: {
-					topic: topic,
-					title: title,
-					body: body,
-					badge: badge,
-					sound: sound,
-					icon: icon,
-					data: data,
-				},
-			},
-		});
+		if (process?.send)
+		    process.send({
+                eventType: 32,
+                receiver: null,
+                operationEvent: {
+                    eventCode: 0,
+                    encrypted: false,
+                    parameters: {
+                        topic: topic,
+                        title: title,
+                        body: body,
+                        badge: badge,
+                        sound: sound,
+                        icon: icon,
+                        data: data,
+                    },
+                },
+            });
 	}
 }
 
@@ -541,146 +548,145 @@ interface FunctionResponse {
 	errorMessage: any;
 }
 
-if (parentPort) {
-	parentPort.on("message", async (request: CloudScriptRequest) => {
-		let startTime = performance.now();
-		let startMemoryUsage = process.memoryUsage();
-
-		let logs: string[] = [];
-
-		let handleResponse: FunctionResponse = null as any;
-
-		if (request.eventType == EventCallbackType.System) {
-			if (request.eventName == "system_RequestServerDetail") {
-				let functionRequest: FunctionRequest = {
-					eventName: request.eventName,
-					operationRequest: null as any,
-					secretInfo: null as any,
-					request: request.request,
-					log(log: any) {
-						logs.push(JSON.stringify(log));
-					},
-				};
-
-				handleResponse = await ___handleMatchmakingFunction(functionRequest);
-			}
-			else {
-				let functionRequest: FunctionRequest = {
-					eventName: request.eventName,
-					operationRequest: null as any,
-					secretInfo: null as any,
-					request: null as any,
-					log(log: any) {
-						logs.push(JSON.stringify(log));
-					},
-				};
-
-				handleResponse = await ___handleSystemFunction(functionRequest);
-			}
-		} else if (request.eventType == EventCallbackType.Event) {
-			let originOperationEvent = request.operationRequest;
-            
-            let operationEvent = new OperationEvent(originOperationEvent.operationCode, (originOperationEvent.parameters ? GNHashtable.builder().addAll(originOperationEvent.parameters).build() : null as any), originOperationEvent.encrypted);
+process?.on("message", async (request: CloudScriptRequest) => {
+    let startTime = performance.now();
+    let startMemoryUsage = process.memoryUsage();
+
+    let logs: string[] = [];
+
+    let handleResponse: FunctionResponse = null as any;
+
+    if (request.eventType == EventCallbackType.System) {
+        if (request.eventName == "system_RequestServerDetail") {
+            let functionRequest: FunctionRequest = {
+                eventName: request.eventName,
+                operationRequest: null as any,
+                secretInfo: null as any,
+                request: request.request,
+                log(log: any) {
+                    logs.push(JSON.stringify(log));
+                },
+            };
 
+            handleResponse = await ___handleMatchmakingFunction(functionRequest);
+        }
+        else {
             let functionRequest: FunctionRequest = {
                 eventName: request.eventName,
                 operationRequest: null as any,
                 secretInfo: null as any,
-                request: {
-                    operationEvent: operationEvent,
-                    request: request.request,
+                request: null as any,
+                log(log: any) {
+                    logs.push(JSON.stringify(log));
                 },
+            };
+
+            handleResponse = await ___handleSystemFunction(functionRequest);
+        }
+    } else if (request.eventType == EventCallbackType.Event) {
+        let originOperationEvent = request.operationRequest;
+        
+        let operationEvent = new OperationEvent(originOperationEvent.operationCode, (originOperationEvent.parameters ? GNHashtable.builder().addAll(originOperationEvent.parameters).build() : null as any), originOperationEvent.encrypted);
+
+        let functionRequest: FunctionRequest = {
+            eventName: request.eventName,
+            operationRequest: null as any,
+            secretInfo: null as any,
+            request: {
+                operationEvent: operationEvent,
+                request: request.request,
+            },
+            log(log: any) {
+                logs.push(JSON.stringify(log));
+            },
+        };
+
+        handleResponse = await ___handleEventFunction(functionRequest);
+    } else {
+        let originOperationRequest = request.operationRequest;
+        let operationRequest = new OperationRequest(originOperationRequest.operationCode, originOperationRequest.encrypted);
+        if (originOperationRequest.parameters) {
+            operationRequest.setParameters(GNHashtable.builder().addAll(originOperationRequest.parameters).build());
+        }
+
+        let originSecretInfo = request.secretInfo;
+        let secretInfo: SecretInfo = null as any;
+        if (originSecretInfo) {
+            secretInfo = SecretInfo.Builder()
+                .setSecretKey(originSecretInfo.secretKey)
+                .setRole(originSecretInfo.role)
+                .setIsRemove(originSecretInfo.remove)
+                .setTsExpire(originSecretInfo.tsExpire)
+                .setPermission(originSecretInfo.permission)
+                .setGameId(originSecretInfo.gameId)
+                .setIsDefault(originSecretInfo.isDefault)
+                .setIsOnlyMasterAdmin(originSecretInfo.onlyMasterAdmin)
+                .build();
+        }
+
+        if (request.eventType == EventCallbackType.Pre) {
+            let functionRequest: FunctionRequest = {
+                eventName: request.eventName,
+                operationRequest: operationRequest,
+                secretInfo: secretInfo,
+                request: request.request,
                 log(log: any) {
                     logs.push(JSON.stringify(log));
                 },
             };
 
-            handleResponse = await ___handleEventFunction(functionRequest);
-        } else {
-			let originOperationRequest = request.operationRequest;
-			let operationRequest = new OperationRequest(originOperationRequest.operationCode, originOperationRequest.encrypted);
-			if (originOperationRequest.parameters) {
-				operationRequest.setParameters(GNHashtable.builder().addAll(originOperationRequest.parameters).build());
-			}
-
-			let originSecretInfo = request.secretInfo;
-			let secretInfo: SecretInfo = null as any;
-			if (originSecretInfo) {
-				secretInfo = SecretInfo.Builder()
-					.setSecretKey(originSecretInfo.secretKey)
-					.setRole(originSecretInfo.role)
-					.setIsRemove(originSecretInfo.remove)
-					.setTsExpire(originSecretInfo.tsExpire)
-					.setPermission(originSecretInfo.permission)
-					.setGameId(originSecretInfo.gameId)
-					.setIsDefault(originSecretInfo.isDefault)
-					.setIsOnlyMasterAdmin(originSecretInfo.onlyMasterAdmin)
-					.build();
-			}
-
-			if (request.eventType == EventCallbackType.Pre) {
-				let functionRequest: FunctionRequest = {
-					eventName: request.eventName,
-					operationRequest: operationRequest,
-					secretInfo: secretInfo,
-					request: request.request,
-					log(log: any) {
-						logs.push(JSON.stringify(log));
-					},
-				};
-
-				handleResponse = await ___handlePreFunction(functionRequest);
-			} else if (request.eventType == EventCallbackType.Post) {
-				let originOperationResponse = request.operationResponse;
-				let operationResponse: OperationResponse = null as any;
-
-				if (originOperationResponse) {
-					operationResponse = new OperationResponse(originOperationRequest.operationCode, originOperationRequest.requestId, originOperationRequest.encrypted);
-					operationResponse.setReturnCode(originOperationResponse.returnCode);
-					operationResponse.setDebugMessage(originOperationResponse.debugMessage);
-
-					if (originOperationResponse.parameters) {
-						operationResponse.setParameters(GNHashtable.builder().addAll(originOperationResponse.parameters).build());
-					}
-				}
-
-				let functionRequest: FunctionRequest = {
-					eventName: request.eventName,
-					operationRequest: operationRequest,
-					operationResponse: operationResponse,
-					secretInfo: secretInfo,
-					request: request.request,
-					log(log: any) {
-						logs.push(JSON.stringify(log));
-					},
-				};
-
-				handleResponse = await ___handlePostFunction(functionRequest);
-			}
-		}
-
-		let endTime = performance.now();
-		let endMemoryUsage = process.memoryUsage();
-
-		let memoryUsedInBytes = endMemoryUsage.heapUsed - startMemoryUsage.heapUsed;
-        if (memoryUsedInBytes <= 0) memoryUsedInBytes = 8192;
-		let executeTimeInMs = endTime - startTime;
-
-		//let cost = (memoryUsedInGb * executeTime) / 1000 * 0.022;
-
-		let response: CloudScriptResponse = {
-			responseId: request.requestId,
-			response: handleResponse as any,
-			stats: {
-				executeTimeInMs: executeTimeInMs,
-				memoryUsedInBytes: memoryUsedInBytes,
-			},
-			logs: logs,
-		};
+            handleResponse = await ___handlePreFunction(functionRequest);
+        } else if (request.eventType == EventCallbackType.Post) {
+            let originOperationResponse = request.operationResponse;
+            let operationResponse: OperationResponse = null as any;
 
-		parentPort?.postMessage(response);
-	});
-}
+            if (originOperationResponse) {
+                operationResponse = new OperationResponse(originOperationRequest.operationCode, originOperationRequest.requestId, originOperationRequest.encrypted);
+                operationResponse.setReturnCode(originOperationResponse.returnCode);
+                operationResponse.setDebugMessage(originOperationResponse.debugMessage);
+
+                if (originOperationResponse.parameters) {
+                    operationResponse.setParameters(GNHashtable.builder().addAll(originOperationResponse.parameters).build());
+                }
+            }
+
+            let functionRequest: FunctionRequest = {
+                eventName: request.eventName,
+                operationRequest: operationRequest,
+                operationResponse: operationResponse,
+                secretInfo: secretInfo,
+                request: request.request,
+                log(log: any) {
+                    logs.push(JSON.stringify(log));
+                },
+            };
+
+            handleResponse = await ___handlePostFunction(functionRequest);
+        }
+    }
+
+    let endTime = performance.now();
+    let endMemoryUsage = process.memoryUsage();
+
+    let memoryUsedInBytes = endMemoryUsage.heapUsed - startMemoryUsage.heapUsed;
+    if (memoryUsedInBytes <= 0) memoryUsedInBytes = 8192;
+    let executeTimeInMs = endTime - startTime;
+
+    //let cost = (memoryUsedInGb * executeTime) / 1000 * 0.022;
+
+    let response: CloudScriptResponse = {
+        responseId: request.requestId,
+        response: handleResponse as any,
+        stats: {
+            executeTimeInMs: executeTimeInMs,
+            memoryUsedInBytes: memoryUsedInBytes,
+        },
+        logs: logs,
+    };
+
+    if (process?.send)
+        process.send(response);
+});
 
 async function ___handleMatchmakingFunction(request: FunctionRequest): Promise<FunctionResponse> {
 	let handler = systemMatchmakingHandlers[request.eventName];
@@ -859,7 +865,7 @@ async function ___handlePostFunction(request: FunctionRequest): Promise<Function
 }
 
 {
-	let gnServerSettingsOptions: GNServerSettingsOptions = workerData.gnServerSettingsOptions;
+	let gnServerSettingsOptions: GNServerSettingsOptions = JSON.parse(process.env.gnServerSettingsOptions ?? "");
 
 	let gnServerSettings = new GNServerSettings();
 	gnServerSettings.config(gnServerSettingsOptions);
@@ -876,12 +882,12 @@ const mail = new CloudScriptMail();
 const pushNotification = new CloudScriptPushNotification();
 
 {
-	let dbConnection = workerData.dbConnection;
+	let dbConnection = JSON.parse(process.env.dbConnection ?? "");
 	database.init(dbConnection.url, dbConnection.dbName, dbConnection.options);
 }
 
-delete workerData.dbConnection;
-delete workerData.gnServerSettingsOptions;
+process.env.dbConnection = "";
+process.env.gnServerSettingsOptions = "";
 
 const preHandlers: Record<string, (request: any, secretInfo: SecretInfo, operationRequest: OperationRequest, log: (log: any) => void) => Promise<OperationResponse | null>> = {};
 

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

@@ -1,12 +1,14 @@
 import { IBuilder } from "./../../GN-library/xbuilder/lib/IBuilder";
 declare abstract class BuilderBase {
     protected port: number;
+    protected socketPort: number;
     protected useSSL: boolean;
     protected keyFilePath: string;
     protected certFilePath: string;
     protected expiredToken: number;
     protected privateKeyToken: string;
     getPort(): number;
+    getSocketPort(): number;
     getUseSSL(): boolean;
     getKeyFilePath(): string;
     getCertFilePath(): string;
@@ -16,6 +18,7 @@ declare abstract class BuilderBase {
 }
 declare class Builder extends BuilderBase implements IBuilder<ApplicationSettings> {
     setPort(port: number): Builder;
+    setSocketPort(socketPort: number): Builder;
     setUseSSL(useSSL: boolean): Builder;
     setKeyFilePath(keyFilePath: string): Builder;
     setCertFilePath(certFilePath: string): Builder;

package/dist/GNServer.d.ts

@@ -43,7 +43,7 @@ export declare class GNServer {
     private xDatabase;
     private xMail;
     private xPushNotification;
-    private xCacheData;
+    private xCacheDataDic;
     private facebookService;
     private genericService;
     private appleService;
@@ -87,7 +87,8 @@ export declare class GNServer {
     getDatabase(): xDatabase;
     getMail(): xMail;
     getPushNotification(): xPushNotification;
-    getCacheData(): xCacheData;
+    getCacheData(gameId: string): xCacheData;
+    setCacheData(gameId: string, cacheData: xCacheData): void;
     getFacebookService(): IFacebookService;
     getGenericService(): IGenericService;
     getPostEventCallbackService(): IPostEventCallbackService;
@@ -114,6 +115,7 @@ export declare class GNServer {
     private handleSocketDisconnect;
     private handleOnRequest;
     private handleMatchmaking;
+    private handleRemoveCacheInvalidData;
     private handleMatchmakingForGame;
     private requestMatchServerDetail;
     setMatchServerDetail(gameId: string, matchId: string, serverDetail: ServerDetail, ticketIds: string[]): void;

package/dist/index.d.ts

@@ -52,6 +52,8 @@ import { InvalidMemberType } from "./GN-common/constant/enumType/InvalidMemberTy
 export { InvalidMemberType };
 import { ItemType } from "./GN-common/constant/enumType/ItemType";
 export { ItemType };
+import { StoreItemType } from "./GN-common/constant/enumType/StoreItemType";
+export { StoreItemType };
 import { MatchmakingMemberStatus } from "./GN-common/constant/enumType/MatchmakingMemberStatus";
 export { MatchmakingMemberStatus };
 import { MatchmakingTicketStatus } from "./GN-common/constant/enumType/MatchmakingTicketStatus";