import * as express from 'express'
+import { InboxManager } from '@server/lib/activitypub/inbox-manager'
import { Activity, ActivityPubCollection, ActivityPubOrderedCollection, RootActivity } from '../../../shared'
+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 { activityPubValidator } from '../../middlewares/validators/activitypub/activity'
-import { queue } from 'async'
-import { ActorModel } from '../../models/activitypub/actor'
const inboxRouter = express.Router()
// ---------------------------------------------------------------------------
-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[] = []
+ 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 ]
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()
}