@midwayjs/bull-board 3.11.18 → 3.12.1

package/dist/adapter.d.ts

@@ -1,4 +1,4 @@
-import { AppControllerRoute, AppViewRoute, BullBoardQueues, ControllerHandlerReturnType, IServerAdapter } from '@bull-board/api/dist/typings/app';
+import type { AppControllerRoute, AppViewRoute, BullBoardQueues, ControllerHandlerReturnType, IServerAdapter, UIConfig } from '@bull-board/api/dist/typings/app';
 export declare class MidwayAdapter implements IServerAdapter {
     private basePath;
     private bullBoardQueues;
@@ -8,17 +8,19 @@ export declare class MidwayAdapter implements IServerAdapter {
     private apiRoutes;
     private staticCache;
     setBasePath(path: string): MidwayAdapter;
+    setUIConfig(config: UIConfig): MidwayAdapter;
     setStaticPath(staticsRoute: string, staticsPath: string): MidwayAdapter;
     setViewsPath(viewPath: string): MidwayAdapter;
     setErrorHandler(handler: (error: Error) => ControllerHandlerReturnType): this;
     setApiRoutes(routes: AppControllerRoute[]): MidwayAdapter;
     setEntryRoute(routeDef: AppViewRoute): MidwayAdapter;
+    getEntryRoute(): AppViewRoute;
     setQueues(bullBoardQueues: BullBoardQueues): MidwayAdapter;
     getViewRoutes(): string[];
     matchApiRoutes(method: string, url: string): AppControllerRoute;
     getStaticRoutes(): string;
     renderStatic(filename: any): Promise<any>;
-    renderView(filename: any): Promise<unknown>;
+    renderView(filename: any, params?: {}): Promise<unknown>;
     runAPI(route: any, query: any): Promise<any>;
 }
 //# sourceMappingURL=adapter.d.ts.map

package/dist/adapter.js

@@ -14,6 +14,10 @@ class MidwayAdapter {
         this.basePath = path;
         return this;
     }
+    setUIConfig(config) {
+        // 这里没用
+        return this;
+    }
     setStaticPath(staticsRoute, staticsPath) {
         this.statics = { route: staticsRoute, path: staticsPath };
         return this;
@@ -37,6 +41,9 @@ class MidwayAdapter {
         this.entryRoute = routeDef;
         return this;
     }
+    getEntryRoute() {
+        return this.entryRoute;
+    }
     setQueues(bullBoardQueues) {
         this.bullBoardQueues = bullBoardQueues;
         return this;
@@ -74,7 +81,7 @@ class MidwayAdapter {
         this.staticCache.set(filename, content);
         return content;
     }
-    async renderView(filename) {
+    async renderView(filename, params = {}) {
         const basePath = this.basePath.endsWith('/')
             ? this.basePath
             : `${this.basePath}/`;
@@ -83,7 +90,7 @@ class MidwayAdapter {
         }
         filename = (0, path_1.join)(this.viewPath, filename);
         return new Promise((resolve, reject) => {
-            ejs.renderFile(filename, { basePath, cache: true }, {
+            ejs.renderFile(filename, { basePath, cache: true, ...params }, {
                 root: this.viewPath,
             }, (err, result) => {
                 if (err) {

package/dist/board.middleware.d.ts

@@ -1,11 +1,9 @@
 import { IMiddleware, IMidwayApplication, IMidwayContext, NextFunction } from '@midwayjs/core';
 import * as bull from '@midwayjs/bull';
+import { BullBoardOption } from './interface';
 export declare class BoardMiddleware implements IMiddleware<IMidwayContext, NextFunction, unknown> {
     framework: bull.Framework;
-    bullBoardConfig: {
-        basePath?: string;
-        adapterOptions?: any;
-    };
+    bullBoardConfig: BullBoardOption;
     private basePath;
     private serverAdapter;
     init(): Promise<void>;

package/dist/board.middleware.js

@@ -43,6 +43,9 @@ let BoardMiddleware = class BoardMiddleware {
         (0, api_1.createBullBoard)({
             queues: wrapQueues,
             serverAdapter: this.serverAdapter,
+            options: {
+                uiConfig: this.bullBoardConfig.uiConfig,
+            },
         });
         this.serverAdapter.setBasePath(this.basePath);
     }
@@ -59,7 +62,12 @@ let BoardMiddleware = class BoardMiddleware {
                     content = await this.serverAdapter.renderStatic(routePath);
                 }
                 else if (this.serverAdapter.getViewRoutes().indexOf(routePath) !== -1) {
-                    content = await this.serverAdapter.renderView(routePath);
+                    const entryRoute = this.serverAdapter.getEntryRoute();
+                    const { name, params } = entryRoute.handler({
+                        basePath: this.basePath,
+                        uiConfig: this.bullBoardConfig.uiConfig,
+                    });
+                    content = await this.serverAdapter.renderView(name, params);
                 }
                 else {
                     const matchRoute = this.serverAdapter.matchApiRoutes(req.method, routePath);
@@ -94,7 +102,12 @@ let BoardMiddleware = class BoardMiddleware {
                     content = await this.serverAdapter.renderStatic(routePath);
                 }
                 else if (this.serverAdapter.getViewRoutes().indexOf(routePath) !== -1) {
-                    content = await this.serverAdapter.renderView(routePath);
+                    const entryRoute = this.serverAdapter.getEntryRoute();
+                    const { name, params } = entryRoute.handler({
+                        basePath: this.basePath,
+                        uiConfig: this.bullBoardConfig.uiConfig,
+                    });
+                    content = await this.serverAdapter.renderView(name, params);
                 }
                 else {
                     const matchRoute = this.serverAdapter.matchApiRoutes(ctx.method, routePath);

package/dist/configuration.js

@@ -44,6 +44,7 @@ BullBoardConfiguration = __decorate([
                 default: {
                     bullBoard: {
                         basePath: '/ui',
+                        uiConfig: {},
                         adapterOptions: {
                             readOnlyMode: false,
                         },

package/dist/index.d.ts

@@ -1,3 +1,4 @@
 export { BullBoardConfiguration as Configuration } from './configuration';
 export * from './board.middleware';
+export * from './interface';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -18,4 +18,5 @@ 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("./interface"), exports);
 //# sourceMappingURL=index.js.map

package/dist/interface.d.ts

@@ -0,0 +1,7 @@
+import type { QueueAdapterOptions, UIConfig } from "@bull-board/api/dist/typings/app";
+export interface BullBoardOption {
+    basePath?: string;
+    uiConfig?: UIConfig;
+    adapterOptions?: QueueAdapterOptions;
+}
+//# sourceMappingURL=interface.d.ts.map

package/dist/interface.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=interface.js.map

package/index.d.ts

@@ -1,13 +1,10 @@
-import { QueueAdapterOptions } from '@bull-board/api/dist/typings/app';
 import '@midwayjs/bull';
+import { BullBoardOption } from './dist/index';
 export * from './dist/index';
 
 declare module '@midwayjs/core/dist/interface' {
   // eslint-disable-next-line
   interface MidwayConfig {
-    bullBoard?: {
-      basePath?: string;
-      adapterOptions?: QueueAdapterOptions;
-    };
+    bullBoard?: PowerPartial<BullBoardOption>;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/bull-board",
-  "version": "3.11.18",
+  "version": "3.12.1",
   "description": "midway component for bull",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -24,19 +24,19 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/core": "^3.11.15",
-    "@midwayjs/express": "^3.11.15",
-    "@midwayjs/koa": "^3.11.15",
-    "@midwayjs/mock": "^3.11.15"
+    "@midwayjs/core": "^3.12.1",
+    "@midwayjs/express": "^3.12.1",
+    "@midwayjs/koa": "^3.12.1",
+    "@midwayjs/mock": "^3.12.1"
   },
   "dependencies": {
-    "@bull-board/api": "4.6.4",
-    "@bull-board/ui": "4.6.4",
-    "@midwayjs/bull": "^3.11.18",
+    "@bull-board/api": "5.8.0",
+    "@bull-board/ui": "5.8.0",
+    "@midwayjs/bull": "^3.12.1",
     "ejs": "3.1.9"
   },
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "c5646f6fcae5b8e0ff1520ce37a5c54dc73502ce"
+  "gitHead": "48413b87b12354cb8207de6aa58e0a4ca22ea000"
 }