@brightsideoy/kama 0.1.0-alpha.155 → 0.1.0-alpha.157

package/templates/astro-starter/src/middleware.ts

@@ -1,13 +1,121 @@
+// src/middleware.ts
+
 import { defineMiddleware } from "astro:middleware";
-import { env } from "cloudflare:workers";
+
+/**
+ * Safely extracts environment variables across Astro 7, Node.js, and Cloudflare Workers
+ * without triggering the `@astrojs/cloudflare` runtime.env getter exception.
+ */
+async function getSafeEnv(locals: any): Promise<Record<string, any>> {
+    // 1. Try native Cloudflare Workers module (Astro 5+ / workerd)
+    try {
+        // @ts-ignore
+        const cf = await import("cloudflare:workers");
+        if (cf?.env) return cf.env;
+    } catch (e) {
+        // Not running inside a Cloudflare Worker container
+    }
+
+    // 2. Safe check for locals.runtime / cfContext (Local Node.js / Hono)
+    const runtime = locals?.runtime || locals?.cfContext;
+    if (runtime && typeof runtime === "object") {
+        if ("CMS_WORKER" in runtime || "PUBLIC_API_URL" in runtime) {
+            return runtime;
+        }
+
+        // Safely check property descriptor to avoid triggering throwing getters
+        try {
+            const desc = Object.getOwnPropertyDescriptor(runtime, "env");
+            if (desc && !desc.get) {
+                return runtime.env;
+            }
+        } catch (e) {
+            // Ignore getter throws
+        }
+    }
+
+    // 3. Fallback for standalone Node.js mode
+    return typeof process !== "undefined" ? process.env || {} : {};
+}
 
 export const onRequest = defineMiddleware(async (context, next) => {
     const pathname = context.url.pathname;
-    const cfContext = (context.locals as any).cfContext;
-    const workerEnv = cfContext?.env || (env as any);
+    const pathLower = pathname.toLowerCase();
+
+    // 🎯 Detect Local Vite Dev Mode to bypass edge caching locally
+    const isDev = import.meta.env.DEV;
+
+    // 🎯 Safe dual-environment context extraction
+    const workerEnv = await getSafeEnv(context.locals);
+
+    // Attach to locals so Astro components (like Header.astro) don't have to re-evaluate it
+    (context.locals as any).safeEnv = workerEnv;
+
+    // 🎯 Safe ctx extraction (Fixing the runtime.ctx crash in Astro 6/7)
+    let cfContext = (context.locals as any).cfContext;
+    if (!cfContext) {
+        const runtime = (context.locals as any).runtime;
+        if (runtime && typeof runtime === "object") {
+            try {
+                const desc = Object.getOwnPropertyDescriptor(runtime, "ctx");
+                if (desc && !desc.get) {
+                    cfContext = runtime.ctx;
+                }
+            } catch (e) { }
+        }
+    }
+    cfContext = cfContext || {};
+
     const HTML_CACHE = workerEnv?.HTML_CACHE; // KV Namespace binding
 
-    // 🎯 0. DIRECT EDGE INTERCEPT FOR CACHE PURGE ENDPOINT
+    // 🎯 0. INSTANT EDGE SPAM DROP (Blocks bots before hit to CMS worker/database)
+    const isSpam =
+        pathLower.includes("wp-") ||
+        pathLower.includes("wordpress") ||
+        pathLower.endsWith(".php") ||
+        pathLower === "/wp";
+
+    if (isSpam) {
+        return new Response("Not Found", { status: 404 });
+    }
+
+    // 🎯 0B. DIRECT MEDIA PROXY VIA SERVICE BINDING
+    if (pathname.startsWith("/media/")) {
+        const cmsWorker = workerEnv?.CMS_WORKER;
+        const envApiUrl = import.meta.env?.PUBLIC_API_URL;
+        const workerApiUrl = workerEnv?.PUBLIC_API_URL;
+        const baseApiUrl = String(envApiUrl || workerApiUrl || "https://kama.kamaengine.com");
+        const cleanApiUrl = baseApiUrl.endsWith("/") ? baseApiUrl.slice(0, -1) : baseApiUrl;
+
+        const mediaUrl = `${cleanApiUrl}${pathname}${context.url.search}`;
+        const mediaReq = new Request(mediaUrl, {
+            headers: context.request.headers
+        });
+
+        let mediaResponse: Response;
+
+        if (cmsWorker && typeof cmsWorker.fetch === "function") {
+            mediaResponse = await cmsWorker.fetch(mediaReq);
+        } else {
+            mediaResponse = await fetch(mediaReq);
+        }
+
+        const newHeaders = new Headers(mediaResponse.headers);
+
+        // 🎯 DEV FIX: Only apply 1-year cache on media in Production
+        if (!isDev) {
+            newHeaders.set("Cache-Control", "public, max-age=31536000, s-maxage=31536000, immutable");
+        }
+        newHeaders.set("Access-Control-Allow-Origin", "*");
+
+        return new Response(mediaResponse.body, {
+            status: mediaResponse.status,
+            statusText: mediaResponse.statusText,
+            headers: newHeaders
+        });
+    }
+
+    // 🎯 0C. DIRECT EDGE INTERCEPT FOR CACHE PURGE ENDPOINT
     if (pathname === "/api/purge" || pathname === "/api/purge/") {
         if (context.request.method !== "POST") {
             return new Response(JSON.stringify({ error: "Method Not Allowed" }), {
@@ -187,7 +295,8 @@ export const onRequest = defineMiddleware(async (context, next) => {
 
     let activeCacheKey = cleanLookupPath;
 
-    if (isHtmlPage && HTML_CACHE && !isWarmer) {
+    // 🎯 DEV FIX: Bypass KV Read in local dev
+    if (!isDev && isHtmlPage && HTML_CACHE && !isWarmer) {
         try {
             const [siteVer, pageVer] = await Promise.all([
                 HTML_CACHE.get("site_version"),
@@ -217,7 +326,9 @@ export const onRequest = defineMiddleware(async (context, next) => {
     const response = await next();
 
     // 🎯 2. KV STATIC "FILE" CACHE WRITE (Save HTML under active Version Key)
+    // 🎯 DEV FIX: Bypass KV Write in local dev
     if (
+        !isDev &&
         isHtmlPage &&
         HTML_CACHE &&
         response.status === 200 &&
@@ -262,19 +373,21 @@ export const onRequest = defineMiddleware(async (context, next) => {
         return response;
     }
 
-    // 🎯 4. IMAGE & STATIC ASSET CACHING
-    if (
-        pathname.startsWith("/media/") ||
-        pathname.startsWith("/_image") ||
-        pathname.startsWith("/cdn-cgi/image/") ||
-        pathname.match(/\.(png|jpg|jpeg|webp|avif|svg|gif|ico|woff2?|css|js)$/i)
-    ) {
-        response.headers.set(
-            "Cache-Control",
-            "public, max-age=31536000, s-maxage=31536000, immutable"
-        );
-        response.headers.set("Access-Control-Allow-Origin", "*");
-        return response;
+    // 🎯 4. STATIC ASSET CACHING FOR COMPRESSED BUNDLES / ASSETS
+    // 🎯 DEV FIX: Do not apply max-age=31536000 locally to prevent breaking Vite HMR
+    if (!isDev) {
+        if (
+            pathname.startsWith("/_image") ||
+            pathname.startsWith("/cdn-cgi/image/") ||
+            pathname.match(/\.(png|jpg|jpeg|webp|avif|svg|gif|ico|woff2?|css|js)$/i)
+        ) {
+            response.headers.set(
+                "Cache-Control",
+                "public, max-age=31536000, s-maxage=31536000, immutable"
+            );
+            response.headers.set("Access-Control-Allow-Origin", "*");
+            return response;
+        }
     }
 
     // 🎯 5. SECURITY HEADERS FOR HTML PAGES

package/templates/astro-starter/src/pages/[...slug].astro

@@ -1,4 +1,6 @@
 ---
+// src/pages/[...slug].astro
+
 import StandardLayout from "../layouts/StandardLayout.astro";
 import SkeletonLayout from "../layouts/SkeletonLayout.astro";
 import BlockRenderer from "../components/blocks/BlockRenderer.astro";
@@ -6,9 +8,6 @@ import Breadcrumb from "../components/global/Breadcrumb.astro";
 import { getNodeByPath, getChannelId, getTree, getTreeId } from "../lib/cms";
 import type { NodeResponse, TreeNode } from "../lib/cms";
 
-// 🎯 Import environment variables directly from Cloudflare
-import { env } from "cloudflare:workers";
-
 export const prerender = false;
 
 const { slug } = Astro.params;
@@ -47,17 +46,18 @@ if (isStaticAsset) {
   return new Response(null, { status: 404 });
 }
 
-// 2. ENV & WORKER RESOLUTION
-const workerEnv = env || {};
-const cmsWorker = workerEnv.CMS_WORKER;
+// 2. ENV & WORKER RESOLUTION (Safe Dual-Environment)
+// 🎯 Replaced throwing runtime getter with safeEnv from middleware
+const safeEnv = (Astro.locals as any).safeEnv || {};
+const cmsWorker = safeEnv.CMS_WORKER;
 
 // Extract environment configuration & fallback slug
 const envHomeSlug = import.meta.env.PUBLIC_HOME_SLUG;
-const workerHomeSlug = (workerEnv as any).PUBLIC_HOME_SLUG;
+const workerHomeSlug = safeEnv.PUBLIC_HOME_SLUG;
 const homeSlug = String(envHomeSlug || workerHomeSlug || "home").trim();
 
 const envApiUrl = import.meta.env.PUBLIC_API_URL;
-const workerApiUrl = workerEnv.PUBLIC_API_URL;
+const workerApiUrl = safeEnv.PUBLIC_API_URL;
 const baseApiUrl = String(
   envApiUrl || workerApiUrl || "https://admin.kamaengine.com",
 );
@@ -93,7 +93,6 @@ const customFetch = async (input: RequestInfo | URL, init?: RequestInit) => {
   const fetchOpts: RequestInit = {
     ...init,
     headers: reqHeaders,
-    cache: "no-store",
   };
 
   const req = new Request(urlStr, fetchOpts);
@@ -172,6 +171,7 @@ const isSkeleton = node?.nodeType === "page-skeleton";
     <SkeletonLayout
       node={node}
       content={content}
+      language={pageData?.language}
       normalizedSlug={normalizedSlug}
       isHomePage={isHomePage}
     >
@@ -181,6 +181,7 @@ const isSkeleton = node?.nodeType === "page-skeleton";
     <StandardLayout
       node={node}
       content={content}
+      language={pageData?.language}
       normalizedSlug={normalizedSlug}
       isHomePage={isHomePage}
       hasSidebar={hasSidebar}

package/definitions/_page.yaml

@@ -1,52 +0,0 @@
-id: _page
-label: Page Old
-inTree: true
-inVault: true
-hasCanvas: true
-
-layout:
-  columns: "10fr 4fr"
-  areas:
-    - ["header", "header"]
-    - ["main", "sidebar"]
-    - ["footer", "footer"]
-
-regions:
-  header:
-    label: Header
-    inherit: parent
-  main:
-    label: Content
-  sidebar:
-    label: Sidebar
-  footer:
-    label: Footer
-    inherit: parent
-
-allowedBlocks:
-  - header
-  - hero
-  - text
-  - image_card
-
-# 👉 TABS DEFINITION
-tabs:
-  settings:
-    label: "Page"
-    fields:
-      # Imports core fields: title, slug, isHidden
-      - fieldSet: page-base
-
-      # Overrides & custom properties
-      - menuTitle:
-          label: Menu Title
-          type: text
-          dbType: text
-          public: true
-          placeholder: "Short title for navigation menus"
-
-      # SEO / OpenGraph metadata
-      - fieldSet: meta
-
-      # Role permissions & access control
-      - fieldSet: access