Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser

2023-04-17 09:00:52 +02:00 · 2023-04-17 09:00:52 +02:00 · 3ee29553b4
parent 02c573bd23 610f51aaf8
commit 3ee29553b4
8 changed files with 185 additions and 645 deletions
--- a/back/methods/image/upload.js
+++ b/back/methods/image/upload.js
@ -1,7 +1,6 @@
 const UserError = require('vn-loopback/util/user-error');
-const fs = require('fs-extra');
+const fs = require('fs/promises');
 const path = require('path');
-const uuid = require('uuid');

 module.exports = Self => {
    Self.remoteMethodCtx('upload', {
@ -36,7 +35,7 @@ module.exports = Self => {
        const fileOptions = {};
        const args = ctx.args;

-        let srcFile;
+        let tempFilePath;
        try {
            const hasWriteRole = await models.ImageCollection.hasWriteRole(ctx, args.collection);
            if (!hasWriteRole)
@ -53,15 +52,20 @@ module.exports = Self => {
            });

            const file = await TempContainer.getFile(tempContainer.name, uploadedFile.name);
-            srcFile = path.join(file.client.root, file.container, file.name);
+            tempFilePath = path.join(file.client.root, file.container, file.name);

-            const fileName = `${uuid.v4()}.png`;
-            await models.Image.registerImage(args.collection, srcFile, fileName, args.id);
-        } catch (e) {
-            if (fs.existsSync(srcFile))
-                await fs.unlink(srcFile);
+            const fileName = `${args.id}.png`;

-            throw e;
+            await models.Image.resize({
+                collectionName: args.collection,
+                srcFile: tempFilePath,
+                fileName: fileName,
+                entityId: args.id
+            });
+        } finally {
+            try {
+                await fs.unlink(tempFilePath);
+            } catch (error) { }
        }
    };
 };
--- a/back/models/image.js
+++ b/back/models/image.js
@ -1,161 +1,110 @@
 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');
+const gm = require('gm');

 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) => {
+    Self.resize = async function({collectionName, srcFile, fileName, entityId}) {
        const models = Self.app.models;
-        const tx = await Self.beginTransaction({});
-        const myOptions = {transaction: tx};

-        try {
-            const collection = await models.ImageCollection.findOne({
+        const collection = await models.ImageCollection.findOne(
+            {
                fields: [
                    'id',
-                    'name',
                    'maxWidth',
                    'maxHeight',
                    'model',
-                    'property'
+                    'property',
                ],
                where: {name: collectionName},
                include: {
                    relation: 'sizes',
                    scope: {
-                        fields: ['width', 'height', 'crop']
-                    }
-                }
-            }, myOptions);
+                        fields: ['width', 'height', 'crop'],
+                    },
+                },
+            }
+        );

-            const data = {
+        // Insert image row
+        await models.Image.upsertWithWhere(
+            {
                name: fileName,
                collectionFk: collectionName
-            };
-            const newImage = await Self.upsertWithWhere(data, {
+            },
+            {
                name: fileName,
                collectionFk: collectionName,
-                updated: Date.vnNow()
-            }, myOptions);
-
-            // Resizes and saves the image
-            const container = await models.ImageContainer.container(collectionName);
-            const rootPath = container.client.root;
-            const collectionDir = path.join(rootPath, collectionName);
-            const dstDir = path.join(collectionDir, 'full');
-            const dstFile = path.join(dstDir, fileName);
-
-            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
-                    },
-                    failOn: 'none'
-                };
+                updated: Date.vnNow() / 1000,
            }
+        );

-            const resizeOpts = {
-                withoutEnlargement: true,
-                fit: 'inside'
-            };
+        // Update entity image file name
+        const model = models[collection.model];
+        if (!model) throw new Error('No matching model found');

-            await fs.mkdir(dstDir, {recursive: true});
-            await sharp(imgSrc, sharpOptions)
-                .resize(collection.maxWidth, collection.maxHeight, resizeOpts)
-                .png()
-                .toFile(dstFile);
+        const entity = await model.findById(entityId);
+        if (entity) {
+            await entity.updateAttribute(
+                collection.property,
+                fileName
+            );
+        }

