composter-cli 1.0.14 → 1.0.15

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "composter-cli",
-  "version": "1.0.14",
+  "version": "1.0.15",
+  "private": false,
   "type": "module",
   "description": "Your personal vault for React components. Push, pull, and sync reusable components across projects — like shadcn/ui but for YOUR code.",
   "main": "src/index.js",
@@ -36,8 +37,9 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
+    "chalk": "^5.6.2",
     "commander": "^14.0.2",
-    "dotenv": "^16.4.5",
+    "dotenv": "^17.2.3",
     "inquirer": "^13.0.1",
     "node-fetch": "^3.3.2"
   },

package/src/commands/listCat.js

@@ -1,61 +1,33 @@
+import chalk from "chalk";
 import { apiRequest } from "../utils/request.js";
-import { loadSession } from "../utils/session.js";
+import { log } from "../utils/log.js";
 
 export async function listCategories() {
-  const session = loadSession();
-  if (!session || !session.jwt) {
-    console.log("You must be logged in. Run: composter login");
-    return;
-  }
 
-  try{
-    const res = await apiRequest("/categories", {
-        method: "GET",
-        headers: { "Content-Type": "application/json" },
-    });
-    let body = null;
-    try {
-      body = await res.json();
-    } catch {
-      // Ignore if no JSON
-    }
+  const res = await apiRequest("/categories", {
+    method: "GET",
+    headers: { "Content-Type": "application/json" },
+  });
 
-    // Handle auth failure
-    if (res.status === 401) {
-      console.log("Session expired. Run composter login again.");
-      return;
-    }
+  let body = null;
 
-    // Handle server errors
-    if (res.status >= 500) {
-      console.log("Server error. Try again later.");
-      return;
-    }
+  try {
+    body = await res.json();
+  } catch {
+    // Ignore if no JSON
+  }
 
-    // Handle success
-    if (res.ok) {
-      const categories = body?.categories || [];
-      if (categories.length === 0) {
-        console.log("No categories found.");
-        return;
-      }
-      categories.forEach((cat) => {
-        //list them adjacent to each other with tab space between
-        process.stdout.write(`${cat.name}\t\t`);
-      });
-      console.log();
-      return;
-    }
 
-    // Handle other errors
-    const errorMessage =
-      (body && (body.message || body.error || JSON.stringify(body))) ||
-      res.statusText ||
-      `HTTP ${res.status}`;
-    console.log("Error listing categories:", errorMessage);
-    return;
-  } catch (error) {
-    console.log("Error fetching categories:", error);
+
+  const categories = body?.categories || [];
+  if (categories.length === 0) {
+    log.info("No categories found.");
     return;
   }
+  categories.forEach((cat) => {
+    //list them adjacent to each other with tab space between
+    process.stdout.write(chalk.cyan.bold(cat.name) + "\t\t");
+  });
+  console.log();
+  return;
 }

package/src/commands/login.js

@@ -1,75 +1,70 @@
 import inquirer from "inquirer";
-import fetch from "node-fetch";
+import { safeFetch } from "../utils/safeFetch.js";
 import { saveSession } from "../utils/session.js";
-import dotenv from "dotenv";
-import { fileURLToPath } from 'url';
-import { dirname, join } from 'path';
+import { fileURLToPath } from "url";
+import { dirname } from "path";
+import { log } from "../utils/log.js";
+import { handleFetchError } from "../utils/errorHandlers/fetchErrorHandler.js";
+import chalk from "chalk";
+import { composterLoginArtv2 } from "../constants/asciiArts.js";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
-dotenv.config({ path: join(__dirname, '../../.env') });
 
-const BASE_URL = `${process.env.BASE_URL || "https://composter.onrender.com/api"}/auth`;
+const BASE_URL = `${process.env.BASE_URL}/auth`;
 
 export async function login() {
-  console.log("=== Composter Login ===");
+  console.log(chalk.bold.blue(composterLoginArtv2));
 
   const { email, password } = await inquirer.prompt([
     { type: "input", name: "email", message: "Email:" },
     { type: "password", name: "password", message: "Password:" }
   ]);
 
-  // Step 1 — Sign in
-  const res = await fetch(`${BASE_URL}/sign-in/email`, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({ email, password })
-  });
-
-  if (!res.ok) {
-    // try to parse JSON error body, fall back to statusText
-    let errBody = null;
-    try {
-      errBody = await res.json();
-    } catch (e) {
-      // body wasn't JSON or couldn't be parsed
-    }
-    const message =
-      (errBody && (errBody.message || errBody.error || JSON.stringify(errBody))) ||
-      res.statusText ||
-      `HTTP ${res.status}`;
-    console.log("\nLogin failed:", message);
+  const isValidEmail = /\S+@\S+\.\S+/.test(email);
+  if (!isValidEmail) {
+    log.error("Please enter a valid email address.");
     return;
   }
 
-  // Step 2 — Extract session cookie
-  const cookie = res.headers.get("set-cookie");
-  if (!cookie) {
-    console.log("Failed: No session cookie returned.");
-    return;
-  }
+  try {
+
+    // Step 1: Sign in with email and password to obtain session cookie
+    const res = await safeFetch(`${BASE_URL}/sign-in/email`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ email, password })
+    });
 
