Clearify the connect and the disconnect events in the debugger session (#11)

IoT.js-Debug-DCO-1.0-Signed-off-by: Imre Kiss [email protected]

Author: knightburton

src/IotjsDebugger.ts

@@ -18,7 +18,7 @@
 
 import {
   LoggingDebugSession, DebugSession, Logger, logger, InitializedEvent, OutputEvent, Thread, Source,
-  StoppedEvent, ContinuedEvent, StackFrame
+  StoppedEvent, ContinuedEvent, StackFrame, TerminatedEvent
 } from 'vscode-debugadapter';
 import { DebugProtocol } from 'vscode-debugprotocol';
 import * as Fs from 'fs';
@@ -133,6 +133,11 @@ class IotjsDebugSession extends LoggingDebugSession {
       this.handleSource(data);
     };
 
+    const onClose = () => {
+      this.log('onClose');
+      this.sendEvent(new TerminatedEvent());
+    };
+
     const protocolDelegate = <JerryDebugProtocolDelegate>{
       onBacktrace,
       onBreakpointHit,
@@ -142,7 +147,10 @@ class IotjsDebugSession extends LoggingDebugSession {
 
     this._protocolhandler = new JerryDebugProtocolHandler(protocolDelegate);
     this._debuggerClient = new JerryDebuggerClient(<JerryDebuggerOptions>{
-      delegate: this._protocolhandler,
+      delegate: {
+        onMessage: (message: Uint8Array) => this._protocolhandler.onMessage(message),
+        onClose
+      },
       host: args.address,
       port: args.port
     });
@@ -169,6 +177,7 @@ class IotjsDebugSession extends LoggingDebugSession {
 
     this._debuggerClient.disconnect();
 
+    this.sendEvent(new TerminatedEvent());
     this.sendResponse(response);
   }
 

src/JerryDebuggerClient.ts

@@ -25,6 +25,7 @@ export interface JerryDebuggerOptions {
 
 export interface JerryDebuggerDelegate {
   onMessage: (message: Uint8Array) => void;
+  onClose?: () => void;
 }
 
 export const DEFAULT_DEBUGGER_HOST = 'localhost';
@@ -51,6 +52,7 @@ export class JerryDebuggerClient {
     this.socket = new WebSocket(`ws://${this.host}:${this.port}/jerry-debugger`);
     this.socket.binaryType = 'arraybuffer';
     this.socket.on('message', this.onMessage.bind(this));
+    this.socket.on('close', () => this.onClose());
 
     this.connectPromise = new Promise((resolve, reject) => {
       if (!this.socket) {
@@ -72,7 +74,7 @@ export class JerryDebuggerClient {
 
   disconnect() {
     if (this.socket) {
-      this.socket.terminate();
+      this.socket.close();
       this.socket = undefined;
     }
   }
@@ -81,6 +83,12 @@ export class JerryDebuggerClient {
     this.delegate.onMessage(new Uint8Array(data));
   }
 
+  onClose() {
+    if (this.delegate.onClose) {
+      this.delegate.onClose();
+    }
+  }
+
   send(data: Uint8Array) {
     this.socket!.send(data);
   }