-import * as Bluebird from 'bluebird'
-import * as Bull from 'bull'
+import { map } from 'bluebird'
+import { Job } from 'bull'
+import { buildGlobalHeaders, buildSignedRequestOptions, computeBody } from '@server/lib/activitypub/send'
+import { ActorFollowHealthCache } from '@server/lib/actor-follow-health-cache'
import { ActivitypubHttpBroadcastPayload } from '@shared/models'
import { logger } from '../../../helpers/logger'
import { doRequest } from '../../../helpers/requests'
-import { BROADCAST_CONCURRENCY, REQUEST_TIMEOUT } from '../../../initializers/constants'
-import { ActorFollowScoreCache } from '../../files-cache'
-import { buildGlobalHeaders, buildSignedRequestOptions, computeBody } from './utils/activitypub-http-utils'
+import { BROADCAST_CONCURRENCY } from '../../../initializers/constants'
-async function processActivityPubHttpBroadcast (job: Bull.Job) {
+async function processActivityPubHttpBroadcast (job: Job) {
logger.info('Processing ActivityPub broadcast in job %d.', job.id)
const payload = job.data as ActivitypubHttpBroadcastPayload
method: 'POST' as 'POST',
json: body,
httpSignature: httpSignatureOptions,
- timeout: REQUEST_TIMEOUT,
headers: buildGlobalHeaders(body)
}
const badUrls: string[] = []
const goodUrls: string[] = []
- await Bluebird.map(payload.uris, uri => {
- return doRequest(uri, options)
- .then(() => goodUrls.push(uri))
- .catch(() => badUrls.push(uri))
+ await map(payload.uris, async uri => {
+ try {
+ await doRequest(uri, options)
+ goodUrls.push(uri)
+ } catch (err) {
+ logger.debug('HTTP broadcast to %s failed.', uri, { err })
+ badUrls.push(uri)
+ }
}, { concurrency: BROADCAST_CONCURRENCY })
- return ActorFollowScoreCache.Instance.updateActorFollowsScore(goodUrls, badUrls)
+ return ActorFollowHealthCache.Instance.updateActorFollowsHealth(goodUrls, badUrls)
}
// ---------------------------------------------------------------------------