lambder 2.0.15 → 2.0.18

package/dist/Lambder.js

@@ -175,7 +175,7 @@ export default class Lambder {
                         return await this.apiInputValidationErrorHandler(ctx, resolver, inputResult.error);
                     }
                     return resolver.raw({
-                        statusCode: 400,
+                        statusCode: 422,
                         body: JSON.stringify({ error: "Input validation failed", zodError: inputResult.error }),
                         multiValueHeaders: { "Content-Type": ["application/json"] }
                     });
@@ -267,7 +267,7 @@ export default class Lambder {
                 try {
                     const resolver = this.getResolver(ctx, resolve, reject);
                     if (ctx.method === "OPTIONS")
-                        return resolver.cors();
+                        return resolve(resolver.cors());
                     const firstMatchedAction = this.actionList.find(action => action.conditionFn(ctx));
                     if (firstMatchedAction) {
                         // Check version if provided by the client and the server

package/dist/LambderCaller.d.ts

@@ -1,5 +1,6 @@
 import { LambderApiResponse } from './LambderResponseBuilder';
 import type { ApiContractShape } from './LambderApiContract';
+import type { z } from "zod";
 type VoidFunction = () => void | Promise<void>;
 type FetchTracker = {
     apiName: string;
@@ -21,6 +22,7 @@ type FetchEndEventHandler = (params: {
     activeFetchList: FetchTracker[];
 }) => void | Promise<void>;
 type ErrorHandler = (err: Error) => void | Promise<void>;
+type ValidationErrorHandler = (zodError: z.ZodError) => (void | false) | Promise<(void | false)>;
 type MessageHandler = (message: any) => void | Promise<void>;
 export default class LambderCaller<TContract extends ApiContractShape = any> {
     private isCorsEnabled;
@@ -34,11 +36,12 @@ export default class LambderCaller<TContract extends ApiContractShape = any> {
     private errorMessageHandler?;
     private notAuthorizedHandler?;
     private errorHandler?;
+    private apiInputValidationErrorHandler?;
     private fetchStartedHandler?;
     private fetchEndedHandler?;
     private sessionTokenCookieKey;
     private sessionCsrfCookieKey;
-    constructor({ apiPath, apiVersion, isCorsEnabled, versionExpiredHandler, sessionExpiredHandler, messageHandler, errorMessageHandler, notAuthorizedHandler, errorHandler, fetchStartedHandler, fetchEndedHandler, }: {
+    constructor({ apiPath, apiVersion, isCorsEnabled, versionExpiredHandler, sessionExpiredHandler, messageHandler, errorMessageHandler, notAuthorizedHandler, errorHandler, fetchStartedHandler, fetchEndedHandler, apiInputValidationErrorHandler, }: {
         apiPath: string;
         apiVersion?: string;
         isCorsEnabled: boolean;
@@ -50,6 +53,7 @@ export default class LambderCaller<TContract extends ApiContractShape = any> {
         errorHandler?: ErrorHandler;
         fetchStartedHandler?: FetchStartEventHandler;
         fetchEndedHandler?: FetchEndEventHandler;
+        apiInputValidationErrorHandler?: ValidationErrorHandler;
     });
     setSessionCookieKey(sessionTokenCookieKey: string, sessionCsrfCookieKey: string): void;
     apiRaw<TApiName extends keyof TContract & string = string, TOutput = TApiName extends keyof TContract ? TContract[TApiName]['output'] : any>(apiName: TApiName, payload?: TApiName extends keyof TContract ? TContract[TApiName]['input'] : any, options?: {
@@ -58,6 +62,7 @@ export default class LambderCaller<TContract extends ApiContractShape = any> {
         sessionExpiredHandler?: VoidFunction;
         messageHandler?: MessageHandler;
         errorMessageHandler?: MessageHandler;
+        apiInputValidationErrorHandler?: ValidationErrorHandler;
         notAuthorizedHandler?: VoidFunction;
         errorHandler?: ErrorHandler;
         fetchStartedHandler?: FetchStartEventHandler;

package/dist/LambderCaller.js

@@ -11,11 +11,12 @@ export default class LambderCaller {
     errorMessageHandler;
     notAuthorizedHandler;
     errorHandler;
+    apiInputValidationErrorHandler;
     fetchStartedHandler;
     fetchEndedHandler;
     sessionTokenCookieKey = "LMDRSESSIONTKID";
     sessionCsrfCookieKey = "LMDRSESSIONCSTK";
-    constructor({ apiPath, apiVersion, isCorsEnabled = false, versionExpiredHandler, sessionExpiredHandler, messageHandler, errorMessageHandler, notAuthorizedHandler, errorHandler, fetchStartedHandler, fetchEndedHandler, }) {
+    constructor({ apiPath, apiVersion, isCorsEnabled = false, versionExpiredHandler, sessionExpiredHandler, messageHandler, errorMessageHandler, notAuthorizedHandler, errorHandler, fetchStartedHandler, fetchEndedHandler, apiInputValidationErrorHandler, }) {
         this.apiPath = apiPath ?? "/api";
         this.apiVersion = apiVersion;
         this.isCorsEnabled = isCorsEnabled;
@@ -25,6 +26,7 @@ export default class LambderCaller {
         this.errorMessageHandler = errorMessageHandler;
         this.notAuthorizedHandler = notAuthorizedHandler;
         this.errorHandler = errorHandler;
+        this.apiInputValidationErrorHandler = apiInputValidationErrorHandler;
         this.fetchStartedHandler = fetchStartedHandler;
         this.fetchEndedHandler = fetchEndedHandler;
     }
@@ -54,6 +56,17 @@ export default class LambderCaller {
             }).then(async (res) => {
                 if (res.status >= 500)
                     throw new Error("Request failed: " + res.status + " - " + res.statusText);
+                if (res.status === 422) {
+                    const errorData = await res.json();
+                    if (this.apiInputValidationErrorHandler) {
+                        await this.apiInputValidationErrorHandler(errorData.zodError);
+                    }
+                    else if (this.errorHandler) {
+                        await this.errorHandler(new Error("API Input Validation Error", { cause: errorData.zodError }));
+                    }
+                    return null;
+                }
+                ;
                 if (res.headers.get("Content-Type")?.includes("application/lambder-json-stream")) {
                     const decompressed = res.json();
                     return decompressed;
@@ -114,7 +127,7 @@ export default class LambderCaller {
             return data;
         }
         catch (err) {
-            const wrappedError = err instanceof Error ? err : new Error("Error: " + String(err));
+            const wrappedError = err instanceof Error ? err : new Error("Error: ", { cause: err });
             fetchTracker.done = true;
             if (!fetchTracker.fetchEndCalled && this.fetchEndedHandler) {
                 await this.fetchEndedHandler({

package/package.json

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

package/src/Lambder.ts

@@ -240,7 +240,7 @@ export default class Lambder<TSessionData = any, _TContract extends Record<strin
                         return await this.apiInputValidationErrorHandler(ctx, resolver, inputResult.error);
                     }
                     return resolver.raw({
-                        statusCode: 400,
+                        statusCode: 422,
                         body: JSON.stringify({ error: "Input validation failed", zodError: inputResult.error }),
                         multiValueHeaders: { "Content-Type": ["application/json"] }
                     });
@@ -367,7 +367,7 @@ export default class Lambder<TSessionData = any, _TContract extends Record<strin
             )=> {
                 try{
                     const resolver = this.getResolver(ctx, resolve, reject);
-                    if(ctx.method === "OPTIONS") return resolver.cors();
+                    if(ctx.method === "OPTIONS") return resolve(resolver.cors());
         
                     const firstMatchedAction = this.actionList.find(action => action.conditionFn(ctx));
                     if(firstMatchedAction){

package/src/LambderCaller.ts

@@ -1,6 +1,7 @@
 import Cookies from 'js-cookie';
 import { LambderApiResponse } from './LambderResponseBuilder';
 import type { ApiContractShape } from './LambderApiContract';
+import type { z } from "zod";
 
 type VoidFunction = ()=>void|Promise<void>;
 type FetchTracker = { apiName: string, done: boolean, fetchEndCalled: boolean };
@@ -22,6 +23,7 @@ type FetchEndEventHandler = (params: {
 })=>void|Promise<void>;
 
 type ErrorHandler = (err: Error) => void|Promise<void>;
+type ValidationErrorHandler = (zodError: z.ZodError) => (void|false)|Promise<(void|false)>;
 type MessageHandler = (message:any) => void|Promise<void>;
 
 export default class LambderCaller<TContract extends ApiContractShape = any> {
@@ -39,6 +41,7 @@ export default class LambderCaller<TContract extends ApiContractShape = any> {
     private errorMessageHandler?: MessageHandler;
     private notAuthorizedHandler?: VoidFunction;
     private errorHandler?: ErrorHandler;
+    private apiInputValidationErrorHandler?: ValidationErrorHandler;
     
     private fetchStartedHandler?: FetchStartEventHandler;
     private fetchEndedHandler?: FetchEndEventHandler;
@@ -54,6 +57,7 @@ export default class LambderCaller<TContract extends ApiContractShape = any> {
             messageHandler, errorMessageHandler,
             notAuthorizedHandler, errorHandler,
             fetchStartedHandler, fetchEndedHandler,
+            apiInputValidationErrorHandler,
         }: 
         { 
             apiPath: string,
@@ -67,6 +71,7 @@ export default class LambderCaller<TContract extends ApiContractShape = any> {
             errorHandler?: ErrorHandler, 
             fetchStartedHandler?: FetchStartEventHandler, 
             fetchEndedHandler?: FetchEndEventHandler,
+            apiInputValidationErrorHandler?: ValidationErrorHandler,
         }
     ){
         this.apiPath = apiPath ?? "/api";
@@ -80,6 +85,7 @@ export default class LambderCaller<TContract extends ApiContractShape = any> {
         this.errorMessageHandler = errorMessageHandler;
         this.notAuthorizedHandler = notAuthorizedHandler;
         this.errorHandler = errorHandler;
+        this.apiInputValidationErrorHandler = apiInputValidationErrorHandler;
         
         this.fetchStartedHandler = fetchStartedHandler; 
         this.fetchEndedHandler = fetchEndedHandler;
@@ -103,6 +109,7 @@ export default class LambderCaller<TContract extends ApiContractShape = any> {
             sessionExpiredHandler?: VoidFunction, 
             messageHandler?: MessageHandler,
             errorMessageHandler?: MessageHandler,
+            apiInputValidationErrorHandler?: ValidationErrorHandler,
             notAuthorizedHandler?: VoidFunction, 
             errorHandler?: ErrorHandler, 
             fetchStartedHandler?: FetchStartEventHandler, 
@@ -127,6 +134,15 @@ export default class LambderCaller<TContract extends ApiContractShape = any> {
                 body: JSON.stringify({ apiName, version, token, siteHost, payload, }),
             }).then(async (res)=>{
                 if(res.status >= 500) throw new Error("Request failed: " + res.status + " - " + res.statusText);
+                if(res.status === 422){
+                    const errorData: { error: string, zodError: z.ZodError } = await res.json();
+                    if(this.apiInputValidationErrorHandler){
+                        await this.apiInputValidationErrorHandler(errorData.zodError);                        
+                    }else if(this.errorHandler){
+                        await this.errorHandler(new Error("API Input Validation Error", { cause: errorData.zodError }));
+                    }
+                    return null;
+                };
                 if(res.headers.get("Content-Type")?.includes("application/lambder-json-stream")){ 
                     const decompressed = res.json();
                     return decompressed;
@@ -182,7 +198,7 @@ export default class LambderCaller<TContract extends ApiContractShape = any> {
             }
             return data;
         }catch(err){
-            const wrappedError = err instanceof Error ? err : new Error("Error: " + String(err));
+            const wrappedError = err instanceof Error ? err : new Error("Error: ", { cause: err });
             fetchTracker.done = true;
             if(!fetchTracker.fetchEndCalled && this.fetchEndedHandler){
                 await this.fetchEndedHandler({

package/tests/error-handling.test.ts

@@ -441,7 +441,7 @@ describe('Error Handling - Input Validation Errors', () => {
         });
         const result = await handler(event, createMockContext());
 
-        expect(result.statusCode).toBe(400);
+        expect(result.statusCode).toBe(422);
         const body = JSON.parse(result.body || '{}');
         expect(body.error).toBe('Input validation failed');
         expect(body.zodError).toBeDefined();
@@ -467,7 +467,7 @@ describe('Error Handling - Input Validation Errors', () => {
         const event = createMockEvent('/api', 'POST', 'testApi', { value: 'abc' }); // Too short
         const result = await handler(event, createMockContext());
 
-        expect(result.statusCode).toBe(400);
+        expect(result.statusCode).toBe(422);
     });
 });