hono-sessions 0.7.2 → 0.8.0

package/README.md

@@ -74,8 +74,11 @@ const store = new CookieStore()
 
 app.use('*', sessionMiddleware({
   store,
-  encryptionKey: 'password_at_least_32_characters_long', // Required for CookieStore, recommended for others
+  encryptionKey: 'password_at_least_32_characters_long', // Required for CookieStore, recommended for others.
+  // You can also supply a function instead of a plain string
+  // encryptionKey: () => 'function_that_returns_a_long_string'
   expireAfterSeconds: 900, // Expire session after 15 minutes of inactivity
+  autoExtendExpiration: true, // Extend the session expiration time automatically. Defaults to true
   cookieOptions: {
     sameSite: 'Lax', // Recommended for basic CSRF protection in modern browsers
     path: '/', // Required for this library to work properly
@@ -91,6 +94,14 @@ app.get('/', async (c, next) => {
   return c.html(`<h1>You have visited this page ${ session.get('counter') } times</h1>`)
 })
 
+app.get('/read', (c) => {
+  const session = c.get('session')
+  session.touch() // Update the session expiration time
+  return c.json({
+    counter: session.get('counter')
+  })
+})
+
 Deno.serve(app.fetch)
 ```
 

package/esm/deps.d.ts

@@ -3,4 +3,5 @@ export { createMiddleware } from 'hono/factory';
 export { getCookie, setCookie } from 'hono/cookie';
 export type { CookieOptions } from 'hono/utils/cookie';
 export * as Iron from 'iron-webcrypto';
+export { hash } from 'ohash';
 //# sourceMappingURL=deps.d.ts.map

package/esm/deps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deps.d.ts","sourceRoot":"","sources":["../src/deps.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAA;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAClD,YAAY,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAA"}
+{"version":3,"file":"deps.d.ts","sourceRoot":"","sources":["../src/deps.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAA;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAClD,YAAY,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAA;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA"}

package/esm/deps.js

@@ -1,3 +1,4 @@
 export { createMiddleware } from 'hono/factory';
 export { getCookie, setCookie } from 'hono/cookie';
 export * as Iron from 'iron-webcrypto';
+export { hash } from 'ohash';

package/esm/src/Middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Middleware.d.ts","sourceRoot":"","sources":["../../src/src/Middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0C,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAGtF,OAAO,cAAc,MAAM,qBAAqB,CAAA;AAEhD,iEAAiE;AACjE,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,cAAc,GAAG,iBAAiB,CAyI5E"}
+{"version":3,"file":"Middleware.d.ts","sourceRoot":"","sources":["../../src/src/Middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0C,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAGtF,OAAO,cAAc,MAAM,qBAAqB,CAAA;AAEhD,iEAAiE;AACjE,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,cAAc,GAAG,iBAAiB,CAkK5E"}

package/esm/src/Middleware.js

@@ -4,10 +4,22 @@ import { Session, encrypt, decrypt } from '../mod.js';
 /** Function that returns a Hono-compatible session middleware */
 export function sessionMiddleware(options) {
     const store = options.store;
-    const encryptionKey = options.encryptionKey;
+    let encryptionKey;
     const expireAfterSeconds = options.expireAfterSeconds;
     const cookieOptions = options.cookieOptions;
     const sessionCookieName = options.sessionCookieName || 'session';
+    const autoExtendExpiration = options.autoExtendExpiration ?? true;
+    if (options.encryptionKey !== undefined) {
+        if (typeof options.encryptionKey === 'function') {
+            encryptionKey = options.encryptionKey();
+        }
+        else {
+            encryptionKey = options.encryptionKey;
+        }
+    }
+    else {
+        encryptionKey = undefined;
+    }
     if (store instanceof CookieStore) {
         store.sessionCookieName = sessionCookieName;
         if (encryptionKey) {
@@ -21,7 +33,7 @@ export function sessionMiddleware(options) {
         }
     }
     const middleware = createMiddleware(async (c, next) => {
-        const session = new Session;
+        const session = new Session(expireAfterSeconds);
         let sid = '';
         let session_data;
         let createNewSession = false;
@@ -34,6 +46,9 @@ export function sessionMiddleware(options) {
                 try {
                     sid = (encryptionKey ? await decrypt(encryptionKey, sessionCookie) : sessionCookie);
                     session_data = await store.getSessionById(sid);
+                    if (session_data) {
+                        session_data._id = sid;
+                    }
                 }
                 catch {
                     createNewSession = true;
@@ -42,7 +57,9 @@ export function sessionMiddleware(options) {
             if (session_data) {
                 session.setCache(session_data);
                 if (session.sessionValid()) {
-                    session.reupSession(expireAfterSeconds);
+                    if (autoExtendExpiration) {
+                        session.reupSession();
+                    }
                 }
                 else {
                     store instanceof CookieStore ? await store.deleteSession(c) : await store.deleteSession(sid);
@@ -68,16 +85,22 @@ export function sessionMiddleware(options) {
             }
             else {
                 sid = globalThis.crypto.randomUUID();
+                defaultData._id = sid;
                 await store.createSession(sid, defaultData);
             }
-            session.setCache(defaultData);
+            session.setCache(defaultData, true);
         }
         if (!(store instanceof CookieStore)) {
             setCookie(c, sessionCookieName, encryptionKey ? await encrypt(encryptionKey, sid) : sid, cookieOptions);
         }
-        session.updateAccess();
+        if (autoExtendExpiration) {
+            session.updateAccess();
+        }
         c.set('session', session);
         await next();
+        if (session.isStale()) {
+            session.touch();
+        }
         const shouldDelete = session.getCache()._delete;
         const shouldRotateSessionKey = c.get("session_key_rotation") === true;
         const storeIsCookieStore = store instanceof CookieStore;
@@ -106,7 +129,8 @@ export function sessionMiddleware(options) {
          * or the store is a CookieStore (which does not have its session key rotated)
          */
         const shouldPersistSession = !shouldDelete &&
-            (!shouldRotateSessionKey || storeIsCookieStore);
+            (!shouldRotateSessionKey || storeIsCookieStore) &&
+            session.isStale();
         if (shouldPersistSession) {
             store instanceof CookieStore
                 ? await store.persistSessionData(c, session.getCache())

package/esm/src/Session.d.ts

@@ -3,6 +3,7 @@ interface SessionDataEntry<T> {
     flash: boolean;
 }
 export interface SessionData<T = any> {
+    _id?: string;
     _data: Record<string, SessionDataEntry<T>>;
     _expire: string | null;
     _delete: boolean;
@@ -10,13 +11,26 @@ export interface SessionData<T = any> {
 }
 export declare class Session<T = any> {
     private cache;
-    constructor();
-    setCache(cache_data: SessionData<T>): void;
+    private expiration;
+    private hash;
+    constructor(expiration?: number);
+    setCache(cache_data: SessionData<T>, isNew?: boolean): void;
+    isStale(): boolean;
     getCache(): SessionData<T>;
     setExpiration(expiration: string): void;
-    reupSession(expiration: number | null | undefined): void;
+    /**
+     * Extend expiration
+     */
+    reupSession(): void;
+    /**
+     * Extend session expiration and update access time
+     */
+    touch(): void;
     deleteSession(): void;
     sessionValid(): boolean;
+    /**
+     * Update the last accessed time
+     */
     updateAccess(): void;
     get<K extends keyof T>(key: K): T[K] | null;
     set<K extends keyof T>(key: K, value: T[K]): void;

package/esm/src/Session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Session.d.ts","sourceRoot":"","sources":["../../src/src/Session.ts"],"names":[],"mappings":"AAAA,UAAU,gBAAgB,CAAC,CAAC;IAC1B,KAAK,EAAE,CAAC,CAAC;IACT,KAAK,EAAE,OAAO,CAAA;CACf;AAED,MAAM,WAAW,WAAW,CAAC,CAAC,GAAG,GAAG;IAClC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3C,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAED,qBAAa,OAAO,CAAC,CAAC,GAAG,GAAG;IAE1B,OAAO,CAAC,KAAK,CAAgB;;IAW7B,QAAQ,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC;IAInC,QAAQ,IAAI,WAAW,CAAC,CAAC,CAAC;IAI1B,aAAa,CAAC,UAAU,EAAE,MAAM;IAIhC,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS;IAMjD,aAAa;IAIb,YAAY,IAAI,OAAO;IAIvB,YAAY;IAIZ,GAAG,CAAC,CAAC,SAAS,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI;IAe3C,GAAG,CAAC,CAAC,SAAS,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;IAS1C,MAAM,CAAC,CAAC,SAAS,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;IAMhC,KAAK,CAAC,CAAC,SAAS,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;CAQ7C"}
+{"version":3,"file":"Session.d.ts","sourceRoot":"","sources":["../../src/src/Session.ts"],"names":[],"mappings":"AAEA,UAAU,gBAAgB,CAAC,CAAC;IAC1B,KAAK,EAAE,CAAC,CAAC;IACT,KAAK,EAAE,OAAO,CAAA;CACf;AAED,MAAM,WAAW,WAAW,CAAC,CAAC,GAAG,GAAG;IAClC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3C,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAED,qBAAa,OAAO,CAAC,CAAC,GAAG,GAAG;IAE1B,OAAO,CAAC,KAAK,CAAgB;IAC7B,OAAO,CAAC,UAAU,CAAoB;IACtC,OAAO,CAAC,IAAI,CAAsB;gBAEtB,UAAU,CAAC,EAAE,MAAM;IAU/B,QAAQ,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,KAAK,GAAE,OAAe;IAK3D,OAAO,IAAI,OAAO;IAIlB,QAAQ,IAAI,WAAW,CAAC,CAAC,CAAC;IAI1B,aAAa,CAAC,UAAU,EAAE,MAAM;IAIhC;;OAEG;IACH,WAAW;IAMX;;OAEG;IACH,KAAK;IAKL,aAAa;IAIb,YAAY,IAAI,OAAO;IAIvB;;OAEG;IACH,YAAY;IAIZ,GAAG,CAAC,CAAC,SAAS,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI;IAe3C,GAAG,CAAC,CAAC,SAAS,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;IAS1C,MAAM,CAAC,CAAC,SAAS,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;IAMhC,KAAK,CAAC,CAAC,SAAS,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;CAQ7C"}

package/esm/src/Session.js

@@ -1,11 +1,25 @@
+import { hash } from '../deps.js';
 export class Session {
-    constructor() {
+    constructor(expiration) {
         Object.defineProperty(this, "cache", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "expiration", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "hash", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: null
+        });
+        this.expiration = expiration;
         this.cache = {
             _data: {},
             _expire: null,
@@ -13,26 +27,43 @@ export class Session {
             _accessed: null,
         };
     }
-    setCache(cache_data) {
+    setCache(cache_data, isNew = false) {
+        this.hash = !isNew ? hash(cache_data) : null;
         this.cache = cache_data;
     }
+    isStale() {
+        return !this.hash || this.hash !== hash(this.cache);
+    }
     getCache() {
         return this.cache;
     }
     setExpiration(expiration) {
         this.cache._expire = expiration;
     }
-    reupSession(expiration) {
-        if (expiration) {
-            this.setExpiration(new Date(Date.now() + expiration * 1000).toISOString());
+    /**
+     * Extend expiration
+     */
+    reupSession() {
+        if (this.expiration) {
+            this.setExpiration(new Date(Date.now() + this.expiration * 1000).toISOString());
         }
     }
+    /**
+     * Extend session expiration and update access time
+     */
+    touch() {
+        this.reupSession();
+        this.updateAccess();
+    }
     deleteSession() {
         this.cache._delete = true;
     }
     sessionValid() {
         return this.cache._expire == null || Date.now() < new Date(this.cache._expire).getTime();
     }
+    /**
+     * Update the last accessed time
+     */
     updateAccess() {
         this.cache._accessed = new Date().toISOString();
     }

package/esm/src/SessionOptions.d.ts

@@ -3,9 +3,10 @@ import CookieStore from './store/CookieStore.js';
 import { CookieOptions } from '../deps.js';
 export default interface SessionOptions {
     store: Store | CookieStore;
-    encryptionKey?: string;
+    encryptionKey?: string | (() => string);
     expireAfterSeconds?: number;
     cookieOptions?: CookieOptions;
     sessionCookieName?: string;
+    autoExtendExpiration?: boolean;
 }
 //# sourceMappingURL=SessionOptions.d.ts.map

package/esm/src/SessionOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SessionOptions.d.ts","sourceRoot":"","sources":["../../src/src/SessionOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,kBAAkB,CAAA;AACpC,OAAO,WAAW,MAAM,wBAAwB,CAAA;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,MAAM,CAAC,OAAO,WAAW,cAAc;IACrC,KAAK,EAAE,KAAK,GAAG,WAAW,CAAA;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC3B"}
+{"version":3,"file":"SessionOptions.d.ts","sourceRoot":"","sources":["../../src/src/SessionOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,kBAAkB,CAAA;AACpC,OAAO,WAAW,MAAM,wBAAwB,CAAA;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,MAAM,CAAC,OAAO,WAAW,cAAc;IACrC,KAAK,EAAE,KAAK,GAAG,WAAW,CAAA;IAC1B,aAAa,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,CAAC;IACxC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono-sessions",
-  "version": "0.7.2",
+  "version": "0.8.0",
   "description": "Cookie-based sessions for Hono web framework",
   "repository": {
     "type": "git",
@@ -24,7 +24,8 @@
   },
   "dependencies": {
     "hono": "^4.0.0",
-    "iron-webcrypto": "^1.2.1"
+    "iron-webcrypto": "^1.2.1",
+    "ohash": "^2"
   },
   "_generatedBy": "dnt@dev"
 }

package/script/deps.d.ts

@@ -3,4 +3,5 @@ export { createMiddleware } from 'hono/factory';
 export { getCookie, setCookie } from 'hono/cookie';
 export type { CookieOptions } from 'hono/utils/cookie';
 export * as Iron from 'iron-webcrypto';
+export { hash } from 'ohash';
 //# sourceMappingURL=deps.d.ts.map

package/script/deps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deps.d.ts","sourceRoot":"","sources":["../src/deps.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAA;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAClD,YAAY,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAA"}
+{"version":3,"file":"deps.d.ts","sourceRoot":"","sources":["../src/deps.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAA;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAClD,YAAY,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAA;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA"}

package/script/deps.js

@@ -23,10 +23,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Iron = exports.setCookie = exports.getCookie = exports.createMiddleware = void 0;
+exports.hash = exports.Iron = exports.setCookie = exports.getCookie = exports.createMiddleware = void 0;
 var factory_1 = require("hono/factory");
 Object.defineProperty(exports, "createMiddleware", { enumerable: true, get: function () { return factory_1.createMiddleware; } });
 var cookie_1 = require("hono/cookie");
 Object.defineProperty(exports, "getCookie", { enumerable: true, get: function () { return cookie_1.getCookie; } });
 Object.defineProperty(exports, "setCookie", { enumerable: true, get: function () { return cookie_1.setCookie; } });
 exports.Iron = __importStar(require("iron-webcrypto"));
+var ohash_1 = require("ohash");
+Object.defineProperty(exports, "hash", { enumerable: true, get: function () { return ohash_1.hash; } });

package/script/src/Middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Middleware.d.ts","sourceRoot":"","sources":["../../src/src/Middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0C,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAGtF,OAAO,cAAc,MAAM,qBAAqB,CAAA;AAEhD,iEAAiE;AACjE,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,cAAc,GAAG,iBAAiB,CAyI5E"}
+{"version":3,"file":"Middleware.d.ts","sourceRoot":"","sources":["../../src/src/Middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0C,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAGtF,OAAO,cAAc,MAAM,qBAAqB,CAAA;AAEhD,iEAAiE;AACjE,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,cAAc,GAAG,iBAAiB,CAkK5E"}

package/script/src/Middleware.js

@@ -10,10 +10,22 @@ const mod_js_1 = require("../mod.js");
 /** Function that returns a Hono-compatible session middleware */
 function sessionMiddleware(options) {
     const store = options.store;
-    const encryptionKey = options.encryptionKey;
+    let encryptionKey;
     const expireAfterSeconds = options.expireAfterSeconds;
     const cookieOptions = options.cookieOptions;
     const sessionCookieName = options.sessionCookieName || 'session';
+    const autoExtendExpiration = options.autoExtendExpiration ?? true;
+    if (options.encryptionKey !== undefined) {
+        if (typeof options.encryptionKey === 'function') {
+            encryptionKey = options.encryptionKey();
+        }
+        else {
+            encryptionKey = options.encryptionKey;
+        }
+    }
+    else {
+        encryptionKey = undefined;
+    }
     if (store instanceof CookieStore_js_1.default) {
         store.sessionCookieName = sessionCookieName;
         if (encryptionKey) {
@@ -27,7 +39,7 @@ function sessionMiddleware(options) {
         }
     }
     const middleware = (0, deps_js_1.createMiddleware)(async (c, next) => {
-        const session = new mod_js_1.Session;
+        const session = new mod_js_1.Session(expireAfterSeconds);
         let sid = '';
         let session_data;
         let createNewSession = false;
@@ -40,6 +52,9 @@ function sessionMiddleware(options) {
                 try {
                     sid = (encryptionKey ? await (0, mod_js_1.decrypt)(encryptionKey, sessionCookie) : sessionCookie);
                     session_data = await store.getSessionById(sid);
+                    if (session_data) {
+                        session_data._id = sid;
+                    }
                 }
                 catch {
                     createNewSession = true;
@@ -48,7 +63,9 @@ function sessionMiddleware(options) {
             if (session_data) {
                 session.setCache(session_data);
                 if (session.sessionValid()) {
-                    session.reupSession(expireAfterSeconds);
+                    if (autoExtendExpiration) {
+                        session.reupSession();
+                    }
                 }
                 else {
                     store instanceof CookieStore_js_1.default ? await store.deleteSession(c) : await store.deleteSession(sid);
@@ -74,16 +91,22 @@ function sessionMiddleware(options) {
             }
             else {
                 sid = globalThis.crypto.randomUUID();
+                defaultData._id = sid;
                 await store.createSession(sid, defaultData);
             }
-            session.setCache(defaultData);
+            session.setCache(defaultData, true);
         }
         if (!(store instanceof CookieStore_js_1.default)) {
             (0, deps_js_1.setCookie)(c, sessionCookieName, encryptionKey ? await (0, mod_js_1.encrypt)(encryptionKey, sid) : sid, cookieOptions);
         }
-        session.updateAccess();
+        if (autoExtendExpiration) {
+            session.updateAccess();
+        }
         c.set('session', session);
         await next();
+        if (session.isStale()) {
+            session.touch();
+        }
         const shouldDelete = session.getCache()._delete;
         const shouldRotateSessionKey = c.get("session_key_rotation") === true;
         const storeIsCookieStore = store instanceof CookieStore_js_1.default;
@@ -112,7 +135,8 @@ function sessionMiddleware(options) {
          * or the store is a CookieStore (which does not have its session key rotated)
          */
         const shouldPersistSession = !shouldDelete &&
-            (!shouldRotateSessionKey || storeIsCookieStore);
+            (!shouldRotateSessionKey || storeIsCookieStore) &&
+            session.isStale();
         if (shouldPersistSession) {
             store instanceof CookieStore_js_1.default
                 ? await store.persistSessionData(c, session.getCache())

package/script/src/Session.d.ts

@@ -3,6 +3,7 @@ interface SessionDataEntry<T> {
     flash: boolean;
 }
 export interface SessionData<T = any> {
+    _id?: string;
     _data: Record<string, SessionDataEntry<T>>;
     _expire: string | null;
     _delete: boolean;
@@ -10,13 +11,26 @@ export interface SessionData<T = any> {
 }
 export declare class Session<T = any> {
     private cache;
-    constructor();
-    setCache(cache_data: SessionData<T>): void;
+    private expiration;
+    private hash;
+    constructor(expiration?: number);
+    setCache(cache_data: SessionData<T>, isNew?: boolean): void;
+    isStale(): boolean;
     getCache(): SessionData<T>;
     setExpiration(expiration: string): void;
-    reupSession(expiration: number | null | undefined): void;
+    /**
+     * Extend expiration
+     */
+    reupSession(): void;
+    /**
+     * Extend session expiration and update access time
+     */
+    touch(): void;
     deleteSession(): void;
     sessionValid(): boolean;
+    /**
+     * Update the last accessed time
+     */
     updateAccess(): void;
     get<K extends keyof T>(key: K): T[K] | null;
     set<K extends keyof T>(key: K, value: T[K]): void;

package/script/src/Session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Session.d.ts","sourceRoot":"","sources":["../../src/src/Session.ts"],"names":[],"mappings":"AAAA,UAAU,gBAAgB,CAAC,CAAC;IAC1B,KAAK,EAAE,CAAC,CAAC;IACT,KAAK,EAAE,OAAO,CAAA;CACf;AAED,MAAM,WAAW,WAAW,CAAC,CAAC,GAAG,GAAG;IAClC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3C,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAED,qBAAa,OAAO,CAAC,CAAC,GAAG,GAAG;IAE1B,OAAO,CAAC,KAAK,CAAgB;;IAW7B,QAAQ,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC;IAInC,QAAQ,IAAI,WAAW,CAAC,CAAC,CAAC;IAI1B,aAAa,CAAC,UAAU,EAAE,MAAM;IAIhC,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS;IAMjD,aAAa;IAIb,YAAY,IAAI,OAAO;IAIvB,YAAY;IAIZ,GAAG,CAAC,CAAC,SAAS,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI;IAe3C,GAAG,CAAC,CAAC,SAAS,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;IAS1C,MAAM,CAAC,CAAC,SAAS,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;IAMhC,KAAK,CAAC,CAAC,SAAS,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;CAQ7C"}
+{"version":3,"file":"Session.d.ts","sourceRoot":"","sources":["../../src/src/Session.ts"],"names":[],"mappings":"AAEA,UAAU,gBAAgB,CAAC,CAAC;IAC1B,KAAK,EAAE,CAAC,CAAC;IACT,KAAK,EAAE,OAAO,CAAA;CACf;AAED,MAAM,WAAW,WAAW,CAAC,CAAC,GAAG,GAAG;IAClC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3C,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAED,qBAAa,OAAO,CAAC,CAAC,GAAG,GAAG;IAE1B,OAAO,CAAC,KAAK,CAAgB;IAC7B,OAAO,CAAC,UAAU,CAAoB;IACtC,OAAO,CAAC,IAAI,CAAsB;gBAEtB,UAAU,CAAC,EAAE,MAAM;IAU/B,QAAQ,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,KAAK,GAAE,OAAe;IAK3D,OAAO,IAAI,OAAO;IAIlB,QAAQ,IAAI,WAAW,CAAC,CAAC,CAAC;IAI1B,aAAa,CAAC,UAAU,EAAE,MAAM;IAIhC;;OAEG;IACH,WAAW;IAMX;;OAEG;IACH,KAAK;IAKL,aAAa;IAIb,YAAY,IAAI,OAAO;IAIvB;;OAEG;IACH,YAAY;IAIZ,GAAG,CAAC,CAAC,SAAS,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI;IAe3C,GAAG,CAAC,CAAC,SAAS,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;IAS1C,MAAM,CAAC,CAAC,SAAS,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;IAMhC,KAAK,CAAC,CAAC,SAAS,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;CAQ7C"}

package/script/src/Session.js

@@ -1,14 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Session = void 0;
+const deps_js_1 = require("../deps.js");
 class Session {
-    constructor() {
+    constructor(expiration) {
         Object.defineProperty(this, "cache", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "expiration", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "hash", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: null
+        });
+        this.expiration = expiration;
         this.cache = {
             _data: {},
             _expire: null,
@@ -16,26 +30,43 @@ class Session {
             _accessed: null,
         };
     }
-    setCache(cache_data) {
+    setCache(cache_data, isNew = false) {
+        this.hash = !isNew ? (0, deps_js_1.hash)(cache_data) : null;
         this.cache = cache_data;
     }
+    isStale() {
+        return !this.hash || this.hash !== (0, deps_js_1.hash)(this.cache);
+    }
     getCache() {
         return this.cache;
     }
     setExpiration(expiration) {
         this.cache._expire = expiration;
     }
-    reupSession(expiration) {
-        if (expiration) {
-            this.setExpiration(new Date(Date.now() + expiration * 1000).toISOString());
+    /**
+     * Extend expiration
+     */
+    reupSession() {
+        if (this.expiration) {
+            this.setExpiration(new Date(Date.now() + this.expiration * 1000).toISOString());
         }
     }
+    /**
+     * Extend session expiration and update access time
+     */
+    touch() {
+        this.reupSession();
+        this.updateAccess();
+    }
     deleteSession() {
         this.cache._delete = true;
     }
     sessionValid() {
         return this.cache._expire == null || Date.now() < new Date(this.cache._expire).getTime();
     }
+    /**
+     * Update the last accessed time
+     */
     updateAccess() {
         this.cache._accessed = new Date().toISOString();
     }

package/script/src/SessionOptions.d.ts

@@ -3,9 +3,10 @@ import CookieStore from './store/CookieStore.js';
 import { CookieOptions } from '../deps.js';
 export default interface SessionOptions {
     store: Store | CookieStore;
-    encryptionKey?: string;
+    encryptionKey?: string | (() => string);
     expireAfterSeconds?: number;
     cookieOptions?: CookieOptions;
     sessionCookieName?: string;
+    autoExtendExpiration?: boolean;
 }
 //# sourceMappingURL=SessionOptions.d.ts.map

package/script/src/SessionOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SessionOptions.d.ts","sourceRoot":"","sources":["../../src/src/SessionOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,kBAAkB,CAAA;AACpC,OAAO,WAAW,MAAM,wBAAwB,CAAA;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,MAAM,CAAC,OAAO,WAAW,cAAc;IACrC,KAAK,EAAE,KAAK,GAAG,WAAW,CAAA;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC3B"}
+{"version":3,"file":"SessionOptions.d.ts","sourceRoot":"","sources":["../../src/src/SessionOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,kBAAkB,CAAA;AACpC,OAAO,WAAW,MAAM,wBAAwB,CAAA;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,MAAM,CAAC,OAAO,WAAW,cAAc;IACrC,KAAK,EAAE,KAAK,GAAG,WAAW,CAAA;IAC1B,aAAa,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,CAAC;IACxC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B"}