OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Process inbox activities in a queue

pull/1074/head
Chocobozzz 2018-09-14 16:47:15 +02:00
parent 4b5384f6e7
commit d61b817890
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
server/controllers/activitypub/inbox.ts
View File

@ -7,6 +7,8 @@ import { asyncMiddleware, checkSignature, localAccountValidator, localVideoChann
import { activityPubValidator } from '../../middlewares/validators/activitypub/activity' import { activityPubValidator } from '../../middlewares/validators/activitypub/activity'
import { VideoChannelModel } from '../../models/video/video-channel' import { VideoChannelModel } from '../../models/video/video-channel'
import { AccountModel } from '../../models/account/account' import { AccountModel } from '../../models/account/account'
import { queue } from 'async'
import { ActorModel } from '../../models/activitypub/actor'
const inboxRouter = express.Router() const inboxRouter = express.Router()
@ -14,7 +16,7 @@ inboxRouter.post('/inbox',
signatureValidator, signatureValidator,
asyncMiddleware(checkSignature), asyncMiddleware(checkSignature),
asyncMiddleware(activityPubValidator), asyncMiddleware(activityPubValidator),
asyncMiddleware(inboxController) inboxController
) )
inboxRouter.post('/accounts/:name/inbox', inboxRouter.post('/accounts/:name/inbox',
@ -22,14 +24,14 @@ inboxRouter.post('/accounts/:name/inbox',
asyncMiddleware(checkSignature), asyncMiddleware(checkSignature),
asyncMiddleware(localAccountValidator), asyncMiddleware(localAccountValidator),
asyncMiddleware(activityPubValidator), asyncMiddleware(activityPubValidator),
asyncMiddleware(inboxController) inboxController
) )
inboxRouter.post('/video-channels/:name/inbox', inboxRouter.post('/video-channels/:name/inbox',
signatureValidator, signatureValidator,
asyncMiddleware(checkSignature), asyncMiddleware(checkSignature),
asyncMiddleware(localVideoChannelValidator), asyncMiddleware(localVideoChannelValidator),
asyncMiddleware(activityPubValidator), asyncMiddleware(activityPubValidator),
asyncMiddleware(inboxController) inboxController
) )
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@ -40,7 +42,12 @@ export {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
async function inboxController (req: express.Request, res: express.Response, next: express.NextFunction) { const inboxQueue = queue<{ activities: Activity[], signatureActor?: ActorModel, inboxActor?: ActorModel }, Error>((task, cb) => {
processActivities(task.activities, task.signatureActor, task.inboxActor)
.then(() => cb())
})
function inboxController (req: express.Request, res: express.Response, next: express.NextFunction) {
const rootActivity: RootActivity = req.body const rootActivity: RootActivity = req.body
let activities: Activity[] = [] let activities: Activity[] = []
@ -66,7 +73,11 @@ async function inboxController (req: express.Request, res: express.Response, nex
logger.info('Receiving inbox requests for %d activities by %s.', activities.length, res.locals.signature.actor.url) 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()
} }