@griddo/cx 11.7.4 → 11.7.6-rc.0

package/exporter/constants/envs.ts

@@ -1,67 +1,76 @@
-/**
- * Here are all the environment variables that the CX code uses.
- */
-
-import dotenv from "dotenv";
+// Here are all the environment variables that the CX code uses.
 
 import { isTruthy } from "../utils/core-utils";
 
-dotenv.config();
-
-//
 // Credentials
-//
-/* prettier-ignore */ const GRIDDO_API_URL = process.env.GRIDDO_API_URL || process.env.API_URL;
-/* prettier-ignore */ const GRIDDO_PUBLIC_API_URL = process.env.GRIDDO_PUBLIC_API_URL || process.env.PUBLIC_API_URL;
-/* prettier-ignore */ const GRIDDO_BOT_USER = process.env.botEmail || process.env.GRIDDO_BOT_USER;
-/* prettier-ignore */ const GRIDDO_BOT_PASSWORD = process.env.botPassword|| process.env.GRIDDO_BOT_PASSWORD;
+const GRIDDO_API_URL = process.env.GRIDDO_API_URL || process.env.API_URL;
+const GRIDDO_PUBLIC_API_URL = process.env.GRIDDO_PUBLIC_API_URL || process.env.PUBLIC_API_URL;
+const GRIDDO_BOT_USER = process.env.botEmail || process.env.GRIDDO_BOT_USER;
+const GRIDDO_BOT_PASSWORD = process.env.botPassword || process.env.GRIDDO_BOT_PASSWORD;
 
-//
 // Rendering
-//
-/* prettier-ignore */ const GRIDDO_API_CONCURRENCY_COUNT = Number.parseInt( process.env.GRIDDO_API_CONCURRENCY_COUNT || "10");
-/* prettier-ignore */ const GRIDDO_RENDER_ALL_SITES = isTruthy(process.env.GRIDDO_RENDER_ALL_SITES || process.env.updateAllSites);
-/* prettier-ignore */ const GRIDDO_RENDER_SITE = Number.parseInt(process.env.GRIDDO_RENDER_SITE || "")
-/* prettier-ignore */ const GRIDDO_RENDER_PAGES = (process.env.GRIDDO_RENDER_PAGES || "").split(",").map((item) => Number.parseInt(item)).filter(Boolean);
-/* prettier-ignore */ const GRIDDO_SKIP_BUILD_CHECKS = isTruthy(process.env.GRIDDO_SKIP_BUILD_CHECKS)
-/* prettier-ignore */ const GRIDDO_DEBUG_LOGS = isTruthy(process.env.GRIDDO_DEBUG_LOGS);
-/* prettier-ignore */ const GRIDDO_BUILD_LOGS = isTruthy(process.env.GRIDDO_BUILD_LOGS);
-/* prettier-ignore */ const GRIDDO_RENDER_BREAKPOINTS_FEATURE = isTruthy(process.env.GRIDDO_RENDER_BREAKPOINTS_FEATURE);
-/* prettier-ignore */ const GRIDDO_SSG_VERBOSE_LOGS = isTruthy(process.env.GRIDDO_SSG_VERBOSE_LOGS)
-/* prettier-ignore */ const GRIDDO_SEARCH_FEATURE = isTruthy(process.env.GRIDDO_SEARCH_FEATURE);
-/* prettier-ignore */ const GRIDDO_ASSET_PREFIX = process.env.GRIDDO_ASSET_PREFIX || process.env.ASSET_PREFIX;
-/* prettier-ignore */ const GRIDDO_REACT_APP_INSTANCE = process.env.GRIDDO_REACT_APP_INSTANCE || process.env.REACT_APP_INSTANCE;
-/* prettier-ignore */ const GRIDDO_AI_EMBEDDINGS = isTruthy(process.env.GRIDDO_AI_EMBEDDINGS);
-/* prettier-ignore */ const GRIDDO_VERBOSE_LOGS = isTruthy(process.env.GRIDDO_VERBOSE_LOGS);
-/* prettier-ignore */ const GRIDDO_ALERT_FEATURE = isTruthy(process.env.GRIDDO_ALERT_FEATURE);
-/* prettier-ignore */ const GRIDDO_API_MAX_RESPONSE_SIZE = Number.parseInt(process.env.GRIDDO_API_MAX_RESPONSE_SIZE || "81920") // 80KB
-/* prettier-ignore */ const GRIDDO_SSG_MAX_PAGE_SIZE = Number.parseInt(process.env.GRIDDO_SSG_MAX_PAGE_SIZE || "524288") // 512KB
+const GRIDDO_API_CONCURRENCY_COUNT = Number.parseInt(
+	process.env.GRIDDO_API_CONCURRENCY_COUNT || "10",
+);
+const GRIDDO_RENDER_ALL_SITES = isTruthy(
+	process.env.GRIDDO_RENDER_ALL_SITES || process.env.updateAllSites,
+);
+const GRIDDO_RENDER_SITE = Number.parseInt(process.env.GRIDDO_RENDER_SITE || "");
+const GRIDDO_RENDER_PAGES = (process.env.GRIDDO_RENDER_PAGES || "")
+	.split(",")
+	.map((item) => Number.parseInt(item))
+	.filter(Boolean);
+const GRIDDO_SKIP_BUILD_CHECKS = isTruthy(process.env.GRIDDO_SKIP_BUILD_CHECKS);
+const GRIDDO_DEBUG_LOGS = isTruthy(process.env.GRIDDO_DEBUG_LOGS);
+const GRIDDO_BUILD_LOGS = isTruthy(process.env.GRIDDO_BUILD_LOGS);
+const GRIDDO_RENDER_BREAKPOINTS_FEATURE = isTruthy(process.env.GRIDDO_RENDER_BREAKPOINTS_FEATURE);
+const GRIDDO_SSG_VERBOSE_LOGS = isTruthy(process.env.GRIDDO_SSG_VERBOSE_LOGS);
+const GRIDDO_SEARCH_FEATURE = isTruthy(process.env.GRIDDO_SEARCH_FEATURE);
+const GRIDDO_ASSET_PREFIX = process.env.GRIDDO_ASSET_PREFIX || process.env.ASSET_PREFIX;
+const GRIDDO_REACT_APP_INSTANCE =
+	process.env.GRIDDO_REACT_APP_INSTANCE || process.env.REACT_APP_INSTANCE;
+const GRIDDO_AI_EMBEDDINGS = isTruthy(process.env.GRIDDO_AI_EMBEDDINGS);
+const GRIDDO_VERBOSE_LOGS = isTruthy(process.env.GRIDDO_VERBOSE_LOGS);
 
