lambder 1.0.29 → 1.0.31

package/dist/Lambder.d.ts

@@ -35,6 +35,9 @@ type HookBeforeRenderFunction = (renderContext: RenderContext, resolver: Resolve
 type HookAfterRenderFunction = (renderContext: RenderContext, resolver: Resolver, renderResult: ResolverResponse) => ResolverResponse | Promise<ResolverResponse>;
 type HookFallbackFunction = (renderContext: RenderContext, resolver: Resolver) => ResolverResponse | Promise<ResolverResponse>;
 type HookCompletedFunction = (renderResult: ResolverResponse) => ResolverResponse | Promise<ResolverResponse>;
+type GlobalErrorHandlerFunction = (err: Error, renderContext: RenderContext | null) => ResolverResponse | Promise<ResolverResponse>;
+type RouteFallbackHandlerFunction = (renderContext: RenderContext, resolver: Resolver) => ResolverResponse;
+type ApiFallbackHandlerFunction = (renderContext: RenderContext, resolver: Resolver) => ResolverResponse;
 export declare const createContext: (event: APIGatewayProxyEvent, lambdaContext: Context) => RenderContext;
 export default class Lambder {
     private apiPath;
@@ -52,9 +55,9 @@ export default class Lambder {
         apiVersion?: string;
         isCorsEnabled?: boolean;
     });
-    setRouteFallbackHandler(routeFallbackHandler: (renderContext: RenderContext, resolver: Resolver) => ResolverResponse): void;
-    setApiFallbackHandler(apiFallbackHandler: (renderContext: RenderContext, resolver: Resolver) => ResolverResponse): void;
-    setGlobalErrorHandler(globalErrorHandler: (err: Error) => ResolverResponse): void;
+    setRouteFallbackHandler(routeFallbackHandler: RouteFallbackHandlerFunction): void;
+    setApiFallbackHandler(apiFallbackHandler: ApiFallbackHandlerFunction): void;
+    setGlobalErrorHandler(globalErrorHandler: GlobalErrorHandlerFunction): void;
     private validateSession;
     private handleNoMatchedAction;
     addModule(moduleFn: Function): Promise<void>;

package/dist/Lambder.js

@@ -147,8 +147,10 @@ export default class Lambder {
         }
     }
     async render(event, lambdaContext) {
+        let eventRenderContext = null;
         try {
             let renderContext = createContext(event, lambdaContext);
+            eventRenderContext = renderContext;
             return await new Promise(async (resolve, reject) => {
                 const resolver = new Resolver({
                     isCorsEnabled: this.isCorsEnabled,
@@ -187,7 +189,7 @@ export default class Lambder {
         catch (err) {
             const wrappedError = err instanceof Error ? err : new Error("Error: " + String(err));
             if (this.globalErrorHandler) {
-                return this.globalErrorHandler(wrappedError);
+                return this.globalErrorHandler(wrappedError, eventRenderContext);
             }
             return { statusCode: 500, body: "Internal Server Error.", };
         }

package/package.json

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

package/src/Lambder.ts

@@ -36,6 +36,10 @@ type HookAfterRenderFunction = (renderContext: RenderContext, resolver: Resolver
 type HookFallbackFunction = (renderContext: RenderContext, resolver: Resolver) => ResolverResponse|Promise<ResolverResponse>;
 type HookCompletedFunction = (renderResult: ResolverResponse) => ResolverResponse|Promise<ResolverResponse>;
 
+type GlobalErrorHandlerFunction = (err: Error, renderContext: RenderContext|null) => ResolverResponse|Promise<ResolverResponse>;
+type RouteFallbackHandlerFunction = (renderContext:RenderContext, resolver: Resolver) => ResolverResponse;
+type ApiFallbackHandlerFunction = (renderContext:RenderContext, resolver: Resolver) => ResolverResponse;
+
 type HookEventType = "created"|"beforeRender"|"afterRender"|"fallback"|"completed";
 type HookListType = { 
     priority: number, 
@@ -77,9 +81,9 @@ export default class Lambder {
         "fallback": { priority: number, hookFn: HookFallbackFunction }[],
         "completed": { priority: number, hookFn: HookCompletedFunction }[]
     };
-    private globalErrorHandler: Function|null = null;
-    private routeFallbackHandler: Function|null = null;
-    private apiFallbackHandler: Function|null = null;
+    private globalErrorHandler: GlobalErrorHandlerFunction|null = null;
+    private routeFallbackHandler: RouteFallbackHandlerFunction|null = null;
+    private apiFallbackHandler: ApiFallbackHandlerFunction|null = null;
 
     constructor(
         { publicPath, apiPath, apiVersion, isCorsEnabled, }: 
@@ -99,13 +103,13 @@ export default class Lambder {
         };
     }
 
-    setRouteFallbackHandler(routeFallbackHandler: (renderContext:RenderContext, resolver: Resolver)=>ResolverResponse){
+    setRouteFallbackHandler(routeFallbackHandler: RouteFallbackHandlerFunction){
         this.routeFallbackHandler = routeFallbackHandler;
     }
-    setApiFallbackHandler(apiFallbackHandler: (renderContext:RenderContext, resolver: Resolver)=>ResolverResponse){
+    setApiFallbackHandler(apiFallbackHandler: ApiFallbackHandlerFunction){
         this.apiFallbackHandler = apiFallbackHandler;
     }
-    setGlobalErrorHandler(globalErrorHandler: (err: Error)=>ResolverResponse){
+    setGlobalErrorHandler(globalErrorHandler: GlobalErrorHandlerFunction){
         this.globalErrorHandler = globalErrorHandler;
     }
 
@@ -222,8 +226,11 @@ export default class Lambder {
         event: APIGatewayProxyEvent,
         lambdaContext: Context
     ): Promise<ResolverResponse>{
+        let eventRenderContext:RenderContext|null = null;
+
         try {
-            let renderContext:RenderContext = createContext(event, lambdaContext)
+            let renderContext = createContext(event, lambdaContext);
+            eventRenderContext = renderContext;
 
             return await new Promise(async (
                 resolve:(renderResult: ResolverResponse)=>void,
@@ -263,9 +270,8 @@ export default class Lambder {
             });
         }catch(err){
             const wrappedError = err instanceof Error ? err : new Error("Error: " + String(err));
-
             if(this.globalErrorHandler){
-                return this.globalErrorHandler(wrappedError);
+                return this.globalErrorHandler(wrappedError, eventRenderContext);
             }
             return { statusCode: 500, body: "Internal Server Error.", }