Floramondo image download fixes

back/models/image.js

@@ -1,11 +1,51 @@
 const fs = require('fs-extra');
 const sharp = require('sharp');
 const path = require('path');
+const readChunk = require('read-chunk');
+const imageType = require('image-type');
+const bmp = require('bmp-js');
 
 module.exports = Self => {
     require('../methods/image/download')(Self);
     require('../methods/image/upload')(Self);
 
+    // Function extracted from jimp package (utils)
+    function scan(image, x, y, w, h, f) {
+        // round input
+        x = Math.round(x);
+        y = Math.round(y);
+        w = Math.round(w);
+        h = Math.round(h);
+
+        for (let _y = y; _y < y + h; _y++) {
+            for (let _x = x; _x < x + w; _x++) {
+                const idx = (image.bitmap.width * _y + _x) << 2;
+                f.call(image, _x, _y, idx);
+            }
+        }
+
+        return image;
+    }
+
+    // Function extracted from jimp package (type-bmp)
+    function fromAGBR(bitmap) {
+        return scan({bitmap}, 0, 0, bitmap.width, bitmap.height, function(
+            x,
+            y,
+            index
+        ) {
+            const alpha = this.bitmap.data[index + 0];
+            const blue = this.bitmap.data[index + 1];
+            const green = this.bitmap.data[index + 2];
+            const red = this.bitmap.data[index + 3];
+
+            this.bitmap.data[index + 0] = red;
+            this.bitmap.data[index + 1] = green;
+            this.bitmap.data[index + 2] = blue;
+            this.bitmap.data[index + 3] = bitmap.is_with_alpha ? alpha : 0xff;
+        }).bitmap;
+    }
+
     Self.registerImage = async(collectionName, srcFilePath, fileName, entityId) => {
         const models = Self.app.models;
         const tx = await Self.beginTransaction({});
@@ -48,13 +88,31 @@ module.exports = Self => {
             const dstDir = path.join(collectionDir, 'full');
             const dstFile = path.join(dstDir, file);
 
+            const buffer = readChunk.sync(srcFilePath, 0, 12);
+            const type = imageType(buffer);
+
+            let sharpOptions;
+            let imgSrc = srcFilePath;
+            if (type.mime == 'image/bmp') {
+                const bmpBuffer = fs.readFileSync(srcFilePath);
+                const bmpData = fromAGBR(bmp.decode(bmpBuffer));
+                imgSrc = bmpData.data;
+                sharpOptions = {
+                    raw: {
+                        width: bmpData.width,
+                        height: bmpData.height,
+                        channels: 4
+                    }
+                };
+            }
+
             const resizeOpts = {
                 withoutEnlargement: true,
                 fit: 'inside'
             };
 
             await fs.mkdir(dstDir, {recursive: true});
-            await sharp(srcFilePath)
+            await sharp(imgSrc, sharpOptions)
                 .resize(collection.maxWidth, collection.maxHeight, resizeOpts)
                 .png()
                 .toFile(dstFile);
@@ -69,7 +127,7 @@ module.exports = Self => {
                 };
 
                 await fs.mkdir(dstDir, {recursive: true});
-                await sharp(srcFilePath)
+                await sharp(imgSrc, sharpOptions)
                     .resize(size.width, size.height, resizeOpts)
                     .png()
                     .toFile(dstFile);

modules/item/back/methods/item-image-queue/downloadImages.js

@@ -46,8 +46,8 @@ module.exports = Self => {
 
             if (!image) return;
 
-            const srcFile = image.url.split('/').pop();
-            const fileName = srcFile.replace(/\./g, '');
+            const srcFile = image.url;
+            const fileName = srcFile.replace(/\.|\/|:/g, '');
             const file = `${fileName}.png`;
             const filePath = path.join(tempPath, file);
 

package-lock.json

@@ -6996,6 +6996,11 @@
             "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
             "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w=="
         },
+        "bmp-js": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/bmp-js/-/bmp-js-0.1.0.tgz",
+            "integrity": "sha1-4Fpj95amwf8l9Hcex62twUjAcjM="
+        },
         "bn.js": {
             "version": "4.11.8",
             "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
@@ -10041,6 +10046,11 @@
                 }
             }
         },
