Fix (publish): Remove binary-plist and use simple-plist instead

bootstrap.ts

@@ -103,7 +103,7 @@ $injector.requireCommand("proxy|set", "./commands/proxy/proxy-set");
 $injector.requireCommand("proxy|clear", "./commands/proxy/proxy-clear");
 
 $injector.require("utils", "./utils");
-$injector.require("bplistParser", "./bplist-parser");
+$injector.require("plistParser", "./plist-parser");
 $injector.require("winreg", "./winreg");
 
 $injector.require("loggingLevels", "./mobile/logging-levels");

declarations.d.ts

@@ -1365,8 +1365,17 @@ interface IUtils {
 	getMilliSecondsTimeout(defaultTimeout: number): number;
 }
 
-interface IBinaryPlistParser {
+/**
+ * Used for parsing of .plist files
+ */
+interface IPlistParser {
+	/**
+	 * Parses the .plist file and returns the result as object
+	 * @param {string} plistFilePath Absolute path to .plist file
+	 * @return {Promise<any>} The parsed object
+	 */
 	parseFile(plistFilePath: string): Promise<any>;
+	parseFileSync(plistFilePath: string): any;
 }
 
 interface IUserSettingsService extends UserSettings.IUserSettingsService {

definitions/simple-plist.d.ts

@@ -0,0 +1,4 @@
+declare module "simple-plist" {
+	export function readFile(filePath: string, callback?:(err: Error, obj: any) => void): void;
+	export function readFileSync(filePath: string): any;
+}

mobile/ios/simulator/ios-simulator-application-manager.ts

@@ -8,7 +8,7 @@ export class IOSSimulatorApplicationManager extends ApplicationManagerBase {
 		private identifier: string,
 		private $options: ICommonOptions,
 		private $fs: IFileSystem,
-		private $bplistParser: IBinaryPlistParser,
+		private $plistParser: IPlistParser,
 		private $iOSSimulatorLogProvider: Mobile.IiOSSimulatorLogProvider,
 		private $deviceLogProvider: Mobile.IDeviceLogProvider,
 		$logger: ILogger,
@@ -90,7 +90,7 @@ export class IOSSimulatorApplicationManager extends ApplicationManagerBase {
 		const applicationPath = this.iosSim.getApplicationPath(this.identifier, appIdentifier),
 			pathToInfoPlist = path.join(applicationPath, "Info.plist");
 
-		return this.$fs.exists(pathToInfoPlist) ? (await this.$bplistParser.parseFile(pathToInfoPlist))[0] : null;
+		return this.$fs.exists(pathToInfoPlist) ? await this.$plistParser.parseFile(pathToInfoPlist) : null;
 	}
 
 	public async getDebuggableApps(): Promise<Mobile.IDeviceApplicationInformation[]> {

package.json

@@ -26,7 +26,6 @@
     "Proton"
   ],
   "dependencies": {
-    "bplist-parser": "0.0.6",
     "bufferpack": "0.0.6",
     "byline": "4.2.1",
     "chalk": "1.0.0",
@@ -63,6 +62,7 @@
     "rimraf": "2.2.6",
     "semver": "5.3.0",
     "shelljs": "0.7.5",
+    "simple-plist": "0.2.1",
     "source-map": "0.5.6",
     "tabtab": "https://github.com/Icenium/node-tabtab/tarball/master",
     "temp": "0.8.1",

plist-parser.ts

@@ -0,0 +1,20 @@
+import * as simplePlist from "simple-plist";
+
+export class PlistParser implements IPlistParser {
+	public parseFile(plistFilePath: string): Promise<any> {
+		return new Promise<any>((resolve, reject) => {
+			simplePlist.readFile(plistFilePath, (err: Error, obj: any) => {
+				if (err) {
+					reject(err);
+				} else {
+					resolve(obj);
+				}
+			});
+		});
+	}
+
+	public parseFileSync(plistFilePath: string): any {
+		return simplePlist.readFileSync(plistFilePath);
+	}
+}
+$injector.register("plistParser", PlistParser);