- Added option to output duration and time

packages/cli/src/managers/shell.manager.ts

@@ -2,10 +2,13 @@ import {exec, spawn} from "child_process";
 import {ConsoleManager} from "./console.manager";
 import {injectable} from "tsyringe";
 import {PathManager} from "./path.manager";
+import {DateUtil} from "@pristine-ts/common"
 
 @injectable()
 export class ShellManager {
-    constructor(private readonly consoleManager: ConsoleManager, private readonly pathManager: PathManager) {
+    constructor(private readonly consoleManager: ConsoleManager,
+                private readonly pathManager: PathManager,
+                private readonly dateUtil: DateUtil) {
     }
 
     execute(command: string, options?: {
@@ -14,6 +17,8 @@ export class ShellManager {
         maxBuffer?: number,
         outputStdout?: boolean,
         outputStderr?: boolean,
+        outputDuration?: boolean,
+        outputTimeBeforeExecutingCommand?: boolean,
     }): Promise<string> {
         return new Promise<string>((resolve, reject) => {
             const env = process.env;
@@ -24,13 +29,21 @@ export class ShellManager {
 
             const outputStdout = options?.outputStdout ?? true;
             const outputStderr = options?.outputStderr ?? true;
+            const outputDuration = options?.outputDuration ?? true;
+            const outputTimeBeforeExecutingCommand = options?.outputTimeBeforeExecutingCommand ?? true;
 
             if(directory) {
                 const absoluteDirectory = this.pathManager.getPathRelativeToCurrentExecutionDirectory(directory);
                 finalCommand = "cd " + absoluteDirectory + " && " + command;
             }
 
-            outputStdout && this.consoleManager.writeLine(finalCommand);
+            const start = new Date();
+
+            if(outputTimeBeforeExecutingCommand) {
+                this.consoleManager.writeLine(start.toISOString());
+            }
+
+            this.consoleManager.writeLine(finalCommand);
 
             if(streamStdout) {
                 const child = spawn(finalCommand, [], { shell: true, env });
@@ -49,6 +62,13 @@ export class ShellManager {
                         return reject(code);
                     }
 
+                    // Output the duration in human readable format
+                    if(outputDuration) {
+                        const end = new Date();
+                        const duration = end.getTime() - start.getTime();
+                        this.consoleManager.writeLine(`Executed in: ${this.dateUtil.formatDuration(duration)}`);
+                    }
+
                     return resolve(code + "");
                 });
             }
@@ -64,6 +84,13 @@ export class ShellManager {
                     return resolve(stderr);
                 }
 
+                // Output the duration in human readable format
+                if(outputDuration) {
+                    const end = new Date();
+                    const duration = end.getTime() - start.getTime();
+                    this.consoleManager.writeLine(`Executed in: ${this.dateUtil.formatDuration(duration)}`);
+                }
+
                 outputStdout && this.consoleManager.writeLine(stdout);
                 return resolve(stdout);
             })

packages/common/src/utils/date.util.ts

@@ -0,0 +1,24 @@
+import {injectable} from "tsyringe"
+@injectable()
+export class DateUtil {
+    formatDuration(milliseconds: number) {
+        if(milliseconds === 0) {
+            return "0ms";
+        }
+
+        const seconds = Math.floor(milliseconds / 1000);
+        const minutes = Math.floor(seconds / 60);
+        const hours = Math.floor(minutes / 60);
+        const days = Math.floor(hours / 24);
+        const years = Math.floor(days / 365);
+
+        const parts = [];
+        if (years > 0) parts.push(`${years} year${years > 1 ? 's' : ''}`);
+        if (days > 0) parts.push(`${days} day${days > 1 ? 's' : ''}`);
+        if (hours > 0) parts.push(`${hours} hour${hours > 1 ? 's' : ''}`);
+        if (minutes > 0) parts.push(`${minutes} minute${minutes > 1 ? 's' : ''}`);
+        parts.push(`${seconds % 60} second${seconds % 60 > 1 ? 's' : ''}`);
+
+        return parts.join(", ").replace(/, (.*)$/, " and $1");
+    }
+}

packages/common/src/utils/utils.ts

@@ -1,2 +1,3 @@
+export * from "./date.util";
 export * from "./metadata.util";
 export * from "./request.util";