npm - appium-android-driver - Versions diffs - 5.0.9 → 5.0.10 - Mend

appium-android-driver 5.0.9 → 5.0.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/build/lib/commands/system-bars.js +3 -5
package/lib/commands/system-bars.js +2 -4
package/package.json +1 -1

package/build/lib/commands/system-bars.js CHANGED Viewed

@@ -40,10 +40,8 @@ function parseWindowProperties(name, props, log = null) {
   result.x = parseFloat(frameMatch[1]);
   result.y = parseFloat(frameMatch[2]);
-  const left = parseFloat(frameMatch[3]);
-  const top = parseFloat(frameMatch[4]);
-  result.width = left - result.x;
-  result.height = top - result.y;
+  result.width = parseFloat(frameMatch[3]) - result.x;
+  result.height = parseFloat(frameMatch[4]) - result.y;
   const visibilityMatch = SURFACE_PATTERN.exec(propLines);
   if (!visibilityMatch) {
@@ -135,4 +133,4 @@ var _default = commands;
 exports.default = _default;require('source-map-support').install();
-//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["lib/commands/system-bars.js"],"names":["WINDOW_TITLE_PATTERN","FRAME_PATTERN","SURFACE_PATTERN","STATUS_BAR_WINDOW_NAME_PREFIX","NAVIGATION_BAR_WINDOW_NAME_PREFIX","DEFAULT_WINDOW_PROPERTIES","visible","x","y","width","height","commands","parseWindowProperties","name","props","log","result","_","cloneDeep","propLines","join","frameMatch","exec","debug","Error","parseFloat","left","top","visibilityMatch","parseWindows","lines","windows","currentWindowName","windowNameRowIndent","line","split","map","trimEnd","currentIndent","length","trimStart","isNil","match","isArray","push","isEmpty","statusBar","navigationBar","toPairs","startsWith","unmatchedWindows","filter","window","namePrefix","info","keys","getSystemBars","stdout","adb","shell","e","message"],"mappings":"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","sourcesContent":["import _ from 'lodash';\n\nconst WINDOW_TITLE_PATTERN = /^\\s+Window\\s#\\d+\\sWindow\\{[0-9a-f]+\\s\\w+\\s([\\w-]+)\\}:$/;\nconst FRAME_PATTERN = /^\\s+mFrame=\\[([0-9.-]+),([0-9.-]+)\\]\\[([0-9.-]+),([0-9.-]+)\\]/m;\nconst SURFACE_PATTERN = /^\\s+Surface:\\sshown=(true|false)/m;\nconst STATUS_BAR_WINDOW_NAME_PREFIX = 'StatusBar';\nconst NAVIGATION_BAR_WINDOW_NAME_PREFIX = 'NavigationBar';\nconst DEFAULT_WINDOW_PROPERTIES = {\n  visible: false,\n  x: 0, y: 0, width: 0, height: 0,\n};\n\nconst commands = {};\n\n/**\n * @typedef {Object} WindowProperties\n * @property {boolean} visible Whether the window is visible\n * @property {number} x Window x coordinate\n * @property {number} y Window y coordinate\n * @property {number} width Window width\n * @property {number} height Window height\n */\n\n/**\n * Parses window properties from adb dumpsys output\n *\n * @param {string} name The name of the window whose properties are being parsed\n * @param {Array<string>} props The list of particular window property lines.\n * Check the corresponding unit tests for more details on the input format.\n * @param {Object?} log Logger instance\n * @returns {WindowProperties} Parsed properties object\n * @throws {Error} If there was an issue while parsing the properties string\n */\nfunction parseWindowProperties (name, props, log = null) {\n  const result = _.cloneDeep(DEFAULT_WINDOW_PROPERTIES);\n  const propLines = props.join('\\n');\n  const frameMatch = FRAME_PATTERN.exec(propLines);\n  if (!frameMatch) {\n    log?.debug(propLines);\n    throw new Error(`Cannot parse the frame size from '${name}' window properties`);\n  }\n  result.x = parseFloat(frameMatch[1]);\n  result.y = parseFloat(frameMatch[2]);\n  const left = parseFloat(frameMatch[3]);\n  const top = parseFloat(frameMatch[4]);\n  result.width = left - result.x;\n  result.height = top - result.y;\n  const visibilityMatch = SURFACE_PATTERN.exec(propLines);\n  if (!visibilityMatch) {\n    log?.debug(propLines);\n    throw new Error(`Cannot parse the visibility value from '${name}' window properties`);\n  }\n  result.visible = visibilityMatch[1] === 'true';\n  return result;\n}\n\n/**\n * Extracts status and navigation bar information from the window manager output.\n *\n * @param {Array<string>} lines Output from dumpsys command.\n * Check the corresponding unit tests for more details on the input format.\n * @param {Object?} log Logger instance\n * @return {Object} An object containing two items where keys are statusBar and navigationBar,\n * and values are corresponding WindowProperties objects\n * @throws {Error} If no window properties could be parsed\n */\nfunction parseWindows (lines, log = null) {\n  const windows = {};\n  let currentWindowName = null;\n  let windowNameRowIndent = null;\n  for (const line of lines.split('\\n').map(_.trimEnd)) {\n    const currentIndent = line.length - _.trimStart(line).length;\n    if (_.isNil(windowNameRowIndent) || currentIndent <= windowNameRowIndent) {\n      const match = WINDOW_TITLE_PATTERN.exec(line);\n      if (!match) {\n        currentWindowName = null;\n        continue;\n      }\n      currentWindowName = match[1];\n      if (_.isNil(windowNameRowIndent)) {\n        windowNameRowIndent = currentIndent;\n      }\n      continue;\n    }\n    if (!currentWindowName || currentIndent <= windowNameRowIndent) {\n      continue;\n    }\n\n    if (!_.isArray(windows[currentWindowName])) {\n      windows[currentWindowName] = [];\n    }\n    windows[currentWindowName].push(line);\n  }\n  if (_.isEmpty(windows)) {\n    log?.debug(lines.join('\\n'));\n    throw new Error('Cannot parse any window information from the dumpsys output');\n  }\n\n  const result = {statusBar: null, navigationBar: null};\n  for (const [name, props] of _.toPairs(windows)) {\n    if (name.startsWith(STATUS_BAR_WINDOW_NAME_PREFIX)) {\n      result.statusBar = parseWindowProperties(name, props, log);\n    } else if (name.startsWith(NAVIGATION_BAR_WINDOW_NAME_PREFIX)) {\n      result.navigationBar = parseWindowProperties(name, props, log);\n    }\n  }\n  const unmatchedWindows = [\n    ['statusBar', STATUS_BAR_WINDOW_NAME_PREFIX],\n    ['navigationBar', NAVIGATION_BAR_WINDOW_NAME_PREFIX]\n  ].filter(([name]) => _.isNil(result[name]));\n  for (const [window, namePrefix] of unmatchedWindows) {\n    log?.info(`No windows have been found whose title matches to ` +\n      `'${namePrefix}'. Assuming it is invisible. ` +\n      `Only the following windows are available: ${_.keys(windows)}`);\n    result[window] = _.cloneDeep(DEFAULT_WINDOW_PROPERTIES);\n  }\n  return result;\n}\n\ncommands.getSystemBars = async function getSystemBars () {\n  let stdout;\n  try {\n    stdout = await this.adb.shell(['dumpsys', 'window', 'windows']);\n  } catch (e) {\n    throw new Error(`Cannot retrieve system bars details. Original error: ${e.message}`);\n  }\n  return parseWindows(stdout, this.log);\n};\n\n// for unit tests\nexport { parseWindows, parseWindowProperties };\nexport default commands;\n"],"file":"lib/commands/system-bars.js","sourceRoot":"../../.."}
+//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["lib/commands/system-bars.js"],"names":["WINDOW_TITLE_PATTERN","FRAME_PATTERN","SURFACE_PATTERN","STATUS_BAR_WINDOW_NAME_PREFIX","NAVIGATION_BAR_WINDOW_NAME_PREFIX","DEFAULT_WINDOW_PROPERTIES","visible","x","y","width","height","commands","parseWindowProperties","name","props","log","result","_","cloneDeep","propLines","join","frameMatch","exec","debug","Error","parseFloat","visibilityMatch","parseWindows","lines","windows","currentWindowName","windowNameRowIndent","line","split","map","trimEnd","currentIndent","length","trimStart","isNil","match","isArray","push","isEmpty","statusBar","navigationBar","toPairs","startsWith","unmatchedWindows","filter","window","namePrefix","info","keys","getSystemBars","stdout","adb","shell","e","message"],"mappings":"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","sourcesContent":["import _ from 'lodash';\n\nconst WINDOW_TITLE_PATTERN = /^\\s+Window\\s#\\d+\\sWindow\\{[0-9a-f]+\\s\\w+\\s([\\w-]+)\\}:$/;\nconst FRAME_PATTERN = /^\\s+mFrame=\\[([0-9.-]+),([0-9.-]+)\\]\\[([0-9.-]+),([0-9.-]+)\\]/m;\nconst SURFACE_PATTERN = /^\\s+Surface:\\sshown=(true|false)/m;\nconst STATUS_BAR_WINDOW_NAME_PREFIX = 'StatusBar';\nconst NAVIGATION_BAR_WINDOW_NAME_PREFIX = 'NavigationBar';\nconst DEFAULT_WINDOW_PROPERTIES = {\n  visible: false,\n  x: 0, y: 0, width: 0, height: 0,\n};\n\nconst commands = {};\n\n/**\n * @typedef {Object} WindowProperties\n * @property {boolean} visible Whether the window is visible\n * @property {number} x Window x coordinate\n * @property {number} y Window y coordinate\n * @property {number} width Window width\n * @property {number} height Window height\n */\n\n/**\n * Parses window properties from adb dumpsys output\n *\n * @param {string} name The name of the window whose properties are being parsed\n * @param {Array<string>} props The list of particular window property lines.\n * Check the corresponding unit tests for more details on the input format.\n * @param {Object?} log Logger instance\n * @returns {WindowProperties} Parsed properties object\n * @throws {Error} If there was an issue while parsing the properties string\n */\nfunction parseWindowProperties (name, props, log = null) {\n  const result = _.cloneDeep(DEFAULT_WINDOW_PROPERTIES);\n  const propLines = props.join('\\n');\n  const frameMatch = FRAME_PATTERN.exec(propLines);\n  if (!frameMatch) {\n    log?.debug(propLines);\n    throw new Error(`Cannot parse the frame size from '${name}' window properties`);\n  }\n  result.x = parseFloat(frameMatch[1]);\n  result.y = parseFloat(frameMatch[2]);\n  result.width = parseFloat(frameMatch[3]) - result.x;\n  result.height = parseFloat(frameMatch[4]) - result.y;\n  const visibilityMatch = SURFACE_PATTERN.exec(propLines);\n  if (!visibilityMatch) {\n    log?.debug(propLines);\n    throw new Error(`Cannot parse the visibility value from '${name}' window properties`);\n  }\n  result.visible = visibilityMatch[1] === 'true';\n  return result;\n}\n\n/**\n * Extracts status and navigation bar information from the window manager output.\n *\n * @param {Array<string>} lines Output from dumpsys command.\n * Check the corresponding unit tests for more details on the input format.\n * @param {Object?} log Logger instance\n * @return {Object} An object containing two items where keys are statusBar and navigationBar,\n * and values are corresponding WindowProperties objects\n * @throws {Error} If no window properties could be parsed\n */\nfunction parseWindows (lines, log = null) {\n  const windows = {};\n  let currentWindowName = null;\n  let windowNameRowIndent = null;\n  for (const line of lines.split('\\n').map(_.trimEnd)) {\n    const currentIndent = line.length - _.trimStart(line).length;\n    if (_.isNil(windowNameRowIndent) || currentIndent <= windowNameRowIndent) {\n      const match = WINDOW_TITLE_PATTERN.exec(line);\n      if (!match) {\n        currentWindowName = null;\n        continue;\n      }\n      currentWindowName = match[1];\n      if (_.isNil(windowNameRowIndent)) {\n        windowNameRowIndent = currentIndent;\n      }\n      continue;\n    }\n    if (!currentWindowName || currentIndent <= windowNameRowIndent) {\n      continue;\n    }\n\n    if (!_.isArray(windows[currentWindowName])) {\n      windows[currentWindowName] = [];\n    }\n    windows[currentWindowName].push(line);\n  }\n  if (_.isEmpty(windows)) {\n    log?.debug(lines.join('\\n'));\n    throw new Error('Cannot parse any window information from the dumpsys output');\n  }\n\n  const result = {statusBar: null, navigationBar: null};\n  for (const [name, props] of _.toPairs(windows)) {\n    if (name.startsWith(STATUS_BAR_WINDOW_NAME_PREFIX)) {\n      result.statusBar = parseWindowProperties(name, props, log);\n    } else if (name.startsWith(NAVIGATION_BAR_WINDOW_NAME_PREFIX)) {\n      result.navigationBar = parseWindowProperties(name, props, log);\n    }\n  }\n  const unmatchedWindows = [\n    ['statusBar', STATUS_BAR_WINDOW_NAME_PREFIX],\n    ['navigationBar', NAVIGATION_BAR_WINDOW_NAME_PREFIX]\n  ].filter(([name]) => _.isNil(result[name]));\n  for (const [window, namePrefix] of unmatchedWindows) {\n    log?.info(`No windows have been found whose title matches to ` +\n      `'${namePrefix}'. Assuming it is invisible. ` +\n      `Only the following windows are available: ${_.keys(windows)}`);\n    result[window] = _.cloneDeep(DEFAULT_WINDOW_PROPERTIES);\n  }\n  return result;\n}\n\ncommands.getSystemBars = async function getSystemBars () {\n  let stdout;\n  try {\n    stdout = await this.adb.shell(['dumpsys', 'window', 'windows']);\n  } catch (e) {\n    throw new Error(`Cannot retrieve system bars details. Original error: ${e.message}`);\n  }\n  return parseWindows(stdout, this.log);\n};\n\n// for unit tests\nexport { parseWindows, parseWindowProperties };\nexport default commands;\n"],"file":"lib/commands/system-bars.js","sourceRoot":"../../.."}

package/lib/commands/system-bars.js CHANGED Viewed

@@ -41,10 +41,8 @@ function parseWindowProperties (name, props, log = null) {
   }
   result.x = parseFloat(frameMatch[1]);
   result.y = parseFloat(frameMatch[2]);
-  const left = parseFloat(frameMatch[3]);
-  const top = parseFloat(frameMatch[4]);
-  result.width = left - result.x;
-  result.height = top - result.y;
+  result.width = parseFloat(frameMatch[3]) - result.x;
+  result.height = parseFloat(frameMatch[4]) - result.y;
   const visibilityMatch = SURFACE_PATTERN.exec(propLines);
   if (!visibilityMatch) {
     log?.debug(propLines);

package/package.json CHANGED Viewed

@@ -9,7 +9,7 @@
     "mobile",
     "mobile testing"
   ],
-  "version": "5.0.9",
+  "version": "5.0.10",
   "author": "appium",
   "license": "Apache-2.0",
   "repository": {