-            const sizes = collection.sizes();
-            for (let size of sizes) {
-                const dstDir = path.join(collectionDir, `${size.width}x${size.height}`);
-                const dstFile = path.join(dstDir, fileName);
-                const resizeOpts = {
-                    withoutEnlargement: true,
-                    fit: size.crop ? 'cover' : 'inside'
-                };
+        // Resize
+        const container = await models.ImageContainer.container(
+            collectionName
+        );
+        const rootPath = container.client.root;
+        const collectionDir = path.join(rootPath, collectionName);

-                await fs.mkdir(dstDir, {recursive: true});
-                await sharp(imgSrc, sharpOptions)
-                    .resize(size.width, size.height, resizeOpts)
-                    .png()
-                    .toFile(dstFile);
-            }
+        // To max size
+        const {maxWidth, maxHeight} = collection;
+        const fullSizePath = path.join(collectionDir, 'full');
+        const toFullSizePath = `${fullSizePath}/${fileName}`;

-            const model = models[collection.model];
+        await fs.mkdir(fullSizePath, {recursive: true});
+        await new Promise((resolve, reject) => {
+            gm(srcFile)
+                .resize(maxWidth, maxHeight, '>')
+                .setFormat('png')
+                .quality(100)
+                .write(toFullSizePath, function(err) {
+                    if (err) reject(err);
+                    if (!err) resolve();
+                });
+        });

-            if (!model)
-                throw new Error('Matching model not found');
+        // To collection sizes
+        for (const size of collection.sizes()) {
+            const {width, height} = size;

-            const item = await model.findById(entityId, null, myOptions);
-            if (item) {
-                await item.updateAttribute(
-                    collection.property,
-                    fileName,
-                    myOptions
-                );
-            }
+            const sizePath = path.join(collectionDir, `${width}x${height}`);
+            const toSizePath = `${sizePath}/${fileName}`;

-            if (fs.existsSync(srcFilePath))
-                await fs.unlink(srcFilePath);
+            await fs.mkdir(sizePath, {recursive: true});
+            await new Promise((resolve, reject) => {
+                const gmInstance = gm(srcFile);

-            await tx.commit();
+                if (size.crop) {
+                    gmInstance
+                        .resize(width, height, '^')
+                        .gravity('Center')
+                        .crop(width, height);
+                }

-            return newImage;
-        } catch (e) {
-            await tx.rollback();
-            throw e;
+                if (!size.crop) gmInstance.resize(width, height, '>');
+
+                gmInstance
+                    .setFormat('png')
+                    .quality(100)
+                    .write(toSizePath, function(err) {
+                        if (err) reject(err);
+                        if (!err) resolve();
+                    });
+            });
        }
    };
 };
