fix: modified handling svg files in ssi-sdk.core

packages/ssi-sdk-core/package.json

@@ -14,7 +14,7 @@
     "cross-fetch": "^3.1.8",
     "debug": "^4.3.4",
     "image-size": "^2.0.0-beta.2",
-    "uint8arrays": "3.1.1"
+    "uint8arrays": "^3.1.1"
   },
   "devDependencies": {
     "did-resolver": "^4.1.0"

packages/ssi-sdk-core/src/utils/__tests__/image.test.ts

@@ -22,6 +22,26 @@ describe('@sphereon/ssi-sdk.core:image', () => {
     expect(result?.width).toEqual(1901)
   })
 
+  it('should return image dimensions for a 2-layered svg base64', async (): Promise<void> => {
+    const svg_base64 =
+      'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmVyc2lvbj0iMS4xIgogICBpZD0ic3ZnMjgwOTQiCiAgIHZpZXdCb3g9IjAgMCA3NDQuMDk0NDg4MTkgMTA1Mi4zNjIyMDQ3IgogICBoZWlnaHQ9IjI5N21tIgogICB3aWR0aD0iMjEwbW0iPgogIDxkZWZzCiAgICAgaWQ9ImRlZnMyODA5NiIgLz4KICA8bWV0YWRhdGEKICAgICBpZD0ibWV0YWRhdGEyODA5OSI+CiAgICA8cmRmOlJERj4KICAgICAgPGNjOldvcmsKICAgICAgICAgcmRmOmFib3V0PSIiPgogICAgICAgIDxkYzpmb3JtYXQ+aW1hZ2Uvc3ZnK3htbDwvZGM6Zm9ybWF0PgogICAgICAgIDxkYzp0eXBlCiAgICAgICAgICAgcmRmOnJlc291cmNlPSJodHRwOi8vcHVybC5vcmcvZGMvZGNtaXR5cGUvU3RpbGxJbWFnZSIgLz4KICAgICAgICA8ZGM6dGl0bGU+PC9kYzp0aXRsZT4KICAgICAgPC9jYzpXb3JrPgogICAgPC9yZGY6UkRGPgogIDwvbWV0YWRhdGE+CiAgPGcKICAgICBpZD0ibGF5ZXIxIj4KICAgIDx0ZXh0CiAgICAgICBpZD0idGV4dDI4NjQyIgogICAgICAgeT0iNDUxLjk5NTgyIgogICAgICAgeD0iNDMzLjM1NzkxIgogICAgICAgc3R5bGU9ImZvbnQtc3R5bGU6bm9ybWFsO2ZvbnQtdmFyaWFudDpub3JtYWw7Zm9udC13ZWlnaHQ6bm9ybWFsO2ZvbnQtc3RyZXRjaDpub3JtYWw7Zm9udC1zaXplOjE4MC42NTI0MzUzcHg7bGluZS1oZWlnaHQ6MTI1JTtmb250LWZhbWlseTonVGltZXMgTmV3IFJvbWFuJzstaW5rc2NhcGUtZm9udC1zcGVjaWZpY2F0aW9uOidUaW1lcyBOZXcgUm9tYW4nO3RleHQtYWxpZ246Y2VudGVyO2xldHRlci1zcGFjaW5nOjBweDt3b3JkLXNwYWNpbmc6MHB4O3dyaXRpbmctbW9kZTpsci10Yjt0ZXh0LWFuY2hvcjptaWRkbGU7ZmlsbDojMDAwMDAwO2ZpbGwtb3BhY2l0eToxO3N0cm9rZTpub25lO3N0cm9rZS13aWR0aDoxcHg7c3Ryb2tlLWxpbmVjYXA6YnV0dDtzdHJva2UtbGluZWpvaW46bWl0ZXI7c3Ryb2tlLW9wYWNpdHk6MSIKICAgICAgIHhtbDpzcGFjZT0icHJlc2VydmUiPjx0c3BhbgogICAgICAgICB5PSI0NTEuOTk1ODIiCiAgICAgICAgIHg9IjQzMy4zNTc5MSIKICAgICAgICAgaWQ9InRzcGFuMjg2NDQiPmxheWVyIDE8L3RzcGFuPjwvdGV4dD4KICA8L2c+CiAgPGcKICAgICBpZD0ibGF5ZXIyIj4KICAgIDx0ZXh0CiAgICAgICB4bWw6c3BhY2U9InByZXNlcnZlIgogICAgICAgc3R5bGU9ImZvbnQtc3R5bGU6bm9ybWFsO2ZvbnQtdmFyaWFudDpub3JtYWw7Zm9udC13ZWlnaHQ6bm9ybWFsO2ZvbnQtc3RyZXRjaDpub3JtYWw7Zm9udC1zaXplOjE4MC42NTI0MzUzcHg7bGluZS1oZWlnaHQ6MTI1JTtmb250LWZhbWlseTonVGltZXMgTmV3IFJvbWFuJzstaW5rc2NhcGUtZm9udC1zcGVjaWZpY2F0aW9uOidUaW1lcyBOZXcgUm9tYW4nO3RleHQtYWxpZ246Y2VudGVyO2xldHRlci1zcGFjaW5nOjBweDt3b3JkLXNwYWNpbmc6MHB4O3dyaXRpbmctbW9kZTpsci10Yjt0ZXh0LWFuY2hvcjptaWRkbGU7ZmlsbDojMDAwMDAwO2ZpbGwtb3BhY2l0eToxO3N0cm9rZTpub25lO3N0cm9rZS13aWR0aDoxcHg7c3Ryb2tlLWxpbmVjYXA6YnV0dDtzdHJva2UtbGluZWpvaW46bWl0ZXI7c3Ryb2tlLW9wYWNpdHk6MSIKICAgICAgIHg9IjMzNi4yMTUwNiIKICAgICAgIHk9IjM3Ny43MTAwOCIKICAgICAgIGlkPSJ0ZXh0Mjg2NDYiPjx0c3BhbgogICAgICAgICBpZD0idHNwYW4yODY0OCIKICAgICAgICAgeD0iMzM2LjIxNTA2IgogICAgICAgICB5PSIzNzcuNzEwMDgiPmxheWVyIDI8L3RzcGFuPjwvdGV4dD4KICA8L2c+Cjwvc3ZnPgo='
+
+    const result: IImageDimensions = await getImageDimensions(svg_base64)
+    expect(result).toBeDefined()
+    expect(result?.height).toEqual(297)
+    expect(result?.width).toEqual(210)
+  })
+
+  it('should return image dimensions for a animated svg base64', async (): Promise<void> => {
+    const svg_base64 =
+      'PHN2ZyB3aWR0aD0iMjQiIGhlaWdodD0iMjQiIHZpZXdCb3g9IjAgMCAyNCAyNCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48Zz48Y2lyY2xlIGN4PSIxMiIgY3k9IjIuNSIgcj0iMS41IiBvcGFjaXR5PSIuMTQiLz48Y2lyY2xlIGN4PSIxNi43NSIgY3k9IjMuNzciIHI9IjEuNSIgb3BhY2l0eT0iLjI5Ii8+PGNpcmNsZSBjeD0iMjAuMjMiIGN5PSI3LjI1IiByPSIxLjUiIG9wYWNpdHk9Ii40MyIvPjxjaXJjbGUgY3g9IjIxLjUwIiBjeT0iMTIuMDAiIHI9IjEuNSIgb3BhY2l0eT0iLjU3Ii8+PGNpcmNsZSBjeD0iMjAuMjMiIGN5PSIxNi43NSIgcj0iMS41IiBvcGFjaXR5PSIuNzEiLz48Y2lyY2xlIGN4PSIxNi43NSIgY3k9IjIwLjIzIiByPSIxLjUiIG9wYWNpdHk9Ii44NiIvPjxjaXJjbGUgY3g9IjEyIiBjeT0iMjEuNSIgcj0iMS41Ii8+PGFuaW1hdGVUcmFuc2Zvcm0gYXR0cmlidXRlTmFtZT0idHJhbnNmb3JtIiB0eXBlPSJyb3RhdGUiIGNhbGNNb2RlPSJkaXNjcmV0ZSIgZHVyPSIwLjc1cyIgdmFsdWVzPSIwIDEyIDEyOzMwIDEyIDEyOzYwIDEyIDEyOzkwIDEyIDEyOzEyMCAxMiAxMjsxNTAgMTIgMTI7MTgwIDEyIDEyOzIxMCAxMiAxMjsyNDAgMTIgMTI7MjcwIDEyIDEyOzMwMCAxMiAxMjszMzAgMTIgMTI7MzYwIDEyIDEyIiByZXBlYXRDb3VudD0iaW5kZWZpbml0ZSIvPjwvZz48L3N2Zz4='
+
+    const result: IImageDimensions = await getImageDimensions(svg_base64)
+    expect(result).toBeDefined()
+    expect(result?.height).toEqual(24)
+    expect(result?.width).toEqual(24)
+  })
+
   it('should return image type for png base64', async (): Promise<void> => {
     const png_base64 =
       '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'

packages/ssi-sdk-core/src/utils/image.ts

@@ -1,6 +1,7 @@
 import fetch from 'cross-fetch'
 import { imageSize } from 'image-size'
 import { IImageDimensions, IImageResource } from '../types'
+import * as u8a from 'uint8arrays'
 
 type SizeCalculationResult = {
   width?: number
@@ -9,45 +10,38 @@ type SizeCalculationResult = {
   type?: string
 }
 
-const uint8ArrayToString = (uint8Array: Uint8Array): string => {
-  const decoder = new TextDecoder('utf-8')
-  return decoder.decode(uint8Array)
-}
-
 // TODO: here we're handling svg separately, remove this section when image-size starts supporting it in version 2
 const isSvg = (uint8Array: Uint8Array): boolean => {
-  const text = uint8ArrayToString(uint8Array)
-  const normalizedText = text.trim().toLowerCase()
+  const maxCheckLength: number = Math.min(80, uint8Array.length)
+  const initialText: string = u8a.toString(uint8Array.subarray(0, maxCheckLength))
+  const normalizedText: string = initialText.trim().toLowerCase()
   return normalizedText.startsWith('<svg') || normalizedText.startsWith('<?xml')
 }
 
-const getSvgDimensions = (uint8Array: Uint8Array) => {
-  const svgContent = uint8ArrayToString(uint8Array)
-  const widthMatch = svgContent.match(/width="([^"]+)"/)
-  const heightMatch = svgContent.match(/height="([^"]+)"/)
-  const viewBoxMatch = svgContent.match(/viewBox="([^"]+)"/)
-
-  let width, height
-
-  if (widthMatch) {
-    width = widthMatch[1]
-  }
-
-  if (heightMatch) {
-    height = heightMatch[1]
-  }
+function parseDimension(dimension: string): number | undefined {
+  const match: RegExpMatchArray | null = dimension.match(/^(\d+(?:\.\d+)?)([a-z%]*)$/)
+  return match ? parseFloat(match[1]) : 0
+}
 
-  if ((!width || !height) && viewBoxMatch) {
-    const parts = viewBoxMatch[1].split(' ').map(Number)
-    if (!width && parts.length === 4) {
-      width = parts[2].toString()
-    }
-    if (!height && parts.length === 4) {
-      height = parts[3].toString()
+const getSvgDimensions = (uint8Array: Uint8Array): SizeCalculationResult => {
+  const svgContent: string = new TextDecoder().decode(uint8Array)
+  const widthMatch: RegExpMatchArray | null = svgContent.match(/width="([^"]+)"/)
+  const heightMatch: RegExpMatchArray | null = svgContent.match(/height="([^"]+)"/)
+  const viewBoxMatch: RegExpMatchArray | null = svgContent.match(/viewBox="[^"]*"/)
+
+  let width: number | undefined = widthMatch ? parseDimension(widthMatch[1]) : undefined
+  let height: number | undefined = heightMatch ? parseDimension(heightMatch[1]) : undefined
+
+  if (viewBoxMatch && (!width || !height)) {
+    const parts = viewBoxMatch[0].match(/[\d\.]+/g)?.map(Number)
+    if (parts && parts.length === 4) {
+      const [x, y, viewBoxWidth, viewBoxHeight] = parts
+      width = width ?? viewBoxWidth - x
+      height = height ?? viewBoxHeight - y
     }
   }
 
-  return { width: Number(width), height: Number(height), type: 'svg' }
+  return { width, height, type: 'svg' }
 }
 
 export const getImageMediaType = async (base64: string): Promise<string | undefined> => {