2.0.0-rc.1

Update distro.md.
dependency upgrade.
2024-12-22 11:42:14 -08:00 · 2023-03-19 22:46:19 -04:00 · 2023-03-19 22:31:42 -04:00 · 2023-03-19 22:13:44 -04:00 · 2023-03-19 19:34:35 -04:00
4 changed files with 271 additions and 150 deletions
--- a/app/assets/js/scripts/landing.js
+++ b/app/assets/js/scripts/landing.js
@ -103,24 +103,29 @@ function setLaunchEnabled(val){
 // Bind launch button
 document.getElementById('launch_button').addEventListener('click', async e => {
    loggerLanding.info('Launching game..')
-    const server = (await DistroAPI.getDistribution()).getServerById(ConfigManager.getSelectedServer())
-    const mcVersion = server.rawServer.minecraftVersion
-    const jExe = ConfigManager.getJavaExecutable(ConfigManager.getSelectedServer())
-    if(jExe == null){
-        await asyncSystemScan(server.effectiveJavaOptions)
-    } else {
-
-        setLaunchDetails(Lang.queryJS('landing.launch.pleaseWait'))
-        toggleLaunchArea(true)
-        setLaunchPercentage(0, 100)
-
-        const details = await validateSelectedJvm(ensureJavaDirIsRoot(jExe), server.effectiveJavaOptions.supported)
-        if(details != null){
-            loggerLanding.info('Jvm Details', details)
-            await dlAsync()
-        } else {
+    try {
+        const server = (await DistroAPI.getDistribution()).getServerById(ConfigManager.getSelectedServer())
+        const jExe = ConfigManager.getJavaExecutable(ConfigManager.getSelectedServer())
+        if(jExe == null){
            await asyncSystemScan(server.effectiveJavaOptions)
+        } else {
+
+            setLaunchDetails(Lang.queryJS('landing.launch.pleaseWait'))
+            toggleLaunchArea(true)
+            setLaunchPercentage(0, 100)
+
+            const details = await validateSelectedJvm(ensureJavaDirIsRoot(jExe), server.effectiveJavaOptions.supported)
+            if(details != null){
+                loggerLanding.info('Jvm Details', details)
+                await dlAsync()
+
+            } else {
+                await asyncSystemScan(server.effectiveJavaOptions)
+            }
        }
+    } catch(err) {
+        loggerLanding.error('Unhandled error in during launch process.', err)
+        showLaunchFailure('Error During Launch', 'See console (CTRL + Shift + i) for more details.')
    }
 })

@ -319,9 +324,14 @@ async function asyncSystemScan(effectiveJavaOptions, launchAfter = true){
        )
        setOverlayHandler(() => {
            setLaunchDetails('Preparing Java Download..')
-            
-            downloadJava(effectiveJavaOptions, launchAfter)
            toggleOverlay(false)
+            
+            try {
+                downloadJava(effectiveJavaOptions, launchAfter)
+            } catch(err) {
+                loggerLanding.error('Unhandled error in Java Download', err)
+                showLaunchFailure('Error During Java Download', 'See console (CTRL + Shift + i) for more details.')
+            }
        })
        setDismissHandler(() => {
            $('#overlayContent').fadeOut(250, () => {
@ -374,6 +384,10 @@ async function downloadJava(effectiveJavaOptions, launchAfter = true) {
        ConfigManager.getDataDirectory(),
        effectiveJavaOptions.distribution)

+    if(asset == null) {
+        throw new Error('Failed to find OpenJDK distribution.')
+    }
+
    let received = 0
    await downloadFile(asset.url, asset.path, ({ transferred }) => {
        received = transferred
@ -385,9 +399,8 @@ async function downloadJava(effectiveJavaOptions, launchAfter = true) {
        loggerLanding.warn(`Java Download: Expected ${asset.size} bytes but received ${received}`)
        if(!await validateLocalFile(asset.path, asset.algo, asset.hash)) {
            log.error(`Hashes do not match, ${asset.id} may be corrupted.`)
-
-            // TODO Make error handling graceful.
-            throw new Error('JDK download had problems')
+            // Don't know how this could happen, but report it.
+            throw new Error('Downloaded JDK has bad hash, file may be corrupted.')
        }
    }

@ -492,18 +505,32 @@ async function dlAsync(login = true) {

    loggerLaunchSuite.info('Validating files.')
    setLaunchDetails('Validating file integrity..')
-    const invalidFileCount = await fullRepairModule.verifyFiles(percent => {
-        setLaunchPercentage(percent)
-    })
-    setLaunchPercentage(100)
+    let invalidFileCount = 0
+    try {
+        invalidFileCount = await fullRepairModule.verifyFiles(percent => {
+            setLaunchPercentage(percent)
+        })
+        setLaunchPercentage(100)
+    } catch (err) {
+        loggerLaunchSuite.error('Error during file validation.')
+        showLaunchFailure('Error During File Verification', err.displayable || 'See console (CTRL + Shift + i) for more details.')
+        return
+    }
+    

    if(invalidFileCount > 0) {
        loggerLaunchSuite.info('Downloading files.')
        setLaunchDetails('Downloading files..')
-        await fullRepairModule.download(percent => {
-            setDownloadPercentage(percent)
-        })
-        setDownloadPercentage(100)
+        try {
+            await fullRepairModule.download(percent => {
+                setDownloadPercentage(percent)
+            })
+            setDownloadPercentage(100)
+        } catch(err) {
+            loggerLaunchSuite.error('Error during file download.')
+            showLaunchFailure('Error During File Download', err.displayable || 'See console (CTRL + Shift + i) for more details.')
+            return
+        }
    } else {
        loggerLaunchSuite.info('No invalid files, skipping download.')
    }
--- a/docs/distro.md
+++ b/docs/distro.md
@ -2,6 +2,8 @@

 You can use [Nebula](https://github.com/dscalzi/Nebula) to automate the generation of a distribution index.

+The most up to date and accurate descriptions of the distribution spec can be viewed in [helios-distribution-types](https://github.com/dscalzi/helios-distribution-types).
+
 The distribution index is written in JSON. The general format of the index is as posted below.

 ```json
@ -143,12 +145,122 @@ Only one server in the array should have the `mainServer` property enabled. This

 Whether or not the server can be autoconnected to. If false, the server will not be autoconnected to even when the user has the autoconnect setting enabled.

+### `Server.javaOptions: JavaOptions`
+
+**OPTIONAL**
+
+Sever-specific Java options. If not provided, defaults are used by the client.
+
 ### `Server.modules: Module[]`

 An array of module objects.

 ---

+## JavaOptions Object
+
+Server-specific Java options.
+
+#### Example
+```JSON
+{
+    "supported": ">=17",
+    "suggestedMajor": 17,
+    "platformOptions": [
+      {
+        "platform": "darwin",
+        "architecture": "arm64",
+        "distribution": "CORRETTO"
+      }
+    ],
+    "ram": {
+      "recommended": 3072,
+      "minimum": 2048
+    }
+}
+```
+
+### `JavaOptions.platformOptions: JavaPlatformOptions[]`
+
+**OPTIONAL**
+
+Platform-specific java rules for this server configuration. Validation rules will be delegated to the client for any undefined properties. Java validation can be configured for specific platforms and architectures. The most specific ruleset will be applied.
+
+Maxtrix Precedence (Highest - Lowest)
+  - Current platform, current architecture (ex. win32 x64).
+  - Current platform, any architecture (ex. win32).
+  - Java Options base properties.
+  - Client logic (default logic in the client).
+
+Properties:
+
+  - `platformOptions.platform: string` - The platform that this validation matrix applies to.
+  - `platformOptions.architecture: string` - Optional. The architecture that this validation matrix applies to. If omitted, applies to all architectures.
+  - `platformOptions.distribution: string` - Optional. See `JavaOptions.distribution`.
+  - `platformOptions.supported: string` - Optional. See `JavaOptions.supported`.
+  - `platformOptions.suggestedMajor: number` - Optional. See `JavaOptions.suggestedMajor`.
+
+### `JavaOptions.ram: object`
+
+**OPTIONAL**
+
+This allows you to require a minimum and recommended amount of RAM per server instance. The minimum is the smallest value the user can select in the settings slider. The recommended value will be the default value selected for that server. These values are specified in megabytes and must be an interval of 512. This allows configuration in intervals of half gigabytes. In the above example, the recommended ram value is 3 GB (3072 MB) and the minimum is 2 GB (2048 MB).
+
+  - `ram.recommended: number` - The recommended amount of RAM in megabytes. Must be an interval of 512.
+  - `ram.minimum: number` - The absolute minimum amount of RAM in megabytes. Must be an interval of 512.
+
+### `JavaOptions.distribution: string`
+
+**OPTIONAL**
+
+Preferred JDK distribution to download if no applicable installation could be found. If omitted, the client will decide (decision may be platform-specific).
+
+### `JavaOptions.supported: string`
+
+**OPTIONAL**
+
+A semver range of supported JDK versions.
+
+Java version syntax is platform dependent.
+
+JDK 8 and prior
+```
+1.{major}.{minor}_{patch}-b{build}
+Ex. 1.8.0_152-b16
+```
+
+JDK 9+
+```
+{major}.{minor}.{patch}+{build}
+Ex. 11.0.12+7
+```
+
+For processing, all versions will be translated into a semver compliant string. JDK 9+ is already semver. For versions 8 and below, `1.{major}.{minor}_{patch}-b{build}` will be translated to `{major}.{minor}.{patch}+{build}`.
+
+If specified, you must also specify suggestedMajor.
+
+If omitted, the client will decide based on the game version.
+
+### `JavaOptions.suggestedMajor: number`
+
+**OPTIONAL**
+
+The suggested major Java version. The suggested major should comply with the version range specified by supported, if defined. This will be used in messages displayed to the end user, and to automatically fetch a Java version.
+
+NOTE If supported is specified, suggestedMajor must be set. The launcher's default value may not comply with your custom major supported range.
+
+Common use case:
+  - supported: '>=17.x'
+  - suggestedMajor: 17
+
+More involved:
+  - supported: '>=16 <20'
+  - suggestedMajor: 17
+
+Given a wider support range, it becomes necessary to specify which major version in the range is the suggested.
+
+---
+
 ## Module Object

 A module is a generic representation of a file required to run the minecraft client.
--- a/package-lock.json
+++ b/package-lock.json
@ -1,33 +1,33 @@
 {
  "name": "helioslauncher",
-  "version": "1.9.0",
+  "version": "2.0.0-rc.1",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "helioslauncher",
-      "version": "1.9.0",
+      "version": "2.0.0-rc.1",
      "license": "UNLICENSED",
      "dependencies": {
        "@electron/remote": "^2.0.8",
        "adm-zip": "^0.5.9",
        "async": "^3.2.4",
        "discord-rpc-patch": "^4.0.1",
-        "ejs": "^3.1.8",
+        "ejs": "^3.1.9",
        "ejs-electron": "^2.1.1",
        "electron-updater": "^5.3.0",
        "fs-extra": "^11.1.0",
        "github-syntax-dark": "^0.5.0",
        "got": "^11.8.5",
-        "helios-core": "~0.2.0-pre.2",
-        "helios-distribution-types": "^1.2.0-pre.1",
-        "jquery": "^3.6.1",
+        "helios-core": "~2.0.0-rc.1",
+        "helios-distribution-types": "^1.2.0",
+        "jquery": "^3.6.4",
        "semver": "^7.3.8"
      },
      "devDependencies": {
-        "electron": "^23.0.0",
+        "electron": "^23.1.4",
        "electron-builder": "^23.6.0",
-        "eslint": "^8.34.0"
+        "eslint": "^8.36.0"
      },
      "engines": {
        "node": "18.x.x"
@ -166,15 +166,39 @@
        "node": ">=10"
      }
    },
+    "node_modules/@eslint-community/eslint-utils": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.3.0.tgz",
+      "integrity": "sha512-v3oplH6FYCULtFuCeqyuTd9D2WKO937Dxdq+GmHOLL72TTRriLxz2VLlNfkZRsvj6PKnOPAtuT6dwrs/pA5DvA==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+      }
+    },
+    "node_modules/@eslint-community/regexpp": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.4.0.tgz",
+      "integrity": "sha512-A9983Q0LnDGdLPjxyXQ00sbV+K+O+ko2Dr+CZigbHWtX9pNfxlaBkMR8X1CztI73zuEyEBXTVjx7CE+/VSwDiQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+      }
+    },
    "node_modules/@eslint/eslintrc": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz",
-      "integrity": "sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.1.tgz",
+      "integrity": "sha512-eFRmABvW2E5Ho6f5fHLqgena46rOj7r7OKHYfLElqcBfGFHHpjBhivyi5+jOEQuSpdc/1phIZJlbC2te+tZNIw==",
      "dev": true,
      "dependencies": {
        "ajv": "^6.12.4",
        "debug": "^4.3.2",
-        "espree": "^9.4.0",
+        "espree": "^9.5.0",
        "globals": "^13.19.0",
        "ignore": "^5.2.0",
        "import-fresh": "^3.2.1",
@ -189,6 +213,15 @@
        "url": "https://opencollective.com/eslint"
      }
    },
+    "node_modules/@eslint/js": {
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.36.0.tgz",
+      "integrity": "sha512-lxJ9R5ygVm8ZWgYdUweoq5ownDlJ4upvoWmO4eLxBYHdMo+vZ/Rx0EN6MbKWDJOSUGrqJy2Gt+Dyv/VKml0fjg==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
    "node_modules/@humanwhocodes/config-array": {
      "version": "0.11.8",
      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
@ -407,9 +440,9 @@
      "dev": true
    },
    "node_modules/@types/node": {
-      "version": "16.18.12",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.12.tgz",
-      "integrity": "sha512-vzLe5NaNMjIE3mcddFVGlAXN1LEWueUsMsOJWaT6wWMJGyljHAWHznqfnKUQWGzu7TLPrGvWdNAsvQYW+C0xtw=="
+      "version": "16.18.16",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.16.tgz",
+      "integrity": "sha512-ZOzvDRWp8dCVBmgnkIqYCArgdFOO9YzocZp8Ra25N/RStKiWvMOXHMz+GjSeVNe5TstaTmTWPucGJkDw0XXJWA=="
    },
    "node_modules/@types/plist": {
      "version": "3.0.2",
@ -1353,9 +1386,9 @@
      "dev": true
    },
    "node_modules/ejs": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.8.tgz",
-      "integrity": "sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==",
+      "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz",
+      "integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==",
      "dependencies": {
        "jake": "^10.8.5"
      },
@ -1376,9 +1409,9 @@
      }
    },
    "node_modules/electron": {
-      "version": "23.0.0",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-23.0.0.tgz",
-      "integrity": "sha512-S6hVtTAjauMiiWP9sBVR5RpcUC464cNZ06I2EMUjeZBq+KooS6tLmNsfw0zLpAXDp1qosjlBP3v71NTZ3gd9iA==",
+      "version": "23.1.4",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-23.1.4.tgz",
+      "integrity": "sha512-3Z6CpAPdhv6haYX9DTO7k0l6uAUreZM3/EngQYqGN3Gz7Fp0DPb/egt8BwR3ClG/jTlQM+PQ+5WkTK0eMjm07A==",
      "hasInstallScript": true,
      "dependencies": {
        "@electron/get": "^2.0.0",
@ -1595,12 +1628,15 @@
      }
    },
    "node_modules/eslint": {
-      "version": "8.34.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.34.0.tgz",
-      "integrity": "sha512-1Z8iFsucw+7kSqXNZVslXS8Ioa4u2KM7GPwuKtkTFAqZ/cHMcEaR+1+Br0wLlot49cNxIiZk5wp8EAbPcYZxTg==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.36.0.tgz",
+      "integrity": "sha512-Y956lmS7vDqomxlaaQAHVmeb4tNMp2FWIvU/RnU5BD3IKMD/MJPr76xdyr68P8tV1iNMvN2mRK0yy3c+UjL+bw==",
      "dev": true,
      "dependencies": {
-        "@eslint/eslintrc": "^1.4.1",
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.4.0",
+        "@eslint/eslintrc": "^2.0.1",
+        "@eslint/js": "8.36.0",
        "@humanwhocodes/config-array": "^0.11.8",
        "@humanwhocodes/module-importer": "^1.0.1",
        "@nodelib/fs.walk": "^1.2.8",
@ -1611,10 +1647,9 @@
        "doctrine": "^3.0.0",
        "escape-string-regexp": "^4.0.0",
        "eslint-scope": "^7.1.1",
-        "eslint-utils": "^3.0.0",
        "eslint-visitor-keys": "^3.3.0",
-        "espree": "^9.4.0",
-        "esquery": "^1.4.0",
+        "espree": "^9.5.0",
+        "esquery": "^1.4.2",
        "esutils": "^2.0.2",
        "fast-deep-equal": "^3.1.3",
        "file-entry-cache": "^6.0.1",
@ -1635,7 +1670,6 @@
        "minimatch": "^3.1.2",
        "natural-compare": "^1.4.0",
        "optionator": "^0.9.1",
-        "regexpp": "^3.2.0",
        "strip-ansi": "^6.0.1",
        "strip-json-comments": "^3.1.0",
        "text-table": "^0.2.0"
@ -1663,33 +1697,6 @@
        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
      }
    },
-    "node_modules/eslint-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-      "dev": true,
-      "dependencies": {
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "engines": {
-        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      },
-      "peerDependencies": {
-        "eslint": ">=5"
-      }
-    },
-    "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
    "node_modules/eslint-visitor-keys": {
      "version": "3.3.0",
      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
@ -1700,9 +1707,9 @@
      }
    },
    "node_modules/espree": {
-      "version": "9.4.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz",
-      "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==",
+      "version": "9.5.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.0.tgz",
+      "integrity": "sha512-JPbJGhKc47++oo4JkEoTe2wjy4fmMwvFpgJT9cQzmfXKp22Dr6Hf1tdCteLz1h0P3t+mGvWZ+4Uankvh8+c6zw==",
      "dev": true,
      "dependencies": {
        "acorn": "^8.8.0",
@ -1717,9 +1724,9 @@
      }
    },
    "node_modules/esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
      "dev": true,
      "dependencies": {
        "estraverse": "^5.1.0"
@ -1778,9 +1785,9 @@
      }
    },
    "node_modules/extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz",
+      "integrity": "sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==",
      "dev": true,
      "engines": [
        "node >=0.6.0"
@ -2119,9 +2126,9 @@
      }
    },
    "node_modules/graceful-fs": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
    },
    "node_modules/graceful-readlink": {
      "version": "1.0.1",
@ -2180,14 +2187,14 @@
      }
    },
    "node_modules/helios-core": {
-      "version": "0.2.0-pre.2",
-      "resolved": "https://registry.npmjs.org/helios-core/-/helios-core-0.2.0-pre.2.tgz",
-      "integrity": "sha512-rS9xa2CfQBa+2uINOhIYFSR/nDZQJp8DJrbHXxKFSRckGvdPWwandEwwFoN+bwm3bPSdVhCe2xiSESbMK86UOA==",
+      "version": "2.0.0-rc.1",
+      "resolved": "https://registry.npmjs.org/helios-core/-/helios-core-2.0.0-rc.1.tgz",
+      "integrity": "sha512-vl+UI5mqV1yr61T8uwglGQewjK425kPq1Yc99UtTH8nM0ZVHYn2TbwUUq+fKaZcjZ70GSp7fI/+UMrzxc7pGEA==",
      "dependencies": {
        "fastq": "^1.15.0",
-        "fs-extra": "^10.1.0",
-        "got": "^11.8.5",
-        "luxon": "^3.1.0",
+        "fs-extra": "^11.1.0",
+        "got": "^11.8.6",
+        "luxon": "^3.3.0",
        "node-disk-info": "^1.3.0",
        "node-stream-zip": "^1.15.0",
        "semver": "^7.3.8",
@ -2197,23 +2204,10 @@
        "winston": "^3.8.2"
      }
    },
-    "node_modules/helios-core/node_modules/fs-extra": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
    "node_modules/helios-distribution-types": {
-      "version": "1.2.0-pre.1",
-      "resolved": "https://registry.npmjs.org/helios-distribution-types/-/helios-distribution-types-1.2.0-pre.1.tgz",
-      "integrity": "sha512-UyjXWqvX/N7lsZ42RpBLLiEm1VLlN8UNudwW3UQWYPdATEfDKy8tCS857l4pHPCbC73ASqpLDK9S0HUdWbqFDQ=="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/helios-distribution-types/-/helios-distribution-types-1.2.0.tgz",
+      "integrity": "sha512-C8mRJGK0zAc7rRnA06Sj0LYwVqhY445UYNTmXU876AmfBirRR2F+A3LsD3osdgTxRMzrgkxBXvYZ0QbYW6j+6Q=="
    },
    "node_modules/hosted-git-info": {
      "version": "4.1.0",
@ -2470,9 +2464,9 @@
      }
    },
    "node_modules/jquery": {
-      "version": "3.6.3",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.3.tgz",
-      "integrity": "sha512-bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg=="
+      "version": "3.6.4",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.4.tgz",
+      "integrity": "sha512-v28EW9DWDFpzcD9O5iyJXg3R3+q+mET5JhnjJzQUZMHOv67bpSIHq81GEYpPNZHG+XXHsfSme3nxp/hndKEcsQ=="
    },
    "node_modules/js-sdsl": {
      "version": "4.3.0",
@ -2722,9 +2716,9 @@
      }
    },
    "node_modules/minipass": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.0.3.tgz",
-      "integrity": "sha512-OW2r4sQ0sI+z5ckEt5c1Tri4xTgZwYDxpE54eqWlQloQRoWtXjqt9udJ5Z4dSv7wK+nfFI7FRXyCpBSft+gpFw==",
+      "version": "4.2.5",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.5.tgz",
+      "integrity": "sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q==",
      "dev": true,
      "engines": {
        "node": ">=8"
@ -3075,18 +3069,6 @@
        "node": ">= 6"
      }
    },
-    "node_modules/regexpp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      }
-    },
    "node_modules/require-directory": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@ -3214,9 +3196,9 @@
      ]
    },
    "node_modules/safe-stable-stringify": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.2.tgz",
-      "integrity": "sha512-gMxvPJYhP0O9n2pvcfYfIuYgbledAOJFcqRThtPRmjscaipiwcwPPKLytpVzMkG2HAN87Qmo2d4PtGiri1dSLA==",
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz",
+      "integrity": "sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==",
      "engines": {
        "node": ">=10"
      }
@ -3820,9 +3802,9 @@
      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
    },
    "node_modules/yargs": {
-      "version": "17.6.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz",
-      "integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==",
+      "version": "17.7.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
+      "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
      "dev": true,
      "dependencies": {
        "cliui": "^8.0.1",
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "helioslauncher",
-  "version": "1.9.0",
+  "version": "2.0.0-rc.1",
  "productName": "Helios Launcher",
  "description": "Modded Minecraft Launcher",
  "author": "Daniel Scalzi (https://github.com/dscalzi/)",
@ -27,21 +27,21 @@
    "adm-zip": "^0.5.9",
    "async": "^3.2.4",
    "discord-rpc-patch": "^4.0.1",
-    "ejs": "^3.1.8",
+    "ejs": "^3.1.9",
    "ejs-electron": "^2.1.1",
    "electron-updater": "^5.3.0",
    "fs-extra": "^11.1.0",
    "github-syntax-dark": "^0.5.0",
    "got": "^11.8.5",
-    "helios-core": "~0.2.0-pre.2",
-    "helios-distribution-types": "^1.2.0-pre.1",
-    "jquery": "^3.6.1",
+    "helios-core": "~2.0.0-rc.1",
+    "helios-distribution-types": "^1.2.0",
+    "jquery": "^3.6.4",
    "semver": "^7.3.8"
  },
  "devDependencies": {
-    "electron": "^23.0.0",
+    "electron": "^23.1.4",
    "electron-builder": "^23.6.0",
-    "eslint": "^8.34.0"
+    "eslint": "^8.36.0"
  },
  "repository": {
    "type": "git",
Author	SHA1	Message	Date
Daniel Scalzi	2f27cdbaf4	2.0.0-rc.1	2023-03-19 22:46:19 -04:00
Daniel Scalzi	c9aeb0e0aa	Update distro.md.	2023-03-19 22:31:42 -04:00
Daniel Scalzi	2abe214005	dependency upgrade.	2023-03-19 22:13:44 -04:00
Daniel Scalzi	e639061fa8	Hopefully catch all errors during launch process.	2023-03-19 19:34:35 -04:00