2.0.2 - Make version parse regex more lenient.

Author: dscalzi

lib/java/JavaGuard.ts

@@ -719,7 +719,7 @@ export function parseJavaRuntimeVersion(verString: string): JavaVersion {
 export function  parseJavaRuntimeVersionLegacy(verString: string): JavaVersion {
     // 1.{major}.0_{update}-b{build}
     // ex. 1.8.0_152-b16
-    const regex = /^1.(\d+).(\d+)_(\d+)(?:-b(\d+))?$/
+    const regex = /1.(\d+).(\d+)_(\d+)(?:-b(\d+))?/
     const match = regex.exec(verString)!
 
     if(match == null) {
@@ -744,7 +744,7 @@ export function  parseJavaRuntimeVersionLegacy(verString: string): JavaVersion {
 export function  parseJavaRuntimeVersionSemver(verString: string): JavaVersion {
     // {major}.{minor}.{patch}+{build}
     // ex. 10.0.2+13 or 10.0.2.13
-    const regex = /^(\d+)\.(\d+).(\d+)(?:[+.](\d+))?$/
+    const regex = /(\d+)\.(\d+).(\d+)(?:[+.](\d+))?/
     const match = regex.exec(verString)!
 
     if(match == null) {

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "helios-core",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "A library containing core mechanisms for Helios Launcher",
   "main": "dist/index.js",
   "scripts": {
@@ -63,16 +63,16 @@
     "@types/fs-extra": "^11.0.1",
     "@types/luxon": "^3.2.0",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^18.15.7",
+    "@types/node": "^18.15.11",
     "@types/tar-fs": "^2.0.1",
     "@types/triple-beam": "^1.3.2",
     "@types/winreg": "^1.2.31",
-    "@typescript-eslint/eslint-plugin": "^5.56.0",
-    "@typescript-eslint/parser": "^5.56.0",
+    "@typescript-eslint/eslint-plugin": "^5.57.0",
+    "@typescript-eslint/parser": "^5.57.0",
     "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
     "cross-env": "^7.0.3",
-    "eslint": "^8.36.0",
+    "eslint": "^8.37.0",
     "helios-distribution-types": "^1.2.0",
     "mocha": "^10.2.0",
     "nock": "^13.3.0",

package.json

@@ -94,7 +94,8 @@ describe('JavaGuard', () => {
             ['1.8.0_351', { major: 8, minor: 0, patch: 351, build: undefined }],
             ['1.8.0_351-b10', { major: 8, minor: 0, patch: 351, build: 10 }],
             ['17.0.5', { major: 17, minor: 0, patch: 5, build: undefined }],
-            ['17.0.5.8', { major: 17, minor: 0, patch: 5, build: 8 }]
+            ['17.0.5.8', { major: 17, minor: 0, patch: 5, build: 8 }],
+            ['17.0.6+9-LTS-190', { major: 17, minor: 0, patch: 6, build: 9 }]
         ]
 
         for(const [test, res] of testMatrix) {