@applitools/screenshoter 3.3.22 → 3.3.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/screenshoter",
-  "version": "3.3.22",
+  "version": "3.3.25",
   "description": "Applitools universal screenshoter for web and native applications",
   "keywords": [
     "applitools",
@@ -25,6 +25,13 @@
     "name": "Applitools Team",
     "email": "team@applitools.com"
   },
+  "exports": {
+    ".": {
+      "default": "./index.js"
+    },
+    "./src/*": "./src/*",
+    "./package.json": "./package.json"
+  },
   "main": "./index.js",
   "files": [
     "src",
@@ -35,7 +42,7 @@
     "test": "yarn test:it && yarn test:e2e",
     "test:unit": "mocha ./test/unit/*.spec.js --no-timeouts",
     "test:it": "mocha ./test/it/*.spec.js --no-timeouts",
-    "test:e2e": "yarn test:e2e:web && yarn && test:e2e:android && yarn test:e2e:ios",
+    "test:e2e": "yarn test:e2e:web && yarn && yarn test:e2e:android && yarn test:e2e:ios",
     "test:e2e:web": "mocha ./test/e2e/web/*.spec.js --no-timeouts -r @applitools/test-utils/mocha-hooks/docker",
     "test:e2e:android": "APPLITOOLS_TEST_REMOTE=sauce mocha ./test/e2e/android*/*.spec.js --no-timeouts --parallel --jobs ${MOCHA_JOBS:-2}",
     "test:e2e:ios": "APPLITOOLS_TEST_REMOTE=sauce mocha ./test/e2e/ios*/*.spec.js --no-timeouts --parallel --jobs ${MOCHA_JOBS:-2}",
@@ -60,30 +67,31 @@
     }
   },
   "dependencies": {
-    "@applitools/logger": "1.1.5",
+    "@applitools/logger": "1.1.6",
     "@applitools/snippets": "2.2.3",
-    "@applitools/utils": "1.3.0",
+    "@applitools/utils": "1.3.1",
+    "jpeg-js": "0.4.3",
     "png-async": "0.9.4"
   },
   "devDependencies": {
-    "@applitools/bongo": "^2.0.3",
-    "@applitools/driver": "^1.8.12",
+    "@applitools/bongo": "^2.1.1",
+    "@applitools/driver": "^1.8.14",
     "@applitools/scripts": "1.1.0",
-    "@applitools/spec-driver-webdriverio": "1.2.9",
+    "@applitools/spec-driver-webdriverio": "1.2.10",
     "@applitools/test-utils": "1.3.2",
     "appium": "^1.22.3",
-    "chromedriver": "^95.0.0",
-    "eslint": "^7.9.0",
+    "chromedriver": "^101.0.0",
+    "eslint": "^8.16.0",
     "eslint-plugin-mocha-no-only": "^1.1.1",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.1.4",
+    "eslint-plugin-prettier": "^4.0.0",
     "husky": "^4.3.8",
-    "mocha": "^9.2.0",
-    "pixelmatch": "^5.2.1",
-    "prettier": "1.19.0",
-    "webdriverio": "^7.16.7"
+    "mocha": "^10.0.0",
+    "pixelmatch": "^5.3.0",
+    "prettier": "2.6.2",
+    "webdriverio": "^7.19.7"
   },
   "engines": {
-    "node": ">= 10.0.0"
+    "node": ">=12.13.0"
   }
 }

package/src/image.js

@@ -2,6 +2,7 @@ const fs = require('fs')
 const stream = require('stream')
 const path = require('path')
 const png = require('png-async')
