@realtimex/email-automator 2.3.0 → 2.3.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/api/server.ts +2 -4
- package/api/src/config/index.ts +8 -6
- package/bin/email-automator.js +6 -1
- package/dist/api/server.js +2 -4
- package/dist/api/src/config/index.js +5 -4
- package/package.json +1 -1
package/api/server.ts
CHANGED
|
@@ -66,10 +66,8 @@ app.use('/api', apiRateLimit);
|
|
|
66
66
|
// API routes
|
|
67
67
|
app.use('/api', routes);
|
|
68
68
|
|
|
69
|
-
// Serve static files - robust resolution for compiled app
|
|
70
|
-
|
|
71
|
-
// In dev mode, it is at ../dist
|
|
72
|
-
const distPath = path.join(process.cwd(), 'dist');
|
|
69
|
+
// Serve static files - robust resolution for compiled app and NPX
|
|
70
|
+
const distPath = process.env.ELECTRON_STATIC_PATH || path.join(process.cwd(), 'dist');
|
|
73
71
|
app.use(express.static(distPath));
|
|
74
72
|
|
|
75
73
|
// Handle client-side routing
|
package/api/src/config/index.ts
CHANGED
|
@@ -1,15 +1,17 @@
|
|
|
1
1
|
import dotenv from 'dotenv';
|
|
2
2
|
import { fileURLToPath } from 'url';
|
|
3
|
-
import { dirname, join } from 'path';
|
|
4
|
-
|
|
5
|
-
// 1. Try to load from current working directory (e.g. where npx is run)
|
|
6
|
-
dotenv.config({ path: join(process.cwd(), '.env') });
|
|
7
|
-
// 2. Fallback to package root
|
|
8
|
-
dotenv.config();
|
|
3
|
+
import path, { dirname, join } from 'path';
|
|
9
4
|
|
|
10
5
|
const __filename = fileURLToPath(import.meta.url);
|
|
11
6
|
const __dirname = dirname(__filename);
|
|
12
7
|
|
|
8
|
+
// 1. Try to load from current working directory (where npx is run)
|
|
9
|
+
dotenv.config({ path: join(process.cwd(), '.env') });
|
|
10
|
+
|
|
11
|
+
// 2. Fallback to package root (where the binary lives)
|
|
12
|
+
// In dist/api/src/config/index.js, the root is 4 levels up
|
|
13
|
+
dotenv.config({ path: join(__dirname, '..', '..', '..', '.env') });
|
|
14
|
+
|
|
13
15
|
function parseArgs(args: string[]): { port: number | null, noUi: boolean } {
|
|
14
16
|
const portIndex = args.indexOf('--port');
|
|
15
17
|
let port = null;
|
package/bin/email-automator.js
CHANGED
|
@@ -32,11 +32,16 @@ console.log('');
|
|
|
32
32
|
|
|
33
33
|
// Path to compiled server
|
|
34
34
|
const serverPath = join(__dirname, '..', 'dist', 'api', 'server.js');
|
|
35
|
+
const distPath = join(__dirname, '..', 'dist');
|
|
35
36
|
|
|
36
37
|
// Start server with standard node
|
|
37
38
|
const server = spawn(process.execPath, [serverPath, ...args], {
|
|
38
39
|
stdio: 'inherit',
|
|
39
|
-
env: {
|
|
40
|
+
env: {
|
|
41
|
+
...process.env,
|
|
42
|
+
PORT: port,
|
|
43
|
+
ELECTRON_STATIC_PATH: distPath // Reuse a standard env name for static assets
|
|
44
|
+
},
|
|
40
45
|
});
|
|
41
46
|
|
|
42
47
|
server.on('error', (error) => {
|
package/dist/api/server.js
CHANGED
|
@@ -55,10 +55,8 @@ app.use((req, res, next) => {
|
|
|
55
55
|
app.use('/api', apiRateLimit);
|
|
56
56
|
// API routes
|
|
57
57
|
app.use('/api', routes);
|
|
58
|
-
// Serve static files - robust resolution for compiled app
|
|
59
|
-
|
|
60
|
-
// In dev mode, it is at ../dist
|
|
61
|
-
const distPath = path.join(process.cwd(), 'dist');
|
|
58
|
+
// Serve static files - robust resolution for compiled app and NPX
|
|
59
|
+
const distPath = process.env.ELECTRON_STATIC_PATH || path.join(process.cwd(), 'dist');
|
|
62
60
|
app.use(express.static(distPath));
|
|
63
61
|
// Handle client-side routing
|
|
64
62
|
app.get(/.*/, (req, res, next) => {
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import dotenv from 'dotenv';
|
|
2
2
|
import { fileURLToPath } from 'url';
|
|
3
3
|
import { dirname, join } from 'path';
|
|
4
|
-
// 1. Try to load from current working directory (e.g. where npx is run)
|
|
5
|
-
dotenv.config({ path: join(process.cwd(), '.env') });
|
|
6
|
-
// 2. Fallback to package root
|
|
7
|
-
dotenv.config();
|
|
8
4
|
const __filename = fileURLToPath(import.meta.url);
|
|
9
5
|
const __dirname = dirname(__filename);
|
|
6
|
+
// 1. Try to load from current working directory (where npx is run)
|
|
7
|
+
dotenv.config({ path: join(process.cwd(), '.env') });
|
|
8
|
+
// 2. Fallback to package root (where the binary lives)
|
|
9
|
+
// In dist/api/src/config/index.js, the root is 4 levels up
|
|
10
|
+
dotenv.config({ path: join(__dirname, '..', '..', '..', '.env') });
|
|
10
11
|
function parseArgs(args) {
|
|
11
12
|
const portIndex = args.indexOf('--port');
|
|
12
13
|
let port = null;
|