feat: add dirtberry #43
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| "use node" | ||
|
|
||
| export const DIRTBERRY_TRIM_FRACTION = 0.03 | ||
| export const DIRTBERRY_SOURCE_WIDTH = 832 | ||
| export const DIRTBERRY_SOURCE_HEIGHT = 1216 | ||
| export const DIRTBERRY_OUTPUT_HEIGHT = | ||
| DIRTBERRY_SOURCE_HEIGHT - Math.round(DIRTBERRY_SOURCE_HEIGHT * DIRTBERRY_TRIM_FRACTION) * 2 | ||
|
|
||
| const JIMP_ENCODABLE_MIME_TYPES = new Set([ | ||
| "image/bmp", | ||
| "image/x-ms-bmp", | ||
| "image/gif", | ||
| "image/jpeg", | ||
| "image/png", | ||
| "image/tiff", | ||
| ] as const) | ||
|
|
||
| type JimpEncodableMime = "image/bmp" | "image/x-ms-bmp" | "image/gif" | "image/jpeg" | "image/png" | "image/tiff" | ||
|
|
||
| type DirtberryCropRegion = { | ||
| top: number | ||
| height: number | ||
| } | ||
|
|
||
| export type DirtberryCropResult = { | ||
| buffer: Buffer | ||
| width: number | ||
| height: number | ||
| wasCropped: boolean | ||
| inputWidth: number | ||
| inputHeight: number | ||
| trimPixels: number | ||
| processor: "jimp" | "none" | ||
| } | ||
|
|
||
| export function getDirtberrySourceDimensions(): { width: number; height: number } { | ||
| return { | ||
| width: DIRTBERRY_SOURCE_WIDTH, | ||
| height: DIRTBERRY_SOURCE_HEIGHT, | ||
| } | ||
| } | ||
|
|
||
| export function isDirtberryModel(model?: string): boolean { | ||
| const normalized = model?.trim().toLowerCase() | ||
| if (!normalized) { | ||
| return false | ||
| } | ||
| return normalized === "dirtberry" || normalized.includes("dirtberry") | ||
| } | ||
|
|
||
| /** | ||
| * Calculate Dirtberry's watermark-removal crop region. | ||
| * Trims 3% from top and bottom when the resulting crop is valid. | ||
| */ | ||
| export function calculateDirtberryCropRegion(height: number): DirtberryCropRegion | null { | ||
| if (!Number.isFinite(height) || height <= 0) return null | ||
|
|
||
| const trimPixels = Math.round(height * DIRTBERRY_TRIM_FRACTION) | ||
| const croppedHeight = height - trimPixels * 2 | ||
|
|
||
| if (trimPixels <= 0 || croppedHeight <= 0) { | ||
| return null | ||
| } | ||
|
|
||
| return { | ||
| top: trimPixels, | ||
| height: croppedHeight, | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Crop Dirtberry images to remove corner watermarks before persistence. | ||
| * Returns original data if crop is not applicable. | ||
| */ | ||
| export async function cropDirtberryImageBuffer( | ||
| imageBuffer: Buffer | ||
| ): Promise<DirtberryCropResult> { | ||
| // Use jimp only (pure JS) so Convex linux-arm64 deployments don't fail | ||
| // on native sharp module loading. | ||
| const { Jimp } = await import("jimp") | ||
| const image = await Jimp.read(imageBuffer) | ||
| const width = image.bitmap.width | ||
| const height = image.bitmap.height | ||
|
|
||
| if (!width || !height) { | ||
| throw new Error("Unable to read Dirtberry image dimensions") | ||
| } | ||
|
|
||
| const region = calculateDirtberryCropRegion(height) | ||
| if (!region) { | ||
| return { | ||
| buffer: imageBuffer, | ||
| width, | ||
| height, | ||
| wasCropped: false, | ||
| inputWidth: width, | ||
| inputHeight: height, | ||
| trimPixels: 0, | ||
| processor: "none", | ||
| } | ||
| } | ||
|
|
||
| image.crop({ | ||
| x: 0, | ||
| y: region.top, | ||
| w: width, | ||
| h: region.height, | ||
| }) | ||
|
|
||
| const inputMime = image.mime | ||
| const outputMime: JimpEncodableMime = | ||
| inputMime && JIMP_ENCODABLE_MIME_TYPES.has(inputMime as JimpEncodableMime) | ||
| ? (inputMime as JimpEncodableMime) | ||
| : "image/jpeg" | ||
| const croppedBuffer = | ||
| outputMime === "image/jpeg" | ||
| ? Buffer.from(await image.getBuffer(outputMime, { quality: 100 })) | ||
| : Buffer.from(await image.getBuffer(outputMime)) | ||
|
|
||
| return { | ||
| buffer: croppedBuffer, | ||
| width, | ||
| height: region.height, | ||
| wasCropped: true, | ||
| inputWidth: width, | ||
| inputHeight: height, | ||
| trimPixels: region.top, | ||
| processor: "jimp", | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This fallback forces
outputMimetoimage/jpegfor any input MIME Jimp cannot encode, but the processors still upload with the original responsecontent-typeheader and derive the file extension from it. If Dirtberry (or a future variant) returns something likeimage/webp, the code will upload JPEG bytes labeled as WebP, leading to incorrect metadata/content-type and potential decode issues for clients.Useful? React with 👍 / 👎.