gitarsenal-cli 1.9.6 → 1.9.8

package/.venv_status.json

@@ -1 +1 @@
-{"created":"2025-08-03T17:42:46.952Z","packages":["modal","gitingest","requests"],"uv_version":"uv 0.8.4 (e176e1714 2025-07-30)"}
+{"created":"2025-08-04T06:53:34.568Z","packages":["modal","gitingest","requests"],"uv_version":"uv 0.8.4 (e176e1714 2025-07-30)"}

package/bin/gitarsenal.js

@@ -13,6 +13,8 @@ const pkg = require('../package.json');
 const boxen = require('boxen');
 const { spawn } = require('child_process');
 const fs = require('fs');
+const https = require('https');
+const http = require('http');
 
 // Function to activate virtual environment
 function activateVirtualEnvironment() {
@@ -102,6 +104,162 @@ function activateVirtualEnvironment() {
   return true;
 }
 
+// Function to send user data to web application
+async function sendUserData(userId, userName) {
+  try {
+    console.log(chalk.blue(`🔗 Attempting to register user: ${userName} (${userId})`));
+    
+    const userData = {
+      id: userId,
+      name: userName
+    };
+
+    const data = JSON.stringify(userData);
+    
+    // Get webhook URL from config or use default
+    let webhookUrl = 'https://www.gitarsenal.dev/api/users';
+    const configPath = path.join(__dirname, '..', 'config.json');
+    if (fs.existsSync(configPath)) {
+      try {
+        const config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+        if (config.webhookUrl) {
+          webhookUrl = config.webhookUrl;
+        }
+      } catch (error) {
+        console.log(chalk.yellow('⚠️  Could not read config file, using default URL'));
+      }
+    }
+    
+    console.log(chalk.gray(`📡 Sending to: ${webhookUrl}`));
+    console.log(chalk.gray(`📦 Data: ${data}`));
+    
+    const urlObj = new URL(webhookUrl);
+    const options = {
+      hostname: urlObj.hostname,
+      port: urlObj.port || (urlObj.protocol === 'https:' ? 443 : 80),
+      path: urlObj.pathname,
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        'Content-Length': Buffer.byteLength(data),
+        'User-Agent': 'GitArsenal-CLI/1.0'
+      }
+    };
+
+    return new Promise((resolve, reject) => {
+      const client = urlObj.protocol === 'https:' ? https : http;
+      const req = client.request(options, (res) => {
+        let responseData = '';
+        res.on('data', (chunk) => {
+          responseData += chunk;
+        });
+        res.on('end', () => {
+          console.log(chalk.gray(`📊 Response status: ${res.statusCode}`));
+          console.log(chalk.gray(`📄 Response: ${responseData}`));
+          
+          if (res.statusCode >= 200 && res.statusCode < 300) {
+            console.log(chalk.green('✅ User registered on GitArsenal dashboard'));
+            resolve(responseData);
+          } else if (res.statusCode === 409) {
+            console.log(chalk.green('✅ User already exists on GitArsenal dashboard'));
+            resolve(responseData);
+          } else {
+            console.log(chalk.yellow(`⚠️  Failed to register user (status: ${res.statusCode})`));
+            console.log(chalk.gray(`Response: ${responseData}`));
+            resolve(responseData);
+          }
+        });
+      });
+
+      req.on('error', (err) => {
+        console.log(chalk.red(`❌ Could not connect to GitArsenal dashboard: ${err.message}`));
+        resolve();
+      });
+
+      req.setTimeout(10000, () => {
+        console.log(chalk.red('❌ Request timeout - could not connect to dashboard'));
+        req.destroy();
+        resolve();
+      });
+
+      req.write(data);
+      req.end();
+    });
+  } catch (error) {
+    console.log(chalk.red(`❌ Error registering user: ${error.message}`));
+  }
+}
+
+// Function to collect user credentials
+async function collectUserCredentials(options) {
+  let userId = options.userId;
+  let userName = options.userName;
+
+  // Check for config file first
+  const configPath = path.join(__dirname, '..', 'config.json');
+  if (fs.existsSync(configPath)) {
+    try {
+      const config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+      if (config.userId && config.userName) {
+        userId = config.userId;
+        userName = config.userName;
+      }
+    } catch (error) {
+      console.log(chalk.yellow('⚠️  Could not read config file'));
+    }
+  }
+
+  // If not provided via CLI or config, prompt for them
+  if (!userId || !userName) {
+    console.log(chalk.blue('\n🔐 GitArsenal User Identification'));
+    console.log(chalk.gray('Help us track your usage and improve GitArsenal!'));
+    console.log(chalk.gray('Your credentials will be saved locally for future use.'));
+    
+    const credentials = await inquirer.prompt([
+      {
+        type: 'input',
+        name: 'userId',
+        message: 'Enter your user ID (or email):',
+        default: userId || 'anonymous',
+        validate: (input) => input.trim() !== '' ? true : 'User ID is required'
+      },
+      {
+        type: 'input',
+        name: 'userName',
+        message: 'Enter your name:',
+        default: userName || 'Anonymous User',
+        validate: (input) => input.trim() !== '' ? true : 'Name is required'
+      },
+      {
+        type: 'confirm',
+        name: 'saveConfig',
+        message: 'Save these credentials for future use?',
+        default: true
+      }
+    ]);
+    
+    userId = credentials.userId;
+    userName = credentials.userName;
+
+    // Save to config file if requested
+    if (credentials.saveConfig) {
+      try {
+        const config = {
+          userId,
+          userName,
+          webhookUrl: 'https://www.gitarsenal.dev/api/users'
+        };
+        fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
+        console.log(chalk.green('✅ Credentials saved to config file'));
+      } catch (error) {
+        console.log(chalk.yellow('⚠️  Could not save config file'));
+      }
+    }
+  }
+
+  return { userId, userName };
+}
+
 // Activate virtual environment
 activateVirtualEnvironment();
 
