chore: update d.ts

Author: SvetoslavTsenov

Diff for: lib/appium-driver.d.ts

@@ -55,7 +55,7 @@ export declare class AppiumDriver {
      */
     readonly storageByDeviceName: string;
     static createAppiumDriver(port: number, args: INsCapabilities): Promise<AppiumDriver>;
-    private static applyDeviceAdditionsSettings(args, sessionIfno);
+    private static applyDeviceAdditionsSettings;
     /**
      *
      * @param xPath
@@ -158,7 +158,7 @@ export declare class AppiumDriver {
      */
     startRecordingVideo(videoName: any): any;
     stopRecordingVideo(): Promise<any>;
-    private compare(imageName, timeOutSeconds?, tolerance?, rect?, toleranceType?);
+    private compare;
     prepareImageToCompare(filePath: string, rect: IRectangle): Promise<void>;
     takeScreenshot(fileName: string): Promise<string>;
     logScreenshot(fileName: string): Promise<string>;
@@ -171,10 +171,10 @@ export declare class AppiumDriver {
     resetApp(): Promise<void>;
     init(): Promise<void>;
     quit(): Promise<void>;
-    private static applyAdditionalSettings(args);
-    private convertArrayToUIElements(array, searchM, args);
-    private static configureLogging(driver, verbose);
-    private getExpectedImagePath(imageName);
+    private static applyAdditionalSettings;
+    private convertArrayToUIElements;
+    private static configureLogging;
+    private getExpectedImagePath;
     /**
     * Wait specific amount of time before continue execution
     * @param miliseconds
@@ -204,7 +204,7 @@ export declare class AppiumDriver {
     * @param waitForElement
     */
     findElementByAccessibilityIdIfExists(id: string, waitForElement?: number): Promise<UIElement>;
-    executeShellCommand(commandAndargs: {
+    static executeShellCommand(driver: any, commandAndargs: {
         command: string;
         "args": Array<any>;
     }): Promise<any>;

Diff for: lib/appium-driver.ts

@@ -187,7 +187,7 @@ export class AppiumDriver {
             try {
                 const sessionIfno = await driver.init(args.appiumCaps);
                 log(sessionIfno, args.verbose);
-                AppiumDriver.applyDeviceAdditionsSettings(args, sessionIfno);
+                await AppiumDriver.applyDeviceAdditionsSettings(driver, args, sessionIfno);
 
                 hasStarted = true;
             } catch (error) {
@@ -209,10 +209,15 @@ export class AppiumDriver {
         return new AppiumDriver(driver, wd, webio, driverConfig, args);
     }
 
-    private static applyDeviceAdditionsSettings(args: INsCapabilities, sessionIfno: any) {
+    private static async applyDeviceAdditionsSettings(driver, args: INsCapabilities, sessionIfno: any) {
         if (!args.device.config || !args.device.config.density || !args.device.config.offset) {
             args.device.config = {};
-            const density: number = sessionIfno[1].deviceScreenDensity / 100;
+            let density: number = sessionIfno[1].deviceScreenDensity / 100;
+            console.log(`Get density from appium session: ${density}`);
+            if (!density) {
+                density = await AppiumDriver.executeShellCommand(driver, { command: "wm", args: ["density"] });
+                console.log(`Device density recieved from adb shell command ${density}`);
+            }
             args.device.config['density'] = density;
 
             if (args.appiumCaps.platformName.toLowerCase() === "android") {
@@ -733,16 +738,17 @@ export class AppiumDriver {
         }
     }
 
-    public async executeShellCommand(commandAndargs: { command: string, "args": Array<any> }) {
-        const output = await this._driver.execute("mobile: shell", commandAndargs);
+    public static async executeShellCommand(driver, commandAndargs: { command: string, "args": Array<any> }) {
+        const output = await driver.execute("mobile: shell", commandAndargs);
         return output;
     }
+
     public async setDontKeepActivities(value: boolean) {
         if (this._args.isAndroid) {
             const status = value ? 1 : 0;
-            const output = await this.executeShellCommand({ command: "settings", args: ['put', 'global', 'always_finish_activities', status] });
+            const output = await AppiumDriver.executeShellCommand(this._driver, { command: "settings", args: ['put', 'global', 'always_finish_activities', status] });
             //check if set 
-            const check = await this.executeShellCommand({ command: "settings", args: ['get', 'global', 'always_finish_activities'] })
+            const check = await AppiumDriver.executeShellCommand(this._driver, { command: "settings", args: ['get', 'global', 'always_finish_activities'] })
             console.info(`always_finish_activities: ${check}`)
         } else {
             // Do nothing for iOS ...

Diff for: lib/appium-server.d.ts

@@ -16,9 +16,9 @@ export declare class AppiumServer {
     readonly server: child_process.ChildProcess;
     hasStarted: boolean;
     start(port: any, deviceManager?: IDeviceManager): Promise<boolean>;
-    private startAppiumServer(logLevel, isSauceLab);
+    private startAppiumServer;
     stop(): Promise<{}>;
-    private prepareDevice(deviceManager);
-    private prepareApp();
-    private resolveAppiumDependency();
+    private prepareDevice;
+    private prepareApp;
+    private resolveAppiumDependency;
 }

Diff for: lib/device-controller.d.ts

@@ -9,6 +9,6 @@ export declare class DeviceManger implements IDeviceManager {
     installApp(args: INsCapabilities): Promise<any>;
     uninstallApp(args: INsCapabilities): Promise<any>;
     static kill(device: IDevice): Promise<void>;
-    private static getDefaultDevice(args);
+    private static getDefaultDevice;
     getPackageId(device: IDevice, appPath: string): string;
 }

Diff for: lib/direction.d.ts

@@ -2,5 +2,5 @@ export declare const enum Direction {
     down = 0,
     up = 1,
     left = 2,
-    right = 3,
+    right = 3
 }

Diff for: lib/image-helper.d.ts

@@ -10,16 +10,16 @@ export declare class ImageHelper {
     blockOutAreas: IRectangle[];
     imageOutputLimit(): ImageOptions;
     thresholdType(): ImageOptions;
-    threshold(thresholdType: any): 0.01 | 10;
+    threshold(thresholdType: any): 10 | 0.01;
     delta(): number;
     static cropImageDefault(_args: INsCapabilities): {
         x: number;
         y: any;
         width: any;
         height: any;
     };
-    private static getOffsetPixels(args);
-    private runDiff(diffOptions, diffImage);
+    private static getOffsetPixels;
+    private runDiff;
     compareImages(actual: string, expected: string, output: string, valueThreshold?: number, typeThreshold?: any): Promise<boolean>;
     clipRectangleImage(rect: IRectangle, path: string): Promise<{}>;
     readImage(path: string): Promise<any>;

Diff for: lib/image-options.d.ts

@@ -1,5 +1,5 @@
 export declare enum ImageOptions {
     outputAll,
     pixel,
-    percent,
+    percent
 }

Diff for: lib/interfaces/ns-capabilities.d.ts

@@ -2,7 +2,7 @@ import { IDevice } from "mobile-devices-controller";
 export declare enum AutomationName {
     UiAutomator2 = "UIAutomator2",
     Appium = "Appium",
-    XCUITest = "XCUITest",
+    XCUITest = "XCUITest"
 }
 export interface INsCapabilities {
     projectDir: string;

Diff for: lib/locators.d.ts

@@ -8,7 +8,7 @@ export declare class Locator {
     readonly image: string;
     readonly locators: Map<string, string>;
     getElementByName(name: any): string;
-    private loadAndroidElements();
-    private loadIOSElements();
-    private createIosElement(element);
+    private loadAndroidElements;
+    private loadIOSElements;
+    private createIosElement;
 }

Diff for: lib/ns-capabilities.d.ts

@@ -53,10 +53,10 @@ export declare class NsCapabilities implements INsCapabilities {
     readonly wdaLocalPort: number;
     device: IDevice;
     readonly emulatorOptions: string;
-    private isAndroidPlatform();
-    private setAutomationName();
+    private isAndroidPlatform;
+    private setAutomationName;
     tryGetAndroidApiLevel(): number;
-    private resolveApplication();
-    private checkMandatoryCapabiliies();
-    private throwExceptions();
+    private resolveApplication;
+    private checkMandatoryCapabiliies;
+    private throwExceptions;
 }

Diff for: lib/search-options.d.ts

@@ -1,4 +1,4 @@
 export declare const enum SearchOptions {
     exact = 0,
-    contains = 1,
+    contains = 1
 }

Diff for: lib/ui-element.d.ts

@@ -9,7 +9,7 @@ export declare class UIElement {
     private _args;
     private _searchMethod;
     private _searchParams;
-    private _index;
+    private _index?;
     constructor(_element: any, _driver: any, _wd: any, _webio: any, _args: INsCapabilities, _searchMethod: string, _searchParams: string, _index?: number);
     /**
      * Click on element

Diff for: package.json

@@ -17,10 +17,12 @@
         "appium",
         "test"
     ],
-    "maintainers": [{
-        "name": "SvetoslavTsenov",
-        "email": "[email protected]"
-    }],
+    "maintainers": [
+        {
+            "name": "SvetoslavTsenov",
+            "email": "[email protected]"
+        }
+    ],
     "dependencies": {
         "app-root-path": "~2.0.1",
         "blink-diff": "~1.0.13",
@@ -48,4 +50,4 @@
         "prepare": "tsc",
         "watch": "tsc --watch"
     }
-}
+}