@awsless/cli 0.0.46-next.2 → 0.0.46-next.21

package/dist/handlers/{bundle.mjs → bundle.js}

@@ -1,9 +1,15 @@
 // src/feature/bundle/server/handle.ts
 import { patch, unpatch } from "@awsless/json";
 import { ExpectedError, invoke, isErrorResponse } from "@awsless/lambda";
-import { formatRoutePayload, getCurrentRoute, withRoute } from "awsless";
+import { formatRoutePayload, getCurrentRoute, withBundleRouteContext } from "awsless";
 
 // src/feature/bundle/server/resource/util.ts
+var routeType = (route) => {
+  return route.split(":")[1];
+};
+var routeFromResourceName = (name) => {
+  return name.slice(process.env.APP.length + 2).split("--").join(":");
+};
 var asyncRoute = (key, payload) => {
   process.env.THROW_EXPECTED_ERRORS = "1";
   return { key, payload };
@@ -20,7 +26,7 @@ var webRoute = (key, event) => {
 // src/feature/bundle/server/resource/cron.ts
 var cronHandler = (event) => {
   const route = event?.["$awsless-route"];
-  if (typeof route === "string" && route.split(":")[1] === "cron") {
+  if (typeof route === "string" && routeType(route) === "cron") {
     return asyncRoute(route, event.event);
   }
   return;
@@ -29,7 +35,7 @@ var cronHandler = (event) => {
 // src/feature/bundle/server/resource/function.ts
 var functionHandler = (event) => {
   const route = event?.["$awsless-route"];
-  if (typeof route === "string" && route.split(":")[1] === "function") {
+  if (typeof route === "string" && routeType(route) === "function") {
     return {
       key: route,
       payload: event.event
@@ -42,7 +48,7 @@ var functionHandler = (event) => {
 var iconHandler = (event) => {
   const route = event?.["$awsless-route"];
   if (typeof route === "string") {
-    if (route.split(":")[1] === "icon") {
+    if (routeType(route) === "icon") {
       return {
         key: route,
         payload: event.event
@@ -51,7 +57,7 @@ var iconHandler = (event) => {
     return;
   }
   const requestRoute = event?.headers?.["x-awsless-route"];
-  if (typeof requestRoute === "string" && requestRoute.split(":")[1] === "icon") {
+  if (typeof requestRoute === "string" && routeType(requestRoute) === "icon") {
     return webRoute(requestRoute, event);
   }
   return;
@@ -61,7 +67,7 @@ var iconHandler = (event) => {
 var imageHandler = (event) => {
   const route = event?.["$awsless-route"];
   if (typeof route === "string") {
-    if (route.split(":")[1] === "image") {
+    if (routeType(route) === "image") {
       return {
         key: route,
         payload: event.event
@@ -70,7 +76,7 @@ var imageHandler = (event) => {
     return;
   }
   const requestRoute = event?.headers?.["x-awsless-route"];
-  if (typeof requestRoute === "string" && requestRoute.split(":")[1] === "image") {
+  if (typeof requestRoute === "string" && routeType(requestRoute) === "image") {
     return webRoute(requestRoute, event);
   }
   return;
@@ -80,13 +86,13 @@ var imageHandler = (event) => {
 var logHandler = (event) => {
   const route = event?.["$awsless-route"];
   if (typeof route === "string") {
-    if (route.split(":")[1] === "on-error-log") {
+    if (routeType(route) === "on-error-log") {
       return asyncRoute(route, event.event);
     }
     return;
   }
   if (typeof event?.awslogs?.data === "string") {
-    return asyncRoute(`${process.env.APP}:on-error-log:handler`, event);
+    return asyncRoute("base:on-error-log:handler", event);
   }
   return;
 };
@@ -98,8 +104,8 @@ var metricHandler = (event) => {
   }
   if (event?.source === "aws.cloudwatch" && typeof event.alarmArn === "string") {
     const alarmName = event.alarmArn.split(":alarm:").at(-1);
-    const route = alarmName.slice(process.env.APP.length + 2).split("--").join(":");
-    if (route.split(":")[1] === "metric") {
+    const route = routeFromResourceName(alarmName);
+    if (routeType(route) === "metric") {
       return asyncRoute(route, event);
     }
   }
@@ -109,19 +115,8 @@ var metricHandler = (event) => {
 // src/feature/bundle/server/resource/on-failure.ts
 var onFailureHandler = (event) => {
   const route = event?.["$awsless-route"];
-  if (typeof route === "string") {
-    if (route.split(":")[1] === "on-failure") {
-      return asyncRoute(route, event.event);
-    }
-    return;
-  }
-  if (typeof event?.headers?.["x-awsless-route"] === "string") {
-    return;
-  }
-  const record = event?.Records?.[0];
-  const eventSourceArn = record?.eventSourceARN;
-  if (record?.eventSource === "aws:sqs" && typeof eventSourceArn === "string" && eventSourceArn.endsWith(":" + process.env.APP + "--on-failure--failure")) {
-    return asyncRoute(`${process.env.APP}:on-failure:normalizer`, event);
+  if (typeof route === "string" && routeType(route) === "on-failure") {
+    return asyncRoute(route, event.event);
   }
   return;
 };
@@ -131,7 +126,7 @@ var eventTypes = ["connected", "disconnected", "subscribed", "unsubscribed"];
 var pubsubHandler = (event, routes) => {
   const route = event?.["$awsless-route"];
   if (typeof route === "string") {
-    if (route.split(":")[1] === "pubsub") {
+    if (routeType(route) === "pubsub") {
       if (eventTypes.some((type) => route.endsWith(`-${type}`))) {
         return asyncRoute(route, event.event);
       }
@@ -172,7 +167,7 @@ var pubsubHandler = (event, routes) => {
 var queueHandler = (event) => {
   const route = event?.["$awsless-route"];
   if (typeof route === "string") {
-    if (route.split(":")[1] === "queue") {
+    if (routeType(route) === "queue") {
       return asyncRoute(route, event.event);
     }
     return;
@@ -182,9 +177,9 @@ var queueHandler = (event) => {
   }
   const record = event?.Records?.[0];
   if (record?.eventSource === "aws:sqs" && typeof record.eventSourceARN === "string") {
-    const resourceName = record.eventSourceARN.split(":").at(-1);
-    const route2 = resourceName.replace(/\.fifo$/, "").slice(process.env.APP.length + 2).split("--").join(":");
-    if (route2.split(":")[1] === "queue") {
+    const queueName = record.eventSourceARN.split(":").at(-1);
+    const route2 = routeFromResourceName(queueName.replace(/\.fifo$/, ""));
+    if (routeType(route2) === "queue") {
       return asyncRoute(route2, event);
     }
   }
@@ -197,7 +192,19 @@ var restHandler = (event) => {
     return;
   }
   const route = event?.headers?.["x-awsless-route"];
-  if (typeof route === "string" && route.split(":")[1] === "rest") {
+  if (typeof route === "string" && routeType(route) === "rest") {
+    return webRoute(route, event);
+  }
+  return;
+};
+
+// src/feature/bundle/server/resource/route.ts
+var routeHandler = (event) => {
+  if (typeof event?.["$awsless-route"] === "string") {
+    return;
+  }
+  const route = event?.headers?.["x-awsless-route"];
+  if (typeof route === "string" && routeType(route) === "route") {
     return webRoute(route, event);
   }
   return;
@@ -207,7 +214,7 @@ var restHandler = (event) => {
 var rpcHandler = (event) => {
   const route = event?.["$awsless-route"];
   if (typeof route === "string") {
-    if (route.split(":")[1] === "rpc") {
+    if (routeType(route) === "rpc") {
       return {
         key: route,
         payload: event.event
@@ -216,7 +223,7 @@ var rpcHandler = (event) => {
     return;
   }
   const requestRoute = event?.headers?.["x-awsless-route"];
-  if (typeof requestRoute === "string" && requestRoute.split(":")[1] === "rpc") {
+  if (typeof requestRoute === "string" && routeType(requestRoute) === "rpc") {
     return webRoute(requestRoute, event);
   }
   return;
@@ -228,7 +235,7 @@ var siteHandler = (event) => {
     return;
   }
   const route = event?.headers?.["x-awsless-route"];
-  if (typeof route === "string" && route.split(":")[1] === "site") {
+  if (typeof route === "string" && routeType(route) === "site") {
     return webRoute(route, event);
   }
   return;
@@ -238,7 +245,7 @@ var siteHandler = (event) => {
 var storeHandler = (event) => {
   const requestedRoute = event?.["$awsless-route"];
   if (typeof requestedRoute === "string") {
-    if (requestedRoute.split(":")[1] === "store") {
+    if (routeType(requestedRoute) === "store") {
       return asyncRoute(requestedRoute, event.event);
     }
     return;
@@ -248,7 +255,7 @@ var storeHandler = (event) => {
   }
   const record = event?.Records?.[0];
   const route = record?.s3?.configurationId;
-  if (record?.eventSource === "aws:s3" && typeof route === "string" && route.split(":")[1] === "store") {
+  if (record?.eventSource === "aws:s3" && typeof route === "string" && routeType(route) === "store") {
     return asyncRoute(route, event);
   }
   return;
@@ -262,8 +269,8 @@ var tableHandler = (event) => {
   const record = event?.Records?.[0];
   if (record?.eventSource === "aws:dynamodb" && typeof record.eventSourceARN === "string") {
     const tableName = record.eventSourceARN.split("/")[1];
-    const route = tableName.slice(process.env.APP.length + 2).split("--").join(":");
-    if (route.split(":")[1] === "table") {
+    const route = routeFromResourceName(tableName);
+    if (routeType(route) === "table") {
       return asyncRoute(route, event);
     }
   }
@@ -273,7 +280,7 @@ var tableHandler = (event) => {
 // src/feature/bundle/server/resource/task.ts
 var taskHandler = (event) => {
   const route = event?.["$awsless-route"];
-  if (typeof route === "string" && route.split(":")[1] === "task") {
+  if (typeof route === "string" && routeType(route) === "task") {
     return asyncRoute(route, event.event);
   }
   return;
@@ -283,7 +290,7 @@ var taskHandler = (event) => {
 var topicHandler = (event, routes) => {
   const route = event?.["$awsless-route"];
   if (typeof route === "string") {
-    if (route.split(":")[1] === "topic") {
+    if (routeType(route) === "topic") {
       return asyncRoute(route, event.event);
     }
     return;
@@ -325,6 +332,7 @@ var createBundle = (handlers) => {
     topicHandler,
     taskHandler,
     restHandler,
+    routeHandler,
     rpcHandler,
     siteHandler,
     storeHandler,
@@ -338,8 +346,7 @@ var createBundle = (handlers) => {
         return match;
       }
     }
-    const route = event?.["$awsless-route"] ?? event?.headers?.["x-awsless-route"];
-    throw new Error("Unknown bundle route: " + route);
+    throw new Error(`Unknown bundle route: ${event?.["$awsless-route"] ?? event?.headers?.["x-awsless-route"]} `);
   };
   return async (event, context) => {
     const handleRoute = (match2) => {
@@ -348,13 +355,13 @@ var createBundle = (handlers) => {
         throw new Error("Unknown bundle route: " + match2.key);
       }
       process.env.AWSLESS_ROUTE = match2.key;
-      return withRoute(match2.key, invokeRoute, async () => {
+      return withBundleRouteContext(match2.key, internalInvoke, async () => {
         const handle = await load();
         const routedContext = { ...context, route: match2.key };
         return handle(match2.payload ?? {}, routedContext);
       });
     };
-    const invokeRoute = async (key, payload) => {
+    const internalInvoke = async (key, payload) => {
       const caller = getCurrentRoute();
       const throwExpectedErrors = process.env.THROW_EXPECTED_ERRORS;
       let result;