Merge pull request #26 from NativeScript/kerezov/dispose

Make cloud-device-emulator implement IDisposable

Author: Mitko-Kerezov

lib/cloud-device-emulator.ts

@@ -5,8 +5,10 @@ export class CloudDeviceEmulatorWrapper implements ICloudDeviceEmulator {
 		return this.cloudDeviceEmulatorInstance.deviceEmitter;
 	}
 
-	constructor() {
+	constructor(private $options: IOptions,
+		private $processService: IProcessService) {
 		this.cloudDeviceEmulatorInstance = require("cloud-device-emulator");
+		this.$processService.attachToProcessExitSignals(this, this._dispose);
 	}
 
 	public getSeverAddress(): Promise<ICloudDeviceServerInfo> {
@@ -20,6 +22,16 @@ export class CloudDeviceEmulatorWrapper implements ICloudDeviceEmulator {
 	public killServer(): Promise<any> {
 		return this.cloudDeviceEmulatorInstance.killServer();
 	}
+
+	public dispose() {
+		if (!this.$options.watch) {
+			this._dispose();
+		}
+	}
+
+	private _dispose() {
+		this.cloudDeviceEmulatorInstance.deviceEmitter.dispose();
+	}
 }
 
 $injector.register("cloudDeviceEmulator", CloudDeviceEmulatorWrapper);

lib/definitions/emulators.d.ts

@@ -32,7 +32,7 @@ interface IAppetizeEmulatorLauncher {
 /**
  * Describes service for interaction with server which communicates with cloud emulators.
  */
-interface ICloudDeviceEmulator {
+interface ICloudDeviceEmulator extends IDisposable {
 	/**
 	 * Event emitter instance that raises events upon finding/losing a device.
 	 */

package.json

@@ -45,7 +45,7 @@
     "typescript": "2.1.5"
   },
   "dependencies": {
-    "cloud-device-emulator": "~0.2.0",
+    "cloud-device-emulator": "0.3.0",
     "cookie": "0.3.1",
     "lodash": "4.17.4",
     "minimatch": "3.0.4",

test/mobile/mobile-core/appetize-device-discovery.ts

@@ -14,6 +14,7 @@ class CustomDeviceEmitter extends EventEmitter implements CloudDeviceEmitter {
 	public getCurrentlyAttachedDevices(): IAttachedDevices {
 		return this._initialDevices;
 	}
+	public dispose(): void { /* empty */ }
 }
 
 describe("appetize device discovery", () => {