@midwayjs/bull-board 4.0.0-alpha.1 → 4.0.0-beta.10

package/README.md

@@ -6,4 +6,4 @@ Document: [https://midwayjs.org](https://midwayjs.org)
 
 ## License
 
-[MIT]((http://github.com/midwayjs/midway/blob/master/LICENSE))
+[MIT](https://github.com/midwayjs/midway/blob/master/LICENSE)

package/dist/adapter.js

@@ -6,10 +6,14 @@ const path_1 = require("path");
 const fs_1 = require("fs");
 const core_1 = require("@midwayjs/core");
 class MidwayAdapter {
-    constructor() {
-        this.basePath = '';
-        this.staticCache = new Map();
-    }
+    basePath = '';
+    bullBoardQueues;
+    // private errorHandler: ((error: Error) => ControllerHandlerReturnType) | undefined;
+    statics;
+    viewPath;
+    entryRoute;
+    apiRoutes;
+    staticCache = new Map();
     setBasePath(path) {
         this.basePath = path;
         return this;

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,57 @@ 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 {
+    bullBoard;
+    bullBoardConfig;
+    frameworkService;
+    applicationContext;
+    basePath;
+    serverAdapter;
+    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;
     }
@@ -29,6 +76,24 @@ let BullBoardManager = class BullBoardManager {
     }
 };
 exports.BullBoardManager = BullBoardManager;
+__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);
 exports.BullBoardManager = BullBoardManager = __decorate([
     (0, core_1.Singleton)()
 ], BullBoardManager);

package/dist/board.middleware.d.ts

@@ -1,14 +1,11 @@
 import { IMiddleware, IMidwayApplication, IMidwayContext, NextFunction } from '@midwayjs/core';
-import * as bull from '@midwayjs/bull';
 import { BullBoardOption } from './interface';
 import { BullBoardManager } from './board.manager';
 export declare class BoardMiddleware implements IMiddleware<IMidwayContext, NextFunction, unknown> {
-    protected framework: bull.Framework;
     protected bullBoardConfig: BullBoardOption;
     protected bullBoardManager: BullBoardManager;
     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 bull = require("@midwayjs/bull");
-const api_1 = require("@bull-board/api");
-const bullAdapter_1 = require("@bull-board/api/bullAdapter");
-const adapter_1 = require("./adapter");
 const board_manager_1 = require("./board.manager");
 const MIME_MAP = {
     '.html': 'text/html',
@@ -36,22 +32,13 @@ const MIME_MAP = {
     '.otf': 'application/x-font-opentype',
 };
 let BoardMiddleware = class BoardMiddleware {
-    async init() {
-        const queueList = this.framework.getQueueList();
-        const wrapQueues = queueList.map(queue => new bullAdapter_1.BullAdapter(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);
-    }
+    bullBoardConfig;
+    bullBoardManager;
+    basePath;
+    serverAdapter;
     resolve(app) {
+        this.basePath = this.bullBoardManager.getBasePath();
+        this.serverAdapter = this.bullBoardManager.getServerAdapter();
         if ('express' === app.getNamespace()) {
             return async (req, res, next) => {
                 const pathname = req.path;
@@ -138,10 +125,6 @@ let BoardMiddleware = class BoardMiddleware {
     }
 };
 exports.BoardMiddleware = BoardMiddleware;
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", bull.Framework)
-], BoardMiddleware.prototype, "framework", void 0);
 __decorate([
     (0, core_1.Config)('bullBoard'),
     __metadata("design:type", Object)
@@ -150,12 +133,6 @@ __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", board_manager_1.BullBoardManager)
 ], BoardMiddleware.prototype, "bullBoardManager", void 0);
-__decorate([
-    (0, core_1.Init)(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", Promise)
-], BoardMiddleware.prototype, "init", null);
 exports.BoardMiddleware = BoardMiddleware = __decorate([
     (0, core_1.Provide)(),
     (0, core_1.Scope)(core_1.ScopeEnum.Singleton)

package/dist/configuration.d.ts

@@ -1,7 +1,8 @@
-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>;
+    onServerReady(container: IMidwayContainer): Promise<void>;
 }
 //# sourceMappingURL=configuration.d.ts.map

package/dist/configuration.js

@@ -10,11 +10,13 @@ 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");
+const board_manager_1 = require("./board.manager");
 let BullBoardConfiguration = class BullBoardConfiguration {
-    async onReady() {
+    applicationManager;
+    configService;
+    async onReady(container) {
         const apps = this.applicationManager.getApplications([
             'express',
             'egg',
@@ -22,10 +24,16 @@ 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);
+                }
             });
         }
     }
+    async onServerReady(container) {
+        await container.getAsync(board_manager_1.BullBoardManager);
+    }
 };
 exports.BullBoardConfiguration = BullBoardConfiguration;
 __decorate([
@@ -39,7 +47,6 @@ __decorate([
 exports.BullBoardConfiguration = BullBoardConfiguration = __decorate([
     (0, core_1.Configuration)({
         namespace: 'bull-board',
-        imports: [bull],
         importConfigs: [
             {
                 default: {

package/dist/index.d.ts

@@ -3,4 +3,7 @@ export * from './board.middleware';
 export * from './board.manager';
 export * from './interface';
 export * as BullBoard from '@bull-board/api';
+export { MidwayAdapter } from './adapter';
+export { BullAdapter } from '@bull-board/api/bullAdapter';
+export { BullMQAdapter } from '@bull-board/api/bullMQAdapter';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -14,11 +14,17 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BullBoard = exports.Configuration = void 0;
+exports.BullMQAdapter = exports.BullAdapter = exports.MidwayAdapter = exports.BullBoard = exports.Configuration = void 0;
 var configuration_1 = require("./configuration");
 Object.defineProperty(exports, "Configuration", { enumerable: true, get: function () { return configuration_1.BullBoardConfiguration; } });
 __exportStar(require("./board.middleware"), exports);
 __exportStar(require("./board.manager"), exports);
 __exportStar(require("./interface"), exports);
 exports.BullBoard = require("@bull-board/api");
+var adapter_1 = require("./adapter");
+Object.defineProperty(exports, "MidwayAdapter", { enumerable: true, get: function () { return adapter_1.MidwayAdapter; } });
+var bullAdapter_1 = require("@bull-board/api/bullAdapter");
+Object.defineProperty(exports, "BullAdapter", { enumerable: true, get: function () { return bullAdapter_1.BullAdapter; } });
+var bullMQAdapter_1 = require("@bull-board/api/bullMQAdapter");
+Object.defineProperty(exports, "BullMQAdapter", { enumerable: true, get: function () { return bullMQAdapter_1.BullMQAdapter; } });
 //# sourceMappingURL=index.js.map

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": "4.0.0-alpha.1",
+  "version": "4.0.0-beta.10",
   "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": "^4.0.0-alpha.1",
-    "@midwayjs/express": "^4.0.0-alpha.1",
-    "@midwayjs/koa": "^4.0.0-alpha.1",
-    "@midwayjs/mock": "^4.0.0-alpha.1"
+    "@midwayjs/bull": "^4.0.0-beta.10",
+    "@midwayjs/bullmq": "^4.0.0-beta.10",
+    "@midwayjs/core": "^4.0.0-beta.10",
+    "@midwayjs/express": "^4.0.0-beta.10",
+    "@midwayjs/koa": "^4.0.0-beta.10",
+    "@midwayjs/mock": "^4.0.0-beta.10"
   },
   "dependencies": {
     "@bull-board/api": "5.23.0",
     "@bull-board/ui": "5.23.0",
-    "@midwayjs/bull": "^4.0.0-alpha.1",
     "ejs": "3.1.10"
   },
   "engines": {
-    "node": ">=12"
+    "node": ">=20"
   },
-  "gitHead": "14bb4da91805a1cf52f190c0d37a74b395dd6372"
+  "gitHead": "1b1856629913703f67304155aaf611ec936a81ac"
 }