@xmobitea/gn-server 2.0.3 → 2.0.5

package/dist/GN-common/entity/operationHelper/OperationHelper.d.ts

@@ -1,10 +1,43 @@
 import { InvalidMember } from "./../InvalidMember";
 import { OperationResponse } from "./../operationResponse/OperationResponse";
+import { OperationRequest } from "./../operationRequest/OperationRequest";
 import { OperationEvent } from "./../operationEvent/OperationEvent";
+import { Request } from "./../operationRequest/base/Request";
+import { GNHashtable } from "./../../common/GNData";
 export declare class OperationHelper {
     private static invalidMemberData;
     static toResponseSocketData(operationResponse: OperationResponse): [number, any, number];
     static toResponseHttpData(operationResponse: OperationResponse): [number, any];
+    static toDataGNHashtable(gnHashtable: GNHashtable): {};
+    static toDataOperationResponse(operationResponse: OperationResponse): {
+        operationCode: string;
+        encrypted: boolean;
+        responseId: number;
+        parameters: {};
+        debugMessage: string;
+        returnCode: string;
+    };
+    static toDataOperationRequest(operationRequest: OperationRequest): {
+        operationCode: string;
+        encrypted: boolean;
+        requestId: number;
+        parameters: {};
+    };
+    static toDataFromRequest(request: Request): {
+        code: string;
+        type: string;
+        role: string;
+        ip: string;
+        secretInfo: {
+            role: string;
+            gameId: string;
+        };
+        authInfo: {
+            userId: string;
+        };
+    };
+    private static toDataSecretInfo;
+    private static toAuthInfo;
     static newOperationResponse(operationCode: number, responseId: number, encrypted: boolean): OperationResponse;
     static newOperationResponseInvalid(operationCode: number, responseId: number, encrypted: boolean, debugMessage?: string): OperationResponse;
     static newOperationResponseInvalidRequestParameters(operationCode: number, responseId: number, invalidMembers: InvalidMember[], encrypted: boolean, debugMessage?: string): OperationResponse;

package/dist/index.js

@@ -62425,6 +62425,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.PreEventCallbackService = exports.PostEventCallbackService = void 0;
+const OperationHelper_1 = __webpack_require__(7440);
 const xDatetime_1 = __webpack_require__(1308);
 const xDebug_1 = __webpack_require__(9343);
 class PostEventCallbackService {
@@ -62457,8 +62458,9 @@ class PostEventCallbackService {
                 eventName: eventName,
                 tsCreate: xDatetime_1.xDatetime.getCurrentMilliseconds(),
                 request: request,
-                operationRequest: operationRequest,
-                operationResponse: operationResponse,
+                operationRequest: OperationHelper_1.OperationHelper.toDataOperationRequest(operationRequest),
+                originRequest: OperationHelper_1.OperationHelper.toDataFromRequest(operationRequest.originRequest),
+                operationResponse: OperationHelper_1.OperationHelper.toDataOperationResponse(operationResponse),
                 customTags: operationRequest.getParameters().getGNHashtable("CustomTags")
             });
             if (!this.eventLstDict.has(eventName)) {
@@ -66225,6 +66227,9 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.OperationHelper = void 0;
 const ReturnCode_1 = __webpack_require__(8412);
 const OperationResponse_1 = __webpack_require__(3964);
+const CodeHelper_1 = __webpack_require__(7728);
+const RequestType_1 = __webpack_require__(1016);
+const RequestRole_1 = __webpack_require__(1948);
 class OperationHelper {
     static invalidMemberData(operationResponse) {
         let anwser = [];
@@ -66243,6 +66248,54 @@ class OperationHelper {
     static toResponseHttpData(operationResponse) {
         return [operationResponse.getReturnCode(), operationResponse.getReturnCode() == ReturnCode_1.ReturnCode.Ok ? operationResponse.getParameters().toData() : operationResponse.getReturnCode() == ReturnCode_1.ReturnCode.InvalidRequestParameters ? OperationHelper.invalidMemberData(operationResponse) : operationResponse.getDebugMessage()];
     }
+    static toDataGNHashtable(gnHashtable) {
+        if (gnHashtable == null)
+            return null;
+        return gnHashtable.toData();
+    }
+    static toDataOperationResponse(operationResponse) {
+        return {
+            operationCode: CodeHelper_1.CodeHelper.getOperationCodeName(operationResponse.getOperationCode()),
+            encrypted: operationResponse.isEncrypted(),
+            responseId: operationResponse.getResponseId(),
+            parameters: OperationHelper.toDataGNHashtable(operationResponse.getParameters()),
+            debugMessage: operationResponse.getDebugMessage(),
+            returnCode: CodeHelper_1.CodeHelper.getReturnCodeName(operationResponse.getReturnCode()),
+        };
+    }
+    static toDataOperationRequest(operationRequest) {
+        return {
+            operationCode: CodeHelper_1.CodeHelper.getOperationCodeName(operationRequest.getOperationCode()),
+            encrypted: operationRequest.isEncrypted(),
+            requestId: operationRequest.getRequestId(),
+            parameters: OperationHelper.toDataGNHashtable(operationRequest.getParameters())
+        };
+    }
+    static toDataFromRequest(request) {
+        return {
+            code: CodeHelper_1.CodeHelper.getOperationCodeName(request.getCode()),
+            type: RequestType_1.RequestType[request.getType()],
+            role: RequestRole_1.RequestRole[request.getRole()],
+            ip: request.getIP(),
+            secretInfo: OperationHelper.toDataSecretInfo(request.getSecretInfo()),
+            authInfo: OperationHelper.toAuthInfo(request.getAuthInfo()),
+        };
+    }
+    static toDataSecretInfo(secretInfo) {
+        if (secretInfo == null)
+            return null;
+        return {
+            role: RequestRole_1.RequestRole[secretInfo.getRole()],
+            gameId: secretInfo.getGameId(),
+        };
+    }
+    static toAuthInfo(authInfo) {
+        if (authInfo == null)
+            return null;
+        return {
+            userId: authInfo.getUserId(),
+        };
+    }
     static newOperationResponse(operationCode, responseId, encrypted) {
         return new OperationResponse_1.OperationResponse(operationCode, responseId, encrypted);
     }
@@ -69537,7 +69590,7 @@ class xDatabase {
     }
     createMasterPlayerAsync(result) {
         return __awaiter(this, void 0, void 0, function* () {
-            let collection = this.systemCollection("GamePlayer");
+            let collection = this.systemCollection("MasterPlayer");
             yield collection.insertOne(result);
             return new MasterPlayer_1.MasterPlayer(result, collection);
         });
@@ -71307,10 +71360,10 @@ class ServerApplication extends BuilderBase {
                 yield this.gnServer.getDatabase().systemCollection("UploadFileInfoCollection").createIndex({ "tsCreate": -1 }, { background: true, name: "tsCreate_-1" });
             }
             {
-                yield this.gnServer.getDatabase().systemCollection("AdapterEventCollection").createIndex({ createdAt: 1 }, { expireAfterSeconds: 60, background: true, name: "createdAt_1" });
+                yield this.gnServer.getDatabase().systemCollection("AdapterEventCollection").createIndex({ "createdAt": 1 }, { expireAfterSeconds: 60, background: true, name: "createdAt_1" });
             }
             {
-                yield this.gnServer.getDatabase().systemCollection("SecretInfoCollection").createIndex({ "secretKey": 1 }, { background: true, unique: true, name: "secretKey_1" });
+                // await this.gnServer.getDatabase().systemCollection("SecretInfoCollection").createIndex({ "secretKey": 1 }, { background: true, unique: true, name: "secretKey_1" });
             }
             {
                 yield this.gnServer.getDatabase().systemCollection("Config").createIndex({ "configName": 1, "label": 1 }, { background: true, unique: true, name: "configName_1_label_1" });

package/gn.sh

@@ -179,7 +179,7 @@ import { TestRequestHandler } from "./src/app-api/handler/TestRequestHandler";
 import { PostIndex } from "./PostIndex";
 
 let ENVIROMENT = process.env.ENVIROMENT || "debug";
-const optionsPath = __dirname + "/./GNconfig." + ENVIROMENT + ".json";
+const optionsPath = __dirname + "/./../GNconfig." + ENVIROMENT + ".json";
 console.log("[GN Server] ENVIROMENT [" + ENVIROMENT + "], load the config at " + optionsPath);
 let optionStr = fs.readFileSync(optionsPath).toString();
 let fullOptions = JSON.parse(optionStr);

package/package.json

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