appium-support - npm Package Compare versions

Comparing version 2.49.0 to 2.50.0

build/lib/net.js

@@ -113,3 +113,3 @@ "use strict";
 
-  if ((auth === null || auth === void 0 ? void 0 : auth.user) && (auth === null || auth === void 0 ? void 0 : auth.pass) || user && pass) {
+  if (auth !== null && auth !== void 0 && auth.user && auth !== null && auth !== void 0 && auth.pass || user && pass) {
     ftpOpts.user = (auth === null || auth === void 0 ? void 0 : auth.user) || user;
@@ -235,2 +235,2 @@ ftpOpts.pass = (auth === null || auth === void 0 ? void 0 : auth.pass) || pass;
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["lib/net.js"],"names":["toAxiosAuth","auth","_","isPlainObject","axiosAuth","username","user","password","pass","uploadFileToHttp","localFileStream","parsedUri","uploadOptions","method","timeout","headers","fileFieldName","formFields","protocol","href","requestOpts","url","form","FormData","append","pairs","isArray","toPairs","key","value","toLower","Object","assign","getHeaders","log","debug","JSON","stringify","data","uploadFileToFtp","hostname","port","pathname","ftpOpts","host","B","resolve","reject","Ftp","put","err","uploadFile","localPath","remoteUri","fs","exists","Error","isMetered","parse","size","stat","info","timer","Timer","start","includes","createReadStream","getDuration","asSeconds","toFixed","downloadFile","remoteUrl","dstPath","downloadOptions","responseType","responseLength","writer","createWriteStream","responseStream","responseHeaders","parseInt","pipe","once","e","unpipe","message","rimraf","secondsElapsed","bytesPerSec","Math","floor"],"mappings":"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","sourcesContent":["import _ from 'lodash';\nimport fs from './fs';\nimport url from 'url';\nimport B from 'bluebird';\nimport { toReadableSizeString } from './util';\nimport log from './logger';\nimport Ftp from 'jsftp';\nimport Timer from './timing';\nimport axios from 'axios';\nimport FormData from 'form-data';\n\n\nfunction toAxiosAuth (auth) {\n  if (!_.isPlainObject(auth)) {\n    return null;\n  }\n\n  const axiosAuth = {\n    username: auth.username || auth.user,\n    password: auth.password || auth.pass,\n  };\n  return (axiosAuth.username && axiosAuth.password) ? axiosAuth : null;\n}\n\nasync function uploadFileToHttp (localFileStream, parsedUri, uploadOptions = {}) {\n  const {\n    method = 'POST',\n    timeout = 5000,\n    headers,\n    auth,\n    fileFieldName = 'file',\n    formFields,\n  } = uploadOptions;\n  const {\n    protocol,\n    href,\n  } = parsedUri;\n\n  const requestOpts = {\n    url: href,\n    method,\n    timeout,\n  };\n  const axiosAuth = toAxiosAuth(auth);\n  if (axiosAuth) {\n    requestOpts.auth = axiosAuth;\n  }\n  const form = new FormData();\n  form.append(fileFieldName, localFileStream);\n  if (formFields) {\n    let pairs = [];\n    if (_.isArray(formFields)) {\n      pairs = formFields;\n    } else if (_.isPlainObject(formFields)) {\n      pairs = _.toPairs(formFields);\n    }\n    for (const [key, value] of pairs) {\n      if (_.toLower(key) !== _.toLower(fileFieldName)) {\n        form.append(key, value);\n      }\n    }\n  }\n  requestOpts.headers = Object.assign({}, _.isPlainObject(headers) ? headers : {}, form.getHeaders());\n\n  // exclude form data from the log since it'll contain the entire recorded video\n  log.debug(`${protocol} upload options (ex. form data): ${JSON.stringify(requestOpts)}`);\n  requestOpts.data = form;\n\n  await axios(requestOpts);\n}\n\nasync function uploadFileToFtp (localFileStream, parsedUri, uploadOptions = {}) {\n  const {\n    auth,\n    user,\n    pass,\n  } = uploadOptions;\n  const {\n    hostname,\n    port,\n    protocol,\n    pathname,\n  } = parsedUri;\n\n  const ftpOpts = {\n    host: hostname,\n    port: port || 21,\n  };\n  if ((auth?.user && auth?.pass) || (user && pass)) {\n    ftpOpts.user = auth?.user || user;\n    ftpOpts.pass = auth?.pass || pass;\n  }\n  log.debug(`${protocol} upload options: ${JSON.stringify(ftpOpts)}`);\n  return await new B((resolve, reject) => {\n    new Ftp(ftpOpts).put(localFileStream, pathname, (err) => {\n      if (err) {\n        reject(err);\n      } else {\n        resolve();\n      }\n    });\n  });\n}\n\n/**\n * @typedef {Object} AuthCredentials\n * @property {string} user - Non-empty user name\n * @property {string} pass - Non-empty password\n */\n\n/**\n * @typedef {Object} FtpUploadOptions\n * @property {boolean} isMetered [true] - Whether to log the actual upload performance\n * (e.g. timings and speed)\n * @property {AuthCredentials} auth\n */\n\n/**\n * @typedef {Object} HttpUploadOptions\n * @property {boolean} isMetered [true] - Whether to log the actual upload performance\n * (e.g. timings and speed)\n * @property {string} method [POST] - The HTTP method used for file upload\n * @property {AuthCredentials} auth\n * @property {number} timeout [5000] - The actual request timeout in milliseconds\n * @property {Object} headers - Additional request headers mapping\n * @property {string} fileFieldName [file] - The name of the form field containing the file\n * content to be uploaded\n * @property {Array<Pair>|Object} formFields - The additional form fields\n * to be included into the upload request. This property is only considered if\n * `fileFieldName` is set\n */\n\n/**\n * Uploads the given file to a remote location. HTTP(S) and FTP\n * protocols are supported.\n *\n * @param {string} localPath - The path to a file on the local storage.\n * @param {string} remoteUri - The remote URI to upload the file to.\n * @param {?FtpUploadOptions|HttpUploadOptions} uploadOptions\n */\nasync function uploadFile (localPath, remoteUri, uploadOptions = {}) {\n  if (!await fs.exists(localPath)) {\n    throw new Error (`'${localPath}' does not exists or is not accessible`);\n  }\n\n  const {\n    isMetered = true,\n  } = uploadOptions;\n\n  const parsedUri = url.parse(remoteUri);\n  const {size} = await fs.stat(localPath);\n  if (isMetered) {\n    log.info(`Uploading '${localPath}' of ${toReadableSizeString(size)} size to '${remoteUri}'...`);\n  }\n  const timer = new Timer().start();\n  if (['http:', 'https:'].includes(parsedUri.protocol)) {\n    await uploadFileToHttp(fs.createReadStream(localPath), parsedUri, uploadOptions);\n  } else if (parsedUri.protocol === 'ftp:') {\n    await uploadFileToFtp(fs.createReadStream(localPath), parsedUri, uploadOptions);\n  } else {\n    throw new Error(`Cannot upload the file at '${localPath}' to '${remoteUri}'. ` +\n      `Unsupported remote protocol '${parsedUri.protocol}'. ` +\n      `Only http/https and ftp/ftps protocols are supported.`);\n  }\n  if (isMetered) {\n    log.info(`Uploaded '${localPath}' of ${toReadableSizeString(size)} size in ${timer.getDuration().asSeconds.toFixed(3)}s`);\n  }\n}\n\n/**\n * @typedef {Object} DownloadOptions\n * @property {boolean} isMetered [true] - Whether to log the actual download performance\n * (e.g. timings and speed)\n * @property {AuthCredentials} auth\n * @property {number} timeout [5000] - The actual request timeout in milliseconds\n * @property {Object} headers - Request headers mapping\n */\n\n/**\n * Downloads the given file via HTTP(S)\n *\n * @param {string} remoteUrl - The remote url\n * @param {string} dstPath - The local path to download the file to\n * @param {?DownloadOptions} downloadOptions\n * @throws {Error} If download operation fails\n */\nasync function downloadFile (remoteUrl, dstPath, downloadOptions = {}) {\n  const {\n    isMetered = true,\n    auth,\n    timeout = 5000,\n    headers,\n  } = downloadOptions;\n\n  const requestOpts = {\n    url: remoteUrl,\n    responseType: 'stream',\n    timeout,\n  };\n  const axiosAuth = toAxiosAuth(auth);\n  if (axiosAuth) {\n    requestOpts.auth = axiosAuth;\n  }\n  if (_.isPlainObject(headers)) {\n    requestOpts.headers = headers;\n  }\n\n  const timer = new Timer().start();\n  let responseLength;\n  try {\n    const writer = fs.createWriteStream(dstPath);\n    const {\n      data: responseStream,\n      headers: responseHeaders,\n    } = await axios(requestOpts);\n    responseLength = parseInt(responseHeaders['content-length'], 10);\n    responseStream.pipe(writer);\n\n    await new B((resolve, reject) => {\n      responseStream.once('error', reject);\n      writer.once('finish', resolve);\n      writer.once('error', (e) => {\n        responseStream.unpipe(writer);\n        reject(e);\n      });\n    });\n  } catch (err) {\n    throw new Error(`Cannot download the file from ${remoteUrl}: ${err.message}`);\n  }\n\n  const {size} = await fs.stat(dstPath);\n  if (responseLength && size !== responseLength) {\n    await fs.rimraf(dstPath);\n    throw new Error(`The size of the file downloaded from ${remoteUrl} (${size} bytes) ` +\n      `differs from the one in Content-Length response header (${responseLength} bytes)`);\n  }\n  if (isMetered) {\n    const secondsElapsed = timer.getDuration().asSeconds;\n    log.debug(`${remoteUrl} (${toReadableSizeString(size)}) ` +\n      `has been downloaded to '${dstPath}' in ${secondsElapsed.toFixed(3)}s`);\n    if (secondsElapsed >= 2) {\n      const bytesPerSec = Math.floor(size / secondsElapsed);\n      log.debug(`Approximate download speed: ${toReadableSizeString(bytesPerSec)}/s`);\n    }\n  }\n}\n\nexport { uploadFile, downloadFile };\n"],"file":"lib/net.js","sourceRoot":"../.."}
+//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["lib/net.js"],"names":["toAxiosAuth","auth","_","isPlainObject","axiosAuth","username","user","password","pass","uploadFileToHttp","localFileStream","parsedUri","uploadOptions","method","timeout","headers","fileFieldName","formFields","protocol","href","requestOpts","url","form","FormData","append","pairs","isArray","toPairs","key","value","toLower","Object","assign","getHeaders","log","debug","JSON","stringify","data","uploadFileToFtp","hostname","port","pathname","ftpOpts","host","B","resolve","reject","Ftp","put","err","uploadFile","localPath","remoteUri","fs","exists","Error","isMetered","parse","size","stat","info","timer","Timer","start","includes","createReadStream","getDuration","asSeconds","toFixed","downloadFile","remoteUrl","dstPath","downloadOptions","responseType","responseLength","writer","createWriteStream","responseStream","responseHeaders","parseInt","pipe","once","e","unpipe","message","rimraf","secondsElapsed","bytesPerSec","Math","floor"],"mappings":"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","sourcesContent":["import _ from 'lodash';\nimport fs from './fs';\nimport url from 'url';\nimport B from 'bluebird';\nimport { toReadableSizeString } from './util';\nimport log from './logger';\nimport Ftp from 'jsftp';\nimport Timer from './timing';\nimport axios from 'axios';\nimport FormData from 'form-data';\n\n\nfunction toAxiosAuth (auth) {\n  if (!_.isPlainObject(auth)) {\n    return null;\n  }\n\n  const axiosAuth = {\n    username: auth.username || auth.user,\n    password: auth.password || auth.pass,\n  };\n  return (axiosAuth.username && axiosAuth.password) ? axiosAuth : null;\n}\n\nasync function uploadFileToHttp (localFileStream, parsedUri, uploadOptions = {}) {\n  const {\n    method = 'POST',\n    timeout = 5000,\n    headers,\n    auth,\n    fileFieldName = 'file',\n    formFields,\n  } = uploadOptions;\n  const {\n    protocol,\n    href,\n  } = parsedUri;\n\n  const requestOpts = {\n    url: href,\n    method,\n    timeout,\n  };\n  const axiosAuth = toAxiosAuth(auth);\n  if (axiosAuth) {\n    requestOpts.auth = axiosAuth;\n  }\n  const form = new FormData();\n  form.append(fileFieldName, localFileStream);\n  if (formFields) {\n    let pairs = [];\n    if (_.isArray(formFields)) {\n      pairs = formFields;\n    } else if (_.isPlainObject(formFields)) {\n      pairs = _.toPairs(formFields);\n    }\n    for (const [key, value] of pairs) {\n      if (_.toLower(key) !== _.toLower(fileFieldName)) {\n        form.append(key, value);\n      }\n    }\n  }\n  requestOpts.headers = Object.assign({}, _.isPlainObject(headers) ? headers : {}, form.getHeaders());\n\n  // exclude form data from the log since it'll contain the entire recorded video\n  log.debug(`${protocol} upload options (ex. form data): ${JSON.stringify(requestOpts)}`);\n  requestOpts.data = form;\n\n  await axios(requestOpts);\n}\n\nasync function uploadFileToFtp (localFileStream, parsedUri, uploadOptions = {}) {\n  const {\n    auth,\n    user,\n    pass,\n  } = uploadOptions;\n  const {\n    hostname,\n    port,\n    protocol,\n    pathname,\n  } = parsedUri;\n\n  const ftpOpts = {\n    host: hostname,\n    port: port || 21,\n  };\n  if ((auth?.user && auth?.pass) || (user && pass)) {\n    ftpOpts.user = auth?.user || user;\n    ftpOpts.pass = auth?.pass || pass;\n  }\n  log.debug(`${protocol} upload options: ${JSON.stringify(ftpOpts)}`);\n  return await new B((resolve, reject) => {\n    new Ftp(ftpOpts).put(localFileStream, pathname, (err) => {\n      if (err) {\n        reject(err);\n      } else {\n        resolve();\n      }\n    });\n  });\n}\n\n/**\n * @typedef {Object} AuthCredentials\n * @property {string} user - Non-empty user name\n * @property {string} pass - Non-empty password\n */\n\n/**\n * @typedef {Object} FtpUploadOptions\n * @property {boolean} isMetered [true] - Whether to log the actual upload performance\n * (e.g. timings and speed)\n * @property {AuthCredentials} auth\n */\n\n/**\n * @typedef {Object} HttpUploadOptions\n * @property {boolean} isMetered [true] - Whether to log the actual upload performance\n * (e.g. timings and speed)\n * @property {string} method [POST] - The HTTP method used for file upload\n * @property {AuthCredentials} auth\n * @property {number} timeout [5000] - The actual request timeout in milliseconds\n * @property {Object} headers - Additional request headers mapping\n * @property {string} fileFieldName [file] - The name of the form field containing the file\n * content to be uploaded\n * @property {Array<Pair>|Object} formFields - The additional form fields\n * to be included into the upload request. This property is only considered if\n * `fileFieldName` is set\n */\n\n/**\n * Uploads the given file to a remote location. HTTP(S) and FTP\n * protocols are supported.\n *\n * @param {string} localPath - The path to a file on the local storage.\n * @param {string} remoteUri - The remote URI to upload the file to.\n * @param {?FtpUploadOptions|HttpUploadOptions} uploadOptions\n */\nasync function uploadFile (localPath, remoteUri, uploadOptions = {}) {\n  if (!await fs.exists(localPath)) {\n    throw new Error (`'${localPath}' does not exists or is not accessible`);\n  }\n\n  const {\n    isMetered = true,\n  } = uploadOptions;\n\n  const parsedUri = url.parse(remoteUri);\n  const {size} = await fs.stat(localPath);\n  if (isMetered) {\n    log.info(`Uploading '${localPath}' of ${toReadableSizeString(size)} size to '${remoteUri}'...`);\n  }\n  const timer = new Timer().start();\n  if (['http:', 'https:'].includes(parsedUri.protocol)) {\n    await uploadFileToHttp(fs.createReadStream(localPath), parsedUri, uploadOptions);\n  } else if (parsedUri.protocol === 'ftp:') {\n    await uploadFileToFtp(fs.createReadStream(localPath), parsedUri, uploadOptions);\n  } else {\n    throw new Error(`Cannot upload the file at '${localPath}' to '${remoteUri}'. ` +\n      `Unsupported remote protocol '${parsedUri.protocol}'. ` +\n      `Only http/https and ftp/ftps protocols are supported.`);\n  }\n  if (isMetered) {\n    log.info(`Uploaded '${localPath}' of ${toReadableSizeString(size)} size in ${timer.getDuration().asSeconds.toFixed(3)}s`);\n  }\n}\n\n/**\n * @typedef {Object} DownloadOptions\n * @property {boolean} isMetered [true] - Whether to log the actual download performance\n * (e.g. timings and speed)\n * @property {AuthCredentials} auth\n * @property {number} timeout [5000] - The actual request timeout in milliseconds\n * @property {Object} headers - Request headers mapping\n */\n\n/**\n * Downloads the given file via HTTP(S)\n *\n * @param {string} remoteUrl - The remote url\n * @param {string} dstPath - The local path to download the file to\n * @param {?DownloadOptions} downloadOptions\n * @throws {Error} If download operation fails\n */\nasync function downloadFile (remoteUrl, dstPath, downloadOptions = {}) {\n  const {\n    isMetered = true,\n    auth,\n    timeout = 5000,\n    headers,\n  } = downloadOptions;\n\n  const requestOpts = {\n    url: remoteUrl,\n    responseType: 'stream',\n    timeout,\n  };\n  const axiosAuth = toAxiosAuth(auth);\n  if (axiosAuth) {\n    requestOpts.auth = axiosAuth;\n  }\n  if (_.isPlainObject(headers)) {\n    requestOpts.headers = headers;\n  }\n\n  const timer = new Timer().start();\n  let responseLength;\n  try {\n    const writer = fs.createWriteStream(dstPath);\n    const {\n      data: responseStream,\n      headers: responseHeaders,\n    } = await axios(requestOpts);\n    responseLength = parseInt(responseHeaders['content-length'], 10);\n    responseStream.pipe(writer);\n\n    await new B((resolve, reject) => {\n      responseStream.once('error', reject);\n      writer.once('finish', resolve);\n      writer.once('error', (e) => {\n        responseStream.unpipe(writer);\n        reject(e);\n      });\n    });\n  } catch (err) {\n    throw new Error(`Cannot download the file from ${remoteUrl}: ${err.message}`);\n  }\n\n  const {size} = await fs.stat(dstPath);\n  if (responseLength && size !== responseLength) {\n    await fs.rimraf(dstPath);\n    throw new Error(`The size of the file downloaded from ${remoteUrl} (${size} bytes) ` +\n      `differs from the one in Content-Length response header (${responseLength} bytes)`);\n  }\n  if (isMetered) {\n    const secondsElapsed = timer.getDuration().asSeconds;\n    log.debug(`${remoteUrl} (${toReadableSizeString(size)}) ` +\n      `has been downloaded to '${dstPath}' in ${secondsElapsed.toFixed(3)}s`);\n    if (secondsElapsed >= 2) {\n      const bytesPerSec = Math.floor(size / secondsElapsed);\n      log.debug(`Approximate download speed: ${toReadableSizeString(bytesPerSec)}/s`);\n    }\n  }\n}\n\nexport { uploadFile, downloadFile };\n"],"file":"lib/net.js","sourceRoot":"../.."}

lib/image-util.js

@@ -39,2 +39,3 @@ import _ from 'lodash';
 const DEFAULT_MATCH_THRESHOLD = 0.5;
+const MATCH_NEIGHBOUR_THRESHOLD = 10;
 
@@ -412,2 +413,5 @@ const AVAILABLE_DETECTORS = [
  * a match
+ * @property {?float} multiple [false] find multiple matches in the image
+ * @property {?number} matchNeighbourThreshold [10] The pixel distance between matches we consider
+ * to be part of the same template match
  */
@@ -421,5 +425,8 @@
  * represented as PNG image buffer. On this image the matching
- * region is highlighted with a rectangle.
+ * region is highlighted with a rectangle. If the multiple option is passed,
+ * all results are highlighted here.
  * @property {number} score The similarity score as a float number in range [0.0, 1.0].
  * 1.0 is the highest score (means both images are totally equal).
+ * @property {Array<OccurrenceResult>} multiple The array of matching OccurenceResults
+ * - only when multiple option is passed
  */
@@ -441,3 +448,7 @@
 
-  const {visualize = false, threshold = DEFAULT_MATCH_THRESHOLD} = options;
+  const { visualize = false,
+          threshold = DEFAULT_MATCH_THRESHOLD,
+          multiple = false,
+          matchNeighbourThreshold = MATCH_NEIGHBOUR_THRESHOLD } = options;
+
   const [fullImg, partialImg] = await B.all([
@@ -447,32 +458,99 @@ cv.imdecodeAsync(fullImgData),
   ]);
-  const result = {};
+  const results = [];
+  let visualization = null;
+
   try {
     const matched = await fullImg.matchTemplateAsync(partialImg, cv.TM_CCOEFF_NORMED);
     const minMax = await matched.minMaxLocAsync();
-    result.score = minMax.maxVal;
-    if (result.score < threshold) {
+
+    if (multiple) {
+      const nonZeroMatchResults = matched.threshold(threshold, 1, cv.THRESH_BINARY).convertTo(cv.CV_8U).findNonZero();
+      const matches = filterNearMatches(nonZeroMatchResults, matchNeighbourThreshold);
+
+      for (const element of matches) {
+        results.push({
+          score: matched.at(element.y, element.x),
+          rect: {
+            x: element.x,
+            y: element.y,
+            width: partialImg.cols,
+            height: partialImg.rows
+          }
+        });
+      }
+    } else if (minMax.maxVal >= threshold) {
+      results.push({
+        score: minMax.maxVal,
+        rect: {
+          x: minMax.maxLoc.x,
+          y: minMax.maxLoc.y,
+          width: partialImg.cols,
+          height: partialImg.rows
+        }
+      });
+    }
+
+    if (_.isEmpty(results)) {
       // Below error message, `Cannot find any occurrences` is referenced in find by image
-      throw new Error(`Cannot find any occurrences of the partial image in the full ` +
-                      `image above the threshold of ${threshold}. Highest match value ` +
+      throw new Error(`Match threshold: ${threshold}. Highest match value ` +
                       `found was ${minMax.maxVal}`);
     }
-    result.rect = {
-      x: minMax.maxLoc.x,
-      y: minMax.maxLoc.y,
-      width: partialImg.cols,
-      height: partialImg.rows
-    };
   } catch (e) {
     // Below error message, `Cannot find any occurrences` is referenced in find by image
     throw new Error(`Cannot find any occurrences of the partial image in the full image. ` +
-                    `Original error: ${e}`);
+      `Original error: ${e.message}`);
   }
+
   if (visualize) {
-    highlightRegion(fullImg, result.rect);
-    result.visualization = await cv.imencodeAsync('.png', fullImg);
+    const fullHighlightedImage = fullImg.copy();
+
+    for (const result of results) {
+      const singleHighlightedImage = fullImg.copy();
+
+      highlightRegion(singleHighlightedImage, result.rect);
+      highlightRegion(fullHighlightedImage, result.rect);
+      result.visualization = await cv.imencodeAsync('.png', singleHighlightedImage);
+    }
+    visualization = await cv.imencodeAsync('.png', fullHighlightedImage);
   }
-  return result;
+
+  return {
+    rect: results[0].rect,
+    score: results[0].score,
+    visualization,
+    multiple: results
+  };
 }
 
 /**
+ * Filter out match results which have a matched neighbour
+ *
+ * @param {Array<Point>} nonZeroMatchResults matrix of image match results
+ * @param {number} matchNeighbourThreshold The pixel distance within which we
+ * consider an element being a neighbour of an existing match
+ * @return {Array<Point>} the filtered array of matched points
+ */
+function filterNearMatches (nonZeroMatchResults, matchNeighbourThreshold) {
+  return nonZeroMatchResults.reduce((acc, element) => {
+    if (!acc.some((match) => distance(match, element) <= matchNeighbourThreshold)) {
+      acc.push(element);
+    }
+    return acc;
+  }, []);
+}
+
+/**
+ * Find the distance between two points
+ *
+ * @param {Point} point1 The first point
+ * @param {Point} point2 The second point
+ * @return {number} the distance
+ */
+function distance (point1, point2) {
+  const a2 = Math.pow((point1.x - point2.x), 2);
+  const b2 = Math.pow((point1.y - point2.y), 2);
+  return Math.sqrt(a2 + b2);
+}
+
+/**
  * Crop the image by given rectangle (use base64 string as input and output)
@@ -479,0 +557,0 @@ *

package.json

@@ -7,3 +7,3 @@ {
   ],
-  "version": "2.49.0",
+  "version": "2.50.0",
   "author": "appium",
@@ -35,3 +35,3 @@ "license": "Apache-2.0",
     "archiver": "^5.0.0",
-    "axios": "^0.20.0",
+    "axios": "^0.21.1",
     "base64-stream": "^1.0.0",
@@ -87,4 +87,3 @@ "bluebird": "^3.5.1",
   "devDependencies": {
-    "ajv": "^6.5.3",
-    "appium-gulp-plugins": "^5.2.1",
+    "appium-gulp-plugins": "^5.4.0",
     "asyncbox": "^2.3.1",
@@ -91,0 +90,0 @@ "chai": "^4.1.2",

README.md

 # appium-support
 
-[![Coverage Status](https://coveralls.io/repos/appium/appium-support/badge.svg?branch=master&service=github)](https://coveralls.io/github/appium/appium-support?branch=master)
-
 Utility functions used to support libs used across appium packages.
@@ -6,0 +4,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

439837

increased by2.34%

Dev dependency count

9

decreased by-10%

Lines of code

6078

increased by2.32%

Worsened metrics

Number of lines in readme file

151

decreased by-1.31%

Dependency changes

• + Addedaxios@0.21.4(transitive)

• - Removedaxios@0.20.0(transitive)

• Updatedaxios@^0.21.1