fix: Update dumpsys windows output parsing logic for API level 33 (#753)

Author: mykola-mokhnach

lib/commands/system-bars.js

@@ -1,8 +1,10 @@
 import _ from 'lodash';
 
 const WINDOW_TITLE_PATTERN = /^\s+Window\s#\d+\sWindow\{[0-9a-f]+\s\w+\s([\w-]+)\}:$/;
-const FRAME_PATTERN = /^\s+mFrame=\[([0-9.-]+),([0-9.-]+)\]\[([0-9.-]+),([0-9.-]+)\]/m;
-const SURFACE_PATTERN = /^\s+Surface:\sshown=(true|false)/m;
+const FRAME_PATTERN = /\bm?[Ff]rame=\[([0-9.-]+),([0-9.-]+)\]\[([0-9.-]+),([0-9.-]+)\]/;
+const VIEW_VISIBILITY_PATTERN = /\bmViewVisibility=(0x[0-9a-fA-F]+)/;
+// https://developer.android.com/reference/android/view/View#VISIBLE
+const VIEW_VISIBLE = 0x0;
 const STATUS_BAR_WINDOW_NAME_PREFIX = 'StatusBar';
 const NAVIGATION_BAR_WINDOW_NAME_PREFIX = 'NavigationBar';
 const DEFAULT_WINDOW_PROPERTIES = {
@@ -43,12 +45,12 @@ function parseWindowProperties (name, props, log = null) {
   result.y = parseFloat(frameMatch[2]);
   result.width = parseFloat(frameMatch[3]) - result.x;
   result.height = parseFloat(frameMatch[4]) - result.y;
-  const visibilityMatch = SURFACE_PATTERN.exec(propLines);
+  const visibilityMatch = VIEW_VISIBILITY_PATTERN.exec(propLines);
   if (!visibilityMatch) {
     log?.debug(propLines);
     throw new Error(`Cannot parse the visibility value from '${name}' window properties`);
   }
-  result.visible = visibilityMatch[1] === 'true';
+  result.visible = parseInt(visibilityMatch[1], 16) === VIEW_VISIBLE;
   return result;
 }
 
@@ -65,29 +67,21 @@ function parseWindowProperties (name, props, log = null) {
 function parseWindows (lines, log = null) {
   const windows = {};
   let currentWindowName = null;
-  let windowNameRowIndent = null;
   for (const line of lines.split('\n').map(_.trimEnd)) {
-    const currentIndent = line.length - _.trimStart(line).length;
-    if (_.isNil(windowNameRowIndent) || currentIndent <= windowNameRowIndent) {
-      const match = WINDOW_TITLE_PATTERN.exec(line);
-      if (!match) {
-        currentWindowName = null;
-        continue;
-      }
+    const match = WINDOW_TITLE_PATTERN.exec(line);
+    if (match) {
       currentWindowName = match[1];
-      if (_.isNil(windowNameRowIndent)) {
-        windowNameRowIndent = currentIndent;
-      }
+      windows[currentWindowName] = [];
       continue;
     }
-    if (!currentWindowName || currentIndent <= windowNameRowIndent) {
+    if (_.trim(line).length === 0) {
+      currentWindowName = null;
       continue;
     }
 
-    if (!_.isArray(windows[currentWindowName])) {
-      windows[currentWindowName] = [];
+    if (currentWindowName && _.isArray(windows[currentWindowName])) {
+      windows[currentWindowName].push(line);
     }
-    windows[currentWindowName].push(line);
   }
   if (_.isEmpty(windows)) {
     log?.debug(lines.join('\n'));