@scefira/dfw 1.5.4 → 1.6.0

package/dist/esm/lib/APIManager.js

@@ -2,10 +2,10 @@ import chalk from "chalk";
 import passport from "passport";
 import session from "express-session";
 import fileUpload from "express-fileupload";
-import { v7 as uuid7 } from 'uuid';
+import { v7 as uuid7 } from "uuid";
 import bodyParser from "body-parser";
 import { DFWPassportStrategy } from "#lib/DFWPassportStrategy";
-import { DFWSessionStore } from "#lib/DFWSessionStore";
+import { DFWSessionStore, sessionCookieOptions } from "#lib/DFWSessionStore";
 import { DFWUtils } from "#lib/DFWUtils";
 export class APIManager {
     constructor(DFW) {
@@ -15,34 +15,42 @@ export class APIManager {
         const config = this.DFW.config;
         const APIRouter = this.DFW.routerAPILayer;
         //// PASSPORT AND SESSION ////
+        if (process.env.NODE_ENV === "production" &&
+            !config.session?.secret) {
+            DFWUtils.log("[DFW] Warning: using the default session secret in production");
+        }
         APIRouter.use(session({
             rolling: config.session?.rolling ?? false,
-            name: 'stk',
-            secret: config.session?.secret ?? 'default',
+            name: "stk",
+            secret: config.session?.secret ?? "default",
             genid: () => uuid7(),
             resave: false,
             saveUninitialized: false,
             store: new DFWSessionStore(this.DFW),
-            cookie: {
-                secure: false,
-                maxAge: 1000 * 60 * 60 * 24 * 180, //6 Months
-                ...config.session?.cookieOptions
-            }
+            cookie: sessionCookieOptions(config)
         }));
         APIRouter.use(passport.initialize());
         APIRouter.use(passport.session());
         if (config.session?.authenticators?.dfw !== false) {
-            passport.use('dfw', DFWPassportStrategy(this.DFW));
+            passport.use("dfw", DFWPassportStrategy(this.DFW));
         }
-        passport.serializeUser(async ({ id }, done) => {
+        passport.serializeUser(({ id }, done) => {
             done(null, id);
         });
-        passport.deserializeUser(async (idUser, done) => {
+        passport.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: () => ({
@@ -50,80 +58,123 @@ export class APIManager {
                     user: req.user?.id,
                     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.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?.status === "number"
+                ? err.status
+                : typeof 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 ?? 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) {
         const APIContainer = this.DFW.routerAPIContainer;
-        const method = params.method ?? 'get';
+        const method = params.method ?? "get";
         const mainFunction = params.fn;
         if (!params.middleware && !mainFunction) {
             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, bodyParser.json());
-        // file upload middleware
-        if (params.upload)
-            APIContainer[method](path, fileUpload(typeof params.upload === 'boolean' ? {} : params.upload));
-        // plugged middlewares and handlers
+        }
+        // File upload middleware
+        if (params.upload) {
+            APIContainer[method](path, fileUpload(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, async (req, res, next) => {
                 try {
-                    // calling the listener
-                    const data = await mainFunction(req.dfw, req, res).catch(next);
+                    const data = await mainFunction(req.dfw, req, res);
                     if (params.callback) {
-                        res.on('finish', () => {
-                            params.callback?.(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.log(`${chalk.yellow(method.toUpperCase().padEnd(7, ' '))}  ${chalk.green(path)}`);
+        DFWUtils.log(`${chalk.yellow(method.toUpperCase().padEnd(7, " "))}  ${chalk.green(path)}`);
     }
 }
 //# sourceMappingURL=APIManager.js.map

package/dist/esm/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/esm/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/esm/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/esm/lib/DFWSessionStore.js

@@ -1,75 +1,219 @@
-import { Store } from "express-session";
-import { createLRU } from 'lru.min';
-export class DFWSessionStore extends Store {
+import session, {} from "express-session";
+import { createLRU } from "lru.min";
+const SESSION_CACHE_IDLE_MS = 60 * 60 * 1000;
+export function sessionCookieOptions(config) {
+    return {
+        secure: false,
+        maxAge: 1000 * 60 * 60 * 24 * 180,
+        ...config.session?.cookieOptions
+    };
+}
+export class DFWSessionStore extends session.Store {
     constructor(DFW) {
         super();
+        this.loadedSessions = new WeakSet();
+        this.pendingReads = new Map();
         this.db = DFW.db;
+        this.cookieOptions = sessionCookieOptions(DFW.config);
+        this.rolling = DFW.config.session?.rolling ?? false;
         this.cache = createLRU({ max: DFW.config.session?.cacheSize ?? 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) {
+        return sessionData.cookie.expires ?? null;
+    }
+    legacySession(idUser) {
+        const cookie = Object.assign(new session.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");
+            }
+            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");
             }
-        }).then((sessionObj) => {
-            if (sessionObj) {
-                const passportSession = { cookie: {}, passport: { user: sessionObj.idUser } };
-                this.cache.set(sid, passportSession);
-                callback(null, passportSession);
+            if (record.expiresAt !== null && (expiresAt === null ||
+                record.expiresAt.getTime() < Date.UTC(expiresAt.getUTCFullYear(), expiresAt.getUTCMonth(), expiresAt.getUTCDate()))) {
+                expiresAt = record.expiresAt;
+            }
+        }
+        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) {
+        return JSON.stringify({
+            __dfwSessionStore: 1,
+            session: sessionData,
+            expiresAt: expiresAt?.toISOString() ?? 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);
             }
-            else {
-                this.cache.set(sid, null);
-                callback(null, null);
+            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() });
             }
-        }).catch((e) => {
-            callback(e);
+            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) => {
+            if (!record)
+                return null;
+            const stored = this.readSession(record);
+            if (stored.expiresAt !== null && stored.expiresAt.getTime() <= Date.now()) {
+                if (this.cache.peek(sid)?.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) {
-        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: sessionData.passport?.user,
-            },
-            update: {
-                idUser: sessionData.passport?.user,
-            },
-            where: {
-                id: sid
+        try {
+            const passport = sessionData.passport;
+            const expiresAt = this.expiration(sessionData);
+            const values = {
+                idUser: passport?.user ?? 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: { id: sid, ...values },
+                    update: values,
+                    where: { id: sid }
+                });
+            write.then(() => {
+                this.invalidate(sid);
+                callback?.();
+            }, (error) => {
+                this.invalidate(sid);
+                this.reportError(error, callback);
+            });
+        }
+        catch (error) {
+            this.reportError(error, callback);
+        }
+    }
+    touch(sid, sessionData, callback) {
+        if (!this.rolling) {
+            callback?.();
+            return;
+        }
+        this.touchSession(sid, sessionData)
+            .then(() => callback?.(), (error) => {
+            this.invalidate(sid);
+            this.reportError(error, callback);
+        });
+    }
+    async touchSession(sid, sessionData) {
+        for (let attempt = 0; attempt < 5; attempt++) {
+            const record = await 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 (this.cache.peek(sid)?.record === record)
+                    this.invalidate(sid);
+                return;
+            }
+            const expiresAt = this.expiration(sessionData);
+            const data = this.serialize({ ...stored.data, cookie: sessionData.cookie }, expiresAt);
+            const result = await 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?.record === record) {
+                    cached.record = {
+                        ...record,
+                        data,
+                        expiresAt: expiresAt === null ? null : new Date(Date.UTC(expiresAt.getUTCFullYear(), expiresAt.getUTCMonth(), expiresAt.getUTCDate()))
+                    };
+                }
+                return;
             }
-        }).then(() => {
-            callback && callback();
-        }).catch(e => callback && callback(e));
+            this.invalidate(sid);
+        }
+        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?.();
+        }, (error) => {
+            this.invalidate(sid);
+            this.reportError(error, callback);
         });
     }
+    reportError(error, callback) {
+        if (callback)
+            callback(error);
+        else
+            console.error("[DFW] Session store error:", error);
+    }
 }
 //# sourceMappingURL=DFWSessionStore.js.map

package/dist/esm/lib/DFWSessionStore.js.map

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

package/dist/esm/modules/DFWSessionModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DFWSessionModule.d.ts","sourceRoot":"","sources":["../../../src/modules/DFWSessionModule.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,qBAAa,gBAAiB,SAAQ,SAAS,CAAC,YAAY,CAAC;gBAC7C,GAAG,EAAE,OAAO;IAIxB,uBAAuB,GAAU,yCAAyC,UAAU,CAAC,YAAY,CAAC,+EAY9F;IAED,UAAU,GAAU,KAAK,UAAU,EAAE,MAAM;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,mBASxD;IAED,WAAW,GAAU,KAAK,UAAU,mBASnC;CACP"}
+{"version":3,"file":"DFWSessionModule.d.ts","sourceRoot":"","sources":["../../../src/modules/DFWSessionModule.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,qBAAa,gBAAiB,SAAQ,SAAS,CAAC,YAAY,CAAC;gBAC7C,GAAG,EAAE,OAAO;IAIxB,uBAAuB,GAAU,yCAAyC,UAAU,CAAC,YAAY,CAAC,+EAY9F;IAED,UAAU,GAAU,KAAK,UAAU,EAAE,MAAM;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,mBASxD;IAED,WAAW,GAAU,KAAK,UAAU,mBAWnC;CACP"}