genlayer 0.0.29 → 0.0.31

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 
 
+## 0.0.31 (2024-05-27)
+
+
+### Bug Fixes
+
+* handle Fetch Error (Mac M3) ([#36](https://github.com/yeagerai/genlayer-cli/issues/36)) ([deae77a](https://github.com/yeagerai/genlayer-cli/commit/deae77a7c5a0f00694d2aa94f26d3e3be67e0178))
+
+## 0.0.30 (2024-05-22)
+
 ## 0.0.29 (2024-05-15)
 
 ## 0.0.28 (2024-05-13)

package/dist/index.js

@@ -39896,7 +39896,7 @@ var {
 } = import_index.default;
 
 // package.json
-var version = "0.0.29";
+var version = "0.0.31";
 
 // src/lib/config/text.ts
 var CLI_DESCRIPTION = "GenLayer CLI is a development environment for the GenLayer ecosystem. It allows developers to interact with the protocol by creating accounts, sending transactions, and working with Intelligent Contracts by testing, debugging, and deploying them.";
@@ -42491,6 +42491,7 @@ var inquirer_default = inquirer;
 // src/lib/config/simulator.ts
 var DEFAULT_JSON_RPC_URL = "http://localhost:4000/api";
 var DEFAULT_REPO_GH_URL = "https://github.com/yeagerai/genlayer-simulator.git";
+var DOCKER_IMAGES_AND_CONTAINERS_NAME_PREFIX = "genlayer-simulator-";
 var DEFAULT_RUN_SIMULATOR_COMMAND = (simulatorLocation) => ({
   darwin: `osascript -e 'tell application "Terminal" to do script "cd ${simulatorLocation} && docker compose build && docker compose up"'`,
   win32: `start cmd.exe /c "cd /d ${simulatorLocation} && docker compose build && docker compose up && pause"`,
@@ -42501,6 +42502,11 @@ var DEFAULT_PULL_OLLAMA_COMMAND = (simulatorLocation) => ({
   win32: `cd /d ${simulatorLocation} && docker exec ollama ollama pull llama3`,
   linux: `cd ${simulatorLocation} && docker exec ollama ollama pull llama3`
 });
+var DEFAULT_RUN_DOCKER_COMMAND = {
+  darwin: "open -a Docker",
+  win32: 'start "" "C:\\Program Files\\Docker\\Docker\\Docker Desktop.exe"',
+  linux: "sudo systemctl start docker"
+};
 var AVAILABLE_PLATFORMS = ["darwin", "win32", "linux"];
 var STARTING_TIMEOUT_WAIT_CYLCE = 2e3;
 var STARTING_TIMEOUT_ATTEMPTS = 120;
@@ -44387,21 +44393,12 @@ function checkCommand(command, toolName) {
   });
 }
 function executeCommand(cmdsByPlatform, toolName) {
-  try {
-    const runningPlatform = getPlatform();
-    const command = cmdsByPlatform[runningPlatform];
-    return asyncExec(command);
-  } catch (error) {
-    throw new Error(`Error executing ${toolName}: ${error.message}`);
-  }
-}
-function executeCommandInNewTerminal(cmdsByPlatform) {
   const runningPlatform = getPlatform();
   const command = cmdsByPlatform[runningPlatform];
   try {
     return asyncExec(command);
   } catch (error) {
-    throw new Error(`Error executing command ${command}`);
+    throw new Error(`Error executing ${toolName || command}: ${error.message}.`);
   }
 }
 function getHomeDirectory() {
@@ -44410,13 +44407,64 @@ function getHomeDirectory() {
 function getPlatform() {
   const currentPlatform = process.platform;
   if (!AVAILABLE_PLATFORMS.includes(currentPlatform)) {
-    throw new Error(`Unsupported platform: ${currentPlatform}`);
+    throw new Error(`Unsupported platform: ${currentPlatform}.`);
   }
   return currentPlatform;
 }
 function openUrl(url) {
   return open_default(url);
 }
+function listDockerContainers() {
+  return __async(this, null, function* () {
+    try {
+      const dockerResponse = yield asyncExec("docker ps -a --format '{{.Names}}'");
+      const dockerContainers = dockerResponse.stdout.split("\n");
+      return dockerContainers;
+    } catch (error) {
+      throw new Error("Error listing Docker containers.");
+    }
+    return [];
+  });
+}
+function listDockerImages() {
+  return __async(this, null, function* () {
+    try {
+      const dockerResponse = yield asyncExec("docker images --format '{{.Repository}}'");
+      const dockerImages = dockerResponse.stdout.split("\n");
+      return dockerImages;
+    } catch (error) {
+      throw new Error("Error listing Docker images.");
+    }
+    return [];
+  });
+}
+function stopDockerContainer(containerName) {
+  return __async(this, null, function* () {
+    try {
+      yield asyncExec(`docker stop ${containerName}`);
+    } catch (error) {
+      throw new Error(`Error stopping Docker container ${containerName}.`);
+    }
+  });
+}
+function removeDockerContainer(containerName) {
+  return __async(this, null, function* () {
+    try {
+      yield asyncExec(`docker rm ${containerName}`);
+    } catch (error) {
+      throw new Error(`Error removing container ${containerName}.`);
+    }
+  });
+}
+function removeDockerImage(imageName) {
+  return __async(this, null, function* () {
+    try {
+      yield asyncExec(`docker rmi ${imageName}`);
+    } catch (error) {
+      throw new Error(`Error removing image ${imageName}.`);
+    }
+  });
+}
 
 // src/lib/services/simulator.ts
 function getSimulatorLocation() {
@@ -44466,6 +44514,13 @@ function checkRequirements() {
         throw error;
       }
     }
+    if (requirementsInstalled.docker) {
+      try {
+        yield checkCommand("docker ps", "docker");
+      } catch (error) {
+        yield executeCommand(DEFAULT_RUN_DOCKER_COMMAND);
+      }
+    }
     return requirementsInstalled;
   });
 }
@@ -44499,7 +44554,7 @@ function pullOllamaModel() {
   return __async(this, null, function* () {
     const simulatorLocation = getSimulatorLocation();
     const cmdsByPlatform = DEFAULT_PULL_OLLAMA_COMMAND(simulatorLocation);
-    yield executeCommandInNewTerminal(cmdsByPlatform);
+    yield executeCommand(cmdsByPlatform);
     return true;
   });
 }
@@ -44516,7 +44571,7 @@ function configSimulator(newConfig) {
 function runSimulator() {
   const simulatorLocation = getSimulatorLocation();
   const commandsByPlatform = DEFAULT_RUN_SIMULATOR_COMMAND(simulatorLocation);
-  return executeCommandInNewTerminal(commandsByPlatform);
+  return executeCommand(commandsByPlatform);
 }
 function waitForSimulatorToBeReady() {
   return __async(this, arguments, function* (retries = STARTING_TIMEOUT_ATTEMPTS) {
@@ -44531,7 +44586,7 @@ function waitForSimulatorToBeReady() {
         return waitForSimulatorToBeReady(retries - 1);
       }
     } catch (error) {
-      if ((error.name === "FetchError" || error.message.includes("ECONNRESET") || error.message.includes("ECONNREFUSED") || error.message.includes("socket hang up")) && retries > 0) {
+      if ((error.name === "FetchError" || error.message.includes("Fetch Error") || error.message.includes("ECONNRESET") || error.message.includes("ECONNREFUSED") || error.message.includes("socket hang up")) && retries > 0) {
         yield sleep(STARTING_TIMEOUT_WAIT_CYLCE * 2);
         return waitForSimulatorToBeReady(retries - 1);
       }
@@ -44577,6 +44632,34 @@ function openFrontend() {
     return true;
   });
 }
+function resetDockerContainers() {
+  return __async(this, null, function* () {
+    const containers = yield listDockerContainers();
+    const genlayerContainers = containers.filter(
+      (container) => container.startsWith(DOCKER_IMAGES_AND_CONTAINERS_NAME_PREFIX)
+    );
+    const containersStopPromises = genlayerContainers.map(
+      (container) => stopDockerContainer(container)
+    );
+    yield Promise.all(containersStopPromises);
+    const containersRemovePromises = genlayerContainers.map(
+      (container) => removeDockerContainer(container)
+    );
+    yield Promise.all(containersRemovePromises);
+    return true;
+  });
+}
+function resetDockerImages() {
+  return __async(this, null, function* () {
+    const images = yield listDockerImages();
+    const genlayerImages = images.filter(
+      (image) => image.startsWith(DOCKER_IMAGES_AND_CONTAINERS_NAME_PREFIX)
+    );
+    const imagesRemovePromises = genlayerImages.map((image) => removeDockerImage(image));
+    yield Promise.all(imagesRemovePromises);
+    return true;
+  });
+}
 
 // src/commands/general/init.ts
 function getRequirementsErrorMessage({ git, docker }) {
@@ -44598,6 +44681,9 @@ function initAction(options) {
       const { git, docker } = yield checkRequirements();
       const errorMessage = getRequirementsErrorMessage({ git, docker });
       if (errorMessage) {
+        console.log(
+          "There was a problem running the docker service. Please start the docker service and try again."
+        );
         console.error(errorMessage);
         return;
       }
@@ -44605,6 +44691,14 @@ function initAction(options) {
       console.error(error);
       return;
     }
+    console.log(`Resetting Docker containers and images...`);
+    try {
+      yield resetDockerContainers();
+      yield resetDockerImages();
+    } catch (error) {
+      console.error(error);
+      return;
+    }
     const answers = yield inquirer_default.prompt([
       {
         type: "confirm",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "genlayer",
-  "version": "0.0.29",
+  "version": "0.0.31",
   "description": "GenLayer Command Line Tool",
   "main": "src/index.ts",
   "bin": {

package/src/commands/general/init.ts

@@ -17,6 +17,8 @@ import {
   getSimulatorLocation,
   getFrontendUrl,
   openFrontend,
+  resetDockerContainers,
+  resetDockerImages,
 } from "@/lib/services/simulator";
 export interface InitActionOptions {
   numValidators: number;
@@ -43,6 +45,9 @@ export async function initAction(options: InitActionOptions) {
     const {git, docker} = await checkRequirements();
     const errorMessage = getRequirementsErrorMessage({git, docker});
     if (errorMessage) {
+      console.log(
+        "There was a problem running the docker service. Please start the docker service and try again.",
+      );
       console.error(errorMessage);
       return;
     }
@@ -51,6 +56,16 @@ export async function initAction(options: InitActionOptions) {
     return;
   }
 
+  // Reset Docker containers and images
+  console.log(`Resetting Docker containers and images...`);
+  try {
+    await resetDockerContainers();
+    await resetDockerImages();
+  } catch (error) {
+    console.error(error);
+    return;
+  }
+
   // Ask for confirmation on downloading the GenLayer Simulator from GitHub
   const answers = await inquirer.prompt([
     {

package/src/lib/clients/system.ts

@@ -20,32 +20,20 @@ type ExecuteCommandResult = {
   stderr: string;
 };
 
-type ExecuteCommandInNewTerminalInput = {
+type ExecuteCommandByPlatformInput = {
   [key in RunningPlatform]: string;
 };
 
 export function executeCommand(
-  cmdsByPlatform: ExecuteCommandInNewTerminalInput,
-  toolName: string,
-): Promise<ExecuteCommandResult> {
-  try {
-    const runningPlatform = getPlatform();
-    const command = cmdsByPlatform[runningPlatform];
-    return asyncExec(command);
-  } catch (error: any) {
-    throw new Error(`Error executing ${toolName}: ${error.message}`);
-  }
-}
-
-export function executeCommandInNewTerminal(
-  cmdsByPlatform: ExecuteCommandInNewTerminalInput,
-): PromiseWithChild<{stdout: string; stderr: string}> {
+  cmdsByPlatform: ExecuteCommandByPlatformInput,
+  toolName?: string,
+): PromiseWithChild<ExecuteCommandResult> {
   const runningPlatform = getPlatform();
   const command = cmdsByPlatform[runningPlatform];
   try {
     return asyncExec(command);
   } catch (error: any) {
-    throw new Error(`Error executing command ${command}`);
+    throw new Error(`Error executing ${toolName || command}: ${error.message}.`);
   }
 }
 
@@ -56,7 +44,7 @@ export function getHomeDirectory(): string {
 function getPlatform(): RunningPlatform {
   const currentPlatform = process.platform as RunningPlatform;
   if (!AVAILABLE_PLATFORMS.includes(currentPlatform)) {
-    throw new Error(`Unsupported platform: ${currentPlatform}`);
+    throw new Error(`Unsupported platform: ${currentPlatform}.`);
   }
   return currentPlatform;
 }
@@ -64,3 +52,49 @@ function getPlatform(): RunningPlatform {
 export function openUrl(url: string): Promise<ChildProcess> {
   return open(url);
 }
+
+export async function listDockerContainers(): Promise<string[]> {
+  try {
+    const dockerResponse = await asyncExec("docker ps -a --format '{{.Names}}'");
+    const dockerContainers = dockerResponse.stdout.split("\n");
+    return dockerContainers;
+  } catch (error) {
+    throw new Error("Error listing Docker containers.");
+  }
+  return [];
+}
+
+export async function listDockerImages(): Promise<string[]> {
+  try {
+    const dockerResponse = await asyncExec("docker images --format '{{.Repository}}'");
+    const dockerImages = dockerResponse.stdout.split("\n");
+    return dockerImages;
+  } catch (error) {
+    throw new Error("Error listing Docker images.");
+  }
+  return [];
+}
+
+export async function stopDockerContainer(containerName: string): Promise<void> {
+  try {
+    await asyncExec(`docker stop ${containerName}`);
+  } catch (error) {
+    throw new Error(`Error stopping Docker container ${containerName}.`);
+  }
+}
+
+export async function removeDockerContainer(containerName: string) {
+  try {
+    await asyncExec(`docker rm ${containerName}`);
+  } catch (error) {
+    throw new Error(`Error removing container ${containerName}.`);
+  }
+}
+
+export async function removeDockerImage(imageName: string) {
+  try {
+    await asyncExec(`docker rmi ${imageName}`);
+  } catch (error) {
+    throw new Error(`Error removing image ${imageName}.`);
+  }
+}

package/src/lib/config/simulator.ts

@@ -1,5 +1,6 @@
 export const DEFAULT_JSON_RPC_URL = "http://localhost:4000/api";
 export const DEFAULT_REPO_GH_URL = "https://github.com/yeagerai/genlayer-simulator.git";
+export const DOCKER_IMAGES_AND_CONTAINERS_NAME_PREFIX = "genlayer-simulator-";
 export const DEFAULT_RUN_SIMULATOR_COMMAND = (simulatorLocation: string) => ({
   darwin: `osascript -e 'tell application "Terminal" to do script "cd ${simulatorLocation} && docker compose build && docker compose up"'`,
   win32: `start cmd.exe /c "cd /d ${simulatorLocation} && docker compose build && docker compose up && pause"`,
@@ -10,6 +11,12 @@ export const DEFAULT_PULL_OLLAMA_COMMAND = (simulatorLocation: string) => ({
   win32: `cd /d ${simulatorLocation} && docker exec ollama ollama pull llama3`,
   linux: `cd ${simulatorLocation} && docker exec ollama ollama pull llama3`,
 });
+export const DEFAULT_RUN_DOCKER_COMMAND = {
+  darwin: "open -a Docker",
+  win32: 'start "" "C:\\Program Files\\Docker\\Docker\\Docker Desktop.exe"',
+  linux: "sudo systemctl start docker",
+};
+
 export const AVAILABLE_PLATFORMS = ["darwin", "win32", "linux"] as const;
 export type RunningPlatform = (typeof AVAILABLE_PLATFORMS)[number];
 export const STARTING_TIMEOUT_WAIT_CYLCE = 2000;

package/src/lib/services/simulator.ts

@@ -5,7 +5,9 @@ import * as path from "path";
 import {rpcClient} from "@/lib/clients/jsonRpcClient";
 import {
   DEFAULT_REPO_GH_URL,
+  DOCKER_IMAGES_AND_CONTAINERS_NAME_PREFIX,
   DEFAULT_RUN_SIMULATOR_COMMAND,
+  DEFAULT_RUN_DOCKER_COMMAND,
   DEFAULT_PULL_OLLAMA_COMMAND,
   STARTING_TIMEOUT_WAIT_CYLCE,
   STARTING_TIMEOUT_ATTEMPTS,
@@ -16,8 +18,12 @@ import {
   checkCommand,
   getHomeDirectory,
   executeCommand,
-  executeCommandInNewTerminal,
   openUrl,
+  listDockerContainers,
+  stopDockerContainer,
+  removeDockerContainer,
+  listDockerImages,
+  removeDockerImage,
 } from "@/lib/clients/system";
 import {MissingRequirementError} from "../errors/missingRequirement";
 
@@ -80,12 +86,20 @@ export async function checkRequirements(): Promise<Record<string, boolean>> {
   try {
     await checkCommand("docker --version", "docker");
     requirementsInstalled.docker = true;
-  } catch (error) {
+  } catch (error: any) {
     if (!(error instanceof MissingRequirementError)) {
       throw error;
     }
   }
 
+  if (requirementsInstalled.docker) {
+    try {
+      await checkCommand("docker ps", "docker");
+    } catch (error: any) {
+      await executeCommand(DEFAULT_RUN_DOCKER_COMMAND);
+    }
+  }
+
   return requirementsInstalled;
 }
 
@@ -121,7 +135,7 @@ export async function updateSimulator(): Promise<DownloadSimulatorResultType> {
 export async function pullOllamaModel(): Promise<boolean> {
   const simulatorLocation = getSimulatorLocation();
   const cmdsByPlatform = DEFAULT_PULL_OLLAMA_COMMAND(simulatorLocation);
-  await executeCommandInNewTerminal(cmdsByPlatform);
+  await executeCommand(cmdsByPlatform);
   return true;
 }
 
@@ -137,7 +151,7 @@ export async function configSimulator(newConfig: Record<string, string>): Promis
 export function runSimulator(): Promise<{stdout: string; stderr: string}> {
   const simulatorLocation = getSimulatorLocation();
   const commandsByPlatform = DEFAULT_RUN_SIMULATOR_COMMAND(simulatorLocation);
-  return executeCommandInNewTerminal(commandsByPlatform);
+  return executeCommand(commandsByPlatform);
 }
 
 type WaitForSimulatorToBeReadyResultType = {
@@ -162,6 +176,7 @@ export async function waitForSimulatorToBeReady(
   } catch (error: any) {
     if (
       (error.name === "FetchError" ||
+        error.message.includes("Fetch Error") ||
         error.message.includes("ECONNRESET") ||
         error.message.includes("ECONNREFUSED") ||
         error.message.includes("socket hang up")) &&
@@ -220,3 +235,32 @@ export async function openFrontend(): Promise<boolean> {
   await openUrl(getFrontendUrl());
   return true;
 }
+
+export async function resetDockerContainers(): Promise<boolean> {
+  const containers = await listDockerContainers();
+  const genlayerContainers = containers.filter((container: string) =>
+    container.startsWith(DOCKER_IMAGES_AND_CONTAINERS_NAME_PREFIX),
+  );
+  const containersStopPromises = genlayerContainers.map((container: string) =>
+    stopDockerContainer(container),
+  );
+  await Promise.all(containersStopPromises);
+
+  const containersRemovePromises = genlayerContainers.map((container: string) =>
+    removeDockerContainer(container),
+  );
+  await Promise.all(containersRemovePromises);
+
+  return true;
+}
+
+export async function resetDockerImages(): Promise<boolean> {
+  const images = await listDockerImages();
+  const genlayerImages = images.filter((image: string) =>
+    image.startsWith(DOCKER_IMAGES_AND_CONTAINERS_NAME_PREFIX),
+  );
+  const imagesRemovePromises = genlayerImages.map((image: string) => removeDockerImage(image));
+  await Promise.all(imagesRemovePromises);
+
+  return true;
+}