@leadertechie/personal-site-kit 0.1.0-alpha.14 → 0.1.0-alpha.16

package/dist/api/website-api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"website-api.d.ts","sourceRoot":"","sources":["../../src/api/website-api.ts"],"names":[],"mappings":"AAWA,MAAM,MAAM,UAAU,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;AAE3E,qBAAa,UAAU;IACrB,OAAO,CAAC,cAAc,CAAiC;IAEhD,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU;IAIzD,OAAO,CAAC,cAAc;IAOtB,OAAO,CAAC,mBAAmB;IAoB3B,OAAO,CAAC,UAAU;IAqBL,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC;CA+FlE"}
+{"version":3,"file":"website-api.d.ts","sourceRoot":"","sources":["../../src/api/website-api.ts"],"names":[],"mappings":"AAWA,MAAM,MAAM,UAAU,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;AAE3E,qBAAa,UAAU;IACrB,OAAO,CAAC,cAAc,CAAiC;IAEhD,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU;IAIzD,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,mBAAmB;IAmB3B,OAAO,CAAC,UAAU;IAqBL,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC;CAgGlE"}

package/dist/api.js

@@ -1,5 +1,5 @@
-import { W as WebsiteAPI } from "./chunks/website-api-CE2q2nt7.js";
-import { A, B, M, R, c, a, g, b, d, h, e, r, s, v } from "./chunks/website-api-CE2q2nt7.js";
+import { W as WebsiteAPI } from "./chunks/website-api-C3lGjXdD.js";
+import { A, B, M, R, c, a, g, b, d, h, e, r, s, v } from "./chunks/website-api-C3lGjXdD.js";
 const defaultAPI = new WebsiteAPI();
 export {
   A as AUTH_KV,

package/dist/chunks/{website-api-CE2q2nt7.js → website-api-C3lGjXdD.js}

@@ -798,16 +798,20 @@ class WebsiteAPI {
     this.customHandlers.set(route, handler);
   }
   addCORSHeaders(response) {
-    response.headers.set("Access-Control-Allow-Origin", "*");
+    if (!response.headers.has("Access-Control-Allow-Origin")) {
+      response.headers.set("Access-Control-Allow-Origin", "*");
+    }
     response.headers.set("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS");
     response.headers.set("Access-Control-Allow-Headers", "Content-Type, Authorization, X-Session-Token");
     return response;
   }
   addAdminCORSHeaders(response, origin) {
     const isLocal = origin && (origin.includes("localhost") || origin.includes("127.0.0.1"));
-    if (isLocal) {
-      response.headers.set("Access-Control-Allow-Origin", origin);
-      response.headers.set("Access-Control-Allow-Credentials", "true");
+    if (!response.headers.has("Access-Control-Allow-Origin")) {
+      if (isLocal) {
+        response.headers.set("Access-Control-Allow-Origin", origin);
+        response.headers.set("Access-Control-Allow-Credentials", "true");
+      }
     }
     response.headers.set("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS");
     response.headers.set("Access-Control-Allow-Headers", "Content-Type, Authorization, X-Session-Token");
@@ -871,7 +875,7 @@ class WebsiteAPI {
             return this.addAdminCORSHeaders(createErrorResponse("Unauthorized", 401), origin);
           }
           clearContentCache$1();
-          return this.addAdminCORSHeaders(new Response(JSON.stringify({ success: true, message: "Cache cleared" }), { status: 200 }), origin);
+          return this.addAdminCORSHeaders(new Response(JSON.stringify({ success: true, message: "Cache cleared" }), { status: 200, headers: { "Content-Type": "application/json" } }), origin);
         case "aboutme":
           return this.addAdminCORSHeaders(await handleAboutMe(env), origin);
         case "logo":

package/dist/index.js

@@ -1,4 +1,4 @@
-import { A, B, M, R, W, c, a, g, b, d, h, e, r, s, v } from "./chunks/website-api-CE2q2nt7.js";
+import { A, B, M, R, W, c, a, g, b, d, h, e, r, s, v } from "./chunks/website-api-C3lGjXdD.js";
 import { WebsitePrerender } from "./prerender.js";
 import { A as A2, a as a2, b as b2, c as c2, d as d2, e as e2, f, g as g2, h as h2, i, B as B2, F, M as M2, j, S, k } from "./chunks/index-B2jGIzSi.js";
 import { S as S2, g as g3, i as i2, r as r2 } from "./chunks/site-store-CGV9c2DI.js";

package/dist/prerender/template.d.ts

@@ -5,6 +5,8 @@ export interface TemplateProps {
     content: string;
     hydrationData?: string;
     baseSiteUrl?: string;
+    jsAsset?: string;
+    cssAsset?: string;
 }
-export declare const createHtmlTemplate: ({ title, description, canonicalUrl, content, hydrationData, baseSiteUrl }: TemplateProps) => Promise<string>;
+export declare const createHtmlTemplate: ({ title, description, canonicalUrl, content, hydrationData, baseSiteUrl, jsAsset, cssAsset }: TemplateProps) => Promise<string>;
 //# sourceMappingURL=template.d.ts.map

package/dist/prerender/template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"template.d.ts","sourceRoot":"","sources":["../../src/prerender/template.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAyBD,eAAO,MAAM,kBAAkB,GAAU,2EAOtC,aAAa,KAAG,OAAO,CAAC,MAAM,CA0BhC,CAAC"}
+{"version":3,"file":"template.d.ts","sourceRoot":"","sources":["../../src/prerender/template.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAsDD,eAAO,MAAM,kBAAkB,GAAU,8FAStC,aAAa,KAAG,OAAO,CAAC,MAAM,CAmChC,CAAC"}

package/dist/prerender/website-prerender.d.ts

@@ -18,7 +18,9 @@ export declare class WebsitePrerender {
     private copyright;
     private templateRenderer;
     private apiHandler?;
+    private cachedAssets;
     constructor(options?: PrerenderOptions);
+    private discoverAssets;
     private fetchStaticDetails;
     private fetchAboutMeData;
     fetch(request: Request, env: any, ctx: any): Promise<Response>;

package/dist/prerender/website-prerender.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"website-prerender.d.ts","sourceRoot":"","sources":["../../src/prerender/website-prerender.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,aAAa,EAAE,MAAM,YAAY,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,EAAuB,MAAM,gBAAgB,CAAC;AAE1E,MAAM,WAAW,gBAAgB;IAC/B,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,kBAAkB,CAAC,EAAE,WAAW,EAAE,CAAC;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;IACtE,UAAU,CAAC,EAAE;QAAE,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAA;KAAE,CAAC;CAChG;AAED,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,MAAM,CAAW;IACzB,OAAO,CAAC,kBAAkB,CAAgB;IAC1C,OAAO,CAAC,WAAW,CAAgB;IACnC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,gBAAgB,CAAqD;IAC7E,OAAO,CAAC,UAAU,CAAC,CAAoF;gBAE3F,OAAO,GAAE,gBAAqB;YAmB5B,kBAAkB;YAiClB,gBAAgB;IAajB,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC;CA4F5E"}
+{"version":3,"file":"website-prerender.d.ts","sourceRoot":"","sources":["../../src/prerender/website-prerender.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,aAAa,EAAE,MAAM,YAAY,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,EAAuB,MAAM,gBAAgB,CAAC;AAE1E,MAAM,WAAW,gBAAgB;IAC/B,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,kBAAkB,CAAC,EAAE,WAAW,EAAE,CAAC;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;IACtE,UAAU,CAAC,EAAE;QAAE,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAA;KAAE,CAAC;CAChG;AAED,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,MAAM,CAAW;IACzB,OAAO,CAAC,kBAAkB,CAAgB;IAC1C,OAAO,CAAC,WAAW,CAAgB;IACnC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,gBAAgB,CAAqD;IAC7E,OAAO,CAAC,UAAU,CAAC,CAAoF;IACvG,OAAO,CAAC,YAAY,CAA4C;gBAEpD,OAAO,GAAE,gBAAqB;YAmB5B,cAAc;YAuCd,kBAAkB;YAgClB,gBAAgB;IAajB,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC;CAiI5E"}

package/dist/prerender.js

@@ -1,24 +1,42 @@
 import { R2ContentLoader } from "@leadertechie/r2tohtml";
+let cachedAssets = null;
+let isDiscovering = false;
 async function getAssetPaths(baseSiteUrl) {
-  const assetsUrl = `${baseSiteUrl}/cdn-assets.json`;
+  if (cachedAssets) return cachedAssets;
+  if (isDiscovering) {
+    return { js: "/assets/index.js", css: "/assets/index.css" };
+  }
+  isDiscovering = true;
   try {
+    const assetsUrl = `${baseSiteUrl}/cdn-assets.json`;
     const res = await fetch(assetsUrl);
     if (res.ok) {
       const data = await res.json();
-      return { js: data.js, css: data.css };
+      cachedAssets = { js: data.js, css: data.css };
+      isDiscovering = false;
+      return cachedAssets;
     }
   } catch (e) {
   }
   try {
-    const res = await fetch(`${baseSiteUrl}/?t=${Date.now()}`);
-    const html = await res.text();
-    const jsMatch = html.match(/src="(\/assets\/index-[^"]+\.js)"/);
-    const cssMatch = html.match(/href="(\/assets\/index-[^"]+\.css)"/);
-    return {
-      js: jsMatch ? jsMatch[1] : "/assets/index.js",
-      css: cssMatch ? cssMatch[1] : "/assets/index.css"
-    };
+    const res = await fetch(`${baseSiteUrl}/index.html`);
+    if (res.ok) {
+      const html = await res.text();
+      const jsMatch = html.match(/src="([^"]*assets\/index-[^"]+\.js)"/);
+      const cssMatch = html.match(/href="([^"]*assets\/index-[^"]+\.css)"/);
+      if (jsMatch || cssMatch) {
+        cachedAssets = {
+          js: jsMatch ? jsMatch[1].startsWith("/") ? jsMatch[1] : "/" + jsMatch[1] : "/assets/index.js",
+          css: cssMatch ? cssMatch[1].startsWith("/") ? cssMatch[1] : "/" + cssMatch[1] : "/assets/index.css"
+        };
+        isDiscovering = false;
+        return cachedAssets;
+      }
+    }
   } catch (e) {
+    console.warn("Asset discovery failed:", e);
+  } finally {
+    isDiscovering = false;
   }
   return { js: "/assets/index.js", css: "/assets/index.css" };
 }
@@ -28,9 +46,18 @@ const createHtmlTemplate = async ({
   canonicalUrl,
   content,
   hydrationData = "",
-  baseSiteUrl = ""
+  baseSiteUrl = "",
+  jsAsset,
+  cssAsset
 }) => {
-  const { js: jsAsset, css: cssAsset } = await getAssetPaths(baseSiteUrl);
+  let js = jsAsset;
+  let css = cssAsset;
+  if (!js || !css) {
+    const effectiveBaseUrl = baseSiteUrl || new URL(canonicalUrl).origin;
+    const discovered = await getAssetPaths(effectiveBaseUrl);
+    js = js || discovered.js;
+    css = css || discovered.css;
+  }
   return `<!doctype html>
 <html lang="en" data-theme="light">
   <head>
@@ -44,8 +71,8 @@ const createHtmlTemplate = async ({
     <meta property="og:description" content="${description}" />
     <meta property="og:url" content="${canonicalUrl}" />
     <link rel="canonical" href="${canonicalUrl}" />
-    <link rel="stylesheet" crossorigin href="${cssAsset}" />
-    <script type="module" crossorigin src="${jsAsset}"><\/script>
+    <link rel="stylesheet" crossorigin href="${css}" />
+    <script type="module" crossorigin src="${js}"><\/script>
   </head>
   <body>
     ${hydrationData}
@@ -138,7 +165,7 @@ async function fetchLatestStorySummaries(env, count = 3) {
   }
 }
 const generatePageContent = async (pathname, routes, footerLinks, env) => {
-  const apiUrl = env?.API_URL || env?.apiUrl;
+  const apiUrl = env?.API_URL || env?.apiUrl || "https://api.example.com";
   const baseUrl = env?.BASE_URL || env?.baseUrl || "https://www.example.com";
   let staticDetails = {
     siteTitle: "My Personal Website",
@@ -286,6 +313,7 @@ const generatePageContent = async (pathname, routes, footerLinks, env) => {
 };
 class WebsitePrerender {
   constructor(options = {}) {
+    this.cachedAssets = null;
     this.routes = options.routes || [
       { link: "/", text: "Home" },
       { link: "/blogs", text: "Blogs" },
@@ -303,11 +331,41 @@ class WebsitePrerender {
     this.templateRenderer = options.templateRenderer || createHtmlTemplate;
     this.apiHandler = options.apiHandler;
   }
+  async discoverAssets(env, baseSiteUrl) {
+    if (this.cachedAssets) return this.cachedAssets;
+    try {
+      let html = "";
+      if (env.ASSETS) {
+        const res = await env.ASSETS.fetch(new Request("http://localhost/index.html"));
+        if (res.ok) html = await res.text();
+      }
+      if (!html) {
+        const res = await fetch(`${baseSiteUrl}/index.html`, {
+          headers: { "X-Asset-Discovery": "true" }
+        });
+        if (res.ok) html = await res.text();
+      }
+      if (html) {
+        const jsMatch = html.match(/src="([^"]*assets\/index-[^"]+\.js)"/);
+        const cssMatch = html.match(/href="([^"]*assets\/index-[^"]+\.css)"/);
+        if (jsMatch || cssMatch) {
+          this.cachedAssets = {
+            js: jsMatch ? jsMatch[1].startsWith("/") ? jsMatch[1] : "/" + jsMatch[1] : "/assets/index.js",
+            css: cssMatch ? cssMatch[1].startsWith("/") ? cssMatch[1] : "/" + cssMatch[1] : "/assets/index.css"
+          };
+          return this.cachedAssets;
+        }
+      }
+    } catch (e) {
+      console.warn("Asset discovery failed:", e);
+    }
+    return { js: "/assets/index.js", css: "/assets/index.css" };
+  }
   async fetchStaticDetails(apiUrl, env) {
     try {
       let data;
       if (this.apiHandler) {
-        const res = await this.apiHandler.fetch(new Request(`${apiUrl}/api/static`), env, {});
+        const res = await this.apiHandler.fetch(new Request("http://localhost/api/static"), env, {});
         if (res.ok) data = await res.json();
       } else {
         const res = await fetch(`${apiUrl}/api/static`);
@@ -334,7 +392,7 @@ class WebsitePrerender {
   async fetchAboutMeData(apiUrl, env) {
     try {
       if (this.apiHandler) {
-        const res = await this.apiHandler.fetch(new Request(`${apiUrl}/api/aboutme`), env, {});
+        const res = await this.apiHandler.fetch(new Request("http://localhost/api/aboutme"), env, {});
         if (res.ok) return await res.json();
       } else {
         const res = await fetch(`${apiUrl}/api/aboutme`);
@@ -345,15 +403,39 @@ class WebsitePrerender {
     return null;
   }
   async fetch(request, env, ctx) {
-    const apiUrl = env?.API_URL || "https://api.example.com";
-    const baseSiteUrl = env?.BASE_SITE_URL || "https://site.example.com";
-    await this.fetchStaticDetails(apiUrl, env);
     const url = new URL(request.url);
+    const apiUrl = env?.API_URL || `${url.origin}/api`;
+    const baseSiteUrl = env?.BASE_SITE_URL || url.origin;
+    if (url.pathname === "/admin" || url.pathname.startsWith("/admin/")) {
+      if (env.ASSETS) {
+        const assetRes = await env.ASSETS.fetch(new Request("http://localhost/index.html"));
+        if (assetRes.ok) return assetRes;
+      }
+      const templateResponse = await fetch(`${baseSiteUrl}/index.html`);
+      if (templateResponse.ok) {
+        return new Response(templateResponse.body, {
+          headers: { "content-type": "text/html" }
+        });
+      }
+    }
+    if (request.headers.get("X-Asset-Discovery") === "true") {
+      if (env.ASSETS) {
+        return env.ASSETS.fetch(new Request("http://localhost/index.html"));
+      }
+    }
+    await this.fetchStaticDetails(apiUrl, env);
     if (url.pathname.startsWith("/api/")) {
       if (this.apiHandler) {
         return this.apiHandler.fetch(request, env, ctx);
       }
-      return fetch(`${apiUrl}${url.pathname}${url.search}`);
+      return fetch(`${apiUrl}${url.pathname.replace(/^\/api/, "")}${url.search}`);
+    }
+    if (env.ASSETS && (url.pathname.startsWith("/assets/") || url.pathname === "/favicon.ico" || url.pathname === "/logo.png")) {
+      try {
+        const assetRes = await env.ASSETS.fetch(request);
+        if (assetRes.ok) return assetRes;
+      } catch (e) {
+      }
     }
     if (url.pathname.startsWith("/images/")) {
       const imageKey = url.pathname.slice(1);
@@ -390,6 +472,9 @@ class WebsitePrerender {
         ico: "image/x-icon"
       };
       const contentType = contentTypes[ext || ""] || "application/octet-stream";
+      if (baseSiteUrl === url.origin && !env.ASSETS) {
+        return new Response("Asset not found", { status: 404 });
+      }
       const response = await fetch(`${baseSiteUrl}${path}`);
       if (response.ok) {
         return new Response(response.body, {
@@ -414,8 +499,15 @@ class WebsitePrerender {
         hydrationScript = `<script>window.__HYDRATION_DATA__ = ${JSON.stringify(aboutMeData)};<\/script>`;
       }
     }
+    const assets = await this.discoverAssets(env, baseSiteUrl);
     const pageContent = await generatePageContent(url.pathname, this.routes, this.footerLinks, { ...env, apiUrl, siteTitle: this.siteTitle, copyright: this.copyright });
-    const html = await this.templateRenderer({ ...pageContent, hydrationData: hydrationScript });
+    const html = await this.templateRenderer({
+      ...pageContent,
+      hydrationData: hydrationScript,
+      baseSiteUrl,
+      jsAsset: assets.js,
+      cssAsset: assets.css
+    });
     return new Response(html, {
       headers: {
         "content-type": "text/html",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leadertechie/personal-site-kit",
-  "version": "0.1.0-alpha.14",
+  "version": "0.1.0-alpha.16",
   "type": "module",
   "description": "A high-performance personal website engine for Cloudflare Workers and R2",
   "repository": {