qlara 0.1.11 → 0.1.12

package/dist/aws.cjs

@@ -462,8 +462,25 @@ function buildTemplate(config) {
                   }
                 }
               ]
-            }
-            // No CustomErrorResponses — the edge handler manages 403/404
+            },
+            // Serve the framework's 404 page (e.g., Next.js not-found.ts → 404.html)
+            // when S3 returns 403 (missing file) or 404. This covers:
+            // - Unknown routes not in the manifest
+            // - Validation failures (renderer abandons, no file uploaded)
+            CustomErrorResponses: [
+              {
+                ErrorCode: 403,
+                ResponseCode: 404,
+                ResponsePagePath: "/404.html",
+                ErrorCachingMinTTL: 10
+              },
+              {
+                ErrorCode: 404,
+                ResponseCode: 404,
+                ResponsePagePath: "/404.html",
+                ErrorCachingMinTTL: 10
+              }
+            ]
           }
         }
       }
@@ -665,33 +682,55 @@ function generateFallbackFromTemplate(templateHtml, routePattern) {
   );
   return fallback;
 }
+function findTemplateForRoute(buildDir, routePattern) {
+  const segments = routePattern.replace(/^\//, "").split("/");
+  function walk(currentDir, segmentIndex) {
+    if (segmentIndex >= segments.length) return null;
+    if (!(0, import_node_fs3.existsSync)(currentDir)) return null;
+    const segment = segments[segmentIndex];
+    const isLast = segmentIndex === segments.length - 1;
+    const isDynamic = segment.startsWith(":");
+    if (isLast) {
+      const files = (0, import_node_fs3.readdirSync)(currentDir).filter(
+        (f) => f.endsWith(".html") && f !== FALLBACK_FILENAME
+      );
+      return files.length > 0 ? (0, import_node_path3.join)(currentDir, files[0]) : null;
+    }
+    if (isDynamic) {
+      const entries = (0, import_node_fs3.readdirSync)(currentDir, { withFileTypes: true });
+      for (const entry of entries) {
+        if (entry.isDirectory() && !entry.name.startsWith("_") && !entry.name.startsWith(".")) {
+          const result = walk((0, import_node_path3.join)(currentDir, entry.name), segmentIndex + 1);
+          if (result) return result;
+        }
+      }
+      return null;
+    }
+    return walk((0, import_node_path3.join)(currentDir, segment), segmentIndex + 1);
+  }
+  return walk(buildDir, 0);
+}
 function generateFallbacks(buildDir, routes) {
   const generated = [];
   for (const route of routes) {
-    const parts = route.pattern.replace(/^\//, "").split("/");
-    const dirParts = parts.filter((p) => !p.startsWith(":"));
-    const routeDir = (0, import_node_path3.join)(buildDir, ...dirParts);
-    if (!(0, import_node_fs3.existsSync)(routeDir)) {
-      console.warn(
-        `[qlara] Warning: No output directory for route ${route.pattern} at ${routeDir}`
-      );
-      continue;
-    }
-    const files = (0, import_node_fs3.readdirSync)(routeDir).filter(
-      (f) => f.endsWith(".html") && f !== FALLBACK_FILENAME
-    );
-    if (files.length === 0) {
+    const templatePath = findTemplateForRoute(buildDir, route.pattern);
+    if (!templatePath) {
       console.warn(
-        `[qlara] Warning: No HTML files in ${routeDir} to create fallback template`
+        `[qlara] Warning: No HTML template found for route ${route.pattern}`
       );
       continue;
     }
-    const templatePath = (0, import_node_path3.join)(routeDir, files[0]);
     const templateHtml = (0, import_node_fs3.readFileSync)(templatePath, "utf-8");
     const fallbackHtml = generateFallbackFromTemplate(templateHtml, route.pattern);
-    const fallbackPath = (0, import_node_path3.join)(routeDir, FALLBACK_FILENAME);
+    const parts = route.pattern.replace(/^\//, "").split("/");
+    const dirParts = parts.filter((p) => !p.startsWith(":"));
+    const fallbackDir = dirParts.length > 0 ? (0, import_node_path3.join)(buildDir, ...dirParts) : buildDir;
+    if (!(0, import_node_fs3.existsSync)(fallbackDir)) {
+      (0, import_node_fs3.mkdirSync)(fallbackDir, { recursive: true });
+    }
+    const fallbackPath = (0, import_node_path3.join)(fallbackDir, FALLBACK_FILENAME);
     (0, import_node_fs3.writeFileSync)(fallbackPath, fallbackHtml);
-    const relativePath = (0, import_node_path3.join)(...dirParts, FALLBACK_FILENAME);
+    const relativePath = dirParts.length > 0 ? (0, import_node_path3.join)(...dirParts, FALLBACK_FILENAME) : FALLBACK_FILENAME;
     generated.push(relativePath);
     console.log(`[qlara] Generated fallback: ${relativePath}`);
   }
@@ -789,6 +828,18 @@ async function updateCloudFrontEdgeVersion(cf, distributionId, newVersionArn) {
     const qlaraPolicyId = await ensureCachePolicy(cf);
     config.DefaultCacheBehavior.CachePolicyId = qlaraPolicyId;
   }
+  const hasErrorResponses = config.CustomErrorResponses?.Items?.some(
+    (r) => r.ErrorCode === 403
+  );
+  if (!hasErrorResponses) {
+    config.CustomErrorResponses = {
+      Quantity: 2,
+      Items: [
+        { ErrorCode: 403, ResponseCode: "404", ResponsePagePath: "/404.html", ErrorCachingMinTTL: 10 },
+        { ErrorCode: 404, ResponseCode: "404", ResponsePagePath: "/404.html", ErrorCachingMinTTL: 10 }
+      ]
+    };
+  }
   await cf.send(
     new import_client_cloudfront.UpdateDistributionCommand({
       Id: distributionId,

package/dist/aws.js

@@ -459,8 +459,25 @@ function buildTemplate(config) {
                   }
                 }
               ]
-            }
-            // No CustomErrorResponses — the edge handler manages 403/404
+            },
+            // Serve the framework's 404 page (e.g., Next.js not-found.ts → 404.html)
+            // when S3 returns 403 (missing file) or 404. This covers:
+            // - Unknown routes not in the manifest
+            // - Validation failures (renderer abandons, no file uploaded)
+            CustomErrorResponses: [
+              {
+                ErrorCode: 403,
+                ResponseCode: 404,
+                ResponsePagePath: "/404.html",
+                ErrorCachingMinTTL: 10
+              },
+              {
+                ErrorCode: 404,
+                ResponseCode: 404,
+                ResponsePagePath: "/404.html",
+                ErrorCachingMinTTL: 10
+              }
+            ]
           }
         }
       }
@@ -592,7 +609,7 @@ async function bundleRenderer(routeFile, cacheTtl = 3600, framework) {
 var STACK_NAME_PREFIX = "qlara";
 
 // src/fallback.ts
-import { readFileSync as readFileSync3, writeFileSync, readdirSync as readdirSync2, existsSync as existsSync2 } from "fs";
+import { readFileSync as readFileSync3, writeFileSync, readdirSync as readdirSync2, existsSync as existsSync2, mkdirSync as mkdirSync2 } from "fs";
 import { join as join3 } from "path";
 var FALLBACK_FILENAME = "_fallback.html";
 function paramPlaceholder(paramName) {
@@ -661,33 +678,55 @@ function generateFallbackFromTemplate(templateHtml, routePattern) {
   );
   return fallback;
 }
+function findTemplateForRoute(buildDir, routePattern) {
+  const segments = routePattern.replace(/^\//, "").split("/");
+  function walk(currentDir, segmentIndex) {
+    if (segmentIndex >= segments.length) return null;
+    if (!existsSync2(currentDir)) return null;
+    const segment = segments[segmentIndex];
+    const isLast = segmentIndex === segments.length - 1;
+    const isDynamic = segment.startsWith(":");
+    if (isLast) {
+      const files = readdirSync2(currentDir).filter(
+        (f) => f.endsWith(".html") && f !== FALLBACK_FILENAME
+      );
+      return files.length > 0 ? join3(currentDir, files[0]) : null;
+    }
+    if (isDynamic) {
+      const entries = readdirSync2(currentDir, { withFileTypes: true });
+      for (const entry of entries) {
+        if (entry.isDirectory() && !entry.name.startsWith("_") && !entry.name.startsWith(".")) {
+          const result = walk(join3(currentDir, entry.name), segmentIndex + 1);
+          if (result) return result;
+        }
+      }
+      return null;
+    }
+    return walk(join3(currentDir, segment), segmentIndex + 1);
+  }
+  return walk(buildDir, 0);
+}
 function generateFallbacks(buildDir, routes) {
   const generated = [];
   for (const route of routes) {
-    const parts = route.pattern.replace(/^\//, "").split("/");
-    const dirParts = parts.filter((p) => !p.startsWith(":"));
-    const routeDir = join3(buildDir, ...dirParts);
-    if (!existsSync2(routeDir)) {
-      console.warn(
-        `[qlara] Warning: No output directory for route ${route.pattern} at ${routeDir}`
-      );
-      continue;
-    }
-    const files = readdirSync2(routeDir).filter(
-      (f) => f.endsWith(".html") && f !== FALLBACK_FILENAME
-    );
-    if (files.length === 0) {
+    const templatePath = findTemplateForRoute(buildDir, route.pattern);
+    if (!templatePath) {
       console.warn(
-        `[qlara] Warning: No HTML files in ${routeDir} to create fallback template`
+        `[qlara] Warning: No HTML template found for route ${route.pattern}`
       );
       continue;
     }
-    const templatePath = join3(routeDir, files[0]);
     const templateHtml = readFileSync3(templatePath, "utf-8");
     const fallbackHtml = generateFallbackFromTemplate(templateHtml, route.pattern);
-    const fallbackPath = join3(routeDir, FALLBACK_FILENAME);
+    const parts = route.pattern.replace(/^\//, "").split("/");
+    const dirParts = parts.filter((p) => !p.startsWith(":"));
+    const fallbackDir = dirParts.length > 0 ? join3(buildDir, ...dirParts) : buildDir;
+    if (!existsSync2(fallbackDir)) {
+      mkdirSync2(fallbackDir, { recursive: true });
+    }
+    const fallbackPath = join3(fallbackDir, FALLBACK_FILENAME);
     writeFileSync(fallbackPath, fallbackHtml);
-    const relativePath = join3(...dirParts, FALLBACK_FILENAME);
+    const relativePath = dirParts.length > 0 ? join3(...dirParts, FALLBACK_FILENAME) : FALLBACK_FILENAME;
     generated.push(relativePath);
     console.log(`[qlara] Generated fallback: ${relativePath}`);
   }
@@ -785,6 +824,18 @@ async function updateCloudFrontEdgeVersion(cf, distributionId, newVersionArn) {
     const qlaraPolicyId = await ensureCachePolicy(cf);
     config.DefaultCacheBehavior.CachePolicyId = qlaraPolicyId;
   }
+  const hasErrorResponses = config.CustomErrorResponses?.Items?.some(
+    (r) => r.ErrorCode === 403
+  );
+  if (!hasErrorResponses) {
+    config.CustomErrorResponses = {
+      Quantity: 2,
+      Items: [
+        { ErrorCode: 403, ResponseCode: "404", ResponsePagePath: "/404.html", ErrorCachingMinTTL: 10 },
+        { ErrorCode: 404, ResponseCode: "404", ResponsePagePath: "/404.html", ErrorCachingMinTTL: 10 }
+      ]
+    };
+  }
   await cf.send(
     new UpdateDistributionCommand({
       Id: distributionId,

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/cli.ts
-import { readFileSync as readFileSync4, writeFileSync as writeFileSync2, existsSync as existsSync3, mkdirSync as mkdirSync2 } from "fs";
+import { readFileSync as readFileSync4, writeFileSync as writeFileSync2, existsSync as existsSync3, mkdirSync as mkdirSync3 } from "fs";
 import { join as join4 } from "path";
 
 // src/provider/aws/constants.ts
@@ -470,8 +470,25 @@ function buildTemplate(config) {
                   }
                 }
               ]
-            }
-            // No CustomErrorResponses — the edge handler manages 403/404
+            },
+            // Serve the framework's 404 page (e.g., Next.js not-found.ts → 404.html)
+            // when S3 returns 403 (missing file) or 404. This covers:
+            // - Unknown routes not in the manifest
+            // - Validation failures (renderer abandons, no file uploaded)
+            CustomErrorResponses: [
+              {
+                ErrorCode: 403,
+                ResponseCode: 404,
+                ResponsePagePath: "/404.html",
+                ErrorCachingMinTTL: 10
+              },
+              {
+                ErrorCode: 404,
+                ResponseCode: 404,
+                ResponsePagePath: "/404.html",
+                ErrorCachingMinTTL: 10
+              }
+            ]
           }
         }
       }
@@ -600,7 +617,7 @@ async function bundleRenderer(routeFile, cacheTtl = 3600, framework) {
 }
 
 // src/fallback.ts
-import { readFileSync as readFileSync3, writeFileSync, readdirSync as readdirSync2, existsSync as existsSync2 } from "fs";
+import { readFileSync as readFileSync3, writeFileSync, readdirSync as readdirSync2, existsSync as existsSync2, mkdirSync as mkdirSync2 } from "fs";
 import { join as join3 } from "path";
 var FALLBACK_FILENAME = "_fallback.html";
 function paramPlaceholder(paramName) {
@@ -669,33 +686,55 @@ function generateFallbackFromTemplate(templateHtml, routePattern) {
   );
   return fallback;
 }
+function findTemplateForRoute(buildDir, routePattern) {
+  const segments = routePattern.replace(/^\//, "").split("/");
+  function walk(currentDir, segmentIndex) {
+    if (segmentIndex >= segments.length) return null;
+    if (!existsSync2(currentDir)) return null;
+    const segment = segments[segmentIndex];
+    const isLast = segmentIndex === segments.length - 1;
+    const isDynamic = segment.startsWith(":");
+    if (isLast) {
+      const files = readdirSync2(currentDir).filter(
+        (f) => f.endsWith(".html") && f !== FALLBACK_FILENAME
+      );
+      return files.length > 0 ? join3(currentDir, files[0]) : null;
+    }
+    if (isDynamic) {
+      const entries = readdirSync2(currentDir, { withFileTypes: true });
+      for (const entry of entries) {
+        if (entry.isDirectory() && !entry.name.startsWith("_") && !entry.name.startsWith(".")) {
+          const result = walk(join3(currentDir, entry.name), segmentIndex + 1);
+          if (result) return result;
+        }
+      }
+      return null;
+    }
+    return walk(join3(currentDir, segment), segmentIndex + 1);
+  }
+  return walk(buildDir, 0);
+}
 function generateFallbacks(buildDir, routes) {
   const generated = [];
   for (const route of routes) {
-    const parts = route.pattern.replace(/^\//, "").split("/");
-    const dirParts = parts.filter((p) => !p.startsWith(":"));
-    const routeDir = join3(buildDir, ...dirParts);
-    if (!existsSync2(routeDir)) {
-      console.warn(
-        `[qlara] Warning: No output directory for route ${route.pattern} at ${routeDir}`
-      );
-      continue;
-    }
-    const files = readdirSync2(routeDir).filter(
-      (f) => f.endsWith(".html") && f !== FALLBACK_FILENAME
-    );
-    if (files.length === 0) {
+    const templatePath = findTemplateForRoute(buildDir, route.pattern);
+    if (!templatePath) {
       console.warn(
-        `[qlara] Warning: No HTML files in ${routeDir} to create fallback template`
+        `[qlara] Warning: No HTML template found for route ${route.pattern}`
       );
       continue;
     }
-    const templatePath = join3(routeDir, files[0]);
     const templateHtml = readFileSync3(templatePath, "utf-8");
     const fallbackHtml = generateFallbackFromTemplate(templateHtml, route.pattern);
-    const fallbackPath = join3(routeDir, FALLBACK_FILENAME);
+    const parts = route.pattern.replace(/^\//, "").split("/");
+    const dirParts = parts.filter((p) => !p.startsWith(":"));
+    const fallbackDir = dirParts.length > 0 ? join3(buildDir, ...dirParts) : buildDir;
+    if (!existsSync2(fallbackDir)) {
+      mkdirSync2(fallbackDir, { recursive: true });
+    }
+    const fallbackPath = join3(fallbackDir, FALLBACK_FILENAME);
     writeFileSync(fallbackPath, fallbackHtml);
-    const relativePath = join3(...dirParts, FALLBACK_FILENAME);
+    const relativePath = dirParts.length > 0 ? join3(...dirParts, FALLBACK_FILENAME) : FALLBACK_FILENAME;
     generated.push(relativePath);
     console.log(`[qlara] Generated fallback: ${relativePath}`);
   }
@@ -793,6 +832,18 @@ async function updateCloudFrontEdgeVersion(cf, distributionId, newVersionArn) {
     const qlaraPolicyId = await ensureCachePolicy(cf);
     config.DefaultCacheBehavior.CachePolicyId = qlaraPolicyId;
   }
+  const hasErrorResponses = config.CustomErrorResponses?.Items?.some(
+    (r) => r.ErrorCode === 403
+  );
+  if (!hasErrorResponses) {
+    config.CustomErrorResponses = {
+      Quantity: 2,
+      Items: [
+        { ErrorCode: 403, ResponseCode: "404", ResponsePagePath: "/404.html", ErrorCachingMinTTL: 10 },
+        { ErrorCode: 404, ResponseCode: "404", ResponsePagePath: "/404.html", ErrorCachingMinTTL: 10 }
+      ]
+    };
+  }
   await cf.send(
     new UpdateDistributionCommand({
       Id: distributionId,
@@ -1161,7 +1212,7 @@ function loadResources() {
   return JSON.parse(readFileSync4(RESOURCES_PATH, "utf-8"));
 }
 function saveResources(resources) {
-  mkdirSync2(QLARA_DIR, { recursive: true });
+  mkdirSync3(QLARA_DIR, { recursive: true });
   writeFileSync2(RESOURCES_PATH, JSON.stringify(resources, null, 2));
 }
 async function deploy() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qlara",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "description": "Runtime ISR for static React apps — dynamic routing and SEO metadata for statically exported Next.js apps on AWS",
   "license": "MIT",
   "keywords": [

package/src/provider/aws/renderer.ts

@@ -834,6 +834,58 @@ async function findReferenceSegmentDir(bucket: string, routePrefix: string): Pro
   return null;
 }
 
+/**
+ * Find a reference segment directory using the route pattern.
+ * For multi-param routes like /:lang/products/:id, the direct URI-based prefix
+ * (e.g., 'da/products') may not contain any build-time pages. This function
+ * walks the S3 key hierarchy following the route pattern: static segments
+ * descend directly, dynamic segments list subdirectories and try any of them.
+ */
+async function findReferenceSegmentDirByPattern(
+  bucket: string,
+  routePattern: string,
+): Promise<string | null> {
+  // Remove the last segment (the page-level param) to get the parent segments
+  const segments = routePattern.replace(/^\//, '').split('/');
+  const parentSegments = segments.slice(0, -1);
+
+  async function searchPrefix(prefix: string, segmentIndex: number): Promise<string | null> {
+    if (segmentIndex >= parentSegments.length) {
+      // We've traversed all parent segments — check for segment files here
+      return findReferenceSegmentDir(bucket, prefix.replace(/\/$/, ''));
+    }
+
+    const segment = parentSegments[segmentIndex];
+
+    if (!segment.startsWith(':')) {
+      // Static segment — descend directly
+      const nextPrefix = prefix ? `${prefix}${segment}/` : `${segment}/`;
+      return searchPrefix(nextPrefix, segmentIndex + 1);
+    }
+
+    // Dynamic segment — list subdirectories and try each
+    try {
+      const response = await s3.send(new ListObjectsV2Command({
+        Bucket: bucket,
+        Prefix: prefix,
+        Delimiter: '/',
+        MaxKeys: 10,
+      }));
+
+      for (const commonPrefix of response.CommonPrefixes || []) {
+        const subPrefix = commonPrefix.Prefix || '';
+        const result = await searchPrefix(subPrefix, segmentIndex + 1);
+        if (result) return result;
+      }
+    } catch {
+      // S3 error — skip
+    }
+    return null;
+  }
+
+  return searchPrefix('', 0);
+}
+
 type SegmentFileType = 'shared' | 'tree' | 'head' | 'full' | 'page';
 
 /**
@@ -1004,14 +1056,19 @@ async function generateSegmentFiles(
   params: Record<string, string>,
   rscData: string | null,
   metadata: QlaraMetadata | null,
+  routePattern: string,
 ): Promise<void> {
   const cleanUri = uri.replace(/^\//, '').replace(/\/$/, '');
   const parts = cleanUri.split('/');
-  const routePrefix = parts.slice(0, -1).join('/'); // 'product'
-  const segmentDir = `${cleanUri}/`;                 // 'product/42/'
-
-  // Find a build-time page with segment files to use as reference
-  const refDir = await findReferenceSegmentDir(bucket, routePrefix);
+  const routePrefix = parts.slice(0, -1).join('/'); // 'da/products'
+  const segmentDir = `${cleanUri}/`;                 // 'da/products/42/'
+
+  // Find a build-time page with segment files to use as reference.
+  // Try the direct URI prefix first; fall back to pattern-based search for multi-param routes.
+  let refDir = await findReferenceSegmentDir(bucket, routePrefix);
+  if (!refDir) {
+    refDir = await findReferenceSegmentDirByPattern(bucket, routePattern);
+  }
   if (!refDir) return; // No segment files on S3 — Next.js 15 or no build-time pages
 
   // List all segment files in the reference directory
@@ -1217,7 +1274,7 @@ export async function handler(event: RendererEvent & { warmup?: boolean }): Prom
       // 7. Generate per-segment prefetch files (Next.js 16+ Segment Cache)
       //    Reads templates from a build-time reference page, patches page-specific data.
       //    Skips automatically for Next.js 15 (no segment files on S3).
-      await generateSegmentFiles(bucket, uri, params, rscData, metadata);
+      await generateSegmentFiles(bucket, uri, params, rscData, metadata, routePattern);
     }
 
     return {