@napi-rs/canvas 0.1.52 → 0.1.54

package/README.md

@@ -1,7 +1,7 @@
 # `skr canvas`
 
 ![CI](https://github.com/Brooooooklyn/canvas/workflows/CI/badge.svg)
-![Skia Version](https://img.shields.io/badge/Skia-chrome%2Fm125-hotpink)
+![Skia Version](https://img.shields.io/badge/Skia-chrome%2Fm128-hotpink)
 [![install size](https://packagephobia.com/badge?p=@napi-rs/canvas)](https://packagephobia.com/result?p=@napi-rs/canvas)
 [![Downloads](https://img.shields.io/npm/dm/@napi-rs/canvas.svg?sanitize=true)](https://npmcharts.com/compare/@napi-rs/canvas?minimal=true)
 
@@ -9,7 +9,7 @@
 
 Google Skia binding to Node.js via [Node-API](https://napi.rs), **0 System dependencies!**
 
-⚠️ This project is in pre-release stage. And there may some bugs existed.<br/>
+⚠️ This project is in pre-release stage. And there may be some bugs.<br/>
 For details on planned features and future direction please refer to the [Roadmap](https://github.com/Brooooooklyn/canvas/issues/113).
 
 [中文文档](./README-zh.md)
@@ -353,7 +353,7 @@ $ cd canvas
 
 # Download Skia binaries:
 # It will pull the binaries match the git hash in `./skia` submodule
-$ node scripts/release-skia-binary.js --download
+$ node scripts/release-skia-binary.mjs --download
 
 # Install NPM packages, build the Node.js addon:
 $ npm install -g yarn

package/load-image.js

@@ -61,14 +61,18 @@ function makeRequest(url, resolve, reject, redirectCount, requestOptions) {
 
   lib
     .get(url.toString(), requestOptions || {}, (res) => {
-      const shouldRedirect = REDIRECT_STATUSES.has(res.statusCode) && typeof res.headers.location === 'string'
-      if (shouldRedirect && redirectCount > 0)
-        return makeRequest(new URL(res.headers.location), resolve, reject, redirectCount - 1, requestOptions)
-      if (typeof res.statusCode === 'number' && (res.statusCode < 200 || res.statusCode >= 300)) {
-        return reject(new Error(`remote source rejected with status code ${res.statusCode}`))
+      try {
+        const shouldRedirect = REDIRECT_STATUSES.has(res.statusCode) && typeof res.headers.location === 'string'
+        if (shouldRedirect && redirectCount > 0)
+          return makeRequest(new URL(res.headers.location, url.origin), resolve, reject, redirectCount - 1, requestOptions)
+        if (typeof res.statusCode === 'number' && (res.statusCode < 200 || res.statusCode >= 300)) {
+          return reject(new Error(`remote source rejected with status code ${res.statusCode}`))
+        }
+  
+        consumeStream(res).then(resolve, reject)
+      } catch (err) {
+        reject(err)
       }
-
-      consumeStream(res).then(resolve, reject)
     })
     .on('error', reject)
 }
@@ -85,10 +89,13 @@ function consumeStream(res) {
 }
 
 function createImage(src, alt) {
-  const image = new Image()
-  image.src = src
-  if (typeof alt === 'string') image.alt = alt
-  return image
+  return new Promise((resolve, reject) => {
+    const image = new Image()
+    if (typeof alt === 'string') image.alt = alt
+    image.onload = () => resolve(image)
+    image.onerror = (e) => reject(e)
+    image.src = src
+  })
 }
 
 function isBufferLike(src) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@napi-rs/canvas",
-  "version": "0.1.52",
+  "version": "0.1.54",
   "description": "Canvas for Node.js with skia backend",
   "main": "index.js",
   "repository": {
@@ -71,7 +71,7 @@
     "@jimp/jpeg": "^0.22.10",
     "@jimp/png": "^0.22.10",
     "@napi-rs/cli": "^2.18.0",
-    "@octokit/rest": "^20.0.2",
+    "@octokit/rest": "^21.0.0",
     "@swc-node/register": "^1.8.0",
     "@swc/core": "^1.4.0",
     "@taplo/cli": "^0.7.0",
@@ -83,13 +83,14 @@
     "canvas": "^2.11.2",
     "canvaskit-wasm": "^0.39.1",
     "colorette": "^2.0.20",
-    "conventional-changelog-cli": "^4.1.0",
+    "conventional-changelog-cli": "^5.0.0",
+    "core-js": "^3.38.0",
     "echarts": "^5.4.3",
     "husky": "^9.0.10",
     "lint-staged": "^15.2.1",
     "lodash": "^4.17.21",
     "npm-run-all2": "^6.1.2",
-    "oxlint": "^0.2.17",
+    "oxlint": "^0.7.0",
     "pinst": "^3.0.0",
     "png.js": "^0.2.1",
     "prettier": "^3.2.5",
@@ -109,7 +110,8 @@
   },
   "ava": {
     "require": [
-      "@swc-node/register"
+      "@swc-node/register",
+      "core-js/proposals/promise-with-resolvers.js"
     ],
     "extensions": [
       "ts"
@@ -133,16 +135,16 @@
     "singleQuote": true,
     "arrowParens": "always"
   },
-  "packageManager": "yarn@4.1.1",
+  "packageManager": "yarn@4.4.0",
   "optionalDependencies": {
-    "@napi-rs/canvas-win32-x64-msvc": "0.1.52",
-    "@napi-rs/canvas-darwin-x64": "0.1.52",
-    "@napi-rs/canvas-linux-x64-gnu": "0.1.52",
-    "@napi-rs/canvas-linux-arm-gnueabihf": "0.1.52",
-    "@napi-rs/canvas-linux-x64-musl": "0.1.52",
-    "@napi-rs/canvas-linux-arm64-gnu": "0.1.52",
-    "@napi-rs/canvas-linux-arm64-musl": "0.1.52",
-    "@napi-rs/canvas-darwin-arm64": "0.1.52",
-    "@napi-rs/canvas-android-arm64": "0.1.52"
+    "@napi-rs/canvas-win32-x64-msvc": "0.1.54",
+    "@napi-rs/canvas-darwin-x64": "0.1.54",
+    "@napi-rs/canvas-linux-x64-gnu": "0.1.54",
+    "@napi-rs/canvas-linux-arm-gnueabihf": "0.1.54",
+    "@napi-rs/canvas-linux-x64-musl": "0.1.54",
+    "@napi-rs/canvas-linux-arm64-gnu": "0.1.54",
+    "@napi-rs/canvas-linux-arm64-musl": "0.1.54",
+    "@napi-rs/canvas-darwin-arm64": "0.1.54",
+    "@napi-rs/canvas-android-arm64": "0.1.54"
   }
 }