@midwayjs/bull-board 3.0.1 → 3.6.1

package/LICENSE

@@ -0,0 +1,21 @@
+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.

package/dist/adapter.d.ts

@@ -19,9 +19,6 @@ export declare class MidwayAdapter implements IServerAdapter {
     getStaticRoutes(): string;
     renderStatic(filename: any): Promise<any>;
     renderView(filename: any): Promise<unknown>;
-    runAPI(route: any, params: any, query: any): Promise<{
-        status: any;
-        body: any;
-    }>;
+    runAPI(route: any, query: any): Promise<any>;
 }
 //# sourceMappingURL=adapter.d.ts.map

package/dist/adapter.js

@@ -50,7 +50,13 @@ class MidwayAdapter {
             if (route.method !== method.toLowerCase()) {
                 return false;
             }
-            return !!core_1.PathToRegexpUtil.match(route.regexpPattern)(url);
+            const result = core_1.PathToRegexpUtil.match(route.route, {
+                decode: decodeURIComponent,
+            })(url);
+            if (result) {
+                route.params = result.params;
+            }
+            return !!result;
         });
     }
     getStaticRoutes() {
@@ -62,14 +68,16 @@ class MidwayAdapter {
         if (this.staticCache.has(filename)) {
             return this.staticCache.get(filename);
         }
-        let content = (0, fs_1.readFileSync)(filename, {
+        const content = (0, fs_1.readFileSync)(filename, {
             encoding: 'utf-8',
         });
         this.staticCache.set(filename, content);
         return content;
     }
     async renderView(filename) {
-        const basePath = this.basePath.endsWith('/') ? this.basePath : `${this.basePath}/`;
+        const basePath = this.basePath.endsWith('/')
+            ? this.basePath
+            : `${this.basePath}/`;
         if (filename === '/') {
             filename = 'index.ejs';
         }
@@ -87,16 +95,13 @@ class MidwayAdapter {
             });
         });
     }
-    async runAPI(route, params, query) {
+    async runAPI(route, query) {
         const response = await route.handler({
             queues: this.bullBoardQueues,
-            params,
+            params: route.params,
             query,
         });
-        return {
-            status: response.status || 200,
-            body: response.body
-        };
+        return response.body;
     }
 }
 exports.MidwayAdapter = MidwayAdapter;

package/dist/board.middleware.d.ts

