Fix comments for iOS11 Simulator log.

Author: Kristian D. Dimitrov

lib/declarations.ts

@@ -33,7 +33,7 @@ interface ISimctl {
 	uninstall(deviceId: string, applicationIdentifier: string, opts?: any): void;
 	notifyPost(deviceId: string, notification: string): void;
 	getDevices(): IDevice[];
-	getLog(deviceId: string): any;
+	getLog(deviceId: string, predicate?: string): any;
 	getAppContainer(deviceId: string, applicationIdentifier: string): string;
 }
 

lib/iphone-simulator-xcode-simctl.ts

@@ -2,6 +2,7 @@
 "use strict";
 
 import childProcess = require("./child-process");
+import * as child_process from "child_process";
 import errors = require("./errors");
 
 import common = require("./iphone-simulator-common");
@@ -119,7 +120,7 @@ export class XCodeSimctlSimulator extends IPhoneSimulatorNameGetter implements I
 		}
 	}
 
-	public printDeviceLog(deviceId: string, launchResult?: string): any {
+	public printDeviceLog(deviceId: string, launchResult?: string): child_process.ChildProcess {
 		let pid = "";
 		let deviceLogChildProcess;
 
@@ -130,46 +131,39 @@ export class XCodeSimctlSimulator extends IPhoneSimulatorNameGetter implements I
 		if (!this.isDeviceLogOperationStarted) {
 			deviceLogChildProcess = this.getDeviceLogProcess(deviceId);
 			if (deviceLogChildProcess.stdout) {
-				deviceLogChildProcess.stdout.on("data", (data: NodeBuffer) => {
-					let dataAsString = data.toString();
-					if (pid) {
-						if (dataAsString.indexOf(`[${pid}]`) > -1 || dataAsString.indexOf(` ${pid} `) > -1) {
-							process.stdout.write(dataAsString);
-						}
-					} else {
-						process.stdout.write(dataAsString);
-					}
-				});
+				deviceLogChildProcess.stdout.on("data", this.logDataHandler.bind(this, pid));
 			}
 
 			if (deviceLogChildProcess.stderr) {
-				deviceLogChildProcess.stderr.on("data", (data: string) => {
-					let dataAsString = data.toString();
-					if (pid) {
-						if (dataAsString.indexOf(`[${pid}]`) > -1 || dataAsString.indexOf(` ${pid} `) > -1) {
-							process.stdout.write(dataAsString);
-						}
-					} else {
-						process.stdout.write(dataAsString);
-					}
-					process.stdout.write(data.toString());
-				});
+				deviceLogChildProcess.stderr.on("data", this.logDataHandler.bind(this, pid));
 			}
 		}
 
 		return deviceLogChildProcess;
 	}
 
-	public getDeviceLogProcess(deviceId: string): any {
-		const device = this.getDeviceFromIdentifier(deviceId) || {};
-		const deviceVersion = this.getDeviceFromIdentifier(deviceId).runtimeVersion || "";
-		const majorVersion = deviceVersion.split(".")[0];
+	private logDataHandler(pid: string, logData: NodeBuffer): void {
+		const dataAsString = logData.toString();
 
+		if (pid) {
+			if (dataAsString.indexOf(`[${pid}]`) > -1) {
+				process.stdout.write(dataAsString);
+			}
+		} else {
+			process.stdout.write(dataAsString);
+		}
+	}
+
+	public getDeviceLogProcess(deviceId: string, predicate?: string): child_process.ChildProcess {
 		if (!this.isDeviceLogOperationStarted) {
-			if(majorVersion && parseInt(majorVersion) >= 11) {
-				this.deviceLogChildProcess = this.simctl.getLog(deviceId);
+			const device = this.getDeviceFromIdentifier(deviceId);
+			const deviceVersion = device ? device.runtimeVersion : "";
+			const majorVersion = deviceVersion.split(".")[0];
+
+			if (majorVersion && parseInt(majorVersion) >= 11) {
+				this.deviceLogChildProcess = this.simctl.getLog(deviceId, predicate);
 			} else {
-				let logFilePath = path.join(osenv.home(), "Library", "Logs", "CoreSimulator", deviceId, "system.log");
+				const logFilePath = path.join(osenv.home(), "Library", "Logs", "CoreSimulator", deviceId, "system.log");
 				this.deviceLogChildProcess = require("child_process").spawn("tail", ['-f', '-n', '1', logFilePath]);
 			}
 

lib/simctl.ts

@@ -121,8 +121,14 @@ export class Simctl implements ISimctl {
 		return devices;
 	}
 
-	public getLog(deviceId: string): any {
-		return this.simctlSpawn("spawn", [deviceId, "log", "stream"]);
+	public getLog(deviceId: string, predicate?: string): child_process.ChildProcess {
+		let predicateArgs: string[] = [];
+
+		if (predicate) {
+			predicateArgs = ["--predicate", predicate];
+		}
+
+		return this.simctlSpawn("spawn", [deviceId, "log", "stream", "--style", "syslog"].concat(predicateArgs));
 	}
 
 	private simctlExec(command: string, args: string[], opts?: any): any {
@@ -133,7 +139,7 @@ export class Simctl implements ISimctl {
 		return '';
 	}
 
-	private simctlSpawn(command: string, args: string[], opts?: any): any {
+	private simctlSpawn(command: string, args: string[], opts?: child_process.SpawnOptions): child_process.ChildProcess {
 		return child_process.spawn("xcrun", ["simctl", command].concat(args), opts);
 	}
 }