-  // Step 3 — Fetch JWT token
-  const tokenRes = await fetch(`${BASE_URL}/token`, {
-    method: "GET",
-    headers: { "Cookie": cookie }
-  });
+    const cookie = res.headers.get("set-cookie");
+    if (!cookie) {
+      log.error("Unable to retrieve session cookie. Login failed.");
+      return;
+    }
+
+    const tokenRes = await safeFetch(`${BASE_URL}/token`, {
+      method: "GET",
+      headers: { Cookie: cookie }
+    });
 
-  let token = null;
-  if (tokenRes.ok) {
     const json = await tokenRes.json();
-    token = json.token;
-  }
+    const token = json.token;
+
+    const expiresAt = new Date(
+      Date.now() + 30 * 24 * 60 * 60 * 1000
+    ).toISOString();
 
-  // Step 4 — Save session + jwt locally with expiration
-  const expiresAt = new Date(Date.now() + (30 * 24 * 60 * 60 * 1000)).toISOString(); // 30 days
-  saveSession({
-    cookies: cookie,
-    jwt: token,
-    createdAt: new Date().toISOString(),
-    expiresAt: expiresAt
-  });
+    saveSession({
+      cookies: cookie,
+      jwt: token,
+      createdAt: new Date().toISOString(),
+      expiresAt
+    });
+
+    log.success("You have successfully logged in");
+    log.info(`Session expires: ${expiresAt}`);
+  } catch (err) {
+    handleFetchError(err);
+  }
 
-  console.log("\nLogged in successfully!");
-  console.log(`Session expires: ${expiresAt}`);
 }

package/src/commands/mkcat.js

@@ -1,5 +1,5 @@
+import { log } from "../utils/log.js";
 import { apiRequest } from "../utils/request.js";
