Tweaker routing ++

Author: anders-nom

common/package-lock.json

@@ -3,13 +3,11 @@
     "private": true,
     "version": "0.0.0",
     "type": "module",
-    "peerDependencies": {
+    "devDependencies": {
         "@navikt/ds-react": "5",
+        "@types/express": "4.17.21",
         "express": "4",
         "lru-cache": "11",
         "react": "18"
-    },
-    "devDependencies": {
-        "@types/express": "4.17.21"
     }
 }

common/package.json

@@ -1,6 +1,6 @@
-import { ErrorRequestHandler, Express, RequestHandler } from 'express';
+import { ErrorRequestHandler, RequestHandler, Router } from 'express';
 
-export const setupErrorHandlers = (expressApp: Express) => {
+export const setupErrorHandlers = (router: Router) => {
     const notFoundHandler: RequestHandler = (req, res, _) => {
         res.status(404).send('Not found');
     };
@@ -21,7 +21,7 @@ export const setupErrorHandlers = (expressApp: Express) => {
         return res.status(statusCode).end();
     };
 
-    expressApp.use('*', notFoundHandler);
+    router.use('*', notFoundHandler);
 
-    expressApp.use(serverErrorHandler);
+    router.use(serverErrorHandler);
 };

legacy-archive/server/src/routing/errorHandlers.ts common/src/server/routing/errorHandlers.ts

@@ -0,0 +1,6 @@
+import { Router } from 'express';
+
+export const setupNaisProbeHandlers = (router: Router) => {
+    router.get('/internal/isAlive', (_, res) => res.status(200).json({ message: 'I am alive!' }));
+    router.get('/internal/isReady', (_, res) => res.status(200).json({ message: 'I am ready!' }));
+};

common/src/server/routing/internal.ts

@@ -1,19 +1,19 @@
-import express, { Express } from 'express';
+import express, { Router } from 'express';
 import path from 'path';
 import { createServer } from 'vite';
 import { AppHtmlRenderer, devRenderer, HtmlRenderer, prodRenderer } from './htmlRenderer';
 
 const assetsDir = path.resolve(process.cwd(), 'dist', 'client');
 
 type Props = {
-    expressApp: Express;
+    router: Router;
     appHtmlRenderer: AppHtmlRenderer;
     ssrModulePath: string;
     appBaseBath: string;
 };
 
 export const buildHtmlRenderer = async ({
-    expressApp,
+    router,
     appHtmlRenderer,
     ssrModulePath,
     appBaseBath,
@@ -28,14 +28,14 @@ export const buildHtmlRenderer = async ({
             base: appBaseBath,
         });
 
-        expressApp.use(vite.middlewares);
+        router.use(vite.middlewares);
 
         return devRenderer(vite, ssrModulePath);
     }
 
     console.log(`Configuring site renderer for production mode - Using assets dir ${assetsDir}`);
 
-    expressApp.use(
+    router.use(
         '/',
         express.static(assetsDir, {
             maxAge: '1y',

common/src/server/ssr/initRenderer.ts

@@ -1,6 +1,6 @@
 import process from 'process';
 
-export const validateEnv = async (expectedVars: string[]) => {
+export const validateEnv = async (expectedVars: readonly string[] | string[]) => {
     const isValid = expectedVars.every((key) => {
         if (process.env[key]) {
             return true;

common/src/server/utils/validateEnv.ts

@@ -3,7 +3,6 @@ import express, { Express, Response, Router } from 'express';
 import { CmsArchiveContentService } from './CmsArchiveContentService';
 import { parseNumberParam, parseQueryParamsList } from '../utils/queryParams';
 import mime from 'mime';
-import { HtmlRenderer } from '../ssr/htmlRenderer';
 import { transformQueryToContentSearchParams } from '../opensearch/queries/contentSearch';
 import { CmsArchiveCategoriesService } from './CmsArchiveCategoriesService';
 import { cspMiddleware } from '../routing/csp';
@@ -12,6 +11,7 @@ import { PdfGenerator } from '../pdf/PdfGenerator';
 import { Browser } from 'puppeteer';
 import { DOWNLOAD_COOKIE_NAME } from '../../../shared/downloadCookie';
 import { LegacyArchiveSiteConfig } from '@common/shared/siteConfigs';
+import { HtmlRenderer } from '@common/server/ssr/htmlRenderer';
 
 type ContructorProps = {
     config: LegacyArchiveSiteConfig;

legacy-archive/server/src/cms/CmsArchiveSite.ts

@@ -5,12 +5,13 @@ import { render } from '../_ssr-dist/main-server';
 import puppeteer from 'puppeteer';
 import { legacyArchiveConfigs } from '@common/shared/siteConfigs';
 import { buildHtmlRenderer } from '@common/server/ssr/initRenderer';
+import { setupErrorHandlers } from '@common/server/routing/errorHandlers';
 
 export const setupSites = async (expressApp: Express) => {
     const opensearchClent = new CmsArchiveOpenSearchClient();
 
     const htmlRenderer = await buildHtmlRenderer({
-        expressApp,
+        router: expressApp,
         appHtmlRenderer: render,
         appBaseBath: process.env.APP_BASEPATH,
         ssrModulePath: '/client/main-server.tsx',
@@ -35,4 +36,6 @@ export const setupSites = async (expressApp: Express) => {
     expressApp.get('/', (req, res) => {
         return res.redirect(legacyArchiveConfigs[0].baseUrl);
     });
+
+    setupErrorHandlers(expressApp);
 };

legacy-archive/server/src/routing/internal.ts

@@ -1,27 +1,25 @@
 import express from 'express';
 import compression from 'compression';
-import { setupErrorHandlers } from './routing/errorHandlers';
-import { setupInternalRoutes } from './routing/internal';
 import { setupSites } from './routing/site';
 import { validateEnv } from '@common/server/utils/validateEnv';
+import { setupNaisProbeHandlers } from '@common/server/routing/internal';
 
-const { APP_PORT } = process.env;
-
-validateEnv([
+const expectedEnv = [
     'NODE_ENV',
     'APP_PORT',
     'APP_BASEPATH',
     'APP_ORIGIN',
     'OPEN_SEARCH_URI',
     'OPEN_SEARCH_USERNAME',
     'OPEN_SEARCH_PASSWORD',
-])
+] as const;
+
+validateEnv(expectedEnv)
     .then(async () => {
         const app = express().use(compression(), express.json());
 
-        setupInternalRoutes(app);
+        setupNaisProbeHandlers(app);
         await setupSites(app);
-        setupErrorHandlers(app);
 
         return app;
     })
@@ -30,6 +28,8 @@ validateEnv([
         throw e;
     })
     .then((app) => {
+        const { APP_PORT } = process.env;
+
         const server = app.listen(APP_PORT, () => {
             console.log(`Server starting on port ${APP_PORT}`);
         });

legacy-archive/server/src/routing/site.ts

@@ -17,7 +17,7 @@ export default defineConfig(({ mode }) => {
                 : []),
         ],
         ssr: {
-            // Externalizing certain libraries seems to cause crashes due to invalid imports in the SSR bundle
+            // Externalizing certain libraries causes SSR crashes due to invalid imports in the SSR bundle
             noExternal: [
                 '@babel/runtime',
                 '@navikt/aksel-icons',