effortless-aws 0.15.0 → 0.16.1

package/dist/cli/index.js

@@ -72096,6 +72096,13 @@ var syncFiles = (input) => Effect_exports.gen(function* () {
   yield* Effect_exports.logDebug(`S3 sync: ${uploaded} uploaded, ${deleted} deleted, ${unchanged} unchanged`);
   return { uploaded, deleted, unchanged };
 });
+var putObject = (input) => s3_exports.make("put_object", {
+  Bucket: input.bucketName,
+  Key: input.key,
+  Body: typeof input.body === "string" ? Buffer.from(input.body) : input.body,
+  ContentType: input.contentType,
+  CacheControl: input.cacheControl ?? "public, max-age=0, must-revalidate"
+});
 var putBucketPolicyForOAC = (bucketName, distributionArn) => Effect_exports.gen(function* () {
   const policy = JSON.stringify({
     Version: "2012-10-17",
@@ -72232,6 +72239,9 @@ var findCertificate = (domain) => Effect_exports.gen(function* () {
 
 // src/aws/cloudfront.ts
 var CACHING_OPTIMIZED_POLICY_ID = "658327ea-f89d-4fab-a63d-7e88639e58f6";
+var CACHING_DISABLED_POLICY_ID = "4135ea2d-bfcb-4884-b0c3-f7c1dc6e36b4";
+var ALL_VIEWER_EXCEPT_HOST_HEADER_POLICY_ID = "b689b0a8-53d0-40ab-baf2-68738e2966ac";
+var SECURITY_HEADERS_POLICY_ID = "67f7725c-6f97-4210-82d7-5512b31e9d03";
 var ensureOAC = (input) => Effect_exports.gen(function* () {
   const { name } = input;
   const result = yield* cloudfront_exports.make("list_origin_access_controls", {});
@@ -72330,7 +72340,7 @@ var ensureViewerRequestFunction = (name, config2) => Effect_exports.gen(function
 });
 var makeDistComment = (project2, stage, handlerName) => `effortless: ${project2}/${stage}/${handlerName}`;
 var ensureDistribution = (input) => Effect_exports.gen(function* () {
-  const { project: project2, stage, handlerName, bucketName, bucketRegion, oacId, spa, index, tags: tags2, urlRewriteFunctionArn, lambdaEdgeArn, aliases, acmCertificateArn } = input;
+  const { project: project2, stage, handlerName, bucketName, bucketRegion, oacId, spa, index, tags: tags2, urlRewriteFunctionArn, lambdaEdgeArn, aliases, acmCertificateArn, apiOriginDomain, routePatterns } = input;
   const aliasesConfig = aliases && aliases.length > 0 ? { Quantity: aliases.length, Items: aliases } : { Quantity: 0, Items: [] };
   const viewerCertificate = acmCertificateArn ? {
     ACMCertificateArn: acmCertificateArn,
@@ -72340,8 +72350,53 @@ var ensureDistribution = (input) => Effect_exports.gen(function* () {
   const functionAssociations = !lambdaEdgeArn && urlRewriteFunctionArn ? { Quantity: 1, Items: [{ FunctionARN: urlRewriteFunctionArn, EventType: "viewer-request" }] } : { Quantity: 0, Items: [] };
   const lambdaFunctionAssociations = lambdaEdgeArn ? { Quantity: 1, Items: [{ EventType: "viewer-request", LambdaFunctionARN: lambdaEdgeArn, IncludeBody: false }] } : { Quantity: 0, Items: [] };
   const comment = makeDistComment(project2, stage, handlerName);
-  const originId = `S3-${bucketName}`;
-  const originDomain = `${bucketName}.s3.${bucketRegion}.amazonaws.com`;
+  const s3OriginId = `S3-${bucketName}`;
+  const s3OriginDomain = `${bucketName}.s3.${bucketRegion}.amazonaws.com`;
+  const hasApiRoutes = apiOriginDomain && routePatterns && routePatterns.length > 0;
+  const apiOriginId = hasApiRoutes ? `API-${project2}-${stage}` : void 0;
+  const originsItems = [
+    {
+      Id: s3OriginId,
+      DomainName: s3OriginDomain,
+      OriginPath: "",
+      OriginAccessControlId: oacId,
+      S3OriginConfig: { OriginAccessIdentity: "" },
+      CustomHeaders: { Quantity: 0, Items: [] }
+    },
+    ...hasApiRoutes ? [{
+      Id: apiOriginId,
+      DomainName: apiOriginDomain,
+      OriginPath: "",
+      CustomOriginConfig: {
+        HTTPPort: 80,
+        HTTPSPort: 443,
+        OriginProtocolPolicy: "https-only",
+        OriginSslProtocols: { Quantity: 1, Items: ["TLSv1.2"] },
+        OriginReadTimeout: 30,
+        OriginKeepaliveTimeout: 5
+      },
+      CustomHeaders: { Quantity: 0, Items: [] }
+    }] : []
+  ];
+  const API_METHODS = ["GET", "HEAD", "OPTIONS", "PUT", "POST", "PATCH", "DELETE"];
+  const CACHED_METHODS = ["GET", "HEAD"];
+  const cacheBehaviors = hasApiRoutes ? {
+    Quantity: routePatterns.length,
+    Items: routePatterns.map((pattern2) => ({
+      PathPattern: pattern2,
+      TargetOriginId: apiOriginId,
+      ViewerProtocolPolicy: "redirect-to-https",
+      AllowedMethods: {
+        Quantity: 7,
+        Items: [...API_METHODS],
+        CachedMethods: { Quantity: 2, Items: [...CACHED_METHODS] }
+      },
+      Compress: true,
+      CachePolicyId: CACHING_DISABLED_POLICY_ID,
+      OriginRequestPolicyId: ALL_VIEWER_EXCEPT_HOST_HEADER_POLICY_ID
+    }))
+  } : { Quantity: 0, Items: [] };
+  const { errorPagePath } = input;
   const customErrorResponses = spa ? {
     Quantity: 2,
     Items: [
@@ -72358,6 +72413,22 @@ var ensureDistribution = (input) => Effect_exports.gen(function* () {
         ErrorCachingMinTTL: 0
       }
     ]
+  } : errorPagePath ? {
+    Quantity: 2,
+    Items: [
+      {
+        ErrorCode: 403,
+        ResponseCode: "404",
+        ResponsePagePath: errorPagePath,
+        ErrorCachingMinTTL: 0
+      },
+      {
+        ErrorCode: 404,
+        ResponseCode: "404",
+        ResponsePagePath: errorPagePath,
+        ErrorCachingMinTTL: 0
+      }
+    ]
   } : { Quantity: 0, Items: [] };
   const existing = yield* findDistributionByTags(project2, stage, handlerName);
   if (existing) {
@@ -72373,7 +72444,12 @@ var ensureDistribution = (input) => Effect_exports.gen(function* () {
     const aliasesMatch = currentAliases.length === desiredAliases.length && desiredAliases.every((a) => currentAliases.includes(a));
     const certMatch = currentConfig.ViewerCertificate?.ACMCertificateArn === (acmCertificateArn ?? void 0);
     const currentLambdaEdgeArn = currentConfig.DefaultCacheBehavior?.LambdaFunctionAssociations?.Items?.[0]?.LambdaFunctionARN;
-    const needsUpdate = currentOrigin?.DomainName !== originDomain || currentOrigin?.OriginAccessControlId !== oacId || currentConfig.DefaultRootObject !== index || currentConfig.DefaultCacheBehavior?.CachePolicyId !== CACHING_OPTIMIZED_POLICY_ID || (currentConfig.CustomErrorResponses?.Quantity ?? 0) !== customErrorResponses.Quantity || (currentConfig.DefaultCacheBehavior?.FunctionAssociations?.Quantity ?? 0) !== functionAssociations.Quantity || currentConfig.DefaultCacheBehavior?.FunctionAssociations?.Items?.[0]?.FunctionARN !== (urlRewriteFunctionArn ?? void 0) || (currentConfig.DefaultCacheBehavior?.LambdaFunctionAssociations?.Quantity ?? 0) !== lambdaFunctionAssociations.Quantity || currentLambdaEdgeArn !== (lambdaEdgeArn ?? void 0) || !aliasesMatch || !certMatch;
+    const originsMatch = (currentConfig.Origins?.Quantity ?? 0) === originsItems.length;
+    const currentBehaviorPatterns = (currentConfig.CacheBehaviors?.Items ?? []).map((b) => b.PathPattern).sort();
+    const desiredBehaviorPatterns = (routePatterns ?? []).slice().sort();
+    const behaviorsMatch = currentBehaviorPatterns.length === desiredBehaviorPatterns.length && desiredBehaviorPatterns.every((p3, i) => currentBehaviorPatterns[i] === p3);
+    const apiOriginMatch = !hasApiRoutes || currentConfig.Origins?.Items?.some((o) => o.DomainName === apiOriginDomain);
+    const needsUpdate = currentOrigin?.DomainName !== s3OriginDomain || currentOrigin?.OriginAccessControlId !== oacId || currentConfig.DefaultRootObject !== index || currentConfig.DefaultCacheBehavior?.CachePolicyId !== CACHING_OPTIMIZED_POLICY_ID || currentConfig.DefaultCacheBehavior?.ResponseHeadersPolicyId !== SECURITY_HEADERS_POLICY_ID || (currentConfig.CustomErrorResponses?.Quantity ?? 0) !== customErrorResponses.Quantity || (currentConfig.DefaultCacheBehavior?.FunctionAssociations?.Quantity ?? 0) !== functionAssociations.Quantity || currentConfig.DefaultCacheBehavior?.FunctionAssociations?.Items?.[0]?.FunctionARN !== (urlRewriteFunctionArn ?? void 0) || (currentConfig.DefaultCacheBehavior?.LambdaFunctionAssociations?.Quantity ?? 0) !== lambdaFunctionAssociations.Quantity || currentLambdaEdgeArn !== (lambdaEdgeArn ?? void 0) || !aliasesMatch || !certMatch || !originsMatch || !behaviorsMatch || !apiOriginMatch;
     if (needsUpdate) {
       yield* Effect_exports.logDebug(`CloudFront distribution ${existing.Id} config changed, updating...`);
       const etag = configResult.ETag;
@@ -72384,21 +72460,12 @@ var ensureDistribution = (input) => Effect_exports.gen(function* () {
           ...currentConfig,
           Comment: comment,
           Origins: {
-            Quantity: 1,
-            Items: [
-              {
-                Id: originId,
-                DomainName: originDomain,
-                OriginPath: "",
-                OriginAccessControlId: oacId,
-                S3OriginConfig: { OriginAccessIdentity: "" },
-                CustomHeaders: { Quantity: 0, Items: [] }
-              }
-            ]
+            Quantity: originsItems.length,
+            Items: originsItems
           },
           DefaultCacheBehavior: {
             ...currentConfig.DefaultCacheBehavior,
-            TargetOriginId: originId,
+            TargetOriginId: s3OriginId,
             ViewerProtocolPolicy: "redirect-to-https",
             AllowedMethods: {
               Quantity: 2,
@@ -72407,10 +72474,12 @@ var ensureDistribution = (input) => Effect_exports.gen(function* () {
             },
             Compress: true,
             CachePolicyId: CACHING_OPTIMIZED_POLICY_ID,
+            ResponseHeadersPolicyId: SECURITY_HEADERS_POLICY_ID,
             FunctionAssociations: functionAssociations,
             LambdaFunctionAssociations: lambdaFunctionAssociations,
             ForwardedValues: void 0
           },
+          CacheBehaviors: cacheBehaviors,
           Aliases: aliasesConfig,
           ...viewerCertificate ? { ViewerCertificate: viewerCertificate } : {},
           DefaultRootObject: index,
@@ -72436,18 +72505,11 @@ var ensureDistribution = (input) => Effect_exports.gen(function* () {
     CallerReference: `${project2}-${stage}-${handlerName}-${Date.now()}`,
     Comment: comment,
     Origins: {
-      Quantity: 1,
-      Items: [
-        {
-          Id: originId,
-          DomainName: originDomain,
-          OriginAccessControlId: oacId,
-          S3OriginConfig: { OriginAccessIdentity: "" }
-        }
-      ]
+      Quantity: originsItems.length,
+      Items: originsItems
     },
     DefaultCacheBehavior: {
-      TargetOriginId: originId,
+      TargetOriginId: s3OriginId,
       ViewerProtocolPolicy: "redirect-to-https",
       AllowedMethods: {
         Quantity: 2,
@@ -72456,9 +72518,11 @@ var ensureDistribution = (input) => Effect_exports.gen(function* () {
       },
       Compress: true,
       CachePolicyId: CACHING_OPTIMIZED_POLICY_ID,
+      ResponseHeadersPolicyId: SECURITY_HEADERS_POLICY_ID,
       FunctionAssociations: functionAssociations,
       LambdaFunctionAssociations: lambdaFunctionAssociations
     },
+    CacheBehaviors: cacheBehaviors,
     Aliases: aliasesConfig,
     ...viewerCertificate ? { ViewerCertificate: viewerCertificate } : {},
     DefaultRootObject: index,
@@ -72820,7 +72884,7 @@ var parseSource = (source) => {
   const project2 = new Project({ useInMemoryFileSystem: true });
   return project2.createSourceFile("input.ts", source);
 };
-var RUNTIME_PROPS = ["onRequest", "onRecord", "onBatchComplete", "onBatch", "onMessage", "onObjectCreated", "onObjectRemoved", "setup", "schema", "onError", "deps", "config", "static", "middleware"];
+var RUNTIME_PROPS = ["onRequest", "onRecord", "onBatchComplete", "onBatch", "onMessage", "onObjectCreated", "onObjectRemoved", "setup", "schema", "onError", "deps", "config", "static", "middleware", "routes"];
 var evalConfig = (configText, exportName) => {
   try {
     return new Function(`return ${configText}`)();
@@ -72924,6 +72988,26 @@ var extractStaticGlobs = (obj) => {
   const arrayLiteral = init;
   return arrayLiteral.getElements().filter((e) => e.getKind() === SyntaxKind.StringLiteral).map((e) => e.asKindOrThrow(SyntaxKind.StringLiteral).getLiteralValue());
 };
+var extractRoutePatterns = (obj) => {
+  const routesProp = obj.getProperties().find((p3) => {
+    if (p3.getKind() === SyntaxKind.PropertyAssignment) {
+      return p3.getName() === "routes";
+    }
+    return false;
+  });
+  if (!routesProp || routesProp.getKind() !== SyntaxKind.PropertyAssignment) return [];
+  const init = routesProp.getInitializer();
+  if (!init || init.getKind() !== SyntaxKind.ObjectLiteralExpression) return [];
+  const routesObj = init;
+  return routesObj.getProperties().map((p3) => {
+    if (p3.getKind() !== SyntaxKind.PropertyAssignment) return "";
+    const nameNode = p3.getNameNode();
+    if (nameNode.getKind() === SyntaxKind.StringLiteral) {
+      return nameNode.asKindOrThrow(SyntaxKind.StringLiteral).getLiteralValue();
+    }
+    return nameNode.getText();
+  }).filter(Boolean);
+};
 var handlerRegistry = {
   http: {
     defineFn: "defineHttp",
@@ -72988,7 +73072,8 @@ var extractHandlerConfigs = (source, type2) => {
           const depsKeys = extractDepsKeys(objLiteral);
           const paramEntries = extractParamEntries(objLiteral);
           const staticGlobs = extractStaticGlobs(objLiteral);
-          results.push({ exportName: "default", config: config2, hasHandler, depsKeys, paramEntries, staticGlobs });
+          const routePatterns = extractRoutePatterns(objLiteral);
+          results.push({ exportName: "default", config: config2, hasHandler, depsKeys, paramEntries, staticGlobs, routePatterns });
         }
       }
     }
@@ -73011,7 +73096,8 @@ var extractHandlerConfigs = (source, type2) => {
         const depsKeys = extractDepsKeys(objLiteral);
         const paramEntries = extractParamEntries(objLiteral);
         const staticGlobs = extractStaticGlobs(objLiteral);
-        results.push({ exportName, config: config2, hasHandler, depsKeys, paramEntries, staticGlobs });
+        const routePatterns = extractRoutePatterns(objLiteral);
+        results.push({ exportName, config: config2, hasHandler, depsKeys, paramEntries, staticGlobs, routePatterns });
       }
     });
   });
@@ -73607,6 +73693,41 @@ var deployMiddlewareLambda = (input) => Effect_exports.gen(function* () {
   yield* Effect_exports.logDebug(`Middleware deployed: ${versionArn}`);
   return { versionArn };
 });
+var ERROR_PAGE_KEY = "_effortless/404.html";
+var generateErrorPageHtml = () => `<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<title>404 \u2014 Page not found</title>
+<style>
+  * { margin: 0; padding: 0; box-sizing: border-box; }
+  body {
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    min-height: 100vh;
+    background: #fff;
+    color: #111;
+  }
+  .c { text-align: center; }
+  h1 { font-size: 4rem; font-weight: 200; letter-spacing: 0.1em; }
+  hr { width: 40px; border: none; border-top: 1px solid #ccc; margin: 1.5rem auto; }
+  p { font-size: 1rem; color: #666; }
+  a { display: inline-block; margin-top: 1.5rem; color: #666; font-size: 0.875rem; text-decoration: none; }
+  a:hover { color: #111; }
+</style>
+</head>
+<body>
+<div class="c">
+  <h1>404</h1>
+  <hr>
+  <p>This page does not exist.</p>
+  <a href="javascript:history.back()">&larr; Back</a>
+</div>
+</body>
+</html>`;
 var deployStaticSite = (input) => Effect_exports.gen(function* () {
   const { projectDir, project: project2, region, fn: fn2 } = input;
   const { exportName, config: config2 } = fn2;
@@ -73614,6 +73735,14 @@ var deployStaticSite = (input) => Effect_exports.gen(function* () {
   const handlerName = exportName;
   const hasMiddleware = fn2.hasHandler;
   const tagCtx = { project: project2, stage, handler: handlerName };
+  const routePatterns = fn2.routePatterns;
+  if (routePatterns.length > 0 && !input.apiOriginDomain) {
+    return yield* Effect_exports.fail(
+      new Error(
+        `Static site "${exportName}" has routes but no API Gateway exists. Ensure defineHttp() handlers are included in the discovery patterns.`
+      )
+    );
+  }
   if (config2.build) {
     yield* Effect_exports.logDebug(`Building site: ${config2.build}`);
     yield* Effect_exports.try({
@@ -73682,6 +73811,7 @@ var deployStaticSite = (input) => Effect_exports.gen(function* () {
       urlRewriteFunctionArn = result.functionArn;
     }
   }
+  const errorPagePath = isSpa ? void 0 : config2.errorPage ? `/${config2.errorPage}` : `/${ERROR_PAGE_KEY}`;
   const index = config2.index ?? "index.html";
   const { distributionId, distributionArn, domainName } = yield* ensureDistribution({
     project: project2,
@@ -73696,11 +73826,21 @@ var deployStaticSite = (input) => Effect_exports.gen(function* () {
     urlRewriteFunctionArn,
     lambdaEdgeArn,
     aliases,
-    acmCertificateArn
+    acmCertificateArn,
+    errorPagePath,
+    ...input.apiOriginDomain && routePatterns.length > 0 ? { apiOriginDomain: input.apiOriginDomain, routePatterns } : {}
   });
   yield* putBucketPolicyForOAC(bucketName, distributionArn);
   const sourceDir = path8.resolve(projectDir, config2.dir);
   yield* syncFiles({ bucketName, sourceDir });
+  if (!isSpa && !config2.errorPage) {
+    yield* putObject({
+      bucketName,
+      key: ERROR_PAGE_KEY,
+      body: generateErrorPageHtml(),
+      contentType: "text/html; charset=utf-8"
+    });
+  }
   yield* invalidateDistribution(distributionId);
   const url2 = domain ? `https://${domain}` : `https://${domainName}`;
   yield* Effect_exports.logDebug(`Static site deployed: ${url2}`);
@@ -74165,9 +74305,10 @@ var buildAppTasks = (ctx, handlers, apiId, results) => {
   }
   return tasks;
 };
-var buildStaticSiteTasks = (ctx, handlers, results) => {
+var buildStaticSiteTasks = (ctx, handlers, results, apiId) => {
   const tasks = [];
   const { region } = ctx.input;
+  const apiOriginDomain = apiId ? `${apiId}.execute-api.${region}.amazonaws.com` : void 0;
   for (const { file: file7, exports } of handlers) {
     for (const fn2 of exports) {
       tasks.push(
@@ -74178,7 +74319,8 @@ var buildStaticSiteTasks = (ctx, handlers, results) => {
             stage: ctx.input.stage,
             region,
             fn: fn2,
-            ...fn2.hasHandler ? { file: file7 } : {}
+            ...fn2.hasHandler ? { file: file7 } : {},
+            ...apiOriginDomain ? { apiOriginDomain } : {}
           }).pipe(Effect_exports.provide(clients_exports.makeClients({
             s3: { region },
             cloudfront: { region: "us-east-1" },
@@ -74326,7 +74468,10 @@ var deployProject = (input) => Effect_exports.gen(function* () {
   }
   let apiId;
   let apiUrl;
-  if (totalHttpHandlers > 0 || totalAppHandlers > 0) {
+  const staticSitesNeedApi = staticSiteHandlers.some(
+    ({ exports }) => exports.some((fn2) => fn2.routePatterns.length > 0)
+  );
+  if (totalHttpHandlers > 0 || totalAppHandlers > 0 || staticSitesNeedApi) {
     const tagCtx = {
       project: input.project,
       stage,
@@ -74387,7 +74532,7 @@ var deployProject = (input) => Effect_exports.gen(function* () {
     ...apiId ? buildHttpTasks(ctx, httpHandlers, apiId, httpResults) : [],
     ...buildTableTasks(ctx, tableHandlers, tableResults),
     ...apiId ? buildAppTasks(ctx, appHandlers, apiId, appResults) : [],
-    ...buildStaticSiteTasks(ctx, staticSiteHandlers, staticSiteResults),
+    ...buildStaticSiteTasks(ctx, staticSiteHandlers, staticSiteResults, apiId),
     ...buildFifoQueueTasks(ctx, fifoQueueHandlers, fifoQueueResults),
     ...buildBucketTasks(ctx, bucketHandlers, bucketResults),
     ...buildMailerTasks(ctx, mailerHandlers, mailerResults)