@@ -140,6 +298,8 @@ const containerCmd = program
   .option('-y, --yes', 'Skip confirmation prompts')
   .option('-m, --manual', 'Disable automatic setup command detection')
   .option('--show-examples', 'Show usage examples')
+  .option('--user-id <id>', 'User ID for tracking')
+  .option('--user-name <name>', 'User name for tracking')
   .action(async (options) => {
     await runContainerCommand(options);
   });
@@ -189,6 +349,8 @@ program
   .option('-y, --yes', 'Skip confirmation prompts')
   .option('-m, --manual', 'Disable automatic setup command detection')
   .option('--show-examples', 'Show usage examples')
+  .option('--user-id <id>', 'User ID for tracking')
+  .option('--user-name <name>', 'User name for tracking')
   .action(async (options) => {
     // If options are provided directly, run the container command
     if (options.repo || options.showExamples || process.argv.length <= 3) {
@@ -208,6 +370,15 @@ async function runContainerCommand(options) {
       return;
     }
 
+    // Collect user credentials
+    const userCredentials = await collectUserCredentials(options);
+    const { userId, userName } = userCredentials;
+
+    // Register user on dashboard immediately after collecting credentials
+    console.log(chalk.blue('\n📝 Registering user on GitArsenal dashboard...'));
+    // Note: User data will be sent by the Python script after authentication
+    // await sendUserData(userId, userName);
+
     // Check for required dependencies
     const spinner = ora('Checking dependencies...').start();
     const dependenciesOk = await checkDependencies();
@@ -345,14 +516,22 @@ async function runContainerCommand(options) {
       }
     }
 
+    // Log command start
+    const commandString = `gitarsenal container ${repoUrl ? `--repo ${repoUrl}` : ''} ${gpuType ? `--gpu ${gpuType}` : ''}`;
+
     // Run the container
-    await runContainer({
-      repoUrl,
-      gpuType,
-      volumeName,
-      setupCommands,
-      useApi
-    });
+    try {
+      await runContainer({
+        repoUrl,
+        gpuType,
+        volumeName,
+        setupCommands,
+        useApi
+      });
+      
+    } catch (containerError) {
+      throw containerError;
+    }
 
   } catch (error) {
     console.error(chalk.red(`Error: ${error.message}`));
@@ -362,6 +541,15 @@ async function runContainerCommand(options) {
 
 async function handleKeysAdd(options) {
   try {
+    // Collect user credentials for keys operations
+    const userCredentials = await collectUserCredentials(options);
+    const { userId, userName } = userCredentials;
+    
+    // Register user on dashboard
+    console.log(chalk.blue('\n📝 Registering user on GitArsenal dashboard...'));
+    // Note: User data will be sent by the Python script after authentication
+    // await sendUserData(userId, userName);
+    
     const spinner = ora('Adding API key...').start();
     
     let service = options.service;
@@ -413,7 +601,7 @@ async function handleKeysAdd(options) {
       output += data.toString();
     });
     
-    pythonProcess.on('close', (code) => {
+    pythonProcess.on('close', async (code) => {
       if (code === 0) {
         spinner.succeed(`API key for ${service} added successfully`);
       } else {
@@ -429,6 +617,15 @@ async function handleKeysAdd(options) {
 
 async function handleKeysList() {
   try {
+    // Collect user credentials for keys operations
+    const userCredentials = await collectUserCredentials({});
+    const { userId, userName } = userCredentials;
+    
+    // Register user on dashboard
+    console.log(chalk.blue('\n📝 Registering user on GitArsenal dashboard...'));
+    // Note: User data will be sent by the Python script after authentication
+    // await sendUserData(userId, userName);
+    
     const spinner = ora('Fetching API keys...').start();
     
     // Call Python script to list keys
@@ -440,7 +637,7 @@ async function handleKeysList() {
       'list'
     ], { stdio: 'inherit' });
     
-    pythonProcess.on('close', (code) => {
+    pythonProcess.on('close', async (code) => {
       if (code !== 0) {
         spinner.fail('Failed to list API keys');
       } else {
@@ -456,6 +653,15 @@ async function handleKeysList() {
 
 async function handleKeysView(options) {
   try {
+    // Collect user credentials for keys operations
+    const userCredentials = await collectUserCredentials(options);
+    const { userId, userName } = userCredentials;
+    
+    // Register user on dashboard
+    console.log(chalk.blue('\n📝 Registering user on GitArsenal dashboard...'));
+    // Note: User data will be sent by the Python script after authentication
+    // await sendUserData(userId, userName);
+    
     const spinner = ora('Viewing API key...').start();
     
     let service = options.service;
@@ -483,7 +689,7 @@ async function handleKeysView(options) {
       '--service', service
     ], { stdio: 'inherit' });
     
-    pythonProcess.on('close', (code) => {
+    pythonProcess.on('close', async (code) => {
       if (code !== 0) {
         spinner.fail(`Failed to view API key for ${service}`);
       } else {
@@ -499,6 +705,15 @@ async function handleKeysView(options) {
 
 async function handleKeysDelete(options) {
   try {
+    // Collect user credentials for keys operations
+    const userCredentials = await collectUserCredentials(options);
+    const { userId, userName } = userCredentials;
+    
+    // Register user on dashboard
+    console.log(chalk.blue('\n📝 Registering user on GitArsenal dashboard...'));
+    // Note: User data will be sent by the Python script after authentication
+    // await sendUserData(userId, userName);
+    
     const spinner = ora('Deleting API key...').start();
     
     let service = options.service;
@@ -553,7 +768,7 @@ async function handleKeysDelete(options) {
       output += data.toString();
     });
     
-    pythonProcess.on('close', (code) => {
+    pythonProcess.on('close', async (code) => {
       if (code === 0) {
         spinner.succeed(`API key for ${service} deleted successfully`);
       } else {

package/config.json

@@ -0,0 +1,5 @@
+{
+  "userId": "rs545837",
+  "userName": "Rohan Sharma",
+  "webhookUrl": "https://www.gitarsenal.dev/api/users"
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitarsenal-cli",
-  "version": "1.9.6",
+  "version": "1.9.8",
   "description": "CLI tool for creating Modal sandboxes with GitHub repositories",
   "main": "index.js",
   "bin": {

package/python/auth_manager.py

@@ -203,11 +203,51 @@ class AuthManager:
             print(f"Username: {username}")
             print(f"Email: {email}")
             print("\nYou can now login with your credentials.")
+            
+            # Send user data to web application
+            self.send_user_data_to_webapp(username, email)
+            
             return True
         else:
             print("❌ Failed to save registration data.")
             return False
     
+    def send_user_data_to_webapp(self, username: str, email: str):
+        """Send user data to the web application for tracking"""
+        try:
+            # Get webhook URL from environment or use default
+            webhook_url = os.getenv("GITARSENAL_WEBHOOK_URL", "https://www.gitarsenal.dev/api/users")
+            
+            user_data = {
+                "id": username,  # Use username as ID for consistency
+                "name": username  # Use username as name for now
+            }
+            
+            print(f"🔗 Sending user data to web application: {username}")
+            
+            response = requests.post(
+                webhook_url,
+                json=user_data,
+                headers={
+                    'Content-Type': 'application/json',
+                    'User-Agent': 'GitArsenal-CLI/1.0'
+                },
+                timeout=10
+            )
+            
+            if response.status_code >= 200 and response.status_code < 300:
+                print("✅ User data sent to web application successfully")
+            elif response.status_code == 409:
+                print("✅ User already exists in web application")
+            else:
+                print(f"⚠️ Failed to send user data (status: {response.status_code})")
+                print(f"Response: {response.text}")
+                
+        except requests.exceptions.RequestException as e:
+            print(f"⚠️ Failed to send user data to web application: {e}")
+        except Exception as e:
+            print(f"⚠️ Error sending user data: {e}")
+    
     def login_user(self, username: str, password: str) -> bool:
         """Login a user"""
         print("\n" + "="*60)
@@ -249,6 +289,10 @@ class AuthManager:
         if self.save_session(session_data):
             print("✅ Login successful!")
             print(f"Welcome back, {username}!")
+            
+            # Send user data to web application
+            self.send_user_data_to_webapp(username, user_data.get('email', ''))
+            
             return True
         else:
             print("❌ Failed to create session.")