commit

__tests__/distributors/jetbrains-installer.test.ts

@@ -41,7 +41,9 @@ describe('getAvailableVersions', () => {
     expect(availableVersions).not.toBeNull();
 
     const length =
-      os.platform() === 'win32' ? manifestData.length : manifestData.length + 2;
+      os.platform() === 'win32'
+        ? manifestData.length - 1
+        : manifestData.length + 1;
     expect(availableVersions.length).toBe(length);
   }, 10_000);
 });

dist/setup/index.js

@@ -128806,20 +128806,16 @@ class JavaBase {
                     }
                 }
                 catch (error) {
-                    if (error instanceof tc.HTTPError) {
-                        if (error.httpStatusCode === 403) {
-                            core.error('HTTP 403: Permission denied or access restricted.');
-                        }
-                        else if (error.httpStatusCode === 429) {
-                            core.warning('HTTP 429: Rate limit exceeded. Please retry later.');
-                        }
-                        else {
-                            core.error(`HTTP ${error.httpStatusCode}: ${error.message}`);
-                        }
+                    if (error instanceof tc.HTTPError && error.httpStatusCode === 403) {
+                        core.error(`Received HTTP 403: Permission denied or restricted access.`);
+                    }
+                    else if (error instanceof tc.HTTPError &&
+                        error.httpStatusCode === 429) {
+                        core.warning(`Received HTTP 429: Rate limit exceeded. Try again later.`);
                     }
                     else {
                         const message = error instanceof Error ? error.message : JSON.stringify(error);
-                        core.error(`Java setup failed due to network issue or timeout: ${message}`);
+                        core.error(`Failed to set up Java due to a network issue or timeout: ${message}`);
                     }
                     if (error instanceof Error && error.stack) {
                         core.debug(error.stack);
@@ -129695,12 +129691,7 @@ class JetBrainsDistribution extends base_installer_1.JavaBase {
                     // url is identical except page_index so print it once for debug
                     core.debug(`Gathering available versions from '${rawUrl}'`);
                 }
-                const paginationPageResult = (yield this.http.getJson(rawUrl, requestHeaders)).result;
-                if (!paginationPageResult || paginationPageResult.length === 0) {
-                    // break infinity loop because we have reached end of pagination
-                    break;
-                }
-                const paginationPage = paginationPageResult.filter(version => this.stable ? !version.prerelease : version.prerelease);
+                const paginationPage = (yield this.http.getJson(rawUrl, requestHeaders)).result;
                 if (!paginationPage || paginationPage.length === 0) {
                     // break infinity loop because we have reached end of pagination
                     break;
@@ -129708,11 +129699,9 @@ class JetBrainsDistribution extends base_installer_1.JavaBase {
                 rawVersions.push(...paginationPage);
                 page_index++;
             }
-            if (this.stable) {
-                // Add versions not available from the API but are downloadable
-                const hidden = ['11_0_10b1145.115', '11_0_11b1341.60'];
-                rawVersions.push(...hidden.map(tag => ({ tag_name: tag, name: tag, prerelease: false })));
-            }
+            // Add versions not available from the API but are downloadable
+            const hidden = ['11_0_10b1145.115', '11_0_11b1341.60'];
+            rawVersions.push(...hidden.map(tag => ({ tag_name: tag, name: tag })));
             const versions0 = rawVersions.map((v) => __awaiter(this, void 0, void 0, function* () {
                 var _a;
                 // Release tags look like one of these:
@@ -129731,7 +129720,7 @@ class JetBrainsDistribution extends base_installer_1.JavaBase {
                     .replace('-', '');
                 const vsplit = vstring.split('b');
                 let semver = vsplit[0];
-                const build = vsplit[1];
+                const build = +vsplit[1];
                 // Normalize semver
                 if (!semver.includes('.') && !semver.includes('_'))
                     semver = `${semver}.0.0`;

package-lock.json

@@ -21,7 +21,7 @@
       },
       "devDependencies": {
         "@types/jest": "^29.5.14",
-        "@types/node": "^24.0.10",
+        "@types/node": "^20.11.24",
         "@types/semver": "^7.5.8",
         "@typescript-eslint/eslint-plugin": "^5.54.0",
         "@typescript-eslint/parser": "^5.54.0",
@@ -1645,11 +1645,11 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "24.0.10",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.0.10.tgz",
-      "integrity": "sha512-ENHwaH+JIRTDIEEbDK6QSQntAYGtbvdDXnMXnZaZ6k13Du1dPMmprkEHIL7ok2Wl2aZevetwTAb5S+7yIF+enA==",
+      "version": "20.11.24",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
+      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
       "dependencies": {
-        "undici-types": "~7.8.0"
+        "undici-types": "~5.26.4"
       }
     },
     "node_modules/@types/node-fetch": {
@@ -5347,9 +5347,9 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "7.8.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.8.0.tgz",
-      "integrity": "sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw=="
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
     },
     "node_modules/update-browserslist-db": {
       "version": "1.0.13",

package.json

@@ -38,7 +38,7 @@
   },
   "devDependencies": {
     "@types/jest": "^29.5.14",
-    "@types/node": "^24.0.10",
+    "@types/node": "^20.11.24",
     "@types/semver": "^7.5.8",
     "@typescript-eslint/eslint-plugin": "^5.54.0",
     "@typescript-eslint/parser": "^5.54.0",

src/distributions/base-installer.ts

@@ -62,24 +62,28 @@ export abstract class JavaBase {
           core.info(`Java ${foundJava.version} was downloaded`);
         }
       } catch (error: any) {
-        if (error instanceof tc.HTTPError) {
-          if (error.httpStatusCode === 403) {
-            core.error('HTTP 403: Permission denied or access restricted.');
-          } else if (error.httpStatusCode === 429) {
-            core.warning('HTTP 429: Rate limit exceeded. Please retry later.');
-          } else {
-            core.error(`HTTP ${error.httpStatusCode}: ${error.message}`);
-          }
+        if (error instanceof tc.HTTPError && error.httpStatusCode === 403) {
+          core.error(
+            `Received HTTP 403: Permission denied or restricted access.`
+          );
+        } else if (
+          error instanceof tc.HTTPError &&
+          error.httpStatusCode === 429
+        ) {
+          core.warning(
+            `Received HTTP 429: Rate limit exceeded. Try again later.`
+          );
         } else {
           const message =
             error instanceof Error ? error.message : JSON.stringify(error);
           core.error(
-            `Java setup failed due to network issue or timeout: ${message}`
+            `Failed to set up Java due to a network issue or timeout: ${message}`
           );
         }
         if (error instanceof Error && error.stack) {
           core.debug(error.stack);
         }
+
         throw error;
       }
     }

src/distributions/jetbrains/installer.ts

@@ -113,18 +113,9 @@ export class JetBrainsDistribution extends JavaBase {
         core.debug(`Gathering available versions from '${rawUrl}'`);
       }
 
-      const paginationPageResult = (
+      const paginationPage = (
         await this.http.getJson<IJetBrainsRawVersion[]>(rawUrl, requestHeaders)
       ).result;
-      if (!paginationPageResult || paginationPageResult.length === 0) {
-        // break infinity loop because we have reached end of pagination
-        break;
-      }
-
-      const paginationPage: IJetBrainsRawVersion[] =
-        paginationPageResult.filter(version =>
-          this.stable ? !version.prerelease : version.prerelease
-        );
       if (!paginationPage || paginationPage.length === 0) {
         // break infinity loop because we have reached end of pagination
         break;
@@ -134,13 +125,9 @@ export class JetBrainsDistribution extends JavaBase {
       page_index++;
     }
 
-    if (this.stable) {
-      // Add versions not available from the API but are downloadable
-      const hidden = ['11_0_10b1145.115', '11_0_11b1341.60'];
-      rawVersions.push(
-        ...hidden.map(tag => ({tag_name: tag, name: tag, prerelease: false}))
-      );
-    }
+    // Add versions not available from the API but are downloadable
+    const hidden = ['11_0_10b1145.115', '11_0_11b1341.60'];
+    rawVersions.push(...hidden.map(tag => ({tag_name: tag, name: tag})));
 
     const versions0 = rawVersions.map(async v => {
       // Release tags look like one of these:
@@ -161,7 +148,7 @@ export class JetBrainsDistribution extends JavaBase {
 
       const vsplit = vstring.split('b');
       let semver = vsplit[0];
-      const build = vsplit[1];
+      const build = +vsplit[1];
 
       // Normalize semver
       if (!semver.includes('.') && !semver.includes('_'))

src/distributions/jetbrains/models.ts

@@ -3,12 +3,11 @@
 export interface IJetBrainsRawVersion {
   tag_name: string;
   name: string;
-  prerelease: boolean;
 }
 
 export interface IJetBrainsVersion {
   tag_name: string;
   semver: string;
-  build: string;
+  build: number;
   url: string;
 }