@xmobitea/gn-server 2.6.3 → 2.6.5

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

@@ -3,6 +3,16 @@ interface NodeInfo {
     instanceId: string;
     fullUrl: string;
 }
+interface InstanceInfoStatus {
+    instanceId: string;
+    isPrimary: boolean;
+    tsPrimary: number;
+    currentInstanceIdPrimary: string;
+    currentTsPrimary: number;
+}
+interface InstanceInfo extends InstanceInfoStatus {
+    lostPing: number;
+}
 export declare class ClusterHandler {
     private router;
     private clusterRouter;
@@ -19,6 +29,8 @@ export declare class ClusterHandler {
     setIsPrimary(isPrimary: boolean): void;
     getIsPrimary(): boolean;
     getIsSingleNode(): boolean;
+    getInstanceInfoStatus(): InstanceInfoStatus;
+    getInstanceInfos(): InstanceInfo[];
     setPrivateKeyToken(privateKeyToken: string): void;
     setAllNodes(allNodes: NodeInfo[]): void;
     init(): void;

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

@@ -48,7 +48,7 @@ export declare class SocketAppHandler {
     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;
+    sendEventToNamespace(namespace: string, operationEvent: OperationEvent, useMsgPack?: boolean): 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): void;

package/dist/GN-startup/routes/utils/wrap.d.ts

@@ -1,2 +1,2 @@
-import { Request, Response, NextFunction, RequestHandler } from 'express';
+import { Request, Response, NextFunction, RequestHandler } from "express";
 export declare function wrap(fn: (req: Request, res: Response, next: NextFunction) => any): RequestHandler;

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

@@ -7,6 +7,9 @@ declare abstract class BuilderBase {
     protected certFilePath: string;
     protected expiredToken: number;
     protected privateKeyToken: string;
+    protected initRootUsername: string;
+    protected initRootPassword: string;
+    protected restoreRootPassword: string;
     getPort(): number;
     getSocketPort(): number;
     getUseSSL(): boolean;
@@ -14,6 +17,9 @@ declare abstract class BuilderBase {
     getCertFilePath(): string;
     getExpiredToken(): number;
     getPrivateKeyToken(): string;
+    getInitRootUsername(): string;
+    getInitRootPassword(): string;
+    getRestoreRootPassword(): string;
     constructor();
 }
 declare class Builder extends BuilderBase implements IBuilder<ApplicationSettings> {
@@ -24,6 +30,9 @@ declare class Builder extends BuilderBase implements IBuilder<ApplicationSetting
     setCertFilePath(certFilePath: string): Builder;
     setExpiredToken(expiredToken: number): Builder;
     setPrivateKeyToken(privateKeyToken: string): Builder;
+    setInitRootUsername(initRootUsername: string): Builder;
+    setInitRootPassword(initRootPassword: string): Builder;
+    setRestoreRootUsername(restoreRootPassword: string): Builder;
     constructor();
     build(): ApplicationSettings;
 }

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

@@ -2,11 +2,15 @@ import { IBuilder } from "./../../GN-library/xbuilder/lib/IBuilder";
 declare abstract class BuilderBase {
     protected connectionString: string;
     protected databaseName: string;
+    protected logConnectionString: string;
+    protected logDatabaseName: string;
     protected options: {
         [k: string]: any;
     };
     getConnectionString(): string;
     getDatabaseName(): string;
+    getLogConnectionString(): string;
+    getLogDatabaseName(): string;
     getOptions(): {
         [k: string]: any;
     };
@@ -15,6 +19,8 @@ declare abstract class BuilderBase {
 declare class Builder extends BuilderBase implements IBuilder<DatabaseSettings> {
     setConnectionString(connectionString: string): Builder;
     setDatabaseName(databaseName: string): Builder;
+    setLogConnectionString(logConnectionString: string): Builder;
+    setLogDatabaseName(logDatabaseName: string): Builder;
     setOptions(options: {
         [k: string]: any;
     }): Builder;

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

@@ -3,15 +3,18 @@ declare abstract class BuilderBase {
     protected headerIP: string;
     protected idTypeCase: number;
     protected ipApiUrl: string;
+    protected cloudScriptExecuteTimeoutInMs: number;
     getHeaderIP(): string;
     getIdTypeCase(): number;
     getIPApiUrl(): string;
+    getCloudScriptExecuteTimeoutInMs(): number;
     constructor();
 }
 declare class Builder extends BuilderBase implements IBuilder<OtherSettings> {
     setHeaderIP(headerIP: string): Builder;
     setIdTypeCase(idTypeCase: number): Builder;
     setIPApiUrl(ipApiUrl: string): Builder;
+    setCloudScriptExecuteTimeoutInMs(cloudScriptExecuteTimeoutInMs: number): Builder;
     constructor();
     build(): OtherSettings;
 }

package/dist/GNServer.d.ts

@@ -5,7 +5,6 @@ import { SocketApp } from "./GN-startup/SocketApp";
 import { HttpApp } from "./GN-startup/HttpApp";
 import { IRequestHandler } from "./GN-app-api/handler/controller/handler/base/IRequestHandler";
 import { IFacebookService } from "./GN-app-api/service/IFacebookService";
-import { IGenericService } from "./GN-app-api/service/IGenericService";
 import { IAppleService } from "./GN-app-api/service/IAppleService";
 import { ICloudScriptService } from "./GN-app-api/service/ICloudScriptService";
 import { ITimerService } from "./GN-app-api/service/ITimerService";
@@ -37,10 +36,10 @@ export declare class GNServer {
     private apiMiddleware;
     private requestController;
     private idTypeCase;
+    private restoreRootPassword;
     private xGNSettings;
     private xDatabase;
     private facebookService;
-    private genericService;
     private appleService;
     private googleService;
     private googlePlayGameService;
@@ -72,21 +71,25 @@ export declare class GNServer {
     getHttpApp(): HttpApp;
     getRequestController(): RequestController;
     addCustomHandler(requestHandler: IRequestHandler, onlyAuthenticated?: boolean): void;
-    getCustomHandler(code: number): IRequestHandler;
-    removeCustomHandler(code: number): void;
+    getCustomHandler(operationCode: string): IRequestHandler;
+    removeCustomHandler(operationCode: string): void;
     createIndex(collectionName: string, index: {
         [k: string]: any;
     }, options?: CreateIndexesOptions): void;
+    logCreateIndex(collectionName: string, index: {
+        [k: string]: any;
+    }, options?: CreateIndexesOptions): void;
     getConfigService(gameId: string): IConfigService;
     setConfigGame(gameId: string, configService: IConfigService): void;
     setIdTypeCase(idTypeCase: number): void;
     getIdTypeCase(): number;
+    setRestoreRootPassword(restoreRootPassword: string): void;
+    getRestoreRootPassword(): string;
     getGNSettings(): xGNSettings;
     getDatabase(): xDatabase;
     getCacheService(gameId: string): ICacheService;
     setCacheService(gameId: string, cacheService: ICacheService): void;
     getFacebookService(): IFacebookService;
-    getGenericService(): IGenericService;
     getPostEventCallbackService(): IPostEventCallbackService;
     getPreEventCallbackService(): IPreEventCallbackService;
     getEventCallbackCloudScriptService(): IEventCallbackCloudScriptService;

package/dist/index.d.ts

@@ -10,8 +10,6 @@ import { PostEventCallbackService, PreEventCallbackService } from "./GN-app-api/
 export { PostEventCallbackService, PreEventCallbackService };
 import { FacebookService } from "./GN-app-api/service/FacebookService";
 export { FacebookService };
-import { GenericService } from "./GN-app-api/service/GenericService";
-export { GenericService };
 import { GoogleService } from "./GN-app-api/service/GoogleService";
 export { GoogleService };
 import { IAnalyticsService } from "./GN-app-api/service/IAnalyticsService";
@@ -22,8 +20,6 @@ import { IPostEventCallbackService, OnPostCallbackFunction, OnPreCallbackFunctio
 export { IPostEventCallbackService, OnPostCallbackFunction, OnPreCallbackFunction, IPreEventCallbackService };
 import { IFacebookService } from "./GN-app-api/service/IFacebookService";
 export { IFacebookService };
-import { IGenericService, IGenericServiceHandler } from "./GN-app-api/service/IGenericService";
-export { IGenericService, IGenericServiceHandler };
 import { IGoogleService } from "./GN-app-api/service/IGoogleService";
 export { IGoogleService };
 import { IPushNotificationService } from "./GN-app-api/service/IPushNotificationService";
@@ -78,10 +74,8 @@ import { RequestRole } from "./GN-common/constant/enumType/RequestRole";
 export { RequestRole };
 import { RequestType } from "./GN-common/constant/enumType/RequestType";
 export { RequestType };
-import { GNErrorCode } from "./GN-common/constant/errorCode/GNErrorCode";
-export { GNErrorCode };
-import { GNParameterCode } from "./GN-common/constant/parameterCode/GNParameterCode";
-export { GNParameterCode };
+import { ErrorCode } from "./GN-common/constant/errorCode/ErrorCode";
+export { ErrorCode };
 import { ParameterCode } from "./GN-common/constant/parameterCode/ParameterCode";
 export { ParameterCode };
 import { Commands } from "./GN-common/constant/Commands";

package/gn.sh

@@ -96,7 +96,10 @@ init_create_GNConfigDebugJson() {
 			"keyFilePath": "",
 			"certFilePath": "",
 			"expiredTokenInMs": 172800000,
-            "privateKeyToken": "privateKeyDefault"
+            "privateKeyToken": "privateKeyDefault",
+            "initRootUsername": "admin",
+			"initRootPassword": "password",
+			"restoreRootPassword": ""
 		},
 
 		"httpAppSettings": {
@@ -104,7 +107,7 @@ init_create_GNConfigDebugJson() {
 			"allowOrigin": "*",
 			"credentials": true,
 			"allowMethods": ["GET", "POST"],
-			"allowHeaders": ["a", "content-type", "s", "g", "content-length", "user-agent"],
+			"allowHeaders": ["Auth-Token", "Content-Type", "Secret-Key", "Game-Id", "Content-Length", "User-Agent", "X-Real-IP"],
 			"enableSendAndReceiveDebug": true,
 			"enablePostViaMsgPack": true,
 			"enablePostViaJson": true
@@ -117,7 +120,7 @@ init_create_GNConfigDebugJson() {
 			"credentials": true,
 			"allowMethods": ["GET"],
 			"allowHeaders": [],
-			"enableSendAndReceiveDebug": true,
+			"enableSendAndReceiveDebug": false,
 			"enablePostViaMsgPack": true,
 			"enablePostViaJson": true,
 			"pingInterval": 50000,
@@ -134,14 +137,17 @@ init_create_GNConfigDebugJson() {
 		"databaseSettings": {
 			"connectionString": "mongodb://127.0.0.1:27017/",
 			"databaseName": "XmobiTea",
+            "logConnectionString": null,
+			"logDatabaseName": "XmobiTea",
 			"options": {
 			}
 		},
 
 		"otherSettings": {
-			"headerIP": "x-ip",
+			"headerIP": "X-Real-IP",
 			"idTypeCase": 0,
-			"ipApiUrl": "http://127.0.0.1:2555/json"
+			"ipApiUrl": "https://ipdetail.gearn.net/json",
+            "cloudScriptExecuteTimeoutInMs": 15000
 		},
 
 		"logSettings": {
@@ -300,20 +306,21 @@ import { OperationCodeExtensions } from "./../../common/constant/OperationCode.e
 import { TestParameterCode } from "./../../common/constant/parameterCode/TestParameterCode";
 
 class TestOperationRequest extends OperationRequest {
+
     @BooleanDataMember({ code: TestParameterCode.Boolean, isOptional: true })
-    booleanValue?: boolean;
+    public booleanValue?: boolean;
 	
     @NumberDataMember({ code: TestParameterCode.Number, isOptional: true })
-    numberValue?: number;
+    public numberValue?: number;
 	
     @StringDataMember({ code: TestParameterCode.String, isOptional: true })
-    stringValue?: string;
+    public stringValue?: string;
 	
     @GNHashtableDataMember({ code: TestParameterCode.GNHashtable, isOptional: true })
-    gnHashtableValue?: GNHashtable;
+    public gnHashtableValue?: GNHashtable;
 	
     @GNArrayDataMember({ code: TestParameterCode.GNArray, isOptional: true })
-    gnArrayValue?: GNArray;
+    public gnArrayValue?: GNArray;
 
     public override isValidRequest() {
         return true;
@@ -321,7 +328,8 @@ class TestOperationRequest extends OperationRequest {
 }
 
 export class TestRequestHandler extends RequestHandler {
-    public getCode() {
+
+    public override getCode() {
         return OperationCodeExtensions.Test;
     }
 
@@ -414,7 +422,7 @@ export class EventCodeExtensions extends EventCode {
     echo 'import { OperationCode } from "@xmobitea/gn-server";
 
 export class OperationCodeExtensions extends OperationCode {
-    public static readonly Test: number = 50;
+    public static readonly Test: number = 500;
 }' > OperationCode.ext.ts
     echo 'create OperationCode.ext.ts success'
 
@@ -433,11 +441,11 @@ export class OperationCodeExtensions extends OperationCode {
 
     cd "$DIR_PARAMETER_CODE"
     echo 'export class TestParameterCode {
-    public static readonly String: string = "1";
-    public static readonly Number: string = "2";
-    public static readonly Boolean: string = "3";
-    public static readonly GNHashtable: string = "4";
-    public static readonly GNArray: string = "5";
+    public static readonly String: string = "string";
+    public static readonly Number: string = "number";
+    public static readonly Boolean: string = "boolean";
+    public static readonly GNHashtable: string = "gnHashtable";
+    public static readonly GNArray: string = "gnArray";
 }' > TestParameterCode.ts
     echo 'create TestParameterCode.ts file success'
 
@@ -581,22 +589,10 @@ createRequestHandler() {
     arrOPERATION_CMD_COUNT=(${OPERATION_CMD_COUNT// / })
     OPERATION_COUNT=${arrOPERATION_CMD_COUNT[0]}
 
-    CONTENT_OPERATION=""
-    MAX_VALUE=50
-
     n=0
     while read line; do
         if [ $n -ge 3 ]; then
             CONTENT_OPERATION+="\t"$line
-
-            arrTEMP=(${line//=/ })
-            TEMP_CURRENT_VALUE=${arrTEMP[5]}
-            arrTEMP_CURRENT_VALUE=(${TEMP_CURRENT_VALUE//;/ })
-            CURRENT_VALUE=${arrTEMP_CURRENT_VALUE[0]}
-
-            if [ $MAX_VALUE -lt $CURRENT_VALUE ]; then
-                MAX_VALUE=$CURRENT_VALUE
-            fi
         else
             CONTENT_OPERATION+=$line
         fi
@@ -606,7 +602,7 @@ createRequestHandler() {
         fi
 
         if [ $n == $((OPERATION_COUNT - 2)) ]; then
-            CONTENT_OPERATION+="\tpublic static readonly "$REQUEST_NAME": number = "$((MAX_VALUE + 1))";"
+            CONTENT_OPERATION+="\tpublic static readonly "$REQUEST_NAME": string = "$REQUEST_NAME";"
             CONTENT_OPERATION+="\n"
             CONTENT_OPERATION+="}"
             break
@@ -646,8 +642,9 @@ import { '$REQUEST_NAME'ErrorCode } from "./../../common/constant/errorCode/'$RE
 import { '$REQUEST_NAME'ParameterCode } from "./../../common/constant/parameterCode/'$REQUEST_NAME'ParameterCode";
 
 class '$REQUEST_NAME'OperationRequest extends OperationRequest {
+    
     @DataMember({ code: '$REQUEST_NAME'ParameterCode.Var1, isOptional: true })
-    var1: number;
+    public var1: number;
 
     public override isValidRequest() {
         return true;
@@ -655,7 +652,8 @@ class '$REQUEST_NAME'OperationRequest extends OperationRequest {
 }
 
 export class '$REQUEST_NAME'RequestHandler extends RequestHandler {
-    public getCode() {
+
+    public override getCode() {
         return OperationCodeExtensions.'$REQUEST_NAME';
     }
 

package/index.js

@@ -0,0 +1,26 @@
+const fs = require("fs");
+
+const optionsPath = __dirname + "/./GNconfig.debug.json";
+let optionStr = fs.readFileSync(optionsPath).toString();
+let fullOptions = JSON.parse(optionStr);
+let options = fullOptions.options;
+
+const { ServerApplicationStartup, Debug } = require("./dist/index");
+
+let applicationStartup = new ServerApplicationStartup();
+applicationStartup.config(options);
+applicationStartup.run();
+
+let gnServer = applicationStartup.getGNServer();
+
+process.on("uncaughtException", (uncaughtException) => {
+	Debug.log("Uncaught Exception at: %s - message: %s", uncaughtException.stack, uncaughtException.message);
+});
+
+process.on("uncaughtError", (uncaughtException) => {
+	Debug.log("Uncaught Error at: %s - message: %s", uncaughtException.stack, uncaughtException.message);
+});
+
+process.on("unhandledRejection", (reason) => {
+	Debug.log("Unhandled Rejection at: %s - message: %s", reason.stack, reason.message);
+});

package/package.json

@@ -1,18 +1,19 @@
 {
   "name": "@xmobitea/gn-server",
-  "version": "2.6.3",
+  "version": "2.6.5",
   "description": "GearN Server by XmobiTea (Pro)",
   "types": "dist/index.d.ts",
-  "main": "dist/index.js",
+  "main": "index.js",
   "scripts": {
     "dev": "npm run build && npm run debug",
     "debug": "node index.js",
     "build": "rm -rf ./dist && webpack --mode production --stats-modules && npm run copyCloudScriptTemplate",
+    "build:withoutwebpack": "rm -rf ./dist && tsc",
     "copyCloudScriptTemplate": "node ./syncCodeVer2.js && cp -R ./src/GN-startup/cloudScript ./dist/GN-startup/cloudScript",
     "push": "npm run build && npm publish && git push"
   },
   "author": "Chang X <changx.develop@gmail.com> (https://xmobitea.com)",
-  "license": "Apache-2.0",
+  "license": "MIT",
   "devDependencies": {
     "@types/bcrypt": "^5.0.2",
     "@types/express": "^5.0.0",
@@ -31,7 +32,7 @@
     "@msgpack/msgpack": "^2.8.0",
     "@socket.io/mongo-adapter": "^0.3.2",
     "@socket.io/mongo-emitter": "^0.2.0",
-    "@xmobitea/gn-typescript-client": "^2.6.3",
+    "@xmobitea/gn-typescript-client": "^2.6.8",
     "axios": "^1.10.0",
     "bcrypt": "^5.1.1",
     "cors": "^2.8.5",
@@ -49,16 +50,20 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/XmobiTea-Family/GN-Server.git"
+    "url": "git+https://github.com/XmobiTea-Family/GearN-Server.git"
   },
   "keywords": [
     "GN",
+    "GearN",
     "Server",
     "Pro",
     "XmobiTea"
   ],
   "bugs": {
-    "url": "https://github.com/XmobiTea-Family/GN-Server/issues"
+    "url": "https://github.com/XmobiTea-Family/GearN-Server/issues"
   },
-  "homepage": "https://gearn.net"
+  "homepage": "https://gearn.net",
+  "engines": {
+    "node": ">=20.0.0"
+  }
 }

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

@@ -1,11 +0,0 @@
-import { IGenericService } from "./IGenericService";
-export declare class GenericService implements IGenericService {
-    verifyGenericService(serviceName: string, serviceData: {
-        [k: string]: any;
-    }): Promise<{
-        status: "Ok" | "ServiceNotFound" | "VerifyError";
-        serviceId: string;
-        someDatas?: any;
-        error?: string;
-    }>;
-}

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

@@ -1,26 +0,0 @@
-import { Constructor } from "./IRequestConverterService";
-export interface IGenericService {
-    verifyGenericService(serviceName: string, serviceData: {
-        [k: string]: any;
-    }): Promise<{
-        status: "Ok" | "ServiceNotFound" | "VerifyError";
-        serviceId: string;
-        someDatas?: any;
-        error?: string;
-    }>;
-}
-export interface IGenericServiceHandler {
-    getServiceName(): string;
-    handle(serviceData: {
-        [k: string]: any;
-    }): Promise<{
-        status: "Ok" | "ServiceNotFound" | "VerifyError";
-        serviceId: string;
-        someDatas?: any;
-        error?: string;
-    }>;
-}
-export declare namespace IGenericService {
-    function getImplementations(): IGenericServiceHandler[];
-    function register<T extends Constructor<IGenericServiceHandler>>(ctor: T): T;
-}