@luisrodrigues/nestjs-scheduler-dashboard 0.1.2 → 0.1.4

package/dist/jobs.service.d.ts

@@ -7,7 +7,7 @@ export declare class JobsService {
     getJobs(): {
         cron: {
             name: string;
-            cronExpression: any;
+            cronExpression: string;
             running: boolean;
             nextRun: string;
             history: import(".").JobExecution[];
@@ -22,7 +22,7 @@ export declare class JobsService {
     };
     getJob(name: string): {
         name: string;
-        cronExpression: any;
+        cronExpression: string;
         running: boolean;
         nextRun: string;
         history: import(".").JobExecution[];

package/dist/jobs.service.js

@@ -15,6 +15,35 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.JobsService = void 0;
 const common_1 = require("@nestjs/common");
 const schedule_1 = require("@nestjs/schedule");
+function resolveNextRun(job) {
+    try {
+        const next = job.nextDate?.();
+        if (!next)
+            return null;
+        if (typeof next.toISO === 'function')
+            return next.toISO();
+        if (next instanceof Date)
+            return next.toISOString();
+        return null;
+    }
+    catch {
+        return null;
+    }
+}
+function resolveCronExpression(cronTime) {
+    if (!cronTime || typeof cronTime !== 'object')
+        return null;
+    const ct = cronTime;
+    const src = ct['source'] ?? ct['_source'];
+    if (typeof src === 'string')
+        return src;
+    if (typeof cronTime.toString === 'function') {
+        const str = cronTime.toString();
+        if (str !== '[object Object]')
+            return str;
+    }
+    return null;
+}
 const storage_abstract_1 = require("./storage/storage.abstract");
 const job_concurrency_1 = require("./decorators/job-concurrency");
 const scheduler_dash_constants_1 = require("./scheduler-dash.constants");
@@ -26,7 +55,7 @@ let JobsService = class JobsService {
     getJobs() {
         const cron = [...this.schedulerRegistry.getCronJobs().entries()].map(([name, job]) => ({
             name,
-            cronExpression: job.cronTime.source?.toString() ?? null,
+            cronExpression: resolveCronExpression(job.cronTime),
             running: job.running ?? false,
             nextRun: job.nextDate()?.toISO() ?? null,
             history: this.storage.findByJob(name),
@@ -42,7 +71,7 @@ let JobsService = class JobsService {
             return null;
         return {
             name,
-            cronExpression: job.cronTime.source?.toString() ?? null,
+            cronExpression: resolveCronExpression(job.cronTime),
             running: job.running ?? false,
             nextRun: job.nextDate()?.toISO() ?? null,
             history: this.storage.findByJob(name),

package/dist/scheduler-dash.module.d.ts

@@ -12,4 +12,6 @@ export declare class SchedulerDashModule implements NestModule, OnModuleInit {
     configure(consumer: MiddlewareConsumer): void;
     static forRoot(options?: SchedulerDashOptions): DynamicModule;
     static forRootAsync(asyncOptions: SchedulerDashAsyncOptions): DynamicModule;
+    private normalizeRoute;
+    private escapeRegex;
 }

package/dist/scheduler-dash.module.js

@@ -36,11 +36,11 @@ let SchedulerDashModule = SchedulerDashModule_1 = class SchedulerDashModule {
         scheduler_dash_context_1.SchedulerDashContext.storage = this.storage;
         scheduler_dash_context_1.SchedulerDashContext.noOverlap = this.options.noOverlap ?? false;
         scheduler_dash_context_1.SchedulerDashContext.maxConcurrent = this.options.maxConcurrent;
-        const route = (this.options.route ?? '_scheduler').replace(/^\//, '');
+        const route = this.normalizeRoute(this.options.route);
         this.logger.log(`Dashboard available at /${route}`);
     }
     configure(consumer) {
-        const route = (this.options.route ?? '_scheduler').replace(/^\//, '');
+        const route = this.normalizeRoute(this.options.route);
         const guard = (0, auth_1.createAuthGuard)(this.options.auth);
         const svc = this.jobsService;
         const router = express.Router({ mergeParams: true });
@@ -70,22 +70,27 @@ let SchedulerDashModule = SchedulerDashModule_1 = class SchedulerDashModule {
             const ok = svc.stopExecution(req.params.id);
             ok
                 ? res.json({ stopped: req.params.id })
-                : res.status(404).json({ message: `Execution "${req.params.id}" not found or already finished` });
+                : res.status(404).json({
+                    message: `Execution "${req.params.id}" not found or already finished`,
+                });
         });
-        router.get('*', (_req, res) => {
+        router.use((_req, res) => {
             res.sendFile('index.html', { root: PUBLIC_PATH });
         });
         consumer
             .apply((req, res, next) => {
-            req.url = req.originalUrl.replace(new RegExp(`^/${route}`), '') || '/';
+            req.url =
+                req.originalUrl.replace(new RegExp(`^/${this.escapeRegex(route)}(?=/|$)`), '') || '/';
             router(req, res, next);
         })
-            .forRoutes('*');
+            .forRoutes(route);
     }
     static forRoot(options = {}) {
         const parsed = scheduler_dash_schema_1.SchedulerDashOptionsSchema.safeParse(options);
         if (!parsed.success) {
-            throw new Error(`[SchedulerDash] Invalid options:\n${parsed.error.issues.map(i => `  • ${i.path.join('.')}: ${i.message}`).join('\n')}`);
+            throw new Error(`[SchedulerDash] Invalid options:\n${parsed.error.issues
+                .map(i => `  • ${i.path.join('.')}: ${i.message}`)
+                .join('\n')}`);
         }
         return {
             module: SchedulerDashModule_1,
@@ -111,7 +116,9 @@ let SchedulerDashModule = SchedulerDashModule_1 = class SchedulerDashModule {
                         const options = await asyncOptions.useFactory(...args);
                         const parsed = scheduler_dash_schema_1.SchedulerDashOptionsSchema.safeParse(options);
                         if (!parsed.success) {
-                            throw new Error(`[SchedulerDash] Invalid options:\n${parsed.error.issues.map(i => `  • ${i.path.join('.')}: ${i.message}`).join('\n')}`);
+                            throw new Error(`[SchedulerDash] Invalid options:\n${parsed.error.issues
+                                .map(i => `  • ${i.path.join('.')}: ${i.message}`)
+                                .join('\n')}`);
                         }
                         return options;
                     },
@@ -126,6 +133,12 @@ let SchedulerDashModule = SchedulerDashModule_1 = class SchedulerDashModule {
             ],
         };
     }
+    normalizeRoute(route) {
+        return (route ?? '_scheduler').replace(/^\/+|\/+$/g, '');
+    }
+    escapeRegex(value) {
+        return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    }
 };
 exports.SchedulerDashModule = SchedulerDashModule;
 exports.SchedulerDashModule = SchedulerDashModule = SchedulerDashModule_1 = __decorate([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luisrodrigues/nestjs-scheduler-dashboard",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Dashboard for @nestjs/schedule — embedded UI, job history, metrics, stop/trigger controls",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -13,11 +13,18 @@
     "dev": "tsc -p tsconfig.json --watch"
   },
   "peerDependencies": {
-    "@nestjs/common": "^10.0.0",
-    "@nestjs/core": "^10.0.0",
-    "@nestjs/schedule": "^4.0.0",
+    "@nestjs/common": "^8.0.0 || ^9.0.0 || ^10.0.0",
+    "@nestjs/core": "^8.0.0 || ^9.0.0 || ^10.0.0",
+    "@nestjs/schedule": "^2.0.0 || ^3.0.0 || ^4.0.0",
+    "reflect-metadata": "^0.1.13 || ^0.2.0",
+    "rxjs": "^7.0.0",
     "express": "^4.0.0"
   },
+  "peerDependenciesMeta": {
+    "reflect-metadata": { "optional": false },
+    "rxjs": { "optional": false },
+    "express": { "optional": false }
+  },
   "devDependencies": {
     "@nestjs/common": "^10.4.15",
     "@nestjs/core": "^10.4.15",