thinkncollab-cli 0.0.85 → 0.0.87

package/commands/createTask.js

@@ -57,133 +57,129 @@ async function createTask() {
             return;
         }
         
-        // console.log(chalk.green(`✅ Room ID: ${roomId}`));
-        // console.log(chalk.green(`✅ Token: ${token.substring(0, 10)}...${token.substring(token.length - 10)}\n`));
+        // STEP 1: Find available port FIRST
+        console.log(chalk.gray('🔍 Finding available port for callback server...'));
+        const PORT = await findAvailablePort(3002);
+        console.log(chalk.green(`✅ Callback server will run on port: ${PORT}`));
         
-        // Construct the URL with CLI flag
-        const redirectUrl = `https://thinkncollab.in/cli/tasks/${roomId}/${token}/create?cli=true`;
+        // STEP 2: Construct the URL with the found port
+        const redirectUrl = `https://thinkncollab.in/cli/tasks/${roomId}/${token}/create?cli=true&callbackPort=${PORT}`;
         
         const spinner = createSpinner('Preparing task creation interface...');  
         
         console.log(chalk.blue('🔗 Opening task creation interface in your browser...'));
         console.log(chalk.gray(`URL: ${redirectUrl}`));
         
-        // Find available port
-        const PORT = await findAvailablePort(3002);
         spinner.stop();
         
