Боже, хочу сдохнуть, а не вот это вот всё

В пизду, я не буду доделывать этот говнокод

TODOLIST.md

@@ -1,6 +1,6 @@
 -   [ ] настройка [webpack loaders](https://webpack.js.org/loaders/) [немного в electron-webpack](https://github.com/electron-userland/electron-webpack/blob/master/packages/electron-webpack/src/targets/RendererTarget.ts)
 -   [ ] [обфускация](https://github.com/javascript-obfuscator/javascript-obfuscator)
--   [ ] уменmьшение размера электрона (пересборка?)
+-   [ ] уменьшение размера электрона (пересборка?)
 
 ---
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aurora-launcher",
-  "version": "0.0.2-dev",
+  "version": "0.0.2",
   "description": "Launcher for Minecraft",
   "main": "build/main/index.js",
   "scripts": {

src/main/game/Starter.ts

@@ -9,7 +9,6 @@ import { Request } from "aurora-api"
 import { StorageHelper } from "../helpers/StorageHelper"
 import { HttpHelper } from "../helpers/HttpHelper"
 import pMap from "p-map"
-import { LogHelper } from "main/helpers/LogHelper"
 const api = require("@config").api
 
 interface ClientArgs {
@@ -43,7 +42,11 @@ export default class Starter {
     }
 
     async startChain(event: IpcMainEvent, clientArgs: ClientArgs) {
-        await this.hash(event, clientArgs)
+        try {
+            await this.hash(event, clientArgs)
+        } catch (error) {
+            return event.reply("stopGame")
+        }
         await this.start(event, clientArgs)
     }
 
@@ -59,16 +62,24 @@ export default class Starter {
             this.gameLauncherLegacy(gameArgs, clientArgs, clientDir, assetsDir)
         }
 
-        const librariesDirectory = path.resolve(clientDir, 'libraries')
-        const nativesDirectory = path.resolve(clientDir, 'natives')
-
-        const classpath = Starter.scanDir(librariesDirectory)
-        classpath.push(path.resolve(clientDir, 'minecraft.jar'))
-        // if (clientArgs.classPath !== undefined) {
-        //     clientArgs.classPath.forEach((fileName) => {
-        //         classpath.push(path.resolve(clientDir, fileName))
-        //     })
-        // }
+        const librariesDirectory = path.join(clientDir, "libraries")
+        const nativesDirectory = path.join(clientDir, "natives")
+
+        const classpath: string[] = []
+        if (clientArgs.classPath !== undefined) {
+            clientArgs.classPath.forEach(fileName => {
+                const filePath = path.join(clientDir, fileName)
+                if (fs.statSync(filePath).isDirectory()) {
+                    classpath.push(...Starter.scanDir(librariesDirectory))
+                } else {
+                    classpath.push(filePath)
+                }
+            })
+        } else {
+            App.window.sendEvent("textToConsole", "classPath is empty")
+            console.error("classPath is empty")
+            return
+        }
 
         const jvmArgs = []
 
@@ -116,7 +127,13 @@ export default class Starter {
 
         const fileHashes = ((hashes as Request).data as {
             hashes: any[]
-        }).hashes.sort((a, b) => b.size - a.size)
+        }).hashes
+        if (!fileHashes) {
+            App.window.sendEvent("textToConsole", `${type} not found`)
+            console.error(`${type} not found`)
+            throw undefined
+        }
+        fileHashes.sort((a, b) => b.size - a.size)
         const totalSize = fileHashes.reduce((p, c) => p + c.size, 0)
         let loaded = 0
 

src/renderer/runtime/assets/sass/main.sass

@@ -37,4 +37,7 @@ button
     border-radius: 2px
 
 ::-webkit-scrollbar-corner
-    display: none
+    display: none
+
+[disabled]
+    opacity: 0.75

src/renderer/runtime/components/TitleBar.vue

@@ -88,7 +88,7 @@ export default Vue.extend({
             },
             title: {
                 show: true,
-                text: 'AuroraLauncher dev build v0.0.1'
+                text: 'AuroraLauncher dev build v0.0.2'
             },
             user: {
                 show: false,
@@ -130,4 +130,4 @@ export default Vue.extend({
         })
     }
 })
-</script>
+</script>

src/renderer/runtime/scenes/ServerPanel.vue

@@ -1,8 +1,8 @@
 <template>
     <div class="block-center">
-        <h1>Привет {{username}}</h1>
-        <h2>Выбранный сервер: {{selectedServer.title}}</h2>
-        <button @click="startGame">Играть</button>
+        <h1>Привет {{ username }}</h1>
+        <h2>Выбранный сервер: {{ selectedServer.title }}</h2>
+        <button @click="startGame" :disabled="gameStarted">Играть</button>
         <div class="progress" v-show="showProgress">
             <div class="progress-line"></div>
         </div>
@@ -51,47 +51,64 @@
 </style>
 
 <script lang="ts">
-import Vue from 'vue'
-import Game from '@scripts/Game'
-import ServerPanel from '@scripts/ServerPanel'
-import { Launcher } from '@Launcher'
+import Vue from "vue"
+import Game from "@scripts/Game"
+import ServerPanel from "@scripts/ServerPanel"
+import { Launcher } from "@Launcher"
 
 export default Vue.extend({
     data() {
         return {
-            console: '',
+            console: "",
             showProgress: false,
-            selectedServer: JSON.parse(localStorage.getItem('selectedProfile') as string),
+            selectedServer: JSON.parse(
+                localStorage.getItem("selectedProfile") as string
+            ),
             selectedProfile: {},
-            username: localStorage.getItem('username')
+            username: localStorage.getItem("username"),
+            gameStarted: false
         }
     },
     methods: {
         startGame() {
-            Game.start(this.selectedProfile, this.textToConsole, this.progress)
+            this.gameStarted = true
+            Game.start(
+                this.selectedProfile,
+                this.textToConsole,
+                this.progress,
+                () => (this.gameStarted = false)
+            )
         },
         textToConsole(string: string) {
             this.console += string
-            const consoleEl = document.querySelector('.console')!
+            const consoleEl = document.querySelector(".console")!
             // Если не оборачивать в setImmediate, то оно прокручивает не до конца
-            setImmediate(() => {consoleEl.scrollTop = consoleEl.scrollHeight})
+            setImmediate(() => {
+                consoleEl.scrollTop = consoleEl.scrollHeight
+            })
         },
         progress(data: any) {
-            const progressEl = document.querySelector('.progress-line') as HTMLElement
+            const progressEl = document.querySelector(
+                ".progress-line"
+            ) as HTMLElement
             const total = data.total
             const loaded = data.loaded
-            const percent = (loaded / total * 100)
+            const percent = (loaded / total) * 100
 
             progressEl.style.width = percent + "%"
             this.showProgress = percent < 100
 
-            const infoEl = document.querySelector('.info') as HTMLElement
-            infoEl.innerHTML = `Загружено ${bytesToSize(loaded)} из ${bytesToSize(total)}`
+            const infoEl = document.querySelector(".info") as HTMLElement
+            infoEl.innerHTML = `Загружено ${bytesToSize(
+                loaded
+            )} из ${bytesToSize(total)}`
         }
     },
     async mounted() {
-        this.selectedProfile = JSON.parse(await ServerPanel.getProfile(this.selectedServer.profileUUID))
-        Launcher.$emit('showHistoryBackBtn')
+        this.selectedProfile = JSON.parse(
+            await ServerPanel.getProfile(this.selectedServer.profileUUID)
+        )
+        Launcher.$emit("showHistoryBackBtn")
     }
 })
 
@@ -102,4 +119,4 @@ function bytesToSize(bytes: number): string {
     if (i === 0) return `${bytes} ${sizes[i]})`
     return `${(bytes / 1024 ** i).toFixed(2)} ${sizes[i]}`
 }
-</script>
+</script>

src/renderer/scripts/Game.ts

@@ -1,28 +1,34 @@
-import { ipcRenderer } from 'electron'
+import { ipcRenderer } from "electron"
 
 export default class Game {
     /**
      * Start the game
      * @param csl Print to console wrapper
      */
-    static async start(profile: any, csl: (string: string) => void, progress: (data: object) => void) {
-        ipcRenderer.send('startGame', {
+    static async start(
+        profile: any,
+        csl: (string: string) => void,
+        progress: (data: object) => void,
+        callback: () => void
+    ) {
+        ipcRenderer.send("startGame", {
             ...profile,
-            username: localStorage.getItem('username'),
-            userUUID: localStorage.getItem('userUUID'),
-            accessToken: localStorage.getItem('accessToken'),
+            username: localStorage.getItem("username"),
+            userUUID: localStorage.getItem("userUUID"),
+            accessToken: localStorage.getItem("accessToken")
         })
 
-        ipcRenderer.on('textToConsole', (_e, string: string) => {
+        ipcRenderer.on("textToConsole", (_e, string: string) => {
             csl(string)
         })
 
-        ipcRenderer.on('loadProgress', (_e, data: object) => {
+        ipcRenderer.on("loadProgress", (_e, data: object) => {
             progress(data)
         })
 
-        ipcRenderer.once('stopGame', () => {
-            ipcRenderer.removeAllListeners('textToConsole')
+        ipcRenderer.once("stopGame", () => {
+            ipcRenderer.removeAllListeners("textToConsole")
+            callback()
         })
     }
-}
+}