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

package/dist/bin.js

@@ -56328,7 +56328,7 @@ var require_client2 = __commonJS((exports) => {
 var require_config = __commonJS((exports) => {
   var { homedir: homedir2 } = __require("os");
   var { sep: sep2, join: join30 } = __require("path");
-  var { createHash: createHash17 } = __require("crypto");
+  var { createHash: createHash18 } = __require("crypto");
   var { readFile: readFile$1 } = __require("fs/promises");
   var { IniSectionType: IniSectionType2 } = require_dist_cjs();
   var { normalizeProvider } = require_client2();
@@ -56483,7 +56483,7 @@ var require_config = __commonJS((exports) => {
   var DEFAULT_PROFILE = "default";
   var getProfileName = (init) => init.profile || process.env[ENV_PROFILE] || DEFAULT_PROFILE;
   var getSSOTokenFilepath = (id) => {
-    const hasher = createHash17("sha1");
+    const hasher = createHash18("sha1");
     const cacheName = hasher.update(id).digest("hex");
     return join30(getHomeDir(), ".aws", "sso", "cache", `${cacheName}.json`);
   };
@@ -56564,7 +56564,7 @@ var require_config = __commonJS((exports) => {
   };
   var filePromises = {};
   var fileIntercept = {};
-  var readFile13 = (path2, options) => {
+  var readFile14 = (path2, options) => {
     if (fileIntercept[path2] !== undefined) {
       return fileIntercept[path2];
     }
@@ -56587,10 +56587,10 @@ var require_config = __commonJS((exports) => {
       resolvedConfigFilepath = join30(homeDir, configFilepath.slice(2));
     }
     const parsedFiles = await Promise.all([
-      readFile13(resolvedConfigFilepath, {
+      readFile14(resolvedConfigFilepath, {
         ignoreCache: init.ignoreCache
       }).then(parseIni).then(getConfigData).catch(swallowError$1),
-      readFile13(resolvedFilepath, {
+      readFile14(resolvedFilepath, {
         ignoreCache: init.ignoreCache
       }).then(parseIni).catch(swallowError$1)
     ]);
@@ -56601,7 +56601,7 @@ var require_config = __commonJS((exports) => {
   };
   var getSsoSessionData = (data) => Object.entries(data).filter(([key]) => key.startsWith(IniSectionType2.SSO_SESSION + CONFIG_PREFIX_SEPARATOR)).reduce((acc, [key, value]) => ({ ...acc, [key.substring(key.indexOf(CONFIG_PREFIX_SEPARATOR) + 1)]: value }), {});
   var swallowError = () => ({});
-  var loadSsoSessionData = async (init = {}) => readFile13(init.configFilepath ?? getConfigFilepath()).then(parseIni).then(getSsoSessionData).catch(swallowError);
+  var loadSsoSessionData = async (init = {}) => readFile14(init.configFilepath ?? getConfigFilepath()).then(parseIni).then(getSsoSessionData).catch(swallowError);
   var mergeConfigFiles = (...files) => {
     const merged = {};
     for (const file2 of files) {
@@ -57012,7 +57012,7 @@ var require_config = __commonJS((exports) => {
   exports.nodeFipsConfigSelectors = nodeFipsConfigSelectors;
   exports.numberSelector = numberSelector;
   exports.parseKnownFiles = parseKnownFiles;
-  exports.readFile = readFile13;
+  exports.readFile = readFile14;
   exports.resolveCustomEndpointsConfig = resolveCustomEndpointsConfig;
   exports.resolveDefaultsModeConfig = resolveDefaultsModeConfig;
   exports.resolveEndpointsConfig = resolveEndpointsConfig;
@@ -57833,7 +57833,7 @@ var require_endpoints = __commonJS((exports) => {
 
 // ../../node_modules/.pnpm/@smithy+core@3.29.7/node_modules/@smithy/core/dist-cjs/submodules/serde/index.js
 var require_serde = __commonJS((exports) => {
-  var { createHmac: createHmac3, createHash: createHash17, getRandomValues } = __require("crypto");
+  var { createHmac: createHmac3, createHash: createHash18, getRandomValues } = __require("crypto");
   var { ReadStream, lstatSync: lstatSync2, fstatSync } = __require("fs");
   var { HttpResponse: HttpResponse2 } = require_transport2();
   var { toEndpointV1 } = require_endpoints();
@@ -58735,7 +58735,7 @@ var require_serde = __commonJS((exports) => {
       return Promise.resolve(this.hash.digest());
     }
     reset() {
-      this.hash = this.secret ? createHmac3(this.algorithmIdentifier, castSourceData(this.secret)) : createHash17(this.algorithmIdentifier);
+      this.hash = this.secret ? createHmac3(this.algorithmIdentifier, castSourceData(this.secret)) : createHash18(this.algorithmIdentifier);
     }
   }
   function castSourceData(toCast, encoding) {
@@ -59474,7 +59474,7 @@ var require_checksum = __commonJS((exports) => {
   var { createReadStream: createReadStream2 } = __require("fs");
   var { Writable } = __require("stream");
   var { toUint8Array, concatBytes } = require_serde();
-  var { createHash: createHash17, createHmac: createHmac3 } = __require("crypto");
+  var { createHash: createHash18, createHmac: createHmac3 } = __require("crypto");
   var zlib = __require("zlib");
   async function blobReader(blob, onChunk, chunkSize = 1024 * 1024) {
     const size = blob.size;
@@ -59639,7 +59639,7 @@ var require_checksum = __commonJS((exports) => {
   }
   var hasNativeCrypto$1 = (() => {
     try {
-      createHash17("md5");
+      createHash18("md5");
       return true;
     } catch {
       return false;
@@ -59649,7 +59649,7 @@ var require_checksum = __commonJS((exports) => {
   function buildNativeClass$2() {
     return class Md5Node2 {
       digestLength = 16;
-      hash = createHash17("md5");
+      hash = createHash18("md5");
       update(data) {
         this.hash.update(toUint8Array(data));
       }
@@ -59658,7 +59658,7 @@ var require_checksum = __commonJS((exports) => {
         return new Uint8Array(buf.buffer, buf.byteOffset, buf.byteLength);
       }
       reset() {
-        this.hash = createHash17("md5");
+        this.hash = createHash18("md5");
       }
     };
   }
@@ -59948,7 +59948,7 @@ var require_checksum = __commonJS((exports) => {
   ]);
   var hasNativeCrypto = (() => {
     try {
-      createHash17("sha256");
+      createHash18("sha256");
       return true;
     } catch {
       return false;
@@ -59988,7 +59988,7 @@ var require_checksum = __commonJS((exports) => {
         this.finished = false;
       }
       createHash() {
-        return this.secret ? createHmac3("sha256", toBuffer(this.secret)) : createHash17("sha256");
+        return this.secret ? createHmac3("sha256", toBuffer(this.secret)) : createHash18("sha256");
       }
     };
   }
@@ -74174,7 +74174,7 @@ var require_signin = __commonJS((exports) => {
 });
 
 // ../../node_modules/.pnpm/@aws-sdk+credential-provider-login@3.972.66/node_modules/@aws-sdk/credential-provider-login/dist-es/LoginCredentialsFetcher.js
-import { createHash as createHash17, createPrivateKey, createPublicKey, sign } from "crypto";
+import { createHash as createHash18, createPrivateKey, createPublicKey, sign } from "crypto";
 import { promises as fs3 } from "fs";
 import { homedir as homedir3 } from "os";
 import { dirname as dirname19, join as join33 } from "path";
@@ -74338,7 +74338,7 @@ var init_LoginCredentialsFetcher = __esm(() => {
     getTokenFilePath() {
       const directory = process.env.AWS_LOGIN_CACHE_DIRECTORY ?? join33(homedir3(), ".aws", "login", "cache");
       const loginSessionBytes = Buffer.from(this.loginSession, "utf8");
-      const loginSessionSha256 = createHash17("sha256").update(loginSessionBytes).digest("hex");
+      const loginSessionSha256 = createHash18("sha256").update(loginSessionBytes).digest("hex");
       return join33(directory, `${loginSessionSha256}.json`);
     }
     derToRawSignature(derSignature) {
@@ -101700,7 +101700,7 @@ var SitesSchema = exports_external.record(ResourceIdSchema, exports_external.obj
     configs: exports_external.string().array().optional().describe("Define the config values for your build command.")
   }).optional().describe(`Specifies the build process for sites that need a build step.`),
   static: exports_external.union([LocalDirectorySchema, exports_external.boolean()]).optional().describe("Specifies the path to the static files directory. Additionally you can also pass `true` when you don't have local static files, but still want to make an S3 bucket."),
-  ssr: FunctionSchema.optional().describe("Specifies the file that will render the site on the server.")
+  ssr: StackFunctionSchema.optional().describe("Specifies the file that will render the site on the server.")
 })).optional().describe("Define the sites in your stack.");
 
 // src/feature/store/schema.ts
@@ -106637,7 +106637,37 @@ ${(errors3.trim() || output.trim()).slice(-2000)}`);
           });
         });
       }
-      if (props.ssr) {
+      if (props.ssr && isStandaloneFunction(props.ssr)) {
+        const fn = createLambdaFunction(ctx, `${id}-ssr`, props.ssr);
+        const url = new aws.lambda.FunctionUrl(group, "ssr-url", {
+          functionName: fn.lambda.functionName,
+          authorizationType: "AWS_IAM"
+        });
+        new aws.lambda.Permission(group, "ssr-url-permission", {
+          functionName: fn.lambda.functionName,
+          statementId: "cloudfront-url",
+          principal: "cloudfront.amazonaws.com",
+          sourceAccount: ctx.accountId,
+          action: "lambda:InvokeFunctionUrl",
+          functionUrlAuthType: "AWS_IAM"
+        });
+        new aws.lambda.Permission(group, "ssr-invoke-permission", {
+          functionName: fn.lambda.functionName,
+          statementId: "cloudfront-invoke",
+          principal: "cloudfront.amazonaws.com",
+          sourceAccount: ctx.accountId,
+          action: "lambda:InvokeFunction",
+          invokedViaFunctionUrl: true
+        });
+        addRoutes({
+          [routeKey]: {
+            type: "lambda",
+            forwardHost: true,
+            urlEncodedQueryString: true,
+            domainName: url.functionUrl.pipe((url2) => url2.split("/")[2])
+          }
+        });
+      } else if (props.ssr) {
         const ssr = props.ssr;
         const bundleRouteKey = formatRouteKey(ctx.stack.name, "site", id);
         registerBundleFunction(ctx, bundleRouteKey, ssr);
@@ -107483,6 +107513,8 @@ var layerFeature = defineFeature({
 // src/feature/image/index.ts
 import { toDays as toDays9 } from "@awsless/duration";
 import { formatRouteEnvName as formatRouteEnvName5 } from "awsless";
+import { createHash as createHash14 } from "crypto";
+import { readFile as readFile11 } from "fs/promises";
 import { dirname as dirname15, join as join23 } from "path";
 import { fileURLToPath as fileURLToPath10 } from "url";
 var imageFeature = defineFeature({
@@ -107504,12 +107536,27 @@ var imageFeature = defineFeature({
       resourceType: "layer",
       resourceName: "sharp"
     });
+    ctx.registerBuild("image", layerId, async (build2) => {
+      const file2 = await readFile11(path2);
+      const fingerprint = createHash14("sha1").update(file2).digest("hex");
+      return build2(fingerprint, async (write) => {
+        await Promise.all([
+          write("HASH", fingerprint),
+          write("layer.zip", file2)
+        ]);
+        return {
+          size: formatByteSize(file2.byteLength)
+        };
+      });
+    });
+    const source = relativePath(getBuildPath("image", layerId, "layer.zip"));
+    const sourceHash = $file(getBuildPath("image", layerId, "HASH"));
     const zipFile = new aws.s3.BucketObject(group, "layer", {
       bucket: ctx.shared.get("asset", "bucket").name,
       key: `layer/${layerId}.zip`,
       contentType: "application/zip",
-      source: path2,
-      sourceHash: $hash(path2)
+      source,
+      sourceHash
     }, {
       replaceOnChanges: ["bucket", "key"]
     });
@@ -107525,7 +107572,7 @@ var imageFeature = defineFeature({
         }
         return name;
       }),
-      sourceCodeHash: $hash(path2),
+      sourceCodeHash: sourceHash,
       skipDestroy: true
     }, {
       dependsOn: [zipFile],
@@ -107709,15 +107756,15 @@ var import_deepmerge5 = __toESM(require_cjs2(), 1);
 import { relative as relative7 } from "path";
 
 // src/feature/job/util.ts
-import { createHash as createHash15 } from "crypto";
+import { createHash as createHash16 } from "crypto";
 import { toDays as toDays11, toSeconds as toSeconds9 } from "@awsless/duration";
 import { stringify as stringify2 } from "@awsless/json";
 import { generateFileHash as generateFileHash3 } from "@awsless/ts-file-cache";
 var import_deepmerge4 = __toESM(require_cjs2(), 1);
 
 // src/feature/job/build/executable.ts
-import { createHash as createHash14 } from "crypto";
-import { readFile as readFile11, writeFile as writeFile7 } from "fs/promises";
+import { createHash as createHash15 } from "crypto";
+import { readFile as readFile12, writeFile as writeFile7 } from "fs/promises";
 import { join as join25, resolve as resolve3 } from "path";
 var buildJobExecutable = async (input, outputPath, architecture) => {
   const filePath = join25(outputPath, "program");
@@ -107772,9 +107819,9 @@ await handler(payload)
 ${result.logs?.map((log) => log.message).join(`
 `)}`);
   }
-  const file2 = await readFile11(filePath);
+  const file2 = await readFile12(filePath);
   return {
-    hash: createHash14("sha1").update(file2).update(target2).digest("hex"),
+    hash: createHash15("sha1").update(file2).update(target2).digest("hex"),
     file: file2
   };
 };
@@ -108037,7 +108084,7 @@ var createFargateJob = (parentGroup, ctx, ns, id, local) => {
   variables.AWS_ACCOUNT_ID = ctx.accountId;
   variables.STACK = ctx.stackConfig.name;
   variables.CODE_HASH = code.sourceHash;
-  variables.JOB_CONFIG_HASH = createHash15("sha1").update(stringify2(props)).digest("hex");
+  variables.JOB_CONFIG_HASH = createHash16("sha1").update(stringify2(props)).digest("hex");
   if (props.environment) {
     for (const [key, value] of Object.entries(props.environment)) {
       variables[key] = value;
@@ -108232,7 +108279,7 @@ import { toDays as toDays12, toSeconds as toSeconds10 } from "@awsless/duration"
 import { stringify as stringify3 } from "@awsless/json";
 import { generateFileHash as generateFileHash4 } from "@awsless/ts-file-cache";
 var import_deepmerge6 = __toESM(require_cjs2(), 1);
-import { createHash as createHash16 } from "crypto";
+import { createHash as createHash17 } from "crypto";
 import { join as join26 } from "path";
 var createFargateTask = (parentGroup, ctx, ns, id, local) => {
   const group = new Group(parentGroup, "instance", ns);
@@ -108525,7 +108572,7 @@ var createFargateTask = (parentGroup, ctx, ns, id, local) => {
   variables.AWS_ACCOUNT_ID = ctx.accountId;
   variables.STACK = ctx.stackConfig.name;
   variables.CODE_HASH = code.sourceHash;
-  variables.INSTANCE_CONFIG_HASH = createHash16("sha1").update(stringify3(props)).digest("hex");
+  variables.INSTANCE_CONFIG_HASH = createHash17("sha1").update(stringify3(props)).digest("hex");
   if (props.environment) {
     for (const [key, value] of Object.entries(props.environment)) {
       variables[key] = value;
@@ -109241,7 +109288,7 @@ var MAX_VALUE_SIZE = 1000;
 var ORIGIN_PLACEHOLDER = "x".repeat(64);
 var assertRouteValueSize = (key, route) => {
   const withOrigin = (entry) => {
-    return entry.type === "lambda" ? { ...entry, domainName: ORIGIN_PLACEHOLDER } : entry;
+    return entry.type === "lambda" && !entry.domainName ? { ...entry, domainName: ORIGIN_PLACEHOLDER } : entry;
   };
   for (const entry of Array.isArray(route) ? route : [route]) {
     if (Buffer.byteLength(JSON.stringify(withOrigin(entry)), "utf8") > MAX_VALUE_SIZE) {
@@ -109313,7 +109360,7 @@ var routerFeature = defineFeature({
         for (const dependency of options?.dependsOn ?? []) {
           routeDependencies.add(dependency);
         }
-        if (Object.values(newRoutes).flat().some((route) => route.type === "lambda")) {
+        if (Object.values(newRoutes).flat().some((route) => route.type === "lambda" && !route.domainName)) {
           hasLambdaRoutes = true;
         }
       });
@@ -109692,7 +109739,7 @@ var routerFeature = defineFeature({
             functionVersion: bundle.lambda.version,
             routes: $resolve([routes, lambdaUrlHost], (routes2, lambdaUrlHost2) => {
               const withOrigin = (route) => {
-                return route.type === "lambda" ? { ...route, domainName: lambdaUrlHost2 } : route;
+                return route.type === "lambda" && !route.domainName ? { ...route, domainName: lambdaUrlHost2 } : route;
               };
               return Object.entries(routes2).flatMap(([key, route]) => createRouteStoreEntries(key, Array.isArray(route) ? route.map(withOrigin) : withOrigin(route)));
             })
@@ -111137,7 +111184,7 @@ 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 { mkdir as mkdir6, readFile as readFile13, writeFile as writeFile8 } from "fs/promises";
 import { join as join28 } from "path";
 import { parse as parse5, stringify as stringify4 } from "@awsless/json";
 import { generateFolderHash, loadWorkspace as loadWorkspace2 } from "@awsless/ts-file-cache";
@@ -111324,7 +111371,7 @@ var runTest = async (stack, dir, filters, workspace, opts) => {
   if (!process.env.NO_CACHE) {
     const exists2 = await fileExist(file2);
     if (exists2) {
-      const raw = await readFile12(file2, { encoding: "utf8" });
+      const raw = await readFile13(file2, { encoding: "utf8" });
       const data = parse5(raw);
       if (data.fingerprint === fingerprint) {
         logs_exports.step(formatResult({
@@ -114889,7 +114936,7 @@ var parseIni = (iniData) => {
 import { readFile as fsReadFile } from "fs/promises";
 var filePromises = {};
 var fileIntercept = {};
-var readFile13 = (path2, options) => {
+var readFile14 = (path2, options) => {
   if (fileIntercept[path2] !== undefined) {
     return fileIntercept[path2];
   }
@@ -114914,10 +114961,10 @@ var loadSharedConfigFiles = async (init = {}) => {
     resolvedConfigFilepath = join32(homeDir, configFilepath.slice(2));
   }
   const parsedFiles = await Promise.all([
-    readFile13(resolvedConfigFilepath, {
+    readFile14(resolvedConfigFilepath, {
       ignoreCache: init.ignoreCache
     }).then(parseIni).then(getConfigData).catch(swallowError),
-    readFile13(resolvedFilepath, {
+    readFile14(resolvedFilepath, {
       ignoreCache: init.ignoreCache
     }).then(parseIni).catch(swallowError)
   ]);
@@ -116003,7 +116050,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 { readFile as readFile16 } from "fs/promises";
 import { join as join34 } 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
@@ -116073,7 +116120,7 @@ var getTypeScriptUserAgentPair = async () => {
   for (const nodeModulesParentDir of nodeModulesParentDirs) {
     try {
       const appPackageJsonPath = join34(nodeModulesParentDir, "package.json");
-      const packageJson = await readFile15(appPackageJsonPath, "utf-8");
+      const packageJson = await readFile16(appPackageJsonPath, "utf-8");
       const { dependencies, devDependencies } = JSON.parse(packageJson);
       const version2 = devDependencies?.typescript ?? dependencies?.typescript;
       if (typeof version2 !== "string") {
@@ -116091,7 +116138,7 @@ var getTypeScriptUserAgentPair = async () => {
   for (const nodeModulesParentDir of nodeModulesParentDirs) {
     try {
       const tsPackageJsonPath = join34(nodeModulesParentDir, TS_PACKAGE_JSON);
-      const packageJson = await readFile15(tsPackageJsonPath, "utf-8");
+      const packageJson = await readFile16(tsPackageJsonPath, "utf-8");
       const { version: version2 } = JSON.parse(packageJson);
       const sanitizedVersion2 = getSanitizedTypeScriptVersion(version2);
       if (typeof sanitizedVersion2 !== "string") {
@@ -116216,7 +116263,7 @@ var toUtf82 = (input) => {
 
 // ../../node_modules/.pnpm/@smithy+hash-node@4.2.12/node_modules/@smithy/hash-node/dist-es/index.js
 import { Buffer as Buffer3 } from "buffer";
-import { createHash as createHash18, createHmac as createHmac3 } from "crypto";
+import { createHash as createHash19, createHmac as createHmac3 } from "crypto";
 
 class Hash {
   algorithmIdentifier;
@@ -116234,7 +116281,7 @@ class Hash {
     return Promise.resolve(this.hash.digest());
   }
   reset() {
-    this.hash = this.secret ? createHmac3(this.algorithmIdentifier, castSourceData(this.secret)) : createHash18(this.algorithmIdentifier);
+    this.hash = this.secret ? createHmac3(this.algorithmIdentifier, castSourceData(this.secret)) : createHash19(this.algorithmIdentifier);
   }
 }
 function castSourceData(toCast, encoding) {