From 3ac3b838acd06fe3cfde9562e4de3dbc6b84a364 Mon Sep 17 00:00:00 2001 From: Ralf Aron Date: Mon, 9 Sep 2024 16:06:13 +0200 Subject: [PATCH] fix: update package.json --- package-lock.json | 490 ++++++++++-------- package.json | 4 +- projects/aas-server/package.json | 4 +- .../src/app/aas-provider/aas-provider.ts | 4 +- .../aas-server/src/app/image-processing.ts | 17 +- .../src/test/image-processing.spec.ts | 3 +- 6 files changed, 288 insertions(+), 234 deletions(-) diff --git a/package-lock.json b/package-lock.json index eb1ab4b0..5f75b572 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,7 @@ "@ngx-translate/core": "^15.0.0", "@ngx-translate/http-loader": "^8.0.0", "@popperjs/core": "^2.11.8", - "@xmldom/xmldom": "^0.9.2", + "@xmldom/xmldom": "^0.8.10", "aas-core": "projects/aas-core", "bcryptjs": "^2.4.3", "bootstrap": "^5.3.3", @@ -39,7 +39,7 @@ "cors": "^2.8.5", "express": "^4.19.2", "form-data": "^4.0.0", - "jimp": "^1.3.0", + "jimp": "^1.4.0", "jsonwebtoken": "^9.0.2", "jszip": "^3.10.1", "jwt-decode": "^4.0.0", @@ -5173,13 +5173,14 @@ } }, "node_modules/@jimp/core": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@jimp/core/-/core-1.3.0.tgz", - "integrity": "sha512-3+ndSrQYQxyyKyUSdXyk29vHt9vc3zg+3aFrVX2RHzAMeLdjkQHqzQc/7v6VxRk6BtOh1v/VPtmsXHXVg1vVhA==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@jimp/core/-/core-1.4.0.tgz", + "integrity": "sha512-bMjZOoMyDuM9t16qG5vcSWlh75u+ygG+QBrQg55CBAGn71BFpGUcfn2EvtNKhWz1MaJgpKC047WHlOmrQBR8og==", + "license": "MIT", "dependencies": { - "@jimp/file-ops": "1.3.0", - "@jimp/types": "1.3.0", - "@jimp/utils": "1.3.0", + "@jimp/file-ops": "1.4.0", + "@jimp/types": "1.4.0", + "@jimp/utils": "1.4.0", "await-to-js": "^3.0.0", "exif-parser": "^0.1.12", "file-type": "^16.0.0", @@ -5193,6 +5194,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz", "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==", + "license": "MIT", "bin": { "mime": "cli.js" }, @@ -5201,13 +5203,14 @@ } }, "node_modules/@jimp/diff": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@jimp/diff/-/diff-1.3.0.tgz", - "integrity": "sha512-eGFfZi8UjSZ6gGu9kpQmGPRRDt5fMV3V1qKRn0cTqtBsECAnKPG5PPT1dvnjDDBbtAOH81jhIr//ko8H5WV8jg==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@jimp/diff/-/diff-1.4.0.tgz", + "integrity": "sha512-PpHiYx5rw8Is5MeKvuOX5rgGr1W1R6kRIlZtJ0Fg6kHT610oFcSZj65/rea9cQ2MmJgTbO09r9mEoHMcqNouiw==", + "license": "MIT", "dependencies": { - "@jimp/plugin-resize": "1.3.0", - "@jimp/types": "1.3.0", - "@jimp/utils": "1.3.0", + "@jimp/plugin-resize": "1.4.0", + "@jimp/types": "1.4.0", + "@jimp/utils": "1.4.0", "pixelmatch": "^5.3.0" }, "engines": { @@ -5215,21 +5218,23 @@ } }, "node_modules/@jimp/file-ops": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@jimp/file-ops/-/file-ops-1.3.0.tgz", - "integrity": "sha512-DzbSLgUdOGT9T9qf+Ik/hBA8e4zA9tWyHnJJA/N9sJHwHNDCMtoaX3KY5ssHuRGmcngGKLwbeGjddnZXF4oIVA==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@jimp/file-ops/-/file-ops-1.4.0.tgz", + "integrity": "sha512-9a4+VXGAQ29eVc+lXd2Edy5O6Cflv50EuwWm9bcU317iYo44Ro4NlG25JBL+Cu8BcSq8Fh/TjQdkBAigTlMB8g==", + "license": "MIT", "engines": { "node": ">=18" } }, "node_modules/@jimp/js-bmp": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@jimp/js-bmp/-/js-bmp-1.3.0.tgz", - "integrity": "sha512-sc3jvJJOMHoUtP9mlnuBCkwhHy9T2KiSfdV3XKg81v+bg9O0LudB33v3Y0dtGxSo/WOL2V6PVNIWTRf7gu+hJw==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@jimp/js-bmp/-/js-bmp-1.4.0.tgz", + "integrity": "sha512-hngoxEXL7X7+tgylUiXK4vwXpzXTfQSXcLsBC2M7wJ/ODU0qcVe62XqzLY+BOPLym6SYxwjJ9Zeap+xTJyNwkA==", + "license": "MIT", "dependencies": { - "@jimp/core": "1.3.0", - "@jimp/types": "1.3.0", - "@jimp/utils": "1.3.0", + "@jimp/core": "1.4.0", + "@jimp/types": "1.4.0", + "@jimp/utils": "1.4.0", "bmp-ts": "^1.0.9" }, "engines": { @@ -5237,12 +5242,13 @@ } }, "node_modules/@jimp/js-gif": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@jimp/js-gif/-/js-gif-1.3.0.tgz", - "integrity": "sha512-hhAd/TpZSp6AIuRjYKFGGEsu9HzQG16Q9lZHPcTZz1TlxtTUqW60AJvFrGvnUZbTecDj3JnI3TipX8aeqZpBDg==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@jimp/js-gif/-/js-gif-1.4.0.tgz", + "integrity": "sha512-aaBGArc8yQhZCrqQ02m1+wzlVIg3lEmLDzwgzYY5WnoAOLpvkVzRj1M3WV17Bu8v3AzWkO1izapKTHo6Hb7cvg==", + "license": "MIT", "dependencies": { - "@jimp/core": "1.3.0", - "@jimp/types": "1.3.0", + "@jimp/core": "1.4.0", + "@jimp/types": "1.4.0", "gifwrap": "^0.10.1", "omggif": "^1.0.10" }, @@ -5251,12 +5257,13 @@ } }, "node_modules/@jimp/js-jpeg": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@jimp/js-jpeg/-/js-jpeg-1.3.0.tgz", - "integrity": "sha512-SrZL35FvKsgySS5kpqYWbVsi0rswcgxw3oRTVOy55q8F045fE4U0YqlnRdkg77dxdahUOIWVhvn5+0V+Re5F5A==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@jimp/js-jpeg/-/js-jpeg-1.4.0.tgz", + "integrity": "sha512-vIRXccEs64TIpbHiFX3AuNCcREsTPLA09yxQWcs6EGRMQhIpyeatqIYC4L8bAhOGHW/uI8hNWZiuXWwPByxfkA==", + "license": "MIT", "dependencies": { - "@jimp/core": "1.3.0", - "@jimp/types": "1.3.0", + "@jimp/core": "1.4.0", + "@jimp/types": "1.4.0", "jpeg-js": "^0.4.4" }, "engines": { @@ -5264,12 +5271,13 @@ } }, "node_modules/@jimp/js-png": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@jimp/js-png/-/js-png-1.3.0.tgz", - "integrity": "sha512-9x8uFueVupNocQQ5WEFat61M31MdRDV7O3QBDR2iEsbVeQ1+LE9Tvvm9r1PG9W91KZYzG4IYPPsogQ0TFEixqA==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@jimp/js-png/-/js-png-1.4.0.tgz", + "integrity": "sha512-nBYqmXRkhw97xCbCihYGU5RiWfRYtsjAT2/lxcMqItOFkNEODDnx3aUG4R1LZYPfG1/1Z+Fok15L+FQL1JxD1g==", + "license": "MIT", "dependencies": { - "@jimp/core": "1.3.0", - "@jimp/types": "1.3.0", + "@jimp/core": "1.4.0", + "@jimp/types": "1.4.0", "pngjs": "^7.0.0" }, "engines": { @@ -5277,12 +5285,13 @@ } }, "node_modules/@jimp/js-tiff": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@jimp/js-tiff/-/js-tiff-1.3.0.tgz", - "integrity": "sha512-uin5WkVm0M8ZgotIANXU0sfVkNApsKws1ZSqsc9NZf0MYJsZkz/w8D4ld6hXkFCEQcJ/TMu7aeMZSP+I8cbmOg==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@jimp/js-tiff/-/js-tiff-1.4.0.tgz", + "integrity": "sha512-WJcNBKBk1C14la4xMa3VLgc23G136eMiy9rGS1a8SBc16e7915J5kiMRpVrg6noenzb+8oN0RE5LGE5X+/BCQA==", + "license": "MIT", "dependencies": { - "@jimp/core": "1.3.0", - "@jimp/types": "1.3.0", + "@jimp/core": "1.4.0", + "@jimp/types": "1.4.0", "utif2": "^4.1.0" }, "engines": { @@ -5290,12 +5299,13 @@ } }, "node_modules/@jimp/plugin-blit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-1.3.0.tgz", - "integrity": "sha512-5OjEUM0jtzQ6KJBTougs8ozbUAxYyJiKZqceFb8mqKVMjuiM94N9425mIDDgOl5MDFwAESeTMIchKCAPMOv2FQ==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-1.4.0.tgz", + "integrity": "sha512-eHg4MCCdMOnZ70/TsbObz+0wCY1qKMlRPjTqWGgfjoT/harjjZveV2j9gCNofGVcyscV7b5S6It7p0f6LcwmPA==", + "license": "MIT", "dependencies": { - "@jimp/types": "1.3.0", - "@jimp/utils": "1.3.0", + "@jimp/types": "1.4.0", + "@jimp/utils": "1.4.0", "zod": "^3.23.8" }, "engines": { @@ -5303,23 +5313,25 @@ } }, "node_modules/@jimp/plugin-blur": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-1.3.0.tgz", - "integrity": "sha512-108RHeCvHFJqpQvuaydhxwJLBwdjEWKLW6ZXWWCnCadrpKbH2yqu9P6oUhHS7atLjQ0ZBzXcM+Wj2VYR7XU8ng==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-1.4.0.tgz", + "integrity": "sha512-rMblWcCMYtaaFv+6UD4EupyOm7i7tWNxdvm+lqrcquKF54vfw9JtvywrmEX4CBCUoKGSIlFHFj8HH8IFDW6MJQ==", + "license": "MIT", "dependencies": { - "@jimp/core": "1.3.0", - "@jimp/utils": "1.3.0" + "@jimp/core": "1.4.0", + "@jimp/utils": "1.4.0" }, "engines": { "node": ">=18" } }, "node_modules/@jimp/plugin-circle": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@jimp/plugin-circle/-/plugin-circle-1.3.0.tgz", - "integrity": "sha512-Lkz1uwD2wgysuu4TDzAVQ26+urr+siYlO/qXnMYHui9k0P735S6B6EsWrzssLDGOtqevQyYcx5u6h0Kv4lzehg==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-circle/-/plugin-circle-1.4.0.tgz", + "integrity": "sha512-wVMTUak3SnozmNHDfjWCk8dhfo02+5DNdhNoajcP+keL9i++TNOw/0bWNBJhS6YyHXmL85QWpA3tp62bLs88Fw==", + "license": "MIT", "dependencies": { - "@jimp/types": "1.3.0", + "@jimp/types": "1.4.0", "zod": "^3.23.8" }, "engines": { @@ -5327,13 +5339,14 @@ } }, "node_modules/@jimp/plugin-color": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-1.3.0.tgz", - "integrity": "sha512-HLFtZB86W2nVnfZT+LAsyooF9efapWPmxuOKECeevunb1zHieO1ni19QXJfcqtt+cVj8UxIBGC4v9IFDJ9PGYw==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-1.4.0.tgz", + "integrity": "sha512-YnTqQP7SyKvW0eu2KeKB5lMUnYSNMHFNzw15A3paq4YBeG21wpyqXiZzpGjJmwEVlRo35JqkWjP2++O3HW/Pqw==", + "license": "MIT", "dependencies": { - "@jimp/core": "1.3.0", - "@jimp/types": "1.3.0", - "@jimp/utils": "1.3.0", + "@jimp/core": "1.4.0", + "@jimp/types": "1.4.0", + "@jimp/utils": "1.4.0", "tinycolor2": "^1.6.0", "zod": "^3.23.8" }, @@ -5342,15 +5355,16 @@ } }, "node_modules/@jimp/plugin-contain": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@jimp/plugin-contain/-/plugin-contain-1.3.0.tgz", - "integrity": "sha512-1xPJ/CC4hh8IDrZFCtwQezw0RFzdrFvatzXkmfZD0cRyUXtYQ8VzExeK9MXLWi2+/nfufh+2SIhThTQ8xIzLBw==", - "dependencies": { - "@jimp/core": "1.3.0", - "@jimp/plugin-blit": "1.3.0", - "@jimp/plugin-resize": "1.3.0", - "@jimp/types": "1.3.0", - "@jimp/utils": "1.3.0", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-contain/-/plugin-contain-1.4.0.tgz", + "integrity": "sha512-20IFdQ4SYFEas8OEstHfNTm6IBAXRuyClbEQF51vmVcAIL2IMNoxkzwNZqcOMhNA6Ug4dMHfRP2DFWvu0UEtnQ==", + "license": "MIT", + "dependencies": { + "@jimp/core": "1.4.0", + "@jimp/plugin-blit": "1.4.0", + "@jimp/plugin-resize": "1.4.0", + "@jimp/types": "1.4.0", + "@jimp/utils": "1.4.0", "zod": "^3.23.8" }, "engines": { @@ -5358,14 +5372,15 @@ } }, "node_modules/@jimp/plugin-cover": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@jimp/plugin-cover/-/plugin-cover-1.3.0.tgz", - "integrity": "sha512-Q8vlXepruKU+A55PS2A+d7TPwIoYthnX61ae+TQa+/4DjYk6XZA2YlmUFhq7P3RH5p288N/84ILNSIwH5YCqAw==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-cover/-/plugin-cover-1.4.0.tgz", + "integrity": "sha512-pzcuTSyF4gaVuGlLfhghk33hELVITq+trdgBgLzq9P2RoNUrq7PrtzS4N/aAWHeQFXTHhr83FSdEHGUQX7dG0A==", + "license": "MIT", "dependencies": { - "@jimp/core": "1.3.0", - "@jimp/plugin-crop": "1.3.0", - "@jimp/plugin-resize": "1.3.0", - "@jimp/types": "1.3.0", + "@jimp/core": "1.4.0", + "@jimp/plugin-crop": "1.4.0", + "@jimp/plugin-resize": "1.4.0", + "@jimp/types": "1.4.0", "zod": "^3.23.8" }, "engines": { @@ -5373,13 +5388,14 @@ } }, "node_modules/@jimp/plugin-crop": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-1.3.0.tgz", - "integrity": "sha512-AoCTYFgcDEH+sqc2IQ5CI0CgYrQZSFfZ6q4zSXkWA+irs1nDbjJeA+0vClkYxJNSkk2wqB0fys69OBoqfDabrw==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-1.4.0.tgz", + "integrity": "sha512-VlprZvjbMMo860/vk557SMiKKnhqEliJ/IKv/4PuXcJQqEFUQYelege/gmmLYCOSLypY5jt39UIkQG7RjgIcOg==", + "license": "MIT", "dependencies": { - "@jimp/core": "1.3.0", - "@jimp/types": "1.3.0", - "@jimp/utils": "1.3.0", + "@jimp/core": "1.4.0", + "@jimp/types": "1.4.0", + "@jimp/utils": "1.4.0", "zod": "^3.23.8" }, "engines": { @@ -5387,12 +5403,13 @@ } }, "node_modules/@jimp/plugin-displace": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@jimp/plugin-displace/-/plugin-displace-1.3.0.tgz", - "integrity": "sha512-8t/R0SjE7YWujeMLbUT2js9WIeyFbeQXxAiCPt4AJy1BUD56sbcWIx1zJzrL52eF+bG4AS8oLOp5arL+P7ocmQ==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-displace/-/plugin-displace-1.4.0.tgz", + "integrity": "sha512-eBlVY/ewbBlRK8nEAoAmf0OCpJGD+T1zl42ZaVmEbWYW4IRb51bLhBeZDMKEKT6cN9kb8xn6rYqj3peCgDCv4A==", + "license": "MIT", "dependencies": { - "@jimp/types": "1.3.0", - "@jimp/utils": "1.3.0", + "@jimp/types": "1.4.0", + "@jimp/utils": "1.4.0", "zod": "^3.23.8" }, "engines": { @@ -5400,23 +5417,25 @@ } }, "node_modules/@jimp/plugin-dither": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@jimp/plugin-dither/-/plugin-dither-1.3.0.tgz", - "integrity": "sha512-oE6kHne88OOcJBu+fk9KvMMB71UZUO4B2YYoaHVjGbtciPG9FbBBGqgD9oULVWhHuICZdDnfgFF0hhemQuQloQ==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-dither/-/plugin-dither-1.4.0.tgz", + "integrity": "sha512-msVgcWpuHoU0+A4feHTGMHFLhHCulVP1FwCp8KWt07o9gQG2jxH8tiF5Ki/aM7cF+GXfZIbfVj+FCVytuVMsig==", + "license": "MIT", "dependencies": { - "@jimp/types": "1.3.0" + "@jimp/types": "1.4.0" }, "engines": { "node": ">=18" } }, "node_modules/@jimp/plugin-fisheye": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@jimp/plugin-fisheye/-/plugin-fisheye-1.3.0.tgz", - "integrity": "sha512-VLaqY/IxrqHyjKeWpUwJZpAqug4DE26hM/8ejfPm5FmofAS1dI0deecDfbthRbw17hnPVcAiTkZ6QTiQL71Z4w==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-fisheye/-/plugin-fisheye-1.4.0.tgz", + "integrity": "sha512-j/VI/EiBzIwiR+O2ajBm3qzebseO+4ePzG4IKAIs9qgOtT5cc6LZF+xdEr0bp8Qe8sAnwH6aTQi6k1AoclY1rg==", + "license": "MIT", "dependencies": { - "@jimp/types": "1.3.0", - "@jimp/utils": "1.3.0", + "@jimp/types": "1.4.0", + "@jimp/utils": "1.4.0", "zod": "^3.23.8" }, "engines": { @@ -5424,11 +5443,12 @@ } }, "node_modules/@jimp/plugin-flip": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@jimp/plugin-flip/-/plugin-flip-1.3.0.tgz", - "integrity": "sha512-cHeefBsjBYLbjqq8TFJHQD/6sgJLvb6XPdB8wVvKe682Y8jIilxlEhZJeUFXwsMrKKhbXNZxmtSc/pEIYCo6cA==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-flip/-/plugin-flip-1.4.0.tgz", + "integrity": "sha512-yBmmTyLrPEYEd5WPGpVT3MQwx6ekjSsyALv2XZHaxXK/ALJa4S74byMhXgD2z7u3aXvCryx7yW7Fb7LcTYukVA==", + "license": "MIT", "dependencies": { - "@jimp/types": "1.3.0", + "@jimp/types": "1.4.0", "zod": "^3.23.8" }, "engines": { @@ -5436,19 +5456,20 @@ } }, "node_modules/@jimp/plugin-hash": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@jimp/plugin-hash/-/plugin-hash-1.3.0.tgz", - "integrity": "sha512-LAUi9FFT3Kp2bI2hWXQ75t1pl6q6ZyKH/jJQZg8DPL+fFK0//TIsw/g0VxW5lZoV3mHUUorQlsZzWtNi/DGtWA==", - "dependencies": { - "@jimp/core": "1.3.0", - "@jimp/js-bmp": "1.3.0", - "@jimp/js-jpeg": "1.3.0", - "@jimp/js-png": "1.3.0", - "@jimp/js-tiff": "1.3.0", - "@jimp/plugin-color": "1.3.0", - "@jimp/plugin-resize": "1.3.0", - "@jimp/types": "1.3.0", - "@jimp/utils": "1.3.0", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-hash/-/plugin-hash-1.4.0.tgz", + "integrity": "sha512-CdqXHxHL7GmQm9L9ZtLP4BtdmIC8z4vAYS1fqX/rRuBTWmRGN+1fN/UbtwDvnuedeFgImE2sq8XxUUmVRVC5ZQ==", + "license": "MIT", + "dependencies": { + "@jimp/core": "1.4.0", + "@jimp/js-bmp": "1.4.0", + "@jimp/js-jpeg": "1.4.0", + "@jimp/js-png": "1.4.0", + "@jimp/js-tiff": "1.4.0", + "@jimp/plugin-color": "1.4.0", + "@jimp/plugin-resize": "1.4.0", + "@jimp/types": "1.4.0", + "@jimp/utils": "1.4.0", "any-base": "^1.1.0" }, "engines": { @@ -5456,11 +5477,12 @@ } }, "node_modules/@jimp/plugin-mask": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@jimp/plugin-mask/-/plugin-mask-1.3.0.tgz", - "integrity": "sha512-fpU6rZ75c1gD6/8zsiPQW57+doX3KfexZ3lVYToyd720HPO/qfG9lzwfY30tJVXArI4DMbG8qN7lXKgGeWwGqw==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-mask/-/plugin-mask-1.4.0.tgz", + "integrity": "sha512-92Rei2zkXFsXM6st0AjiWRplNZ2cwVq7dGU5SVqtM5LGnqK6HJDkZXWk9zp82+eajHSTye+EZ+6Xj5Sn4nMPsw==", + "license": "MIT", "dependencies": { - "@jimp/types": "1.3.0", + "@jimp/types": "1.4.0", "zod": "^3.23.8" }, "engines": { @@ -5468,15 +5490,16 @@ } }, "node_modules/@jimp/plugin-print": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@jimp/plugin-print/-/plugin-print-1.3.0.tgz", - "integrity": "sha512-WeN35Fo9Bushm6VGUdQXqXrVIFDYECeKLKN+LlAqQ/YnIlUiTirPlcyGHzEBKD8uXDCmjBYqxwadcPvRDVwFEw==", - "dependencies": { - "@jimp/core": "1.3.0", - "@jimp/js-jpeg": "1.3.0", - "@jimp/js-png": "1.3.0", - "@jimp/plugin-blit": "1.3.0", - "@jimp/types": "1.3.0", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-print/-/plugin-print-1.4.0.tgz", + "integrity": "sha512-GZYW6zmp9g8T7G0pNO1x/AjxHX7R1zu0+6iJBHZgyrCkaTluFd6D7448ZUHMzmNOCcmlSNI8bJ+PhUk2V3hU5A==", + "license": "MIT", + "dependencies": { + "@jimp/core": "1.4.0", + "@jimp/js-jpeg": "1.4.0", + "@jimp/js-png": "1.4.0", + "@jimp/plugin-blit": "1.4.0", + "@jimp/types": "1.4.0", "parse-bmfont-ascii": "^1.0.6", "parse-bmfont-binary": "^1.0.6", "parse-bmfont-xml": "^1.1.6", @@ -5488,9 +5511,10 @@ } }, "node_modules/@jimp/plugin-quantize": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@jimp/plugin-quantize/-/plugin-quantize-1.3.0.tgz", - "integrity": "sha512-4Hgp5UNN8DGeX1ULNANPwlHCyuaZYZPJ/mpe/lnCN4jLI/SeBzR4g8tU+srNF6arPwRXrLNQV6T/ehAa7zhbkg==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-quantize/-/plugin-quantize-1.4.0.tgz", + "integrity": "sha512-3A8Omq8EzyRHz7iObeSVHXflMDK8W9pOh0pKDbdCYAAQfH60jElZ4aiC7g4XPeR+C+XxDO4vSQlC/LhbkmV0ig==", + "license": "MIT", "dependencies": { "image-q": "^4.0.0", "zod": "^3.23.8" @@ -5500,12 +5524,13 @@ } }, "node_modules/@jimp/plugin-resize": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-1.3.0.tgz", - "integrity": "sha512-9fMw6ff/3kzDwQ2rGNYCJ2jc9IHsxQh9eaoPb4SkVHxzq+O3yka3M2Vjf41gaYhQ5Pt5QLgQ9uYUA+2kp1RF1g==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-1.4.0.tgz", + "integrity": "sha512-Y+FQzJ/k79EJYSqn8yabtgshthHNHMpTZWIrlazugplNk+PjDlMQ5Hu7PVYUus+GxX8wzf1PSG0wPY3gVilwTA==", + "license": "MIT", "dependencies": { - "@jimp/core": "1.3.0", - "@jimp/types": "1.3.0", + "@jimp/core": "1.4.0", + "@jimp/types": "1.4.0", "zod": "^3.23.8" }, "engines": { @@ -5513,15 +5538,16 @@ } }, "node_modules/@jimp/plugin-rotate": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-1.3.0.tgz", - "integrity": "sha512-lpzk37tzk7b5RG5U6P/E3vk+bwU86TnNZOc1LHQeTOEpfFAPMTJl6w+OlLLxVNJ7HUQege/8P47N2onQX00wXw==", - "dependencies": { - "@jimp/core": "1.3.0", - "@jimp/plugin-crop": "1.3.0", - "@jimp/plugin-resize": "1.3.0", - "@jimp/types": "1.3.0", - "@jimp/utils": "1.3.0", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-1.4.0.tgz", + "integrity": "sha512-mvDTeXvonkKWC1T98CljbjazR40CZVMdgtn5R8giPp16745PC3WFy+kA3PocMXg3EAwK4+I9Hh6r7Y4VRsa4fw==", + "license": "MIT", + "dependencies": { + "@jimp/core": "1.4.0", + "@jimp/plugin-crop": "1.4.0", + "@jimp/plugin-resize": "1.4.0", + "@jimp/types": "1.4.0", + "@jimp/utils": "1.4.0", "zod": "^3.23.8" }, "engines": { @@ -5529,15 +5555,16 @@ } }, "node_modules/@jimp/plugin-threshold": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@jimp/plugin-threshold/-/plugin-threshold-1.3.0.tgz", - "integrity": "sha512-lKBzZEgjI/zM51/muGyL2juGEkK361/yFpRcmjafIijq0sHNww1rhqSa0AhO80iCmN77A4Ym/oelY0qh4mtlLQ==", - "dependencies": { - "@jimp/core": "1.3.0", - "@jimp/plugin-color": "1.3.0", - "@jimp/plugin-hash": "1.3.0", - "@jimp/types": "1.3.0", - "@jimp/utils": "1.3.0", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-threshold/-/plugin-threshold-1.4.0.tgz", + "integrity": "sha512-AvbIZenfMpOIoF2pnUtNo7SsNt4z2VSyrKFa0BIiodpUBdxujkBRq/FO/jNLnxaN6ShhVudBgRX6AJB4+hzITQ==", + "license": "MIT", + "dependencies": { + "@jimp/core": "1.4.0", + "@jimp/plugin-color": "1.4.0", + "@jimp/plugin-hash": "1.4.0", + "@jimp/types": "1.4.0", + "@jimp/utils": "1.4.0", "zod": "^3.23.8" }, "engines": { @@ -5545,9 +5572,10 @@ } }, "node_modules/@jimp/types": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@jimp/types/-/types-1.3.0.tgz", - "integrity": "sha512-K4RaTmDTqZqbjjwOtxzVH9QyCgQBukXjKOmdgNuCmu7ugrpeTeWV7SvrwZZPhTt31lmja8A3a3Dw1ScVZdtmyA==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@jimp/types/-/types-1.4.0.tgz", + "integrity": "sha512-EWIsQxRgBBvkkkZ81iVQLpb+V5Y1wNyrqUl5w56ZwT7HaJGGJz9EU1TYcUhxq1q2jQJLeNMScfJbUTZv7y3Ehw==", + "license": "MIT", "dependencies": { "zod": "^3.23.8" }, @@ -5556,11 +5584,12 @@ } }, "node_modules/@jimp/utils": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@jimp/utils/-/utils-1.3.0.tgz", - "integrity": "sha512-QIye6IWJaQ3Q9+6rxgQiFI1I7MwrQZYxlhYhPolJv+BfCXBT8XWJymV8J75vlnjvz3kN2AMXAEU7c7w0h2Tz3Q==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@jimp/utils/-/utils-1.4.0.tgz", + "integrity": "sha512-WXqOq/x1SjyY2QaMDdjaStYLICN4Uie9pSswrQSBqFLgO/m9xEdwFNnhLQDhwqqDUlQ4NnDIdAUUTihmdO2p8g==", + "license": "MIT", "dependencies": { - "@jimp/types": "1.3.0", + "@jimp/types": "1.4.0", "tinycolor2": "^1.6.0" }, "engines": { @@ -7439,7 +7468,8 @@ "node_modules/@tokenizer/token": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/@tokenizer/token/-/token-0.3.0.tgz", - "integrity": "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==" + "integrity": "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==", + "license": "MIT" }, "node_modules/@tsconfig/node10": { "version": "1.0.11", @@ -8495,11 +8525,12 @@ } }, "node_modules/@xmldom/xmldom": { - "version": "0.9.2", - "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.9.2.tgz", - "integrity": "sha512-afP3lpLtalPxgNGU4bxlsru4wSDsZwdSFKnHs6PR0q3KIEWWcAlBqAdx4aWlVtP1gV1FBWlJ3d0MgaRRdj/ucA==", + "version": "0.8.10", + "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz", + "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==", + "license": "MIT", "engines": { - "node": ">=14.0.0" + "node": ">=10.0.0" } }, "node_modules/@xtuc/ieee754": { @@ -8754,7 +8785,8 @@ "node_modules/any-base": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/any-base/-/any-base-1.1.0.tgz", - "integrity": "sha512-uMgjozySS8adZZYePpaWs8cxB9/kdzmpX6SgJZ+wbz1K5eYk5QMYDVJaZKhxyIHUdnnJkfR7SVgStgH7LkGUyg==" + "integrity": "sha512-uMgjozySS8adZZYePpaWs8cxB9/kdzmpX6SgJZ+wbz1K5eYk5QMYDVJaZKhxyIHUdnnJkfR7SVgStgH7LkGUyg==", + "license": "MIT" }, "node_modules/any-promise": { "version": "1.3.0", @@ -9003,6 +9035,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/await-to-js/-/await-to-js-3.0.0.tgz", "integrity": "sha512-zJAaP9zxTcvTHRlejau3ZOY4V7SRpiByf3/dxx2uyKxxor19tpmpV2QRsTKikckwhaPmr2dVpxxMr7jOCYVp5g==", + "license": "MIT", "engines": { "node": ">=6.0.0" } @@ -9322,6 +9355,7 @@ "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "dev": true, "funding": [ { "type": "github", @@ -9435,7 +9469,8 @@ "node_modules/bmp-ts": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/bmp-ts/-/bmp-ts-1.0.9.tgz", - "integrity": "sha512-cTEHk2jLrPyi+12M3dhpEbnnPOsaZuq7C45ylbbQIiWgDFZq4UVYPEY5mlqjvsj/6gJv9qX5sa+ebDzLXT28Vw==" + "integrity": "sha512-cTEHk2jLrPyi+12M3dhpEbnnPOsaZuq7C45ylbbQIiWgDFZq4UVYPEY5mlqjvsj/6gJv9qX5sa+ebDzLXT28Vw==", + "license": "MIT" }, "node_modules/body-parser": { "version": "1.20.2", @@ -9611,6 +9646,7 @@ "version": "5.7.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "dev": true, "funding": [ { "type": "github", @@ -11755,6 +11791,7 @@ "version": "0.1.13", "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", + "dev": true, "optional": true, "dependencies": { "iconv-lite": "^0.6.2" @@ -11764,6 +11801,7 @@ "version": "0.6.3", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "dev": true, "optional": true, "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" @@ -13011,6 +13049,7 @@ "version": "16.5.4", "resolved": "https://registry.npmjs.org/file-type/-/file-type-16.5.4.tgz", "integrity": "sha512-/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw==", + "license": "MIT", "dependencies": { "readable-web-to-node-stream": "^3.0.0", "strtok3": "^6.2.4", @@ -13242,6 +13281,7 @@ "version": "1.15.6", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", + "dev": true, "funding": [ { "type": "individual", @@ -13550,6 +13590,7 @@ "version": "0.10.1", "resolved": "https://registry.npmjs.org/gifwrap/-/gifwrap-0.10.1.tgz", "integrity": "sha512-2760b1vpJHNmLzZ/ubTtNnEx5WApN/PYWJvXvgS+tL1egTTthayFYIQQNi136FLEDcN/IyEY2EcGpIITD6eYUw==", + "license": "MIT", "dependencies": { "image-q": "^4.0.0", "omggif": "^1.0.10" @@ -14091,6 +14132,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/image-q/-/image-q-4.0.0.tgz", "integrity": "sha512-PfJGVgIfKQJuq3s0tTDOKtztksibuUEbJQIYT3by6wctQo+Rdlh7ef4evJ5NCdxY4CfMbvFkocEwbl4BF8RlJw==", + "license": "MIT", "dependencies": { "@types/node": "16.9.1" } @@ -14098,7 +14140,8 @@ "node_modules/image-q/node_modules/@types/node": { "version": "16.9.1", "resolved": "https://registry.npmjs.org/@types/node/-/node-16.9.1.tgz", - "integrity": "sha512-QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g==" + "integrity": "sha512-QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g==", + "license": "MIT" }, "node_modules/image-size": { "version": "0.5.5", @@ -16910,37 +16953,38 @@ } }, "node_modules/jimp": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/jimp/-/jimp-1.3.0.tgz", - "integrity": "sha512-eJnVMuqDQ545taNLp13gVZynnoOvE0xZ2Oti9alkld47dNhmFHBmFTBMTYaZr7zceGTf54RGdr7C4d2WUNwc0g==", - "dependencies": { - "@jimp/core": "1.3.0", - "@jimp/diff": "1.3.0", - "@jimp/js-bmp": "1.3.0", - "@jimp/js-gif": "1.3.0", - "@jimp/js-jpeg": "1.3.0", - "@jimp/js-png": "1.3.0", - "@jimp/js-tiff": "1.3.0", - "@jimp/plugin-blit": "1.3.0", - "@jimp/plugin-blur": "1.3.0", - "@jimp/plugin-circle": "1.3.0", - "@jimp/plugin-color": "1.3.0", - "@jimp/plugin-contain": "1.3.0", - "@jimp/plugin-cover": "1.3.0", - "@jimp/plugin-crop": "1.3.0", - "@jimp/plugin-displace": "1.3.0", - "@jimp/plugin-dither": "1.3.0", - "@jimp/plugin-fisheye": "1.3.0", - "@jimp/plugin-flip": "1.3.0", - "@jimp/plugin-hash": "1.3.0", - "@jimp/plugin-mask": "1.3.0", - "@jimp/plugin-print": "1.3.0", - "@jimp/plugin-quantize": "1.3.0", - "@jimp/plugin-resize": "1.3.0", - "@jimp/plugin-rotate": "1.3.0", - "@jimp/plugin-threshold": "1.3.0", - "@jimp/types": "1.3.0", - "@jimp/utils": "1.3.0" + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/jimp/-/jimp-1.4.0.tgz", + "integrity": "sha512-TZNtWCHhT3Ghw4Z0PC9P4TFhwWM/nKhiLtXW1R3y+sQVVd4SvZsXbMoeAqq95K0Y5f4Xq4fC4CHzrJYfolHqRw==", + "license": "MIT", + "dependencies": { + "@jimp/core": "1.4.0", + "@jimp/diff": "1.4.0", + "@jimp/js-bmp": "1.4.0", + "@jimp/js-gif": "1.4.0", + "@jimp/js-jpeg": "1.4.0", + "@jimp/js-png": "1.4.0", + "@jimp/js-tiff": "1.4.0", + "@jimp/plugin-blit": "1.4.0", + "@jimp/plugin-blur": "1.4.0", + "@jimp/plugin-circle": "1.4.0", + "@jimp/plugin-color": "1.4.0", + "@jimp/plugin-contain": "1.4.0", + "@jimp/plugin-cover": "1.4.0", + "@jimp/plugin-crop": "1.4.0", + "@jimp/plugin-displace": "1.4.0", + "@jimp/plugin-dither": "1.4.0", + "@jimp/plugin-fisheye": "1.4.0", + "@jimp/plugin-flip": "1.4.0", + "@jimp/plugin-hash": "1.4.0", + "@jimp/plugin-mask": "1.4.0", + "@jimp/plugin-print": "1.4.0", + "@jimp/plugin-quantize": "1.4.0", + "@jimp/plugin-resize": "1.4.0", + "@jimp/plugin-rotate": "1.4.0", + "@jimp/plugin-threshold": "1.4.0", + "@jimp/types": "1.4.0", + "@jimp/utils": "1.4.0" }, "engines": { "node": ">=18" @@ -16958,7 +17002,8 @@ "node_modules/jpeg-js": { "version": "0.4.4", "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.4.tgz", - "integrity": "sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg==" + "integrity": "sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg==", + "license": "BSD-3-Clause" }, "node_modules/js-tokens": { "version": "4.0.0", @@ -24702,7 +24747,8 @@ "node_modules/omggif": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/omggif/-/omggif-1.0.10.tgz", - "integrity": "sha512-LMJTtvgc/nugXj0Vcrrs68Mn2D1r0zf630VNtqtpI1FEO7e+O9FP4gqs9AcnBaSEeoHIPm28u6qgPR0oyEpGSw==" + "integrity": "sha512-LMJTtvgc/nugXj0Vcrrs68Mn2D1r0zf630VNtqtpI1FEO7e+O9FP4gqs9AcnBaSEeoHIPm28u6qgPR0oyEpGSw==", + "license": "MIT" }, "node_modules/on-finished": { "version": "2.4.1", @@ -25128,17 +25174,20 @@ "node_modules/parse-bmfont-ascii": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/parse-bmfont-ascii/-/parse-bmfont-ascii-1.0.6.tgz", - "integrity": "sha512-U4RrVsUFCleIOBsIGYOMKjn9PavsGOXxbvYGtMOEfnId0SVNsgehXh1DxUdVPLoxd5mvcEtvmKs2Mmf0Mpa1ZA==" + "integrity": "sha512-U4RrVsUFCleIOBsIGYOMKjn9PavsGOXxbvYGtMOEfnId0SVNsgehXh1DxUdVPLoxd5mvcEtvmKs2Mmf0Mpa1ZA==", + "license": "MIT" }, "node_modules/parse-bmfont-binary": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/parse-bmfont-binary/-/parse-bmfont-binary-1.0.6.tgz", - "integrity": "sha512-GxmsRea0wdGdYthjuUeWTMWPqm2+FAd4GI8vCvhgJsFnoGhTrLhXDDupwTo7rXVAgaLIGoVHDZS9p/5XbSqeWA==" + "integrity": "sha512-GxmsRea0wdGdYthjuUeWTMWPqm2+FAd4GI8vCvhgJsFnoGhTrLhXDDupwTo7rXVAgaLIGoVHDZS9p/5XbSqeWA==", + "license": "MIT" }, "node_modules/parse-bmfont-xml": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/parse-bmfont-xml/-/parse-bmfont-xml-1.1.6.tgz", "integrity": "sha512-0cEliVMZEhrFDwMh4SxIyVJpqYoOWDJ9P895tFuS+XuNzI5UBmBk5U5O4KuJdTnZpSBI4LFA2+ZiJaiwfSwlMA==", + "license": "MIT", "dependencies": { "xml-parse-from-string": "^1.0.0", "xml2js": "^0.5.0" @@ -25331,6 +25380,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-4.1.0.tgz", "integrity": "sha512-ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg==", + "license": "MIT", "engines": { "node": ">=8" }, @@ -25392,6 +25442,7 @@ "version": "5.3.0", "resolved": "https://registry.npmjs.org/pixelmatch/-/pixelmatch-5.3.0.tgz", "integrity": "sha512-o8mkY4E/+LNUf6LzX96ht6k6CEDi65k9G2rjMtBe9Oo+VPKSvl+0GKHuH/AlG+GA5LPG/i5hrekkxUc3s2HU+Q==", + "license": "ISC", "dependencies": { "pngjs": "^6.0.0" }, @@ -25403,6 +25454,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-6.0.0.tgz", "integrity": "sha512-TRzzuFRRmEoSW/p1KVAmiOgPco2Irlah+bGFCeNfJXxxYGwSw7YwAOAcd7X28K/m5bjBWKsC29KyoMfHbypayg==", + "license": "MIT", "engines": { "node": ">=12.13.0" } @@ -25588,6 +25640,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-7.0.0.tgz", "integrity": "sha512-LKWqWJRhstyYo9pGvgor/ivk2w94eSjE3RGVuzLGlr3NmD8bf7RcYGze1mNdEHRP6TRP6rMuDHk5t44hnTRyow==", + "license": "MIT", "engines": { "node": ">=14.19.0" } @@ -26202,6 +26255,7 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz", "integrity": "sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw==", + "license": "MIT", "dependencies": { "readable-stream": "^3.6.0" }, @@ -26217,6 +26271,7 @@ "version": "3.6.2", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "license": "MIT", "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -27551,6 +27606,7 @@ "version": "1.2.2", "resolved": "https://registry.npmjs.org/simple-xml-to-json/-/simple-xml-to-json-1.2.2.tgz", "integrity": "sha512-bmJJf5YiYL60eOQk3gaVxbM6vgYuwrFydCEAA2x3jccHUTsAffiPyblS/yQGr8GDUQVxSDm3WwLNL5HmRqDUcg==", + "license": "MIT", "engines": { "node": ">=14.20.0" } @@ -28305,6 +28361,7 @@ "version": "6.3.0", "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-6.3.0.tgz", "integrity": "sha512-fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw==", + "license": "MIT", "dependencies": { "@tokenizer/token": "^0.3.0", "peek-readable": "^4.1.0" @@ -28885,7 +28942,8 @@ "node_modules/tinycolor2": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.6.0.tgz", - "integrity": "sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw==" + "integrity": "sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw==", + "license": "MIT" }, "node_modules/tmp": { "version": "0.2.3", @@ -28933,6 +28991,7 @@ "version": "4.2.1", "resolved": "https://registry.npmjs.org/token-types/-/token-types-4.2.1.tgz", "integrity": "sha512-6udB24Q737UD/SDsKAHI9FCRP7Bqc9D/MQUV02ORQg5iskjtLJlZJNdN4kKtcdtwCeWIwIHDGaUsTsCCAa8sFQ==", + "license": "MIT", "dependencies": { "@tokenizer/token": "^0.3.0", "ieee754": "^1.2.1" @@ -29557,6 +29616,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/utif2/-/utif2-4.1.0.tgz", "integrity": "sha512-+oknB9FHrJ7oW7A2WZYajOcv4FcDR4CfoGB0dPNfxbi4GO05RRnFmt5oa23+9w32EanrYcSJWspUiJkLMs+37w==", + "license": "MIT", "dependencies": { "pako": "^1.0.11" } @@ -30964,7 +31024,8 @@ "node_modules/xml-parse-from-string": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/xml-parse-from-string/-/xml-parse-from-string-1.0.1.tgz", - "integrity": "sha512-ErcKwJTF54uRzzNMXq2X5sMIy88zJvfN2DmdoQvy7PAFJ+tPRU6ydWuOKNMyfmOjdyBQTFREi60s0Y0SyI0G0g==" + "integrity": "sha512-ErcKwJTF54uRzzNMXq2X5sMIy88zJvfN2DmdoQvy7PAFJ+tPRU6ydWuOKNMyfmOjdyBQTFREi60s0Y0SyI0G0g==", + "license": "MIT" }, "node_modules/xml-writer": { "version": "1.7.0", @@ -30978,6 +31039,7 @@ "version": "0.5.0", "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz", "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==", + "license": "MIT", "dependencies": { "sax": ">=0.6.0", "xmlbuilder": "~11.0.0" @@ -30990,6 +31052,7 @@ "version": "11.0.1", "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz", "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==", + "license": "MIT", "engines": { "node": ">=4.0" } @@ -31210,6 +31273,7 @@ "version": "3.23.8", "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz", "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==", + "license": "MIT", "funding": { "url": "https://github.com/sponsors/colinhacks" } @@ -31258,26 +31322,18 @@ "zone.js": "~0.14.7" } }, - "projects/aas-portal/node_modules/@xmldom/xmldom": { - "version": "0.8.10", - "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz", - "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==", - "engines": { - "node": ">=10.0.0" - } - }, "projects/aas-server": { "version": "3.0.0", "license": "Apache 2.0", "dependencies": { "@babel/polyfill": "^7.4.4", - "@xmldom/xmldom": "^0.9.2", + "@xmldom/xmldom": "^0.8.10", "bcryptjs": "^2.4.3", "chalk": "^2.4.1", "cors": "^2.8.5", "express": "^4.19.2", "form-data": "^4.0.0", - "jimp": "^1.3.0", + "jimp": "^1.4.0", "jsonwebtoken": "^9.0.2", "jszip": "^3.10.1", "lodash-es": "^4.17.21", diff --git a/package.json b/package.json index 65405efe..a9dc70ee 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "@ngx-translate/core": "^15.0.0", "@ngx-translate/http-loader": "^8.0.0", "@popperjs/core": "^2.11.8", - "@xmldom/xmldom": "^0.9.2", + "@xmldom/xmldom": "^0.8.10", "aas-core": "projects/aas-core", "bcryptjs": "^2.4.3", "bootstrap": "^5.3.3", @@ -62,7 +62,7 @@ "cors": "^2.8.5", "express": "^4.19.2", "form-data": "^4.0.0", - "jimp": "^1.3.0", + "jimp": "^1.4.0", "jsonwebtoken": "^9.0.2", "jszip": "^3.10.1", "jwt-decode": "^4.0.0", diff --git a/projects/aas-server/package.json b/projects/aas-server/package.json index fd8cad34..683b53d3 100644 --- a/projects/aas-server/package.json +++ b/projects/aas-server/package.json @@ -21,13 +21,13 @@ }, "dependencies": { "@babel/polyfill": "^7.4.4", - "@xmldom/xmldom": "^0.9.2", + "@xmldom/xmldom": "^0.8.10", "bcryptjs": "^2.4.3", "chalk": "^2.4.1", "cors": "^2.8.5", "express": "^4.19.2", "form-data": "^4.0.0", - "jimp": "^1.3.0", + "jimp": "^1.4.0", "jsonwebtoken": "^9.0.2", "jszip": "^3.10.1", "lodash-es": "^4.17.21", diff --git a/projects/aas-server/src/app/aas-provider/aas-provider.ts b/projects/aas-server/src/app/aas-provider/aas-provider.ts index 8c201ea0..8f5c273d 100644 --- a/projects/aas-server/src/app/aas-provider/aas-provider.ts +++ b/projects/aas-server/src/app/aas-provider/aas-provider.ts @@ -8,7 +8,7 @@ import { inject, singleton } from 'tsyringe'; import { extname } from 'path/posix'; -import Jimp from 'jimp'; +import { Jimp } from 'jimp'; import { Readable } from 'stream'; import { AASDocument, @@ -179,7 +179,7 @@ export class AASProvider { } if (extension === '.tiff' || extension === '.tif') { - stream = await ImageProcessing.convertAsync(stream, Jimp.MIME_PNG); + stream = await ImageProcessing.convertAsync(stream); } } } else if (dataElement.modelType === 'Blob') { diff --git a/projects/aas-server/src/app/image-processing.ts b/projects/aas-server/src/app/image-processing.ts index 5ceea155..1e69f4f6 100644 --- a/projects/aas-server/src/app/image-processing.ts +++ b/projects/aas-server/src/app/image-processing.ts @@ -6,7 +6,7 @@ * *****************************************************************************/ -import jimp from 'jimp'; +import { Jimp } from 'jimp'; import { Duplex } from 'stream'; export class ImageProcessing { @@ -40,9 +40,9 @@ export class ImageProcessing { source.resume(); }); - const image = await jimp.read(buffer); - await image.resize(width || jimp.AUTO, height || jimp.AUTO); - const outBuffer = await image.getBufferAsync(jimp.MIME_PNG); + const image = await Jimp.fromBuffer(buffer); + await image.resize({ w: width !== undefined ? width : 0, h: height !== undefined ? height : 0 }); + const outBuffer = await image.getBuffer('image/png'); const stream = new Duplex(); stream.push(outBuffer); @@ -51,12 +51,11 @@ export class ImageProcessing { } /** - * Converts the specified source image to the specified mime-type. + * Converts the specified source image to an PNG. * @param source The source image. - * @param mimeType The target mime-type. * @returns The converted image. */ - public static async convertAsync(source: NodeJS.ReadableStream, mimeType: string): Promise { + public static async convertAsync(source: NodeJS.ReadableStream): Promise { const buffer: Buffer = await new Promise((resolve, reject) => { const buffers: Uint8Array[] = []; source.on('data', function (buffer: Uint8Array) { @@ -74,8 +73,8 @@ export class ImageProcessing { source.resume(); }); - const image = await jimp.read(buffer); - const outBuffer = await image.getBufferAsync(mimeType); + const image = await Jimp.fromBuffer(buffer); + const outBuffer = await image.getBuffer('image/png'); const stream = new Duplex(); stream.push(outBuffer); stream.push(null); diff --git a/projects/aas-server/src/test/image-processing.spec.ts b/projects/aas-server/src/test/image-processing.spec.ts index eec0b7c5..4a7efa6d 100644 --- a/projects/aas-server/src/test/image-processing.spec.ts +++ b/projects/aas-server/src/test/image-processing.spec.ts @@ -8,7 +8,6 @@ import { describe, it, expect } from '@jest/globals'; import fs from 'fs'; -import Jimp from 'jimp'; import { ImageProcessing } from '../app/image-processing.js'; describe('image processing', function () { @@ -20,7 +19,7 @@ describe('image processing', function () { it('converts a tiff-image to a png-image', async () => { const source = fs.createReadStream('./src/test/assets/image.tiff'); - const stream = await ImageProcessing.convertAsync(source, Jimp.MIME_PNG); + const stream = await ImageProcessing.convertAsync(source); expect(stream).toBeTruthy(); }); });