@websline/cms-view-utils 1.2.0 → 1.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@websline/cms-view-utils",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "type": "module",
   "files": [
     "src",

package/src/cms/fetchSiteConfig.js

@@ -0,0 +1,20 @@
+import { buildCmsSiteConfigUrl } from "./urlResolver.js";
+import { buildCmsHeaders } from "./headers.js";
+import { HttpError } from "../shared/errors.js";
+
+const fetchSiteConfig = async (request) => {
+	const cmsUrl = buildCmsSiteConfigUrl();
+
+	const response = await fetch(cmsUrl, {
+		method: "GET",
+		headers: buildCmsHeaders(request),
+	});
+
+	if (!response.ok) {
+		throw new HttpError(response.status, "CMS Error");
+	}
+
+	return response.json();
+};
+
+export { fetchSiteConfig };

package/src/cms/urlResolver.js

@@ -1,19 +1,21 @@
-const buildCmsPageUrl = ({ draftUuid, path }) => {
-	const base = import.meta.env.CMS_URL;
+const CMS_BASE_URL = import.meta.env.CMS_URL;
 
+const buildCmsPageUrl = ({ draftUuid, path }) => {
 	if (draftUuid) {
-		return `${base}/api/public/pages/preview/${draftUuid}`;
+		return `${CMS_BASE_URL}/api/public/pages/preview/${draftUuid}`;
 	}
 
 	const normalizedPath = path.startsWith("/") ? path : `/${path}`;
 
-	return `${base}/api/public/pages${normalizedPath}`;
+	return `${CMS_BASE_URL}/api/public/pages${normalizedPath}`;
 };
 
-const buildCmsSitemapUrl = () => {
-	const base = import.meta.env.CMS_URL;
+const buildCmsSiteConfigUrl = () => {
+	return `${CMS_BASE_URL}/api/public/site-config`;
+};
 
-	return `${base}/api/public/sitemap`;
+const buildCmsSitemapUrl = () => {
+	return `${CMS_BASE_URL}/api/public/sitemap`;
 };
 
-export { buildCmsPageUrl, buildCmsSitemapUrl };
+export { buildCmsPageUrl, buildCmsSiteConfigUrl, buildCmsSitemapUrl };

package/src/handlers/robotsHandler.js

@@ -1,3 +1,6 @@
+import { fetchSiteConfig } from "../cms/fetchSiteConfig.js";
+import { HttpError } from "../shared/errors.js";
+
 const buildRobotsTxt = ({ siteUrl, allowIndexing }) => {
 	if (!allowIndexing) {
 		return `User-agent: *
@@ -12,29 +15,31 @@ Sitemap: ${siteUrl}/sitemap.xml
 `;
 };
 
-const resolveSiteUrl = (request) => {
-	const url = new URL(request.url);
-	return `${url.protocol}//${url.host}`;
-};
-
-// TODO: replace with CMS setting once available
-const resolveAllowIndexing = () => true;
-
 const createRobotsHandler =
 	() =>
 	async ({ request }) => {
-		const siteUrl = resolveSiteUrl(request);
-		const allowIndexing = resolveAllowIndexing();
-
-		const body = buildRobotsTxt({ siteUrl, allowIndexing });
-
-		return new Response(body, {
-			status: 200,
-			headers: {
-				"Content-Type": "text/plain; charset=utf-8",
-				"Cache-Control": "no-store",
-			},
-		});
+		try {
+			const siteConfig = await fetchSiteConfig(request);
+			const siteUrl = siteConfig?.url;
+			const allowIndexing = siteConfig?.mode === "PRODUCTION";
+
+			const body = buildRobotsTxt({ siteUrl, allowIndexing });
+
+			return new Response(body, {
+				status: 200,
+				headers: {
+					"Content-Type": "text/plain; charset=utf-8",
+					"Cache-Control": "no-store",
+				},
+			});
+		} catch (error) {
+			if (error instanceof HttpError) {
+				return new Response(`Robots error: ${error.message}`, {
+					status: error.status,
+				});
+			}
+			throw error;
+		}
 	};
 
 export { createRobotsHandler };

package/src/handlers/sitemapHandler.js

@@ -1,20 +1,18 @@
 import { fetchSitemap } from "../cms/fetchSitemap.js";
+import { fetchSiteConfig } from "../cms/fetchSiteConfig.js";
 import { buildSitemapXml } from "./sitemapXml.js";
 import { HttpError } from "../shared/errors.js";
 
-const resolveSiteUrl = (request) => {
-	const url = new URL(request.url);
-	return `${url.protocol}//${url.host}`;
-};
-
 const createSitemapHandler =
 	() =>
 	async ({ request }) => {
-		const siteUrl = resolveSiteUrl(request);
-
 		try {
-			const entries = await fetchSitemap(request);
-			const xml = buildSitemapXml(entries, siteUrl);
+			const [entries, siteConfig] = await Promise.all([
+				fetchSitemap(request),
+				fetchSiteConfig(request),
+			]);
+
+			const xml = buildSitemapXml(entries, siteConfig?.url);
 
 			return new Response(xml, {
 				status: 200,