migrated to Flutter Infra API

closes #1
sampathbalivada · Jun 4, 2020 · f7343cc · f7343cc
1 parent 73d1c6b
commit f7343cc
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 11 deletions.
diff --git a/app/download-helper.js b/app/download-helper.js
@@ -4,6 +4,7 @@ const fs = require('fs');
 exports.downloadFile = downloadFile;
 exports.getURLs = getURLs;
 exports.getFilenameFromUrl = getFilenameFromUrl;
+exports.getDataFromURL = getDataFromURL;
 
 function downloadFile(configuration) {
     return new Promise(function (resolve, reject) {
@@ -46,7 +47,7 @@ function downloadFile(configuration) {
     });
 }
 
-function getURLs(remoteURL) {
+function getDataFromURL(remoteURL) {
     return new Promise(function (resolve, reject) {
         var req = request.get(remoteURL, function (err, resp, body) {
             if (err) {
@@ -58,12 +59,40 @@ function getURLs(remoteURL) {
     })
 }
 
+function getURLs() {
+    var repoURLS;
+    return new Promise((resolve, reject) => {
+        getDataFromURL('https://raw.githubusercontent.com/sampathbalivada/flutter_installer/master/urls.json')
+            .then((data) => {
+                repoURLS = data;
+                return getDataFromURL('https://storage.googleapis.com/flutter_infra/releases/releases_windows.json');
+            })
+            .then((data) => {
+                current_release_stable_hash = data["current_release"]["beta"];
+                for (var i = 1, release = data["releases"][0]; i < data["releases"].length; i++) {
+                    if (release["hash"] != current_release_stable_hash) {
+                        repoURLS['flutter-sdk'] = data["base_url"] + "/" + release["archive"]
+                        resolve(repoURLS);
+                        break;
+                    }
+                    release = data["releases"][i];
+                }
+            })
+    })
+}
+
 function getFilenameFromUrl(url) {
     return url.substring(url.lastIndexOf('/') + 1);
 }
 
+// Use this function to test URL downloads
+function getURLsTest() {
+    getURLs().then((data) => {
+        console.log(data)
+    });
+}
+
 // Use this function to test file downloads
-// Will be removed when stable
 function downloadTest(fileURL) {
     var filename = getFilenameFromUrl(fileURL);
     var downloadsFolder = "D:\\Downloads";

diff --git a/app/download/download.js b/app/download/download.js
@@ -8,7 +8,7 @@ function startDownload() {
     const progressIndicator = document.getElementById('progress-bar');
     download_button.onclick = '';
     download_button.classList.add("disabled");
-    dwn.getURLs('https://raw.githubusercontent.com/sampathbalivada/flutter_installer/master/urls.json?token=AGLFFNEZK75GHLTNLMTQOR26X57GO')
+    dwn.getURLs()
         .then((fetchedURLs) => {
             urls = fetchedURLs;
             showFileNames(urls);

diff --git a/app/install/install.js b/app/install/install.js
@@ -22,7 +22,7 @@ function installComponents() {
             }
         }).then(
             () => {
-                return dwn.getURLs('https://raw.githubusercontent.com/sampathbalivada/flutter_installer/master/urls.json')
+                return dwn.getURLs()
             }
         )
         .then((fetchedURLs) => {

diff --git a/app/sdk_download/download.js b/app/sdk_download/download.js
@@ -8,7 +8,7 @@ function startDownload() {
     const progressIndicator = document.getElementById('progress-bar');
     download_button.onclick = '';
     download_button.classList.add("disabled");
-    dwn.getURLs('https://raw.githubusercontent.com/sampathbalivada/flutter_installer/master/urls.json?token=AGLFFNEZK75GHLTNLMTQOR26X57GO')
+    dwn.getURLs()
         .then((fetchedURLs) => {
             urls = fetchedURLs;
             showFileNames(urls);

diff --git a/app/sdk_install/install.js b/app/sdk_install/install.js
@@ -13,7 +13,7 @@ const debug = false;
 
 function installComponents() {
     var urls;
-    dwn.getURLs('https://raw.githubusercontent.com/sampathbalivada/flutter_installer/master/urls.json?token=AGLFFNEZK75GHLTNLMTQOR26X57GO')
+    dwn.getURLs()
         .then((fetchedURLs) => {
             urls = fetchedURLs;
 

diff --git a/package.json b/package.json
@@ -5,8 +5,7 @@
   "main": "main.js",
   "scripts": {
     "start": "electron .",
-    "dist": "electron-builder",
-    "package-win": "electron-packager . flutter_installer --overwrite --asar=true --platform=win32 --arch=x64 --icon=assets/icon.ico --prune=true --out=release-builds --version-string.CompanyName=CE --version-string.FileDescription=CE --version-string.ProductName=\"Flutter Installer\""
+    "dist": "electron-builder"
   },
   "devDependencies": {
     "electron": "^8.2.3",

diff --git a/urls.json b/urls.json
@@ -1,5 +1,4 @@
 {
-    "flutter-sdk" : "https://storage.googleapis.com/flutter_infra/releases/stable/windows/flutter_windows_1.17.0-stable.zip",
-    "command-line-tools" : "https://dl.google.com/android/repository/commandlinetools-win-6200805_latest.zip",
-    "jdk" : "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09.1/OpenJDK8U-jdk_x86-32_windows_hotspot_8u252b09.zip"
+    "command-line-tools": "https://dl.google.com/android/repository/commandlinetools-win-6200805_latest.zip",
+    "jdk": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09.1/OpenJDK8U-jdk_x86-32_windows_hotspot_8u252b09.zip"
 }