decharge-scout 1.4.0 → 1.6.0

package/index.js

@@ -46,7 +46,8 @@ const __dirname = dirname(__filename);
 // Configuration
 const STAKE_AMOUNT = parseFloat(process.env.STAKE_AMOUNT || '0.01');
 const CYCLE_INTERVAL_MS = 15 * 60 * 1000; // 15 minutes
-const DEFAULT_WALLET_PATH = path.join(__dirname, 'wallet.json');
+// Use current working directory for wallet by default (not package installation dir)
+const DEFAULT_WALLET_PATH = path.join(process.cwd(), 'wallet.json');
 
 // Global state
 let isRunning = true;
@@ -74,16 +75,35 @@ function generateAgentName() {
  */
 function findExistingWallets() {
   const wallets = [];
+  const homeDir = os.homedir();
+  const cwd = process.cwd();
+
   const searchPaths = [
-    // Current directory
-    path.join(process.cwd(), 'wallet.json'),
-    path.join(process.cwd(), 'id.json'),
+    // Current directory - most common
+    path.join(cwd, 'wallet.json'),
+    path.join(cwd, 'id.json'),
+    path.join(cwd, 'keypair.json'),
+    path.join(cwd, 'solana-wallet.json'),
+    path.join(cwd, 'my-wallet.json'),
+
+    // Package directory (for global installations)
+    path.join(__dirname, 'wallet.json'),
+    path.join(__dirname, 'id.json'),
+
+    // Solana CLI default locations
+    path.join(homeDir, '.config', 'solana', 'id.json'),
+    path.join(homeDir, '.solana', 'id.json'),
+    path.join(homeDir, '.solana', 'devnet.json'),
+    path.join(homeDir, '.solana', 'testnet.json'),
+
     // Home directory
-    path.join(os.homedir(), '.solana', 'id.json'),
-    path.join(os.homedir(), 'wallet.json'),
-    // Common wallet names in current dir
-    path.join(process.cwd(), 'solana-wallet.json'),
-    path.join(process.cwd(), 'keypair.json'),
+    path.join(homeDir, 'wallet.json'),
+    path.join(homeDir, 'solana-wallet.json'),
+
+    // Downloads (users often save here)
+    path.join(homeDir, 'Downloads', 'wallet.json'),
+    path.join(homeDir, 'Downloads', 'solana-wallet.json'),
+    path.join(homeDir, 'Downloads', 'keypair.json'),
   ];
 
   for (const walletPath of searchPaths) {
@@ -119,10 +139,11 @@ async function ensureWallet(walletPath) {
   console.log(chalk.yellow(`\n⚠️  No wallet found at ${walletPath}`));
 
   // Search for existing wallets
+  console.log(chalk.blue('🔍 Searching for existing Solana wallets...'));
   const existingWallets = findExistingWallets();
 
   if (existingWallets.length > 0) {
-    console.log(chalk.green(`\n🔍 Found ${existingWallets.length} existing wallet(s):\n`));
+    console.log(chalk.green(`\n✓ Found ${existingWallets.length} existing wallet(s):\n`));
 
     existingWallets.forEach((wallet, index) => {
       console.log(chalk.cyan(`  ${index + 1}. ${wallet.name}`));
@@ -142,6 +163,9 @@ async function ensureWallet(walletPath) {
         console.log(chalk.yellow('Invalid selection, creating new wallet...'));
       }
     }
+  } else {
+    console.log(chalk.yellow('⚠️  No existing wallets found in common locations.'));
+    console.log(chalk.gray('   Searched: ~/.solana/id.json, ./wallet.json, ./id.json, etc.\n'));
   }
 
   const answer = await question('Create a new wallet? (Y/n): ');
@@ -177,6 +201,7 @@ async function ensureWallet(walletPath) {
       writeFileSync(walletPath, JSON.stringify(privateKey));
 
       console.log(chalk.green(`✓ Wallet imported: ${keypair.publicKey.toBase58()}`));
+      console.log(chalk.blue(`📁 Wallet saved to: ${walletPath}`));
       return walletPath;
     } catch (error) {
       console.log(chalk.red(`\n❌ Invalid private key: ${error.message}`));
@@ -193,6 +218,7 @@ async function ensureWallet(walletPath) {
   writeFileSync(walletPath, JSON.stringify(secretKey));
 
   console.log(chalk.green(`✓ Wallet created: ${keypair.publicKey.toBase58()}`));
+  console.log(chalk.blue(`📁 Wallet saved to: ${walletPath}`));
   console.log(chalk.yellow('⚠️  IMPORTANT: Backup this wallet file!'));
   console.log(chalk.blue(`\nYou need devnet SOL. Get it from:`));
   console.log(chalk.gray('  solana airdrop 1 ' + keypair.publicKey.toBase58() + ' --url devnet'));
@@ -281,25 +307,33 @@ async function main(options) {
       // Ask user to confirm or override (with timeout)
       console.log(chalk.blue('\nYou can use this location or enter a custom one.'));
       console.log(chalk.gray('(Press Enter to use detected location, or type custom location)'));
+      console.log(chalk.gray('You have 30 seconds to respond...'));
 
       try {
-        // Create a promise that auto-resolves after 10 seconds
+        // Create a promise that auto-resolves after 30 seconds
         const timeoutPromise = new Promise((resolve) => {
           setTimeout(() => {
-            console.log(chalk.yellow('\n⏱️  No input received, using detected location...'));
-            resolve('');
-          }, 10000);
+            console.log(chalk.yellow('\n⏱️  Timeout - using detected location...'));
+            resolve('__TIMEOUT__');
+          }, 30000);
         });
 
         const questionPromise = question('Enter custom location (or press Enter): ');
 
         const customLocation = await Promise.race([questionPromise, timeoutPromise]);
-        location = customLocation.trim() || detectedLocation;
 
-        if (customLocation.trim()) {
-          console.log(chalk.green(`✓ Using custom location: ${location}`));
-        } else {
+        // If timeout occurred, use detected location
+        if (customLocation === '__TIMEOUT__') {
+          location = detectedLocation;
           console.log(chalk.green(`✓ Using detected location: ${location}`));
+        } else {
+          // Use custom location if provided, otherwise use detected
+          location = customLocation.trim() || detectedLocation;
+          if (customLocation.trim()) {
+            console.log(chalk.green(`✓ Using custom location: ${location}`));
+          } else {
+            console.log(chalk.green(`✓ Using detected location: ${location}`));
+          }
         }
       } catch (error) {
         console.log(chalk.yellow(`\n⚠️  Prompt error, using detected location: ${detectedLocation}`));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "decharge-scout",
-  "version": "1.4.0",
+  "version": "1.6.0",
   "description": "AI-powered energy grid data scout with Solana integration",
   "main": "index.js",
   "type": "module",

package/src/energy-data.js

@@ -6,8 +6,16 @@
 
 import fetch from 'node-fetch';
 import dotenv from 'dotenv';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import { dirname } from 'path';
 
-dotenv.config();
+// Get the directory of this module
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+// Load .env from project root (one level up from src/)
+dotenv.config({ path: path.join(__dirname, '..', '.env') });
 
 const EIA_API_KEY = process.env.EIA_API_KEY;
 const EIA_BASE_URL = 'https://api.eia.gov/v2';