@xmobitea/gn-server 2.4.13 → 2.4.15

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

@@ -175,7 +175,36 @@ class CloudScriptAdmin {
 	public readonly storeInventory = GNNetwork.storeInventory.admin;
 	public readonly multiplayer = GNNetwork.multiplayer.admin;
 	public readonly cloudScript = GNNetwork.cloudScript.admin;
-	public readonly dashboard = GNNetwork.dashboard;
+	public readonly dashboard = {
+        getAdminAccountList: GNNetwork.dashboard.getAdminAccountList,
+        getAdminAccountListAsync: GNNetwork.dashboard.getAdminAccountListAsync,
+        getGameInformation: GNNetwork.dashboard.getGameInformation,
+        getGameInformationAsync: GNNetwork.dashboard.getGameInformationAsync,
+        getGameList: GNNetwork.dashboard.getGameList,
+        getGameListAsync: GNNetwork.dashboard.getGameListAsync,
+        getMasterGameSettings: GNNetwork.dashboard.getMasterGameSettings,
+        getMasterGameSettingsAsync: GNNetwork.dashboard.getMasterGameSettingsAsync,
+        getSecretInfoInformation: GNNetwork.dashboard.getSecretInfoInformation,
+        getSecretInfoInformationAsync: GNNetwork.dashboard.getSecretInfoInformationAsync,
+        getSecretInfoList: GNNetwork.dashboard.getSecretInfoList,
+        getSecretInfoListAsync: GNNetwork.dashboard.getSecretInfoListAsync,
+        getServerLog: GNNetwork.dashboard.getServerLog,
+        getServerLogAsync: GNNetwork.dashboard.getServerLogAsync,
+        setGameInformation: GNNetwork.dashboard.setGameInformation,
+        setGameInformationAsync: GNNetwork.dashboard.setGameInformationAsync,
+        getUsernameAdminAccount: GNNetwork.dashboard.getUsernameAdminAccount,
+        getUsernameAdminAccountAsync: GNNetwork.dashboard.getUsernameAdminAccountAsync,
+        getAnalytics: GNNetwork.dashboard.getAnalytics,
+        getAnalyticsAsync: GNNetwork.dashboard.getAnalyticsAsync,
+        resetStatisticsLeaderboard: GNNetwork.dashboard.resetStatisticsLeaderboard,
+        resetStatisticsLeaderboardAsync: GNNetwork.dashboard.resetStatisticsLeaderboardAsync,
+        getBackupStatisticsLeaderboardVersion: GNNetwork.dashboard.getBackupStatisticsLeaderboardVersion,
+        getBackupStatisticsLeaderboardVersionAsync: GNNetwork.dashboard.getBackupStatisticsLeaderboardVersionAsync,
+        getServerGameData: GNNetwork.dashboard.getServerGameData,
+        getServerGameDataAsync: GNNetwork.dashboard.getServerGameDataAsync,
+        deleteInDatabase: GNNetwork.dashboard.deleteInDatabase,
+        deleteInDatabaseAsync: GNNetwork.dashboard.deleteInDatabaseAsync,
+    };
 	public send(
 		requestType: RequestType,
 		requestRole: RequestRole,
@@ -440,6 +469,7 @@ enum EventCallbackType {
 	Pre = 0,
 	Post = 1,
 	System = 2,
+    Event = 3,
 }
 
 interface CloudScriptRequest {
@@ -547,7 +577,26 @@ if (parentPort) {
 
 				handleResponse = await ___handleSystemFunction(functionRequest);
 			}
-		} else {
+		} 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) {
@@ -613,7 +662,8 @@ if (parentPort) {
 		let endTime = performance.now();
 		let endMemoryUsage = process.memoryUsage();
 
-		let memoryUsedInBytes = endMemoryUsage.rss - startMemoryUsage.rss;
+		let memoryUsedInBytes = endMemoryUsage.heapUsed - startMemoryUsage.heapUsed;
+        if (memoryUsedInBytes <= 0) memoryUsedInBytes = 8192;
 		let executeTimeInMs = endTime - startTime;
 
 		//let cost = (memoryUsedInGb * executeTime) / 1000 * 0.022;
@@ -693,6 +743,46 @@ async function ___handleSystemFunction(request: FunctionRequest): Promise<Functi
 	return answer;
 }
 
+async function ___handleEventFunction(request: FunctionRequest): Promise<FunctionResponse> {
+    let handler = eventHandlers[request.eventName];
+
+	if (handler == null) {
+		return {
+			status: ExecuteResponseStatus.FunctionNameNotFound,
+			result: null,
+			request: null,
+			errorMessage: null,
+		};
+	}
+
+	let answer: FunctionResponse = {
+		status: ExecuteResponseStatus.Ok,
+		errorMessage: null,
+		result: null,
+		request: null,
+	};
+
+	try {
+		await handler(request.request.request, request.request.operationEvent, request.log);
+
+        let operationEvent = request.request.operationEvent;
+
+        answer.result = {
+            returnCode: operationEvent.getEventCode(),
+            debugMessage: null as any,
+            encrypted: operationEvent.isEncrypted(),
+            parameters: operationEvent.getParameters()?.toData(),
+        };
+
+        answer.request = request.request.request;
+	} catch (err: any) {
+		answer.status = ExecuteResponseStatus.Exception;
+		answer.errorMessage = err.message;
+	}
+
+	return answer;
+}
+
 async function ___handlePreFunction(request: FunctionRequest): Promise<FunctionResponse> {
 	let handler = preHandlers[request.eventName];
 
@@ -799,6 +889,8 @@ const postHandlers: Record<string, (request: any, secretInfo: SecretInfo, operat
 
 const systemHandlers: Record<string, (log: (log: any) => void) => Promise<void>> = {};
 
+const eventHandlers: Record<string, (request: any, operationEvent: OperationEvent, log: (log: any) => void) => Promise<void>> = {};
+
 const systemMatchmakingHandlers: Record<string, (gameId: string, matchmakingTicketCanMatch: MatchmakingTicketCanMatch, log: (log: any) => void) => Promise<{ success: boolean }>> = {};
 
 //$replaceScript

package/dist/GNServer.d.ts

@@ -62,6 +62,7 @@ export declare class GNServer {
     private gameIds;
     private matchmakingHandler;
     private waitingServerDetailDict;
+    private postEventCallbackCollection;
     constructor();
     init(): void;
     run(onRunSuccess?: OnRunSuccess): void;