@napi-rs/canvas 1.0.10 → 1.0.12

package/load-image.js

@@ -7,6 +7,9 @@ const { Image } = require('./js-binding')
 let http, https
 
 const MAX_REDIRECTS = 20
+// Image fires onerror with an Event, as browsers do; the Error behind it is
+// under this key.
+const IMAGE_ERROR = Symbol.for('@napi-rs/canvas/image-error')
 const REDIRECT_STATUSES = new Set([301, 302])
 
 /**
@@ -26,17 +29,12 @@ module.exports = async function loadImage(source, options = {}) {
   if (isBufferLike(source)) return createImage(Buffer.from(source), options.alt)
   // if the source is Image instance, copy the image src to new image
   if (source instanceof Image) return createImage(source.src, options.alt)
-  // if source is string and in data uri format, construct image using data uri
-  if (typeof source === 'string' && source.trimStart().startsWith('data:')) {
-    const commaIdx = source.indexOf(',')
-    const encoding = source.lastIndexOf('base64', commaIdx) < 0 ? 'utf-8' : 'base64'
-    const data = Buffer.from(source.slice(commaIdx + 1), encoding)
-    // Empty payload would silently complete on Image (HTML spec) and the loadImage
-    // promise would never settle; reject upfront instead.
-    // See https://github.com/Brooooooklyn/canvas/issues/1255
-    if (data.length === 0) throw new Error(`Invalid data URI: empty payload in ${source.slice(0, 64)}`)
-    return createImage(data, options.alt)
-  }
+  // A data: URL (the URL parser drops leading C0 controls and spaces) is
+  // the image's src, as in a browser: Image parses it with the Fetch data:
+  // URL processor. A URL object with the data: scheme too.
+  // An empty body fires onerror, so the promise settles (issue #1255).
+  if (typeof source === 'string' && isDataUrl(source)) return createImage(source, options.alt)
+  if (source instanceof URL && source.protocol === 'data:') return createImage(source.href, options.alt)
   // if source is a string or URL instance
   if (typeof source === 'string') {
     // if the source exists as a file, construct image from that file
@@ -141,11 +139,19 @@ async function createImage(src, alt) {
         .then(() => image.decode())
         .then(() => resolve(image), reject)
     }
-    image.onerror = (e) => reject(e)
+    image.onerror = (event) => reject((event && event[IMAGE_ERROR]) || event)
     image.src = src
   })
 }
 
+// The URL parser skips leading C0 controls and spaces; the scheme is
+// ASCII case-insensitive.
+function isDataUrl(src) {
+  let i = 0
+  while (i < src.length && src.charCodeAt(i) <= 0x20) i++
+  return src.slice(i, i + 5).toLowerCase() === 'data:'
+}
+
 function isBufferLike(src) {
   return (src && src.type === 'Buffer') || Array.isArray(src)
 }

package/node-canvas.d.ts

@@ -45,7 +45,12 @@ export interface PngConfig {
   palette?: Uint8ClampedArray
   /** Background color index for indexed PNGs. Not supported by Skia backend. */
   backgroundIndex?: number
-  /** Pixels per inch. Accepted for compatibility. */
+  /**
+   * Pixels per inch, written as a PNG `pHYs` chunk with the bytes node-canvas
+   * writes, up to 54546055 ppi; a larger value writes 2147483647 px/m, the
+   * PNG maximum. The fraction is dropped. 0, a value below 1, NaN, the
+   * infinities and a non-number write none.
+   */
   resolution?: number
 }
 

package/node-canvas.js

