Merge pull request #581 from telerik/vladimirov/fix-ios-device-discovery

Fix deploy on iOS devices

Author: rosen-vladimirov

README.md

@@ -7,9 +7,9 @@ Contains common infrastructure for CLIs - mainly AppBuilder and NativeScript.
 Installation
 ===
 
-Latest version: 0.4.0
+Latest version: 0.4.1
 
-Release date: 2015, December 29
+Release date: 2016, January 08
 
 ### System Requirements
 

mobile/ios/ios-proxy-services.ts

@@ -5,6 +5,7 @@ import * as path from "path";
 import * as iOSCore from "./ios-core";
 import * as helpers from "../../helpers";
 import * as plistlib from "plistlib";
+import Future = require("fibers/future");
 
 export class MobileServices {
 	public static APPLE_FILE_CONNECTION: string = "com.apple.afc";
@@ -161,6 +162,7 @@ export class AfcClient implements Mobile.IAfcClient {
 
 	public transfer(localFilePath: string, devicePath: string): IFuture<void> {
 		return(() => {
+			let future = new Future<void>();
 			this.ensureDevicePathExist(path.dirname(devicePath));
 			let reader = this.$fs.createReadStream(localFilePath);
 			devicePath = helpers.fromWindowsRelativePathToUnix(devicePath);
@@ -169,19 +171,44 @@ export class AfcClient implements Mobile.IAfcClient {
 
 			let target = this.open(devicePath, "w");
  			let localFilePathSize = this.$fs.getFileSize(localFilePath).wait();
+ 			let isErrorCode21Raised = false,
+ 				futureThrow = (err: Error) => {
+					if (!future.isResolved()) {
+						future.throw(err);
+					}
+				};
 
 			reader.on("data", (data: NodeBuffer) => {
-				target.write(data, data.length);
-				this.$logger.trace("transfer-> localFilePath: '%s', devicePath: '%s', localFilePathSize: '%s', transferred bytes: '%s'",
-					localFilePath, devicePath, localFilePathSize.toString(), data.length.toString());
-			})
-			.on("error", (error: Error) => {
-				this.$errors.fail(error);
-			})
-			.on("end", () => target.close());
+				try {
+					target.write(data, data.length);
+					this.$logger.trace("transfer-> localFilePath: '%s', devicePath: '%s', localFilePathSize: '%s', transferred bytes: '%s'",
+						localFilePath, devicePath, localFilePathSize.toString(), data.length.toString());
+				} catch(err) {
+					if(err.message.indexOf("Result is: '21'") !== -1 && !isErrorCode21Raised) {
+						// Error code 21 is kAFCInterruptedError. It looks like in most cases it is raised on the first package that we try to transfer.
+						// However ignoring this error on the first package, does not prevent the application from installing and working correctly.
+						// So ignore the first occurrence of the error only.
+						this.$logger.warn(err.message);
+						isErrorCode21Raised = true;
+					} else {
+						futureThrow(err);
+					}
+				}
+			});
+
+			reader.on("error", (error: Error) => {
+				futureThrow(error);
+			});
 
-			this.$fs.futureFromEvent(reader, "close").wait();
+			reader.on("end", () => target.close());
+
+			reader.on("close", () => {
+				if(!future.isResolved()) {
+					future.return();
+				}
+			});
 
+			future.wait();
 		}).future<void>()();
 	}
 

mobile/mobile-core/devices-service.ts

@@ -103,8 +103,10 @@ export class DevicesService implements Mobile.IDevicesService {
 				setInterval(() => {
 					fiberBootstrap.run(() => {
 						try {
-							Future.wait([this.$iOSDeviceDiscovery.checkForDevices(),
-										this.$androidDeviceDiscovery.checkForDevices()]);
+							// This code could be faster, by using Future.wait([...]), but it turned out this is breaking iOS deployment on Mac
+							// It's causing error 21 when deploying on some iOS devices during transfer of the first package.
+							this.$iOSDeviceDiscovery.checkForDevices().wait();
+							this.$androidDeviceDiscovery.checkForDevices().wait();
 						} catch (err) {
 							this.$logger.trace("Error while checking for new devices.", err);
 						}
@@ -267,7 +269,11 @@ export class DevicesService implements Mobile.IDevicesService {
 				let device = this._devices[deviceIdentifier];
 				device.deploy(packageFile, packageName).wait();
 				if(device.applicationManager.canStartApplication()) {
-					device.applicationManager.startApplication(packageName).wait();
+					try {
+						device.applicationManager.startApplication(packageName).wait();
+					} catch(err) {
+						this.$logger.trace("Unable to start application on device. Error is: ", err);
+					}
 				}
 			} else {
 				throw new Error(`Cannot find device with identifier ${deviceIdentifier}.`);

services/messages-service.ts

@@ -3,6 +3,7 @@
 
 import * as util from "util";
 import * as path from "path";
+import * as fiberBootstrap from "../fiber-bootstrap";
 
 export class MessagesService implements IMessagesService {
 	private _pathsToMessageJsonFiles: string[] = null;
@@ -70,13 +71,15 @@ export class MessagesService implements IMessagesService {
 	}
 
 	private refreshMessageJsonContentsCache(): void {
-		this._messageJsonFilesContentsCache = [];
-		_.each(this.pathsToMessageJsonFiles, path => {
-			if (!this.$fs.exists(path).wait()) {
-				throw new Error("Message json file " + path + " does not exist.");
-			}
-
-			this._messageJsonFilesContentsCache.push(this.$fs.readJson(path).wait());
+		fiberBootstrap.run(() => {
+			this._messageJsonFilesContentsCache = [];
+			_.each(this.pathsToMessageJsonFiles, path => {
+				if (!this.$fs.exists(path).wait()) {
+					throw new Error("Message json file " + path + " does not exist.");
+				}
+
+				this._messageJsonFilesContentsCache.push(this.$fs.readJson(path).wait());
+			});
 		});
 	}