skia-canvas 3.0.0 → 3.0.1

package/README.md

@@ -16,6 +16,12 @@
   <a href="https://github.com/samizdatco/skia-canvas/discussions">Discussion Forum</a>
 </div>
 
+<div align="center">
+
+### [Version 3.0 now available](https://github.com/samizdatco/skia-canvas/discussions/255)
+
+</div>
+
 ---
 
 Skia Canvas is a Node.js implementation of the HTML Canvas drawing [API](https://developer.mozilla.org/en-US/docs/Web/API/Canvas_API) for both on- and off-screen rendering. Since it uses Google’s [Skia](https://skia.org) graphics engine, its output is very similar to Chrome’s [`<canvas>`](https://html.spec.whatwg.org/multipage/canvas.html) element — though it's also capable of things the browser’s Canvas still can't achieve.

package/lib/browser.js

@@ -24,8 +24,6 @@ class Canvas{
     let elt = document.createElement('canvas'),
         pages = []
 
-    Object.defineProperty(elt, "async", {value:true, writable:false, enumerable:true})
-
     for (var [prop, get] of Object.entries({
       png: () => asBuffer(elt, 'image/png'),
       jpg: () => asBuffer(elt, 'image/jpeg'),

package/lib/classes/imagery.js

@@ -5,9 +5,9 @@
 "use strict"
 
 const {RustClass, core, readOnly, inspect, neon, argc, REPR} = require('./neon'),
+      {fetch} = require('../fetch'),
       {EventEmitter} = require('events'),
       {readFile} = require('fs/promises'),
-      {fetch} = require('cross-fetch'),
       url = require('url')
 
 //

package/lib/fetch.js

@@ -0,0 +1,9 @@
+// wrapper that calls either native fetch (on node v18+) or node-fetch (for older systems)
+const fetch = (src, options) => {
+  const fn = global.fetch
+    ? Promise.resolve(global.fetch)
+    : import('node-fetch').then(({default:fetch}) => fetch)
+  return fn.then(fetch => fetch(src, options))
+}
+
+module.exports = {fetch}

package/lib/prebuild.mjs

@@ -6,9 +6,9 @@ import {createReadStream, createWriteStream, existsSync} from 'fs'
 import {readFile, writeFile, rm} from 'fs/promises'
 import {resolve} from 'path'
 import {promisify} from 'util'
-import fetch from 'cross-fetch'
 import {family} from 'detect-libc'
-import { HttpsProxyAgent } from 'https-proxy-agent'
+import {fetch} from "./fetch.js"
+import {HttpsProxyAgent} from 'https-proxy-agent'
 
 const pipeline = promisify(stream.pipeline)
 const exec = promisify(child_process.exec);
@@ -26,6 +26,23 @@ const CARGO_FEATURES = {
   win32: "vulkan,window",
 }[process.platform]
 
+class Hasher extends stream.Transform {
+  #digest
+  constructor(options) {
+    super(options)
+    this.hash = crypto.createHash('sha256')
+  }
+  _transform(chunk, encoding, callback) {
+    this.hash.update(chunk)
+    this.push(chunk)
+    callback()
+  }
+  get digest(){
+    this.#digest = this.#digest || `sha256:${this.hash.digest('hex')}`
+    return this.#digest
+  }
+}
+
 async function config(){
   let package_json = JSON.parse(await readFile(PACKAGE_JSON)),
       {platform, arch} = process,
@@ -71,18 +88,17 @@ async function download(...args){
             if (status==404) throw Error(`Prebuilt library not found at "${url}" (HTTP error ${status})`)
             else throw Error(`Failed to load prebuilt binary from "${url}" (HTTP error ${status})`)
         }else{
-            console.log(`Prebuilt libary found at "${url}"`)
+            console.log(`Fetching prebuilt libary from "${url}"`)
         }
 
         // write to /lib/skia.node while also hashing the .gz file
-        let [digest, _] = await Promise.all([
-            pipeline( body, crypto.createHash('sha256').setEncoding('hex'), digest => digest.toArray() ),
-            pipeline( body, zlib.createGunzip(), createWriteStream(BINARY_PATH) )
-        ])
+        let sha = new Hasher()
+        let gunzip = zlib.createGunzip()
+        await pipeline(body, sha, gunzip, createWriteStream(BINARY_PATH))
 
         // verify hash if `prebuild` obj exists in package.json (i.e., this is a published module, not a repo copy)
         let official = (prebuild || {})[`${triplet}.gz`],
-            actual = `sha256:${digest}`
+            actual = sha.digest
         if (official && actual != official){
             await rm(BINARY_PATH, {force:true})
             throw Error(`Prebuilt library file '${triplet}.gz' failed integrity check\nDownloaded: ${url}\nExpected: ${official}\nReceived: ${actual}`)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skia-canvas",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "A multi-threaded, GPU-accelerated, Canvas API for Node",
   "author": "Christian Swinehart <drafting@samizdat.co>",
   "license": "MIT",
@@ -28,10 +28,10 @@
     "test": "jest"
   },
   "dependencies": {
-    "cross-fetch": "^4.1.0",
     "detect-libc": "^2.0.4",
     "fast-glob": "^3.3.3",
     "https-proxy-agent": "^7.0.6",
+    "node-fetch": "^3.3.2",
     "string-split-by": "^1.0.0"
   },
   "devDependencies": {
@@ -70,15 +70,15 @@
     "rust"
   ],
   "prebuild": {
-    "aws-lambda-arm64.zip": "sha256:13e4987d905adb6708168c747c533ecb412f2e1b62d6d49dde11d62868cf02b7",
-    "aws-lambda-x64.zip": "sha256:555d0cfd43b76481bfd309a1258ecbd22e58cf50c4d9832c5f437a3271a3f656",
-    "darwin-arm64.gz": "sha256:e50f32c760ffd237a9f55b7277f69fe61df73cb8ebde500b36e41d49bcc6b69c",
-    "darwin-x64.gz": "sha256:606b5368af960c150687101f2d8794293b73cf5766438f03ee2ab0949bb140fd",
-    "linux-arm64-glibc.gz": "sha256:988c653a0c98991bb9822c78d616dd8f5ef346899cde495830888b5a9d182135",
-    "linux-arm64-musl.gz": "sha256:b3884a8be601789a01c3615b7b7a0d1a09356ac811b1c22430cfbcf7a1e17e4b",
-    "linux-x64-glibc.gz": "sha256:9f57032652094baba1cd5b897dc51d7c287daeb7e2f1db9e11c7e7f5dda55c99",
-    "linux-x64-musl.gz": "sha256:3ac0b095b3b2f9e7353fd14b9f6305f4bdffb68aa594b1f836887bcbe892a1a6",
-    "win32-arm64.gz": "sha256:47bb7f9f6e526c282348fcfa5ec60528ecce8ffc5b5fb6ea09dd3ca28f1ff4a4",
-    "win32-x64.gz": "sha256:01d2d9c1ba54f59761c6d65ef6f4ebd8d7f0e0a955484dd827c342b39832acd9"
+    "aws-lambda-arm64.zip": "sha256:6277df5424e71150ff186f28a5f083c6a04365dfe02c5750ec667171b4e3b59c",
+    "aws-lambda-x64.zip": "sha256:8f57d142d9c739307bf4a52308151310c1b520d1540c02d2cf24941c09958615",
+    "darwin-arm64.gz": "sha256:554b6dd523ec71337f77a650d9df413aaec156b274633611398c512a03f9ed9e",
+    "darwin-x64.gz": "sha256:e5d701b95c74c42146e03c8a2794f96daafb32ed4afaa0ea267509847f4222f1",
+    "linux-arm64-glibc.gz": "sha256:90f91f355e807dd336b779a7ff432999a1361b6307f60ac0c4f706d422ebc86c",
+    "linux-arm64-musl.gz": "sha256:5952bf795abc0933a1ea0ef7be69eacf062680e72076a9370ddb0598e037e848",
+    "linux-x64-glibc.gz": "sha256:568618bb562d79ab8c9124e9179b0139d6715689fb12c796788d5c4c6eb5897b",
+    "linux-x64-musl.gz": "sha256:1ad2a48e5810970110dfd81216ff94c893794c58578e02af6461f9f0378b3bf6",
+    "win32-arm64.gz": "sha256:eb65c083ade85cb1f72eb45350175cf99b642c38651ecb14c3af163bed4ef528",
+    "win32-x64.gz": "sha256:9a60f2d71321f922fe9a54cf6af9f05e3e1e66defed2822777ce99bb2e79bab6"
   }
 }