thinkncollab-cli 0.0.89 → 0.0.91

package/commands/myTask.js

@@ -24,15 +24,16 @@ function getAuthData() {
 }
 
 // -----------------------------
-// Main Function
+// Main Function - with limit parameter
 // -----------------------------
-async function myTask() {
+async function myTask(limit = 5) {
   try {
     const { email, token } = getAuthData();
-
+    const machineId = machine.machineIdSync();
+    
     const CWD = process.cwd();
     const metaDataPath = path.join(CWD, ".tnc", ".tncmeta.json");
-
+    
     if (!fs.existsSync(metaDataPath)) {
       console.log(chalk.yellow("⚠️ Room metadata not found in current directory!"));
       return;
@@ -46,95 +47,167 @@ async function myTask() {
 
     const cacheFile = path.join(cacheDir, "tasks.json");
 
-    let tasks = [];
+    let userTasks = [];
+    let recommendations = [];
 
     try {
+      console.log(chalk.blue("🔄 Fetching from server..."));
+      
+      // FIX: Headers me bhejo - safe!
       const res = await axios.get(`${url}/${roomId}`, {
         params: {
-          email,
-          token,
-          machineId: machine.machineIdSync()
-        }
+          n: limit,  // sirf n query me
+          format: 'json'
+        },
+        headers: {
+          'x-user-email': email,
+          'x-user-token': token,
+          'x-machine-id': machineId,
+          'User-Agent': 'tnc-cli/1.0'
+        },
+        timeout: 5000
       });
 
-      tasks = res.data.tasks || [];
+      console.log(chalk.green("✅ Server response received!"));
+
+      // Server sends userTasks and recommendations
+      userTasks = res.data.userTasks || [];
+      recommendations = res.data.recommendations?.topTasks || [];
 
-      fs.writeFileSync(cacheFile, JSON.stringify(tasks, null, 2));
+      // Cache ONLY top 5 tasks (combine userTasks + recommendations, take first 5)
+      const top5Tasks = [...userTasks, ...recommendations].slice(0, 5);
+      
+      // Cache the data - sirf top 5
+      fs.writeFileSync(cacheFile, JSON.stringify({
+        userTasks: top5Tasks.filter(t => t.assignedTo?.some(a => a.userId?._id?.toString() === userTasks[0]?.assignedTo?.[0]?.userId?._id?.toString())),
+        recommendations: top5Tasks.filter(t => !t.assignedTo?.some(a => a.userId?._id?.toString() === userTasks[0]?.assignedTo?.[0]?.userId?._id?.toString()))
+      }, null, 2));
+
+      // Display logic...
+      displayTasks(userTasks, recommendations);
 
     } catch (error) {
+      // Offline mode...
+      console.log(chalk.red(`❌ Server error: ${error.message}`));
+      if (error.code === 'ECONNREFUSED') {
+        console.log(chalk.red(`🚨 Server not running at ${url}`));
+        console.log(chalk.yellow("💡 Start server: npm start"));
+      } else if (error.response?.status === 401) {
+        console.log(chalk.red("🔒 Unauthorized! Token expired or invalid."));
+        console.log(chalk.yellow("💡 Please login again: tnc-cli login"));
+      }
+      
       if (fs.existsSync(cacheFile)) {
         console.log(chalk.yellow("⚠️ Offline mode: showing cached tasks"));
-        tasks = JSON.parse(fs.readFileSync(cacheFile, "utf-8"));
+        const cached = JSON.parse(fs.readFileSync(cacheFile, "utf-8"));
+        userTasks = cached.userTasks || [];
+        recommendations = cached.recommendations || [];
+        displayTasks(userTasks, recommendations);
       } else {
-        console.error(
-          chalk.red("❌ Error fetching tasks and no cache available:"),
-          error.response?.data || error.message
-        );
-        return;
+        console.log(chalk.gray("📭 No cached tasks available."));
       }
     }
-
-    if (!tasks.length) {
-      console.log(chalk.gray("📭 No tasks assigned."));
-      return;
-    }
-
-    // -----------------------------
-    // Create Table
-    // -----------------------------
-const table = new CliTable3({
-  head: [
-    chalk.cyan.bold("Title"),
-    chalk.green.bold("Status"),
-    chalk.magenta.bold("Category"),
-    chalk.red.bold("Priority"),
-    chalk.yellow.bold("ID"),
-    chalk.blue.bold("Att.")
-  ],
-  colWidths: [30, 12, 18, 10, 26, 6], // adjusted
-  wordWrap: true,
-  style: {
-    head: [],
-    border: ["grey"]
+  } catch (error) {
+    console.error(chalk.red("❌ Error:"), error.message);
   }
-});
-
-
-    console.log(chalk.bold.cyan("\n📋 YOUR TASKS\n"));
-
-    tasks.forEach(task => {
-
-      // Status color
-      let statusColor =
-        task.status === "completed"
-          ? chalk.green
-          : task.status === "in-progress"
-          ? chalk.yellow
-          : chalk.red;
+}
 
-      // Priority color
-      let priorityColor =
-        task.priority === "high"
-          ? chalk.red
-          : task.priority === "medium"
-          ? chalk.yellow
-          : chalk.green;
+// Display function
+function displayTasks(userTasks, recommendations) {
+  // Show user tasks
+  if (userTasks.length > 0) {
+    const userTable = new CliTable3({
+      head: [
+        chalk.cyan.bold("Title"),
+        chalk.green.bold("Status"),
+        chalk.magenta.bold("Category"),
+        chalk.red.bold("Priority"),
+        chalk.yellow.bold("ID")
+      ],
+      colWidths: [30, 12, 18, 8, 30],
+      wordWrap: true
+    });
 
-      table.push([
-        chalk.white(task.title),
-        statusColor(task.status),
+    console.log(chalk.bold.cyan("\n📋 YOUR ASSIGNED TASKS\n"));
+    userTasks.forEach(task => {
+      userTable.push([
+        chalk.white(task.title || "Untitled"),
+        task.status === "completed" ? chalk.green(task.status) : 
+          task.status === "in-progress" ? chalk.yellow(task.status) : 
+          task.status === "pending" ? chalk.blue(task.status) : chalk.red(task.status || "unknown"),
         chalk.magenta(task.category || "General"),
-        priorityColor(task.priority || "low"),
-        chalk.gray(task._id),
-        chalk.blue(task.attachments?.length || 0)
+        task.priority === "critical" ? chalk.bgRed.white(" CRITICAL ") :
+          task.priority === "high" ? chalk.red(task.priority) : 
+          task.priority === "medium" ? chalk.yellow(task.priority) : 
+          task.priority === "low" ? chalk.green(task.priority) : chalk.gray("none"),
+        chalk.gray(task._id ? task._id : 'N/A')
       ]);
     });
+    console.log(userTable.toString());
+  }
 
-    console.log(table.toString());
+  // Show recommendations
+  if (recommendations.length > 0) {
+  const recTable = new CliTable3({
+    head: [
+      chalk.cyan.bold("Title"),
+      chalk.green.bold("Score"),
+      chalk.blue.bold("Status"),
+      chalk.red.bold("Priority"),
+      chalk.yellow.bold("Due Date"),
+      chalk.magenta.bold("ID")  // ← ID column add kiya
+    ],
+    colWidths: [30, 10, 12, 12, 15, 30],  // ID ke liye width
+    wordWrap: true
+  });
+
+  console.log(chalk.bold.cyan("\n🎯 RECOMMENDED TASKS\n"));
+  
+  recommendations.forEach((task, idx) => {
+    // Status color
+    let statusColor = 
+      task.status === "completed" ? chalk.green("✓ Completed") :
+      task.status === "in-progress" ? chalk.yellow("⟳ In Progress") :
+      task.status === "pending" ? chalk.blue("⏳ Pending") :
+      task.isOverdue ? chalk.red("⚠️ Overdue") :
+      chalk.gray(task.status || "Unknown");
+
+    recTable.push([
+      chalk.white(task.title || "Untitled"),
+      
+      // Score column
+      task.score >= 80 ? chalk.green.bold(task.score) : 
+        task.score >= 60 ? chalk.yellow(task.score) : 
+        task.score >= 40 ? chalk.hex('#FFA500')(task.score) : chalk.red(task.score || 0),
+      
+      // Status column
+      statusColor,
+      
+      // Priority column  
+      task.priority === "critical" ? chalk.bgRed.white(" CRITICAL ") :
+        task.priority === "high" ? chalk.red(task.priority) :
+        task.priority === "medium" ? chalk.yellow(task.priority) : 
+        task.priority === "low" ? chalk.green(task.priority) : chalk.gray("none"),
+      
+      // Due Date column
+      task.dueDate ? new Date(task.dueDate).toLocaleDateString() : chalk.gray("No date"),
+      
+      // ID column - short version
+      chalk.gray(task._id ? task._id : 'N/A')
+    ]);
+  });
+  
+  console.log(recTable.toString());
+}
 
-  } catch (error) {
-    console.error(chalk.red("❌ Error:"), error.message);
+  if (userTasks.length === 0 && recommendations.length === 0) {
+    console.log(chalk.gray("📭 No tasks found."));
   }
+
+  // Summary
+  console.log(chalk.gray("\n" + "─".repeat(60)));
+  console.log(chalk.cyan(`📊 Summary: ${userTasks.length} assigned, ${recommendations.length} recommended`));
+  console.log(chalk.gray(`💡 Use -n <number> to see more tasks (e.g., tnc-cli my-tasks -n 10)`));
 }
 
-export default myTask;
+export default myTask;

package/commands/myTeam.js

@@ -6,7 +6,7 @@ import chalk from "chalk";
 import getVerify from "../lib/getVerify.js";
 
 const CWD = process.cwd();
-const TNC_API_URL = "https://thinkncollab.com/";
+const BASE_URL = "https://thinkncollab.com/cli";
 const metaDataFile = path.join(CWD, ".tnc", ".tncmeta.json");
 
 async function myTeam() {
@@ -18,9 +18,7 @@ async function myTeam() {
             return;
         }
 
-        const metaData = JSON.parse(
-            fs.readFileSync(metaDataFile, "utf-8")
-        );
+        const metaData = JSON.parse(fs.readFileSync(metaDataFile, "utf-8"));
 
         if (!metaData.roomId) {
             console.log(chalk.red("❌ No room associated with this project."));
@@ -28,48 +26,99 @@ async function myTeam() {
         }
 
         const roomId = metaData.roomId;
+        const projectName = metaData.projectName || "Unknown Project";
 
+        // Get user credentials
         const verifyData = await getVerify();
         const { email, token } = verifyData;
+        const machineId = machine.machineIdSync();
 
-        const response = await axios.get(
-            `${TNC_API_URL}cli/myTeam/${roomId}`,
-            {
-                headers: {
-                    email,
-                    token,
-                    machineId: machine.machineIdSync(),
-                },
+        console.log(chalk.blue(`📋 Fetching team members for project: ${projectName}`));
+        console.log(chalk.blue(`🏠 Room ID: ${roomId}`));
+
+        // API call with headers for authentication
+        const response = await axios({
+            method: 'get',
+            url: `${BASE_URL}/myTeam/${roomId}`,
+            headers: {
+                'x-user-email': email,
+                'x-user-token': token,
+                'x-machine-id': machineId,
+                'x-project-id': metaData.projectId // Optional: for project context
             }
-        );
+            // NO REQUEST BODY - all auth in headers
+        });
 
         const teamMembers = response.data.RoomMembers || [];
 
         if (teamMembers.length === 0) {
-            console.log(chalk.yellow("⚠️  You are not part of any team yet."));
+            console.log(chalk.yellow("⚠️ No team members found in this room."));
             return;
         }
 
-        console.log(chalk.green("👥 Your Team Members:"));
-        teamMembers.forEach(member => {
+        // Display team information
+        console.log(chalk.green("\n👥 Team Members:"));
+        console.log(chalk.gray("────────────────────────"));
+
+        // Sort members by role or name
+        const sortedMembers = teamMembers.sort((a, b) => {
+            // Put room owner first if available
+            if (a.role === 'owner' && b.role !== 'owner') return -1;
+            if (b.role === 'owner' && a.role !== 'owner') return 1;
+            return (a.name || a.email).localeCompare(b.name || b.email);
+        });
+
+        sortedMembers.forEach((member, index) => {
+            // Determine role badge
+            let roleBadge = '';
+            if (member.role === 'owner') {
+                roleBadge = chalk.yellow('👑 Owner');
+            } else if (member.role === 'admin' || member.role === 'manager') {
+                roleBadge = chalk.blue('⚙️ Admin');
+            } else {
+                roleBadge = chalk.gray('👤 Member');
+            }
+
+            // Format online status
+            const status = member.isOnline 
+                ? chalk.green('● Online') 
+                : chalk.gray('○ Offline');
+
             console.log(
-                chalk.blue(`- ${member.name} (${member.email})`)
+                chalk.white(`${index + 1}. `) +
+                chalk.cyan.bold(member.name || 'Unknown') + 
+                chalk.gray(` <${member.email}>`)
             );
+            console.log(chalk.gray(`   ${roleBadge}  •  ${status}`));
+            
+            // Show last active if available
+            if (member.lastActive) {
+                const lastActive = new Date(member.lastActive).toLocaleString();
+                console.log(chalk.gray(`   Last active: ${lastActive}`));
+            }
+            
+            console.log(chalk.gray("────────────────────────"));
         });
 
+        console.log(chalk.green(`\n✅ Total members: ${teamMembers.length}`));
+
     } catch (err) {
         if (err.response) {
-            console.error(
-                chalk.red("❌ Error:"),
-                chalk.red(err.response.data.error)
-            );
+            console.error(chalk.red("❌ Server Error:"), chalk.red(err.response.data.message || err.response.data.error));
+            
+            if (err.response.status === 401) {
+                console.error(chalk.yellow("   Unauthorized. Please login again."));
+            } else if (err.response.status === 404) {
+                console.error(chalk.yellow("   Room not found. Please check your project."));
+            } else if (err.response.status === 403) {
+                console.error(chalk.yellow("   You don't have permission to view this team."));
+            }
+        } else if (err.request) {
+            console.error(chalk.red("❌ No response from server. Check your internet connection."));
         } else {
-            console.error(
-                chalk.red("❌ Error:"),
-                chalk.red(err.message)
-            );
+            console.error(chalk.red("❌ Error:"), chalk.red(err.message));
         }
     }
 }
 
-export default myTeam;
+export default myTeam; 

package/commands/sendInvite.js

@@ -2,51 +2,86 @@ import fs from "fs";
 import path from "path";
 import axios from "axios";
 import os from "os";
+import machineId from "node-machine-id"; // Add this import
 
 const homeDir = os.homedir();
-const url = "https://thinkncollab.com/cli/invite"; 
+const baseUrl = "https://thinkncollab.com/cli"; 
+
 async function getEmail() {
   const rcFile = path.join(homeDir, ".tncrc");
   if (!fs.existsSync(rcFile)) {
-    console.log(" Please login first!");
+    console.log("❌ Please login first!");
     process.exit(1);
   }
   const content = fs.readFileSync(rcFile, "utf-8");
-  const email = JSON.parse(content).email;
-  return email;
+  return JSON.parse(content).email;
 }
+
 async function getToken() {
   const rcFile = path.join(homeDir, '.tncrc');
-  if(!fs.readFileSync(rcFile)){
-    console.log(" Please login first! ")
+  if (!fs.existsSync(rcFile)) {
+    console.log("❌ Please login first!");
+    process.exit(1);
   }
   const content = fs.readFileSync(rcFile, 'utf-8');
-  const token = JSON.parse(content).token;
-  return token;
+  return JSON.parse(content).token;
 }
+
 async function sendInvite(inviteeEmail) {
   try {
     const email = await getEmail();
     const token = await getToken();
+    const machineIdValue = machineId.machineIdSync(); // Get machine ID
+    
     const CWD = process.cwd();
-    const metaDataPath = path.join(".tnc", '.tncmeta.json'); 
-    const metaData = JSON.parse(fs.readFileSync(path.join(CWD, metaDataPath), 'utf-8'));
+    
+    // Read project metadata
+    const metaDataPath = path.join(CWD, ".tnc", '.tncmeta.json');
+    if (!fs.existsSync(metaDataPath)) {
+      console.log("❌ Not in a ThinkNCollab project. Run 'tnc init' first.");
+      process.exit(1);
+    }
+    
+    const metaData = JSON.parse(fs.readFileSync(metaDataPath, 'utf-8'));
     const roomId = metaData.roomId;
-    console.log(email, token, roomId, inviteeEmail);
- const res = await axios({
-  method: 'post',
-  url: `${url}/${roomId}`,
-  params: {
-    email,
-    token,
-    inviteeEmail,
-    roomId
-  }
-});
-    console.log(" Invitation sent successfully to", inviteeEmail);
-    console.log("Invite Link:", res.data.invitationLink);
+
+    console.log(`📧 Inviting: ${inviteeEmail}`);
+    console.log(`🏠 Room ID: ${roomId}`);
+
+    // USING HEADERS FOR AUTHENTICATION
+    const res = await axios({
+      method: 'post',
+      url: `${baseUrl}/invite/${roomId}`,
+      params: {
+        inviteeEmail: inviteeEmail  // Only inviteeEmail in query params
+      },
+      headers: {
+        'x-user-email': email,
+        'x-user-token': token,
+        'x-machine-id': machineIdValue
+      }
+    });
+
+    console.log("✅ Invitation sent successfully to", inviteeEmail);
+    console.log("🔗 Invite Link:", res.data.invitationLink);
+    
   } catch (error) {
-    console.error(" Error while generating the invitation link:", error.response?.data || error.message);
+    if (error.response) {
+      // Server responded with error
+      console.error("❌ Server error:", error.response.data.message || error.response.status);
+      if (error.response.status === 401) {
+        console.error("   Unauthorized. Please login again.");
+      } else if (error.response.status === 404) {
+        console.error("   Room not found.");
+      }
+    } else if (error.request) {
+      // No response received
+      console.error("❌ No response from server. Check your internet connection.");
+    } else {
+      // Other errors
+      console.error("❌ Error:", error.message);
+    }
   }
 }
-export default sendInvite;
+
+export default sendInvite;