Merge pull request #1394 from NativeScript/wait-for-debugger-before-starting-client

wait for the debugger to settle before starting a client and output t…

Author: rosen-vladimirov

lib/commands/debug.ts

@@ -2,25 +2,61 @@
 "use strict";
 
 export class DebugPlatformCommand implements ICommand {
-	constructor(private debugService: IDebugService) { }
+	constructor(private debugService: IDebugService,
+		private $devicesService: Mobile.IDevicesService,
+		private $errors: IErrors,
+		protected $options: IOptions) { }
 
 	execute(args: string[]): IFuture<void> {
 		return this.debugService.debug();
 	}
 
 	allowedParameters: ICommandParameter[] = [];
+
+	canExecute(args: string[]): IFuture<boolean> {
+		return ((): boolean => {
+			this.$devicesService.initialize({ platform: this.debugService.platform, deviceId: this.$options.device }).wait();
+			if(this.$devicesService.deviceCount === 0) {
+				this.$errors.failWithoutHelp("No devices detected. Connect a device and try again.");
+			} else if (this.$devicesService.deviceCount > 1) {
+				this.$errors.fail("Cannot debug on multiple devices. Select device with --device option.");
+			}
+
+			return true;
+		}).future<boolean>()();
+	}
 }
 
 export class DebugIOSCommand extends DebugPlatformCommand {
-	constructor(private $iOSDebugService: IDebugService) {
-		super($iOSDebugService);
+	constructor($iOSDebugService: IDebugService,
+		$devicesService: Mobile.IDevicesService,
+		$errors: IErrors,
+		$options: IOptions) {
+		super($iOSDebugService, $devicesService, $errors, $options);
+	}
+
+	canExecute(args: string[]): IFuture<boolean> {
+		return ((): boolean => {
+			if(this.$options.emulator) {
+				return true;
+			}
+
+			return super.canExecute(args).wait();
+		}).future<boolean>()();
 	}
 }
 $injector.registerCommand("debug|ios", DebugIOSCommand);
 
 export class DebugAndroidCommand extends DebugPlatformCommand {
-	constructor(private $androidDebugService: IDebugService) {
-		super($androidDebugService);
+	constructor($androidDebugService: IDebugService,
+		$devicesService: Mobile.IDevicesService,
+		$errors: IErrors,
+		$options: IOptions) {
+		super($androidDebugService, $devicesService, $errors, $options);
+	}
+
+	canExecute(args: string[]): IFuture<boolean> {
+		return super.canExecute(args);
 	}
 }
 $injector.registerCommand("debug|android", DebugAndroidCommand);

lib/definitions/debug.d.ts

@@ -1,4 +1,5 @@
 interface IDebugService {
 	debug(): IFuture<void>;
 	debugStart(): IFuture<void>;
+	platform: string;
 }

lib/services/android-debug-service.ts

@@ -3,6 +3,7 @@
 import * as path from "path";
 import * as net from "net";
 import Future = require("fibers/future");
+import { sleep } from "../common/helpers";
 
 class AndroidDebugService implements IDebugService {
 	private static DEFAULT_NODE_INSPECTOR_URL = "http://127.0.0.1:8080/debug";
@@ -21,7 +22,7 @@ class AndroidDebugService implements IDebugService {
 		private $opener: IOpener,
 		private $config: IConfiguration) { }
 
-	private get platform() { return "android"; }
+	public get platform() { return "android"; }
 
 	private get device(): Mobile.IAndroidDevice {
 		return this._device;
@@ -182,11 +183,32 @@ class AndroidDebugService implements IDebugService {
 		return (() => {
 			let packageName = this.$projectData.projectId;
 
+			// Arguments passed to executeShellCommand must be in array ([]), but it turned out adb shell "arg with intervals" still works correctly.
+			// As we need to redirect output of a command on the device, keep using only one argument.
+			// We could rewrite this with two calls - touch and rm -f , but -f flag is not available on old Android, so rm call will fail when file does not exist.
 			this.device.adb.executeShellCommand([`cat /dev/null > /data/local/tmp/${packageName}-debugbreak`]).wait();
 
 			this.device.applicationManager.stopApplication(packageName).wait();
 			this.device.applicationManager.startApplication(packageName).wait();
 
+			let waitText: string = `0 /data/local/tmp/${packageName}-debugbreak`;
+			let maxWait = 6;
+			let debugerStarted: boolean = false;
+			while (maxWait > 0 && !debugerStarted) {
+				let forwardsResult = this.device.adb.executeShellCommand(["ls", "-s", `/data/local/tmp/${packageName}-debugbreak`]).wait();
+				maxWait--;
+				debugerStarted = forwardsResult.indexOf(waitText) === -1;
+				if (!debugerStarted) {
+					sleep(500);
+				}
+			}
+
+			if (debugerStarted) {
+				this.$logger.info("# NativeScript Debugger started #");
+			} else {
+				this.$logger.warn("# NativeScript Debugger did not start in time #");
+			}
+
 			if (this.$options.client) {
 				let localDebugPort = this.getForwardedLocalDebugPortForPackageName(this.device.deviceInfo.identifier, packageName).wait();
 				this.startDebuggerClient(localDebugPort).wait();

lib/services/ios-debug-service.ts

@@ -32,7 +32,7 @@ class IOSDebugService implements IDebugService {
         private $iOSSocketRequestExecutor: IiOSSocketRequestExecutor,
         private $socketProxyFactory: ISocketProxyFactory) { }
 
-    get platform(): string {
+    public get platform(): string {
         return "ios";
     }