+const jpeg = require('jpeg-js')
 const utils = require('@applitools/utils')
 
 function makeImage(data) {
@@ -9,16 +10,19 @@ function makeImage(data) {
   let transforms = {rotate: 0, scale: 1, crop: null, modifiers: []}
 
   if (utils.types.isBase64(data)) {
-    const buffer = Buffer.from(data, 'base64')
-    image = fromBuffer(buffer)
-    size = extractPngSize(buffer)
+    return makeImage(Buffer.from(data, 'base64'))
   } else if (utils.types.isString(data)) {
-    const buffer = fs.readFileSync(data)
-    image = fromBuffer(buffer)
-    size = extractPngSize(buffer)
+    return makeImage(fs.readFileSync(data))
   } else if (Buffer.isBuffer(data)) {
-    image = fromBuffer(data)
-    size = extractPngSize(data)
+    if (isPngBuffer(data)) {
+      image = fromPngBuffer(data)
+      size = extractPngSize(data)
+    } else if (isJpegBuffer(data)) {
+      image = fromJpegBuffer(data)
+      size = extractJpegSize(data)
+    } else {
+      throw new Error('Unable to create an image abstraction from buffer with unknown data')
+    }
   } else if (data.isImage) {
     transforms = data.transforms
     image = data.toRaw()
@@ -41,12 +45,12 @@ function makeImage(data) {
       const croppedSize = utils.geometry.size(transforms.crop || size)
       const scaledSize = utils.geometry.scale(croppedSize, transforms.scale)
       const rotatedSize = utils.geometry.rotate(scaledSize, transforms.rotate)
-      return utils.geometry.round(rotatedSize)
+      return utils.geometry.ceil(rotatedSize)
     },
     get unscaledSize() {
       const croppedSize = utils.geometry.size(transforms.crop || size)
       const rotatedSize = utils.geometry.rotate(croppedSize, transforms.rotate)
-      return utils.geometry.round(rotatedSize)
+      return utils.geometry.ceil(rotatedSize)
     },
     get rawSize() {
       return size
@@ -158,17 +162,39 @@ function makeImage(data) {
   }
 }
 
-function extractPngSize(buffer) {
+function isPngBuffer(buffer) {
   return buffer.slice(12, 16).toString('ascii') === 'IHDR'
-    ? {width: buffer.readUInt32BE(16), height: buffer.readUInt32BE(20)}
-    : {width: 0, height: 0}
+}
+
+function isJpegBuffer(buffer) {
+  return buffer.slice(6, 10).toString('ascii') === 'JFIF'
+}
+
+function extractPngSize(buffer) {
+  return {width: buffer.readUInt32BE(16), height: buffer.readUInt32BE(20)}
+}
+
+function extractJpegSize(buffer) {
+  // skip file signature
+  let offset = 4
+  while (buffer.length > offset) {
+    // extract length of the block
+    offset += buffer.readUInt16BE(offset)
+    // if next segment is SOF extract size
+    if (buffer[offset + 1] === 0xc0) {
+      return {width: buffer.readUInt16BE(offset + 7), height: buffer.readUInt16BE(offset + 5)}
+    } else {
+      // skip block signature
+      offset += 2
+    }
+  }
 }
 
 function fromSize(size) {
   return new png.Image({width: size.width, height: size.height})
 }
 
-async function fromBuffer(buffer) {
+async function fromPngBuffer(buffer) {
   return new Promise((resolve, reject) => {
     const image = new png.Image()
 
@@ -179,6 +205,10 @@ async function fromBuffer(buffer) {
   })
 }
 
+async function fromJpegBuffer(buffer) {
+  return jpeg.decode(buffer, {tolerantDecoding: true, formatAsRGBA: true})
+}
+
 async function toPng(image) {
   return new Promise((resolve, reject) => {
     let buffer = Buffer.alloc(0)

package/src/take-screenshot.js

@@ -63,7 +63,9 @@ async function takeScreenshot({
     if (!window && !driver.isNative) {
       await scrollIntoViewport({context: target.context, region: target.region, scroller: target.scroller, logger})
     }
-
+    if (fully && !target.region && target.scroller) {
+      await target.scroller.moveTo({x: 0, y: 0})
+    }
     const screenshot =
       fully && target.scroller
         ? await takeStitchedScreenshot({