@realtimex/email-automator 2.3.4 → 2.3.6

package/api/server.ts

@@ -74,18 +74,23 @@ function getDistPath() {
         return process.env.ELECTRON_STATIC_PATH;
     }
 
-    // 2. Try to find dist relative to this file
-    // In dev: dist is at ../dist
-    // In npx/dist: dist is at ../../dist
+    // 2. Try to find dist relative to packageRoot (from config)
+    // This is the most reliable way in compiled app
+    const fromRoot = join(config.rootDir || process.cwd(), 'dist');
+    if (existsSync(join(fromRoot, 'index.html'))) {
+        return fromRoot;
+    }
+
+    // 3. Try to find dist relative to this file
     let current = __dirname;
     for (let i = 0; i < 4; i++) {
         const potential = join(current, 'dist');
-        if (existsSync(potential)) return potential;
+        if (existsSync(join(potential, 'index.html'))) return potential;
         current = path.dirname(current);
     }
 
-    // 3. Fallback to current working directory
-    return join(process.cwd(), 'dist');
+    // 4. Fallback to current working directory
+    return join(config.packageRoot || process.cwd(), 'dist');
 }
 
 const distPath = getDistPath();

package/api/src/config/index.ts

@@ -6,25 +6,38 @@ import { existsSync } from 'fs';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
-// Robustly find package root (directory containing package.json)
+// Robustly find package root (directory containing package.json and bin folder)
 function findPackageRoot(startDir: string): string {
     let current = startDir;
     while (current !== path.parse(current).root) {
-        if (existsSync(join(current, 'package.json'))) {
+        if (existsSync(join(current, 'package.json')) && existsSync(join(current, 'bin'))) {
             return current;
         }
         current = dirname(current);
     }
-    return process.cwd(); // Fallback
+    return process.cwd();
 }
 
 const packageRoot = findPackageRoot(__dirname);
+console.log(`🏠 Package Root: ${packageRoot}`);
+
+function loadEnvironment() {
+    const cwdEnv = join(process.cwd(), '.env');
+    const rootEnv = join(packageRoot, '.env');
+
+    if (existsSync(cwdEnv)) {
+        console.log(`📝 Loading environment from CWD: ${cwdEnv}`);
+        dotenv.config({ path: cwdEnv, override: true });
+    } else if (existsSync(rootEnv)) {
+        console.log(`📝 Loading environment from Root: ${rootEnv}`);
+        dotenv.config({ path: rootEnv, override: true });
+    } else {
+        // Just run default dotenv config in case it's in a standard location
+        dotenv.config();
+    }
+}
 
-// 1. Try to load from current working directory (where npx is run)
-dotenv.config({ path: join(process.cwd(), '.env') });
-
-// 2. Fallback to package root
-dotenv.config({ path: join(packageRoot, '.env') });
+loadEnvironment();
 
 function parseArgs(args: string[]): { port: number | null, noUi: boolean } {
     const portIndex = args.indexOf('--port');
@@ -45,6 +58,7 @@ const cliArgs = parseArgs(process.argv.slice(2));
 
 export const config = {
     // Server
+    packageRoot,
     // Default port 3004 (RealTimeX Desktop uses 3001/3002)
     port: cliArgs.port || (process.env.PORT ? parseInt(process.env.PORT, 10) : 3004),
     noUi: cliArgs.noUi,
@@ -52,8 +66,8 @@ export const config = {
     isProduction: process.env.NODE_ENV === 'production',
 
     // Paths - Robust resolution for both TS source and compiled JS in dist/
-    rootDir: process.cwd(),
-    scriptsDir: join(process.cwd(), 'scripts'),
+    rootDir: packageRoot,
+    scriptsDir: join(packageRoot, 'scripts'),
 
     // Supabase
     supabase: {

package/dist/api/server.js

@@ -62,18 +62,22 @@ function getDistPath() {
     if (process.env.ELECTRON_STATIC_PATH && existsSync(process.env.ELECTRON_STATIC_PATH)) {
         return process.env.ELECTRON_STATIC_PATH;
     }
-    // 2. Try to find dist relative to this file
-    // In dev: dist is at ../dist
-    // In npx/dist: dist is at ../../dist
+    // 2. Try to find dist relative to packageRoot (from config)
+    // This is the most reliable way in compiled app
+    const fromRoot = join(config.rootDir || process.cwd(), 'dist');
+    if (existsSync(join(fromRoot, 'index.html'))) {
+        return fromRoot;
+    }
+    // 3. Try to find dist relative to this file
     let current = __dirname;
     for (let i = 0; i < 4; i++) {
         const potential = join(current, 'dist');
-        if (existsSync(potential))
+        if (existsSync(join(potential, 'index.html')))
             return potential;
         current = path.dirname(current);
     }
-    // 3. Fallback to current working directory
-    return join(process.cwd(), 'dist');
+    // 4. Fallback to current working directory
+    return join(config.packageRoot || process.cwd(), 'dist');
 }
 const distPath = getDistPath();
 logger.info('Serving static assets', { path: distPath });

package/dist/api/src/config/index.js

@@ -4,22 +4,36 @@ import path, { dirname, join } from 'path';
 import { existsSync } from 'fs';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
-// Robustly find package root (directory containing package.json)
+// Robustly find package root (directory containing package.json and bin folder)
 function findPackageRoot(startDir) {
     let current = startDir;
     while (current !== path.parse(current).root) {
-        if (existsSync(join(current, 'package.json'))) {
+        if (existsSync(join(current, 'package.json')) && existsSync(join(current, 'bin'))) {
             return current;
         }
         current = dirname(current);
     }
-    return process.cwd(); // Fallback
+    return process.cwd();
 }
 const packageRoot = findPackageRoot(__dirname);
-// 1. Try to load from current working directory (where npx is run)
-dotenv.config({ path: join(process.cwd(), '.env') });
-// 2. Fallback to package root
-dotenv.config({ path: join(packageRoot, '.env') });
+console.log(`🏠 Package Root: ${packageRoot}`);
+function loadEnvironment() {
+    const cwdEnv = join(process.cwd(), '.env');
+    const rootEnv = join(packageRoot, '.env');
+    if (existsSync(cwdEnv)) {
+        console.log(`📝 Loading environment from CWD: ${cwdEnv}`);
+        dotenv.config({ path: cwdEnv, override: true });
+    }
+    else if (existsSync(rootEnv)) {
+        console.log(`📝 Loading environment from Root: ${rootEnv}`);
+        dotenv.config({ path: rootEnv, override: true });
+    }
+    else {
+        // Just run default dotenv config in case it's in a standard location
+        dotenv.config();
+    }
+}
+loadEnvironment();
 function parseArgs(args) {
     const portIndex = args.indexOf('--port');
     let port = null;
@@ -35,14 +49,15 @@ function parseArgs(args) {
 const cliArgs = parseArgs(process.argv.slice(2));
 export const config = {
     // Server
+    packageRoot,
     // Default port 3004 (RealTimeX Desktop uses 3001/3002)
     port: cliArgs.port || (process.env.PORT ? parseInt(process.env.PORT, 10) : 3004),
     noUi: cliArgs.noUi,
     nodeEnv: process.env.NODE_ENV || 'development',
     isProduction: process.env.NODE_ENV === 'production',
     // Paths - Robust resolution for both TS source and compiled JS in dist/
-    rootDir: process.cwd(),
-    scriptsDir: join(process.cwd(), 'scripts'),
+    rootDir: packageRoot,
+    scriptsDir: join(packageRoot, 'scripts'),
     // Supabase
     supabase: {
         url: process.env.SUPABASE_URL || process.env.VITE_SUPABASE_URL || '',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realtimex/email-automator",
-  "version": "2.3.4",
+  "version": "2.3.6",
   "type": "module",
   "main": "dist/api/server.js",
   "bin": {