merge: rethrow everything but non-retryable HTTP errors (!837)

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

Approved-by: Marie <github@yuugi.dev>
Approved-by: Charlotte <timo.herngreen@gmail.com>

3 files changed, 21 insertions, 21 deletions

diff --git a/packages/backend/src/logger.ts b/packages/backend/src/logger.ts
index ff5363a425..3b20ae5df0 100644
--- a/packages/backend/src/logger.ts
+++ b/packages/backend/src/logger.ts
@@ -18,6 +18,9 @@ type Context = {
 
 type Level = 'error' | 'success' | 'warning' | 'debug' | 'info';
 
+type Data = DataElement | DataElement[];
+type DataElement = Record<string, unknown> | Error | string | null;
+
 // eslint-disable-next-line import/no-default-export
 export default class Logger {
 	private context: Context;
@@ -38,7 +41,7 @@ export default class Logger {
 	}
 
 	@bindThis
-	private log(level: Level, message: string, data?: Record<string, any> | null, important = false, subContexts: Context[] = []): void {
+	private log(level: Level, message: string, data?: Data, important = false, subContexts: Context[] = []): void {
 		if (envOption.quiet) return;
 
 		if (this.parentLogger) {
@@ -68,17 +71,23 @@ export default class Logger {
 		if (envOption.withLogTime) log = chalk.gray(time) + ' ' + log;
 
 		const args: unknown[] = [important ? chalk.bold(log) : log];
-		if (data != null) {
+		if (Array.isArray(data)) {
+			for (const d of data) {
+				if (d != null) {
+					args.push(d);
+				}
+			}
+		} else if (data != null) {
 			args.push(data);
 		}
 		console.log(...args);
 	}
 
 	@bindThis
-	public error(x: string | Error, data?: Record<string, any> | null, important = false): void { // 実行を継続できない状況で使う
+	public error(x: string | Error, data?: Data, important = false): void { // 実行を継続できない状況で使う
 		if (x instanceof Error) {
-			data = data ?? {};
-			data.e = x;
+			data = data ? (Array.isArray(data) ? data : [data]) : [];
+			data.unshift({ e: x });
 			this.log('error', x.toString(), data, important);
 		} else if (typeof x === 'object') {
 			this.log('error', `${(x as any).message ?? (x as any).name ?? x}`, data, important);
@@ -88,24 +97,24 @@ export default class Logger {
 	}
 
 	@bindThis
-	public warn(message: string, data?: Record<string, any> | null, important = false): void { // 実行を継続できるが改善すべき状況で使う
+	public warn(message: string, data?: Data, important = false): void { // 実行を継続できるが改善すべき状況で使う
 		this.log('warning', message, data, important);
 	}
 
 	@bindThis
-	public succ(message: string, data?: Record<string, any> | null, important = false): void { // 何かに成功した状況で使う
+	public succ(message: string, data?: Data, important = false): void { // 何かに成功した状況で使う
 		this.log('success', message, data, important);
 	}
 
 	@bindThis
-	public debug(message: string, data?: Record<string, any> | null, important = false): void { // デバッグ用に使う(開発者に必要だが利用者に不要な情報)
+	public debug(message: string, data?: Data, important = false): void { // デバッグ用に使う(開発者に必要だが利用者に不要な情報)
 		if (process.env.NODE_ENV !== 'production' || envOption.verbose) {
 			this.log('debug', message, data, important);
 		}
 	}
 
 	@bindThis
-	public info(message: string, data?: Record<string, any> | null, important = false): void { // それ以外
+	public info(message: string, data?: Data, important = false): void { // それ以外
 		this.log('info', message, data, important);
 	}
 }
diff --git a/packages/backend/src/queue/QueueProcessorService.ts b/packages/backend/src/queue/QueueProcessorService.ts
index 33c2d02dd8..297edfd545 100644
--- a/packages/backend/src/queue/QueueProcessorService.ts
+++ b/packages/backend/src/queue/QueueProcessorService.ts
@@ -349,7 +349,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 						});
 					}
 				})
-				.on('error', (err: Error) => logger.error(`error ${err.name}: ${err.message}`, { e: renderError(err) }))
+				.on('error', (err: Error) => logger.error('inbox error:', renderError(err)))
 				.on('stalled', (jobId) => logger.warn(`stalled id=${jobId}`));
 		}
 		//#endregion
diff --git a/packages/backend/src/queue/processors/InboxProcessorService.ts b/packages/backend/src/queue/processors/InboxProcessorService.ts
index 7dfa4ec704..7727a3e985 100644
--- a/packages/backend/src/queue/processors/InboxProcessorService.ts
+++ b/packages/backend/src/queue/processors/InboxProcessorService.ts
@@ -7,7 +7,6 @@ import { URL } from 'node:url';
 import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';
 import httpSignature from '@peertube/http-signature';
 import * as Bull from 'bullmq';
-import { AbortError } from 'node-fetch';
 import type Logger from '@/logger.js';
 import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
 import { FetchInstanceMetadataService } from '@/core/FetchInstanceMetadataService.js';
@@ -245,16 +244,8 @@ export class InboxProcessorService implements OnApplicationShutdown {
 				}
 			}
 
-			if (e instanceof StatusError) {
-				if (e.isRetryable) {
-					return `temporary error ${e.statusCode}`;
-				} else {
-					return `skip: permanent error ${e.statusCode}`;
-				}
-			}
-
-			if (e instanceof AbortError) {
-				return 'request aborted';
+			if (e instanceof StatusError && !e.isRetryable) {
+				return `skip: permanent error ${e.statusCode}`;
 			}
 
 			throw e;