enhanced

theZeuses · Feb 2, 2023 · 3a56ad4 · 3a56ad4
1 parent d9784de
commit 3a56ad4
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 18 deletions.
diff --git a/.npmignore b/.npmignore
@@ -0,0 +1 @@
+src
diff --git a/package.json b/package.json
@@ -23,22 +23,19 @@
     "build": "npm run clean && npm run compile",
     "clean": "rm -rf ./dist",
     "compile": "tsc",
-    "prepare": "npm run build",
     "dev": "tsc --watch"
   },
   "main": "dist/index.js",
   "devDependencies": {
-    "@nestjs/bull": "^0.6.2",
-    "@nestjs/common": "^9.2.1",
-    "@nestjs/core": "^9.2.1",
-    "@types/bull": "^4.10.0",
-    "bull": "^4.10.2",
     "typescript": "^4.9.4"
   },
   "dependencies": {
     "@bull-monitor/express": "^5.1.0"
   },
   "peerDependencies": {
-    "@nestjs/bull": "^0.6.2"
+    "@nestjs/bull": "^0.6.2",
+    "@nestjs/common": "^9.2.1",
+    "bull": "^4.10.2",
+    "reflect-metadata": "^0.1.13"
   }
 }
diff --git a/src/bull-monitor.interface.ts b/src/bull-monitor.interface.ts
@@ -1,12 +1,21 @@
 import { NestMiddleware, Type } from "@nestjs/common";
 import { Config as BaseConfig } from "@bull-monitor/root";
+import { BullModuleAsyncOptions, BullModuleOptions } from "@nestjs/bull";
 
 type Config = Omit<BaseConfig, "queues"> & {
     queues: Array<
-        string |
+        BullModuleOptions &
         {
-            name: string,
-            readonly: boolean
+            readonly?: boolean
+        }
+    >
+}
+
+type AsyncConfig = Omit<BaseConfig, "queues"> & {
+    queues: Array<
+        BullModuleAsyncOptions &
+        {
+            readonly?: boolean
         }
     >
 }
@@ -15,4 +24,10 @@ export interface Options {
     route: string,
     config: Config,
     middleware?: Array<Type<NestMiddleware>>
+}
+
+export interface AsyncOptions {
+    route: string,
+    config: AsyncConfig,
+    middleware?: Array<Type<NestMiddleware>>
 }
diff --git a/src/bull-monitor.module.ts b/src/bull-monitor.module.ts
@@ -3,7 +3,7 @@ import { DynamicModule, Inject, MiddlewareConsumer, Module, NestModule } from "@
 import { BullMonitorExpressService } from "./bull-monitor.service";
 import { Queue } from "bull";
 import { BULL_MONITOR_OPTIONS_TOKEN, BULL_MONITOR_TOKEN } from "./bull-monitor.constant";
-import { Options } from "./bull-monitor.interface";
+import { AsyncOptions, Options } from "./bull-monitor.interface";
 
 @Module({})
 export class BullMonitorModule implements NestModule {
@@ -21,22 +21,63 @@ export class BullMonitorModule implements NestModule {
 
     static register(options: Options): DynamicModule {
         const imports = [];
+        const { queues, ...restConfig } = options.config;
 
-        options.config.queues.map(queue => {
-            imports.push(BullModule.registerQueue({ name: (typeof queue == "string" ? queue : queue.name) }));
+        const configuredQueues = {};
+        queues.map(q => {
+            imports.push(BullModule.registerQueue(q));
+            configuredQueues[q.name] = q;
         });
 
+        return {
+            module: BullMonitorModule,
+            imports: [...imports],
+            providers: [
+                {
+                    provide: BULL_MONITOR_TOKEN,
+                    useFactory: (...injectedQueues: Array<Queue>) => {
+                        return new BullMonitorExpressService(injectedQueues.map(q => ({
+                            queue: q,
+                            config: {
+                                readonly: configuredQueues[q.name].readonly && true
+                            }
+                        })), restConfig);
+                    },
+                    inject: [...queues.map(q => getQueueToken(q.name))]
+                },
+                {
+                    provide: BULL_MONITOR_OPTIONS_TOKEN,
+                    useValue: options
+                }
+            ]
+        }
+    }
+
+    static registerAsync(options: AsyncOptions): DynamicModule {
+        const imports = [];
         const { queues, ...restConfig } = options.config;
+
+        const configuredQueues = {};
+        queues.map(q => {
+            imports.push(BullModule.registerQueueAsync(q));
+            configuredQueues[q.name] = q;
+        });
+
         return {
             module: BullMonitorModule,
-            imports,
+            imports: [...imports],
             providers: [
                 {
                     provide: BULL_MONITOR_TOKEN,
                     useFactory: (...injectedQueues: Array<Queue>) => {
-                        return new BullMonitorExpressService(injectedQueues, restConfig);
+                        return new BullMonitorExpressService(injectedQueues.map(q => ({
+                            queue: q,
+                            config: {
+                                readonly: configuredQueues[q.name].readonly && true
+                            }
+                        })), restConfig);
                     },
-                    inject: [...queues.map(queue => getQueueToken((typeof queue == "string" ? queue : queue.name)))]
+                    inject: [...queues.map(q => getQueueToken(q.name))]
                 },
                 {
                     provide: BULL_MONITOR_OPTIONS_TOKEN,

diff --git a/src/bull-monitor.service.ts b/src/bull-monitor.service.ts
@@ -2,11 +2,15 @@ import { BullMonitorExpress } from "@bull-monitor/express";
 import { Queue } from "bull";
 import { BullAdapter } from "@bull-monitor/root/dist/bull-adapter";
 import { Config } from "@bull-monitor/root";
+import { QueueConfig } from "@bull-monitor/root/dist/queue";
 
 export class BullMonitorExpressService extends BullMonitorExpress {
-  constructor(queues: Array<Queue>, config: Omit<Config, "queues">) {
+  constructor(queuesWithConfig: Array<{
+    queue: Queue,
+    config: QueueConfig
+  }>, config: Omit<Config, "queues">) {
     super({ 
-      queues: queues.map(q => new BullAdapter(q)),
+      queues: queuesWithConfig.map(q => new BullAdapter(q.queue, q.config)),
       ...config
     });
   }