Merge pull request #212 from telerik/vladimirov/merge-release-from-282

Merge release in master from 282

Author: rosen-vladimirov

definitions/mobile.d.ts

@@ -19,7 +19,6 @@ declare module Mobile {
 		sync(localToDevicePaths: ILocalToDevicePathData[], appIdentifier: IAppIdentifier, liveSyncUrl: string, options: ISyncOptions): IFuture<void>;
 		debug(packageFile: string, packageName: string): IFuture<void>;
 		openDeviceLogStream(): void;
-		getInstalledApplications(): IFuture<string[]>;
 		runApplication(applicationId: string): IFuture<void>;
 	}
 
@@ -119,6 +118,8 @@ declare module Mobile {
 		deviceInstallApplication(service: number, packageFile: NodeBuffer, options: NodeBuffer, installationCallback: NodeBuffer): number;
 		deviceMountImage(devicePointer: NodeBuffer, imagePath: NodeBuffer, options: NodeBuffer, mountCallBack: NodeBuffer): number;
 		deviceLookupApplications(devicePointer: NodeBuffer, appType: number, result: NodeBuffer): number;
+		deviceGetInterfaceType(devicePointer: NodeBuffer): number;
+		deviceGetConnectionId(devicePointer: NodeBuffer): number;
 		afcConnectionOpen(service: number, timeout: number, afcConnection: NodeBuffer): number;
 		afcConnectionClose(afcConnection: NodeBuffer): number;
 		afcDirectoryCreate(afcConnection: NodeBuffer, path: string): number;
@@ -132,6 +133,14 @@ declare module Mobile {
 		afcDirectoryClose(afcConnection: NodeBuffer, afcdirectory: NodeBuffer): number;
 		isDataReceivingCompleted(reply: IDictionary<any>): boolean;
 		setLogLevel(logLevel: number): number;
+
+		/**
+		 * Connect to a port on iOS device connected over USB.
+		 * @param connectionId Connection ID obtained throught IMobileDevice deviceGetConnectionId.
+		 * @param port Port on the device to connect to. The native API expects it in big endian!
+		 * @param socketRef Out param, reference to the socket file descriptor.
+		 */
+		uSBMuxConnectByPort(connectionId: number, port: number, socketRef: NodeBuffer): number;
 	}
 
 	interface IHouseArrestClient {
@@ -171,7 +180,8 @@ declare module Mobile {
 		readSystemLog(action: (data: NodeBuffer) => void): void;
 		sendMessage(message: {[key: string]: {}}, format?: number): void;
 		sendMessage(message: string): void;
-		sendAll?(data: NodeBuffer): void;
+		sendAll? (data: NodeBuffer): void;
+		receiveAll? (callback: (data: NodeBuffer) => void): void;
 		exchange(message: IDictionary<any>): IFuture<IiOSSocketResponseData>;
 		close(): void;
 	}
@@ -201,7 +211,7 @@ declare module Mobile {
 	interface IEmulatorPlatformServices {
 		checkDependencies(): IFuture<void>;
 		checkAvailability(dependsOnProject?: boolean): IFuture<void>;
-		startEmulator(app: string, emulatorOptions?: IEmulatorOptions) : IFuture<void>;
+		startEmulator(app: string, emulatorOptions?: IEmulatorOptions): IFuture<void>;
 	}
 
 	interface IEmulatorSettingsService {

definitions/plistlib.d.ts

@@ -1,3 +1,5 @@
 declare module "plistlib" {
-	export function toString(data: any): string;
+    export function toString(data: any): string;
+    export function loadBuffer(data: NodeBuffer, callback: (err: any, plist: any) => void): void;
+    export function loadString(data: string, callback: (err: any, plist: any) => void): void;
 }

mobile/ios/ios-core.ts

@@ -25,6 +25,7 @@ export class CoreTypes {
 	public static uintType = ref.types.uint;
 	public static uint32Type = ref.types.uint32;
 	public static intType = ref.types.int;
+	public static longType = ref.types.long;
 	public static boolType = ref.types.bool;
 	public static doubleType = ref.types.double;
 
@@ -204,7 +205,10 @@ class IOSCore implements Mobile.IiOSCore {
 			"AMDeviceCopyValue": ffi.ForeignFunction(lib.get("AMDeviceCopyValue"), CoreTypes.cfStringRef, [CoreTypes.am_device_p, CoreTypes.cfStringRef, CoreTypes.cfStringRef]),
 			"AMDeviceNotificationUnsubscribe": ffi.ForeignFunction(lib.get("AMDeviceNotificationUnsubscribe"), CoreTypes.intType, [CoreTypes.amDeviceNotificationRef]),
 			"AMDeviceMountImage": hostInfo.isDarwin() ? ffi.ForeignFunction(lib.get("AMDeviceMountImage"), CoreTypes.uintType, [CoreTypes.am_device_p, CoreTypes.cfStringRef, CoreTypes.cfDictionaryRef, CoreTypes.am_device_mount_image_callback, CoreTypes.voidPtr]) : null,
-			"AMDSetLogLevel": ffi.ForeignFunction(lib.get("AMDSetLogLevel"), CoreTypes.intType, [CoreTypes.intType])
+			"AMDSetLogLevel": ffi.ForeignFunction(lib.get("AMDSetLogLevel"), CoreTypes.intType, [CoreTypes.intType]),
+			"AMDeviceGetInterfaceType": ffi.ForeignFunction(lib.get("AMDeviceGetInterfaceType"), CoreTypes.longType, [CoreTypes.am_device_p]),
+			"AMDeviceGetConnectionID": ffi.ForeignFunction(lib.get("AMDeviceGetConnectionID"), CoreTypes.longType, [CoreTypes.am_device_p]),
+			"USBMuxConnectByPort": ffi.ForeignFunction(lib.get("USBMuxConnectByPort"), CoreTypes.intType, [CoreTypes.intType, CoreTypes.intType, CoreTypes.intPtr])
 		};
 	}
 
@@ -556,6 +560,14 @@ export class MobileDevice implements Mobile.IMobileDevice {
 		return this.mobileDeviceLibrary.AMDeviceLookupApplications(devicePointer, appType, result);
 	}
 
+	public deviceGetInterfaceType(devicePointer: NodeBuffer): number {
+		return this.mobileDeviceLibrary.AMDeviceGetInterfaceType(devicePointer);
+	}
+
+	public deviceGetConnectionId(devicePointer: NodeBuffer): number {
+		return this.mobileDeviceLibrary.AMDeviceGetConnectionID(devicePointer);
+	}
+
 	public afcConnectionOpen(service: number, timeout: number, afcConnection: NodeBuffer): number {
 		return this.mobileDeviceLibrary.AFCConnectionOpen(service, timeout, afcConnection);
 	}
@@ -611,6 +623,10 @@ export class MobileDevice implements Mobile.IMobileDevice {
 	public setLogLevel(logLevel: number): number {
 		return this.mobileDeviceLibrary.AMDSetLogLevel(logLevel);
 	}
+
+	public uSBMuxConnectByPort(connectionId: number, port: number, socketRef: NodeBuffer): number {
+		return this.mobileDeviceLibrary.USBMuxConnectByPort(connectionId, port, socketRef);
+	}
  }
 $injector.register("mobileDevice", MobileDevice);
 
@@ -668,7 +684,7 @@ class WinSocket implements Mobile.IiOSDeviceSocket {
 		if(typeof(data) === "string") {
 			message = new Buffer(data);
 		}
-        else {
+		else {
 			var payload:NodeBuffer = new Buffer(plistlib.toString(this.createPlist(data)));
 			var packed:any = bufferpack.pack(">i", [payload.length]);
 			message = Buffer.concat([packed, payload]);
@@ -689,6 +705,15 @@ class WinSocket implements Mobile.IiOSDeviceSocket {
 		}
 	}
 
+	public receiveAll(handler: (data: NodeBuffer) => void): void {
+		var data = this.read(WinSocket.BYTES_TO_READ);
+		while (data) {
+			handler(data);
+			data = this.read(WinSocket.BYTES_TO_READ);
+		}
+		this.close();
+	}
+
 	public exchange(message: IDictionary<any>): IFuture<Mobile.IiOSSocketResponseData> {
 		this.sendMessage(message);
 		return this.receiveMessage();
@@ -861,6 +886,10 @@ class PosixSocket implements Mobile.IiOSDeviceSocket {
 		this.$errors.verifyHeap("sendMessage");
 	}
 
+	public receiveAll(handler: (data: NodeBuffer) => void): void {
+		this.socket.on('data', handler);
+	}
+
 	public exchange(message: IDictionary<any>): IFuture<Mobile.IiOSSocketResponseData> {
 		this.$errors.fail("Exchange function is not implemented for OSX");
 		return null;
@@ -908,6 +937,12 @@ export class PlistService implements Mobile.IiOSDeviceSocket {
 	public sendAll(data: NodeBuffer): void {
 		this.socket.sendAll(data);
 	}
+
+	public receiveAll(handler: (data: NodeBuffer) => void): void {
+		if (this.socket.receiveAll) {
+			this.socket.receiveAll(handler);
+		}
+	}
 }
 
 export class GDBServer implements Mobile.IGDBServer {

mobile/ios/ios-device.ts

@@ -2,6 +2,7 @@
 "use strict";
 
 import Future = require("fibers/future");
+import net = require("net");
 import ref = require("ref");
 import os = require("os");
 import path = require("path");
@@ -18,6 +19,7 @@ var CoreTypes = iosCore.CoreTypes;
 
 export class IOSDevice implements Mobile.IIOSDevice {
 	private static IMAGE_ALREADY_MOUNTED_ERROR_CODE = 3892314230;
+	private static INTERFACE_USB = 1;
 
 	private identifier: string = null;
 	private voidPtr = ref.refType(ref.types.void);
@@ -299,6 +301,10 @@ export class IOSDevice implements Mobile.IIOSDevice {
 		}).future<void>()();
 	}
 
+	private getInterfaceType(): number {
+		return this.$mobileDevice.deviceGetInterfaceType(this.devicePointer);
+	}
+
 	public startService(serviceName: string): number {
 		var func = () => {
 			var socket = ref.alloc("int");
@@ -318,11 +324,16 @@ export class IOSDevice implements Mobile.IIOSDevice {
 		}).future<void>()();
 	}
 
-    public debug(packageFile: string, packageName: string): IFuture<void> {
-        return (() => {
-            this.$errors.fail({formatStr:"this will come in a future version", suppressCommandHelp: true});
-        }).future<void>()();
-    }
+	public debug(packageFile: string, packageName: string): IFuture<void> {
+		return (() => {
+			var debugging: IOSDeviceDebugging = this.$injector.resolve(IOSDeviceDebugging, {
+				packageFile: packageFile,
+				packageName: packageName,
+				$iOSDevice: this
+			});
+			debugging.debug();
+		}).future<void>()();
+	}
 
 	public sync(localToDevicePaths: Mobile.ILocalToDevicePathData[], appIdentifier: Mobile.IAppIdentifier, liveSyncUrl: string, options: Mobile.ISyncOptions = {}): IFuture<void> {
 		return(() => {
@@ -340,7 +351,6 @@ export class IOSDevice implements Mobile.IIOSDevice {
 				var notificationProxyClient = this.$injector.resolve(iOSProxyServices.NotificationProxyClient, {device: this});
 				notificationProxyClient.postNotification("com.telerik.app.refreshWebView");
 				notificationProxyClient.closeSocket();
-
 			}
 
 			this.$logger.out("Successfully synced device with identifier '%s'", this.getIdentifier());
@@ -381,5 +391,169 @@ export class IOSDevice implements Mobile.IIOSDevice {
 			this.$logger.info("Successfully run application %s on device with ID %s", applicationId, this.getIdentifier());
 		}).future<void>()();
 	}
+
+	public connectToPort(port: number): net.NodeSocket {
+		var interfaceType = this.getInterfaceType();
+		if(interfaceType === IOSDevice.INTERFACE_USB) {
+			var connectionId = this.$mobileDevice.deviceGetConnectionId(this.devicePointer);
+			var socketRef = ref.alloc(CoreTypes.intType);
+
+			this.$mobileDevice.uSBMuxConnectByPort(connectionId, this.htons(port), socketRef);
+			var socketValue = socketRef.deref();
+
+			return new net.Socket({ fd: socketValue });
+		}
+
+		return null;
+	}
+
+	/**
+	 * Converts a little endian 16 bit int number to 16 bit int big endian number.
+	 */
+	private htons(port: number): number {
+		var result =  (port & 0xff00) >> 8 | (port & 0x00ff) << 8;
+		return result;
+	}
+}
+$injector.register("iOSDevice", IOSDevice);
+
+export class IOSDeviceDebugging {
+	private notificationProxyClient: iOSProxyServices.NotificationProxyClient;
+
+	constructor(
+		private packageFile: string,
+		private packageName: string,
+		private $iOSDevice: IOSDevice,
+
+		private $injector: IInjector,
+
+		private $logger: ILogger,
+		private $errors: IErrors,
+
+		private $npm: INodePackageManager,
+		private $childProcess: IChildProcess) {
+
+		this.notificationProxyClient = this.$injector.resolve(iOSProxyServices.NotificationProxyClient, { device: this.$iOSDevice });
+	}
+
+	public debug(): void {
+		if (options["get-port"]) {
+			this.$errors.fail({ formatStr: "this feature is not supported in the selected platform", suppressCommandHelp: true });
+		} else if (options["start"]) {
+			this.attachDebugger();
+		} else if (options["stop"]) {
+			this.$errors.fail({ formatStr: "this feature is not supported in the selected platform", suppressCommandHelp: true });
+		} else if (options["debug-brk"]) {
+			this.startAppWithDebugger();
+		} else {
+			this.$logger.info("Should specify exactly one option: debug-brk, start");
+		}
+	}
+
+	public attachDebugger(): void {
+		this.attachAtRuntime();
+	}
+
+	public startAppWithDebugger(): void {
+		this.$iOSDevice.deploy(this.packageFile, this.packageName).wait();
+		this.attachAtStartup();
+		this.$iOSDevice.runApplication(this.packageName).wait();
+	}
+
+	private attachAtStartup() {
+		this.startTheFrontEnd();
+
+		var appLaunchMessage = this.packageName + ":NativeScript.Debug.AppLaunching";
+		this.notificationProxyClient.addObserver(appLaunchMessage, () => {
+			this.$logger.info("Got AppLaunching");
+			this.startTheBackend("WaitForDebugger");
+		});
+	}
+
+	private attachAtRuntime(): void {
+		this.startTheFrontEnd();
+		this.startTheBackend("AttachRequest");
+	}
+
+	private startTheFrontEnd(): void {
+		this.openSafariFrontEnd();
+		this.printHowToTerminate();
+	}
+
+	private startTheBackend(message: string) {
+		this.attachWhenReady();
+		this.postDebugNotification(message);
+	}
+
+	private openSafariFrontEnd(): void {
+		var tnsIosPackage = this.$npm.install("tns-ios").wait();
+		var safariPath = path.join(tnsIosPackage, "WebInspectorUI/Safari/Main.html");
+		this.$childProcess.exec("open -a Safari " + safariPath).wait();
+	}
+
+	private attachWhenReady(): void {
+
+		var identifier = this.$iOSDevice.getIdentifier();
+		this.$logger.info("Device Identifier: " + identifier);
+
+		var appReadyForAttachMessage = this.packageName + ":NativeScript.Debug.ReadyForAttach";
+		this.notificationProxyClient.addObserver(appReadyForAttachMessage, () => {
+			this.$logger.info("Got ReadyForAttach");
+			
+			// NOTE: We will try to provide command line options to select ports, at least on the localhost.
+			var devicePort = 8080;
+			var localPort = 8080;
+
+			var localServer = net.createServer((localSocket) => {
+				this.$logger.info("Front-end client connected to localhost " + localPort);
+
+				var deviceSocket: any;
+
+				var buff = new Array();
+				localSocket.on('data', (data: NodeBuffer) => {
+					if (deviceSocket) {
+						deviceSocket.write(data);
+					} else {
+						buff.push(data);
+					}
+				});
+				localSocket.on('end', () => {
+					this.$logger.info('Localhost client disconnected!');
+					process.exit(0);
+				});
+
+				deviceSocket = this.$iOSDevice.connectToPort(devicePort);
+				this.$logger.info("Connected localhost " + localPort + " to device " + devicePort);
+
+				buff.forEach((data) => {
+					deviceSocket.write(data);
+				});
+
+				deviceSocket.on('data', (data: NodeBuffer) => {
+					localSocket.write(data);
+				});
+
+				deviceSocket.on('end', () => {
+					this.$logger.info("Device socket closed!");
+					process.exit(0);
+				});
+
+			});
+
+			localServer.listen(localPort, () => {
+				this.$logger.info("Opened localhost " + localPort);
+			});
+		});
+	}
+
+	private printHowToTerminate() {
+		this.$logger.info("\nSetting up debugger proxy...\n\nPress Ctrl + C to terminate!\n");
+	}
+
+	private postDebugNotification(notification: string): void {
+		var attachRequestMessage = this.packageName + ":NativeScript.Debug.AttachRequest";
+		this.notificationProxyClient.postNotification(attachRequestMessage);
+		this.$logger.info("Send " + notification);
+	}
 }
-$injector.register("iOSDevice", IOSDevice);
+$injector.register("iOSDeviceDebugging", IOSDeviceDebugging);