genlayer 0.1.3 → 0.1.4

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 
 
+## 0.1.4 (2024-11-12)
+
+
+### Bug Fixes
+
+* changing linux command to fix display issue and fixing waiting simulator issue ([#127](https://github.com/yeagerai/genlayer-cli/issues/127)) ([721eebf](https://github.com/yeagerai/genlayer-cli/commit/721eebfea758a0897f23afd60b5767c59d593eb1))
+
 ## 0.1.3 (2024-11-08)
 
 ## 0.1.2 (2024-11-08)

package/dist/index.js

@@ -39699,7 +39699,7 @@ var {
 } = import_index.default;
 
 // package.json
-var version = "0.1.3";
+var version = "0.1.4";
 
 // 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.";
@@ -39767,7 +39767,7 @@ 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"`,
-  linux: `x-terminal-emulator -e bash -c 'cd ${simulatorLocation} && docker compose build && docker compose up; echo "Press enter to exit"; read'`
+  linux: `nohup bash -c 'cd ${simulatorLocation} && docker compose build && docker compose up -d'`
 });
 var DEFAULT_PULL_OLLAMA_COMMAND = (simulatorLocation) => ({
   darwin: `cd ${simulatorLocation} && docker exec ollama ollama pull llama3`,
@@ -40572,7 +40572,7 @@ var SimulatorService = class {
       console.log("Waiting for the simulator to start up...");
       try {
         const response = yield rpcClient.request({ method: "ping", params: [] });
-        if (((_a = response == null ? void 0 : response.result) == null ? void 0 : _a.status) === "OK" || ((_c = (_b = response == null ? void 0 : response.result) == null ? void 0 : _b.data) == null ? void 0 : _c.status) === "OK") {
+        if ((response == null ? void 0 : response.result) === "OK" || ((_a = response == null ? void 0 : response.result) == null ? void 0 : _a.status) === "OK" || ((_c = (_b = response == null ? void 0 : response.result) == null ? void 0 : _b.data) == null ? void 0 : _c.status) === "OK") {
           return { initialized: true };
         }
         if (retries > 0) {

package/package.json

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

package/src/lib/config/simulator.ts

@@ -4,7 +4,7 @@ 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"`,
-  linux: `x-terminal-emulator -e bash -c 'cd ${simulatorLocation} && docker compose build && docker compose up; echo "Press enter to exit"; read'`,
+  linux: `nohup bash -c 'cd ${simulatorLocation} && docker compose build && docker compose up -d'`,
 });
 export const DEFAULT_PULL_OLLAMA_COMMAND = (simulatorLocation: string) => ({
   darwin: `cd ${simulatorLocation} && docker exec ollama ollama pull llama3`,

package/src/lib/services/simulator.ts

@@ -221,7 +221,7 @@ export class SimulatorService implements ISimulatorService {
       const response = await rpcClient.request({method: "ping", params: []});
 
       //Compatibility with current simulator version
-      if (response?.result?.status === "OK" || response?.result?.data?.status === "OK") {
+      if (response?.result === "OK" || response?.result?.status === "OK" || response?.result?.data?.status === "OK") {
         return { initialized: true };
       }
       if (retries > 0) {

package/tests/services/simulator.test.ts

@@ -104,20 +104,27 @@ describe("SimulatorService - Basic Tests", () => {
     expect(fs.existsSync).toHaveBeenCalled();
   });
 
-  test("should return initialized true when simulator responds with OK", async () => {
+  test("should return initialized true when simulator responds with OK (result.status = OK)", async () => {
     vi.mocked(rpcClient.request).mockResolvedValueOnce({ result: {status: 'OK'} });
     const result = await simulatorService.waitForSimulatorToBeReady(STARTING_TIMEOUT_ATTEMPTS);
     expect(result).toEqual({ initialized: true });
     expect(rpcClient.request).toHaveBeenCalledWith({ method: "ping", params: [] });
   });
 
-  test("should return initialized true when simulator responds with OK (different json structure)", async () => {
+  test("should return initialized true when simulator responds with OK (result.data.status = OK)", async () => {
     vi.mocked(rpcClient.request).mockResolvedValueOnce({ result: {data: {status: 'OK'}} });
     const result = await simulatorService.waitForSimulatorToBeReady(STARTING_TIMEOUT_ATTEMPTS);
     expect(result).toEqual({ initialized: true });
     expect(rpcClient.request).toHaveBeenCalledWith({ method: "ping", params: [] });
   });
 
+  test("should return initialized true when simulator responds with OK (result = OK)", async () => {
+    vi.mocked(rpcClient.request).mockResolvedValueOnce({ result: 'OK' });
+    const result = await simulatorService.waitForSimulatorToBeReady(STARTING_TIMEOUT_ATTEMPTS);
+    expect(result).toEqual({ initialized: true });
+    expect(rpcClient.request).toHaveBeenCalledWith({ method: "ping", params: [] });
+  });
+
   test("should return initialized false with errorCode TIMEOUT after retries", async () => {
     vi.mocked(rpcClient.request).mockResolvedValue(undefined);
     const result = await simulatorService.waitForSimulatorToBeReady(1);