refactor(builds): refactored how the builds works to include the build number now

this will be for the new lst - ccc
This commit is contained in:
2026-06-17 10:34:53 -05:00
parent 4ff10dfcb2
commit 1b1918dcd0
8 changed files with 192 additions and 152 deletions

View File

@@ -9,6 +9,7 @@ import { routeHitMiddleware } from "./middleware/routeHit.middleware.js";
import { setupRoutes } from "./routeHandler.routes.js"; import { setupRoutes } from "./routeHandler.routes.js";
import { auth } from "./utils/auth.utils.js"; import { auth } from "./utils/auth.utils.js";
import { lstCors } from "./utils/cors.utils.js"; import { lstCors } from "./utils/cors.utils.js";
import { getAppVersion } from "./utils/version.utils.js";
const createApp = async () => { const createApp = async () => {
const log = createLogger({ module: "system", subModule: "main start" }); const log = createLogger({ module: "system", subModule: "main start" });
@@ -35,6 +36,7 @@ const createApp = async () => {
app.all(`${baseUrl}/api/auth/*splat`, toNodeHandler(auth)); app.all(`${baseUrl}/api/auth/*splat`, toNodeHandler(auth));
app.use(express.json()); app.use(express.json());
const version = await getAppVersion();
app.get(`${baseUrl}/api/lst-config.js`, (_, res) => { app.get(`${baseUrl}/api/lst-config.js`, (_, res) => {
res.type("application/javascript"); res.type("application/javascript");
res.setHeader("Cache-Control", "no-store"); res.setHeader("Cache-Control", "no-store");
@@ -47,7 +49,9 @@ const createApp = async () => {
appVersion: ${JSON.stringify(umamiConfig.appVersion ?? "dev")}, appVersion: ${JSON.stringify(umamiConfig.appVersion ?? "dev")},
umamiHost: ${JSON.stringify(umamiConfig.umamiHost ?? "")}, umamiHost: ${JSON.stringify(umamiConfig.umamiHost ?? "")},
umamiWebsiteId: ${JSON.stringify(umamiConfig.umamiWebsiteId ?? "")}, umamiWebsiteId: ${JSON.stringify(umamiConfig.umamiWebsiteId ?? "")},
timezone: ${JSON.stringify(process.env.TIMEZONE ?? "America/Chicago")} timezone: ${JSON.stringify(process.env.TIMEZONE ?? "America/Chicago")},
version: ${JSON.stringify(version.version)},
lastBuildTIme: ${JSON.stringify(version.lastBuildTime)}
}; };
`); `);
}); });

View File

@@ -17,12 +17,13 @@ import { prodStopSpec } from "../scaler/prodSqlStop.spec.js";
import { prodRegisterSpec } from "../scaler/register.spec.js"; import { prodRegisterSpec } from "../scaler/register.spec.js";
// all the specs // all the specs
import { statusSpec } from "../scaler/stats.spec.js"; import { statusSpec } from "../scaler/stats.spec.js";
import { getAppVersion } from "../utils/version.utils.js";
export const openApiBase: OpenAPIV3_1.Document = { export const openApiBase: OpenAPIV3_1.Document = {
openapi: "3.1.0", openapi: "3.1.0",
info: { info: {
title: "LST API", title: "LST API",
version: "3.0.0", version: (await getAppVersion()).version ?? "",
description: "Label System Tracking API", description: "Label System Tracking API",
}, },
servers: [ servers: [

View File

@@ -1,5 +1,6 @@
import { createServer } from "node:http"; import { createServer } from "node:http";
import os from "node:os"; import os from "node:os";
import createApp from "./app.js"; import createApp from "./app.js";
import { db } from "./db/db.controller.js"; import { db } from "./db/db.controller.js";
import { startDbNotificationListener } from "./db/db.listener.js"; import { startDbNotificationListener } from "./db/db.listener.js";
@@ -32,6 +33,7 @@ import { ppooMonitoring } from "./warehousing/warehousing.ppooMonitor.js";
const port = Number(process.env.PORT) || 3000; const port = Number(process.env.PORT) || 3000;
export let systemSettings: Setting[] = []; export let systemSettings: Setting[] = [];
const start = async () => { const start = async () => {
const { app, baseUrl } = await createApp(); const { app, baseUrl } = await createApp();

View File

@@ -6,12 +6,15 @@ import {
type SqlQuery, type SqlQuery,
sqlQuerySelector, sqlQuerySelector,
} from "../prodSql/prodSqlQuerySelector.utils.js"; } from "../prodSql/prodSqlQuerySelector.utils.js";
import { isServerRunning } from "../tcpServer/tcp.server.js"; import { isServerRunning } from "../tcpServer/tcp.server.js";
import { getAppVersion } from "../utils/version.utils.js";
const router = Router(); const router = Router();
router.get("/", async (_, res) => { router.get("/", async (_, res) => {
const used = process.memoryUsage(); const used = process.memoryUsage();
const version = await getAppVersion();
const query = sqlQuerySelector("prodSqlStats") as SqlQuery; const query = sqlQuerySelector("prodSqlStats") as SqlQuery;
@@ -20,6 +23,8 @@ router.get("/", async (_, res) => {
status: "ok", status: "ok",
uptime: process.uptime(), uptime: process.uptime(),
nodeVersion: process.version, nodeVersion: process.version,
appVersion: version.version ?? "",
lastBuildDate: version.lastBuildTime ?? "",
memoryUsage: `Heap: ${(used.heapUsed / 1024 / 1024).toFixed(2)} MB / RSS: ${( memoryUsage: `Heap: ${(used.heapUsed / 1024 / 1024).toFixed(2)} MB / RSS: ${(
used.rss / 1024 / 1024 used.rss / 1024 / 1024
).toFixed(2)} MB`, ).toFixed(2)} MB`,

View File

@@ -0,0 +1,16 @@
import fsp from "node:fs/promises";
import path from "node:path";
import { fileURLToPath } from "node:url";
export const getAppVersion = async () => {
const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
const version = path.join(__dirname, "../../package.json");
const raw = await fsp.readFile(`${version}`, "utf8");
const config = JSON.parse(raw);
return {
version: `${config.version}.${parseInt((config.build as string) ?? "1", 0) - 1}`,
lastBuildTime: config.lastBuildDate,
};
};

View File

@@ -2,6 +2,7 @@ import fs from "node:fs";
import fsp from "node:fs/promises"; import fsp from "node:fs/promises";
import path from "node:path"; import path from "node:path";
import archiver from "archiver"; import archiver from "archiver";
import { format } from "date-fns";
import { createLogger } from "../logger/logger.controller.js"; import { createLogger } from "../logger/logger.controller.js";
import { emitBuildLog } from "./build.utils.js"; import { emitBuildLog } from "./build.utils.js";
import { updateAppStats } from "./updateAppStats.utils.js"; import { updateAppStats } from "./updateAppStats.utils.js";
@@ -17,33 +18,31 @@ const exists = async (target: string) => {
} }
}; };
const getNextBuildNumber = async (buildNumberFile: string) => { const getNextBuildNumber = async (versionPath: string) => {
if (!(await exists(buildNumberFile))) { const raw = await fsp.readFile(versionPath, "utf8");
await fsp.writeFile(buildNumberFile, "1", "utf8"); const config = JSON.parse(raw);
return 1; const current = Number.parseInt(config.build.trim(), 10);
}
const raw = await fsp.readFile(buildNumberFile, "utf8");
const current = Number.parseInt(raw.trim(), 10);
let nextBuild: string;
if (Number.isNaN(current) || current < 1) { if (Number.isNaN(current) || current < 1) {
await fsp.writeFile(buildNumberFile, "1", "utf8"); nextBuild = "1";
return 1; } else {
nextBuild = String(current + 1); // Incrementing the build number
} }
const next = current + 1; const updatedConfig = {
...config,
build: nextBuild,
lastBuildDate: format(new Date(Date.now()), "M/d/yyyy HH:mm"),
};
await fsp.writeFile(buildNumberFile, String(next), "utf8"); await fsp.writeFile(
versionPath,
JSON.stringify(updatedConfig, null, 4) + "\n",
"utf8",
);
// update the server with the next build number return { version: config.version, build: config.build };
await updateAppStats({
currentBuild: next,
lastBuildAt: new Date(),
building: true,
});
return next;
}; };
const cleanupOldBuilds = async (buildFolder: string, maxBuilds: number) => { const cleanupOldBuilds = async (buildFolder: string, maxBuilds: number) => {
@@ -53,7 +52,8 @@ const cleanupOldBuilds = async (buildFolder: string, maxBuilds: number) => {
for (const entry of entries) { for (const entry of entries) {
if (!entry.isFile()) continue; if (!entry.isFile()) continue;
if (!/^LSTV3-\d+\.zip$/i.test(entry.name)) continue; //if (!/^LSTV3-\d+\.zip$/i.test(entry.name)) continue;
if (!entry.name.includes("LSTV3")) continue;
const fullPath = path.join(buildFolder, entry.name); const fullPath = path.join(buildFolder, entry.name);
const stat = await fsp.stat(fullPath); const stat = await fsp.stat(fullPath);
@@ -85,7 +85,7 @@ export const zipBuild = async () => {
} }
const includesFile = path.join(appDir, ".includes"); const includesFile = path.join(appDir, ".includes");
const buildNumberFile = path.join(appDir, ".buildNumber"); const version = path.join(appDir, "package.json");
const buildFolder = path.join(appDir, "builds"); const buildFolder = path.join(appDir, "builds");
const tempFolder = path.join(appDir, "temp", "zip-temp"); const tempFolder = path.join(appDir, "temp", "zip-temp");
if (!(await exists(includesFile))) { if (!(await exists(includesFile))) {
@@ -95,11 +95,13 @@ export const zipBuild = async () => {
await fsp.mkdir(buildFolder, { recursive: true }); await fsp.mkdir(buildFolder, { recursive: true });
const buildNumber = await getNextBuildNumber(buildNumberFile); const lstVersion = await getNextBuildNumber(version);
const zipFileName = `LSTV3-${buildNumber}.zip`; const zipFileName = `LSTV3-${lstVersion.version}.${lstVersion.build}.zip`;
const zipFile = path.join(buildFolder, zipFileName); const zipFile = path.join(buildFolder, zipFileName);
// make the folders in case they are not created already // make the folders in case they are not created already
emitBuildLog(`Using build number: ${buildNumber}`); emitBuildLog(
`Using version, build number: ${lstVersion.version}.${lstVersion.build}`,
);
if (await exists(tempFolder)) { if (await exists(tempFolder)) {
await fsp.rm(tempFolder, { recursive: true, force: true }); await fsp.rm(tempFolder, { recursive: true, force: true });
@@ -170,7 +172,7 @@ export const zipBuild = async () => {
return { return {
success: true, success: true,
buildNumber, build: lstVersion.build,
zipFile, zipFile,
zipFileName, zipFileName,
}; };

View File

@@ -1,6 +1,8 @@
{ {
"name": "lst_v3", "name": "lst_v3",
"version": "0.1.0-alpha.3", "version": "0.1.0-alpha.3",
"build": "175",
"lastBuildDate": "6/17/2026 10:26",
"description": "The tool that supports us in our everyday alplaprod", "description": "The tool that supports us in our everyday alplaprod",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {

View File

@@ -31,24 +31,32 @@ function Update-Server {
[string]$Server, [string]$Server,
[string]$Token [string]$Token
) )
$buildFile = Join-Path $AppDir ".buildNumber"
$buildFile = Join-Path $AppDir "package.json"
$BuildNumber = 1 $BuildNumber = 1
$BuildFolder = Join-Path $AppDir "builds" $BuildFolder = Join-Path $AppDir "builds"
if (Test-Path $BuildFile) { $packageJson = Get-Content $buildFile -Raw | ConvertFrom-Json
$content = Get-Content $BuildFile | Select-Object -First 1
$num = $content.Trim() -as [int] # safe cast
if ($num) { # Extract the .build property and cast it safely to an integer
$BuildNumber = $num + 1 $num = "$($packageJson.version).$(([int]$packageJson.build) -1)"
} # if (Test-Path $BuildFile) {
else { # # Parse the entire JSON file into a PowerShell object
$BuildNumber = 1 # $packageJson = Get-Content $buildFile -Raw | ConvertFrom-Json
}
} # # Extract the .build property and cast it safely to an integer
# $num = "($packageJson.version).($packageJson.build)"
# if ($null -ne $num) {
# $BuildNumber = $num + 1
# }
# else {
# $BuildNumber = 1
# }
# }
# Get The current Build we have zipped up # Get The current Build we have zipped up
$BuildNumber = ([int]$BuildNumber - 1).ToString() $BuildNumber = $num
# copy the latest build over # copy the latest build over