optimize site proxy

Author: github0null

src/EIDEProjectExplorer.ts

@@ -83,7 +83,7 @@ import { SevenZipper, CompressOption } from './Compress';
 import { DependenceManager } from './DependenceManager';
 import { ArrayDelRepetition } from '../lib/node-utility/Utility';
 import {
-    copyObject, downloadFileWithProgress, getDownloadUrlFromGitea,
+    copyObject, downloadFileWithProgress,
     runShellCommand, redirectHost, readGithubRepoFolder, FileCache,
     genGithubHash, md5, toArray, newMarkdownString, newFileTooltipString, FileTooltipInfo, escapeXml,
     readGithubRepoTxtFile, downloadFile, notifyReloadWindow, formatPath, execInternalCommand,

src/OperationExplorer.ts

@@ -1103,11 +1103,9 @@ export class OperationExplorer {
                             netReq.emit('abort');
                         });
 
-                        const headers: any = {
+                        const headers: any = utility.setProxyHeader({
                             'User-Agent': 'Mozilla/5.0'
-                        };
-
-                        utility.setProxyHeader(headers);
+                        });
 
                         if (acToken) { // if token is enabled, use it
                             headers['Authorization'] = `token ${acToken}`;

src/extension.ts

@@ -576,19 +576,19 @@ async function tryInstallBinaries(binFolder: File, binVersion: string): Promise<
     const binType = '7z';
 
     // binaries download site
-    const downloadSites: string[] = [
+    let downloadSites: string[] = [
         `https://raw-github.github0null.io/github0null/eide-resource/master/binaries/${platform.getRuntimeId()}/bin-${binVersion}.${binType}`,
         `https://raw-github.em-ide.com/github0null/eide-resource/master/binaries/${platform.getRuntimeId()}/bin-${binVersion}.${binType}`,
+        `https://raw.githubusercontent.com/github0null/eide-resource/master/binaries/${platform.getRuntimeId()}/bin-${binVersion}.${binType}`
     ];
 
-    /* random select the order of site */
-    if (Math.random() > 0.5) {
-        downloadSites.reverse();
+    // random order
+    {
+        const sValMap: Map<string, number> = new Map();
+        downloadSites.forEach(s => sValMap.set(s, Math.floor(Math.random() * 100)));
+        downloadSites = downloadSites.sort((a, b) => (sValMap.get(a) || 0) - (sValMap.get(b) || 0));
     }
 
-    // add github default download url
-    downloadSites.push(`https://raw.githubusercontent.com/github0null/eide-resource/master/binaries/${platform.getRuntimeId()}/bin-${binVersion}.${binType}`);
-
     let installedDone = false;
 
     try {

src/utility.ts

@@ -497,38 +497,6 @@ export async function downloadFileWithProgress(url: string, fileLable: string,
     });
 }
 
-export async function getDownloadUrlFromGitea(repo: string, folder: string, fileName: string): Promise<any | Error | undefined> {
-
-    return new Promise(async (resolve) => {
-
-        const req = new NetRequest();
-
-        const res = await req.Request<any, any>({
-            host: `git.github0null.io`,
-            path: `/api/v1/repos/root/${repo}/contents/${folder}`,
-            timeout: 3000,
-            headers: setProxyHeader({ 'User-Agent': 'Mozilla/5.0' }),
-            rejectUnauthorized: false, // ignore cert failed
-        }, 'https');
-
-        if (res.success == false || res.content == undefined) {
-            resolve(new Error(res.msg || `Can't connect to git repo !`));
-            return;
-        }
-
-        let fInfo: any | undefined;
-
-        for (const fileInfo of res.content) {
-            if (fileInfo['name'] == fileName) {
-                fInfo = fileInfo;
-                break;
-            }
-        }
-
-        resolve(fInfo);
-    });
-}
-
 export async function readGithubRepoFolder(repo_url: string, token?: vscode.CancellationToken): Promise<GitFileInfo[] | Error> {
 
     // URL: https://api.github.com/repos/github0null/eide-doc/contents/eide-template-list