Many more fixes...

This commit is contained in:
Nathanael Anderson
2024-04-11 07:52:51 -06:00
parent 48a675b71e
commit f925115472
16 changed files with 1203 additions and 257 deletions
+39 -14
View File
@@ -1,33 +1,57 @@
const https = require('https');
const http = require('http');
const _fs = require('fs');
const { basename } = require('path');
const https = require('node:https');
const http = require('node:http');
const nodeFS = require('node:fs');
const nodePath = require('node:path');
const Url = require('url');
const electron = require('electron');
const TIMEOUT = 60000;
module.exports = function(url, path, progress) {
module.exports = function(url, filePath, progress, options) {
const uri = Url.parse(url);
if (!path) {
path = basename(uri.path);
if (!filePath) {
filePath = nodePath.basename(uri.path);
}
const file = _fs.createWriteStream(path);
let file, fileName = filePath;
function get(url, callback) {
let request = (uri.protocol === 'https:' ? https : http).get(url, function(response) {
if (response.headers.location) {
get(response.headers.location, callback);
} else {
if (options && options.useContentDispositionFilename) {
const contentDisposition = response.headers['content-disposition'];
if (contentDisposition) {
const appData = nodePath.join(electron.app.getPath('appData'), 'SideQuest');
const match = contentDisposition.match(/filename="(.+)"/);
if (match && match.length > 1) {
fileName = nodePath.join(appData, match[1]);
file = nodeFS.createWriteStream(fileName);
}
}
}
if (!file) {
file = nodeFS.createWriteStream(filePath);
}
callback(null, response);
}
});
request.on('error', function(err) {
callback(err);
});
request.setTimeout(TIMEOUT, function() {
request.abort();
callback(new Error(`request timeout after ${TIMEOUT / 1000.0}s`));
});
if (options && options.timeout !== undefined) {
if (options.timeout > 0) {
request.setTimeout(TIMEOUT, function() {
request.abort();
callback(new Error(`request timeout after ${options.timeout / 1000.0}s`));
});
}
} else {
request.setTimeout(TIMEOUT, function() {
request.abort();
callback(new Error(`request timeout after ${TIMEOUT / 1000.0}s`));
});
}
}
return new Promise(function(resolve, reject) {
@@ -35,7 +59,8 @@ module.exports = function(url, path, progress) {
if (err) {
return reject(err);
}
const len = parseInt(res.headers['content-length'], 10);
let len = parseInt(res.headers['content-length'], 10);
if (isNaN(len) || len <= 0) { len = 1; }
let downloaded = 0;
let percent = 0;
res.on('data', function(chunk) {
@@ -46,7 +71,7 @@ module.exports = function(url, path, progress) {
})
.on('end', function() {
file.end();
resolve(true);
resolve(fileName);
})
.on('error', function(err) {
reject(err);