gitarsenal-cli 1.9.7 → 1.9.9

package/.venv_status.json

@@ -1 +1 @@
-{"created":"2025-08-03T18:14:08.672Z","packages":["modal","gitingest","requests"],"uv_version":"uv 0.8.4 (e176e1714 2025-07-30)"}
+{"created":"2025-08-04T08:44:42.614Z","packages":["modal","gitingest","requests"],"uv_version":"uv 0.8.4 (e176e1714 2025-07-30)"}

package/bin/gitarsenal.js

@@ -105,22 +105,19 @@ function activateVirtualEnvironment() {
 }
 
 // Function to send user data to web application
-async function sendUserData(userId, userName, command, repoUrl = null, success = true, error = null) {
+async function sendUserData(userId, userName) {
   try {
+    console.log(chalk.blue(`🔗 Attempting to register user: ${userName} (${userId})`));
+    
     const userData = {
-      userId,
-      userName,
-      command,
-      repoUrl,
-      success,
-      error,
-      timestamp: new Date().toISOString()
+      email: userId,  // Use userId as email (assuming it's an email)
+      name: userName
     };
 
     const data = JSON.stringify(userData);
     
     // Get webhook URL from config or use default
-    let webhookUrl = 'https://gitarsenal.dev/api/users/cli-log';
+    let webhookUrl = 'https://www.gitarsenal.dev/api/users';
     const configPath = path.join(__dirname, '..', 'config.json');
     if (fs.existsSync(configPath)) {
       try {
@@ -129,10 +126,13 @@ async function sendUserData(userId, userName, command, repoUrl = null, success =
           webhookUrl = config.webhookUrl;
         }
       } catch (error) {
-        // Use default URL if config can't be read
+        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,
@@ -141,7 +141,8 @@ async function sendUserData(userId, userName, command, repoUrl = null, success =
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',
-        'Content-Length': Buffer.byteLength(data)
+        'Content-Length': Buffer.byteLength(data),
+        'User-Agent': 'GitArsenal-CLI/1.0'
       }
     };
 
@@ -153,18 +154,31 @@ async function sendUserData(userId, userName, command, repoUrl = null, success =
           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 activity logged to GitArsenal dashboard'));
+            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 log user activity (non-critical)'));
+            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.yellow('⚠️  Could not connect to GitArsenal dashboard (non-critical)'));
+        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();
       });
 
@@ -172,7 +186,7 @@ async function sendUserData(userId, userName, command, repoUrl = null, success =
       req.end();
     });
   } catch (error) {
-    console.log(chalk.yellow('⚠️  Error logging user activity (non-critical)'));
+    console.log(chalk.red(`❌ Error registering user: ${error.message}`));
   }
 }
 
