@awsless/awsless 0.0.534 → 0.0.536

package/dist/bin.js

@@ -1564,6 +1564,10 @@ var SitesSchema = z32.record(
       origins: z32.string().array().default(["*"]),
       methods: z32.enum(["GET", "DELETE", "HEAD", "OPTIONS", "PATCH", "POST", "PUT", "ALL"]).array().default(["ALL"])
     }).optional().describe("Specify the cors headers."),
+    auth: z32.object({
+      username: z32.string().describe("Basic auth username"),
+      password: z32.string().describe("Basic auth password")
+    }).optional().describe("Enable basic authentication for the site"),
     security: z32.object({
       // contentSecurityPolicy: z.object({
       // 	override: z.boolean().default(false),
@@ -1678,6 +1682,7 @@ var IconsSchema = z34.record(
     domain: ResourceIdSchema.describe("The domain id to link your site with.").optional(),
     subDomain: z34.string().optional(),
     log: LogSchema.optional(),
+    cacheDuration: DurationSchema.optional().describe("The cache duration of the cached icons."),
     preserveId: z34.boolean().optional().default(false).describe("Preserve the IDs of the icons."),
     symbols: z34.boolean().optional().default(false).describe("Use SVG symbols for icons."),
     origin: z34.union([
@@ -1729,6 +1734,7 @@ var ImagesSchema = z35.record(
     domain: ResourceIdSchema.describe("The domain id to link your site with.").optional(),
     subDomain: z35.string().optional(),
     log: LogSchema.optional(),
+    cacheDuration: DurationSchema.optional().describe("Cache duration of the cached images."),
     presets: z35.record(z35.string(), transformationOptionsSchema).describe("Named presets for image transformations"),
     extensions: z35.object({
       jpeg: z35.object({
@@ -4734,13 +4740,16 @@ var getCacheControl = (file) => {
 var getContentType = (file) => {
   return contentType(extname2(file)) || "text/html; charset=utf-8";
 };
-var getViewerRequestFunctionCode = (domain2, bucket, functionUrl) => {
+var getViewerRequestFunctionCode = (domain2, bucket, functionUrl, basicAuth) => {
   return $resolve([bucket?.bucketRegionalDomainName, functionUrl?.functionUrl], (bucketDomain, lambdaUrl) => {
     return CF_FUNC_WRAP([
       // --------------------------------------------------------
       // Block direct access to cloudfront.
       domain2 ? BLOCK_DIRECT_ACCESS_TO_CLOUDFRONT : "",
       // --------------------------------------------------------
+      // Basic Authentication
+      basicAuth ? BASIC_AUTH_CHECK(basicAuth.username, basicAuth.password) : "",
+      // --------------------------------------------------------
       // Define functions.
       bucketDomain ? GET_PREFIXES : "",
       bucketDomain ? SET_S3_ORIGIN : "",
@@ -4773,6 +4782,18 @@ if (event.request.headers.host.value.includes('cloudfront.net')) {
 		statusDescription: 'Forbidden'
 	};
 }`;
+var BASIC_AUTH_CHECK = (username, password) => `
+var auth = event.request.headers.authorization && event.request.headers.authorization.value;
+if (!auth || !auth.startsWith('Basic ') || atob(auth.slice(6)) !== '${username}:${password}') {
+	return {
+		statusCode: 401,
+		headers: {
+			'www-authenticate': {
+				value: 'Basic realm="Protected"'
+			}
+		}
+	};
+}`;
 var SET_S3_ORIGIN = `
 function setS3Origin(s3Domain) {
 	const origin = {
@@ -4785,8 +4806,8 @@ function setS3Origin(s3Domain) {
 		}
 	};
 
-	console.log("s3 origin")
-	console.log(origin)
+	// console.log("s3 origin")
+	// console.log(origin)
 	cf.updateRequestOrigin(origin);
 }`;
 var SET_LAMBDA_ORIGIN = `
@@ -5087,7 +5108,7 @@ var siteFeature = defineFeature({
         runtime: `cloudfront-js-2.0`,
         comment: `Viewer Request - ${name}`,
         publish: true,
-        code: getViewerRequestFunctionCode(domainName, bucket, functionUrl),
+        code: getViewerRequestFunctionCode(domainName, bucket, functionUrl, props.auth),
         keyValueStoreAssociations: kvs ? [kvs.arn] : void 0
       });
       const distribution = new $15.aws.cloudfront.Distribution(group, "distribution", {
@@ -5998,7 +6019,7 @@ var layerFeature = defineFeature({
 import { $ as $22, Group as Group23 } from "@awsless/formation";
 import { join as join12, dirname as dirname8 } from "path";
 import { mebibytes as mebibytes4 } from "@awsless/size";
-import { days as days6, seconds as seconds9, toSeconds as toSeconds8 } from "@awsless/duration";
+import { days as days6, seconds as seconds9, toDays as toDays5, toSeconds as toSeconds8 } from "@awsless/duration";
 import { constantCase as constantCase11 } from "change-case";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import { glob as glob3 } from "glob";
@@ -6077,7 +6098,18 @@ var imageFeature = defineFeature({
         tags: {
           cache: "true"
         },
-        forceDestroy: true
+        forceDestroy: true,
+        ...props.cacheDuration ? {
+          lifecycleRule: [
+            {
+              enabled: true,
+              id: "image-cache-duration",
+              expiration: {
+                days: toDays5(props.cacheDuration)
+              }
+            }
+          ]
+        } : {}
       });
       const sharpLayerId = formatGlobalResourceName({
         appName: ctx.appConfig.name,
@@ -6184,6 +6216,7 @@ var imageFeature = defineFeature({
         aliases: domainName ? [domainName] : void 0,
         priceClass: "PriceClass_All",
         httpVersion: "http2and3",
+        waitForDeployment: false,
         restrictions: {
           geoRestriction: {
             restrictionType: "none",
@@ -6293,7 +6326,7 @@ var imageFeature = defineFeature({
 import { $ as $23, Group as Group24 } from "@awsless/formation";
 import { join as join13, dirname as dirname9 } from "path";
 import { mebibytes as mebibytes5 } from "@awsless/size";
-import { days as days7, seconds as seconds10, toSeconds as toSeconds9 } from "@awsless/duration";
+import { days as days7, seconds as seconds10, toDays as toDays6, toSeconds as toSeconds9 } from "@awsless/duration";
 import { constantCase as constantCase12 } from "change-case";
 import { fileURLToPath as fileURLToPath3 } from "url";
 import { glob as glob4 } from "glob";
@@ -6332,7 +6365,21 @@ var iconFeature = defineFeature({
           resourceType: "icon",
           resourceName: shortId(`cache-${id}-${ctx.appId}`)
         }),
-        forceDestroy: true
+        tags: {
+          cache: "true"
+        },
+        forceDestroy: true,
+        ...props.cacheDuration ? {
+          lifecycleRule: [
+            {
+              enabled: true,
+              id: "icon-cache-duration",
+              expiration: {
+                days: toDays6(props.cacheDuration)
+              }
+            }
+          ]
+        } : {}
       });
       const serverLambda = createPrebuildLambdaFunction(group, ctx, "icon", id, {
         bundleFile: join13(__dirname3, "/prebuild/icon/bundle.zip"),

package/dist/build-json-schema.js

@@ -959,6 +959,10 @@ var SitesSchema = z29.record(
       origins: z29.string().array().default(["*"]),
       methods: z29.enum(["GET", "DELETE", "HEAD", "OPTIONS", "PATCH", "POST", "PUT", "ALL"]).array().default(["ALL"])
     }).optional().describe("Specify the cors headers."),
+    auth: z29.object({
+      username: z29.string().describe("Basic auth username"),
+      password: z29.string().describe("Basic auth password")
+    }).optional().describe("Enable basic authentication for the site"),
     security: z29.object({
       // contentSecurityPolicy: z.object({
       // 	override: z.boolean().default(false),
@@ -1073,6 +1077,7 @@ var IconsSchema = z31.record(
     domain: ResourceIdSchema.describe("The domain id to link your site with.").optional(),
     subDomain: z31.string().optional(),
     log: LogSchema.optional(),
+    cacheDuration: DurationSchema.optional().describe("The cache duration of the cached icons."),
     preserveId: z31.boolean().optional().default(false).describe("Preserve the IDs of the icons."),
     symbols: z31.boolean().optional().default(false).describe("Use SVG symbols for icons."),
     origin: z31.union([
@@ -1124,6 +1129,7 @@ var ImagesSchema = z32.record(
     domain: ResourceIdSchema.describe("The domain id to link your site with.").optional(),
     subDomain: z32.string().optional(),
     log: LogSchema.optional(),
+    cacheDuration: DurationSchema.optional().describe("Cache duration of the cached images."),
     presets: z32.record(z32.string(), transformationOptionsSchema).describe("Named presets for image transformations"),
     extensions: z32.object({
       jpeg: z32.object({

package/dist/prebuild/image/HASH

@@ -1 +1 @@
-ec61da9b3cd0cdab7d90e90891cbd4e68058b97b
+77d5c40c76a204153d51f02737dfbfb9568c0601

package/dist/prebuild/rpc/HASH

@@ -1 +1 @@
-067ac22da538619c808461cfb4c14803a7a8917d
+8446d078f922ef61f32bfa9a1e660975640f784c