@awsless/cli 0.0.46-next.17 → 0.0.46-next.19

package/dist/bin.js

@@ -56327,7 +56327,7 @@ var require_client2 = __commonJS((exports) => {
 // ../../node_modules/.pnpm/@smithy+core@3.29.7/node_modules/@smithy/core/dist-cjs/submodules/config/index.js
 var require_config = __commonJS((exports) => {
   var { homedir: homedir2 } = __require("os");
-  var { sep: sep2, join: join28 } = __require("path");
+  var { sep: sep2, join: join29 } = __require("path");
   var { createHash: createHash16 } = __require("crypto");
   var { readFile: readFile$1 } = __require("fs/promises");
   var { IniSectionType: IniSectionType2 } = require_dist_cjs();
@@ -56485,7 +56485,7 @@ var require_config = __commonJS((exports) => {
   var getSSOTokenFilepath = (id) => {
     const hasher = createHash16("sha1");
     const cacheName = hasher.update(id).digest("hex");
-    return join28(getHomeDir(), ".aws", "sso", "cache", `${cacheName}.json`);
+    return join29(getHomeDir(), ".aws", "sso", "cache", `${cacheName}.json`);
   };
   var tokenIntercept = {};
   var getSSOTokenFromFile = async (id) => {
@@ -56512,9 +56512,9 @@ var require_config = __commonJS((exports) => {
     ...data.default && { default: data.default }
   });
   var ENV_CONFIG_PATH = "AWS_CONFIG_FILE";
-  var getConfigFilepath = () => process.env[ENV_CONFIG_PATH] || join28(getHomeDir(), ".aws", "config");
+  var getConfigFilepath = () => process.env[ENV_CONFIG_PATH] || join29(getHomeDir(), ".aws", "config");
   var ENV_CREDENTIALS_PATH = "AWS_SHARED_CREDENTIALS_FILE";
-  var getCredentialsFilepath = () => process.env[ENV_CREDENTIALS_PATH] || join28(getHomeDir(), ".aws", "credentials");
+  var getCredentialsFilepath = () => process.env[ENV_CREDENTIALS_PATH] || join29(getHomeDir(), ".aws", "credentials");
   var prefixKeyRegex = /^([\w-]+)\s(["'])?([\w-@+.%:/]+)\2$/;
   var profileNameBlockList = ["__proto__", "profile __proto__"];
   var parseIni = (iniData) => {
@@ -56580,11 +56580,11 @@ var require_config = __commonJS((exports) => {
     const relativeHomeDirPrefix = "~/";
     let resolvedFilepath = filepath;
     if (filepath.startsWith(relativeHomeDirPrefix)) {
-      resolvedFilepath = join28(homeDir, filepath.slice(2));
+      resolvedFilepath = join29(homeDir, filepath.slice(2));
     }
     let resolvedConfigFilepath = configFilepath;
     if (configFilepath.startsWith(relativeHomeDirPrefix)) {
-      resolvedConfigFilepath = join28(homeDir, configFilepath.slice(2));
+      resolvedConfigFilepath = join29(homeDir, configFilepath.slice(2));
     }
     const parsedFiles = await Promise.all([
       readFile13(resolvedConfigFilepath, {
@@ -74177,7 +74177,7 @@ var require_signin = __commonJS((exports) => {
 import { createHash as createHash16, createPrivateKey, createPublicKey, sign } from "crypto";
 import { promises as fs3 } from "fs";
 import { homedir as homedir3 } from "os";
-import { dirname as dirname17, join as join31 } from "path";
+import { dirname as dirname17, join as join32 } from "path";
 var import_config24, import_protocols3, LoginCredentialsFetcher;
 var init_LoginCredentialsFetcher = __esm(() => {
   import_config24 = __toESM(require_config(), 1);
@@ -74336,10 +74336,10 @@ var init_LoginCredentialsFetcher = __esm(() => {
       await fs3.writeFile(tokenFilePath, JSON.stringify(token, null, 2), "utf8");
     }
     getTokenFilePath() {
-      const directory = process.env.AWS_LOGIN_CACHE_DIRECTORY ?? join31(homedir3(), ".aws", "login", "cache");
+      const directory = process.env.AWS_LOGIN_CACHE_DIRECTORY ?? join32(homedir3(), ".aws", "login", "cache");
       const loginSessionBytes = Buffer.from(this.loginSession, "utf8");
       const loginSessionSha256 = createHash16("sha256").update(loginSessionBytes).digest("hex");
-      return join31(directory, `${loginSessionSha256}.json`);
+      return join32(directory, `${loginSessionSha256}.json`);
     }
     derToRawSignature(derSignature) {
       let offset = 2;
@@ -105365,9 +105365,9 @@ var createPubSubService = (parentGroup, ctx, id, props, inputs) => {
     taskDefinition: task2.arn,
     launchType: "FARGATE",
     networkConfiguration: {
-      subnets: ctx.shared.get("vpc", "public-subnets"),
+      subnets: ctx.shared.get("vpc", "private-subnets"),
       securityGroups: [inputs.securityGroupId],
-      assignPublicIp: true
+      assignPublicIp: false
     },
     loadBalancer: [
       {
@@ -106149,7 +106149,7 @@ var searchFeature = defineFeature({
 
 // src/feature/site/index.ts
 import { createHash as createHash12 } from "crypto";
-import { basename as basename3, dirname as dirname12, join as join19 } from "path";
+import { dirname as dirname12, join as join20 } from "path";
 
 // src/util/cache.ts
 import { lstat as lstat3, readdir as readdir4 } from "fs/promises";
@@ -106188,6 +106188,40 @@ var listAllFiles = async (list2) => {
   return files;
 };
 
+// src/feature/site/static-routes.ts
+import { basename as basename3, join as join19 } from "path";
+var planStaticRoutes = (files, sitePath) => {
+  const plan = { files: {}, dirs: [] };
+  const assetDirs = new Set;
+  for (const file2 of files) {
+    if (file2.endsWith(".html")) {
+      const strippedHtmlFile = file2.endsWith("index.html") ? file2.slice(0, -11) : file2.slice(0, -5);
+      const urlFriendlyFile = strippedHtmlFile.endsWith("/") ? strippedHtmlFile.slice(0, -1) : strippedHtmlFile;
+      plan.files[join19(sitePath, urlFriendlyFile)] = file2;
+      continue;
+    }
+    if (!basename3(file2).includes(".")) {
+      plan.files[join19(sitePath, file2)] = file2;
+      continue;
+    }
+    if (sitePath !== "/") {
+      continue;
+    }
+    const firstSegment = file2.split("/")[0];
+    if (file2.includes("/") && !firstSegment.includes(".")) {
+      assetDirs.add(firstSegment);
+      continue;
+    }
+    plan.files[join19(sitePath, file2)] = file2;
+  }
+  if (sitePath === "/") {
+    plan.dirs = [...assetDirs].map((dir) => join19(sitePath, dir, "*."));
+  } else {
+    plan.catchAll = join19(sitePath, "*.");
+  }
+  return plan;
+};
+
 // src/feature/site/index.ts
 var siteFeature = defineFeature({
   name: "site",
@@ -106209,7 +106243,7 @@ var siteFeature = defineFeature({
           return build2(fingerprint, async (write) => {
             const credentialProvider = await getCredentials(ctx.appConfig.profile);
             const credentials2 = await credentialProvider();
-            const cwd = join19(directories.root, dirname12(ctx.stackConfig.file));
+            const cwd = join20(directories.root, dirname12(ctx.stackConfig.file));
             const env2 = {
               ...process.env,
               APP: ctx.appConfig.name,
@@ -106273,7 +106307,7 @@ ${(errors3.trim() || output.trim()).slice(-2000)}`);
               cwd: staticDir,
               nodir: true
             }).sort();
-            const hashes = files.map((file2) => $hash(join19(staticDir, file2)));
+            const hashes = files.map((file2) => $hash(join20(staticDir, file2)));
             const version = $combine(...hashes).pipe((hashes2) => {
               const hash2 = createHash12("sha1");
               for (const [index, file2] of files.entries()) {
@@ -106289,26 +106323,16 @@ ${(errors3.trim() || output.trim()).slice(-2000)}`);
               version
             });
             const staticRoutes = {};
-            for (const file2 of files) {
-              if (file2.endsWith(".html")) {
-                const strippedHtmlFile = file2.endsWith("index.html") ? file2.slice(0, -11) : file2.slice(0, -5);
-                const urlFriendlyFile = strippedHtmlFile.endsWith("/") ? strippedHtmlFile.slice(0, -1) : strippedHtmlFile;
-                const routeFileKey = join19(props.path, urlFriendlyFile);
-                staticRoutes[routeFileKey] = {
-                  type: "s3",
-                  domainName: bucket.regionalDomainName,
-                  rewrite: { to: $interpolate`/${folder}v-${deployment.version}/${file2}` }
-                };
-              } else if (!basename3(file2).includes(".")) {
-                staticRoutes[join19(props.path, file2)] = {
-                  type: "s3",
-                  domainName: bucket.regionalDomainName,
-                  rewrite: { to: $interpolate`/${folder}v-${deployment.version}/${file2}` }
-                };
-              }
+            const plan = planStaticRoutes(files, props.path);
+            for (const [routeFileKey, file2] of Object.entries(plan.files)) {
+              staticRoutes[routeFileKey] = {
+                type: "s3",
+                domainName: bucket.regionalDomainName,
+                rewrite: { to: $interpolate`/${folder}v-${deployment.version}/${file2}` }
+              };
             }
             const pathPattern = props.path === "/" ? "" : props.path.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-            staticRoutes[join19(props.path, "*.")] = {
+            const assetRoute = {
               type: "s3",
               domainName: bucket.regionalDomainName,
               rewrite: {
@@ -106316,6 +106340,12 @@ ${(errors3.trim() || output.trim()).slice(-2000)}`);
                 to: $interpolate`/${folder}v-${deployment.version}/$1`
               }
             };
+            for (const routeDirKey of plan.dirs) {
+              staticRoutes[routeDirKey] = assetRoute;
+            }
+            if (plan.catchAll) {
+              staticRoutes[plan.catchAll] = assetRoute;
+            }
             addRoutes(staticRoutes, { dependsOn: [deployment, bucket.policy] });
           }
         });
@@ -106325,7 +106355,7 @@ ${(errors3.trim() || output.trim()).slice(-2000)}`);
 });
 
 // src/feature/store/index.ts
-import { join as join20 } from "path";
+import { join as join21 } from "path";
 import { toDays as toDays8 } from "@awsless/duration";
 
 // src/feature/store/util.ts
@@ -106448,8 +106478,8 @@ var storeFeature = defineFeature({
               key: `${folder}${file2}`,
               cacheControl: getCacheControl(file2),
               contentType: getContentType(file2),
-              source: join20(props.static, file2),
-              sourceHash: $hash(join20(props.static, file2))
+              source: join21(props.static, file2),
+              sourceHash: $hash(join21(props.static, file2))
             }, {
               replaceOnChanges: ["bucket", "key"]
             });
@@ -106923,9 +106953,13 @@ var vpcFeature = defineFeature({
       public: publicRouteTable
     };
     let ipv6Identifier = 0;
+    const subnetIdsByType = {
+      private: [],
+      public: []
+    };
     for (const [_type, table3] of Object.entries(tables)) {
       const type = _type;
-      const subnetIds = [];
+      const subnetIds = subnetIdsByType[type];
       for (const i in zones) {
         const index = Number(i) + 1;
         const id = `${type}-${index}`;
@@ -106952,6 +106986,26 @@ var vpcFeature = defineFeature({
       }
       ctx.shared.set("vpc", `${type}-subnets`, subnetIds);
     }
+    const eip = new aws.Eip(group, "nat", {
+      domain: "vpc",
+      tags: {
+        Name: ctx.app.name
+      }
+    });
+    const natGateway = new aws.nat.Gateway(group, "nat", {
+      allocationId: eip.allocationId,
+      subnetId: subnetIdsByType.public[0],
+      tags: {
+        Name: ctx.app.name
+      }
+    }, {
+      dependsOn: [attachment]
+    });
+    new aws.Route(group, "nat-ipv4", {
+      routeTableId: privateRouteTable.id,
+      destinationCidrBlock: "0.0.0.0/0",
+      natGatewayId: natGateway.id
+    });
   }
 });
 
@@ -107074,7 +107128,7 @@ var layerFeature = defineFeature({
 // src/feature/image/index.ts
 import { toDays as toDays9 } from "@awsless/duration";
 import { formatRouteEnvName as formatRouteEnvName4 } from "awsless";
-import { dirname as dirname13, join as join21 } from "path";
+import { dirname as dirname13, join as join22 } from "path";
 import { fileURLToPath as fileURLToPath9 } from "url";
 var imageFeature = defineFeature({
   name: "image",
@@ -107089,7 +107143,7 @@ var imageFeature = defineFeature({
       throw new FileError("app.json", "The image feature requires an arm64 function bundle.");
     }
     const group = new Group(ctx.base, "image", "layer");
-    const path2 = join21(dirname13(fileURLToPath9(import.meta.url)), "/layers/sharp-arm.zip");
+    const path2 = join22(dirname13(fileURLToPath9(import.meta.url)), "/layers/sharp-arm.zip");
     const layerId = formatGlobalResourceName({
       appName: ctx.appConfig.name,
       resourceType: "layer",
@@ -107154,7 +107208,7 @@ var imageFeature = defineFeature({
       const serverRouteKey = formatRouteKey(ctx.stack.name, "image", id);
       bundle.addHandler({
         routeKey: serverRouteKey,
-        file: join21(dirname13(fileURLToPath9(import.meta.url)), "/handlers/image.js"),
+        file: join22(dirname13(fileURLToPath9(import.meta.url)), "/handlers/image.js"),
         exportName: "default",
         external: ["sharp"]
       });
@@ -107192,8 +107246,8 @@ var imageFeature = defineFeature({
             new aws.s3.BucketObject(group, `static-${file2}`, {
               bucket: bucket.name,
               key: `${folder}origin/${file2}`,
-              source: join21(props.origin.static, file2),
-              sourceHash: $hash(join21(props.origin.static, file2))
+              source: join22(props.origin.static, file2),
+              sourceHash: $hash(join22(props.origin.static, file2))
             }, {
               replaceOnChanges: ["bucket", "key"]
             });
@@ -107209,7 +107263,7 @@ var imageFeature = defineFeature({
 // src/feature/icon/index.ts
 import { toDays as toDays10 } from "@awsless/duration";
 import { formatRouteEnvName as formatRouteEnvName5 } from "awsless";
-import { dirname as dirname14, join as join22 } from "path";
+import { dirname as dirname14, join as join23 } from "path";
 import { fileURLToPath as fileURLToPath10 } from "url";
 var iconFeature = defineFeature({
   name: "icon",
@@ -107241,7 +107295,7 @@ var iconFeature = defineFeature({
       const serverRouteKey = formatRouteKey(ctx.stack.name, "icon", id);
       bundle.addHandler({
         routeKey: serverRouteKey,
-        file: join22(dirname14(fileURLToPath10(import.meta.url)), "/handlers/icon.js"),
+        file: join23(dirname14(fileURLToPath10(import.meta.url)), "/handlers/icon.js"),
         exportName: "default"
       });
       addRoutes({
@@ -107281,8 +107335,8 @@ var iconFeature = defineFeature({
             new aws.s3.BucketObject(group, `static-${file2}`, {
               bucket: bucket.name,
               key: `${folder}origin/${file2}`,
-              source: join22(props.origin.static, file2),
-              sourceHash: $hash(join22(props.origin.static, file2))
+              source: join23(props.origin.static, file2),
+              sourceHash: $hash(join23(props.origin.static, file2))
             }, {
               replaceOnChanges: ["bucket", "key"]
             });
@@ -107309,10 +107363,10 @@ var import_deepmerge3 = __toESM(require_cjs2(), 1);
 // src/feature/job/build/executable.ts
 import { createHash as createHash13 } from "crypto";
 import { readFile as readFile11, writeFile as writeFile7 } from "fs/promises";
-import { join as join23, resolve as resolve3 } from "path";
+import { join as join24, resolve as resolve3 } from "path";
 var buildJobExecutable = async (input, outputPath, architecture) => {
-  const filePath = join23(outputPath, "program");
-  const wrapperPath = join23(outputPath, "wrapper.ts");
+  const filePath = join24(outputPath, "program");
+  const wrapperPath = join24(outputPath, "wrapper.ts");
   const handlerPath = resolve3(input);
   await writeFile7(wrapperPath, `import { parse } from '@awsless/json'
 import { getObject } from '@awsless/s3'
@@ -107770,7 +107824,7 @@ var jobFeature = defineFeature({
           Name: `${ctx.app.name}-job-storage`
         }
       });
-      for (const [index, subnetId] of ctx.shared.get("vpc", "public-subnets").entries()) {
+      for (const [index, subnetId] of ctx.shared.get("vpc", "private-subnets").entries()) {
         new aws.efs.MountTarget(storageGroup, `mount-target-${index + 1}`, {
           fileSystemId: fileSystem.id,
           subnetId,
@@ -107784,7 +107838,7 @@ var jobFeature = defineFeature({
     const jobs = Object.entries(ctx.stackConfig.jobs ?? {});
     if (jobs.length === 0)
       return;
-    const subnets = ctx.shared.get("vpc", "public-subnets");
+    const subnets = ctx.shared.get("vpc", "private-subnets");
     ctx.addEnv("JOB_SUBNETS", new Output(new Set(findInputDeps(subnets)), async (resolve4) => {
       const resolved = await resolveInputs(subnets);
       resolve4(JSON.stringify(resolved));
@@ -107822,7 +107876,7 @@ import { stringify as stringify3 } from "@awsless/json";
 import { generateFileHash as generateFileHash3 } from "@awsless/ts-file-cache";
 var import_deepmerge5 = __toESM(require_cjs2(), 1);
 import { createHash as createHash15 } from "crypto";
-import { join as join24 } from "path";
+import { join as join25 } from "path";
 var createFargateTask = (parentGroup, ctx, ns, id, local) => {
   const group = new Group(parentGroup, "instance", ns);
   const name = formatLocalResourceName({
@@ -108027,7 +108081,7 @@ var createFargateTask = (parentGroup, ctx, ns, id, local) => {
           healthCheck: props.healthCheck ? {
             command: [
               "CMD-SHELL",
-              `curl -f http://${join24("localhost", props.healthCheck.path)} || exit 1`
+              `curl -f http://${join25("localhost", props.healthCheck.path)} || exit 1`
             ],
             interval: toSeconds10(props.healthCheck.interval),
             retries: props.healthCheck.retries,
@@ -108072,9 +108126,9 @@ var createFargateTask = (parentGroup, ctx, ns, id, local) => {
     desiredCount: 1,
     launchType: "FARGATE",
     networkConfiguration: {
-      subnets: ctx.shared.get("vpc", "public-subnets"),
+      subnets: ctx.shared.get("vpc", "private-subnets"),
       securityGroups: [securityGroup.id],
-      assignPublicIp: true
+      assignPublicIp: false
     },
     forceNewDeployment: true,
     forceDelete: true,
@@ -110723,12 +110777,12 @@ import { DynamoDBClient as DynamoDBClient3 } from "@awsless/dynamodb";
 // src/cli/ui/complex/run-tests.ts
 var import_wildstring3 = __toESM(require_wildstring(), 1);
 import { mkdir as mkdir6, readFile as readFile12, writeFile as writeFile8 } from "fs/promises";
-import { join as join26 } from "path";
+import { join as join27 } from "path";
 import { parse as parse5, stringify as stringify4 } from "@awsless/json";
 import { generateFolderHash, loadWorkspace as loadWorkspace2 } from "@awsless/ts-file-cache";
 
 // src/test/start.ts
-import { dirname as dirname15, join as join25 } from "path";
+import { dirname as dirname15, join as join26 } from "path";
 import { fileURLToPath as fileURLToPath11 } from "url";
 import { configDefaults } from "vitest/config";
 import { startVitest } from "vitest/node";
@@ -110749,7 +110803,7 @@ var startTest = async (props) => {
     globals: true,
     reporters: [new NullReporter],
     setupFiles: [
-      join25(__dirname4, "test-global-setup.js")
+      join26(__dirname4, "test-global-setup.js")
     ]
   }, {
     logLevel: "silent",
@@ -110903,7 +110957,7 @@ var logTestErrors = (event) => {
 };
 var runTest = async (stack, dir, filters, workspace, opts) => {
   await mkdir6(directories.test, { recursive: true });
-  const file2 = join26(directories.test, `${stack}.json`);
+  const file2 = join27(directories.test, `${stack}.json`);
   const fingerprint = await generateFolderHash(workspace, dir);
   if (!process.env.NO_CACHE) {
     const exists2 = await fileExist(file2);
@@ -112257,7 +112311,7 @@ var watchConfig = async (options, resolve4, reject) => {
 
 // src/type-gen/generate.ts
 import { mkdir as mkdir7, writeFile as writeFile9 } from "fs/promises";
-import { dirname as dirname16, join as join27, relative as relative8 } from "path";
+import { dirname as dirname16, join as join28, relative as relative8 } from "path";
 var generateTypes = async (props) => {
   const files = [];
   await Promise.all(features.map((feature) => {
@@ -112265,7 +112319,7 @@ var generateTypes = async (props) => {
       ...props,
       async write(file2, data, include = false) {
         const code = data?.toString("utf8");
-        const path2 = join27(directories.types, file2);
+        const path2 = join28(directories.types, file2);
         if (code) {
           if (include) {
             files.push(relative8(directories.root, path2));
@@ -112279,7 +112333,7 @@ var generateTypes = async (props) => {
   if (files.length) {
     const code = files.map((file2) => `/// <reference path='${file2}' />`).join(`
 `);
-    await writeFile9(join27(directories.root, `awsless.d.ts`), code);
+    await writeFile9(join28(directories.root, `awsless.d.ts`), code);
   }
 };
 
@@ -114376,7 +114430,7 @@ var DEFAULT_PROFILE = "default";
 var getProfileName = (init) => init.profile || process.env[ENV_PROFILE] || DEFAULT_PROFILE;
 
 // ../../node_modules/.pnpm/@smithy+shared-ini-file-loader@4.4.7/node_modules/@smithy/shared-ini-file-loader/dist-es/loadSharedConfigFiles.js
-import { join as join30 } from "path";
+import { join as join31 } from "path";
 
 // ../../node_modules/.pnpm/@smithy+shared-ini-file-loader@4.4.7/node_modules/@smithy/shared-ini-file-loader/dist-es/constants.js
 var CONFIG_PREFIX_SEPARATOR = ".";
@@ -114398,14 +114452,14 @@ var getConfigData = (data) => Object.entries(data).filter(([key]) => {
 });
 
 // ../../node_modules/.pnpm/@smithy+shared-ini-file-loader@4.4.7/node_modules/@smithy/shared-ini-file-loader/dist-es/getConfigFilepath.js
-import { join as join28 } from "path";
+import { join as join29 } from "path";
 var ENV_CONFIG_PATH = "AWS_CONFIG_FILE";
-var getConfigFilepath = () => process.env[ENV_CONFIG_PATH] || join28(getHomeDir(), ".aws", "config");
+var getConfigFilepath = () => process.env[ENV_CONFIG_PATH] || join29(getHomeDir(), ".aws", "config");
 
 // ../../node_modules/.pnpm/@smithy+shared-ini-file-loader@4.4.7/node_modules/@smithy/shared-ini-file-loader/dist-es/getCredentialsFilepath.js
-import { join as join29 } from "path";
+import { join as join30 } from "path";
 var ENV_CREDENTIALS_PATH = "AWS_SHARED_CREDENTIALS_FILE";
-var getCredentialsFilepath = () => process.env[ENV_CREDENTIALS_PATH] || join29(getHomeDir(), ".aws", "credentials");
+var getCredentialsFilepath = () => process.env[ENV_CREDENTIALS_PATH] || join30(getHomeDir(), ".aws", "credentials");
 
 // ../../node_modules/.pnpm/@smithy+shared-ini-file-loader@4.4.7/node_modules/@smithy/shared-ini-file-loader/dist-es/parseIni.js
 var prefixKeyRegex = /^([\w-]+)\s(["'])?([\w-@\+\.%:/]+)\2$/;
@@ -114478,11 +114532,11 @@ var loadSharedConfigFiles = async (init = {}) => {
   const relativeHomeDirPrefix = "~/";
   let resolvedFilepath = filepath;
   if (filepath.startsWith(relativeHomeDirPrefix)) {
-    resolvedFilepath = join30(homeDir, filepath.slice(2));
+    resolvedFilepath = join31(homeDir, filepath.slice(2));
   }
   let resolvedConfigFilepath = configFilepath;
   if (configFilepath.startsWith(relativeHomeDirPrefix)) {
-    resolvedConfigFilepath = join30(homeDir, configFilepath.slice(2));
+    resolvedConfigFilepath = join31(homeDir, configFilepath.slice(2));
   }
   const parsedFiles = await Promise.all([
     readFile13(resolvedConfigFilepath, {
@@ -115575,7 +115629,7 @@ var getRuntimeUserAgentPair = () => {
 
 // ../../node_modules/.pnpm/@aws-sdk+util-user-agent-node@3.973.14_aws-crt@1.30.0_supports-color@8.1.1_/node_modules/@aws-sdk/util-user-agent-node/dist-es/getTypeScriptUserAgentPair.js
 import { readFile as readFile15 } from "fs/promises";
-import { join as join32 } from "path";
+import { join as join33 } from "path";
 
 // ../../node_modules/.pnpm/@aws-sdk+util-user-agent-node@3.973.14_aws-crt@1.30.0_supports-color@8.1.1_/node_modules/@aws-sdk/util-user-agent-node/dist-es/getNodeModulesParentDirs.js
 import { normalize as normalize3, sep as sep3 } from "path";
@@ -115623,7 +115677,7 @@ var getSanitizedDevTypeScriptVersion = (version2 = "") => {
 // ../../node_modules/.pnpm/@aws-sdk+util-user-agent-node@3.973.14_aws-crt@1.30.0_supports-color@8.1.1_/node_modules/@aws-sdk/util-user-agent-node/dist-es/getTypeScriptUserAgentPair.js
 var __dirname = "/Users/work/Code/awsless/node_modules/.pnpm/@aws-sdk+util-user-agent-node@3.973.14_aws-crt@1.30.0_supports-color@8.1.1_/node_modules/@aws-sdk/util-user-agent-node/dist-es";
 var tscVersion;
-var TS_PACKAGE_JSON = join32("node_modules", "typescript", "package.json");
+var TS_PACKAGE_JSON = join33("node_modules", "typescript", "package.json");
 var getTypeScriptUserAgentPair = async () => {
   if (tscVersion === null) {
     return;
@@ -115643,7 +115697,7 @@ var getTypeScriptUserAgentPair = async () => {
   let versionFromApp;
   for (const nodeModulesParentDir of nodeModulesParentDirs) {
     try {
-      const appPackageJsonPath = join32(nodeModulesParentDir, "package.json");
+      const appPackageJsonPath = join33(nodeModulesParentDir, "package.json");
       const packageJson = await readFile15(appPackageJsonPath, "utf-8");
       const { dependencies, devDependencies } = JSON.parse(packageJson);
       const version2 = devDependencies?.typescript ?? dependencies?.typescript;
@@ -115661,7 +115715,7 @@ var getTypeScriptUserAgentPair = async () => {
   let versionFromNodeModules;
   for (const nodeModulesParentDir of nodeModulesParentDirs) {
     try {
-      const tsPackageJsonPath = join32(nodeModulesParentDir, TS_PACKAGE_JSON);
+      const tsPackageJsonPath = join33(nodeModulesParentDir, TS_PACKAGE_JSON);
       const packageJson = await readFile15(tsPackageJsonPath, "utf-8");
       const { version: version2 } = JSON.parse(packageJson);
       const sanitizedVersion2 = getSanitizedTypeScriptVersion(version2);
@@ -118722,7 +118776,7 @@ var sinon;
   const arraySlice = arrayProto.slice;
   const concat = arrayProto.concat;
   const forEach = arrayProto.forEach;
-  const join33 = arrayProto.join;
+  const join34 = arrayProto.join;
   const splice = arrayProto.splice;
   function applyDefaults(obj, defaults2) {
     for (const key of Object.keys(defaults2)) {
@@ -118758,7 +118812,7 @@ var sinon;
         let actual = "";
         if (!calledInOrder(arguments)) {
           try {
-            expected = join33(arguments, ", ");
+            expected = join34(arguments, ", ");
             const calls = arraySlice(arguments);
             let i4 = calls.length;
             while (i4) {
@@ -118766,7 +118820,7 @@ var sinon;
                 splice(calls, i4, 1);
               }
             }
-            actual = join33(orderByFirstCall(calls), ", ");
+            actual = join34(orderByFirstCall(calls), ", ");
           } catch (e7) {}
           failAssertion(this, `expected ${expected} to be called in order but were called as ${actual}`);
         } else {
@@ -118811,7 +118865,7 @@ var sinon;
             `    expected = ${inspect(expectation)}`,
             `    actual = ${inspect(actual)}`
           ];
-          failAssertion(this, join33(formatted, `
+          failAssertion(this, join34(formatted, `
 `));
         }
       }
@@ -118916,7 +118970,7 @@ var sinon;
   const valueToString = require2("@sinonjs/commons").valueToString;
   const exportAsyncBehaviors = require2("./util/core/export-async-behaviors");
   const concat = arrayProto.concat;
-  const join33 = arrayProto.join;
+  const join34 = arrayProto.join;
   const reverse = arrayProto.reverse;
   const slice = arrayProto.slice;
   const useLeftMostCallback = -1;
@@ -118953,7 +119007,7 @@ var sinon;
         msg = `${functionName(behavior.stub)} expected to yield, but no callback was passed.`;
       }
       if (args.length > 0) {
-        msg += ` Received [${join33(args, ", ")}]`;
+        msg += ` Received [${join34(args, ", ")}]`;
       }
       return msg;
     }
@@ -119763,7 +119817,7 @@ var sinon;
   const filter2 = arrayProto.filter;
   const forEach = arrayProto.forEach;
   const every = arrayProto.every;
-  const join33 = arrayProto.join;
+  const join34 = arrayProto.join;
   const push = arrayProto.push;
   const slice = arrayProto.slice;
   const unshift = arrayProto.unshift;
@@ -119840,10 +119894,10 @@ var sinon;
       });
       this.restore();
       if (messages.length > 0) {
-        mockExpectation.fail(join33(concat(messages, met), `
+        mockExpectation.fail(join34(concat(messages, met), `
 `));
       } else if (met.length > 0) {
-        mockExpectation.pass(join33(concat(messages, met), `
+        mockExpectation.pass(join34(concat(messages, met), `
 `));
       }
       return true;
@@ -119896,7 +119950,7 @@ var sinon;
         args,
         stack: err.stack
       })}`);
-      mockExpectation.fail(join33(messages, `
+      mockExpectation.fail(join34(messages, `
 `));
     }
   });
@@ -120003,14 +120057,14 @@ var sinon;
   const valueToString = require2("@sinonjs/commons").valueToString;
   const concat = arrayProto.concat;
   const filter2 = arrayProto.filter;
-  const join33 = arrayProto.join;
+  const join34 = arrayProto.join;
   const map = arrayProto.map;
   const reduce = arrayProto.reduce;
   const slice = arrayProto.slice;
   function throwYieldError(proxy, text2, args) {
     let msg = functionName(proxy) + text2;
     if (args.length) {
-      msg += ` Received [${join33(slice(args), ", ")}]`;
+      msg += ` Received [${join34(slice(args), ", ")}]`;
     }
     throw new Error(msg);
   }
@@ -120132,7 +120186,7 @@ var sinon;
       const formattedArgs = map(this.args, function(arg) {
         return inspect(arg);
       });
-      callStr = `${callStr + join33(formattedArgs, ", ")})`;
+      callStr = `${callStr + join34(formattedArgs, ", ")})`;
       if (typeof this.returnValue !== "undefined") {
         callStr += ` => ${inspect(this.returnValue)}`;
       }
@@ -120863,7 +120917,7 @@ var sinon;
   const timesInWords = require2("./util/core/times-in-words");
   const inspect = require2("util").inspect;
   const jsDiff = require2("diff");
-  const join33 = arrayProto.join;
+  const join34 = arrayProto.join;
   const map = arrayProto.map;
   const push = arrayProto.push;
   const slice = arrayProto.slice;
@@ -120891,7 +120945,7 @@ var sinon;
       }
       return text2;
     });
-    return join33(objects, "");
+    return join34(objects, "");
   }
   function quoteStringValue(value) {
     if (typeof value === "string") {
@@ -120949,7 +121003,7 @@ ${stringifiedCall}`;
         push(calls, stringifiedCall);
       }
       return calls.length > 0 ? `
-${join33(calls, `
+${join34(calls, `
 `)}` : "";
     },
     t: function(spyInstance) {
@@ -120957,10 +121011,10 @@ ${join33(calls, `
       for (let i4 = 0, l5 = spyInstance.callCount;i4 < l5; ++i4) {
         push(objects, inspect(spyInstance.thisValues[i4]));
       }
-      return join33(objects, ", ");
+      return join34(objects, ", ");
     },
     "*": function(spyInstance, args) {
-      return join33(map(args, function(arg) {
+      return join34(map(args, function(arg) {
         return inspect(arg);
       }), ", ");
     }
@@ -121292,7 +121346,7 @@ ${join33(calls, `
 }, { "@sinonjs/commons": 48 }], 26: [function(require2, module, exports) {
   const arrayProto = require2("@sinonjs/commons").prototypes.array;
   const hasOwnProperty2 = require2("@sinonjs/commons").prototypes.object.hasOwnProperty;
-  const join33 = arrayProto.join;
+  const join34 = arrayProto.join;
   const push = arrayProto.push;
   const hasDontEnumBug = function() {
     const obj = {
@@ -121333,7 +121387,7 @@ ${join33(calls, `
         push(result, obj[prop]());
       }
     }
-    return join33(result, "") !== "0123456789";
+    return join34(result, "") !== "0123456789";
   }();
   function extendCommon(target2, sources, doCopy) {
     let source, i4, prop;
@@ -123398,7 +123452,7 @@ ${job.error.stack.split(`
   module.exports = matcherPrototype;
 }, { "../create-matcher": 63 }], 71: [function(require2, module, exports) {
   var functionName = require2("@sinonjs/commons").functionName;
-  var join33 = require2("@sinonjs/commons").prototypes.array.join;
+  var join34 = require2("@sinonjs/commons").prototypes.array.join;
   var map = require2("@sinonjs/commons").prototypes.array.map;
   var stringIndexOf = require2("@sinonjs/commons").prototypes.string.indexOf;
   var valueToString = require2("@sinonjs/commons").valueToString;
@@ -123429,7 +123483,7 @@ ${job.error.stack.split(`
         m5.test = function(actual) {
           return matchObject(actual, expectation, match3);
         };
-        m5.message = `match(${join33(array, ", ")})`;
+        m5.message = `match(${join34(array, ", ")})`;
         return m5;
       },
       regexp: function(m5, expectation) {
@@ -126753,7 +126807,7 @@ ${job.error.stack.split(`
       tokenize: function tokenize(value) {
         return value.split("");
       },
-      join: function join33(chars) {
+      join: function join34(chars) {
         return chars.join("");
       }
     };

package/dist/handlers/bundle.js

@@ -1,7 +1,7 @@
 // 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) => {
@@ -198,6 +198,18 @@ var restHandler = (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;
+};
+
 // src/feature/bundle/server/resource/rpc.ts
 var rpcHandler = (event) => {
   const route = event?.["$awsless-route"];
@@ -320,6 +332,7 @@ var createBundle = (handlers) => {
     topicHandler,
     taskHandler,
     restHandler,
+    routeHandler,
     rpcHandler,
     siteHandler,
     storeHandler,
@@ -333,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) => {
@@ -343,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;

package/dist/handlers/icon.js

@@ -14048,7 +14048,7 @@ var require_svgstore = __commonJS((exports, module) => {
 
 // src/feature/icon/server/handle.ts
 import { getObject, putObject } from "@awsless/s3";
-import { getRouteEnv, invokeRoute } from "awsless";
+import { getRouteEnv, internalInvoke } from "awsless";
 
 // ../../node_modules/.pnpm/svgo@4.0.1/node_modules/svgo/dist/svgo.browser.js
 var visitSkip = Symbol();
@@ -33332,7 +33332,7 @@ var handle_default = async (event) => {
     }
     const originRoute = getRouteEnv("ICON_ORIGIN");
     if (!baseIcon && originRoute) {
-      const result = await invokeRoute(originRoute, { path });
+      const result = await internalInvoke(originRoute, { path });
       if (typeof result === "string") {
         baseIcon = Buffer.from(result);
       } else if (result === undefined) {

package/dist/handlers/image.js

@@ -1,7 +1,7 @@
 // src/feature/image/server/handle.ts
 import { getObject, putObject } from "@awsless/s3";
 import sharp from "sharp";
-import { getRouteEnv, invokeRoute } from "awsless";
+import { getRouteEnv, internalInvoke } from "awsless";
 
 // src/feature/image/server/validate.ts
 import { object, picklist, pipe, safeParse, string, transform } from "@awsless/validate";
@@ -92,7 +92,7 @@ var handle_default = async (event) => {
     }
     const originRoute = getRouteEnv("IMAGE_ORIGIN");
     if (!baseImage && originRoute) {
-      const result = await invokeRoute(originRoute, { path: originalPath });
+      const result = await internalInvoke(originRoute, { path: originalPath });
       if (typeof result === "string") {
         baseImage = Buffer.from(result, "base64");
       } else if (result === undefined) {

package/dist/handlers/on-error-log.js

@@ -22,7 +22,7 @@ import {
   putItem,
   string as dbString
 } from "@awsless/dynamodb";
-import { getRouteEnv, invokeRoute } from "awsless";
+import { getRouteEnv, internalInvoke } from "awsless";
 import { createHash } from "crypto";
 import * as zlib from "zlib";
 var RuntimeErrorSchema = object({
@@ -107,7 +107,7 @@ var handle_default = async (event, context) => {
       if (!error || await isOwnRequest(error.requestId)) {
         continue;
       }
-      const invoke = invokeRoute(consumerRoute, {
+      const invoke = internalInvoke(consumerRoute, {
         ...error,
         origin,
         date: logEvent.timestamp

package/dist/handlers/rpc.js

@@ -1,6 +1,6 @@
 // src/feature/rpc/server/handle.ts
 import { ExpectedError, ViewableError } from "@awsless/lambda";
-import { invokeRoute as invokeRoute2 } from "awsless";
+import { internalInvoke as internalInvoke2 } from "awsless";
 import { randomUUID } from "node:crypto";
 
 // src/feature/rpc/server/auth.ts
@@ -51,7 +51,7 @@ function isFuture(date) {
 }
 
 // src/feature/rpc/server/auth.ts
-import { getRouteEnv, invokeRoute } from "awsless";
+import { getRouteEnv, internalInvoke } from "awsless";
 
 // src/feature/rpc/server/validate.ts
 import {
@@ -135,7 +135,7 @@ var authenticate = async (token) => {
   }
   let response;
   try {
-    response = await invokeRoute(authRoute, { token });
+    response = await internalInvoke(authRoute, { token });
   } catch (error) {
     console.error(error);
     return {
@@ -463,7 +463,7 @@ var handle_default = async (event) => {
       }
       let data;
       try {
-        data = await invokeRoute2(fn.details.name, {
+        data = await internalInvoke2(fn.details.name, {
           ...fn.payload ?? {},
           ...auth.context ?? {},
           viewer: buildViewerPayload(request.output)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/cli",
-  "version": "0.0.46-next.17",
+  "version": "0.0.46-next.19",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -38,15 +38,15 @@
     "@awsless/ts-file-cache": "^0.0.16"
   },
   "peerDependencies": {
-    "@awsless/big-float": "^0.1.7",
+    "@awsless/dynamodb": "^0.3.21",
     "@awsless/duration": "^0.0.4",
     "@awsless/json": "^0.0.11",
-    "@awsless/lambda": "^0.0.47",
     "@awsless/s3": "^0.0.22",
     "@awsless/validate": "^0.1.7",
     "@awsless/weak-cache": "^0.0.1",
-    "awsless": "^0.0.15-next.3",
-    "@awsless/dynamodb": "^0.3.21"
+    "awsless": "^0.0.15-next.5",
+    "@awsless/big-float": "^0.1.7",
+    "@awsless/lambda": "^0.0.47"
   },
   "devDependencies": {
     "@clack/prompts": "^0.7.0",
@@ -100,25 +100,25 @@
     "zip-a-folder": "^3.1.6",
     "zod": "^3.24.2",
     "zod-to-json-schema": "^3.24.3",
+    "@awsless/big-float": "^0.1.7",
+    "@awsless/clui": "^0.0.9",
     "@awsless/cloudwatch": "^0.0.1",
     "@awsless/duration": "^0.0.4",
     "@awsless/dynamodb": "^0.3.21",
-    "@awsless/big-float": "^0.1.7",
-    "@awsless/iot": "^0.0.5",
-    "@awsless/clui": "^0.0.9",
-    "@awsless/json": "^0.0.11",
     "@awsless/lambda": "^0.0.47",
-    "@awsless/s3": "^0.0.22",
+    "@awsless/json": "^0.0.11",
+    "@awsless/iot": "^0.0.5",
     "@awsless/open-search": "^0.0.24",
-    "@awsless/sns": "^0.0.11",
+    "@awsless/s3": "^0.0.22",
     "@awsless/redis": "^0.1.13",
-    "@awsless/ssm": "^0.0.8",
-    "@awsless/weak-cache": "^0.0.1",
+    "@awsless/size": "^0.0.2",
     "@awsless/scheduler": "^0.0.5",
-    "awsless": "^0.0.15-next.3",
-    "@awsless/validate": "^0.1.7",
+    "@awsless/sns": "^0.0.11",
     "@awsless/sqs": "^0.0.24",
-    "@awsless/size": "^0.0.2"
+    "@awsless/ssm": "^0.0.8",
+    "@awsless/validate": "^0.1.7",
+    "@awsless/weak-cache": "^0.0.1",
+    "awsless": "^0.0.15-next.5"
   },
   "scripts": {
     "test": "bun cli/build-handlers.ts && pnpm vitest",