Merge branch 'main' of github.com:MCPJam/inspector

Author: chelojimenez

server/app.ts

@@ -4,25 +4,55 @@ import { cors } from "hono/cors";
 import { logger } from "hono/logger";
 import { serveStatic } from "@hono/node-server/serve-static";
 import dotenv from "dotenv";
+import { existsSync } from "fs";
+import { join, dirname, resolve } from "path";
+import { fileURLToPath } from "url";
 
 // Import routes
 import mcpRoutes from "./routes/mcp/index.js";
 import { MCPJamClientManager } from "./services/mcpjam-client-manager.js";
 import path from "path";
 
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
 export function createHonoApp() {
   // Load environment variables early so route handlers can read CONVEX_HTTP_URL
-  try {
-    const envFile =
-      process.env.NODE_ENV === "production"
-        ? ".env.production"
-        : ".env.development";
-    dotenv.config({ path: envFile });
-    if (!process.env.CONVEX_HTTP_URL) {
-      dotenv.config();
+  const envFile =
+    process.env.NODE_ENV === "production"
+      ? ".env.production"
+      : ".env.development";
+
+  // Determine where to look for .env file:
+  // 1. Electron packaged: use process.resourcesPath directly
+  // 2. npm package: package root (two levels up from dist/server)
+  // 3. Local dev: current working directory
+  let envPath = envFile;
+
+  if (process.env.IS_PACKAGED === "true" && process.resourcesPath) {
+    // Electron packaged app - use process.resourcesPath directly
+    envPath = join(process.resourcesPath, envFile);
+  } else if (process.env.ELECTRON_APP === "true") {
+    // Electron dev mode - already handled by src/main.ts setting env vars
+    envPath = join(process.env.ELECTRON_RESOURCES_PATH || ".", envFile);
+  } else {
+    // npm package or local dev
+    const packageRoot = resolve(__dirname, "..", "..");
+    const packageEnvPath = join(packageRoot, envFile);
+    if (existsSync(packageEnvPath)) {
+      envPath = packageEnvPath;
     }
-  } catch (error) {
-    console.warn("[startup] Failed loading env files", error);
+  }
+
+  dotenv.config({ path: envPath });
+
+  // Validate required env vars
+  if (!process.env.CONVEX_HTTP_URL) {
+    throw new Error(
+      `CONVEX_HTTP_URL is required but not set. Tried loading from: ${envPath}\n` +
+        `IS_PACKAGED=${process.env.IS_PACKAGED}, resourcesPath=${process.resourcesPath}\n` +
+        `File exists: ${existsSync(envPath)}`,
+    );
   }
 
   // Ensure PATH includes user shell paths so child processes (e.g., npx) can be found

server/index.ts

@@ -5,8 +5,12 @@ import { Hono } from "hono";
 import { cors } from "hono/cors";
 import { logger } from "hono/logger";
 import { serveStatic } from "@hono/node-server/serve-static";
-import { readFileSync } from "fs";
-import { join } from "path";
+import { readFileSync, existsSync } from "fs";
+import { join, dirname, resolve } from "path";
+import { fileURLToPath } from "url";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
 
 // ANSI color codes for console output
 const colors = {
@@ -123,17 +127,36 @@ try {
 const app = new Hono();
 
 // Load environment variables early so route handlers can read CONVEX_HTTP_URL
-try {
-  const envFile =
-    process.env.NODE_ENV === "production"
-      ? ".env.production"
-      : ".env.development";
-  dotenv.config({ path: envFile });
-  if (!process.env.CONVEX_HTTP_URL) {
-    dotenv.config();
+const envFile =
+  process.env.NODE_ENV === "production"
+    ? ".env.production"
+    : ".env.development";
+
+// Determine where to look for .env file:
+// 1. Electron: Resources folder
+// 2. npm package: package root (two levels up from dist/server)
+// 3. Local dev: current working directory
+let envPath = envFile;
+if (
+  process.env.ELECTRON_APP === "true" &&
+  process.env.ELECTRON_RESOURCES_PATH
+) {
+  envPath = join(process.env.ELECTRON_RESOURCES_PATH, envFile);
+} else {
+  const packageRoot = resolve(__dirname, "..", "..");
+  const packageEnvPath = join(packageRoot, envFile);
+  if (existsSync(packageEnvPath)) {
+    envPath = packageEnvPath;
   }
-} catch (error) {
-  console.warn("[startup] Failed loading env files", error);
+}
+
+dotenv.config({ path: envPath });
+
+// Validate required env vars
+if (!process.env.CONVEX_HTTP_URL) {
+  throw new Error(
+    "CONVEX_HTTP_URL is required but not set. Please set it via environment variable or .env file.",
+  );
 }
 
 // Initialize centralized MCPJam Client Manager

src/main.ts

@@ -55,10 +55,11 @@ async function startHonoServer(): Promise<number> {
   try {
     const port = app.isPackaged ? 3000 : await findAvailablePort(3000);
 
-    // Set environment variable to tell the server it's running in Electron
+    // Set environment variables to tell the server it's running in Electron
     process.env.ELECTRON_APP = "true";
     process.env.IS_PACKAGED = app.isPackaged ? "true" : "false";
     process.env.ELECTRON_RESOURCES_PATH = process.resourcesPath;
+    process.env.NODE_ENV = app.isPackaged ? "production" : "development";
 
     const honoApp = createHonoApp();