appium-uiautomator2-driver 6.6.1 → 6.6.3

package/package.json

@@ -7,7 +7,7 @@
     "automated testing",
     "android"
   ],
-  "version": "6.6.1",
+  "version": "6.6.3",
   "bugs": {
     "url": "https://github.com/appium/appium-uiautomator2-driver/issues"
   },
@@ -48,7 +48,7 @@
     "rebuild": "npm run clean; npm run build",
     "format": "prettier -w ./lib",
     "reset": "node ./scripts/reset.js",
-    "test": "mocha --exit --timeout 1m \"./test/unit/**/*-specs.js\""
+    "test": "mocha --exit --timeout 1m \"./test/unit/**/*-specs.ts\""
   },
   "prettier": {
     "bracketSpacing": false,
@@ -73,7 +73,6 @@
     "@appium/docutils": "^2.0.0-rc.1",
     "@appium/eslint-config-appium-ts": "^2.0.0-rc.1",
     "@appium/support": "^7.0.0-rc.1",
-    "@appium/test-support": "^4.0.0-rc.1",
     "@appium/tsconfig": "^1.0.0-rc.1",
     "@appium/types": "^1.0.0-rc.1",
     "@semantic-release/changelog": "^6.0.1",

package/lib/commands/screenshot.js

@@ -1,116 +0,0 @@
-import _ from 'lodash';
-import B from 'bluebird';
-import {imageUtil} from 'appium/support';
-
-// Display 4619827259835644672 (HWC display 0): port=0 pnpId=GGL displayName="EMU_display_0"
-const DISPLAY_PATTERN = /^Display\s+(\d+)\s+\(.+display\s+(\d+)\).+displayName="([^"]*)/gm;
-
-/**
- * @this {AndroidUiautomator2Driver}
- * @returns {Promise<string>}
- */
-export async function mobileViewportScreenshot() {
-  return await this.getViewportScreenshot();
-}
-
-/**
- * @this {AndroidUiautomator2Driver}
- * @returns {Promise<string>}
- */
-export async function getViewportScreenshot() {
-  const screenshot = await this.getScreenshot();
-  const rect = await this.getViewPortRect();
-  return await imageUtil.cropBase64Image(screenshot, rect);
-}
-
-/**
- * @this {AndroidUiautomator2Driver}
- * @returns {Promise<string>}
- */
-export async function getScreenshot() {
-  if (this.mjpegStream) {
-    const data = await this.mjpegStream.lastChunkPNGBase64();
-    if (data) {
-      return data;
-    }
-    this.log.warn(
-      'Tried to get screenshot from active MJPEG stream, but there ' +
-        'was no data yet. Falling back to regular screenshot methods.'
-    );
-  }
-  return String(
-    await /** @type {import('../uiautomator2').UiAutomator2Server} */ (
-      this.uiautomator2
-    ).jwproxy.command('/screenshot', 'GET')
-  );
-}
-
-/**
- * Retrieves screenshots of each display available to Android.
- * This functionality is only supported since Android 10.
- * @this {AndroidUiautomator2Driver}
- * @param {number | string} [displayId] Android display identifier to take a screenshot for.
- * If not provided then screenshots of all displays are going to be returned.
- * If no matches were found then an error is thrown.
- * @returns {Promise<import('@appium/types').StringRecord<import('./types').Screenshot>>}
- */
-export async function mobileScreenshots(displayId) {
-  const displaysInfo = await /** @type {import('appium-adb').ADB} */ (this.adb).shell([
-    'dumpsys',
-    'SurfaceFlinger',
-    '--display-id',
-  ]);
-  /** @type {import('@appium/types').StringRecord<import('./types').Screenshot>} */
-  const infos = {};
-  let match;
-  while ((match = DISPLAY_PATTERN.exec(displaysInfo))) {
-    infos[match[1]] = /** @type {any} */ ({
-      id: match[1],
-      isDefault: match[2] === '0',
-      name: match[3],
-    });
-  }
-  if (_.isEmpty(infos)) {
-    this.log.debug(displaysInfo);
-    throw new Error('Cannot determine the information about connected Android displays');
-  }
-  this.log.info(`Parsed Android display infos: ${JSON.stringify(infos)}`);
-
-  /**
-   * @param {string} dispId
-   */
-  const toB64Screenshot = async (dispId) =>
-    (await /** @type {import('appium-adb').ADB} */ (this.adb).takeScreenshot(dispId)).toString(
-      'base64'
-    );
-
-  // @ts-ignore isNaN works properly here
-  const displayIdStr = isNaN(displayId) ? null : `${displayId}`;
-  if (displayIdStr) {
-    if (!infos[displayIdStr]) {
-      throw new Error(
-        `The provided display identifier '${displayId}' is not known. ` +
-          `Only the following displays have been detected: ${JSON.stringify(infos)}`
-      );
-    }
-    return {
-      [displayIdStr]: {
-        ...infos[displayIdStr],
-        payload: await toB64Screenshot(displayIdStr),
-      },
-    };
-  }
-
-  const allInfos = _.values(infos);
-  const screenshots = await B.all(allInfos.map(({id}) => toB64Screenshot(id)));
-  for (const [info, payload] of /** @type {[import('./types').Screenshot, string][]} */ (
-    _.zip(allInfos, screenshots)
-  )) {
-    info.payload = payload;
-  }
-  return infos;
-}
-
-/**
- * @typedef {import('../driver').AndroidUiautomator2Driver} AndroidUiautomator2Driver
- */