Merge pull request #65 from NativeScript/raikov/livesync-debug2

Added support for debug with livesync

Author: ivanbuhov

package.json

@@ -105,84 +105,68 @@
         "runtime": "node",
         "initialConfigurations": [
           {
-            "name": "Launch on iOS Device",
+            "name": "Sync on iOS",
             "type": "nativescript",
             "platform": "ios",
             "request": "launch",
             "appRoot": "${workspaceRoot}",
             "sourceMaps": true,
             "diagnosticLogging": false,
-            "emulator": false
-          },
-          {
-            "name": "Attach on iOS Device",
-            "type": "nativescript",
-            "platform": "ios",
-            "request": "attach",
-            "appRoot": "${workspaceRoot}",
-            "sourceMaps": true,
-            "diagnosticLogging": false,
-            "emulator": false
+            "emulator": false,
+            "rebuild": false
           },
           {
-            "name": "Launch on iOS Emulator",
+            "name": "Launch on iOS",
             "type": "nativescript",
             "platform": "ios",
             "request": "launch",
             "appRoot": "${workspaceRoot}",
             "sourceMaps": true,
             "diagnosticLogging": false,
-            "emulator": true
+            "emulator": false,
+            "rebuild": true
           },
           {
-            "name": "Attach on iOS Emulator",
+            "name": "Attach on iOS",
             "type": "nativescript",
             "platform": "ios",
             "request": "attach",
             "appRoot": "${workspaceRoot}",
             "sourceMaps": true,
             "diagnosticLogging": false,
-            "emulator": true
+            "emulator": false
           },
           {
-            "name": "Launch on Android Device",
+            "name": "Sync on Android",
             "type": "nativescript",
             "platform": "android",
             "request": "launch",
             "appRoot": "${workspaceRoot}",
             "sourceMaps": true,
             "diagnosticLogging": false,
-            "emulator": false
+            "emulator": false,
+            "rebuild": false
           },
           {
-            "name": "Launch on Android Emulator",
+            "name": "Launch on Android",
             "type": "nativescript",
             "platform": "android",
             "request": "launch",
             "appRoot": "${workspaceRoot}",
             "sourceMaps": true,
             "diagnosticLogging": false,
-            "emulator": true
+            "emulator": false,
+            "rebuild": true
           },
           {
-            "name": "Attach on Android Device",
+            "name": "Attach on Android",
             "type": "nativescript",
             "platform": "android",
             "request": "attach",
             "appRoot": "${workspaceRoot}",
             "sourceMaps": true,
             "diagnosticLogging": false,
             "emulator": false
-          },
-          {
-            "name": "Attach on Android Emulator",
-            "type": "nativescript",
-            "platform": "android",
-            "request": "attach",
-            "appRoot": "${workspaceRoot}",
-            "sourceMaps": true,
-            "diagnosticLogging": false,
-            "emulator": true
           }
         ],
         "configurationAttributes": {
@@ -234,6 +218,11 @@
                 "type": "boolean",
                 "description": "Whether the app to run in emulator or on a physical device.",
                 "default": false
+              },
+              "rebuild": {
+                "type": "boolean",
+                "description": "Whether the app should be rebuild before start.",
+                "default": true
               }
             }
           },

src/debug-adapter/webKitAdapterInterfaces.d.ts

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

src/services/NsCliService.ts

@@ -137,35 +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", !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 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(!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);
                 }
             });
 
@@ -207,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;
 
@@ -220,6 +237,7 @@ export class AndroidProject extends NSProject {
                     .appendParam("debug")
                     .appendParam(this.platform())
                     .appendParamIf("--emulator", args.emulator)
+                    .appendParamIf("--no-rebuild", args.rebuild !== true)
                     .appendParam("--debug-brk")
                     .appendParam("--no-client")
                     .appendParams(args.tnsArgs)
@@ -233,13 +251,14 @@ export class AndroidProject extends NSProject {
                     let strData: string = data.toString();
                     that.emit('TNS.outputMessage', data.toString(), 'log');
                     that.writeToTnsOutputFile(strData);
-                    if (!launched && args.request === "launch" && strData.indexOf('# NativeScript Debugger started #') > -1) {
-                        launched = 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);
+                    if (!launched) {
+                         if (args.request === "launch" && ((strData.indexOf('# NativeScript Debugger started #') > -1) || strData.indexOf('Successfully synced application') > -1)) {
+                             launched = 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);
+                         }
                     }
                 });
 
@@ -249,7 +268,14 @@ export class AndroidProject extends NSProject {
                 });
 
                 child.on('close', function(code) {
-                    reject("The debug process exited unexpectedly code:" + code);
+                    if (!args.rebuild) {
+                         setTimeout(() => {
+                          reject("The debug process exited unexpectedly code:" + code);
+                        }, 3000);
+                    }
+                    else {
+                        reject("The debug process exited unexpectedly code:" + code);
+                    }
                 });
             });
          }