@@ -1,4 +1,4 @@
-import type { IMiddleware, IMidwayApplication, IMidwayContext, NextFunction } from '@midwayjs/core';
+import { IMiddleware, IMidwayApplication, IMidwayContext, NextFunction } from '@midwayjs/core';
 import * as bull from '@midwayjs/bull';
 export declare class BoardMiddleware implements IMiddleware<IMidwayContext, NextFunction, unknown> {
     framework: bull.Framework;

package/dist/board.middleware.js

@@ -10,7 +10,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BoardMiddleware = void 0;
-const decorator_1 = require("@midwayjs/decorator");
+const core_1 = require("@midwayjs/core");
 const path_1 = require("path");
 const bull = require("@midwayjs/bull");
 const api_1 = require("@bull-board/api");
@@ -47,7 +47,7 @@ let BoardMiddleware = class BoardMiddleware {
         this.serverAdapter.setBasePath(this.basePath);
     }
     resolve(app) {
-        if (app.getFrameworkType() === decorator_1.MidwayFrameworkType.WEB_EXPRESS) {
+        if (app.getFrameworkType() === core_1.MidwayFrameworkType.WEB_EXPRESS) {
             return async (req, res, next) => {
                 const pathname = req.path;
                 if (pathname.indexOf(this.basePath) === -1) {
@@ -64,7 +64,7 @@ let BoardMiddleware = class BoardMiddleware {
                 else {
                     const matchRoute = this.serverAdapter.matchApiRoutes(req.method, routePath);
                     if (matchRoute) {
-                        content = await this.serverAdapter.runAPI(matchRoute, req.params, req.query);
+                        content = await this.serverAdapter.runAPI(matchRoute, req.query);
                     }
                 }
                 const ext = (0, path_1.extname)(pathname);
@@ -99,7 +99,7 @@ let BoardMiddleware = class BoardMiddleware {
                 else {
                     const matchRoute = this.serverAdapter.matchApiRoutes(ctx.method, routePath);
                     if (matchRoute) {
-                        content = await this.serverAdapter.runAPI(matchRoute, ctx.params, ctx.query);
+                        content = await this.serverAdapter.runAPI(matchRoute, ctx.query);
                     }
                 }
                 const ext = (0, path_1.extname)(pathname);
@@ -123,22 +123,22 @@ let BoardMiddleware = class BoardMiddleware {
     }
 };
 __decorate([
-    (0, decorator_1.Inject)(),
+    (0, core_1.Inject)(),
     __metadata("design:type", bull.Framework)
 ], BoardMiddleware.prototype, "framework", void 0);
 __decorate([
-    (0, decorator_1.Config)('bullBoard'),
+    (0, core_1.Config)('bullBoard'),
     __metadata("design:type", Object)
 ], BoardMiddleware.prototype, "bullBoardConfig", void 0);
 __decorate([
-    (0, decorator_1.Init)(),
+    (0, core_1.Init)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], BoardMiddleware.prototype, "init", null);
 BoardMiddleware = __decorate([
-    (0, decorator_1.Provide)(),
-    (0, decorator_1.Scope)(decorator_1.ScopeEnum.Singleton)
+    (0, core_1.Provide)(),
+    (0, core_1.Scope)(core_1.ScopeEnum.Singleton)
 ], BoardMiddleware);
 exports.BoardMiddleware = BoardMiddleware;
 //# sourceMappingURL=board.middleware.js.map

package/dist/configuration.js

@@ -10,13 +10,16 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BullBoardConfiguration = void 0;
-const decorator_1 = require("@midwayjs/decorator");
 const bull = require("@midwayjs/bull");
 const core_1 = require("@midwayjs/core");
 const board_middleware_1 = require("./board.middleware");
 let BullBoardConfiguration = class BullBoardConfiguration {
     async onReady() {
-        const apps = this.applicationManager.getApplications(['express', 'egg', 'koa']);
+        const apps = this.applicationManager.getApplications([
+            'express',
+            'egg',
+            'koa',
+        ]);
         if (apps.length) {
             apps.forEach(app => {
                 app.useMiddleware(board_middleware_1.BoardMiddleware);
@@ -25,15 +28,15 @@ let BullBoardConfiguration = class BullBoardConfiguration {
     }
 };
 __decorate([
-    (0, decorator_1.Inject)(),
+    (0, core_1.Inject)(),
     __metadata("design:type", core_1.MidwayApplicationManager)
 ], BullBoardConfiguration.prototype, "applicationManager", void 0);
 __decorate([
-    (0, decorator_1.Inject)(),
+    (0, core_1.Inject)(),
     __metadata("design:type", core_1.MidwayConfigService)
 ], BullBoardConfiguration.prototype, "configService", void 0);
 BullBoardConfiguration = __decorate([
-    (0, decorator_1.Configuration)({
+    (0, core_1.Configuration)({
         namespace: 'bull-board',
         imports: [bull],
         importConfigs: [

package/index.d.ts

@@ -1,4 +1,5 @@
 import { QueueAdapterOptions } from '@bull-board/api/dist/typings/app';
+import '@midwayjs/bull';
 export * from './dist/index';
 
 declare module '@midwayjs/core/dist/interface' {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/bull-board",
-  "version": "3.0.1",
+  "version": "3.6.1",
   "description": "midway component for bull",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -24,19 +24,19 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/core": "^3.4.13",
-    "@midwayjs/decorator": "^3.4.11",
-    "@midwayjs/koa": "^3.5.3",
-    "@midwayjs/express": "^3.5.3",
-    "@midwayjs/mock": "^3.4.13"
+    "@midwayjs/core": "^3.6.0",
+    "@midwayjs/express": "^3.6.0",
+    "@midwayjs/koa": "^3.6.0",
+    "@midwayjs/mock": "^3.6.0"
   },
   "dependencies": {
-    "@bull-board/api": "4.3.1",
-    "@bull-board/ui": "4.3.1",
-    "@midwayjs/bull": "^3.0.3",
+    "@bull-board/api": "4.4.0",
+    "@bull-board/ui": "4.4.0",
+    "@midwayjs/bull": "^3.6.1",
     "ejs": "3.1.8"
   },
   "engines": {
     "node": ">=12"
-  }
+  },
+  "gitHead": "7aa8d1d712ff5ae7e3b27eb2e154d3f7ee40889a"
 }