@midwayjs/bull-board 3.20.5 → 3.20.6-beta.1

package/dist/board.manager.d.ts

@@ -1,7 +1,18 @@
+import { IMidwayContainer, MidwayFrameworkService } from '@midwayjs/core';
 import { createBullBoard } from '@bull-board/api';
 import { BaseAdapter } from '@bull-board/api/dist/src/queueAdapters/base';
+import { MidwayAdapter } from './adapter';
+import { BullBoardOption } from './interface';
 export declare class BullBoardManager {
     private bullBoard;
+    protected bullBoardConfig: BullBoardOption;
+    protected frameworkService: MidwayFrameworkService;
+    protected applicationContext: IMidwayContainer;
+    private basePath;
+    private serverAdapter;
+    protected init(): Promise<void>;
+    getBasePath(): string;
+    getServerAdapter(): MidwayAdapter;
     setBullBoard(bullBoard: ReturnType<typeof createBullBoard>): void;
     getBullBoardOrigin(): ReturnType<typeof createBullBoard>;
     addQueue(queue: BaseAdapter): void;

package/dist/board.manager.js

@@ -5,10 +5,51 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BullBoardManager = void 0;
 const core_1 = require("@midwayjs/core");
+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");
 let BullBoardManager = class BullBoardManager {
+    async init() {
+        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();
+        this.bullBoard = (0, api_1.createBullBoard)({
+            queues: wrapQueues,
+            serverAdapter: this.serverAdapter,
+            options: {
+                uiConfig: this.bullBoardConfig.uiConfig,
+            },
+        });
+        this.serverAdapter.setBasePath(this.basePath);
+    }
+    getBasePath() {
+        return this.basePath;
+    }
+    getServerAdapter() {
+        return this.serverAdapter;
+    }
     setBullBoard(bullBoard) {
         this.bullBoard = bullBoard;
     }
@@ -28,6 +69,24 @@ let BullBoardManager = class BullBoardManager {
         this.bullBoard.setQueues(newBullQueues);
     }
 };
+__decorate([
+    (0, core_1.Config)('bullBoard'),
+    __metadata("design:type", Object)
+], BullBoardManager.prototype, "bullBoardConfig", void 0);
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", core_1.MidwayFrameworkService)
+], BullBoardManager.prototype, "frameworkService", void 0);
+__decorate([
+    (0, core_1.ApplicationContext)(),
+    __metadata("design:type", Object)
+], BullBoardManager.prototype, "applicationContext", void 0);
+__decorate([
+    (0, core_1.Init)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], BullBoardManager.prototype, "init", null);
 BullBoardManager = __decorate([
     (0, core_1.Singleton)()
 ], BullBoardManager);

package/dist/board.middleware.d.ts

@@ -1,14 +1,11 @@
-import { IMiddleware, IMidwayApplication, IMidwayContext, NextFunction, IMidwayContainer, MidwayFrameworkService } from '@midwayjs/core';
+import { IMiddleware, IMidwayApplication, IMidwayContext, NextFunction } from '@midwayjs/core';
 import { BullBoardOption } from './interface';
 import { BullBoardManager } from './board.manager';
 export declare class BoardMiddleware implements IMiddleware<IMidwayContext, NextFunction, unknown> {
-    protected frameworkService: MidwayFrameworkService;
     protected bullBoardConfig: BullBoardOption;
     protected bullBoardManager: BullBoardManager;
-    protected applicationContext: IMidwayContainer;
     private basePath;
     private serverAdapter;
-    protected init(): Promise<void>;
     resolve(app: IMidwayApplication): (req: any, res: any, next: NextFunction) => Promise<any>;
     static getName(): string;
 }

package/dist/board.middleware.js

@@ -12,10 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BoardMiddleware = void 0;
 const core_1 = require("@midwayjs/core");
 const path_1 = require("path");
-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 = {
     '.html': 'text/html',
@@ -36,36 +32,9 @@ const MIME_MAP = {
     '.otf': 'application/x-font-opentype',
 };
 let BoardMiddleware = class BoardMiddleware {
-    async init() {
-        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)({
-            queues: wrapQueues,
-            serverAdapter: this.serverAdapter,
-            options: {
-                uiConfig: this.bullBoardConfig.uiConfig,
-            },
-        });
-        this.serverAdapter.setBasePath(this.basePath);
-        this.bullBoardManager.setBullBoard(bullBoard);
-    }
     resolve(app) {
+        this.basePath = this.bullBoardManager.getBasePath();
+        this.serverAdapter = this.bullBoardManager.getServerAdapter();
         if (app.getFrameworkType() === core_1.MidwayFrameworkType.WEB_EXPRESS) {
             return async (req, res, next) => {
                 const pathname = req.path;
@@ -151,10 +120,6 @@ let BoardMiddleware = class BoardMiddleware {
         return 'bull-board-ui';
     }
 };
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", core_1.MidwayFrameworkService)
-], BoardMiddleware.prototype, "frameworkService", void 0);
 __decorate([
     (0, core_1.Config)('bullBoard'),
     __metadata("design:type", Object)
@@ -163,16 +128,6 @@ __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),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", Promise)
-], BoardMiddleware.prototype, "init", null);
 BoardMiddleware = __decorate([
     (0, core_1.Provide)(),
     (0, core_1.Scope)(core_1.ScopeEnum.Singleton)

package/dist/configuration.d.ts

@@ -3,5 +3,6 @@ export declare class BullBoardConfiguration {
     applicationManager: MidwayApplicationManager;
     configService: MidwayConfigService;
     onReady(container: IMidwayContainer): Promise<void>;
+    onServerReady(container: IMidwayContainer): Promise<void>;
 }
 //# sourceMappingURL=configuration.d.ts.map

package/dist/configuration.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BullBoardConfiguration = void 0;
 const core_1 = require("@midwayjs/core");
 const board_middleware_1 = require("./board.middleware");
+const board_manager_1 = require("./board.manager");
 let BullBoardConfiguration = class BullBoardConfiguration {
     async onReady(container) {
         const apps = this.applicationManager.getApplications([
@@ -28,6 +29,9 @@ let BullBoardConfiguration = class BullBoardConfiguration {
             });
         }
     }
+    async onServerReady(container) {
+        await container.getAsync(board_manager_1.BullBoardManager);
+    }
 };
 __decorate([
     (0, core_1.Inject)(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/bull-board",
-  "version": "3.20.5",
+  "version": "3.20.6-beta.1",
   "description": "midway component for bull",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -39,6 +39,5 @@
   },
   "engines": {
     "node": ">=12"
-  },
-  "gitHead": "7ce57281bd3ef5d18dc50b47ff9bffb8a27c071e"
+  }
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2013 - Now midwayjs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.