Fabio/tileserver-gl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanup error responses

Browse source 
Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>
This commit is contained in:
acalcutt 2024-12-29 22:18:02 -05:00
parent d98cc3328f
commit 4c6f379f4e
2 changed files with 49 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
src/serve_style.js
View file

@ -19,7 +19,7 @@ const allowedSpriteFormats = allowedOptions(['png', 'json']);
*/
function allowedSpriteScales(scale) {
if (!scale) return '';
const match = scale.match(/(\d+)x/);
const match = scale.match(/(\d+)x/);
const parsedScale = match ? parseInt(match[1], 10) : 1;
return '@' + Math.min(parsedScale, 3) + 'x';
}
@ -64,42 +64,43 @@ export const serve_style = {
});
app.get(`/:id/:sprite{/:spriteID}{@:scale}{.:format}`, (req, res, next) => {
console.log(req.params);
const { spriteID = 'default', id, format } = req.params;
const scale = allowedSpriteScales(req.params.scale);
try {
if (
!allowedSpriteFormats(format) ||
((id == 256 || id == 512) && format === 'json')
) {
//Workaround for {/:tileSize}/:id.json' and /styles/:id/wmts.xml
next('route');
} else {
const item = repo[id];
const sprite = item.spritePaths.find(
(sprite) => sprite.id === spriteID,
);
if (sprite) {
const filename = `${sprite.path + scale}.${format}`;
return fs.readFile(filename, (err, data) => {
if (err) {
console.log('Sprite load error:', filename);
return res.sendStatus(404);
} else {
if (format === 'json')
res.header('Content-type', 'application/json');
if (format === 'png') res.header('Content-type', 'image/png');
return res.send(data);
}
});
} else {
return res.status(400).send('Bad Sprite ID or Scale');
}
}
} catch (e) {
console.log(e);
next('route');
if (
!allowedSpriteFormats(format) ||
((id == 256 || id == 512) && format === 'json')
) {
//Workaround for {/:tileSize}/:id.json' and /styles/:id/wmts.xml
return next('route');
}
const item = repo[id];
if (!item) {
return res.sendStatus(404); // Ensure item exists first to prevent errors
}
const sprite = item.spritePaths.find((sprite) => sprite.id === spriteID);
if (!sprite) {
return res.status(400).send('Bad Sprite ID or Scale');
}
const spriteScale = allowedSpriteScales(scale);
const filename = `${sprite.path}${spriteScale}.${format}`;
fs.readFile(filename, (err, data) => {
if (err) {
console.error('Sprite load error: %s, Error: %s', filename, err);
return res.sendStatus(404);
}
if (format === 'json') {
res.header('Content-type', 'application/json');
} else if (format === 'png') {
res.header('Content-type', 'image/png');
}
return res.send(data);
});
});
return app;

16
src/utils.js
View file

@ -196,14 +196,23 @@ export function fixTileJSONCenter(tileJSON) {
function getFontPbf(allowedFonts, fontPath, name, range, fallbacks) {
return new Promise((resolve, reject) => {
if (!allowedFonts || (allowedFonts[name] && fallbacks)) {
if (!name || typeof name !== 'string' || name.trim() === '') {
console.error('ERROR: Invalid font name: %s', name);
return reject('Invalid font name');
}
if (!/^\d+-\d+$/.test(range)) {
console.error('ERROR: Invalid range: %s', range);
return reject('Invalid range');
}
const filename = path.join(fontPath, name, `${range}.pbf`);
if (!fallbacks) {
fallbacks = clone(allowedFonts || {});
}
delete fallbacks[name];
// eslint-disable-next-line security/detect-non-literal-fs-filename
fs.readFile(filename, (err, data) => {
if (err) {
console.error(`ERROR: Font not found: ${name}`);
console.error('ERROR: Font not found: %s, Error: %s', filename, err);
if (fallbacks && Object.keys(fallbacks).length) {
let fallbackName;
@ -219,7 +228,10 @@ function getFontPbf(allowedFonts, fontPath, name, range, fallbacks) {
}
}
console.error(`ERROR: Trying to use ${fallbackName} as a fallback`);
console.error(
`ERROR: Trying to use %s as a fallback`,
fallbackName,
);
delete fallbacks[fallbackName];
getFontPbf(null, fontPath, fallbackName, range, fallbacks).then(
resolve,