From faf01d784fb6d015f13db9ec2d86f1d1221d74aa Mon Sep 17 00:00:00 2001 From: acalcutt Date: Sat, 4 Jan 2025 00:36:11 -0500 Subject: [PATCH] Update serve_font.js --- src/serve_font.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/serve_font.js b/src/serve_font.js index 546e486..65587dc 100644 --- a/src/serve_font.js +++ b/src/serve_font.js @@ -30,14 +30,8 @@ export async function serve_font(options, allowedFonts, programOpts) { * @returns {Promise} */ app.get('/fonts/:fontstack/:range.pbf', async (req, res) => { - if (verbose) { - console.log( - `Handling font request for: /fonts/%s/%s.pbf`, - req.params.fontstack, - req.params.range, - ); - } let fontstack = req.params.fontstack; + let range = req.params.range; const fontStackParts = fontstack.split(','); const sanitizedFontStack = fontStackParts .map((font) => { @@ -49,8 +43,15 @@ export async function serve_font(options, allowedFonts, programOpts) { if (sanitizedFontStack.length == 0) { return res.status(400).send('Invalid font stack format'); } + + if (verbose) { + console.log( + `Handling font request for: /fonts/%s/%s.pbf`, + sanitizedFontStack, + range, + ); + } fontstack = decodeURI(sanitizedFontStack); - const range = req.params.range; try { const concatenated = await getFontsPbf(