@shware/security 7.1.1 → 8.0.1

package/dist/session/common.cjs

@@ -1,19 +1,16 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 // src/session/common.ts
-const SPRING_SECURITY_CONTEXT = "SPRING_SECURITY_CONTEXT";
-const PRINCIPAL_NAME_INDEX_NAME = `org.springframework.session.FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME`;
-function resolveIndexesFor(session) {
-	const principalName = session.getAttribute(PRINCIPAL_NAME_INDEX_NAME);
-	if (principalName !== null) return principalName;
-	const jsonString = session.getAttribute(SPRING_SECURITY_CONTEXT);
-	if (typeof jsonString === "string") {
-		const context = JSON.parse(jsonString);
-		return context?.authentication?.name ?? context?.authentication?.principal?.name ?? null;
-	}
-	return null;
+/**
+* The session attribute holding the signed-in principal's name, and the one index the
+* repositories keep (`findByIndexNameAndIndexValue`), so `kick` and `listSessions` can find every
+* session of a user.
+*/
+const PRINCIPAL_NAME_INDEX_NAME = "principalName";
+function principalNameOf(session) {
+	const name = session.getAttribute(PRINCIPAL_NAME_INDEX_NAME);
+	return name === null ? null : String(name);
 }
 exports.PRINCIPAL_NAME_INDEX_NAME = PRINCIPAL_NAME_INDEX_NAME;
-exports.SPRING_SECURITY_CONTEXT = SPRING_SECURITY_CONTEXT;
-exports.resolveIndexesFor = resolveIndexesFor;
+exports.principalNameOf = principalNameOf;
 
 //# sourceMappingURL=common.cjs.map

package/dist/session/common.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"common.cjs","names":[],"sources":["../../src/session/common.ts"],"sourcesContent":["import type { SecurityContext, Session } from './types';\n\nexport const SPRING_SECURITY_CONTEXT = 'SPRING_SECURITY_CONTEXT';\nexport const PRINCIPAL_NAME_INDEX_NAME = `org.springframework.session.FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME`;\n\nexport function resolveIndexesFor(session: Session): string | null {\n  const principalName = session.getAttribute(PRINCIPAL_NAME_INDEX_NAME) as string | null;\n  if (principalName !== null) return principalName;\n\n  const jsonString = session.getAttribute(SPRING_SECURITY_CONTEXT);\n  if (typeof jsonString === 'string') {\n    // The attribute is externally stored JSON, so it may parse to null.\n    const context = JSON.parse(jsonString) as SecurityContext | null;\n    return context?.authentication?.name ?? context?.authentication?.principal?.name ?? null;\n  }\n  return null;\n}\n"],"mappings":";;AAEA,MAAa,0BAA0B;AACvC,MAAa,4BAA4B;AAEzC,SAAgB,kBAAkB,SAAiC;CACjE,MAAM,gBAAgB,QAAQ,aAAa,yBAAyB;CACpE,IAAI,kBAAkB,MAAM,OAAO;CAEnC,MAAM,aAAa,QAAQ,aAAa,uBAAuB;CAC/D,IAAI,OAAO,eAAe,UAAU;EAElC,MAAM,UAAU,KAAK,MAAM,UAAU;EACrC,OAAO,SAAS,gBAAgB,QAAQ,SAAS,gBAAgB,WAAW,QAAQ;CACtF;CACA,OAAO;AACT"}
+{"version":3,"file":"common.cjs","names":[],"sources":["../../src/session/common.ts"],"sourcesContent":["import type { Session } from './types';\n\n/**\n * The session attribute holding the signed-in principal's name, and the one index the\n * repositories keep (`findByIndexNameAndIndexValue`), so `kick` and `listSessions` can find every\n * session of a user.\n */\nexport const PRINCIPAL_NAME_INDEX_NAME = 'principalName';\n\nexport function principalNameOf(session: Session): string | null {\n  const name = session.getAttribute(PRINCIPAL_NAME_INDEX_NAME);\n  return name === null ? null : String(name);\n}\n"],"mappings":";;;;;;;AAOA,MAAa,4BAA4B;AAEzC,SAAgB,gBAAgB,SAAiC;CAC/D,MAAM,OAAO,QAAQ,aAAa,yBAAyB;CAC3D,OAAO,SAAS,OAAO,OAAO,OAAO,IAAI;AAC3C"}

package/dist/session/common.d.cts

@@ -1,5 +1,9 @@
 import { Session } from "./types.cjs";
-export declare const SPRING_SECURITY_CONTEXT = "SPRING_SECURITY_CONTEXT";
-export declare const PRINCIPAL_NAME_INDEX_NAME = "org.springframework.session.FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME";
-export declare function resolveIndexesFor(session: Session): string | null;
+/**
+ * The session attribute holding the signed-in principal's name, and the one index the
+ * repositories keep (`findByIndexNameAndIndexValue`), so `kick` and `listSessions` can find every
+ * session of a user.
+ */
+export declare const PRINCIPAL_NAME_INDEX_NAME = "principalName";
+export declare function principalNameOf(session: Session): string | null;
 //# sourceMappingURL=common.d.cts.map

package/dist/session/common.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"common.d.cts","names":[],"sources":["../../src/session/common.ts"],"mappings":";qBAEa;qBACA;wBAEG,kBAAkB,SAAS"}
+{"version":3,"file":"common.d.cts","names":[],"sources":["../../src/session/common.ts"],"mappings":";;;;;;qBAOa;wBAEG,gBAAgB,SAAS"}

package/dist/session/common.d.mts

@@ -1,5 +1,9 @@
 import { Session } from "./types.mjs";
-export declare const SPRING_SECURITY_CONTEXT = "SPRING_SECURITY_CONTEXT";
-export declare const PRINCIPAL_NAME_INDEX_NAME = "org.springframework.session.FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME";
-export declare function resolveIndexesFor(session: Session): string | null;
+/**
+ * The session attribute holding the signed-in principal's name, and the one index the
+ * repositories keep (`findByIndexNameAndIndexValue`), so `kick` and `listSessions` can find every
+ * session of a user.
+ */
+export declare const PRINCIPAL_NAME_INDEX_NAME = "principalName";
+export declare function principalNameOf(session: Session): string | null;
 //# sourceMappingURL=common.d.mts.map

package/dist/session/common.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"common.d.mts","names":[],"sources":["../../src/session/common.ts"],"mappings":";qBAEa;qBACA;wBAEG,kBAAkB,SAAS"}
+{"version":3,"file":"common.d.mts","names":[],"sources":["../../src/session/common.ts"],"mappings":";;;;;;qBAOa;wBAEG,gBAAgB,SAAS"}

package/dist/session/common.mjs

@@ -1,16 +1,14 @@
 // src/session/common.ts
-const SPRING_SECURITY_CONTEXT = "SPRING_SECURITY_CONTEXT";
-const PRINCIPAL_NAME_INDEX_NAME = `org.springframework.session.FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME`;
-function resolveIndexesFor(session) {
-	const principalName = session.getAttribute(PRINCIPAL_NAME_INDEX_NAME);
-	if (principalName !== null) return principalName;
-	const jsonString = session.getAttribute(SPRING_SECURITY_CONTEXT);
-	if (typeof jsonString === "string") {
-		const context = JSON.parse(jsonString);
-		return context?.authentication?.name ?? context?.authentication?.principal?.name ?? null;
-	}
-	return null;
+/**
+* The session attribute holding the signed-in principal's name, and the one index the
+* repositories keep (`findByIndexNameAndIndexValue`), so `kick` and `listSessions` can find every
+* session of a user.
+*/
+const PRINCIPAL_NAME_INDEX_NAME = "principalName";
+function principalNameOf(session) {
+	const name = session.getAttribute(PRINCIPAL_NAME_INDEX_NAME);
+	return name === null ? null : String(name);
 }
-export { PRINCIPAL_NAME_INDEX_NAME, SPRING_SECURITY_CONTEXT, resolveIndexesFor };
+export { PRINCIPAL_NAME_INDEX_NAME, principalNameOf };
 
 //# sourceMappingURL=common.mjs.map

package/dist/session/common.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"common.mjs","names":[],"sources":["../../src/session/common.ts"],"sourcesContent":["import type { SecurityContext, Session } from './types';\n\nexport const SPRING_SECURITY_CONTEXT = 'SPRING_SECURITY_CONTEXT';\nexport const PRINCIPAL_NAME_INDEX_NAME = `org.springframework.session.FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME`;\n\nexport function resolveIndexesFor(session: Session): string | null {\n  const principalName = session.getAttribute(PRINCIPAL_NAME_INDEX_NAME) as string | null;\n  if (principalName !== null) return principalName;\n\n  const jsonString = session.getAttribute(SPRING_SECURITY_CONTEXT);\n  if (typeof jsonString === 'string') {\n    // The attribute is externally stored JSON, so it may parse to null.\n    const context = JSON.parse(jsonString) as SecurityContext | null;\n    return context?.authentication?.name ?? context?.authentication?.principal?.name ?? null;\n  }\n  return null;\n}\n"],"mappings":";AAEA,MAAa,0BAA0B;AACvC,MAAa,4BAA4B;AAEzC,SAAgB,kBAAkB,SAAiC;CACjE,MAAM,gBAAgB,QAAQ,aAAa,yBAAyB;CACpE,IAAI,kBAAkB,MAAM,OAAO;CAEnC,MAAM,aAAa,QAAQ,aAAa,uBAAuB;CAC/D,IAAI,OAAO,eAAe,UAAU;EAElC,MAAM,UAAU,KAAK,MAAM,UAAU;EACrC,OAAO,SAAS,gBAAgB,QAAQ,SAAS,gBAAgB,WAAW,QAAQ;CACtF;CACA,OAAO;AACT"}
+{"version":3,"file":"common.mjs","names":[],"sources":["../../src/session/common.ts"],"sourcesContent":["import type { Session } from './types';\n\n/**\n * The session attribute holding the signed-in principal's name, and the one index the\n * repositories keep (`findByIndexNameAndIndexValue`), so `kick` and `listSessions` can find every\n * session of a user.\n */\nexport const PRINCIPAL_NAME_INDEX_NAME = 'principalName';\n\nexport function principalNameOf(session: Session): string | null {\n  const name = session.getAttribute(PRINCIPAL_NAME_INDEX_NAME);\n  return name === null ? null : String(name);\n}\n"],"mappings":";;;;;;AAOA,MAAa,4BAA4B;AAEzC,SAAgB,gBAAgB,SAAiC;CAC/D,MAAM,OAAO,QAAQ,aAAa,yBAAyB;CAC3D,OAAO,SAAS,OAAO,OAAO,OAAO,IAAI;AAC3C"}

package/dist/session/db.cjs

