lambder 1.0.54 → 1.0.55

package/dist/Lambder.js

@@ -199,30 +199,29 @@ export default class Lambder {
             let ctx = createContext(event, lambdaContext);
             eventRenderContext = ctx;
             return await new Promise(async (resolve, reject) => {
-                const resolver = this.getResolver(resolve, reject);
-                if (ctx.method === "OPTIONS")
-                    return resolver.cors();
-                const firstMatchedAction = this.actionList.find(action => action.conditionFn(ctx));
-                if (firstMatchedAction) {
-                    for (const hook of this.hookList["beforeRender"]) {
-                        ctx = await hook.hookFn(ctx, resolver);
+                try {
+                    const resolver = this.getResolver(resolve, reject);
+                    if (ctx.method === "OPTIONS")
+                        return resolver.cors();
+                    const firstMatchedAction = this.actionList.find(action => action.conditionFn(ctx));
+                    if (firstMatchedAction) {
+                        for (const hook of this.hookList["beforeRender"]) {
+                            ctx = await hook.hookFn(ctx, resolver);
+                        }
+                        let response = await firstMatchedAction.actionFn(ctx, resolver);
+                        for (const hook of this.hookList["afterRender"]) {
+                            response = await hook.hookFn(ctx, resolver, response);
+                        }
+                        resolve(response);
                     }
-                    let response = await firstMatchedAction.actionFn(ctx, resolver);
-                    for (const hook of this.hookList["afterRender"]) {
-                        response = await hook.hookFn(ctx, resolver, response);
+                    else {
+                        return this.handleNoMatchedAction(ctx, resolver);
                     }
-                    resolve(response);
                 }
-                else {
-                    return this.handleNoMatchedAction(ctx, resolver);
+                catch (err) {
+                    const wrappedError = err instanceof Error ? err : new Error("Error: " + String(err));
+                    reject(wrappedError);
                 }
-            }).then(async (response) => {
-                for (const hook of this.hookList["completed"]) {
-                    response = await hook.hookFn(response);
-                }
-                return response;
-            }).catch((reason) => {
-                throw reason;
             });
         }
         catch (err) {

package/package.json

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

package/src/Lambder.ts

@@ -280,23 +280,23 @@ export default class Lambder {
                 resolve:(response: ResolverResponse)=>void,
                 reject:(err: Error)=>void
             )=> {
-                const resolver = this.getResolver(resolve, reject);
-                if(ctx.method === "OPTIONS") return resolver.cors();
-    
-                const firstMatchedAction = this.actionList.find(action => action.conditionFn(ctx));
-                if(firstMatchedAction){
-                    for(const hook of this.hookList["beforeRender"]){ ctx = await hook.hookFn(ctx, resolver); }
-                    let response = await firstMatchedAction.actionFn(ctx, resolver);
-                    for(const hook of this.hookList["afterRender"]){ response = await hook.hookFn(ctx, resolver, response); }
-                    resolve(response);
-                }else{
-                    return this.handleNoMatchedAction(ctx, resolver);
+                try{
+                    const resolver = this.getResolver(resolve, reject);
+                    if(ctx.method === "OPTIONS") return resolver.cors();
+        
+                    const firstMatchedAction = this.actionList.find(action => action.conditionFn(ctx));
+                    if(firstMatchedAction){
+                        for(const hook of this.hookList["beforeRender"]){ ctx = await hook.hookFn(ctx, resolver); }
+                        let response = await firstMatchedAction.actionFn(ctx, resolver);
+                        for(const hook of this.hookList["afterRender"]){ response = await hook.hookFn(ctx, resolver, response); }
+                        resolve(response);
+                    }else{
+                        return this.handleNoMatchedAction(ctx, resolver);
+                    }
+                } catch(err){ 
+                    const wrappedError = err instanceof Error ? err : new Error("Error: " + String(err));
+                    reject(wrappedError);
                 }
-            }).then(async (response: ResolverResponse):Promise<ResolverResponse> => {
-                for(const hook of this.hookList["completed"]){ response = await hook.hookFn(response); }
-                return response;
-            }).catch((reason: Error)=>{
-                throw reason;
             })
         }catch(err){
             if(this.globalErrorHandler){