@brightsideoy/kama 0.1.0-alpha.143 → 0.1.0-alpha.145

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

@@ -1,18 +1,14 @@
 ---
-// src/pages/[...slug].astro
 import StandardLayout from "../layouts/StandardLayout.astro";
 import SkeletonLayout from "../layouts/SkeletonLayout.astro";
 import BlockRenderer from "../components/blocks/BlockRenderer.astro";
 import Breadcrumb from "../components/global/Breadcrumb.astro";
 import { getNodeByPath, getChannelId, getTree, getTreeId } from "../lib/cms";
 import type { NodeResponse, TreeNode } from "../lib/cms";
-import { env } from "cloudflare:workers";
 
 export const prerender = false;
 
 const { slug } = Astro.params;
-
-// 🎯 Extract Preview & Revision parameters from the URL
 const searchParams = Astro.url.searchParams;
 const isPreview = searchParams.get("preview") === "true";
 const revisionId = searchParams.get("revisionId");
@@ -22,7 +18,6 @@ Astro.response.headers.set(
   "no-store, no-cache, must-revalidate, proxy-revalidate",
 );
 
-// 1. STATIC ASSET CHECK
 const staticExts = [
   ".ico",
   ".png",
@@ -42,20 +37,11 @@ if (isStaticAsset) {
   return new Response(null, { status: 404 });
 }
 
-// 2. ENV & WORKER RESOLUTION
-const locals = (Astro.locals as any) || {};
-const workerEnv = env || process.env || {};
-const cmsWorker = locals.cfContext?.env?.CMS_WORKER || workerEnv.CMS_WORKER;
-
-// Extract environment configuration & fallback slug
-const envHomeSlug = import.meta.env.PUBLIC_HOME_SLUG;
-const workerHomeSlug = (workerEnv as any).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 baseApiUrl = String(envApiUrl || workerApiUrl || "http://localhost:8787");
-
+// 🎯 DUAL-ARCHITECTURE ENV RESOLUTION (No CF Imports, No runtime.env!)
+const homeSlug = String(import.meta.env.PUBLIC_HOME_SLUG || "home").trim();
+const baseApiUrl = String(
+  import.meta.env.PUBLIC_API_URL || "http://localhost:8787",
+);
 const cleanApiUrl = baseApiUrl.endsWith("/")
   ? baseApiUrl.slice(0, -1)
   : baseApiUrl;
@@ -67,32 +53,25 @@ const customFetch = async (input: RequestInfo | URL, init?: RequestInit) => {
   const urlObj = new URL(urlStr);
   urlObj.searchParams.set("_t", Date.now().toString());
 
-  // Inject Revision ID and Preview flag if we are time-traveling
   if (revisionId) urlObj.searchParams.set("revisionId", revisionId);
   if (isPreview) urlObj.searchParams.set("preview", "true");
 
-  urlStr = urlObj.toString();
-
-  const req = new Request(urlStr, {
-    ...init,
-    cache: "no-store",
-    headers: {
-      ...init?.headers,
-      "X-Bypass-Cache": "true",
-      "Cache-Control": "no-cache, no-store, must-revalidate",
-    },
-  });
-
-  if (cmsWorker && typeof cmsWorker.fetch === "function") {
-    return cmsWorker.fetch(req);
-  }
-  return fetch(req);
+  return fetch(
+    new Request(urlObj.toString(), {
+      ...init,
+      cache: "no-store",
+      headers: {
+        ...init?.headers,
+        "X-Bypass-Cache": "true",
+        "Cache-Control": "no-cache, no-store, must-revalidate",
+      },
+    }),
+  );
 };
 
 const channelId = getChannelId();
 const treeId = getTreeId();
 
-// 3. PATH RESOLUTION
 const rawSlug = Array.isArray(slug) ? slug.join("/") : slugStr;
 const pathParts = rawSlug.split("/").filter(part => part.trim() !== "");
 
@@ -100,14 +79,12 @@ let pageData: NodeResponse | null = null;
 let navTree: TreeNode[] = [];
 let targetSlug = pathParts.join("/");
 
-// 🎯 FETCH TREE FIRST (to resolve root page if visiting '/')
 try {
   navTree = await getTree(treeId, channelId, customFetch);
 } catch (err) {
   console.error(`❌ [SSR Error] Failed to fetch tree "${treeId}":`, err);
 }
 
-// 🎯 DYNAMIC HOME SLUG RESOLUTION
 if (!targetSlug) {
   const rootTreeSlug =
     navTree && navTree.length > 0
@@ -116,7 +93,6 @@ if (!targetSlug) {
   targetSlug = rootTreeSlug || homeSlug;
 }
 
-// 🎯 FETCH NODE DATA
 try {
   pageData = await getNodeByPath(targetSlug, channelId, isPreview, customFetch);
 } catch (err) {
@@ -144,13 +120,10 @@ const isHomePage =
   pathParts.length === 0;
 
 const normalizedSlug = isHomePage ? "" : targetSlug;
-
 const headerBlocks = content?.header || [];
 const mainBlocks = content?.content || [];
 const sidebarBlocks = content?.sidebar || [];
 const hasSidebar = sidebarBlocks.length > 0;
-
-// 🎯 Detect if this node is a standalone Page Skeleton
 const isSkeleton = node?.nodeType === "page-skeleton";
 ---
 

package/templates/astro-starter/src/pages/media/[...path].ts

@@ -2,6 +2,13 @@
 import type { APIRoute } from "astro";
 import { handleMediaProxy } from "../../lib/media/media-proxy";
 
+export const prerender = false;
+
 export const GET: APIRoute = async (context) => {
-    return handleMediaProxy(context);
+    try {
+        return await handleMediaProxy(context);
+    } catch (error: any) {
+        console.error("❌ [Media Proxy Error]:", error?.message || error);
+        return new Response("Media Proxy Failed", { status: 500 });
+    }
 };

package/wrangler.json

@@ -0,0 +1,22 @@
+{
+  "$schema": "node_modules/wrangler/config-schema.json",
+  "name": "kama",
+  "main": "server/index.ts",
+  "compatibility_date": "2024-09-23",
+  "compatibility_flags": [
+    "nodejs_compat"
+  ],
+  "d1_databases": [
+    {
+      "binding": "DB",
+      "database_name": "kama-db",
+      "database_id": "local-kama-db"
+    }
+  ],
+  "r2_buckets": [
+    {
+      "binding": "MEDIA_BUCKET",
+      "bucket_name": "kama-media"
+    }
+  ]
+}