From b97caabc3597638ec1fc336840e3fff8a9eadee1 Mon Sep 17 00:00:00 2001 From: si458 Date: Mon, 19 May 2025 11:08:09 +0100 Subject: [PATCH] upgrade image-size to 2.0.2 Signed-off-by: si458 --- mcrec.js | 2 +- meshcentral.js | 4 ++-- meshdesktopmultiplex.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mcrec.js b/mcrec.js index 43966b88..67612278 100644 --- a/mcrec.js +++ b/mcrec.js @@ -121,7 +121,7 @@ function processBlock(state, block, err) { case 3: // Tile var x = block.data.readUInt16BE(4); var y = block.data.readUInt16BE(6); - var dimensions = require('image-size')(block.data.slice(8)); + var dimensions = require('image-size').imageSize(block.data.slice(8)); //log("Tile", x, y, dimensions.width, dimensions.height, block.ptr); //console.log(elapseSeconds); diff --git a/meshcentral.js b/meshcentral.js index 2238a182..bfad20b0 100644 --- a/meshcentral.js +++ b/meshcentral.js @@ -4294,7 +4294,7 @@ function mainStart() { if (passport != null) { modules.push(...passport); } if (captcha == true) { modules.push('svg-captcha@1.4.0'); } - if (sessionRecording == true) { modules.push('image-size@1.2.1'); } // Need to get the remote desktop JPEG sizes to index the recodring file. + if (sessionRecording == true) { modules.push('image-size@2.0.2'); } // Need to get the remote desktop JPEG sizes to index the recording file. if (config.letsencrypt != null) { modules.push('acme-client@4.2.5'); } // Add acme-client module. We need to force v4.2.4 or higher since olver versions using SHA-1 which is no longer supported by Let's Encrypt. if (config.settings.mqtt != null) { modules.push('aedes@0.39.0'); } // Add MQTT Modules if (config.settings.mysql != null) { modules.push('mysql2@3.11.4'); } // Add MySQL. @@ -4338,7 +4338,7 @@ function mainStart() { } // Desktop multiplexor support - if (config.settings.desktopmultiplex === true) { modules.push('image-size@1.2.1'); } + if (config.settings.desktopmultiplex === true) { modules.push('image-size@2.0.2'); } // SMS support if (config.sms != null) { diff --git a/meshdesktopmultiplex.js b/meshdesktopmultiplex.js index 9b6d1e19..61384fff 100644 --- a/meshdesktopmultiplex.js +++ b/meshdesktopmultiplex.js @@ -697,7 +697,7 @@ function CreateDesktopMultiplexor(parent, domain, nodeid, id, func) { case 3: // Tile, check dimentions and store if ((data.length < 10) || (obj.lastData == null)) break; var x = data.readUInt16BE(4), y = data.readUInt16BE(6); - var dimensions = require('image-size')(data.slice(8)); + var dimensions = require('image-size').imageSize(data.slice(8)); var sx = (x / 16), sy = (y / 16), sw = (dimensions.width / 16), sh = (dimensions.height / 16); obj.counter++;