fix download bug

mei23 · Aug 29, 2021 · 500fe79 · 500fe79
1 parent d721c9e
commit 500fe79
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/src/misc/download-url.ts b/src/misc/download-url.ts
@@ -61,7 +61,11 @@ export async function downloadUrl(url: string, path: string) {
 		}
 	}).on('error', (e: any) => {
 		if (e.name === 'HTTPError') {
-			throw e.response?.statusCode;
+			const statusCode = e.response?.statusCode;
+			const statusMessage = e.response?.statusMessage;
+			e.name = `StatusError`;
+			e.statusCode = statusCode;
+			e.message = `${statusCode} ${statusMessage}`;
 		}
 	});
 

diff --git a/src/remote/activitypub/models/image.ts b/src/remote/activitypub/models/image.ts
@@ -35,7 +35,7 @@ export async function createImage(actor: IRemoteUser, value: IObject): Promise<I
 		file = await uploadFromUrl(image.url, actor, null, image.url, !!image.sensitive, false, !cache);
 	} catch (e) {
 		// 4xxの場合は添付されてなかったことにする
-		if (e >= 400 && e < 500) {
+		if (e.statusCode >= 400 && e.statusCode < 500) {
 			logger.warn(`Ignored image: ${image.url} - ${e}`);
 			return null;
 		}

diff --git a/src/server/file/send-drive-file.ts b/src/server/file/send-drive-file.ts
@@ -81,7 +81,7 @@ export default async function(ctx: Router.RouterContext) {
 			return await sendNormal(ctx, file.data, file.type);
 		} catch (e) {
 			serverLogger.error(e);
-			return await sendError(ctx, typeof e === 'number' && e >= 400 && e < 500 ? e : 500);
+			return await sendError(ctx, typeof e.statusCode === 'number' && e.statusCode >= 400 && e.statusCode < 500 ? e.statusCode : 500);
 		} finally {
 			cleanup();
 		}

diff --git a/src/server/file/send-emoji.ts b/src/server/file/send-emoji.ts
@@ -58,12 +58,12 @@ export default async function(ctx: Router.RouterContext) {
 			});
 		};
 
-		if (typeof e == 'number' && e >= 400 && e < 500) {
+		if (typeof e.statusCode === 'number' && e.statusCode >= 400 && e.statusCode < 500) {
 			// 4xx
 			defered();
 			ctx.status = e;
 			ctx.set('Cache-Control', 'max-age=86400');
-		} else if (typeof e == 'number') {
+		} else if (typeof e.statusCode === 'number') {
 			// other status code
 			ctx.status = 500;
 			ctx.set('Cache-Control', 'max-age=300');

diff --git a/src/server/proxy/proxy-media.ts b/src/server/proxy/proxy-media.ts
@@ -39,7 +39,7 @@ export async function proxyMedia(ctx: Router.RouterContext) {
 	} catch (e) {
 		serverLogger.error(e);
 
-		if (typeof e == 'number' && e >= 400 && e < 500) {
+		if (typeof e.statusCode === 'number' && e.statusCode >= 400 && e.statusCode < 500) {
 			ctx.status = e;
 			ctx.set('Cache-Control', 'max-age=86400');
 		} else {