Set onion, vary and Link headers in Next.js app

src/app/components/ChartbeatAnalytics/utils/index.test.ts

@@ -13,6 +13,7 @@ import {
   AUDIO_PAGE,
   TV_PAGE,
   LIVE_TV_PAGE,
+  UNKNOWN_PAGE,
 } from '../../../routes/utils/pageTypes';
 import {
   chartbeatUID,
@@ -309,7 +310,7 @@ describe('Chartbeat utilities', () => {
       ${MEDIA_ASSET_PAGE}   | ${'MAP Page Title'}           | ${'MAP Page Title'}
       ${ARTICLE_PAGE}       | ${'Article Page Title'}       | ${'Article Page Title'}
       ${MEDIA_ARTICLE_PAGE} | ${'Media Article Page Title'} | ${'Media Article Page Title'}
-      ${'unknown'}          | ${'Unknown Page Title'}       | ${'Unknown Page Title'}
+      ${UNKNOWN_PAGE}       | ${'Unknown Page Title'}       | ${'Unknown Page Title'}
     `(
       'should return correct title when pageType is $pageType',
       ({ pageType, title, expected }) => {

src/app/routes/utils/pageTypes.ts

@@ -19,3 +19,4 @@ export const AUDIO_PAGE = 'audio' as const;
 export const TV_PAGE = 'tv' as const;
 export const OFFLINE_PAGE = 'offline' as const;
 export const LIVE_TV_PAGE = 'liveTV' as const;
+export const UNKNOWN_PAGE = 'Unknown' as const;

src/server/index.jsx

@@ -41,6 +41,7 @@ import extractHeaders from './utilities/extractHeaders';
 import addPlatformToRequestChainHeader from './utilities/addPlatformToRequestChainHeader';
 import services from './utilities/serviceConfigs';
 import createAdNonce from '../app/utilities/createAdNonce';
+import { UNKNOWN_PAGE } from '../app/routes/utils/pageTypes';
 
 const morgan = require('morgan');
 
@@ -198,7 +199,7 @@ server.get(
     injectPlatformToRequestChainHeader,
   ],
   async ({ url, query, headers, path: urlPath }, res) => {
-    let derivedPageType = 'Unknown';
+    let derivedPageType = UNKNOWN_PAGE;
     let serverSideExperiments = [];
 
     try {

src/server/utilities/customMetrics/index.ts

@@ -5,7 +5,7 @@ import onEnvironment from '../onEnvironment';
 export type Params = {
   metricName: string;
   statusCode?: number | string;
-  pageType: PageTypes | 'Unknown';
+  pageType: PageTypes;
   requestUrl: string;
 };
 

src/server/utilities/getAssetOrigins/index.js → src/server/utilities/getAssetOrigins/index.ts

@@ -1,8 +1,7 @@
-const getAssetOrigins = () => {
-  const IMAGES_ORIGIN = 'https://ichef.bbci.co.uk';
-
-  const ANALYTICS_ORIGINS = ['https://ping.chartbeat.net'];
+const IMAGES_ORIGIN = 'https://ichef.bbci.co.uk';
+const ANALYTICS_ORIGINS = ['https://ping.chartbeat.net'];
 
+const getAssetOrigins = () => {
   const assetOrigins = [
     IMAGES_ORIGIN,
     process.env.SIMORGH_PUBLIC_STATIC_ASSETS_ORIGIN,

ws-nextjs-app/integration/utils/responseHeaderTests.ts

@@ -1,11 +1,39 @@
 export default () => {
-  // This header is set in the Next.js middleware/proxy file: 'ws-nextjs-app/middleware.ts'
-  // The presence of this header and its value including the word 'SIMORGH' indicates that middleware/proxy is working correctly
+  // These headers are set in the Next.js _app.page.tsx file
+  // The presence of this header and its value including the word 'SIMORGH' indicates that _app.page.tsx is setting headers correctly
   describe('req-svc-chain is set correctly', () => {
     it('should contain the correct svc chain', async () => {
       const fetchResponse = await fetch(window.location.href);
       const reqSvcChain = fetchResponse.headers.get('req-svc-chain');
       expect(reqSvcChain).toContain('SIMORGH');
     });
   });
+
+  describe('Onion-Location header is set correctly', () => {
+    it('should contain the correct Onion-Location header', async () => {
+      const fetchResponse = await fetch(window.location.href);
+      const onionHeader = fetchResponse.headers.get('Onion-Location');
+      expect(onionHeader).toBe(
+        `https://www.bbcweb3hytmzhn5d532owbu6oqadra5z3ar726vq5kgwwn6aucdccrad.onion${new URL(window.location.href).pathname}`,
+      );
+    });
+  });
+
+  describe('Vary header is set correctly', () => {
+    it('should contain the correct Vary header', async () => {
+      const fetchResponse = await fetch(window.location.href);
+      const varyHeader = fetchResponse.headers.get('Vary');
+      expect(varyHeader).toContain('X-Country, Accept-Encoding');
+    });
+  });
+
+  describe('Link header is set correctly', () => {
+    it('should contain the correct Link header for AMP pages', async () => {
+      const fetchResponse = await fetch(window.location.href);
+      const linkHeader = fetchResponse.headers.get('Link');
+      expect(linkHeader).toContain(
+        '<https://ichef.bbci.co.uk>; rel="dns-prefetch"',
+      );
+    });
+  });
 };

ws-nextjs-app/pages/[service]/articles/handleArticleRoute.ts

@@ -10,7 +10,6 @@ import handleError from '#app/routes/utils/handleError';
 import { PageTypes } from '#app/models/types/global';
 
 import { ArticleMetadata } from '#app/models/types/optimo';
-import { getServerExperiments } from '#server/utilities/experimentHeader';
 import augmentWithDisclaimer from './augmentWithDisclaimer';
 import shouldRender from '../../../utilities/shouldRender';
 import getPageData from '../../../utilities/pageRequests/getPageData';
@@ -176,12 +175,6 @@ export default async (context: GetServerSidePropsContext) => {
 
   const derivedPageType = getDerivedArticleType(article.metadata);
 
-  const serverSideExperiments = getServerExperiments({
-    headers: reqHeaders,
-    service,
-    pageType: derivedPageType,
-  });
-
   return {
     props: {
       country,
@@ -201,7 +194,6 @@ export default async (context: GetServerSidePropsContext) => {
       },
       pageType: derivedPageType,
       pathname: resolvedUrlWithoutQuery,
-      serverSideExperiments,
       service,
       status,
       variant: variant || null,