qlara 0.1.3 → 0.1.5

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";
 }
@@ -95,8 +95,26 @@ function listFiles(dir) {
   }
   return files;
 }
-async function syncToS3(client, bucketName, buildDir) {
+async function listAllKeys(client, bucketName) {
+  const keys = /* @__PURE__ */ new Set();
+  let continuationToken;
+  do {
+    const response = await client.send(
+      new import_client_s3.ListObjectsV2Command({
+        Bucket: bucketName,
+        ContinuationToken: continuationToken
+      })
+    );
+    for (const obj of response.Contents || []) {
+      if (obj.Key) keys.add(obj.Key);
+    }
+    continuationToken = response.NextContinuationToken;
+  } while (continuationToken);
+  return keys;
+}
+async function syncToS3(client, bucketName, buildDir, cacheTtl = 3600) {
   const files = listFiles(buildDir);
+  const newKeys = /* @__PURE__ */ new Set();
   let uploaded = 0;
   const batchSize = 10;
   for (let i = 0; i < files.length; i += batchSize) {
@@ -104,9 +122,10 @@ async function syncToS3(client, bucketName, buildDir) {
     await Promise.all(
       batch.map(async (filePath) => {
         const key = (0, import_node_path.relative)(buildDir, filePath);
+        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,
@@ -120,7 +139,22 @@ async function syncToS3(client, bucketName, buildDir) {
       })
     );
   }
-  return uploaded;
+  const existingKeys = await listAllKeys(client, bucketName);
+  const staleKeys = [...existingKeys].filter((key) => !newKeys.has(key));
+  let deleted = 0;
+  for (let i = 0; i < staleKeys.length; i += 1e3) {
+    const batch = staleKeys.slice(i, i + 1e3);
+    await client.send(
+      new import_client_s3.DeleteObjectsCommand({
+        Bucket: bucketName,
+        Delete: {
+          Objects: batch.map((key) => ({ Key: key }))
+        }
+      })
+    );
+    deleted += batch.length;
+  }
+  return { uploaded, deleted };
 }
 async function emptyBucket(client, bucketName) {
   let continuationToken;
@@ -844,8 +878,8 @@ 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 fileCount = await syncToS3(s3, res.bucketName, buildDir);
-      console.log(`[qlara/aws] Uploaded ${fileCount} files to S3`);
+      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({
         bucketName: res.bucketName,
@@ -862,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)(
@@ -949,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";
 }
@@ -92,8 +92,26 @@ function listFiles(dir) {
   }
   return files;
 }
-async function syncToS3(client, bucketName, buildDir) {
+async function listAllKeys(client, bucketName) {
+  const keys = /* @__PURE__ */ new Set();
+  let continuationToken;
+  do {
+    const response = await client.send(
+      new ListObjectsV2Command({
+        Bucket: bucketName,
+        ContinuationToken: continuationToken
+      })
+    );
+    for (const obj of response.Contents || []) {
+      if (obj.Key) keys.add(obj.Key);
+    }
+    continuationToken = response.NextContinuationToken;
+  } while (continuationToken);
+  return keys;
+}
+async function syncToS3(client, bucketName, buildDir, cacheTtl = 3600) {
   const files = listFiles(buildDir);
+  const newKeys = /* @__PURE__ */ new Set();
   let uploaded = 0;
   const batchSize = 10;
   for (let i = 0; i < files.length; i += batchSize) {
@@ -101,9 +119,10 @@ async function syncToS3(client, bucketName, buildDir) {
     await Promise.all(
       batch.map(async (filePath) => {
         const key = relative(buildDir, filePath);
+        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,
@@ -117,7 +136,22 @@ async function syncToS3(client, bucketName, buildDir) {
       })
     );
   }
-  return uploaded;
+  const existingKeys = await listAllKeys(client, bucketName);
+  const staleKeys = [...existingKeys].filter((key) => !newKeys.has(key));
+  let deleted = 0;
+  for (let i = 0; i < staleKeys.length; i += 1e3) {
+    const batch = staleKeys.slice(i, i + 1e3);
+    await client.send(
+      new DeleteObjectsCommand({
+        Bucket: bucketName,
+        Delete: {
+          Objects: batch.map((key) => ({ Key: key }))
+        }
+      })
+    );
+    deleted += batch.length;
+  }
+  return { uploaded, deleted };
 }
 async function emptyBucket(client, bucketName) {
   let continuationToken;
@@ -840,8 +874,8 @@ 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 fileCount = await syncToS3(s3, res.bucketName, buildDir);
-      console.log(`[qlara/aws] Uploaded ${fileCount} files to S3`);
+      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({
         bucketName: res.bucketName,
@@ -858,7 +892,8 @@ function aws(awsConfig = {}) {
       await lambda.send(
         new UpdateFunctionConfigurationCommand({
           FunctionName: res.edgeFunctionArn,
-          Timeout: 30
+          Timeout: 30,
+          MemorySize: 512
         })
       );
       await waitUntilFunctionUpdatedV2(
@@ -945,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";
 }
@@ -103,8 +103,26 @@ function listFiles(dir) {
   }
   return files;
 }
-async function syncToS3(client, bucketName, buildDir) {
+async function listAllKeys(client, bucketName) {
+  const keys = /* @__PURE__ */ new Set();
+  let continuationToken;
+  do {
+    const response = await client.send(
+      new ListObjectsV2Command({
+        Bucket: bucketName,
+        ContinuationToken: continuationToken
+      })
+    );
+    for (const obj of response.Contents || []) {
+      if (obj.Key) keys.add(obj.Key);
+    }
+    continuationToken = response.NextContinuationToken;
+  } while (continuationToken);
+  return keys;
+}
+async function syncToS3(client, bucketName, buildDir, cacheTtl = 3600) {
   const files = listFiles(buildDir);
+  const newKeys = /* @__PURE__ */ new Set();
   let uploaded = 0;
   const batchSize = 10;
   for (let i = 0; i < files.length; i += batchSize) {
@@ -112,9 +130,10 @@ async function syncToS3(client, bucketName, buildDir) {
     await Promise.all(
       batch.map(async (filePath) => {
         const key = relative(buildDir, filePath);
+        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,
@@ -128,7 +147,22 @@ async function syncToS3(client, bucketName, buildDir) {
       })
     );
   }
-  return uploaded;
+  const existingKeys = await listAllKeys(client, bucketName);
+  const staleKeys = [...existingKeys].filter((key) => !newKeys.has(key));
+  let deleted = 0;
+  for (let i = 0; i < staleKeys.length; i += 1e3) {
+    const batch = staleKeys.slice(i, i + 1e3);
+    await client.send(
+      new DeleteObjectsCommand({
+        Bucket: bucketName,
+        Delete: {
+          Objects: batch.map((key) => ({ Key: key }))
+        }
+      })
+    );
+    deleted += batch.length;
+  }
+  return { uploaded, deleted };
 }
 async function emptyBucket(client, bucketName) {
   let continuationToken;
@@ -848,8 +882,8 @@ 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 fileCount = await syncToS3(s3, res.bucketName, buildDir);
-      console.log(`[qlara/aws] Uploaded ${fileCount} files to S3`);
+      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({
         bucketName: res.bucketName,
@@ -866,7 +900,8 @@ function aws(awsConfig = {}) {
       await lambda.send(
         new UpdateFunctionConfigurationCommand({
           FunctionName: res.edgeFunctionArn,
-          Timeout: 30
+          Timeout: 30,
+          MemorySize: 512
         })
       );
       await waitUntilFunctionUpdatedV2(
@@ -953,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.3",
+  "version": "0.1.5",
   "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

@@ -276,13 +276,20 @@ export async function handler(
 
   // At this point, the file does NOT exist in S3 (403 from OAC or 404)
 
-  // 2. Fetch manifest and check if this URL matches a Qlara dynamic route
+  // 2. Skip non-HTML file requests — these are never dynamic routes
+  //    e.g. /product/20.txt (RSC flight data), /product/20.json, etc.
+  const nonHtmlExt = uri.match(/\.([a-z0-9]+)$/)?.[1];
+  if (nonHtmlExt && nonHtmlExt !== 'html') {
+    return response;
+  }
+
+  // 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 match = manifest ? matchRoute(cleanUri, manifest.routes) : null;
 
-  // 3. If route matches: invoke renderer synchronously to get fully rendered HTML
+  // 4. If route matches: invoke renderer synchronously to get fully rendered HTML
   if (match) {
     // Try to render with full SEO metadata (synchronous — waits for result)
     const renderedHtml = await invokeRenderer(cleanUri, match);
@@ -299,6 +306,6 @@ export async function handler(
     }
   }
 
-  // 4. No match or no fallback — return original error
+  // 5. No match or no fallback — return original error
   return response;
 }

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
@@ -86,6 +89,7 @@ const FALLBACK_PLACEHOLDER = '__QLARA_FALLBACK__';
 function deriveS3Key(uri: string): string {
   const cleanUri = uri.replace(/^\//, '').replace(/\/$/, '');
   if (!cleanUri) return 'index.html';
+  if (cleanUri.endsWith('.html')) return cleanUri;
   return `${cleanUri}.html`;
 }
 
@@ -762,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