appium-uiautomator2-driver 3.9.5 → 3.9.7

package/lib/commands/actions.js

@@ -76,7 +76,6 @@ export async function performActions(actions) {
  * @this {AndroidUiautomator2Driver}
  * @returns {Promise<void>}
  */
-// eslint-disable-next-line require-await
 export async function releaseActions() {
   this.log.info('On this platform, releaseActions is a no-op');
 }

package/lib/driver.ts

@@ -10,7 +10,7 @@ import type {
   StringRecord,
 } from '@appium/types';
 import {DEFAULT_ADB_PORT} from 'appium-adb';
-import AndroidDriver, {utils} from 'appium-android-driver';
+import {AndroidDriver, utils} from 'appium-android-driver';
 import {SETTINGS_HELPER_ID} from 'io.appium.settings';
 import {BaseDriver, DeviceSettings} from 'appium/driver';
 import {fs, mjpeg, util} from 'appium/support';
@@ -481,7 +481,7 @@ class AndroidUiautomator2Driver
       const [startPort, endPort] = DEVICE_PORT_RANGE;
       try {
         this.systemPort = await findAPortNotInUse(startPort, endPort);
-      } catch (e) {
+      } catch {
         throw this.log.errorWithException(
           `Cannot find any free port in range ${startPort}..${endPort}}. ` +
             `Please set the available port number by providing the systemPort capability or ` +
@@ -671,9 +671,13 @@ class AndroidUiautomator2Driver
       ...caps,
       ...sessionInfo,
     };
-    // Adding AUT package name in the capabilities if package name not exist in caps
-    if (!capsWithSessionInfo.appPackage && appInfo) {
-      capsWithSessionInfo.appPackage = appInfo.appPackage;
+    // Adding AUT info in the capabilities if it does not exist in caps
+    if (appInfo) {
+      for (const capName of ['appPackage', 'appActivity']) {
+        if (!capsWithSessionInfo[capName] && appInfo[capName]) {
+          capsWithSessionInfo[capName] = appInfo[capName];
+        }
+      }
     }
 
     await this.performSessionExecution(capsWithSessionInfo);
@@ -874,7 +878,7 @@ class AndroidUiautomator2Driver
           (async () => {
             try {
               await task();
-            } catch (ign) {}
+            } catch {}
           })();
         })
       );

package/lib/helpers.js

@@ -16,7 +16,7 @@ export async function isWriteable(filePath) {
       await fs.close(await fs.open(filePath, 'r+'));
     }
     return true;
-  } catch (ign) {
+  } catch {
     return false;
   }
 }

package/lib/uiautomator2.js

@@ -226,7 +226,6 @@ class UiAutomator2Server {
           } else if (pmOutput.includes(INSTRUMENTATION_TARGET)) {
             pmOutput = ''; // remove output, so it is not printed below
             this.log.debug(`Instrumentation target '${INSTRUMENTATION_TARGET}' is available`);
-            // eslint-disable-next-line require-atomic-updates
             isPmServiceAvailable = true;
           } else if (!pmError) {
             pmError = new Error('The instrumentation target is not listed by Package Manager');
@@ -237,7 +236,7 @@ class UiAutomator2Server {
         waitMs: SERVICES_LAUNCH_TIMEOUT,
         intervalMs: 1000,
       });
-    } catch (err) {
+    } catch {
       // @ts-ignore It is ok if the attribute does not exist
       this.log.error(`Unable to find instrumentation target '${INSTRUMENTATION_TARGET}': ${(pmError || {}).message}`);
       if (pmOutput) {
@@ -268,7 +267,7 @@ class UiAutomator2Server {
       this.jwproxy.didInstrumentationExit = false;
       try {
         await this.stopInstrumentationProcess();
-      } catch (ign) {}
+      } catch {}
       await this.startInstrumentationProcess();
       if (!this.jwproxy.didInstrumentationExit) {
         try {
@@ -276,7 +275,7 @@ class UiAutomator2Server {
             try {
               await this.jwproxy.command('/status', 'GET');
               return true;
-            } catch (err) {
+            } catch {
               // short circuit to retry or fail fast
               return this.jwproxy.didInstrumentationExit;
             }
@@ -284,7 +283,7 @@ class UiAutomator2Server {
             waitMs: timeout,
             intervalMs: 1000,
           });
-        } catch (err) {
+        } catch {
           throw this.log.errorWithException(
             `The instrumentation process cannot be initialized within ${timeout}ms timeout. `
             + 'Make sure the application under test does not crash and investigate the logcat output. '
@@ -391,14 +390,14 @@ class UiAutomator2Server {
               url: `http://${this.host}:${this.systemPort}/status`,
               timeout: axiosTimeout,
             });
-          } catch (err) {
+          } catch {
             return true;
           }
         }, {
           waitMs: timeout,
           intervalMs: 100,
         });
-      } catch (err) {
+      } catch {
         this.log.warn(`The ${SERVER_TEST_PACKAGE_ID} process might fail to stop within ${timeout}ms timeout.`);
       }
     };
@@ -429,12 +428,12 @@ class UiAutomator2Server {
         this.adb.forceStop(SERVER_PACKAGE_ID),
         this.adb.forceStop(SERVER_TEST_PACKAGE_ID)
       ]);
-    } catch (ignore) {}
+    } catch {}
     if (strictCleanup) {
       // https://github.com/appium/appium/issues/10749
       try {
         await this.adb.killProcessesByName('uiautomator');
-      } catch (ignore) {}
+      } catch {}
     }
     await waitStop();
   }