merge: prepare release 2025.4.3 (!1125)

View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1125

Approved-by: Marie <github@yuugi.dev>
Approved-by: Julia <julia@insertdomain.name>

1 files changed, 11 insertions, 6 deletions

diff --git a/packages/backend/src/core/DownloadService.ts b/packages/backend/src/core/DownloadService.ts
index 26e60e00b3..cb5bdb6cb7 100644
--- a/packages/backend/src/core/DownloadService.ts
+++ b/packages/backend/src/core/DownloadService.ts
@@ -18,6 +18,7 @@ import { LoggerService } from '@/core/LoggerService.js';
 import type Logger from '@/logger.js';
 
 import { bindThis } from '@/decorators.js';
+import { renderInlineError } from '@/misc/render-inline-error.js';
 
 @Injectable()
 export class DownloadService {
@@ -37,7 +38,7 @@ export class DownloadService {
 	public async downloadUrl(url: string, path: string, options: { timeout?: number, operationTimeout?: number, maxSize?: number } = {} ): Promise<{
 		filename: string;
 	}> {
-		this.logger.info(`Downloading ${chalk.cyan(url)} to ${chalk.cyanBright(path)} ...`);
+		this.logger.debug(`Downloading ${chalk.cyan(url)} to ${chalk.cyanBright(path)} ...`);
 
 		const timeout = options.timeout ?? 30 * 1000;
 		const operationTimeout = options.operationTimeout ?? 60 * 1000;
@@ -86,7 +87,7 @@ export class DownloadService {
 						filename = parsed.parameters.filename;
 					}
 				} catch (e) {
-					this.logger.warn(`Failed to parse content-disposition: ${contentDisposition}`, { stack: e });
+					this.logger.warn(`Failed to parse content-disposition ${contentDisposition}: ${renderInlineError(e)}`);
 				}
 			}
 		}).on('downloadProgress', (progress: Got.Progress) => {
@@ -100,13 +101,17 @@ export class DownloadService {
 			await stream.pipeline(req, fs.createWriteStream(path));
 		} catch (e) {
 			if (e instanceof Got.HTTPError) {
-				throw new StatusError(`${e.response.statusCode} ${e.response.statusMessage}`, e.response.statusCode, e.response.statusMessage);
-			} else {
+				throw new StatusError(`download error from ${url}`, e.response.statusCode, e.response.statusMessage, e);
+			} else if (e instanceof Got.RequestError || e instanceof Got.AbortError) {
+				throw new Error(String(e), { cause: e });
+			} else if (e instanceof Error) {
 				throw e;
+			} else {
+				throw new Error(String(e), { cause: e });
 			}
 		}
 
-		this.logger.succ(`Download finished: ${chalk.cyan(url)}`);
+		this.logger.info(`Download finished: ${chalk.cyan(url)}`);
 
 		return {
 			filename,
@@ -118,7 +123,7 @@ export class DownloadService {
 		// Create temp file
 		const [path, cleanup] = await createTemp();
 
-		this.logger.info(`text file: Temp file is ${path}`);
+		this.logger.debug(`text file: Temp file is ${path}`);
 
 		try {
 			// write content at URL to temp file