feat: Enhance error handling in server responses by including request IDs and detailed error codes; improve frontend modal components for better accessibility and user experience
Publish Fast Tabler Docker image / build-and-push-fast (push) Successful in 4m59s
Publish Fast Tabler Docker image / build-and-push-fast (push) Successful in 4m59s
This commit is contained in:
+51
-48
@@ -125,7 +125,8 @@ function sendOk(res, meta) {
|
||||
}
|
||||
|
||||
function sendError(res, status, message, code, details) {
|
||||
return res.status(status).json({ message, code, details });
|
||||
const requestId = res.req?.id;
|
||||
return res.status(status).json({ code, message, details, requestId });
|
||||
}
|
||||
|
||||
// Map UI resource -> S3 key (for history endpoints)
|
||||
@@ -460,7 +461,7 @@ app.post('/api/domains', async (req, res) => {
|
||||
res.send('File updated successfully');
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
res.status(500).send('Error writing to S3');
|
||||
return sendError(res, 500, 'Error writing to S3', 'E_S3');
|
||||
}
|
||||
});
|
||||
|
||||
@@ -516,7 +517,7 @@ app.get('/api/asns', async (req, res) => {
|
||||
res.json([]);
|
||||
} else {
|
||||
console.error(error);
|
||||
res.status(500).send('Error reading from S3');
|
||||
return sendError(res, 500, 'Error reading from S3', 'E_S3');
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -607,7 +608,7 @@ app.get('/api/domains-new', async (req, res) => {
|
||||
res.json([]); // Return empty array if file does not exist
|
||||
} else {
|
||||
console.error(error);
|
||||
res.status(500).send('Error reading from S3');
|
||||
return sendError(res, 500, 'Error reading from S3', 'E_S3');
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -698,7 +699,7 @@ app.get('/api/ip-ranges', async (req, res) => {
|
||||
res.json([]); // Return empty array if file does not exist
|
||||
} else {
|
||||
console.error(error);
|
||||
res.status(500).send('Error reading from S3');
|
||||
return sendError(res, 500, 'Error reading from S3', 'E_S3');
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -779,7 +780,7 @@ app.get('/api/communities', async (req, res) => {
|
||||
return res.json([]);
|
||||
}
|
||||
console.error('Error reading communities from S3:', error);
|
||||
res.status(500).send('Error reading communities from S3');
|
||||
return sendError(res, 500, 'Error reading communities from S3', 'E_S3');
|
||||
}
|
||||
});
|
||||
|
||||
@@ -788,7 +789,7 @@ app.post('/api/communities', async (req, res) => {
|
||||
const { communities } = req.body;
|
||||
|
||||
if (!Array.isArray(communities)) {
|
||||
return res.status(400).send('communities must be an array');
|
||||
return sendError(res, 400, 'communities must be an array', 'E_BAD_REQUEST');
|
||||
}
|
||||
|
||||
// Validate entries and ensure unique values
|
||||
@@ -798,10 +799,10 @@ app.post('/api/communities', async (req, res) => {
|
||||
const entry = communities[i] || {};
|
||||
const value = typeof entry.value === 'string' ? entry.value.trim() : '';
|
||||
if (!value) {
|
||||
return res.status(400).send(`Community at index ${i} is missing required field: value`);
|
||||
return sendError(res, 400, `Community at index ${i} is missing required field: value`, 'E_SCHEMA');
|
||||
}
|
||||
if (seen.has(value)) {
|
||||
return res.status(400).send(`Duplicate community value at index ${i}: ${value}`);
|
||||
return sendError(res, 400, `Duplicate community value at index ${i}: ${value}`, 'E_SCHEMA');
|
||||
}
|
||||
seen.add(value);
|
||||
normalized.push({
|
||||
@@ -826,7 +827,7 @@ app.post('/api/communities', async (req, res) => {
|
||||
res.send('Communities updated successfully');
|
||||
} catch (error) {
|
||||
console.error('Error writing communities to S3:', error);
|
||||
res.status(500).send('Error writing communities to S3');
|
||||
return sendError(res, 500, 'Error writing communities to S3', 'E_S3');
|
||||
}
|
||||
});
|
||||
|
||||
@@ -861,7 +862,7 @@ app.get('/api/servers', async (req, res) => {
|
||||
res.json([]); // Return empty array if file does not exist
|
||||
} else {
|
||||
console.error(error);
|
||||
res.status(500).send('Error reading from S3');
|
||||
return sendError(res, 500, 'Error reading from S3', 'E_S3');
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -872,14 +873,14 @@ app.post('/api/servers', async (req, res) => {
|
||||
|
||||
// Validate servers structure
|
||||
if (!Array.isArray(servers)) {
|
||||
return res.status(400).send('Servers must be an array');
|
||||
return sendError(res, 400, 'Servers must be an array', 'E_BAD_REQUEST');
|
||||
}
|
||||
|
||||
// Validate each server has required fields
|
||||
for (let i = 0; i < servers.length; i++) {
|
||||
const server = servers[i];
|
||||
if (!server.ip || !server.dns || !server.country || !server.provider || !server.tunnel) {
|
||||
return res.status(400).send(`Server at index ${i} is missing required fields`);
|
||||
return sendError(res, 400, `Server at index ${i} is missing required fields`, 'E_SCHEMA');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -895,7 +896,7 @@ app.post('/api/servers', async (req, res) => {
|
||||
res.send('File updated successfully');
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
res.status(500).send('Error writing to S3');
|
||||
return sendError(res, 500, 'Error writing to S3', 'E_S3');
|
||||
}
|
||||
});
|
||||
|
||||
@@ -930,7 +931,7 @@ app.get('/api/billing', async (req, res) => {
|
||||
res.json([]); // Return empty array if file does not exist
|
||||
} else {
|
||||
console.error(error);
|
||||
res.status(500).send('Error reading from S3');
|
||||
return sendError(res, 500, 'Error reading from S3', 'E_S3');
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -941,14 +942,14 @@ app.post('/api/billing', async (req, res) => {
|
||||
|
||||
// Validate billing data structure
|
||||
if (!Array.isArray(billingData)) {
|
||||
return res.status(400).send('Billing data must be an array');
|
||||
return sendError(res, 400, 'Billing data must be an array', 'E_BAD_REQUEST');
|
||||
}
|
||||
|
||||
// Validate each billing item has required fields
|
||||
for (let i = 0; i < billingData.length; i++) {
|
||||
const item = billingData[i];
|
||||
if (!item.hostName || !item.country || !item.provider) {
|
||||
return res.status(400).send(`Billing item at index ${i} is missing required fields: hostName, country, provider`);
|
||||
return sendError(res, 400, `Billing item at index ${i} is missing required fields: hostName, country, provider`, 'E_SCHEMA');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -964,7 +965,7 @@ app.post('/api/billing', async (req, res) => {
|
||||
res.send('File updated successfully');
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
res.status(500).send('Error writing to S3');
|
||||
return sendError(res, 500, 'Error writing to S3', 'E_S3');
|
||||
}
|
||||
});
|
||||
|
||||
@@ -999,7 +1000,7 @@ app.get('/api/filters', async (req, res) => {
|
||||
res.json([]); // Return empty array if file does not exist
|
||||
} else {
|
||||
console.error(error);
|
||||
res.status(500).send('Error reading from S3');
|
||||
return sendError(res, 500, 'Error reading from S3', 'E_S3');
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -1010,14 +1011,14 @@ app.post('/api/filters', async (req, res) => {
|
||||
|
||||
// Validate filters structure
|
||||
if (!Array.isArray(filters)) {
|
||||
return res.status(400).send('Filters must be an array');
|
||||
return sendError(res, 400, 'Filters must be an array', 'E_BAD_REQUEST');
|
||||
}
|
||||
|
||||
// Validate each filter has required fields
|
||||
for (let i = 0; i < filters.length; i++) {
|
||||
const filter = filters[i];
|
||||
if (!filter.community || !filter.gateway) {
|
||||
return res.status(400).send(`Filter at index ${i} is missing required fields`);
|
||||
return sendError(res, 400, `Filter at index ${i} is missing required fields`, 'E_SCHEMA');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1033,7 +1034,7 @@ app.post('/api/filters', async (req, res) => {
|
||||
res.send('File updated successfully');
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
res.status(500).send('Error writing to S3');
|
||||
return sendError(res, 500, 'Error writing to S3', 'E_S3');
|
||||
}
|
||||
});
|
||||
|
||||
@@ -1066,7 +1067,7 @@ app.get('/api/s3/last-modified', async (req, res) => {
|
||||
res.json(out);
|
||||
} catch (error) {
|
||||
console.error('Error fetching last modified dates from S3:', error);
|
||||
res.status(500).send('Error fetching last modified dates from S3');
|
||||
return sendError(res, 500, 'Error fetching last modified dates from S3', 'E_S3');
|
||||
}
|
||||
});
|
||||
|
||||
@@ -1190,7 +1191,7 @@ app.get('/api/filters/generate-config', async (req, res) => {
|
||||
res.json({ config: '// filters.json file not found' });
|
||||
} else {
|
||||
console.error(error);
|
||||
res.status(500).send('Error generating configuration');
|
||||
return sendError(res, 500, 'Error generating configuration', 'E_S3');
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -1252,7 +1253,7 @@ app.post('/api/filters/export-config', async (req, res) => {
|
||||
res.json({ success: true, message: 'Конфигурация экспортирована в S3' });
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
res.status(500).send('Error exporting configuration');
|
||||
return sendError(res, 500, 'Error exporting configuration', 'E_S3');
|
||||
}
|
||||
});
|
||||
|
||||
@@ -1286,7 +1287,7 @@ app.get('/api/server-configs', async (req, res) => {
|
||||
res.json([]); // Return empty array if file does not exist
|
||||
} else {
|
||||
console.error(error);
|
||||
res.status(500).send('Error reading server configs from S3');
|
||||
return sendError(res, 500, 'Error reading server configs from S3', 'E_S3');
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -1297,14 +1298,14 @@ app.post('/api/server-configs', async (req, res) => {
|
||||
|
||||
// Validate servers structure
|
||||
if (!Array.isArray(servers)) {
|
||||
return res.status(400).send('Servers must be an array');
|
||||
return sendError(res, 400, 'Servers must be an array', 'E_BAD_REQUEST');
|
||||
}
|
||||
|
||||
// Validate each server has required fields
|
||||
for (let i = 0; i < servers.length; i++) {
|
||||
const server = servers[i];
|
||||
if (!server.id || !server.name) {
|
||||
return res.status(400).send(`Server at index ${i} is missing required fields`);
|
||||
return sendError(res, 400, `Server at index ${i} is missing required fields`, 'E_SCHEMA');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1320,7 +1321,7 @@ app.post('/api/server-configs', async (req, res) => {
|
||||
res.send('Server configs updated successfully');
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
res.status(500).send('Error writing server configs to S3');
|
||||
return sendError(res, 500, 'Error writing server configs to S3', 'E_S3');
|
||||
}
|
||||
});
|
||||
|
||||
@@ -1341,7 +1342,7 @@ app.get('/api/server-configs/:serverId', async (req, res) => {
|
||||
res.json({ config: '// Конфигурация не найдена' });
|
||||
} else {
|
||||
console.error(error);
|
||||
res.status(500).send('Error reading server config from S3');
|
||||
return sendError(res, 500, 'Error reading server config from S3', 'E_S3');
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -1352,7 +1353,7 @@ app.post('/api/server-configs/:serverId', async (req, res) => {
|
||||
const { config } = req.body;
|
||||
|
||||
if (!config) {
|
||||
return res.status(400).send('Config is required');
|
||||
return sendError(res, 400, 'Config is required', 'E_BAD_REQUEST');
|
||||
}
|
||||
|
||||
const params = {
|
||||
@@ -1367,7 +1368,7 @@ app.post('/api/server-configs/:serverId', async (req, res) => {
|
||||
res.send('Server config saved successfully');
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
res.status(500).send('Error writing server config to S3');
|
||||
return sendError(res, 500, 'Error writing server config to S3', 'E_S3');
|
||||
}
|
||||
});
|
||||
|
||||
@@ -1384,7 +1385,7 @@ app.delete('/api/server-configs/:serverId', async (req, res) => {
|
||||
res.send('Server config deleted successfully');
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
res.status(500).send('Error deleting server config from S3');
|
||||
return sendError(res, 500, 'Error deleting server config from S3', 'E_S3');
|
||||
}
|
||||
});
|
||||
|
||||
@@ -1414,7 +1415,7 @@ app.delete('/api/server-configs/:serverId/complete', async (req, res) => {
|
||||
res.send('Server and all associated files deleted successfully');
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
res.status(500).send('Error deleting server files from S3');
|
||||
return sendError(res, 500, 'Error deleting server files from S3', 'E_S3');
|
||||
}
|
||||
});
|
||||
|
||||
@@ -1449,7 +1450,7 @@ app.get('/api/server-filters/:serverId', async (req, res) => {
|
||||
res.json([]); // Return empty array if file does not exist
|
||||
} else {
|
||||
console.error(error);
|
||||
res.status(500).send('Error reading server filters from S3');
|
||||
return sendError(res, 500, 'Error reading server filters from S3', 'E_S3');
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -1497,14 +1498,14 @@ app.post('/api/server-filters/:serverId', async (req, res) => {
|
||||
|
||||
// Validate filters structure
|
||||
if (!Array.isArray(filters)) {
|
||||
return res.status(400).send('Filters must be an array');
|
||||
return sendError(res, 400, 'Filters must be an array', 'E_BAD_REQUEST');
|
||||
}
|
||||
|
||||
// Validate each filter has required fields
|
||||
for (let i = 0; i < filters.length; i++) {
|
||||
const filter = filters[i];
|
||||
if (!filter.community || !filter.gateway) {
|
||||
return res.status(400).send(`Filter at index ${i} is missing required fields`);
|
||||
return sendError(res, 400, `Filter at index ${i} is missing required fields`, 'E_SCHEMA');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1520,7 +1521,7 @@ app.post('/api/server-filters/:serverId', async (req, res) => {
|
||||
res.send('Server filters updated successfully');
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
res.status(500).send('Error writing server filters to S3');
|
||||
return sendError(res, 500, 'Error writing server filters to S3', 'E_S3');
|
||||
}
|
||||
});
|
||||
|
||||
@@ -1554,7 +1555,7 @@ app.get('/api/simple-filters', async (req, res) => {
|
||||
res.json([]); // Return empty array if file does not exist
|
||||
} else {
|
||||
console.error(error);
|
||||
res.status(500).send('Error reading simple filters from S3');
|
||||
return sendError(res, 500, 'Error reading simple filters from S3', 'E_S3');
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -1565,14 +1566,14 @@ app.post('/api/simple-filters', async (req, res) => {
|
||||
|
||||
// Validate filters structure
|
||||
if (!Array.isArray(filters)) {
|
||||
return res.status(400).send('Filters must be an array');
|
||||
return sendError(res, 400, 'Filters must be an array', 'E_BAD_REQUEST');
|
||||
}
|
||||
|
||||
// Validate each filter has required fields
|
||||
for (let i = 0; i < filters.length; i++) {
|
||||
const filter = filters[i];
|
||||
if (!filter.community || !filter.gateway) {
|
||||
return res.status(400).send(`Filter at index ${i} is missing required fields`);
|
||||
return sendError(res, 400, `Filter at index ${i} is missing required fields`, 'E_SCHEMA');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1588,7 +1589,7 @@ app.post('/api/simple-filters', async (req, res) => {
|
||||
res.send('Simple filters updated successfully');
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
res.status(500).send('Error writing simple filters to S3');
|
||||
return sendError(res, 500, 'Error writing simple filters to S3', 'E_S3');
|
||||
}
|
||||
});
|
||||
|
||||
@@ -1616,7 +1617,7 @@ app.get('/api/auto-urls', async (req, res) => {
|
||||
res.json([]); // Return empty array if file does not exist
|
||||
} else {
|
||||
console.error(error);
|
||||
res.status(500).send('Error reading auto URLs from S3');
|
||||
return sendError(res, 500, 'Error reading auto URLs from S3', 'E_S3');
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -1714,7 +1715,7 @@ app.post('/api/auto-urls', async (req, res) => {
|
||||
res.send('Auto URLs updated successfully');
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
res.status(500).send('Error writing auto URLs to S3');
|
||||
return sendError(res, 500, 'Error writing auto URLs to S3', 'E_S3');
|
||||
}
|
||||
});
|
||||
|
||||
@@ -1745,7 +1746,7 @@ app.post('/api/auto-urls/process', async (req, res) => {
|
||||
}
|
||||
|
||||
if (urls.length === 0) {
|
||||
return res.status(400).send('No URLs to process');
|
||||
return sendError(res, 400, 'No URLs to process', 'E_BAD_REQUEST');
|
||||
}
|
||||
|
||||
// Get current IPs
|
||||
@@ -1830,7 +1831,7 @@ app.post('/api/auto-urls/process', async (req, res) => {
|
||||
|
||||
} catch (error) {
|
||||
console.error('Error processing auto URLs:', error);
|
||||
res.status(500).send('Error processing auto URLs');
|
||||
return sendError(res, 500, 'Error processing auto URLs', 'E_S3');
|
||||
}
|
||||
});
|
||||
|
||||
@@ -1846,8 +1847,10 @@ app.use((err, req, res, next) => {
|
||||
const status = typeof err?.status === 'number' ? err.status : 500;
|
||||
const code = err?.code || 'E_INTERNAL';
|
||||
const message = status === 500 && process.env.NODE_ENV === 'production' ? 'Internal Server Error' : (err?.message || 'Error');
|
||||
try { console.error('error:', err); } catch {}
|
||||
res.status(status).json({ message, code });
|
||||
const details = err?.details;
|
||||
const requestId = req?.id;
|
||||
try { req.log?.error({ err, code, requestId }, 'request error'); } catch {}
|
||||
res.status(status).json({ code, message, details, requestId });
|
||||
});
|
||||
|
||||
app.listen(port, () => {
|
||||
|
||||
Reference in New Issue
Block a user