Remove uneeded async
This commit is contained in:
parent
ed09acf14b
commit
7a9e420a02
|
@ -104,7 +104,6 @@
|
||||||
"@peertube/feed": "^5.0.1",
|
"@peertube/feed": "^5.0.1",
|
||||||
"@peertube/http-signature": "^1.7.0",
|
"@peertube/http-signature": "^1.7.0",
|
||||||
"@uploadx/core": "^5.1.2",
|
"@uploadx/core": "^5.1.2",
|
||||||
"async": "^3.0.1",
|
|
||||||
"async-lru": "^1.1.1",
|
"async-lru": "^1.1.1",
|
||||||
"bcrypt": "5.0.1",
|
"bcrypt": "5.0.1",
|
||||||
"bencode": "^2.0.2",
|
"bencode": "^2.0.2",
|
||||||
|
@ -179,7 +178,6 @@
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@peertube/maildev": "^1.2.0",
|
"@peertube/maildev": "^1.2.0",
|
||||||
"@types/async": "^3.0.0",
|
|
||||||
"@types/async-lock": "^1.1.0",
|
"@types/async-lock": "^1.1.0",
|
||||||
"@types/bcrypt": "^5.0.0",
|
"@types/bcrypt": "^5.0.0",
|
||||||
"@types/bencode": "^2.0.0",
|
"@types/bencode": "^2.0.0",
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import { queue, QueueObject } from 'async'
|
import PQueue from 'p-queue'
|
||||||
import { logger } from '@server/helpers/logger'
|
import { logger } from '@server/helpers/logger'
|
||||||
import { SCHEDULER_INTERVALS_MS } from '@server/initializers/constants'
|
import { SCHEDULER_INTERVALS_MS } from '@server/initializers/constants'
|
||||||
import { MActorDefault, MActorSignature } from '@server/types/models'
|
import { MActorDefault, MActorSignature } from '@server/types/models'
|
||||||
|
@ -6,42 +6,33 @@ import { Activity } from '@shared/models'
|
||||||
import { StatsManager } from '../stat-manager'
|
import { StatsManager } from '../stat-manager'
|
||||||
import { processActivities } from './process'
|
import { processActivities } from './process'
|
||||||
|
|
||||||
type QueueParam = {
|
|
||||||
activities: Activity[]
|
|
||||||
signatureActor?: MActorSignature
|
|
||||||
inboxActor?: MActorDefault
|
|
||||||
}
|
|
||||||
|
|
||||||
class InboxManager {
|
class InboxManager {
|
||||||
|
|
||||||
private static instance: InboxManager
|
private static instance: InboxManager
|
||||||
|
private readonly inboxQueue: PQueue
|
||||||
private readonly inboxQueue: QueueObject<QueueParam>
|
|
||||||
|
|
||||||
private constructor () {
|
private constructor () {
|
||||||
this.inboxQueue = queue<QueueParam, Error>((task, cb) => {
|
this.inboxQueue = new PQueue({ concurrency: 1 })
|
||||||
const options = { signatureActor: task.signatureActor, inboxActor: task.inboxActor }
|
|
||||||
|
|
||||||
processActivities(task.activities, options)
|
|
||||||
.then(() => cb())
|
|
||||||
.catch(err => {
|
|
||||||
logger.error('Error in process activities.', { err })
|
|
||||||
cb()
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
setInterval(() => {
|
setInterval(() => {
|
||||||
StatsManager.Instance.updateInboxWaiting(this.getActivityPubMessagesWaiting())
|
StatsManager.Instance.updateInboxWaiting(this.getActivityPubMessagesWaiting())
|
||||||
}, SCHEDULER_INTERVALS_MS.UPDATE_INBOX_STATS)
|
}, SCHEDULER_INTERVALS_MS.UPDATE_INBOX_STATS)
|
||||||
}
|
}
|
||||||
|
|
||||||
addInboxMessage (options: QueueParam) {
|
addInboxMessage (param: {
|
||||||
this.inboxQueue.push(options)
|
activities: Activity[]
|
||||||
.catch(err => logger.error('Cannot add options in inbox queue.', { options, err }))
|
signatureActor?: MActorSignature
|
||||||
|
inboxActor?: MActorDefault
|
||||||
|
}) {
|
||||||
|
this.inboxQueue.add(() => {
|
||||||
|
const options = { signatureActor: param.signatureActor, inboxActor: param.inboxActor }
|
||||||
|
|
||||||
|
return processActivities(param.activities, options)
|
||||||
|
}).catch(err => logger.error('Error with inbox queue.', { err }))
|
||||||
}
|
}
|
||||||
|
|
||||||
getActivityPubMessagesWaiting () {
|
getActivityPubMessagesWaiting () {
|
||||||
return this.inboxQueue.length() + this.inboxQueue.running()
|
return this.inboxQueue.size + this.inboxQueue.pending
|
||||||
}
|
}
|
||||||
|
|
||||||
static get Instance () {
|
static get Instance () {
|
||||||
|
|
|
@ -1,21 +1,26 @@
|
||||||
import { eachSeries } from 'async'
|
import Bluebird from 'bluebird'
|
||||||
import { NextFunction, Request, RequestHandler, Response } from 'express'
|
import { NextFunction, Request, RequestHandler, Response } from 'express'
|
||||||
import { ValidationChain } from 'express-validator'
|
import { ValidationChain } from 'express-validator'
|
||||||
import { ExpressPromiseHandler } from '@server/types/express-handler'
|
import { ExpressPromiseHandler } from '@server/types/express-handler'
|
||||||
import { retryTransactionWrapper } from '../helpers/database-utils'
|
import { retryTransactionWrapper } from '../helpers/database-utils'
|
||||||
|
|
||||||
// Syntactic sugar to avoid try/catch in express controllers
|
// Syntactic sugar to avoid try/catch in express controllers/middlewares
|
||||||
// Thanks: https://medium.com/@Abazhenov/using-async-await-in-express-with-node-8-b8af872c0016
|
|
||||||
|
|
||||||
export type RequestPromiseHandler = ValidationChain | ExpressPromiseHandler
|
export type RequestPromiseHandler = ValidationChain | ExpressPromiseHandler
|
||||||
|
|
||||||
function asyncMiddleware (fun: RequestPromiseHandler | RequestPromiseHandler[]) {
|
function asyncMiddleware (fun: RequestPromiseHandler | RequestPromiseHandler[]) {
|
||||||
return (req: Request, res: Response, next: NextFunction) => {
|
return (req: Request, res: Response, next: NextFunction) => {
|
||||||
if (Array.isArray(fun) === true) {
|
if (Array.isArray(fun) === true) {
|
||||||
return eachSeries(fun as RequestHandler[], (f, cb) => {
|
return Bluebird.each(fun as RequestPromiseHandler[], f => {
|
||||||
Promise.resolve(f(req, res, err => cb(err)))
|
return new Promise<void>((resolve, reject) => {
|
||||||
.catch(err => next(err))
|
return asyncMiddleware(f)(req, res, err => {
|
||||||
}, next)
|
if (err) return reject(err)
|
||||||
|
|
||||||
|
return resolve()
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}).then(() => next())
|
||||||
|
.catch(err => next(err))
|
||||||
}
|
}
|
||||||
|
|
||||||
return Promise.resolve((fun as RequestHandler)(req, res, next))
|
return Promise.resolve((fun as RequestHandler)(req, res, next))
|
||||||
|
|
|
@ -1925,11 +1925,6 @@
|
||||||
resolved "https://registry.yarnpkg.com/@types/async-lock/-/async-lock-1.1.5.tgz#a82f33e09aef451d6ded7bffae73f9d254723124"
|
resolved "https://registry.yarnpkg.com/@types/async-lock/-/async-lock-1.1.5.tgz#a82f33e09aef451d6ded7bffae73f9d254723124"
|
||||||
integrity sha512-A9ClUfmj6wwZMLRz0NaYzb98YH1exlHdf/cdDSKBfMQJnPOdO8xlEW0Eh2QsTTntGzOFWURcEjYElkZ1IY4GCQ==
|
integrity sha512-A9ClUfmj6wwZMLRz0NaYzb98YH1exlHdf/cdDSKBfMQJnPOdO8xlEW0Eh2QsTTntGzOFWURcEjYElkZ1IY4GCQ==
|
||||||
|
|
||||||
"@types/async@^3.0.0":
|
|
||||||
version "3.2.15"
|
|
||||||
resolved "https://registry.yarnpkg.com/@types/async/-/async-3.2.15.tgz#26d4768fdda0e466f18d6c9918ca28cc89a4e1fe"
|
|
||||||
integrity sha512-PAmPfzvFA31mRoqZyTVsgJMsvbynR429UTTxhmfsUCrWGh3/fxOrzqBtaTPJsn4UtzTv4Vb0+/O7CARWb69N4g==
|
|
||||||
|
|
||||||
"@types/bcrypt@^5.0.0":
|
"@types/bcrypt@^5.0.0":
|
||||||
version "5.0.0"
|
version "5.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/@types/bcrypt/-/bcrypt-5.0.0.tgz#a835afa2882d165aff5690893db314eaa98b9f20"
|
resolved "https://registry.yarnpkg.com/@types/bcrypt/-/bcrypt-5.0.0.tgz#a835afa2882d165aff5690893db314eaa98b9f20"
|
||||||
|
@ -2802,7 +2797,7 @@ async@3.2.3:
|
||||||
resolved "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz#ac53dafd3f4720ee9e8a160628f18ea91df196c9"
|
resolved "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz#ac53dafd3f4720ee9e8a160628f18ea91df196c9"
|
||||||
integrity sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==
|
integrity sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==
|
||||||
|
|
||||||
async@>=0.2.9, async@^3.0.1, async@^3.1.0, async@^3.2.3:
|
async@>=0.2.9, async@^3.1.0, async@^3.2.3:
|
||||||
version "3.2.4"
|
version "3.2.4"
|
||||||
resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c"
|
resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c"
|
||||||
integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==
|
integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==
|
||||||
|
|
Loading…
Reference in New Issue
Block a user