Improve error handling in server and client

This commit is contained in:
Danijel Micic
2025-12-15 11:06:14 +11:00
parent 52365a9470
commit 6b30e3432e
2 changed files with 174 additions and 143 deletions

View File

@@ -37,6 +37,17 @@ document.getElementById('smtpForm').addEventListener('submit', async function(e)
}, },
body: JSON.stringify(data), body: JSON.stringify(data),
}); });
if (!response.ok) {
// Handle non-200 responses
const contentType = response.headers.get("content-type");
if (contentType && contentType.includes("application/json")) {
const errorResult = await response.json();
throw new Error(errorResult.message || errorResult.error || "Server Error");
} else {
const text = await response.text();
throw new Error(`Server returned ${response.status}: ${text.substring(0, 100)}...`);
}
}
const result = await response.json(); const result = await response.json();
@@ -48,6 +59,7 @@ document.getElementById('smtpForm').addEventListener('submit', async function(e)
statusDiv.textContent = '✅ Success! Email Sent Successfully.'; statusDiv.textContent = '✅ Success! Email Sent Successfully.';
logOutput.textContent = JSON.stringify(result.details, null, 2); logOutput.textContent = JSON.stringify(result.details, null, 2);
} else { } else {
// This block handles cases where response was 200 OK but success is false (business logic error)
statusDiv.classList.add('status-error'); statusDiv.classList.add('status-error');
statusDiv.textContent = '❌ Error: ' + result.message; statusDiv.textContent = '❌ Error: ' + result.message;
logOutput.textContent = result.error || 'Unknown error occurred.'; logOutput.textContent = result.error || 'Unknown error occurred.';
@@ -56,8 +68,8 @@ document.getElementById('smtpForm').addEventListener('submit', async function(e)
} catch (error) { } catch (error) {
resultsDiv.classList.remove('hidden'); resultsDiv.classList.remove('hidden');
statusDiv.classList.add('status-error'); statusDiv.classList.add('status-error');
statusDiv.textContent = '❌ Network Error'; statusDiv.textContent = '❌ Error Caught'; // Changed from "Network Error" to be more accurate
logOutput.textContent = error.toString(); logOutput.textContent = error.message; // Use error.message instead of error.toString()
} finally { } finally {
// Reset Button // Reset Button
btn.disabled = false; btn.disabled = false;
@@ -108,6 +120,16 @@ document.getElementById('autoTestBtn').addEventListener('click', async function(
}, },
body: JSON.stringify(autoTestData), body: JSON.stringify(autoTestData),
}); });
if (!response.ok) {
const contentType = response.headers.get("content-type");
if (contentType && contentType.includes("application/json")) {
const errorResult = await response.json();
throw new Error(errorResult.message || errorResult.error || "Server Error");
} else {
const text = await response.text();
throw new Error(`Server returned ${response.status}: ${text.substring(0, 100)}...`);
}
}
const result = await response.json(); const result = await response.json();
@@ -149,8 +171,8 @@ document.getElementById('autoTestBtn').addEventListener('click', async function(
} catch (error) { } catch (error) {
resultsDiv.classList.remove('hidden'); resultsDiv.classList.remove('hidden');
statusDiv.classList.add('status-error'); statusDiv.classList.add('status-error');
statusDiv.textContent = '❌ Network Error'; statusDiv.textContent = '❌ Error Caught';
logOutput.textContent = error.toString(); logOutput.textContent = error.message;
} finally { } finally {
// Reset Button // Reset Button
btn.disabled = false; btn.disabled = false;

View File

@@ -23,8 +23,7 @@ app.post('/api/test-smtp', async (req, res) => {
// Log intent // Log intent
console.log( console.log(
`Attempting SMTP connection to ${host}:${port} (${ `Attempting SMTP connection to ${host}:${port} (${secure ? "Secure" : "Insecure"
secure ? "Secure" : "Insecure"
}) for ${user}` }) for ${user}`
); );
@@ -46,9 +45,9 @@ app.post('/api/test-smtp', async (req, res) => {
}; };
} }
try {
const transporter = nodemailer.createTransport(transporterConfig); const transporter = nodemailer.createTransport(transporterConfig);
try {
// 1. Verify Connection // 1. Verify Connection
await transporter.verify(); await transporter.verify();
console.log("SMTP Connection Verified Successfully"); console.log("SMTP Connection Verified Successfully");
@@ -248,9 +247,9 @@ app.post('/api/auto-test-smtp', async (req, res) => {
}; };
} }
try {
const transporter = nodemailer.createTransport(transporterConfig); const transporter = nodemailer.createTransport(transporterConfig);
try {
// Verify connection // Verify connection
await transporter.verify(); await transporter.verify();
console.log(`${config.name} - Connection successful!`); console.log(`${config.name} - Connection successful!`);
@@ -420,6 +419,16 @@ app.post('/api/auto-test-smtp', async (req, res) => {
}); });
}); });
// Global Error Handler
app.use((err, req, res, next) => {
console.error("Unhandled Error:", err);
res.status(500).json({
success: false,
message: "Internal Server Error",
error: err.message || "Unknown error occurred"
});
});
app.listen(port, () => { app.listen(port, () => {
console.log(`Server running at http://localhost:${port}`); console.log(`Server running at http://localhost:${port}`);
}); });