genlayer 0.0.23 → 0.0.24

package/esbuild.config.dev

@@ -6,6 +6,10 @@ module.exports = {
     outfile: "dist/index.js", // Output file
     platform: "node",
     target: "es6",
+    define: { 'import.meta.url': '_importMetaUrl' },
+    banner: {
+      js: "const _importMetaUrl=require('url').pathToFileURL(__filename)",
+    },
   },
   watch: true,
 };

package/esbuild.config.prod

@@ -6,6 +6,10 @@ module.exports = {
     outfile: "dist/index.js", // Output file
     platform: "node",
     target: "es6",
+    define: { 'import.meta.url': '_importMetaUrl' },
+    banner: {
+      js: "const _importMetaUrl=require('url').pathToFileURL(__filename)",
+    },
   },
   watch: false,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "genlayer",
-  "version": "0.0.23",
+  "version": "0.0.24",
   "description": "GenLayer Command Line Tool",
   "main": "src/index.ts",
   "bin": {
@@ -56,6 +56,7 @@
     "dotenv": "^16.4.5",
     "inquirer": "^9.2.19",
     "node-fetch": "^3.3.2",
+    "open": "^10.1.0",
     "uuid": "^9.0.1"
   }
 }

package/src/commands/general/index.ts

@@ -1,6 +1,7 @@
 import {Command} from "commander";
 
 import {initAction} from "./init";
