Add AP stats

2 files changed, 11 insertions, 69 deletions

diff --git a/server/controllers/activitypub/inbox.ts b/server/controllers/activitypub/inbox.ts
index 67b2c0d66..14f301ab7 100644
--- a/server/controllers/activitypub/inbox.ts
+++ b/server/controllers/activitypub/inbox.ts
@@ -1,13 +1,11 @@
 import * as express from 'express'
+import { InboxManager } from '@server/lib/activitypub/inbox-manager'
 import { Activity, ActivityPubCollection, ActivityPubOrderedCollection, RootActivity } from '../../../shared'
+import { HttpStatusCode } from '../../../shared/core-utils/miscs/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 { MActorDefault, MActorSignature } from '../../types/models'
-import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
 
 const inboxRouter = express.Router()
 
@@ -41,18 +39,6 @@ export {
 
 // ---------------------------------------------------------------------------
 
-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[]
@@ -74,10 +60,12 @@ function inboxController (req: express.Request, res: express.Response) {
 
   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(HttpStatusCode.NO_CONTENT_204).end()
diff --git a/server/controllers/api/server/stats.ts b/server/controllers/api/server/stats.ts
index f07301a04..3aea12450 100644
--- a/server/controllers/api/server/stats.ts
+++ b/server/controllers/api/server/stats.ts
@@ -1,16 +1,8 @@
 import * as express from 'express'
-import { ServerStats } from '../../../../shared/models/server/server-stats.model'
-import { asyncMiddleware } from '../../../middlewares'
-import { UserModel } from '../../../models/account/user'
-import { ActorFollowModel } from '../../../models/activitypub/actor-follow'
-import { VideoModel } from '../../../models/video/video'
-import { VideoCommentModel } from '../../../models/video/video-comment'
-import { VideoRedundancyModel } from '../../../models/redundancy/video-redundancy'
+import { StatsManager } from '@server/lib/stat-manager'
 import { ROUTE_CACHE_LIFETIME } from '../../../initializers/constants'
+import { asyncMiddleware } from '../../../middlewares'
 import { cacheRoute } from '../../../middlewares/cache'
-import { VideoFileModel } from '../../../models/video/video-file'
-import { CONFIG } from '../../../initializers/config'
-import { VideoRedundancyStrategyWithManual } from '@shared/models'
 
 const statsRouter = express.Router()
 
@@ -19,48 +11,10 @@ statsRouter.get('/stats',
   asyncMiddleware(getStats)
 )
 
-async function getStats (req: express.Request, res: express.Response) {
-  const { totalLocalVideos, totalLocalVideoViews, totalVideos } = await VideoModel.getStats()
-  const { totalLocalVideoComments, totalVideoComments } = await VideoCommentModel.getStats()
-  const { totalUsers, totalDailyActiveUsers, totalWeeklyActiveUsers, totalMonthlyActiveUsers } = await UserModel.getStats()
-  const { totalInstanceFollowers, totalInstanceFollowing } = await ActorFollowModel.getStats()
-  const { totalLocalVideoFilesSize } = await VideoFileModel.getStats()
-
-  const strategies = CONFIG.REDUNDANCY.VIDEOS.STRATEGIES
-                          .map(r => ({
-                            strategy: r.strategy as VideoRedundancyStrategyWithManual,
-                            size: r.size
-                          }))
-
-  strategies.push({ strategy: 'manual', size: null })
-
-  const videosRedundancyStats = await Promise.all(
-    strategies.map(r => {
-      return VideoRedundancyModel.getStats(r.strategy)
-        .then(stats => Object.assign(stats, { strategy: r.strategy, totalSize: r.size }))
-    })
-  )
-
-  const data: ServerStats = {
-    totalLocalVideos,
-    totalLocalVideoViews,
-    totalLocalVideoFilesSize,
-    totalLocalVideoComments,
-    totalVideos,
-    totalVideoComments,
-
-    totalUsers,
-    totalDailyActiveUsers,
-    totalWeeklyActiveUsers,
-    totalMonthlyActiveUsers,
-
-    totalInstanceFollowers,
-    totalInstanceFollowing,
-
-    videosRedundancy: videosRedundancyStats
-  }
+async function getStats (_req: express.Request, res: express.Response) {
+  const data = await StatsManager.Instance.getStats()
 
-  return res.json(data).end()
+  return res.json(data)
 }
 
 // ---------------------------------------------------------------------------