CHANGELOG.md

@@ -8,6 +8,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## 1.12.1
+
+### Fixed
+- Hotfix: Fixed a small bug in the render backend which should prevent heavy cpu usage for pdf rendering
+- Removed user error.message component for invitation problems as errors are stripped in production
+- Collaborator remove modal now closes after removing a collaborator
+
 ## 1.12.0
 
 ### Fixed

apps/fullstack/app/(protected)/(generic_layout)/books/[id]/edit/collaborators/components.tsx

@@ -320,7 +320,10 @@ function RemoveCollaboratorModal({
                     </Button>
                     <Button
                         variant="danger"
-                        onClick={() => removeCollaborator(collaborator)}
+                        onClick={() => {
+                            removeCollaborator(collaborator);
+                            handleClose();
+                        }}
                     >
                         Remove
                     </Button>

apps/fullstack/app/(protected)/(generic_layout)/books/invitation/error.tsx

@@ -17,11 +17,6 @@ export default function Error({
         <>
             <h1 className="text-center">Invitation error</h1>
             <hr />
-            {error.message && (
-                <div className="text-center p-1">
-                    <code>{error.message}</code>
-                </div>
-            )}
             <p className="text-center text-dark">
                 The token provided is invalid or has already been used. Make
                 sure you are using the correct link we have sent you via email.

apps/images/src/common/errorHandler.ts

 import { NextFunction, Request, Response } from "express";
 
+import { NotFoundError } from "@snip/database/errors";
 import {
     DataValidationError,
     DataValidationErrorArray,
 } from "@snip/snips/errors";
-import { NotFoundError } from "@snip/database/errors";
 
 export const errorHandler = (
     err: Error,
@@ -56,8 +56,8 @@ export const asyncHandler =
             next: NextFunction,
         ) => Promise<unknown>,
     ) =>
-        (req: Request, res: Response, next: NextFunction) =>
-            Promise.resolve(fn(req, res, next)).catch(next);
+    (req: Request, res: Response, next: NextFunction) =>
+        Promise.resolve(fn(req, res, next)).catch(next);
 
 /** Extend the error class to create an auth failed error */
 export class AuthFailedError extends Error {

apps/images/src/render/overrides.ts

@@ -47,8 +47,11 @@ const get_bitmap = async function (this: any) {
 ImageSnipLegacy.prototype.get_bitmap = get_bitmap;
 ImageSnip.prototype.get_bitmap = get_bitmap;
 import path from "path";
-async function readFromAssetsAsResponse(p: string, ...args: unknown[]) {
-    const buffer = await readFile(path.join("/assets", p));
+async function readFromAssetsAsResponse(
+    p: string | URL | Request,
+    ..._args: unknown[]
+) {
+    const buffer = await readFile(path.join("/assets", String(p)));
     return new Response(buffer);
 }
 

apps/images/src/render/pdf.ts

@@ -2,14 +2,14 @@ import { PDFDocument } from "pdf-lib";
 import { Readable } from "stream";
 
 import stream2buffer from "@snip/common/stream2buffer";
-import { BookDataRet, PageData } from "@snip/database/types";
+import { BookDataRet, PageDataRet } from "@snip/database/types";
 
 import renderPage from ".";
 import { PageNumberLocation, SelectedPage } from "./renderParams";
 
 export async function render_book_pdf(
     bookData: BookDataRet,
-    pages: PageData[],
+    pages: PageDataRet[],
     selectedPages?: SelectedPage[],
     pageNumberLocation?: PageNumberLocation,
 ): Promise<[Readable, number]> {
@@ -41,20 +41,16 @@ export async function render_book_pdf(
         });
     }
 
-    const pdfsToMerge = await Promise.all(
-        pages.map((page) => {
-            return renderPage(page.id, {
-                width: 720,
-                format: "pdf",
-                force_render: false,
-                encoding: "gzip",
-                return_stream: true,
-            }) as Promise<Readable>;
-        }),
-    );
-
     const mergedPdf = await PDFDocument.create();
-    for (const pdfBytes of pdfsToMerge) {
+    for (const page of pages) {
+        const pdfBytes = (await renderPage(page.id, {
+            width: 720,
+            format: "pdf",
+            force_render: false,
+            encoding: "gzip",
+            return_stream: true,
+        })) as Readable;
+
         const pdf = await PDFDocument.load(await stream2buffer(pdfBytes));
         // Get the form containing all the fields
         const form = pdf.getForm();

apps/images/src/server.ts

 import express, { Response } from "express";
 import { createServer } from "http";
+import { AddressInfo } from "net";
+import sharp from "sharp";
+import { Readable } from "stream";
+import { createGzip } from "zlib";
+import { z } from "zod";
 
+import { config } from "@snip/config/server";
 import service from "@snip/database";
 import { NotFoundError } from "@snip/database/errors";
+import { LocalPage } from "@snip/render/page";
+import { get_snip_from_data } from "@snip/snips";
 
 import {
     adminMiddleWare,
@@ -17,27 +25,17 @@ import {
     BadUsage,
     errorHandler,
 } from "./common/errorHandler";
+import renderPage, { render } from "./render";
+import { render_book_pdf } from "./render/pdf";
 import {
     parseSelectedPages,
     RenderParams,
     validateRenderParams,
 } from "./render/renderParams";
+import { renderSnip } from "./render/snip";
 
 const app = express();
 export const server = createServer(app);
-import { AddressInfo } from "net";
-import sharp from "sharp";
-import { Readable } from "stream";
-import { createGzip } from "zlib";
-import { z } from "zod";
-
-import { config } from "@snip/config/server";
-import { LocalPage } from "@snip/render/page";
-import { get_snip_from_data } from "@snip/snips";
-
-import renderPage, { render } from "./render";
-import { render_book_pdf } from "./render/pdf";
-import { renderSnip } from "./render/snip";
 
 const renderSchema = z.object({
     page_id: z.coerce.number(),

package.json

 {
     "name": "snip",
-    "version": "1.12.0",
+    "version": "1.12.1",
     "description": "our digital lab book",
     "author": "Sebastian B. Mohr, Markus Osterhoff",
     "repository": {