composter-cli 1.0.11 → 1.0.15

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() {

package/mcp/lib/auth.js

@@ -1,78 +0,0 @@
-import fs from "fs";
-import path from "path";
-import os from "os";
-
-// Session path (same as CLI)
-const SESSION_PATH = path.join(os.homedir(), ".config", "composter", "session.json");
-
-// Get base URL - supports both dev and production
-export function getBaseUrl() {
-  // Check for explicit env var first
-  if (process.env.COMPOSTER_API_URL) {
-    return process.env.COMPOSTER_API_URL;
-  }
-  // Check for dev mode
-  if (process.env.COMPOSTER_DEV === "true" || process.env.NODE_ENV === "development") {
-    return "http://localhost:3000/api";
-  }
-  // Default to production
-  return "https://composter.onrender.com/api";
-}
-
-// Load session from CLI's session file
-export function loadSession() {
-  if (!fs.existsSync(SESSION_PATH)) {
-    return null;
-  }
-
-  try {
-    const raw = fs.readFileSync(SESSION_PATH, "utf-8");
-    const session = JSON.parse(raw);
-
-    // Check if session is expired
-    if (session.expiresAt && new Date(session.expiresAt) < new Date()) {
-      return null;
-    }
-
-    return session;
-  } catch {
-    return null;
-  }
-}
-
-// Get JWT token from session
-export function getAuthToken() {
-  const session = loadSession();
-  if (!session) {
-    throw new Error("No session found. Please run 'composter login' first.");
-  }
-
-  const token = session.jwt || session.token || session.accessToken;
-  if (!token) {
-    throw new Error("Session file missing token. Please run 'composter login' again.");
-  }
-
-  return token;
-}
-
-// Verify session is valid by making a test API call
-export async function verifySession() {
-  const token = getAuthToken();
-  const baseUrl = getBaseUrl();
-
-  const res = await fetch(`${baseUrl.replace('/api', '')}/api/me`, {
-    headers: {
-      "Authorization": `Bearer ${token}`,
-    },
-  });
-
-  if (!res.ok) {
-    if (res.status === 401) {
-      throw new Error("Session expired. Please run 'composter login' again.");
-    }
-    throw new Error(`Authentication failed: ${res.statusText}`);
-  }
-
-  const data = await res.json();
-  return data?.user?.id || data?.session?.userId;
-}