@browserless/screenshot 10.9.7 → 10.9.8

package/package.json

@@ -2,7 +2,7 @@
   "name": "@browserless/screenshot",
   "description": "Take a clean screenshot of any website",
   "homepage": "https://browserless.js.org/#/?id=screenshoturl-options",
-  "version": "10.9.7",
+  "version": "10.9.8",
   "main": "src/index.js",
   "author": {
     "email": "hello@microlink.io",
@@ -28,7 +28,7 @@
     "screenshot"
   ],
   "dependencies": {
-    "@browserless/goto": "^10.9.7",
+    "@browserless/goto": "^10.9.8",
     "@kikobeats/content-type": "~1.0.1",
     "@kikobeats/time-span": "~1.0.9",
     "debug-logfmt": "~1.4.5",
@@ -46,7 +46,7 @@
     "svg-gradient": "~1.0.3"
   },
   "devDependencies": {
-    "@browserless/test": "^10.9.7",
+    "@browserless/test": "^10.9.8",
     "ava": "5",
     "cheerio": "latest"
   },
@@ -67,5 +67,5 @@
     "timeout": "2m",
     "workerThreads": false
   },
-  "gitHead": "1134ac8b6f7a110e4020042f1b8054af845bdb00"
+  "gitHead": "e468dda7fc284d02c2d2eb494e907b1111c7964e"
 }

package/src/is-white-screenshot.js

@@ -3,20 +3,30 @@
 const { Jimp } = require('jimp')
 
 module.exports = async uint8array => {
-  const image = await Jimp.fromBuffer(Buffer.from(uint8array))
-  const firstPixel = image.getPixelColor(0, 0)
-  const height = image.bitmap.height
-  const width = image.bitmap.width
+  try {
+    const image = await Jimp.fromBuffer(Buffer.from(uint8array))
+    const firstPixel = image.getPixelColor(0, 0)
+    const height = image.bitmap.height
+    const width = image.bitmap.width
 
-  const samplePercentage = 0.25 // Sample 25% of the image
-  const sampleSize = Math.floor(width * height * samplePercentage) // Calculate sample size based on percentage
-  const stepSize = Math.max(1, Math.floor((width * height) / sampleSize)) // Calculate step size based on sample size
+    // For 2D grid sampling, calculate stepSize to achieve approximately the target sample percentage.
+    // When sampling every 'stepSize' pixels in both dimensions, actual samples = (height/stepSize) * (width/stepSize).
+    // To achieve samplePercentage, we need: (h*w)/(stepSize²) ≈ samplePercentage*(h*w)
+    // Therefore: stepSize ≈ sqrt(1 / samplePercentage)
+    const samplePercentage = 0.25 // Sample ~25% of the image
+    const stepSize = Math.max(1, Math.ceil(Math.sqrt(1 / samplePercentage)))
 
-  for (let i = 0; i < height; i += stepSize) {
-    for (let j = 0; j < width; j += stepSize) {
-      if (firstPixel !== image.getPixelColor(j, i)) return false
+    for (let i = 0; i < height; i += stepSize) {
+      for (let j = 0; j < width; j += stepSize) {
+        if (firstPixel !== image.getPixelColor(j, i)) return false
+      }
     }
-  }
 
-  return true
+    return true
+  } catch (error) {
+    if (error.message.includes('maxMemoryUsageInMB')) {
+      return false
+    }
+    throw error
+  }
 }