-import * as kue from 'kue'
+import * as Bull from 'bull'
+import * as Bluebird from 'bluebird'
import { logger } from '../../../helpers/logger'
import { doRequest } from '../../../helpers/requests'
import { ActorFollowModel } from '../../../models/activitypub/actor-follow'
import { buildSignedRequestOptions, computeBody } from './utils/activitypub-http-utils'
+import { BROADCAST_CONCURRENCY, JOB_REQUEST_TIMEOUT } from '../../../initializers'
export type ActivitypubHttpBroadcastPayload = {
uris: string[]
body: any
}
-async function processActivityPubHttpBroadcast (job: kue.Job) {
+async function processActivityPubHttpBroadcast (job: Bull.Job) {
logger.info('Processing ActivityPub broadcast in job %d.', job.id)
const payload = job.data as ActivitypubHttpBroadcastPayload
method: 'POST',
uri: '',
json: body,
- httpSignature: httpSignatureOptions
+ httpSignature: httpSignatureOptions,
+ timeout: JOB_REQUEST_TIMEOUT
}
const badUrls: string[] = []
const goodUrls: string[] = []
- for (const uri of payload.uris) {
- options.uri = uri
-
- try {
- await doRequest(options)
- goodUrls.push(uri)
- } catch (err) {
- badUrls.push(uri)
- }
- }
+ await Bluebird.map(payload.uris, uri => {
+ return doRequest(Object.assign({}, options, { uri }))
+ .then(() => goodUrls.push(uri))
+ .catch(() => badUrls.push(uri))
+ }, { concurrency: BROADCAST_CONCURRENCY })
return ActorFollowModel.updateActorFollowsScore(goodUrls, badUrls, undefined)
}