fix: fastify plugin should work with prefixed routes (#22)

Co-authored-by: Andrew Chou <andrewchou@fastmail.com>
digidem · Oct 3, 2024 · a7fd764 · a7fd764
1 parent 1997ed1
commit a7fd764
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/bin/smp-view.js b/bin/smp-view.js
@@ -47,6 +47,7 @@ function serve({ port = 3000, filepath }) {
 
   server.register(smpServer, {
     filepath: path.relative(process.cwd(), filepath),
+    prefix: '/map',
   })
   return server.listen({ port })
 }
diff --git a/lib/reader.js b/lib/reader.js
@@ -146,5 +146,8 @@ function getUrl(smpUri, baseUrl) {
     throw new Error(`Invalid SMP URI: ${smpUri}`)
   }
   if (typeof baseUrl !== 'string') return smpUri
-  return smpUri.replace(URI_BASE, baseUrl + '/')
+  if (!baseUrl.endsWith('/')) {
+    baseUrl += '/'
+  }
+  return smpUri.replace(URI_BASE, baseUrl)
 }
diff --git a/lib/server.js b/lib/server.js
@@ -1,13 +1,15 @@
-/**
- * @typedef {object} PluginOptions
- * @property {string} filepath
- * @property {boolean} [lazy=false]
- */
 import Reader from './reader.js'
 
 /** @import { FastifyPluginCallback, FastifyReply } from 'fastify' */
 /** @import { Resource } from './reader.js' */
 
+/**
+ * @typedef {object} PluginOptions
+ * @property {boolean} [lazy=false]
+ * @property {string} [prefix]
+ * @property {string} filepath Path to styled map package (`.smp`) file
+ */
+
 /**
  * @param {FastifyReply} reply
  * @param {Resource} resource
@@ -29,7 +31,7 @@ function sendResource(reply, resource) {
  *
  * @type {FastifyPluginCallback<PluginOptions>}
  */
-export default function (fastify, { filepath, lazy = false }, done) {
+export default function (fastify, { lazy = false, filepath }, done) {
   /** @type {Reader | undefined} */
   let reader
   if (!lazy) {
@@ -40,18 +42,21 @@ export default function (fastify, { filepath, lazy = false }, done) {
     if (!reader) {
       reader = new Reader(filepath)
     }
-    return reader.getStyle(fastify.listeningOrigin)
+    const baseUrl = new URL(fastify.prefix, fastify.listeningOrigin)
+    return reader.getStyle(baseUrl.href)
   })
 
   fastify.get('*', async (request, reply) => {
     if (!reader) {
       reader = new Reader(filepath)
     }
+    // @ts-expect-error - not worth the hassle of type casting this
+    const path = request.params['*']
 
     /** @type {Resource} */
     let resource
     try {
-      resource = await reader.getResource(decodeURI(request.url))
+      resource = await reader.getResource(path)
     } catch (e) {
       // @ts-ignore
       e.statusCode = 404

diff --git a/map-viewer/index.html b/map-viewer/index.html
@@ -31,7 +31,7 @@
 
       const map = new maplibregl.Map({
         container: 'map',
-        style: 'style.json',
+        style: 'map/style.json',
       })
 
       map.on('error', (e) => {