thinkncollab-cli 0.0.26 → 0.0.28

package/bin/index.js

@@ -415,22 +415,30 @@ async function main() {
     case "init":
       await projectInit();
       break;
-      
+
     case "pull": {
-      const roomIndex = args.indexOf("--room");
-      const versionIndex = args.indexOf("--version");
-      
-      if (roomIndex === -1 || !args[roomIndex + 1]) {
-        console.error("Usage: tnc pull --room <roomId> [--version <version>]");
-        process.exit(1);
-      }
-      
-      const roomId = args[roomIndex + 1];
-      const version = versionIndex !== -1 && args[versionIndex + 1] ? args[versionIndex + 1] : "latest";
-      
-      await pull(roomId, version);
-      break;
+  const roomIndex = args.indexOf("--room");
+  const versionIndex = args.indexOf("--version");
+  
+  if (roomIndex === -1 || !args[roomIndex + 1]) {
+    console.error("Usage: tnc pull --room <roomId> [--version <version>]");
+    process.exit(1);
+  }
+  
+  const roomId = args[roomIndex + 1];
+  let version = "latest";
+  if (versionIndex !== -1 && args[versionIndex + 1]) {
+    version = args[versionIndex + 1];
+  } else {
+    const possibleVersionIndex = roomIndex + 2;
+    if (args[possibleVersionIndex] && !args[possibleVersionIndex].startsWith("--")) {
+      version = args[possibleVersionIndex];
     }
+  }
+  
+  await pull(roomId, version);
+  break;
+}
 
     default:
       console.log("✅ TNC CLI ready!");

package/commands/pull.js

@@ -4,7 +4,6 @@ import axios from "axios";
 import https from "https";
 import os from "os";
 
-
 const RC_FILE = path.join(os.homedir(), ".tncrc");
 const CWD = process.cwd();
 
@@ -121,14 +120,22 @@ export default async function pull(roomId, version = "latest") {
     console.log(`🎯 Version: ${version}`);
     console.log("");
 
-    // Get folder data from server
-    let url = `http://localhost:3001/folders/${roomId}/download`;
+    // Use your existing endpoint
+    let url = `http://localhost:3001/folder/${roomId}/download`;
     const params = { projectId };
     
     if (version !== "latest") {
-      params.version = version;
+      const versionNum = parseInt(version);
+      if (isNaN(versionNum)) {
+        console.error("❌ Version must be a number");
+        return;
+      }
+      params.version = versionNum;
     }
 
+    console.log("🔍 Making API request with:", { roomId, projectId, version });
+    console.log("🌐 API URL:", url);
+    
     const response = await axios.get(url, {
       params,
       headers: {
@@ -137,14 +144,25 @@ export default async function pull(roomId, version = "latest") {
       }
     });
 
+    console.log("✅ API Response received");
     const folderData = response.data;
     
-    if (!folderData || !folderData.rootContent) {
-      console.log("❌ No content found to download.");
+    if (!folderData) {
+      console.log("❌ No data found in response");
       return;
     }
 
-    console.log(`📦 Found version ${folderData.version} with ${folderData.rootContent.length} items`);
+    // Handle different response formats
+    let rootContent = folderData.rootContent || folderData.content || folderData;
+    let folderVersion = folderData.version || 1;
+
+    if (!rootContent || !Array.isArray(rootContent)) {
+      console.log("❌ No valid content found in response");
+      console.log("📋 Response structure:", Object.keys(folderData));
+      return;
+    }
+
+    console.log(`📦 Found version ${folderVersion} with ${rootContent.length} items`);
     console.log("");
 
     // Create backup of current versions file if it exists
@@ -156,7 +174,7 @@ export default async function pull(roomId, version = "latest") {
     }
 
     // Process and download files
-    const result = await processFolderContent(folderData.rootContent, process.cwd());
+    const result = await processFolderContent(rootContent, process.cwd());
 
     console.log("");
     console.log("📊 Download Summary:");
@@ -188,7 +206,7 @@ export default async function pull(roomId, version = "latest") {
       }
     };
     
-    flattenContent(folderData.rootContent);
+    flattenContent(rootContent);
     fs.writeFileSync(versionsFile, JSON.stringify(newVersionMap, null, 2));
     
     console.log("");
@@ -196,18 +214,21 @@ export default async function pull(roomId, version = "latest") {
     console.log(`🎉 Pull completed successfully!`);
 
   } catch (err) {
+    console.error("❌ Pull failed with error:", err.message);
+    
     if (err.response) {
-      console.error("❌ Pull failed:", err.response.data.message || err.response.statusText);
+      console.error("📡 Server response status:", err.response.status);
+      if (err.response.data) {
+        if (typeof err.response.data === 'object') {
+          console.error("📡 Server message:", err.response.data.message || err.response.data);
+        } else {
+          console.error("📡 Server response:", err.response.data);
+        }
+      }
+    } else if (err.request) {
+      console.error("🌐 No response received from server - check if backend is running on localhost:3001");
     } else {
-      console.error("❌ Pull failed:", err.message);
+      console.error("🔧 Configuration error:", err.message);
     }
   }
-}
-
-/** ------------------ PULL WITH OPTIONS ------------------ **/
-export async function pullWithOptions(roomId, options = {}) {
-  const version = options.version || "latest";
-  const targetPath = options.targetPath || process.cwd();
-  
-  await pull(roomId, version, targetPath);
 }

package/package.json

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