@realtimex/email-automator 2.3.2 → 2.3.4

package/api/server.ts

@@ -1,8 +1,9 @@
 import express from 'express';
 import cors from 'cors';
-import path from 'path';
+import path, { join } from 'path';
 import { fileURLToPath } from 'url';
 import { spawn } from 'child_process';
+import { existsSync } from 'fs';
 import { config, validateConfig } from './src/config/index.js';
 import { errorHandler } from './src/middleware/errorHandler.js';
 import { apiRateLimit } from './src/middleware/rateLimit.js';
@@ -66,8 +67,29 @@ app.use('/api', apiRateLimit);
 // API routes
 app.use('/api', routes);
 
-// Serve static files - robust resolution for compiled app and NPX
-const distPath = process.env.ELECTRON_STATIC_PATH || path.join(process.cwd(), 'dist');
+// Robust resolution for static assets (dist folder)
+function getDistPath() {
+    // 1. Check environment variable override
+    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
+    let current = __dirname;
+    for (let i = 0; i < 4; i++) {
+        const potential = join(current, 'dist');
+        if (existsSync(potential)) return potential;
+        current = path.dirname(current);
+    }
+
+    // 3. Fallback to current working directory
+    return join(process.cwd(), 'dist');
+}
+
+const distPath = getDistPath();
+logger.info('Serving static assets', { path: distPath });
 app.use(express.static(distPath));
 
 // Handle client-side routing

package/api/src/config/index.ts

@@ -1,16 +1,30 @@
 import dotenv from 'dotenv';
 import { fileURLToPath } from 'url';
 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)
+function findPackageRoot(startDir: string): string {
+    let current = startDir;
+    while (current !== path.parse(current).root) {
+        if (existsSync(join(current, 'package.json'))) {
+            return current;
+        }
+        current = dirname(current);
+    }
+    return process.cwd(); // Fallback
+}
+
+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 (where the binary lives)
-// In dist/api/src/config/index.js, the root is 4 levels up
-dotenv.config({ path: join(__dirname, '..', '..', '..', '.env') });
+// 2. Fallback to package root
+dotenv.config({ path: join(packageRoot, '.env') });
 
 function parseArgs(args: string[]): { port: number | null, noUi: boolean } {
     const portIndex = args.indexOf('--port');

package/dist/api/server.js

@@ -1,7 +1,8 @@
 import express from 'express';
 import cors from 'cors';
-import path from 'path';
+import path, { join } from 'path';
 import { fileURLToPath } from 'url';
+import { existsSync } from 'fs';
 import { config, validateConfig } from './src/config/index.js';
 import { errorHandler } from './src/middleware/errorHandler.js';
 import { apiRateLimit } from './src/middleware/rateLimit.js';
@@ -55,8 +56,27 @@ app.use((req, res, next) => {
 app.use('/api', apiRateLimit);
 // API routes
 app.use('/api', routes);
-// Serve static files - robust resolution for compiled app and NPX
-const distPath = process.env.ELECTRON_STATIC_PATH || path.join(process.cwd(), 'dist');
+// Robust resolution for static assets (dist folder)
+function getDistPath() {
+    // 1. Check environment variable override
+    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
+    let current = __dirname;
+    for (let i = 0; i < 4; i++) {
+        const potential = join(current, 'dist');
+        if (existsSync(potential))
+            return potential;
+        current = path.dirname(current);
+    }
+    // 3. Fallback to current working directory
+    return join(process.cwd(), 'dist');
+}
+const distPath = getDistPath();
+logger.info('Serving static assets', { path: distPath });
 app.use(express.static(distPath));
 // Handle client-side routing
 app.get(/.*/, (req, res, next) => {

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

@@ -1,13 +1,25 @@
 import dotenv from 'dotenv';
 import { fileURLToPath } from 'url';
-import { dirname, join } from 'path';
+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)
+function findPackageRoot(startDir) {
+    let current = startDir;
+    while (current !== path.parse(current).root) {
+        if (existsSync(join(current, 'package.json'))) {
+            return current;
+        }
+        current = dirname(current);
+    }
+    return process.cwd(); // Fallback
+}
+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 (where the binary lives)
-// In dist/api/src/config/index.js, the root is 4 levels up
-dotenv.config({ path: join(__dirname, '..', '..', '..', '.env') });
+// 2. Fallback to package root
+dotenv.config({ path: join(packageRoot, '.env') });
 function parseArgs(args) {
     const portIndex = args.indexOf('--port');
     let port = null;

package/package.json

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