@@ -233,7 +247,7 @@ async function collectUserCredentials(options) {
         const config = {
           userId,
           userName,
-          webhookUrl: 'https://gitarsenal.dev/api/users/cli-log'
+          webhookUrl: 'https://www.gitarsenal.dev/api/users'
         };
         fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
         console.log(chalk.green('✅ Credentials saved to config file'));
@@ -360,14 +374,17 @@ async function runContainerCommand(options) {
     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();
     
     if (!dependenciesOk) {
       spinner.fail('Missing dependencies. Please install them and try again.');
-      // Log failed dependency check
-      await sendUserData(userId, userName, 'dependency-check', null, false, 'Missing dependencies');
       process.exit(1);
     }
     spinner.succeed('Dependencies checked');
@@ -501,7 +518,6 @@ async function runContainerCommand(options) {
 
     // Log command start
     const commandString = `gitarsenal container ${repoUrl ? `--repo ${repoUrl}` : ''} ${gpuType ? `--gpu ${gpuType}` : ''}`;
-    await sendUserData(userId, userName, commandString, repoUrl, true);
 
     // Run the container
     try {
@@ -513,12 +529,7 @@ async function runContainerCommand(options) {
         useApi
       });
       
-      // Log successful completion
-      await sendUserData(userId, userName, commandString, repoUrl, true);
-      
     } catch (containerError) {
-      // Log error
-      await sendUserData(userId, userName, commandString, repoUrl, false, containerError.message);
       throw containerError;
     }
 
@@ -534,6 +545,11 @@ async function handleKeysAdd(options) {
     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;
@@ -588,12 +604,8 @@ async function handleKeysAdd(options) {
     pythonProcess.on('close', async (code) => {
       if (code === 0) {
         spinner.succeed(`API key for ${service} added successfully`);
-        // Log successful key addition
-        await sendUserData(userId, userName, `gitarsenal keys add --service ${service}`, null, true);
       } else {
         spinner.fail(`Failed to add API key: ${output}`);
-        // Log failed key addition
-        await sendUserData(userId, userName, `gitarsenal keys add --service ${service}`, null, false, output);
       }
     });
     
@@ -609,6 +621,11 @@ async function handleKeysList() {
     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
@@ -623,10 +640,8 @@ async function handleKeysList() {
     pythonProcess.on('close', async (code) => {
       if (code !== 0) {
         spinner.fail('Failed to list API keys');
-        await sendUserData(userId, userName, 'gitarsenal keys list', null, false, 'Failed to list API keys');
       } else {
         spinner.stop();
-        await sendUserData(userId, userName, 'gitarsenal keys list', null, true);
       }
     });
     
@@ -642,6 +657,11 @@ async function handleKeysView(options) {
     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;
@@ -672,10 +692,8 @@ async function handleKeysView(options) {
     pythonProcess.on('close', async (code) => {
       if (code !== 0) {
         spinner.fail(`Failed to view API key for ${service}`);
-        await sendUserData(userId, userName, `gitarsenal keys view --service ${service}`, null, false, `Failed to view API key for ${service}`);
       } else {
         spinner.stop();
-        await sendUserData(userId, userName, `gitarsenal keys view --service ${service}`, null, true);
       }
     });
     
@@ -691,6 +709,11 @@ async function handleKeysDelete(options) {
     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;
@@ -721,7 +744,6 @@ async function handleKeysDelete(options) {
     
     if (!confirmAnswer.confirm) {
       console.log(chalk.yellow('Operation cancelled by user.'));
-      await sendUserData(userId, userName, `gitarsenal keys delete --service ${service}`, null, false, 'Operation cancelled by user');
       return;
     }
     
@@ -749,10 +771,8 @@ async function handleKeysDelete(options) {
     pythonProcess.on('close', async (code) => {
       if (code === 0) {
         spinner.succeed(`API key for ${service} deleted successfully`);
-        await sendUserData(userId, userName, `gitarsenal keys delete --service ${service}`, null, true);
       } else {
         spinner.fail(`Failed to delete API key: ${output}`);
-        await sendUserData(userId, userName, `gitarsenal keys delete --service ${service}`, null, false, output);
       }
     });
     

package/config.json

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

package/package.json

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

package/python/auth_manager.py

@@ -203,11 +203,61 @@ 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")
+            
+            # Ensure we have valid email and name
+            if not email or not email.strip():
+                print(f"⚠️ No email provided for user {username}, skipping web app registration")
+                return
+                
+            if not username or not username.strip():
+                print(f"⚠️ No username provided, skipping web app registration")
+                return
+            
+            user_data = {
+                "email": email.strip(),  # Use email as the primary identifier
+                "name": username.strip()  # Use username as the display name
+            }
+            
+            print(f"🔗 Sending user data to web application: {username}")
+            print(f"📦 Data being sent: {user_data}")
+            
+            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 +299,13 @@ class AuthManager:
         if self.save_session(session_data):
             print("✅ Login successful!")
             print(f"Welcome back, {username}!")
+            
+            # Debug: Print user data to see what we have
+            print(f"🔍 User data for web app: username={username}, email={user_data.get('email', 'NOT_FOUND')}")
+            
+            # 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.")