import * as express from 'express'
import { Activity, ActivityPubCollection, ActivityPubOrderedCollection, RootActivity } from '../../../shared'
-import { logger } from '../../helpers'
import { isActivityValid } from '../../helpers/custom-validators/activitypub/activity'
+import { logger } from '../../helpers/logger'
import { processActivities } from '../../lib/activitypub/process/process'
-import { asyncMiddleware, checkSignature, localAccountValidator, signatureValidator } from '../../middlewares'
+import { asyncMiddleware, checkSignature, localAccountValidator, localVideoChannelValidator, signatureValidator } from '../../middlewares'
import { activityPubValidator } from '../../middlewares/validators/activitypub/activity'
+import { queue } from 'async'
+import { ActorModel } from '../../models/activitypub/actor'
const inboxRouter = express.Router()
inboxRouter.post('/inbox',
signatureValidator,
asyncMiddleware(checkSignature),
- activityPubValidator,
- asyncMiddleware(inboxController)
+ asyncMiddleware(activityPubValidator),
+ inboxController
)
-inboxRouter.post('/account/:name/inbox',
+inboxRouter.post('/accounts/:name/inbox',
signatureValidator,
asyncMiddleware(checkSignature),
- localAccountValidator,
- activityPubValidator,
- asyncMiddleware(inboxController)
+ asyncMiddleware(localAccountValidator),
+ asyncMiddleware(activityPubValidator),
+ inboxController
+)
+inboxRouter.post('/video-channels/:name/inbox',
+ signatureValidator,
+ asyncMiddleware(checkSignature),
+ asyncMiddleware(localVideoChannelValidator),
+ asyncMiddleware(activityPubValidator),
+ inboxController
)
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
-async function inboxController (req: express.Request, res: express.Response, next: express.NextFunction) {
+const inboxQueue = queue<{ activities: Activity[], signatureActor?: ActorModel, inboxActor?: ActorModel }, Error>((task, cb) => {
+ const options = { signatureActor: task.signatureActor, inboxActor: task.inboxActor }
+
+ processActivities(task.activities, options)
+ .then(() => cb())
+})
+
+function inboxController (req: express.Request, res: express.Response) {
const rootActivity: RootActivity = req.body
let activities: Activity[] = []
}
// Only keep activities we are able to process
- logger.debug('Filtering activities...', { activities })
+ logger.debug('Filtering %d activities...', activities.length)
activities = activities.filter(a => isActivityValid(a))
logger.debug('We keep %d activities.', activities.length, { activities })
- await processActivities(activities, res.locals.account)
+ 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)
+
+ inboxQueue.push({
+ activities,
+ signatureActor: res.locals.signature.actor,
+ inboxActor: accountOrChannel ? accountOrChannel.Actor : undefined
+ })
- res.status(204).end()
+ return res.status(204).end()
}