import { processActivities } from '../../lib/activitypub/process/process'
import { asyncMiddleware, checkSignature, localAccountValidator, localVideoChannelValidator, signatureValidator } from '../../middlewares'
import { activityPubValidator } from '../../middlewares/validators/activitypub/activity'
-import { VideoChannelModel } from '../../models/video/video-channel'
-import { AccountModel } from '../../models/account/account'
+import { queue } from 'async'
+import { MActorDefault, MActorSignature } from '../../types/models'
const inboxRouter = express.Router()
signatureValidator,
asyncMiddleware(checkSignature),
asyncMiddleware(activityPubValidator),
- asyncMiddleware(inboxController)
+ inboxController
)
inboxRouter.post('/accounts/:name/inbox',
asyncMiddleware(checkSignature),
asyncMiddleware(localAccountValidator),
asyncMiddleware(activityPubValidator),
- asyncMiddleware(inboxController)
+ inboxController
)
inboxRouter.post('/video-channels/:name/inbox',
signatureValidator,
asyncMiddleware(checkSignature),
asyncMiddleware(localVideoChannelValidator),
asyncMiddleware(activityPubValidator),
- asyncMiddleware(inboxController)
+ inboxController
)
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
-async function inboxController (req: express.Request, res: express.Response, next: express.NextFunction) {
+type QueueParam = { activities: Activity[], signatureActor?: MActorSignature, inboxActor?: MActorDefault }
+const inboxQueue = queue<QueueParam, Error>((task, cb) => {
+ const options = { signatureActor: task.signatureActor, inboxActor: task.inboxActor }
+
+ processActivities(task.activities, options)
+ .then(() => cb())
+ .catch(err => {
+ logger.error('Error in process activities.', { err })
+ cb()
+ })
+})
+
+function inboxController (req: express.Request, res: express.Response) {
const rootActivity: RootActivity = req.body
- let activities: Activity[] = []
+ let activities: Activity[]
- if ([ 'Collection', 'CollectionPage' ].indexOf(rootActivity.type) !== -1) {
+ if ([ 'Collection', 'CollectionPage' ].includes(rootActivity.type)) {
activities = (rootActivity as ActivityPubCollection).items
- } else if ([ 'OrderedCollection', 'OrderedCollectionPage' ].indexOf(rootActivity.type) !== -1) {
+ } else if ([ 'OrderedCollection', 'OrderedCollectionPage' ].includes(rootActivity.type)) {
activities = (rootActivity as ActivityPubOrderedCollection<Activity>).orderedItems
} else {
activities = [ rootActivity as Activity ]
activities = activities.filter(a => isActivityValid(a))
logger.debug('We keep %d activities.', activities.length, { activities })
- let accountOrChannel: VideoChannelModel | AccountModel
- if (res.locals.account) {
- accountOrChannel = res.locals.account
- } else if (res.locals.videoChannel) {
- accountOrChannel = res.locals.videoChannel
- }
+ const accountOrChannel = res.locals.account || res.locals.videoChannel
logger.info('Receiving inbox requests for %d activities by %s.', activities.length, res.locals.signature.actor.url)
- await processActivities(activities, res.locals.signature.actor, accountOrChannel ? accountOrChannel.Actor : undefined)
+ inboxQueue.push({
+ activities,
+ signatureActor: res.locals.signature.actor,
+ inboxActor: accountOrChannel ? accountOrChannel.Actor : undefined
+ })
- res.status(204).end()
+ return res.status(204).end()
}