-//
 // LifeCycle
-//
-/* prettier-ignore */ const GRIDDO_INIT_LIFECYCLE_MAX_ATTEMPTS = Number.parseInt(process.env.GRIDDO_INIT_LIFECYCLE_MAX_ATTEMPTS || "1");
-/* prettier-ignore */ const GRIDDO_CLEAN_LIFECYCLE_MAX_ATTEMPTS = Number.parseInt(process.env.GRIDDO_CLEAN_LIFECYCLE_MAX_ATTEMPTS || "1");
-/* prettier-ignore */ const GRIDDO_CLOSE_LIFECYCLE_MAX_ATTEMPTS = Number.parseInt(process.env.GRIDDO_CLOSE_LIFECYCLE_MAX_ATTEMPTS || "1");
-/* prettier-ignore */ const GRIDDO_PREPARE_LIFECYCLE_MAX_ATTEMPTS = Number.parseInt(process.env.GRIDDO_PREPARE_LIFECYCLE_MAX_ATTEMPTS || "1");
-/* prettier-ignore */ const GRIDDO_RESTORE_LIFECYCLE_MAX_ATTEMPTS = Number.parseInt(process.env.GRIDDO_RESTORE_LIFECYCLE_MAX_ATTEMPTS || "1");
-/* prettier-ignore */ const GRIDDO_DATA_LIFECYCLE_MAX_ATTEMPTS = Number.parseInt(process.env.GRIDDO_DATA_LIFECYCLE_MAX_ATTEMPTS || "1");
-/* prettier-ignore */ const GRIDDO_SSG_LIFECYCLE_MAX_ATTEMPTS = Number.parseInt(process.env.GRIDDO_SSG_LIFECYCLE_MAX_ATTEMPTS || "2");
-/* prettier-ignore */ const GRIDDO_RELOCATION_LIFECYCLE_MAX_ATTEMPTS = Number.parseInt(process.env.GRIDDO_RELOCATION_LIFECYCLE_MAX_ATTEMPTS || "1");
-/* prettier-ignore */ const GRIDDO_META_LIFECYCLE_MAX_ATTEMPTS = Number.parseInt(process.env.GRIDDO_META_LIFECYCLE_MAX_ATTEMPTS || "4");
-/* prettier-ignore */ const GRIDDO_ARCHIVE_LIFECYCLE_MAX_ATTEMPTS = Number.parseInt(process.env.GRIDDO_ARCHIVE_LIFECYCLE_MAX_ATTEMPTS || "1");
+const GRIDDO_INIT_LIFECYCLE_MAX_ATTEMPTS = Number.parseInt(
+	process.env.GRIDDO_INIT_LIFECYCLE_MAX_ATTEMPTS || "1",
+);
+const GRIDDO_CLEAN_LIFECYCLE_MAX_ATTEMPTS = Number.parseInt(
+	process.env.GRIDDO_CLEAN_LIFECYCLE_MAX_ATTEMPTS || "1",
+);
+const GRIDDO_CLOSE_LIFECYCLE_MAX_ATTEMPTS = Number.parseInt(
+	process.env.GRIDDO_CLOSE_LIFECYCLE_MAX_ATTEMPTS || "1",
+);
+const GRIDDO_PREPARE_LIFECYCLE_MAX_ATTEMPTS = Number.parseInt(
+	process.env.GRIDDO_PREPARE_LIFECYCLE_MAX_ATTEMPTS || "1",
+);
+const GRIDDO_RESTORE_LIFECYCLE_MAX_ATTEMPTS = Number.parseInt(
+	process.env.GRIDDO_RESTORE_LIFECYCLE_MAX_ATTEMPTS || "1",
+);
+const GRIDDO_DATA_LIFECYCLE_MAX_ATTEMPTS = Number.parseInt(
+	process.env.GRIDDO_DATA_LIFECYCLE_MAX_ATTEMPTS || "1",
+);
+const GRIDDO_SSG_LIFECYCLE_MAX_ATTEMPTS = Number.parseInt(
+	process.env.GRIDDO_SSG_LIFECYCLE_MAX_ATTEMPTS || "2",
+);
+const GRIDDO_RELOCATION_LIFECYCLE_MAX_ATTEMPTS = Number.parseInt(
+	process.env.GRIDDO_RELOCATION_LIFECYCLE_MAX_ATTEMPTS || "1",
+);
+const GRIDDO_META_LIFECYCLE_MAX_ATTEMPTS = Number.parseInt(
+	process.env.GRIDDO_META_LIFECYCLE_MAX_ATTEMPTS || "4",
+);
+const GRIDDO_ARCHIVE_LIFECYCLE_MAX_ATTEMPTS = Number.parseInt(
+	process.env.GRIDDO_ARCHIVE_LIFECYCLE_MAX_ATTEMPTS || "1",
+);
 
