Update server.js

This commit is contained in:
fcarraUniSa
2025-12-23 12:23:07 +01:00
committed by GitHub
parent 3390bd8f17
commit 394b87dc25

View File

@@ -15,15 +15,27 @@ const __dirname = path.dirname(__filename);
const app = express(); const app = express();
const PORT = process.env.PORT || 3000; const PORT = process.env.PORT || 3000;
// 1. CORS deve essere la prima cosa per gestire le richieste OPTIONS dei browser
app.use(cors()); app.use(cors());
app.use(express.json()); app.options('*', cors());
app.use(express.static(path.join(__dirname, 'dist')));
// 2. Logging immediato di ogni richiesta
app.use((req, res, next) => { app.use((req, res, next) => {
console.log(`[${new Date().toISOString()}] ${req.method} ${req.url}`); const start = Date.now();
res.on('finish', () => {
const duration = Date.now() - start;
console.log(`[${new Date().toISOString()}] ${req.method} ${req.url} - Status: ${res.statusCode} (${duration}ms)`);
});
next(); next();
}); });
// 3. Parser JSON con limite aumentato (fondamentale per template HTML grandi)
app.use(express.json({ limit: '10mb' }));
app.use(express.urlencoded({ limit: '10mb', extended: true }));
// 4. File statici
app.use(express.static(path.join(__dirname, 'dist')));
const rawDbType = (process.env.DB_TYPE || 'mysql').toLowerCase().trim(); const rawDbType = (process.env.DB_TYPE || 'mysql').toLowerCase().trim();
const DB_TYPE = (rawDbType === 'postgres' || rawDbType === 'postgresql') ? 'postgres' : 'mysql'; const DB_TYPE = (rawDbType === 'postgres' || rawDbType === 'postgresql') ? 'postgres' : 'mysql';
@@ -35,13 +47,9 @@ const dbConfig = {
port: process.env.DB_PORT || (DB_TYPE === 'postgres' ? 5432 : 3306), port: process.env.DB_PORT || (DB_TYPE === 'postgres' ? 5432 : 3306),
}; };
console.log('--- Database Configuration ---'); console.log('--- App Version: 1.0.2 ---');
console.log(`Type: ${DB_TYPE}`); console.log(`DB Type: ${DB_TYPE}`);
console.log(`Host: ${dbConfig.host}`); console.log(`DB Host: ${dbConfig.host}`);
console.log(`User: ${dbConfig.user}`);
console.log(`Database: ${dbConfig.database}`);
console.log(`Port: ${dbConfig.port}`);
console.log('------------------------------');
let pool; let pool;
@@ -49,46 +57,16 @@ const initDB = async (retries = 5) => {
while (retries > 0) { while (retries > 0) {
try { try {
if (!dbConfig.host || !dbConfig.user || !dbConfig.database) { if (!dbConfig.host || !dbConfig.user || !dbConfig.database) {
throw new Error("Missing required database environment variables."); throw new Error("Missing required database environment variables (DB_HOST, DB_USER, DB_NAME).");
} }
if (DB_TYPE === 'postgres') { if (DB_TYPE === 'postgres') {
const { Pool } = pg; const { Pool } = pg;
pool = new Pool(dbConfig); pool = new Pool(dbConfig);
await pool.query(` await pool.query('SELECT 1'); // Test connection
CREATE TABLE IF NOT EXISTS email_templates (
id VARCHAR(255) PRIMARY KEY,
template_key VARCHAR(255) UNIQUE NOT NULL,
name VARCHAR(255) NOT NULL,
description TEXT,
subject VARCHAR(255),
header_html TEXT,
body_html TEXT,
footer_html TEXT,
full_html TEXT,
required_variables JSONB,
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
);
`);
} else { } else {
pool = mysql.createPool(dbConfig); pool = mysql.createPool(dbConfig);
await pool.query(` await pool.query('SELECT 1'); // Test connection
CREATE TABLE IF NOT EXISTS email_templates (
id VARCHAR(255) PRIMARY KEY,
template_key VARCHAR(255) UNIQUE NOT NULL,
name VARCHAR(255) NOT NULL,
description TEXT,
subject VARCHAR(255),
header_html MEDIUMTEXT,
body_html MEDIUMTEXT,
footer_html MEDIUMTEXT,
full_html MEDIUMTEXT,
required_variables JSON,
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
);
`);
} }
console.log(`Connected to ${DB_TYPE} database successfully.`); console.log(`Connected to ${DB_TYPE} database successfully.`);
return; return;
@@ -96,18 +74,21 @@ const initDB = async (retries = 5) => {
retries -= 1; retries -= 1;
console.error(`Database connection failed (${retries} retries left):`, err.message); console.error(`Database connection failed (${retries} retries left):`, err.message);
if (retries === 0) { if (retries === 0) {
console.error("No more retries. Exiting."); console.error("FATAL: Could not connect to database.");
process.exit(1); // Non usciamo per permettere al server di servire i file statici e mostrare errori via API
} } else {
await new Promise(resolve => setTimeout(resolve, 5000)); await new Promise(resolve => setTimeout(resolve, 5000));
} }
} }
}
}; };
initDB(); initDB();
app.get('/api/templates', async (req, res) => { app.get('/api/templates', async (req, res) => {
try { try {
if (!pool) return res.status(503).json({ error: "Database not connected" });
let rows; let rows;
if (DB_TYPE === 'postgres') { if (DB_TYPE === 'postgres') {
const result = await pool.query('SELECT * FROM email_templates ORDER BY updated_at DESC'); const result = await pool.query('SELECT * FROM email_templates ORDER BY updated_at DESC');
@@ -137,12 +118,10 @@ app.get('/api/templates', async (req, res) => {
}); });
app.post('/api/templates', async (req, res) => { app.post('/api/templates', async (req, res) => {
console.log("POST /api/templates - Ricevuta richiesta di salvataggio");
const t = req.body; const t = req.body;
if (!t.name || !t.id) { if (!t.name || !t.id) {
console.error("ERRORE: Dati mancanti nella richiesta POST", t); return res.status(400).json({ error: "Name and ID are required" });
return res.status(400).json({ error: "Nome e ID sono obbligatori" });
} }
const header = t.header || ''; const header = t.header || '';
@@ -166,7 +145,8 @@ app.post('/api/templates', async (req, res) => {
]; ];
try { try {
console.log(`Tentativo di salvataggio nel DB (${DB_TYPE}) per chiave: ${templateKey}`); if (!pool) throw new Error("Database not connected");
if (DB_TYPE === 'postgres') { if (DB_TYPE === 'postgres') {
const query = ` const query = `
INSERT INTO email_templates (id, template_key, name, description, subject, header_html, body_html, footer_html, full_html, required_variables, updated_at) INSERT INTO email_templates (id, template_key, name, description, subject, header_html, body_html, footer_html, full_html, required_variables, updated_at)
@@ -201,16 +181,16 @@ app.post('/api/templates', async (req, res) => {
`; `;
await pool.query(query, params); await pool.query(query, params);
} }
console.log("Salvataggio DB riuscito");
res.json({ success: true }); res.json({ success: true });
} catch (err) { } catch (err) {
console.error("ERRORE SALVATAGGIO DB:", err.message); console.error("DB Save Error:", err.message);
res.status(500).json({ error: 'Failed to save template', details: err.message }); res.status(500).json({ error: 'Database save failed', details: err.message });
} }
}); });
app.delete('/api/templates/:id', async (req, res) => { app.delete('/api/templates/:id', async (req, res) => {
try { try {
if (!pool) return res.status(503).json({ error: "Database not connected" });
if (DB_TYPE === 'postgres') { if (DB_TYPE === 'postgres') {
await pool.query('DELETE FROM email_templates WHERE id = $1', [req.params.id]); await pool.query('DELETE FROM email_templates WHERE id = $1', [req.params.id]);
} else { } else {
@@ -227,6 +207,6 @@ app.get('*', (req, res) => {
res.sendFile(path.join(__dirname, 'dist', 'index.html')); res.sendFile(path.join(__dirname, 'dist', 'index.html'));
}); });
app.listen(PORT, () => { app.listen(PORT, '0.0.0.0', () => {
console.log(`Server running on port ${PORT}`); console.log(`Server running on port ${PORT}`);
}); });