jcc-express-mvc 1.8.8 → 1.8.21

package/lib/Queue/Controllers/QueueControllers.d.ts

@@ -6,24 +6,15 @@ export declare class QueueControllers {
     /**
      * Show the dashboard
      */
-    dashboard(): Promise<void | {
-        (url: string): void;
-        (status: number, url: string): void;
-    }>;
+    dashboard(): Promise<void>;
     /**
-     * Show the index
+     * JSON list of queues (API)
      */
-    index(): Promise<any[] | import("../../Interface").AppResponse | {
-        (url: string): void;
-        (status: number, url: string): void;
-    }>;
+    index(): Promise<import("../../Interface").AppResponse>;
     /**
      * Show the queue
      */
-    show(status: string): Promise<void | {
-        (url: string): void;
-        (status: number, url: string): void;
-    }>;
+    show(status: string): Promise<void>;
     /**
      * Retry a failed job or run a pending job.
      * PUT /queue/jobs/:id/failed  -> retry (re-queue as pending)

package/lib/Queue/Controllers/QueueControllers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueueControllers.d.ts","sourceRoot":"","sources":["../../../../jcc-express-mvc/lib/Queue/Controllers/QueueControllers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,IAAI,CAAC;AAE3B,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAG9C,qBACa,gBAAgB;IACf,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAAL,KAAK,EAAE,KAAK;IAEzC;;OAEG;IACG,SAAS;;;;IAQf;;OAEG;IACG,KAAK;;;;IAUX;;OAEG;IAEG,IAAI,CAAC,MAAM,EAAE,MAAM;;;;IAgBzB;;;;OAIG;IAEG,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IA+BvC;;OAEG;IAEG,OAAO,CAAC,EAAE,EAAE,MAAM;IAKxB,OAAO,CAAC,SAAS;IAkBX,MAAM,CAAC,EAAE,GAAG,EAAE,EAAE,WAAW;CAGlC"}
+{"version":3,"file":"QueueControllers.d.ts","sourceRoot":"","sources":["../../../../jcc-express-mvc/lib/Queue/Controllers/QueueControllers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,IAAI,CAAC;AAE3B,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,qBACa,gBAAgB;IACf,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAAL,KAAK,EAAE,KAAK;IAEzC;;OAEG;IACG,SAAS;IAIf;;OAEG;IACG,KAAK;IAKX;;OAEG;IAEG,IAAI,CAAC,MAAM,EAAE,MAAM;IAWzB;;;;OAIG;IAEG,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IA+BvC;;OAEG;IAEG,OAAO,CAAC,EAAE,EAAE,MAAM;IAKxB,OAAO,CAAC,SAAS;IAkBX,MAAM,CAAC,EAAE,GAAG,EAAE,EAAE,WAAW;CAGlC"}

package/lib/Queue/Controllers/QueueControllers.js

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.QueueControllers = void 0;
 const __1 = require("..");
 const Dependency_1 = require("../../Dependency");
-//
 let QueueControllers = class QueueControllers {
     constructor(queue) {
         this.queue = queue;
@@ -21,21 +20,12 @@ let QueueControllers = class QueueControllers {
      * Show the dashboard
      */
     async dashboard() {
-        const user = { email: "abdoujammeh64@gmails.com" };
-        if (!(await can(user, "viewJobs")) && env("APP_ENV") !== "local") {
-            return redirect("/login");
-        }
         return view("queue/dashboard");
     }
     /**
-     * Show the index
+     * JSON list of queues (API)
      */
     async index() {
-        return await this.queue.getQueues();
-        const user = { email: "abdoujammeh64@gmails.com" };
-        if (!(await can(user, "viewJobs")) && env("APP_ENV") !== "local") {
-            return redirect("/login");
-        }
         const queues = await this.queue.getQueues();
         return response().json({ success: true, data: queues });
     }
@@ -43,12 +33,7 @@ let QueueControllers = class QueueControllers {
      * Show the queue
      */
     async show(status) {
-        const user = { email: "abdoujammeh64@gmails.com" };
-        if (!(await can(user, "viewJobs")) && env("APP_ENV") !== "local") {
-            return redirect("/login");
-        }
         const jobs = (await this.queue.findQueueBy("status", status)).map((job) => this.formatJob(job));
-        // return jobs;
         return view("queue/jobs", {
             jobs,
             status: status,

package/lib/Queue/Route/web.js

@@ -2,7 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const Route_1 = require("../../Routes/Route");
 const QueueControllers_1 = require("../Controllers/QueueControllers");
-Route_1.Route.controller(QueueControllers_1.QueueControllers).group((Route) => {
+const queueDashboardGuard_1 = require("../middleware/queueDashboardGuard");
+Route_1.Route.middleware([queueDashboardGuard_1.queueDashboardGuard])
+    .controller(QueueControllers_1.QueueControllers)
+    .group((Route) => {
     Route.get("/dashboard", "dashboard");
     Route.get("/jobs", "index");
     Route.get("/jobs/{status}", "show");

package/lib/Queue/index.d.ts

@@ -2,4 +2,5 @@ export * from "./Queue";
 export * from "./Job";
 export * from "./type";
 export * from "./interface";
+export { queueDashboardGuard } from "./middleware/queueDashboardGuard";
 //# sourceMappingURL=index.d.ts.map

package/lib/Queue/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Queue/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,OAAO,CAAC;AACtB,cAAc,QAAQ,CAAC;AACvB,cAAc,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Queue/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,OAAO,CAAC;AACtB,cAAc,QAAQ,CAAC;AACvB,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC"}

package/lib/Queue/index.js

@@ -14,7 +14,10 @@ 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.queueDashboardGuard = void 0;
 __exportStar(require("./Queue"), exports);
 __exportStar(require("./Job"), exports);
 __exportStar(require("./type"), exports);
 __exportStar(require("./interface"), exports);
+var queueDashboardGuard_1 = require("./middleware/queueDashboardGuard");
+Object.defineProperty(exports, "queueDashboardGuard", { enumerable: true, get: function () { return queueDashboardGuard_1.queueDashboardGuard; } });

package/lib/Queue/middleware/queueDashboardGuard.d.ts

@@ -0,0 +1,7 @@
+import type { AppNext, AppRequest, AppResponse } from "../../Interface";
+/**
+ * Protects all `/queue/*` routes: in non-local env runs session auth then `viewJobs` gate.
+ * In `APP_ENV=local`, skips checks (development convenience).
+ */
+export declare function queueDashboardGuard(req: AppRequest, res: AppResponse, next: AppNext): void;
+//# sourceMappingURL=queueDashboardGuard.d.ts.map

package/lib/Queue/middleware/queueDashboardGuard.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"queueDashboardGuard.d.ts","sourceRoot":"","sources":["../../../../jcc-express-mvc/lib/Queue/middleware/queueDashboardGuard.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAQxE;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,UAAU,EACf,GAAG,EAAE,WAAW,EAChB,IAAI,EAAE,OAAO,GACZ,IAAI,CA4BN"}

package/lib/Queue/middleware/queueDashboardGuard.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.queueDashboardGuard = queueDashboardGuard;
+const Config_1 = require("../../Config/Config");
+const Authorization_1 = require("../../Authorization");
+const AuthMiddleware_1 = require("../../Auth/AuthMiddleware");
+const VIEW_JOBS_ABILITY = "viewJobs";
+function isLocalEnv() {
+    return String(Config_1.config.get("APP_ENV", "") ?? "").toLowerCase() === "local";
+}
+/**
+ * Protects all `/queue/*` routes: in non-local env runs session auth then `viewJobs` gate.
+ * In `APP_ENV=local`, skips checks (development convenience).
+ */
+function queueDashboardGuard(req, res, next) {
+    if (isLocalEnv()) {
+        next();
+        return;
+    }
+    void AuthMiddleware_1.authMiddleware.auth(req, res, () => {
+        void (async () => {
+            try {
+                const user = req.user;
+                if (!user) {
+                    req.jccSession?.put("redirect", req.originalUrl || req.url || "/");
+                    return res.redirect(303, `/login?redirect=${encodeURIComponent(req.originalUrl || req.url || "/")}`);
+                }
+                if (!(await Authorization_1.GateFacade.can(user, VIEW_JOBS_ABILITY))) {
+                    if (req.expectsJson() && !req.isInertia()) {
+                        return res
+                            .status(403)
+                            .json({ message: "This action is unauthorized." });
+                    }
+                    return res.status(403).send("Forbidden");
+                }
+                next();
+            }
+            catch (e) {
+                next(e);
+            }
+        })();
+    });
+}

package/lib/Response/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Response/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAGvD;;;;;GAKG;AACH,qBAAa,YAAY;IACvB,OAAO,CAAC,OAAO,CAAa;IAC5B,OAAO,CAAC,QAAQ,CAAc;gBAClB,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW;IAYtD;;;OAGG;IACH,SAAS,CAAC,WAAW;IAerB;;;OAGG;IACH,OAAO,CAAC,YAAY;IAQpB,OAAO,CAAC,IAAI;CAIb"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Response/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAGvD;;;;;GAKG;AACH,qBAAa,YAAY;IACvB,OAAO,CAAC,OAAO,CAAa;IAC5B,OAAO,CAAC,QAAQ,CAAc;gBAClB,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW;IAYtD;;;OAGG;IACH,SAAS,CAAC,WAAW;IAerB;;;OAGG;IACH,OAAO,CAAC,YAAY;IAQpB,OAAO,CAAC,IAAI;CAQb"}

package/lib/Response/index.js

@@ -47,7 +47,12 @@ class HttpResponse {
         //   : this.response.redirect(303, reqUrls[0]);
     }
     with(message, type) {
-        this.request.flash(type, message);
+        if (this.request.jccSession) {
+            this.request.jccSession.flash(type, message);
+        }
+        else {
+            this.request.flash(type, message);
+        }
         return this;
     }
 }

package/lib/Routes/Route.d.ts

@@ -1,6 +1,6 @@
 import { RequestHandler } from "express";
 import { ResourceOption } from "../Interface/index";
-import { Constructor, Middleware, RouteHandler } from "../Type";
+import { Constructor, MiddlewareInput, RouteHandler } from "../Type";
 export declare class Route<T extends Record<string, RequestHandler>> {
     private static routeBuilder;
     /**
@@ -20,7 +20,7 @@ export declare class Route<T extends Record<string, RequestHandler>> {
      * @param {Array | function} middleware - Array of middleware functions.
      * @returns {Route} - Returns the route instance.
      */
-    static middleware(middleware: string | Middleware | string[]): typeof Route;
+    static middleware(middleware: MiddlewareInput): typeof Route;
     /**
      * Groups routes using a callback function.
      * @param {Function} callback - Callback function for defining grouped routes.

package/lib/Routes/Route.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Route.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Routes/Route.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EAAE,WAAW,EAAkB,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEhF,qBAAa,KAAK,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC;IACzD,OAAO,CAAC,MAAM,CAAC,YAAY,CAAqC;IAEhE;;;;OAIG;WACW,UAAU,CAAC,UAAU,EAAE,GAAG,GAAG,OAAO,KAAK;IAOvD;;;;OAIG;WACW,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,KAAK;IAK/C;;;;OAIG;WACW,UAAU,CACtB,UAAU,EAAE,MAAM,GAAG,UAAU,GAAG,MAAM,EAAE,GACzC,OAAO,KAAK;IAKf;;;;OAIG;WACW,KAAK,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,KAAK,IAAI,GAAG,OAAO,KAAK;IAQ3E;;;;;OAKG;WACW,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,IAAI;IAS5D;;;;;OAKG;WACW,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,IAAI;IAI7D;;;;;OAKG;WACW,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,IAAI;IAI9D;;;;;OAKG;WACW,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,IAAI;IAI5D;;;;;OAKG;WACW,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,IAAI;WAIjD,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;WAM7C,QAAQ,CACpB,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,WAAW,CAAC,GAAG,CAAC,EAC5B,MAAM,GAAE,cAAyC;WAarC,QAAQ,CAAC,IAAI,EAAE,MAAM;IAMnC,OAAO,CAAC,MAAM,CAAC,mBAAmB;CAOnC"}
+{"version":3,"file":"Route.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Routes/Route.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EACL,WAAW,EAGX,eAAe,EACf,YAAY,EACb,MAAM,SAAS,CAAC;AAEjB,qBAAa,KAAK,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC;IACzD,OAAO,CAAC,MAAM,CAAC,YAAY,CAAqC;IAEhE;;;;OAIG;WACW,UAAU,CAAC,UAAU,EAAE,GAAG,GAAG,OAAO,KAAK;IAOvD;;;;OAIG;WACW,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,KAAK;IAK/C;;;;OAIG;WACW,UAAU,CAAC,UAAU,EAAE,eAAe,GAAG,OAAO,KAAK;IAKnE;;;;OAIG;WACW,KAAK,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,KAAK,IAAI,GAAG,OAAO,KAAK;IAQ3E;;;;;OAKG;WACW,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,IAAI;IAS5D;;;;;OAKG;WACW,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,IAAI;IAI7D;;;;;OAKG;WACW,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,IAAI;IAI9D;;;;;OAKG;WACW,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,IAAI;IAI5D;;;;;OAKG;WACW,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,IAAI;WAIjD,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;WAM7C,QAAQ,CACpB,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,WAAW,CAAC,GAAG,CAAC,EAC5B,MAAM,GAAE,cAAyC;WAarC,QAAQ,CAAC,IAAI,EAAE,MAAM;IAMnC,OAAO,CAAC,MAAM,CAAC,mBAAmB;CAOnC"}

package/lib/Routes/RouteBuilder.d.ts

@@ -1,6 +1,6 @@
 import { Application as ExpressApplication, RequestHandler } from "express";
 import { BaseController, ExpressCallback, MethodsInterface, ResourceOption } from "../Interface";
-import { HttpMethodType, HttpRoutes, Middleware, ObjectType, RouteHandler } from "../Type";
+import { HttpMethodType, HttpRoutes, MiddlewareInput, ObjectType, RouteHandler } from "../Type";
 import type { Application } from "../Application/Application";
 export declare class RouteBuilder {
     private static middlewareStack;
@@ -18,7 +18,7 @@ export declare class RouteBuilder {
     static validateResourceOption(option: ResourceOption, methods: ObjectType): boolean | ObjectType;
     static setPrefix(prefix: string): void;
     private static replaceRouteParameters;
-    static setMiddle(middleware: string | Middleware | string[]): number | RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>[] | undefined;
+    static setMiddle(middleware: MiddlewareInput): number | RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>[] | undefined;
     static setController(Controller: new (...args: any[]) => any): void;
     static buildRoute(httpMethod: HttpMethodType, url: string, callback: RouteHandler): void;
     static setServiceContainer(container: Application): void;

package/lib/Routes/RouteBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RouteBuilder.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Routes/RouteBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,IAAI,kBAAkB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAC5E,OAAO,EAIL,cAAc,EACd,eAAe,EAEf,gBAAgB,EAChB,cAAc,EACf,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,cAAc,EACd,UAAU,EACV,UAAU,EACV,UAAU,EACV,YAAY,EACb,MAAM,SAAS,CAAC;AAMjB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAG9D,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAC,eAAe,CAA0B;IACxD,OAAO,CAAC,MAAM,CAAC,UAAU,CAAwB;IACjD,OAAO,CAAC,MAAM,CAAC,MAAM,CAAS;IAC9B,OAAO,CAAC,MAAM,CAAC,SAAS,CAAS;IACjC,SAAS,CAAC,MAAM,CAAC,gBAAgB,EAAE,WAAW,CAAC;IAC/C,SAAS,CAAC,MAAM,CAAC,UAAU,EAAE,cAAc,CAAC;IAC5C,OAAO,CAAC,MAAM,CAAC,MAAM,CAAkB;WAEzB,UAAU;WAKV,QAAQ;IAItB,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;WAOpC,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB;WAahD,YAAY,CAAC,GAAG,EAAE,MAAM;WAIxB,sBAAsB,CAClC,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,UAAU,GAClB,OAAO,GAAG,UAAU;WAmBT,SAAS,CAAC,MAAM,EAAE,MAAM;IAItC,OAAO,CAAC,MAAM,CAAC,sBAAsB;WAKvB,SAAS,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU,GAAG,MAAM,EAAE;WA4BpD,aAAa,CAAC,UAAU,EAAE,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG;WAIrD,UAAU,CACtB,UAAU,EAAE,cAAc,EAC1B,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,YAAY;WA0BV,mBAAmB,CAAC,SAAS,EAAE,WAAW;IAIxD,SAAS,CAAC,MAAM,CAAC,QAAQ,CACvB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,YAAY,EACtB,UAAU,EAAE,cAAc,GAAG,cAAc,EAAE,GAC5C,GAAG;IASN,SAAS,CAAC,MAAM,CAAC,gBAAgB,CAC/B,QAAQ,EAAE,cAAc,GAAG,KAAK,CAAC,GAAG,CAAC,GACpC,eAAe;IAwBlB,OAAO,CAAC,MAAM,CAAC,cAAc;WAgCf,aAAa,CAAC,GAAG,EAAE,kBAAkB;IAoCnD,WAAkB,SAAS,IAAI,UAAU,CAExC;CACF"}
+{"version":3,"file":"RouteBuilder.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Routes/RouteBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,IAAI,kBAAkB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAC5E,OAAO,EAIL,cAAc,EACd,eAAe,EAEf,gBAAgB,EAChB,cAAc,EACf,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,cAAc,EACd,UAAU,EAEV,eAAe,EACf,UAAU,EACV,YAAY,EACb,MAAM,SAAS,CAAC;AAMjB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAG9D,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAC,eAAe,CAA0B;IACxD,OAAO,CAAC,MAAM,CAAC,UAAU,CAAwB;IACjD,OAAO,CAAC,MAAM,CAAC,MAAM,CAAS;IAC9B,OAAO,CAAC,MAAM,CAAC,SAAS,CAAS;IACjC,SAAS,CAAC,MAAM,CAAC,gBAAgB,EAAE,WAAW,CAAC;IAC/C,SAAS,CAAC,MAAM,CAAC,UAAU,EAAE,cAAc,CAAC;IAC5C,OAAO,CAAC,MAAM,CAAC,MAAM,CAAkB;WAEzB,UAAU;WAKV,QAAQ;IAItB,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;WAOpC,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB;WAahD,YAAY,CAAC,GAAG,EAAE,MAAM;WAIxB,sBAAsB,CAClC,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,UAAU,GAClB,OAAO,GAAG,UAAU;WAmBT,SAAS,CAAC,MAAM,EAAE,MAAM;IAItC,OAAO,CAAC,MAAM,CAAC,sBAAsB;WAKvB,SAAS,CAAC,UAAU,EAAE,eAAe;WA4BrC,aAAa,CAAC,UAAU,EAAE,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG;WAIrD,UAAU,CACtB,UAAU,EAAE,cAAc,EAC1B,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,YAAY;WA0BV,mBAAmB,CAAC,SAAS,EAAE,WAAW;IAIxD,SAAS,CAAC,MAAM,CAAC,QAAQ,CACvB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,YAAY,EACtB,UAAU,EAAE,cAAc,GAAG,cAAc,EAAE,GAC5C,GAAG;IASN,SAAS,CAAC,MAAM,CAAC,gBAAgB,CAC/B,QAAQ,EAAE,cAAc,GAAG,KAAK,CAAC,GAAG,CAAC,GACpC,eAAe;IAwBlB,OAAO,CAAC,MAAM,CAAC,cAAc;WAgCf,aAAa,CAAC,GAAG,EAAE,kBAAkB;IAoCnD,WAAkB,SAAS,IAAI,UAAU,CAExC;CACF"}

package/lib/Security/CsrfMiddleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CsrfMiddleware.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Security/CsrfMiddleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAGhE,MAAM,WAAW,WAAW;IAC1B,4EAA4E;IAC5E,MAAM,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IAC7B,kEAAkE;IAClE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,uDAAuD;IACvD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gEAAgE;IAChE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,wDAAwD;IACxD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,yEAAyE;IACzE,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAmBD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,IAAI,CAAC,OAAO,GAAE,WAAgB,IAUpC,KAAK,UAAU,EAAE,KAAK,WAAW,EAAE,MAAM,OAAO,UA+CzD"}
+{"version":3,"file":"CsrfMiddleware.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Security/CsrfMiddleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAGhE,MAAM,WAAW,WAAW;IAC1B,4EAA4E;IAC5E,MAAM,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IAC7B,kEAAkE;IAClE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,uDAAuD;IACvD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gEAAgE;IAChE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,wDAAwD;IACxD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,yEAAyE;IACzE,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAmBD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,IAAI,CAAC,OAAO,GAAE,WAAgB,IAUpC,KAAK,UAAU,EAAE,KAAK,WAAW,EAAE,MAAM,OAAO,UAkDzD"}

package/lib/Security/CsrfMiddleware.js

@@ -71,11 +71,13 @@ function csrf(options = {}) {
         const submitted = req.body?.[fieldName] ||
             req.headers[headerName] ||
             req.headers[headerName.toLowerCase()];
-        try {
-            !submitted ||
-                !crypto_1.default.timingSafeEqual(Buffer.from(String(submitted)), Buffer.from(token));
+        if (!submitted) {
+            throw new MissMatchTokenException_1.MissMatchTokenException("CSRF token mismatch.");
         }
-        catch (err) {
+        const submittedBuf = Buffer.from(String(submitted), "utf8");
+        const tokenBuf = Buffer.from(token, "utf8");
+        if (submittedBuf.length !== tokenBuf.length ||
+            !crypto_1.default.timingSafeEqual(submittedBuf, tokenBuf)) {
             throw new MissMatchTokenException_1.MissMatchTokenException("CSRF token mismatch.");
         }
         next();

package/lib/Session/DatabaseSession.d.ts

@@ -1,11 +1,17 @@
 import { SessionData, SessionStore } from "../Interface";
+/**
+ * Database session store (Laravel-style `sessions` table).
+ * Requires Jcc-eloquent / Knex (`DB`) to be configured. Not for Sequelize-only apps.
+ *
+ * Expected columns: `id` (varchar, session id), `payload` (longtext), `last_activity` (int, unix).
+ */
 export declare class DatabaseSessionStore implements SessionStore {
-    private tableName;
-    createTable(): Promise<void>;
+    private readonly tableName;
+    constructor(tableName?: string);
     get(sessionId: string): Promise<SessionData | null>;
     set(sessionId: string, data: SessionData, maxAge?: number): Promise<void>;
     destroy(sessionId: string): Promise<void>;
     touch(sessionId: string, maxAge?: number): Promise<void>;
-    clear(): Promise<any>;
+    clear(): Promise<void>;
 }
 //# sourceMappingURL=DatabaseSession.d.ts.map

package/lib/Session/DatabaseSession.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DatabaseSession.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Session/DatabaseSession.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEzD,qBAAa,oBAAqB,YAAW,YAAY;IACvD,OAAO,CAAC,SAAS,CAAsB;IAE1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAmBnC,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;IAcnD,GAAG,CACP,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,WAAW,EACjB,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC;IAcV,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQzC,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYxD,KAAK,IAAI,OAAO,CAAC,GAAG,CAAC;CAO5B"}
+{"version":3,"file":"DatabaseSession.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Session/DatabaseSession.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEzD;;;;;GAKG;AACH,qBAAa,oBAAqB,YAAW,YAAY;IAC3C,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,GAAE,MAAmB;IAErD,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;IAenD,GAAG,CACP,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,WAAW,EACjB,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC;IA2BV,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQzC,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYxD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAO7B"}

package/lib/Session/DatabaseSession.js

@@ -2,36 +2,25 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DatabaseSessionStore = void 0;
 const Jcc_eloquent_1 = require("../Jcc-eloquent");
+/**
+ * Database session store (Laravel-style `sessions` table).
+ * Requires Jcc-eloquent / Knex (`DB`) to be configured. Not for Sequelize-only apps.
+ *
+ * Expected columns: `id` (varchar, session id), `payload` (longtext), `last_activity` (int, unix).
+ */
 class DatabaseSessionStore {
-    constructor() {
-        this.tableName = "sessions";
-    }
-    async createTable() {
-        const sqlQuery = Jcc_eloquent_1.Schema.create("sessions", function (table) {
-            table.id();
-            table.string("uuid");
-            table.foreignId("user_id").nullable().index();
-            table.string("ip_address", 45).nullable();
-            table.text("user_agent").nullable();
-            table.text("payload");
-            table.integer("last_activity").index();
-            table.timestamps();
-        });
-        try {
-            await Jcc_eloquent_1.DB.runQuery(sqlQuery);
-        }
-        catch (error) {
-            console.error("Failed to create sessions table:", error);
-        }
+    constructor(tableName = "sessions") {
+        this.tableName = tableName;
     }
     async get(sessionId) {
         try {
-            const result = (await Jcc_eloquent_1.DB.table(this.tableName)
+            const row = (await Jcc_eloquent_1.DB.table(this.tableName)
                 .select("payload")
-                .where("uuid", sessionId)
-                .where("expires", ">", Date.now())
+                .where("id", sessionId)
                 .first());
-            return JSON.parse(result?.payload);
+            if (!row?.payload)
+                return null;
+            return JSON.parse(row.payload);
         }
         catch (error) {
             console.error("Failed to get session from database:", error);
@@ -40,13 +29,25 @@ class DatabaseSessionStore {
     }
     async set(sessionId, data, maxAge) {
         try {
-            const expires = maxAge ? Date.now() + maxAge : null;
-            const payload = {
-                data: JSON.stringify(data),
-                expires,
-                uuid: sessionId,
-            };
-            await Jcc_eloquent_1.DB.table(this.tableName).insert(payload);
+            const payload = JSON.stringify(data);
+            const lastActivity = Math.floor(Date.now() / 1000);
+            const existing = await Jcc_eloquent_1.DB.table(this.tableName)
+                .where("id", sessionId)
+                .first();
+            if (existing) {
+                await Jcc_eloquent_1.DB.table(this.tableName).where("id", sessionId).update({
+                    payload,
+                    last_activity: lastActivity,
+                });
+            }
+            else {
+                await Jcc_eloquent_1.DB.table(this.tableName).insert({
+                    id: sessionId,
+                    payload,
+                    last_activity: lastActivity,
+                });
+            }
+            void maxAge;
         }
         catch (error) {
             console.error("Failed to set session in database:", error);
@@ -54,7 +55,7 @@ class DatabaseSessionStore {
     }
     async destroy(sessionId) {
         try {
-            await Jcc_eloquent_1.DB.table(this.tableName).where("uuid", sessionId).delete();
+            await Jcc_eloquent_1.DB.table(this.tableName).where("id", sessionId).delete();
         }
         catch (error) {
             console.error("Failed to destroy session in database:", error);
@@ -62,10 +63,11 @@ class DatabaseSessionStore {
     }
     async touch(sessionId, maxAge) {
         try {
-            const expires = maxAge ? Date.now() + maxAge : null;
+            const lastActivity = Math.floor(Date.now() / 1000);
             await Jcc_eloquent_1.DB.table(this.tableName)
-                .where("uuid", sessionId)
-                .update({ expires });
+                .where("id", sessionId)
+                .update({ last_activity: lastActivity });
+            void maxAge;
         }
         catch (error) {
             console.error("Failed to touch session in database:", error);
@@ -73,7 +75,7 @@ class DatabaseSessionStore {
     }
     async clear() {
         try {
-            return Jcc_eloquent_1.DB.table(this.tableName).delete();
+            await Jcc_eloquent_1.DB.table(this.tableName).delete();
         }
         catch (error) {
             console.error("Failed to clear sessions from database:", error);

package/lib/Session/ExpressJccSession.d.ts

@@ -0,0 +1,23 @@
+import type { AppRequest } from "../Interface";
+import type { SessionData } from "../Interface";
+import type { Session } from "./index";
+export declare class ExpressJccSession {
+    private readonly req;
+    constructor(req: AppRequest);
+    flash(key: string, value: any): void;
+    getFlash(key: string, defaultValue?: any): any;
+    get(key: string, defaultValue?: any): any;
+    put(key: string, value: any): void;
+    has(key: string): boolean;
+    forget(key: string): void;
+    all(): SessionData;
+    only(keys: string[]): SessionData;
+    except(keys: string[]): SessionData;
+    flush(): void;
+    load(): Promise<void>;
+    save(): Promise<void>;
+    regenerate(): Promise<void>;
+    getId(): string;
+}
+export declare function createExpressJccSession(req: AppRequest): Session;
+//# sourceMappingURL=ExpressJccSession.d.ts.map

package/lib/Session/ExpressJccSession.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExpressJccSession.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Session/ExpressJccSession.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAWvC,qBAAa,iBAAiB;IAChB,OAAO,CAAC,QAAQ,CAAC,GAAG;gBAAH,GAAG,EAAE,UAAU;IAE5C,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,IAAI;IAIpC,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,GAAG,GAAG,GAAG;IAO9C,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,GAAG,GAAG,GAAG;IAOzC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,IAAI;IAMlC,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAKzB,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAKzB,GAAG,IAAI,WAAW;IAKlB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,WAAW;IAQjC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,WAAW;IAUnC,KAAK,IAAI,IAAI;IASP,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAQrB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAUjC,KAAK,IAAI,MAAM;CAGhB;AAED,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAEhE"}

package/lib/Session/ExpressJccSession.js

@@ -0,0 +1,110 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExpressJccSession = void 0;
+exports.createExpressJccSession = createExpressJccSession;
+/**
+ * Bridges `req.jccSession` to the same underlying store as `express-session` +
+ * `connect-flash`, so flash messages set via `res.with()` or `req.flash()` stay
+ * in sync with `jccSession.flash()` / `getFlash()`.
+ */
+function sessionRecord(req) {
+    return req.session;
+}
+class ExpressJccSession {
+    constructor(req) {
+        this.req = req;
+    }
+    flash(key, value) {
+        this.req.flash(key, value);
+    }
+    getFlash(key, defaultValue) {
+        const raw = this.req.flash(key);
+        if (raw === undefined || raw === null)
+            return defaultValue;
+        if (Array.isArray(raw))
+            return raw.length ? raw[0] : defaultValue;
+        return raw;
+    }
+    get(key, defaultValue) {
+        const s = sessionRecord(this.req);
+        if (!s)
+            return defaultValue;
+        const v = s[key];
+        return v !== undefined ? v : defaultValue;
+    }
+    put(key, value) {
+        const s = sessionRecord(this.req);
+        if (!s)
+            return;
+        s[key] = value;
+    }
+    has(key) {
+        const s = sessionRecord(this.req);
+        return s != null && s[key] !== undefined;
+    }
+    forget(key) {
+        const s = sessionRecord(this.req);
+        if (s && key in s)
+            delete s[key];
+    }
+    all() {
+        const s = sessionRecord(this.req);
+        return s ? { ...s } : {};
+    }
+    only(keys) {
+        const out = {};
+        for (const key of keys) {
+            if (this.has(key))
+                out[key] = this.get(key);
+        }
+        return out;
+    }
+    except(keys) {
+        const full = this.all();
+        const skip = new Set(keys);
+        const out = {};
+        for (const k of Object.keys(full)) {
+            if (!skip.has(k))
+                out[k] = full[k];
+        }
+        return out;
+    }
+    flush() {
+        const s = sessionRecord(this.req);
+        if (!s)
+            return;
+        const keep = new Set(["cookie"]);
+        for (const k of Object.keys(s)) {
+            if (!keep.has(k))
+                delete s[k];
+        }
+    }
+    async load() {
+        /* express-session already populated req.session */
+    }
+    async save() {
+        return new Promise((resolve, reject) => {
+            const s = this.req.session;
+            if (s?.save)
+                s.save((err) => (err ? reject(err) : resolve()));
+            else
+                resolve();
+        });
+    }
+    async regenerate() {
+        return new Promise((resolve, reject) => {
+            const s = this.req.session;
+            if (s?.regenerate)
+                s.regenerate((err) => (err ? reject(err) : resolve()));
+            else
+                resolve();
+        });
+    }
+    getId() {
+        return this.req.sessionID ?? "";
+    }
+}
+exports.ExpressJccSession = ExpressJccSession;
+function createExpressJccSession(req) {
+    return new ExpressJccSession(req);
+}

package/lib/Session/RedisSession.d.ts

@@ -1,7 +1,7 @@
 import { SessionData, SessionStore } from "../Interface";
 export declare class RedisSessionStore implements SessionStore {
-    private client;
-    private prefix;
+    private readonly client;
+    private readonly prefix;
     constructor(redisUrl: string, prefix?: string);
     private getKey;
     get(sessionId: string): Promise<SessionData | null>;

package/lib/Session/RedisSession.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RedisSession.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Session/RedisSession.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEzD,qBAAa,iBAAkB,YAAW,YAAY;IACpD,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,MAAM,CAAS;gBAEX,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAE,MAAmB;IAMzD,OAAO,CAAC,MAAM;IAIR,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;IAgBnD,GAAG,CACP,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,WAAW,EACjB,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC;IAeV,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASzC,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYxD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAU7B"}
+{"version":3,"file":"RedisSession.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Session/RedisSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AA6BzD,qBAAa,iBAAkB,YAAW,YAAY;IACpD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;IACzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;gBAEpB,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAE,MAAmB;IAOzD,OAAO,CAAC,MAAM;IAIR,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;IAgBnD,GAAG,CACP,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,WAAW,EACjB,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC;IAeV,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASzC,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYxD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAU7B"}

package/lib/Session/RedisSession.js

@@ -1,12 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RedisSessionStore = void 0;
-const redis_1 = require("redis");
+function loadRedisCreateClient() {
+    try {
+        // Optional peer dependency — only required when SESSION_DRIVER=redis
+        // eslint-disable-next-line @typescript-eslint/no-require-imports
+        const redis = require("redis");
+        if (typeof redis.createClient !== "function") {
+            throw new Error("invalid redis module");
+        }
+        return redis.createClient;
+    }
+    catch {
+        throw new Error('Session driver "redis" needs the optional package: npm install redis');
+    }
+}
 class RedisSessionStore {
     constructor(redisUrl, prefix = "session:") {
-        this.client = (0, redis_1.createClient)({ url: redisUrl });
+        const createClient = loadRedisCreateClient();
+        this.client = createClient({ url: redisUrl });
         this.prefix = prefix;
-        this.client.connect();
+        void this.client.connect();
     }
     getKey(sessionId) {
         return `${this.prefix}${sessionId}`;
@@ -46,7 +60,7 @@ class RedisSessionStore {
             await this.client.del(key);
         }
         catch (error) {
-            console.error("Failed to destroy session in Redis:", error);
+            console.error("Failed to destroy session from Redis:", error);
         }
     }
     async touch(sessionId, maxAge) {
@@ -64,7 +78,7 @@ class RedisSessionStore {
         try {
             const keys = await this.client.keys(`${this.prefix}*`);
             if (keys.length > 0) {
-                await this.client.del(keys);
+                await this.client.del(...keys);
             }
         }
         catch (error) {