Eliminate unresolved page title and RangeNotSatisfiableError

1 month ago · 1eb2aff0b4
7 changed files with 41 additions and 30 deletions
--- a/apps/api/src/app/app.module.ts
+++ b/apps/api/src/app/app.module.ts
@ -14,8 +14,6 @@ import { DataGatheringQueueModule } from '@ghostfolio/api/services/queues/data-g
 import { PortfolioSnapshotQueueModule } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.module';
 import {
  BULL_BOARD_ROUTE,
-  DEFAULT_LANGUAGE_CODE,
-  SUPPORTED_LANGUAGE_CODES,
  THROTTLE_DEFAULT_LIMIT,
  THROTTLE_DEFAULT_TTL
 } from '@ghostfolio/common/config';
@ -143,29 +141,7 @@ import { UserModule } from './user/user.module';
        '/api/*wildcard',
        '/sitemap.xml'
      ],
-      rootPath: join(__dirname, '..', 'client'),
-      serveStaticOptions: {
-        setHeaders: (res) => {
-          if (res.req?.path === '/') {
-            let languageCode = DEFAULT_LANGUAGE_CODE;
-
-            try {
-              const code = res.req.headers['accept-language']
-                .split(',')[0]
-                .split('-')[0];
-
-              if (
-                (SUPPORTED_LANGUAGE_CODES as readonly string[]).includes(code)
-              ) {
-                languageCode = code;
-              }
-            } catch {}
-
-            res.set('Location', `/${languageCode}`);
-            res.statusCode = StatusCodes.MOVED_PERMANENTLY;
-          }
-        }
-      }
+      rootPath: join(__dirname, '..', 'client')
    }),
    ServeStaticModule.forRoot({
      rootPath: join(__dirname, '..', 'client', '.well-known'),
--- a/apps/api/src/main.ts
+++ b/apps/api/src/main.ts
@ -1,3 +1,4 @@
+import { languageRedirectMiddleware } from '@ghostfolio/api/middlewares/language-redirect.middleware';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import {
  BULL_BOARD_ROUTE,
@ -100,6 +101,8 @@ async function bootstrap() {
    });
  }

+  app.use(languageRedirectMiddleware);
+
  const configurationService = app.get(ConfigurationService);

  const trustProxy = configurationService.get('TRUST_PROXY');
--- a/apps/api/src/middlewares/html-template.middleware.ts
+++ b/apps/api/src/middlewares/html-template.middleware.ts
@ -111,7 +111,13 @@ export class HtmlTemplateMiddleware implements NestMiddleware {
      );

      try {
-        map[languageCode] = readFileSync(indexHtmlPath, 'utf8');
+        // Restore the interpolation token which the template replaces with a
+        // static fallback title to avoid showing an unresolved template
+        // literal when served without interpolation (e.g. by the service worker)
+        map[languageCode] = readFileSync(indexHtmlPath, 'utf8').replace(
+          /<title>.*?<\/title>/,
+          '<title>${title}</title>'
+        );
      } catch {
        this.logger.warn(
          `Skipping language '${languageCode}': ${indexHtmlPath} not found`
--- a/apps/api/src/middlewares/language-redirect.middleware.ts
+++ b/apps/api/src/middlewares/language-redirect.middleware.ts
@ -0,0 +1,29 @@
+import {
+  DEFAULT_LANGUAGE_CODE,
+  SUPPORTED_LANGUAGE_CODES
+} from '@ghostfolio/common/config';
+
+import { NextFunction, Request, Response } from 'express';
+import { StatusCodes } from 'http-status-codes';
+
+export function languageRedirectMiddleware(
+  request: Request,
+  response: Response,
+  next: NextFunction
+) {
+  if (request.path !== '/' || !['GET', 'HEAD'].includes(request.method)) {
+    return next();
+  }
+
+  let languageCode = DEFAULT_LANGUAGE_CODE;
+
+  try {
+    const code = request.headers['accept-language'].split(',')[0].split('-')[0];
+
+    if ((SUPPORTED_LANGUAGE_CODES as readonly string[]).includes(code)) {
+      languageCode = code;
+    }
+  } catch {}
+
+  return response.redirect(StatusCodes.MOVED_PERMANENTLY, `/${languageCode}`);
+}
--- a/apps/client/project.json
+++ b/apps/client/project.json
@ -203,9 +203,6 @@
          {
            "command": "shx cp apps/client/src/assets/favicon.ico dist/apps/client"
          },
-          {
-            "command": "shx cp apps/client/src/assets/index.html dist/apps/client"
-          },
          {
            "command": "shx cp apps/client/src/assets/robots.txt dist/apps/client"
          },
--- a/apps/client/src/assets/index.html
+++ b/apps/client/src/assets/index.html
--- a/apps/client/src/index.html
+++ b/apps/client/src/index.html
@ -1,7 +1,7 @@
 <!doctype html>
 <html class="h-100 position-relative" lang="${languageCode}">
  <head>
-    <title>${title}</title>
+    <title>Ghostfolio</title>
    <base href="/" />
    <meta charset="utf-8" />
    <meta content="yes" name="apple-mobile-web-app-capable" />