skia-canvas 3.0.2 → 3.0.4

package/lib/classes/imagery.js

@@ -5,10 +5,9 @@
 "use strict"
 
 const {RustClass, core, readOnly, inspect, neon, argc, REPR} = require('./neon'),
-      {fetch} = require('../fetch'),
+      {fetchURL, decodeDataURL, expandURL} = require('../urls'),
       {EventEmitter} = require('events'),
-      {readFile} = require('fs/promises'),
-      url = require('url')
+      {readFile} = require('fs/promises')
 
 //
 // Image
@@ -35,7 +34,7 @@ class Image extends RustClass {
   constructor(data, src='') {
     super(Image).alloc()
 
-    data = expandURLs(data)
+    data = expandURL(data)
     this.prop("src", ''+src || '::Buffer::')
 
     if (Buffer.isBuffer(data)) {
@@ -94,7 +93,7 @@ class Image extends RustClass {
       }
     }
 
-    src = expandURLs(src)
+    src = expandURL(src)
     this.prop("src", typeof src=='string' ? src : '')
 
     fetchData(src, undefined, loaded, failed)
@@ -221,41 +220,8 @@ function isSharpImage(obj){
   }
 }
 
-const decodeDataURL = (dataURL, ok, fail) => {
-  if (typeof dataURL!='string') return fail(TypeError(`Expected a data URL string (got ${typeof dataURL})`))
-  let [header, mime, enc] = dataURL.slice(0, 40).match(/^\s*data:(?<mime>[^;]*);(?:charset=)?(?<enc>[^,]*),/) || []
-  if (!mime || !enc) return fail(TypeError(`Expected a valid data URL string (got: "${dataURL}")`))
-
-  // SVGs in particular may not be base64 encoded
-  let content = dataURL.slice(header.length)
-  if (enc.toLowerCase() != 'base64') content = decodeURIComponent(content)
-
-  try{ ok(Buffer.from(content, enc)) }
-  catch(e){ fail(e) }
-}
-
-const fetchURL = (url, fetchOpts, ok, fail) => {
-  fetch(url, fetchOpts)
-    .then(resp => {
-      if (resp.ok) return resp.arrayBuffer()
-      else throw new Error(`Failed to load image from "${url}" (HTTP error ${resp.status})`)
-    })
-    .then(buf => ok(Buffer.from(buf)))
-    .catch(err => fail(err))
-}
-
-const expandURLs = (src) => {
-  // convert URLs to strings, otherwise pass arg through unmodified
-  if (src instanceof URL){
-    if (src.protocol=='file:') src = url.fileURLToPath(src)
-    else if (src.protocol.match(/^(https?|data):/)) src = src.href
-    else throw Error(`Unsupported protocol: ${src.protocol.replace(':', '')}`)
-  }
-  return src
-}
-
-const fetchData = (src, fetchOpts, loaded, failed) => {
-  src = expandURLs(src)
+const fetchData = (src, reqOpts, loaded, failed) => {
+  src = expandURL(src)
   if (Buffer.isBuffer(src)) {
     loaded(src, '::Buffer::')
   }else if (isSharpImage(src)){
@@ -272,7 +238,7 @@ const fetchData = (src, fetchOpts, loaded, failed) => {
         err =>  failed(err),
       )
     }else if (/^\s*https?:\/\//.test(src)){
-      fetchURL(src, fetchOpts,
+      fetchURL(src, reqOpts,
         buffer => loaded(buffer, src),
         err => failed(err)
       )

package/lib/prebuild.mjs

@@ -7,7 +7,7 @@ import {readFile, writeFile, rm} from 'fs/promises'
 import {resolve} from 'path'
 import {promisify} from 'util'
 import {family} from 'detect-libc'
-import {fetch} from "./fetch.js"
+import https from 'follow-redirects/https.js'
 import {HttpsProxyAgent} from 'https-proxy-agent'
 
 const pipeline = promisify(stream.pipeline)
@@ -18,7 +18,10 @@ const REPO_URL = "https://github.com/samizdatco/skia-canvas"
 const BINARY_HOST = `${REPO_URL}/releases/download`
 const BINARY_PATH = `${ROOT}/lib/skia.node`
 const PACKAGE_JSON = `${ROOT}/package.json`
-const PROXY_URL = process.env.http_proxy || process.env.HTTP_PROXY || process.env.npm_config_proxy
+const PROXY_URL =
+  process.env.https_proxy || process.env.HTTPS_PROXY ||
+  process.env.http_proxy || process.env.HTTP_PROXY ||
+  process.env.npm_config_https_proxy || process.env.npm_config_proxy
 
 const CARGO_FEATURES = {
   darwin: "metal,window",
@@ -80,16 +83,18 @@ async function download(...args){
 
     let {version, triplet, prebuild} = await config(),
         url = `${BINARY_HOST}/v${version}/${triplet}.gz`,
-        agent = PROXY_URL ? new HttpsProxyAgent(proxy) : undefined
+        agent = PROXY_URL ? new HttpsProxyAgent(PROXY_URL) : undefined
 
     try{
-        let {ok, status, body} = await fetch(url, {agent})
-        if (!ok){
-            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(`Fetching prebuilt libary from "${url}"`)
-        }
+        let body = await new Promise((res, rej) => {
+          https.get(url, {agent}, resp => {
+            let {statusCode:status} = resp
+            if (status == 404) rej(`Prebuilt library not found at "${url}" (HTTP error ${status})`)
+            else if (status < 200 || status >= 300) rej(`Failed to load prebuilt binary from "${url}" (HTTP error ${status})`)
+            else res(resp)
+          })
+        })
+        console.log(`Fetched prebuilt libary from "${url}"`)
 
         // write to /lib/skia.node while also hashing the .gz file
         let sha = new Hasher()
@@ -113,8 +118,9 @@ async function download(...args){
 }
 
 function compile(...args){
-  let optimization = args.includes('generic') || args.includes('dev') ? '' : "--release",
-      features = args.includes('generic') ? '' : `--features ${CARGO_FEATURES}`,
+  let optimization = args.includes('custom') || args.includes('dev') ? '' : "--release",
+      customFeatures = args.includes('custom') && (args[args.indexOf('custom')+1] || '').replace(/[^[a-z0-9\_\-\,]/g, ''),
+      features = `--features "${args.includes('custom') ? customFeatures || '' : CARGO_FEATURES}"`,
       isFallback = args.includes('--fallback'),
       isSrcRepo = existsSync(`${ROOT}/Cargo.toml`)
 

package/lib/urls.js

@@ -0,0 +1,61 @@
+const url = require('url'),
+      {http, https} = require('follow-redirects'),
+      {HttpsProxyAgent} = require('https-proxy-agent')
+
+const UA = {"User-Agent": "Skia Canvas"}
+const PROXY_URL =
+  process.env.https_proxy || process.env.HTTPS_PROXY ||
+  process.env.http_proxy || process.env.HTTP_PROXY
+
+const fetchURL = (url, opts, ok, fail) => {
+  let proto = url.slice(0,5).split(':')[0],
+      client = {http, https}[proto.toLowerCase()]
+
+  if (!client){
+    fail(new Error(`Unsupported protocol: expected 'http' or 'https' (got: ${proto})`))
+  }else{
+    opts = opts || {}
+    opts.headers = {...UA, ...opts.headers}
+    opts.agent = opts.agent===undefined && PROXY_URL ? new HttpsProxyAgent(PROXY_URL) : opts.agent
+
+    let req = client.request(url, opts, resp => {
+      if (resp.statusCode < 200 || resp.statusCode >= 300){
+        fail(new Error(`Failed to load image from "${url}" (HTTP error ${resp.statusCode})`))
+      }else{
+        const chunks = []
+        resp.on("data", chunk => chunks.push(chunk))
+        resp.on("end", () => ok(Buffer.concat(chunks)))
+        resp.on('error', e => fail(e))
+      }
+    })
+
+    req.on('error', e => fail(e))
+    if (opts.body) req.write(opts.body)
+    req.end()
+  }
+}
+
+const decodeDataURL = (dataURL, ok, fail) => {
+  if (typeof dataURL!='string') return fail(TypeError(`Expected a data URL string (got ${typeof dataURL})`))
+  let [header, mime, enc] = dataURL.slice(0, 40).match(/^\s*data:(?<mime>[^;]*);(?:charset=)?(?<enc>[^,]*),/) || []
+  if (!mime || !enc) return fail(TypeError(`Expected a valid data URL string (got: "${dataURL}")`))
+
+  // SVGs in particular may not be base64 encoded
+  let content = dataURL.slice(header.length)
+  if (enc.toLowerCase() != 'base64') content = decodeURIComponent(content)
+
+  try{ ok(Buffer.from(content, enc)) }
+  catch(e){ fail(e) }
+}
+
+const expandURL = (src) => {
+  // convert URLs to strings, otherwise pass arg through unmodified
+  if (src instanceof URL){
+    if (src.protocol=='file:') src = url.fileURLToPath(src)
+    else if (src.protocol.match(/^(https?|data):/)) src = src.href
+    else throw Error(`Unsupported protocol: ${src.protocol.replace(':', '')}`)
+  }
+  return src
+}
+
+module.exports = {fetchURL, decodeDataURL, expandURL}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skia-canvas",
-  "version": "3.0.2",
+  "version": "3.0.4",
   "description": "A multi-threaded, GPU-accelerated, Canvas API for Node",
   "author": "Christian Swinehart <drafting@samizdat.co>",
   "license": "MIT",
@@ -29,8 +29,8 @@
   },
   "dependencies": {
     "detect-libc": "^2.0.4",
+    "follow-redirects": "^1.15.11",
     "https-proxy-agent": "^7.0.6",
-    "node-fetch": "^2.7.0",
     "string-split-by": "^1.0.0"
   },
   "devDependencies": {
@@ -70,15 +70,15 @@
     "rust"
   ],
   "prebuild": {
-    "aws-lambda-arm64.zip": "sha256:c9b4d687110cc2a9246cfa0688f20100828cc2f4e239ffdccb4efe45fdec0b84",
-    "aws-lambda-x64.zip": "sha256:bdd29bf8be43f1b1d106d30e36a916406cbb0ba755d58b75dfb11f2eb2acc1dd",
-    "darwin-arm64.gz": "sha256:4a4c3aa2729aa77faa189815354ce917361c00f99d69afde3b30ac45894eaeab",
-    "darwin-x64.gz": "sha256:4ad7daa6d6236fe5a241ad3bf404d36b06418cb4e0f9e741deb2be2a590da52a",
-    "linux-arm64-glibc.gz": "sha256:73b66d5a9e5cf8841b94462f313323c4bad755d7a0e8202393fac6cdb31e4db8",
-    "linux-arm64-musl.gz": "sha256:3b704353a36428f31eaefe0870da29a1ad433272b81c1088efe770850b812609",
-    "linux-x64-glibc.gz": "sha256:80f9f5a54c92d99cb0cc6da23d7e0c12011b2e53f3c8540864007e1e83e82f65",
-    "linux-x64-musl.gz": "sha256:82fd698d543347ba49a531acad350dd146473c8bbac3e2c6fd137de7cdb02b01",
-    "win32-arm64.gz": "sha256:4b7cb850e87b084c785d7412b0c466daffcd5c7e89f359aa6ee23a36ae87abbb",
-    "win32-x64.gz": "sha256:95fdd138d2863f5fa1cf2e34947da3374f64df86eb88d0de0b3d8bee81d2a5c3"
+    "aws-lambda-arm64.zip": "sha256:7cd7d3347a8ed5a7a6a00a3dc7a05b3556a39eebd4a82c18def146dbcad415d3",
+    "aws-lambda-x64.zip": "sha256:8cd71fae702245258bca77fae284793f0ee1760d44ff88ffb622200418ca48c6",
+    "darwin-arm64.gz": "sha256:d20eaf98437640f0d25dae9dd1007176ccce7a473f1ecb6294fb86de8b08901a",
+    "darwin-x64.gz": "sha256:11aa8f5fb42c79ddbf63d4e0f3e5774d2d5b9fc9d831cd267b88408379d0c163",
+    "linux-arm64-glibc.gz": "sha256:d2d70378f797972463bab191a952a5b16c126e1b951aa47f16404bea2e2042ce",
+    "linux-arm64-musl.gz": "sha256:f035ff50ada62106669deadc0e859ab07987ab1632e0176fd37cf9b68e05a575",
+    "linux-x64-glibc.gz": "sha256:b133ce5c3ddc177078d41e1570423407345f162915acbb5f68dc657df75552ba",
+    "linux-x64-musl.gz": "sha256:577ba30287b89c492d97e7af8417d613368418b068b3eb800c281f3bb69f01ec",
+    "win32-arm64.gz": "sha256:480b9598d5b1d4c1dfd13947f7d5042218851493a79470a59e5b47943941de6c",
+    "win32-x64.gz": "sha256:1bdfced1fc24e1e1af0f94809db6277b84aecb73b8aa258d42cf232fb79bc3d3"
   }
 }

package/lib/fetch.js

@@ -1,4 +0,0 @@
-// rapper that exports either native fetch (on node v18+) or node-fetch (for older systems)
-module.exports = {
-  fetch: global.fetch || require('node-fetch')
-}