@xhmikosr/downloader 11.0.2 → 12.0.0

package/index.js

@@ -4,12 +4,14 @@ import process from 'node:process';
 import contentDisposition from 'content-disposition';
 import archiveType from '@xhmikosr/archive-type';
 import decompress from '@xhmikosr/decompress';
+import extName from 'ext-name';
+import {fileTypeFromBuffer} from 'file-type';
 import filenamify from 'filenamify';
 import getStream from 'get-stream';
 import got from 'got';
+// TODO replace with `defaults` package when we drop Node.js < 16 support
+import mergeOptions from 'merge-options';
 import {pEvent} from 'p-event';
-import fileType from 'file-type';
-import extName from 'ext-name';
 
 const filenameFromPath = res => path.basename(new URL(res.requestUrl).pathname);
 
@@ -29,13 +31,13 @@ const getExtFromMime = res => {
 	return exts[0].ext;
 };
 
-const getFilename = (res, data) => {
+const getFilename = async (res, data) => {
 	const header = res.headers['content-disposition'];
 
 	if (header) {
 		const parsed = contentDisposition.parse(header);
 
-		if (parsed.parameters && parsed.parameters.filename) {
+		if (parsed.parameters?.filename) {
 			return parsed.parameters.filename;
 		}
 	}
@@ -43,7 +45,8 @@ const getFilename = (res, data) => {
 	let filename = filenameFromPath(res);
 
 	if (!path.extname(filename)) {
-		const ext = (fileType(data) || {}).ext || getExtFromMime(res);
+		const fileType = await fileTypeFromBuffer(data);
+		const ext = fileType?.ext || getExtFromMime(res);
 
 		if (ext) {
 			filename = `${filename}.${ext}`;
@@ -59,39 +62,51 @@ const download = (uri, output, options) => {
 		output = null;
 	}
 
-	options = {
-		responseType: 'buffer',
-		https: {
-			rejectUnauthorized: process.env.npm_config_strict_ssl !== 'false',
+	const defaultOptions = {
+		got: {
+			responseType: 'buffer',
+			https: {
+				rejectUnauthorized: process.env.npm_config_strict_ssl !== 'false',
+			},
 		},
-		...options,
+		decompress: {},
 	};
 
-	const stream = got.stream(uri, options);
-
-	const promise = pEvent(stream, 'response').then(res => {
-		const encoding = options.responseType === 'buffer' ? 'buffer' : options.encoding;
-		return Promise.all([getStream(stream, {encoding}), res]);
-	}).then(result => {
-		const [data, res] = result;
-
-		if (!output) {
-			return options.extract && archiveType(data) ? decompress(data, options) : data;
-		}
-
-		const filename = options.filename || filenamify(getFilename(res, data));
-		const outputFilepath = path.join(output, filename);
-
-		if (options.extract && archiveType(data)) {
-			return decompress(data, path.dirname(outputFilepath), options);
-		}
-
-		return fs.mkdir(path.dirname(outputFilepath), {recursive: true})
-			.then(() => fs.writeFile(outputFilepath, data))
-			.then(() => data);
-	});
-
-	stream.then = promise.then.bind(promise); // eslint-disable-line unicorn/no-thenable
+	options = mergeOptions(defaultOptions, options);
+
+	const stream = got.stream(uri, options.got);
+
+	const promise = pEvent(stream, 'response')
+		.then(res => {
+			const encoding = options.got.responseType === 'buffer' ? 'buffer' : options.got.encoding;
+			return Promise.all([getStream(stream, {encoding}), res]);
+		})
+		.then(async ([data, res]) => {
+			if (!output) {
+				return options.extract && await archiveType(data)
+					? decompress(data, options.decompress)
+					: data;
+			}
+
+			const filename = options.filename || filenamify(await getFilename(res, data));
+			const outputFilepath = path.join(output, filename);
+
+			if (options.extract && await archiveType(data)) {
+				return decompress(
+					data,
+					path.dirname(outputFilepath),
+					options.decompress,
+				);
+			}
+
+			return fs
+				.mkdir(path.dirname(outputFilepath), {recursive: true})
+				.then(() => fs.writeFile(outputFilepath, data))
+				.then(() => data);
+		});
+
+	// eslint-disable-next-line unicorn/no-thenable
+	stream.then = promise.then.bind(promise);
 	stream.catch = promise.catch.bind(promise);
 
 	return stream;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xhmikosr/downloader",
-	"version": "11.0.2",
+	"version": "12.0.0",
 	"description": "Download and extract files",
 	"license": "MIT",
 	"repository": "XhmikosR/download",
@@ -39,23 +39,23 @@
 		"url"
 	],
 	"dependencies": {
-		"@xhmikosr/archive-type": "^5.0.0",
-		"@xhmikosr/decompress": "^7.0.0",
+		"@xhmikosr/archive-type": "^6.0.1",
+		"@xhmikosr/decompress": "^8.0.0",
 		"content-disposition": "^0.5.4",
 		"ext-name": "^5.0.0",
-		"file-type": "^12.4.2",
+		"file-type": "^18.5.0",
 		"filenamify": "^5.1.1",
 		"get-stream": "^6.0.1",
-		"got": "^11.8.6",
+		"got": "^12.6.1",
+		"merge-options": "^3.0.4",
 		"p-event": "^5.0.1"
 	},
 	"devDependencies": {
-		"ava": "^5.3.0",
+		"ava": "^4.3.3",
 		"c8": "^7.14.0",
 		"is-zip": "^1.0.0",
 		"nock": "^13.3.1",
 		"path-exists": "^5.0.0",
-		"random-buffer": "^0.1.0",
 		"xo": "^0.54.2"
 	},
 	"xo": {

package/readme.md

@@ -57,9 +57,15 @@ Path to where your file will be written.
 
 #### options
 
+##### options.got
+
 Type: `Object`
 
-Same options as [`got`](https://github.com/sindresorhus/got#options) and [`decompress`](https://github.com/XhmikosR/decompress#options) in addition to the ones below.
+Same options as [`got`](https://github.com/sindresorhus/got#options).
+
+##### options.decompress
+
+Same options as [`decompress`](https://github.com/XhmikosR/decompress#options).
 
 ##### extract