@mapwhit/glyph-server 1.4.1 → 1.4.2

package/index.js

@@ -1,9 +1,17 @@
 #!/usr/bin/env node
 
-require('dotenv').config({ path: '/etc/default/map-glyph-server' });
+import process from 'node:process';
+import connect from '@pirxpilot/connect';
+import Debug from 'debug';
+import router from './lib/map-glyph-server.js';
 
-const connect = require('@pirxpilot/connect');
-const router = require('./lib/map-glyph-server');
+const debug = Debug('map-glyph-server:app');
+
+try {
+  process.loadEnvFile('/etc/default/map-glyph-server');
+} catch {
+  debug('Environment file cannot be loaded.');
+}
 
 const PORT = process.env.MAP_GLYPH_SERVER_PORT || 3060;
 const FONT_PATH = process.env.MAP_GLYPH_SERVER_FONT_PATH;
@@ -13,13 +21,11 @@ if (!FONT_PATH) {
   process.exit(1);
 }
 
-const app = connect();
+export const app = connect();
 
 app.use('/fonts', router(FONT_PATH));
 
-module.exports = app;
-
-if (!module.parent) {
+if (import.meta.main) {
   app.listen(PORT);
   console.log('Listening on port', PORT);
 }

package/lib/find-fonts.js

@@ -1,13 +1,12 @@
-const { readdir, stat } = require('node:fs/promises');
-const { join } = require('node:path');
+import { readdir, stat } from 'node:fs/promises';
+import { join } from 'node:path';
+import Debug from 'debug';
 
-const debug = require('debug')('map-glyph-server');
-
-module.exports = findFonts;
+const debug = Debug('map-glyph-server');
 
 const memo = Object.create(null);
 
-function findFonts(fontPath) {
+export default function findFonts(fontPath) {
   let p = memo[fontPath];
   if (!p) {
     memo[fontPath] = p = findFontsImplementation(fontPath);
@@ -19,9 +18,7 @@ async function findFontsImplementation(fontPath) {
   debug('Looking for fonts in:', fontPath);
   const dirs = await readdir(fontPath, { withFileTypes: true });
   const fonts = {};
-  await Promise.all(
-    dirs.filter(d => d.isDirectory() || d.isSymbolicLink()).map(checkDir)
-  );
+  await Promise.all(dirs.filter(d => d.isDirectory() || d.isSymbolicLink()).map(checkDir));
   return fonts;
 
   async function checkDir({ name, parentPath }) {

package/lib/get-fonts-pbf.js

@@ -1,11 +1,9 @@
-const { join } = require('node:path');
-const { readFile } = require('node:fs/promises');
+import { readFile } from 'node:fs/promises';
+import { join } from 'node:path';
+import { combine } from '@furkot/glyph-pbf-composite';
+import Debug from 'debug';
 
-const { combine } = require('@furkot/glyph-pbf-composite');
-
-const debug = require('debug')('map-glyph-server');
-
-module.exports = getFontsPbf;
+const debug = Debug('map-glyph-server');
 
 async function getFontPbf(fontPath, choices, range) {
   debug('Looking for', choices[0], range);
@@ -35,15 +33,12 @@ async function getFontPbf(fontPath, choices, range) {
   }
 }
 
-async function getFontsPbf(fontPath, fonts, range, fallbacks) {
-  let pbfs = await Promise.all(
-    fonts.map(font => getFontPbf(fontPath, [font, ...fallbacks], range))
-  );
+export default async function getFontsPbf(fontPath, fonts, range, fallbacks) {
+  let pbfs = await Promise.all(fonts.map(font => getFontPbf(fontPath, [font, ...fallbacks], range)));
   // only non-empty fonts are OK
   pbfs = pbfs.filter(p => p?.length);
   debug(pbfs);
   if (pbfs.length < fonts.length) {
-    console.log('here');
     throw 404;
   }
   const result = pbfs.length > 1 ? combine(pbfs) : pbfs[0];

package/lib/map-glyph-server.js

@@ -1,13 +1,12 @@
-const Router = require('@pirxpilot/router');
-
-const findFonts = require('./find-fonts');
-const getFontsPbf = require('./get-fonts-pbf');
-const entityTag = require('etag');
-const fresh = require('fresh');
+import Router from '@pirxpilot/router';
+import entityTag from 'etag';
+import fresh from 'fresh';
+import findFonts from './find-fonts.js';
+import getFontsPbf from './get-fonts-pbf.js';
 
 const CACHE_MAX_AGE = process.env.MAP_GLYPH_SERVER_CACHE_MAX_AGE;
 
-async function find(req, res, next) {
+async function find(req, _res, next) {
   const fonts = await findFonts(req.fontPath);
   req.fonts = fonts;
   req.fontList = Object.keys(fonts);
@@ -45,22 +44,18 @@ async function sendFontsPbf(req, res) {
   res.end(pbf);
 }
 
-module.exports = function (fontPath) {
+export default function (fontPath) {
   const router = new Router({
     strict: true,
     caseSensitive: true
   });
 
-  router.use(function (req, res, next) {
+  router.use((req, _res, next) => {
     req.fontPath = fontPath;
     next();
   });
 
-  router.get(
-    /^\/(?<fontstack>[^/]+)\/(?<range>\d+-\d+)\.pbf$/,
-    find,
-    sendFontsPbf
-  );
+  router.get(/^\/(?<fontstack>[^/]+)\/(?<range>\d+-\d+)\.pbf$/, find, sendFontsPbf);
   router.get('/.json', find, sendFontsList);
   return router;
-};
+}

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@mapwhit/glyph-server",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "Server for glyph/font files compatible with mapbox-gl-js",
+  "type": "module",
   "author": {
     "name": "Damian Krzeminski",
     "email": "pirxpilot@furkot.com",
@@ -27,12 +28,11 @@
     "@pirxpilot/connect": "~4",
     "@pirxpilot/router": "~1",
     "debug": "~4",
-    "dotenv": "~16",
     "etag": "~1",
     "fresh": "~2"
   },
   "devDependencies": {
-    "@biomejs/biome": "^1.9.4",
+    "@biomejs/biome": "2.2.4",
     "supertest-fetch": "~2"
   },
   "scripts": {