fix: wrong hostname containing port #398

teritorio · Oct 25, 2024 · f92a72c · f92a72c
1 parent ae0af90
commit f92a72c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 19 deletions.
diff --git a/server/routes/manifest.webmanifest.ts b/server/routes/manifest.webmanifest.ts
@@ -4,20 +4,16 @@ import { defineEventHandler } from 'h3'
 import { getSettings } from '../../lib/apiSettings'
 import { vidos } from '../../lib/config'
 import { vidoConfigResolve } from '../../plugins/vido-config'
-import type { VidoConfig } from '../../utils/types-config'
 
 async function manifest(
   req: IncomingMessage,
   res: ServerResponse<IncomingMessage>,
 ) {
-  const hostname = (req.headers['x-forwarded-host'] || req.headers.host) as
-    | string
-    | undefined
-  if (hostname) {
-    const vido: VidoConfig = vidoConfigResolve(hostname, vidos())
-    const fetchSettings = getSettings(vido)
+  const hostname = (req.headers['x-forwarded-host'] || req.headers.host)?.toString().split(':')[0]
 
-    const [settings] = await Promise.all([fetchSettings])
+  if (hostname) {
+    const vido = vidoConfigResolve(hostname, vidos())
+    const settings = await getSettings(vido)
 
     res.write(
       JSON.stringify({

diff --git a/server/routes/sitemap.xml.ts b/server/routes/sitemap.xml.ts
@@ -12,27 +12,25 @@ import { getMenu } from '~/lib/apiMenu'
 import { getPois } from '~/lib/apiPois'
 import { vidos } from '~/lib/config'
 import { vidoConfigResolve } from '~/plugins/vido-config'
-import type { VidoConfig } from '~/utils/types-config'
 
 // Import by node_modules because access to internal module content
 
 async function manifest(
   req: IncomingMessage,
   res: ServerResponse<IncomingMessage>,
 ) {
-  const hostname = (req.headers['x-forwarded-host'] || req.headers.host) as
-    | string
-    | undefined
+  const hostname = (req.headers['x-forwarded-host'] || req.headers.host)?.toString()
+
   if (hostname) {
-    const vido: VidoConfig = vidoConfigResolve(hostname, vidos())
+    const vido = vidoConfigResolve(hostname.split(':')[0], vidos())
 
-    const menu = getMenu(vido).then(menuItem =>
-      menuItem
+    const menu = getMenu(vido)
+      .then(menuItem => menuItem
         .filter(menuItem => menuItem.category && menuItem.id)
         .map(menuCategory => ({
           url: `/${menuCategory.id}/`,
         })),
-    )
+      )
 
     const pois = getPois(vido).then(apiPois =>
       apiPois.features.map(poi => ({
@@ -41,9 +39,7 @@ async function manifest(
       })),
     )
 
-    const entries: SitemapEntry[] = (await Promise.all([menu, pois])).flat(
-      1,
-    )
+    const entries: SitemapEntry[] = (await Promise.all([menu, pois])).flat(1)
 
     entries.push({
       url: '/',