swtor/ssn
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

🗑️ Remove download with vanilla Node.js

Browse source
This commit is contained in:
C-3PO 2018-11-16 00:23:25 +01:00
parent 1326f5b5f4
commit e5bfdd6e95
Signed by: c3po
GPG key ID: 62993C4BB4D86F24
3 changed files with 13 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/cdn/downloadUrlContents.ts
View file

@ -1,26 +0,0 @@
import * as http from 'http';
import saveResponse from './funcs/saveResponse';
/** Downloads the given URL and saves it to disk. Returns the location where file is saved under. Throws error if download fails. */
export default function downloadUrlContents(
host: string,
path: string,
tempFileName: string,
resolve: (fileName: string) => void,
reject: (reason: Error | string) => void,
): void {
//Create HTTP request
const request = http.request({
family: 4,
hostname: host,
path,
}, saveResponse.bind(null, tempFileName, resolve, (reason: string) => { request.abort(); reject(reason); }));
//In case of connection errors, exit early
request.on('error', (error) => {
request.abort();
reject(error);
});
request.end();
}

12
src/cdn/downloadWrapper.ts
View file

@ -1,12 +1,11 @@
import * as os from 'os';
import * as nodePath from 'path';
import downloadUrlContents from './downloadUrlContents';
import downloadWithCurl from './downloadWithCurl';
import checkLocalCache from './funcs/checkLocalCache';
import createDirRecursively from './funcs/createDirRecursively';
/** Downloads the given URL and saves it to disk. Returns the location where file is saved under. Throws error if download fails. */
export default async function downloadWrapper({ host, path, size, useCurl = false }: {host: string, path: string, size: number, useCurl: boolean}): Promise<string> {
export default async function downloadWrapper({ host, path, size }: {host: string, path: string, size: number, useCurl: boolean}): Promise<string> {
//Generate file name we want to save it under
//e.g. on Linux: /tmp/patcher/cdn-patch.swtor.com/patch/assets_swtor_main/assets_swtor_main_-1to0/assets_swtor_main_-1to0.zip
const tempFileName = nodePath.join(os.tmpdir(), 'patcher', host, path);
@ -21,8 +20,7 @@ export default async function downloadWrapper({ host, path, size, useCurl = fals
return tempFileName;
}
//Download either via curl or natively with Node
if (useCurl) {
//Download via curl
//Try up to three times
for (let i = 0; i < 3; i += 1) {
try {
@ -35,10 +33,4 @@ export default async function downloadWrapper({ host, path, size, useCurl = fals
}
//Download failed, throw error
throw new Error('Could not download with curl');
} else {
const downloadResult = await new Promise((resolve, reject) => {
downloadUrlContents(host, path, tempFileName, resolve, reject);
}) as string;
return downloadResult;
}
}

2
src/ssn/installPatch.ts
View file

@ -62,7 +62,7 @@ export default async function installPatch({ product, from, to, sourceDirectory,
//start download, making sure that .zip file downloads first
const indexOfLastFile = solidpkg.files.length - 1;
const zipFile = getUrlContents(createUrlObject(solidpkg.files[indexOfLastFile]));
const diskFiles = solidpkg.files.slice(0, indexOfLastFile).map((file) => downloadWrapper.bind(null, { ...createUrlObject(file), useCurl: true }));
const diskFiles = solidpkg.files.slice(0, indexOfLastFile).map((file) => downloadWrapper.bind(null, createUrlObject(file)));
//we can parse the file entries as soon as the .zip file is downloaded
const fileEntries = readSsnFile(await zipFile);