Full implementasjon av pdf-tjenester

Author: anders-nom

package-lock.json

@@ -25,6 +25,7 @@
     "@navikt/ds-react": "5.17.4",
     "csp-header": "5.2.1",
     "js-cookie": "3.0.5",
+    "jszip": "3.10.1",
     "lodash.debounce": "4.0.8",
     "puppeteer": "22.0.0",
     "react": "18.2.0",

package.json

@@ -27,8 +27,9 @@ export class CmsArchiveCategoriesService {
     public async init() {
         const allCategories = await this.getAllCategories();
         if (!allCategories) {
-            console.error(`Could not retrieve categories for ${this.config.name}`);
-            return false;
+            const msg = `Could not retrieve categories for ${this.config.name}`;
+            console.error(msg);
+            throw Error(msg);
         }
 
         this.populateCategoriesMap(allCategories);

server/src/cms/CmsArchiveCategoriesService.ts

@@ -108,24 +108,34 @@ export class CmsArchiveContentService {
     }
 
     public async getContentVersions(versionKeys: string[]): Promise<CmsContent[] | null> {
-        const result = await this.client.getDocuments<CmsContentDocument>({
+        const result = await this.client.search<CmsContentDocument>({
             index: this.index,
             _source_excludes: ['xmlAsString, versions'],
+            size: versionKeys.length,
             body: {
-                ids: versionKeys,
+                sort: {
+                    'meta.timestamp': 'desc',
+                },
+                query: {
+                    ids: {
+                        values: versionKeys,
+                    },
+                },
             },
         });
 
-        return (
-            result?.reduce<CmsContent[]>((acc, content) => {
-                const fixedContent = this.fixContent(content);
-                if (fixedContent) {
-                    acc.push(fixedContent);
-                }
+        if (!result) {
+            return null;
+        }
+
+        return result.hits.reduce<CmsContent[]>((acc, content) => {
+            const fixedContent = this.fixContent(content);
+            if (fixedContent) {
+                acc.push(fixedContent);
+            }
 
-                return acc;
-            }, []) || null
-        );
+            return acc;
+        }, []);
     }
 
     private fixContent(contentDocument: CmsContentDocument | null): CmsContent | null {

server/src/cms/CmsArchiveContentService.ts

@@ -1,14 +1,14 @@
 import { CmsArchiveOpenSearchClient } from '../opensearch/CmsArchiveOpenSearchClient';
 import express, { Express, Response, Router } from 'express';
 import { CmsArchiveContentService } from './CmsArchiveContentService';
-import { parseQueryParamsList } from '../utils/queryParams';
+import { parseNumberParam, parseQueryParamsList } from '../utils/queryParams';
 import mime from 'mime';
-import { HtmlRenderer } from '../site/ssr/htmlRenderer';
+import { HtmlRenderer } from '../ssr/htmlRenderer';
 import { transformQueryToContentSearchParams } from '../opensearch/queries/contentSearch';
 import { CmsArchiveCategoriesService } from './CmsArchiveCategoriesService';
 import { cspMiddleware } from '../routing/csp';
 import { CmsArchiveBinariesService } from './CmsArchiveBinariesService';
-import { PdfGenerator } from '../site/pdf/PdfGenerator';
+import { PdfGenerator } from '../pdf/PdfGenerator';
 import { Browser } from 'puppeteer';
 
 export type CmsArchiveSiteConfig = {
@@ -151,12 +151,53 @@ export class CmsArchiveSite {
     }
 
     private setupFileRoutes(router: Router) {
-        router.get('/pdf/:versionKeys', async (req, res, next) => {
-            const versionKeys = req.params.versionKeys.split(',');
+        router.get('/pdf/single/:versionKey', async (req, res, next) => {
+            const result = await this.pdfGenerator.generatePdfFromVersion(
+                req.params.versionKey,
+                parseNumberParam(req.query.width)
+            );
+
+            if (!result) {
+                return next();
+            }
+
+            const { filename, data } = result;
+
+            const contentType = mime.lookup(filename) || 'application/octet-stream';
+
+            return res
+                .setHeader('Content-Disposition', `attachment; filename="${filename}"`)
+                .setHeader('Content-Type', contentType)
+                .send(data);
+        });
+
+        router.get('/pdf/multi/:versionKeys', async (req, res, next) => {
+            const result = await this.pdfGenerator.generatePdfFromVersions(
+                req.params.versionKeys.split(','),
+                parseNumberParam(req.query.width)
+            );
+
+            if (!result) {
+                return next();
+            }
+
+            const { filename, dataStream } = result;
+
+            const contentType = mime.lookup(filename) || 'application/octet-stream';
+
+            res.setHeader('Content-Disposition', `attachment; filename="${filename}"`).setHeader(
+                'Content-Type',
+                contentType
+            );
 
-            const pdfs = this.pdfGenerator.generatePdfFromVersions(versionKeys);
+            dataStream.on('data', (chunk) => {
+                res.write(chunk);
+            });
 
-            // return this.fileResponse(`${contentVersion.displayName}-${con}`);
+            dataStream.on('end', () => {
+                console.log(`Finished streaming file ${filename}`);
+                res.end();
+            });
         });
 
         router.get('/binary/file/:binaryKey', async (req, res, next) => {
@@ -167,7 +208,7 @@ export class CmsArchiveSite {
                 return next();
             }
 
-            return this.fileResponse(
+            return this.cmsBinaryResponse(
                 binary.filename,
                 binary.data,
                 `attachment; filename="${binary.filename}"`,
@@ -181,7 +222,7 @@ export class CmsArchiveSite {
                 return next();
             }
 
-            return this.fileResponse(file.filename, file.data, 'inline', res);
+            return this.cmsBinaryResponse(file.filename, file.data, 'inline', res);
         });
 
         router.use('/*/_image/:contentKey.:extension', async (req, res, next) => {
@@ -190,6 +231,7 @@ export class CmsArchiveSite {
                 return next();
             }
 
+            // The last item in the binaries array of an image content is the source file
             const binaryKey = content.binaries?.slice(-1)?.[0].key;
             if (!binaryKey) {
                 return next();
@@ -200,7 +242,7 @@ export class CmsArchiveSite {
                 return next();
             }
 
-            return this.fileResponse(binary.filename, binary.data, 'inline', res);
+            return this.cmsBinaryResponse(binary.filename, binary.data, 'inline', res);
         });
 
         router.use('/*/_image/:contentKey/label/:label.:extension', async (req, res, next) => {
@@ -221,21 +263,21 @@ export class CmsArchiveSite {
                 return next();
             }
 
-            return this.fileResponse(binary.filename, binary.data, 'inline', res);
+            return this.cmsBinaryResponse(binary.filename, binary.data, 'inline', res);
         });
     }
 
-    private fileResponse(
+    private cmsBinaryResponse(
         filename: string,
-        data: string,
+        base64Data: string,
         contentDisposition: string,
         res: Response
     ) {
         const contentType = mime.lookup(filename) || 'application/octet-stream';
 
         return res
-            .setHeader('Content-Dispositon', contentDisposition)
+            .setHeader('Content-Disposition', contentDisposition)
             .setHeader('Content-Type', contentType)
-            .send(Buffer.from(data, 'base64'));
+            .send(Buffer.from(base64Data, 'base64'));
     }
 }