Fix download tool4d

Author: guillaume-kotulski

editor/src/apiManager.ts

@@ -14,9 +14,10 @@ export function requestLabelVersion(url: string, channel: string): Promise<Label
         return new Promise((resolve, reject) => {
             const request = proto.get(url, {timeout:120}, response => {
                 if (response.statusCode === 302 || response.statusCode === 200) {
-                    const regex = /_(([0-9]{2})(\.(x)|R([0-9])*)?|main)_([0-9]{6})/;
+                    const regex = /_(([0-9]{2})(\.(x)|R([0-9]+)*)?|main)_([0-9]{6})/;
                     const version = new LabeledVersion(0, 0, 0, 0, false, channel, false);
                     const resultRegex = regex.exec(response.headers.location);
+
                     if (resultRegex) {
                         if (resultRegex[1] && resultRegex[1] === "main") {
                             version.isRRelease = true;
@@ -80,10 +81,25 @@ export class APIManager {
         return labelVersion.version - 1;
     }
 
+    public async HasRReleaseVersionAvailable(inStartMajorVersion: number, inChannel: string): Promise<boolean> {
+        const labelVersion = new LabeledVersion(inStartMajorVersion, 0, 0, 0, true, inChannel, false);
+        let hasRRelease = true;
+        const url = this.getURLTool4D(labelVersion);
+
+        try {
+            await requestLabelVersion(url, labelVersion.channel);
+        }
+        catch (error) {
+            hasRRelease = false;
+        }
+        return hasRRelease;
+    }
+
     //https://resources-download.4d.com/release/20%20Rx/20%20R3/latest/mac/tool4d_v20R3_mac_x86.tar.xz
     //https://resources-download.4d.com/release/20%20Rx/latest/latest/win/tool4d_win.tar.xz => Last Rx released
     //https://resources-download.4d.com/release/20%20Rx/latest/latest/win/tool4d_win.tar.xz => Last Rx beta
     //https://resources-download.4d.com/release/20%20Rx/20%20R3/latest/win/tool4d_win.tar.xz => Last 20R3 release
+    //https://resources-download.4d.com/release/21.x/latest/latest/win/tool4d_win.tar.xz => Last 21.x stable
     /*
         Starting from 20R5
         Linux has tar.xz and .deb

editor/src/test/toolDownload.test.ts

@@ -55,7 +55,7 @@ suite('Download tool', () => {
 
         while (true) {
             try {
-                await requestLabelVersion(`https://resources-download.4d.com/release/${number}.x/latest/latest/win/tool4d_win.tar.xz`, "stable");
+                await requestLabelVersion(`https://resources-download.4d.com/release/${number}.x/latest/latest/win/tool4d_win.tar.xz`, "beta");
                 number++;
             }
             catch (error) {

editor/src/toolPreparator.ts

@@ -65,7 +65,8 @@ export class ToolPreparator {
             const versions = getDirectories(inRootFolder)
                 .map(version => LabeledVersion.fromString(version))
                 .filter(version => labeledVersion.channel === "beta" ? true : version.channel === "stable")
-                .sort((a, b) => a.version - b.version);
+                .sort((a, b) => { if(a.version == b.version){ return a.releaseVersion - b.releaseVersion } 
+                else { return a.version - b.version } });
 
             if (versions.length > 0) {
                 localLabelVersion = versions[versions.length - 1];
@@ -174,8 +175,10 @@ export class ToolPreparator {
         try {
             if (labeledVersionWanted.isLatest() && !labeledVersionWanted.isMain()) {
                 lastMajorVersion = await this._APIManager.getLastMajorVersionAvailable(21, labeledVersionWanted.channel);
+                const hasRRelease = await this._APIManager.HasRReleaseVersionAvailable(lastMajorVersion, labeledVersionWanted.channel);
                 labeledVersionWanted.version = lastMajorVersion;
-                Logger.get().log("lastVersion available is", labeledVersionWanted.version);
+                labeledVersionWanted.isRRelease = hasRRelease;
+                Logger.get().log("lastVersion major version available is", labeledVersionWanted.version);
             }