-import * as kue from 'kue'
import * as Bluebird from 'bluebird'
+import * as Bull from 'bull'
+import { ActivitypubHttpBroadcastPayload } from '@shared/models'
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 } from '../../../initializers'
-
-export type ActivitypubHttpBroadcastPayload = {
- uris: string[]
- signatureActorId?: number
- body: any
-}
+import { BROADCAST_CONCURRENCY, REQUEST_TIMEOUT } from '../../../initializers/constants'
+import { ActorFollowScoreCache } from '../../files-cache'
+import { buildGlobalHeaders, buildSignedRequestOptions, computeBody } from './utils/activitypub-http-utils'
-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
const httpSignatureOptions = await buildSignedRequestOptions(payload)
const options = {
- method: 'POST',
- uri: '',
+ method: 'POST' as 'POST',
json: body,
- httpSignature: httpSignatureOptions
+ httpSignature: httpSignatureOptions,
+ timeout: REQUEST_TIMEOUT,
+ headers: buildGlobalHeaders(body)
}
const badUrls: string[] = []
const goodUrls: string[] = []
await Bluebird.map(payload.uris, uri => {
- return doRequest(Object.assign({}, options, { uri }))
+ return doRequest(uri, options)
.then(() => goodUrls.push(uri))
.catch(() => badUrls.push(uri))
}, { concurrency: BROADCAST_CONCURRENCY })
- return ActorFollowModel.updateActorFollowsScore(goodUrls, badUrls, undefined)
+ return ActorFollowScoreCache.Instance.updateActorFollowsScore(goodUrls, badUrls)
}
// ---------------------------------------------------------------------------