refactor: remove some caps that are no longer valid as server and etc.

Author: SvetoslavTsenov

Diff for: lib/appium-driver.ts

@@ -194,7 +194,7 @@ export class AppiumDriver {
                 console.log(error);
                 console.log("Rety launching appium driver!");
                 if (error && error.message && error.message.includes("WebDriverAgent")) {
-                    let freePort = await findFreePort(100, args.appiumCaps.port, args);
+                    const freePort = await findFreePort(100, args.wdaLocalPort);
                     console.log("args.appiumCaps['wdaLocalPort']", freePort);
                     args.appiumCaps["wdaLocalPort"] = freePort;
                 }

Diff for: lib/appium-server.ts

@@ -63,7 +63,7 @@ export class AppiumServer {
 
         log("Starting server...", this._args.verbose);
         const logLevel = this._args.verbose === true ? "debug" : "info";
-        this.port = port || this._args.port;
+        this.port = this._args.port || port;
         let retry = false;
 
         this.startAppiumServer(logLevel);
@@ -74,7 +74,7 @@ export class AppiumServer {
         while (retries > 0 && !response) {
             retries--;
             this.port += 10;
-            this.port = (await findFreePort(100, this.port, this._args));
+            this.port = (await findFreePort(100, this.port));
 
             this.startAppiumServer(logLevel);
             response = await waitForOutput(this._server, /listener started/, /Error: listen/, 60000, true);

Diff for: lib/parser.ts

@@ -10,8 +10,8 @@ const config = (() => {
         .option("testFolder", { describe: "e2e test folder name", default: "e2e", type: "string" })
         .option("appiumCapsLocation", { describe: "Capabilities", type: "string" })
         .option("sauceLab", { describe: "SauceLab", default: false, type: "boolean" })
-        .option("port", { alias: "p", describe: "Appium port", type: "string" })
-        .option("wdaLocalPort", { alias: "p", describe: "WDA port", type: "string" })
+        .option("port", { alias: "p", describe: "Appium port", default: 8300, type: "number" })
+        .option("wdaLocalPort", { alias: "wda", describe: "WDA port", default: 8410, type: "number" })
         .option("verbose", { alias: "v", describe: "Log actions", type: "boolean" })
         .option("path", { describe: "path", default: process.cwd(), type: "string" })
         .option("appPath", { describe: "application path", type: "string" })
@@ -20,13 +20,6 @@ const config = (() => {
         .option("reuseDevice", { describe: "Reusing device if available.", type: "boolean", default: false })
         .option("devMode", { alias: "dev-mode", describe: "Will skipp app instalation and will reuse the one installed on device!", type: "boolean", default: false })
         .option("ignoreDeviceController", { alias: "i-ns-device-controller", describe: "Use default appium options for running emulatos/ simulators.", type: "boolean", default: false })
-        .option("useDeviceControllerServer", {
-            alias: "use-ns-device-controller-server",
-            describe: "Use server to boot, kill, subscribe or unsubscribe for devices. Also this flag could be specified in as an evn variable",
-            type: "boolean",
-            default: false
-        })
-        .option("deviceControllerServerPort", { describe: "Reusing device if available.", type: "boolean", default: false })
         .help()
         .argv;
 

Diff for: lib/utils.d.ts

@@ -37,5 +37,5 @@ export declare function calculateOffset(direction: any, y: number, yOffset: numb
 export declare function scroll(wd: any, driver: any, direction: Direction, isIOS: boolean, y: number, x: number, yOffset: number, xOffset: number, verbose: any): Promise<void>;
 export declare const addExt: (fileName: string, ext: string) => string;
 export declare const isPortAvailable: (port: any) => Promise<{}>;
-export declare const findFreePort: (retries: number, port: number, args: INsCapabilities) => Promise<number>;
+export declare const findFreePort: (retries?: number, port?: number) => Promise<number>;
 export declare function wait(milisecodns: any): void;

Diff for: lib/utils.ts

@@ -445,7 +445,7 @@ export const isPortAvailable = (port) => {
     });
 };
 
-export const findFreePort = async (retries: number = 10, port: number = 3000, args: INsCapabilities) => {
+export const findFreePort = async (retries: number = 10, port: number = 3000) => {
     let p: number = port;
 
     while (!(await isPortAvailable(p)) && retries > 0) {