-import * as kue from 'kue'
+import { Job } from 'bullmq'
+import { buildGlobalHeaders, buildSignedRequestOptions, computeBody } from '@server/lib/activitypub/send'
+import { ActivitypubHttpUnicastPayload } 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 { JOB_REQUEST_TIMEOUT } from '../../../initializers'
-
-export type ActivitypubHttpUnicastPayload = {
- uri: string
- signatureActorId?: number
- body: any
-}
+import { ActorFollowHealthCache } from '../../actor-follow-health-cache'
-async function processActivityPubHttpUnicast (job: kue.Job) {
- logger.info('Processing ActivityPub unicast in job %d.', job.id)
+async function processActivityPubHttpUnicast (job: Job) {
+ logger.info('Processing ActivityPub unicast in job %s.', job.id)
const payload = job.data as ActivitypubHttpUnicastPayload
const uri = payload.uri
const httpSignatureOptions = await buildSignedRequestOptions(payload)
const options = {
- method: 'POST',
- uri,
+ method: 'POST' as 'POST',
json: body,
httpSignature: httpSignatureOptions,
- timeout: JOB_REQUEST_TIMEOUT
+ headers: buildGlobalHeaders(body)
}
try {
- await doRequest(options)
- ActorFollowModel.updateActorFollowsScore([ uri ], [], undefined)
+ await doRequest(uri, options)
+ ActorFollowHealthCache.Instance.updateActorFollowsHealth([ uri ], [])
} catch (err) {
- ActorFollowModel.updateActorFollowsScore([], [ uri ], undefined)
+ ActorFollowHealthCache.Instance.updateActorFollowsHealth([], [ uri ])
throw err
}