@easel-sh/cli 0.1.0-alpha.7 → 0.1.0-alpha.9

package/dist/handler-wrapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handler-wrapper.d.ts","sourceRoot":"","sources":["../src/handler-wrapper.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAkRlE"}
+{"version":3,"file":"handler-wrapper.d.ts","sourceRoot":"","sources":["../src/handler-wrapper.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAwRlE"}

package/dist/handler-wrapper.js

@@ -21,6 +21,13 @@ function getModule() {
   return userModulePromise;
 }
 
+function normalizeStatus(status) {
+  // Valid HTTP status is 100-599. Response.status can be 0 for error/opaque (Fetch API).
+  if (typeof status === "number" && status >= 100 && status < 600) return status;
+  if (status === 0) return 502; // error/opaque response
+  return 200;
+}
+
 async function responseToLambda(response) {
   const responseHeaders = {};
   response.headers.forEach((value, key) => {
@@ -28,7 +35,7 @@ async function responseToLambda(response) {
   });
   const body = await response.text();
   return {
-    statusCode: response.status || 200,
+    statusCode: normalizeStatus(response.status),
     headers: responseHeaders,
     body: body,
   };
@@ -49,14 +56,12 @@ module.exports.handler = async (event, _context) => {
   }
 
   const queryParams = { ...(event.queryStringParameters || {}) };
-  let path = "/";
-  const matchedPath = normalizedHeaders["x-matched-path"];
-  if (matchedPath) {
-    path = matchedPath.startsWith("/") ? matchedPath : "/" + matchedPath;
-  } else {
-    path = isV2 ? event.rawPath || event.path || "/" : event.path || "/";
-  }
-
+  // Prefer original client path from router when present so Lambda sees the same URL the client requested (event.rawPath may be wrong if event was built by API Gateway or an older gateway)
+  const originalPath = normalizedHeaders["x-router-original-path"];
+  const pathFromEvent = isV2 ? event.rawPath || event.path || "/" : event.path || "/";
+  const path = (originalPath && originalPath.trim())
+    ? (originalPath.trim().startsWith("/") ? originalPath.trim() : "/" + originalPath.trim())
+    : pathFromEvent;
   const host = event.headers?.host || event.headers?.["host"] || "localhost";
   const url = new URL(path, "http://" + host);
   Object.entries(queryParams).forEach(([key, value]) => {
@@ -180,10 +185,11 @@ module.exports.handler = async (event, _context) => {
     const headers = {};
     let body = "";
     let headersSent = false;
+    let resolved = false;
 
     function finishRes() {
-      if (headersSent) return;
-      headersSent = true;
+      if (resolved) return;
+      resolved = true;
       const out = {};
       Object.entries(headers).forEach(([k, v]) => {
         out[k] = Array.isArray(v) ? v.join(", ") : v;

package/dist/handler-wrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"handler-wrapper.js","sourceRoot":"","sources":["../src/handler-wrapper.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,UAAU,sBAAsB,CAAC,WAAmB;IACxD,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,GAAG,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;IAC3E,OAAO;;;;;;;;;;iCAUwB,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqQ3C,CAAC;AACF,CAAC"}
+{"version":3,"file":"handler-wrapper.js","sourceRoot":"","sources":["../src/handler-wrapper.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,UAAU,sBAAsB,CAAC,WAAmB;IACxD,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,GAAG,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;IAC3E,OAAO;;;;;;;;;;iCAUwB,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2Q3C,CAAC;AACF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easel-sh/cli",
-  "version": "0.1.0-alpha.7",
+  "version": "0.1.0-alpha.9",
   "type": "module",
   "bin": {
     "cli": "./dist/cli.js"