thinkncollab-cli 0.0.10 → 0.0.11

package/Readme.md

@@ -14,7 +14,10 @@ npm install -g @thinkncollab/tnc-cli
 tnc-cli login
 
 # Push files to a room
-tnc-cli push --room 64a1b2c3d4e5f6a1b2c3d4e5 ./project-files/
+tnc-cli push --room <roomId> <path>
+
+# Logout 
+tnc-cli logout
 ```
 
 ---

package/bin/index.js

@@ -8,24 +8,11 @@ import crypto from "crypto";
 import FormData from "form-data";
 
 const RC_FILE = path.join(os.homedir(), ".tncrc");
-const BASE_URL = "https://thinkncollab.com/rooms";
+const VERSION_FILE = path.join(process.cwd(), ".tncversions");
+const BASE_URL = "http://localhost:3001/rooms";
+const CWD = process.cwd();
 
-// LOGOUT
-async function logout() {
-  try {
-    if (fs.existsSync(RC_FILE)) {
-      // Remove the .tncrc file safely
-      await fs.promises.rm(RC_FILE, { force: true });
-      console.log("✅ Logged out successfully. Local credentials removed.");
-    } else {
-      console.log("ℹ️ No active session found.");
-    }
-  } catch (err) {
-    console.error("❌ Error during logout:", err.message);
-  }
-}
-
-/** ========== LOGIN ========== **/
+/** ------------------ LOGIN ------------------ **/
 async function login() {
   const answers = await inquirer.prompt([
     { type: "input", name: "email", message: "Email:" },
@@ -47,6 +34,21 @@ async function login() {
   }
 }
 
+/** ------------------ LOGOUT ------------------ **/
+async function logout() {
+  try {
+    if (fs.existsSync(RC_FILE)) {
+      await fs.promises.rm(RC_FILE, { force: true });
+      console.log("✅ Logged out successfully. Local credentials removed.");
+    } else {
+      console.log("ℹ️ No active session found.");
+    }
+  } catch (err) {
+    console.error("❌ Error during logout:", err.message);
+  }
+}
+
+/** ------------------ TOKEN UTILS ------------------ **/
 function readToken() {
   if (!fs.existsSync(RC_FILE)) {
     console.error("❌ Not logged in. Run 'tnc login' first.");
@@ -56,7 +58,7 @@ function readToken() {
   return { token: data.token, email: data.email };
 }
 
-/** ========== IGNORE HANDLING ========== **/
+/** ------------------ IGNORE HANDLING ------------------ **/
 function loadIgnore(folderPath) {
   const ignoreFile = path.join(folderPath, ".ignoretnc");
   if (!fs.existsSync(ignoreFile)) return [];
@@ -80,7 +82,7 @@ function shouldIgnore(relativePath, ignoreList) {
   });
 }
 
-/** ========== SCAN FOLDER ========== **/
+/** ------------------ SCAN FOLDER ------------------ **/
 function scanFolder(folderPath, ignoreList, rootPath = folderPath) {
   const items = fs.readdirSync(folderPath, { withFileTypes: true });
   const result = [];
@@ -97,14 +99,15 @@ function scanFolder(folderPath, ignoreList, rootPath = folderPath) {
       result.push({
         name: item.name,
         type: "folder",
-        children: scanFolder(fullPath, ignoreList, rootPath)
+        children: scanFolder(fullPath, ignoreList, rootPath),
+        path: relativePath
       });
     } else {
       const stats = fs.statSync(fullPath);
       result.push({
         name: item.name,
         type: "file",
-        path: fullPath,
+        path: relativePath,
         size: stats.size
       });
     }
@@ -112,7 +115,48 @@ function scanFolder(folderPath, ignoreList, rootPath = folderPath) {
   return result;
 }
 
-/** ========== CLOUDINARY UPLOAD (SIGNED) ========== **/
+/** ------------------ VERSIONING ------------------ **/
+function loadVersions() {
+  if (!fs.existsSync(VERSION_FILE)) return {};
+  return JSON.parse(fs.readFileSync(VERSION_FILE, "utf-8"));
+}
+
+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 checkChanges(fileTree, versionMap, rootPath = CWD) {
+  return fileTree.map(item => {
+    const fullPath = path.join(rootPath, item.path || item.name);
+    const hash = computeHashCLI(fullPath);
+    const prevHash = versionMap[item.path || fullPath] || null;
+    const changed = hash !== prevHash;
+
+    let newItem = { ...item, changed, hash };
+
+    if (item.type === "folder" && item.children.length > 0) {
+      newItem.children = checkChanges(item.children, versionMap, rootPath);
+      newItem.changed = newItem.changed || newItem.children.some(c => c.changed);
+    }
+
+    return newItem;
+  });
+}
+
+/** ------------------ CLOUDINARY UPLOAD ------------------ **/
 async function uploadFileSigned(filePath, folder, roomId, token, email) {
   const filename = path.basename(filePath);
 
@@ -152,26 +196,28 @@ async function uploadTree(fileTree, folderHex, roomId, token, email, parentPath
       uploaded.push({
         name: node.name,
         type: "folder",
+        path: relativePath,
         children
       });
-    } else {
+    } 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 // ✅ send top-level URL now
+        url
       });
+    } else {
+      uploaded.push(node); // unchanged, no upload
     }
   }
 
   return uploaded;
 }
 
-/** ========== PUSH FUNCTION ========== **/
+/** ------------------ PUSH FUNCTION ------------------ **/
 async function push(roomId, targetPath) {
   const { token, email } = readToken();
   const stats = fs.statSync(targetPath);
@@ -185,7 +231,7 @@ async function push(roomId, targetPath) {
     const relativePath = path.basename(targetPath);
     content = shouldIgnore(relativePath, ignoreList)
       ? []
-      : [{ name: relativePath, type: "file", path: targetPath, size: stats.size }];
+      : [{ name: relativePath, type: "file", path: relativePath, size: stats.size }];
   }
 
   if (!content.length) {
@@ -193,11 +239,20 @@ async function push(roomId, targetPath) {
     return;
   }
 
+  const previousVersions = loadVersions();
+  const contentWithChanges = checkChanges(content, previousVersions);
+  const hasChanges = contentWithChanges.some(item => item.changed || (item.children && item.children.some(c => c.changed)));
+
+  if (!hasChanges) {
+    console.log("ℹ️ No changes detected since last push.");
+    return;
+  }
+
   try {
     const folderHex = crypto.createHash("md5").update(path.basename(targetPath) + Date.now()).digest("hex");
 
     console.log("🚀 Uploading to Cloudinary...");
-    const uploadedTree = await uploadTree(content, folderHex, roomId, token, email);
+    const uploadedTree = await uploadTree(contentWithChanges, folderHex, roomId, token, email);
 
     console.log("🗂️ Sending metadata to backend...");
     await axios.post(
@@ -207,12 +262,24 @@ async function push(roomId, targetPath) {
     );
 
     console.log("✅ Upload complete! Metadata stored successfully.");
+
+    // Save version hashes
+    const flattenVersionMap = {};
+    const flatten = items => {
+      for (const item of items) {
+        flattenVersionMap[item.path || item.name] = item.hash;
+        if (item.children) flatten(item.children);
+      }
+    };
+    flatten(contentWithChanges);
+    saveVersions(flattenVersionMap);
+
   } catch (err) {
     console.error("❌ Upload failed:", err.response?.data || err.message);
   }
 }
 
-/** ========== CLI HANDLER ========== **/
+/** ------------------ CLI HANDLER ------------------ **/
 const args = process.argv.slice(2);
 
 switch (args[0]) {
@@ -220,6 +287,10 @@ switch (args[0]) {
     login();
     break;
 
+  case "logout":
+    logout();
+    break;
+
   case "push": {
     const roomIndex = args.indexOf("--room");
     if (roomIndex === -1 || !args[roomIndex + 1] || !args[roomIndex + 2]) {
@@ -231,14 +302,11 @@ switch (args[0]) {
     push(roomId, targetPath);
     break;
   }
-  case "logout": {
-    logout();
-    break;
-  }
 
   default:
     console.log("✅ TNC CLI ready!");
     console.log("Commands:");
     console.log("  tnc login");
     console.log("  tnc push --room <roomId> <path>");
-}
+    console.log("  tnc logout");
+}

package/branch/.tnc/.tncmeta.json

@@ -0,0 +1,7 @@
+{
+  "projectId": "68f9a4687d7da88440b2e0eb",
+  "projectName": "my project",
+  "currentBranch": "main",
+  "lastCommit": null,
+  "files": {}
+}

package/branch/init.js

@@ -0,0 +1,47 @@
+import fs from "fs";
+import os from "os";
+import path from "path";
+import inquirer from "inquirer";
+import axios from "axios"; 
+const CWD = process.cwd();
+
+async function  projectInit() {
+
+
+const answer = await inquirer.prompt([
+    {type: "input", name: "projectName", message: "Enter Project Name:"},
+
+
+]);
+
+const HomeDir = os.homedir();
+const data = fs.readFileSync(path.join(HomeDir, ".tncrc"));
+const currentUser = JSON.parse(data).email;
+// let us make the a .tncmeta.json file for keeping track of branch info
+//.tncmeta.json should be in the a separate folder at the root of the project
+
+ const response = await axios.post("http://localhost:3001/cli/init", {
+    projectName : answer.projectName,
+    owner: currentUser
+ })
+ const projectId = response.data.project._id;
+
+const tncFolder = fs.mkdirSync(path.join(CWD, ".tnc"), { recursive: true });
+
+const metaFilePath = path.join(tncFolder, ".tncmeta.json");
+
+fs.writeFileSync(metaFilePath, JSON.stringify({"projectId": projectId,
+  "projectName": answer.projectName,
+  "currentBranch": "main",
+  "lastCommit": null,
+  "files": {},
+    },
+    null,
+    2
+  )
+);
+console.log("✅ Project initialized successfully!");
+
+}
+
+projectInit();

package/branch/pull.js

@@ -0,0 +1,124 @@
+#!/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";
+
+const BASE_URL = "http://localhost:3001";
+const CWD = process.cwd();
+
+function readToken() {
+  const homeDir = os.homedir();
+  return JSON.parse(fs.readFileSync(path.join(homeDir, ".tncrc")));
+}
+
+function readMeta() {
+  const metaPath = path.join(CWD, ".tnc", ".tncmeta.json");
+  return fs.existsSync(metaPath) ? JSON.parse(fs.readFileSync(metaPath)) : null;
+}
+
+function writeMeta(meta) {
+  const metaPath = path.join(CWD, ".tnc", ".tncmeta.json");
+  fs.writeFileSync(metaPath, JSON.stringify(meta, null, 2));
+}
+
+// ========== 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("#"));
+}
+
+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;
+  });
+}
+
+// ========== 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 });
+    }
+  }
+  return result;
+}
+
+// ========== 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;
+
+  const stats = fs.statSync(CWD);
+  const ignoreList = loadIgnore(CWD);
+
+  const content = scanFolder(CWD, ignoreList);
+  if (!content.length) return console.log("⚠️ Nothing to upload (all ignored).");
+
+  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);
+        }
+      }
+    }
+    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.");
+  } catch (err) {
+    console.error("❌ Push failed:", err.response?.data || err.message);
+  }
+}
+
+// Call push all
+dpushAll();

package/package.json

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