lambder 1.0.140 → 1.0.142

package/dist/Lambder.js

@@ -236,6 +236,14 @@ export default class Lambder {
                         return resolver.cors();
                     const firstMatchedAction = this.actionList.find(action => action.conditionFn(ctx));
                     if (firstMatchedAction) {
+                        // Check version if provided by the client and the server
+                        if (this.apiVersion && ctx.post?.apiVersion) {
+                            if (ctx.post.apiVersion !== this.apiVersion) {
+                                const responseBuilder = this.getResponseBuilder();
+                                return resolve(responseBuilder.versionExpired());
+                            }
+                        }
+                        ;
                         // Run beforeRender hooks
                         for (const hook of this.hookList["beforeRender"]) {
                             const hookCtx = await hook.hookFn(ctx, resolver);

package/dist/LambderMSW.js

@@ -31,7 +31,8 @@ export default class LambderMSW {
         return this.http.post(this.apiPath, async ({ request }) => {
             let body;
             try {
-                body = await request.json();
+                const clonedRequest = request.clone();
+                body = await clonedRequest.json();
             }
             catch (parseErr) {
                 // If JSON parsing fails, return undefined to let other handlers try
@@ -40,15 +41,12 @@ export default class LambderMSW {
             }
             // Check if body is valid and has apiName
             if (!body || typeof body.apiName !== 'string') {
-                // Invalid request format, let other handlers try
                 return;
             }
-            console.log("LambderMSW called for:", body.apiName, "matching against:", apiName);
-            // Check if this is the API we're mocking
             if (body.apiName !== apiName) {
-                // If this handler doesn't match, return undefined to let MSW try other handlers
                 return;
             }
+            console.log("LambderMSW called for:", body.apiName);
             try {
                 // Add artificial delay if specified
                 if (options?.delay) {

package/dist/LambderResponseBuilder.d.ts

@@ -42,11 +42,12 @@ export default class LambderResponseBuilder<TContract extends ApiContractShape =
     html(data: string, headers?: Record<string, string | string[]>): LambderResolverResponse;
     status301(url: string, headers?: Record<string, string | string[]>): LambderResolverResponse;
     status404(data: string, headers?: Record<string, string | string[]>): LambderResolverResponse;
+    versionExpired(headers?: Record<string, string | string[]>): LambderResolverResponse;
     cors(): LambderResolverResponse;
     fileBase64(fileBase64: string, mimeType: string, headers?: Record<string, string | string[]>): LambderResolverResponse;
     file(filePath: string, headers?: Record<string, string | string[]>, fallbackFilePath?: string): Promise<LambderResolverResponse>;
     ejsTemplate(template: string, pageData: Record<string, any>, headers?: Record<string, string | string[]>): Promise<LambderResolverResponse>;
     ejsFile(filePath: string, pageData: Record<string, any>, headers?: Record<string, string | string[]>): Promise<LambderResolverResponse>;
     api<T = any>(payload: T | null, { versionExpired, sessionExpired, notAuthorized, message, errorMessage, logList, }?: LambderApiResponseConfig, headers?: Record<string, string | string[]>): LambderResolverResponse;
-    private apiBinary;
+    apiBinary<T = any>(payload: T | null, { versionExpired, sessionExpired, notAuthorized, message, errorMessage, logList, }?: LambderApiResponseConfig, headers?: Record<string, string | string[]>): LambderResolverResponse;
 }

package/dist/LambderResponseBuilder.js

@@ -127,6 +127,10 @@ export default class LambderResponseBuilder {
         });
     }
     ;
+    versionExpired(headers) {
+        return this.api(null, { versionExpired: true }, headers);
+    }
+    ;
     cors() {
         return this.raw({
             statusCode: 200,

package/package.json

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

package/src/Lambder.ts

@@ -377,6 +377,13 @@ export default class Lambder<TContract extends ApiContractShape = any> {
         
                     const firstMatchedAction = this.actionList.find(action => action.conditionFn(ctx));
                     if(firstMatchedAction){
+                        // Check version if provided by the client and the server
+                        if(this.apiVersion && ctx.post?.apiVersion){
+                            if(ctx.post.apiVersion !== this.apiVersion){
+                                const responseBuilder = this.getResponseBuilder();
+                                return resolve(responseBuilder.versionExpired());
+                            }
+                        };
                         // Run beforeRender hooks
                         for(const hook of this.hookList["beforeRender"]){ 
                             const hookCtx = await hook.hookFn(ctx, resolver);

package/src/LambderMSW.ts

@@ -65,7 +65,8 @@ export default class LambderMSW<TContract extends ApiContractShape = any> {
             let body: any;
             
             try {
-                body = await request.json();
+                const clonedRequest = request.clone();
+                body = await clonedRequest.json();
             } catch (parseErr) {
                 // If JSON parsing fails, return undefined to let other handlers try
                 console.warn("LambderMSW: Failed to parse request body as JSON");
@@ -73,18 +74,10 @@ export default class LambderMSW<TContract extends ApiContractShape = any> {
             }
             
             // Check if body is valid and has apiName
-            if (!body || typeof body.apiName !== 'string') {
-                // Invalid request format, let other handlers try
-                return;
-            }
-            
-            console.log("LambderMSW called for:", body.apiName, "matching against:", apiName);
+            if (!body || typeof body.apiName !== 'string') { return; }
+            if (body.apiName !== apiName) { return; }
             
-            // Check if this is the API we're mocking
-            if (body.apiName !== apiName) {
-                // If this handler doesn't match, return undefined to let MSW try other handlers
-                return;
-            }
+            console.log("LambderMSW called for:", body.apiName);
             
             try {
                 // Add artificial delay if specified

package/src/LambderResponseBuilder.ts

@@ -176,6 +176,12 @@ export default class LambderResponseBuilder<TContract extends ApiContractShape =
         });
     };
 
+	versionExpired(
+        headers?: Record<string, string|string[]>,
+    ):LambderResolverResponse{
+        return this.api(null, { versionExpired: true }, headers);
+    };
+
 	cors():LambderResolverResponse{
         return this.raw({ 
             statusCode: 200,
@@ -275,7 +281,7 @@ export default class LambderResponseBuilder<TContract extends ApiContractShape =
         }, headers);
     };
 
-    private apiBinary<T=any>(
+    apiBinary<T=any>(
         payload: T | null, 
         {
             versionExpired, sessionExpired, notAuthorized,