pdf improvements

package.json

@@ -44,7 +44,6 @@
 	"dependencies": {
 		"gm": "^1.25.0",
 		"neat-csv": "^7.0.0",
-		"pdf-lib": "^1.17.1",
 		"serialport": "^11.0.1",
 		"svelte-local-storage-store": "^0.5.0",
 		"throttle-debounce": "^5.0.0"

src/lib/server/image.ts

@@ -1,4 +1,3 @@
-import { PDFDocument } from 'pdf-lib';
 import { convertPdfToImage } from './pdf';
 import { identify, imageMagick } from './imageMagick';
 
@@ -59,37 +58,9 @@ export async function imageToZpl(
 
 export async function pdfToImage(buffer: Buffer | ArrayBuffer, dpi = 300) {
 	const pdfDataBuffer = Buffer.from(buffer);
+	const image = await convertPdfToImage(pdfDataBuffer, 1, 10);
 
-	const pdfDoc = await PDFDocument.load(pdfDataBuffer);
-	const page = pdfDoc.getPage(0);
-	const { width: widthInPoints, height: heightInPoints } = page.getSize();
-	const rotation = page.getRotation();
-
-	const { width: widthInPointsRotated, height: heightInPointsRotated } = rotateDimension(
-		{ width: widthInPoints, height: heightInPoints },
-		rotation.type === 'degrees' ? rotation.angle : toDegree(rotation.angle)
-	);
-
-	const width = Math.round((widthInPointsRotated / 72) * dpi);
-	const height = Math.round((heightInPointsRotated / 72) * dpi);
-
-	const image = await convertPdfToImage(pdfDataBuffer, 1, 10, width, height);
-
-	return { image, width, height };
-}
-
-function rotateDimension({ width, height }: Dimensions, rotationDegrees: number) {
-	if (rotationDegrees % 180 !== 0) {
-		return {
-			width: height,
-			height: width
-		};
-	}
-
-	return {
-		width,
-		height
-	};
+	return image;
 }
 
 function bufferToBitBuffer(inputBuffer: Buffer): Buffer {
@@ -139,10 +110,6 @@ function calculateRotation(imageSize: Dimensions, pageSize: Dimensions): number
 	return imageIsLandscape !== pageIsLandscape ? 90 : 0;
 }
 
-function toDegree(radian: number) {
-	return (radian * 180) / Math.PI;
-}
-
 function isDecimal(num: number) {
 	return num % 1 !== 0;
 }

src/lib/server/pdf.ts

@@ -5,16 +5,13 @@ export async function convertPdfToImage(
 	buffer: Buffer,
 	page: number,
 	dpmm: number,
-	width: number,
-	height: number
 ) {
 	const pageSetup = `pdf[${page - 1}]`;
 
 	return new Promise<Buffer>((resolve, reject) => {
 		imageMagick(buffer, pageSetup)
 			.in('-define', 'pdf:use-cropbox=true')
 			.density(dpmmToDpi(dpmm), dpmmToDpi(dpmm))
-			.resize(width, height, '!')
 			.quality(0)
 			.compress('jpeg')
 			.stream('png', (error, stdout) => {

src/routes/api/[printer]/pdf/+server.ts

@@ -14,7 +14,7 @@ export const POST: RequestHandler = async ({ params, request }) => {
 
 		const { width, height } = mmToPixels(printer.dpmm, printer.widthMm, printer.heightMm);
 
-		const { image } = await pdfToImage(Buffer.from(await request.arrayBuffer()));
+		const image = await pdfToImage(Buffer.from(await request.arrayBuffer()));
 		const zpl = await imageToZpl(image, width, height);
 
 		await print(zpl, printerIdentifier);