thinkncollab-cli 0.0.23 → 0.0.25

package/bin/index.js

@@ -7,6 +7,8 @@ import path from "path";
 import crypto from "crypto";
 import FormData from "form-data";
 import projectInit from "../commands/init.js";
+import Status from "../commands/status.js";
+import pull from "../commands/pull.js";
 
 const RC_FILE = path.join(os.homedir(), ".tncrc");
 const VERSION_FILE = path.join(process.cwd(), ".tncversions");
@@ -406,10 +408,29 @@ async function main() {
       await push(roomId, targetPath);
       break;
     }
+    case "status":
+      await Status();
+      break;
 
     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;
+    }
 
     default:
       console.log("✅ TNC CLI ready!");

package/commands/pull.js

@@ -1,124 +1,211 @@
-#!/usr/bin/env node
 import fs from "fs";
 import path from "path";
-import crypto from "crypto";
 import axios from "axios";
-import os from "os";
-import { createUploader } from "./cloudUploader.js";
+import https from "https";
 
-const BASE_URL = "http://localhost:3001";
+const RC_FILE = path.join(os.homedir(), ".tncrc");
 const CWD = process.cwd();
 
+/** ------------------ TOKEN UTILS ------------------ **/
 function readToken() {
-  const homeDir = os.homedir();
-  return JSON.parse(fs.readFileSync(path.join(homeDir, ".tncrc")));
+  if (!fs.existsSync(RC_FILE)) {
+    console.error("❌ Not logged in. Run 'tnc login' first.");
+    process.exit(1);
+  }
+  const data = JSON.parse(fs.readFileSync(RC_FILE));
+  return { token: data.token, email: data.email };
 }
 
