refactor: Use Map to save given queues instead of POJO

felixmosh · Apr 26, 2021 · 6f2c487 · 6f2c487
1 parent 2aa46c7
commit 6f2c487
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 24 deletions.
diff --git a/src/@types/app.ts b/src/@types/app.ts
@@ -47,13 +47,7 @@ export interface QueueAdapterOptions {
   readOnlyMode: boolean
 }
 
-export interface BullBoardQueue {
-  queue: QueueAdapter
-}
-
-export interface BullBoardQueues {
-  [key: string]: BullBoardQueue
-}
+export type BullBoardQueues = Map<string, QueueAdapter>
 
 export interface ValidMetrics {
   total_system_memory: string

diff --git a/src/index.ts b/src/index.ts
@@ -20,7 +20,7 @@ import { retryJob } from './routes/retryJob'
 export { BullMQAdapter } from './queueAdapters/bullMQ'
 export { BullAdapter } from './queueAdapters/bull'
 
-const bullBoardQueues: BullBoardQueues = {}
+const bullBoardQueues: BullBoardQueues = new Map<string, QueueAdapter>()
 
 const wrapAsync = <Params extends ParamsDictionary>(
   fn: RequestHandler<Params>,
@@ -49,7 +49,7 @@ export const setQueues = (bullQueues: ReadonlyArray<QueueAdapter>): void => {
   bullQueues.forEach((queue) => {
     const name = queue.getName()
 
-    bullBoardQueues[name] = { queue }
+    bullBoardQueues.set(name, queue)
   })
 }
 
@@ -58,9 +58,9 @@ export const replaceQueues = (
 ): void => {
   const queuesToPersist: string[] = bullQueues.map((queue) => queue.getName())
 
-  Object.keys(bullBoardQueues).forEach((name) => {
+  bullBoardQueues.forEach((_queue, name) => {
     if (queuesToPersist.indexOf(name) === -1) {
-      delete bullBoardQueues[name]
+      bullBoardQueues.delete(name)
     }
   })
 

diff --git a/src/routes/cleanAll.ts b/src/routes/cleanAll.ts
@@ -17,7 +17,7 @@ export const cleanAll: RequestHandler<RequestParams> = async (
 
   const GRACE_TIME_MS = 5000
 
-  const { queue } = bullBoardQueues[queueName]
+  const queue = bullBoardQueues.get(queueName)
   if (!queue) {
     return res.status(404).send({
       error: 'Queue not found',

diff --git a/src/routes/cleanJob.ts b/src/routes/cleanJob.ts
@@ -6,7 +6,7 @@ export const cleanJob: RequestHandler = async (req: Request, res: Response) => {
     bullBoardQueues: BullBoardQueues
   }
   const { queueName, id } = req.params
-  const { queue } = bullBoardQueues[queueName]
+  const queue = bullBoardQueues.get(queueName)
 
   if (!queue) {
     return res.status(404).send({

diff --git a/src/routes/jobLogs.ts b/src/routes/jobLogs.ts
@@ -6,7 +6,7 @@ export const jobLogs: RequestHandler = async (req: Request, res: Response) => {
     bullBoardQueues: BullBoardQueues
   }
   const { queueName, id } = req.params
-  const { queue } = bullBoardQueues[queueName]
+  const queue = bullBoardQueues.get(queueName)
 
   if (!queue) {
     return res.status(404).send({

diff --git a/src/routes/promoteJob.ts b/src/routes/promoteJob.ts
@@ -9,7 +9,7 @@ export const promoteJob: RequestHandler = async (
     bullBoardQueues: BullBoardQueues
   }
   const { queueName, id } = req.params
-  const { queue } = bullBoardQueues[queueName]
+  const queue = bullBoardQueues.get(queueName)
 
   if (!queue) {
     return res.status(404).send({

diff --git a/src/routes/queues.ts b/src/routes/queues.ts
@@ -5,7 +5,7 @@ import { parse as parseRedisInfo } from 'redis-info'
 
 import * as api from '../@types/api'
 import * as app from '../@types/app'
-import { JobStatus, QueueAdapter } from '../@types/app'
+import { BullBoardQueues, JobStatus, QueueAdapter } from '../@types/app'
 import { Status } from '../ui/components/constants'
 
 type MetricName = keyof app.ValidMetrics
@@ -18,9 +18,7 @@ const metrics: MetricName[] = [
   'blocked_clients',
 ]
 
-const getStats = async ({
-  queue,
-}: app.BullBoardQueue): Promise<app.ValidMetrics> => {
+const getStats = async (queue: QueueAdapter): Promise<app.ValidMetrics> => {
   const redisClient = await queue.getClient()
   const redisInfoRaw = await redisClient.info()
   const redisInfo = parseRedisInfo(redisInfoRaw)
@@ -73,7 +71,7 @@ const getDataForQueues = async (
   req: Request,
 ): Promise<api.GetQueues> => {
   const query = req.query || {}
-  const pairs = Object.entries(bullBoardQueues)
+  const pairs = [...bullBoardQueues.entries()]
 
   if (pairs.length == 0) {
     return {
@@ -83,7 +81,7 @@ const getDataForQueues = async (
   }
 
   const queues: app.AppQueue[] = await Promise.all(
-    pairs.map(async ([name, { queue }]) => {
+    pairs.map(async ([name, queue]) => {
       const counts = await queue.getJobCounts(...statuses)
       const status =
         query[name] === 'latest' ? statuses : (query[name] as JobStatus[])
@@ -110,7 +108,9 @@ export const queuesHandler: RequestHandler = async (
   req: Request,
   res: Response,
 ) => {
-  const { bullBoardQueues } = req.app.locals
+  const { bullBoardQueues } = req.app.locals as {
+    bullBoardQueues: BullBoardQueues
+  }
 
   res.json(await getDataForQueues(bullBoardQueues, req))
 }
diff --git a/src/routes/retryAll.ts b/src/routes/retryAll.ts
@@ -8,7 +8,7 @@ export const retryAll: RequestHandler = async (req: Request, res: Response) => {
     bullBoardQueues: BullBoardQueues
   }
 
-  const { queue } = bullBoardQueues[queueName]
+  const queue = bullBoardQueues.get(queueName)
   if (!queue) {
     return res.status(404).send({ error: 'queue not found' })
   } else if (queue.readOnlyMode) {

diff --git a/src/routes/retryJob.ts b/src/routes/retryJob.ts
@@ -6,7 +6,7 @@ export const retryJob: RequestHandler = async (req: Request, res: Response) => {
     bullBoardQueues: BullBoardQueues
   }
   const { queueName, id } = req.params
-  const { queue } = bullBoardQueues[queueName]
+  const queue = bullBoardQueues.get(queueName)
 
   if (!queue) {
     return res.status(404).send({