Merge remote-tracking branch 'refs/remotes/upstream/master'

# Conflicts: # app/app.ejs # app/assets/js/scripts/settings.js # app/frame.ejs # app/landing.ejs # app/login.ejs # app/loginOptions.ejs # app/settings.ejs # app/welcome.ejs # docs/MicrosoftAuth.md # docs/distro.md # electron-builder.yml # package-lock.json # package.json
Raft08 · May 2, 2024 · d7b8bf4 · d7b8bf4
2 parents 1dc616e + eb683f8
commit d7b8bf4
Show file tree

Hide file tree

Showing 33 changed files with 3,177 additions and 1,095 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Set up Node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20
 
       - name: Set up Python
         uses: actions/setup-python@v4

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-18
+20
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2022 Daniel D. Scalzi
+Copyright (c) 2017-2024 Daniel D. Scalzi
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -84,7 +84,7 @@ This section details the setup of a basic developmentment environment.
 
 **System Requirements**
 
-* [Node.js][nodejs] v18
+* [Node.js][nodejs] v20
 
 ---
 

diff --git a/app/app.ejs b/app/app.ejs
@@ -1,7 +1,7 @@
 <html lang="en" xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta charset="utf-8" http-equiv="Content-Security-Policy" content="script-src 'self' 'sha256-In6B8teKZQll5heMl9bS7CESTbGvuAt3VVV86BUQBDk='"/>
-    <title>Crafted Launcher Legacy</title>
+    <title><%= lang('app.title') %></title>
     <script src="./assets/js/scripts/uicore.js"></script>
     <script src="./assets/js/scripts/uibinder.js"></script>
     <link type="text/css" rel="stylesheet" href="./assets/css/launcher.css">
@@ -45,11 +45,5 @@
             </div>
         </div>
     </div>
-    <script>
-        // Load language
-        for(let key of Object.keys(Lang.query('html'))){
-            document.getElementById(key).innerHTML = Lang.query(`html.${key}`)
-        }
-    </script>
 </body>
 </html>
diff --git a/app/assets/js/authmanager.js b/app/assets/js/authmanager.js
@@ -13,12 +13,122 @@ const { v3: uuidv3 } = require('uuid')
 const ConfigManager          = require('./configmanager')
 const { LoggerUtil }         = require('helios-core')
 const { RestResponseStatus } = require('helios-core/common')
-const { MojangRestAPI, mojangErrorDisplayable, MojangErrorCode } = require('helios-core/mojang')
-const { MicrosoftAuth, microsoftErrorDisplayable, MicrosoftErrorCode } = require('helios-core/microsoft')
+const { MojangRestAPI, MojangErrorCode } = require('helios-core/mojang')
+const { MicrosoftAuth, MicrosoftErrorCode } = require('helios-core/microsoft')
 const { AZURE_CLIENT_ID }    = require('./ipcconstants')
+const Lang = require('./langloader')
 
 const log = LoggerUtil.getLogger('AuthManager')
 
