lambder 1.0.109 → 1.0.111

package/dist/Lambder.d.ts

@@ -82,6 +82,12 @@ export default class Lambder {
     addHook(hookEvent: 'beforeRender', hookFn: HookBeforeRenderFunction, priority?: number): Promise<void>;
     addHook(hookEvent: 'afterRender', hookFn: HookAfterRenderFunction, priority?: number): Promise<void>;
     addHook(hookEvent: 'fallback', hookFn: HookFallbackFunction, priority?: number): Promise<void>;
+    getSessionController(ctx: LambderRenderContext): {
+        startSession: (userKey: string, data?: any, ttlInSeconds?: number) => Promise<LambderSessionContext>;
+        editSession: (newData: any) => Promise<LambderSessionContext>;
+        deleteSession: () => Promise<void>;
+        deleteSessionAll: () => Promise<void>;
+    };
     getResponseBuilder(): LambderResponseBuilder;
     private getResolver;
     render(event: APIGatewayProxyEvent, lambdaContext: Context): Promise<LambderResolverResponse>;

package/dist/Lambder.js

@@ -46,7 +46,7 @@ export default class Lambder {
     utils;
     lambderSession;
     sessionTokenCookieKey = "LMDRSESSIONTKID";
-    sessionCsrfCookieKey = "LMDRSESSIONCSID";
+    sessionCsrfCookieKey = "LMDRSESSIONCSTK";
     constructor({ publicPath, apiPath, ejsPath, apiVersion }) {
         this.publicPath = publicPath || "/incorrect-path-not-found";
         this.ejsPath = ejsPath || "/incorrect-ejs-path-not-found";
@@ -213,6 +213,40 @@ export default class Lambder {
             this.hookList[hookEvent].sort((a, b) => a.priority - b.priority);
         }
     }
+    getSessionController(ctx) {
+        return {
+            startSession: async (userKey, data, ttlInSeconds) => {
+                if (!this.lambderSession)
+                    throw "Session is not enabled. Use lambder.enableDdbSession(...) to configure.";
+                ctx.session = await this.lambderSession.createSession(userKey, data, ttlInSeconds);
+                return ctx.session;
+            },
+            editSession: async (newData) => {
+                if (!this.lambderSession)
+                    throw "Session is not enabled. Use lambder.enableDdbSession(...) to configure.";
+                if (!ctx.session)
+                    throw "Session not found.";
+                ctx.session = await this.lambderSession.editSession(ctx.session, newData);
+                return ctx.session;
+            },
+            deleteSession: async () => {
+                if (!this.lambderSession)
+                    throw "Session is not enabled. Use lambder.enableDdbSession(...) to configure.";
+                if (!ctx.session)
+                    throw "Session not found.";
+                await this.lambderSession.deleteSession(ctx.session);
+                ctx.session = null;
+            },
+            deleteSessionAll: async () => {
+                if (!this.lambderSession)
+                    throw "Session is not enabled. Use lambder.enableDdbSession(...) to configure.";
+                if (!ctx.session)
+                    throw "Session not found.";
+                await this.lambderSession.deleteSessionAll(ctx.session);
+                ctx.session = null;
+            },
+        };
+    }
     getResponseBuilder() {
         return new LambderResponseBuilder({
             isCorsEnabled: this.isCorsEnabled,
@@ -244,6 +278,7 @@ export default class Lambder {
                         return resolver.cors();
                     const firstMatchedAction = this.actionList.find(action => action.conditionFn(ctx));
                     if (firstMatchedAction) {
+                        // Run beforeRender hooks
                         for (const hook of this.hookList["beforeRender"]) {
                             const hookCtx = await hook.hookFn(ctx, resolver);
                             if (hookCtx instanceof Error) {
@@ -251,7 +286,9 @@ export default class Lambder {
                             }
                             ctx = hookCtx;
                         }
+                        // Run matched action
                         let response = await firstMatchedAction.actionFn(ctx, resolver);
+                        // Run afterRender hooks
                         for (const hook of this.hookList["afterRender"]) {
                             const hookResponse = await hook.hookFn(ctx, resolver, response);
                             if (hookResponse instanceof Error) {
@@ -259,6 +296,29 @@ 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=/; 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=/; SameSite=Lax; Secure`,
+                                        `${this.sessionCsrfCookieKey}=0; Expires=${new Date(Date.now() - 100000).toUTCString()}; Path=/; SameSite=Lax; Secure`,
+                                    ],
+                                };
+                            }
+                        }
                         resolve(response);
                     }
                     else {

package/dist/LambderCaller.js

@@ -38,7 +38,7 @@ export default class LambderCaller {
                     activeFetchList: this.fetchTrackerList.filter(v => !v.done)
                 });
             const version = this.apiVersion;
-            const token = Cookies.get("LMBDRTOKEN") || "";
+            const token = Cookies.get("LMDRSESSIONCSTK") || "";
             const siteHost = window.location.hostname;
             let data = await fetch(this.apiPath, {
                 method: 'POST', mode: 'same-origin', cache: 'no-cache',

package/dist/LambderSession.d.ts

@@ -28,6 +28,7 @@ export default class LambderSession {
     private ddbQueryAllByPartitionKey;
     private ddbDeleteAllByPartitionKey;
     createSession(userKey: string, data?: any, ttlInSeconds?: number): Promise<LambderSessionContext>;
+    editSession(session: LambderSessionContext, newData?: any): Promise<LambderSessionContext>;
     getSession(sessionToken: string): Promise<LambderSessionContext | null>;
     isSessionValid(session: any, sessionToken: any, csrfToken: any, skipCsrfTokenCheck?: boolean): boolean;
     deleteSession(session: Record<string, any>): Promise<boolean>;

package/dist/LambderSession.js

@@ -80,6 +80,13 @@ export default class LambderSession {
         await this.ddbPutItem(session);
         return session;
     }
+    async editSession(session, newData) {
+        if (!session)
+            throw "Invalid session";
+        session.data = newData;
+        await this.ddbPutItem(session);
+        return session;
+    }
     async getSession(sessionToken) {
         const [userKeyHash, sessionSortKey] = sessionToken.split(":");
         if (!userKeyHash || !sessionSortKey)

package/dist/index.d.ts

@@ -3,3 +3,4 @@ export default Lambder;
 export { default as LambderCaller } from "./LambderCaller.js";
 export { default as LambderResponseBuilder } from "./LambderResponseBuilder.js";
 export { default as LambderResolver } from "./LambderResolver.js";
+export { default as LambderSession } from "./LambderSession.js";

package/dist/index.js

@@ -3,3 +3,4 @@ export default Lambder;
 export { default as LambderCaller } from "./LambderCaller.js";
 export { default as LambderResponseBuilder } from "./LambderResponseBuilder.js";
 export { default as LambderResolver } from "./LambderResolver.js";
+export { default as LambderSession } from "./LambderSession.js";

package/package.json

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

package/src/Lambder.ts

@@ -92,7 +92,7 @@ export default class Lambder {
 
     private lambderSession?: LambderSession;
     private sessionTokenCookieKey = "LMDRSESSIONTKID";
-    private sessionCsrfCookieKey = "LMDRSESSIONCSID";
+    private sessionCsrfCookieKey = "LMDRSESSIONCSTK";
     
     constructor(
         { publicPath, apiPath, ejsPath, apiVersion }: 
@@ -288,6 +288,34 @@ export default class Lambder {
         }
     }
 
+    public getSessionController(ctx: LambderRenderContext){
+        return {
+            startSession: async (userKey: string, data?: any, ttlInSeconds?: number): Promise<LambderSessionContext> => {
+                if(!this.lambderSession) throw "Session is not enabled. Use lambder.enableDdbSession(...) to configure.";
+                ctx.session = await this.lambderSession.createSession(userKey, data, ttlInSeconds);
+                return ctx.session;
+            },
+            editSession: async (newData: any): Promise<LambderSessionContext> => {
+                if(!this.lambderSession) throw "Session is not enabled. Use lambder.enableDdbSession(...) to configure.";
+                if(!ctx.session) throw "Session not found.";
+                ctx.session = await this.lambderSession.editSession(ctx.session, newData);
+                return ctx.session;
+            },
+            deleteSession: async () => {
+                if(!this.lambderSession) throw "Session is not enabled. Use lambder.enableDdbSession(...) to configure.";
+                if(!ctx.session) throw "Session not found.";
+                await this.lambderSession.deleteSession(ctx.session);
+                ctx.session = null
+            },
+            deleteSessionAll: async () => {
+                if(!this.lambderSession) throw "Session is not enabled. Use lambder.enableDdbSession(...) to configure.";
+                if(!ctx.session) throw "Session not found.";
+                await this.lambderSession.deleteSessionAll(ctx.session);
+                ctx.session = null
+            },
+        }
+    }
+
     public getResponseBuilder(){
         return new LambderResponseBuilder({
             isCorsEnabled: this.isCorsEnabled, 
@@ -328,21 +356,47 @@ export default class Lambder {
         
                     const firstMatchedAction = this.actionList.find(action => action.conditionFn(ctx));
                     if(firstMatchedAction){
+                        // Run beforeRender hooks
                         for(const hook of this.hookList["beforeRender"]){ 
                             const hookCtx = await hook.hookFn(ctx, resolver);
                             if(hookCtx instanceof Error){ throw hookCtx; }
                             ctx = hookCtx;
                         }
+                        // Run matched action
                         let response = await firstMatchedAction.actionFn(ctx, resolver);
+                        // Run afterRender hooks
                         for(const hook of this.hookList["afterRender"]){ 
                             const hookResponse = await hook.hookFn(ctx, resolver, response);
                             if(hookResponse instanceof Error){ throw hookResponse; }
                             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=/; 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=/; SameSite=Lax; Secure`,
+                                        `${this.sessionCsrfCookieKey}=0; Expires=${new Date(Date.now() - 100000).toUTCString()}; Path=/; SameSite=Lax; Secure`,
+                                    ],
+                                };
+                            }
+                        }
                         resolve(response);
                     }else{
                         return this.handleNoMatchedAction(ctx, resolver);
                     }
+
                 } catch(err){ 
                     const wrappedError = err instanceof Error ? err : new Error("Error: " + String(err));
                     reject(wrappedError);

package/src/LambderCaller.ts

@@ -101,7 +101,7 @@ export default class LambderCaller {
                 activeFetchList: this.fetchTrackerList.filter(v=>!v.done)
             });
             const version = this.apiVersion;
-            const token = Cookies.get("LMBDRTOKEN") || "";
+            const token = Cookies.get("LMDRSESSIONCSTK") || "";
             const siteHost = window.location.hostname;
             let data = await fetch(this.apiPath, {
                 method: 'POST', mode: 'same-origin', cache: 'no-cache',

package/src/LambderSession.ts

@@ -116,6 +116,16 @@ export default class LambderSession{
         return session;
     }
 
+    public async editSession(
+        session: LambderSessionContext,
+        newData?: any
+    ): Promise<LambderSessionContext> {
+        if(!session) throw "Invalid session";
+        session.data = newData;
+        await this.ddbPutItem(session);
+        return session;
+    }
+
     public async getSession(sessionToken: string): Promise<LambderSessionContext|null>{
         const [ userKeyHash, sessionSortKey ] = sessionToken.split(":");
         if(!userKeyHash || !sessionSortKey) return null;

package/src/index.ts

@@ -3,4 +3,5 @@ import Lambder from './Lambder.js';
 export default Lambder;
 export { default as LambderCaller } from "./LambderCaller.js";
 export { default as LambderResponseBuilder } from "./LambderResponseBuilder.js";
-export { default as LambderResolver } from "./LambderResolver.js";
+export { default as LambderResolver } from "./LambderResolver.js";
+export { default as LambderSession } from "./LambderSession.js";