[angular-18] fix server.ts file after angular upgrade
This commit is contained in:
parent
516be6cc83
commit
f2066eb59b
78
server.ts
78
server.ts
|
@ -4,18 +4,25 @@ import 'zone.js/node';
|
||||||
import { APP_BASE_HREF } from '@angular/common';
|
import { APP_BASE_HREF } from '@angular/common';
|
||||||
import { CommonEngine } from '@angular/ssr';
|
import { CommonEngine } from '@angular/ssr';
|
||||||
import * as express from 'express';
|
import * as express from 'express';
|
||||||
|
import * as compression from 'compression';
|
||||||
import { existsSync } from 'node:fs';
|
import { existsSync } from 'node:fs';
|
||||||
import { join } from 'node:path';
|
import { join } from 'node:path';
|
||||||
import bootstrap from './src/main.server';
|
import {AppServerModule} from "./src/main.server";
|
||||||
|
import {REQUEST, RESPONSE} from "./src/app/openaireLibrary/utils/tokens";
|
||||||
|
import {Prometheus} from "./prometheus";
|
||||||
|
import {Counter} from "prom-client";
|
||||||
|
|
||||||
// The Express app is exported so that it can be used by serverless Functions.
|
// The Express app is exported so that it can be used by serverless Functions.
|
||||||
export function app(): express.Express {
|
export function app(): express.Express {
|
||||||
const server = express();
|
const server = express();
|
||||||
|
server.use(compression());
|
||||||
const distFolder = join(process.cwd(), 'dist/eosc/browser');
|
const distFolder = join(process.cwd(), 'dist/eosc/browser');
|
||||||
const indexHtml = existsSync(join(distFolder, 'index.original.html'))
|
const indexHtml = existsSync(join(distFolder, 'index.original.html'))
|
||||||
? join(distFolder, 'index.original.html')
|
? join(distFolder, 'index.original.html')
|
||||||
: join(distFolder, 'index.html');
|
: join(distFolder, 'index.html');
|
||||||
|
|
||||||
|
const prometheus: Prometheus = new Prometheus();
|
||||||
|
|
||||||
const commonEngine = new CommonEngine();
|
const commonEngine = new CommonEngine();
|
||||||
|
|
||||||
server.set('view engine', 'html');
|
server.set('view engine', 'html');
|
||||||
|
@ -28,21 +35,64 @@ export function app(): express.Express {
|
||||||
maxAge: '1y'
|
maxAge: '1y'
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
server.get('/metrics', (req, res) => {
|
||||||
|
res.set('Content-Type', prometheus.register.contentType);
|
||||||
|
res.end(prometheus.register.metrics());
|
||||||
|
});
|
||||||
|
|
||||||
|
server.get('/health-check', async (_req, res, _next) => {
|
||||||
|
var uptime = process.uptime();
|
||||||
|
const date = new Date(uptime*1000);
|
||||||
|
const days = date.getUTCDate() - 1,
|
||||||
|
hours = date.getUTCHours(),
|
||||||
|
minutes = date.getUTCMinutes(),
|
||||||
|
seconds = date.getUTCSeconds(),
|
||||||
|
milliseconds = date.getUTCMilliseconds();
|
||||||
|
|
||||||
|
|
||||||
|
const healthcheck = {
|
||||||
|
uptime: days + " days, " + hours + " hours, " + minutes + " minutes, " + seconds + " seconds, " + milliseconds + " milliseconds",
|
||||||
|
message: 'OK',
|
||||||
|
timestamp: new Date()
|
||||||
|
};
|
||||||
|
try {
|
||||||
|
res.send(healthcheck);
|
||||||
|
} catch (error) {
|
||||||
|
healthcheck.message = error;
|
||||||
|
res.status(503).send();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
// All regular routes use the Angular engine
|
// All regular routes use the Angular engine
|
||||||
server.get('*', (req, res, next) => {
|
server.get('*', (req, res, next) => {
|
||||||
const { protocol, originalUrl, baseUrl, headers } = req;
|
const { protocol, originalUrl, baseUrl, headers } = req;
|
||||||
|
|
||||||
commonEngine
|
let start = new Date();
|
||||||
.render({
|
let counter: Counter = prometheus.counters.get(req.path);
|
||||||
bootstrap,
|
|
||||||
documentFilePath: indexHtml,
|
if(counter !== undefined) {
|
||||||
url: `${protocol}://${headers.host}${originalUrl}`,
|
counter.inc(1, new Date());
|
||||||
publicPath: distFolder,
|
|
||||||
providers: [
|
commonEngine
|
||||||
{ provide: APP_BASE_HREF, useValue: baseUrl },],
|
.render({
|
||||||
})
|
bootstrap: AppServerModule,
|
||||||
.then((html) => res.send(html))
|
inlineCriticalCss: false,
|
||||||
.catch((err) => next(err));
|
documentFilePath: indexHtml,
|
||||||
|
url: req.url,
|
||||||
|
publicPath: distFolder,
|
||||||
|
providers: [
|
||||||
|
{ provide: APP_BASE_HREF, useValue: req.baseUrl },
|
||||||
|
{
|
||||||
|
provide: REQUEST, useValue: (req)
|
||||||
|
},
|
||||||
|
{
|
||||||
|
provide: RESPONSE, useValue: (res)
|
||||||
|
}
|
||||||
|
],
|
||||||
|
})
|
||||||
|
.then((html) => res.send(html))
|
||||||
|
.catch((err) => next(err));
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
return server;
|
return server;
|
||||||
|
@ -66,6 +116,4 @@ const mainModule = __non_webpack_require__.main;
|
||||||
const moduleFilename = mainModule && mainModule.filename || '';
|
const moduleFilename = mainModule && mainModule.filename || '';
|
||||||
if (moduleFilename === __filename || moduleFilename.includes('iisnode')) {
|
if (moduleFilename === __filename || moduleFilename.includes('iisnode')) {
|
||||||
run();
|
run();
|
||||||
}
|
}
|
||||||
|
|
||||||
export default bootstrap;
|
|
Loading…
Reference in New Issue