Merge pull request #365 from intersystems-community/#359-debugger

fixed, issue with no file exist, correct using sessions

Author: daimor

src/api/index.ts

@@ -71,10 +71,6 @@ export class AtelierAPI {
     };
   }
 
-  private get iris(): boolean {
-    return workspaceState.get(this.configName + ":iris", false);
-  }
-
   private transformNameIfCsp(filename: string): string {
     // If a CSP file, change from
     // \csp\user\... to
@@ -131,12 +127,9 @@ export class AtelierAPI {
   }
 
   public xdebugUrl(): string {
-    const { host, username, https, port, password, apiVersion } = this.config;
+    const { host, https, port, apiVersion } = this.config;
     const proto = https ? "wss" : "ws";
-    const auth = this.iris
-      ? `IRISUsername=${username}&IRISPassword=${password}`
-      : `CacheUserName=${username}&CachePassword=${password}`;
-    return `${proto}://${host}:${port}/api/atelier/v${apiVersion}/%25SYS/debug?${auth}`;
+    return `${proto}://${host}:${port}/api/atelier/v${apiVersion}/%25SYS/debug`;
   }
 
   public updateCookies(newCookies: string[]): Promise<any> {

src/debug/debugSession.ts

@@ -90,14 +90,6 @@ export class ObjectScriptDebugSession extends LoggingDebugSession {
   public constructor() {
     super();
 
-    const api = new AtelierAPI();
-    this.cookies = api.cookies;
-    if (!api.active) {
-      throw new Error("Connection not active");
-    }
-    this._namespace = api.ns;
-    this._url = api.xdebugUrl();
-
     // this debugger uses zero-based lines and columns
     this.setDebuggerLinesStartAt1(false);
     this.setDebuggerColumnsStartAt1(false);
@@ -117,27 +109,37 @@ export class ObjectScriptDebugSession extends LoggingDebugSession {
       supportsStepBack: false,
     };
 
-    const socket = new WebSocket(this._url, {
-      headers: {
-        cookie: this.cookies,
-      },
-    });
+    try {
+      const api = new AtelierAPI();
+      this.cookies = api.cookies;
+      if (!api.active) {
+        throw new Error("Connection not active");
+      }
+      this._namespace = api.ns;
+      this._url = api.xdebugUrl();
 
-    const disposeConnection = (error?: Error): void => {
-      this.sendEvent(new ThreadEvent("exited", this._connection.id));
-      this._connection.close();
-      this._connection = null;
-    };
-    this._connection = new xdebug.Connection(socket)
-      .on("warning", (warning: string) => {
-        this.sendEvent(new OutputEvent(warning + "\n"));
-      })
-      .on("close", disposeConnection)
-      .on("stdout", (data: string) => {
-        this.sendEvent(new OutputEvent(data, "stdout"));
+      await api.serverInfo();
+
+      const socket = new WebSocket(this._url, {
+        headers: {
+          cookie: this.cookies,
+        },
       });
 
-    try {
+      const disposeConnection = (error?: Error): void => {
+        this.sendEvent(new ThreadEvent("exited", this._connection.id));
+        this._connection.close();
+        this._connection = null;
+      };
+      this._connection = new xdebug.Connection(socket)
+        .on("warning", (warning: string) => {
+          this.sendEvent(new OutputEvent(warning + "\n"));
+        })
+        .on("close", disposeConnection)
+        .on("stdout", (data: string) => {
+          this.sendEvent(new OutputEvent(data, "stdout"));
+        });
+
       await this._connection.waitForInitPacket();
 
       await this._connection.sendFeatureSetCommand("max_data", 8192);
@@ -326,26 +328,31 @@ export class ObjectScriptDebugSession extends LoggingDebugSession {
           const fileUri = DocumentContentProvider.getUri(routine, null, namespace).toString();
           const source = new Source(routine, fileUri);
           let line = stackFrame.line + 1;
-          if (source.name.endsWith(".cls") && stackFrame.method !== "") {
-            line = await vscode.workspace.openTextDocument(vscode.Uri.parse(source.path)).then((document) => {
+          const place = `${stackFrame.method}+${stackFrame.methodOffset}`;
+          const stackFrameId = this._stackFrameIdCounter++;
+          let noSource = false;
+          try {
+            const document = await vscode.workspace.openTextDocument(vscode.Uri.parse(source.path));
+            if (source.name.endsWith(".cls") && stackFrame.method !== "") {
               const methodMatchPattern = new RegExp(`^(Class)?Method ${stackFrame.method}(?=[( ])`, "i");
               for (let i = 0; i < document.lineCount; i++) {
-                const line = document.lineAt(i);
+                const codeLine = document.lineAt(i);
 
-                const methodMatch = line.text.match(methodMatchPattern);
+                const methodMatch = codeLine.text.match(methodMatchPattern);
                 if (methodMatch) {
-                  return i + 2 + stackFrame.methodOffset;
+                  line = i + 2 + stackFrame.methodOffset;
+                  break;
                 }
               }
-            });
+            }
+            this._stackFrames.set(stackFrameId, stackFrame);
+          } catch (ex) {
+            noSource = true;
           }
-          const place = `${stackFrame.method}+${stackFrame.methodOffset}`;
-          const stackFrameId = this._stackFrameIdCounter++;
-          this._stackFrames.set(stackFrameId, stackFrame);
           return {
             id: stackFrameId,
             name: place,
-            source,
+            source: noSource ? null : source,
             line,
             column: 1,
           };

src/extension.ts

@@ -587,7 +587,9 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
           placeHolder: "Please enter comma delimited arguments list",
         })
         .then((args) => {
-          startDebugging(args);
+          if (args) {
+            startDebugging(args);
+          }
         });
     }),
     vscode.commands.registerCommand("vscode-objectscript.pickProcess", async (config) => {