-        // Create callback server
-// Create callback server with better CORS and request handling
-const server = http.createServer((req, res) => {
-    console.log(chalk.yellow(`\n📨 Callback received: ${req.url}`));
-    
-    // CORS headers for all responses
-    res.setHeader('Access-Control-Allow-Origin', '*');
-    res.setHeader('Access-Control-Allow-Methods', 'GET, POST, OPTIONS');
-    res.setHeader('Access-Control-Allow-Headers', 'Content-Type, X-CLI-Callback-URL');
-    res.setHeader('Access-Control-Max-Age', '86400'); // 24 hours
-    
-    // Handle preflight
-    if (req.method === 'OPTIONS') {
-        res.writeHead(200);
-        res.end();
-        return;
-    }
-    
-    // Parse URL
-    const url = new URL(req.url, `http://localhost:${PORT}`);
-    
-    // Check for callback (handle both /callback and direct query params)
-    if (req.url.includes('/callback') || url.searchParams.has('taskId')) {
-        const taskId = url.searchParams.get('taskId');
-        const attachments = url.searchParams.get('attachments');
-        const status = url.searchParams.get('status');
-        
-        // Log success
-        if (status === 'error') {
-            console.log(chalk.red('\n❌ Task creation failed!'));
-        } else {
-            console.log(chalk.green('\n✅ Task created successfully!'));
-            if (taskId) {
-                console.log(chalk.blue(`📋 Task ID: ${taskId}`));
-                
-                // Save task ID to file
-                const taskMetaPath = path.join(CWD, ".tnc", "last-task.json");
-                fs.writeFileSync(taskMetaPath, JSON.stringify({
-                    taskId,
-                    attachments: attachments ? attachments.length : 0,
-                    timestamp: new Date().toISOString(),
-                    roomId
-                }, null, 2));
-                console.log(chalk.gray(`📝 Task ID saved to .tnc/last-task.json`));
+        // STEP 3: Create callback server
+        const server = http.createServer((req, res) => {
+            console.log(chalk.yellow(`\n📨 Callback received: ${req.url}`));
+            
+            // CORS headers for all responses
+            res.setHeader('Access-Control-Allow-Origin', '*');
+            res.setHeader('Access-Control-Allow-Methods', 'GET, POST, OPTIONS');
+            res.setHeader('Access-Control-Allow-Headers', 'Content-Type, X-CLI-Callback-URL');
+            res.setHeader('Access-Control-Max-Age', '86400'); // 24 hours
+            
+            // Handle preflight
+            if (req.method === 'OPTIONS') {
+                res.writeHead(200);
+                res.end();
+                return;
             }
-            if (attachments) {
-                // console.log(chalk.blue(`📎 Attachments: ${attachments}`));
+            
+            // Parse URL
+            const url = new URL(req.url, `http://localhost:${PORT}`);
+            
+            // Check for callback (handle both /callback and direct query params)
+            if (req.url.includes('/callback') || url.searchParams.has('taskId')) {
+                const taskId = url.searchParams.get('taskId');
+                const attachments = url.searchParams.get('attachments');
+                const status = url.searchParams.get('status');
+                
+                // Log success
+                if (status === 'error') {
+                    console.log(chalk.red('\n❌ Task creation failed!'));
+                } else {
+                    console.log(chalk.green('\n✅ Task created successfully!'));
+                    if (taskId) {
+                        console.log(chalk.blue(`📋 Task ID: ${taskId}`));
+                        
+                        // Save task ID to file
+                        const taskMetaPath = path.join(CWD, ".tnc", "last-task.json");
+                        fs.writeFileSync(taskMetaPath, JSON.stringify({
+                            taskId,
+                            attachments: attachments ? parseInt(attachments) : 0,
+                            timestamp: new Date().toISOString(),
+                            roomId
+                        }, null, 2));
+                        console.log(chalk.gray(`📝 Task ID saved to .tnc/last-task.json`));
+                    }
+                }
+                
+                // Send response to close browser (HTML with auto-close)
+                res.writeHead(200, { 
+                    'Content-Type': 'text/html',
+                    'Access-Control-Allow-Origin': '*'
+                });
+                res.end(`
+                    <!DOCTYPE html>
+                    <html>
+                    <head>
+                        <title>${status === 'error' ? 'Failed' : 'Success'}</title>
+                        <style>
+                            body { 
+                                font-family: Arial, sans-serif;
+                                display: flex;
+                                justify-content: center;
+                                align-items: center;
+                                height: 100vh;
+                                margin: 0;
+                                background: ${status === 'error' ? '#f44336' : '#4CAF50'};
+                                color: white;
+                            }
+                            .message {
+                                text-align: center;
+                                padding: 20px;
+                            }
+                        </style>
+                    </head>
+                    <body>
+                        <div class="message">
+                            <h1>${status === 'error' ? '❌ Task Failed' : '✅ Task Created'}</h1>
+                            ${taskId ? `<p>Task ID: ${taskId}</p>` : ''}
+                            <p>Closing in 3 seconds...</p>
+                        </div>
+                        <script>
+                            // Send one more callback to ensure it was received
+                            fetch(window.location.href, { method: 'GET', mode: 'no-cors' });
+                            
+                            // Auto close
+                            setTimeout(() => window.close(), 3000);
+                            
+                            // Fallback
+                            setTimeout(() => {
+                                window.location.href = 'about:blank';
+                                setTimeout(() => window.close(), 100);
+                            }, 4000);
+                        </script>
+                    </body>
+                    </html>
+                `);
+                
+                // Close server after response
+                setTimeout(() => {
+                    server.close();
+                    console.log(chalk.gray('\n📡 Callback server closed'));
+                    process.exit(0);
+                }, 2000);
+            } else {
+                // Handle other requests (like favicon)
+                res.writeHead(404);
+                res.end('Not found');
             }
-        }
-        
-        // Send response to close browser (HTML with auto-close)
-        res.writeHead(200, { 
-            'Content-Type': 'text/html',
-            'Access-Control-Allow-Origin': '*'
         });
-        res.end(`
-            <!DOCTYPE html>
-            <html>
-            <head>
-                <title>${status === 'error' ? 'Failed' : 'Success'}</title>
-                <style>
-                    body { 
-                        font-family: Arial, sans-serif;
-                        display: flex;
-                        justify-content: center;
-                        align-items: center;
-                        height: 100vh;
-                        margin: 0;
-                        background: ${status === 'error' ? '#f44336' : '#4CAF50'};
-                        color: white;
-                    }
-                    .message {
-                        text-align: center;
-                        padding: 20px;
-                    }
-                </style>
-            </head>
-            <body>
-                <div class="message">
-                    <h1>${status === 'error' ? '❌ Task Failed' : '✅ Task Created'}</h1>
-                    ${taskId ? `<p>Task ID: ${taskId}</p>` : ''}
-                    <p>Closing in 3 seconds...</p>
-                </div>
-                <script>
-                    // Send one more callback to ensure it was received
-                    fetch(window.location.href, { method: 'GET', mode: 'no-cors' });
-                    
-                    // Auto close
-                    setTimeout(() => window.close(), 3000);
-                    
-                    // Fallback
-                    setTimeout(() => {
-                        window.location.href = 'about:blank';
-                        setTimeout(() => window.close(), 100);
-                    }, 4000);
-                </script>
-            </body>
-            </html>
-        `);
-        
-        // Close server after response
-        setTimeout(() => {
-            server.close();
-            console.log(chalk.gray('\n📡 Callback server closed'));
-            process.exit(0);
-        }, 2000);
-    } else {
-        // Handle other requests (like favicon)
-        res.writeHead(404);
-        res.end('Not found');
-    }
-});
         
         // Server error handling
         server.on('error', (err) => {
@@ -197,15 +193,14 @@ const server = http.createServer((req, res) => {
         
         // Start server
         server.listen(PORT, () => {
-            // console.log(chalk.gray(`📡 Waiting for callback on http://localhost:${PORT}/callback`));
-            // console.log(chalk.gray('The browser will automatically close after task creation\n'));
+            console.log(chalk.gray(`📡 Waiting for callback on http://localhost:${PORT}/callback`));
         });
         
         // Open browser
         setTimeout(async () => {
             try {
                 await open(redirectUrl);
-                // console.log(chalk.green('✅ Browser opened successfully!'));
+                console.log(chalk.green('✅ Browser opened successfully!'));
             } catch (err) {
                 if (err.message.includes('No application')) {
                     console.error(chalk.red('❌ Could not open browser automatically.'));

package/commands/myTeam.js

@@ -1,44 +1,75 @@
 import axios from "axios";
 import fs from "fs";
-import os from "os";
 import path from "path";
 import machine from "node-machine-id";
 import chalk from "chalk";
-import FormData from "form-data";
 import getVerify from "../lib/getVerify.js";
 
 const CWD = process.cwd();
-const TNC_API_URL = "http://localhost:3001/";
+const TNC_API_URL = "https://thinkncollab.com/";
 const metaDataFile = path.join(CWD, ".tnc", ".tncmeta.json");
-const metaData = JSON.parse(fs.readFileSync(metaDataFile, "utf-8"));
-const roomId = metaData.roomId;
 
 async function myTeam() {
     try {
+        // ✅ Check initialization first
+        if (!fs.existsSync(metaDataFile)) {
+            console.log(chalk.red("❌ Project not initialized."));
+            console.log(chalk.yellow("👉 Run `tnc init` first."));
+            return;
+        }
+
+        const metaData = JSON.parse(
+            fs.readFileSync(metaDataFile, "utf-8")
+        );
+
+        if (!metaData.roomId) {
+            console.log(chalk.red("❌ No room associated with this project."));
+            return;
+        }
+
+        const roomId = metaData.roomId;
+
         const verifyData = await getVerify();
         const { email, token } = verifyData;
-        const response = await axios.get(`${TNC_API_URL}cli/myTeam/${roomId}`, {
-            headers: {
-                email,
-                token,
-                machineId: machine.machineIdSync(),
-            },
-        });
+
+        const response = await axios.get(
+            `${TNC_API_URL}cli/myTeam/${roomId}`,
+            {
+                headers: {
+                    email,
+                    token,
+                    machineId: machine.machineIdSync(),
+                },
+            }
+        );
+
         const teamMembers = response.data.RoomMembers || [];
+
         if (teamMembers.length === 0) {
             console.log(chalk.yellow("⚠️  You are not part of any team yet."));
             return;
         }
-        console.log(chalk.green("👥 Your Team Members:"))
+
+        console.log(chalk.green("👥 Your Team Members:"));
         teamMembers.forEach(member => {
-            console.log(chalk.blue(`- ${member.name} (${member.email})`));
+            console.log(
+                chalk.blue(`- ${member.name} (${member.email})`)
+            );
         });
+
     } catch (err) {
         if (err.response) {
-            console.error(chalk.red("❌ Error:"), chalk.red(err.response.data.error));
+            console.error(
+                chalk.red("❌ Error:"),
+                chalk.red(err.response.data.error)
+            );
         } 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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "thinkncollab-cli",
   "author": "Raman Singh",
-  "version": "0.0.85",
+  "version": "0.0.87",
   "description": "CLI tool for ThinkNCollab",
   "main": "index.js",
   "bin": {