Ensure the CLI process is killed when the client is dosconnected

Author: ivanbuhov

src/debug-adapter/webKitDebugAdapter.ts

@@ -5,6 +5,7 @@
 import * as os from 'os';
 import * as fs from 'fs';
 import * as path from 'path';
+import {ChildProcess} from 'child_process';
 import {Handles, StoppedEvent, InitializedEvent, TerminatedEvent, OutputEvent} from 'vscode-debugadapter';
 import {DebugProtocol} from 'vscode-debugprotocol';
 import {INSDebugConnection} from './connection/INSDebugConnection';
@@ -42,6 +43,7 @@ export class WebKitDebugAdapter implements DebugProtocol.IDebugAdapter {
     private _lastOutputEvent: OutputEvent;
     private _loggerFrontendHandler: LoggerHandler = args => this.fireEvent(new OutputEvent(`${args.message}\n`, args.type.toString()));
     private _request: DebugRequest;
+    private _tnsProcess: ChildProcess;
 
     public constructor() {
         this._variableHandles = new Handles<IScopeVarHandle>();
@@ -153,9 +155,12 @@ export class WebKitDebugAdapter implements DebugProtocol.IDebugAdapter {
             }
 
             if (cliCommand.tnsProcess) {
+                this._tnsProcess = cliCommand.tnsProcess;
                 cliCommand.tnsProcess.stdout.on('data', data => { Services.logger().log(data.toString(), Tags.FrontendMessage); });
                 cliCommand.tnsProcess.stderr.on('data', data => { Services.logger().error(data.toString(), Tags.FrontendMessage); });
-                cliCommand.tnsProcess.on('close', (code, signal) => { Services.logger().error(`[NSDebugAdapter] The tns command finished its execution with code ${code}.`, Tags.FrontendMessage); });
+                cliCommand.tnsProcess.on('close', (code, signal) => {
+                    Services.logger().error(`[NSDebugAdapter] The tns command finished its execution with code ${code}.`, Tags.FrontendMessage);
+                });
             }
 
             let promiseResolve = null;
@@ -191,7 +196,10 @@ export class WebKitDebugAdapter implements DebugProtocol.IDebugAdapter {
         connection.on('Console.messageRepeatCountUpdated', params => this.onMessageRepeatCountUpdated(params));
         connection.on('Inspector.detached', () => this.terminateSession());
         connection.on('close', () => this.terminateSession());
-        connection.on('error', () => this.terminateSession());
+        connection.on('error', (error) => {
+            Services.logger().log(error.toString());
+            this.terminateSession();
+        });
         connection.on('connect', () => this.onConnected())
         this._webKitConnection = connection;
         return connection;
@@ -220,6 +228,11 @@ export class WebKitDebugAdapter implements DebugProtocol.IDebugAdapter {
         this.clearClientContext();
         this.clearTargetContext();
 
+        if (this._tnsProcess) {
+            this._tnsProcess.kill('SIGQUIT');
+            this._tnsProcess = null;
+        }
+
         if (this._webKitConnection) {
             Services.logger().log("Closing debug connection");
 
@@ -356,7 +369,6 @@ export class WebKitDebugAdapter implements DebugProtocol.IDebugAdapter {
                 .then(responses => ({ breakpoints: this._webkitBreakpointResponsesToODPBreakpoints(targetScriptUrl, responses, args.lines) }));
 
             const inDebug = typeof (<any>global).v8debug === 'object';
-            console.log("InDebug: " + inDebug);
             const setBreakpointsPTimeout = utils.promiseTimeout(setBreakpointsPFailOnError, /*timeoutMs*/inDebug ? 2000000 : 8000, 'Set breakpoints request timed out');
 
             // Do just one setBreakpointsRequest at a time to avoid interleaving breakpoint removed/breakpoint added requests to Chrome.

src/debug-adapter/webKitDebugSession.ts

@@ -2,7 +2,7 @@ import {OutputEvent, DebugSession, ErrorDestination} from 'vscode-debugadapter';
 import {DebugProtocol} from 'vscode-debugprotocol';
 
 import {WebKitDebugAdapter} from './webKitDebugAdapter';
-import {Handlers} from '../common/logger';
+import {LoggerHandler, Handlers, Tags} from '../common/logger';
 import {Services} from '../services/debugAdapterServices';
 
 import {AdapterProxy} from './adapter/adapterProxy';
@@ -76,7 +76,7 @@ export class WebKitDebugSession extends DebugSession {
 
 
                 if (eStr === 'Error: unknowncommand') {
-                    this.sendErrorResponse(response, 1014, '[NativeScript-Debug-Adapter] Unrecognized request: ' + request.command, null, ErrorDestination.Telemetry);
+                    this.sendErrorResponse(response, 1014, '[NSDebugAdapter] Unrecognized request: ' + request.command, null, ErrorDestination.Telemetry);
                     return;
                 }
 
@@ -87,8 +87,8 @@ export class WebKitDebugSession extends DebugSession {
                 } else {
                     // These errors show up in the message bar at the top (or nowhere), sometimes not obvious that they
                     // come from the adapter
-                    response.message = '[NativeScript-Debug-Adapter] ' + eStr;
-                    Services.logger().log('Error: ' + e ? e.stack : eStr);
+                    response.message = '[NSDebugAdapter] ' + eStr;
+                    Services.logger().error('Error: ' + eStr, Tags.FrontendMessage);
                 }
 
                 response.success = false;