+// Error messages
+
+function microsoftErrorDisplayable(errorCode) {
+    switch (errorCode) {
+        case MicrosoftErrorCode.NO_PROFILE:
+            return {
+                title: Lang.queryJS('auth.microsoft.error.noProfileTitle'),
+                desc: Lang.queryJS('auth.microsoft.error.noProfileDesc')
+            }
+        case MicrosoftErrorCode.NO_XBOX_ACCOUNT:
+            return {
+                title: Lang.queryJS('auth.microsoft.error.noXboxAccountTitle'),
+                desc: Lang.queryJS('auth.microsoft.error.noXboxAccountDesc')
+            }
+        case MicrosoftErrorCode.XBL_BANNED:
+            return {
+                title: Lang.queryJS('auth.microsoft.error.xblBannedTitle'),
+                desc: Lang.queryJS('auth.microsoft.error.xblBannedDesc')
+            }
+        case MicrosoftErrorCode.UNDER_18:
+            return {
+                title: Lang.queryJS('auth.microsoft.error.under18Title'),
+                desc: Lang.queryJS('auth.microsoft.error.under18Desc')
+            }
+        case MicrosoftErrorCode.UNKNOWN:
+            return {
+                title: Lang.queryJS('auth.microsoft.error.unknownTitle'),
+                desc: Lang.queryJS('auth.microsoft.error.unknownDesc')
+            }
+    }
+}
+
+function mojangErrorDisplayable(errorCode) {
+    switch(errorCode) {
+        case MojangErrorCode.ERROR_METHOD_NOT_ALLOWED:
+            return {
+                title: Lang.queryJS('auth.mojang.error.methodNotAllowedTitle'),
+                desc: Lang.queryJS('auth.mojang.error.methodNotAllowedDesc')
+            }
+        case MojangErrorCode.ERROR_NOT_FOUND:
+            return {
+                title: Lang.queryJS('auth.mojang.error.notFoundTitle'),
+                desc: Lang.queryJS('auth.mojang.error.notFoundDesc')
+            }
+        case MojangErrorCode.ERROR_USER_MIGRATED:
+            return {
+                title: Lang.queryJS('auth.mojang.error.accountMigratedTitle'),
+                desc: Lang.queryJS('auth.mojang.error.accountMigratedDesc')
+            }
+        case MojangErrorCode.ERROR_INVALID_CREDENTIALS:
+            return {
+                title: Lang.queryJS('auth.mojang.error.invalidCredentialsTitle'),
+                desc: Lang.queryJS('auth.mojang.error.invalidCredentialsDesc')
+            }
+        case MojangErrorCode.ERROR_RATELIMIT:
+            return {
+                title: Lang.queryJS('auth.mojang.error.tooManyAttemptsTitle'),
+                desc: Lang.queryJS('auth.mojang.error.tooManyAttemptsDesc')
+            }
+        case MojangErrorCode.ERROR_INVALID_TOKEN:
+            return {
+                title: Lang.queryJS('auth.mojang.error.invalidTokenTitle'),
+                desc: Lang.queryJS('auth.mojang.error.invalidTokenDesc')
+            }
+        case MojangErrorCode.ERROR_ACCESS_TOKEN_HAS_PROFILE:
+            return {
+                title: Lang.queryJS('auth.mojang.error.tokenHasProfileTitle'),
+                desc: Lang.queryJS('auth.mojang.error.tokenHasProfileDesc')
+            }
+        case MojangErrorCode.ERROR_CREDENTIALS_MISSING:
+            return {
+                title: Lang.queryJS('auth.mojang.error.credentialsMissingTitle'),
+                desc: Lang.queryJS('auth.mojang.error.credentialsMissingDesc')
+            }
+        case MojangErrorCode.ERROR_INVALID_SALT_VERSION:
+            return {
+                title: Lang.queryJS('auth.mojang.error.invalidSaltVersionTitle'),
+                desc: Lang.queryJS('auth.mojang.error.invalidSaltVersionDesc')
+            }
+        case MojangErrorCode.ERROR_UNSUPPORTED_MEDIA_TYPE:
+            return {
+                title: Lang.queryJS('auth.mojang.error.unsupportedMediaTypeTitle'),
+                desc: Lang.queryJS('auth.mojang.error.unsupportedMediaTypeDesc')
+            }
+        case MojangErrorCode.ERROR_GONE:
+            return {
+                title: Lang.queryJS('auth.mojang.error.accountGoneTitle'),
+                desc: Lang.queryJS('auth.mojang.error.accountGoneDesc')
+            }
+        case MojangErrorCode.ERROR_UNREACHABLE:
+            return {
+                title: Lang.queryJS('auth.mojang.error.unreachableTitle'),
+                desc: Lang.queryJS('auth.mojang.error.unreachableDesc')
+            }
+        case MojangErrorCode.ERROR_NOT_PAID:
+            return {
+                title: Lang.queryJS('auth.mojang.error.gameNotPurchasedTitle'),
+                desc: Lang.queryJS('auth.mojang.error.gameNotPurchasedDesc')
+            }
+        case MojangErrorCode.UNKNOWN:
+            return {
+                title: Lang.queryJS('auth.mojang.error.unknownErrorTitle'),
+                desc: Lang.queryJS('auth.mojang.error.unknownErrorDesc')
+            }
+        default:
+            throw new Error(`Unknown error code: ${errorCode}`)
+    }
+}
+
 // Functions
 
 /**

diff --git a/app/assets/js/discordwrapper.js b/app/assets/js/discordwrapper.js
@@ -5,15 +5,17 @@ const logger = LoggerUtil.getLogger('DiscordWrapper')
 
 const { Client } = require('discord-rpc-patch')
 
+const Lang = require('./langloader')
+
 let client
 let activity
 
-exports.initRPC = function(genSettings, servSettings, initialDetails = 'Waiting for Client..'){
+exports.initRPC = function(genSettings, servSettings, initialDetails = Lang.queryJS('discord.waiting')){
     client = new Client({ transport: 'ipc' })
 
     activity = {
         details: initialDetails,
-        state: 'Server: ' + servSettings.shortId,
+        state: Lang.queryJS('discord.state', {shortId: servSettings.shortId}),
         largeImageKey: servSettings.largeImageKey,
         largeImageText: servSettings.largeImageText,
         smallImageKey: genSettings.smallImageKey,

diff --git a/app/assets/js/langloader.js b/app/assets/js/langloader.js
@@ -1,21 +1,43 @@
 const fs = require('fs-extra')
 const path = require('path')
+const toml = require('toml')
+const merge = require('lodash.merge')
 
 let lang
 
 exports.loadLanguage = function(id){
-    lang = JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'lang', `${id}.json`))) || {}
+    lang = merge(lang || {}, toml.parse(fs.readFileSync(path.join(__dirname, '..', 'lang', `${id}.toml`))) || {})
 }
 
-exports.query = function(id){
+exports.query = function(id, placeHolders){
     let query = id.split('.')
     let res = lang
     for(let q of query){
         res = res[q]
     }
-    return res === lang ? {} : res
+    let text = res === lang ? '' : res
+    if (placeHolders) {
+        Object.entries(placeHolders).forEach(([key, value]) => {
+            text = text.replace(`{${key}}`, value)
+        })
+    }
+    return text
+}
+
+exports.queryJS = function(id, placeHolders){
+    return exports.query(`js.${id}`, placeHolders)
 }
 
-exports.queryJS = function(id){
-    return exports.query(`js.${id}`)
+exports.queryEJS = function(id, placeHolders){
+    return exports.query(`ejs.${id}`, placeHolders)
+}
+
+exports.setupLanguage = function(){
+    // Load Language Files
+    exports.loadLanguage('en_US')
+    // Uncomment this when translations are ready
+    //exports.loadLanguage('xx_XX')
+
+    // Load Custom Language File for Launcher Customizer
+    exports.loadLanguage('_custom')
 }
diff --git a/app/assets/js/preloader.js b/app/assets/js/preloader.js
@@ -23,7 +23,7 @@ DistroAPI['commonDir'] = ConfigManager.getCommonDirectory()
 DistroAPI['instanceDir'] = ConfigManager.getInstanceDirectory()
 
 // Load Strings
-LangLoader.loadLanguage('en_US')
+LangLoader.setupLanguage()
 
 /**
  *
-Original file line number
+Diff line change
@@ Expand Up @@
     **System Requirements**
-    * [Node.js][nodejs] v18
+    * [Node.js][nodejs] v20
     ---
@@ Expand Down @@