Change the source sending send function to the promise based (#28)

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

Author: knightburton

src/IotjsDebugger.ts

@@ -132,15 +132,20 @@ class IotjsDebugSession extends LoggingDebugSession {
       this.sendEvent(new TerminatedEvent());
     };
 
-    const onWaitForSource = () => {
+    const onWaitForSource = async () => {
       this.log('onWaitForSource');
+
       if (args.program !== '') {
         if (Fs.existsSync(`${args.localRoot}/${args.program}`)) {
           const content = Fs.readFileSync(`${args.localRoot}/${args.program}`, {
             encoding: 'utf8',
             flag: 'r'
           });
-          this._protocolhandler.sendClientSource(args.program, content);
+          await this._protocolhandler.sendClientSource(args.program, content)
+            .then(() => this.log('Source has been sended to the engine.'))
+            .catch(error => {
+              this.sendErrorResponse(response, 0, error);
+            });
         } else {
           this.sendErrorResponse(response, 0, 'You must provide a valid path to source');
         }

src/JerryProtocolHandler.ts

@@ -711,9 +711,9 @@ export class JerryDebugProtocolHandler {
     return result;
   }
 
-  sendClientSource(fileName, fileSourceCode) {
+  public sendClientSource(fileName: string, fileSourceCode: string): Promise<any> {
     if (!this.waitForSourceEnabled) {
-      throw new Error('wait-for-source not enabled');
+      return Promise.reject('wait-for-source not enabled');
     }
 
     this.waitForSourceEnabled = false;
@@ -723,21 +723,20 @@ export class JerryDebugProtocolHandler {
     array[0] = SP.CLIENT.JERRY_DEBUGGER_CLIENT_SOURCE;
 
     if (byteLength <= this.maxMessageSize) {
-      this.debuggerClient.send(array);
-      return true;
+      return this.sendSimpleRequest(array);
     }
 
-    this.debuggerClient.send(array.slice(0, this.maxMessageSize));
+    let result = this.sendSimpleRequest(array.slice(0, this.maxMessageSize));
 
     let offset = this.maxMessageSize - 1;
 
     while (offset < byteLength) {
       array[offset] = SP.CLIENT.JERRY_DEBUGGER_CLIENT_SOURCE_PART;
-      this.debuggerClient.send(array.slice(offset, offset + this.maxMessageSize));
+      result = this.sendSimpleRequest(array.slice(offset, offset + this.maxMessageSize));
       offset += this.maxMessageSize - 1;
     }
 
-    return true;
+    return result;
   }
 
   onWaitForSource() {

src/extension.ts

@@ -46,14 +46,9 @@ const provideInitialConfigurations = (): string => {
 };
 
 const getListOfFiles = (): Array<string> => {
-  let wsFolders = Array<string>();
   let wsFiles = Array<string>();
 
-  vscode.workspace.workspaceFolders.forEach(folder => {
-    wsFolders.push(folder.uri.fsPath);
-  });
-
-  wsFolders.forEach(entry => {
+  vscode.workspace.workspaceFolders.map(folder => folder.uri.fsPath).forEach(entry => {
     fs.readdirSync(entry).forEach(file => {
       if ((fs.statSync(`${entry}/${file}`)).isFile()) {
         if (path.extname(file).toLowerCase().match(/\.(js)$/i)) {
@@ -62,12 +57,14 @@ const getListOfFiles = (): Array<string> => {
       }
     });
   });
-  return wsFiles;
+
+  return ['', ...wsFiles];
 };
 
 const getProgramName = (): Thenable<string> => {
   return vscode.window.showQuickPick(getListOfFiles(), {
-    placeHolder: 'Select a file you want to debug or press Enter if you are in normal mode'
+    placeHolder: 'Select a file you want to debug or press Enter if you are in normal mode',
+    ignoreFocusOut: true
   });
 };