codehub-ghx-cli 1.0.4 → 1.0.6

package/commands/commit.js

@@ -47,7 +47,7 @@ async function commitRepo(message) {
             );
         }
 
-        await axios.put(`http://localhost:3000/repo/update/${repoId}`, {
+        await axios.put(`https://codehub-backend-jj4b.onrender.com/repo/update/${repoId}`, {
                     message:message,
                 });
 

package/commands/push.js

@@ -1,28 +1,26 @@
 
 
-// ghx-cli/commands/push.js
 const fs = require("fs").promises;
 const fssync = require("fs");
 const path = require("path");
 const axios = require("axios");
 const mongoose = require('mongoose');
 const { s3, s3_BUCKET } = require("../config/aws-config");
-const PushLog = require('../../models/pushModel');
+// const PushLog = require('../../models/pushModel');
 require('dotenv').config;
 
 
-async function connectDB(){
-    const mongoURI = process.env.MONGODB_URI;
-        mongoose.connect(mongoURI)
-        .then(()=>console.log("push date saved"))
-        .catch((err)=>console.error("Unable to connect",err));
-}
+// async function connectDB(){
+//     const mongoURI = process.env.MONGODB_URI;
+//         mongoose.connect(mongoURI)
+//         .then(()=>console.log("push date saved"))
+//         .catch((err)=>console.error("Unable to connect",err));
+// }
 
 
 
-// uploadRecursive:
 
-async function uploadRecursive(localPath, baseDir, commitId, collectedFiles) {
+async function uploadRecursive(localPath, baseDir, commitId, collectedFiles, repoId) {
 
     const relative = path.relative(baseDir, localPath).replace(/\\/g, "/");
 
@@ -52,38 +50,57 @@ async function uploadRecursive(localPath, baseDir, commitId, collectedFiles) {
         const relative = path.relative(baseDir, localPath).replace(/\\/g, "/");
 
         const cleanPath = relative.replace(/\\/g, "/");
-        // const s3Key = `commits/${commitId}/${relative}`; // canonical S3 key and DB path
+        // const s3Key = `commits/${commitId}/${relative}`;
         const s3Key = `repo/${commitId}/${cleanPath}`;
         const fileIdPath = cleanPath;
         const fileContent = await fs.readFile(localPath);
 
-        // upload to S3 under canonical key
-        await s3.upload({
-            Bucket: s3_BUCKET,
-            Key: s3Key,
-            Body: fileContent
-        }).promise();
+        
+
+        const fileBase64 = fileContent.toString("base64");
+
+                await axios.post(
+                "https://codehub-backend-jj4b.onrender.com/push/upload",
+                {
+                    repoId,                       // ✅ use actual repoId
+            s3Key,
+            content: fileBase64,
+            filename: path.basename(localPath),
+            folder: path.dirname(relative).replace(/\\/g, "/") === "." ? "" : path.dirname(relative).replace(/\\/g, "/"),
+            isFolder: false
+                }
+                );
+
+
+
+
+
+        // await s3.upload({
+        //     Bucket: s3_BUCKET,
+        //     Key: s3Key,
+        //     Body: fileContent
+        // }).promise();
 
         const filename = path.basename(localPath);
-        const folder = path.dirname(relative).replace(/\\/g, "/"); // relative folder inside commit
+        const folder = path.dirname(relative).replace(/\\/g, "/"); 
 
         collectedFiles.push({
             // filename,
             // commit: commitId,
-            // // path: s3Key,      // canonical path saved to DB
+            // // path: s3Key,      // 
             // // folder: folder === "." ? "" : folder,
             // // isFolder: false
-            // path: cleanPath,   // <-- canonical
+            // path: cleanPath,   //
             // folder: folder === "." ? "" : folder,
-            // fullS3Path: s3Key,  // <-- actual file stored in S3
+            // fullS3Path: s3Key,  // 
             // fullPath: cleanPath,
             // isFolder: false
              filename,
     commit: commitId,
-    path: s3Key,        // <--- ALWAYS THIS
+    path: s3Key,        
     folder: folder === "." ? "" : folder,
-    fullS3Path: s3Key,  // <--- ALWAYS THIS
-    fullPath: s3Key,    // <--- ALWAYS THIS
+    fullS3Path: s3Key,  
+    fullPath: s3Key,    
     isFolder: false
         });
     }
@@ -99,7 +116,7 @@ async function pushRepo() {
         const repoId = config.repoId;
 
         if (!repoId) {
-            console.log("❌ repoId missing in .codehub/config.json");
+            console.log(" repoId missing in .codehub/config.json");
             return;
         }
 
@@ -107,7 +124,7 @@ async function pushRepo() {
         const commitDirs = await fs.readdir(commitsPath);
 
         if (commitDirs.length === 0) {
-            console.log("❌ No commits to push");
+            console.log(" No commits to push");
             return;
         }
 
@@ -122,41 +139,39 @@ async function pushRepo() {
 
 
 
-
-        // Fetch existing repo content so we can merge (and dedupe)
-        const dbRes = await axios.get(`http://localhost:3000/repo/id/${repoId}`);
-        // backend returns array; first element is repo object
+        const dbRes = await axios.get(`https://codehub-backend-jj4b.onrender.com/repo/id/${repoId}`);
+        
         const existing = (dbRes.data && dbRes.data[0] && dbRes.data[0].content) || [];
 
-        // map existing by path for fast overwrite
+    
         const contentMap = {};
         existing.forEach(f => {
             if (!f || !f.path) return;
             contentMap[f.path] = f;
         });
 
-        // const commitDirs = await fs.readdir(commitsPath);
+        
         let newFiles = [];
 
         for (const commitId of commitDirs) {
             const commitFolder = path.join(commitsPath, commitId);
 
-            // commitFolder may contain files/folders
+            // commitFolder
             await uploadRecursive(
                 commitFolder,
-                commitFolder, // baseDir
+                commitFolder, 
                 commitId,
-                newFiles
+                newFiles,repoId,
             );
         }
 
-        // merge/overwrite: newFiles wins
+        
         for (const f of newFiles) {
 
             for (const existingPath in contentMap) {
         const old = contentMap[existingPath];
 
-        // compare logical location (folder + filename)
+    
         if (old.filename === f.filename && old.folder === f.folder) {
             delete contentMap[existingPath];
         }
@@ -171,8 +186,8 @@ async function pushRepo() {
         
         const finalFiles = Object.values(contentMap);
 
-        // push finalFiles to backend (replace content)
-        await axios.put(`http://localhost:3000/repo/update/${repoId}`, {
+        // push
+        await axios.put(`https://codehub-backend-jj4b.onrender.com/repo/update/${repoId}`, {
             content: finalFiles,
             message: commitMessage,
             description: ""
@@ -181,20 +196,29 @@ async function pushRepo() {
 
         await fs.rm(commitsPath, { recursive: true, force: true });
         await fs.mkdir(commitsPath);
-        await connectDB();
+        // await connectDB();
 
 
-        console.log("✅ Push complete!");
+        console.log(" Push complete!");
         // console.log("Using repoId:", repoId);
 
-        await PushLog.create({
-    repoId: repoId,
-    pushedAt: new Date()
-});
+        try {
+            await axios.post('https://codehub-backend-jj4b.onrender.com/push-log', {
+                repoId: repoId,
+                pushedAt: new Date()
+            });
+            console.log("Push log saved to backend");
+        } catch (err) {
+            console.error("Failed to save push log:", err.message);
+        }
+//         await PushLog.create({
+//     repoId: repoId,
+//     pushedAt: new Date()
+// });
 
         process.exit(0);
     } catch (err) {
-        console.error("❌ Push error:", err);
+        console.error(" Push error:", err);
         process.exit(1);
     }
 }

package/commands/revert.js

@@ -1,33 +1,4 @@
-// const fs = require("fs");
-// const path = require('path');
-// const { promisify } = require("util");
-// // const {s3, s3_BUCKET} = require('../config/aws-config');
-// const {s3, s3_BUCKET} = require('../config/aws-config');
 
-// const readdir = promisify(fs.readdir);
-// const copyFile = promisify(fs.copyFile);
-
-
-// async function revertRepo(commitID) {
-//   const repopath = path.resolve(process.cwd(), ".codehub");
-//  const commitsPath = path.join(repopath, "commits");
-
-
-//  try {
-//     const commitDir = path.join(commitsPath, commitID);
-//     const files = await readdir(commitDir);
-//     const parentDir = path.resolve(repopath, "..");
-
-//     for(const file of files){
-//         await copyFile(path.join(commitDir, file), path.join(parentDir, file));
-//     }
-//     console.log(`Commit ${commitID} reverted successfully!`);
-//  } catch (err) {
-//     console.error("Unable to revert:", err);
-//  }
-// }
-
-// module.exports = {revertRepo};
 
 const fs = require("fs").promises;
 const fssync = require("fs");
@@ -55,7 +26,7 @@ async function revertRepo(commitID) {
     const commitsPath = path.join(repoPath, "commits");
     const commitFolder = path.join(commitsPath, commitID);
 
-    // Ensure that commit exists
+    
     if (!fssync.existsSync(commitFolder)) {
         console.log(`❌ Commit "${commitID}" not found.`);
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codehub-ghx-cli",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -17,6 +17,7 @@
     "axios": "^1.13.2",
     "codehub-ghx-cli": "^1.0.3",
     "dotenv": "^17.2.3",
+    "mongoose": "^9.0.2",
     "path": "^0.12.7",
     "uuid": "^13.0.0",
     "yargs": "^18.0.0"