Десереализация классов из JSON

package.json

@@ -52,10 +52,12 @@
     },
     "dependencies": {
         "adm-zip": "^0.5.4",
+        "class-transformer": "^0.4.0",
         "cli-progress": "^3.9.0",
         "colors": "^1.4.0",
         "p-map": "^4.0.0",
         "progress-stream": "^2.0.0",
+        "reflect-metadata": "^0.1.13",
         "semver": "^7.3.5",
         "source-map-support": "^0.5.19",
         "uuid": "^8.3.2",

src/main/LauncherServer.ts

@@ -16,9 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import 'source-map-support/register';
-
-const version = require("../../package").version
+import "source-map-support/register"
+import "reflect-metadata"
 
 import { EventEmitter } from "events"
 
@@ -35,6 +34,8 @@ import { ModulesManager } from "./modules/ModulesManager"
 import { ProfilesManager } from "./profiles/ProfilesManager"
 import { UpdatesManager } from "./updates/UpdatesManager"
 
+const version = require("../../package").version
+
 export class LauncherServer extends EventEmitter {
     private _ConfigManager: ConfigManager
     private _LangManager: LangManager

src/main/api/WebSocketManager.ts

@@ -52,7 +52,7 @@ export class WebSocketManager {
             // }
 
             try {
-                parsedMessage = JsonHelper.toJSON(message)
+                parsedMessage = JsonHelper.fromJSON(message)
             } catch (error) {
                 return this.wsSend(ws, {
                     uuid: NIL_UUID,
@@ -88,6 +88,6 @@ export class WebSocketManager {
     }
 
     private wsSend(ws: ws, data: wsResponse | wsErrorResponse): void {
-        ws.send(JsonHelper.toString(data))
+        ws.send(JsonHelper.toJSON(data))
     }
 }

src/main/api/types/ErrorResponse.ts

@@ -1,3 +1,21 @@
+/**
+ * AuroraLauncher LauncherServer - Server for AuroraLauncher
+ * Copyright (C) 2020 - 2021 AuroraTeam
+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 export interface ErrorResponse {
     code: number
     message: string

src/main/api/types/Request.ts

@@ -1,3 +1,21 @@
+/**
+ * AuroraLauncher LauncherServer - Server for AuroraLauncher
+ * Copyright (C) 2020 - 2021 AuroraTeam
+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 export type RequestData = object
 
 export interface Request {

src/main/api/types/Response.ts

@@ -1,3 +1,21 @@
+/**
+ * AuroraLauncher LauncherServer - Server for AuroraLauncher
+ * Copyright (C) 2020 - 2021 AuroraTeam
+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 export type ResponseData = object
 
 export interface Response {

src/main/config/ConfigManager.ts

@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import { JsonHelper } from "../helpers/JsonHelper"
+import * as fs from "fs"
+
 import { LogHelper } from "../helpers/LogHelper"
 import { StorageHelper } from "../helpers/StorageHelper"
-import { LauncherServerConfig } from "./LauncherServerConfig"
-import fs = require("fs")
+import { LauncherServerConfig } from "./types/LauncherServerConfig"
 
 export class ConfigManager {
     private config: LauncherServerConfig
@@ -41,18 +41,19 @@ export class ConfigManager {
     }
 
     private load(): void {
-        const config = fs.readFileSync(StorageHelper.configFile)
+        const config = fs.readFileSync(StorageHelper.configFile).toString()
         try {
-            this.config = JsonHelper.toJSON(config.toString())
+            this.config = LauncherServerConfig.fromJSON(config)
         } catch (e) {
             if (e instanceof SyntaxError) {
                 LogHelper.error(e)
                 LogHelper.fatal("Json syntax broken. Try fix or delete LauncherServerConfig.json")
             }
+            LogHelper.fatal(e)
         }
     }
 
     private save(): void {
-        fs.writeFileSync(StorageHelper.configFile, JsonHelper.toString(this.config, true))
+        fs.writeFileSync(StorageHelper.configFile, this.config.toJSON())
     }
 }

src/main/config/types/AuthConfig.ts

@@ -0,0 +1,35 @@
+/**
+ * AuroraLauncher LauncherServer - Server for AuroraLauncher
+ * Copyright (C) 2020 - 2021 AuroraTeam
+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import { AbstractAuthProvider, AbstractAuthProviderConfig } from "../../auth/authProviders/AbstractAuthProvider"
+import {
+    AbstractTextureProvider,
+    AbstractTextureProviderConfig,
+} from "../../auth/textureProviders/AbstractTextureProvider"
+
+export class AuthConfig {
+    authProvider: AbstractAuthProviderConfig
+    textureProvider: AbstractTextureProviderConfig
+
+    static getDefaults(): AuthConfig {
+        const defaults = new AuthConfig()
+        defaults.authProvider = AbstractAuthProvider.getDefaultConfig()
+        defaults.textureProvider = AbstractTextureProvider.getDefaultConfig()
+        return defaults
+    }
+}

src/main/config/types/LauncherServerConfig.ts

@@ -0,0 +1,59 @@
+/**
+ * AuroraLauncher LauncherServer - Server for AuroraLauncher
+ * Copyright (C) 2020 - 2021 AuroraTeam
+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import { classToPlain, deserialize } from "class-transformer"
+
+import { JsonHelper } from "../../helpers/JsonHelper"
+import { AuthConfig } from "./AuthConfig"
+import { WebSocketConfig } from "./WebSocketConfig"
+
+// TODO Инфа на будущее, пригодится при версионировании конфигов
+// https://github.com/typestack/class-transformer/tree/v0.4.0#using-versioning-to-control-exposed-and-excluded-properties
+export class LauncherServerConfig {
+    configVersion: number
+    lang: "ru" | "en"
+    env: Envirovement
+    mirrors: string[]
+    auth: AuthConfig
+    ws: WebSocketConfig
+
+    static getDefaults(): LauncherServerConfig {
+        const config = new LauncherServerConfig()
+        config.configVersion = 0
+        config.lang = "ru"
+        config.env = Envirovement.DEV
+        config.mirrors = ["https://mirror.aurora-launcher.ru/"]
+        config.auth = AuthConfig.getDefaults()
+        config.ws = WebSocketConfig.getDefaults()
+        return config
+    }
+
+    public toJSON(): string {
+        return JsonHelper.toJSON(classToPlain(this), true)
+    }
+
+    public static fromJSON(json: string): LauncherServerConfig {
+        return deserialize(LauncherServerConfig, json)
+    }
+}
+
+export enum Envirovement {
+    PRODUCTION = "prod",
+    DEBUG = "debug",
+    DEV = "dev",
+}

src/main/config/LauncherServerConfig.ts → src/main/config/types/WebSocketConfig.ts

@@ -16,12 +16,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import { AbstractAuthProvider, AbstractAuthProviderConfig } from "../auth/authProviders/AbstractAuthProvider"
-import {
-    AbstractTextureProvider,
-    AbstractTextureProviderConfig,
-} from "../auth/textureProviders/AbstractTextureProvider"
-
 export class WebSocketConfig {
     address: string
     ip: string
@@ -49,45 +43,3 @@ export class WebSocketConfig {
         return defaults
     }
 }
-
-export class AuthConfig {
-    authProvider: AbstractAuthProviderConfig
-    textureProvider: AbstractTextureProviderConfig
-
-    static getDefaults(): AuthConfig {
-        const defaults = new AuthConfig()
-        defaults.authProvider = AbstractAuthProvider.getDefaultConfig()
-        defaults.textureProvider = AbstractTextureProvider.getDefaultConfig()
-        return defaults
-    }
-}
-
-export enum Envirovement {
-    PRODUCTION = "prod",
-    DEBUG = "debug",
-    DEV = "dev",
-}
-
-export class LauncherServerConfig {
-    configVersion: string
-    lang: string
-
-    env: Envirovement
-
-    updatesUrl: Array<string>
-
-    auth: AuthConfig
-
-    ws: WebSocketConfig
-
-    static getDefaults(): LauncherServerConfig {
-        const config = new LauncherServerConfig()
-        config.configVersion = "0"
-        config.lang = "ru"
-        config.env = Envirovement.DEV
-        config.updatesUrl = ["https://mirror.aurora-launcher.ru/"]
-        config.auth = AuthConfig.getDefaults()
-        config.ws = WebSocketConfig.getDefaults()
-        return config
-    }
-}

src/main/download/FabricManager.ts

@@ -74,7 +74,7 @@ export class FabricManager extends MojangManager {
 
         let loaders: any[]
         try {
-            loaders = JsonHelper.toJSON(loadersData)
+            loaders = JsonHelper.fromJSON(loadersData)
         } catch (error) {
             LogHelper.debug(error)
             LogHelper.error("Error parsing JSON data")
@@ -99,7 +99,7 @@ export class FabricManager extends MojangManager {
         }
 
         try {
-            return JsonHelper.toJSON(versionData)
+            return JsonHelper.fromJSON(versionData)
         } catch (error) {
             LogHelper.debug(error)
             return

src/main/download/MirrorManager.ts

@@ -37,7 +37,7 @@ export class MirrorManager {
      * @param dirName - Название конечной папки
      */
     async downloadClient(clientName: string, dirName: string): Promise<void> {
-        const mirrors: string[] = App.ConfigManager.getConfig().updatesUrl
+        const mirrors: string[] = App.ConfigManager.getConfig().mirrors
         const clientDir = path.resolve(StorageHelper.updatesDir, dirName)
         if (fs.existsSync(clientDir)) return LogHelper.error(App.LangManager.getTranslate("MirrorManager.dirExist"))
 
@@ -82,7 +82,7 @@ export class MirrorManager {
 
         //Profiles
         App.ProfilesManager.createProfile({
-            ...JsonHelper.toJSON(profile),
+            ...JsonHelper.fromJSON(profile),
             clientDir: dirName,
         } as ClientProfileConfig)
         LogHelper.info(App.LangManager.getTranslate("MirrorManager.client.success"))
@@ -94,7 +94,7 @@ export class MirrorManager {
      * @param dirName - Название конечной папки
      */
     async downloadAssets(assetsName: string, dirName: string): Promise<void> {
-        const mirrors: string[] = App.ConfigManager.getConfig().updatesUrl
+        const mirrors: string[] = App.ConfigManager.getConfig().mirrors
         const assetsDir = path.resolve(StorageHelper.updatesDir, dirName)
         if (fs.existsSync(assetsDir)) return LogHelper.error(App.LangManager.getTranslate("MirrorManager.dirExist"))