Skip to content

Commit 8b1cb0e

Browse files
committed
chore: fix build for older sharp release
1 parent bda9c51 commit 8b1cb0e

File tree

1 file changed

+15
-9
lines changed

1 file changed

+15
-9
lines changed

ts/webworker/workers/node/image_processor/image_processor.worker.ts

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@ function centerCoverOpts(maxSidePx: number) {
6363
}
6464

6565
function formattedMetadata(metadata: {
66-
width: number;
67-
height: number;
68-
format: keyof sharp.FormatEnum;
66+
width: number | undefined;
67+
height: number | undefined;
68+
// format: keyof sharp.FormatEnum;
6969
size: number;
7070
}) {
71-
return `(${metadata.width}x${metadata.height} ${metadata.format} of ${metadata.size} bytes)`;
71+
return `(${metadata.width}x${metadata.height} of ${metadata.size} bytes)`;
7272
}
7373

7474
function sharpFrom(inputBuffer: ArrayBufferLike | Buffer, options?: sharp.SharpOptions) {
@@ -371,7 +371,13 @@ const workerActions: ImageProcessorWorkerActions = {
371371
const start = Date.now();
372372
const metadata = await metadataFromBuffer(inputBuffer);
373373

374-
if (!metadata || !metadata.format || !sharp.format[metadata.format]?.output) {
374+
if (
375+
!metadata ||
376+
!metadata.format ||
377+
!sharp.format[metadata.format]?.output ||
378+
!metadata.width ||
379+
!metadata.height
380+
) {
375381
logIfOn(`Unsupported format: ${metadata?.format}`);
376382
return null;
377383
}
@@ -480,10 +486,10 @@ const workerActions: ImageProcessorWorkerActions = {
480486
}ms for}`
481487
);
482488
logIfOn(
483-
`\t src${formattedMetadata({ width: metadata.width, format: metadata.format, height: metadata.height, size: inputBuffer.byteLength })} `
489+
`\t src${formattedMetadata({ width: metadata.width, height: metadata.height, size: inputBuffer.byteLength })} `
484490
);
485491
logIfOn(
486-
`\t dest${formattedMetadata({ width: outputMetadata.width, format: outputMetadata.format, height: outputMetadata.height, size: buffer.buffer.byteLength })} `
492+
`\t dest${formattedMetadata({ width: outputMetadata.width, height: outputMetadata.height, size: buffer.buffer.byteLength })} `
487493
);
488494

489495
return {
@@ -501,7 +507,7 @@ const workerActions: ImageProcessorWorkerActions = {
501507
}ms with quality ${quality}`
502508
);
503509
logIfOn(
504-
`\t src${formattedMetadata({ width: metadata.width, format: metadata.format, height: metadata.height, size: inputBuffer.byteLength })} `
510+
`\t src${formattedMetadata({ width: metadata.width, height: metadata.height, size: inputBuffer.byteLength })} `
505511
);
506512
}
507513
qualityRangeIndex++;
@@ -513,7 +519,7 @@ const workerActions: ImageProcessorWorkerActions = {
513519
`[imageProcessorWorker] processForFileServerUpload: failed after ${Date.now() - start}ms`
514520
);
515521
logIfOn(
516-
`\t src${formattedMetadata({ width: metadata.width, format: metadata.format, height: metadata.height, size: inputBuffer.byteLength })} `
522+
`\t src${formattedMetadata({ width: metadata.width, height: metadata.height, size: inputBuffer.byteLength })} `
517523
);
518524

519525
return null;

0 commit comments

Comments
 (0)