tileserver-gl-light 4.6.6 → 4.7.0

package/src/serve_font.js

@@ -1,12 +1,10 @@
 'use strict';
 
 import express from 'express';
-import fs from 'node:fs';
-import path from 'path';
 
-import { getFontsPbf } from './utils.js';
+import { getFontsPbf, listFonts } from './utils.js';
 
-export const serve_font = (options, allowedFonts) => {
+export const serve_font = async (options, allowedFonts) => {
   const app = express().disable('x-powered-by');
 
   const lastModified = new Date().toUTCString();
@@ -14,49 +12,30 @@ export const serve_font = (options, allowedFonts) => {
   const fontPath = options.paths.fonts;
 
   const existingFonts = {};
-  const fontListingPromise = new Promise((resolve, reject) => {
-    fs.readdir(options.paths.fonts, (err, files) => {
-      if (err) {
-        reject(err);
-        return;
-      }
-      for (const file of files) {
-        fs.stat(path.join(fontPath, file), (err, stats) => {
-          if (err) {
-            reject(err);
-            return;
-          }
-          if (
-            stats.isDirectory() &&
-            fs.existsSync(path.join(fontPath, file, '0-255.pbf'))
-          ) {
-            existingFonts[path.basename(file)] = true;
-          }
-        });
-      }
-      resolve();
-    });
-  });
 
-  app.get('/fonts/:fontstack/:range([\\d]+-[\\d]+).pbf', (req, res, next) => {
-    const fontstack = decodeURI(req.params.fontstack);
-    const range = req.params.range;
+  app.get(
+    '/fonts/:fontstack/:range([\\d]+-[\\d]+).pbf',
+    async (req, res, next) => {
+      const fontstack = decodeURI(req.params.fontstack);
+      const range = req.params.range;
+
+      try {
+        const concatenated = await getFontsPbf(
+          options.serveAllFonts ? null : allowedFonts,
+          fontPath,
+          fontstack,
+          range,
+          existingFonts,
+        );
 
-    getFontsPbf(
-      options.serveAllFonts ? null : allowedFonts,
-      fontPath,
-      fontstack,
-      range,
-      existingFonts,
-    ).then(
-      (concated) => {
         res.header('Content-type', 'application/x-protobuf');
         res.header('Last-Modified', lastModified);
-        return res.send(concated);
-      },
-      (err) => res.status(400).header('Content-Type', 'text/plain').send(err),
-    );
-  });
+        return res.send(concatenated);
+      } catch (err) {
+        res.status(400).header('Content-Type', 'text/plain').send(err);
+      }
+    },
+  );
 
   app.get('/fonts.json', (req, res, next) => {
     res.header('Content-type', 'application/json');
@@ -65,5 +44,7 @@ export const serve_font = (options, allowedFonts) => {
     );
   });
 
-  return fontListingPromise.then(() => app);
+  const fonts = await listFonts(options.paths.fonts);
+  Object.assign(existingFonts, fonts);
+  return app;
 };