@xaidenlabs/uso 1.1.30 → 1.1.33

package/bin/index.js

@@ -28,10 +28,6 @@ program
     .description('Verify installation by building a test Anchor project')
     .action(verify);
 
-program
-    .command('create <project_name>')
-    .description('Scaffold a new Anchor project')
-    .action(create);
 
 program
     .command('build')
@@ -59,6 +55,11 @@ program
     .allowUnknownOption() // Allow flags like --reset
     .action(validator);
 
+program
+    .command('create <projectName>')
+    .description('Scaffold a new Solana project with Next.js frontend')
+    .action(create);
+
 program
     .command('clean')
     .description('Clean the project (wraps "anchor clean")')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xaidenlabs/uso",
-  "version": "1.1.30",
+  "version": "1.1.33",
   "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/commands/create.js

@@ -1,128 +1,104 @@
+const shell = require('shelljs');
+const chalk = require('chalk');
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
-const shell = require('shelljs');
 const { log, spinner } = require('../utils/logger');
 
-const create = async (projectName) => {
-    if (!projectName) {
-        log.error("❌ Please provide a project name: uso create <project-name>");
+const create = async (projectName, options) => {
+    // 1. Validation
+    if (!shell.which('anchor')) {
+        log.error("❌ 'anchor' is not found in PATH.");
+        log.warn("👉 Run 'uso init' to install the Solana toolchain.");
         return;
     }
-
-    // Validate project name (basic check for valid folder name)
-    if (!/^[a-z0-9-_]+$/.test(projectName)) {
-        log.error("❌ Project name can only contain lowercase letters, numbers, hyphens, and underscores.");
+    if (!projectName) {
+        log.error("❌ Please specify a project name.");
+        log.warn("👉 Usage: uso create <project-name>");
         return;
     }
 
-    const targetDir = path.resolve(process.cwd(), projectName);
-    if (fs.existsSync(targetDir)) {
+    if (fs.existsSync(projectName)) {
         log.error(`❌ Directory '${projectName}' already exists.`);
         return;
     }
 
-    log.header(`🏗️  Scaffolding new project: ${projectName}`);
-
-    // 1. Copy Template
-    const templateDir = path.resolve(__dirname, '../../templates/default');
-    const spin = spinner('Copying template files...').start();
+    log.header(`🏗️  Scaffolding new Solana project: ${projectName}...`);
 
-    try {
-        shell.cp('-R', templateDir, targetDir);
-        spin.succeed('Template copied.');
-    } catch (e) {
-        spin.fail('Failed to copy template.');
-        log.error(e.message);
-        return;
-    }
+    // 2. Ensure Wallet Keypair Exists
+    const keypairPath = path.join(os.homedir(), '.config', 'solana', 'id.json');
+    if (!fs.existsSync(keypairPath)) {
+        log.info("🔑 No default wallet found. Generating one for you...");
+        const keyDir = path.dirname(keypairPath);
+        if (!fs.existsSync(keyDir)) shell.mkdir('-p', keyDir);
 
-    // 1b. Add Windows Defender exclusion for the project directory (prevents build blocks)
-    if (os.platform() === 'win32') {
-        const defSpin = spinner('Adding Windows Defender exclusion...').start();
-        const cargoHome = path.join(os.homedir(), '.cargo');
-        const cmd = `powershell -Command "Start-Process powershell -ArgumentList '-NoProfile', '-Command', 'Add-MpPreference -ExclusionPath \\\"${targetDir.replace(/\\/g, '\\\\')}\\\"; Add-MpPreference -ExclusionPath \\\"${cargoHome.replace(/\\/g, '\\\\')}\\\"' -Verb RunAs -WindowStyle Hidden -Wait"`;
-        const defResult = shell.exec(cmd, { silent: true });
-        if (defResult.code === 0) {
-            defSpin.succeed('Defender exclusion added (builds won\'t be blocked).');
-        } else {
-            defSpin.warn('Could not add Defender exclusion. Builds may be blocked by antivirus.');
+        if (shell.exec('solana-keygen new --no-bip39-passphrase --outfile "' + keypairPath + '"').code !== 0) {
+            log.error("❌ Failed to generate wallet keypair.");
+            return;
         }
+        log.success(`✅ Wallet created at: ${keypairPath}`);
     }
 
-    // 2. Customize Project (Rename files and content)
-    log.info("✏️  Customizing project details...");
+    // 3. Run Anchor Init
+    const initSpin = spinner(`Initializing Anchor project '${projectName}'...`).start();
+    // --javascript flag used to be common, but now TypeScript is default.
+    // We just run init.
+    if (shell.exec(`anchor init ${projectName}`).code !== 0) {
+        initSpin.fail("Failed to initialize Anchor project.");
+        return;
+    }
+    initSpin.succeed("Anchor project initialized.");
 
-    // Rename programs/my-project to programs/<project-name>
-    // Note: Rust crate names typically use underscores, not hyphens.
-    const crateName = projectName.replace(/-/g, '_');
+    const projectPath = path.join(process.cwd(), projectName);
+    shell.cd(projectPath);
 
-    const oldProgramDir = path.join(targetDir, 'programs', 'my-project');
-    const newProgramDir = path.join(targetDir, 'programs', crateName);
+    // 4. Inject Frontend Template
+    // We'll use the official Solana dApp Scaffold (Next.js + Tailwind)
+    const templateRepo = "https://github.com/solana-developers/dapp-scaffold-4"; // A popular one, or we can use a simpler one.
+    // Let's use a reliable Next.js starter.
+    // "solana-lab/dapp-scaffold" is deprecated/archived.
+    // "solana-developers/solana-dapp-next" is good.
+    const frontendRepo = "https://github.com/solana-developers/solana-dapp-next.git";
 
-    // Rename tests/my-project.ts to tests/<project-name>.ts
-    const oldTestFile = path.join(targetDir, 'tests', 'my-project.ts');
-    const newTestFile = path.join(targetDir, 'tests', `${projectName}.ts`);
+    log.info("🧬 Injecting Next.js frontend (Solana Adapter + Tailwind)...");
 
-    try {
-        if (fs.existsSync(oldProgramDir)) {
-            fs.renameSync(oldProgramDir, newProgramDir);
-        }
-        if (fs.existsSync(oldTestFile)) {
-            fs.renameSync(oldTestFile, newTestFile);
-        }
-
-        // Replace placeholders in files
-        const replaceInFile = (filePath, searchValue, replaceValue) => {
-            if (fs.existsSync(filePath)) {
-                let content = fs.readFileSync(filePath, 'utf8');
-                // Global replace
-                const regex = new RegExp(searchValue, 'g');
-                content = content.replace(regex, replaceValue);
-                fs.writeFileSync(filePath, content, 'utf8');
-            }
-        };
-
-        // Update Anchor.toml
-        replaceInFile(path.join(targetDir, 'Anchor.toml'), 'my_project', crateName);
-
-        // Update Cargo.toml
-        replaceInFile(path.join(newProgramDir, 'Cargo.toml'), 'my-project', projectName);
-        replaceInFile(path.join(newProgramDir, 'Cargo.toml'), 'my_project', crateName);
-
-        // Update lib.rs (if specific project name usage exists beyond mod name which is file-based in lib.rs typically, but here we defined inside lib.rs)
-        // Actually, in lib.rs: pub mod my_project -> pub mod crate_name
-        replaceInFile(path.join(newProgramDir, 'src', 'lib.rs'), 'my_project', crateName);
-
-        // Update test file
-        replaceInFile(newTestFile, 'my-project', projectName); // describe("my-project")
-        replaceInFile(newTestFile, 'my_project', crateName); // import ... "../target/types/my_project"
-
-        // Update class name in test file (MyProject -> ProjectNamePascalCase)
-        const toPascalCase = (str) => {
-            return str.match(/[a-z0-9]+/gi)
-                .map(word => word.charAt(0).toUpperCase() + word.substr(1).toLowerCase())
-                .join('');
-        };
-        const pascalName = toPascalCase(projectName);
-        replaceInFile(newTestFile, 'MyProject', pascalName);
-
-    } catch (e) {
-        log.error(`❌ Failed during customization: ${e.message}`);
-        // clean up? maybe not, let user see what happened
-        return;
+    // Remove existing app folder if anchor created it (usually it doesn't)
+    if (fs.existsSync('app')) {
+        shell.rm('-rf', 'app');
     }
 
-    // 4. Generate Keypair if needed? 
-    // Anchor usually handles this on first build, but let's check if they have a wallet.
-    // We won't force it here, "uso init" or "uso verify" handles wallet creation.
+    const cloneSpin = spinner("Cloning frontend template...").start();
+    if (shell.exec(`git clone ${frontendRepo} app`).code !== 0) {
+        cloneSpin.fail("Failed to clone frontend template.");
+        log.warn("⚠️  Proceeding with backend only.");
+    } else {
+        cloneSpin.succeed("Frontend template injected into ./app");
+        // Remove .git from the frontend so it's part of the main repo
+        shell.rm('-rf', path.join('app', '.git'));
+
+        // Installing dependencies for frontend is slow, maybe skip or ask user?
+        // Let's print instructions instead to be fast.
+    }
 
-    log.header("\n🎉 Project Created Successfully!");
-    log.info(`\n👉 Next steps:\n`);
-    log.info(`   cd ${projectName}`);
-    log.info(`   npm install`);
-    log.info(`   uso test`);
-    log.info(`\nHappy building! 🚀`);
+    // 5. Configure Anchor.toml for Local Development
+    // (Optional: depending on what 'anchor init' generates, we might want to ensure seeds=false or similar)
+    // For now, standard init is usually fine.
+
+    // 6. Final Success Message
+    console.log("");
+    log.header(`✅ Project '${projectName}' is ready! 🚀`);
+
+    log.subHeader("Quick Start:");
+    console.log(chalk.yellow(`  cd ${projectName}`));
+    console.log(chalk.yellow(`  uso val     `) + chalk.gray(" # Start local validator (in new terminal)"));
+    console.log(chalk.yellow(`  uso test    `) + chalk.gray(" # Build & run tests"));
+    console.log("");
+
+    log.subHeader("Frontend:");
+    console.log(chalk.yellow(`  cd app`));
+    console.log(chalk.yellow(`  npm install`));
+    console.log(chalk.yellow(`  npm run dev`));
+    console.log("");
 };
 
 module.exports = { create };

package/src/commands/workflow.js

@@ -168,7 +168,7 @@ const airdrop = (amount, recipient) => {
     return runProxyCommand('airdrop', args, 'solana');
 };
 
-const validator = (args = []) => {
+const validator = async (args = []) => {
     if (!shell.which('solana-test-validator')) {
         log.error("❌ 'solana-test-validator' is not found in PATH.");
         log.warn("👉 Run 'uso init' to install it.");
@@ -186,8 +186,35 @@ const validator = (args = []) => {
     log.header(`🚀 Starting Solana Test Validator (${fullCmd})...`);
     log.info("👉 Press Ctrl+C to stop it.");
 
-    // Run without capturing output so it streams to console
-    shell.exec(fullCmd);
+    // Run and capture exit code
+    // We use shell.exec, which blocks. If it runs successfully, it blocks until user Ctrl+C.
+    // If it fails immediately (like Access Denied), it returns execution object.
+    const execution = shell.exec(fullCmd);
+
+    if (execution.code !== 0) {
+        const output = (execution.stderr || '') + (execution.stdout || '');
+        if (output.includes('Access is denied') || output.includes('os error 5')) {
+            log.warn("⚠️  Validator failed (Access Denied). Retrying with Administrator privileges...");
+
+            // Extract optional flags from args if any
+            const flags = Array.isArray(args) ? args : [];
+            // Run Elevated: binary='solana-test-validator', command='', args=flags
+            // await runElevatedWithProgress('', flags, 'solana-test-validator');
+
+            // Use Fire-and-Forget for validator (interactive/long-running)
+            // We don't want to capture logs, we want the user to see the new window.
+            const flagStr = flags.join(' ');
+            const targetCmd = `solana-test-validator ${flagStr}`;
+
+            log.info(`🚀 Spawning visible Administrator terminal for '${targetCmd}'...`);
+            log.warn("👉 A new window will appear. Keep it open to run the validator!");
+
+            const psCmd = `powershell -Command "Start-Process powershell -ArgumentList '-NoExit', '-Command', '& ${targetCmd}' -Verb RunAs"`;
+            shell.exec(psCmd);
+
+            log.success("✅ Validator launch sequence initiated.");
+        }
+    }
 };
 
 const unblock = () => {