@archznn/xavva 2.6.0 → 2.8.0

package/src/services/EmbeddedTomcatService.ts

@@ -1,4 +1,6 @@
 import { Logger } from "../utils/ui";
+import { ProgressBar, ThemedSpinner } from "../utils/ProgressBar";
+import { VERSIONS, getAvailableTomcatVersions, isSupportedTomcatVersion } from "../config/versions";
 import {
 	existsSync,
 	mkdirSync,
@@ -45,25 +47,10 @@ export class EmbeddedTomcatService {
 	private downloadUrl: string;
 	private isInstalled: boolean = false;
 
-	// Versões estáveis do Tomcat (atualizadas: 2026-03-04)
-	// URLs são construídas dinamicamente baseadas na plataforma
-	private static readonly VERSIONS: Record<
-		string,
-		{ sha512: string }
-	> = {
-			"10.1.52": {
-				sha512: "",
-			},
-			"9.0.115": {
-				sha512: "",
-			},
-			"11.0.18": {
-				sha512: "",
-			},
-		};
+	// Versões agora centralizadas em src/config/versions.ts
 
 	constructor(options: EmbeddedTomcatOptions) {
-		this.version = options.version || "10.1.52";
+		this.version = options.version || VERSIONS.TOMCAT.DEFAULT;
 		this.port = options.port || 8080;
 		this.webappPath = path.resolve(options.webappPath);
 		this.contextPath = options.contextPath || "/";
@@ -71,7 +58,7 @@ export class EmbeddedTomcatService {
 		this.tomcatHome = path.join(this.baseDir, this.version);
 
 		// Constrói URL de download baseada na plataforma
-		const versionInfo = EmbeddedTomcatService.VERSIONS[this.version];
+		const versionInfo = isSupportedTomcatVersion(this.version) ? { sha512: "" } : null;
 		if (versionInfo) {
 			// Usa URL primária (CDN Apache)
 			this.downloadUrl = getTomcatDownloadUrl(this.version);
@@ -354,34 +341,76 @@ export class EmbeddedTomcatService {
 	 * Lista versões disponíveis
 	 */
 	static getAvailableVersions(): string[] {
-		return Object.keys(EmbeddedTomcatService.VERSIONS);
+		return getAvailableTomcatVersions();
 	}
 
 	/**
 	 * Download com progresso
 	 */
 	private async downloadFile(url: string, destPath: string): Promise<void> {
-		const spinner = Logger.spinner(`Baixando Tomcat ${this.version}...`);
+		const response = await fetch(url);
 
-		try {
-			const response = await fetch(url);
+		if (!response.ok) {
+			throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+		}
 
-			if (!response.ok) {
-				throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+		const totalSize = parseInt(response.headers.get("content-length") || "0");
+		
+		// Se temos content-length, usar progress bar
+		if (totalSize > 0) {
+			const progress = new ProgressBar({
+				title: `Baixando Tomcat ${this.version}`,
+				total: totalSize,
+				width: 25
+			});
+
+			const reader = response.body?.getReader();
+			if (!reader) {
+				throw new Error("Response body não disponível");
 			}
 
-			const totalSize = parseInt(response.headers.get("content-length") || "0");
-			const buffer = await response.arrayBuffer();
+			const chunks: Uint8Array[] = [];
+			let received = 0;
+
+			while (true) {
+				const { done, value } = await reader.read();
+				if (done) break;
+				
+				chunks.push(value);
+				received += value.length;
+				progress.update(received);
+			}
 
-			writeFileSync(destPath, Buffer.from(buffer));
+			progress.complete();
 
-			spinner(true);
+			// Concatena chunks e salva
+			const allChunks = new Uint8Array(received);
+			let position = 0;
+			for (const chunk of chunks) {
+				allChunks.set(chunk, position);
+				position += chunk.length;
+			}
 
-			const sizeMB = (buffer.byteLength / 1024 / 1024).toFixed(1);
+			await fsPromises.writeFile(destPath, allChunks);
+			
+			const sizeMB = (received / 1024 / 1024).toFixed(1);
 			Logger.info("Download", `${sizeMB} MB baixados`);
-		} catch (error) {
-			spinner(false);
-			throw error;
+		} else {
+			// Sem content-length, usar spinner temático
+			const spinner = new ThemedSpinner();
+			const stop = spinner.start(`Baixando Tomcat ${this.version}`, "dots", "download");
+
+			try {
+				const buffer = await response.arrayBuffer();
+				await fsPromises.writeFile(destPath, Buffer.from(buffer));
+				stop(true);
+				
+				const sizeMB = (buffer.byteLength / 1024 / 1024).toFixed(1);
+				Logger.info("Download", `${sizeMB} MB baixados`);
+			} catch (error) {
+				stop(false);
+				throw error;
+			}
 		}
 	}
 
@@ -389,13 +418,14 @@ export class EmbeddedTomcatService {
 	 * Extrai arquivo de arquivos (ZIP ou tar.gz)
 	 */
 	private async extractZip(zipPath: string, destDir: string): Promise<void> {
-		const spinner = Logger.spinner("Extraindo arquivos...");
+		const spinner = new ThemedSpinner();
+		const stop = spinner.start("Extraindo arquivos", "pulse", "build");
 
 		return new Promise((resolve, reject) => {
 			const cmd = getExtractCommand(zipPath, destDir);
 			
 			if (!cmd) {
-				spinner(false);
+				stop(false);
 				reject(new Error(`Formato de arquivo não suportado: ${path.extname(zipPath)}`));
 				return;
 			}
@@ -404,16 +434,16 @@ export class EmbeddedTomcatService {
 
 			extractProcess.on("close", (code) => {
 				if (code === 0) {
-					spinner(true);
+					stop(true);
 					resolve();
 				} else {
-					spinner(false);
+					stop(false);
 					reject(new Error(`Falha ao extrair (código ${code})`));
 				}
 			});
 
 			extractProcess.on("error", (err) => {
-				spinner(false);
+				stop(false);
 				reject(err);
 			});
 		});