Merge pull request #158 from intersystems-community/docker-terminal

fix several issues with terminal in docker

Author: daimor

src/api/index.ts

@@ -215,7 +215,7 @@ export class AtelierAPI {
           })
           .catch((error) => {
             if (error.error && error.error.code === "ECONNREFUSED") {
-              setTimeout(checkConnection, 1000);
+              setTimeout(checkConnection, 30000);
             }
             console.error(error);
             throw error;

src/extension.ts

@@ -492,5 +492,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
 export function deactivate(): void {
   // This will ensure all pending events get flushed
   reporter.dispose();
-  terminal.dispose();
+  if (terminal) {
+    terminal.dispose();
+  }
 }

src/utils/index.ts

@@ -183,18 +183,16 @@ export async function terminalWithDocker(): Promise<vscode.Terminal> {
   const workspace = currentWorkspaceFolder();
 
   const terminalName = `ObjectScript:${workspace}`;
-  let terminal = vscode.window.terminals.find((el) => el.name === terminalName && el.exitStatus == undefined);
-  if (!terminal) {
-    terminal = vscode.window.createTerminal(terminalName, "docker-compose", [
-      "-f",
-      file,
-      "exec",
-      service,
-      "/bin/bash",
-      "-c",
-      `command -v iris >/dev/null 2>&1 && iris session $ISC_PACKAGE_INSTANCENAME -U ${ns} || ccontrol session $ISC_PACKAGE_INSTANCENAME -U ${ns}`,
-    ]);
-  }
-  terminal.show();
+  const terminal = vscode.window.createTerminal(terminalName, "docker-compose", [
+    "-f",
+    file,
+    "exec",
+    service,
+    "/bin/bash",
+    "-c",
+    `[ -f /tmp/vscodesession.pid ] && kill $(cat /tmp/vscodesession.pid) >/dev/null 2>&1 ; echo $$ > /tmp/vscodesession.pid;
+      $(command -v ccontrol || command -v iris) session $ISC_PACKAGE_INSTANCENAME -U ${ns}`,
+  ]);
+  terminal.show(true);
   return terminal;
 }