@@ -42,7 +42,7 @@ class PNGStream extends Readable {
     if (this._done) return
     this._done = true
     this._canvas
-      .encode('png')
+      .encode('png', _pngOptions(this._options))
       .then((buf) => {
         this.push(buf)
         this.push(null)
@@ -109,6 +109,20 @@ function _extractQuality(mime, configOrQuality) {
   return NODE_CANVAS_DEFAULT_QUALITY
 }
 
+/**
+ * The native PNG options for a node-canvas PngConfig: only `resolution`, the
+ * one member node-canvas writes (a pHYs chunk); undefined without a numeric
+ * one, so the native call stays a plain PNG encode.
+ *
+ * @param {object|undefined} config
+ * @returns {{ resolution: number }|undefined}
+ */
+function _pngOptions(config) {
+  if (config === null || typeof config !== 'object') return undefined
+  const resolution = config.resolution
+  return typeof resolution === 'number' ? { resolution: resolution } : undefined
+}
+
 // ---------------------------------------------------------------------------
 // Compat methods added to each canvas instance created via this module
 // ---------------------------------------------------------------------------
@@ -159,7 +173,8 @@ function _compatToBuffer(mimeOrCallback, configOrQuality) {
       return
     }
     const q = _extractQuality(mime, config)
-    this.encode(format, q != null ? Math.round(q * 100) : undefined).then(
+    const options = format === 'png' ? _pngOptions(config) : q != null ? Math.round(q * 100) : undefined
+    this.encode(format, options).then(
       (buf) => callback(null, buf),
       (err) => callback(err),
     )
@@ -176,7 +191,11 @@ function _compatToBuffer(mimeOrCallback, configOrQuality) {
     return this.data()
   }
 
-  // Sync: extract quality (0-1) and scale to 0-100 for native toBuffer
+  // Sync: PNG takes the resolution; JPEG / WebP a quality (0-1) scaled to
+  // 0-100 for native toBuffer
+  if (mimeOrCallback === 'image/png') {
+    return _origToBuffer.call(this, mimeOrCallback, _pngOptions(configOrQuality))
+  }
   const q = _extractQuality(mimeOrCallback, configOrQuality)
   return _origToBuffer.call(this, mimeOrCallback, q != null ? Math.round(q * 100) : undefined)
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@napi-rs/canvas",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "description": "Canvas for Node.js with skia backend",
   "main": "index.js",
   "repository": {
@@ -58,7 +58,6 @@
   },
   "scripts": {
     "artifacts": "napi artifacts",
-    "bench": "node --import @oxc-node/core/register benchmark/bench.ts",
     "build": "napi build --platform --release --js js-binding.js",
     "build:debug": "napi build --platform --js js-binding.js",
     "example-lottie": "yarn oxnode ./example/lottie-to-video.ts",
@@ -103,14 +102,14 @@
     "npm-run-all2": "^9.0.0",
     "oxlint": "^1.34.0",
     "oxlint-tsgolint": "^7.0.0",
+    "pdfjs-dist": "6.4.299",
     "pinst": "^3.0.0",
     "png.js": "^0.2.1",
     "prettier": "^3.7.4",
     "pretty-bytes": "^7.1.0",
     "semver": "^7.7.3",
-    "skia-canvas": "^3.0.8",
+    "smol-toml": "^1.9.0",
     "table": "^6.9.0",
-    "tinybench": "^6.0.0",
     "typescript": "^7.0.0"
   },
   "lint-staged": {
@@ -156,25 +155,22 @@
   "dependenciesMeta": {
     "canvas": {
       "built": true
-    },
-    "skia-canvas": {
-      "built": true
     }
   },
   "resolutions": {
     "@napi-rs/canvas": "workspace:"
   },
   "optionalDependencies": {
-    "@napi-rs/canvas-linux-x64-gnu": "1.0.10",
-    "@napi-rs/canvas-darwin-x64": "1.0.10",
-    "@napi-rs/canvas-win32-x64-msvc": "1.0.10",
-    "@napi-rs/canvas-win32-arm64-msvc": "1.0.10",
-    "@napi-rs/canvas-linux-arm-gnueabihf": "1.0.10",
-    "@napi-rs/canvas-linux-x64-musl": "1.0.10",
-    "@napi-rs/canvas-linux-arm64-gnu": "1.0.10",
-    "@napi-rs/canvas-linux-arm64-musl": "1.0.10",
-    "@napi-rs/canvas-darwin-arm64": "1.0.10",
-    "@napi-rs/canvas-android-arm64": "1.0.10",
-    "@napi-rs/canvas-linux-riscv64-gnu": "1.0.10"
+    "@napi-rs/canvas-linux-x64-gnu": "1.0.12",
+    "@napi-rs/canvas-darwin-x64": "1.0.12",
+    "@napi-rs/canvas-win32-x64-msvc": "1.0.12",
+    "@napi-rs/canvas-win32-arm64-msvc": "1.0.12",
+    "@napi-rs/canvas-linux-arm-gnueabihf": "1.0.12",
+    "@napi-rs/canvas-linux-x64-musl": "1.0.12",
+    "@napi-rs/canvas-linux-arm64-gnu": "1.0.12",
+    "@napi-rs/canvas-linux-arm64-musl": "1.0.12",
+    "@napi-rs/canvas-darwin-arm64": "1.0.12",
+    "@napi-rs/canvas-android-arm64": "1.0.12",
+    "@napi-rs/canvas-linux-riscv64-gnu": "1.0.12"
   }
 }