+        "file-type": {
+            "version": "10.11.0",
+            "resolved": "https://registry.npmjs.org/file-type/-/file-type-10.11.0.tgz",
+            "integrity": "sha512-uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw=="
+        },
         "filed-mimefix": {
             "version": "0.1.3",
             "resolved": "https://registry.npmjs.org/filed-mimefix/-/filed-mimefix-0.1.3.tgz",
@@ -12985,6 +12995,14 @@
             "integrity": "sha1-SMptcvbGo68Aqa1K5odr44ieKwk=",
             "dev": true
         },
+        "image-type": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/image-type/-/image-type-4.1.0.tgz",
+            "integrity": "sha512-CFJMJ8QK8lJvRlTCEgarL4ro6hfDQKif2HjSvYCdQZESaIPV4v9imrf7BQHK+sQeTeNeMpWciR9hyC/g8ybXEg==",
+            "requires": {
+                "file-type": "^10.10.0"
+            }
+        },
         "imap": {
             "version": "0.8.19",
             "resolved": "https://registry.npmjs.org/imap/-/imap-0.8.19.tgz",
@@ -21219,8 +21237,7 @@
         "p-try": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-            "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-            "dev": true
+            "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
         },
         "package-json": {
             "version": "4.0.1",
@@ -22141,6 +22158,15 @@
             "integrity": "sha512-tJBzzzIgnnRfEm046qRcURvwQnZVXmuCbscxUO5RWrGTXpon2d4c8mI0D8WE6ydVIm29JiLB6+RslkIvym9Rjw==",
             "dev": true
         },
+        "read-chunk": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/read-chunk/-/read-chunk-3.2.0.tgz",
+            "integrity": "sha512-CEjy9LCzhmD7nUpJ1oVOE6s/hBkejlcJEgLQHVnQznOSilOPb+kpKktlLfFDK3/WP43+F80xkUTM2VOkYoSYvQ==",
+            "requires": {
+                "pify": "^4.0.1",
+                "with-open-file": "^0.1.6"
+            }
+        },
         "read-pkg": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
@@ -26651,6 +26677,16 @@
                 "string-width": "^2.1.1"
             }
         },
+        "with-open-file": {
+            "version": "0.1.7",
+            "resolved": "https://registry.npmjs.org/with-open-file/-/with-open-file-0.1.7.tgz",
+            "integrity": "sha512-ecJS2/oHtESJ1t3ZfMI3B7KIDKyfN0O16miWxdn30zdh66Yd3LsRFebXZXq6GU4xfxLf6nVxp9kIqElb5fqczA==",
+            "requires": {
+                "p-finally": "^1.0.0",
+                "p-try": "^2.1.0",
+                "pify": "^4.0.1"
+            }
+        },
         "word-count": {
             "version": "0.2.2",
             "resolved": "https://registry.npmjs.org/word-count/-/word-count-0.2.2.tgz",

package.json

@@ -12,10 +12,12 @@
         "node": ">=12"
     },
     "dependencies": {
+        "bmp-js": "^0.1.0",
         "compression": "^1.7.3",
         "fs-extra": "^5.0.0",
         "helmet": "^3.21.2",
         "i18n": "^0.8.4",
+        "image-type": "^4.1.0",
         "imap": "^0.8.19",
         "ldapjs": "^2.2.0",
         "loopback": "^3.26.0",
@@ -30,6 +32,7 @@
         "node-ssh": "^11.0.0",
         "object-diff": "0.0.4",
         "object.pick": "^1.3.0",
+        "read-chunk": "^3.2.0",
         "request": "^2.88.0",
         "request-promise-native": "^1.0.8",
         "require-yaml": "0.0.1",