-function readMeta() {
-  const metaPath = path.join(CWD, ".tnc", ".tncmeta.json");
-  return fs.existsSync(metaPath) ? JSON.parse(fs.readFileSync(metaPath)) : null;
-}
+/** ------------------ DOWNLOAD FILE ------------------ **/
+async function downloadFile(url, filePath) {
+  return new Promise((resolve, reject) => {
+    const fileDir = path.dirname(filePath);
+    
+    // Create directory if it doesn't exist
+    if (!fs.existsSync(fileDir)) {
+      fs.mkdirSync(fileDir, { recursive: true });
+    }
 
-function writeMeta(meta) {
-  const metaPath = path.join(CWD, ".tnc", ".tncmeta.json");
-  fs.writeFileSync(metaPath, JSON.stringify(meta, null, 2));
-}
+    const file = fs.createWriteStream(filePath);
+    
+    https.get(url, (response) => {
+      if (response.statusCode !== 200) {
+        reject(new Error(`Failed to download: ${response.statusCode}`));
+        return;
+      }
 
-// ========== IGNORE HANDLING ==========
-function loadIgnore(folderPath) {
-  const ignoreFile = path.join(folderPath, ".ignoretnc");
-  if (!fs.existsSync(ignoreFile)) return [];
-  return fs.readFileSync(ignoreFile, "utf-8")
-           .split("\n")
-           .map(l => l.trim())
-           .filter(l => l && !l.startsWith("#"));
-}
+      response.pipe(file);
 
-function shouldIgnore(relativePath, ignoreList) {
-  relativePath = relativePath.replace(/\\/g, "/");
-  return ignoreList.some(pattern => {
-    pattern = pattern.replace(/\\/g, "/");
-    if (pattern.endsWith("/**")) {
-      const folder = pattern.slice(0, -3);
-      return relativePath === folder || relativePath.startsWith(folder + "/");
-    }
-    if (pattern.startsWith("*.")) return relativePath.endsWith(pattern.slice(1));
-    return relativePath === pattern;
+      file.on('finish', () => {
+        file.close();
+        resolve(filePath);
+      });
+
+    }).on('error', (err) => {
+      fs.unlink(filePath, () => {}); // Delete the file on error
+      reject(err);
+    });
   });
 }
 
-// ========== SCAN FOLDER ==========
-function scanFolder(folderPath, ignoreList, rootPath = folderPath) {
-  const items = fs.readdirSync(folderPath, { withFileTypes: true });
-  const result = [];
-  for (const item of items) {
-    const fullPath = path.join(folderPath, item.name);
-    const relativePath = path.relative(rootPath, fullPath).replace(/\\/g, "/");
-    if (shouldIgnore(relativePath, ignoreList)) continue;
-
-    if (item.isDirectory()) {
-      result.push({ name: item.name, type: "folder", children: scanFolder(fullPath, ignoreList, rootPath) });
-    } else {
-      const stats = fs.statSync(fullPath);
-      result.push({ name: item.name, type: "file", path: fullPath, size: stats.size });
+/** ------------------ PROCESS FOLDER CONTENT ------------------ **/
+async function processFolderContent(content, basePath = "") {
+  let downloadedCount = 0;
+  let skippedCount = 0;
+  let errorCount = 0;
+
+  for (const item of content) {
+    const itemPath = path.join(basePath, item.path || item.name);
+
+    if (item.type === "folder") {
+      // Create directory
+      if (!fs.existsSync(itemPath)) {
+        fs.mkdirSync(itemPath, { recursive: true });
+        console.log(`📁 Created directory: ${itemPath}`);
+      }
+
+      // Process children recursively
+      if (item.children && item.children.length > 0) {
+        const result = await processFolderContent(item.children, basePath);
+        downloadedCount += result.downloadedCount;
+        skippedCount += result.skippedCount;
+        errorCount += result.errorCount;
+      }
+    } else if (item.type === "file" && item.url) {
+      try {
+        // Check if file already exists and has same content
+        if (fs.existsSync(itemPath)) {
+          const existingStats = fs.statSync(itemPath);
+          if (existingStats.size === item.size) {
+            console.log(`✅ Already exists: ${itemPath}`);
+            skippedCount++;
+            continue;
+          }
+        }
+
+        console.log(`📥 Downloading: ${itemPath}`);
+        await downloadFile(item.url, itemPath);
+        console.log(`✅ Downloaded: ${itemPath}`);
+        downloadedCount++;
+      } catch (err) {
+        console.error(`❌ Failed to download ${itemPath}:`, err.message);
+        errorCount++;
+      }
+    } else if (item.type === "file" && !item.url) {
+      console.log(`⚠️  No URL available for: ${itemPath}`);
+      skippedCount++;
     }
   }
-  return result;
+
+  return { downloadedCount, skippedCount, errorCount };
 }
 
-// ========== PUSH EVERYTHING ==========
-export async function dpushAll() {
-  const { token, email } = readToken();
-  const meta = readMeta();
-  if (!meta) return console.log("❌ Project not initialized locally. Run init first.");
-  const { projectId, currentBranch } = meta;
+/** ------------------ PULL FUNCTION ------------------ **/
+export default async function pull(roomId, version = "latest") {
+  try {
+    const { token, email } = readToken();
+    
+    const tncMetaPath = path.join(process.cwd(), ".tnc", ".tncmeta.json");
+    if (!fs.existsSync(tncMetaPath)) {
+      console.error("❌ Project not initialized. Run 'tnc init' first.");
+      return;
+    }
 
-  const stats = fs.statSync(CWD);
-  const ignoreList = loadIgnore(CWD);
+    const meta = JSON.parse(fs.readFileSync(tncMetaPath, "utf-8"));
+    const projectId = meta.projectId;
 
-  const content = scanFolder(CWD, ignoreList);
-  if (!content.length) return console.log("⚠️ Nothing to upload (all ignored).");
+    console.log(`🚀 Pulling files from room ${roomId}...`);
+    console.log(`📋 Project: ${projectId}`);
+    console.log(`🎯 Version: ${version}`);
+    console.log("");
 
-  try {
-    const uploader = createUploader(BASE_URL, token, email);
-    const folderHex = crypto.createHash("md5").update(path.basename(CWD) + Date.now()).digest("hex");
-
-    console.log("🚀 Uploading entire project...");
-    const uploadedTree = await uploader.uploadTree(content, folderHex, projectId);
-
-    // Prepare metadata
-    const filesMetadata = [];
-    function flattenTree(nodes, parent = "") {
-      for (const node of nodes) {
-        const relPath = path.join(parent, node.name).replace(/\\/g, "/");
-        if (node.type === "file") {
-          const hash = crypto.createHash("md5").update(fs.readFileSync(path.join(CWD, relPath))).digest("hex");
-          filesMetadata.push({ filename: relPath, contentHash: hash, path: node.url, version: 0 });
-        } else if (node.type === "folder") {
-          flattenTree(node.children, relPath);
-        }
+    // Get folder data from server
+    let url = `http://localhost:3001/folders/${roomId}/download`;
+    const params = { projectId };
+    
+    if (version !== "latest") {
+      params.version = version;
+    }
+
+    const response = await axios.get(url, {
+      params,
+      headers: {
+        authorization: `Bearer ${token}`,
+        email: email
       }
+    });
+
+    const folderData = response.data;
+    
+    if (!folderData || !folderData.rootContent) {
+      console.log("❌ No content found to download.");
+      return;
+    }
+
+    console.log(`📦 Found version ${folderData.version} with ${folderData.rootContent.length} items`);
+    console.log("");
+
+    // Create backup of current versions file if it exists
+    const versionsFile = path.join(process.cwd(), ".tncversions");
+    if (fs.existsSync(versionsFile)) {
+      const backupPath = path.join(process.cwd(), `.tncversions.backup.${Date.now()}`);
+      fs.copyFileSync(versionsFile, backupPath);
+      console.log(`💾 Backed up existing versions to: ${path.basename(backupPath)}`);
     }
-    flattenTree(uploadedTree);
-
-    console.log("🗂️ Sending metadata to backend...");
-    const pushRes = await axios.post(
-      `${BASE_URL}/cli/push`,
-      { projectId, branchName: currentBranch, files: filesMetadata, author: email, message: "Full project push" },
-      { headers: { authorization: `Bearer ${token}`, email } }
-    );
-
-    console.log("✅ Push successful:", pushRes.data);
-
-    // Update local meta
-    meta.lastCommit = pushRes.data.commitId;
-    for (const f of pushRes.data.files) meta.files[f.filename] = f.version;
-    writeMeta(meta);
-    console.log("📝 Local metadata updated.");
+
+    // Process and download files
+    const result = await processFolderContent(folderData.rootContent, process.cwd());
+
+    console.log("");
+    console.log("📊 Download Summary:");
+    console.log("====================");
+    console.log(`✅ Downloaded: ${result.downloadedCount} files`);
+    console.log(`📋 Skipped: ${result.skippedCount} files (already exist)`);
+    console.log(`❌ Errors: ${result.errorCount} files`);
+    
+    if (result.errorCount > 0) {
+      console.log("");
+      console.log("⚠️  Some files failed to download. Check the errors above.");
+    }
+
+    // Update local versions file with pulled data
+    const newVersionMap = {};
+    const flattenContent = (items) => {
+      for (const item of items) {
+        if (item.type === "file") {
+          newVersionMap[item.path] = {
+            hash: item.contentHash || item.hash,
+            url: item.url,
+            version: item.version || 1,
+            size: item.size || 0
+          };
+        }
+        if (item.children) {
+          flattenContent(item.children);
+        }
+      }
+    };
+    
+    flattenContent(folderData.rootContent);
+    fs.writeFileSync(versionsFile, JSON.stringify(newVersionMap, null, 2));
+    
+    console.log("");
+    console.log(`💾 Updated local versions file with ${Object.keys(newVersionMap).length} files`);
+    console.log(`🎉 Pull completed successfully!`);
+
   } catch (err) {
-    console.error("❌ Push failed:", err.response?.data || err.message);
+    if (err.response) {
+      console.error("❌ Pull failed:", err.response.data.message || err.response.statusText);
+    } else {
+      console.error("❌ Pull failed:", err.message);
+    }
   }
 }
 
-// Call push all
-dpushAll();
+/** ------------------ 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/commands/status.js

@@ -0,0 +1,284 @@
+
+import fs from "fs";
+import path from "path";
+import crypto from "crypto";
+
+const VERSION_FILE = path.join(process.cwd(), ".tncversions");
+const CWD = process.cwd();
+
+/** ------------------ IGNORE HANDLING ------------------ **/
+function loadIgnore(folderPath) {
+  const ignoreFile = path.join(folderPath, ".ignoretnc");
+  if (!fs.existsSync(ignoreFile)) return [];
+  return fs
+    .readFileSync(ignoreFile, "utf-8")
+    .split("\n")
+    .map(line => line.trim())
+    .filter(line => line && !line.startsWith("#"));
+}
+
+function shouldIgnore(relativePath, ignoreList) {
+  return ignoreList.some(pattern => {
+    if (pattern.endsWith("/**")) {
+      const folder = pattern.slice(0, -3);
+      return relativePath === folder || relativePath.startsWith(folder + path.sep);
+    }
+    if (pattern.startsWith("*.")) {
+      return relativePath.endsWith(pattern.slice(1));
+    }
+    return relativePath === pattern;
+  });
+}
+
+/** ------------------ SCAN FOLDER ------------------ **/
+function scanFolder(folderPath, ignoreList, rootPath = folderPath) {
+  const items = fs.readdirSync(folderPath, { withFileTypes: true });
+  const result = [];
+  for (const item of items) {
+    const fullPath = path.join(folderPath, item.name);
+    const relativePath = path.relative(rootPath, fullPath);
+
+    if (shouldIgnore(relativePath, ignoreList)) {
+      continue;
+    }
+
+    if (item.isDirectory()) {
+      result.push({
+        name: item.name,
+        type: "folder",
+        children: scanFolder(fullPath, ignoreList, rootPath),
+        path: relativePath
+      });
+    } else {
+      const stats = fs.statSync(fullPath);
+      result.push({
+        name: item.name,
+        type: "file",
+        path: relativePath,
+        size: stats.size
+      });
+    }
+  }
+  return result;
+}
+
+/** ------------------ VERSIONING ------------------ **/
+function loadVersions() {
+  if (!fs.existsSync(VERSION_FILE)) return {};
+  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 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;
+    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 newItem = { 
+      ...item, 
+      changed, 
+      hash,
+      path: relativePath
+    };
+
+    // 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);
+    }
+
+    return newItem;
+  });
+}
+
+/** ------------------ STATUS FUNCTION ------------------ **/
+export default async function status() {
+  try {
+    const tncMetaPath = path.join(process.cwd(), ".tnc", ".tncmeta.json");
+    if (!fs.existsSync(tncMetaPath)) {
+      console.error("❌ Project not initialized. Run 'tnc init' first.");
+      return;
+    }
+
+    const meta = JSON.parse(fs.readFileSync(tncMetaPath, "utf-8"));
+    const projectId = meta.projectId;
+    
+    console.log("📊 TNC Project Status");
+    console.log("=====================");
+    console.log(`Project ID: ${projectId}`);
+    console.log(`Directory: ${process.cwd()}`);
+    console.log("");
+
+    // Check if versions file exists
+    if (!fs.existsSync(VERSION_FILE)) {
+      console.log("📭 No previous versions found. Run 'tnc push' first.");
+      return;
+    }
+
+    const previousVersions = loadVersions();
+    const totalFiles = Object.keys(previousVersions).length;
+    
+    console.log(`📁 Total tracked files: ${totalFiles}`);
+    console.log("");
+
+    // Scan current directory for changes
+    const ignoreList = loadIgnore(process.cwd());
+    const currentContent = scanFolder(process.cwd(), ignoreList);
+    const contentWithChanges = checkChanges(currentContent, previousVersions);
+
+    // Analyze changes
+    let changedCount = 0;
+    let newCount = 0;
+    let unchangedCount = 0;
+    let ignoredCount = 0;
+
+    const flattenAndAnalyze = (items) => {
+      for (const item of items) {
+        if (item.type === "file") {
+          if (!previousVersions[item.path]) {
+            newCount++;
+          } else if (item.changed) {
+            changedCount++;
+          } else {
+            unchangedCount++;
+          }
+        }
+        if (item.children) {
+          flattenAndAnalyze(item.children);
+        }
+      }
+    };
+    
+    flattenAndAnalyze(contentWithChanges);
+
+    console.log("🔄 Change Summary:");
+    console.log(`  ✅ Unchanged files: ${unchangedCount}`);
+    console.log(`  📝 Modified files: ${changedCount}`);
+    console.log(`  🆕 New files: ${newCount}`);
+    console.log("");
+
+    // Show detailed changes
+    if (changedCount > 0 || newCount > 0) {
+      console.log("📋 Detailed Changes:");
+      console.log("-------------------");
+      
+      const showChanges = (items, indent = "") => {
+        for (const item of items) {
+          if (item.type === "file") {
+            if (!previousVersions[item.path]) {
+              console.log(`${indent}🆕 ${item.path} (new)`);
+            } else if (item.changed) {
+              console.log(`${indent}📝 ${item.path} (modified)`);
+            }
+          } else if (item.type === "folder") {
+            const hasFileChanges = item.children && item.children.some(child => 
+              child.type === 'file' && (!previousVersions[child.path] || child.changed)
+            );
+            
+            if (hasFileChanges) {
+              console.log(`${indent}📁 ${item.path}/`);
+              if (item.children) {
+                showChanges(item.children, indent + "  ");
+              }
+            }
+          }
+        }
+      };
+      
+      showChanges(contentWithChanges);
+    } else {
+      console.log("🎉 No changes detected. Everything is up to date!");
+    }
+
+    console.log("");
+    
+    // Show version info
+    const versions = Object.values(previousVersions);
+    if (versions.length > 0) {
+      const maxVersion = Math.max(...versions.map(v => v.version || 1));
+      console.log(`🏷️  Latest version: ${maxVersion}`);
+      
+      // Show file type breakdown
+      const extensions = {};
+      Object.keys(previousVersions).forEach(filePath => {
+        const ext = path.extname(filePath) || 'no extension';
+        extensions[ext] = (extensions[ext] || 0) + 1;
+      });
+      
+      console.log("");
+      console.log("📄 File Types:");
+      Object.entries(extensions)
+        .sort(([,a], [,b]) => b - a)
+        .forEach(([ext, count]) => {
+          console.log(`  ${ext || '(no ext)'}: ${count} files`);
+        });
+    }
+
+    // Show last push info if available
+    const versionFileStats = fs.statSync(VERSION_FILE);
+    console.log("");
+    console.log(`⏰ Last push: ${versionFileStats.mtime.toLocaleString()}`);
+
+  } catch (err) {
+    console.error("❌ Error checking status:", err.message);
+  }
+}
+

package/package.json

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