From 993625affc8e5455ab6a0db6a6a327add7a2a969 Mon Sep 17 00:00:00 2001
From: thatben <thatbenbierens@gmail.com>
Date: Fri, 14 Feb 2025 09:22:04 +0100
Subject: [PATCH] Fixes args formatting on win

---
 src/handlers/nodeHandlers.js | 29 +++++++++++++----------------
 win.md                       |  7 ++++++-
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/handlers/nodeHandlers.js b/src/handlers/nodeHandlers.js
index 295e2a3..2219dd5 100644
--- a/src/handlers/nodeHandlers.js
+++ b/src/handlers/nodeHandlers.js
@@ -71,22 +71,19 @@ export async function runCodex(showNavigationMenu) {
                 nat = await runCommand('curl -s https://ip.codex.storage');
             }
 
-            const command = platform === 'win32' 
-                ? `codex ^
-                    --data-dir=datadir ^
-                    --disc-port=${discPort} ^
-                    --listen-addrs=/ip4/0.0.0.0/tcp/${listenPort} ^
-                    --nat=${nat} ^
-                    --api-cors-origin="*" ^
-                    --bootstrap-node=spr:CiUIAhIhAiJvIcA_ZwPZ9ugVKDbmqwhJZaig5zKyLiuaicRcCGqLEgIDARo8CicAJQgCEiECIm8hwD9nA9n26BUoNuarCEllqKDnMrIuK5qJxFwIaosQ3d6esAYaCwoJBJ_f8zKRAnU6KkYwRAIgM0MvWNJL296kJ9gWvfatfmVvT-A7O2s8Mxp8l9c8EW0CIC-h-H-jBVSgFjg3Eny2u33qF7BDnWFzo7fGfZ7_qc9P`
-                : `codex \
-                    --data-dir=datadir \
-                    --disc-port=${discPort} \
-                    --listen-addrs=/ip4/0.0.0.0/tcp/${listenPort} \
-                    --nat=\`curl -s https://ip.codex.storage\` \
-                    --api-cors-origin="*" \
-                    --bootstrap-node=spr:CiUIAhIhAiJvIcA_ZwPZ9ugVKDbmqwhJZaig5zKyLiuaicRcCGqLEgIDARo8CicAJQgCEiECIm8hwD9nA9n26BUoNuarCEllqKDnMrIuK5qJxFwIaosQ3d6esAYaCwoJBJ_f8zKRAnU6KkYwRAIgM0MvWNJL296kJ9gWvfatfmVvT-A7O2s8Mxp8l9c8EW0CIC-h-H-jBVSgFjg3Eny2u33qF7BDnWFzo7fGfZ7_qc9P`;
+            const executable = `codex`;
+            const args = [
+                `--data-dir=datadir`,
+                `--disc-port=${discPort}`,
+                `--listen-addrs=/ip4/0.0.0.0/tcp/${listenPort}`,
+                `--nat=${nat}`,
+                `--api-cors-origin="*"`,
+                `--bootstrap-node=spr:CiUIAhIhAiJvIcA_ZwPZ9ugVKDbmqwhJZaig5zKyLiuaicRcCGqLEgIDARo8CicAJQgCEiECIm8hwD9nA9n26BUoNuarCEllqKDnMrIuK5qJxFwIaosQ3d6esAYaCwoJBJ_f8zKRAnU6KkYwRAIgM0MvWNJL296kJ9gWvfatfmVvT-A7O2s8Mxp8l9c8EW0CIC-h-H-jBVSgFjg3Eny2u33qF7BDnWFzo7fGfZ7_qc9P`
+            ];
 
+            const command = 
+                `${executable} ${args.join(" ")}`
+            
             console.log(showInfoMessage(
                 '🚀 Codex node is running...\n\n' +
                 'Please keep this terminal open. Start a new terminal to interact with the node.\n\n' +
@@ -256,7 +253,7 @@ export async function checkNodeStatus(showNavigationMenu) {
 
         if (nodeRunning) {
             const spinner = createSpinner('Checking node status...').start();
-            const response = await runCommand('curl http://localhost:8080/api/codex/v1/debug/info -w \'\\n\'');
+            const response = await runCommand('curl http://localhost:8080/api/codex/v1/debug/info');
             spinner.success();
             
             const data = JSON.parse(response);
diff --git a/win.md b/win.md
index 4e51741..0f82bb3 100644
--- a/win.md
+++ b/win.md
@@ -3,7 +3,12 @@
 ## Setup
 - Download and run Nodejs installer 'node-v22.14.0-x64.msi' from https://nodejs.org/en/download
 
-## CMD (not powershell) 
+## Enable npm for powershell
+- Open ps in admin mode
+- Run `Set-ExecutionPolicy -ExecutionPolicy RemoteSigned`
+- Close admin ps
+
+## Powershell
 - 'node --version' returns 'v22.14.0`
 - 'npm --version' returns '10.9.2'