better way to dealt with terminals in docker-compose

Author: daimor

src/extension.ts

@@ -69,7 +69,7 @@ export let workspaceState: vscode.Memento;
 export let extensionContext: vscode.ExtensionContext;
 export let panel: vscode.StatusBarItem;
 export let posPanel: vscode.StatusBarItem;
-export let terminal: vscode.Terminal;
+export const terminals: vscode.Terminal[] = [];
 export let xmlContentProvider: XmlContentProvider;
 
 import TelemetryReporter from "vscode-extension-telemetry";
@@ -250,6 +250,12 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
       checkConnection(true);
     }
   });
+  vscode.window.onDidCloseTerminal((t) => {
+    const terminalIndex = terminals.findIndex((terminal) => terminal.name == t.name);
+    if (terminalIndex > -1) {
+      terminals.splice(terminalIndex, 1);
+    }
+  });
 
   workspace.onDidSaveTextDocument((file) => {
     if (schemas.includes(file.uri.scheme) || languages.includes(file.languageId)) {
@@ -492,7 +498,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
 export function deactivate(): void {
   // This will ensure all pending events get flushed
   reporter.dispose();
-  if (terminal) {
-    terminal.dispose();
+  if (terminals) {
+    terminals.forEach((t) => t.dispose());
   }
 }

src/utils/index.ts

@@ -3,7 +3,7 @@ import path = require("path");
 import * as url from "url";
 import { execSync } from "child_process";
 import * as vscode from "vscode";
-import { config, schemas, workspaceState } from "../extension";
+import { config, schemas, workspaceState, terminals } from "../extension";
 
 export const outputChannel = vscode.window.createOutputChannel("ObjectScript");
 
@@ -137,7 +137,7 @@ export function notNull(el: any): boolean {
 }
 
 export function portFromDockerCompose(): { port: number; docker: boolean } {
-  const { "docker-compose": dockerCompose, port: defaultPort } = config("conn");
+  const { "docker-compose": dockerCompose = {}, port: defaultPort } = config("conn");
   const result = { port: defaultPort, docker: false };
   const { service, file = "docker-compose.yml", internalPort = 52773 } = dockerCompose;
   if (!internalPort || !file || !service || service === "") {
@@ -183,16 +183,20 @@ export async function terminalWithDocker(): Promise<vscode.Terminal> {
   const workspace = currentWorkspaceFolder();
 
   const terminalName = `ObjectScript:${workspace}`;
-  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}`,
-  ]);
+  let terminal = terminals.find((t) => t.name == terminalName && t.exitStatus == undefined);
+  if (!terminal) {
+    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}`,
+    ]);
+    terminals.push(terminal);
+  }
   terminal.show(true);
   return terminal;
 }