v2.2.3

Co-authored-by: Catalin Pit <catalinpit@gmail.com>

apps/remix/app/entry.client.tsx

@@ -10,6 +10,8 @@ import { HydratedRouter } from 'react-router/dom';
 import { extractPostHogConfig } from '@documenso/lib/constants/feature-flags';
 import { dynamicActivate } from '@documenso/lib/utils/i18n';
 
+import './utils/polyfills/promise-with-resolvers';
+
 function PosthogInit() {
   const postHogConfig = extractPostHogConfig();
 

apps/remix/app/utils/polyfills/promise-with-resolvers.ts

@@ -0,0 +1,30 @@
+/**
+ * Polyfill for Promise.withResolvers (ES2024)
+ * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise/withResolvers
+ */
+
+type PromiseWithResolvers<T> = {
+  promise: Promise<T>;
+  resolve: (value: T | PromiseLike<T>) => void;
+  reject: (reason?: unknown) => void;
+};
+
+// We're patching here
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const GlobalPromise = globalThis.Promise as any;
+
+if (typeof GlobalPromise.withResolvers !== 'function') {
+  GlobalPromise.withResolvers = function <T>(): PromiseWithResolvers<T> {
+    let resolve!: (value: T | PromiseLike<T>) => void;
+    let reject!: (reason?: unknown) => void;
+
+    const promise = new Promise<T>((res, rej) => {
+      resolve = res;
+      reject = rej;
+    });
+
+    return { promise, resolve, reject };
+  };
+}
+
+export {};

apps/remix/package.json

@@ -108,5 +108,5 @@
     "vite-plugin-babel-macros": "^1.0.6",
     "vite-tsconfig-paths": "^5.1.4"
   },
-  "version": "2.2.2"
+  "version": "2.2.3"
 }

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@documenso/root",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@documenso/root",
-      "version": "2.2.2",
+      "version": "2.2.3",
       "hasInstallScript": true,
       "workspaces": [
         "apps/*",
@@ -109,7 +109,7 @@
     },
     "apps/remix": {
       "name": "@documenso/remix",
-      "version": "2.2.2",
+      "version": "2.2.3",
       "dependencies": {
         "@cantoo/pdf-lib": "^2.5.3",
         "@documenso/api": "*",

package.json

@@ -5,7 +5,7 @@
     "apps/*",
     "packages/*"
   ],
-  "version": "2.2.2",
+  "version": "2.2.3",
   "scripts": {
     "postinstall": "patch-package",
     "build": "turbo run build",

packages/lib/server-only/ai/pdf-to-images.ts

@@ -1,6 +1,41 @@
-import { createCanvas } from '@napi-rs/canvas';
 import pMap from 'p-map';
 import * as pdfjsLib from 'pdfjs-dist/legacy/build/pdf.mjs';
+import { Canvas, Image, Path2D } from 'skia-canvas';
+
+// @ts-expect-error napi-rs/canvas satisfies the requirements
+globalThis.Path2D = Path2D;
+// @ts-expect-error napi-rs/canvas satisfies the requirements
+globalThis.Image = Image;
+
+class SkiaCanvasFactory {
+  _createCanvas(width: number, height: number) {
+    return new Canvas(width, height);
+  }
+
+  create(width: number, height: number) {
+    const canvas = this._createCanvas(width, height);
+
+    return {
+      canvas,
+      context: canvas.getContext('2d'),
+    };
+  }
+
+  reset(canvasAndContext: { canvas: Canvas }, width: number, height: number) {
+    canvasAndContext.canvas.width = width;
+    canvasAndContext.canvas.height = height;
+  }
+
+  destroy(canvasAndContext: { canvas: Canvas | null; context: unknown }) {
+    if (canvasAndContext.canvas) {
+      canvasAndContext.canvas.width = 0;
+      canvasAndContext.canvas.height = 0;
+    }
+
+    canvasAndContext.canvas = null;
+    canvasAndContext.context = null;
+  }
+}
 
 export type PdfToImagesOptions = {
   scale?: number;
@@ -9,7 +44,10 @@ export type PdfToImagesOptions = {
 export const pdfToImages = async (pdfBytes: Uint8Array, options: PdfToImagesOptions = {}) => {
   const { scale = 2 } = options;
 
-  const pdf = await pdfjsLib.getDocument(pdfBytes).promise;
+  const pdf = await pdfjsLib.getDocument({
+    data: pdfBytes,
+    CanvasFactory: SkiaCanvasFactory,
+  }).promise;
 
   const images = await pMap(
     Array.from({ length: pdf.numPages }),
@@ -19,7 +57,7 @@ export const pdfToImages = async (pdfBytes: Uint8Array, options: PdfToImagesOpti
 
       const viewport = page.getViewport({ scale });
 
-      const canvas = createCanvas(viewport.width, viewport.height);
+      const canvas = new Canvas(viewport.width, viewport.height);
       const canvasContext = canvas.getContext('2d');
 
       await page.render({
@@ -32,7 +70,7 @@ export const pdfToImages = async (pdfBytes: Uint8Array, options: PdfToImagesOpti
 
       return {
         pageNumber,
-        image: await canvas.encode('jpeg'),
+        image: await canvas.toBuffer('jpeg'),
         width: Math.floor(viewport.width),
         height: Math.floor(viewport.height),
         mimeType: 'image/jpeg',

packages/lib/utils/envelope-download.ts

@@ -32,5 +32,5 @@ export const getEnvelopeItemPdfUrl = (options: EnvelopeItemPdfUrlOptions) => {
 
   return token
     ? `${NEXT_PUBLIC_WEBAPP_URL()}/api/files/token/${token}/envelopeItem/${id}${presignToken ? `?presignToken=${presignToken}` : ''}`
-    : `${NEXT_PUBLIC_WEBAPP_URL()}/api/files/envelope/${envelopeId}/envelopeItem/${id}`;
+    : `${NEXT_PUBLIC_WEBAPP_URL()}/api/files/envelope/${envelopeId}/envelopeItem/${id}${presignToken ? `?token=${presignToken}` : ''}`;
 };