@@ -24,7 +24,7 @@ var DBIndexedSessionRepository = class {
 	mapSessionToEntity(session) {
 		const attributes = {};
 		for (const name of session.getAttributeNames()) attributes[name] = session.getAttribute(name);
-		const principalName = require_session_common.resolveIndexesFor(session);
+		const principalName = require_session_common.principalNameOf(session);
 		return {
 			primaryId: session.primaryId,
 			sessionId: session.getId(),
@@ -70,7 +70,7 @@ var DBIndexedSessionRepository = class {
 		await this.db.deleteById(sessionId);
 	}
 	async findByIndexNameAndIndexValue(indexName, indexValue) {
-		if (indexName !== "org.springframework.session.FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME") return /* @__PURE__ */ new Map();
+		if (indexName !== "principalName") return /* @__PURE__ */ new Map();
 		const entities = await this.db.findByPrincipalName(indexValue);
 		if (entities.length === 0) return /* @__PURE__ */ new Map();
 		const sessions = /* @__PURE__ */ new Map();

package/dist/session/db.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"db.cjs","names":["MapSession","randomUUID","resolveIndexesFor","PRINCIPAL_NAME_INDEX_NAME"],"sources":["../../src/session/db.ts"],"sourcesContent":["import { randomUUID } from 'node:crypto';\nimport { PRINCIPAL_NAME_INDEX_NAME, resolveIndexesFor } from './common';\nimport { MapSession } from './map-session';\nimport type { SessionRepository } from './types';\n\ninterface SessionEntity {\n  primaryId: string;\n  sessionId: string;\n  /**\n   * Set on the entity `save` hands the adapter: `true` for a session created in this request and\n   * never stored, `false` for one the adapter returned from `findById` / `findByPrincipalName`. As\n   * in Spring Session's `JdbcIndexedSessionRepository`, it is what decides between an INSERT and\n   * an UPDATE — an UPDATE that touches no row then means the session was deleted meanwhile\n   * (logout, kick) and must not be written back. Absent on entities the adapter returns.\n   */\n  isNew?: boolean;\n  creationTime: number;\n  lastAccessTime: number;\n  maxInactiveInterval: number;\n  expiryTime: number;\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  attributes: Record<string, any>;\n  principalName?: string | null;\n}\n\nclass DBSession extends MapSession {\n  public isNew: boolean;\n  public primaryId: string;\n\n  constructor(cached: MapSession, isNew: boolean) {\n    super(cached);\n    this.isNew = isNew;\n    this.primaryId = randomUUID();\n  }\n}\n\nexport interface DBAdapter {\n  save(session: SessionEntity): Promise<void>;\n  deleteById(sessionId: string): Promise<void>;\n  findById(sessionId: string): Promise<SessionEntity | null>;\n  findByPrincipalName(principalName: string): Promise<SessionEntity[]>;\n  cleanupExpiredSessions(cleanupCount?: number): Promise<void>;\n}\n\nexport class DBIndexedSessionRepository implements SessionRepository<DBSession> {\n  private defaultMaxInactiveInterval = 1800;\n  private readonly db: DBAdapter;\n\n  constructor(db: DBAdapter) {\n    this.db = db;\n  }\n\n  setDefaultMaxInactiveInterval(interval: number) {\n    this.defaultMaxInactiveInterval = interval;\n  }\n\n  private mapSessionToEntity(session: DBSession): SessionEntity {\n    const attributes: Record<string, string | number | null> = {};\n    for (const name of session.getAttributeNames()) {\n      attributes[name] = session.getAttribute(name);\n    }\n    const principalName = resolveIndexesFor(session);\n\n    return {\n      primaryId: session.primaryId,\n      sessionId: session.getId(),\n      isNew: session.isNew,\n      creationTime: session.getCreationTime(),\n      lastAccessTime: session.getLastAccessedTime(),\n      maxInactiveInterval: session.getMaxInactiveInterval(),\n      expiryTime: session.getLastAccessedTime() + session.getMaxInactiveInterval() * 1000,\n      attributes,\n      principalName,\n    };\n  }\n\n  private mapEntityToSession(entity: SessionEntity, allowExpired: boolean): DBSession | null {\n    const loaded = new MapSession(entity.sessionId);\n    loaded.setCreationTime(entity.creationTime);\n    loaded.setLastAccessedTime(entity.lastAccessTime);\n    loaded.setMaxInactiveInterval(entity.maxInactiveInterval);\n    for (const [key, value] of Object.entries(entity.attributes)) {\n      loaded.setAttribute(key, value);\n    }\n\n    if (!allowExpired && loaded.isExpired()) return null;\n    const session = new DBSession(loaded, false);\n    session.primaryId = entity.primaryId;\n    return session;\n  }\n\n  private async getSession(id: string, allowExpired: boolean): Promise<DBSession | null> {\n    const entity = await this.db.findById(id);\n    if (!entity) return null;\n    return this.mapEntityToSession(entity, allowExpired);\n  }\n\n  // override\n  createSession() {\n    const cached = new MapSession();\n    cached.setMaxInactiveInterval(this.defaultMaxInactiveInterval);\n    return new DBSession(cached, true);\n  }\n\n  async save(session: DBSession) {\n    const entity = this.mapSessionToEntity(session);\n    await this.db.save(entity);\n    session.isNew = false;\n  }\n\n  async findById(sessionId: string): Promise<DBSession | null> {\n    return this.getSession(sessionId, false);\n  }\n\n  async deleteById(sessionId: string) {\n    await this.db.deleteById(sessionId);\n  }\n\n  async findByIndexNameAndIndexValue(\n    indexName: string,\n    indexValue: string\n  ): Promise<Map<string, DBSession>> {\n    if (indexName !== PRINCIPAL_NAME_INDEX_NAME) {\n      return new Map<string, DBSession>();\n    }\n    const entities = await this.db.findByPrincipalName(indexValue);\n    if (entities.length === 0) {\n      return new Map<string, DBSession>();\n    }\n    const sessions = new Map<string, DBSession>();\n    for (const entity of entities) {\n      const session = this.mapEntityToSession(entity, false);\n      if (session) {\n        sessions.set(session.getId(), session);\n      }\n    }\n    return sessions;\n  }\n\n  async findByPrincipalName(principalName: string): Promise<Map<string, DBSession>> {\n    return this.findByIndexNameAndIndexValue(PRINCIPAL_NAME_INDEX_NAME, principalName);\n  }\n\n  async cleanupExpiredSessions(cleanupCount?: number): Promise<void> {\n    return this.db.cleanupExpiredSessions(cleanupCount);\n  }\n}\n"],"mappings":";;;;;AAyBA,IAAM,YAAN,cAAwBA,4BAAAA,WAAW;CACjC;CACA;CAEA,YAAY,QAAoB,OAAgB;EAC9C,MAAM,MAAM;EACZ,KAAK,QAAQ;EACb,KAAK,aAAA,GAAYC,YAAAA,WAAAA,CAAW;CAC9B;AACF;AAUA,IAAa,6BAAb,MAAgF;CAC9E,6BAAqC;CACrC;CAEA,YAAY,IAAe;EACzB,KAAK,KAAK;CACZ;CAEA,8BAA8B,UAAkB;EAC9C,KAAK,6BAA6B;CACpC;CAEA,mBAA2B,SAAmC;EAC5D,MAAM,aAAqD,CAAC;EAC5D,KAAK,MAAM,QAAQ,QAAQ,kBAAkB,GAC3C,WAAW,QAAQ,QAAQ,aAAa,IAAI;EAE9C,MAAM,gBAAgBC,uBAAAA,kBAAkB,OAAO;EAE/C,OAAO;GACL,WAAW,QAAQ;GACnB,WAAW,QAAQ,MAAM;GACzB,OAAO,QAAQ;GACf,cAAc,QAAQ,gBAAgB;GACtC,gBAAgB,QAAQ,oBAAoB;GAC5C,qBAAqB,QAAQ,uBAAuB;GACpD,YAAY,QAAQ,oBAAoB,IAAI,QAAQ,uBAAuB,IAAI;GAC/E;GACA;EACF;CACF;CAEA,mBAA2B,QAAuB,cAAyC;EACzF,MAAM,SAAS,IAAIF,4BAAAA,WAAW,OAAO,SAAS;EAC9C,OAAO,gBAAgB,OAAO,YAAY;EAC1C,OAAO,oBAAoB,OAAO,cAAc;EAChD,OAAO,uBAAuB,OAAO,mBAAmB;EACxD,KAAK,MAAM,CAAC,KAAK,UAAU,OAAO,QAAQ,OAAO,UAAU,GACzD,OAAO,aAAa,KAAK,KAAK;EAGhC,IAAI,CAAC,gBAAgB,OAAO,UAAU,GAAG,OAAO;EAChD,MAAM,UAAU,IAAI,UAAU,QAAQ,KAAK;EAC3C,QAAQ,YAAY,OAAO;EAC3B,OAAO;CACT;CAEA,MAAc,WAAW,IAAY,cAAkD;EACrF,MAAM,SAAS,MAAM,KAAK,GAAG,SAAS,EAAE;EACxC,IAAI,CAAC,QAAQ,OAAO;EACpB,OAAO,KAAK,mBAAmB,QAAQ,YAAY;CACrD;CAGA,gBAAgB;EACd,MAAM,SAAS,IAAIA,4BAAAA,WAAW;EAC9B,OAAO,uBAAuB,KAAK,0BAA0B;EAC7D,OAAO,IAAI,UAAU,QAAQ,IAAI;CACnC;CAEA,MAAM,KAAK,SAAoB;EAC7B,MAAM,SAAS,KAAK,mBAAmB,OAAO;EAC9C,MAAM,KAAK,GAAG,KAAK,MAAM;EACzB,QAAQ,QAAQ;CAClB;CAEA,MAAM,SAAS,WAA8C;EAC3D,OAAO,KAAK,WAAW,WAAW,KAAK;CACzC;CAEA,MAAM,WAAW,WAAmB;EAClC,MAAM,KAAK,GAAG,WAAW,SAAS;CACpC;CAEA,MAAM,6BACJ,WACA,YACiC;EACjC,IAAI,cAAA,0FACF,uBAAO,IAAI,IAAuB;EAEpC,MAAM,WAAW,MAAM,KAAK,GAAG,oBAAoB,UAAU;EAC7D,IAAI,SAAS,WAAW,GACtB,uBAAO,IAAI,IAAuB;EAEpC,MAAM,2BAAW,IAAI,IAAuB;EAC5C,KAAK,MAAM,UAAU,UAAU;GAC7B,MAAM,UAAU,KAAK,mBAAmB,QAAQ,KAAK;GACrD,IAAI,SACF,SAAS,IAAI,QAAQ,MAAM,GAAG,OAAO;EAEzC;EACA,OAAO;CACT;CAEA,MAAM,oBAAoB,eAAwD;EAChF,OAAO,KAAK,6BAA6BG,uBAAAA,2BAA2B,aAAa;CACnF;CAEA,MAAM,uBAAuB,cAAsC;EACjE,OAAO,KAAK,GAAG,uBAAuB,YAAY;CACpD;AACF"}
+{"version":3,"file":"db.cjs","names":["MapSession","randomUUID","principalNameOf","PRINCIPAL_NAME_INDEX_NAME"],"sources":["../../src/session/db.ts"],"sourcesContent":["import { randomUUID } from 'node:crypto';\nimport { PRINCIPAL_NAME_INDEX_NAME, principalNameOf } from './common';\nimport { MapSession } from './map-session';\nimport type { SessionRepository } from './types';\n\ninterface SessionEntity {\n  primaryId: string;\n  sessionId: string;\n  /**\n   * Set on the entity `save` hands the adapter: `true` for a session created in this request and\n   * never stored, `false` for one the adapter returned from `findById` / `findByPrincipalName`. As\n   * in Spring Session's `JdbcIndexedSessionRepository`, it is what decides between an INSERT and\n   * an UPDATE — an UPDATE that touches no row then means the session was deleted meanwhile\n   * (logout, kick) and must not be written back. Absent on entities the adapter returns.\n   */\n  isNew?: boolean;\n  creationTime: number;\n  lastAccessTime: number;\n  maxInactiveInterval: number;\n  expiryTime: number;\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  attributes: Record<string, any>;\n  principalName?: string | null;\n}\n\nclass DBSession extends MapSession {\n  public isNew: boolean;\n  public primaryId: string;\n\n  constructor(cached: MapSession, isNew: boolean) {\n    super(cached);\n    this.isNew = isNew;\n    this.primaryId = randomUUID();\n  }\n}\n\nexport interface DBAdapter {\n  save(session: SessionEntity): Promise<void>;\n  deleteById(sessionId: string): Promise<void>;\n  findById(sessionId: string): Promise<SessionEntity | null>;\n  findByPrincipalName(principalName: string): Promise<SessionEntity[]>;\n  cleanupExpiredSessions(cleanupCount?: number): Promise<void>;\n}\n\nexport class DBIndexedSessionRepository implements SessionRepository<DBSession> {\n  private defaultMaxInactiveInterval = 1800;\n  private readonly db: DBAdapter;\n\n  constructor(db: DBAdapter) {\n    this.db = db;\n  }\n\n  setDefaultMaxInactiveInterval(interval: number) {\n    this.defaultMaxInactiveInterval = interval;\n  }\n\n  private mapSessionToEntity(session: DBSession): SessionEntity {\n    const attributes: Record<string, string | number | null> = {};\n    for (const name of session.getAttributeNames()) {\n      attributes[name] = session.getAttribute(name);\n    }\n    const principalName = principalNameOf(session);\n\n    return {\n      primaryId: session.primaryId,\n      sessionId: session.getId(),\n      isNew: session.isNew,\n      creationTime: session.getCreationTime(),\n      lastAccessTime: session.getLastAccessedTime(),\n      maxInactiveInterval: session.getMaxInactiveInterval(),\n      expiryTime: session.getLastAccessedTime() + session.getMaxInactiveInterval() * 1000,\n      attributes,\n      principalName,\n    };\n  }\n\n  private mapEntityToSession(entity: SessionEntity, allowExpired: boolean): DBSession | null {\n    const loaded = new MapSession(entity.sessionId);\n    loaded.setCreationTime(entity.creationTime);\n    loaded.setLastAccessedTime(entity.lastAccessTime);\n    loaded.setMaxInactiveInterval(entity.maxInactiveInterval);\n    for (const [key, value] of Object.entries(entity.attributes)) {\n      loaded.setAttribute(key, value);\n    }\n\n    if (!allowExpired && loaded.isExpired()) return null;\n    const session = new DBSession(loaded, false);\n    session.primaryId = entity.primaryId;\n    return session;\n  }\n\n  private async getSession(id: string, allowExpired: boolean): Promise<DBSession | null> {\n    const entity = await this.db.findById(id);\n    if (!entity) return null;\n    return this.mapEntityToSession(entity, allowExpired);\n  }\n\n  // override\n  createSession() {\n    const cached = new MapSession();\n    cached.setMaxInactiveInterval(this.defaultMaxInactiveInterval);\n    return new DBSession(cached, true);\n  }\n\n  async save(session: DBSession) {\n    const entity = this.mapSessionToEntity(session);\n    await this.db.save(entity);\n    session.isNew = false;\n  }\n\n  async findById(sessionId: string): Promise<DBSession | null> {\n    return this.getSession(sessionId, false);\n  }\n\n  async deleteById(sessionId: string) {\n    await this.db.deleteById(sessionId);\n  }\n\n  async findByIndexNameAndIndexValue(\n    indexName: string,\n    indexValue: string\n  ): Promise<Map<string, DBSession>> {\n    if (indexName !== PRINCIPAL_NAME_INDEX_NAME) {\n      return new Map<string, DBSession>();\n    }\n    const entities = await this.db.findByPrincipalName(indexValue);\n    if (entities.length === 0) {\n      return new Map<string, DBSession>();\n    }\n    const sessions = new Map<string, DBSession>();\n    for (const entity of entities) {\n      const session = this.mapEntityToSession(entity, false);\n      if (session) {\n        sessions.set(session.getId(), session);\n      }\n    }\n    return sessions;\n  }\n\n  async findByPrincipalName(principalName: string): Promise<Map<string, DBSession>> {\n    return this.findByIndexNameAndIndexValue(PRINCIPAL_NAME_INDEX_NAME, principalName);\n  }\n\n  async cleanupExpiredSessions(cleanupCount?: number): Promise<void> {\n    return this.db.cleanupExpiredSessions(cleanupCount);\n  }\n}\n"],"mappings":";;;;;AAyBA,IAAM,YAAN,cAAwBA,4BAAAA,WAAW;CACjC;CACA;CAEA,YAAY,QAAoB,OAAgB;EAC9C,MAAM,MAAM;EACZ,KAAK,QAAQ;EACb,KAAK,aAAA,GAAYC,YAAAA,WAAAA,CAAW;CAC9B;AACF;AAUA,IAAa,6BAAb,MAAgF;CAC9E,6BAAqC;CACrC;CAEA,YAAY,IAAe;EACzB,KAAK,KAAK;CACZ;CAEA,8BAA8B,UAAkB;EAC9C,KAAK,6BAA6B;CACpC;CAEA,mBAA2B,SAAmC;EAC5D,MAAM,aAAqD,CAAC;EAC5D,KAAK,MAAM,QAAQ,QAAQ,kBAAkB,GAC3C,WAAW,QAAQ,QAAQ,aAAa,IAAI;EAE9C,MAAM,gBAAgBC,uBAAAA,gBAAgB,OAAO;EAE7C,OAAO;GACL,WAAW,QAAQ;GACnB,WAAW,QAAQ,MAAM;GACzB,OAAO,QAAQ;GACf,cAAc,QAAQ,gBAAgB;GACtC,gBAAgB,QAAQ,oBAAoB;GAC5C,qBAAqB,QAAQ,uBAAuB;GACpD,YAAY,QAAQ,oBAAoB,IAAI,QAAQ,uBAAuB,IAAI;GAC/E;GACA;EACF;CACF;CAEA,mBAA2B,QAAuB,cAAyC;EACzF,MAAM,SAAS,IAAIF,4BAAAA,WAAW,OAAO,SAAS;EAC9C,OAAO,gBAAgB,OAAO,YAAY;EAC1C,OAAO,oBAAoB,OAAO,cAAc;EAChD,OAAO,uBAAuB,OAAO,mBAAmB;EACxD,KAAK,MAAM,CAAC,KAAK,UAAU,OAAO,QAAQ,OAAO,UAAU,GACzD,OAAO,aAAa,KAAK,KAAK;EAGhC,IAAI,CAAC,gBAAgB,OAAO,UAAU,GAAG,OAAO;EAChD,MAAM,UAAU,IAAI,UAAU,QAAQ,KAAK;EAC3C,QAAQ,YAAY,OAAO;EAC3B,OAAO;CACT;CAEA,MAAc,WAAW,IAAY,cAAkD;EACrF,MAAM,SAAS,MAAM,KAAK,GAAG,SAAS,EAAE;EACxC,IAAI,CAAC,QAAQ,OAAO;EACpB,OAAO,KAAK,mBAAmB,QAAQ,YAAY;CACrD;CAGA,gBAAgB;EACd,MAAM,SAAS,IAAIA,4BAAAA,WAAW;EAC9B,OAAO,uBAAuB,KAAK,0BAA0B;EAC7D,OAAO,IAAI,UAAU,QAAQ,IAAI;CACnC;CAEA,MAAM,KAAK,SAAoB;EAC7B,MAAM,SAAS,KAAK,mBAAmB,OAAO;EAC9C,MAAM,KAAK,GAAG,KAAK,MAAM;EACzB,QAAQ,QAAQ;CAClB;CAEA,MAAM,SAAS,WAA8C;EAC3D,OAAO,KAAK,WAAW,WAAW,KAAK;CACzC;CAEA,MAAM,WAAW,WAAmB;EAClC,MAAM,KAAK,GAAG,WAAW,SAAS;CACpC;CAEA,MAAM,6BACJ,WACA,YACiC;EACjC,IAAI,cAAA,iBACF,uBAAO,IAAI,IAAuB;EAEpC,MAAM,WAAW,MAAM,KAAK,GAAG,oBAAoB,UAAU;EAC7D,IAAI,SAAS,WAAW,GACtB,uBAAO,IAAI,IAAuB;EAEpC,MAAM,2BAAW,IAAI,IAAuB;EAC5C,KAAK,MAAM,UAAU,UAAU;GAC7B,MAAM,UAAU,KAAK,mBAAmB,QAAQ,KAAK;GACrD,IAAI,SACF,SAAS,IAAI,QAAQ,MAAM,GAAG,OAAO;EAEzC;EACA,OAAO;CACT;CAEA,MAAM,oBAAoB,eAAwD;EAChF,OAAO,KAAK,6BAA6BG,uBAAAA,2BAA2B,aAAa;CACnF;CAEA,MAAM,uBAAuB,cAAsC;EACjE,OAAO,KAAK,GAAG,uBAAuB,YAAY;CACpD;AACF"}

package/dist/session/db.mjs

@@ -1,4 +1,4 @@
-import { PRINCIPAL_NAME_INDEX_NAME, resolveIndexesFor } from "./common.mjs";
+import { PRINCIPAL_NAME_INDEX_NAME, principalNameOf } from "./common.mjs";
 import { MapSession } from "./map-session.mjs";
 import { randomUUID } from "node:crypto";
 // src/session/db.ts
@@ -23,7 +23,7 @@ var DBIndexedSessionRepository = class {
 	mapSessionToEntity(session) {
 		const attributes = {};
 		for (const name of session.getAttributeNames()) attributes[name] = session.getAttribute(name);
-		const principalName = resolveIndexesFor(session);
+		const principalName = principalNameOf(session);
 		return {
 			primaryId: session.primaryId,
 			sessionId: session.getId(),
@@ -69,7 +69,7 @@ var DBIndexedSessionRepository = class {
 		await this.db.deleteById(sessionId);
 	}
 	async findByIndexNameAndIndexValue(indexName, indexValue) {
-		if (indexName !== "org.springframework.session.FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME") return /* @__PURE__ */ new Map();
+		if (indexName !== "principalName") return /* @__PURE__ */ new Map();
 		const entities = await this.db.findByPrincipalName(indexValue);
 		if (entities.length === 0) return /* @__PURE__ */ new Map();
 		const sessions = /* @__PURE__ */ new Map();

package/dist/session/db.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"db.mjs","names":[],"sources":["../../src/session/db.ts"],"sourcesContent":["import { randomUUID } from 'node:crypto';\nimport { PRINCIPAL_NAME_INDEX_NAME, resolveIndexesFor } from './common';\nimport { MapSession } from './map-session';\nimport type { SessionRepository } from './types';\n\ninterface SessionEntity {\n  primaryId: string;\n  sessionId: string;\n  /**\n   * Set on the entity `save` hands the adapter: `true` for a session created in this request and\n   * never stored, `false` for one the adapter returned from `findById` / `findByPrincipalName`. As\n   * in Spring Session's `JdbcIndexedSessionRepository`, it is what decides between an INSERT and\n   * an UPDATE — an UPDATE that touches no row then means the session was deleted meanwhile\n   * (logout, kick) and must not be written back. Absent on entities the adapter returns.\n   */\n  isNew?: boolean;\n  creationTime: number;\n  lastAccessTime: number;\n  maxInactiveInterval: number;\n  expiryTime: number;\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  attributes: Record<string, any>;\n  principalName?: string | null;\n}\n\nclass DBSession extends MapSession {\n  public isNew: boolean;\n  public primaryId: string;\n\n  constructor(cached: MapSession, isNew: boolean) {\n    super(cached);\n    this.isNew = isNew;\n    this.primaryId = randomUUID();\n  }\n}\n\nexport interface DBAdapter {\n  save(session: SessionEntity): Promise<void>;\n  deleteById(sessionId: string): Promise<void>;\n  findById(sessionId: string): Promise<SessionEntity | null>;\n  findByPrincipalName(principalName: string): Promise<SessionEntity[]>;\n  cleanupExpiredSessions(cleanupCount?: number): Promise<void>;\n}\n\nexport class DBIndexedSessionRepository implements SessionRepository<DBSession> {\n  private defaultMaxInactiveInterval = 1800;\n  private readonly db: DBAdapter;\n\n  constructor(db: DBAdapter) {\n    this.db = db;\n  }\n\n  setDefaultMaxInactiveInterval(interval: number) {\n    this.defaultMaxInactiveInterval = interval;\n  }\n\n  private mapSessionToEntity(session: DBSession): SessionEntity {\n    const attributes: Record<string, string | number | null> = {};\n    for (const name of session.getAttributeNames()) {\n      attributes[name] = session.getAttribute(name);\n    }\n    const principalName = resolveIndexesFor(session);\n\n    return {\n      primaryId: session.primaryId,\n      sessionId: session.getId(),\n      isNew: session.isNew,\n      creationTime: session.getCreationTime(),\n      lastAccessTime: session.getLastAccessedTime(),\n      maxInactiveInterval: session.getMaxInactiveInterval(),\n      expiryTime: session.getLastAccessedTime() + session.getMaxInactiveInterval() * 1000,\n      attributes,\n      principalName,\n    };\n  }\n\n  private mapEntityToSession(entity: SessionEntity, allowExpired: boolean): DBSession | null {\n    const loaded = new MapSession(entity.sessionId);\n    loaded.setCreationTime(entity.creationTime);\n    loaded.setLastAccessedTime(entity.lastAccessTime);\n    loaded.setMaxInactiveInterval(entity.maxInactiveInterval);\n    for (const [key, value] of Object.entries(entity.attributes)) {\n      loaded.setAttribute(key, value);\n    }\n\n    if (!allowExpired && loaded.isExpired()) return null;\n    const session = new DBSession(loaded, false);\n    session.primaryId = entity.primaryId;\n    return session;\n  }\n\n  private async getSession(id: string, allowExpired: boolean): Promise<DBSession | null> {\n    const entity = await this.db.findById(id);\n    if (!entity) return null;\n    return this.mapEntityToSession(entity, allowExpired);\n  }\n\n  // override\n  createSession() {\n    const cached = new MapSession();\n    cached.setMaxInactiveInterval(this.defaultMaxInactiveInterval);\n    return new DBSession(cached, true);\n  }\n\n  async save(session: DBSession) {\n    const entity = this.mapSessionToEntity(session);\n    await this.db.save(entity);\n    session.isNew = false;\n  }\n\n  async findById(sessionId: string): Promise<DBSession | null> {\n    return this.getSession(sessionId, false);\n  }\n\n  async deleteById(sessionId: string) {\n    await this.db.deleteById(sessionId);\n  }\n\n  async findByIndexNameAndIndexValue(\n    indexName: string,\n    indexValue: string\n  ): Promise<Map<string, DBSession>> {\n    if (indexName !== PRINCIPAL_NAME_INDEX_NAME) {\n      return new Map<string, DBSession>();\n    }\n    const entities = await this.db.findByPrincipalName(indexValue);\n    if (entities.length === 0) {\n      return new Map<string, DBSession>();\n    }\n    const sessions = new Map<string, DBSession>();\n    for (const entity of entities) {\n      const session = this.mapEntityToSession(entity, false);\n      if (session) {\n        sessions.set(session.getId(), session);\n      }\n    }\n    return sessions;\n  }\n\n  async findByPrincipalName(principalName: string): Promise<Map<string, DBSession>> {\n    return this.findByIndexNameAndIndexValue(PRINCIPAL_NAME_INDEX_NAME, principalName);\n  }\n\n  async cleanupExpiredSessions(cleanupCount?: number): Promise<void> {\n    return this.db.cleanupExpiredSessions(cleanupCount);\n  }\n}\n"],"mappings":";;;;AAyBA,IAAM,YAAN,cAAwB,WAAW;CACjC;CACA;CAEA,YAAY,QAAoB,OAAgB;EAC9C,MAAM,MAAM;EACZ,KAAK,QAAQ;EACb,KAAK,YAAY,WAAW;CAC9B;AACF;AAUA,IAAa,6BAAb,MAAgF;CAC9E,6BAAqC;CACrC;CAEA,YAAY,IAAe;EACzB,KAAK,KAAK;CACZ;CAEA,8BAA8B,UAAkB;EAC9C,KAAK,6BAA6B;CACpC;CAEA,mBAA2B,SAAmC;EAC5D,MAAM,aAAqD,CAAC;EAC5D,KAAK,MAAM,QAAQ,QAAQ,kBAAkB,GAC3C,WAAW,QAAQ,QAAQ,aAAa,IAAI;EAE9C,MAAM,gBAAgB,kBAAkB,OAAO;EAE/C,OAAO;GACL,WAAW,QAAQ;GACnB,WAAW,QAAQ,MAAM;GACzB,OAAO,QAAQ;GACf,cAAc,QAAQ,gBAAgB;GACtC,gBAAgB,QAAQ,oBAAoB;GAC5C,qBAAqB,QAAQ,uBAAuB;GACpD,YAAY,QAAQ,oBAAoB,IAAI,QAAQ,uBAAuB,IAAI;GAC/E;GACA;EACF;CACF;CAEA,mBAA2B,QAAuB,cAAyC;EACzF,MAAM,SAAS,IAAI,WAAW,OAAO,SAAS;EAC9C,OAAO,gBAAgB,OAAO,YAAY;EAC1C,OAAO,oBAAoB,OAAO,cAAc;EAChD,OAAO,uBAAuB,OAAO,mBAAmB;EACxD,KAAK,MAAM,CAAC,KAAK,UAAU,OAAO,QAAQ,OAAO,UAAU,GACzD,OAAO,aAAa,KAAK,KAAK;EAGhC,IAAI,CAAC,gBAAgB,OAAO,UAAU,GAAG,OAAO;EAChD,MAAM,UAAU,IAAI,UAAU,QAAQ,KAAK;EAC3C,QAAQ,YAAY,OAAO;EAC3B,OAAO;CACT;CAEA,MAAc,WAAW,IAAY,cAAkD;EACrF,MAAM,SAAS,MAAM,KAAK,GAAG,SAAS,EAAE;EACxC,IAAI,CAAC,QAAQ,OAAO;EACpB,OAAO,KAAK,mBAAmB,QAAQ,YAAY;CACrD;CAGA,gBAAgB;EACd,MAAM,SAAS,IAAI,WAAW;EAC9B,OAAO,uBAAuB,KAAK,0BAA0B;EAC7D,OAAO,IAAI,UAAU,QAAQ,IAAI;CACnC;CAEA,MAAM,KAAK,SAAoB;EAC7B,MAAM,SAAS,KAAK,mBAAmB,OAAO;EAC9C,MAAM,KAAK,GAAG,KAAK,MAAM;EACzB,QAAQ,QAAQ;CAClB;CAEA,MAAM,SAAS,WAA8C;EAC3D,OAAO,KAAK,WAAW,WAAW,KAAK;CACzC;CAEA,MAAM,WAAW,WAAmB;EAClC,MAAM,KAAK,GAAG,WAAW,SAAS;CACpC;CAEA,MAAM,6BACJ,WACA,YACiC;EACjC,IAAI,cAAA,0FACF,uBAAO,IAAI,IAAuB;EAEpC,MAAM,WAAW,MAAM,KAAK,GAAG,oBAAoB,UAAU;EAC7D,IAAI,SAAS,WAAW,GACtB,uBAAO,IAAI,IAAuB;EAEpC,MAAM,2BAAW,IAAI,IAAuB;EAC5C,KAAK,MAAM,UAAU,UAAU;GAC7B,MAAM,UAAU,KAAK,mBAAmB,QAAQ,KAAK;GACrD,IAAI,SACF,SAAS,IAAI,QAAQ,MAAM,GAAG,OAAO;EAEzC;EACA,OAAO;CACT;CAEA,MAAM,oBAAoB,eAAwD;EAChF,OAAO,KAAK,6BAA6B,2BAA2B,aAAa;CACnF;CAEA,MAAM,uBAAuB,cAAsC;EACjE,OAAO,KAAK,GAAG,uBAAuB,YAAY;CACpD;AACF"}
+{"version":3,"file":"db.mjs","names":[],"sources":["../../src/session/db.ts"],"sourcesContent":["import { randomUUID } from 'node:crypto';\nimport { PRINCIPAL_NAME_INDEX_NAME, principalNameOf } from './common';\nimport { MapSession } from './map-session';\nimport type { SessionRepository } from './types';\n\ninterface SessionEntity {\n  primaryId: string;\n  sessionId: string;\n  /**\n   * Set on the entity `save` hands the adapter: `true` for a session created in this request and\n   * never stored, `false` for one the adapter returned from `findById` / `findByPrincipalName`. As\n   * in Spring Session's `JdbcIndexedSessionRepository`, it is what decides between an INSERT and\n   * an UPDATE — an UPDATE that touches no row then means the session was deleted meanwhile\n   * (logout, kick) and must not be written back. Absent on entities the adapter returns.\n   */\n  isNew?: boolean;\n  creationTime: number;\n  lastAccessTime: number;\n  maxInactiveInterval: number;\n  expiryTime: number;\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  attributes: Record<string, any>;\n  principalName?: string | null;\n}\n\nclass DBSession extends MapSession {\n  public isNew: boolean;\n  public primaryId: string;\n\n  constructor(cached: MapSession, isNew: boolean) {\n    super(cached);\n    this.isNew = isNew;\n    this.primaryId = randomUUID();\n  }\n}\n\nexport interface DBAdapter {\n  save(session: SessionEntity): Promise<void>;\n  deleteById(sessionId: string): Promise<void>;\n  findById(sessionId: string): Promise<SessionEntity | null>;\n  findByPrincipalName(principalName: string): Promise<SessionEntity[]>;\n  cleanupExpiredSessions(cleanupCount?: number): Promise<void>;\n}\n\nexport class DBIndexedSessionRepository implements SessionRepository<DBSession> {\n  private defaultMaxInactiveInterval = 1800;\n  private readonly db: DBAdapter;\n\n  constructor(db: DBAdapter) {\n    this.db = db;\n  }\n\n  setDefaultMaxInactiveInterval(interval: number) {\n    this.defaultMaxInactiveInterval = interval;\n  }\n\n  private mapSessionToEntity(session: DBSession): SessionEntity {\n    const attributes: Record<string, string | number | null> = {};\n    for (const name of session.getAttributeNames()) {\n      attributes[name] = session.getAttribute(name);\n    }\n    const principalName = principalNameOf(session);\n\n    return {\n      primaryId: session.primaryId,\n      sessionId: session.getId(),\n      isNew: session.isNew,\n      creationTime: session.getCreationTime(),\n      lastAccessTime: session.getLastAccessedTime(),\n      maxInactiveInterval: session.getMaxInactiveInterval(),\n      expiryTime: session.getLastAccessedTime() + session.getMaxInactiveInterval() * 1000,\n      attributes,\n      principalName,\n    };\n  }\n\n  private mapEntityToSession(entity: SessionEntity, allowExpired: boolean): DBSession | null {\n    const loaded = new MapSession(entity.sessionId);\n    loaded.setCreationTime(entity.creationTime);\n    loaded.setLastAccessedTime(entity.lastAccessTime);\n    loaded.setMaxInactiveInterval(entity.maxInactiveInterval);\n    for (const [key, value] of Object.entries(entity.attributes)) {\n      loaded.setAttribute(key, value);\n    }\n\n    if (!allowExpired && loaded.isExpired()) return null;\n    const session = new DBSession(loaded, false);\n    session.primaryId = entity.primaryId;\n    return session;\n  }\n\n  private async getSession(id: string, allowExpired: boolean): Promise<DBSession | null> {\n    const entity = await this.db.findById(id);\n    if (!entity) return null;\n    return this.mapEntityToSession(entity, allowExpired);\n  }\n\n  // override\n  createSession() {\n    const cached = new MapSession();\n    cached.setMaxInactiveInterval(this.defaultMaxInactiveInterval);\n    return new DBSession(cached, true);\n  }\n\n  async save(session: DBSession) {\n    const entity = this.mapSessionToEntity(session);\n    await this.db.save(entity);\n    session.isNew = false;\n  }\n\n  async findById(sessionId: string): Promise<DBSession | null> {\n    return this.getSession(sessionId, false);\n  }\n\n  async deleteById(sessionId: string) {\n    await this.db.deleteById(sessionId);\n  }\n\n  async findByIndexNameAndIndexValue(\n    indexName: string,\n    indexValue: string\n  ): Promise<Map<string, DBSession>> {\n    if (indexName !== PRINCIPAL_NAME_INDEX_NAME) {\n      return new Map<string, DBSession>();\n    }\n    const entities = await this.db.findByPrincipalName(indexValue);\n    if (entities.length === 0) {\n      return new Map<string, DBSession>();\n    }\n    const sessions = new Map<string, DBSession>();\n    for (const entity of entities) {\n      const session = this.mapEntityToSession(entity, false);\n      if (session) {\n        sessions.set(session.getId(), session);\n      }\n    }\n    return sessions;\n  }\n\n  async findByPrincipalName(principalName: string): Promise<Map<string, DBSession>> {\n    return this.findByIndexNameAndIndexValue(PRINCIPAL_NAME_INDEX_NAME, principalName);\n  }\n\n  async cleanupExpiredSessions(cleanupCount?: number): Promise<void> {\n    return this.db.cleanupExpiredSessions(cleanupCount);\n  }\n}\n"],"mappings":";;;;AAyBA,IAAM,YAAN,cAAwB,WAAW;CACjC;CACA;CAEA,YAAY,QAAoB,OAAgB;EAC9C,MAAM,MAAM;EACZ,KAAK,QAAQ;EACb,KAAK,YAAY,WAAW;CAC9B;AACF;AAUA,IAAa,6BAAb,MAAgF;CAC9E,6BAAqC;CACrC;CAEA,YAAY,IAAe;EACzB,KAAK,KAAK;CACZ;CAEA,8BAA8B,UAAkB;EAC9C,KAAK,6BAA6B;CACpC;CAEA,mBAA2B,SAAmC;EAC5D,MAAM,aAAqD,CAAC;EAC5D,KAAK,MAAM,QAAQ,QAAQ,kBAAkB,GAC3C,WAAW,QAAQ,QAAQ,aAAa,IAAI;EAE9C,MAAM,gBAAgB,gBAAgB,OAAO;EAE7C,OAAO;GACL,WAAW,QAAQ;GACnB,WAAW,QAAQ,MAAM;GACzB,OAAO,QAAQ;GACf,cAAc,QAAQ,gBAAgB;GACtC,gBAAgB,QAAQ,oBAAoB;GAC5C,qBAAqB,QAAQ,uBAAuB;GACpD,YAAY,QAAQ,oBAAoB,IAAI,QAAQ,uBAAuB,IAAI;GAC/E;GACA;EACF;CACF;CAEA,mBAA2B,QAAuB,cAAyC;EACzF,MAAM,SAAS,IAAI,WAAW,OAAO,SAAS;EAC9C,OAAO,gBAAgB,OAAO,YAAY;EAC1C,OAAO,oBAAoB,OAAO,cAAc;EAChD,OAAO,uBAAuB,OAAO,mBAAmB;EACxD,KAAK,MAAM,CAAC,KAAK,UAAU,OAAO,QAAQ,OAAO,UAAU,GACzD,OAAO,aAAa,KAAK,KAAK;EAGhC,IAAI,CAAC,gBAAgB,OAAO,UAAU,GAAG,OAAO;EAChD,MAAM,UAAU,IAAI,UAAU,QAAQ,KAAK;EAC3C,QAAQ,YAAY,OAAO;EAC3B,OAAO;CACT;CAEA,MAAc,WAAW,IAAY,cAAkD;EACrF,MAAM,SAAS,MAAM,KAAK,GAAG,SAAS,EAAE;EACxC,IAAI,CAAC,QAAQ,OAAO;EACpB,OAAO,KAAK,mBAAmB,QAAQ,YAAY;CACrD;CAGA,gBAAgB;EACd,MAAM,SAAS,IAAI,WAAW;EAC9B,OAAO,uBAAuB,KAAK,0BAA0B;EAC7D,OAAO,IAAI,UAAU,QAAQ,IAAI;CACnC;CAEA,MAAM,KAAK,SAAoB;EAC7B,MAAM,SAAS,KAAK,mBAAmB,OAAO;EAC9C,MAAM,KAAK,GAAG,KAAK,MAAM;EACzB,QAAQ,QAAQ;CAClB;CAEA,MAAM,SAAS,WAA8C;EAC3D,OAAO,KAAK,WAAW,WAAW,KAAK;CACzC;CAEA,MAAM,WAAW,WAAmB;EAClC,MAAM,KAAK,GAAG,WAAW,SAAS;CACpC;CAEA,MAAM,6BACJ,WACA,YACiC;EACjC,IAAI,cAAA,iBACF,uBAAO,IAAI,IAAuB;EAEpC,MAAM,WAAW,MAAM,KAAK,GAAG,oBAAoB,UAAU;EAC7D,IAAI,SAAS,WAAW,GACtB,uBAAO,IAAI,IAAuB;EAEpC,MAAM,2BAAW,IAAI,IAAuB;EAC5C,KAAK,MAAM,UAAU,UAAU;GAC7B,MAAM,UAAU,KAAK,mBAAmB,QAAQ,KAAK;GACrD,IAAI,SACF,SAAS,IAAI,QAAQ,MAAM,GAAG,OAAO;EAEzC;EACA,OAAO;CACT;CAEA,MAAM,oBAAoB,eAAwD;EAChF,OAAO,KAAK,6BAA6B,2BAA2B,aAAa;CACnF;CAEA,MAAM,uBAAuB,cAAsC;EACjE,OAAO,KAAK,GAAG,uBAAuB,YAAY;CACpD;AACF"}

package/dist/session/redis.cjs

@@ -18,7 +18,7 @@ var RedisSession = class {
 		this.cached = cached;
 		this.isNew = isNew;
 		this.originalSessionId = cached.getId();
-		this.originalPrincipalName = require_session_common.resolveIndexesFor(this);
+		this.originalPrincipalName = require_session_common.principalNameOf(this);
 		if (isNew) {
 			this.delta.set(CREATION_TIME_KEY, cached.getCreationTime());
 			this.delta.set(LAST_ACCESSED_TIME_KEY, cached.getLastAccessedTime());
@@ -113,7 +113,7 @@ var RedisIndexedSessionRepository = class {
 	namespace;
 	expirationStore;
 	defaultMaxInactiveInterval = 1800;
-	constructor(redis, namespace = "spring:session") {
+	constructor(redis, namespace = "app:session") {
 		this.redis = redis;
 		this.namespace = namespace;
 		this.expirationStore = new SortedSetRedisSessionExpirationStore(redis, namespace);
@@ -161,14 +161,12 @@ var RedisIndexedSessionRepository = class {
 		});
 		if (delta.size !== 0) await this.redis.hset(this.getSessionKey(sessionId), delta);
 		if (removes.length !== 0) await this.redis.hdel(this.getSessionKey(sessionId), ...removes);
-		const principalSessionKey = this.getSessionAttrNameKey(require_session_common.PRINCIPAL_NAME_INDEX_NAME);
-		const securityPrincipalSessionKey = this.getSessionAttrNameKey(require_session_common.SPRING_SECURITY_CONTEXT);
-		if (session.delta.has(principalSessionKey) || session.delta.has(securityPrincipalSessionKey)) {
+		if (session.delta.has(this.getSessionAttrNameKey("principalName"))) {
 			if (session.originalPrincipalName !== null) {
 				const originalPrincipalRedisKey = this.getPrincipalKey(session.originalPrincipalName);
 				await this.redis.srem(originalPrincipalRedisKey, sessionId);
 			}
-			const principal = require_session_common.resolveIndexesFor(session);
+			const principal = require_session_common.principalNameOf(session);
 			session.originalPrincipalName = principal;
 			if (principal !== null) {
 				const principalRedisKey = this.getPrincipalKey(principal);
@@ -229,7 +227,7 @@ var RedisIndexedSessionRepository = class {
 	async deleteById(sessionId) {
 		const session = await this.getSession(sessionId, true);
 		if (!session) return;
-		const principal = require_session_common.resolveIndexesFor(session);
+		const principal = require_session_common.principalNameOf(session);
 		if (principal !== null) await this.redis.srem(this.getPrincipalKey(principal), sessionId);
 		await this.expirationStore.remove(sessionId);
 		const expiredKey = this.getExpiredKey(sessionId);
@@ -238,7 +236,7 @@ var RedisIndexedSessionRepository = class {
 		await this.save(session);
 	}
 	async findByIndexNameAndIndexValue(indexName, indexValue) {
-		if (indexName !== "org.springframework.session.FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME") return /* @__PURE__ */ new Map();
+		if (indexName !== "principalName") return /* @__PURE__ */ new Map();
 		const principalKey = this.getPrincipalKey(indexValue);
 		const sessionIds = await this.redis.smembers(principalKey);
 		if (sessionIds.length === 0) return /* @__PURE__ */ new Map();

package/dist/session/redis.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"redis.cjs","names":["resolveIndexesFor","PRINCIPAL_NAME_INDEX_NAME","MapSession","SPRING_SECURITY_CONTEXT"],"sources":["../../src/session/redis.ts"],"sourcesContent":["import type { Redis } from 'ioredis';\nimport { PRINCIPAL_NAME_INDEX_NAME, SPRING_SECURITY_CONTEXT, resolveIndexesFor } from './common';\nimport { MapSession } from './map-session';\nimport type { KVRepository, Namespace, Session, SessionRepository } from './types';\n\nconst CREATION_TIME_KEY = 'creationTime';\nconst LAST_ACCESSED_TIME_KEY = 'lastAccessedTime';\nconst MAX_INACTIVE_INTERVAL_KEY = 'maxInactiveInterval';\nconst ATTRIBUTE_PREFIX = 'sessionAttr:';\nconst SESSION_EXPIRES_PREFIX = 'expires:';\n\nclass RedisSession implements Session {\n  private readonly cached: MapSession;\n\n  public isNew: boolean;\n  public delta = new Map<string, string | number | null>();\n  public originalSessionId: string;\n  public originalPrincipalName: string | null;\n  public originalLastAccessTime: number | null = null;\n\n  constructor(cached: MapSession, isNew: boolean) {\n    this.cached = cached;\n    this.isNew = isNew;\n    this.originalSessionId = cached.getId();\n    this.originalPrincipalName = resolveIndexesFor(this);\n\n    if (isNew) {\n      this.delta.set(CREATION_TIME_KEY, cached.getCreationTime());\n      this.delta.set(LAST_ACCESSED_TIME_KEY, cached.getLastAccessedTime());\n      this.delta.set(MAX_INACTIVE_INTERVAL_KEY, cached.getMaxInactiveInterval());\n      this.cached.getAttributeNames().forEach((name) => {\n        const value = this.cached.getAttribute(name);\n        if (value) this.delta.set(this.getSessionAttrNameKey(name), value);\n      });\n    }\n  }\n\n  getSessionAttrNameKey(name: string) {\n    return ATTRIBUTE_PREFIX + name;\n  }\n\n  // override\n  setLastAccessedTime(lastAccessedTime: number) {\n    this.cached.setLastAccessedTime(lastAccessedTime);\n    this.delta.set(LAST_ACCESSED_TIME_KEY, lastAccessedTime);\n  }\n\n  isExpired() {\n    return this.cached.isExpired();\n  }\n\n  getCreationTime() {\n    return this.cached.getCreationTime();\n  }\n\n  getId() {\n    return this.cached.getId();\n  }\n\n  changeSessionId() {\n    return this.cached.changeSessionId();\n  }\n\n  getLastAccessedTime() {\n    return this.cached.getLastAccessedTime();\n  }\n\n  setMaxInactiveInterval(interval: number) {\n    this.cached.setMaxInactiveInterval(interval);\n    this.delta.set(MAX_INACTIVE_INTERVAL_KEY, interval);\n  }\n\n  getMaxInactiveInterval() {\n    return this.cached.getMaxInactiveInterval();\n  }\n\n  getAttribute(name: string) {\n    return this.cached.getAttribute(name);\n  }\n\n  getAttributeNames() {\n    return this.cached.getAttributeNames();\n  }\n\n  setAttribute(name: string, value: string) {\n    this.cached.setAttribute(name, value);\n    this.delta.set(this.getSessionAttrNameKey(name), value);\n  }\n\n  removeAttribute(name: string) {\n    this.cached.removeAttribute(name);\n    this.delta.set(this.getSessionAttrNameKey(name), null);\n  }\n}\n\ninterface RedisSessionExpirationStore {\n  save(session: RedisSession): Promise<void>;\n  remove(sessionId: string): Promise<void>;\n  rename(session: RedisSession): Promise<void>;\n  cleanupExpiredSessions(cleanupCount?: number): Promise<void>;\n}\n\nclass SortedSetRedisSessionExpirationStore implements RedisSessionExpirationStore {\n  private readonly redis: Redis;\n  private readonly namespace: Namespace;\n  private readonly expirationsKey: string;\n\n  constructor(redis: Redis, namespace: Namespace) {\n    this.redis = redis;\n    this.namespace = namespace;\n    this.expirationsKey = `${this.namespace}:sessions:expirations`;\n  }\n\n  getSessionKey(sessionId: string) {\n    return `${this.namespace}:sessions:${sessionId}`;\n  }\n\n  async save(session: RedisSession) {\n    const expirationInMillis =\n      session.getLastAccessedTime() + session.getMaxInactiveInterval() * 1000;\n    await this.redis.zadd(this.expirationsKey, expirationInMillis, session.getId());\n  }\n\n  async remove(sessionId: string) {\n    await this.redis.zrem(this.expirationsKey, sessionId);\n  }\n\n  async rename(session: RedisSession) {\n    if (session.originalSessionId === session.getId()) return;\n    await this.remove(session.originalSessionId);\n    await this.save(session);\n  }\n\n  async cleanupExpiredSessions(cleanupCount = 100) {\n    const key = this.expirationsKey;\n    const score = Date.now();\n    const sessionIds = await this.redis.zrevrangebyscore(key, score, 0, 'LIMIT', 0, cleanupCount);\n    if (sessionIds.length === 0) return;\n    for (const sessionId of sessionIds) {\n      const sessionKey = this.getSessionKey(sessionId);\n      // Checks if the session exists. By trying to access the session we only trigger a deletion\n      // if the TTL is expired.\n      await this.redis.exists(sessionKey);\n    }\n  }\n}\n\n// <spring:session:sessions:uuid, hash<session>> + 300s\n// <spring:session:sessions:expirations, sorted_set<uuid>>\n// <spring:session:sessions:expires:uuid, string<empty>>: for expire check & event\nexport class RedisIndexedSessionRepository implements SessionRepository<RedisSession> {\n  private readonly redis: Redis;\n  private readonly namespace: Namespace;\n  private readonly expirationStore: RedisSessionExpirationStore;\n\n  private defaultMaxInactiveInterval = 1800;\n\n  constructor(redis: Redis, namespace: Namespace = 'spring:session') {\n    this.redis = redis;\n    this.namespace = namespace;\n    this.expirationStore = new SortedSetRedisSessionExpirationStore(redis, namespace);\n  }\n\n  setDefaultMaxInactiveInterval(interval: number) {\n    this.defaultMaxInactiveInterval = interval;\n  }\n\n  private getSessionKey(sessionId: string) {\n    return `${this.namespace}:sessions:${sessionId}`;\n  }\n\n  private getExpiredKey(sessionId: string) {\n    return `${this.namespace}:sessions:expires:${sessionId}`;\n  }\n\n  private getSessionAttrNameKey(name: string) {\n    return ATTRIBUTE_PREFIX + name;\n  }\n\n  private getPrincipalKey(principalName: string) {\n    return `${this.namespace}:index:${PRINCIPAL_NAME_INDEX_NAME}:${principalName}`;\n  }\n\n  private async getSession(id: string, allowExpired: boolean): Promise<RedisSession | null> {\n    const key = this.getSessionKey(id);\n    const entries = await this.redis.hgetall(key);\n    if (Object.keys(entries).length === 0) return null;\n    const loaded = new MapSession(id);\n    if (!entries.creationTime) throw new Error('creationTime attribute not found');\n    if (!entries.lastAccessedTime) throw new Error('lastAccessedTime attribute not found');\n    if (!entries.maxInactiveInterval) throw new Error('maxInactiveInterval attribute not found');\n\n    loaded.setCreationTime(Number(entries.creationTime));\n    loaded.setLastAccessedTime(Number(entries.lastAccessedTime));\n    loaded.setMaxInactiveInterval(Number(entries.maxInactiveInterval));\n\n    for (const [key, value] of Object.entries(entries)) {\n      if (key.startsWith(ATTRIBUTE_PREFIX)) {\n        loaded.setAttribute(key.slice(ATTRIBUTE_PREFIX.length), value);\n      }\n    }\n\n    if (!allowExpired && loaded.isExpired()) return null;\n    const result = new RedisSession(loaded, false);\n    result.originalLastAccessTime = loaded.getLastAccessedTime();\n    return result;\n  }\n\n  private async saveDelta(session: RedisSession) {\n    if (session.delta.size === 0) return;\n    const sessionId = session.getId();\n    const delta = new Map<string, string | number>();\n    const removes: string[] = [];\n    session.delta.forEach((value, key) => {\n      if (value !== null) delta.set(key, value);\n      else removes.push(key);\n    });\n\n    if (delta.size !== 0) {\n      await this.redis.hset(this.getSessionKey(sessionId), delta);\n    }\n    if (removes.length !== 0) {\n      await this.redis.hdel(this.getSessionKey(sessionId), ...removes);\n    }\n\n    const principalSessionKey = this.getSessionAttrNameKey(PRINCIPAL_NAME_INDEX_NAME);\n    const securityPrincipalSessionKey = this.getSessionAttrNameKey(SPRING_SECURITY_CONTEXT);\n    if (session.delta.has(principalSessionKey) || session.delta.has(securityPrincipalSessionKey)) {\n      if (session.originalPrincipalName !== null) {\n        const originalPrincipalRedisKey = this.getPrincipalKey(session.originalPrincipalName);\n        await this.redis.srem(originalPrincipalRedisKey, sessionId);\n      }\n      const principal = resolveIndexesFor(session);\n      session.originalPrincipalName = principal;\n      if (principal !== null) {\n        const principalRedisKey = this.getPrincipalKey(principal);\n        await this.redis.sadd(principalRedisKey, sessionId);\n      }\n    }\n\n    if (session.isNew) {\n      // here your can send session created message to channel\n      session.isNew = false;\n    }\n\n    const sessionExpireInSeconds = session.getMaxInactiveInterval();\n\n    // createShadowKey start\n    const keyToExpire = SESSION_EXPIRES_PREFIX + session.getId();\n    const sessionKey = this.getSessionKey(keyToExpire);\n\n    if (sessionExpireInSeconds < 0) {\n      await this.redis.append(sessionKey, '');\n      await this.redis.persist(sessionKey);\n      await this.redis.persist(this.getSessionKey(session.getId()));\n    } else if (sessionExpireInSeconds === 0) {\n      await this.redis.del(sessionKey);\n    } else {\n      await this.redis.append(sessionKey, '');\n      await this.redis.expire(sessionKey, sessionExpireInSeconds);\n    }\n    // createShadowKey end\n\n    if (sessionExpireInSeconds > 0) {\n      const fiveMinutesAfterExpires = sessionExpireInSeconds + 5 * 60;\n      await this.redis.expire(this.getSessionKey(session.getId()), fiveMinutesAfterExpires);\n    }\n\n    await this.expirationStore.save(session);\n    session.delta.clear();\n  }\n\n  private async saveChangeSessionId(session: RedisSession) {\n    const sessionId = session.getId();\n    if (sessionId === session.originalSessionId) return;\n    if (!session.isNew) {\n      const originalSessionIdKey = this.getSessionKey(session.originalSessionId);\n      const sessionIdKey = this.getSessionKey(sessionId);\n      const originalExpiredKey = this.getExpiredKey(session.originalSessionId);\n      const expiredKey = this.getExpiredKey(sessionId);\n\n      await this.redis.rename(originalSessionIdKey, sessionIdKey);\n      await this.redis.rename(originalExpiredKey, expiredKey);\n\n      if (session.originalPrincipalName !== null) {\n        const originalPrincipalRedisKey = this.getPrincipalKey(session.originalPrincipalName);\n        await this.redis.srem(originalPrincipalRedisKey, session.originalSessionId);\n        await this.redis.sadd(originalPrincipalRedisKey, sessionId);\n      }\n      await this.expirationStore.rename(session);\n    }\n    session.originalSessionId = sessionId;\n  }\n\n  // override\n  createSession() {\n    const cached = new MapSession();\n    cached.setMaxInactiveInterval(this.defaultMaxInactiveInterval);\n    return new RedisSession(cached, true);\n  }\n\n  async save(session: RedisSession) {\n    await this.saveChangeSessionId(session);\n    await this.saveDelta(session);\n  }\n\n  async findById(sessionId: string): Promise<RedisSession | null> {\n    return this.getSession(sessionId, false);\n  }\n\n  async deleteById(sessionId: string) {\n    const session = await this.getSession(sessionId, true);\n    if (!session) return;\n    // 1. cleanup index\n    const principal = resolveIndexesFor(session);\n    if (principal !== null) {\n      await this.redis.srem(this.getPrincipalKey(principal), sessionId);\n    }\n    // 2. delete in set\n    await this.expirationStore.remove(sessionId);\n    // 3. delete expired key\n    const expiredKey = this.getExpiredKey(sessionId);\n    await this.redis.del(expiredKey);\n\n    session.setMaxInactiveInterval(0);\n    await this.save(session);\n  }\n\n  async findByIndexNameAndIndexValue(indexName: string, indexValue: string) {\n    if (indexName !== PRINCIPAL_NAME_INDEX_NAME) {\n      return new Map<string, RedisSession>();\n    }\n\n    const principalKey = this.getPrincipalKey(indexValue);\n    const sessionIds = await this.redis.smembers(principalKey);\n    if (sessionIds.length === 0) {\n      return new Map<string, RedisSession>();\n    }\n    const sessions = new Map<string, RedisSession>();\n    for (const sessionId of sessionIds) {\n      const session = await this.findById(sessionId);\n      if (session !== null) {\n        sessions.set(sessionId, session);\n      }\n    }\n    return sessions;\n  }\n\n  async findByPrincipalName(principalName: string) {\n    return this.findByIndexNameAndIndexValue(PRINCIPAL_NAME_INDEX_NAME, principalName);\n  }\n\n  async cleanupExpiredSessions(cleanupCount?: number) {\n    await this.expirationStore.cleanupExpiredSessions(cleanupCount);\n  }\n}\n\nconst INCREMENT_SCRIPT = `\nlocal count = redis.call('INCR', KEYS[1])\nif count == 1 then redis.call('EXPIRE', KEYS[1], ARGV[1]) end\nreturn count\n`;\n\nexport class RedisKVRepository implements KVRepository {\n  private readonly redis: Redis;\n\n  constructor(redis: Redis) {\n    this.redis = redis;\n  }\n\n  async setItem(key: string, value: string, expiresIn?: number) {\n    if (expiresIn) {\n      await this.redis.set(key, value, 'EX', expiresIn);\n    } else {\n      await this.redis.set(key, value);\n    }\n  }\n\n  async getItem(key: string): Promise<string | null> {\n    return this.redis.get(key);\n  }\n\n  async removeItem(key: string) {\n    await this.redis.del(key);\n  }\n\n  async increment(key: string, expiresIn: number): Promise<number> {\n    // INCR and the creating EXPIRE run as one script, so the key never exists without a TTL and\n    // an existing key keeps its expiry.\n    const count = await this.redis.eval(INCREMENT_SCRIPT, 1, key, expiresIn);\n    return Number(count);\n  }\n}\n"],"mappings":";;;;AAKA,MAAM,oBAAoB;AAC1B,MAAM,yBAAyB;AAC/B,MAAM,4BAA4B;AAClC,MAAM,mBAAmB;AACzB,MAAM,yBAAyB;AAE/B,IAAM,eAAN,MAAsC;CACpC;CAEA;CACA,wBAAe,IAAI,IAAoC;CACvD;CACA;CACA,yBAA+C;CAE/C,YAAY,QAAoB,OAAgB;EAC9C,KAAK,SAAS;EACd,KAAK,QAAQ;EACb,KAAK,oBAAoB,OAAO,MAAM;EACtC,KAAK,wBAAwBA,uBAAAA,kBAAkB,IAAI;EAEnD,IAAI,OAAO;GACT,KAAK,MAAM,IAAI,mBAAmB,OAAO,gBAAgB,CAAC;GAC1D,KAAK,MAAM,IAAI,wBAAwB,OAAO,oBAAoB,CAAC;GACnE,KAAK,MAAM,IAAI,2BAA2B,OAAO,uBAAuB,CAAC;GACzE,KAAK,OAAO,kBAAkB,CAAC,CAAC,SAAS,SAAS;IAChD,MAAM,QAAQ,KAAK,OAAO,aAAa,IAAI;IAC3C,IAAI,OAAO,KAAK,MAAM,IAAI,KAAK,sBAAsB,IAAI,GAAG,KAAK;GACnE,CAAC;EACH;CACF;CAEA,sBAAsB,MAAc;EAClC,OAAO,mBAAmB;CAC5B;CAGA,oBAAoB,kBAA0B;EAC5C,KAAK,OAAO,oBAAoB,gBAAgB;EAChD,KAAK,MAAM,IAAI,wBAAwB,gBAAgB;CACzD;CAEA,YAAY;EACV,OAAO,KAAK,OAAO,UAAU;CAC/B;CAEA,kBAAkB;EAChB,OAAO,KAAK,OAAO,gBAAgB;CACrC;CAEA,QAAQ;EACN,OAAO,KAAK,OAAO,MAAM;CAC3B;CAEA,kBAAkB;EAChB,OAAO,KAAK,OAAO,gBAAgB;CACrC;CAEA,sBAAsB;EACpB,OAAO,KAAK,OAAO,oBAAoB;CACzC;CAEA,uBAAuB,UAAkB;EACvC,KAAK,OAAO,uBAAuB,QAAQ;EAC3C,KAAK,MAAM,IAAI,2BAA2B,QAAQ;CACpD;CAEA,yBAAyB;EACvB,OAAO,KAAK,OAAO,uBAAuB;CAC5C;CAEA,aAAa,MAAc;EACzB,OAAO,KAAK,OAAO,aAAa,IAAI;CACtC;CAEA,oBAAoB;EAClB,OAAO,KAAK,OAAO,kBAAkB;CACvC;CAEA,aAAa,MAAc,OAAe;EACxC,KAAK,OAAO,aAAa,MAAM,KAAK;EACpC,KAAK,MAAM,IAAI,KAAK,sBAAsB,IAAI,GAAG,KAAK;CACxD;CAEA,gBAAgB,MAAc;EAC5B,KAAK,OAAO,gBAAgB,IAAI;EAChC,KAAK,MAAM,IAAI,KAAK,sBAAsB,IAAI,GAAG,IAAI;CACvD;AACF;AASA,IAAM,uCAAN,MAAkF;CAChF;CACA;CACA;CAEA,YAAY,OAAc,WAAsB;EAC9C,KAAK,QAAQ;EACb,KAAK,YAAY;EACjB,KAAK,iBAAiB,GAAG,KAAK,UAAU;CAC1C;CAEA,cAAc,WAAmB;EAC/B,OAAO,GAAG,KAAK,UAAU,YAAY;CACvC;CAEA,MAAM,KAAK,SAAuB;EAChC,MAAM,qBACJ,QAAQ,oBAAoB,IAAI,QAAQ,uBAAuB,IAAI;EACrE,MAAM,KAAK,MAAM,KAAK,KAAK,gBAAgB,oBAAoB,QAAQ,MAAM,CAAC;CAChF;CAEA,MAAM,OAAO,WAAmB;EAC9B,MAAM,KAAK,MAAM,KAAK,KAAK,gBAAgB,SAAS;CACtD;CAEA,MAAM,OAAO,SAAuB;EAClC,IAAI,QAAQ,sBAAsB,QAAQ,MAAM,GAAG;EACnD,MAAM,KAAK,OAAO,QAAQ,iBAAiB;EAC3C,MAAM,KAAK,KAAK,OAAO;CACzB;CAEA,MAAM,uBAAuB,eAAe,KAAK;EAC/C,MAAM,MAAM,KAAK;EACjB,MAAM,QAAQ,KAAK,IAAI;EACvB,MAAM,aAAa,MAAM,KAAK,MAAM,iBAAiB,KAAK,OAAO,GAAG,SAAS,GAAG,YAAY;EAC5F,IAAI,WAAW,WAAW,GAAG;EAC7B,KAAK,MAAM,aAAa,YAAY;GAClC,MAAM,aAAa,KAAK,cAAc,SAAS;GAG/C,MAAM,KAAK,MAAM,OAAO,UAAU;EACpC;CACF;AACF;AAKA,IAAa,gCAAb,MAAsF;CACpF;CACA;CACA;CAEA,6BAAqC;CAErC,YAAY,OAAc,YAAuB,kBAAkB;EACjE,KAAK,QAAQ;EACb,KAAK,YAAY;EACjB,KAAK,kBAAkB,IAAI,qCAAqC,OAAO,SAAS;CAClF;CAEA,8BAA8B,UAAkB;EAC9C,KAAK,6BAA6B;CACpC;CAEA,cAAsB,WAAmB;EACvC,OAAO,GAAG,KAAK,UAAU,YAAY;CACvC;CAEA,cAAsB,WAAmB;EACvC,OAAO,GAAG,KAAK,UAAU,oBAAoB;CAC/C;CAEA,sBAA8B,MAAc;EAC1C,OAAO,mBAAmB;CAC5B;CAEA,gBAAwB,eAAuB;EAC7C,OAAO,GAAG,KAAK,UAAU,SAASC,uBAAAA,0BAA0B,GAAG;CACjE;CAEA,MAAc,WAAW,IAAY,cAAqD;EACxF,MAAM,MAAM,KAAK,cAAc,EAAE;EACjC,MAAM,UAAU,MAAM,KAAK,MAAM,QAAQ,GAAG;EAC5C,IAAI,OAAO,KAAK,OAAO,CAAC,CAAC,WAAW,GAAG,OAAO;EAC9C,MAAM,SAAS,IAAIC,4BAAAA,WAAW,EAAE;EAChC,IAAI,CAAC,QAAQ,cAAc,MAAM,IAAI,MAAM,kCAAkC;EAC7E,IAAI,CAAC,QAAQ,kBAAkB,MAAM,IAAI,MAAM,sCAAsC;EACrF,IAAI,CAAC,QAAQ,qBAAqB,MAAM,IAAI,MAAM,yCAAyC;EAE3F,OAAO,gBAAgB,OAAO,QAAQ,YAAY,CAAC;EACnD,OAAO,oBAAoB,OAAO,QAAQ,gBAAgB,CAAC;EAC3D,OAAO,uBAAuB,OAAO,QAAQ,mBAAmB,CAAC;EAEjE,KAAK,MAAM,CAAC,KAAK,UAAU,OAAO,QAAQ,OAAO,GAC/C,IAAI,IAAI,WAAW,gBAAgB,GACjC,OAAO,aAAa,IAAI,MAAM,EAAuB,GAAG,KAAK;EAIjE,IAAI,CAAC,gBAAgB,OAAO,UAAU,GAAG,OAAO;EAChD,MAAM,SAAS,IAAI,aAAa,QAAQ,KAAK;EAC7C,OAAO,yBAAyB,OAAO,oBAAoB;EAC3D,OAAO;CACT;CAEA,MAAc,UAAU,SAAuB;EAC7C,IAAI,QAAQ,MAAM,SAAS,GAAG;EAC9B,MAAM,YAAY,QAAQ,MAAM;EAChC,MAAM,wBAAQ,IAAI,IAA6B;EAC/C,MAAM,UAAoB,CAAC;EAC3B,QAAQ,MAAM,SAAS,OAAO,QAAQ;GACpC,IAAI,UAAU,MAAM,MAAM,IAAI,KAAK,KAAK;QACnC,QAAQ,KAAK,GAAG;EACvB,CAAC;EAED,IAAI,MAAM,SAAS,GACjB,MAAM,KAAK,MAAM,KAAK,KAAK,cAAc,SAAS,GAAG,KAAK;EAE5D,IAAI,QAAQ,WAAW,GACrB,MAAM,KAAK,MAAM,KAAK,KAAK,cAAc,SAAS,GAAG,GAAG,OAAO;EAGjE,MAAM,sBAAsB,KAAK,sBAAsBD,uBAAAA,yBAAyB;EAChF,MAAM,8BAA8B,KAAK,sBAAsBE,uBAAAA,uBAAuB;EACtF,IAAI,QAAQ,MAAM,IAAI,mBAAmB,KAAK,QAAQ,MAAM,IAAI,2BAA2B,GAAG;GAC5F,IAAI,QAAQ,0BAA0B,MAAM;IAC1C,MAAM,4BAA4B,KAAK,gBAAgB,QAAQ,qBAAqB;IACpF,MAAM,KAAK,MAAM,KAAK,2BAA2B,SAAS;GAC5D;GACA,MAAM,YAAYH,uBAAAA,kBAAkB,OAAO;GAC3C,QAAQ,wBAAwB;GAChC,IAAI,cAAc,MAAM;IACtB,MAAM,oBAAoB,KAAK,gBAAgB,SAAS;IACxD,MAAM,KAAK,MAAM,KAAK,mBAAmB,SAAS;GACpD;EACF;EAEA,IAAI,QAAQ,OAEV,QAAQ,QAAQ;EAGlB,MAAM,yBAAyB,QAAQ,uBAAuB;EAG9D,MAAM,cAAc,yBAAyB,QAAQ,MAAM;EAC3D,MAAM,aAAa,KAAK,cAAc,WAAW;EAEjD,IAAI,yBAAyB,GAAG;GAC9B,MAAM,KAAK,MAAM,OAAO,YAAY,EAAE;GACtC,MAAM,KAAK,MAAM,QAAQ,UAAU;GACnC,MAAM,KAAK,MAAM,QAAQ,KAAK,cAAc,QAAQ,MAAM,CAAC,CAAC;EAC9D,OAAO,IAAI,2BAA2B,GACpC,MAAM,KAAK,MAAM,IAAI,UAAU;OAC1B;GACL,MAAM,KAAK,MAAM,OAAO,YAAY,EAAE;GACtC,MAAM,KAAK,MAAM,OAAO,YAAY,sBAAsB;EAC5D;EAGA,IAAI,yBAAyB,GAAG;GAC9B,MAAM,0BAA0B,yBAAyB;GACzD,MAAM,KAAK,MAAM,OAAO,KAAK,cAAc,QAAQ,MAAM,CAAC,GAAG,uBAAuB;EACtF;EAEA,MAAM,KAAK,gBAAgB,KAAK,OAAO;EACvC,QAAQ,MAAM,MAAM;CACtB;CAEA,MAAc,oBAAoB,SAAuB;EACvD,MAAM,YAAY,QAAQ,MAAM;EAChC,IAAI,cAAc,QAAQ,mBAAmB;EAC7C,IAAI,CAAC,QAAQ,OAAO;GAClB,MAAM,uBAAuB,KAAK,cAAc,QAAQ,iBAAiB;GACzE,MAAM,eAAe,KAAK,cAAc,SAAS;GACjD,MAAM,qBAAqB,KAAK,cAAc,QAAQ,iBAAiB;GACvE,MAAM,aAAa,KAAK,cAAc,SAAS;GAE/C,MAAM,KAAK,MAAM,OAAO,sBAAsB,YAAY;GAC1D,MAAM,KAAK,MAAM,OAAO,oBAAoB,UAAU;GAEtD,IAAI,QAAQ,0BAA0B,MAAM;IAC1C,MAAM,4BAA4B,KAAK,gBAAgB,QAAQ,qBAAqB;IACpF,MAAM,KAAK,MAAM,KAAK,2BAA2B,QAAQ,iBAAiB;IAC1E,MAAM,KAAK,MAAM,KAAK,2BAA2B,SAAS;GAC5D;GACA,MAAM,KAAK,gBAAgB,OAAO,OAAO;EAC3C;EACA,QAAQ,oBAAoB;CAC9B;CAGA,gBAAgB;EACd,MAAM,SAAS,IAAIE,4BAAAA,WAAW;EAC9B,OAAO,uBAAuB,KAAK,0BAA0B;EAC7D,OAAO,IAAI,aAAa,QAAQ,IAAI;CACtC;CAEA,MAAM,KAAK,SAAuB;EAChC,MAAM,KAAK,oBAAoB,OAAO;EACtC,MAAM,KAAK,UAAU,OAAO;CAC9B;CAEA,MAAM,SAAS,WAAiD;EAC9D,OAAO,KAAK,WAAW,WAAW,KAAK;CACzC;CAEA,MAAM,WAAW,WAAmB;EAClC,MAAM,UAAU,MAAM,KAAK,WAAW,WAAW,IAAI;EACrD,IAAI,CAAC,SAAS;EAEd,MAAM,YAAYF,uBAAAA,kBAAkB,OAAO;EAC3C,IAAI,cAAc,MAChB,MAAM,KAAK,MAAM,KAAK,KAAK,gBAAgB,SAAS,GAAG,SAAS;EAGlE,MAAM,KAAK,gBAAgB,OAAO,SAAS;EAE3C,MAAM,aAAa,KAAK,cAAc,SAAS;EAC/C,MAAM,KAAK,MAAM,IAAI,UAAU;EAE/B,QAAQ,uBAAuB,CAAC;EAChC,MAAM,KAAK,KAAK,OAAO;CACzB;CAEA,MAAM,6BAA6B,WAAmB,YAAoB;EACxE,IAAI,cAAA,0FACF,uBAAO,IAAI,IAA0B;EAGvC,MAAM,eAAe,KAAK,gBAAgB,UAAU;EACpD,MAAM,aAAa,MAAM,KAAK,MAAM,SAAS,YAAY;EACzD,IAAI,WAAW,WAAW,GACxB,uBAAO,IAAI,IAA0B;EAEvC,MAAM,2BAAW,IAAI,IAA0B;EAC/C,KAAK,MAAM,aAAa,YAAY;GAClC,MAAM,UAAU,MAAM,KAAK,SAAS,SAAS;GAC7C,IAAI,YAAY,MACd,SAAS,IAAI,WAAW,OAAO;EAEnC;EACA,OAAO;CACT;CAEA,MAAM,oBAAoB,eAAuB;EAC/C,OAAO,KAAK,6BAA6BC,uBAAAA,2BAA2B,aAAa;CACnF;CAEA,MAAM,uBAAuB,cAAuB;EAClD,MAAM,KAAK,gBAAgB,uBAAuB,YAAY;CAChE;AACF;AAEA,MAAM,mBAAmB;;;;;AAMzB,IAAa,oBAAb,MAAuD;CACrD;CAEA,YAAY,OAAc;EACxB,KAAK,QAAQ;CACf;CAEA,MAAM,QAAQ,KAAa,OAAe,WAAoB;EAC5D,IAAI,WACF,MAAM,KAAK,MAAM,IAAI,KAAK,OAAO,MAAM,SAAS;OAEhD,MAAM,KAAK,MAAM,IAAI,KAAK,KAAK;CAEnC;CAEA,MAAM,QAAQ,KAAqC;EACjD,OAAO,KAAK,MAAM,IAAI,GAAG;CAC3B;CAEA,MAAM,WAAW,KAAa;EAC5B,MAAM,KAAK,MAAM,IAAI,GAAG;CAC1B;CAEA,MAAM,UAAU,KAAa,WAAoC;EAG/D,MAAM,QAAQ,MAAM,KAAK,MAAM,KAAK,kBAAkB,GAAG,KAAK,SAAS;EACvE,OAAO,OAAO,KAAK;CACrB;AACF"}
+{"version":3,"file":"redis.cjs","names":["principalNameOf","PRINCIPAL_NAME_INDEX_NAME","MapSession"],"sources":["../../src/session/redis.ts"],"sourcesContent":["import type { Redis } from 'ioredis';\nimport { PRINCIPAL_NAME_INDEX_NAME, principalNameOf } from './common';\nimport { MapSession } from './map-session';\nimport type { KVRepository, Namespace, Session, SessionRepository } from './types';\n\nconst CREATION_TIME_KEY = 'creationTime';\nconst LAST_ACCESSED_TIME_KEY = 'lastAccessedTime';\nconst MAX_INACTIVE_INTERVAL_KEY = 'maxInactiveInterval';\nconst ATTRIBUTE_PREFIX = 'sessionAttr:';\nconst SESSION_EXPIRES_PREFIX = 'expires:';\n\nclass RedisSession implements Session {\n  private readonly cached: MapSession;\n\n  public isNew: boolean;\n  public delta = new Map<string, string | number | null>();\n  public originalSessionId: string;\n  public originalPrincipalName: string | null;\n  public originalLastAccessTime: number | null = null;\n\n  constructor(cached: MapSession, isNew: boolean) {\n    this.cached = cached;\n    this.isNew = isNew;\n    this.originalSessionId = cached.getId();\n    this.originalPrincipalName = principalNameOf(this);\n\n    if (isNew) {\n      this.delta.set(CREATION_TIME_KEY, cached.getCreationTime());\n      this.delta.set(LAST_ACCESSED_TIME_KEY, cached.getLastAccessedTime());\n      this.delta.set(MAX_INACTIVE_INTERVAL_KEY, cached.getMaxInactiveInterval());\n      this.cached.getAttributeNames().forEach((name) => {\n        const value = this.cached.getAttribute(name);\n        if (value) this.delta.set(this.getSessionAttrNameKey(name), value);\n      });\n    }\n  }\n\n  getSessionAttrNameKey(name: string) {\n    return ATTRIBUTE_PREFIX + name;\n  }\n\n  // override\n  setLastAccessedTime(lastAccessedTime: number) {\n    this.cached.setLastAccessedTime(lastAccessedTime);\n    this.delta.set(LAST_ACCESSED_TIME_KEY, lastAccessedTime);\n  }\n\n  isExpired() {\n    return this.cached.isExpired();\n  }\n\n  getCreationTime() {\n    return this.cached.getCreationTime();\n  }\n\n  getId() {\n    return this.cached.getId();\n  }\n\n  changeSessionId() {\n    return this.cached.changeSessionId();\n  }\n\n  getLastAccessedTime() {\n    return this.cached.getLastAccessedTime();\n  }\n\n  setMaxInactiveInterval(interval: number) {\n    this.cached.setMaxInactiveInterval(interval);\n    this.delta.set(MAX_INACTIVE_INTERVAL_KEY, interval);\n  }\n\n  getMaxInactiveInterval() {\n    return this.cached.getMaxInactiveInterval();\n  }\n\n  getAttribute(name: string) {\n    return this.cached.getAttribute(name);\n  }\n\n  getAttributeNames() {\n    return this.cached.getAttributeNames();\n  }\n\n  setAttribute(name: string, value: string) {\n    this.cached.setAttribute(name, value);\n    this.delta.set(this.getSessionAttrNameKey(name), value);\n  }\n\n  removeAttribute(name: string) {\n    this.cached.removeAttribute(name);\n    this.delta.set(this.getSessionAttrNameKey(name), null);\n  }\n}\n\ninterface RedisSessionExpirationStore {\n  save(session: RedisSession): Promise<void>;\n  remove(sessionId: string): Promise<void>;\n  rename(session: RedisSession): Promise<void>;\n  cleanupExpiredSessions(cleanupCount?: number): Promise<void>;\n}\n\nclass SortedSetRedisSessionExpirationStore implements RedisSessionExpirationStore {\n  private readonly redis: Redis;\n  private readonly namespace: Namespace;\n  private readonly expirationsKey: string;\n\n  constructor(redis: Redis, namespace: Namespace) {\n    this.redis = redis;\n    this.namespace = namespace;\n    this.expirationsKey = `${this.namespace}:sessions:expirations`;\n  }\n\n  getSessionKey(sessionId: string) {\n    return `${this.namespace}:sessions:${sessionId}`;\n  }\n\n  async save(session: RedisSession) {\n    const expirationInMillis =\n      session.getLastAccessedTime() + session.getMaxInactiveInterval() * 1000;\n    await this.redis.zadd(this.expirationsKey, expirationInMillis, session.getId());\n  }\n\n  async remove(sessionId: string) {\n    await this.redis.zrem(this.expirationsKey, sessionId);\n  }\n\n  async rename(session: RedisSession) {\n    if (session.originalSessionId === session.getId()) return;\n    await this.remove(session.originalSessionId);\n    await this.save(session);\n  }\n\n  async cleanupExpiredSessions(cleanupCount = 100) {\n    const key = this.expirationsKey;\n    const score = Date.now();\n    const sessionIds = await this.redis.zrevrangebyscore(key, score, 0, 'LIMIT', 0, cleanupCount);\n    if (sessionIds.length === 0) return;\n    for (const sessionId of sessionIds) {\n      const sessionKey = this.getSessionKey(sessionId);\n      // Checks if the session exists. By trying to access the session we only trigger a deletion\n      // if the TTL is expired.\n      await this.redis.exists(sessionKey);\n    }\n  }\n}\n\n// <namespace>:sessions:<id>               hash: the session's fields and `sessionAttr:*` attributes\n// <namespace>:sessions:expirations        sorted set of ids by expiry, for cleanup\n// <namespace>:sessions:expires:<id>       empty string with the session's TTL, for the expiry check\n// <namespace>:index:principalName:<name>  set of the principal's session ids\nexport class RedisIndexedSessionRepository implements SessionRepository<RedisSession> {\n  private readonly redis: Redis;\n  private readonly namespace: Namespace;\n  private readonly expirationStore: RedisSessionExpirationStore;\n\n  private defaultMaxInactiveInterval = 1800;\n\n  constructor(redis: Redis, namespace: Namespace = 'app:session') {\n    this.redis = redis;\n    this.namespace = namespace;\n    this.expirationStore = new SortedSetRedisSessionExpirationStore(redis, namespace);\n  }\n\n  setDefaultMaxInactiveInterval(interval: number) {\n    this.defaultMaxInactiveInterval = interval;\n  }\n\n  private getSessionKey(sessionId: string) {\n    return `${this.namespace}:sessions:${sessionId}`;\n  }\n\n  private getExpiredKey(sessionId: string) {\n    return `${this.namespace}:sessions:expires:${sessionId}`;\n  }\n\n  private getSessionAttrNameKey(name: string) {\n    return ATTRIBUTE_PREFIX + name;\n  }\n\n  private getPrincipalKey(principalName: string) {\n    return `${this.namespace}:index:${PRINCIPAL_NAME_INDEX_NAME}:${principalName}`;\n  }\n\n  private async getSession(id: string, allowExpired: boolean): Promise<RedisSession | null> {\n    const key = this.getSessionKey(id);\n    const entries = await this.redis.hgetall(key);\n    if (Object.keys(entries).length === 0) return null;\n    const loaded = new MapSession(id);\n    if (!entries.creationTime) throw new Error('creationTime attribute not found');\n    if (!entries.lastAccessedTime) throw new Error('lastAccessedTime attribute not found');\n    if (!entries.maxInactiveInterval) throw new Error('maxInactiveInterval attribute not found');\n\n    loaded.setCreationTime(Number(entries.creationTime));\n    loaded.setLastAccessedTime(Number(entries.lastAccessedTime));\n    loaded.setMaxInactiveInterval(Number(entries.maxInactiveInterval));\n\n    for (const [key, value] of Object.entries(entries)) {\n      if (key.startsWith(ATTRIBUTE_PREFIX)) {\n        loaded.setAttribute(key.slice(ATTRIBUTE_PREFIX.length), value);\n      }\n    }\n\n    if (!allowExpired && loaded.isExpired()) return null;\n    const result = new RedisSession(loaded, false);\n    result.originalLastAccessTime = loaded.getLastAccessedTime();\n    return result;\n  }\n\n  private async saveDelta(session: RedisSession) {\n    if (session.delta.size === 0) return;\n    const sessionId = session.getId();\n    const delta = new Map<string, string | number>();\n    const removes: string[] = [];\n    session.delta.forEach((value, key) => {\n      if (value !== null) delta.set(key, value);\n      else removes.push(key);\n    });\n\n    if (delta.size !== 0) {\n      await this.redis.hset(this.getSessionKey(sessionId), delta);\n    }\n    if (removes.length !== 0) {\n      await this.redis.hdel(this.getSessionKey(sessionId), ...removes);\n    }\n\n    if (session.delta.has(this.getSessionAttrNameKey(PRINCIPAL_NAME_INDEX_NAME))) {\n      if (session.originalPrincipalName !== null) {\n        const originalPrincipalRedisKey = this.getPrincipalKey(session.originalPrincipalName);\n        await this.redis.srem(originalPrincipalRedisKey, sessionId);\n      }\n      const principal = principalNameOf(session);\n      session.originalPrincipalName = principal;\n      if (principal !== null) {\n        const principalRedisKey = this.getPrincipalKey(principal);\n        await this.redis.sadd(principalRedisKey, sessionId);\n      }\n    }\n\n    if (session.isNew) {\n      // here your can send session created message to channel\n      session.isNew = false;\n    }\n\n    const sessionExpireInSeconds = session.getMaxInactiveInterval();\n\n    // createShadowKey start\n    const keyToExpire = SESSION_EXPIRES_PREFIX + session.getId();\n    const sessionKey = this.getSessionKey(keyToExpire);\n\n    if (sessionExpireInSeconds < 0) {\n      await this.redis.append(sessionKey, '');\n      await this.redis.persist(sessionKey);\n      await this.redis.persist(this.getSessionKey(session.getId()));\n    } else if (sessionExpireInSeconds === 0) {\n      await this.redis.del(sessionKey);\n    } else {\n      await this.redis.append(sessionKey, '');\n      await this.redis.expire(sessionKey, sessionExpireInSeconds);\n    }\n    // createShadowKey end\n\n    if (sessionExpireInSeconds > 0) {\n      const fiveMinutesAfterExpires = sessionExpireInSeconds + 5 * 60;\n      await this.redis.expire(this.getSessionKey(session.getId()), fiveMinutesAfterExpires);\n    }\n\n    await this.expirationStore.save(session);\n    session.delta.clear();\n  }\n\n  private async saveChangeSessionId(session: RedisSession) {\n    const sessionId = session.getId();\n    if (sessionId === session.originalSessionId) return;\n    if (!session.isNew) {\n      const originalSessionIdKey = this.getSessionKey(session.originalSessionId);\n      const sessionIdKey = this.getSessionKey(sessionId);\n      const originalExpiredKey = this.getExpiredKey(session.originalSessionId);\n      const expiredKey = this.getExpiredKey(sessionId);\n\n      await this.redis.rename(originalSessionIdKey, sessionIdKey);\n      await this.redis.rename(originalExpiredKey, expiredKey);\n\n      if (session.originalPrincipalName !== null) {\n        const originalPrincipalRedisKey = this.getPrincipalKey(session.originalPrincipalName);\n        await this.redis.srem(originalPrincipalRedisKey, session.originalSessionId);\n        await this.redis.sadd(originalPrincipalRedisKey, sessionId);\n      }\n      await this.expirationStore.rename(session);\n    }\n    session.originalSessionId = sessionId;\n  }\n\n  // override\n  createSession() {\n    const cached = new MapSession();\n    cached.setMaxInactiveInterval(this.defaultMaxInactiveInterval);\n    return new RedisSession(cached, true);\n  }\n\n  async save(session: RedisSession) {\n    await this.saveChangeSessionId(session);\n    await this.saveDelta(session);\n  }\n\n  async findById(sessionId: string): Promise<RedisSession | null> {\n    return this.getSession(sessionId, false);\n  }\n\n  async deleteById(sessionId: string) {\n    const session = await this.getSession(sessionId, true);\n    if (!session) return;\n    // 1. cleanup index\n    const principal = principalNameOf(session);\n    if (principal !== null) {\n      await this.redis.srem(this.getPrincipalKey(principal), sessionId);\n    }\n    // 2. delete in set\n    await this.expirationStore.remove(sessionId);\n    // 3. delete expired key\n    const expiredKey = this.getExpiredKey(sessionId);\n    await this.redis.del(expiredKey);\n\n    session.setMaxInactiveInterval(0);\n    await this.save(session);\n  }\n\n  async findByIndexNameAndIndexValue(indexName: string, indexValue: string) {\n    if (indexName !== PRINCIPAL_NAME_INDEX_NAME) {\n      return new Map<string, RedisSession>();\n    }\n\n    const principalKey = this.getPrincipalKey(indexValue);\n    const sessionIds = await this.redis.smembers(principalKey);\n    if (sessionIds.length === 0) {\n      return new Map<string, RedisSession>();\n    }\n    const sessions = new Map<string, RedisSession>();\n    for (const sessionId of sessionIds) {\n      const session = await this.findById(sessionId);\n      if (session !== null) {\n        sessions.set(sessionId, session);\n      }\n    }\n    return sessions;\n  }\n\n  async findByPrincipalName(principalName: string) {\n    return this.findByIndexNameAndIndexValue(PRINCIPAL_NAME_INDEX_NAME, principalName);\n  }\n\n  async cleanupExpiredSessions(cleanupCount?: number) {\n    await this.expirationStore.cleanupExpiredSessions(cleanupCount);\n  }\n}\n\nconst INCREMENT_SCRIPT = `\nlocal count = redis.call('INCR', KEYS[1])\nif count == 1 then redis.call('EXPIRE', KEYS[1], ARGV[1]) end\nreturn count\n`;\n\nexport class RedisKVRepository implements KVRepository {\n  private readonly redis: Redis;\n\n  constructor(redis: Redis) {\n    this.redis = redis;\n  }\n\n  async setItem(key: string, value: string, expiresIn?: number) {\n    if (expiresIn) {\n      await this.redis.set(key, value, 'EX', expiresIn);\n    } else {\n      await this.redis.set(key, value);\n    }\n  }\n\n  async getItem(key: string): Promise<string | null> {\n    return this.redis.get(key);\n  }\n\n  async removeItem(key: string) {\n    await this.redis.del(key);\n  }\n\n  async increment(key: string, expiresIn: number): Promise<number> {\n    // INCR and the creating EXPIRE run as one script, so the key never exists without a TTL and\n    // an existing key keeps its expiry.\n    const count = await this.redis.eval(INCREMENT_SCRIPT, 1, key, expiresIn);\n    return Number(count);\n  }\n}\n"],"mappings":"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"}

package/dist/session/redis.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"redis.d.cts","names":[],"sources":["../../src/session/redis.ts"],"mappings":";;;cAWM,wBAAwB;mBACX;EAEV;EACA,OAAK;EACL;EACA;EACA;EAEP,YAAY,QAAQ,YAAY;EAiBhC,sBAAsB;EAKtB,oBAAoB;EAKpB;EAIA;EAIA;EAIA;EAIA;EAIA,uBAAuB;EAKvB;EAIA,aAAa;EAIb;EAIA,aAAa,cAAc;EAK3B,gBAAgB;;qBA6DL,yCAAyC,kBAAkB;mBACrD;mBACA;mBACA;UAET;EAER,YAAY,OAAO,OAAO,YAAW;EAMrC,8BAA8B;UAItB;UAIA;UAIA;UAIA;UAIM;UAyBA;UAgEA;EAuBd,iBAAa;EAMP,KAAK,SAAS,eAAY;EAK1B,SAAS,oBAAoB,QAAQ;EAIrC,WAAW,oBAAiB;EAkB5B,6BAA6B,mBAAmB,qBAAkB,QAAA,YAAA;EAoBlE,oBAAoB,wBAAqB,QAAA,YAAA;EAIzC,uBAAuB,wBAAqB;;qBAWvC,6BAA6B;mBACvB;EAEjB,YAAY,OAAO;EAIb,QAAQ,aAAa,eAAe,qBAAkB;EAQtD,QAAQ,cAAc;EAItB,WAAW,cAAW;EAItB,UAAU,aAAa,oBAAoB"}
+{"version":3,"file":"redis.d.cts","names":[],"sources":["../../src/session/redis.ts"],"mappings":";;;cAWM,wBAAwB;mBACX;EAEV;EACA,OAAK;EACL;EACA;EACA;EAEP,YAAY,QAAQ,YAAY;EAiBhC,sBAAsB;EAKtB,oBAAoB;EAKpB;EAIA;EAIA;EAIA;EAIA;EAIA,uBAAuB;EAKvB;EAIA,aAAa;EAIb;EAIA,aAAa,cAAc;EAK3B,gBAAgB;;qBA8DL,yCAAyC,kBAAkB;mBACrD;mBACA;mBACA;UAET;EAER,YAAY,OAAO,OAAO,YAAW;EAMrC,8BAA8B;UAItB;UAIA;UAIA;UAIA;UAIM;UAyBA;UA8DA;EAuBd,iBAAa;EAMP,KAAK,SAAS,eAAY;EAK1B,SAAS,oBAAoB,QAAQ;EAIrC,WAAW,oBAAiB;EAkB5B,6BAA6B,mBAAmB,qBAAkB,QAAA,YAAA;EAoBlE,oBAAoB,wBAAqB,QAAA,YAAA;EAIzC,uBAAuB,wBAAqB;;qBAWvC,6BAA6B;mBACvB;EAEjB,YAAY,OAAO;EAIb,QAAQ,aAAa,eAAe,qBAAkB;EAQtD,QAAQ,cAAc;EAItB,WAAW,cAAW;EAItB,UAAU,aAAa,oBAAoB"}

package/dist/session/redis.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"redis.d.mts","names":[],"sources":["../../src/session/redis.ts"],"mappings":";;;cAWM,wBAAwB;mBACX;EAEV;EACA,OAAK;EACL;EACA;EACA;EAEP,YAAY,QAAQ,YAAY;EAiBhC,sBAAsB;EAKtB,oBAAoB;EAKpB;EAIA;EAIA;EAIA;EAIA;EAIA,uBAAuB;EAKvB;EAIA,aAAa;EAIb;EAIA,aAAa,cAAc;EAK3B,gBAAgB;;qBA6DL,yCAAyC,kBAAkB;mBACrD;mBACA;mBACA;UAET;EAER,YAAY,OAAO,OAAO,YAAW;EAMrC,8BAA8B;UAItB;UAIA;UAIA;UAIA;UAIM;UAyBA;UAgEA;EAuBd,iBAAa;EAMP,KAAK,SAAS,eAAY;EAK1B,SAAS,oBAAoB,QAAQ;EAIrC,WAAW,oBAAiB;EAkB5B,6BAA6B,mBAAmB,qBAAkB,QAAA,YAAA;EAoBlE,oBAAoB,wBAAqB,QAAA,YAAA;EAIzC,uBAAuB,wBAAqB;;qBAWvC,6BAA6B;mBACvB;EAEjB,YAAY,OAAO;EAIb,QAAQ,aAAa,eAAe,qBAAkB;EAQtD,QAAQ,cAAc;EAItB,WAAW,cAAW;EAItB,UAAU,aAAa,oBAAoB"}
+{"version":3,"file":"redis.d.mts","names":[],"sources":["../../src/session/redis.ts"],"mappings":";;;cAWM,wBAAwB;mBACX;EAEV;EACA,OAAK;EACL;EACA;EACA;EAEP,YAAY,QAAQ,YAAY;EAiBhC,sBAAsB;EAKtB,oBAAoB;EAKpB;EAIA;EAIA;EAIA;EAIA;EAIA,uBAAuB;EAKvB;EAIA,aAAa;EAIb;EAIA,aAAa,cAAc;EAK3B,gBAAgB;;qBA8DL,yCAAyC,kBAAkB;mBACrD;mBACA;mBACA;UAET;EAER,YAAY,OAAO,OAAO,YAAW;EAMrC,8BAA8B;UAItB;UAIA;UAIA;UAIA;UAIM;UAyBA;UA8DA;EAuBd,iBAAa;EAMP,KAAK,SAAS,eAAY;EAK1B,SAAS,oBAAoB,QAAQ;EAIrC,WAAW,oBAAiB;EAkB5B,6BAA6B,mBAAmB,qBAAkB,QAAA,YAAA;EAoBlE,oBAAoB,wBAAqB,QAAA,YAAA;EAIzC,uBAAuB,wBAAqB;;qBAWvC,6BAA6B;mBACvB;EAEjB,YAAY,OAAO;EAIb,QAAQ,aAAa,eAAe,qBAAkB;EAQtD,QAAQ,cAAc;EAItB,WAAW,cAAW;EAItB,UAAU,aAAa,oBAAoB"}

package/dist/session/redis.mjs

@@ -1,4 +1,4 @@
-import { PRINCIPAL_NAME_INDEX_NAME, SPRING_SECURITY_CONTEXT, resolveIndexesFor } from "./common.mjs";
+import { PRINCIPAL_NAME_INDEX_NAME, principalNameOf } from "./common.mjs";
 import { MapSession } from "./map-session.mjs";
 // src/session/redis.ts
 const CREATION_TIME_KEY = "creationTime";
@@ -17,7 +17,7 @@ var RedisSession = class {
 		this.cached = cached;
 		this.isNew = isNew;
 		this.originalSessionId = cached.getId();
-		this.originalPrincipalName = resolveIndexesFor(this);
+		this.originalPrincipalName = principalNameOf(this);
 		if (isNew) {
 			this.delta.set(CREATION_TIME_KEY, cached.getCreationTime());
 			this.delta.set(LAST_ACCESSED_TIME_KEY, cached.getLastAccessedTime());
@@ -112,7 +112,7 @@ var RedisIndexedSessionRepository = class {
 	namespace;
 	expirationStore;
 	defaultMaxInactiveInterval = 1800;
-	constructor(redis, namespace = "spring:session") {
+	constructor(redis, namespace = "app:session") {
 		this.redis = redis;
 		this.namespace = namespace;
 		this.expirationStore = new SortedSetRedisSessionExpirationStore(redis, namespace);
@@ -160,14 +160,12 @@ var RedisIndexedSessionRepository = class {
 		});
 		if (delta.size !== 0) await this.redis.hset(this.getSessionKey(sessionId), delta);
 		if (removes.length !== 0) await this.redis.hdel(this.getSessionKey(sessionId), ...removes);
-		const principalSessionKey = this.getSessionAttrNameKey(PRINCIPAL_NAME_INDEX_NAME);
-		const securityPrincipalSessionKey = this.getSessionAttrNameKey(SPRING_SECURITY_CONTEXT);
-		if (session.delta.has(principalSessionKey) || session.delta.has(securityPrincipalSessionKey)) {
+		if (session.delta.has(this.getSessionAttrNameKey("principalName"))) {
 			if (session.originalPrincipalName !== null) {
 				const originalPrincipalRedisKey = this.getPrincipalKey(session.originalPrincipalName);
 				await this.redis.srem(originalPrincipalRedisKey, sessionId);
 			}
-			const principal = resolveIndexesFor(session);
+			const principal = principalNameOf(session);
 			session.originalPrincipalName = principal;
 			if (principal !== null) {
 				const principalRedisKey = this.getPrincipalKey(principal);
@@ -228,7 +226,7 @@ var RedisIndexedSessionRepository = class {
 	async deleteById(sessionId) {
 		const session = await this.getSession(sessionId, true);
 		if (!session) return;
-		const principal = resolveIndexesFor(session);
+		const principal = principalNameOf(session);
 		if (principal !== null) await this.redis.srem(this.getPrincipalKey(principal), sessionId);
 		await this.expirationStore.remove(sessionId);
 		const expiredKey = this.getExpiredKey(sessionId);
@@ -237,7 +235,7 @@ var RedisIndexedSessionRepository = class {
 		await this.save(session);
 	}
 	async findByIndexNameAndIndexValue(indexName, indexValue) {
-		if (indexName !== "org.springframework.session.FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME") return /* @__PURE__ */ new Map();
+		if (indexName !== "principalName") return /* @__PURE__ */ new Map();
 		const principalKey = this.getPrincipalKey(indexValue);
 		const sessionIds = await this.redis.smembers(principalKey);
 		if (sessionIds.length === 0) return /* @__PURE__ */ new Map();

package/dist/session/redis.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"redis.mjs","names":[],"sources":["../../src/session/redis.ts"],"sourcesContent":["import type { Redis } from 'ioredis';\nimport { PRINCIPAL_NAME_INDEX_NAME, SPRING_SECURITY_CONTEXT, resolveIndexesFor } from './common';\nimport { MapSession } from './map-session';\nimport type { KVRepository, Namespace, Session, SessionRepository } from './types';\n\nconst CREATION_TIME_KEY = 'creationTime';\nconst LAST_ACCESSED_TIME_KEY = 'lastAccessedTime';\nconst MAX_INACTIVE_INTERVAL_KEY = 'maxInactiveInterval';\nconst ATTRIBUTE_PREFIX = 'sessionAttr:';\nconst SESSION_EXPIRES_PREFIX = 'expires:';\n\nclass RedisSession implements Session {\n  private readonly cached: MapSession;\n\n  public isNew: boolean;\n  public delta = new Map<string, string | number | null>();\n  public originalSessionId: string;\n  public originalPrincipalName: string | null;\n  public originalLastAccessTime: number | null = null;\n\n  constructor(cached: MapSession, isNew: boolean) {\n    this.cached = cached;\n    this.isNew = isNew;\n    this.originalSessionId = cached.getId();\n    this.originalPrincipalName = resolveIndexesFor(this);\n\n    if (isNew) {\n      this.delta.set(CREATION_TIME_KEY, cached.getCreationTime());\n      this.delta.set(LAST_ACCESSED_TIME_KEY, cached.getLastAccessedTime());\n      this.delta.set(MAX_INACTIVE_INTERVAL_KEY, cached.getMaxInactiveInterval());\n      this.cached.getAttributeNames().forEach((name) => {\n        const value = this.cached.getAttribute(name);\n        if (value) this.delta.set(this.getSessionAttrNameKey(name), value);\n      });\n    }\n  }\n\n  getSessionAttrNameKey(name: string) {\n    return ATTRIBUTE_PREFIX + name;\n  }\n\n  // override\n  setLastAccessedTime(lastAccessedTime: number) {\n    this.cached.setLastAccessedTime(lastAccessedTime);\n    this.delta.set(LAST_ACCESSED_TIME_KEY, lastAccessedTime);\n  }\n\n  isExpired() {\n    return this.cached.isExpired();\n  }\n\n  getCreationTime() {\n    return this.cached.getCreationTime();\n  }\n\n  getId() {\n    return this.cached.getId();\n  }\n\n  changeSessionId() {\n    return this.cached.changeSessionId();\n  }\n\n  getLastAccessedTime() {\n    return this.cached.getLastAccessedTime();\n  }\n\n  setMaxInactiveInterval(interval: number) {\n    this.cached.setMaxInactiveInterval(interval);\n    this.delta.set(MAX_INACTIVE_INTERVAL_KEY, interval);\n  }\n\n  getMaxInactiveInterval() {\n    return this.cached.getMaxInactiveInterval();\n  }\n\n  getAttribute(name: string) {\n    return this.cached.getAttribute(name);\n  }\n\n  getAttributeNames() {\n    return this.cached.getAttributeNames();\n  }\n\n  setAttribute(name: string, value: string) {\n    this.cached.setAttribute(name, value);\n    this.delta.set(this.getSessionAttrNameKey(name), value);\n  }\n\n  removeAttribute(name: string) {\n    this.cached.removeAttribute(name);\n    this.delta.set(this.getSessionAttrNameKey(name), null);\n  }\n}\n\ninterface RedisSessionExpirationStore {\n  save(session: RedisSession): Promise<void>;\n  remove(sessionId: string): Promise<void>;\n  rename(session: RedisSession): Promise<void>;\n  cleanupExpiredSessions(cleanupCount?: number): Promise<void>;\n}\n\nclass SortedSetRedisSessionExpirationStore implements RedisSessionExpirationStore {\n  private readonly redis: Redis;\n  private readonly namespace: Namespace;\n  private readonly expirationsKey: string;\n\n  constructor(redis: Redis, namespace: Namespace) {\n    this.redis = redis;\n    this.namespace = namespace;\n    this.expirationsKey = `${this.namespace}:sessions:expirations`;\n  }\n\n  getSessionKey(sessionId: string) {\n    return `${this.namespace}:sessions:${sessionId}`;\n  }\n\n  async save(session: RedisSession) {\n    const expirationInMillis =\n      session.getLastAccessedTime() + session.getMaxInactiveInterval() * 1000;\n    await this.redis.zadd(this.expirationsKey, expirationInMillis, session.getId());\n  }\n\n  async remove(sessionId: string) {\n    await this.redis.zrem(this.expirationsKey, sessionId);\n  }\n\n  async rename(session: RedisSession) {\n    if (session.originalSessionId === session.getId()) return;\n    await this.remove(session.originalSessionId);\n    await this.save(session);\n  }\n\n  async cleanupExpiredSessions(cleanupCount = 100) {\n    const key = this.expirationsKey;\n    const score = Date.now();\n    const sessionIds = await this.redis.zrevrangebyscore(key, score, 0, 'LIMIT', 0, cleanupCount);\n    if (sessionIds.length === 0) return;\n    for (const sessionId of sessionIds) {\n      const sessionKey = this.getSessionKey(sessionId);\n      // Checks if the session exists. By trying to access the session we only trigger a deletion\n      // if the TTL is expired.\n      await this.redis.exists(sessionKey);\n    }\n  }\n}\n\n// <spring:session:sessions:uuid, hash<session>> + 300s\n// <spring:session:sessions:expirations, sorted_set<uuid>>\n// <spring:session:sessions:expires:uuid, string<empty>>: for expire check & event\nexport class RedisIndexedSessionRepository implements SessionRepository<RedisSession> {\n  private readonly redis: Redis;\n  private readonly namespace: Namespace;\n  private readonly expirationStore: RedisSessionExpirationStore;\n\n  private defaultMaxInactiveInterval = 1800;\n\n  constructor(redis: Redis, namespace: Namespace = 'spring:session') {\n    this.redis = redis;\n    this.namespace = namespace;\n    this.expirationStore = new SortedSetRedisSessionExpirationStore(redis, namespace);\n  }\n\n  setDefaultMaxInactiveInterval(interval: number) {\n    this.defaultMaxInactiveInterval = interval;\n  }\n\n  private getSessionKey(sessionId: string) {\n    return `${this.namespace}:sessions:${sessionId}`;\n  }\n\n  private getExpiredKey(sessionId: string) {\n    return `${this.namespace}:sessions:expires:${sessionId}`;\n  }\n\n  private getSessionAttrNameKey(name: string) {\n    return ATTRIBUTE_PREFIX + name;\n  }\n\n  private getPrincipalKey(principalName: string) {\n    return `${this.namespace}:index:${PRINCIPAL_NAME_INDEX_NAME}:${principalName}`;\n  }\n\n  private async getSession(id: string, allowExpired: boolean): Promise<RedisSession | null> {\n    const key = this.getSessionKey(id);\n    const entries = await this.redis.hgetall(key);\n    if (Object.keys(entries).length === 0) return null;\n    const loaded = new MapSession(id);\n    if (!entries.creationTime) throw new Error('creationTime attribute not found');\n    if (!entries.lastAccessedTime) throw new Error('lastAccessedTime attribute not found');\n    if (!entries.maxInactiveInterval) throw new Error('maxInactiveInterval attribute not found');\n\n    loaded.setCreationTime(Number(entries.creationTime));\n    loaded.setLastAccessedTime(Number(entries.lastAccessedTime));\n    loaded.setMaxInactiveInterval(Number(entries.maxInactiveInterval));\n\n    for (const [key, value] of Object.entries(entries)) {\n      if (key.startsWith(ATTRIBUTE_PREFIX)) {\n        loaded.setAttribute(key.slice(ATTRIBUTE_PREFIX.length), value);\n      }\n    }\n\n    if (!allowExpired && loaded.isExpired()) return null;\n    const result = new RedisSession(loaded, false);\n    result.originalLastAccessTime = loaded.getLastAccessedTime();\n    return result;\n  }\n\n  private async saveDelta(session: RedisSession) {\n    if (session.delta.size === 0) return;\n    const sessionId = session.getId();\n    const delta = new Map<string, string | number>();\n    const removes: string[] = [];\n    session.delta.forEach((value, key) => {\n      if (value !== null) delta.set(key, value);\n      else removes.push(key);\n    });\n\n    if (delta.size !== 0) {\n      await this.redis.hset(this.getSessionKey(sessionId), delta);\n    }\n    if (removes.length !== 0) {\n      await this.redis.hdel(this.getSessionKey(sessionId), ...removes);\n    }\n\n    const principalSessionKey = this.getSessionAttrNameKey(PRINCIPAL_NAME_INDEX_NAME);\n    const securityPrincipalSessionKey = this.getSessionAttrNameKey(SPRING_SECURITY_CONTEXT);\n    if (session.delta.has(principalSessionKey) || session.delta.has(securityPrincipalSessionKey)) {\n      if (session.originalPrincipalName !== null) {\n        const originalPrincipalRedisKey = this.getPrincipalKey(session.originalPrincipalName);\n        await this.redis.srem(originalPrincipalRedisKey, sessionId);\n      }\n      const principal = resolveIndexesFor(session);\n      session.originalPrincipalName = principal;\n      if (principal !== null) {\n        const principalRedisKey = this.getPrincipalKey(principal);\n        await this.redis.sadd(principalRedisKey, sessionId);\n      }\n    }\n\n    if (session.isNew) {\n      // here your can send session created message to channel\n      session.isNew = false;\n    }\n\n    const sessionExpireInSeconds = session.getMaxInactiveInterval();\n\n    // createShadowKey start\n    const keyToExpire = SESSION_EXPIRES_PREFIX + session.getId();\n    const sessionKey = this.getSessionKey(keyToExpire);\n\n    if (sessionExpireInSeconds < 0) {\n      await this.redis.append(sessionKey, '');\n      await this.redis.persist(sessionKey);\n      await this.redis.persist(this.getSessionKey(session.getId()));\n    } else if (sessionExpireInSeconds === 0) {\n      await this.redis.del(sessionKey);\n    } else {\n      await this.redis.append(sessionKey, '');\n      await this.redis.expire(sessionKey, sessionExpireInSeconds);\n    }\n    // createShadowKey end\n\n    if (sessionExpireInSeconds > 0) {\n      const fiveMinutesAfterExpires = sessionExpireInSeconds + 5 * 60;\n      await this.redis.expire(this.getSessionKey(session.getId()), fiveMinutesAfterExpires);\n    }\n\n    await this.expirationStore.save(session);\n    session.delta.clear();\n  }\n\n  private async saveChangeSessionId(session: RedisSession) {\n    const sessionId = session.getId();\n    if (sessionId === session.originalSessionId) return;\n    if (!session.isNew) {\n      const originalSessionIdKey = this.getSessionKey(session.originalSessionId);\n      const sessionIdKey = this.getSessionKey(sessionId);\n      const originalExpiredKey = this.getExpiredKey(session.originalSessionId);\n      const expiredKey = this.getExpiredKey(sessionId);\n\n      await this.redis.rename(originalSessionIdKey, sessionIdKey);\n      await this.redis.rename(originalExpiredKey, expiredKey);\n\n      if (session.originalPrincipalName !== null) {\n        const originalPrincipalRedisKey = this.getPrincipalKey(session.originalPrincipalName);\n        await this.redis.srem(originalPrincipalRedisKey, session.originalSessionId);\n        await this.redis.sadd(originalPrincipalRedisKey, sessionId);\n      }\n      await this.expirationStore.rename(session);\n    }\n    session.originalSessionId = sessionId;\n  }\n\n  // override\n  createSession() {\n    const cached = new MapSession();\n    cached.setMaxInactiveInterval(this.defaultMaxInactiveInterval);\n    return new RedisSession(cached, true);\n  }\n\n  async save(session: RedisSession) {\n    await this.saveChangeSessionId(session);\n    await this.saveDelta(session);\n  }\n\n  async findById(sessionId: string): Promise<RedisSession | null> {\n    return this.getSession(sessionId, false);\n  }\n\n  async deleteById(sessionId: string) {\n    const session = await this.getSession(sessionId, true);\n    if (!session) return;\n    // 1. cleanup index\n    const principal = resolveIndexesFor(session);\n    if (principal !== null) {\n      await this.redis.srem(this.getPrincipalKey(principal), sessionId);\n    }\n    // 2. delete in set\n    await this.expirationStore.remove(sessionId);\n    // 3. delete expired key\n    const expiredKey = this.getExpiredKey(sessionId);\n    await this.redis.del(expiredKey);\n\n    session.setMaxInactiveInterval(0);\n    await this.save(session);\n  }\n\n  async findByIndexNameAndIndexValue(indexName: string, indexValue: string) {\n    if (indexName !== PRINCIPAL_NAME_INDEX_NAME) {\n      return new Map<string, RedisSession>();\n    }\n\n    const principalKey = this.getPrincipalKey(indexValue);\n    const sessionIds = await this.redis.smembers(principalKey);\n    if (sessionIds.length === 0) {\n      return new Map<string, RedisSession>();\n    }\n    const sessions = new Map<string, RedisSession>();\n    for (const sessionId of sessionIds) {\n      const session = await this.findById(sessionId);\n      if (session !== null) {\n        sessions.set(sessionId, session);\n      }\n    }\n    return sessions;\n  }\n\n  async findByPrincipalName(principalName: string) {\n    return this.findByIndexNameAndIndexValue(PRINCIPAL_NAME_INDEX_NAME, principalName);\n  }\n\n  async cleanupExpiredSessions(cleanupCount?: number) {\n    await this.expirationStore.cleanupExpiredSessions(cleanupCount);\n  }\n}\n\nconst INCREMENT_SCRIPT = `\nlocal count = redis.call('INCR', KEYS[1])\nif count == 1 then redis.call('EXPIRE', KEYS[1], ARGV[1]) end\nreturn count\n`;\n\nexport class RedisKVRepository implements KVRepository {\n  private readonly redis: Redis;\n\n  constructor(redis: Redis) {\n    this.redis = redis;\n  }\n\n  async setItem(key: string, value: string, expiresIn?: number) {\n    if (expiresIn) {\n      await this.redis.set(key, value, 'EX', expiresIn);\n    } else {\n      await this.redis.set(key, value);\n    }\n  }\n\n  async getItem(key: string): Promise<string | null> {\n    return this.redis.get(key);\n  }\n\n  async removeItem(key: string) {\n    await this.redis.del(key);\n  }\n\n  async increment(key: string, expiresIn: number): Promise<number> {\n    // INCR and the creating EXPIRE run as one script, so the key never exists without a TTL and\n    // an existing key keeps its expiry.\n    const count = await this.redis.eval(INCREMENT_SCRIPT, 1, key, expiresIn);\n    return Number(count);\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"redis.mjs","names":[],"sources":["../../src/session/redis.ts"],"sourcesContent":["import type { Redis } from 'ioredis';\nimport { PRINCIPAL_NAME_INDEX_NAME, principalNameOf } from './common';\nimport { MapSession } from './map-session';\nimport type { KVRepository, Namespace, Session, SessionRepository } from './types';\n\nconst CREATION_TIME_KEY = 'creationTime';\nconst LAST_ACCESSED_TIME_KEY = 'lastAccessedTime';\nconst MAX_INACTIVE_INTERVAL_KEY = 'maxInactiveInterval';\nconst ATTRIBUTE_PREFIX = 'sessionAttr:';\nconst SESSION_EXPIRES_PREFIX = 'expires:';\n\nclass RedisSession implements Session {\n  private readonly cached: MapSession;\n\n  public isNew: boolean;\n  public delta = new Map<string, string | number | null>();\n  public originalSessionId: string;\n  public originalPrincipalName: string | null;\n  public originalLastAccessTime: number | null = null;\n\n  constructor(cached: MapSession, isNew: boolean) {\n    this.cached = cached;\n    this.isNew = isNew;\n    this.originalSessionId = cached.getId();\n    this.originalPrincipalName = principalNameOf(this);\n\n    if (isNew) {\n      this.delta.set(CREATION_TIME_KEY, cached.getCreationTime());\n      this.delta.set(LAST_ACCESSED_TIME_KEY, cached.getLastAccessedTime());\n      this.delta.set(MAX_INACTIVE_INTERVAL_KEY, cached.getMaxInactiveInterval());\n      this.cached.getAttributeNames().forEach((name) => {\n        const value = this.cached.getAttribute(name);\n        if (value) this.delta.set(this.getSessionAttrNameKey(name), value);\n      });\n    }\n  }\n\n  getSessionAttrNameKey(name: string) {\n    return ATTRIBUTE_PREFIX + name;\n  }\n\n  // override\n  setLastAccessedTime(lastAccessedTime: number) {\n    this.cached.setLastAccessedTime(lastAccessedTime);\n    this.delta.set(LAST_ACCESSED_TIME_KEY, lastAccessedTime);\n  }\n\n  isExpired() {\n    return this.cached.isExpired();\n  }\n\n  getCreationTime() {\n    return this.cached.getCreationTime();\n  }\n\n  getId() {\n    return this.cached.getId();\n  }\n\n  changeSessionId() {\n    return this.cached.changeSessionId();\n  }\n\n  getLastAccessedTime() {\n    return this.cached.getLastAccessedTime();\n  }\n\n  setMaxInactiveInterval(interval: number) {\n    this.cached.setMaxInactiveInterval(interval);\n    this.delta.set(MAX_INACTIVE_INTERVAL_KEY, interval);\n  }\n\n  getMaxInactiveInterval() {\n    return this.cached.getMaxInactiveInterval();\n  }\n\n  getAttribute(name: string) {\n    return this.cached.getAttribute(name);\n  }\n\n  getAttributeNames() {\n    return this.cached.getAttributeNames();\n  }\n\n  setAttribute(name: string, value: string) {\n    this.cached.setAttribute(name, value);\n    this.delta.set(this.getSessionAttrNameKey(name), value);\n  }\n\n  removeAttribute(name: string) {\n    this.cached.removeAttribute(name);\n    this.delta.set(this.getSessionAttrNameKey(name), null);\n  }\n}\n\ninterface RedisSessionExpirationStore {\n  save(session: RedisSession): Promise<void>;\n  remove(sessionId: string): Promise<void>;\n  rename(session: RedisSession): Promise<void>;\n  cleanupExpiredSessions(cleanupCount?: number): Promise<void>;\n}\n\nclass SortedSetRedisSessionExpirationStore implements RedisSessionExpirationStore {\n  private readonly redis: Redis;\n  private readonly namespace: Namespace;\n  private readonly expirationsKey: string;\n\n  constructor(redis: Redis, namespace: Namespace) {\n    this.redis = redis;\n    this.namespace = namespace;\n    this.expirationsKey = `${this.namespace}:sessions:expirations`;\n  }\n\n  getSessionKey(sessionId: string) {\n    return `${this.namespace}:sessions:${sessionId}`;\n  }\n\n  async save(session: RedisSession) {\n    const expirationInMillis =\n      session.getLastAccessedTime() + session.getMaxInactiveInterval() * 1000;\n    await this.redis.zadd(this.expirationsKey, expirationInMillis, session.getId());\n  }\n\n  async remove(sessionId: string) {\n    await this.redis.zrem(this.expirationsKey, sessionId);\n  }\n\n  async rename(session: RedisSession) {\n    if (session.originalSessionId === session.getId()) return;\n    await this.remove(session.originalSessionId);\n    await this.save(session);\n  }\n\n  async cleanupExpiredSessions(cleanupCount = 100) {\n    const key = this.expirationsKey;\n    const score = Date.now();\n    const sessionIds = await this.redis.zrevrangebyscore(key, score, 0, 'LIMIT', 0, cleanupCount);\n    if (sessionIds.length === 0) return;\n    for (const sessionId of sessionIds) {\n      const sessionKey = this.getSessionKey(sessionId);\n      // Checks if the session exists. By trying to access the session we only trigger a deletion\n      // if the TTL is expired.\n      await this.redis.exists(sessionKey);\n    }\n  }\n}\n\n// <namespace>:sessions:<id>               hash: the session's fields and `sessionAttr:*` attributes\n// <namespace>:sessions:expirations        sorted set of ids by expiry, for cleanup\n// <namespace>:sessions:expires:<id>       empty string with the session's TTL, for the expiry check\n// <namespace>:index:principalName:<name>  set of the principal's session ids\nexport class RedisIndexedSessionRepository implements SessionRepository<RedisSession> {\n  private readonly redis: Redis;\n  private readonly namespace: Namespace;\n  private readonly expirationStore: RedisSessionExpirationStore;\n\n  private defaultMaxInactiveInterval = 1800;\n\n  constructor(redis: Redis, namespace: Namespace = 'app:session') {\n    this.redis = redis;\n    this.namespace = namespace;\n    this.expirationStore = new SortedSetRedisSessionExpirationStore(redis, namespace);\n  }\n\n  setDefaultMaxInactiveInterval(interval: number) {\n    this.defaultMaxInactiveInterval = interval;\n  }\n\n  private getSessionKey(sessionId: string) {\n    return `${this.namespace}:sessions:${sessionId}`;\n  }\n\n  private getExpiredKey(sessionId: string) {\n    return `${this.namespace}:sessions:expires:${sessionId}`;\n  }\n\n  private getSessionAttrNameKey(name: string) {\n    return ATTRIBUTE_PREFIX + name;\n  }\n\n  private getPrincipalKey(principalName: string) {\n    return `${this.namespace}:index:${PRINCIPAL_NAME_INDEX_NAME}:${principalName}`;\n  }\n\n  private async getSession(id: string, allowExpired: boolean): Promise<RedisSession | null> {\n    const key = this.getSessionKey(id);\n    const entries = await this.redis.hgetall(key);\n    if (Object.keys(entries).length === 0) return null;\n    const loaded = new MapSession(id);\n    if (!entries.creationTime) throw new Error('creationTime attribute not found');\n    if (!entries.lastAccessedTime) throw new Error('lastAccessedTime attribute not found');\n    if (!entries.maxInactiveInterval) throw new Error('maxInactiveInterval attribute not found');\n\n    loaded.setCreationTime(Number(entries.creationTime));\n    loaded.setLastAccessedTime(Number(entries.lastAccessedTime));\n    loaded.setMaxInactiveInterval(Number(entries.maxInactiveInterval));\n\n    for (const [key, value] of Object.entries(entries)) {\n      if (key.startsWith(ATTRIBUTE_PREFIX)) {\n        loaded.setAttribute(key.slice(ATTRIBUTE_PREFIX.length), value);\n      }\n    }\n\n    if (!allowExpired && loaded.isExpired()) return null;\n    const result = new RedisSession(loaded, false);\n    result.originalLastAccessTime = loaded.getLastAccessedTime();\n    return result;\n  }\n\n  private async saveDelta(session: RedisSession) {\n    if (session.delta.size === 0) return;\n    const sessionId = session.getId();\n    const delta = new Map<string, string | number>();\n    const removes: string[] = [];\n    session.delta.forEach((value, key) => {\n      if (value !== null) delta.set(key, value);\n      else removes.push(key);\n    });\n\n    if (delta.size !== 0) {\n      await this.redis.hset(this.getSessionKey(sessionId), delta);\n    }\n    if (removes.length !== 0) {\n      await this.redis.hdel(this.getSessionKey(sessionId), ...removes);\n    }\n\n    if (session.delta.has(this.getSessionAttrNameKey(PRINCIPAL_NAME_INDEX_NAME))) {\n      if (session.originalPrincipalName !== null) {\n        const originalPrincipalRedisKey = this.getPrincipalKey(session.originalPrincipalName);\n        await this.redis.srem(originalPrincipalRedisKey, sessionId);\n      }\n      const principal = principalNameOf(session);\n      session.originalPrincipalName = principal;\n      if (principal !== null) {\n        const principalRedisKey = this.getPrincipalKey(principal);\n        await this.redis.sadd(principalRedisKey, sessionId);\n      }\n    }\n\n    if (session.isNew) {\n      // here your can send session created message to channel\n      session.isNew = false;\n    }\n\n    const sessionExpireInSeconds = session.getMaxInactiveInterval();\n\n    // createShadowKey start\n    const keyToExpire = SESSION_EXPIRES_PREFIX + session.getId();\n    const sessionKey = this.getSessionKey(keyToExpire);\n\n    if (sessionExpireInSeconds < 0) {\n      await this.redis.append(sessionKey, '');\n      await this.redis.persist(sessionKey);\n      await this.redis.persist(this.getSessionKey(session.getId()));\n    } else if (sessionExpireInSeconds === 0) {\n      await this.redis.del(sessionKey);\n    } else {\n      await this.redis.append(sessionKey, '');\n      await this.redis.expire(sessionKey, sessionExpireInSeconds);\n    }\n    // createShadowKey end\n\n    if (sessionExpireInSeconds > 0) {\n      const fiveMinutesAfterExpires = sessionExpireInSeconds + 5 * 60;\n      await this.redis.expire(this.getSessionKey(session.getId()), fiveMinutesAfterExpires);\n    }\n\n    await this.expirationStore.save(session);\n    session.delta.clear();\n  }\n\n  private async saveChangeSessionId(session: RedisSession) {\n    const sessionId = session.getId();\n    if (sessionId === session.originalSessionId) return;\n    if (!session.isNew) {\n      const originalSessionIdKey = this.getSessionKey(session.originalSessionId);\n      const sessionIdKey = this.getSessionKey(sessionId);\n      const originalExpiredKey = this.getExpiredKey(session.originalSessionId);\n      const expiredKey = this.getExpiredKey(sessionId);\n\n      await this.redis.rename(originalSessionIdKey, sessionIdKey);\n      await this.redis.rename(originalExpiredKey, expiredKey);\n\n      if (session.originalPrincipalName !== null) {\n        const originalPrincipalRedisKey = this.getPrincipalKey(session.originalPrincipalName);\n        await this.redis.srem(originalPrincipalRedisKey, session.originalSessionId);\n        await this.redis.sadd(originalPrincipalRedisKey, sessionId);\n      }\n      await this.expirationStore.rename(session);\n    }\n    session.originalSessionId = sessionId;\n  }\n\n  // override\n  createSession() {\n    const cached = new MapSession();\n    cached.setMaxInactiveInterval(this.defaultMaxInactiveInterval);\n    return new RedisSession(cached, true);\n  }\n\n  async save(session: RedisSession) {\n    await this.saveChangeSessionId(session);\n    await this.saveDelta(session);\n  }\n\n  async findById(sessionId: string): Promise<RedisSession | null> {\n    return this.getSession(sessionId, false);\n  }\n\n  async deleteById(sessionId: string) {\n    const session = await this.getSession(sessionId, true);\n    if (!session) return;\n    // 1. cleanup index\n    const principal = principalNameOf(session);\n    if (principal !== null) {\n      await this.redis.srem(this.getPrincipalKey(principal), sessionId);\n    }\n    // 2. delete in set\n    await this.expirationStore.remove(sessionId);\n    // 3. delete expired key\n    const expiredKey = this.getExpiredKey(sessionId);\n    await this.redis.del(expiredKey);\n\n    session.setMaxInactiveInterval(0);\n    await this.save(session);\n  }\n\n  async findByIndexNameAndIndexValue(indexName: string, indexValue: string) {\n    if (indexName !== PRINCIPAL_NAME_INDEX_NAME) {\n      return new Map<string, RedisSession>();\n    }\n\n    const principalKey = this.getPrincipalKey(indexValue);\n    const sessionIds = await this.redis.smembers(principalKey);\n    if (sessionIds.length === 0) {\n      return new Map<string, RedisSession>();\n    }\n    const sessions = new Map<string, RedisSession>();\n    for (const sessionId of sessionIds) {\n      const session = await this.findById(sessionId);\n      if (session !== null) {\n        sessions.set(sessionId, session);\n      }\n    }\n    return sessions;\n  }\n\n  async findByPrincipalName(principalName: string) {\n    return this.findByIndexNameAndIndexValue(PRINCIPAL_NAME_INDEX_NAME, principalName);\n  }\n\n  async cleanupExpiredSessions(cleanupCount?: number) {\n    await this.expirationStore.cleanupExpiredSessions(cleanupCount);\n  }\n}\n\nconst INCREMENT_SCRIPT = `\nlocal count = redis.call('INCR', KEYS[1])\nif count == 1 then redis.call('EXPIRE', KEYS[1], ARGV[1]) end\nreturn count\n`;\n\nexport class RedisKVRepository implements KVRepository {\n  private readonly redis: Redis;\n\n  constructor(redis: Redis) {\n    this.redis = redis;\n  }\n\n  async setItem(key: string, value: string, expiresIn?: number) {\n    if (expiresIn) {\n      await this.redis.set(key, value, 'EX', expiresIn);\n    } else {\n      await this.redis.set(key, value);\n    }\n  }\n\n  async getItem(key: string): Promise<string | null> {\n    return this.redis.get(key);\n  }\n\n  async removeItem(key: string) {\n    await this.redis.del(key);\n  }\n\n  async increment(key: string, expiresIn: number): Promise<number> {\n    // INCR and the creating EXPIRE run as one script, so the key never exists without a TTL and\n    // an existing key keeps its expiry.\n    const count = await this.redis.eval(INCREMENT_SCRIPT, 1, key, expiresIn);\n    return Number(count);\n  }\n}\n"],"mappings":"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"}

package/dist/session/types.d.cts

@@ -1,15 +1,3 @@
-import { Principal } from "../core/index.cjs";
-export interface Authentication extends Principal {
-  '@class': string;
-  principal?: Principal;
-  authorities?: string[];
-  credentials?: object;
-  details?: object;
-}
-export interface SecurityContext {
-  '@class': string;
-  authentication?: Authentication;
-}
 export type Namespace = `${string}:session`;
 export interface Session {
   getId(): string;

package/dist/session/types.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.cts","names":[],"sources":["../../src/session/types.ts"],"mappings":";iBAEiB,uBAAuB;EACtC;EACA,YAAY;EACZ;EACA;EACA;;iBAGe;EACf;EACA,iBAAiB;;YAGP;iBAGK;EACf;EACA;EAEA,aAAa;EACb;EACA,aAAa,cAAc;EAC3B,gBAAgB;EAEhB;EACA;EACA,oBAAoB;EAEpB;EACA,uBAAuB;EAEvB;;iBAGe,kBAAkB,UAAU,UAAU;EACrD,iBAAiB;EACjB,KAAK,SAAS,IAAI;EAClB,SAAS,oBAAoB,QAAQ;EACrC,WAAW,oBAAoB;EAG/B,6BAA6B,mBAAmB,qBAAqB,QAAQ,YAAY;EACzF,oBAAoB,wBAAwB,QAAQ,YAAY;EAGhE,uBAAuB,wBAAwB;;;;;;iBAOhC;EACf,QAAQ,aAAa,eAAe,qBAAqB;EACzD,QAAQ,cAAc;EACtB,WAAW,cAAc;;;;;;;EAOzB,UAAU,aAAa,oBAAoB"}
+{"version":3,"file":"types.d.cts","names":[],"sources":["../../src/session/types.ts"],"mappings":"A,YAEY;iBAEK;EACf;EACA;EAEA,aAAa;EACb;EACA,aAAa,cAAc;EAC3B,gBAAgB;EAEhB;EACA;EACA,oBAAoB;EAEpB;EACA,uBAAuB;EAEvB;;iBAGe,kBAAkB,UAAU,UAAU;EACrD,iBAAiB;EACjB,KAAK,SAAS,IAAI;EAClB,SAAS,oBAAoB,QAAQ;EACrC,WAAW,oBAAoB;EAG/B,6BAA6B,mBAAmB,qBAAqB,QAAQ,YAAY;EACzF,oBAAoB,wBAAwB,QAAQ,YAAY;EAGhE,uBAAuB,wBAAwB;;;;;;iBAOhC;EACf,QAAQ,aAAa,eAAe,qBAAqB;EACzD,QAAQ,cAAc;EACtB,WAAW,cAAc;;;;;;;EAOzB,UAAU,aAAa,oBAAoB"}

package/dist/session/types.d.mts

@@ -1,15 +1,3 @@
-import { Principal } from "../core/index.mjs";
-export interface Authentication extends Principal {
-  '@class': string;
-  principal?: Principal;
-  authorities?: string[];
-  credentials?: object;
-  details?: object;
-}
-export interface SecurityContext {
-  '@class': string;
-  authentication?: Authentication;
-}
 export type Namespace = `${string}:session`;
 export interface Session {
   getId(): string;