--- a/db/changes/231401/00-hotfixDelivery.sql
+++ b/db/changes/231401/00-hotfixDelivery.sql
@ -0,0 +1,70 @@
+DROP TABLE IF EXISTS `vn`.`dmsRecover`;
+
+ALTER TABLE `vn`.`delivery` DROP COLUMN addressFk;
+ALTER TABLE `vn`.`delivery` DROP CONSTRAINT delivery_ticketFk_FK;
+ALTER TABLE `vn`.`delivery` DROP COLUMN ticketFk;
+ALTER TABLE `vn`.`delivery` ADD ticketFk INT DEFAULT NULL;
+ALTER TABLE `vn`.`delivery` ADD CONSTRAINT delivery_ticketFk_FK FOREIGN KEY (`ticketFk`) REFERENCES `vn`.`ticket`(`id`);
+
+DROP PROCEDURE IF EXISTS vn.route_getTickets;
+
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`route_getTickets`(vRouteFk INT)
+BEGIN
+/**
+ * Pasado un RouteFk devuelve la información
+ * de sus tickets.
+ *
+ * @param vRouteFk
+ *
+ * @select Información de los tickets
+ */
+
+    SELECT
+            t.id Id,
+            t.clientFk Client,
+            a.id Address,
+            t.packages Packages,
+            a.street AddressName,
+            a.postalCode PostalCode,
+            a.city City,
+            sub2.itemPackingTypeFk PackingType,
+            c.phone ClientPhone,
+            c.mobile ClientMobile,
+            a.phone AddressPhone,
+            a.mobile AddressMobile,
+            d.longitude Longitude,
+            d.latitude Latitude,
+            wm.mediaValue SalePersonPhone,
+            tob.Note Note,
+            t.isSigned Signed
+        FROM ticket t
+            JOIN client c ON t.clientFk = c.id
+            JOIN address a ON t.addressFk = a.id
+            LEFT JOIN delivery d ON t.id = d.ticketFk
+            LEFT JOIN workerMedia wm ON wm.workerFk = c.salesPersonFk
+            LEFT JOIN
+                (SELECT tob.description Note, t.id
+                    FROM ticketObservation tob
+                        JOIN ticket t ON tob.ticketFk = t.id
+                        JOIN observationType ot ON ot.id = tob.observationTypeFk
+                    WHERE t.routeFk = vRouteFk
+                        AND ot.code = 'delivery'
+                )tob ON tob.id = t.id
+            LEFT JOIN
+                (SELECT sub.ticketFk,
+                    CONCAT('(', GROUP_CONCAT(DISTINCT sub.itemPackingTypeFk ORDER BY sub.items DESC SEPARATOR ','), ') ') itemPackingTypeFk
+                    FROM (SELECT s.ticketFk , i.itemPackingTypeFk, COUNT(*) items
+                        FROM ticket t
+                        JOIN sale s ON s.ticketFk = t.id
+                        JOIN item i ON i.id = s.itemFk
+                        WHERE t.routeFk = vRouteFk
+                        GROUP BY t.id,i.itemPackingTypeFk)sub
+                    GROUP BY sub.ticketFk
+                ) sub2 ON sub2.ticketFk = t.id
+        WHERE t.routeFk = vRouteFk
+        GROUP BY t.id
+        ORDER BY t.priority;
+END$$
+DELIMITER ;
--- a/front/salix/components/upload-photo/index.js
+++ b/front/salix/components/upload-photo/index.js
@ -162,14 +162,8 @@ export default class UploadPhoto extends Component {
            if (!this.newPhoto.files)
                throw new Error(`Select an image`);

-            const viewportType = this.viewportSelection;
-            const output = viewportType.output;
            const options = {
                type: 'blob',
-                size: {
-                    width: output.width,
-                    height: output.height
-                }
            };
            return this.editor.result(options)
                .then(blob => this.newPhoto.blob = blob)
--- a/modules/item/back/methods/item-image-queue/download.js
+++ b/modules/item/back/methods/item-image-queue/download.js
@ -1,9 +1,7 @@
 const axios = require('axios');
-const uuid = require('uuid');
 const fs = require('fs/promises');
 const {createWriteStream} = require('fs');
 const path = require('path');
-const gm = require('gm');

 module.exports = Self => {
    Self.remoteMethod('download', {
@ -27,13 +25,9 @@ module.exports = Self => {
        const maxAttempts = 3;
        const collectionName = 'catalog';

-        const tx = await Self.beginTransaction({});
-
        let tempFilePath;
        let queueRow;
        try {
-            const myOptions = {transaction: tx};
-
            queueRow = await Self.findOne(
                {
                    fields: ['id', 'itemFk', 'url', 'attempts'],
@ -44,58 +38,14 @@ module.exports = Self => {
                        },
                    },
                    order: 'priority, attempts, updated',
-                },
-                myOptions
+                }
            );

            if (!queueRow) return;

-            const collection = await models.ImageCollection.findOne(
-                {
-                    fields: [
-                        'id',
-                        'maxWidth',
-                        'maxHeight',
-                        'model',
-                        'property',
-                    ],
-                    where: {name: collectionName},
-                    include: {
-                        relation: 'sizes',
-                        scope: {
-                            fields: ['width', 'height', 'crop'],
-                        },
-                    },
-                },
-                myOptions
-            );
-
-            const fileName = `${uuid.v4()}.png`;
+            const fileName = `${queueRow.itemFk}.png`;
            tempFilePath = path.join(tempPath, fileName);

-            // Insert image row
-            await models.Image.create(
-                {
-                    name: fileName,
-                    collectionFk: collectionName,
-                    updated: Date.vnNow(),
-                },
-                myOptions
-            );
-
-            // Update item
-            const model = models[collection.model];
-            if (!model) throw new Error('No matching model found');
-
-            const item = await model.findById(queueRow.itemFk, null, myOptions);
-            if (item) {
-                await item.updateAttribute(
-                    collection.property,
-                    fileName,
-                    myOptions
-                );
-            }
-
            // Download remote image
            const response = await axios.get(queueRow.url, {
                responseType: 'stream',
@ -108,71 +58,22 @@ module.exports = Self => {
                writeStream.on('error', error => reject(error));
            });

-            // Resize
-            const container = await models.ImageContainer.container(
-                collectionName
-            );
-            const rootPath = container.client.root;
-            const collectionDir = path.join(rootPath, collectionName);
-
-            // To max size
-            const {maxWidth, maxHeight} = collection;
-            const fullSizePath = path.join(collectionDir, 'full');
-            const toFullSizePath = `${fullSizePath}/${fileName}`;
-
-            await fs.mkdir(fullSizePath, {recursive: true});
-            await new Promise((resolve, reject) => {
-                gm(tempFilePath)
-                    .resize(maxWidth, maxHeight, '>')
-                    .setFormat('png')
-                    .write(toFullSizePath, function(err) {
-                        if (err) reject(err);
-                        if (!err) resolve();
-                    });
+            await models.Image.resize({
+                collectionName: collectionName,
+                srcFile: tempFilePath,
+                fileName: fileName,
+                entityId: queueRow.itemFk
            });

-            // To collection sizes
-            for (const size of collection.sizes()) {
-                const {width, height} = size;
-
-                const sizePath = path.join(collectionDir, `${width}x${height}`);
-                const toSizePath = `${sizePath}/${fileName}`;
-
-                await fs.mkdir(sizePath, {recursive: true});
-                await new Promise((resolve, reject) => {
-                    const gmInstance = gm(tempFilePath);
-
-                    if (size.crop) {
-                        gmInstance
-                            .resize(width, height, '^')
-                            .gravity('Center')
-                            .crop(width, height);
-                    }
-
-                    if (!size.crop) gmInstance.resize(width, height, '>');
-
-                    gmInstance
-                        .setFormat('png')
-                        .write(toSizePath, function(err) {
-                            if (err) reject(err);
-                            if (!err) resolve();
-                        });
-                });
-            }
-
            try {
                await fs.unlink(tempFilePath);
            } catch (error) { }

-            await queueRow.destroy(myOptions);
+            await queueRow.destroy();

            // Restart queue
            Self.download();
-
-            await tx.commit();
        } catch (error) {
-            await tx.rollback();
-
            if (queueRow.attempts < maxAttempts) {
                await queueRow.updateAttributes({
                    error: error,
--- a/modules/ticket/back/methods/ticket/saveSign.js
+++ b/modules/ticket/back/methods/ticket/saveSign.js
@ -34,6 +34,8 @@ module.exports = Self => {
        const models = Self.app.models;
        const myOptions = {};
        let tx;
+        let dms;
+        let gestDocCreated = false;

        if (typeof options == 'object')
            Object.assign(myOptions, options);
@ -96,11 +98,12 @@ module.exports = Self => {
                warehouseId: ticket.warehouseFk,
                companyId: ticket.companyFk,
                dmsTypeId: dmsType.id,
-                reference: id,
-                description: `Ticket ${id} Cliente ${ticket.client().name} Ruta ${ticket.route().id}`,
+                reference: '',
+                description: `Firma del cliente - Ruta ${ticket.route().id}`,
                hasFile: true
            };
-            await models.Ticket.uploadFile(ctxUploadFile, id, myOptions);
+            dms = await models.Dms.uploadFile(ctxUploadFile, myOptions);
+            gestDocCreated = true;
        }

        try {
@ -118,12 +121,16 @@ module.exports = Self => {
                    throw new UserError('This ticket cannot be signed because it has not been boxed');
                else if (!await gestDocExists(args.tickets[i])) {
                    if (args.location) setLocation(args.tickets[i]);
-                    await createGestDoc(args.tickets[i]);
+                    if (!gestDocCreated) await createGestDoc(args.tickets[i]);
+                    await models.TicketDms.create({ticketFk: args.tickets[i], dmsFk: dms[0].id}, myOptions);
+                    const ticket = await models.Ticket.findById(args.tickets[i], null, myOptions);
+                    await ticket.updateAttribute('isSigned', true, myOptions);
                    await Self.rawSql(`CALL vn.ticket_setState(?, ?)`, [args.tickets[i], 'DELIVERED'], myOptions);
                }
            }

            if (tx) await tx.commit();
+            return;
        } catch (e) {
            if (tx) await tx.rollback();
            throw e;
--- a/package-lock.json
+++ b/package-lock.json
@ -1,12 +1,12 @@
 {
    "name": "salix-back",
-    "version": "23.08.01",
+    "version": "23.12.01",
    "lockfileVersion": 2,
    "requires": true,
    "packages": {
        "": {
            "name": "salix-back",
-            "version": "23.08.01",
+            "version": "23.12.01",
            "license": "GPL-3.0",
            "dependencies": {
                "axios": "^1.2.2",
@ -41,7 +41,6 @@
                "puppeteer": "^18.0.5",
                "read-chunk": "^3.2.0",
                "require-yaml": "0.0.1",
-                "sharp": "^0.31.3",
                "smbhash": "0.0.1",
                "strong-error-handler": "^2.3.2",
                "uuid": "^3.3.3",
@ -5444,17 +5443,6 @@
                "node": ">=0.10.0"
            }
        },
-        "node_modules/color": {
-            "version": "4.2.3",
-            "license": "MIT",
-            "dependencies": {
-                "color-convert": "^2.0.1",
-                "color-string": "^1.9.0"
-            },
-            "engines": {
-                "node": ">=12.5.0"
-            }
-        },
        "node_modules/color-convert": {
            "version": "2.0.1",
            "license": "MIT",
@ -5469,14 +5457,6 @@
            "version": "1.1.4",
            "license": "MIT"
        },
-        "node_modules/color-string": {
-            "version": "1.9.1",
-            "license": "MIT",
-            "dependencies": {
-                "color-name": "^1.0.0",
-                "simple-swizzle": "^0.2.2"
-            }
-        },
        "node_modules/color-support": {
            "version": "1.1.3",
            "license": "ISC",
@ -6149,6 +6129,7 @@
        },
        "node_modules/deep-extend": {
            "version": "0.6.0",
+            "dev": true,
            "license": "MIT",
            "engines": {
                "node": ">=4.0.0"
@ -7630,13 +7611,6 @@
                "node": ">=0.10.0"
            }
        },
-        "node_modules/expand-template": {
-            "version": "2.0.3",
-            "license": "(MIT OR WTFPL)",
-            "engines": {
-                "node": ">=6"
-            }
-        },
        "node_modules/expand-tilde": {
            "version": "2.0.2",
            "dev": true,
@ -8891,10 +8865,6 @@
                "assert-plus": "^1.0.0"
            }
        },
-        "node_modules/github-from-package": {
-            "version": "0.0.0",
-            "license": "MIT"
-        },
        "node_modules/glob": {
            "version": "7.2.0",
            "license": "ISC",
@ -11516,6 +11486,7 @@
        },
        "node_modules/ini": {
            "version": "1.3.8",
+            "dev": true,
            "license": "ISC"
        },
        "node_modules/internal-ip": {
@ -11645,10 +11616,6 @@
                "url": "https://github.com/sponsors/ljharb"
            }
        },
-        "node_modules/is-arrayish": {
-            "version": "0.3.2",
-            "license": "MIT"
-        },
        "node_modules/is-bigint": {
            "version": "1.0.4",
            "dev": true,
@ -15610,10 +15577,6 @@
                "node": ">=0.10.0"
            }
        },
-        "node_modules/napi-build-utils": {
-            "version": "1.0.2",
-            "license": "MIT"
-        },
        "node_modules/natural-compare": {
            "version": "1.4.0",
            "dev": true,
@ -15655,43 +15618,6 @@
                "node": ">=4.0.0"
            }
        },
-        "node_modules/node-abi": {
-            "version": "3.28.0",
-            "license": "MIT",
-            "dependencies": {
-                "semver": "^7.3.5"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/node-abi/node_modules/lru-cache": {
-            "version": "6.0.0",
-            "license": "ISC",
-            "dependencies": {
-                "yallist": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/node-abi/node_modules/semver": {
-            "version": "7.3.8",
-            "license": "ISC",
-            "dependencies": {
-                "lru-cache": "^6.0.0"
-            },
-            "bin": {
-                "semver": "bin/semver.js"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/node-abi/node_modules/yallist": {
-            "version": "4.0.0",
-            "license": "ISC"
-        },
        "node_modules/node-addon-api": {
            "version": "5.0.0",
            "license": "MIT"
@ -17539,30 +17465,6 @@
                "node": ">=0.10.0"
            }
        },
-        "node_modules/prebuild-install": {
-            "version": "7.1.1",
-            "license": "MIT",
-            "dependencies": {
-                "detect-libc": "^2.0.0",
-                "expand-template": "^2.0.3",
-                "github-from-package": "0.0.0",
-                "minimist": "^1.2.3",
-                "mkdirp-classic": "^0.5.3",
-                "napi-build-utils": "^1.0.1",
-                "node-abi": "^3.3.0",
-                "pump": "^3.0.0",
-                "rc": "^1.2.7",
-                "simple-get": "^4.0.0",
-                "tar-fs": "^2.0.0",
-                "tunnel-agent": "^0.6.0"
-            },
-            "bin": {
-                "prebuild-install": "bin.js"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
        "node_modules/precond": {
            "version": "0.2.3",
            "engines": {
@ -18057,6 +17959,7 @@
        },
        "node_modules/rc": {
            "version": "1.2.8",
+            "dev": true,
            "license": "(BSD-2-Clause OR MIT OR Apache-2.0)",
            "dependencies": {
                "deep-extend": "^0.6.0",
@ -19786,55 +19689,6 @@
                "node": ">=8"
            }
        },
-        "node_modules/sharp": {
-            "version": "0.31.3",
-            "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.31.3.tgz",
-            "integrity": "sha512-XcR4+FCLBFKw1bdB+GEhnUNXNXvnt0tDo4WsBsraKymuo/IAuPuCBVAL2wIkUw2r/dwFW5Q5+g66Kwl2dgDFVg==",
-            "hasInstallScript": true,
-            "dependencies": {
-                "color": "^4.2.3",
-                "detect-libc": "^2.0.1",
-                "node-addon-api": "^5.0.0",
-                "prebuild-install": "^7.1.1",
-                "semver": "^7.3.8",
-                "simple-get": "^4.0.1",
-                "tar-fs": "^2.1.1",
-                "tunnel-agent": "^0.6.0"
-            },
-            "engines": {
-                "node": ">=14.15.0"
-            },
-            "funding": {
-                "url": "https://opencollective.com/libvips"
-            }
-        },
-        "node_modules/sharp/node_modules/lru-cache": {
-            "version": "6.0.0",
-            "license": "ISC",
-            "dependencies": {
-                "yallist": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/sharp/node_modules/semver": {
-            "version": "7.3.8",
-            "license": "ISC",
-            "dependencies": {
-                "lru-cache": "^6.0.0"
-            },
-            "bin": {
-                "semver": "bin/semver.js"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/sharp/node_modules/yallist": {
-            "version": "4.0.0",
-            "license": "ISC"
-        },
        "node_modules/shebang-command": {
            "version": "2.0.0",
            "license": "MIT",
@ -19893,77 +19747,6 @@
            "version": "3.0.7",
            "license": "ISC"
        },
-        "node_modules/simple-concat": {
-            "version": "1.0.1",
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ],
-            "license": "MIT"
-        },
-        "node_modules/simple-get": {
-            "version": "4.0.1",
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ],
-            "license": "MIT",
-            "dependencies": {
-                "decompress-response": "^6.0.0",
-                "once": "^1.3.1",
-                "simple-concat": "^1.0.0"
-            }
-        },
-        "node_modules/simple-get/node_modules/decompress-response": {
-            "version": "6.0.0",
-            "license": "MIT",
-            "dependencies": {
-                "mimic-response": "^3.1.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/simple-get/node_modules/mimic-response": {
-            "version": "3.1.0",
-            "license": "MIT",
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/simple-swizzle": {
-            "version": "0.2.2",
-            "license": "MIT",
-            "dependencies": {
-                "is-arrayish": "^0.3.1"
-            }
-        },
        "node_modules/simple-update-notifier": {
            "version": "1.0.7",
            "dev": true,
@ -20864,6 +20647,7 @@
        },
        "node_modules/strip-json-comments": {
            "version": "2.0.1",
+            "dev": true,
            "license": "MIT",
            "engines": {
                "node": ">=0.10.0"
@ -30660,15 +30444,6 @@
                "object-visit": "^1.0.0"
            }
        },
-        "color": {
-            "version": "4.2.3",
-            "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz",
-            "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==",
-            "requires": {
-                "color-convert": "^2.0.1",
-                "color-string": "^1.9.0"
-            }
-        },
        "color-convert": {
            "version": "2.0.1",
            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@ -30682,15 +30457,6 @@
            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
        },
-        "color-string": {
-            "version": "1.9.1",
-            "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz",
-            "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==",
-            "requires": {
-                "color-name": "^1.0.0",
-                "simple-swizzle": "^0.2.2"
-            }
-        },
        "color-support": {
            "version": "1.1.3",
            "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
@ -31255,8 +31021,7 @@
        },
        "deep-extend": {
            "version": "0.6.0",
-            "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-            "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="
+            "dev": true
        },
        "deep-is": {
            "version": "0.1.4",
@ -32519,11 +32284,6 @@
                }
            }
        },
-        "expand-template": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
-            "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="
-        },
        "expand-tilde": {
            "version": "2.0.2",
            "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
@ -33579,11 +33339,6 @@
                "assert-plus": "^1.0.0"
            }
        },
-        "github-from-package": {
-            "version": "0.0.0",
-            "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
-            "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw=="
-        },
        "glob": {
            "version": "7.2.0",
            "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
@ -35862,8 +35617,7 @@
        },
        "ini": {
            "version": "1.3.8",
-            "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-            "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
+            "dev": true
        },
        "internal-ip": {
            "version": "4.3.0",
@ -35955,11 +35709,6 @@
                "has-tostringtag": "^1.0.0"
            }
        },
-        "is-arrayish": {
-            "version": "0.3.2",
-            "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
-            "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
-        },
        "is-bigint": {
            "version": "1.0.4",
            "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
@ -39322,11 +39071,6 @@
                "to-regex": "^3.0.1"
            }
        },
-        "napi-build-utils": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
-            "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="
-        },
        "natural-compare": {
            "version": "1.4.0",
            "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@ -39365,37 +39109,6 @@
            "resolved": "https://registry.npmjs.org/nocache/-/nocache-2.1.0.tgz",
            "integrity": "sha512-0L9FvHG3nfnnmaEQPjT9xhfN4ISk0A8/2j4M37Np4mcDesJjHgEUfgPhdCyZuFI954tjokaIj/A3NdpFNdEh4Q=="
        },
-        "node-abi": {
-            "version": "3.28.0",
-            "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.28.0.tgz",
-            "integrity": "sha512-fRlDb4I0eLcQeUvGq7IY3xHrSb0c9ummdvDSYWfT9+LKP+3jCKw/tKoqaM7r1BAoiAC6GtwyjaGnOz6B3OtF+A==",
-            "requires": {
-                "semver": "^7.3.5"
-            },
-            "dependencies": {
-                "lru-cache": {
-                    "version": "6.0.0",
-                    "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-                    "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-                    "requires": {
-                        "yallist": "^4.0.0"
-                    }
-                },
-                "semver": {
-                    "version": "7.3.8",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-                    "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-                    "requires": {
-                        "lru-cache": "^6.0.0"
-                    }
-                },
-                "yallist": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-                    "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-                }
-            }
-        },
        "node-addon-api": {
            "version": "5.0.0",
            "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.0.0.tgz",
@ -40879,25 +40592,6 @@
            "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
            "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
        },
-        "prebuild-install": {
-            "version": "7.1.1",
-            "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz",
-            "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==",
-            "requires": {
-                "detect-libc": "^2.0.0",
-                "expand-template": "^2.0.3",
-                "github-from-package": "0.0.0",
-                "minimist": "^1.2.3",
-                "mkdirp-classic": "^0.5.3",
-                "napi-build-utils": "^1.0.1",
-                "node-abi": "^3.3.0",
-                "pump": "^3.0.0",
-                "rc": "^1.2.7",
-                "simple-get": "^4.0.0",
-                "tar-fs": "^2.0.0",
-                "tunnel-agent": "^0.6.0"
-            }
-        },
        "precond": {
            "version": "0.2.3",
            "resolved": "https://registry.npmjs.org/precond/-/precond-0.2.3.tgz",
@ -41314,8 +41008,7 @@
        },
        "rc": {
            "version": "1.2.8",
-            "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-            "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+            "dev": true,
            "requires": {
                "deep-extend": "^0.6.0",
                "ini": "~1.3.0",
@ -42726,44 +42419,6 @@
                "kind-of": "^6.0.2"
            }
        },
-        "sharp": {
-            "version": "0.31.3",
-            "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.31.3.tgz",
-            "integrity": "sha512-XcR4+FCLBFKw1bdB+GEhnUNXNXvnt0tDo4WsBsraKymuo/IAuPuCBVAL2wIkUw2r/dwFW5Q5+g66Kwl2dgDFVg==",
-            "requires": {
-                "color": "^4.2.3",
-                "detect-libc": "^2.0.1",
-                "node-addon-api": "^5.0.0",
-                "prebuild-install": "^7.1.1",
-                "semver": "^7.3.8",
-                "simple-get": "^4.0.1",
-                "tar-fs": "^2.1.1",
-                "tunnel-agent": "^0.6.0"
-            },
-            "dependencies": {
-                "lru-cache": {
-                    "version": "6.0.0",
-                    "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-                    "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-                    "requires": {
-                        "yallist": "^4.0.0"
-                    }
-                },
-                "semver": {
-                    "version": "7.3.8",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-                    "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-                    "requires": {
-                        "lru-cache": "^6.0.0"
-                    }
-                },
-                "yallist": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-                    "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-                }
-            }
-        },
        "shebang-command": {
            "version": "2.0.0",
            "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@ -42820,44 +42475,6 @@
            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
            "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
        },
-        "simple-concat": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
-            "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="
-        },
-        "simple-get": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz",
-            "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==",
-            "requires": {
-                "decompress-response": "^6.0.0",
-                "once": "^1.3.1",
-                "simple-concat": "^1.0.0"
-            },
-            "dependencies": {
-                "decompress-response": {
-                    "version": "6.0.0",
-                    "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
-                    "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
-                    "requires": {
-                        "mimic-response": "^3.1.0"
-                    }
-                },
-                "mimic-response": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
-                    "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ=="
-                }
-            }
-        },
-        "simple-swizzle": {
-            "version": "0.2.2",
-            "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-            "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==",
-            "requires": {
-                "is-arrayish": "^0.3.1"
-            }
-        },
        "simple-update-notifier": {
            "version": "1.0.7",
            "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz",
@ -43626,8 +43243,7 @@
        },
        "strip-json-comments": {
            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-            "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+            "dev": true
        },
        "strong-error-handler": {
            "version": "2.3.2",
--- a/package.json
+++ b/package.json
@ -44,7 +44,6 @@
        "puppeteer": "^18.0.5",
        "read-chunk": "^3.2.0",
        "require-yaml": "0.0.1",
-        "sharp": "^0.31.3",
        "smbhash": "0.0.1",
        "strong-error-handler": "^2.3.2",
        "uuid": "^3.3.3",