Merge pull request #558 from telerik/totev/dont-stop-adb-uninstall

Don't stop adb uninstall

Author: teobugslayer

commands/preuninstall.ts

@@ -2,10 +2,8 @@
 "use strict";
 
 import * as path from "path";
-import * as util from "util";
 
 export class PreUninstallCommand implements ICommand {
-	private static ADB_RELATIVE_PATH = "../resources/platform-tools/android/%s/adb";
 
 	constructor(private $fs: IFileSystem,
 		private $childProcess: IChildProcess,
@@ -17,19 +15,6 @@ export class PreUninstallCommand implements ICommand {
 
 	public execute(args: string[]): IFuture<void> {
 		return (() => {
-			let relativeAdbPath = util.format(PreUninstallCommand.ADB_RELATIVE_PATH, process.platform);
-			let adbPath = path.join(__dirname, relativeAdbPath);
-
-			let killAdbServerCommand = util.format("\"%s\" kill-server", adbPath);
-			this.$logger.warn("Trying to kill adb server. Some running Android related operations may fail.");
-
-			try {
-				this.$childProcess.exec(killAdbServerCommand).wait();
-			} catch(err) {
-				this.$logger.trace(err);
-				this.$logger.warn("Unable to kill adb server.");
-			}
-
 			this.$fs.deleteFile(path.join(this.$options.profileDir, "KillSwitches", "cli")).wait();
 		}).future<void>()();
 	}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "mobile-cli-lib",
   "preferGlobal": false,
-  "version": "0.0.5",
+  "version": "0.1.1",
   "author": "Telerik <[email protected]>",
   "description": "common lib used by different CLI",
   "bin": {
@@ -60,7 +60,7 @@
     "ref-struct": "https://github.com/telerik/ref-struct/tarball/v1.0.1.0-proton",
     "rimraf": "2.2.6",
     "semver": "4.3.4",
-    "shelljs": "0.5.1",
+    "shelljs": "0.5.3",
     "tabtab": "https://github.com/Icenium/node-tabtab/tarball/master",
     "temp": "0.8.1",
     "unzip": "0.1.11",

static-config-base.ts

@@ -2,6 +2,8 @@
 "use strict";
 
 import * as path from "path";
+import * as shelljs from "shelljs";
+import * as os from "os";
 
 export class StaticConfigBase implements Config.IStaticConfig {
 	public PROJECT_FILE_NAME: string = null;
@@ -52,24 +54,56 @@ export class StaticConfigBase implements Config.IStaticConfig {
 
 	private getAdbFilePathCore(): IFuture<string> {
 		return ((): string => {
-			let defaultAdbFilePath = path.join(__dirname, `resources/platform-tools/android/${process.platform}/adb`);
 			let $childProcess: IChildProcess = this.$injector.resolve("$childProcess");
 
 			try {
 				let proc = $childProcess.spawnFromEvent("adb", ["version"], "exit", undefined, { throwError: false }).wait();
 
 				if(proc.stderr) {
-					return defaultAdbFilePath;
+					return this.spawnPrivateAdb().wait();
 				}
 			} catch(e) {
 				if(e.code === "ENOENT") {
-					return defaultAdbFilePath;
+					return this.spawnPrivateAdb().wait();
 				}
 			}
 
 			return "adb";
 		}).future<string>()();
 	}
 
+	/*
+		Problem:
+		1. Adb forks itself as a server which keeps running until adb kill-server is invoked or crashes
+		2. On Windows running processes lock their image files due to memory mapping. Locked files prevent their parent directories from deletion and cannot be overwritten.
+		3. Update and uninstall scenarios are broken
+		Solution:
+		- Copy adb and associated files into a temporary directory. Let this copy of adb run persistently
+		- On Posix OSes, immediately delete the file to not take file space
+		- Tie common lib version to updates of adb, so that when we integrate a newer adb we can use it
+		- Adb is named differently on OSes and may have additional files. The code is hairy to accommodate these differences
+	 */
+	private spawnPrivateAdb(): IFuture<string> {
+		return (():string => {
+			let $fs: IFileSystem = this.$injector.resolve("$fs");
+			let $childProcess: IChildProcess = this.$injector.resolve("$childProcess");
+
+			// prepare the directory to host our copy of adb
+			let defaultAdbDirPath = path.join(__dirname, `resources/platform-tools/android/${process.platform}`);
+			let commonLibVersion = require(path.join(__dirname, "package.json")).version;
+			let tmpDir = path.join(os.tmpdir(), `telerik-common-lib-${commonLibVersion}`);
+			$fs.createDirectory(tmpDir).wait();
+
+			// copy the adb and associated files
+			shelljs.cp(path.join(defaultAdbDirPath, "*"), tmpDir); // deliberately ignore copy errors
+
+			// let adb start its global server
+			let targetAdb = path.join(tmpDir, "adb");
+			$childProcess.spawnFromEvent(targetAdb, ["start-server"], "exit", undefined, { throwError: false }).wait();
+
+			return targetAdb;
+		}).future<string>()();
+	}
+
 	public PATH_TO_BOOTSTRAP: string;
 }