Merge branch 'master' into features/node-section

.github/workflows/node.js.yml

@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        node-version: [18.x, 20.x]
+        node-version: [18.x, 20.x, 22.x]
 
     steps:
     - uses: actions/checkout@v2

.npmignore

@@ -1,4 +1,5 @@
 .git*
+.idea/
 dev-playground/
 docs/
 examples/
@@ -9,7 +10,7 @@ yarn.lock
 composer.json
 bower.json
 .editorconfig
-.eslintrc.json
+eslint.config.mjs
 build-fonts.js
 build-examples.js
 babel.config.json

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## Unreleased
+
+- Fixed speed in Node.js if is fetching URL for image or font redirected
+- Fixed aspect ratio for image with exif orientation tag
+
 ## 0.3.0-beta.12 - 2024-11-03
 
 - Added support PDF/A and PDF/UA (see [documentation](https://pdfmake.github.io/docs/0.3/document-definition-object/pdfa/))

src/DocMeasure.js

@@ -130,8 +130,16 @@ class DocMeasure {
 		this.convertIfBase64Image(node);
 
 		let image = this.pdfDocument.provideImage(node.image);
+
 		let imageSize = { width: image.width, height: image.height };
 
+		if (image.constructor.name === 'JPEG') {
+			// If EXIF orientation calls for it, swap width and height
+			if (image.orientation > 4) {
+				imageSize = { width: image.height, height: image.width };
+			}
+		}
+
 		this.measureImageWithDimensions(node, imageSize);
 
 		return node;

src/URLResolver.js

@@ -11,6 +11,8 @@ const fetchUrl = (url, headers = {}) => {
 
 		h.get(url, options, res => {
 			if (res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) { // redirect url
+				res.resume();
+
 				fetchUrl(res.headers.location).then(buffer => {
 					resolve(buffer);
 				}, result => {
@@ -22,6 +24,8 @@ const fetchUrl = (url, headers = {}) => {
 			const ok = res.statusCode >= 200 && res.statusCode < 300;
 			if (!ok) {
 				reject(new TypeError(`Failed to fetch (status code: ${res.statusCode}, url: "${url}")`));
+				res.resume();
+				return;
 			}
 
 			const chunks = [];