buildnator-personal 0.0.6 → 0.1.0

package/buildnator.client.ts

@@ -3,6 +3,7 @@ import * as https from "https";
 import type { BuildnatorConfig, JobsConfig, QueryValue } from "./types";
 
 const DEFAULT_BUILD_DELAY_MS = 15000;
+const DEFAULT_FILA_DELAY_MS = 15000;
 
 const DEFAULT_JOBS: JobsConfig = {
     agmCompila: "/job/GCS-AGM-Compila%C3%A7%C3%A3o-Automatizada",
@@ -17,6 +18,7 @@ const DEFAULT_JOBS: JobsConfig = {
     unificarCommits: "/job/GCS-Unificar-commits",
     criarbackup: "job/GCS-CriarBackup",
     recriarBranch: "view/Ger%C3%AAncia%20de%20Configura%C3%A7%C3%A3o/job/GCS-RecriarBranch/"
+    
 };
 
 function normalizeBaseUrl(url: string): string {
@@ -28,6 +30,7 @@ export class BuildnatorClient {
     private readonly auth: { username: string; password: string };
     private readonly jobs: JobsConfig;
     private readonly buildDelayMs: number;
+    private readonly filaDelayMs: number;
 
     constructor(private readonly config: BuildnatorConfig) {
         if (!config?.jenkins?.baseUrl || !config.jenkins.user || !config.jenkins.token) {
@@ -46,25 +49,9 @@ export class BuildnatorClient {
             httpsAgent,
         });
 
-        /*if (config.gateway?.baseUrl) {
-            this.gateway = axios.create({
-                baseURL: normalizeBaseUrl(config.gateway.baseUrl),
-                httpsAgent,
-            });
-
-            this.gateway.interceptors.request.use((req) => {
-                const token = config.gateway?.restrictToken;
-                if (token) {
-                    const url = new URL(req.url ?? "", req.baseURL);
-                    url.searchParams.append("token", token);
-                    req.url = url.toString();
-                }
-                return req;
-            });
-        }*/
-
         this.jobs = { ...DEFAULT_JOBS, ...(config.jobs ?? {}) };
         this.buildDelayMs = config.delays?.buildTriggerMs ?? DEFAULT_BUILD_DELAY_MS;
+        this.filaDelayMs = config.delays?.filaMs ?? DEFAULT_FILA_DELAY_MS
     }
 
     private sleep(ms: number): Promise<void> {
@@ -76,6 +63,11 @@ export class BuildnatorClient {
         return res.data;
     }
 
+    private async jenkinsPostNoData(path: string, params?: Record<string, QueryValue>) {
+        const res = await this.jenkins.post(path, null, { auth: this.auth, params });
+        return res;
+    }
+
     private async jenkinsGet(path: string, params?: Record<string, QueryValue>) {
         const res = await this.jenkins.get(path, { auth: this.auth, params });
         return res.data;
@@ -91,15 +83,22 @@ export class BuildnatorClient {
     }
 
     async compilaAGM(branch: string, dirPrefix: string, diretivas: string, version: string): Promise<any> {
-        await this.jenkinsPost(`${this.jobs.agmCompila}/buildWithParameters`, {
+        const retorno = await this.jenkinsPostNoData(`${this.jobs.agmCompila}/buildWithParameters`, {
             branch,
             dirPrefix,
             diretivas,
             version,
         });
-        await this.sleep(this.buildDelayMs);
+        /*await this.sleep(this.buildDelayMs);
         const numbuild = await this.jenkinsPost(`${this.jobs.agmCompila}/api/json`);
-        return numbuild.builds[0].number;
+        return numbuild.builds[0].number;*/
+
+        const location = retorno.headers['location'];
+        const queueId = location.match(/item\/(\d+)/)[1];
+
+        await this.sleep(this.filaDelayMs);
+        const id = await this.consultarFila(queueId)
+        return id
     }
 
     async consultaJenkinsAGM(id: number): Promise<any> {
@@ -125,7 +124,7 @@ export class BuildnatorClient {
         modulos: string,
         gerarVersao: boolean,
     ): Promise<any> {
-        await this.jenkinsPost(`${this.jobs.agbCompila}/buildWithParameters`, {
+        const retorno = await this.jenkinsPostNoData(`${this.jobs.agbCompila}/buildWithParameters`, {
             branch,
             dirPrefix,
             diretivas,
@@ -133,9 +132,16 @@ export class BuildnatorClient {
             modulosOpcionais: modulos,
             gerarVersao,
         });
-        await this.sleep(this.buildDelayMs);
+        /*await this.sleep(this.buildDelayMs);
         const numbuild = await this.jenkinsPost(`${this.jobs.agbCompila}/api/json`);
-        return numbuild.builds[0].number;
+        return numbuild.builds[0].number;*/
+
+        const location = retorno.headers['location'];
+        const queueId = location.match(/item\/(\d+)/)[1];
+
+        await this.sleep(this.filaDelayMs);
+        const id = await this.consultarFila(queueId)
+        return id
     }
 
     async consultaJenkinsAGB(id: number): Promise<any> {
@@ -164,6 +170,7 @@ export class BuildnatorClient {
         versionOld?: string | null,
         datahora?: any
     ): Promise<any> {
+        let retorno
         if (alterarDTHR) {
             if (!versionOld) {
                 throw new Error("versionOld eh obrigatorio quando alterarDTHR=true");
@@ -221,7 +228,7 @@ export class BuildnatorClient {
                 String(somasegundos).padStart(2, "0"),
             ].join(":");
 
-            await this.jenkinsPost(`${this.jobs.agbCompilaVersao}/buildWithParameters`, {
+           retorno =  await this.jenkinsPostNoData(`${this.jobs.agbCompilaVersao}/buildWithParameters`, {
                 branch,
                 dirPrefix,
                 diretivas,
@@ -232,7 +239,7 @@ export class BuildnatorClient {
                 data,
             });
         } else {
-            await this.jenkinsPost(`${this.jobs.agbCompilaVersao}/buildWithParameters`, {
+            retorno = await this.jenkinsPostNoData(`${this.jobs.agbCompilaVersao}/buildWithParameters`, {
                 branch,
                 dirPrefix,
                 diretivas,
@@ -242,9 +249,16 @@ export class BuildnatorClient {
             });
         }
 
-        await this.sleep(this.buildDelayMs);
+        /*await this.sleep(this.buildDelayMs);
         const numbuild = await this.jenkinsPost(`${this.jobs.agbCompilaVersao}/api/json`);
-        return numbuild.builds[0].number;
+        return numbuild.builds[0].number;*/
+
+        const location = retorno.headers['location'];
+        const queueId = location.match(/item\/(\d+)/)[1];
+
+        await this.sleep(this.filaDelayMs);
+        const id = await this.consultarFila(queueId)
+        return id
     }
 
     async consultaVesaoJenkinsAGB(id: number): Promise<any> {
@@ -283,43 +297,71 @@ export class BuildnatorClient {
     }
 
     async liberaAGM(diretorio: string, baseline: string): Promise<any> {
-        await this.jenkinsPost(`${this.jobs.qaAgmLibera}/buildWithParameters`, {
+        const retorno = await this.jenkinsPostNoData(`${this.jobs.qaAgmLibera}/buildWithParameters`, {
             diretorioExecutaveis: diretorio,
             baselineExecutaveis: baseline,
         });
-        await this.sleep(this.buildDelayMs);
+        /*await this.sleep(this.buildDelayMs);
         const numbuild = await this.jenkinsPost(`${this.jobs.qaAgmLibera}/api/json`);
-        return numbuild.builds[0].number;
+        return numbuild.builds[0].number;*/
+
+        const location = retorno.headers['location'];
+        const queueId = location.match(/item\/(\d+)/)[1];
+
+        await this.sleep(this.filaDelayMs);
+        const id = await this.consultarFila(queueId)
+        return id
     }
 
     async liberaAGB(diretorio: string, baseline: string): Promise<any> {
-        await this.jenkinsPost(`${this.jobs.qaTaAgbLibera}/buildWithParameters`, {
+        const retorno = await this.jenkinsPostNoData(`${this.jobs.qaTaAgbLibera}/buildWithParameters`, {
             diretorioExecutaveis: diretorio,
             baselineExecutaveis: baseline,
         });
-        await this.sleep(this.buildDelayMs);
+        /*await this.sleep(this.buildDelayMs);
         const numbuild = await this.jenkinsPost(`${this.jobs.qaTaAgbLibera}/api/json`);
-        return numbuild.builds[0].number;
+        return numbuild.builds[0].number;*/
+
+        const location = retorno.headers['location'];
+        const queueId = location.match(/item\/(\d+)/)[1];
+
+        await this.sleep(this.filaDelayMs);
+        const id = await this.consultarFila(queueId)
+        return id
     }
 
     async liberaAGMEspecifica(diretorio: string, baseline: string): Promise<any> {
-        await this.jenkinsPost(`${this.jobs.qaAgmLiberaEspecifica}/buildWithParameters`, {
+        const retorno = await this.jenkinsPostNoData(`${this.jobs.qaAgmLiberaEspecifica}/buildWithParameters`, {
             diretorioExecutaveis: diretorio,
             baselineExecutaveis: baseline,
         });
-        await this.sleep(this.buildDelayMs);
+        /*await this.sleep(this.buildDelayMs);
         const numbuild = await this.jenkinsPost(`${this.jobs.qaAgmLiberaEspecifica}/api/json`);
-        return numbuild.builds[0].number;
+        return numbuild.builds[0].number;*/
+
+        const location = retorno.headers['location'];
+        const queueId = location.match(/item\/(\d+)/)[1];
+
+        await this.sleep(this.filaDelayMs);
+        const id = await this.consultarFila(queueId)
+        return id
     }
 
     async liberaAGBEspecifica(diretorio: string, baseline: string): Promise<any> {
-        await this.jenkinsPost(`${this.jobs.qaTaAgbLiberaEspecifica}/buildWithParameters`, {
+        const retorno = await this.jenkinsPostNoData(`${this.jobs.qaTaAgbLiberaEspecifica}/buildWithParameters`, {
             diretorioExecutaveis: diretorio,
             baselineExecutaveis: baseline,
         });
-        await this.sleep(this.buildDelayMs);
+        /*await this.sleep(this.buildDelayMs);
         const numbuild = await this.jenkinsPost(`${this.jobs.qaTaAgbLiberaEspecifica}/api/json`);
-        return numbuild.builds[0].number;
+        return numbuild.builds[0].number;*/
+
+        const location = retorno.headers['location'];
+        const queueId = location.match(/item\/(\d+)/)[1];
+
+        await this.sleep(this.filaDelayMs);
+        const id = await this.consultarFila(queueId)
+        return id
     }
 
     async consultaLiberaEspecifica(id: number, projeto: string): Promise<any> {
@@ -367,13 +409,20 @@ export class BuildnatorClient {
     }
 
     async PublicarDllsNuGet(versao: string, dirPrefix: string): Promise<any> {
-        await this.jenkinsPost(`${this.jobs.publicarDllsNuget}/buildWithParameters`, {
+        const retorno = await this.jenkinsPostNoData(`${this.jobs.publicarDllsNuget}/buildWithParameters`, {
             version: versao,
             diretoriobaseversao: dirPrefix,
         });
-        await this.sleep(this.buildDelayMs);
+        /*await this.sleep(this.buildDelayMs);
         const numbuild = await this.jenkinsPost(`${this.jobs.publicarDllsNuget}/api/json`);
-        return numbuild.builds[0].number;
+        return numbuild.builds[0].number;*/
+
+        const location = retorno.headers['location'];
+        const queueId = location.match(/item\/(\d+)/)[1];
+
+        await this.sleep(this.filaDelayMs);
+        const id = await this.consultarFila(queueId)
+        return id
     }
 
     async consultaPublicarDllsNuGet(id: number): Promise<any> {
@@ -392,12 +441,19 @@ export class BuildnatorClient {
     }
 
     async testeTaVersaoEvolutiva(diretorioExecutaveis: string): Promise<any> {
-        await this.jenkinsPost(`${this.jobs.testeTaVersaoEvolutiva}/buildWithParameters`, {
+        const retorno = await this.jenkinsPostNoData(`${this.jobs.testeTaVersaoEvolutiva}/buildWithParameters`, {
             diretorioExecutaveis,
         });
-        await this.sleep(this.buildDelayMs);
+        /*await this.sleep(this.buildDelayMs);
         const numbuild = await this.jenkinsPost(`${this.jobs.testeTaVersaoEvolutiva}/api/json`);
-        return numbuild.builds[0].number;
+        return numbuild.builds[0].number;*/
+
+        const location = retorno.headers['location'];
+        const queueId = location.match(/item\/(\d+)/)[1];
+
+        await this.sleep(this.filaDelayMs);
+        const id = await this.consultarFila(queueId)
+        return id
     }
 
     async consultatesteTaVersaoEvolutiva(id: any): Promise<any> {
@@ -416,13 +472,20 @@ export class BuildnatorClient {
     }
 
     async unificarCommits(branch: string, sistema: string): Promise<any> {
-        await this.jenkinsPost(`${this.jobs.unificarCommits}/buildWithParameters`, {
+        const retorno = await this.jenkinsPostNoData(`${this.jobs.unificarCommits}/buildWithParameters`, {
             Branch: branch,
             repositorio: sistema,
         });
-        await this.sleep(this.buildDelayMs);
+        /*await this.sleep(this.buildDelayMs);
         const numbuild = await this.jenkinsPost(`${this.jobs.unificarCommits}/api/json`);
-        return numbuild.builds[0].number;
+        return numbuild.builds[0].number;*/
+
+        const location = retorno.headers['location'];
+        const queueId = location.match(/item\/(\d+)/)[1];
+
+        await this.sleep(this.filaDelayMs);
+        const id = await this.consultarFila(queueId)
+        return id
     }
 
     async consultarUnificarCommits(id: any): Promise<any> {
@@ -474,13 +537,17 @@ export class BuildnatorClient {
     }
 
     async criarBCK(branch: string, sistema: string): Promise<any> {
-        await this.jenkinsPost(`${this.jobs.criarbackup}/buildWithParameters`, {
+        const retorno = await this.jenkinsPostNoData(`${this.jobs.criarbackup}/buildWithParameters`, {
             branch: branch,
             repositorio: sistema,
         });
-        await this.sleep(this.buildDelayMs);
-        const numbuild = await this.jenkinsPost(`${this.jobs.criarbackup}/api/json`);
-        return numbuild.builds[0].number;
+
+        const location = retorno.headers['location'];
+        const queueId = location.match(/item\/(\d+)/)[1];
+
+        await this.sleep(this.filaDelayMs);
+        const id = await this.consultarFila(queueId)
+        return id
     }
 
     async consultarCriarBCK(id: any): Promise<any> {
@@ -503,15 +570,22 @@ export class BuildnatorClient {
     }
 
     async RecriarBranch(branch: string, sistema: string, branchBackup: string): Promise<any> {
-        await this.jenkinsPost(`${this.jobs.recriarBranch}/buildWithParameters`, {
+        const retorno = await this.jenkinsPostNoData(`${this.jobs.recriarBranch}/buildWithParameters`, {
             branch: branch,
             repositorio: sistema,
             branchBackup: branchBackup
 
         });
-        await this.sleep(this.buildDelayMs);
+        /*await this.sleep(this.buildDelayMs);
         const numbuild = await this.jenkinsPost(`${this.jobs.recriarBranch}/api/json`);
-        return numbuild.builds[0].number;
+        return numbuild.builds[0].number;*/
+
+        const location = retorno.headers['location'];
+        const queueId = location.match(/item\/(\d+)/)[1];
+
+        await this.sleep(this.filaDelayMs);
+        const id = await this.consultarFila(queueId)
+        return id
     }
 
     async consultarRecriarBranch(id: any): Promise<any> {
@@ -519,13 +593,25 @@ export class BuildnatorClient {
             const numbuild = await this.jenkinsPost(`${this.jobs.recriarBranch}/${id}/api/json`);
             if (numbuild && numbuild.inProgress === false) {
                 if (numbuild.result === "SUCCESS") {
-                    return { terminado: true, resultado: true, tipo: "recriarBranch", retorno: numbuild.result};
+                    return { terminado: true, resultado: true, tipo: "recriarBranch", retorno: numbuild.result };
                 }
                 return { terminado: true, resultado: false, tipo: "recriarBranch", retorno: numbuild.result };
             }
-            return { terminado: false, resultado: false, tipo: "recriarBranch", retorno: numbuild?.result};
+            return { terminado: false, resultado: false, tipo: "recriarBranch", retorno: numbuild?.result };
+        } catch {
+            return { terminado: true, resultado: false, tipo: "recriarBranch", retorno: "erro interno" };
+        }
+    }
+
+    async consultarFila(id: any): Promise<any> {
+        try {
+            const retorno = await this.jenkinsGet(`/queue/item/${id}/api/json`);
+            if (retorno && retorno.executable) {
+                return retorno.executable.number
+            }
+            return -1
         } catch {
-            return { terminado: true, resultado: false, tipo: "recriarBranch", retorno: "erro interno"};
+            return -1
         }
     }
 }