tweak coolify env grabber and ensure all head links are https (#55)

* refactor: simplify getCoolifyURL function and update usage in config

* fix: update site configuration to use getCoolifyURL function

* fix: update environment variable reference in getCoolifyURL function

* fix: update COOLIFY_DOMAIN reference to COOLIFY_FQDN in getCoolifyURL function and restore astro.config.mts

* fix: ensure getCoolifyURL fallback to default site URL if undefined

* fix: ensure URLs are converted to HTTPS in Head.astro component

Author: Adammatthiesen

www/astro-config-utils.ts

@@ -1,15 +1,3 @@
-function stripHTTPandHTTPS(url: string) {
-	return url.replace('http://', '').replace('https://', '');
-}
-
-function stripTrailingSlash(url: string) {
-	return url.replace(/\/$/, '');
-}
-
-function setHTTP(url: string) {
-	return `http://${url}`;
-}
-
 function setHTTPS(url: string) {
 	return `https://${url}`;
 }
@@ -26,17 +14,14 @@ function splitListAndSelectFirst(list: string) {
  *
  * @see https://coolify.io/docs/knowledge-base/environment-variables#predefined-variables
  */
-export const getCoolifyURL = (returnHttps?: boolean) => {
-	const urlList = process.env.COOLIFY_FQDN;
+export const getCoolifyURL = () => {
+	const urlList = process.env.COOLIFY_FQDN; // should be a comma-separated list of URLs www.studiocms.dev,studiocms.dev
 	if (!urlList) {
 		return undefined;
 	}
 	const url = splitListAndSelectFirst(urlList);
-	const strippedUrl = stripTrailingSlash(stripHTTPandHTTPS(url));
-	if (returnHttps) {
-		return setHTTPS(strippedUrl);
-	}
-	return setHTTP(strippedUrl);
+	const strippedUrl = url;
+	return setHTTPS(strippedUrl);
 };
 
 export default getCoolifyURL;

www/astro.config.mjs www/astro.config.mtswww/astro.config.mjs renamed to www/astro.config.mts

@@ -1,14 +1,14 @@
 import db from '@astrojs/db';
 import node from '@astrojs/node';
 import cFetch from '@studiocms/cfetch';
+import getCoolifyURL from './astro-config-utils';
 import { defineConfig } from 'astro/config';
 import studiocms from 'studiocms';
-import getCoolifyURL from './astro-config-utils';
 
 // https://astro.build/config
 export default defineConfig({
 	output: 'server',
-	site: getCoolifyURL(true) || 'https://studiocms.dev',
+	site: getCoolifyURL() || 'https://studiocms.dev',
 	image: {
 		remotePatterns: [
 			{

www/src/components/Head.astro

@@ -15,7 +15,16 @@ interface Props {
 	videoPosterImage?: string;
 }
 
-const OgBanner = new URL('/og.png', Astro.url);
+function convertToHTTPS(url: URL) {
+	if (url.protocol === 'http:') {
+		url.protocol = 'https:';
+	}
+	return url;
+}
+
+const safeUrl = convertToHTTPS(Astro.url);
+
+const OgBanner = new URL('/og.png', safeUrl);
 
 const RSSFeed = new URL('rss.xml', Astro.site);
 
@@ -29,6 +38,8 @@ const {
 	videoPosterImage,
 } = Astro.props;
 
+const safeOgImage = convertToHTTPS(ogImage);
+
 const path = Astro.originPathname;
 ---
 
@@ -46,15 +57,15 @@ const path = Astro.originPathname;
 
   <meta property='og:title' content={title} />
   <meta property='og:description' content={desc} />
-  <meta property='og:image' content={ogImage} />
-  <meta property='og:url' content={Astro.url} />
+  <meta property='og:image' content={safeOgImage} />
+  <meta property='og:url' content={safeUrl} />
   <meta property='og:type' content='website' />
 
   <meta name='twitter:card' content='summary_large_image' />
-  <meta name="twitter:url" content={Astro.url} />
+  <meta name="twitter:url" content={safeUrl} />
   <meta name='twitter:title' content={title} />
   <meta name='twitter:description' content={desc} />
-  <meta name='twitter:image' content={ogImage} />
+  <meta name='twitter:image' content={safeOgImage} />
   <meta name='twitter:creator' content='withstudiocms' />
   <meta name='twitter:site' content='withstudiocms' />
 
@@ -71,7 +82,7 @@ const path = Astro.originPathname;
     <meta property="article:author" content={author.name} />
   )}
 
-  <link rel="canonical" href={Astro.url} />
+  <link rel="canonical" href={safeUrl} />
   <link rel="icon" href="https://cdn.studiocms.dev/favicon-light.png" type="image/png" media="(prefers-color-scheme: dark)" />
   <link rel="icon" href="https://cdn.studiocms.dev/favicon-dark.png" type="image/png" media="(prefers-color-scheme: light)" />
   <link rel="icon" href="https://cdn.studiocms.dev/favicon.svg" type="image/svg+xml" />