@griddo/cx 1.75.225 → 1.75.227

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@griddo/cx",
 	"description": "Griddo SSG based on Gatsby",
-	"version": "1.75.225",
+	"version": "1.75.227",
 	"authors": [
 		"Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
 		"Diego M. Béjar <diego.bejar@secuoyas.com>",
@@ -20,13 +20,17 @@
 		"griddo-cx": "./index.js"
 	},
 	"scripts": {
-		"build": "yarn run build:exporter && yarn run build:reset-render",
-		"build:reset-render": "esbuild ./scripts/reset-render.ts --bundle --platform=node --minify --outfile=./build/reset-render.js",
+		"build": "yarn run build:exporter && yarn run build:reset-render && yarn run build:build-complete",
 		"build:exporter": "esbuild ./scripts/griddo-exporter.ts --bundle --platform=node --minify --outfile=./build/index.js",
-		"export": "gatsby telemetry --disable && gatsby build --prefix-paths",
+		"build:build-complete": "esbuild ./scripts/build-complete.ts --bundle --platform=node --minify --outfile=./build/build-complete.js",
+		"build:reset-render": "esbuild ./scripts/reset-render.ts --bundle --platform=node --minify --outfile=./build/reset-render.js",
 		"clean": "gatsby clean; rm -rf .cache public assets dist build store",
+		"export": "gatsby telemetry --disable && gatsby build --prefix-paths",
+		"export:complete": "node ./build/build-complete.js",
+		"export:reset": "node ./build/reset-render.js",
 		"prepare": "yarn run build",
 		"watch:tscheck": "tsc --noEmit --watch",
+		"complete-render": "node ./build/build-complete.js",
 		"reset-render": "node ./build/reset-render.js"
 	},
 	"dependencies": {
@@ -64,7 +68,7 @@
 		"react-helmet": "^6.0.0"
 	},
 	"devDependencies": {
-		"@griddo/eslint-config-back": "^1.75.225",
+		"@griddo/eslint-config-back": "^1.75.227",
 		"@types/babel__core": "^7.20.0",
 		"@types/babel__preset-env": "^7.9.2",
 		"@types/csvtojson": "^2.0.0",
@@ -112,5 +116,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "a6b6a2ed7e0944aae31e4d35a07d74ad195a70c2"
+	"gitHead": "fd5fee42aaf938991fd8d51f24eecbe740c65cc4"
 }

package/scripts/build-complete.ts

@@ -0,0 +1,87 @@
+import fs from "fs";
+import path from "path";
+
+import pkgDir from "pkg-dir";
+
+import { AuthService } from "../src/services/auth";
+import { SitesService } from "../src/services/sites";
+import { logInfo } from "../src/utils/shared";
+
+// Where we are going to find export folders
+const execBasePath = pkgDir.sync()!;
+
+// Where we are going to find archived exports
+const exportArchiveBasePath = path.resolve(execBasePath, "exports/sites");
+
+type Report = {
+	authControl:
+		| {
+				Authorization: string;
+				"Cache-Control": string;
+				lang?: string | undefined;
+		  }
+		| undefined;
+	sites: {
+		siteId: number;
+		publishHashes: string[];
+		siteHash: string | null;
+		unpublishHashes: string[];
+	}[];
+};
+
+export async function buildComplete(report: Report) {
+	await AuthService.login();
+
+	const promises = report.sites.map((site) => {
+		const { siteId, ...body } = site;
+
+		logInfo(`Deploying ending call to site ${siteId}:`);
+
+		return SitesService.endSiteRender(siteId, body);
+	});
+
+	await Promise.all(promises);
+
+	logInfo(`Build end signal sent for ${report.sites.length} site(s)`);
+}
+
+function getExportedDomains() {
+	const domains = fs.readdirSync(exportArchiveBasePath);
+
+	return domains;
+}
+
+function getBuildReports(domains: string[]) {
+	const reports = [];
+
+	for (const domain of domains) {
+		const buildReportFile = path.resolve(
+			exportArchiveBasePath,
+			domain,
+			"dist",
+			"__build-report__.json"
+		);
+
+		if (!fs.existsSync(buildReportFile)) {
+			console.log(`Build report "${buildReportFile}" not found.`);
+			continue;
+		}
+
+		const buildReport = JSON.parse(fs.readFileSync(buildReportFile, "utf-8"));
+
+		reports.push(buildReport);
+	}
+
+	return reports;
+}
+
+async function main() {
+	const domains = getExportedDomains();
+	const reports = getBuildReports(domains);
+
+	for (const report of reports) {
+		await buildComplete(report);
+	}
+}
+
+main();

package/scripts/griddo-exporter.ts

@@ -21,6 +21,9 @@ dotenv.config();
 const artifactsArchivable = ["dist", "assets", "apiCache"];
 const artifactsDisposable = ["public", ".store"];
 
+// TODO: Remove GRIDDO_INFRA_BUILD_COMPLETES behaviour when all instances are over 1.75.227 and infra calls export:complete
+const INFRA_COMPLETES_BUILD = !!process.env.GRIDDO_INFRA_BUILD_COMPLETES;
+
 // TODO: Remove STRIP_DOMAIN_FROM_PATH behaviour when all instances are over 1.75.219
 const STRIP_DOMAIN_FROM_PATH =
 	!!process.env.GRIDDO_EXPORT_STRIP_DOMAIN_FROM_PATH;
@@ -107,6 +110,12 @@ const launchExports = async () => {
 		logInfo(`️🚢 Exporting domain ${chalk.underline(domain)}`);
 		await domainExport(domain);
 	}
+
+	// TODO: Remove when all instances are over 1.75.227 and infra calls export:complete
+	if (!INFRA_COMPLETES_BUILD) {
+		const runner = getEnvRunner({ cwd: __dirname });
+		runner("yarn export:complete");
+	}
 };
 
 const getDomainRunner = (domain: string) => {
@@ -203,7 +212,7 @@ const getDomainRunner = (domain: string) => {
 			} catch (error) {
 				logError(
 					`🚚 Error moving files to ${currentExportArchivePath}`,
-					error.message
+					(error as Error).message
 				);
 				restoreArtifactBackup(artifact);
 				continue;

package/src/utils/cache.ts

@@ -56,7 +56,12 @@ function createSha256(data: string) {
 function saveCache<T>(petition: Petition, content: T) {
 	const stringContent =
 		typeof content === "string" ? content : JSON.stringify(content);
-	fs.writeFileSync(generateFilenameWithHash(petition), stringContent, "utf8");
+	const filename = generateFilenameWithHash(petition);
+	const filepath = path.dirname(filename);
+	if (!fs.existsSync(filepath)) {
+		fs.mkdirSync(filepath, { recursive: true });
+	}
+	fs.writeFileSync(filename, stringContent, "utf8");
 }
 
 /**

package/src/utils/sites.ts

@@ -185,19 +185,6 @@ async function generateBuildReport(
 	fs.writeFileSync(filePathName, JSON.stringify(report));
 
 	logInfo(`Build report saved for ${buildSitesInfo.length} site(s)`);
-
-	// Tell API the build has finished
-	// TODO: Remove when the file version is implemented.
-	const promises = Object.keys(buildProcessData).map(async (siteID) => {
-		const body = buildProcessData[siteID];
-		logInfo(`Deploying ending call to site ${siteID}:`);
-
-		return SitesService.endSiteRender(parseInt(siteID), body);
-	});
-
-	await Promise.all(promises);
-
-	logInfo(`Build end signal sent for ${buildSitesInfo.length} site(s)`);
 }
 
 /**