-//
 // Testing
-//
-/* prettier-ignore */ const GRIDDO_FIXTURES_DOMAIN_NAMES = process.env.GRIDDO_CX_FIXTURES_DOMAIN_NAMES;
-/* prettier-ignore */ const GRIDDO_FIXTURES_SITE_NAMES = process.env.GRIDDO_CX_FIXTURES_SITE_NAMES;
+const GRIDDO_FIXTURES_DOMAIN_NAMES = process.env.GRIDDO_CX_FIXTURES_DOMAIN_NAMES;
+const GRIDDO_FIXTURES_SITE_NAMES = process.env.GRIDDO_CX_FIXTURES_SITE_NAMES;
 
 export {
 	GRIDDO_AI_EMBEDDINGS,
-	GRIDDO_ALERT_FEATURE,
 	GRIDDO_API_CONCURRENCY_COUNT,
-	GRIDDO_API_MAX_RESPONSE_SIZE,
 	GRIDDO_API_URL,
 	GRIDDO_ARCHIVE_LIFECYCLE_MAX_ATTEMPTS,
 	GRIDDO_ASSET_PREFIX,
@@ -88,7 +97,6 @@ export {
 	GRIDDO_SEARCH_FEATURE,
 	GRIDDO_SKIP_BUILD_CHECKS,
 	GRIDDO_SSG_LIFECYCLE_MAX_ATTEMPTS,
-	GRIDDO_SSG_MAX_PAGE_SIZE,
 	GRIDDO_SSG_VERBOSE_LOGS,
 	GRIDDO_VERBOSE_LOGS,
 };

package/exporter/{errors/errors-data.ts → constants/errors.ts}

@@ -7,10 +7,11 @@
  * obligatorily.
  */
 
-import type { ErrorData } from ".";
 import type { SpawnSyncReturns } from "node:child_process";
+import type { ErrorData } from "../utils/errors";
 
 type ErrorsType =
+	| "UploadSearchError"
 	| "ArtifactError"
 	| "ErrorInSSGBuildProcess"
 	| "LifecycleExecutionError"
@@ -20,7 +21,8 @@ type ErrorsType =
 	| "ReadFromStoreError"
 	| "ReferenceFieldSourcesNotFoundError"
 	| "RenderUUIDError"
-	| "WriteToStoreError";
+	| "WriteToStoreError"
+	| "CheckHealthError";
 
 const ArtifactError: ErrorData = {
 	error: "ArtifactError",
@@ -30,19 +32,13 @@ const ArtifactError: ErrorData = {
 	hint: "Have there been any recent deployments? These can delete directories from the current render.",
 };
 
-const ErrorInSSGBuildProcess = (
-	command: SpawnSyncReturns<string>,
-): ErrorData => ({
+const ErrorInSSGBuildProcess = (command: SpawnSyncReturns<string>): ErrorData => ({
 	error: "ErrorInSSGBuildProcess",
 	message: `Error in SSG build process: ${JSON.stringify(command)}`,
-	expected:
-		"This can happen if there was a problem with the SSG build process.",
+	expected: "This can happen if there was a problem with the SSG build process.",
 });
 
-const LifecycleExecutionError = (
-	attempts: number,
-	name: string,
-): ErrorData => ({
+const LifecycleExecutionError = (attempts: number, name: string): ErrorData => ({
 	error: "LifecycleExecutionError",
 	message: `Exceeded maximum retry attempts (${attempts}) for ${name} LifeCycle`,
 });
@@ -50,14 +46,12 @@ const LifecycleExecutionError = (
 const LoginError: ErrorData = {
 	error: "LoginError",
 	message: "There was a problem logging in to the API",
-	expected:
-		"This happens if the API is currently not working or the credentials are incorrect.",
+	expected: "This happens if the API is currently not working or the credentials are incorrect.",
 };
 
 const NoDomainsFoundError: ErrorData = {
 	error: "NoDomainsFoundError",
-	message:
-		"No domains were found in this instance. The process cannot continue.",
+	message: "No domains were found in this instance. The process cannot continue.",
 	expected:
 		"This may happen if the API is not functioning, or the site is not properly configured, or the domains are not registered.",
 	hint: "You can contact the instance administrator.",
@@ -98,6 +92,19 @@ const WriteToStoreError: ErrorData = {
 	hint: "There may be an issue such as lack of space or permissions preventing the file from being written.",
 };
 
+const UploadSearchError: ErrorData = {
+	error: "UploadSearchError",
+	message: "There was an error uploading content to API for search",
+	hint: "This happens if the API is currently not working or the credentials are incorrect.",
+};
+
+const CheckHealthError: ErrorData = {
+	error: "CheckHealthError",
+	message: "There was a problem with environment vars configuration.",
+	expected: "Some of the required environment variables are not set correctly or are missing",
+	hint: "Are the environment variables correctly set?",
+};
+
 export {
 	ArtifactError,
 	ErrorInSSGBuildProcess,
@@ -108,6 +115,8 @@ export {
 	ReadFromStoreError,
 	ReferenceFieldSourcesNotFoundError,
 	RenderUUIDError,
+	UploadSearchError,
 	WriteToStoreError,
+	CheckHealthError,
 	type ErrorsType,
 };

package/exporter/services/auth.ts

@@ -1,8 +1,9 @@
 import type { AuthHeaders } from "../types/api";
 
-import { endpoints, envs } from "../constants";
-import { throwError } from "../errors";
-import { LoginError } from "../errors/errors-data";
+import { LOGIN } from "../constants/endpoints";
+import { GRIDDO_BOT_PASSWORD, GRIDDO_BOT_USER } from "../constants/envs";
+import { LoginError } from "../constants/errors";
+import { throwError } from "../utils/errors";
 
 /**
  * Service for authentication in the Griddo Private API
@@ -12,12 +13,12 @@ class AuthService {
 
 	async login() {
 		try {
-			const response = await fetch(endpoints.LOGIN, {
+			const response = await fetch(LOGIN, {
 				method: "POST",
 				headers: { "Content-Type": "application/json", Connection: "close" },
 				body: JSON.stringify({
-					username: envs.GRIDDO_BOT_USER,
-					password: envs.GRIDDO_BOT_PASSWORD,
+					username: GRIDDO_BOT_USER,
+					password: GRIDDO_BOT_PASSWORD,
 				}),
 			});
 

package/exporter/services/db.ts

@@ -0,0 +1,32 @@
+import type { RenderDB } from "../types/render";
+
+import fsp from "node:fs/promises";
+import path from "node:path";
+
+import { pkgDirSync } from "../utils/folders";
+
+const root = pkgDirSync({ cwd: path.resolve(__dirname, "../../..") }) || "";
+const cache = path.join(root, ".cx-cache");
+const dbFilePath = path.join(cache, "db.json");
+
+async function readDB(customDBPath = "") {
+	const file = customDBPath || dbFilePath;
+	try {
+		return JSON.parse(await fsp.readFile(file, "utf-8")) as RenderDB;
+	} catch (error) {
+		console.error(`Failed to read DB file at ${file}:`, error);
+		throw error;
+	}
+}
+
+async function writeDB(renderDB: RenderDB, customDBPath = "") {
+	const file = customDBPath || dbFilePath;
+	try {
+		await fsp.writeFile(file, JSON.stringify(renderDB));
+	} catch (error) {
+		console.error(`Failed to write DB file at ${file}:`, error);
+		throw error;
+	}
+}
+
+export { readDB, writeDB };

package/exporter/services/navigation.ts

@@ -68,9 +68,7 @@ class NavigationService {
 		const rightLanguageItem = list.find(
 			(item) =>
 				item.language === language &&
-				item.navigationLanguages?.find(
-					(version) => version.navigationId === id,
-				),
+				item.navigationLanguages?.find((version) => version.navigationId === id),
 		);
 
 		const result = rightLanguageItem || list.find((item) => item.id === id);
@@ -87,13 +85,9 @@ class NavigationService {
 	}
 
 	getPageNavigations(page: APIPageObject) {
-		const {
-			header: pageHeader,
-			footer: pageFooter,
-			language,
-			template: { templateType },
-			templateConfig: { defaultHeader, defaultFooter, templates },
-		} = page;
+		const { header: pageHeader, footer: pageFooter, language, template, templateConfig } = page;
+		const { templateType } = template;
+		const { defaultHeader, defaultFooter, templates } = templateConfig;
 
 		// The navigations would be:
 		// - The one with the page or ...

package/exporter/services/reference-fields.ts

@@ -1,9 +1,9 @@
+import type { Core, Fields } from "@griddo/core";
 import type { FetchDataProps } from "../types/global";
 import type { APIPageObject } from "../types/pages";
-import type { Core, Fields } from "@griddo/core";
 
-import { getReferenceFieldSiteData } from "./sites";
 import { boxLog } from "../utils/loggin";
+import { getReferenceFieldSiteData } from "./sites";
 
 /**
  * Get the body data from a ReferenceField.
@@ -54,9 +54,7 @@ function getBody(data: Fields.Reference<unknown>, page: Core.Page) {
 		};
 	}
 
-	console.log(
-		`Error: ReferenceField mode: ${mode} is not recognized on page ${page?.id}.`,
-	);
+	console.log(`Error: ReferenceField mode: ${mode} is not recognized on page ${page?.id}.`);
 
 	return data;
 }
@@ -71,11 +69,8 @@ function getBody(data: Fields.Reference<unknown>, page: Core.Page) {
  * @returns The ContentType data.
  */
 async function fetchContentTypeData(props: FetchDataProps) {
-	const {
-		page,
-		component: { data },
-		cacheKey,
-	} = props;
+	const { page, component, cacheKey } = props;
+	const { data } = component;
 
 	// Distrubutor with `hasDistributorData: true` / `getStaticData: true` but without `data` prop
 	if (!data) {
@@ -109,13 +104,7 @@ async function fetchContentTypeData(props: FetchDataProps) {
 
 	const body = getBody(data, page);
 
-	const response = await getReferenceFieldSiteData(
-		page,
-		body,
-		cacheKey,
-		site,
-		lang,
-	);
+	const response = await getReferenceFieldSiteData(page, body, cacheKey, site, lang);
 
 	return response;
 }
@@ -165,10 +154,7 @@ async function getReferenceFieldData({
 					continue;
 				}
 
-				const _key = key as
-					| "hasDistributorData"
-					| "queriedItems"
-					| "getStaticData";
+				const _key = key as "hasDistributorData" | "queriedItems" | "getStaticData";
 				const component = templateChunk[_key] as unknown as {
 					data: Fields.Reference<unknown>;
 					queriedItems: Fields.QueriedData<unknown>;
@@ -181,8 +167,7 @@ async function getReferenceFieldData({
 					continue;
 				}
 
-				const componentHasRequestForData =
-					component.hasDistributorData || component.getStaticData;
+				const componentHasRequestForData = component.hasDistributorData || component.getStaticData;
 
 				if (componentHasRequestForData) {
 					component.queriedItems = await fetchContentTypeData({

package/exporter/services/robots.ts

@@ -1,18 +1,14 @@
 import type { Robots } from "../types/global";
 
-import fs from "node:fs";
+import fsp from "node:fs/promises";
 import path from "node:path";
 
-import { endpoints } from "../constants";
+import { ROBOTS } from "../constants/endpoints";
 import { get } from "../utils/api";
-import { getConfig } from "../utils/core-utils";
+import { pathExists } from "../utils/folders";
 import { verboseLog } from "../utils/loggin";
+import { getRenderPathsFromDB } from "../utils/render";
 
-const config = getConfig();
-
-/**
- * TODO: JSDoc
- */
 class RobotsService {
 	robots: Robots;
 	settings: Record<string, unknown>;
@@ -22,12 +18,9 @@ class RobotsService {
 		this.settings = {};
 	}
 
-	/**
-	 * TODO: JSDoc
-	 */
 	private async getRobots() {
 		try {
-			const apiRobots = await get<Robots>({ endpoint: endpoints.ROBOTS });
+			const apiRobots = await get<Robots>({ endpoint: ROBOTS });
 			this.robots =
 				apiRobots
 					?.filter((r) => !!r.path)
@@ -44,7 +37,7 @@ class RobotsService {
 	 * Write robots.txt files for the domain.
 	 */
 	async writeFiles(domain: string) {
-		const { __cx } = config.paths(domain);
+		const { __cx } = await getRenderPathsFromDB({ domain });
 		const distDirectory = path.join(__cx, "dist");
 
 		await this.getRobots();
@@ -56,9 +49,9 @@ class RobotsService {
 			return;
 		}
 
-		if (fs.existsSync(distDirectory)) {
+		if (await pathExists(distDirectory)) {
 			const fileLocation = path.join(distDirectory, "robots.txt");
-			fs.writeFileSync(fileLocation, robot?.content);
+			await fsp.writeFile(fileLocation, robot?.content);
 			verboseLog(`wrote robots.txt to ${fileLocation}`);
 		} else {
 			console.log(`${distDirectory} not found`);

package/exporter/services/sites.ts

@@ -1,3 +1,4 @@
+import type { Core } from "@griddo/core";
 import type {
 	AllSitesReponse,
 	EndPageInfoResponse,
@@ -11,17 +12,26 @@ import type {
 	StartPageRenderResponse,
 } from "../types/api";
 import type { Site } from "../types/sites";
-import type { Core } from "@griddo/core";
 
-import { endpoints } from "../constants";
+import {
+	BUILD_END,
+	BUILD_START,
+	GET_ALL,
+	GET_PAGE,
+	GET_REFERENCE_FIELD_DATA,
+	GET_SITEMAP,
+	INFO,
+	LANGUAGES,
+	SOCIALS,
+} from "../constants/endpoints";
 import { get, post } from "../utils/api";
 
 /**
  * Get a list of site objects.
  */
 async function getAllSites(domain: string) {
-	return await get<AllSitesReponse>({
-		endpoint: `${endpoints.GET_ALL}?domainSlug=${domain}`,
+	return get<AllSitesReponse>({
+		endpoint: `${GET_ALL}?domainSlug=${domain}`,
 	});
 }
 
@@ -29,7 +39,7 @@ async function getAllSites(domain: string) {
  * Get a list of site objects from a domain.
  */
 async function getAllSitesFromDomain(domain: string) {
-	const allSites = await get<AllSitesReponse>({ endpoint: endpoints.GET_ALL });
+	const allSites = await get<AllSitesReponse>({ endpoint: GET_ALL });
 
 	if (allSites.length) {
 		for (const site of allSites) {
@@ -40,8 +50,7 @@ async function getAllSitesFromDomain(domain: string) {
 			site.domains = items
 				.filter(
 					(item) =>
-						item.domain &&
-						(item.domain.slug === domain || item.domain.slug === `/${domain}`),
+						item.domain && (item.domain.slug === domain || item.domain.slug === `/${domain}`),
 				)
 				.map((item) => ({ [item.id]: `${item.domain.slug}${item.path}` }));
 		}
@@ -54,8 +63,8 @@ async function getAllSitesFromDomain(domain: string) {
  * Fetch a page object from API.
  */
 async function getPage(id: number, cacheKey: string) {
-	return await get<PageResponse>({
-		endpoint: `${endpoints.GET_PAGE}/${id}`,
+	return get<PageResponse>({
+		endpoint: `${GET_PAGE}/${id}`,
 		cacheKey,
 	});
 }
@@ -64,27 +73,27 @@ async function getPage(id: number, cacheKey: string) {
  * Get site info
  */
 async function getSiteInfo(id: number, cacheKey = "") {
-	const [prefix, suffix] = endpoints.INFO;
+	const [prefix, suffix] = INFO;
 
-	return await get<Site>({
+	return get<Site>({
 		endpoint: `${prefix}${id}${suffix}`,
 		cacheKey,
 	});
 }
 
 async function getSiteLanguages(id: number, cacheKey = "") {
-	const [prefix, suffix] = endpoints.LANGUAGES;
+	const [prefix, suffix] = LANGUAGES;
 
-	return await get<LanguagesResponse>({
+	return get<LanguagesResponse>({
 		endpoint: `${prefix}${id}${suffix}`,
 		cacheKey,
 	});
 }
 
 async function startSiteRender(id: number) {
-	const [prefix, suffix] = endpoints.BUILD_START;
+	const [prefix, suffix] = BUILD_START;
 
-	return await get<StartPageRenderResponse>({
+	return get<StartPageRenderResponse>({
 		endpoint: `${prefix}${id}${suffix}`,
 	});
 }
@@ -93,9 +102,9 @@ async function startSiteRender(id: number) {
  * Send the end signal to API for a render site.
  */
 async function endSiteRender(id: number, body: EndSiteRenderBody) {
-	const [prefix, suffix] = endpoints.BUILD_END;
+	const [prefix, suffix] = BUILD_END;
 
-	return await post<EndPageInfoResponse>({
+	return post<EndPageInfoResponse>({
 		endpoint: `${prefix}${id}${suffix}`,
 		body,
 		useApiCacheDir: false,
@@ -109,11 +118,11 @@ async function getReferenceFieldSiteData(
 	dataSiteId?: number,
 	dataLangID?: number,
 ) {
-	const [prefix, suffix] = endpoints.GET_REFERENCE_FIELD_DATA;
+	const [prefix, suffix] = GET_REFERENCE_FIELD_DATA;
 	const site = dataSiteId || page.site;
 	const lang = dataLangID || page.language;
 
-	return await post<ReferenceFieldResponse>({
+	return post<ReferenceFieldResponse>({
 		endpoint: `${prefix}${site}${suffix}`,
 		body,
 		headers: { lang },
@@ -121,18 +130,20 @@ async function getReferenceFieldSiteData(
 	});
 }
 
-async function getSitemap(id: number) {
-	const [prefix, suffix] = endpoints.GET_SITEMAP;
+async function getSitemap(options: { siteId: number; headers?: Record<string, string> }) {
+	const { siteId, headers } = options;
+	const [prefix, suffix] = GET_SITEMAP;
 
 	return get<SitemapAPIResponse>({
-		endpoint: `${prefix}${id}${suffix}`,
+		endpoint: `${prefix}${siteId}${suffix}`,
+		headers,
 	});
 }
 
 async function getSiteSocials(id: number, cacheKey = "") {
-	const [prefix, suffix] = endpoints.SOCIALS;
+	const [prefix, suffix] = SOCIALS;
 
-	return await get<SocialsResponse>({
+	return get<SocialsResponse>({
 		endpoint: `${prefix}${id}${suffix}`,
 		cacheKey,
 	});