From e4047b407606f47adceef3492cc3834d1455ebfb Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Sat, 21 Dec 2024 16:57:06 +0000
Subject: [PATCH] rethrow everything but non-retryable HTTP errors

every job that ends without an exception will be considered
"completed" and not retried
---
 .../src/queue/processors/InboxProcessorService.ts   | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

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;