Chore/patch dependencies (#4858)

patch dependencies

packages/server/src/index.ts

@@ -34,6 +34,7 @@ import { Workspace } from './enterprise/database/entities/workspace.entity'
 import { Organization } from './enterprise/database/entities/organization.entity'
 import { GeneralRole, Role } from './enterprise/database/entities/role.entity'
 import { migrateApiKeysFromJsonToDb } from './utils/apiKey'
+import { ExpressAdapter } from '@bull-board/express'
 
 declare global {
     namespace Express {
@@ -128,13 +129,16 @@ export class App {
             // Init Queues
             if (process.env.MODE === MODE.QUEUE) {
                 this.queueManager = QueueManager.getInstance()
+                const serverAdapter = new ExpressAdapter()
+                serverAdapter.setBasePath('/admin/queues')
                 this.queueManager.setupAllQueues({
                     componentNodes: this.nodesPool.componentNodes,
                     telemetry: this.telemetry,
                     cachePool: this.cachePool,
                     appDataSource: this.AppDataSource,
                     abortControllerPool: this.abortControllerPool,
-                    usageCacheManager: this.usageCacheManager
+                    usageCacheManager: this.usageCacheManager,
+                    serverAdapter
                 })
                 logger.info('✅ [Queue]: All queues setup successfully')
 

packages/server/src/queue/QueueManager.ts

@@ -7,10 +7,11 @@ import { CachePool } from '../CachePool'
 import { DataSource } from 'typeorm'
 import { AbortControllerPool } from '../AbortControllerPool'
 import { QueueEventsProducer, RedisOptions } from 'bullmq'
-import { createBullBoard } from 'bull-board'
-import { BullMQAdapter } from 'bull-board/bullMQAdapter'
+import { createBullBoard } from '@bull-board/api'
+import { BullMQAdapter } from '@bull-board/api/bullMQAdapter'
 import { Express } from 'express'
 import { UsageCacheManager } from '../UsageCacheManager'
+import { ExpressAdapter } from '@bull-board/express'
 
 const QUEUE_NAME = process.env.QUEUE_NAME || 'flowise-queue'
 
@@ -98,7 +99,8 @@ export class QueueManager {
         cachePool,
         appDataSource,
         abortControllerPool,
-        usageCacheManager
+        usageCacheManager,
+        serverAdapter
     }: {
         componentNodes: IComponentNodes
         telemetry: Telemetry
@@ -106,6 +108,7 @@ export class QueueManager {
         appDataSource: DataSource
         abortControllerPool: AbortControllerPool
         usageCacheManager: UsageCacheManager
+        serverAdapter?: ExpressAdapter
     }) {
         const predictionQueueName = `${QUEUE_NAME}-prediction`
         const predictionQueue = new PredictionQueue(predictionQueueName, this.connection, {
@@ -131,7 +134,12 @@ export class QueueManager {
         })
         this.registerQueue('upsert', upsertionQueue)
 
-        const bullboard = createBullBoard([new BullMQAdapter(predictionQueue.getQueue()), new BullMQAdapter(upsertionQueue.getQueue())])
-        this.bullBoardRouter = bullboard.router
+        if (serverAdapter) {
+            createBullBoard({
+                queues: [new BullMQAdapter(predictionQueue.getQueue()), new BullMQAdapter(upsertionQueue.getQueue())],
+                serverAdapter: serverAdapter
+            })
+            this.bullBoardRouter = serverAdapter.getRouter()
+        }
     }
 }