topaLE
/
ghostfolio
mirror of https://github.com/ghostfolio/ghostfolio
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Eliminate unresolved page title and RangeNotSatisfiableError

pull/7387/head
Thomas Kaul 1 month ago
parent
d02db5002e
commit
1eb2aff0b4
7 changed files with 41 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      apps/api/src/app/app.module.ts
  2. 3
      apps/api/src/main.ts
  3. 8
      apps/api/src/middlewares/html-template.middleware.ts
  4. 29
      apps/api/src/middlewares/language-redirect.middleware.ts
  5. 3
      apps/client/project.json
  6. 0
      apps/client/src/assets/index.html
  7. 2
      apps/client/src/index.html

26
apps/api/src/app/app.module.ts
View File

@ -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 { PortfolioSnapshotQueueModule } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.module';
import { import {
BULL_BOARD_ROUTE, BULL_BOARD_ROUTE,
DEFAULT_LANGUAGE_CODE,
SUPPORTED_LANGUAGE_CODES,
THROTTLE_DEFAULT_LIMIT, THROTTLE_DEFAULT_LIMIT,
THROTTLE_DEFAULT_TTL THROTTLE_DEFAULT_TTL
} from '@ghostfolio/common/config'; } from '@ghostfolio/common/config';
@ -143,29 +141,7 @@ import { UserModule } from './user/user.module';
'/api/*wildcard', '/api/*wildcard',
'/sitemap.xml' '/sitemap.xml'
], ],
rootPath: join(__dirname, '..', 'client'), 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;
}
}
}
}), }),
ServeStaticModule.forRoot({ ServeStaticModule.forRoot({
rootPath: join(__dirname, '..', 'client', '.well-known'), rootPath: join(__dirname, '..', 'client', '.well-known'),

3
apps/api/src/main.ts
View File

@ -1,3 +1,4 @@
import { languageRedirectMiddleware } from '@ghostfolio/api/middlewares/language-redirect.middleware';
import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service'; import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
import { import {
BULL_BOARD_ROUTE, BULL_BOARD_ROUTE,
@ -100,6 +101,8 @@ async function bootstrap() {
}); });
} }
app.use(languageRedirectMiddleware);
const configurationService = app.get(ConfigurationService); const configurationService = app.get(ConfigurationService);
const trustProxy = configurationService.get('TRUST_PROXY'); const trustProxy = configurationService.get('TRUST_PROXY');

8
apps/api/src/middlewares/html-template.middleware.ts
View File

@ -111,7 +111,13 @@ export class HtmlTemplateMiddleware implements NestMiddleware {
); );
try { 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 { } catch {
this.logger.warn( this.logger.warn(
`Skipping language '${languageCode}': ${indexHtmlPath} not found` `Skipping language '${languageCode}': ${indexHtmlPath} not found`

29
apps/api/src/middlewares/language-redirect.middleware.ts
View File

@ -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}`);
}

3
apps/client/project.json
View File

@ -203,9 +203,6 @@
{ {
"command": "shx cp apps/client/src/assets/favicon.ico dist/apps/client" "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" "command": "shx cp apps/client/src/assets/robots.txt dist/apps/client"
}, },

0
apps/client/src/assets/index.html
View File

2
apps/client/src/index.html
View File

@ -1,7 +1,7 @@
<!doctype html> <!doctype html>
<html class="h-100 position-relative" lang="${languageCode}"> <html class="h-100 position-relative" lang="${languageCode}">
<head> <head>
<title>${title}</title> <title>Ghostfolio</title>
<base href="/" /> <base href="/" />
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta content="yes" name="apple-mobile-web-app-capable" /> <meta content="yes" name="apple-mobile-web-app-capable" />

Write Preview
Loading…
Cancel
Save