ファイルのダウンロードがタイムアウトしなくなっているのを修正など (#6233)

* Refactor download / file-info

* body read timeout on download Fix syuilo#6232

2 files changed, 25 insertions, 52 deletions

diff --git a/src/misc/donwload-url.ts b/src/misc/donwload-url.ts
index cd15bbd731..3f42fb3bef 100644
--- a/src/misc/donwload-url.ts
+++ b/src/misc/donwload-url.ts
@@ -1,55 +1,39 @@
 import * as fs from 'fs';
+import * as stream from 'stream';
+import * as util from 'util';
 import fetch from 'node-fetch';
 import { httpAgent, httpsAgent } from './fetch';
+import { AbortController } from 'abort-controller';
 import config from '../config';
 import * as chalk from 'chalk';
 import Logger from '../services/logger';
 
+const pipeline = util.promisify(stream.pipeline);
+
 export async function downloadUrl(url: string, path: string) {
 	const logger = new Logger('download');
 
 	logger.info(`Downloading ${chalk.cyan(url)} ...`);
+	const controller = new AbortController();
+	setTimeout(() => {
+		controller.abort();
+	}, 11 * 1000);
 
 	const response = await fetch(new URL(url).href, {
 		headers: {
 			'User-Agent': config.userAgent
 		},
 		timeout: 10 * 1000,
+		signal: controller.signal,
 		agent: u => u.protocol == 'http:' ? httpAgent : httpsAgent,
-	}).then(response => {
-		if (!response.ok) {
-			logger.error(`Got ${response.status} (${url})`);
-			throw response.status;
-		} else {
-			return response;
-		}
 	});
 
-	await new Promise((res, rej) => {
-		const writable = fs.createWriteStream(path);
-
-		response.body.on('error', (error: any) => {
-			logger.error(`Failed to start download: ${chalk.cyan(url)}: ${error}`, {
-				url: url,
-				e: error
-			});
-			writable.close();
-			rej(error);
-		});
+	if (!response.ok) {
+		logger.error(`Got ${response.status} (${url})`);
+		throw response.status;
+	}
 
-		writable.on('finish', () => {
-			logger.succ(`Download finished: ${chalk.cyan(url)}`);
-			res();
-		});
+	await pipeline(response.body, fs.createWriteStream(path));
 
-		writable.on('error', error => {
-			logger.error(`Download failed: ${chalk.cyan(url)}: ${error}`, {
-				url: url,
-				e: error
-			});
-			rej(error);
-		});
-
-		response.body.pipe(writable);
-	});
+	logger.succ(`Download finished: ${chalk.cyan(url)}`);
 }
diff --git a/src/misc/get-file-info.ts b/src/misc/get-file-info.ts
index 5ccb280260..b838900f61 100644
--- a/src/misc/get-file-info.ts
+++ b/src/misc/get-file-info.ts
@@ -1,10 +1,14 @@
 import * as fs from 'fs';
 import * as crypto from 'crypto';
+import * as stream from 'stream';
+import * as util from 'util';
 import * as fileType from 'file-type';
 import isSvg from 'is-svg';
 import * as probeImageSize from 'probe-image-size';
 import * as sharp from 'sharp';
 
+const pipeline = util.promisify(stream.pipeline);
+
 export type FileInfo = {
 	size: number;
 	md5: string;
@@ -138,32 +142,17 @@ export async function checkSvg(path: string) {
  * Get file size
  */
 export async function getFileSize(path: string): Promise<number> {
-	return new Promise<number>((res, rej) => {
-		fs.stat(path, (err, stats) => {
-			if (err) return rej(err);
-			res(stats.size);
-		});
-	});
+	const getStat = util.promisify(fs.stat);
+	return (await getStat(path)).size;
 }
 
 /**
  * Calculate MD5 hash
  */
 async function calcHash(path: string): Promise<string> {
-	return new Promise<string>((res, rej) => {
-		const readable = fs.createReadStream(path);
-		const hash = crypto.createHash('md5');
-		const chunks: Buffer[] = [];
-		readable
-			.on('error', rej)
-			.pipe(hash)
-			.on('error', rej)
-			.on('data', chunk => chunks.push(chunk))
-			.on('end', () => {
-				const buffer = Buffer.concat(chunks);
-				res(buffer.toString('hex'));
-			});
-	});
+	const hash = crypto.createHash('md5').setEncoding('hex');
+	await pipeline(fs.createReadStream(path), hash);
+	return hash.read();
 }
 
 /**