-import * as express from 'express'
-import { Activity, ActivityPubCollection, ActivityPubOrderedCollection, RootActivity } from '../../../shared'
+import express from 'express'
+import { InboxManager } from '@server/lib/activitypub/inbox-manager'
+import { Activity, ActivityPubCollection, ActivityPubOrderedCollection, RootActivity } from '@shared/models'
+import { HttpStatusCode } from '../../../shared/models/http/http-error-codes'
import { isActivityValid } from '../../helpers/custom-validators/activitypub/activity'
import { logger } from '../../helpers/logger'
-import { processActivities } from '../../lib/activitypub/process/process'
-import { asyncMiddleware, checkSignature, localAccountValidator, localVideoChannelValidator, signatureValidator } from '../../middlewares'
+import {
+ asyncMiddleware,
+ checkSignature,
+ ensureIsLocalChannel,
+ localAccountValidator,
+ signatureValidator,
+ videoChannelsNameWithHostValidator
+} from '../../middlewares'
import { activityPubValidator } from '../../middlewares/validators/activitypub/activity'
-import { queue } from 'async'
-import { MActorDefault, MActorSignature } from '../../typings/models'
const inboxRouter = express.Router()
asyncMiddleware(activityPubValidator),
inboxController
)
-inboxRouter.post('/video-channels/:name/inbox',
+inboxRouter.post('/video-channels/:nameWithHost/inbox',
signatureValidator,
asyncMiddleware(checkSignature),
- asyncMiddleware(localVideoChannelValidator),
+ asyncMiddleware(videoChannelsNameWithHostValidator),
+ ensureIsLocalChannel,
asyncMiddleware(activityPubValidator),
inboxController
)
// ---------------------------------------------------------------------------
-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[]
logger.info('Receiving inbox requests for %d activities by %s.', activities.length, res.locals.signature.actor.url)
- inboxQueue.push({
+ InboxManager.Instance.addInboxMessage({
activities,
signatureActor: res.locals.signature.actor,
- inboxActor: accountOrChannel ? accountOrChannel.Actor : undefined
+ inboxActor: accountOrChannel
+ ? accountOrChannel.Actor
+ : undefined
})
- return res.status(204).end()
+ return res.status(HttpStatusCode.NO_CONTENT_204).end()
}