appium-android-driver 13.1.2 → 13.2.0

package/build/lib/utils.d.ts

@@ -5,6 +5,12 @@ export declare const ADB_SHELL_FEATURE = "adb_shell";
 export declare const ADB_LISTEN_ALL_NETWORK_FEATURE = "adb_listen_all_network";
 export declare const GET_SERVER_LOGS_FEATURE = "get_server_logs";
 export declare const SET_STYLUS_HANDWRITING_FEATURE = "set_stylus_handwriting";
+interface LogEntryWithPrefix {
+    message: string;
+    prefix?: string;
+    timestamp?: number;
+    level?: string;
+}
 /**
  * Assert the presence of particular keys in the given object
  *
@@ -24,12 +30,6 @@ export declare function parseArray(cap: string | string[]): string[];
  * @returns
  */
 export declare function removeAllSessionWebSocketHandlers(this: AndroidDriver): Promise<void>;
-interface LogEntryWithPrefix {
-    message: string;
-    prefix?: string;
-    timestamp?: number;
-    level?: string;
-}
 /**
  *
  * @param x

package/build/lib/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AACzC,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,UAAU,CAAC;AAE5C,YAAY,EAAC,QAAQ,EAAC,CAAC;AAEvB,eAAO,MAAM,iBAAiB,cAAc,CAAC;AAC7C,eAAO,MAAM,8BAA8B,2BAA2B,CAAC;AACvE,eAAO,MAAM,uBAAuB,oBAAoB,CAAC;AACzD,eAAO,MAAM,8BAA8B,2BAA2B,CAAC;AAGvE;;;;;;GAMG;AACH,wBAAgB,WAAW,CACzB,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,EAC3B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACxB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAOrB;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,EAAE,CAa3D;AAED;;;GAGG;AACH,wBAAsB,iCAAiC,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAS1F;AAED,UAAU,kBAAkB;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,CAAC,EAAE,kBAAkB,GAAG,QAAQ,CAG7E;AAED;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,GAAE,MAAc,GAAG,QAAQ,CAM/F"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AACzC,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,UAAU,CAAC;AAE5C,YAAY,EAAC,QAAQ,EAAC,CAAC;AAEvB,eAAO,MAAM,iBAAiB,cAAc,CAAC;AAC7C,eAAO,MAAM,8BAA8B,2BAA2B,CAAC;AACvE,eAAO,MAAM,uBAAuB,oBAAoB,CAAC;AACzD,eAAO,MAAM,8BAA8B,2BAA2B,CAAC;AAGvE,UAAU,kBAAkB;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CACzB,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,EAC3B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACxB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAOrB;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,EAAE,CAa3D;AAED;;;GAGG;AACH,wBAAsB,iCAAiC,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAS1F;AAED;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,CAAC,EAAE,kBAAkB,GAAG,QAAQ,CAG7E;AAED;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,GAAE,MAAc,GAAG,QAAQ,CAM/F"}

package/build/lib/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.ts"],"names":[],"mappings":";;;;;;AAoBA,kCAUC;AAOD,gCAaC;AAMD,8EASC;AAcD,sEAGC;AAUD,kCAMC;AAlGD,oDAAuB;AACvB,0CAAqC;AAMxB,QAAA,iBAAiB,GAAG,WAAW,CAAC;AAChC,QAAA,8BAA8B,GAAG,wBAAwB,CAAC;AAC1D,QAAA,uBAAuB,GAAG,iBAAiB,CAAC;AAC5C,QAAA,8BAA8B,GAAG,wBAAwB,CAAC;AACvE,MAAM,kBAAkB,GAAG,yBAAyB,CAAC,CAAC,uCAAuC;AAE7F;;;;;;GAMG;AACH,SAAgB,WAAW,CACzB,QAA2B,EAC3B,IAAyB;IAEzB,KAAK,MAAM,OAAO,IAAI,gBAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;QAClE,IAAI,CAAC,gBAAC,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC;YAC1B,MAAM,IAAI,eAAM,CAAC,oBAAoB,CAAC,IAAI,OAAO,6BAA6B,CAAC,CAAC;QAClF,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;GAIG;AACH,SAAgB,UAAU,CAAC,GAAsB;IAC/C,IAAI,UAAU,CAAC;IACf,IAAI,CAAC;QACH,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,GAAa,CAAC,CAAC;IACzC,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;IAEV,IAAI,gBAAC,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QAC1B,OAAO,UAAU,CAAC;IACpB,CAAC;SAAM,IAAI,gBAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC3B,OAAO,CAAC,GAAG,CAAC,CAAC;IACf,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,iDAAiD,GAAG,EAAE,CAAC,CAAC;AAC1E,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,iCAAiC;IACrD,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,gBAAC,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAAE,CAAC;QACxE,OAAO;IACT,CAAC;IAED,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC9E,KAAK,MAAM,QAAQ,IAAI,gBAAC,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC;QAC9C,MAAM,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC;IACrD,CAAC;AACH,CAAC;AASD;;;;GAIG;AACH,SAAgB,6BAA6B,CAAC,CAAqB;IACjE,MAAM,GAAG,GAAG,gBAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;IAC3E,OAAO,WAAW,CAAC,CAAC,CAAC,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,EAAE,gBAAC,CAAC,OAAO,CAAC,GAAG,EAAE,kBAAkB,EAAE,EAAE,CAAC,CAAC,CAAC;AACxF,CAAC;AAED;;;;;;;GAOG;AACH,SAAgB,WAAW,CAAC,SAAiB,EAAE,OAAe,EAAE,QAAgB,KAAK;IACnF,OAAO;QACL,SAAS;QACT,KAAK,EAAE,KAAY;QACnB,OAAO;KACR,CAAC;AACJ,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.ts"],"names":[],"mappings":";;;;;;AA2BA,kCAUC;AAOD,gCAaC;AAMD,8EASC;AAOD,sEAGC;AAUD,kCAMC;AAlGD,oDAAuB;AACvB,0CAAqC;AAMxB,QAAA,iBAAiB,GAAG,WAAW,CAAC;AAChC,QAAA,8BAA8B,GAAG,wBAAwB,CAAC;AAC1D,QAAA,uBAAuB,GAAG,iBAAiB,CAAC;AAC5C,QAAA,8BAA8B,GAAG,wBAAwB,CAAC;AACvE,MAAM,kBAAkB,GAAG,yBAAyB,CAAC,CAAC,uCAAuC;AAS7F;;;;;;GAMG;AACH,SAAgB,WAAW,CACzB,QAA2B,EAC3B,IAAyB;IAEzB,KAAK,MAAM,OAAO,IAAI,gBAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;QAClE,IAAI,CAAC,gBAAC,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC;YAC1B,MAAM,IAAI,eAAM,CAAC,oBAAoB,CAAC,IAAI,OAAO,6BAA6B,CAAC,CAAC;QAClF,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;GAIG;AACH,SAAgB,UAAU,CAAC,GAAsB;IAC/C,IAAI,UAAU,CAAC;IACf,IAAI,CAAC;QACH,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,GAAa,CAAC,CAAC;IACzC,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;IAEV,IAAI,gBAAC,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QAC1B,OAAO,UAAU,CAAC;IACpB,CAAC;SAAM,IAAI,gBAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC3B,OAAO,CAAC,GAAG,CAAC,CAAC;IACf,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,iDAAiD,GAAG,EAAE,CAAC,CAAC;AAC1E,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,iCAAiC;IACrD,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,gBAAC,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAAE,CAAC;QACxE,OAAO;IACT,CAAC;IAED,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC9E,KAAK,MAAM,QAAQ,IAAI,gBAAC,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC;QAC9C,MAAM,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC;IACrD,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,SAAgB,6BAA6B,CAAC,CAAqB;IACjE,MAAM,GAAG,GAAG,gBAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;IAC3E,OAAO,WAAW,CAAC,CAAC,CAAC,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,EAAE,gBAAC,CAAC,OAAO,CAAC,GAAG,EAAE,kBAAkB,EAAE,EAAE,CAAC,CAAC,CAAC;AACxF,CAAC;AAED;;;;;;;GAOG;AACH,SAAgB,WAAW,CAAC,SAAiB,EAAE,OAAe,EAAE,QAAgB,KAAK;IACnF,OAAO;QACL,SAAS;QACT,KAAK,EAAE,KAAY;QACnB,OAAO;KACR,CAAC;AACJ,CAAC"}

package/lib/commands/app-management.ts

@@ -2,7 +2,6 @@ import {util} from '@appium/support';
 import {waitForCondition, longSleep} from 'asyncbox';
 import _ from 'lodash';
 import {EOL} from 'node:os';
-import B from 'bluebird';
 import type {AndroidDriver, AndroidDriverOpts} from '../driver';
 import type {AppInfoMap, AppState, IsAppInstalledOptions, TerminateAppOpts} from './types';
 import type {
@@ -599,7 +598,7 @@ export async function installOtherApks(
   } = opts ?? this.opts;
 
   // Install all of the APK's asynchronously
-  await B.all(
+  await Promise.all(
     otherApps.map((otherApp) => {
       this.log.debug(`Installing app: ${otherApp}`);
       return this.adb.installOrUpgrade(otherApp, undefined, {
@@ -632,7 +631,7 @@ export async function uninstallOtherPackages(
   }
 
   this.log.debug(`Uninstalling packages: ${appPackages}`);
-  await B.all(appPackages.map((appPackage) => this.adb.uninstallApk(appPackage)));
+  await Promise.all(appPackages.map((appPackage) => this.adb.uninstallApk(appPackage)));
 }
 
 /**

package/lib/commands/bidi/models.ts

@@ -27,6 +27,13 @@ export const makeContextUpdatedEvent = (contextName: string, domain: string) =>
 export const makeObsoleteContextUpdatedEvent = (contextName: string) =>
   toContextUpdatedEvent(CONTEXT_UPDATED_EVENT_OBSOLETE, contextName);
 
+/**
+ * Builds a BiDi `log.entryAdded` event from a logcat entry.
+ *
+ * @param entry - Raw log line from the device
+ * @param context - Active session context name
+ * @param type - Log entry classification passed through to the event
+ */
 export function makeLogEntryAddedEvent(
   entry: LogEntry,
   context: string,

package/lib/commands/bidi/types.ts

@@ -1,3 +1,13 @@
+export type BiDiLogLevel = 'debug' | 'info' | 'warn' | 'error';
+
+// https://w3c.github.io/webdriver-bidi/#event-log-entryAdded
+export interface LogEntryAddedEvent extends BiDiEvent<LogEntryAddedEventParams> {
+  context: string;
+}
+
+// https://github.com/appium/appium/issues/20741
+export interface ContextUpdatedEvent extends BiDiEvent<ContentUpdatedParams> {}
+
 interface BiDiEvent<TParams> {
   method: string;
   params: TParams;
@@ -8,8 +18,6 @@ interface LogEntrySource {
   context?: string;
 }
 
-export type BiDiLogLevel = 'debug' | 'info' | 'warn' | 'error';
-
 interface LogEntryAddedEventParams {
   type: string;
   level: BiDiLogLevel;
@@ -18,15 +26,7 @@ interface LogEntryAddedEventParams {
   timestamp: number;
 }
 
-// https://w3c.github.io/webdriver-bidi/#event-log-entryAdded
-export interface LogEntryAddedEvent extends BiDiEvent<LogEntryAddedEventParams> {
-  context: string;
-}
-
 interface ContentUpdatedParams {
   name: string;
   type: 'NATIVE' | 'WEB';
 }
-
-// https://github.com/appium/appium/issues/20741
-export interface ContextUpdatedEvent extends BiDiEvent<ContentUpdatedParams> {}

package/lib/commands/bluetooth.ts

@@ -8,6 +8,8 @@ const SUPPORTED_ACTIONS = {
   UNPAIR_ALL: 'unpairAll',
 } as const;
 
+type BluetoothAction = (typeof SUPPORTED_ACTIONS)[keyof typeof SUPPORTED_ACTIONS];
+
 /**
  * Performs the requested action on the default bluetooth adapter
  *
@@ -34,5 +36,3 @@ export async function mobileBluetooth(this: AndroidDriver, action: BluetoothActi
       );
   }
 }
-
-type BluetoothAction = (typeof SUPPORTED_ACTIONS)[keyof typeof SUPPORTED_ACTIONS];

package/lib/commands/context/exports.ts

@@ -305,9 +305,15 @@ export async function startChromedriverProxy(
     cd = await setupNewChromedriver.bind(this)(opts, this.adb.curDeviceId as string, context);
     // bind our stop/exit handler, passing in context so we know which
     // one stopped unexpectedly
-    cd.on(Chromedriver.EVENT_CHANGED, (msg) => {
+    cd.on(Chromedriver.EVENT_CHANGED, async (msg) => {
       if (msg.state === Chromedriver.STATE_STOPPED) {
-        this.onChromedriverStop(context);
+        try {
+          await this.onChromedriverStop(context);
+        } catch (err) {
+          this.log.warn(
+            `Error handling chromedriver stop event for context ${context}: ${(err as Error).message}`,
+          );
+        }
       }
     });
     // save the chromedriver object under the context
@@ -446,9 +452,15 @@ export async function startChromeSession(this: AndroidDriver): Promise<void> {
   }
   const chromedriver = await setupNewChromedriver.bind(this)(opts, this.adb.curDeviceId as string);
   this.chromedriver = chromedriver;
-  chromedriver.on(Chromedriver.EVENT_CHANGED, (msg) => {
+  chromedriver.on(Chromedriver.EVENT_CHANGED, async (msg) => {
     if (msg.state === Chromedriver.STATE_STOPPED) {
-      this.onChromedriverStop(CHROMIUM_WIN);
+      try {
+        await this.onChromedriverStop(CHROMIUM_WIN);
+      } catch (err) {
+        this.log.warn(
+          `Error handling chromedriver stop event for context ${CHROMIUM_WIN}: ${(err as Error).message}`,
+        );
+      }
     }
   });
 

package/lib/commands/context/helpers.ts

@@ -4,7 +4,6 @@ import axios from 'axios';
 import net from 'node:net';
 import {findAPortNotInUse} from 'portscanner';
 import {sleep} from 'asyncbox';
-import B from 'bluebird';
 import os from 'node:os';
 import path from 'node:path';
 import http from 'node:http';
@@ -668,7 +667,7 @@ async function collectWebviewsDetails(
       })(),
     );
   }
-  await B.all(detailCollectors);
+  await Promise.all(detailCollectors);
   this.log.debug(`CDP data collection completed`);
 }
 

package/lib/commands/device/common.ts

@@ -1,6 +1,5 @@
 import * as semver from 'semver';
 import _ from 'lodash';
-import B from 'bluebird';
 import path from 'node:path';
 import {setMockLocationApp} from '../geolocation';
 import {SETTINGS_HELPER_ID} from 'io.appium.settings';
@@ -304,5 +303,5 @@ export async function initDevice(this: AndroidDriver): Promise<void> {
     });
   }
 
-  await B.all(setupPromises);
+  await Promise.all(setupPromises);
 }

package/lib/commands/device/utils.ts

@@ -8,7 +8,6 @@ import {
   UNICODE_IME,
   EMPTY_IME,
 } from 'io.appium.settings';
-import B from 'bluebird';
 import {prepareEmulatorForImageInjection} from '../image-injection';
 import {ADB_LISTEN_ALL_NETWORK_FEATURE} from '../../utils';
 import type {AndroidDriver} from '../../driver';
@@ -212,7 +211,7 @@ export async function pushSettingsApp(this: AndroidDriver, throwIfError: boolean
   }
 
   try {
-    await B.all([
+    await Promise.all([
       this.settingsApp.adjustNotificationsPermissions(),
       this.settingsApp.adjustMediaProjectionServicePermissions(),
     ]);

package/lib/commands/execute.ts

@@ -7,6 +7,8 @@ import type {Chromedriver} from 'appium-chromedriver';
 
 const EXECUTE_SCRIPT_PREFIX = 'mobile:';
 
+type ExecuteMethodArgs = readonly any[] | readonly [StringRecord] | Readonly<StringRecord>;
+
 /**
  * Executes a script on the device or in a web context.
  *
@@ -39,8 +41,6 @@ export async function execute(
   });
 }
 
-// #region Internal Helpers
-
 /**
  * Massages the arguments going into an execute method.
  *
@@ -70,7 +70,3 @@ function preprocessExecuteMethodArgs(args?: ExecuteMethodArgs): StringRecord {
 
   return executeMethodArgs;
 }
-
-// #endregion
-
-type ExecuteMethodArgs = readonly any[] | readonly [StringRecord] | Readonly<StringRecord>;

package/lib/commands/geolocation.ts

@@ -1,7 +1,7 @@
 import _ from 'lodash';
+import {asyncmap} from 'asyncbox';
 import {fs, tempDir} from '@appium/support';
 import path from 'node:path';
-import B from 'bluebird';
 import type {Location} from '@appium/types';
 import {SETTINGS_HELPER_ID} from 'io.appium.settings';
 import {getThirdPartyPackages} from './app-management';
@@ -223,15 +223,11 @@ async function resetMockLocation(this: AndroidDriver): Promise<void> {
     }
 
     this.log.debug(`Resetting mock_location permission for the following apps: ${resultPkgs}`);
-    await B.all(
-      resultPkgs.map((pkgId) =>
-        (async () => {
-          try {
-            await this.adb.shell(['appops', 'set', pkgId, 'android:mock_location', 'deny']);
-          } catch {}
-        })(),
-      ),
-    );
+    await asyncmap(resultPkgs, async (pkgId) => {
+      try {
+        await this.adb.shell(['appops', 'set', pkgId, 'android:mock_location', 'deny']);
+      } catch {}
+    });
   } catch (err) {
     this.log.warn(`Unable to reset mock location: ${(err as Error).message}`);
   }

package/lib/commands/lock/exports.ts

@@ -1,4 +1,4 @@
-import B from 'bluebird';
+import {sleep} from 'asyncbox';
 import {
   validateUnlockCapabilities,
   FINGERPRINT_UNLOCK,
@@ -34,7 +34,7 @@ export async function lock(this: AndroidDriver, seconds?: number): Promise<void>
   if (floatSeconds <= 0) {
     return;
   }
-  await B.delay(1000 * floatSeconds);
+  await sleep(1000 * floatSeconds);
   await this.unlock();
 }
 

package/lib/commands/media-projection.ts

@@ -13,6 +13,16 @@ const DEFAULT_EXT = '.mp4';
 const MIN_API_LEVEL = 29;
 const DEFAULT_FILENAME_FORMAT = 'YYYY-MM-DDTHH-mm-ss';
 
+interface UploadOptions {
+  user?: string;
+  pass?: string;
+  method?: HTTPMethod;
+  headers?: StringRecord;
+  fileFieldName?: string;
+  formFields?: FormFields;
+  uploadTimeout?: number;
+}
+
 /**
  * Starts media projection-based screen recording on the Android device.
  *
@@ -139,8 +149,6 @@ export async function mobileStopMediaProjectionRecording(
   }
 }
 
-// #region Internal helpers
-
 async function uploadRecordedMedia(
   localFile: string,
   remotePath?: string,
@@ -186,15 +194,3 @@ async function verifyMediaProjectionRecordingIsSupported(adb: ADB): Promise<void
     );
   }
 }
-
-// #endregion
-
-interface UploadOptions {
-  user?: string;
-  pass?: string;
-  method?: HTTPMethod;
-  headers?: StringRecord;
-  fileFieldName?: string;
-  formFields?: FormFields;
-  uploadTimeout?: number;
-}

package/lib/commands/network.ts

@@ -1,7 +1,6 @@
 import _ from 'lodash';
 import {errors} from 'appium/driver';
 import {util} from '@appium/support';
-import B from 'bluebird';
 import type {AndroidDriver} from '../driver';
 import type {ServiceType, GetConnectivityResult} from './types';
 
@@ -87,7 +86,7 @@ export async function mobileSetConnectivity(
     return acc;
   }, []);
   const currentState = await this.mobileGetConnectivity(services);
-  const setters: Array<Promise<any> | (() => Promise<any>)> = [];
+  const setters: Promise<any>[] = [];
   if (!_.isUndefined(wifi) && currentState.wifi !== Boolean(wifi)) {
     setters.push(this.setWifiState(wifi));
   }
@@ -95,15 +94,17 @@ export async function mobileSetConnectivity(
     setters.push(this.setDataState(data));
   }
   if (!_.isUndefined(airplaneMode) && currentState.airplaneMode !== Boolean(airplaneMode)) {
-    setters.push(async () => {
-      await this.adb.setAirplaneMode(airplaneMode);
-      if ((await this.adb.getApiLevel()) < 30) {
-        await this.adb.broadcastAirplaneMode(airplaneMode);
-      }
-    });
+    setters.push(
+      (async () => {
+        await this.adb.setAirplaneMode(airplaneMode);
+        if ((await this.adb.getApiLevel()) < 30) {
+          await this.adb.broadcastAirplaneMode(airplaneMode);
+        }
+      })(),
+    );
   }
   if (!_.isEmpty(setters)) {
-    await B.all(setters);
+    await Promise.all(setters);
   }
 }
 
@@ -134,19 +135,24 @@ export async function mobileGetConnectivity(
     );
   }
 
-  const statePromises = {
-    wifi: B.resolve(svcs.includes(WIFI_KEY_NAME) ? this.adb.isWifiOn() : undefined),
-    data: B.resolve(svcs.includes(DATA_KEY_NAME) ? this.adb.isDataOn() : undefined),
-    airplaneMode: B.resolve(
-      svcs.includes(AIRPLANE_MODE_KEY_NAME) ? this.adb.isAirplaneModeOn() : undefined,
-    ),
-  };
-  await B.all(_.values(statePromises));
-  return _.reduce(
-    statePromises,
-    (state, v, k) => (_.isUndefined(v.value()) ? state : {...state, [k]: Boolean(v.value())}),
-    {} as GetConnectivityResult,
-  );
+  const [wifi, data, airplaneMode] = await Promise.all([
+    svcs.includes(WIFI_KEY_NAME) ? this.adb.isWifiOn() : Promise.resolve(undefined),
+    svcs.includes(DATA_KEY_NAME) ? this.adb.isDataOn() : Promise.resolve(undefined),
+    svcs.includes(AIRPLANE_MODE_KEY_NAME)
+      ? this.adb.isAirplaneModeOn()
+      : Promise.resolve(undefined),
+  ]);
+  const result: GetConnectivityResult = {};
+  if (!_.isUndefined(wifi)) {
+    result.wifi = Boolean(wifi);
+  }
+  if (!_.isUndefined(data)) {
+    result.data = Boolean(data);
+  }
+  if (!_.isUndefined(airplaneMode)) {
+    result.airplaneMode = Boolean(airplaneMode);
+  }
+  return result;
 }
 
 /**

package/lib/commands/performance.ts

@@ -139,74 +139,6 @@ export async function mobileGetPerformanceData(
 
 // #region Internal helpers
 
-/**
- * API level between 18 and 30
- * ['<System Type>', '<Memory Type>', <pss total>, <private dirty>, <private clean>, <swapPss dirty>, <heap size>, <heap alloc>, <heap free>]
- * except 'TOTAL', which skips the second type name
- * !!! valDict gets mutated
- */
-function parseMeminfoForApi19To29(
-  entries: string[],
-  valDict: Record<string, string | number>,
-): void {
-  const [type, subType] = entries;
-  if (type === MEMINFO_TITLES.NATIVE && subType === MEMINFO_TITLES.HEAP) {
-    [
-      ,
-      ,
-      valDict.nativePss,
-      valDict.nativePrivateDirty,
-      ,
-      ,
-      valDict.nativeHeapSize,
-      valDict.nativeHeapAllocatedSize,
-    ] = entries;
-  } else if (type === MEMINFO_TITLES.DALVIK && subType === MEMINFO_TITLES.HEAP) {
-    [, , valDict.dalvikPss, valDict.dalvikPrivateDirty] = entries;
-  } else if (type === MEMINFO_TITLES.EGL && subType === MEMINFO_TITLES.MTRACK) {
-    [, , valDict.eglPss, valDict.eglPrivateDirty] = entries;
-  } else if (type === MEMINFO_TITLES.GL && subType === MEMINFO_TITLES.MTRACK) {
-    [, , valDict.glPss, valDict.glPrivateDirty] = entries;
-  } else if (type === MEMINFO_TITLES.TOTAL && entries.length === 8) {
-    // there are two totals, and we only want the full listing, which has 8 entries
-    [, valDict.totalPss, valDict.totalPrivateDirty] = entries;
-  }
-}
-
-/**
- * API level 30 and above
- * ['<System Type>', '<Memory Type>', <pss total>, <private dirty>, <private clean>, <swapPss dirty>, <rss total>, <heap size>, <heap alloc>, <heap free>]
- * !!! valDict gets mutated
- */
-function parseMeminfoForApiAbove29(
-  entries: string[],
-  valDict: Record<string, string | number>,
-): void {
-  const [type, subType] = entries;
-  if (type === MEMINFO_TITLES.NATIVE && subType === MEMINFO_TITLES.HEAP) {
-    [
-      ,
-      ,
-      valDict.nativePss,
-      valDict.nativePrivateDirty,
-      ,
-      ,
-      valDict.nativeRss,
-      valDict.nativeHeapSize,
-      valDict.nativeHeapAllocatedSize,
-    ] = entries;
-  } else if (type === MEMINFO_TITLES.DALVIK && subType === MEMINFO_TITLES.HEAP) {
-    [, , valDict.dalvikPss, valDict.dalvikPrivateDirty, , , valDict.dalvikRss] = entries;
-  } else if (type === MEMINFO_TITLES.EGL && subType === MEMINFO_TITLES.MTRACK) {
-    [, , valDict.eglPss, valDict.eglPrivateDirty] = entries;
-  } else if (type === MEMINFO_TITLES.GL && subType === MEMINFO_TITLES.MTRACK) {
-    [, , valDict.glPss, valDict.glPrivateDirty] = entries;
-  } else if (type === MEMINFO_TITLES.TOTAL && entries.length === 9) {
-    // has 9 entries
-    [, valDict.totalPss, valDict.totalPrivateDirty, , , valDict.totalRss] = entries;
-  }
-}
-
 /**
  * Retrieves memory information for the specified application package.
  *
@@ -539,4 +471,72 @@ export async function getBatteryInfo(this: AndroidDriver, retries: number = 2):
   })) as any[][];
 }
 
+/**
+ * API level between 18 and 30
+ * ['<System Type>', '<Memory Type>', <pss total>, <private dirty>, <private clean>, <swapPss dirty>, <heap size>, <heap alloc>, <heap free>]
+ * except 'TOTAL', which skips the second type name
+ * !!! valDict gets mutated
+ */
+function parseMeminfoForApi19To29(
+  entries: string[],
+  valDict: Record<string, string | number>,
+): void {
+  const [type, subType] = entries;
+  if (type === MEMINFO_TITLES.NATIVE && subType === MEMINFO_TITLES.HEAP) {
+    [
+      ,
+      ,
+      valDict.nativePss,
+      valDict.nativePrivateDirty,
+      ,
+      ,
+      valDict.nativeHeapSize,
+      valDict.nativeHeapAllocatedSize,
+    ] = entries;
+  } else if (type === MEMINFO_TITLES.DALVIK && subType === MEMINFO_TITLES.HEAP) {
+    [, , valDict.dalvikPss, valDict.dalvikPrivateDirty] = entries;
+  } else if (type === MEMINFO_TITLES.EGL && subType === MEMINFO_TITLES.MTRACK) {
+    [, , valDict.eglPss, valDict.eglPrivateDirty] = entries;
+  } else if (type === MEMINFO_TITLES.GL && subType === MEMINFO_TITLES.MTRACK) {
+    [, , valDict.glPss, valDict.glPrivateDirty] = entries;
+  } else if (type === MEMINFO_TITLES.TOTAL && entries.length === 8) {
+    // there are two totals, and we only want the full listing, which has 8 entries
+    [, valDict.totalPss, valDict.totalPrivateDirty] = entries;
+  }
+}
+
+/**
+ * API level 30 and above
+ * ['<System Type>', '<Memory Type>', <pss total>, <private dirty>, <private clean>, <swapPss dirty>, <rss total>, <heap size>, <heap alloc>, <heap free>]
+ * !!! valDict gets mutated
+ */
+function parseMeminfoForApiAbove29(
+  entries: string[],
+  valDict: Record<string, string | number>,
+): void {
+  const [type, subType] = entries;
+  if (type === MEMINFO_TITLES.NATIVE && subType === MEMINFO_TITLES.HEAP) {
+    [
+      ,
+      ,
+      valDict.nativePss,
+      valDict.nativePrivateDirty,
+      ,
+      ,
+      valDict.nativeRss,
+      valDict.nativeHeapSize,
+      valDict.nativeHeapAllocatedSize,
+    ] = entries;
+  } else if (type === MEMINFO_TITLES.DALVIK && subType === MEMINFO_TITLES.HEAP) {
+    [, , valDict.dalvikPss, valDict.dalvikPrivateDirty, , , valDict.dalvikRss] = entries;
+  } else if (type === MEMINFO_TITLES.EGL && subType === MEMINFO_TITLES.MTRACK) {
+    [, , valDict.eglPss, valDict.eglPrivateDirty] = entries;
+  } else if (type === MEMINFO_TITLES.GL && subType === MEMINFO_TITLES.MTRACK) {
+    [, , valDict.glPss, valDict.glPrivateDirty] = entries;
+  } else if (type === MEMINFO_TITLES.TOTAL && entries.length === 9) {
+    // has 9 entries
+    [, valDict.totalPss, valDict.totalPrivateDirty, , , valDict.totalRss] = entries;
+  }
+}
+
 // #endregion

package/lib/commands/permissions.ts

@@ -1,5 +1,4 @@
 import {errors} from 'appium/driver';
-import B from 'bluebird';
 import _ from 'lodash';
 import {ADB_SHELL_FEATURE} from '../utils';
 import type {AndroidDriver} from '../driver';
@@ -25,6 +24,14 @@ const PERMISSIONS_TYPE = Object.freeze({
   REQUESTED: 'requested',
 } as const);
 
+type PMAction = (typeof PM_ACTION)[keyof typeof PM_ACTION];
+
+type AppOpsAction = (typeof APPOPS_ACTION)[keyof typeof APPOPS_ACTION];
+
+type PermissionTarget = (typeof PERMISSION_TARGET)[keyof typeof PERMISSION_TARGET];
+
+type PermissionsType = (typeof PERMISSIONS_TYPE)[keyof typeof PERMISSIONS_TYPE];
+
 /**
  * Changes permissions for an Android application.
  *
@@ -85,7 +92,6 @@ export async function mobileChangePermissions(
       );
   }
 }
-
 /**
  * Gets permissions for an Android application.
  *
@@ -120,9 +126,6 @@ export async function mobileGetPermissions(
   }
   return await actionFunc(appPackage as string);
 }
-
-// #region Internal helpers
-
 async function changePermissionsViaPm(
   this: AndroidDriver,
   permissions: string | string[],
@@ -155,10 +158,11 @@ async function changePermissionsViaPm(
   if (action === PM_ACTION.GRANT) {
     await this.adb.grantPermissions(appPackage, affectedPermissions);
   } else {
-    await B.all(affectedPermissions.map((name) => this.adb.revokePermission(appPackage, name)));
+    await Promise.all(
+      affectedPermissions.map((name) => this.adb.revokePermission(appPackage, name)),
+    );
   }
 }
-
 async function changePermissionsViaAppops(
   this: AndroidDriver,
   permissions: string | string[],
@@ -182,12 +186,5 @@ async function changePermissionsViaAppops(
   const promises = (_.isArray(permissions) ? permissions : [permissions]).map((permission) =>
     this.adb.shell(['appops', 'set', appPackage, permission, action]),
   );
-  await B.all(promises);
+  await Promise.all(promises);
 }
-
-// #endregion
-
-type PMAction = (typeof PM_ACTION)[keyof typeof PM_ACTION];
-type AppOpsAction = (typeof APPOPS_ACTION)[keyof typeof APPOPS_ACTION];
-type PermissionTarget = (typeof PERMISSION_TARGET)[keyof typeof PERMISSION_TARGET];
-type PermissionsType = (typeof PERMISSIONS_TYPE)[keyof typeof PERMISSIONS_TYPE];

package/lib/commands/recordscreen.ts

@@ -269,7 +269,7 @@ async function scheduleScreenRecord(
       `Starting the next ${chunkDuration}s-chunk ` +
         `of screen recording in order to achieve ${timeLimitInt}s total duration`,
     );
-    (async () => {
+    void (async () => {
       try {
         await scheduleScreenRecord.bind(this)(recordingProperties);
       } catch (e) {