thinkncollab-cli 0.0.20 → 0.0.22

package/bin/index.js

@@ -13,9 +13,6 @@ const VERSION_FILE = path.join(process.cwd(), ".tncversions");
 const BASE_URL = "http://localhost:3001/rooms";
 const CWD = process.cwd();
 
-
-
-
 /** ------------------ LOGIN ------------------ **/
 async function login() {
   const answers = await inquirer.prompt([
@@ -131,10 +128,11 @@ function saveVersions(versionMap) {
 
 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("");
+    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);
@@ -145,11 +143,22 @@ function computeHashCLI(filePath) {
 function checkChanges(fileTree, versionMap, rootPath = CWD) {
   return fileTree.map(item => {
     const fullPath = path.join(rootPath, item.path || item.name);
-    const hash = computeHashCLI(fullPath);
+    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");
+      }
+    }
+
     const prevHash = versionMap[item.path || fullPath] || null;
     const changed = hash !== prevHash;
 
-    let newItem = { ...item, changed, hash };
+    const newItem = { ...item, changed, hash };
 
     if (item.type === "folder" && item.children.length > 0) {
       newItem.children = checkChanges(item.children, versionMap, rootPath);
@@ -189,38 +198,45 @@ 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, "/");
 
     if (node.type === "folder") {
-      const children = await uploadTree(node.children, folderHex, roomId, token, email, relativePath);
-      uploaded.push({
-        name: node.name,
-        type: "folder",
-        path: relativePath,
-        children
-      });
-    } else if (node.changed) {
-      const url = await uploadFileSigned(node.path, `tnc_uploads/${folderHex}`, roomId, token, email);
-      console.log(`📦 Uploaded: ${relativePath} → ${url}`);
-      uploaded.push({
-        name: node.name,
-        type: "file",
-        path: relativePath,
-        size: node.size,
-        url
-      });
+      const children = await uploadTree(node.children, folderHex, roomId, token, email, previousVersions, 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) {
+      try {
+        const url = await uploadFileSigned(node.path, `tnc_uploads/${folderHex}`, roomId, token, email);
+        console.log(`📦 Uploaded: ${relativePath} → ${url}`);
+        uploaded.push({ 
+          ...node, 
+          url,
+          hash: node.hash
+        });
+      } catch (err) {
+        console.error(`❌ Failed to upload ${relativePath}:`, err.message);
+        uploaded.push({ ...node, hash: node.hash });
+      }
     } else {
-      uploaded.push(node); // unchanged, no upload
+      // Unchanged file - use previous URL
+      const prevFile = previousVersions[node.path];
+      uploaded.push({ 
+        ...node, 
+        url: prevFile?.url, // ✅ Use stored URL
+        hash: node.hash,
+        version: prevFile?.version || 1
+      });
     }
   }
 
   return uploaded;
 }
 
+
 /** ------------------ PUSH FUNCTION ------------------ **/
 async function push(roomId, targetPath) {
   const { token, email } = readToken();
@@ -231,6 +247,7 @@ async function push(roomId, targetPath) {
   }
   const meta = JSON.parse(fs.readFileSync(tncMetaPath, "utf-8"));
   const projectId = meta.projectId;
+
   const stats = fs.statSync(targetPath);
   const rootFolder = stats.isDirectory() ? targetPath : path.dirname(targetPath);
   const ignoreList = loadIgnore(rootFolder);
@@ -263,34 +280,33 @@ 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 },
-  { headers: { authorization: `Bearer ${token}`, email } }
-);
-
+      `${BASE_URL}/${roomId}/upload`,
+      { folderId: folderHex, content: uploadedTree, uploadedBy: email, projectId },
+      { headers: { authorization: `Bearer ${token}`, email } }
+    );
 
     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);
 
   } catch (err) {
     console.error("❌ Upload failed:", err.response?.data || err.message);

package/package.json

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