qlara 0.1.4 → 0.1.6

package/dist/aws.cjs

@@ -69,12 +69,12 @@ function getContentType(filePath) {
   const ext = (0, import_node_path.extname)(filePath).toLowerCase();
   return CONTENT_TYPES[ext] || "application/octet-stream";
 }
-function getCacheControl(key) {
+function getCacheControl(key, cacheTtl) {
   if (key.includes("_next/static/") || key.includes(".chunk.")) {
     return "public, max-age=31536000, immutable";
   }
   if (key.endsWith(".html")) {
-    return "public, max-age=0, must-revalidate";
+    return `public, max-age=0, s-maxage=${cacheTtl}, stale-while-revalidate=60`;
   }
   return "public, max-age=86400";
 }
@@ -112,7 +112,7 @@ async function listAllKeys(client, bucketName) {
   } while (continuationToken);
   return keys;
 }
-async function syncToS3(client, bucketName, buildDir) {
+async function syncToS3(client, bucketName, buildDir, cacheTtl = 3600) {
   const files = listFiles(buildDir);
   const newKeys = /* @__PURE__ */ new Set();
   let uploaded = 0;
@@ -125,7 +125,7 @@ async function syncToS3(client, bucketName, buildDir) {
         newKeys.add(key);
         const body = (0, import_node_fs.readFileSync)(filePath);
         const contentType = getContentType(filePath);
-        const cacheControl = getCacheControl(key);
+        const cacheControl = getCacheControl(key, cacheTtl);
         await client.send(
           new import_client_s3.PutObjectCommand({
             Bucket: bucketName,
@@ -449,7 +449,7 @@ function buildTemplate(config) {
               CachePolicyId: { Ref: "CachePolicy" },
               LambdaFunctionAssociations: [
                 {
-                  EventType: "origin-response",
+                  EventType: "origin-request",
                   LambdaFunctionARN: { Ref: "EdgeHandlerVersion" },
                   IncludeBody: false
                 }
@@ -764,7 +764,7 @@ async function updateCloudFrontEdgeVersion(cf, distributionId, newVersionArn) {
   const lambdaAssociations = config.DefaultCacheBehavior?.LambdaFunctionAssociations;
   if (lambdaAssociations?.Items) {
     for (const assoc of lambdaAssociations.Items) {
-      if (assoc.EventType === "origin-response") {
+      if (assoc.EventType === "origin-request") {
         assoc.LambdaFunctionARN = newVersionArn;
       }
     }
@@ -878,7 +878,7 @@ function aws(awsConfig = {}) {
       console.log(`[qlara/aws] Generated ${fallbacks.length} fallback page(s)`);
       console.log("[qlara/aws] Syncing build output to S3...");
       const s3 = createS3Client(res.region);
-      const { uploaded, deleted } = await syncToS3(s3, res.bucketName, buildDir);
+      const { uploaded, deleted } = await syncToS3(s3, res.bucketName, buildDir, cacheTtl);
       console.log(`[qlara/aws] Uploaded ${uploaded} files, deleted ${deleted} stale files`);
       console.log("[qlara/aws] Bundling edge handler...");
       const edgeZip = await bundleEdgeHandler({
@@ -896,7 +896,8 @@ function aws(awsConfig = {}) {
       await lambda.send(
         new import_client_lambda.UpdateFunctionConfigurationCommand({
           FunctionName: res.edgeFunctionArn,
-          Timeout: 30
+          Timeout: 30,
+          MemorySize: 512
         })
       );
       await (0, import_client_lambda.waitUntilFunctionUpdatedV2)(
@@ -983,7 +984,7 @@ function aws(awsConfig = {}) {
         new import_client_lambda.UpdateFunctionConfigurationCommand({
           FunctionName: res.rendererFunctionArn,
           Layers: [],
-          MemorySize: 256,
+          MemorySize: 512,
           Timeout: 30,
           Environment: {
             Variables: config.env ?? {}

package/dist/aws.js

@@ -66,12 +66,12 @@ function getContentType(filePath) {
   const ext = extname(filePath).toLowerCase();
   return CONTENT_TYPES[ext] || "application/octet-stream";
 }
-function getCacheControl(key) {
+function getCacheControl(key, cacheTtl) {
   if (key.includes("_next/static/") || key.includes(".chunk.")) {
     return "public, max-age=31536000, immutable";
   }
   if (key.endsWith(".html")) {
-    return "public, max-age=0, must-revalidate";
+    return `public, max-age=0, s-maxage=${cacheTtl}, stale-while-revalidate=60`;
   }
   return "public, max-age=86400";
 }
@@ -109,7 +109,7 @@ async function listAllKeys(client, bucketName) {
   } while (continuationToken);
   return keys;
 }
-async function syncToS3(client, bucketName, buildDir) {
+async function syncToS3(client, bucketName, buildDir, cacheTtl = 3600) {
   const files = listFiles(buildDir);
   const newKeys = /* @__PURE__ */ new Set();
   let uploaded = 0;
@@ -122,7 +122,7 @@ async function syncToS3(client, bucketName, buildDir) {
         newKeys.add(key);
         const body = readFileSync(filePath);
         const contentType = getContentType(filePath);
-        const cacheControl = getCacheControl(key);
+        const cacheControl = getCacheControl(key, cacheTtl);
         await client.send(
           new PutObjectCommand({
             Bucket: bucketName,
@@ -446,7 +446,7 @@ function buildTemplate(config) {
               CachePolicyId: { Ref: "CachePolicy" },
               LambdaFunctionAssociations: [
                 {
-                  EventType: "origin-response",
+                  EventType: "origin-request",
                   LambdaFunctionARN: { Ref: "EdgeHandlerVersion" },
                   IncludeBody: false
                 }
@@ -760,7 +760,7 @@ async function updateCloudFrontEdgeVersion(cf, distributionId, newVersionArn) {
   const lambdaAssociations = config.DefaultCacheBehavior?.LambdaFunctionAssociations;
   if (lambdaAssociations?.Items) {
     for (const assoc of lambdaAssociations.Items) {
-      if (assoc.EventType === "origin-response") {
+      if (assoc.EventType === "origin-request") {
         assoc.LambdaFunctionARN = newVersionArn;
       }
     }
@@ -874,7 +874,7 @@ function aws(awsConfig = {}) {
       console.log(`[qlara/aws] Generated ${fallbacks.length} fallback page(s)`);
       console.log("[qlara/aws] Syncing build output to S3...");
       const s3 = createS3Client(res.region);
-      const { uploaded, deleted } = await syncToS3(s3, res.bucketName, buildDir);
+      const { uploaded, deleted } = await syncToS3(s3, res.bucketName, buildDir, cacheTtl);
       console.log(`[qlara/aws] Uploaded ${uploaded} files, deleted ${deleted} stale files`);
       console.log("[qlara/aws] Bundling edge handler...");
       const edgeZip = await bundleEdgeHandler({
@@ -892,7 +892,8 @@ function aws(awsConfig = {}) {
       await lambda.send(
         new UpdateFunctionConfigurationCommand({
           FunctionName: res.edgeFunctionArn,
-          Timeout: 30
+          Timeout: 30,
+          MemorySize: 512
         })
       );
       await waitUntilFunctionUpdatedV2(
@@ -979,7 +980,7 @@ function aws(awsConfig = {}) {
         new UpdateFunctionConfigurationCommand({
           FunctionName: res.rendererFunctionArn,
           Layers: [],
-          MemorySize: 256,
+          MemorySize: 512,
           Timeout: 30,
           Environment: {
             Variables: config.env ?? {}

package/dist/cli.js

@@ -77,12 +77,12 @@ function getContentType(filePath) {
   const ext = extname(filePath).toLowerCase();
   return CONTENT_TYPES[ext] || "application/octet-stream";
 }
-function getCacheControl(key) {
+function getCacheControl(key, cacheTtl) {
   if (key.includes("_next/static/") || key.includes(".chunk.")) {
     return "public, max-age=31536000, immutable";
   }
   if (key.endsWith(".html")) {
-    return "public, max-age=0, must-revalidate";
+    return `public, max-age=0, s-maxage=${cacheTtl}, stale-while-revalidate=60`;
   }
   return "public, max-age=86400";
 }
@@ -120,7 +120,7 @@ async function listAllKeys(client, bucketName) {
   } while (continuationToken);
   return keys;
 }
-async function syncToS3(client, bucketName, buildDir) {
+async function syncToS3(client, bucketName, buildDir, cacheTtl = 3600) {
   const files = listFiles(buildDir);
   const newKeys = /* @__PURE__ */ new Set();
   let uploaded = 0;
@@ -133,7 +133,7 @@ async function syncToS3(client, bucketName, buildDir) {
         newKeys.add(key);
         const body = readFileSync(filePath);
         const contentType = getContentType(filePath);
-        const cacheControl = getCacheControl(key);
+        const cacheControl = getCacheControl(key, cacheTtl);
         await client.send(
           new PutObjectCommand({
             Bucket: bucketName,
@@ -457,7 +457,7 @@ function buildTemplate(config) {
               CachePolicyId: { Ref: "CachePolicy" },
               LambdaFunctionAssociations: [
                 {
-                  EventType: "origin-response",
+                  EventType: "origin-request",
                   LambdaFunctionARN: { Ref: "EdgeHandlerVersion" },
                   IncludeBody: false
                 }
@@ -768,7 +768,7 @@ async function updateCloudFrontEdgeVersion(cf, distributionId, newVersionArn) {
   const lambdaAssociations = config.DefaultCacheBehavior?.LambdaFunctionAssociations;
   if (lambdaAssociations?.Items) {
     for (const assoc of lambdaAssociations.Items) {
-      if (assoc.EventType === "origin-response") {
+      if (assoc.EventType === "origin-request") {
         assoc.LambdaFunctionARN = newVersionArn;
       }
     }
@@ -882,7 +882,7 @@ function aws(awsConfig = {}) {
       console.log(`[qlara/aws] Generated ${fallbacks.length} fallback page(s)`);
       console.log("[qlara/aws] Syncing build output to S3...");
       const s3 = createS3Client(res.region);
-      const { uploaded, deleted } = await syncToS3(s3, res.bucketName, buildDir);
+      const { uploaded, deleted } = await syncToS3(s3, res.bucketName, buildDir, cacheTtl);
       console.log(`[qlara/aws] Uploaded ${uploaded} files, deleted ${deleted} stale files`);
       console.log("[qlara/aws] Bundling edge handler...");
       const edgeZip = await bundleEdgeHandler({
@@ -900,7 +900,8 @@ function aws(awsConfig = {}) {
       await lambda.send(
         new UpdateFunctionConfigurationCommand({
           FunctionName: res.edgeFunctionArn,
-          Timeout: 30
+          Timeout: 30,
+          MemorySize: 512
         })
       );
       await waitUntilFunctionUpdatedV2(
@@ -987,7 +988,7 @@ function aws(awsConfig = {}) {
         new UpdateFunctionConfigurationCommand({
           FunctionName: res.rendererFunctionArn,
           Layers: [],
-          MemorySize: 256,
+          MemorySize: 512,
           Timeout: 30,
           Environment: {
             Variables: config.env ?? {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qlara",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "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/edge-handler.ts

@@ -1,20 +1,21 @@
 /**
- * Lambda@Edge origin-response handler for Qlara.
+ * Lambda@Edge origin-request handler for Qlara.
  *
  * This file is bundled into a self-contained ZIP and deployed to Lambda@Edge.
  * It does NOT run in the developer's Node.js — it runs at CloudFront edge locations.
  *
  * Config values are injected at bundle time via esbuild `define` (Lambda@Edge has no env vars).
  *
+ * Runs as an **origin-request** trigger so that generated responses are cached by CloudFront.
+ * (Origin-response generated responses are NOT cached — documented AWS behavior.)
+ *
  * Flow for a request to /product/5:
  * 1. CloudFront viewer-request rewrites /product/5 → /product/5.html
- * 2. S3 returns 403 (file doesn't exist, OAC treats missing as 403)
- * 3. This origin-response handler intercepts:
- *    a. Invokes the renderer Lambda synchronously
- *    b. Renderer fetches metadata from the data source, patches fallback HTML with SEO metadata
- *    c. Renderer uploads product/5.html to S3 and returns the rendered HTML
- *    d. Edge handler serves the fully rendered HTML (first request gets full SEO)
- *    e. Subsequent requests hit S3 directly (page is cached)
+ * 2. CloudFront checks edge cache → miss → fires this origin-request handler
+ * 3. Handler checks S3 for product/5.html:
+ *    a. File exists → return it directly (CloudFront caches it)
+ *    b. File doesn't exist → invoke renderer → return rendered HTML (CloudFront caches it)
+ * 4. Subsequent requests hit CloudFront edge cache directly (~10-30ms)
  */
 
 import { S3Client, GetObjectCommand } from '@aws-sdk/client-s3';
@@ -48,18 +49,21 @@ interface CloudFrontResponse {
   statusDescription: string;
   headers: Record<string, Array<{ key: string; value: string }>>;
   body?: string;
+  bodyEncoding?: string;
 }
 
 interface CloudFrontRequest {
   uri: string;
   querystring: string;
+  method: string;
+  headers: Record<string, Array<{ key: string; value: string }>>;
+  origin?: Record<string, unknown>;
 }
 
-interface CloudFrontResponseEvent {
+interface CloudFrontRequestEvent {
   Records: Array<{
     cf: {
       request: CloudFrontRequest;
-      response: CloudFrontResponse;
     };
   }>;
 }
@@ -227,66 +231,62 @@ async function invokeRenderer(uri: string, match: RouteMatch): Promise<string |
 
 // ── Response builder ─────────────────────────────────────────────
 
-// Lambda@Edge read-only headers — must be preserved from the original response
-const READ_ONLY_HEADERS = ['transfer-encoding', 'via'];
-
-function buildHtmlResponse(
-  html: string,
-  originalResponse: CloudFrontResponse
-): CloudFrontResponse {
-  const headers: Record<string, Array<{ key: string; value: string }>> = {
-    'content-type': [
-      { key: 'Content-Type', value: 'text/html; charset=utf-8' },
-    ],
-    'cache-control': [
-      { key: 'Cache-Control', value: `public, max-age=0, s-maxage=${__QLARA_CACHE_TTL__}, stale-while-revalidate=60` },
-    ],
-  };
-
-  // Preserve read-only headers from the original response to avoid 502
-  for (const headerName of READ_ONLY_HEADERS) {
-    if (originalResponse.headers[headerName]) {
-      headers[headerName] = originalResponse.headers[headerName];
-    }
-  }
-
+function buildHtmlResponse(html: string): CloudFrontResponse {
   return {
     status: '200',
     statusDescription: 'OK',
-    headers,
+    headers: {
+      'content-type': [
+        { key: 'Content-Type', value: 'text/html; charset=utf-8' },
+      ],
+      'cache-control': [
+        { key: 'Cache-Control', value: `public, max-age=0, s-maxage=${__QLARA_CACHE_TTL__}, stale-while-revalidate=60` },
+      ],
+    },
     body: html,
+    bodyEncoding: 'text',
   };
 }
 
 // ── Handler ──────────────────────────────────────────────────────
 
 export async function handler(
-  event: CloudFrontResponseEvent
-): Promise<CloudFrontResponse> {
-  const record = event.Records[0].cf;
-  const response = record.response;
-  const request = record.request;
+  event: CloudFrontRequestEvent
+): Promise<CloudFrontRequest | CloudFrontResponse> {
+  const request = event.Records[0].cf.request;
   const uri = request.uri;
-  const status = parseInt(response.status, 10);
 
-  // 1. If response is 200 (file exists in S3), pass through
-  if (status !== 403 && status !== 404) {
-    return response;
-  }
-
-  // At this point, the file does NOT exist in S3 (403 from OAC or 404)
-
-  // 2. Skip non-HTML file requests — these are never dynamic routes
-  //    e.g. /product/20.txt (RSC flight data), /product/20.json, etc.
+  // 1. Non-HTML file requests → forward to S3 origin (handled normally by CloudFront)
+  //    e.g. /product/20.txt (RSC flight data), /product/20.json, JS, CSS, images, etc.
   const nonHtmlExt = uri.match(/\.([a-z0-9]+)$/)?.[1];
   if (nonHtmlExt && nonHtmlExt !== 'html') {
-    return response;
+    return request;
+  }
+
+  // 2. Try to get the file from S3 directly
+  const s3Key = uri.replace(/^\//, '');
+  if (s3Key) {
+    try {
+      const s3Response = await s3.send(
+        new GetObjectCommand({
+          Bucket: __QLARA_BUCKET_NAME__,
+          Key: s3Key,
+        })
+      );
+      const body = await s3Response.Body?.transformToString('utf-8');
+      if (body) {
+        // File exists in S3 → return it directly (CloudFront will cache this)
+        return buildHtmlResponse(body);
+      }
+    } catch {
+      // File doesn't exist in S3 — continue to dynamic route handling
+    }
   }
 
   // 3. Fetch manifest and check if this URL matches a Qlara dynamic route
-  const manifest = await getManifest();
   // Strip .html suffix that the URL rewrite function adds before matching
   const cleanUri = uri.replace(/\.html$/, '');
+  const manifest = await getManifest();
   const match = manifest ? matchRoute(cleanUri, manifest.routes) : null;
 
   // 4. If route matches: invoke renderer synchronously to get fully rendered HTML
@@ -295,17 +295,17 @@ export async function handler(
     const renderedHtml = await invokeRenderer(cleanUri, match);
 
     if (renderedHtml) {
-      return buildHtmlResponse(renderedHtml, response);
+      return buildHtmlResponse(renderedHtml);
     }
 
     // Renderer failed — fall back to unpatched fallback HTML (no SEO, but page still works)
     const fallbackHtml = await getFallbackHtml(match.route);
     if (fallbackHtml) {
       const patchedHtml = patchFallback(fallbackHtml, match.params);
-      return buildHtmlResponse(patchedHtml, response);
+      return buildHtmlResponse(patchedHtml);
     }
   }
 
-  // 5. No match or no fallback — return original error
-  return response;
+  // 5. No match or no fallback — forward to origin (S3 will return 403/404)
+  return request;
 }

package/src/provider/aws/renderer.ts

@@ -79,6 +79,9 @@ interface RendererResult {
 
 const FALLBACK_PLACEHOLDER = '__QLARA_FALLBACK__';
 
+// Module-scope S3 client — reused across warm invocations (avoids recreating TCP/TLS connections)
+const s3 = new S3Client({ region: process.env.AWS_REGION || 'us-east-1' });
+
 /**
  * Derive the S3 key for a rendered page.
  * Matches the Next.js static export convention: /product/42 → product/42.html
@@ -763,9 +766,6 @@ export async function handler(event: RendererEvent & { warmup?: boolean }): Prom
   }
 
   const { uri, bucket, routePattern, params } = event;
-  const region = process.env.AWS_REGION || 'us-east-1';
-
-  const s3 = new S3Client({ region });
 
   try {
     // 0. Check if already rendered + read fallback in parallel