Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Detect apng image type #488

Merged
merged 2 commits into from
May 24, 2023
Merged

fix: Detect apng image type #488

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73a337b
fix: Image type judgment add detect apng
btea May 21, 2023
0ae1e49
Merge branch 'main' into fix-add-detect-apng
shuding May 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion src/handler/image.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

const AVIF = 'image/avif'
const WEBP = 'image/webp'
const APNG = 'image/apng'
const PNG = 'image/png'
const JPEG = 'image/jpeg'
const GIF = 'image/gif'
Expand Down Expand Up @@ -63,7 +64,7 @@ type ResolvedImageData = [string, number?, number?] | readonly []
export const cache = createLRU<ResolvedImageData>(100)
const inflightRequests = new Map<string, Promise<ResolvedImageData>>()

const ALLOWED_IMAGE_TYPES = [PNG, JPEG, GIF, SVG]
const ALLOWED_IMAGE_TYPES = [PNG, APNG, JPEG, GIF, SVG]

function arrayBufferToBase64(buffer) {
let binary = ''
Expand Down Expand Up @@ -120,6 +121,7 @@ function arrayBufferToDataUri(data: ArrayBuffer) {

switch (imageType) {
case PNG:
case APNG:
imageSize = parsePNG(data)
break
case GIF:
Expand Down Expand Up @@ -198,6 +200,7 @@ export async function resolveImageData(
const data = base64ToArrayBuffer(dataString)
switch (imageType) {
case PNG:
case APNG:
imageSize = parsePNG(data)
break
case GIF:
Expand Down Expand Up @@ -283,6 +286,9 @@ function detectContentType(buffer: Uint8Array) {
(b, i) => buffer[i] === b
)
) {
if (detectAPNG(buffer)) {
return APNG
}
return PNG
}
if ([0x47, 0x49, 0x46, 0x38].every((b, i) => buffer[i] === b)) {
Expand All @@ -307,3 +313,19 @@ function detectContentType(buffer: Uint8Array) {
}
return null
}

function detectAPNG(bytes: Uint8Array) {
const dv = new DataView(bytes.buffer)
let type: string,
length: number,
off = 8,
isAPNG = false
while (!isAPNG && type !== 'IEND' && off < bytes.length) {
length = dv.getUint32(off)
const chars = bytes.subarray(off + 4, off + 8)
type = String.fromCharCode(...chars)
isAPNG = type === 'acTL'
off += 12 + length
}
return isAPNG
}