WIP: working directory start and stop

Signed-off-by: Iliya Savov <isavov@users.noreply.github.com>
hiero-ledger · Dec 19, 2023 · 4f0928f · 4f0928f
1 parent 9219dc3
commit 4f0928f
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 14 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -43,8 +43,12 @@ yargs(hideBin(process.argv))
   )
   .command(
     "stop",
-    "Stops the local hedera network and delete all the existing data.",
-    async () => {
+      "Stops the local hedera network and delete all the existing data.",
+      (yargs: yargs.Argv<{}>) => {
+        ServiceLocator.Current.get<CLIService>(CLIService.name).loadStartupOptions(yargs);
+    },
+      async (argv: yargs.ArgumentsCamelCase<{}>) => {
+        ServiceLocator.Current.get<CLIService>(CLIService.name).setCurrentArgv(argv);
         await new StateController("stop").startStateMachine();
     }
   )

diff --git a/src/state/InitState.ts b/src/state/InitState.ts
@@ -74,12 +74,12 @@ export class InitState implements IState{
         }
 
         this.logger.info(`Setting configuration for ${this.cliOptions.network} network with latest images on host ${this.cliOptions.host} with dev mode turned ${this.cliOptions.devMode ? 'on' : 'off'} using ${this.cliOptions.fullMode? 'full': 'turbo'} mode in ${this.cliOptions.multiNode? 'multi' : 'single'} node configuration...`, this.stateName);
-        this.prepareWorkingDirectory();
-        const workingDirConfiguration = [
-            { key: "NETWORK_NODE_LOGS_ROOT_PATH", value: join(this.cliOptions.workingDir, "network-logs", "node") },
-            { key: "APPLICATION_CONFIG_PATH", value: join(this.cliOptions.workingDir, "compose-network","network-node","data","config") },
+        this.prepareWorkDirectory();
+        const workDirConfiguration = [
+            { key: "NETWORK_NODE_LOGS_ROOT_PATH", value: join(this.cliOptions.workDir, "network-logs", "node") },
+            { key: "APPLICATION_CONFIG_PATH", value: join(this.cliOptions.workDir, "compose-network","network-node","data","config") },
         ];
-        configurationData.envConfiguration = configurationData.envConfiguration?.concat(workingDirConfiguration);
+        configurationData.envConfiguration = configurationData.envConfiguration?.concat(workDirConfiguration);
 
         this.configureEnvVariables(configurationData.imageTagConfiguration, configurationData.envConfiguration);
         this.configureNodeProperties(configurationData.nodeConfiguration?.properties);
@@ -88,15 +88,15 @@ export class InitState implements IState{
         this.observer!.update(EventType.Finish);
     }
 
-   private prepareWorkingDirectory() {
-        this.logger.info(`Local Node Working directory set to ${this.cliOptions.workingDir}`,this.stateName);
-       this.ensureDirectoryExists(this.cliOptions.workingDir);
-       this.ensureDirectoryExists(join(this.cliOptions.workingDir, "network-logs","node"));
+   private prepareWorkDirectory() {
+        this.logger.info(`Local Node Working directory set to ${this.cliOptions.workDir}`,this.stateName);
+       this.ensureDirectoryExists(this.cliOptions.workDir);
+       this.ensureDirectoryExists(join(this.cliOptions.workDir, "network-logs","node"));
        const configDir = join(__dirname, '../../compose-network/network-node/data/config/');
        const configDirMirrorNode = join(__dirname, '../../compose-network/mirror-node/application.yml');
        const configFiles = {
-           [configDir]: `${this.cliOptions.workingDir}/compose-network/network-node/data/config`,
-           [configDirMirrorNode]: `${this.cliOptions.workingDir}/compose-network/mirror-node/application.yml`
+           [configDir]: `${this.cliOptions.workDir}/compose-network/network-node/data/config`,
+           [configDirMirrorNode]: `${this.cliOptions.workDir}/compose-network/mirror-node/application.yml`
        }
        this.copyDirectories(configFiles);
         // throw new Error('Method not implemented.');

diff --git a/src/state/StopState.ts b/src/state/StopState.ts
@@ -19,23 +19,29 @@
  */
 
 import shell from 'shelljs';
+import { join } from 'path';
 import { IOBserver } from '../controller/IObserver';
 import { LoggerService } from '../services/LoggerService';
 import { ServiceLocator } from '../services/ServiceLocator';
 import { IState } from './IState';
 import { EventType } from '../types/EventType';
 import { IS_WINDOWS } from '../constants';
+import { CLIOptions } from '../types/CLIOptions';
+import { CLIService } from '../services/CLIService';
 
 export class StopState implements IState{
     private logger: LoggerService;
 
     private observer: IOBserver | undefined;
 
+    private cliOptions: CLIOptions;
+
     private stateName: string;
-    
+
     constructor() {
         this.stateName = StopState.name;
         this.logger = ServiceLocator.Current.get<LoggerService>(LoggerService.name);
+        this.cliOptions = ServiceLocator.Current.get<CLIService>(CLIService.name).getCurrentArgv();
         this.logger.trace('Stop State Initialized!', this.stateName);
     }
 
@@ -57,6 +63,7 @@ export class StopState implements IState{
         shell.exec(`docker compose down -v --remove-orphans 2>${nullOutput}`);
         this.logger.trace('Cleaning the volumes and temp files...', this.stateName);
         shell.exec(`rm -rf network-logs/* >${nullOutput} 2>&1`);
+        shell.exec(`rm -rf ${join(this.cliOptions.workDir, "network-logs")} >${nullOutput} 2>&1`);
         shell.exec(`docker network prune -f 2>${nullOutput}`);
         shell.cd(rootPath);
         this.logger.info('Hedera Local Node was stopped successfully.', this.stateName);