@midwayjs/bull-board 3.19.3 → 3.20.0

package/dist/board.middleware.d.ts

@@ -1,11 +1,11 @@
-import { IMiddleware, IMidwayApplication, IMidwayContext, NextFunction } from '@midwayjs/core';
-import * as bull from '@midwayjs/bull';
+import { IMiddleware, IMidwayApplication, IMidwayContext, NextFunction, IMidwayContainer, MidwayFrameworkService } from '@midwayjs/core';
 import { BullBoardOption } from './interface';
 import { BullBoardManager } from './board.manager';
 export declare class BoardMiddleware implements IMiddleware<IMidwayContext, NextFunction, unknown> {
-    protected framework: bull.Framework;
+    protected frameworkService: MidwayFrameworkService;
     protected bullBoardConfig: BullBoardOption;
     protected bullBoardManager: BullBoardManager;
+    protected applicationContext: IMidwayContainer;
     private basePath;
     private serverAdapter;
     protected init(): Promise<void>;

package/dist/board.middleware.js

@@ -12,9 +12,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BoardMiddleware = void 0;
 const core_1 = require("@midwayjs/core");
 const path_1 = require("path");
-const bull = require("@midwayjs/bull");
 const api_1 = require("@bull-board/api");
 const bullAdapter_1 = require("@bull-board/api/bullAdapter");
+const bullMQAdapter_1 = require("@bull-board/api/bullMQAdapter");
 const adapter_1 = require("./adapter");
 const board_manager_1 = require("./board.manager");
 const MIME_MAP = {
@@ -37,8 +37,22 @@ const MIME_MAP = {
 };
 let BoardMiddleware = class BoardMiddleware {
     async init() {
-        const queueList = this.framework.getQueueList();
-        const wrapQueues = queueList.map(queue => new bullAdapter_1.BullAdapter(queue));
+        let framework = this.frameworkService.getFramework('bull');
+        if (!framework) {
+            framework = this.frameworkService.getFramework('bullmq');
+        }
+        if (!framework) {
+            return;
+        }
+        const queueList = framework.getQueueList();
+        const wrapQueues = queueList.map(queue => {
+            if (this.applicationContext.hasNamespace('bull')) {
+                return new bullAdapter_1.BullAdapter(queue);
+            }
+            else if (this.applicationContext.hasNamespace('bullmq')) {
+                return new bullMQAdapter_1.BullMQAdapter(queue);
+            }
+        });
         this.basePath = this.bullBoardConfig.basePath;
         this.serverAdapter = new adapter_1.MidwayAdapter();
         const bullBoard = (0, api_1.createBullBoard)({
@@ -139,8 +153,8 @@ let BoardMiddleware = class BoardMiddleware {
 };
 __decorate([
     (0, core_1.Inject)(),
-    __metadata("design:type", bull.Framework)
-], BoardMiddleware.prototype, "framework", void 0);
+    __metadata("design:type", core_1.MidwayFrameworkService)
+], BoardMiddleware.prototype, "frameworkService", void 0);
 __decorate([
     (0, core_1.Config)('bullBoard'),
     __metadata("design:type", Object)
@@ -149,6 +163,10 @@ __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", board_manager_1.BullBoardManager)
 ], BoardMiddleware.prototype, "bullBoardManager", void 0);
+__decorate([
+    (0, core_1.ApplicationContext)(),
+    __metadata("design:type", Object)
+], BoardMiddleware.prototype, "applicationContext", void 0);
 __decorate([
     (0, core_1.Init)(),
     __metadata("design:type", Function),

package/dist/configuration.d.ts

@@ -1,7 +1,7 @@
-import { MidwayApplicationManager, MidwayConfigService } from '@midwayjs/core';
+import { IMidwayContainer, MidwayApplicationManager, MidwayConfigService } from '@midwayjs/core';
 export declare class BullBoardConfiguration {
     applicationManager: MidwayApplicationManager;
     configService: MidwayConfigService;
-    onReady(): Promise<void>;
+    onReady(container: IMidwayContainer): Promise<void>;
 }
 //# sourceMappingURL=configuration.d.ts.map

package/dist/configuration.js

@@ -10,11 +10,10 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BullBoardConfiguration = void 0;
-const bull = require("@midwayjs/bull");
 const core_1 = require("@midwayjs/core");
 const board_middleware_1 = require("./board.middleware");
 let BullBoardConfiguration = class BullBoardConfiguration {
-    async onReady() {
+    async onReady(container) {
         const apps = this.applicationManager.getApplications([
             'express',
             'egg',
@@ -22,7 +21,10 @@ let BullBoardConfiguration = class BullBoardConfiguration {
         ]);
         if (apps.length) {
             apps.forEach(app => {
-                app.useMiddleware(board_middleware_1.BoardMiddleware);
+                if (container.hasNamespace('bull') ||
+                    container.hasNamespace('bullmq')) {
+                    app.useMiddleware(board_middleware_1.BoardMiddleware);
+                }
             });
         }
     }
@@ -38,7 +40,6 @@ __decorate([
 BullBoardConfiguration = __decorate([
     (0, core_1.Configuration)({
         namespace: 'bull-board',
-        imports: [bull],
         importConfigs: [
             {
                 default: {

package/index.d.ts

@@ -1,4 +1,3 @@
-import '@midwayjs/bull';
 import { BullBoardOption } from './dist/index';
 export * from './dist/index';
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/bull-board",
-  "version": "3.19.3",
+  "version": "3.20.0",
   "description": "midway component for bull",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -13,6 +13,7 @@
     "midway",
     "IoC",
     "bull",
+    "bullmq",
     "bull-ui",
     "plugin"
   ],
@@ -24,19 +25,20 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/core": "^3.19.0",
-    "@midwayjs/express": "^3.19.2",
-    "@midwayjs/koa": "^3.19.2",
-    "@midwayjs/mock": "^3.19.2"
+    "@midwayjs/bull": "^3.20.0",
+    "@midwayjs/bullmq": "^3.20.0",
+    "@midwayjs/core": "^3.20.0",
+    "@midwayjs/express": "^3.20.0",
+    "@midwayjs/koa": "^3.20.0",
+    "@midwayjs/mock": "^3.20.0"
   },
   "dependencies": {
     "@bull-board/api": "5.23.0",
     "@bull-board/ui": "5.23.0",
-    "@midwayjs/bull": "^3.19.3",
     "ejs": "3.1.10"
   },
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "7c45ca2710e6495d5555419de5b2ab645696c823"
+  "gitHead": "5bf838ec6054f6e1e983664b0456a975db795932"
 }