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

fix: don't crash the server on processing issues (#994)

Browse source 
* fix: don't crash the server on processing issues
Use a try/catch for async functions

Signed-off-by: boldtrn <boldtrn@gmail.com>

* chore: run lint

Signed-off-by: boldtrn <boldtrn@gmail.com>

---------

Signed-off-by: boldtrn <boldtrn@gmail.com>
This commit is contained in:
Robin 2023-09-26 15:41:29 +02:00 committed by GitHub
parent 775ea74a2a
commit c13e5e6821
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 195 additions and 193 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/serve_rendered.js
View file

@ -54,7 +54,6 @@ const cachedEmptyResponses = {
/**
* Create an appropriate mlgl response for http errors.
*
* @param {string} format The format (a sharp format or 'pbf').
* @param {string} color The background color (or empty string for transparent).
* @param {Function} callback The mlgl callback.
@ -102,7 +101,6 @@ function createEmptyResponse(format, color, callback) {
/**
* Parses coordinate pair provided to pair of floats and ensures the resulting
* pair is a longitude/latitude combination depending on lnglat query parameter.
*
* @param {List} coordinatePair Coordinate pair.
* @param coordinates
* @param {object} query Request query parameters.
@ -127,7 +125,6 @@ const parseCoordinatePair = (coordinates, query) => {
/**
* Parses a coordinate pair from query arguments and optionally transforms it.
*
* @param {List} coordinatePair Coordinate pair.
* @param {object} query Request query parameters.
* @param {Function} transformer Optional transform function.
@ -145,7 +142,6 @@ const parseCoordinates = (coordinatePair, query, transformer) => {
/**
* Parses paths provided via query into a list of path objects.
*
* @param {object} query Request query parameters.
* @param {Function} transformer Optional transform function.
*/
@ -220,7 +216,6 @@ const extractPathsFromQuery = (query, transformer) => {
* on marker object.
* Options adhere to the following format
* [optionName]:[optionValue]
*
* @param {List[String]} optionsList List of option strings.
* @param {object} marker Marker object to configure.
*/
@ -255,7 +250,6 @@ const parseMarkerOptions = (optionsList, marker) => {
/**
* Parses markers provided via query into a list of marker objects.
*
* @param {object} query Request query parameters.
* @param {object} options Configuration options.
* @param {Function} transformer Optional transform function.
@ -335,7 +329,6 @@ const extractMarkersFromQuery = (query, options, transformer) => {
/**
* Transforms coordinates to pixels.
*
* @param {List[Number]} ll Longitude/Latitude coordinate pair.
* @param {number} zoom Map zoom level.
*/
@ -347,7 +340,6 @@ const precisePx = (ll, zoom) => {
/**
* Draws a marker in cavans context.
*
* @param {object} ctx Canvas context object.
* @param {object} marker Marker object parsed by extractMarkersFromQuery.
* @param {number} z Map zoom level.
@ -419,7 +411,6 @@ const drawMarker = (ctx, marker, z) => {
* Wraps drawing of markers into list of promises and awaits them.
* It's required because images are expected to load asynchronous in canvas js
* even when provided from a local disk.
*
* @param {object} ctx Canvas context object.
* @param {List[Object]} markers Marker objects parsed by extractMarkersFromQuery.
* @param {number} z Map zoom level.
@ -438,7 +429,6 @@ const drawMarkers = async (ctx, markers, z) => {
/**
* Draws a list of coordinates onto a canvas and styles the resulting path.
*
* @param {object} ctx Canvas context object.
* @param {List[Number]} path List of coordinates.
* @param {object} query Request query parameters.
@ -889,6 +879,7 @@ export const serve_rendered = {
app.get(
util.format(staticPattern, centerPattern),
async (req, res, next) => {
try {
const item = repo[req.params.id];
if (!item) {
return res.sendStatus(404);
@ -954,10 +945,14 @@ export const serve_rendered = {
overlay,
'static',
);
} catch (e) {
next(e);
}
},
);
const serveBounds = async (req, res, next) => {
try {
const item = repo[req.params.id];
if (!item) {
return res.sendStatus(404);
@ -1031,6 +1026,9 @@ export const serve_rendered = {
overlay,
'static',
);
} catch (e) {
next(e);
}
};
const boundsPattern = util.format(
@ -1070,6 +1068,7 @@ export const serve_rendered = {
app.get(
util.format(staticPattern, autoPattern),
async (req, res, next) => {
try {
const item = repo[req.params.id];
if (!item) {
return res.sendStatus(404);
@ -1161,6 +1160,9 @@ export const serve_rendered = {
overlay,
'static',
);
} catch (e) {
next(e);
}
},
);
}