@xaidenlabs/uso 1.1.21 → 1.1.22

package/bin/index.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 const { program } = require('commander');
 const { init } = require('../src/commands/init');
 const { doctor } = require('../src/commands/doctor');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xaidenlabs/uso",
-  "version": "1.1.21",
+  "version": "1.1.22",
   "description": "Universal Solana Orchestrator - A one-command setup tool for Solana and Anchor development environments on Windows, macOS, and Linux.",
   "bin": {
     "uso": "bin/index.js"

package/src/platforms/windows.js

@@ -2,6 +2,7 @@ const shell = require('shelljs');
 const { log, spinner } = require('../utils/logger');
 const fs = require('fs');
 const path = require('path');
+const os = require('os');
 
 const installWindows = async (shouldInstallRust, shouldInstallSolana) => {
     log.header("🪟 Windows detected.");
@@ -41,24 +42,38 @@ const installWindows = async (shouldInstallRust, shouldInstallSolana) => {
 
         if (!hasCl && hasCppTools) {
             log.warn("⚠️  C++ Build Tools are installed but 'cl.exe' is not in PATH.");
-            log.warn("   You may need to restart your terminal or launch 'Developer Command Prompt for VS'.");
-            // We continue, hoping rustup might find it, but it's risky.
+            log.warn("   This WILL cause Rust installation to fail with error 0xc0e90002 or similar.");
+            log.warn("👉 SOLUTION: Close this terminal and open 'Developer Command Prompt for VS 2022' (or similar).");
+            log.warn("   Then run `uso init` inside that prompt.");
+            // We give a chance to continue, but valid warning is given.
         }
     }
 
+    // Use specific temp directory to bypass AppLocker on Desktop
+    const tempDir = os.tmpdir();
+    const rustInstallerPath = path.join(tempDir, 'rustup-init.exe');
+    const solanaInstallerPath = path.join(tempDir, 'solana-install.exe');
+
     // 2. Install Rust
     if (shouldInstallRust) {
         log.info("🦀 Installing Rust (rustup-init.exe)...");
-        shell.exec('powershell -Command "Invoke-WebRequest -Uri https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe -OutFile rustup-init.exe"');
+        log.info(`   Downloading to: ${rustInstallerPath}`);
+
+        shell.exec(`powershell -Command "Invoke-WebRequest -Uri https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe -OutFile '${rustInstallerPath}'"`);
 
         // Unblock the file (Robust)
-        const unblock = shell.exec('powershell -Command "Unblock-File -Path rustup-init.exe"');
+        log.info("ℹ️ Debug: Attempting to unblock rustup-init.exe...");
+        const unblock = shell.exec(`powershell -Command "Unblock-File -Path '${rustInstallerPath}'"`);
+
         if (unblock.code !== 0) {
             log.warn("⚠️  Failed to unblock rustup-init.exe. Trying elevated...");
-            shell.exec('powershell -Command "Start-Process powershell -ArgumentList \'Unblock-File -Path rustup-init.exe\' -Verb RunAs -Wait"');
+            shell.exec(`powershell -Command "Start-Process powershell -ArgumentList 'Unblock-File -Path \\"${rustInstallerPath}\\"' -Verb RunAs -Wait"`);
+        } else {
+            log.info("ℹ️ Debug: Successfully unblocked rustup-init.exe");
         }
 
-        const rustInstall = shell.exec('powershell -Command "./rustup-init.exe -y"');
+        // Run from temp
+        const rustInstall = shell.exec(`powershell -Command "& '${rustInstallerPath}' -y"`);
 
         if (rustInstall.code !== 0) {
             log.warn("⚠️  Rust installer finished with a non-zero code. It might have succeeded if you saw 'Rust is installed now'.");
@@ -66,8 +81,8 @@ const installWindows = async (shouldInstallRust, shouldInstallSolana) => {
             log.success("✅ Rust installed.");
         }
 
-        if (fs.existsSync('rustup-init.exe')) {
-            shell.rm('rustup-init.exe');
+        if (fs.existsSync(rustInstallerPath)) {
+            try { fs.unlinkSync(rustInstallerPath); } catch (e) { }
         }
     } else {
         log.info("🦀 Rust is already installed. Skipping.");
@@ -76,16 +91,20 @@ const installWindows = async (shouldInstallRust, shouldInstallSolana) => {
     // 3. Install Solana CLI (Agave)
     if (shouldInstallSolana) {
         log.info("☀️ Installing Solana CLI (Agave)...");
-        log.info("   Downloading solana-install-init.exe...");
+        log.info(`   Downloading to: ${solanaInstallerPath}`);
 
-        const downloadCmd = 'powershell -Command "Invoke-WebRequest -Uri https://release.anza.xyz/stable/solana-install-init-x86_64-pc-windows-msvc.exe -OutFile solana-install.exe"';
+        const downloadCmd = `powershell -Command "Invoke-WebRequest -Uri https://release.anza.xyz/stable/solana-install-init-x86_64-pc-windows-msvc.exe -OutFile '${solanaInstallerPath}'"`;
         const dlResult = shell.exec(downloadCmd);
 
         // Unblock the file (Robust)
-        const unblockSolana = shell.exec('powershell -Command "Unblock-File -Path solana-install.exe"');
+        log.info("ℹ️ Debug: Attempting to unblock solana-install.exe...");
+        const unblockSolana = shell.exec(`powershell -Command "Unblock-File -Path '${solanaInstallerPath}'"`);
+
         if (unblockSolana.code !== 0) {
             log.warn("⚠️  Failed to unblock solana-install.exe via Unblock-File. Trying elevated...");
-            shell.exec('powershell -Command "Start-Process powershell -ArgumentList \'Unblock-File -Path solana-install.exe\' -Verb RunAs -Wait"');
+            shell.exec(`powershell -Command "Start-Process powershell -ArgumentList 'Unblock-File -Path \\"${solanaInstallerPath}\\"' -Verb RunAs -Wait"`);
+        } else {
+            log.info("ℹ️ Debug: Successfully unblocked solana-install.exe");
         }
 
         if (dlResult.code !== 0) {
@@ -94,23 +113,21 @@ const installWindows = async (shouldInstallRust, shouldInstallSolana) => {
         }
 
         // Try regular install first
-        // Try regular install first (Silently to catch 1314 error without scaring user)
         log.info("   Running Solana Installer...");
-        const installResult = shell.exec('solana-install.exe stable', { silent: true });
+        const installResult = shell.exec(`"${solanaInstallerPath}" stable`, { silent: true });
 
         // Check for Symlink Error (1314) for potential auto-elevation
         if (installResult.code !== 0) {
             const output = installResult.stderr + installResult.stdout;
 
-            if (output.includes("os error 1314")) {
-                log.info("ℹ️  Privilege escalation required for symlinks.");
+            if (output.includes("os error 1314") || output.includes("blocked by your organization") || output.includes("Device Guard") || output.includes("Application Control policy")) {
+                log.info("ℹ️  Privilege escalation required (Symlinks or Device Guard).");
                 log.info("🛡️  Triggering Run as Administrator (UAC)...");
                 log.info("👉 Please click 'Yes' in the popup window to allow the installer.");
 
-                const absPath = path.resolve('solana-install.exe');
                 // Use Start-Process with -Verb RunAs to trigger elevation
                 // -Wait ensures we actually wait for it to finish
-                const elevateCmd = `powershell -Command "Start-Process -FilePath '${absPath}' -ArgumentList 'stable' -Verb RunAs -Wait"`;
+                const elevateCmd = `powershell -Command "Start-Process -FilePath '${solanaInstallerPath}' -ArgumentList 'stable' -Verb RunAs -Wait"`;
 
                 const elevatedRun = shell.exec(elevateCmd);
 
@@ -134,8 +151,8 @@ const installWindows = async (shouldInstallRust, shouldInstallSolana) => {
             log.success("✅ Solana CLI installed.");
         }
 
-        if (fs.existsSync('solana-install.exe')) {
-            shell.rm('solana-install.exe');
+        if (fs.existsSync(solanaInstallerPath)) {
+            try { fs.unlinkSync(solanaInstallerPath); } catch (e) { }
         }
     } else {
         log.info("☀️ Solana CLI is already installed. Skipping.");