2 files changed, 45 insertions, 17 deletions

diff --git a/server/lib/job-queue/handlers/activitypub-cleaner.ts b/server/lib/job-queue/handlers/activitypub-cleaner.ts
index d5e4508fe..1540bf23a 100644
--- a/server/lib/job-queue/handlers/activitypub-cleaner.ts
+++ b/server/lib/job-queue/handlers/activitypub-cleaner.ts
@@ -8,7 +8,8 @@ import {
 } from '@server/helpers/custom-validators/activitypub/activity'
 import { sanitizeAndCheckVideoCommentObject } from '@server/helpers/custom-validators/activitypub/video-comments'
 import { doJSONRequest, PeerTubeRequestError } from '@server/helpers/requests'
-import { AP_CLEANER_CONCURRENCY } from '@server/initializers/constants'
+import { AP_CLEANER } from '@server/initializers/constants'
+import { Redis } from '@server/lib/redis'
 import { VideoModel } from '@server/models/video/video'
 import { VideoCommentModel } from '@server/models/video/video-comment'
 import { VideoShareModel } from '@server/models/video/video-share'
@@ -27,7 +28,7 @@ async function processActivityPubCleaner (_job: Job) {
 
     await map(rateUrls, async rateUrl => {
       try {
-        const result = await updateObjectIfNeeded(rateUrl, bodyValidator, updater, deleter)
+        const result = await updateObjectIfNeeded({ url: rateUrl, bodyValidator, updater, deleter })
 
         if (result?.status === 'deleted') {
           const { videoId, type } = result.data
@@ -37,7 +38,7 @@ async function processActivityPubCleaner (_job: Job) {
       } catch (err) {
         logger.warn('Cannot update/delete remote AP rate %s.', rateUrl, { err })
       }
-    }, { concurrency: AP_CLEANER_CONCURRENCY })
+    }, { concurrency: AP_CLEANER.CONCURRENCY })
   }
 
   {
@@ -46,11 +47,11 @@ async function processActivityPubCleaner (_job: Job) {
 
     await map(shareUrls, async shareUrl => {
       try {
-        await updateObjectIfNeeded(shareUrl, bodyValidator, updater, deleter)
+        await updateObjectIfNeeded({ url: shareUrl, bodyValidator, updater, deleter })
       } catch (err) {
         logger.warn('Cannot update/delete remote AP share %s.', shareUrl, { err })
       }
-    }, { concurrency: AP_CLEANER_CONCURRENCY })
+    }, { concurrency: AP_CLEANER.CONCURRENCY })
   }
 
   {
@@ -59,11 +60,11 @@ async function processActivityPubCleaner (_job: Job) {
 
     await map(commentUrls, async commentUrl => {
       try {
-        await updateObjectIfNeeded(commentUrl, bodyValidator, updater, deleter)
+        await updateObjectIfNeeded({ url: commentUrl, bodyValidator, updater, deleter })
       } catch (err) {
         logger.warn('Cannot update/delete remote AP comment %s.', commentUrl, { err })
       }
-    }, { concurrency: AP_CLEANER_CONCURRENCY })
+    }, { concurrency: AP_CLEANER.CONCURRENCY })
   }
 }
 
@@ -75,12 +76,14 @@ export {
 
 // ---------------------------------------------------------------------------
 
-async function updateObjectIfNeeded <T> (
-  url: string,
-  bodyValidator: (body: any) => boolean,
-  updater: (url: string, newUrl: string) => Promise<T>,
-  deleter: (url: string) => Promise<T>
+async function updateObjectIfNeeded <T> (options: {
+  url: string
+  bodyValidator: (body: any) => boolean
+  updater: (url: string, newUrl: string) => Promise<T>
+  deleter: (url: string) => Promise<T> }
 ): Promise<{ data: T, status: 'deleted' | 'updated' } | null> {
+  const { url, bodyValidator, updater, deleter } = options
+
   const on404OrTombstone = async () => {
     logger.info('Removing remote AP object %s.', url)
     const data = await deleter(url)
@@ -117,7 +120,15 @@ async function updateObjectIfNeeded <T> (
       return on404OrTombstone()
     }
 
-    throw err
+    logger.debug('Remote AP object %s is unavailable.', url)
+
+    const unavailability = await Redis.Instance.addAPUnavailability(url)
+    if (unavailability >= AP_CLEANER.UNAVAILABLE_TRESHOLD) {
+      logger.info('Removing unavailable AP resource %s.', url)
+      return on404OrTombstone()
+    }
+
+    return null
   }
 }
 
diff --git a/server/lib/redis.ts b/server/lib/redis.ts
index 9ef9d7702..4dcbcddb5 100644
--- a/server/lib/redis.ts
+++ b/server/lib/redis.ts
@@ -1,9 +1,11 @@
 import { createClient } from 'redis'
 import { exists } from '@server/helpers/custom-validators/misc'
+import { sha256 } from '@shared/extra-utils'
 import { logger } from '../helpers/logger'
 import { generateRandomString } from '../helpers/utils'
 import { CONFIG } from '../initializers/config'
 import {
+  AP_CLEANER,
   CONTACT_FORM_LIFETIME,
   RESUMABLE_UPLOAD_SESSION_LIFETIME,
   TRACKER_RATE_LIMITS,
@@ -260,6 +262,17 @@ class Redis {
     return this.deleteKey('resumable-upload-' + uploadId)
   }
 
+  /* ************ AP ressource unavailability ************ */
+
+  async addAPUnavailability (url: string) {
+    const key = this.generateAPUnavailabilityKey(url)
+
+    const value = await this.increment(key)
+    await this.setExpiration(key, AP_CLEANER.PERIOD * 2)
+
+    return value
+  }
+
   /* ************ Keys generation ************ */
 
   private generateLocalVideoViewsKeys (videoId?: Number) {
@@ -298,6 +311,10 @@ class Redis {
     return 'contact-form-' + ip
   }
 
+  private generateAPUnavailabilityKey (url: string) {
+    return 'ap-unavailability-' + sha256(url)
+  }
+
   /* ************ Redis helpers ************ */
 
   private getValue (key: string) {
@@ -330,10 +347,6 @@ class Redis {
     return this.client.del(this.prefix + key)
   }
 
-  private getObject (key: string) {
-    return this.client.hGetAll(this.prefix + key)
-  }
-
   private increment (key: string) {
     return this.client.incr(this.prefix + key)
   }
@@ -342,6 +355,10 @@ class Redis {
     return this.client.exists(this.prefix + key)
   }
 
+  private setExpiration (key: string, ms: number) {
+    return this.client.expire(this.prefix + key, ms / 1000)
+  }
+
   static get Instance () {
     return this.instance || (this.instance = new this())
   }