iOS implementation refactoring

Author: ivanbuhov

package.json

@@ -105,7 +105,7 @@
         "runtime": "node",
         "initialConfigurations": [
           {
-            "name": "Launch on iOS",
+            "name": "Sync on iOS",
             "type": "nativescript",
             "platform": "ios",
             "request": "launch",
@@ -116,7 +116,7 @@
             "rebuild": false
           },
           {
-            "name": "Rebuild and launch on iOS",
+            "name": "Launch on iOS",
             "type": "nativescript",
             "platform": "ios",
             "request": "launch",
@@ -127,18 +127,17 @@
             "rebuild": true
           },
           {
-            "name": "Rebuild and attach on iOS",
+            "name": "Attach on iOS",
             "type": "nativescript",
             "platform": "ios",
             "request": "attach",
             "appRoot": "${workspaceRoot}",
             "sourceMaps": true,
             "diagnosticLogging": false,
-            "emulator": false,
-            "rebuild": true
+            "emulator": false
           },
           {
-            "name": "Launch on Android",
+            "name": "Sync on Android",
             "type": "nativescript",
             "platform": "android",
             "request": "launch",
@@ -149,7 +148,7 @@
             "rebuild": false
           },
           {
-            "name": "Rebuild and launch on Android",
+            "name": "Launch on Android",
             "type": "nativescript",
             "platform": "android",
             "request": "launch",
@@ -160,15 +159,14 @@
             "rebuild": true
           },
           {
-            "name": "Rebuild and attach on Android",
+            "name": "Attach on Android",
             "type": "nativescript",
             "platform": "android",
             "request": "attach",
             "appRoot": "${workspaceRoot}",
             "sourceMaps": true,
             "diagnosticLogging": false,
-            "emulator": false,
-            "rebuild": true
+            "emulator": false
           }
         ],
         "configurationAttributes": {

src/debug-adapter/webKitAdapterInterfaces.d.ts

@@ -24,7 +24,6 @@ export interface IAttachRequestArgs extends DebugProtocol.AttachRequestArguments
     request: string;
     tnsArgs?: string[];
     tnsOutput?: string;
-    rebuild?: boolean;
 }
 
 export interface ISetBreakpointsArgs extends DebugProtocol.SetBreakpointsArguments {

src/services/NsCliService.ts

@@ -137,43 +137,51 @@ export class IosProject extends NSProject {
             return Promise.reject('iOS platform is supported only on OS X.');
         }
 
+        let rebuild = (args.request == "launch") ? (args as ILaunchRequestArgs).rebuild : true;
         // build command to execute
         let command = new CommandBuilder()
             .appendParam("debug")
             .appendParam(this.platform())
             .appendParamIf("--emulator", args.emulator)
             .appendParamIf("--start", args.request === "attach")
             .appendParamIf("--debug-brk", args.request === "launch")
-            .appendParamIf("--no-rebuild", !args.rebuild)
+            .appendParamIf("--no-rebuild", !rebuild)
             .appendParam("--no-client")
             .appendParams(args.tnsArgs)
             .build();
 
         let socketPathPrefix = 'socket-file-location: ';
         let socketPathPattern: RegExp = new RegExp(socketPathPrefix + '.*\.sock');
-        let readyToConnect: boolean = false;
+
+        let isSocketOpened = (cliOutput: string): string => {
+            let matches: RegExpMatchArray = cliOutput.match(socketPathPattern);
+            if(matches && matches.length > 0) {
+                return matches[0].substr(socketPathPrefix.length);
+            }
+            return null;
+        };
+
+        let isAppSynced = (cliOutput: string) => {
+            return cliOutput.indexOf('Successfully synced application') > -1;
+        };
 
         return new Promise<string>((resolve, reject) => {
             // run NativeScript CLI command
             let child: ChildProcess = this.spawnProcess(command.path, command.args, args.tnsOutput);
-            let synced = false;
+
+            let appSynced = false;
+            let socketPath: string = null;
 
             child.stdout.on('data', (data) => {
-                let strData: string = data.toString();
-                this.emit('TNS.outputMessage', strData, 'log');
-                this.writeToTnsOutputFile(strData);
-                if (!synced && !args.rebuild && strData.indexOf('Successfully synced application') > -1) {
-                    synced = true;
-                    //wait a little before trying to connect, this gives a changes for adb to be able to connect to the debug socket
-                    setTimeout(() => {
-                        resolve();
-                    }, 500);
-                } else if(!readyToConnect) {
-                    let matches: RegExpMatchArray = strData.match(socketPathPattern);
-                    if(matches && matches.length > 0) {
-                        readyToConnect = true;
-                        resolve(matches[0].substr(socketPathPrefix.length));
-                    }
+                let cliOutput: string = data.toString();
+                this.emit('TNS.outputMessage', cliOutput, 'log');
+                this.writeToTnsOutputFile(cliOutput);
+
+                socketPath = socketPath || isSocketOpened(cliOutput);
+                appSynced = rebuild ? false : (appSynced || isAppSynced(cliOutput));
+
+                if ((rebuild && socketPath) || (!rebuild && socketPath && appSynced)) {
+                    resolve(socketPath);
                 }
             });
 
@@ -183,13 +191,7 @@ export class IosProject extends NSProject {
             });
 
             child.on('close', (code, signal) => {
-                if (!args.rebuild) {
-                    setTimeout(() => {
-                        reject("The debug process exited unexpectedly code:" + code);
-                    }, 3000);
-                } else {
-                    reject("The debug process exited unexpectedly code:" + code);
-                }
+                reject("The debug process exited unexpectedly code:" + code);
             });
         });
     }
@@ -221,11 +223,12 @@ export class AndroidProject extends NSProject {
         return Promise.resolve(child);
     }
 
-    public debug(args: IAttachRequestArgs | ILaunchRequestArgs): Promise<void> {
-        if (args.request === "attach") {
+    public debug(params: IAttachRequestArgs | ILaunchRequestArgs): Promise<void> {
+        if (params.request === "attach") {
             return Promise.resolve<void>();
         }
-        else if (args.request === "launch") {
+        else if (params.request === "launch") {
+            let args: ILaunchRequestArgs = params as ILaunchRequestArgs;
             let that = this;
             let launched = false;