self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-26 22:41:17 +02:00
Code Issues Releases Activity

Chore: Remove node-canvas dependency (#12238)

Browse Source 
Co-authored-by: Laurent Cozic <laurent22@users.noreply.github.com>
This commit is contained in:
Henry Heino
2025-05-19 14:57:43 -07:00
committed by GitHub
parent 50c5139fa6
commit 5b2f409254
8 changed files with 74 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
packages/lib/shim-init-node.ts
View File

@@ -6,10 +6,8 @@ import Note from './models/Note';
import Resource from './models/Resource';
import { basename, fileExtension, safeFileExtension } from './path-utils';
import * as fs from 'fs-extra';
import * as pdfJsNamespace from 'pdfjs-dist';
import { writeFile } from 'fs/promises';
import { ResourceEntity } from './services/database/types';
import { TextItem } from 'pdfjs-dist/types/src/display/api';
import replaceUnsupportedCharacters from './utils/replaceUnsupportedCharacters';
import { FetchBlobOptions } from './types';
import { fromFile as fileTypeFromFile } from 'file-type';
@@ -20,6 +18,7 @@ import * as mimeUtils from './mime-utils';
import BaseItem from './models/BaseItem';
import { Size } from '@joplin/utils/types';
import { cpus } from 'os';
import type PdfJs from './utils/types/pdfJs';
const { _ } = require('./locale');
const http = require('http');
const https = require('https');
@@ -111,7 +110,7 @@ interface ShimInitOptions {
electronBridge: any;
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
nodeSqlite: any;
pdfJs: typeof pdfJsNamespace;
pdfJs: PdfJs;
isAppleSilicon?: ()=> boolean;
}
@@ -823,7 +822,7 @@ function shimInit(options: ShimInitOptions = null) {
const textContent = await page.getTextContent();
const strings = textContent.items.map(item => {
const text = (item as TextItem).str ?? '';
const text = item.str ?? '';
return text;
}).join('\n');
@@ -839,32 +838,24 @@ function shimInit(options: ShimInitOptions = null) {
};
shim.pdfToImages = async (pdfPath: string, outputDirectoryPath: string, options?: CreatePdfFromImagesOptions): Promise<string[]> => {
// We handle both the Electron app and testing framework. Potentially
// the same code could be use to support the CLI app.
const isTesting = !shim.isElectron();
if (typeof HTMLCanvasElement === 'undefined') {
throw new Error('Unsupported -- the Canvas element is required.');
}
const createCanvas = () => {
if (isTesting) {
return require('canvas').createCanvas();
}
return document.createElement('canvas');
};
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
const canvasToBuffer = async (canvas: any): Promise<Buffer> => {
const canvasToBuffer = async (canvas: HTMLCanvasElement): Promise<Buffer> => {
const quality = 0.8;
if (isTesting) {
return canvas.toBuffer('image/jpeg', { quality });
} else {
const canvasToBlob = async (canvas: HTMLCanvasElement): Promise<Blob> => {
return new Promise(resolve => {
canvas.toBlob(blob => resolve(blob), 'image/jpg', quality);
});
};
const canvasToBlob = async (canvas: HTMLCanvasElement): Promise<Blob> => {
return new Promise(resolve => {
canvas.toBlob(blob => resolve(blob), 'image/jpg', quality);
});
};
const blob = await canvasToBlob(canvas);
return Buffer.from(await blob.arrayBuffer());
}
const blob = await canvasToBlob(canvas);
return Buffer.from(await blob.arrayBuffer());
};
const filePrefix = `page_${Date.now()}`;
@@ -879,6 +870,9 @@ function shimInit(options: ShimInitOptions = null) {
const viewport = page.getViewport({ scale: options?.scaleFactor ?? 2 });
const canvas = createCanvas();
const ctx = canvas.getContext('2d');
if (!ctx) {
throw new Error('Unable to get 2D rendering context from canvas.');
}
canvas.height = viewport.height;
canvas.width = viewport.width;