thinkncollab-cli 0.0.21 → 0.0.23

package/bin/index.js

@@ -119,48 +119,86 @@ function scanFolder(folderPath, ignoreList, rootPath = folderPath) {
 /** ------------------ VERSIONING ------------------ **/
 function loadVersions() {
   if (!fs.existsSync(VERSION_FILE)) return {};
-  return JSON.parse(fs.readFileSync(VERSION_FILE, "utf-8"));
+  const data = JSON.parse(fs.readFileSync(VERSION_FILE, "utf-8"));
+  
+  // Backward compatibility: if old format (just strings), convert to new format
+  const converted = {};
+  for (const [path, value] of Object.entries(data)) {
+    if (typeof value === 'string') {
+      converted[path] = { hash: value, url: '', version: 1 };
+    } else {
+      converted[path] = value;
+    }
+  }
+  return converted;
 }
 
 function saveVersions(versionMap) {
   fs.writeFileSync(VERSION_FILE, JSON.stringify(versionMap, null, 2));
 }
 
-function computeHashCLI(filePath) {
-  if (!fs.existsSync(filePath)) return null;
-
-  const stats = fs.statSync(filePath);
-  if (stats.isDirectory()) {
-    const items = fs.readdirSync(filePath);
-    const combined = items.map(name => computeHashCLI(path.join(filePath, name)) || "").join("");
-    return crypto.createHash("sha256").update(filePath + combined).digest("hex");
-  } else {
-    const content = fs.readFileSync(filePath);
-    return crypto.createHash("sha256").update(content).digest("hex");
+function computeFileHash(filePath) {
+  try {
+    if (!fs.existsSync(filePath)) return null;
+    
+    const stats = fs.statSync(filePath);
+    if (stats.isDirectory()) {
+      // For folders: hash of sorted file names + their hashes
+      const items = fs.readdirSync(filePath).sort();
+      const childrenHashes = items.map(name => 
+        computeFileHash(path.join(filePath, name))
+      ).filter(Boolean).join('|');
+      
+      return crypto.createHash("sha256")
+        .update(`folder:${filePath}|${childrenHashes}`)
+        .digest("hex");
+    } else {
+      // For files: hash of content + file metadata
+      const content = fs.readFileSync(filePath);
+      const stats = fs.statSync(filePath);
+      
+      return crypto.createHash("sha256")
+        .update(content)
+        .update(`size:${stats.size}|mtime:${stats.mtimeMs}`)
+        .digest("hex");
+    }
+  } catch (err) {
+    console.error(`❌ Error computing hash for ${filePath}:`, err.message);
+    return null;
   }
 }
 
 function checkChanges(fileTree, versionMap, rootPath = CWD) {
   return fileTree.map(item => {
     const fullPath = path.join(rootPath, item.path || item.name);
+    const relativePath = item.path || item.name;
+    
     let hash = null;
-
-    if (fs.existsSync(fullPath)) {
-      if (fs.statSync(fullPath).isDirectory()) {
-        const children = fs.readdirSync(fullPath).map(name => computeHashCLI(path.join(fullPath, name)) || "").join("");
-        hash = crypto.createHash("sha256").update(fullPath + children).digest("hex");
-      } else {
-        const content = fs.readFileSync(fullPath);
-        hash = crypto.createHash("sha256").update(content).digest("hex");
+    let changed = true;
+
+    try {
+      if (fs.existsSync(fullPath)) {
+        hash = computeFileHash(fullPath);
+        
+        // Check against previous version
+        const prevVersion = versionMap[relativePath];
+        if (prevVersion && prevVersion.hash === hash) {
+          changed = false;
+        }
       }
+    } catch (err) {
+      console.error(`❌ Error checking changes for ${relativePath}:`, err.message);
     }
 
-    const prevHash = versionMap[item.path || fullPath] || null;
-    const changed = hash !== prevHash;
-
-    const newItem = { ...item, changed, hash };
+    const newItem = { 
+      ...item, 
+      changed, 
+      hash,
+      path: relativePath // Ensure consistent path
+    };
 
-    if (item.type === "folder" && item.children.length > 0) {
+    // Recursively check children for folders
+    if (item.type === "folder" && item.children && item.children.length > 0) {
       newItem.children = checkChanges(item.children, versionMap, rootPath);
       newItem.changed = newItem.changed || newItem.children.some(c => c.changed);
     }
@@ -198,22 +236,59 @@ async function uploadFileSigned(filePath, folder, roomId, token, email) {
   return cloudRes.data.secure_url;
 }
 
-async function uploadTree(fileTree, folderHex, roomId, token, email, parentPath = "") {
+async function uploadTree(fileTree, folderHex, roomId, token, email, previousVersions, parentPath = "") {
   const uploaded = [];
 
   for (const node of fileTree) {
-    const relativePath = path.join(parentPath, node.name).replace(/\\/g, "/");
+    const relativePath = node.path || path.join(parentPath, node.name).replace(/\\/g, "/");
 
     if (node.type === "folder") {
-      const children = await uploadTree(node.children, folderHex, roomId, token, email, relativePath);
-      const folderHash = crypto.createHash("sha256").update(relativePath + children.map(c => c.hash || "").join("")).digest("hex");
-      uploaded.push({ ...node, children, hash: folderHash });
-    } else if (node.changed && node.path) {
-      const url = await uploadFileSigned(node.path, `tnc_uploads/${folderHex}`, roomId, token, email);
-      console.log(`📦 Uploaded: ${relativePath} → ${url}`);
-      uploaded.push({ ...node, url });
+      const children = await uploadTree(node.children, folderHex, roomId, token, email, previousVersions, relativePath);
+      
+      uploaded.push({ 
+        ...node, 
+        children, 
+        hash: node.hash,
+        path: relativePath 
+      });
     } else {
-      uploaded.push(node); // unchanged, no upload
+      const prevFile = previousVersions[relativePath];
+      
+      if (node.changed) {
+        try {
+          console.log(`📤 Uploading changed file: ${relativePath}`);
+          const url = await uploadFileSigned(node.path, `tnc_uploads/${folderHex}`, roomId, token, email);
+          console.log(`✅ Uploaded: ${relativePath}`);
+          
+          uploaded.push({ 
+            ...node, 
+            url,
+            hash: node.hash,
+            path: relativePath,
+            version: prevFile ? prevFile.version + 1 : 1
+          });
+        } catch (err) {
+          console.error(`❌ Failed to upload ${relativePath}:`, err.message);
+          // Fallback to previous version if upload fails
+          uploaded.push({ 
+            ...node, 
+            url: prevFile?.url,
+            hash: node.hash,
+            path: relativePath,
+            version: prevFile?.version || 1
+          });
+        }
+      } else {
+        // Unchanged file - use previous URL and version
+        console.log(`📋 Using previous version for: ${relativePath}`);
+        uploaded.push({ 
+          ...node, 
+          url: prevFile?.url,
+          hash: node.hash,
+          path: relativePath,
+          version: prevFile?.version || 1
+        });
+      }
     }
   }
 
@@ -230,10 +305,6 @@ async function push(roomId, targetPath) {
   }
   const meta = JSON.parse(fs.readFileSync(tncMetaPath, "utf-8"));
   const projectId = meta.projectId;
-  if (!projectId) {
-    console.error("❌ Project ID missing in metadata. Run 'tnc init' again.");
-    process.exit(1);
-  }
 
   const stats = fs.statSync(targetPath);
   const rootFolder = stats.isDirectory() ? targetPath : path.dirname(targetPath);
@@ -255,7 +326,16 @@ async function push(roomId, targetPath) {
   }
 
   const previousVersions = loadVersions();
+  console.log('📁 Previous versions:', Object.keys(previousVersions).length);
+  
   const contentWithChanges = checkChanges(content, previousVersions);
+  
+  // Debug: Show what changed
+  const changedFiles = contentWithChanges.flatMap(item => 
+    item.changed ? [item.path] : []
+  );
+  console.log('🔄 Changed files:', changedFiles.length, changedFiles);
+
   const hasChanges = contentWithChanges.some(item => item.changed || (item.children && item.children.some(c => c.changed)));
 
   if (!hasChanges) {
@@ -267,10 +347,9 @@ async function push(roomId, targetPath) {
     const folderHex = crypto.createHash("md5").update(path.basename(targetPath) + Date.now()).digest("hex");
 
     console.log("🚀 Uploading to Cloudinary...");
-    const uploadedTree = await uploadTree(contentWithChanges, folderHex, roomId, token, email);
-
-    console.log("🗂️ Sending metadata:", { folderId: folderHex, content: uploadedTree, uploadedBy: email, projectId });
+    const uploadedTree = await uploadTree(contentWithChanges, folderHex, roomId, token, email, previousVersions);
 
+    console.log("🗂️ Sending metadata...");
     await axios.post(
       `${BASE_URL}/${roomId}/upload`,
       { folderId: folderHex, content: uploadedTree, uploadedBy: email, projectId },
@@ -279,16 +358,24 @@ async function push(roomId, targetPath) {
 
     console.log("✅ Upload complete! Metadata stored successfully.");
 
-    // Save version hashes
-    const flattenVersionMap = {};
-    const flatten = items => {
+    // Save version hashes WITH URLs
+    const newVersionMap = {};
+    const flattenAndStore = (items) => {
       for (const item of items) {
-        flattenVersionMap[item.path || item.name] = item.hash;
-        if (item.children) flatten(item.children);
+        if (item.type === "file") {
+          newVersionMap[item.path] = {
+            hash: item.hash,
+            url: item.url, // ✅ Store URL locally
+            version: item.version || 1
+          };
+        }
+        if (item.children) flattenAndStore(item.children);
       }
     };
-    flatten(contentWithChanges);
-    saveVersions(flattenVersionMap);
+    flattenAndStore(uploadedTree);
+    saveVersions(newVersionMap);
+
+    console.log(`💾 Saved ${Object.keys(newVersionMap).length} files to .tncversions`);
 
   } catch (err) {
     console.error("❌ Upload failed:", err.response?.data || err.message);
@@ -334,4 +421,4 @@ async function main() {
   }
 }
 
-main().catch(err => console.error(err));
+main().catch(err => console.error(err));

package/package.json

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