lambder 3.2.4 → 3.2.6

package/dist/Lambder.js

@@ -431,22 +431,26 @@ export default class Lambder {
         }
         catch (err) {
             const wrappedError = err instanceof Error ? err : new Error("Error: " + String(err));
+            // ctx may be null (createContext failed): derive the format from the raw event.
+            const eventFormat = ctx?._otherInternal.eventFormat ?? (isV2HttpEvent(event) ? "v2" : "v1");
             try {
                 if (this.globalErrorHandler) {
                     const responseBuilder = this.getResponseBuilder(ctx ?? undefined);
                     const errorResponse = await this.globalErrorHandler(wrappedError, ctx, responseBuilder, ctx?._otherInternal.logToApiResponseAccumulator);
-                    return await finalizeResponse(ctx, errorResponse, this.finalizeOptions, ctx?._otherInternal.eventFormat ?? "v1");
+                    return await finalizeResponse(ctx, errorResponse, this.finalizeOptions, eventFormat);
                 }
             }
             catch (handlerErr) {
                 if (handlerErr instanceof LambderResponse) {
                     try {
-                        return await finalizeResponse(ctx, handlerErr, this.finalizeOptions, ctx?._otherInternal.eventFormat ?? "v1");
+                        return await finalizeResponse(ctx, handlerErr, this.finalizeOptions, eventFormat);
                     }
                     catch { /* fall through */ }
                 }
             }
-            return { statusCode: 500, multiValueHeaders: {}, body: "Internal Server Error.", isBase64Encoded: false };
+            return eventFormat === "v2"
+                ? { statusCode: 500, headers: {}, body: "Internal Server Error.", isBase64Encoded: false }
+                : { statusCode: 500, multiValueHeaders: {}, body: "Internal Server Error.", isBase64Encoded: false };
         }
     }
 }

package/dist/LambderContext.js

@@ -16,6 +16,11 @@ export const createContext = (event, lambdaContext, apiPath) => {
     if (isV2HttpEvent(event)) {
         host = headers.host || event.requestContext.domainName || "";
         path = event.rawPath;
+        // Named stages (non-$default) are included in rawPath; v1 strips them.
+        const stage = event.requestContext.stage;
+        if (stage && stage !== "$default" && (path === `/${stage}` || path.startsWith(`/${stage}/`))) {
+            path = path.slice(stage.length + 1) || "/";
+        }
         method = event.requestContext.http.method;
         get = {};
         for (const [key, value] of new URLSearchParams(event.rawQueryString ?? "").entries()) {

package/package.json

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