Address review comments

Co-authored-by: SrinivasanTarget <srinivasan.sekar1990@gmail.com>

Author: saikrishna321

docs/reference/execute-methods.md

@@ -484,15 +484,32 @@ Reads the battery information from the device under test. This endpoint only ret
 
 #### Returned Result
 
-The actual battery info map, which consists of the following entries:
+The returned object always includes at least the following entries:
 
-- level: Battery level in range [0.0, 1.0], where 1.0 means 100% charge.
-- state: Battery state as an integer number. The following values are possible:
+- `level`: Battery level in range [0.0, 1.0], where 1.0 means 100% charge.
+- `state`: Battery state as an integer number. The following values are possible:
    *   UIDeviceBatteryStateUnknown = 0
    *   UIDeviceBatteryStateUnplugged = 1  // on battery, discharging
    *   UIDeviceBatteryStateCharging = 2   // plugged in, less than 100%
    *   UIDeviceBatteryStateFull = 3       // plugged in, at 100%
 
+On iOS 18 and newer real devices, the returned object may also include many additional advanced battery information fields, such as capacity, health metrics, temperature, and more. For a full list of possible advanced fields, see the [BatteryInfo](../../lib/commands/advanced-battery-types.ts).
+
+The returned object is a superset of the basic battery info, and may look like:
+
+```json
+{
+  "level": 0.85,
+  "state": 2,
+  "AbsoluteCapacity": 1234,
+  "CycleCount": 456,
+  "Temperature": 29.5,
+  "...": "other advanced fields"
+}
+```
+
+If advanced fields are not available (e.g., on older iOS versions or simulators), only `level` and `state` will be present.
+
 ### mobile: deviceInfo
 
 Returns the miscellaneous information about the device under test.
@@ -1777,7 +1794,7 @@ The above three extensions are available since the driver version 4.9.0.
 
 You can create a condition on a connected device to test your app under adverse conditions, such as poor network connectivity or thermal constraints.
 
-When you start a device condition, the operating system on the device behaves as if its environment has changed. The device condition remains active until you stop the device condition or disconnect the device. For example, you can start a device condition, run your app, monitor your app’s energy usage, and then stop the condition.
+When you start a device condition, the operating system on the device behaves as if its environment has changed. The device condition remains active until you stop the device condition or disconnect the device. For example, you can start a device condition, run your app, monitor your app's energy usage, and then stop the condition.
 
 Reference: [Test under adverse device conditions (iOS)](https://help.apple.com/xcode/mac/current/#/dev308429d42)
 

lib/commands/battery-types.ts lib/commands/advanced-battery-types.tslib/commands/battery-types.ts renamed to lib/commands/advanced-battery-types.ts

@@ -1,35 +1,38 @@
 import { isIos18OrNewer } from '../utils.js';
+import log from '../logger.js';
 
 export default {
   /**
    * Reads the battery information from the device under test.
    *
    * This endpoint only returns reliable result on real devices.
    *
-   * @returns {Promise<BatteryInfo>} The battery info
+   * @returns {Promise<import('./types').BatteryInfo & Partial<import('./advanced-battery-types').BatteryInfo>>}
    * @this {import('../driver').XCUITestDriver}
    */
   async mobileGetBatteryInfo() {
     let batteryInfoFromShimService;
-    if (isIos18OrNewer(this.opts)) {
-      // TODO: Remove this once we publish the appium-ios-remotexpc package to npm
-      /* eslint-disable import/no-unresolved */
-      // @ts-expect-error
-      const {Services} = await import('appium-ios-remotexpc');
-      const diagService = await Services.startDiagnosticsService(this.device.udid);
-      batteryInfoFromShimService = await diagService.ioregistry({
-        ioClass: 'IOPMPowerSource',
-        returnRawJson: true,
-      });
+    if (isIos18OrNewer(this.opts) && this.isRealDevice()) {
+      let diagService;
+      try {
+        const {Services} = await import('appium-ios-remotexpc');
+        diagService = await Services.startDiagnosticsService(this.device.udid);
+        batteryInfoFromShimService = await diagService.ioregistry({
+          ioClass: 'IOPMPowerSource',
+          returnRawJson: true,
+        });
+      } catch (err) {
+        log.error(`Failed to get battery info from DiagnosticsService: ${err.message}`);
+      }
     }
 
-    const batteryInfoFromWda = /** @type {import('./battery-types.js').BatteryInfo} */ (
+    const batteryInfoFromWda = /** @type {import('./types').BatteryInfo}} */ (
       await this.proxyCommand('/wda/batteryInfo', 'GET')
     );
-    return {...batteryInfoFromWda, ...batteryInfoFromShimService};
+    return {...batteryInfoFromWda, ...batteryInfoFromShimService || {}};
   },
 };
 
 /**
- * @typedef {import('./battery-types.js').BatteryInfo} BatteryInfo
+ * @typedef {import('./types').BatteryInfo} BatteryInfo
  */

lib/commands/battery.js

@@ -3,12 +3,28 @@ import type B from 'bluebird';
 import type {EventEmitter} from 'node:events';
 import type {LiteralUnion, SetOptional, SetRequired} from 'type-fest';
 import type {Page} from '../types';
-import type {AuthorizationStatus, ThermalState} from './enum';
+import type {AuthorizationStatus, BatteryState, ThermalState} from './enum';
 
 export type Direction = 'up' | 'down' | 'left' | 'right';
 
 export type LocationWithAltitude = SetRequired<Location, 'altitude'>;
 
+
+/**
+ * Battery information. Returned by the `mobile: getBatteryInfo` execute method.
+ */
+export interface BatteryInfo {
+  /**
+   * Battery level in range `[0.0, 1.0]`, where `1.0` means 100% charge.
+   */
+  level: number;
+  /**
+   * Battery state
+   */
+  state: BatteryState;
+}
+
+
 /**
  * Options for `stopRecordingScreen` command
  */

lib/commands/types.ts

@@ -85,6 +85,7 @@
     "appium-ios-device": "^2.8.0",
     "appium-ios-simulator": "^6.2.2",
     "appium-remote-debugger": "^12.2.0",
+    "appium-ios-remotexpc": "0.0.3",
     "appium-webdriveragent": "^9.11.0",
     "appium-xcode": "^5.1.4",
     "async-lock": "^1.4.0",

package.json

@@ -9,8 +9,6 @@
 import {logger, node} from '@appium/support';
 import _ from 'lodash';
 
-/* eslint-disable import/no-unresolved */
-// TODO: Remove this once we publish the appium-ios-remotexpc package to npm
 import {
   PacketStreamServer,
   TunnelManager,