@scefira/dfw 1.5.4 → 1.6.0

package/dist/cjs/lib/APIManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"APIManager.d.ts","sourceRoot":"","sources":["../../../src/lib/APIManager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAWtD,qBAAa,UAAU,CAAC,IAAI,SAAS,OAAO,CAAC,GAAG,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAM;gBAEL,GAAG,EAAE,IAAI;IAId,eAAe;IA8Ef,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW;CAkDvD"}
+{"version":3,"file":"APIManager.d.ts","sourceRoot":"","sources":["../../../src/lib/APIManager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAM5C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAWtD,qBAAa,UAAU,CAAC,IAAI,SAAS,OAAO,CAAC,GAAG,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAO;gBAEN,GAAG,EAAE,IAAI;IAId,eAAe;IAsKf,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW;CA0GvD"}

package/dist/cjs/lib/APIManager.js

@@ -31,30 +31,42 @@ class APIManager {
         const config = this.DFW.config;
         const APIRouter = this.DFW.routerAPILayer;
         //// PASSPORT AND SESSION ////
+        if (process.env.NODE_ENV === "production" &&
+            !((_a = config.session) === null || _a === void 0 ? void 0 : _a.secret)) {
+            DFWUtils_1.DFWUtils.log("[DFW] Warning: using the default session secret in production");
+        }
         APIRouter.use((0, express_session_1.default)({
-            rolling: (_b = (_a = config.session) === null || _a === void 0 ? void 0 : _a.rolling) !== null && _b !== void 0 ? _b : false,
-            name: 'stk',
-            secret: (_d = (_c = config.session) === null || _c === void 0 ? void 0 : _c.secret) !== null && _d !== void 0 ? _d : 'default',
+            rolling: (_c = (_b = config.session) === null || _b === void 0 ? void 0 : _b.rolling) !== null && _c !== void 0 ? _c : false,
+            name: "stk",
+            secret: (_e = (_d = config.session) === null || _d === void 0 ? void 0 : _d.secret) !== null && _e !== void 0 ? _e : "default",
             genid: () => (0, uuid_1.v7)(),
             resave: false,
             saveUninitialized: false,
             store: new DFWSessionStore_1.DFWSessionStore(this.DFW),
-            cookie: Object.assign({ secure: false, maxAge: 1000 * 60 * 60 * 24 * 180 }, (_e = config.session) === null || _e === void 0 ? void 0 : _e.cookieOptions)
+            cookie: (0, DFWSessionStore_1.sessionCookieOptions)(config)
         }));
         APIRouter.use(passport_1.default.initialize());
         APIRouter.use(passport_1.default.session());
         if (((_g = (_f = config.session) === null || _f === void 0 ? void 0 : _f.authenticators) === null || _g === void 0 ? void 0 : _g.dfw) !== false) {
-            passport_1.default.use('dfw', (0, DFWPassportStrategy_1.DFWPassportStrategy)(this.DFW));
+            passport_1.default.use("dfw", (0, DFWPassportStrategy_1.DFWPassportStrategy)(this.DFW));
         }
-        passport_1.default.serializeUser((_a, done_1) => __awaiter(this, [_a, done_1], void 0, function* ({ id }, done) {
+        passport_1.default.serializeUser(({ id }, done) => {
             done(null, id);
-        }));
-        passport_1.default.deserializeUser((idUser, done) => __awaiter(this, void 0, void 0, function* () {
+        });
+        passport_1.default.deserializeUser((idUser, done) => {
             done(null, { id: idUser });
-        }));
+        });
         //// DFW API Schema ////
         APIRouter.use(((req, res, next) => {
             const callbackStack = [];
+            let responseFinished = false;
+            const runCallback = (callback) => {
+                void Promise.resolve()
+                    .then(callback)
+                    .catch((error) => {
+                    console.error("[DFW] Callback error:", error);
+                });
+            };
             const dfw = {
                 db: this.DFW.db,
                 getSession: () => {
@@ -65,82 +77,124 @@ class APIManager {
                         id: req.sessionID
                     });
                 },
-                addCallback: (cb) => {
-                    callbackStack.push(cb);
+                addCallback: (callback) => {
+                    // Run immediately if the response already finished.
+                    if (responseFinished) {
+                        runCallback(callback);
+                        return;
+                    }
+                    callbackStack.push(callback);
                 }
             };
             req.dfw = dfw;
+            // All post-response callbacks are handled in one place.
             res.once("finish", () => {
-                callbackStack.forEach((cb) => {
-                    void Promise.resolve()
-                        .then(cb)
-                        .catch((error) => {
-                        console.error("[DFW] Callback error:", error);
-                    });
-                });
+                responseFinished = true;
+                for (const callback of callbackStack.splice(0)) {
+                    runCallback(callback);
+                }
             });
             next();
         }));
         APIRouter.use(this.DFW.routerAPIContainer);
-        APIRouter.use((err, _1, res, _2) => {
-            if (process.env.NODE_ENV == "development")
+        //// ERROR HANDLER ////
+        APIRouter.use((err, _req, res, next) => {
+            // Let Express handle errors after the response has started.
+            if (res.headersSent) {
+                return next(err);
+            }
+            if (process.env.NODE_ENV === "development") {
                 DFWUtils_1.DFWUtils.log(err, true);
-            const errorStatus = res.statusCode === 200 ? 500 : res.statusCode;
-            if (typeof err === "object" && err.message) {
-                res.status(errorStatus).json({ error: err.message, stack: process.env.NODE_ENV == "development" ? err.stack : null }).end();
             }
-            else {
-                res.status(errorStatus).json({ error: err }).end();
+            const explicitStatus = typeof (err === null || err === void 0 ? void 0 : err.status) === "number"
+                ? err.status
+                : typeof (err === null || err === void 0 ? void 0 : err.statusCode) === "number"
+                    ? err.statusCode
+                    : undefined;
+            const currentStatus = res.statusCode >= 400 &&
+                res.statusCode <= 599
+                ? res.statusCode
+                : undefined;
+            const errorStatus = explicitStatus >= 400 &&
+                explicitStatus <= 599
+                ? explicitStatus
+                : currentStatus !== null && currentStatus !== void 0 ? currentStatus : 500;
+            if (typeof err === "object" &&
+                err !== null &&
+                err.message) {
+                res.status(errorStatus).json({
+                    error: err.message,
+                    stack: process.env.NODE_ENV === "development"
+                        ? err.stack
+                        : null
+                });
+                return;
             }
+            res.status(errorStatus).json({
+                error: err
+            });
         });
     }
     addListener(path, params) {
         var _a;
         const APIContainer = this.DFW.routerAPIContainer;
-        const method = (_a = params.method) !== null && _a !== void 0 ? _a : 'get';
+        const method = (_a = params.method) !== null && _a !== void 0 ? _a : "get";
         const mainFunction = params.fn;
         if (!params.middleware && !mainFunction) {
             DFWUtils_1.DFWUtils.log(`Unable to set listener for [${method}] ${path} listener and middleware are undefined`);
             return;
         }
-        this.DFW.server[method](path, this.DFW.routerAPILayer); // Install api layer in this route
-        // Body Parser
-        if (['post', 'put', 'patch', 'delete'].includes(method) && params.disableBodyParser !== true)
+        // Install the API layer only for registered API routes.
+        this.DFW.server[method](path, this.DFW.routerAPILayer);
+        // Body parser
+        if (["post", "put", "patch", "delete"].includes(method) &&
+            params.disableBodyParser !== true) {
             APIContainer[method](path, body_parser_1.default.json());
-        // file upload middleware
-        if (params.upload)
-            APIContainer[method](path, (0, express_fileupload_1.default)(typeof params.upload === 'boolean' ? {} : params.upload));
-        // plugged middlewares and handlers
+        }
+        // File upload middleware
+        if (params.upload) {
+            APIContainer[method](path, (0, express_fileupload_1.default)(typeof params.upload === "boolean"
+                ? {}
+                : params.upload));
+        }
+        // Plugged middlewares and handlers
         if (params.middleware) {
-            const middlewares = Array.isArray(params.middleware) ? params.middleware : [params.middleware];
+            const middlewares = Array.isArray(params.middleware)
+                ? params.middleware
+                : [params.middleware];
             APIContainer[method](path, ...middlewares);
         }
         if (mainFunction) {
             APIContainer[method](path, (req, res, next) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    // calling the listener
-                    const data = yield mainFunction(req.dfw, req, res).catch(next);
+                    const data = yield mainFunction(req.dfw, req, res);
                     if (params.callback) {
-                        res.on('finish', () => {
-                            var _a;
-                            (_a = params.callback) === null || _a === void 0 ? void 0 : _a.call(params, req, data).catch((e) => {
-                                console.error('Error in callback:', e);
-                            });
-                        });
+                        req.dfw.addCallback(() => params.callback(req, data));
                     }
-                    if (!res.finished && !params.disableAutoSend) {
-                        if (data)
-                            res.json(data).end();
-                        else
+                    if (!params.disableAutoSend &&
+                        !res.writableEnded) {
+                        /*
+                         * If the handler already started the response,
+                         * only finish it instead of trying to replace it.
+                         */
+                        if (res.headersSent) {
+                            res.end();
+                            return;
+                        }
+                        if (data !== undefined) {
+                            res.json(data);
+                        }
+                        else {
                             res.end();
+                        }
                     }
                 }
-                catch (e) {
-                    next(e);
+                catch (error) {
+                    next(error);
                 }
             }));
         }
-        DFWUtils_1.DFWUtils.log(`${chalk_1.default.yellow(method.toUpperCase().padEnd(7, ' '))}  ${chalk_1.default.green(path)}`);
+        DFWUtils_1.DFWUtils.log(`${chalk_1.default.yellow(method.toUpperCase().padEnd(7, " "))}  ${chalk_1.default.green(path)}`);
     }
 }
 exports.APIManager = APIManager;

package/dist/cjs/lib/APIManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"APIManager.js","sourceRoot":"","sources":["../../../src/lib/APIManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"APIManager.js","sourceRoot":"","sources":["../../../src/lib/APIManager.ts"],"names":[],"mappings":"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"}

package/dist/cjs/lib/DFWSessionStore.d.ts

@@ -1,11 +1,28 @@
+import type { Request } from "express";
+import session, { type CookieOptions, type SessionData } from "express-session";
+import type { DFWConfig } from "#types/DFWConfig";
 import type { DFWCore } from "./DFWCore.js";
-import { Store } from "express-session";
-export declare class DFWSessionStore extends Store {
-    private db;
-    private cache;
+export declare function sessionCookieOptions(config: DFWConfig): CookieOptions;
+export declare class DFWSessionStore extends session.Store {
+    private readonly db;
+    private readonly cookieOptions;
+    private readonly rolling;
+    private readonly loadedSessions;
+    private readonly cache;
+    private readonly pendingReads;
     constructor(DFW: DFWCore<any>);
-    get(sid: string, callback: (err: any, session?: any) => void): void;
-    set(sid: string, sessionData: any, callback?: (err?: any) => void): void;
+    private expiration;
+    private legacySession;
+    private readSession;
+    private serialize;
+    private findSession;
+    private invalidate;
+    get(sid: string, callback: (err: any, session?: SessionData | null) => void): void;
+    createSession(req: Request, sessionData: SessionData): session.Session & SessionData;
+    set(sid: string, sessionData: SessionData, callback?: (err?: any) => void): void;
+    touch(sid: string, sessionData: SessionData, callback?: (err?: any) => void): void;
+    private touchSession;
     destroy(sid: string, callback?: (err?: any) => void): void;
+    private reportError;
 }
 //# sourceMappingURL=DFWSessionStore.d.ts.map

package/dist/cjs/lib/DFWSessionStore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DFWSessionStore.d.ts","sourceRoot":"","sources":["../../../src/lib/DFWSessionStore.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAGxC,qBAAa,eAAgB,SAAQ,KAAK;IAEtC,OAAO,CAAC,EAAE,CAAc;IAExB,OAAO,CAAC,KAAK,CAA8B;gBAE/B,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC;IAM7B,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI;IA+BnE,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI;IAmBxE,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI;CAc7D"}
+{"version":3,"file":"DFWSessionStore.d.ts","sourceRoot":"","sources":["../../../src/lib/DFWSessionStore.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,OAAO,EAAE,EAAE,KAAK,aAAa,EAAE,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAGhF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAe5C,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,SAAS,GAAG,aAAa,CAMrE;AAED,qBAAa,eAAgB,SAAQ,OAAO,CAAC,KAAK;IAC9C,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAe;IAClC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAC9C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;IAClC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA8B;IAC7D,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAsD;IAC5E,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAoD;gBAErE,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC;IAQ7B,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,aAAa;IAKrB,OAAO,CAAC,WAAW;IAmCnB,OAAO,CAAC,SAAS;IAQjB,OAAO,CAAC,WAAW;IA+BnB,OAAO,CAAC,UAAU;IAKlB,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,IAAI,KAAK,IAAI,GAAG,IAAI;IAYlF,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,GAAG,WAAW;IASpF,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI;IAiChF,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI;YAYpE,YAAY;IAmC1B,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI;IAY1D,OAAO,CAAC,WAAW;CAItB"}

package/dist/cjs/lib/DFWSessionStore.js

@@ -1,81 +1,237 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DFWSessionStore = void 0;
-const express_session_1 = require("express-session");
+exports.sessionCookieOptions = sessionCookieOptions;
+const express_session_1 = __importDefault(require("express-session"));
 const lru_min_1 = require("lru.min");
-class DFWSessionStore extends express_session_1.Store {
+const SESSION_CACHE_IDLE_MS = 60 * 60 * 1000;
+function sessionCookieOptions(config) {
+    var _a;
+    return Object.assign({ secure: false, maxAge: 1000 * 60 * 60 * 24 * 180 }, (_a = config.session) === null || _a === void 0 ? void 0 : _a.cookieOptions);
+}
+class DFWSessionStore extends express_session_1.default.Store {
     constructor(DFW) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         super();
+        this.loadedSessions = new WeakSet();
+        this.pendingReads = new Map();
         this.db = DFW.db;
-        this.cache = (0, lru_min_1.createLRU)({ max: (_b = (_a = DFW.config.session) === null || _a === void 0 ? void 0 : _a.cacheSize) !== null && _b !== void 0 ? _b : 200 });
+        this.cookieOptions = sessionCookieOptions(DFW.config);
+        this.rolling = (_b = (_a = DFW.config.session) === null || _a === void 0 ? void 0 : _a.rolling) !== null && _b !== void 0 ? _b : false;
+        this.cache = (0, lru_min_1.createLRU)({ max: (_d = (_c = DFW.config.session) === null || _c === void 0 ? void 0 : _c.cacheSize) !== null && _d !== void 0 ? _d : 200 });
     }
-    get(sid, callback) {
-        if (this.cache.has(sid)) {
-            if (process.env.NODE_ENV === 'development')
-                console.log(`read session (cache) ${sid}`);
-            callback(null, this.cache.get(sid));
-            return;
+    expiration(sessionData) {
+        var _a;
+        return (_a = sessionData.cookie.expires) !== null && _a !== void 0 ? _a : null;
+    }
+    legacySession(idUser) {
+        const cookie = Object.assign(new express_session_1.default.Cookie(), this.cookieOptions);
+        return Object.assign({ cookie }, { passport: { user: idUser } });
+    }
+    readSession(record) {
+        if (record.data === null) {
+            return { data: this.legacySession(record.idUser), expiresAt: record.expiresAt };
         }
-        if (process.env.NODE_ENV === 'development')
-            console.log(`read session ${sid}`);
-        this.db.dfw_session.findFirst({
-            select: { idUser: true },
-            where: {
-                id: sid,
-                OR: [
-                    { expiresAt: null },
-                    { expiresAt: { gt: new Date() } },
-                ],
+        const stored = JSON.parse(record.data);
+        let data = stored;
+        let expiresAt = record.expiresAt;
+        if (typeof stored === "object" && stored !== null && "__dfwSessionStore" in stored) {
+            if (stored.__dfwSessionStore !== 1 || !("session" in stored) ||
+                !("expiresAt" in stored) ||
+                (typeof stored.expiresAt !== "string" && stored.expiresAt !== null)) {
+                throw new Error("Invalid stored session data");
             }
-        }).then((sessionObj) => {
-            if (sessionObj) {
-                const passportSession = { cookie: {}, passport: { user: sessionObj.idUser } };
-                this.cache.set(sid, passportSession);
-                callback(null, passportSession);
+            data = stored.session;
+            expiresAt = stored.expiresAt === null ? null : new Date(stored.expiresAt);
+            if (expiresAt !== null && !Number.isFinite(expiresAt.getTime())) {
+                throw new Error("Invalid stored session data");
             }
-            else {
-                this.cache.set(sid, null);
-                callback(null, null);
+            if (record.expiresAt !== null && (expiresAt === null ||
+                record.expiresAt.getTime() < Date.UTC(expiresAt.getUTCFullYear(), expiresAt.getUTCMonth(), expiresAt.getUTCDate()))) {
+                expiresAt = record.expiresAt;
             }
-        }).catch((e) => {
-            callback(e);
+        }
+        if (typeof data !== "object" || data === null || !("cookie" in data) ||
+            typeof data.cookie !== "object" || data.cookie === null ||
+            !("originalMaxAge" in data.cookie) ||
+            (typeof data.cookie.originalMaxAge !== "number" && data.cookie.originalMaxAge !== null)) {
+            throw new Error("Invalid stored session data");
+        }
+        return { data: data, expiresAt };
+    }
+    serialize(sessionData, expiresAt) {
+        var _a;
+        return JSON.stringify({
+            __dfwSessionStore: 1,
+            session: sessionData,
+            expiresAt: (_a = expiresAt === null || expiresAt === void 0 ? void 0 : expiresAt.toISOString()) !== null && _a !== void 0 ? _a : null
         });
     }
+    findSession(sid) {
+        const cached = this.cache.get(sid);
+        if (cached) {
+            const now = Date.now();
+            if (now - cached.lastAccess <= SESSION_CACHE_IDLE_MS) {
+                cached.lastAccess = now;
+                return Promise.resolve(cached.record);
+            }
+            this.cache.delete(sid);
+        }
+        const existing = this.pendingReads.get(sid);
+        if (existing)
+            return existing;
+        const pending = this.db.dfw_session.findFirst({
+            select: { idUser: true, data: true, expiresAt: true },
+            where: { id: sid }
+        }).then((record) => {
+            if (this.pendingReads.get(sid) === pending) {
+                this.pendingReads.delete(sid);
+                if (record)
+                    this.cache.set(sid, { record, lastAccess: Date.now() });
+            }
+            return record;
+        }, (error) => {
+            if (this.pendingReads.get(sid) === pending)
+                this.pendingReads.delete(sid);
+            throw error;
+        });
+        this.pendingReads.set(sid, pending);
+        return pending;
+    }
+    invalidate(sid) {
+        this.cache.delete(sid);
+        this.pendingReads.delete(sid);
+    }
+    get(sid, callback) {
+        this.findSession(sid).then((record) => {
+            var _a;
+            if (!record)
+                return null;
+            const stored = this.readSession(record);
+            if (stored.expiresAt !== null && stored.expiresAt.getTime() <= Date.now()) {
+                if (((_a = this.cache.peek(sid)) === null || _a === void 0 ? void 0 : _a.record) === record)
+                    this.invalidate(sid);
+                return null;
+            }
+            return stored.data;
+        }).then((data) => callback(null, data), (error) => callback(error));
+    }
+    createSession(req, sessionData) {
+        if (sessionData.cookie.secure === "auto") {
+            sessionData.cookie.secure = req.secure;
+        }
+        const result = super.createSession(req, sessionData);
+        this.loadedSessions.add(result);
+        return result;
+    }
     set(sid, sessionData, callback) {
-        var _a, _b;
-        if (process.env.NODE_ENV === 'development')
-            console.log(`setting session ${sid} ${JSON.stringify(sessionData)}`);
-        this.cache.set(sid, sessionData);
-        this.db.dfw_session.upsert({
-            create: {
-                id: sid,
-                idUser: (_a = sessionData.passport) === null || _a === void 0 ? void 0 : _a.user,
-            },
-            update: {
-                idUser: (_b = sessionData.passport) === null || _b === void 0 ? void 0 : _b.user,
-            },
-            where: {
-                id: sid
+        var _a;
+        try {
+            const passport = sessionData.passport;
+            const expiresAt = this.expiration(sessionData);
+            const values = {
+                idUser: (_a = passport === null || passport === void 0 ? void 0 : passport.user) !== null && _a !== void 0 ? _a : null,
+                data: this.serialize(sessionData, expiresAt),
+                expiresAt
+            };
+            const loaded = this.loadedSessions.has(sessionData);
+            this.loadedSessions.add(sessionData);
+            this.invalidate(sid);
+            const write = loaded
+                ? this.db.dfw_session.updateMany({ where: { id: sid }, data: values }).then((result) => {
+                    if (result.count === 0)
+                        throw new Error("Cannot save a destroyed session");
+                })
+                : this.db.dfw_session.upsert({
+                    create: Object.assign({ id: sid }, values),
+                    update: values,
+                    where: { id: sid }
+                });
+            write.then(() => {
+                this.invalidate(sid);
+                callback === null || callback === void 0 ? void 0 : callback();
+            }, (error) => {
+                this.invalidate(sid);
+                this.reportError(error, callback);
+            });
+        }
+        catch (error) {
+            this.reportError(error, callback);
+        }
+    }
+    touch(sid, sessionData, callback) {
+        if (!this.rolling) {
+            callback === null || callback === void 0 ? void 0 : callback();
+            return;
+        }
+        this.touchSession(sid, sessionData)
+            .then(() => callback === null || callback === void 0 ? void 0 : callback(), (error) => {
+            this.invalidate(sid);
+            this.reportError(error, callback);
+        });
+    }
+    touchSession(sid, sessionData) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            for (let attempt = 0; attempt < 5; attempt++) {
+                const record = yield this.findSession(sid);
+                if (!record)
+                    return;
+                if (record.data === null)
+                    return;
+                const stored = this.readSession(record);
+                if (stored.expiresAt !== null && stored.expiresAt.getTime() <= Date.now()) {
+                    if (((_a = this.cache.peek(sid)) === null || _a === void 0 ? void 0 : _a.record) === record)
+                        this.invalidate(sid);
+                    return;
+                }
+                const expiresAt = this.expiration(sessionData);
+                const data = this.serialize(Object.assign(Object.assign({}, stored.data), { cookie: sessionData.cookie }), expiresAt);
+                const result = yield this.db.dfw_session.updateMany({
+                    where: { id: sid, data: record.data, expiresAt: record.expiresAt },
+                    data: { data, expiresAt }
+                });
+                if (result.count > 0) {
+                    const cached = this.cache.peek(sid);
+                    if ((cached === null || cached === void 0 ? void 0 : cached.record) === record) {
+                        cached.record = Object.assign(Object.assign({}, record), { data, expiresAt: expiresAt === null ? null : new Date(Date.UTC(expiresAt.getUTCFullYear(), expiresAt.getUTCMonth(), expiresAt.getUTCDate())) });
+                    }
+                    return;
+                }
+                this.invalidate(sid);
             }
-        }).then(() => {
-            callback && callback();
-        }).catch(e => callback && callback(e));
+            throw new Error("Could not update session expiration after concurrent changes");
+        });
     }
     destroy(sid, callback) {
-        if (process.env.NODE_ENV === 'development')
-            console.log(`deleting session ${sid}`);
-        this.cache.delete(sid);
-        this.db.dfw_session.deleteMany({
-            where: {
-                id: sid
-            },
-        }).then(() => {
-            callback && callback();
-        }).catch((e) => {
-            callback && callback(e);
+        this.invalidate(sid);
+        this.db.dfw_session.deleteMany({ where: { id: sid } })
+            .then(() => {
+            this.invalidate(sid);
+            callback === null || callback === void 0 ? void 0 : callback();
+        }, (error) => {
+            this.invalidate(sid);
+            this.reportError(error, callback);
         });
     }
+    reportError(error, callback) {
+        if (callback)
+            callback(error);
+        else
+            console.error("[DFW] Session store error:", error);
+    }
 }
 exports.DFWSessionStore = DFWSessionStore;
 //# sourceMappingURL=DFWSessionStore.js.map