Merge pull request #343 from intersystems-community/debugger-fixes

Fix issues with debugger

Author: daimor

src/api/index.ts

@@ -123,7 +123,7 @@ export class AtelierAPI {
     return !!this._config.active && host.length > 0 && port > 0;
   }
 
-  private get cookies(): string[] {
+  public get cookies(): string[] {
     return this.cache.get("cookies", []);
   }
 

src/debug/debugSession.ts

@@ -85,10 +85,13 @@ export class ObjectScriptDebugSession extends LoggingDebugSession {
 
   private _evalResultProperties = new Map<number, xdebug.EvalResultProperty>();
 
+  private cookies: string[] = [];
+
   public constructor() {
     super();
 
     const api = new AtelierAPI();
+    this.cookies = api.cookies;
     if (!api.active) {
       throw new Error("Connection not active");
     }
@@ -114,7 +117,11 @@ export class ObjectScriptDebugSession extends LoggingDebugSession {
       supportsStepBack: false,
     };
 
-    const socket = new WebSocket(this._url);
+    const socket = new WebSocket(this._url, {
+      headers: {
+        cookie: this.cookies,
+      },
+    });
 
     const disposeConnection = (error?: Error): void => {
       this.sendEvent(new ThreadEvent("exited", this._connection.id));
@@ -130,24 +137,30 @@ export class ObjectScriptDebugSession extends LoggingDebugSession {
         this.sendEvent(new OutputEvent(data, "stdout"));
       });
 
-    await this._connection.waitForInitPacket();
+    try {
+      await this._connection.waitForInitPacket();
 
-    await this._connection.sendFeatureSetCommand("max_data", 8192);
-    await this._connection.sendFeatureSetCommand("max_children", 32);
-    await this._connection.sendFeatureSetCommand("max_depth", 2);
-    await this._connection.sendFeatureSetCommand("notify_ok", 1);
+      await this._connection.sendFeatureSetCommand("max_data", 8192);
+      await this._connection.sendFeatureSetCommand("max_children", 32);
+      await this._connection.sendFeatureSetCommand("max_depth", 2);
+      await this._connection.sendFeatureSetCommand("notify_ok", 1);
 
-    this.sendResponse(response);
+      this.sendResponse(response);
 
-    this.sendEvent(new InitializedEvent());
+      this.sendEvent(new InitializedEvent());
+    } catch (error) {
+      response.success = false;
+      response.message = "Debugger can not start";
+      this.sendResponse(response);
+    }
   }
 
   protected async launchRequest(response: DebugProtocol.LaunchResponse, args: LaunchRequestArguments): Promise<void> {
     // this._args = args;
 
     try {
       const debugTarget = `${this._namespace}:${args.program}`;
-      await this._connection.sendFeatureSetCommand("debug_target", debugTarget);
+      await this._connection.sendFeatureSetCommand("debug_target", debugTarget, true);
 
       this._debugTargetSet.notify();
     } catch (error) {

src/debug/xdebugConnection.ts

@@ -719,8 +719,14 @@ export class Connection extends DbgpConnection {
    *  - show_hidden
    *  - notify_ok
    */
-  public async sendFeatureSetCommand(feature: string, value: string | number): Promise<FeatureSetResponse> {
-    return new FeatureSetResponse(await this._enqueueCommand("feature_set", `-n ${feature} -v ${value}`), this);
+  public async sendFeatureSetCommand(
+    feature: string,
+    value: string | number,
+    base64 = false
+  ): Promise<FeatureSetResponse> {
+    const v =
+      typeof value === "string" && base64 ? `-v_base64 ${Buffer.from(value).toString("base64")}` : `-v ${value}`;
+    return new FeatureSetResponse(await this._enqueueCommand("feature_set", `-n ${feature} ${v}`), this);
   }
 
   // ---------------------------- breakpoints ------------------------------------