refactor: remove ServiceContext (#92)

Author: SvetoslavTsenov

lib/appium-driver.d.ts

@@ -25,7 +25,7 @@ export declare class AppiumDriver {
     private _logPath;
     private _storageByDeviceName;
     private _storageByPlatform;
-    private constructor(_driver, _wd, _webio, _driverConfig, _args);
+    private constructor();
     readonly imageHelper: ImageHelper;
     defaultWaitTime: number;
     readonly capabilities: any;

lib/appium-driver.ts

@@ -11,7 +11,6 @@ import { UIElement } from "./ui-element";
 import { Direction } from "./direction";
 import { Locator } from "./locators";
 import { Platform } from "mobile-devices-controller";
-import { ServiceContext } from "./service/service-context";
 import {
     addExt,
     log,
@@ -470,9 +469,8 @@ export class AppiumDriver {
 
             // It looks we need it for XCTest (iOS 10+ automation)
             if (args.appiumCaps.platformVersion >= 10) {
-                let freePort = await findFreePort(10, (parseInt(args.appiumCaps["wdaLocalPort"])) || 8400, args);
-                console.log(" args.appiumCaps['wdaLocalPort']", freePort)
-                args.appiumCaps["wdaLocalPort"] = freePort;
+                console.log(`args.appiumCaps['wdaLocalPort']: ${args.wdaPort}`);
+                args.appiumCaps["wdaLocalPort"] = args.wdaPort;
             }
         }
     }

lib/appium-server.d.ts

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

lib/appium-server.ts

@@ -12,7 +12,6 @@ import {
 import { INsCapabilities } from "./interfaces/ns-capabilities";
 import { IDeviceManager } from "./interfaces/device-manager";
 import { DeviceManger } from "./device-controller";
-import { ServiceContext } from "../lib/service/service-context";
 
 export class AppiumServer {
     private _server: child_process.ChildProcess;
@@ -56,7 +55,7 @@ export class AppiumServer {
         this._hasStarted = hasStarted;
     }
 
-    public async start(port, deviceManager: IDeviceManager = new DeviceManger(this._args.deviceControllerServerPort)) {
+    public async start(port, deviceManager: IDeviceManager = new DeviceManger()) {
         this._deviceManager = deviceManager;
         if (!this._args.device) {
             const device = await this._deviceManager.startDevice(this._args);
@@ -70,25 +69,30 @@ export class AppiumServer {
         this.port = port || this._args.port;
         let retry = false;
 
-        let response: boolean = false;
+        this.startAppiumServer(logLevel);
+
+        let response = await waitForOutput(this._server, /listener started/, /Error: listen/, 60000, this._args.verbose);
+
         let retries = 11;
         while (retries > 0 && !response) {
             retries--;
+            this.port += 10;
             this.port = (await findFreePort(100, this.port, this._args));
 
-            this._server = child_process.spawn(this._appium, ["-p", this.port.toString(), "--log-level", logLevel], {
-                shell: true,
-                detached: false
-            });
+            this.startAppiumServer(logLevel);
             response = await waitForOutput(this._server, /listener started/, /Error: listen/, 60000, this._args.verbose);
-            if (!response) {
-                this.port += 10;
-            }
         }
 
         return response;
     }
 
+    private startAppiumServer(logLevel) {
+        this._server = child_process.spawn(this._appium, ["-p", this.port.toString(), "--log-level", logLevel], {
+            shell: true,
+            detached: false
+        });
+    }
+
     public async stop() {
         await this._deviceManager.stopDevice(this._args);
         return new Promise((resolve, reject) => {

lib/device-controller.d.ts

@@ -1,11 +1,9 @@
 import { INsCapabilities } from "./interfaces/ns-capabilities";
 import { IDeviceManager } from "./interfaces/device-manager";
-import { ServiceContext } from "./service/service-context";
 import { IDevice } from "mobile-devices-controller";
 export declare class DeviceManger implements IDeviceManager {
-    private _serveiceContext;
     private static _emulators;
-    constructor(port: any, _serveiceContext?: ServiceContext);
+    constructor();
     startDevice(args: INsCapabilities): Promise<IDevice>;
     stopDevice(args: INsCapabilities): Promise<any>;
     installApp(args: INsCapabilities): Promise<any>;

lib/device-controller.ts

@@ -4,13 +4,11 @@ import {
     log,
     isWin,
     shutdown,
-    executeCommand,
-    findFreePort
+    executeCommand
 } from "./utils";
 import * as child_process from "child_process";
 import { INsCapabilities } from "./interfaces/ns-capabilities";
 import { IDeviceManager } from "./interfaces/device-manager";
-import { ServiceContext } from "./service/service-context";
 
 import {
     IDevice,
@@ -26,10 +24,7 @@ import {
 export class DeviceManger implements IDeviceManager {
     private static _emulators: Map<string, IDevice> = new Map();
 
-    constructor(port, private _serveiceContext: ServiceContext = undefined) {
-        if (!this._serveiceContext) {
-            this._serveiceContext = ServiceContext.createServer(port);
-        }
+    constructor() {
     }
 
     public async startDevice(args: INsCapabilities): Promise<IDevice> {
@@ -46,20 +41,6 @@ export class DeviceManger implements IDeviceManager {
             return device;
         }
 
-        // Using serve to manage deivces.
-        if (args.useDeviceControllerServer) {
-            const d = await this._serveiceContext.subscribe(args.appiumCaps.deviceName, args.appiumCaps.platformName.toLowerCase(), args.appiumCaps.platformVersion, args.appiumCaps.app);
-            delete d['__v'];
-            delete d['_id']
-            if (!d || !(d as IDevice)) {
-                console.error("", d);
-                throw new Error("Missing device: " + d);
-            }
-            console.log(`Device:`, d);
-
-            return <any>d;
-        }
-
         const allDevices = (await DeviceController.getDevices({ platform: args.appiumCaps.platformName }));
         if (!allDevices || allDevices === null || allDevices.length === 0) {
             console.log("We couldn't find any devices. We will try to proceed to appium! Maybe avd manager is missing")
@@ -111,27 +92,10 @@ export class DeviceManger implements IDeviceManager {
     public async stopDevice(args: INsCapabilities): Promise<any> {
         if (process.env["DEVICE_TOKEN"]) {
             return;
-        }
-        if (args.useDeviceControllerServer) {
-            const d = await this._serveiceContext.unsubscribe(args.device.token);
-            if (!d) {
-                console.error("", d);
-                throw new Error("Missing device: " + d);
-            }
-
-            try {
-                await this._serveiceContext.releasePort(args.port);
-                if (args.appiumCaps.wdaLocalPort) {
-                    await this._serveiceContext.releasePort(args.appiumCaps.wdaLocalPort);
-                }
-            } catch (error) {
-                console.log(error);
-            }
         } else if (DeviceManger._emulators.has(args.runType)
             && !args.reuseDevice
             && !args.isSauceLab
-            && !args.ignoreDeviceController
-            && !args.useDeviceControllerServer) {
+            && !args.ignoreDeviceController) {
             const device = DeviceManger._emulators.get(args.runType);
             await DeviceManger.kill(device);
         }

lib/interfaces/ns-capabilities.d.ts

@@ -20,6 +20,5 @@ export interface INsCapabilities {
     reuseDevice: boolean;
     device: IDevice;
     ignoreDeviceController: boolean;
-    useDeviceControllerServer: boolean;
-    deviceControllerServerPort: number;
+    wdaLocalPort: number;
 }

lib/interfaces/ns-capabilities.ts

@@ -21,6 +21,5 @@ export interface INsCapabilities {
     reuseDevice: boolean;
     device: IDevice;
     ignoreDeviceController: boolean;
-    useDeviceControllerServer: boolean;
-    deviceControllerServerPort: number;
+    wdaLocalPort: number;
 }

lib/ns-capabilities.d.ts

@@ -21,8 +21,7 @@ export declare class NsCapabilities implements INsCapabilities {
     private _emulatorOptions;
     private _device;
     private _ignoreDeviceController;
-    private _useDeviceControllerServer;
-    private _deviceControllerServerPort;
+    private _wdaLocalPort;
     private exceptions;
     constructor();
     readonly projectDir: any;
@@ -43,8 +42,7 @@ export declare class NsCapabilities implements INsCapabilities {
     readonly isSauceLab: any;
     appPath: string;
     readonly ignoreDeviceController: boolean;
-    readonly useDeviceControllerServer: boolean;
-    readonly deviceControllerServerPort: number;
+    readonly wdaLocalPort: number;
     device: IDevice;
     readonly emulatorOptions: string;
     private isAndroidPlatform();

lib/ns-capabilities.ts

@@ -25,8 +25,7 @@ export class NsCapabilities implements INsCapabilities {
     private _emulatorOptions: string;
     private _device: IDevice;
     private _ignoreDeviceController: boolean;
-    private _useDeviceControllerServer: boolean;
-    private _deviceControllerServerPort: number;
+    private _wdaLocalPort: number;
     private exceptions: Array<string> = new Array();
 
     constructor() {
@@ -48,8 +47,7 @@ export class NsCapabilities implements INsCapabilities {
         this._isIOS = !this._isAndroid;
         this._isSauceLab = parser.isSauceLab;
         this._ignoreDeviceController = parser.ignoreDeviceController;
-        this._useDeviceControllerServer = parser.useDeviceControllerServer;
-        this._deviceControllerServerPort = parser.deviceControllerServerPort;
+        this._wdaLocalPort = parser.wdaLocalPort;
         this.resolveAppPath();
         this.checkMandatoryCapabiliies();
         this.throwExceptions();
@@ -73,8 +71,7 @@ export class NsCapabilities implements INsCapabilities {
     get isSauceLab() { return this._isSauceLab; }
     get appPath() { return this._appPath; }
     get ignoreDeviceController() { return this._ignoreDeviceController; }
-    get useDeviceControllerServer() { return this._useDeviceControllerServer; }
-    get deviceControllerServerPort() { return this._deviceControllerServerPort; }
+    get wdaLocalPort() { return this._wdaLocalPort; }
     set appPath(appPath: string) { this._appPath = appPath; }
     get device() { return this._device; }
     set device(device: IDevice) { this._device = device; }