+import {startAction} from "./start";
 
 export function initializeGeneralCommands(program: Command) {
   program
@@ -8,5 +9,12 @@ export function initializeGeneralCommands(program: Command) {
     .description("Initialize the GenLayer Environment")
     .option("-n, --numValidators <numValidators>", "Number of validators", "5")
     .action(initAction);
+
+  program
+    .command("up")
+    .description("Starts GenLayer's simulator")
+    .option("-nr, --no-restart", "Don't restart the database and validators", true)
+    .action(startAction);
+
   return program;
 }

package/src/commands/general/init.ts

@@ -15,7 +15,8 @@ import {
   pullOllamaModel,
   getAiProvidersOptions,
   getSimulatorLocation,
-  readEnvConfigValue,
+  getFrontendUrl,
+  openFrontend,
 } from "@/lib/services/simulator";
 export interface InitActionOptions {
   numValidators: number;
@@ -105,7 +106,7 @@ export async function initAction(options: InitActionOptions) {
     const providerConfig = AI_PROVIDERS_CONFIG[provider];
     const questions = [
       {
-        type: "password",
+        type: "input",
         name: providerConfig.cliOptionValue,
         message: `Please enter your ${providerConfig.name} API Key:`,
         validate: function (value: string) {
@@ -158,7 +159,7 @@ export async function initAction(options: InitActionOptions) {
 
   // Ollama doesn't need changes in configuration, we just run it
   if (selectedLlmProviders.includes("ollama")) {
-    console.log("Pulling llama2 from Ollama...")
+    console.log("Pulling llama2 from Ollama...");
     await pullOllamaModel();
   }
 
@@ -190,7 +191,14 @@ export async function initAction(options: InitActionOptions) {
     console.error(error);
     return;
   }
-  
-  const frontendPort = readEnvConfigValue('FRONTEND_PORT');
-  console.log(`GenLayer simulator initialized successfully! Go to http://localhost:${frontendPort} in your browser to access it.`);
+
+  // Simulator ready
+  console.log(
+    `GenLayer simulator initialized successfully! Go to ${getFrontendUrl()} in your browser to access it.`,
+  );
+  try {
+    openFrontend();
+  } catch (error) {
+    console.error(error);
+  }
 }

package/src/commands/general/start.ts

@@ -0,0 +1,99 @@
+import {
+  updateSimulator,
+  runSimulator,
+  waitForSimulatorToBeReady,
+  deleteAllValidators,
+  createRandomValidators,
+  clearDatabaseTables,
+  initializeDatabase,
+  getFrontendUrl,
+  openFrontend,
+} from "@/lib/services/simulator";
+
+export interface StartActionOptions {
+  restart: string;
+}
+
+export async function startAction(options: StartActionOptions) {
+  const restartHintText = options.restart
+    ? "restarting the database and validators"
+    : "keeping the database and validators previous configuration";
+  console.log(`Starting GenLayer simulator ${restartHintText}`);
+
+  // Update the simulator to the latest version
+  console.log(`Updating GenLayer Simulator...`);
+  try {
+    await updateSimulator();
+  } catch (error) {
+    console.error(error);
+    return;
+  }
+
+  // Run the GenLayer Simulator
+  console.log("Running the GenLayer Simulator...");
+  try {
+    runSimulator();
+  } catch (error) {
+    console.error(error);
+    return;
+  }
+
+  try {
+    const {initialized, error} = await waitForSimulatorToBeReady();
+    if (!initialized && error === "ERROR") {
+      console.error("Unable to initialize the GenLayer simulator. Please try again.");
+      return;
+    }
+    if (!initialized && error === "TIMEOUT") {
+      console.error(
+        "The simulator is taking too long to initialize. Please try again after the simulator is ready.",
+      );
+      return;
+    }
+    console.log("Simulator is running!");
+  } catch (error) {
+    console.error(error);
+    return;
+  }
+
+  if (options.restart) {
+    // Initialize the database
+    console.log("Initializing the database...");
+    try {
+      //remove everything from the database
+      await clearDatabaseTables();
+
+      const {createResponse, tablesResponse} = await initializeDatabase();
+      if (!createResponse || !tablesResponse) {
+        console.error("Unable to initialize the database. Please try again.");
+        return;
+      }
+    } catch (error) {
+      console.error(error);
+      return;
+    }
+
+    // Initializing validators
+    console.log("Initializing validators...");
+    try {
+      //remove all validators
+      await deleteAllValidators();
+      // create random validators
+      await createRandomValidators();
+    } catch (error) {
+      console.error("Unable to initialize the validators.");
+      console.error(error);
+      return;
+    }
+  }
+
+  // Simulator ready
+  console.log(
+    `GenLayer simulator initialized successfully! Go to ${getFrontendUrl()} in your browser to access it.`,
+  );
+  try {
+    openFrontend();
+  } catch (error) {
+    console.error(error);
+  }
+}

package/src/lib/clients/system.ts

@@ -1,6 +1,7 @@
 import util from "node:util";
-import {PromiseWithChild, exec} from "child_process";
+import {ChildProcess, PromiseWithChild, exec} from "child_process";
 import os from "os";
+import open from "open";
 
 import {RunningPlatform, AVAILABLE_PLATFORMS} from "@/lib/config/simulator";
 import {MissingRequirementError} from "../errors/missingRequirement";
@@ -60,3 +61,7 @@ function getPlatform(): RunningPlatform {
   }
   return currentPlatform;
 }
+
+export function openUrl(url: string): Promise<ChildProcess> {
+  return open(url);
+}

package/src/lib/services/simulator.ts

@@ -16,17 +16,18 @@ import {
   getHomeDirectory,
   executeCommand,
   executeCommandInNewTerminal,
+  openUrl,
 } from "@/lib/clients/system";
 import {MissingRequirementError} from "../errors/missingRequirement";
 
 // Private helper functions
 export function getSimulatorLocation(): string {
-  return path.join(getHomeDirectory(), 'genlayer-simulator');
+  return path.join(getHomeDirectory(), "genlayer-simulator");
 }
 
 export function readEnvConfigValue(key: string): string {
   const simulatorLocation = getSimulatorLocation();
-  const envFilePath = path.join(simulatorLocation, '.env');
+  const envFilePath = path.join(simulatorLocation, ".env");
   // Transform the config string to object
   const envConfig = dotenv.parse(fs.readFileSync(envFilePath, "utf8"));
   return envConfig[key];
@@ -38,7 +39,7 @@ function sleep(millliseconds: number): Promise<void> {
 
 function addConfigToEnvFile(newConfig: Record<string, string>): void {
   const simulatorLocation = getSimulatorLocation();
-  const envFilePath = path.join(simulatorLocation, '.env');
+  const envFilePath = path.join(simulatorLocation, ".env");
 
   // Create a backup of the original .env file
   fs.writeFileSync(`${envFilePath}.bak`, fs.readFileSync(envFilePath));
@@ -125,9 +126,9 @@ export async function pullOllamaModel(): Promise<boolean> {
 
 export async function configSimulator(newConfig: Record<string, string>): Promise<boolean> {
   const simulatorLocation = getSimulatorLocation();
-  const envExample = path.join(simulatorLocation, '.env.example');
-  const envFilePath = path.join(simulatorLocation, '.env');
-  fs.copyFileSync(envExample, envFilePath);  
+  const envExample = path.join(simulatorLocation, ".env.example");
+  const envFilePath = path.join(simulatorLocation, ".env");
+  fs.copyFileSync(envExample, envFilePath);
   addConfigToEnvFile(newConfig);
   return true;
 }
@@ -195,3 +196,13 @@ export function getAiProvidersOptions(): Array<{name: string; value: string}> {
     return {name: providerConfig.name, value: providerConfig.cliOptionValue};
   });
 }
+
+export function getFrontendUrl(): string {
+  const frontendPort = readEnvConfigValue("FRONTEND_PORT");
+  return `http://localhost:${frontendPort}`;
+}
+
+export async function openFrontend(): Promise<boolean> {
+  await openUrl(getFrontendUrl());
+  return true;
+}