-import { loadSession } from "../utils/session.js";
 
 export async function mkcat(categoryName) {
   // Validate input
@@ -9,21 +9,12 @@ export async function mkcat(categoryName) {
     categoryName.includes(" ") ||
     categoryName.length > 10
   ) {
-    console.log(
-      "Invalid category name. It must be non-empty, without spaces, and ≤ 10 characters."
+    log.warn(
+      "Invalid category name. It must be non-empty, without spaces, and at most 10 characters."
     );
-    return;
+    process.exit(1);
   }
 
-  // Check session
-  const session = loadSession();
-  if (!session || !session.jwt) {
-    console.log("You must be logged in. Run: composter login");
-    return;
-  }
-
-  try {
-    // Send request
     const res = await apiRequest("/categories", {
       method: "POST",
       headers: { "Content-Type": "application/json" },
@@ -38,34 +29,16 @@ export async function mkcat(categoryName) {
       // Ignore if no JSON
     }
 
-    // Handle auth failure
-    if (res.status === 401) {
-      console.log("Session expired. Run composter login again.");
-      return;
-    }
-
-    // Handle server errors
-    if (res.status >= 500) {
-      console.log("Server error. Try again later.");
-      return;
-    }
-
-    // Handle success
     if (res.ok) {
-      console.log(`Category '${categoryName}' created successfully!`);
-      console.log("ID:", body?.category?.id);
-      return;
+      log.info(`Category '${categoryName}' created successfully!`);
+      process.exit(0);
     }
 
-    // Handle other errors
+    // handling server sent errors, like duplicate category
     const msg =
-      body?.error ||
-      body?.message ||
-      JSON.stringify(body) ||
+      (body && (body.error || body.message || JSON.stringify(body))) ||
       `HTTP ${res.status}`;
 
-    console.log("Failed to create category:", msg);
-  } catch (err) {
-    console.log("Network or unexpected error:", err.message);
-  }
+    log.error(`Failed to create category: ${msg}`);
+    process.exit(1);
 }

package/src/commands/pull.js

@@ -1,28 +1,22 @@
+import chalk from "chalk";
+import { log } from "../utils/log.js";
 import { apiRequest } from "../utils/request.js";
-import { loadSession } from "../utils/session.js";
 import fs from "fs";
 import path from "path";
 
 export async function pullComponent(category, title, targetDir) { 
     // 1. Validate Input
+    // although commander ensures these are provided, we double-check here
     if (!category?.trim() || !title?.trim() || !targetDir?.trim()) {
-        console.log("❌ Category, title, and target directory are required.");
-        return;
+        log.error("Category, title, and target directory are required.");
+        process.exit(1);
     }
  
     // 2. Resolve Target Directory
     // In multi-file mode, the target is usually a FOLDER, not a specific file.
     const absoluteRoot = path.resolve(targetDir);
  
-    // 3. Check Session
-    const session = loadSession();
-    if (!session || !session.jwt) {
-        console.log("❌ You must be logged in. Run: composter login");
-        return;
-    }
- 
-    try {
-        console.log(`⏳ Fetching '${title}' from '${category}'...`);
+        log.info(`⏳ Fetching '${title}' from '${category}'...`);
 
         const res = await apiRequest(`/components?category=${encodeURIComponent(category)}&title=${encodeURIComponent(title)}`, {
             method: "GET",
@@ -33,22 +27,9 @@ export async function pullComponent(category, title, targetDir) {
         let body = null;
         try { body = await res.json(); } catch {}
 
-        if (res.status === 401) {
-            console.log("❌ Session expired. Run composter login again.");
-            return;
-        }
-        if (res.status === 404) {
-            console.log(`❌ Component '${title}' not found.`);
-            return;
-        }
-        if (!res.ok) {
-            console.log("❌ Server error:", body?.error || res.statusText);
-            return;
-        }
-
-        const component = body.component;
+        const component = body.component ?? null;
 
-        // --- STEP 4: PARSE FILES (Handle JSON vs String) ---
+        // PARSE FILES (Handle JSON vs String) 
         let filesMap = {};
         try {
             // Try to parse new multi-file format
@@ -64,8 +45,8 @@ export async function pullComponent(category, title, targetDir) {
             filesMap[`/${fileName}`] = component.code;
         }
 
-        // --- STEP 5: WRITE FILES TO DISK ---
-        console.log(`📦 Unpacking ${Object.keys(filesMap).length} file(s) into: ${absoluteRoot}`);
+        // WRITE FILES TO DISK 
+        log.info(`📦 Unpacking ${Object.keys(filesMap).length} file(s) into: ${absoluteRoot}`);
 
         // Ensure the root target folder exists
         if (!fs.existsSync(absoluteRoot)) {
@@ -90,19 +71,15 @@ export async function pullComponent(category, title, targetDir) {
             // Write file
             fs.writeFileSync(writePath, content, "utf-8");
             createdFiles.push(relPath);
-            console.log(`   + ${relPath}`);
+            console.log(chalk.cyan(`   + ${relPath}`));
         }
 
-        // --- STEP 6: CHECK DEPENDENCIES ---
+        // CHECK DEPENDENCIES 
         if (component.dependencies && Object.keys(component.dependencies).length > 0) {
             checkDependencies(component.dependencies);
         }
 
-        console.log(`\n✅ Component '${title}' pulled successfully!`);
-
-    } catch (err) {
-        console.log("❌ Error pulling component:", err);
-    }
+        log.success(`Component '${title}' pulled successfully!`);
 }
 
 /**
@@ -113,8 +90,8 @@ function checkDependencies(requiredDeps) {
     
     // If no package.json, we can't check, so just list them all
     if (!fs.existsSync(localPkgPath)) {
-        console.log("\n⚠️  This component requires these packages:");
-        Object.entries(requiredDeps).forEach(([pkg, ver]) => console.log(`   - ${pkg}@${ver}`));
+        log.warn("This component requires these packages:");
+        Object.entries(requiredDeps).forEach(([pkg, ver]) => log.warn(`   - ${pkg}@${ver}`));
         return;
     }
 
@@ -130,10 +107,10 @@ function checkDependencies(requiredDeps) {
         }
 
         if (missing.length > 0) {
-            console.log("\n⚠️  Missing Dependencies (Run this to fix):");
-            console.log(`   npm install ${missing.map(d => d.split('@')[0]).join(" ")}`);
+            log.warn("Missing Dependencies (Run this to fix):");
+            log.info(`   npm install ${missing.map(d => d.split('@')[0]).join(" ")}`);
         } else {
-            console.log("\n✨ All dependencies are already installed.");
+            log.info("All dependencies are already installed.");
         }
     } catch (e) {
         // Ignore JSON parse errors

package/src/commands/push.js

@@ -1,42 +1,34 @@
 import { apiRequest } from "../utils/request.js";
-import { loadSession } from "../utils/session.js";
 import fs from "fs";
 import path from "path";
-// IMPORT THE NEW SPIDER
 import { scanComponent } from "../utils/crawler.js"; 
+import { log } from "../utils/log.js";
 
 export async function pushComponent(category, title, filepath) { 
     // 1. Validate Input
+    // although commander ensures these are provided, we double-check here
     if (!category?.trim() || !title?.trim() || !filepath?.trim()) {
-        console.log("❌ Category, title, and filepath are required.");
+        log.error("Category, title, and filepath are required.");
         return;
     }
 
     // 2. Validate Entry File
     const absolutePath = path.resolve(filepath);
     if (!fs.existsSync(absolutePath)) {
-        console.log(`❌ File not found: ${absolutePath}`);
-        return;
-    }
-
-    // 3. Check Session
-    const session = loadSession();
-    if (!session || !session.jwt) {
-        console.log("❌ You must be logged in. Run: composter login");
+        log.error(`File not found: ${absolutePath}`);
         return;
     }
 
     // 4. RUN THE CRAWLER
-    console.log(`Scanning ${path.basename(absolutePath)} and its dependencies...`);
+    log.info(`Scanning ${path.basename(absolutePath)} and its dependencies...`);
     
     const { files, dependencies } = scanComponent(absolutePath);
     
     const fileCount = Object.keys(files).length;
     const depCount = Object.keys(dependencies).length;
 
-    console.log(`📦 Bundled ${fileCount} file(s) and detected ${depCount} external package(s).`);
+    log.info(`📦 Bundled ${fileCount} file(s) and detected ${depCount} external package(s).`);
 
-    try {
         // 5. Send Request
         // We send 'files' as a JSON string because your DB 'code' column is a String.
         const res = await apiRequest("/components", {
@@ -54,20 +46,12 @@ export async function pushComponent(category, title, filepath) {
         let body = null;
         try { body = await res.json(); } catch {}
 
-        if (res.status === 401) {
-            console.log("❌ Session expired. Run composter login again.");
-            return;
-        }
-
         if (res.ok) {
-            console.log(`✅ Success! Component '${title}' pushed to '${category}'.`);
+            log.success(`Success! Component '${title}' pushed to '${category}'.`);
             return;
         }
 
+        // handle client errors, e.g., 4xx (bad request, conflict, etc.)
         const errorMessage = body?.message || body?.error || res.statusText;
-        console.log("❌ Error pushing component:", errorMessage);
-
-    } catch (error) {
-        console.log("❌ Network Error:", error.message);
-    }
+        log.error(`Error pushing component: ${errorMessage}`);
 }

package/src/constants/asciiArts.js

@@ -0,0 +1,21 @@
+const composterLoginArt = `
+   █████████     ███████    ██████   ██████ ███████████     ███████     █████████  ███████████ ██████████ ███████████     
+  ███░░░░░███  ███░░░░░███ ░░██████ ██████ ░░███░░░░░███  ███░░░░░███  ███░░░░░███░█░░░███░░░█░░███░░░░░█░░███░░░░░███    
+ ███     ░░░  ███     ░░███ ░███░█████░███  ░███    ░███ ███     ░░███░███    ░░░ ░   ░███  ░  ░███  █ ░  ░███    ░███    
+░███         ░███      ░███ ░███░░███ ░███  ░██████████ ░███      ░███░░█████████     ░███     ░██████    ░██████████     
+░███         ░███      ░███ ░███ ░░░  ░███  ░███░░░░░░  ░███      ░███ ░░░░░░░░███    ░███     ░███░░█    ░███░░░░░███    
+░░███     ███░░███     ███  ░███      ░███  ░███        ░░███     ███  ███    ░███    ░███     ░███ ░   █ ░███    ░███    
+ ░░█████████  ░░░███████░   █████     █████ █████        ░░░███████░  ░░█████████     █████    ██████████ █████   █████   
+  ░░░░░░░░░     ░░░░░░░    ░░░░░     ░░░░░ ░░░░░           ░░░░░░░     ░░░░░░░░░     ░░░░░    ░░░░░░░░░░ ░░░░░   ░░░░░                                                                                                                         
+`;
+
+const composterLoginArtv2 = `
+ ██████╗ ██████╗ ███╗   ███╗██████╗  ██████╗ ███████╗████████╗███████╗██████╗ 
+██╔════╝██╔═══██╗████╗ ████║██╔══██╗██╔═══██╗██╔════╝╚══██╔══╝██╔════╝██╔══██╗
+██║     ██║   ██║██╔████╔██║██████╔╝██║   ██║███████╗   ██║   █████╗  ██████╔╝
+██║     ██║   ██║██║╚██╔╝██║██╔═══╝ ██║   ██║╚════██║   ██║   ██╔══╝  ██╔══██╗
+╚██████╗╚██████╔╝██║ ╚═╝ ██║██║     ╚██████╔╝███████║   ██║   ███████╗██║  ██║
+ ╚═════╝ ╚═════╝ ╚═╝     ╚═╝╚═╝      ╚═════╝ ╚══════╝   ╚═╝   ╚══════╝╚═╝  ╚═╝
+`;
+
+export { composterLoginArt, composterLoginArtv2 };

package/src/index.js

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
-
+process.env.DOTENV_CONFIG_QUIET = "true";
+process.env.DOTENVX_QUIET = "true";
+import "dotenv/config";
 import { Command } from "commander";
 import { login } from "./commands/login.js";
 import { mkcat } from "./commands/mkcat.js";
@@ -8,6 +10,7 @@ import { pushComponent } from "./commands/push.js";
 import { pullComponent } from "./commands/pull.js";
 import { initMcp } from "./commands/init.js";
 import { createRequire } from "module";
+import { log } from "./utils/log.js";
 
 const require = createRequire(import.meta.url);
 const packageJson = require("../package.json");
@@ -17,7 +20,17 @@ const program = new Command();
 program
   .name("composter")
   .description("CLI for Composter Platform")
-  .version(packageJson.version);
+  .version(packageJson.version)
+  .configureOutput({
+    // Override the default error handling to use our custom handler
+    writeErr: (str) => {
+      if (str.includes("error:")) log.error(str.trim());
+      else log.info(str.trim());
+    },
+    writeOut: (str) => {
+      log.info(str.trim());
+    },
+  });
 
 program
   .command("login")
@@ -57,4 +70,23 @@ program
     pullComponent(category, title, filepath);
   });
 
+process.on("SIGINT", () => {
+  process.stdout.write("\n");
+  process.exit(130);
+});
+
+process.on("unhandledRejection", (err) => {
+  // Ctrl+C during fetch / inquirer
+  if (
+    err?.name === "AbortError" ||
+    err?.name === "ExitPromptError"
+  ) {
+    log.info("\nOperation cancelled by user.\n");
+    process.exit(130);
+  }
+
+  console.error(err);
+  process.exit(1);
+});
+
 program.parse(process.argv);

package/src/utils/crawler.js

@@ -1,5 +1,6 @@
 import fs from "fs";
 import path from "path";
+import { log } from "./log.js";
 
 const IMPORT_REGEX = /(?:import|export)\s+(?:[\w*\s{},]*\s+from\s+)?['"]([^'"]+)['"]/g;
 
@@ -37,14 +38,16 @@ export function scanComponent(entryFilePath) {
     if (fs.existsSync(localPkgPath)) {
       localPkg = JSON.parse(fs.readFileSync(localPkgPath, "utf-8"));
     }
-  } catch (e) {}
+  } catch (e) {
+    log.warn("Could not read local package.json. The file may be corrupted")
+  }
 
   while (queue.length > 0) {
     const fullPath = queue.shift();
     if (processed.has(fullPath)) continue;
     
     if (!fs.existsSync(fullPath)) {
-      console.warn(`⚠️  Warning: File not found: ${fullPath}`);
+      log.warn(`Warning: File not found - ${fullPath}`);
       continue;
     }
 

package/src/utils/errorHandlers/fetchErrorHandler.js

@@ -0,0 +1,36 @@
+import { log } from "../log.js";
+
+export function handleFetchError(err) {
+  switch (err.message) {
+    case "NETWORK_UNREACHABLE":
+      log.error("Cannot reach server. Check your internet or VPN connection.");
+      break;
+
+    case "SESSION_EXPIRED":
+      log.warn("Your session has expired. Please log in again.");
+      break;
+
+    case "NETWORK_TIMEOUT":
+      log.warn("Network request timed out. Please try again.");
+      break;
+    
+    case "UNAUTHORIZED":
+      log.error("Invalid email or password.");
+      break;
+
+    case "NOT_FOUND":
+      log.error("Requested resource does not exist.");
+      break;
+
+    case "SERVER_ERROR":
+      log.error("Service temporarily unavailable. Try again later.");
+      break;
+
+    default:
+      log.error("An unexpected error occurred.");
+  }
+
+  if (process.env.DEBUG === "1" || process.env.DEBUG === "true") {
+    console.error(err);
+  }
+}

package/src/utils/errorHandlers/sessionErrorHandler.js

@@ -0,0 +1,32 @@
+import { log } from "../log.js";
+
+export function handleSessionError(err) {
+  switch (err.message) {
+    case "FAILED_SESSION_SAVE":
+      log.error("Failed to save session data. Please try logging in again.");
+      break;
+
+    case "NO_SESSION":
+      log.warn("You need to log in first.");
+      log.info("Run: composter login");
+      break;
+
+    case "SESSION_FILE_CORRUPT":
+      log.warn("Session file is corrupt. Please log in again.");
+      break;
+
+    case "SESSION_INVALID":
+      log.warn("Session data is invalid. Please log in again.");
+      break;
+
+    case "SESSION_EXPIRED":
+      log.warn("Your session has expired. Please log in again.");
+      break;
+    default:
+      log.error("An unexpected error occurred.");
+  }
+
+  if (process.env.DEBUG === "1" || process.env.DEBUG === "true") {
+    console.error(err);
+  }
+}

package/src/utils/log.js

@@ -0,0 +1,8 @@
+import chalk from "chalk";
+
+export const log = {
+  info: (msg) => console.log(chalk.blue.bold(`${msg}`)),
+  success: (msg) => console.log(chalk.green.bold(`✔ ${msg}`)),
+  warn: (msg) => console.log(chalk.yellow.bold(`⚠  ${msg}`)),
+  error: (msg) => console.error(chalk.red.bold(`✖ ${msg}`)),
+};

package/src/utils/request.js

@@ -1,35 +1,44 @@
-import fetch from "node-fetch";
-import { loadSession, clearSession } from "./session.js";
-import dotenv from "dotenv";
-dotenv.config({ silent: true });
+import { clearSession, loadSession } from "./session.js";
+import { safeFetch } from "./safeFetch.js";
+import { handleSessionError } from "./errorHandlers/sessionErrorHandler.js";
+import { handleFetchError } from "./errorHandlers/fetchErrorHandler.js";
+import { log } from "./log.js";
 
-const BASE_URL = process.env.BASE_URL || "https://composter.onrender.com/api";
+const BASE_URL = process.env.BASE_URL;
 
 export async function apiRequest(path, options = {}) {
-  const session = loadSession();
+
+  try {
+    const session = loadSession();
+    const headers = options.headers || {};
   
-  if (!session) {
-    console.error("Not authenticated. Please run 'composter login'");
-    process.exit(1);
-  }
+    if (session?.jwt) {
+      headers["Authorization"] = `Bearer ${session.jwt}`;
+    }
   
-  const headers = options.headers || {};
-
-  if (session?.jwt) {
-    headers["Authorization"] = `Bearer ${session.jwt}`;
-  }
-
-  const res = await fetch(`${BASE_URL}${path}`, {
-    ...options,
-    headers,
-  });
-
-  // Handle 401 Unauthorized (expired/invalid session)
-  if (res.status === 401) {
-    console.error("Authentication failed. Please run 'composter login' again");
-    clearSession();
-    process.exit(1);
+    const res = await safeFetch(`${BASE_URL}${path}`, {
+      ...options,
+      headers,
+    });
+  
+    return res;
+  } catch (error) {
+      if (error.type === "SESSION_ERROR") {
+        handleSessionError(error);
+        process.exit(1);
+      } 
+      else {
+        // if we get an 401 error, it usually means the session is invalid or expired
+        // hence we clear the session and handle the error accordingly
+        if(error.type === "FETCH_ERROR" && error.message === "UNAUTHORIZED") {
+          clearSession();
+          log.warn("Session invalid or expired. Please log in again.");
+          log.info("Run: composter login");
+          process.exit(1);
+        }
+        handleFetchError(error);
+        process.exit(1);
+      }
   }
 
-  return res;
 }

package/src/utils/safeFetch.js

@@ -0,0 +1,49 @@
+import fetch from "node-fetch";
+import { FetchError } from "node-fetch";
+
+export async function safeFetch(url, options = {}) {
+
+  let res;
+
+  const controller = new AbortController(); // to handle timeouts
+    const timeout = setTimeout(() => {
+        controller.abort();
+    }, 10000);
+
+  try {
+    res = await fetch(url, { ...options, signal: controller.signal });
+  } catch (err) {
+    if (err.code === "ECONNREFUSED" || err.code === "ENOTFOUND") {
+      throw new FetchError("NETWORK_UNREACHABLE", 'FETCH_ERROR');
+    }
+
+    if (err.name === "AbortError") {
+      throw new FetchError("NETWORK_TIMEOUT", 'FETCH_ERROR');
+    }
+
+    throw new FetchError("NETWORK_ERROR", 'FETCH_ERROR');
+  } finally {
+    clearTimeout(timeout);
+  }
+
+  if (!res.ok) {
+    if (res.status === 401 || res.status === 403) {
+      throw new FetchError("UNAUTHORIZED", 'FETCH_ERROR');
+    }
+
+    if (res.status === 404) {
+      throw new FetchError("NOT_FOUND", 'FETCH_ERROR');
+    }
+
+    if (res.status >= 500) {
+      throw new FetchError("SERVER_ERROR", 'FETCH_ERROR');
+    }
+
+    // Other HTTP errors will be handled by the caller
+    // these are mostly client errors (4xx) like 400, 409 etc.
+    return res;
+  }
+
+  return res;
+}
+

package/src/utils/session.js

@@ -1,30 +1,48 @@
 import fs from "fs";
 import { SESSION_PATH, ensureConfigDir } from "./paths.js";
 
+class SessionError extends Error {
+  constructor(message) {
+    super(message);
+    this.type = "SESSION_ERROR";
+  }
+}
 export function saveSession(sessionData) {
-  ensureConfigDir();
-  fs.writeFileSync(SESSION_PATH, JSON.stringify(sessionData, null, 2), "utf-8");
+  try {
+    ensureConfigDir();
+    fs.writeFileSync(SESSION_PATH, JSON.stringify(sessionData, null, 2), "utf-8");
+  } catch (error) {
+    throw new SessionError("FAILED_SESSION_SAVE");
+  }
 }
 
 export function loadSession() {
-  if (!fs.existsSync(SESSION_PATH)) return null;
+  if (!fs.existsSync(SESSION_PATH)) {
+    throw new SessionError("NO_SESSION");
+  }
   
+  let session;
+
+  // read and parse session file
   try {
-    const session = JSON.parse(fs.readFileSync(SESSION_PATH, "utf-8"));
-    
-    // Check if session is expired
-    if (session.expiresAt && new Date(session.expiresAt) < new Date()) {
-      console.log("Session expired. Please run 'composter login' again.");
-      clearSession();
-      return null;
-    }
-    
-    return session;
+    session = JSON.parse(fs.readFileSync(SESSION_PATH, "utf-8"));
   } catch (error) {
-    console.error("Invalid session file. Please run 'composter login' again.");
     clearSession();
-    return null;
+    throw new SessionError("SESSION_FILE_CORRUPT");
+  }
+   
+  // validate session structure and if expiry is valid date
+  if (!session.expiresAt || isNaN(Date.parse(session.expiresAt))) {
+    clearSession();
+    throw new SessionError("SESSION_INVALID");
   }
+
+  // check if session is expired
+  if (new Date(session.expiresAt) < new Date()) {
+    clearSession();
+    throw new SessionError("SESSION_EXPIRED");
+  } 
+  return session;
 }
 
 export function clearSession() {