lambder 1.0.120 → 1.0.122

package/Readme.md

@@ -37,8 +37,8 @@ const lambder = new Lambder({
 
 // Enable session
 lambder.enableDdbSession({
-    tableName: "website-session",
-    tableRegion: "us-east-1",
+    tableName: "website-session", // DynamoDB Table Name
+    tableRegion: "us-east-1", // DynamoDB Table Region
     sessionSalt: "8p6Vt+4b1w3N8d/dcJ47QF3DRkp9koFg0G" // Change salt
 });
 
@@ -221,13 +221,22 @@ lambder.addModule(async (lambder: Lambder): Promise<void> => {
 You can enable session tracking by:
 
 ```typescript
-// Enable session
+// Enable sessions using a dynamodb session table
 lambder.enableDdbSession({
-    tableName: "website-session",
-    tableRegion: "us-east-1",
+    tableName: "website-session", // DynamoDB Table Name
+    tableRegion: "us-east-1", // DynamoDB Table Region
     sessionSalt: "8p6Vt+4b1w3N8d/dcJ47QF3DRkp9koFg0G" // Change salt
 });
 ```
+#### DynamoDB Session Table Structure: 
+
+Session system is enabled by storing data in a DynamoDB session table.
+
+- Primary Key: "pk"
+- Sort Key: "sk"
+- TTL Key: "expiresAt" (optional)
+
+#### Session Controller
 
 After you enable the session, you can access to the session controller:
 
@@ -235,26 +244,26 @@ After you enable the session, you can access to the session controller:
     // Create session controller:
     const sessionController = lambder.getSessionController(ctx);
 
-    /*
+    // Type for sessionController 
     sessionController: {
-        async createSession(sessionKey, data, ttlInSeconds): 
+        async createSession(sessionKey, data, ttlInSeconds): session
         // Starts a new session and persists the session data to DDB.
 
-        async fetchSession(): 
+        async fetchSession(): session
         // Fetch and validate if there is an existing session
         // This is automatically done for addSessionRoute and addSessionApi
         // Throws if session not found
 
-        async fetchSessionIfExists(): 
+        async fetchSessionIfExists(): session|null 
         // Runs fetchSession and returns the session if found. Otherwise return null
 
-        async updateSessionData(updatedData): 
+        async updateSessionData(updatedData): updatedSession
         // Updates the active sessions data and persist it to ddb.
 
-        async endSession(): Start a new session
+        async endSession(): 
         // End session and delete from DDB.
 
-        async endSessionAll(): Start a new session
+        async endSessionAll(): 
         // Ends and deletes all registered sessions for this sessionKey across all devices
     }
     */
@@ -474,13 +483,8 @@ const loadPageData = async () => {
         console.error("Failed to fetch page data:", error);
     }
 };
-
 ```
 
-## Advanced Configuration
-
-Lambder is designed to be flexible and extensible, allowing for customized behaviors through hooks and custom error handling mechanisms. 
-
 ## Contributing
 
 Contributions are welcome! Especially for documentation. If you have an idea for an improvement or have found a bug, please open an issue or submit a pull request.

package/deploy.sh

@@ -9,8 +9,9 @@ npm version patch --no-git-tag-version
 npm run build
 npm publish
 
-git add .
-git commit
-git push -u origin main
-
 echo "All operations completed successfully"
+
+
+# git add .
+# git commit -m ""
+# git git push -u origin main

package/dist/Lambder.d.ts

@@ -20,6 +20,7 @@ export type LambderRenderContext = {
     lambdaContext: Context;
     _otherInternal: {
         isApiCall: boolean;
+        sessionCookieHeader: null | Record<"Set-Cookie", string[]>;
     };
 };
 type LambderModuleFunction = (lambderInstance: Lambder) => void | Promise<void>;

package/dist/Lambder.js

@@ -36,7 +36,7 @@ export const createContext = (event, lambdaContext, apiPath) => {
         get, post, cookie,
         apiName, apiPayload,
         headers, session, lambdaContext,
-        _otherInternal: { isApiCall }
+        _otherInternal: { isApiCall, sessionCookieHeader: null }
     };
 };
 export default class Lambder {
@@ -194,6 +194,7 @@ export default class Lambder {
         return new LambderSessionController({
             lambderSessionManager: this.lambderSessionManager,
             sessionTokenCookieKey: this.sessionTokenCookieKey,
+            sessionCsrfCookieKey: this.sessionCsrfCookieKey,
             ctx,
         });
     }
@@ -247,27 +248,11 @@ export default class Lambder {
                             response = hookResponse;
                         }
                         // Apply session cookie if needed.
-                        if ((ctx.session?.sessionToken ?? null) !== (ctx?.cookie?.[this.sessionTokenCookieKey] ?? null)) {
-                            // Add session cookies
-                            if (ctx.session?.sessionToken) {
-                                response.multiValueHeaders = {
-                                    ...(response.multiValueHeaders || {}),
-                                    "Set-Cookie": [
-                                        `${this.sessionTokenCookieKey}=${ctx.session.sessionToken}; Expires=${new Date(ctx.session.expiresAt * 1000).toUTCString()}; Path=/; HttpOnly; SameSite=Lax; Secure`,
-                                        `${this.sessionCsrfCookieKey}=${ctx.session.csrfToken}; Expires=${new Date(ctx.session.expiresAt * 1000).toUTCString()}; Path=/; SameSite=Lax; Secure`,
-                                    ],
-                                };
-                            }
-                            else {
-                                // Delete session cookies
-                                response.multiValueHeaders = {
-                                    ...(response.multiValueHeaders || {}),
-                                    "Set-Cookie": [
-                                        `${this.sessionTokenCookieKey}=0; Expires=${new Date(Date.now() - 100000).toUTCString()}; Path=/; HttpOnly; SameSite=Lax; Secure`,
-                                        `${this.sessionCsrfCookieKey}=0; Expires=${new Date(Date.now() - 100000).toUTCString()}; Path=/; SameSite=Lax; Secure`,
-                                    ],
-                                };
-                            }
+                        if ((ctx._otherInternal.sessionCookieHeader)) {
+                            response.multiValueHeaders = {
+                                ...(response.multiValueHeaders || {}),
+                                ...(ctx._otherInternal.sessionCookieHeader || {}),
+                            };
                         }
                         resolve(response);
                     }

package/dist/LambderSessionController.d.ts

@@ -4,10 +4,12 @@ import type { LambderSessionContext } from "./LambderSessionManager.js";
 export default class LambderSessionController {
     lambderSessionManager: LambderSessionManager;
     sessionTokenCookieKey: string;
+    sessionCsrfCookieKey: string;
     ctx: LambderRenderContext;
-    constructor({ lambderSessionManager, sessionTokenCookieKey, ctx, }: {
+    constructor({ lambderSessionManager, sessionTokenCookieKey, sessionCsrfCookieKey, ctx, }: {
         lambderSessionManager: LambderSessionManager;
         sessionTokenCookieKey: string;
+        sessionCsrfCookieKey: string;
         ctx: LambderRenderContext;
     });
     private areRequestSessionTokensValid;

package/dist/LambderSessionController.js

@@ -1,11 +1,13 @@
 export default class LambderSessionController {
     lambderSessionManager;
     sessionTokenCookieKey;
+    sessionCsrfCookieKey;
     ctx;
-    constructor({ lambderSessionManager, sessionTokenCookieKey, ctx, }) {
-        this.ctx = ctx;
-        this.sessionTokenCookieKey = sessionTokenCookieKey;
+    constructor({ lambderSessionManager, sessionTokenCookieKey, sessionCsrfCookieKey, ctx, }) {
         this.lambderSessionManager = lambderSessionManager;
+        this.sessionTokenCookieKey = sessionTokenCookieKey;
+        this.sessionCsrfCookieKey = sessionCsrfCookieKey;
+        this.ctx = ctx;
     }
     ;
     areRequestSessionTokensValid() {
@@ -22,7 +24,14 @@ export default class LambderSessionController {
     }
     ;
     async createSession(sessionKey, data, ttlInSeconds) {
-        this.ctx.session = await this.lambderSessionManager.createSession(sessionKey, data, ttlInSeconds);
+        const session = await this.lambderSessionManager.createSession(sessionKey, data, ttlInSeconds);
+        this.ctx._otherInternal.sessionCookieHeader = {
+            "Set-Cookie": [
+                `${this.sessionTokenCookieKey}=${session.sessionToken}; Expires=${new Date(session.expiresAt * 1000).toUTCString()}; Path=/; HttpOnly; SameSite=Lax; Secure`,
+                `${this.sessionCsrfCookieKey}=${session.csrfToken}; Expires=${new Date(session.expiresAt * 1000).toUTCString()}; Path=/; SameSite=Lax; Secure`,
+            ],
+        };
+        this.ctx.session = session;
         return this.ctx.session;
     }
     ;
@@ -74,6 +83,12 @@ export default class LambderSessionController {
         if (!this.ctx.session)
             throw new Error("Session not found.");
         await this.lambderSessionManager.deleteSession(this.ctx.session);
+        this.ctx._otherInternal.sessionCookieHeader = {
+            "Set-Cookie": [
+                `${this.sessionTokenCookieKey}=0; Expires=${new Date(Date.now() - 100000).toUTCString()}; Path=/; HttpOnly; SameSite=Lax; Secure`,
+                `${this.sessionCsrfCookieKey}=0; Expires=${new Date(Date.now() - 100000).toUTCString()}; Path=/; SameSite=Lax; Secure`,
+            ],
+        };
         this.ctx.session = null;
     }
     ;
@@ -81,6 +96,12 @@ export default class LambderSessionController {
         if (!this.ctx.session)
             throw new Error("Session not found.");
         await this.lambderSessionManager.deleteSessionAll(this.ctx.session);
+        this.ctx._otherInternal.sessionCookieHeader = {
+            "Set-Cookie": [
+                `${this.sessionTokenCookieKey}=0; Expires=${new Date(Date.now() - 100000).toUTCString()}; Path=/; HttpOnly; SameSite=Lax; Secure`,
+                `${this.sessionCsrfCookieKey}=0; Expires=${new Date(Date.now() - 100000).toUTCString()}; Path=/; SameSite=Lax; Secure`,
+            ],
+        };
         this.ctx.session = null;
     }
     ;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lambder",
-  "version": "1.0.120",
+  "version": "1.0.122",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/Lambder.ts

@@ -24,7 +24,10 @@ export type LambderRenderContext = {
     headers: APIGatewayProxyEventHeaders;
     session: LambderSessionContext|null;
     lambdaContext: Context;
-    _otherInternal: { isApiCall: boolean };
+    _otherInternal: { 
+        isApiCall: boolean,
+        sessionCookieHeader: null|Record<"Set-Cookie",string[]>
+    };
 };
 
 type LambderModuleFunction = (lambderInstance: Lambder) => void | Promise<void>;
@@ -76,7 +79,7 @@ export const createContext = (
         get, post, cookie, 
         apiName, apiPayload, 
         headers, session, lambdaContext, 
-        _otherInternal: { isApiCall } 
+        _otherInternal: { isApiCall, sessionCookieHeader: null } 
     };
 }
 
@@ -279,6 +282,7 @@ export default class Lambder {
         return new LambderSessionController({
             lambderSessionManager: this.lambderSessionManager,
             sessionTokenCookieKey: this.sessionTokenCookieKey,
+            sessionCsrfCookieKey: this.sessionCsrfCookieKey,
             ctx, 
         });
     }
@@ -338,25 +342,10 @@ export default class Lambder {
                             response = hookResponse;
                         }
                         // Apply session cookie if needed.
-                        if((ctx.session?.sessionToken ?? null) !== (ctx?.cookie?.[this.sessionTokenCookieKey] ?? null)){
-                            // Add session cookies
-                            if(ctx.session?.sessionToken){
-                                response.multiValueHeaders = {
-                                    ...(response.multiValueHeaders || {}),
-                                    "Set-Cookie": [
-                                        `${this.sessionTokenCookieKey}=${ctx.session.sessionToken}; Expires=${new Date(ctx.session.expiresAt * 1000).toUTCString()}; Path=/; HttpOnly; SameSite=Lax; Secure`,
-                                        `${this.sessionCsrfCookieKey}=${ctx.session.csrfToken}; Expires=${new Date(ctx.session.expiresAt * 1000).toUTCString()}; Path=/; SameSite=Lax; Secure`,
-                                    ],
-                                };
-                            }else{
-                                // Delete session cookies
-                                response.multiValueHeaders = {
-                                    ...(response.multiValueHeaders || {}),
-                                    "Set-Cookie": [
-                                        `${this.sessionTokenCookieKey}=0; Expires=${new Date(Date.now() - 100000).toUTCString()}; Path=/; HttpOnly; SameSite=Lax; Secure`,
-                                        `${this.sessionCsrfCookieKey}=0; Expires=${new Date(Date.now() - 100000).toUTCString()}; Path=/; SameSite=Lax; Secure`,
-                                    ],
-                                };
+                        if((ctx._otherInternal.sessionCookieHeader)){
+                            response.multiValueHeaders = {
+                                ...(response.multiValueHeaders || {}),
+                                ...(ctx._otherInternal.sessionCookieHeader || {}),
                             }
                         }
                         resolve(response);

package/src/LambderSessionController.ts

@@ -5,22 +5,26 @@ import type { LambderSessionContext } from "./LambderSessionManager.js";
 export default class LambderSessionController {
     lambderSessionManager: LambderSessionManager;
     sessionTokenCookieKey: string;
+    sessionCsrfCookieKey: string;
     ctx: LambderRenderContext;
 
     constructor(
         { 
             lambderSessionManager,
             sessionTokenCookieKey,
+            sessionCsrfCookieKey,
             ctx,
         }: {
             lambderSessionManager: LambderSessionManager,
             sessionTokenCookieKey: string,
+            sessionCsrfCookieKey: string,
             ctx: LambderRenderContext,
         }
     ){
-        this.ctx = ctx;
-        this.sessionTokenCookieKey = sessionTokenCookieKey;
         this.lambderSessionManager = lambderSessionManager;
+        this.sessionTokenCookieKey = sessionTokenCookieKey;
+        this.sessionCsrfCookieKey = sessionCsrfCookieKey;
+        this.ctx = ctx;
     };
 
     private areRequestSessionTokensValid(): boolean {
@@ -37,7 +41,14 @@ export default class LambderSessionController {
     };
 
     async createSession (sessionKey: string, data?: any, ttlInSeconds?: number): Promise<LambderSessionContext> {
-        this.ctx.session = await this.lambderSessionManager.createSession(sessionKey, data, ttlInSeconds);
+        const session = await this.lambderSessionManager.createSession(sessionKey, data, ttlInSeconds);
+        this.ctx._otherInternal.sessionCookieHeader = {
+            "Set-Cookie": [
+                `${this.sessionTokenCookieKey}=${session.sessionToken}; Expires=${new Date(session.expiresAt * 1000).toUTCString()}; Path=/; HttpOnly; SameSite=Lax; Secure`,
+                `${this.sessionCsrfCookieKey}=${session.csrfToken}; Expires=${new Date(session.expiresAt * 1000).toUTCString()}; Path=/; SameSite=Lax; Secure`,
+            ],
+        };
+        this.ctx.session = session;
         return this.ctx.session;
     };
 
@@ -83,12 +94,24 @@ export default class LambderSessionController {
     async endSession (){
         if(!this.ctx.session) throw new Error("Session not found.");
         await this.lambderSessionManager.deleteSession(this.ctx.session);
+        this.ctx._otherInternal.sessionCookieHeader = {
+            "Set-Cookie": [
+                `${this.sessionTokenCookieKey}=0; Expires=${new Date(Date.now() - 100000).toUTCString()}; Path=/; HttpOnly; SameSite=Lax; Secure`,
+                `${this.sessionCsrfCookieKey}=0; Expires=${new Date(Date.now() - 100000).toUTCString()}; Path=/; SameSite=Lax; Secure`,
+            ],
+        };
         this.ctx.session = null
     };
 
     async endSessionAll (){
         if(!this.ctx.session) throw new Error("Session not found.");
         await this.lambderSessionManager.deleteSessionAll(this.ctx.session);
+        this.ctx._otherInternal.sessionCookieHeader = {
+            "Set-Cookie": [
+                `${this.sessionTokenCookieKey}=0; Expires=${new Date(Date.now() - 100000).toUTCString()}; Path=/; HttpOnly; SameSite=Lax; Secure`,
+                `${this.sessionCsrfCookieKey}=0; Expires=${new Date(Date.now() - 100000).toUTCString()}; Path=/; SameSite=Lax; Secure`,
+            ],
+        };
         this.ctx.session = null
     };
 };