fix: single build does not cache correctly (#61)

Author: hmdoganjf

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@jotforminc/zenith",
   "packageManager": "[email protected]",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "description": "",
   "main": "./build/index.js",
   "files": [

src/classes/Builder/SingleBuilder.ts

@@ -7,14 +7,14 @@ export default class SingleBuilder extends BuildHelper {
   async fetchOrRun(hash: string) {
     const recoverResponse = await this.anotherJob(hash, 'root', 'stdout', this.command, false, this.logAffected);
     if (recoverResponse === 'Cache not found') {
+      Logger.log(2, 'Cache does not exist for command => ', this.command, hash);
       await this.runManual({cwd: './', command: this.command, hash});
     }
     this.totalCount++;
   }
 
   async runManual({cwd, command, hash}: {cwd: string, command: string, hash: string}) {
     const output = await this.executeManual({cwd, command, hash});
-    Logger.log(2, 'Cache does not exist for command => ', command, hash);
     if (output instanceof Error) {
       throw output;
     }
@@ -23,11 +23,22 @@ export default class SingleBuilder extends BuildHelper {
 
   async build(): Promise<void> {
     const hash = this.hasher.getSingleHash({script: this.command, projects: this.projects});
-    await this.fetchOrRun(hash);
-    void this.pool.terminate();
-    Logger.log(2, this.outputColor, `Zenith completed command: ${this.command}. ${this.noCache ? '(Cache was not used)' : ''}`);
-    Logger.log(2, this.outputColor, `Total of ${this.totalCount} project${this.totalCount === 1 ? ' is' : 's are'} finished.`);
-    Logger.log(2, this.outputColor, `Total process took ${formatTimeDiff(process.hrtime(this.startTime))}.`);
-    return;
+    try {
+      await this.fetchOrRun(hash);
+    } catch (err) {
+      Logger.log(2, err);
+      process.exit(1);
+    }
+    // eslint-disable-next-line no-constant-condition
+    while (true) {
+      const stats = this.pool.stats();
+      if (!stats.activeTasks && !stats.pendingTasks) {
+        void this.pool.terminate();
+        Logger.log(2, this.outputColor, `Zenith completed command: ${this.command}. ${this.noCache ? '(Cache was not used)' : ''}`);
+        Logger.log(2, this.outputColor, `Total of ${this.totalCount} project${this.totalCount === 1 ? ' is' : 's are'} finished.`);
+        Logger.log(2, this.outputColor, `Total process took ${formatTimeDiff(process.hrtime(this.startTime))}.`);
+        return;
+      }
+    }
   }
 }

src/classes/Cache/Cacher.ts

@@ -112,7 +112,7 @@ export default abstract class Cacher {
     if (configManagerInstance.getConfigValue('ZENITH_READ_ONLY')) return;
     try {
       const directoryPath = path.join(ROOT_PATH, root, output);
-      if ((output !== 'stdout' && !existsSync(directoryPath))) {
+      if (output !== 'stdout' && !existsSync(directoryPath)) {
         return;
       }
       const notFoundFiles = getMissingRequiredFiles(directoryPath, requiredFiles);
@@ -199,10 +199,8 @@ export default abstract class Cacher {
       if (nodeError.$metadata.httpStatusCode === 404) {
         return 'Cache not found';
       }
-      if (!error) {
-        return false;
-      }
-      Logger.log(2, 'error', );
+      Logger.log(2, "ERR-C-R ::", error);
+      throw error;
     }
   }
 

src/classes/Runner.ts

@@ -159,7 +159,7 @@ export default class Runner {
     if (Runner.workspace.size === 0) {
       Runner.workspace = deepCloneMap(Builder.getProjects());
     }
-    Logger.log(2, `Zenith ${command} started.`);
+    Logger.log(2, Builder.outputColor, `Zenith ${command} started.`);
     await Builder.build();
   }
 }

src/classes/WorkerHelper.ts

@@ -49,12 +49,8 @@ export default class WorkerHelper {
   }
 
   async anotherJob(hash: string, root: string, output: string, target: string, compareHashes: boolean, logAffected: boolean): Promise<{output: string} | string | unknown> {
-    try {
-      return await this.pool.exec('anotherJob', [hash, root, output, target, compareHashes, logAffected], {
-        on: message => Logger.log(3, message)
+    return await this.pool.exec('anotherJob', [hash, root, output, target, compareHashes, logAffected], {
+      on: message => Logger.log(3, message)
       }) as boolean | Error;
-    } catch (error) {
-      return error;
-    }
   }
 }

src/worker.ts

@@ -59,10 +59,10 @@ const anotherJob = async (hash: string, root: string, output: string, target: st
     if (error && typeof error === 'object' && 'stderr' in error) {
       const execErr = error as ExecError;
       Logger.log(2, 'ERR-W-A :: output => ', execErr.stderr);
-      return execErr;
+      throw execErr;
     }
     Logger.log(2, 'ERR-W-A :: output => ', error);
-    return new Error(String(error));
+    throw new Error(String(error));
   }
 };