feat: Removed the spinner powered by log messages (caused pointer issues previously) since it's no longer needed. Fix sudo util missing problems

Author: kevinwang5658

src/common/base-command.ts

@@ -56,7 +56,7 @@ export abstract class BaseCommand extends Command {
 
         // We print that we used sudo everytime even if the user provides it in the beginning
         if (flags.sudoPassword && data.options.requiresRoot) {
-          console.log(chalk.blue(`Plugin: "${pluginName}" requires root access to run command: "${data.command}"`));
+          console.log(chalk.blue(`Plugin: "${pluginName}" requires root access to run command: "sudo ${data.command}"`));
         }
 
         if (data.options.stdin) {

src/ui/components/default-component.tsx

@@ -22,24 +22,17 @@ import { PlanComponent } from './plan/plan.js';
 import { ProgressDisplay } from './progress/progress-display.js';
 import { PromptPressKeyToContinue } from './widgets/PromptPressKeyToContinue.js';
 
-const spinnerEmitter = new EventEmitter();
-
 export function DefaultComponent(props: {
   emitter: EventEmitter
 }) {
   const { emitter } = props
   const [disableSudoPrompt, setDisableSudoPrompt] = useState(false);
   const [{ status: renderStatus, data: renderData }] = useAtom(store.renderState);
-  const logTriggeredSpinner = selectAtom(store.progressState, (progress) => progress?.logTriggeredSpinner ?? false);
 
   // Use layoutEffect runs before the first render, whereas useEffect runs after
   useLayoutEffect(() => {
     const logListener = (log: string) => {
       console.log(chalk.cyan(log));
-
-      if (logTriggeredSpinner) {
-        spinnerEmitter.emit('data');
-      }
     };
 
     emitter.on(RenderEvent.LOG, logListener);
@@ -64,7 +57,7 @@ export function DefaultComponent(props: {
     }
     {
       renderStatus === RenderStatus.PROGRESS && (
-        <ProgressDisplay emitter={spinnerEmitter} eventType="data"/>
+        <ProgressDisplay />
       )
     }
     {

src/ui/components/progress/progress-display.tsx

@@ -24,44 +24,32 @@ export interface ProgressState {
   }> | null;
 }
 
-export function ProgressDisplay(
-  props: {
-    // progress: ProgressState,
-    emitter: EventEmitter,
-    eventType: string,
-  }
-) {
+export function ProgressDisplay() {
   const [progress] = useAtom(store.progressState);
   if (!progress) {
     return;
   }
 
-  const { label, status, subProgresses, logTriggeredSpinner } = progress;
+  const { label, status, subProgresses } = progress;
 
   return <Box flexDirection="column">
     {
       status === ProgressStatus.IN_PROGRESS
-        ? (logTriggeredSpinner
-          ? <Spinner eventEmitter={props.emitter} eventType={props.eventType} label={label} type="circleHalves"/>
-          : <AutomatedSpinner label={label} type="circleHalves" />
-        )
+        ? <AutomatedSpinner label={label} type="circleHalves" />
         : <StatusMessage variant="success">{label}</StatusMessage>
     }
     <Box flexDirection="column" marginLeft={2}>
-      <SubProgressDisplay emitter={props.emitter} eventType={props.eventType} subProgresses={subProgresses} logTriggeredSpinner={logTriggeredSpinner}/>
+      <SubProgressDisplay subProgresses={subProgresses}/>
     </Box>
   </Box>
 }
 
 export function SubProgressDisplay(
   props: {
-    logTriggeredSpinner: boolean;
     subProgresses: ProgressState['subProgresses'],
-    emitter: EventEmitter,
-    eventType: string,
   }
 ) {
-  const { subProgresses, emitter, eventType } = props;
+  const { subProgresses } = props;
 
   return <>{
     subProgresses && subProgresses
@@ -71,10 +59,7 @@ export function SubProgressDisplay(
       .slice(Math.max(0, subProgresses.length - 5), subProgresses.length)
       .map((s, idx) =>
         s.status === ProgressStatus.IN_PROGRESS
-          ? (props.logTriggeredSpinner
-            ? <Spinner eventEmitter={emitter} eventType={eventType} key={idx} label={s.label} type="circleHalves"/>
-              : <AutomatedSpinner key={idx} label={s.label} type="circleHalves" />
-          )
+          ? <AutomatedSpinner key={idx} label={s.label} type="circleHalves" />
           : <StatusMessage key={idx} variant="success">{s.label}</StatusMessage>
       )
   }</>

src/ui/reporters/default-reporter.tsx

@@ -1,6 +1,6 @@
 import { FormProps, FormReturnValue } from '@codifycli/ink-form';
 import chalk from 'chalk';
-import { SudoRequestData } from 'codify-schemas';
+import { CommandRequestData } from 'codify-schemas';
 import { render } from 'ink';
 import { EventEmitter } from 'node:events';
 import React from 'react';
@@ -169,8 +169,8 @@ export class DefaultReporter implements Reporter {
     this.updateRenderState(RenderStatus.DISPLAY_IMPORT_RESULT, { importResult, showConfigs });
   }
 
-  async promptSudo(pluginName: string, data: SudoRequestData, secureMode: boolean): Promise<string | undefined> {
-    console.log(chalk.blue(`Plugin: "${pluginName}" requires root access to run command: "${data.command}"`));
+  async promptSudo(pluginName: string, data: CommandRequestData, secureMode: boolean): Promise<string | undefined> {
+    console.log(chalk.blue(`Plugin: "${pluginName}" requires root access to run command: "sudo ${data.command}"`));
 
     let password;
 

src/ui/reporters/reporter.ts

@@ -1,4 +1,4 @@
-import { SudoRequestData , SudoRequestResponseData } from 'codify-schemas';
+import { CommandRequestData } from 'codify-schemas';
 
 import { Plan } from '../../entities/plan.js';
 import { ResourceConfig } from '../../entities/resource-config.js';
@@ -59,7 +59,7 @@ export interface Reporter {
 
   promptOptions(message: string, options: string[]): Promise<number>;
 
-  promptSudo(pluginName: string, data: SudoRequestData, secureMode: boolean): Promise<string | undefined>;
+  promptSudo(pluginName: string, data: CommandRequestData, secureMode: boolean): Promise<string | undefined>;
 
   promptUserForValues(resources: Array<ResourceInfo>, promptType: PromptType): Promise<ResourceConfig[]>;
 

src/utils/sudo.ts

@@ -0,0 +1,14 @@
+import { execSync } from 'node:child_process';
+
+
+export const SudoUtils = {
+  validate(password?: string): boolean {
+    try {
+      // Sudo with -SNv will not prompt if within sudo cache timeout
+      execSync(`sudo -SNv ${password ? `<<< ${password}` : ''}`, { stdio: 'ignore' })
+      return true;
+    } catch {
+      return false;
+    }
+  }
+};