@griddo/cx 10.6.3 → 10.6.5

package/exporter/services/settings.ts

@@ -1,51 +1,14 @@
 import type { Settings } from "../types/global";
 
+import { endpoints } from "../constants";
 import { get, post } from "../utils/api";
 
-/**
- * TODO: JSDoc
- */
-class SettingsService {
-	baseURL?: string;
-	settings: Settings;
-	ENDPOINTS: { settings: string; resetRender: string };
-
-	constructor() {
-		this.baseURL = process.env.API_URL;
-		this.settings = {
-			cloudinaryName: "",
-			useMetaTitle: false,
-			useMetaKeywords: false,
-			showBasicMetaRobots: false,
-			avoidHrefLangsOnCanonicals: false,
-			avoidSelfReferenceCanonicals: false,
-			avoidHrefLangXDefault: false,
-			avoidDebugMetas: false,
-		};
-		this.ENDPOINTS = {
-			settings: `${this.baseURL}/settings`,
-			resetRender: `${this.baseURL}/debug/reset-render`,
-		};
-	}
-
-	/**
-	 * Get settings for a full domain render.
-	 */
-	async getAll() {
-		const { settings } = this.ENDPOINTS;
-		const response = await get<Settings>({ endpoint: settings });
-		this.settings = response;
-	}
-
-	/**
-	 * TODO: JSDoc
-	 */
-	async resetRender() {
-		const { resetRender } = this.ENDPOINTS;
-		await post({ endpoint: resetRender });
-	}
+async function getAllSettings() {
+	return await get<Settings>({ endpoint: endpoints.SETTINGS });
 }
 
-const settingsService = new SettingsService();
+async function resetRender() {
+	await post({ endpoint: endpoints.RESET_RENDER });
+}
 
-export { settingsService as SettingsService };
+export { getAllSettings, resetRender };

package/exporter/services/sites.ts

@@ -13,170 +13,126 @@ import type {
 import type { Site } from "../types/sites";
 import type { Core } from "@griddo/core";
 
-import dotenv from "dotenv";
-
+import { endpoints } from "../constants";
 import { get, post } from "../utils/api";
 
-dotenv.config();
-
-// Envs
-const API_URL = process.env.API_URL;
-
-// Consts
-const WITH_URI = `${API_URL}/site/`;
-const ENDPOINTS = {
-	GET_ALL: `${API_URL}/sites/all`,
-	GET_PAGE: [`${API_URL}/page/`, ""],
-	INFO: [`${WITH_URI}`, "/all"],
-	LANGUAGES: [`${WITH_URI}`, "/languages"],
-	BUILD_START: [`${WITH_URI}`, "/build/start"],
-	BUILD_END: [`${WITH_URI}`, "/build/end"],
-	GET_DISTRIBUTOR_DATA: [`${WITH_URI}`, "/distributor"],
-	GET_SITEMAP: [`${WITH_URI}`, "/sitemap"],
-	SOCIALS: [`${WITH_URI}`, "/socials"],
-	GET_PAGES: [`${WITH_URI}`, "/pages?pagination=false"],
-};
+/**
+ * Get a list of site objects.
+ */
+async function getAllSites() {
+	return await get<AllSitesReponse>({ endpoint: endpoints.GET_ALL });
+}
+
+/**
+ * Fetch a page object from API.
+ */
+async function getPage(id: number, cacheKey: string) {
+	return await get<PageResponse>({
+		endpoint: `${endpoints.GET_PAGE}/${id}`,
+		cacheKey,
+	});
+}
+
+/**
+ * Get site info
+ */
+async function getSiteInfo(id: number, cacheKey = "") {
+	const [prefix, suffix] = endpoints.INFO;
+
+	return await get<Site>({
+		endpoint: `${prefix}${id}${suffix}`,
+		cacheKey,
+	});
+}
+
+/**
+ * TODO: JSDoc
+ */
+async function getSiteLanguages(id: number, cacheKey = "") {
+	const [prefix, suffix] = endpoints.LANGUAGES;
+
+	return await get<LanguagesResponse>({
+		endpoint: `${prefix}${id}${suffix}`,
+		cacheKey,
+	});
+}
+
+/**
+ * TODO: JSDoc
+ */
+async function startSiteRender(id: number) {
+	const [prefix, suffix] = endpoints.BUILD_START;
+
+	return await get<StartPageRenderResponse>({
+		endpoint: `${prefix}${id}${suffix}`,
+	});
+}
+
+/**
+ * Send the end signal to API for a render site.
+ */
+async function endSiteRender(id: number, body: EndSiteRenderBody) {
+	const [prefix, suffix] = endpoints.BUILD_END;
+
+	return await post<EndPageInfoResponse>({
+		endpoint: `${prefix}${id}${suffix}`,
+		body,
+	});
+}
+
+/**
+ * TODO: JSDoc
+ */
+async function getDistributorData(
+	page: Core.Page,
+	body: DistributorBody,
+	cacheKey: string,
+	dataSiteId?: number,
+	dataLangID?: number
+) {
+	const [prefix, suffix] = endpoints.GET_REFERENCE_FIELD_DATA;
+	const site = dataSiteId || page.site;
+	const lang = dataLangID || page.language;
+
+	return await post<DistributorResponse>({
+		endpoint: `${prefix}${site}${suffix}`,
+		body,
+		headers: { lang },
+		cacheKey,
+	});
+}
 
 /**
  * TODO: JSDoc
  */
-class SitesService {
-	static async getAll() {
-		const { GET_ALL } = ENDPOINTS;
-		const response = await get<AllSitesReponse>({ endpoint: GET_ALL });
-
-		return response;
-	}
-
-	/**
-	 * Fetch a page object from API.
-	 */
-	static async getPage(id: number, cacheKey: string) {
-		const {
-			GET_PAGE: [prefix, suffix],
-		} = ENDPOINTS;
-		const response = await get<PageResponse>({
-			endpoint: `${prefix}${id}${suffix}`,
-			cacheKey,
-		});
-
-		return response;
-	}
-
-	/**
-	 * Get site info
-	 */
-	static async getInfo(id: number, cacheKey = "") {
-		const {
-			INFO: [prefix, suffix],
-		} = ENDPOINTS;
-		const response = await get<Site>({
-			endpoint: `${prefix}${id}${suffix}`,
-			cacheKey,
-		});
-
-		return response;
-	}
-
-	/**
-	 * TODO: JSDoc
-	 */
-	static async getLanguages(id: number, cacheKey = "") {
-		const {
-			LANGUAGES: [prefix, suffix],
-		} = ENDPOINTS;
-		const response = await get<LanguagesResponse>({
-			endpoint: `${prefix}${id}${suffix}`,
-			cacheKey,
-		});
-
-		return response;
-	}
-
-	/**
-	 * TODO: JSDoc
-	 */
-	static async startSiteRender(id: number) {
-		const {
-			BUILD_START: [prefix, suffix],
-		} = ENDPOINTS;
-		const response = await get<StartPageRenderResponse>({
-			endpoint: `${prefix}${id}${suffix}`,
-		});
-
-		return response;
-	}
-
-	/**
-	 * Send the end signal to API for a render site.
-	 */
-	static async endSiteRender(id: number, body: EndSiteRenderBody) {
-		const {
-			BUILD_END: [prefix, suffix],
-		} = ENDPOINTS;
-		const response = await post<EndPageInfoResponse>({
-			endpoint: `${prefix}${id}${suffix}`,
-			body,
-		});
-
-		return response;
-	}
-
-	/**
-	 * TODO: JSDoc
-	 */
-	static async getDistributorData(
-		page: Core.Page,
-		body: DistributorBody,
-		cacheKey: string,
-		dataSiteId?: number,
-		dataLangID?: number
-	) {
-		const {
-			GET_DISTRIBUTOR_DATA: [prefix, suffix],
-		} = ENDPOINTS;
-
-		const site = dataSiteId || page.site;
-		const lang = dataLangID || page.language;
-
-		const response = await post<DistributorResponse>({
-			endpoint: `${prefix}${site}${suffix}`,
-			body,
-			headers: { lang },
-			cacheKey,
-		});
-
-		return response;
-	}
-
-	/**
-	 * TODO: JSDoc
-	 */
-	static async getSitemap(id: number) {
-		const {
-			GET_SITEMAP: [prefix, suffix],
-		} = ENDPOINTS;
-		const response = await get<SitemapAPIResponse>({
-			endpoint: `${prefix}${id}${suffix}`,
-		});
-
-		return response;
-	}
-
-	/**
-	 * TODO: JSDoc
-	 */
-	static async getSocials(id: number, cacheKey = "") {
-		const {
-			SOCIALS: [prefix, suffix],
-		} = ENDPOINTS;
-		const response = await get<SocialsResponse>({
-			endpoint: `${prefix}${id}${suffix}`,
-			cacheKey,
-		});
-
-		return response;
-	}
+async function getSitemap(id: number) {
+	const [prefix, suffix] = endpoints.GET_SITEMAP;
+
+	return await get<SitemapAPIResponse>({
+		endpoint: `${prefix}${id}${suffix}`,
+	});
 }
 
-export { SitesService };
+/**
+ * TODO: JSDoc
+ */
+async function getSiteSocials(id: number, cacheKey = "") {
+	const [prefix, suffix] = endpoints.SOCIALS;
+
+	return await get<SocialsResponse>({
+		endpoint: `${prefix}${id}${suffix}`,
+		cacheKey,
+	});
+}
+
+export {
+	endSiteRender,
+	getAllSites,
+	getSiteLanguages,
+	getPage,
+	getDistributorData,
+	getSiteInfo,
+	getSitemap,
+	getSiteSocials,
+	startSiteRender,
+};

package/exporter/services/store.ts

@@ -14,10 +14,12 @@ import pLimit from "p-limit";
 
 import { DistributorService } from "./distributors";
 import { NavigationService } from "./navigation";
-import { SettingsService } from "./settings";
-import { SitesService } from "./sites";
+import { getAllSettings } from "./settings";
+import { getPage } from "./sites";
+import { envs } from "../constants";
 import { updatedSiteHash } from "../utils/cache";
-import { getConfig, logInfo, siteList, verbose } from "../utils/core-utils";
+import { getConfig, siteList } from "../utils/core-utils";
+import { infoLog, verboseLog } from "../utils/loggin";
 import {
 	createGriddoListPages,
 	createGriddoMultiPages,
@@ -38,12 +40,7 @@ const config = getConfig();
 
 dotenv.config();
 
-// Envs
-/* prettier-ignore */ const API_URL = process.env.API_URL as string;
-/* prettier-ignore */ const REACT_APP_INSTANCE = process.env.GRIDDO_REACT_APP_INSTANCE || process.env.REACT_APP_INSTANCE;
-/* prettier-ignore */ const API_CONCURRENCY_COUNT = parseInt(process.env.GRIDDO_API_CONCURRENCY_COUNT || "10");
-/* prettier-ignore */ const PUBLIC_API_URL = process.env.PUBLIC_API_URL as string;
-/* prettier-ignore */ const RENDER_ID = new Date().valueOf().toString();
+const RENDER_ID = new Date().valueOf().toString();
 
 /**
  * Fetch, process and save object pages and sites data into the file system to
@@ -52,7 +49,7 @@ dotenv.config();
 async function createStore(domain: string) {
 	createStoreDir();
 
-	console.info(`API calls with ${API_CONCURRENCY_COUNT} threads`);
+	console.info(`API calls with ${envs.GRIDDO_API_CONCURRENCY_COUNT} threads`);
 
 	const { __cx } = config.paths();
 	const { griddoVersion } = config;
@@ -66,8 +63,6 @@ async function createStore(domain: string) {
 		// Get sites objects to publish and unpublish.
 		const { sitesToPublish, sitesToUnpublish } = await checkSites(domain);
 
-		await SettingsService.getAll();
-
 		// If no activity in sites, exit
 		if (!(sitesToPublish.length || sitesToUnpublish.length)) {
 			console.warn("There are no sites to update");
@@ -112,7 +107,7 @@ async function createStore(domain: string) {
 				avoidSelfReferenceCanonicals,
 				avoidHrefLangXDefault,
 				avoidDebugMetas,
-			} = SettingsService.settings;
+			} = await getAllSettings();
 
 			buildProcessData[siteId] = {
 				siteHash,
@@ -136,9 +131,9 @@ async function createStore(domain: string) {
 			};
 
 			const additionalInfo = {
-				baseUrl: API_URL,
-				publicBaseUrl: PUBLIC_API_URL,
-				instance: REACT_APP_INSTANCE,
+				baseUrl: envs.GRIDDO_API_URL,
+				publicBaseUrl: envs.GRIDDO_PUBLIC_API_URL,
+				instance: envs.GRIDDO_REACT_APP_INSTANCE,
 				siteSlug,
 				theme,
 				siteMetadata,
@@ -158,7 +153,7 @@ async function createStore(domain: string) {
 				siteScript,
 			};
 
-			logInfo(`${site.name} site`);
+			infoLog(`${site.name} site`);
 
 			// -------------------------------------------------------------------------
 			// Pages loop promise creation
@@ -170,7 +165,7 @@ async function createStore(domain: string) {
 				let griddoPageObjects: Array<GriddoPageObject> = [];
 
 				// Get page data
-				const page = await SitesService.getPage(pageId, shouldUpdateSite);
+				const page = await getPage(pageId, shouldUpdateSite);
 
 				// Probably a 404
 				if (!page) return;
@@ -183,7 +178,7 @@ async function createStore(domain: string) {
 				// additionalInfo referenced from outside this function and
 				// its used by other pages.
 				const pageAdditionalInfo = JSON.parse(
-					JSON.stringify(additionalInfo)
+					JSON.stringify(additionalInfo),
 				) as PageAdditionalInfo;
 
 				// Updated with navigations (header & footer)
@@ -231,7 +226,7 @@ async function createStore(domain: string) {
 					// pageObjects = await createGriddoListPages({ adapter: "Gatsby" })
 					griddoPageObjects = await createGriddoListPages(
 						griddoListPage,
-						pageAdditionalInfo
+						pageAdditionalInfo,
 					);
 				}
 
@@ -246,7 +241,7 @@ async function createStore(domain: string) {
 
 					griddoPageObjects = await createGriddoMultiPages(
 						griddoMultipage,
-						pageAdditionalInfo
+						pageAdditionalInfo,
 					);
 				}
 
@@ -289,17 +284,17 @@ async function createStore(domain: string) {
 
 			// Debug time
 
-			verbose(`Store site: ${site.name}`);
-			verbose(`${validPagesIds.length} valid pages from API`);
-			verbose(`changed ${changedPages.length} pages from API`);
-			verbose(`deleted ${pagesToDeleteFromStore.length} pages from store`);
-			verbose(`missing ${pagesMissingInStore.length} pages in store`);
-			verbose(`write ${pagesToWriteToStore.length} pages to store`);
+			verboseLog(`Store site: ${site.name}`);
+			verboseLog(`${validPagesIds.length} valid pages from API`);
+			verboseLog(`changed ${changedPages.length} pages from API`);
+			verboseLog(`deleted ${pagesToDeleteFromStore.length} pages from store`);
+			verboseLog(`missing ${pagesMissingInStore.length} pages in store`);
+			verboseLog(`write ${pagesToWriteToStore.length} pages to store`);
 
 			// Create (async)
-			const limit = pLimit(API_CONCURRENCY_COUNT);
+			const limit = pLimit(envs.GRIDDO_API_CONCURRENCY_COUNT);
 			const pagesToStore = pagesToWriteToStore.map((id: number) =>
-				limit(() => fetchPageAndSaveInStore(id))
+				limit(() => fetchPageAndSaveInStore(id)),
 			);
 
 			await Promise.all(pagesToStore);

package/exporter/types/api.ts

@@ -149,7 +149,7 @@ export interface EndPageInfoResponse {
 	message: string;
 }
 /** Response type for the embedding answer in the ai search feature  */
-export type PostEmbeddingsResponse = string
+export type PostEmbeddingsResponse = string;
 
 /** Describes a response type for GET all sites */
 export type AllSitesReponse = Array<Site>;

package/exporter/types/global.ts

@@ -86,6 +86,7 @@ type LifeCyclesNames =
 	| "Archive"
 	| "Clean"
 	| "HealthCheck"
+	| "Close"
 	| "__DEBUG__";
 
 type CXDir =

package/exporter/utils/api.ts

@@ -13,7 +13,8 @@ import chalk from "chalk";
 import dotenv from "dotenv";
 
 import { saveCache, searchCacheData } from "./cache";
-import { delay, getSafeSiteId, logInfo, msToSec } from "./core-utils";
+import { delay, getSafeSiteId, msToSec } from "./core-utils";
+import { infoLog } from "./loggin";
 import { AuthService } from "../services/auth";
 
 dotenv.config();
@@ -39,7 +40,7 @@ const {
 async function requestAPI<T extends APIResponses>(
 	props: APIRequest,
 	method: Method,
-	appendToLog = ""
+	appendToLog = "",
 ): Promise<T> {
 	const { endpoint, body, cacheKey = "", attempt = 1, headers } = props;
 	const cacheOptions = { endpoint, body, headers, cacheKey };
@@ -53,8 +54,8 @@ async function requestAPI<T extends APIResponses>(
 			const siteId = getSafeSiteId(cacheData);
 			const siteIdMsg = siteId ? `site: ${siteId}` : "";
 			const duration = msToSec(new Date().getTime() - start.getTime());
-			logInfo(
-				`${method} (cache) ${siteIdMsg} ${endpoint} - ${duration}s ${appendToLog}`
+			infoLog(
+				`${method} (cache) ${siteIdMsg} ${endpoint} - ${duration}s ${appendToLog}`,
 			);
 			return cacheData;
 		}
@@ -73,8 +74,8 @@ async function requestAPI<T extends APIResponses>(
 		const siteId = getSafeSiteId(data);
 		const siteIdMsg = siteId ? `site: ${siteId}` : "";
 		const duration = msToSec(new Date().getTime() - start.getTime());
-		logInfo(
-			`${method} (fetch) ${siteIdMsg} ${endpoint} - ${duration}s ${appendToLog}`
+		infoLog(
+			`${method} (fetch) ${siteIdMsg} ${endpoint} - ${duration}s ${appendToLog}`,
 		);
 
 		saveCache(cacheOptions, data);
@@ -123,7 +124,7 @@ Max attempts ${RETRY_ATTEMPTS} reached
 				attempt: attempt + 1,
 			},
 			method,
-			appendToLog
+			appendToLog,
 		);
 	}
 }
@@ -159,7 +160,7 @@ async function postApi<T extends APIResponses>(props: PostAPI) {
 	const distributorBodyParams =
 		endpoint.endsWith("/distributor") &&
 		`# Distributor body: ${JSON.stringify(body)} lang: ${JSON.stringify(
-			headers?.lang
+			headers?.lang,
 		)}`;
 
 	return await requestAPI<T>(props, "post", distributorBodyParams || "");
@@ -180,7 +181,7 @@ function showApiError(error: AxiosError, options: ShowApiErrorOptions) {
 				typeof callInfo[item] === "object"
 					? JSON.stringify(callInfo[item])
 					: callInfo[item]
-			}`
+			}`,
 		);
 	}
 
@@ -206,7 +207,7 @@ ${apiResponseStr}
 ${errorDetailsStr}
 
 =============
-`)
+`),
 	);
 }