open terminal with docker-compose

Author: daimor

README.md

@@ -50,7 +50,7 @@ To be able to use many plugin features, you need to configure the connection to
 Or you can edit it through settings editor. Which you can open from menu *Code* > *Preferences* > *Settings* for macOS or *File* > *Preferences* > *Settings* for Windows, search for "workspace settings" through Command Palette [⌘⇧P/Ctrl+Shift+P] or by shortcut [⌘,/Ctrl+,].
 
 - Find a 'objectscript', do not forget to set `active` to `true`
-  `port` should follow to web port of instance (usually by default, 57772 for Caché/Ensemble, 52773 for IRIS) ![Settings UI](https://raw.githubusercontent.com/daimor/vscode-objectscript/master/images/settings.png)
+  `port` should follow to web port of instance (usually by default, 52773 for Caché/Ensemble, 52773 for IRIS) ![Settings UI](https://raw.githubusercontent.com/daimor/vscode-objectscript/master/images/settings.png)
 - Change settings according to your Caché/IRIS instance
 - You will see related output in "Output" while switched to "ObjectScript" channel (right drop-down menu on top of the output window)
 

package-lock.json

@@ -481,7 +481,7 @@
           "description": "Name of service in docker-compose",
           "type": "string"
         },
-        "objectscript.conn.docker-compose.port": {
+        "objectscript.conn.docker-compose.internalPort": {
           "description": "Target port inside the service in docker-compose",
           "type": "number",
           "default": 52773
@@ -720,7 +720,7 @@
     "prettier": "^1.18.2",
     "tape": "^4.11.0",
     "typescript": "^3.6.3",
-    "vsce": "^1.67.1",
+    "vsce": "^1.70.0",
     "vscode-debugadapter-testsupport": "^1.37.1",
     "vscode-test": "^1.2.0"
   },

package.json

@@ -1,6 +1,6 @@
 import * as vscode from "vscode";
-import { config, workspaceState } from "../extension";
-import { currentWorkspaceFolder } from "../utils";
+import { config, workspaceState, checkConnection } from "../extension";
+import { currentWorkspaceFolder, terminalWithDocker } from "../utils";
 
 export async function serverActions(): Promise<void> {
   const { active, host, ns, https, port: defaultPort, username, password } = config("conn");
@@ -14,9 +14,24 @@ export async function serverActions(): Promise<void> {
   const auth = iris
     ? `&IRISUsername=${username}&IRISPassword=${password}`
     : `&CacheUserName=${username}&CachePassword=${password}`;
+
+  const terminal = [];
+  if (workspaceState.get(workspaceFolder + ":docker", true)) {
+    terminal.push({
+      id: "openDockerTerminal",
+      label: "Open terminal in docker",
+      detail: "Use docker-compose to start session inside configured service",
+    });
+  }
   return vscode.window
     .showQuickPick(
       [
+        {
+          id: "refreshConnection",
+          label: "Refresh connection",
+          detail: "Force attempt to connect to the server",
+        },
+        ...terminal,
         {
           detail: "Enable/Disable current connection",
           id: "toggleConnection",
@@ -53,6 +68,13 @@ export async function serverActions(): Promise<void> {
           vscode.env.openExternal(vscode.Uri.parse(classRef + auth));
           break;
         }
+        case "refreshConnection": {
+          checkConnection();
+          break;
+        }
+        case "openDockerTerminal": {
+          terminalWithDocker();
+        }
       }
     });
 }

src/commands/serverActions.ts

@@ -98,6 +98,55 @@ export function getXmlUri(uri: vscode.Uri): vscode.Uri {
 }
 let reporter;
 
+export const checkConnection = (clearCookies = false): void => {
+  const conn = config("conn");
+  const connInfo = `${conn.host}:${conn.port}[${conn.ns}]`;
+  panel.text = connInfo;
+  panel.tooltip = "";
+  vscode.commands.executeCommand("setContext", "vscode-objectscript.connectActive", conn.active);
+  if (!conn.active) {
+    panel.text = `${connInfo} - Disabled`;
+    return;
+  }
+  workspaceState.update(currentWorkspaceFolder() + ":port", undefined);
+  const { port: dockerPort, docker: withDocker } = portFromDockerCompose(config("conn.docker-compose"), conn.port);
+  workspaceState.update(currentWorkspaceFolder() + ":docker", withDocker);
+  if (withDocker) {
+    terminalWithDocker();
+    if (dockerPort !== conn.port) {
+      workspaceState.update(currentWorkspaceFolder() + ":port", dockerPort);
+    }
+  }
+
+  const api = new AtelierAPI(currentWorkspaceFolder());
+  if (clearCookies) {
+    api.clearCookies();
+  }
+  api
+    .serverInfo()
+    .then(async info => {
+      // panel.text = `${connInfo} - Connected`;
+    })
+    .catch(error => {
+      let message = error.message;
+      if (error instanceof StatusCodeError && error.statusCode === 401) {
+        message = "Not Authorized";
+        outputChannel.appendLine(
+          `Authorization error: please check your username/password in the settings,
+          and if you have sufficient privileges on the server.`
+        );
+      } else {
+        outputChannel.appendLine("Error: " + message);
+        outputChannel.appendLine("Please check your network settings in the settings.");
+      }
+      panel.text = `${connInfo} - ERROR`;
+      panel.tooltip = message;
+    })
+    .finally(() => {
+      explorerProvider.refresh();
+    });
+};
+
 export async function activate(context: vscode.ExtensionContext): Promise<void> {
   reporter = new TelemetryReporter(extensionId, extensionVersion, aiKey);
 
@@ -120,52 +169,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
 
   panel.command = "vscode-objectscript.serverActions";
   panel.show();
-  const checkConnection = (clearCookies = false) => {
-    const conn = config("conn");
-    const connInfo = `${conn.host}:${conn.port}[${conn.ns}]`;
-    panel.text = connInfo;
-    panel.tooltip = "";
-    vscode.commands.executeCommand("setContext", "vscode-objectscript.connectActive", conn.active);
-    if (!conn.active) {
-      panel.text = `${connInfo} - Disabled`;
-      return;
-    }
-    const { port: dockerPort, docker: withDocker } = portFromDockerCompose(config("conn.docker-compose"), conn.port);
-    if (withDocker) {
-      terminal = terminalWithDocker();
-      if (dockerPort !== conn.port) {
-        workspaceState.update(currentWorkspaceFolder() + ":port", dockerPort);
-      }
-    }
 
-    const api = new AtelierAPI(currentWorkspaceFolder());
-    if (clearCookies) {
-      api.clearCookies();
-    }
-    api
-      .serverInfo()
-      .then(async info => {
-        // panel.text = `${connInfo} - Connected`;
-      })
-      .catch(error => {
-        let message = error.message;
-        if (error instanceof StatusCodeError && error.statusCode === 401) {
-          message = "Not Authorized";
-          outputChannel.appendLine(
-            `Authorization error: please check your username/password in the settings,
-            and if you have sufficient privileges on the server.`
-          );
-        } else {
-          outputChannel.appendLine("Error: " + message);
-          outputChannel.appendLine("Please check your network settings in the settings.");
-        }
-        panel.text = `${connInfo} - ERROR`;
-        panel.tooltip = message;
-      })
-      .finally(() => {
-        explorerProvider.refresh();
-      });
-  };
   checkConnection();
   vscode.workspace.onDidChangeConfiguration(({ affectsConfiguration }) => {
     if (affectsConfiguration("objectscript.conn")) {

src/extension.ts

@@ -128,12 +128,12 @@ export function portFromDockerCompose(options, defaultPort: number): { port: num
   if (!options) {
     return result;
   }
-  const { file, service, port } = options;
-  if (!port || !file || !service || service === "") {
+  const { file = "docker-compose.yml", service, internalPort = 52773 } = options;
+  if (!internalPort || !file || !service || service === "") {
     return result;
   }
   const cwd = workspaceFolderUri().fsPath;
-  const cmd = `docker-compose -f ${file} ps ${service}`;
+  const cmd = `docker-compose -f ${file} port --protocol=tcp ${service} ${internalPort}`;
   try {
     const serviceLine = execSync(cmd, {
       cwd,
@@ -142,12 +142,13 @@ export function portFromDockerCompose(options, defaultPort: number): { port: num
       .replace("/r", "")
       .split("/n")
       .pop();
-    const servicePortMatch = serviceLine.match(new RegExp(`:(\\d+)->${port}/`));
+    const servicePortMatch = serviceLine.match(new RegExp(`:(\\d+)`));
     if (servicePortMatch) {
       const [, newPort] = servicePortMatch;
       return { port: parseInt(newPort, 10), docker: true };
     }
   } catch (e) {
+    console.log(e);
     // nope
   }
   return result;
@@ -167,7 +168,7 @@ export function terminalWithDocker() {
       "-c",
       `command -v ccontrol >/dev/null 2>&1 && ccontrol session $ISC_PACKAGE_INSTANCENAME -U ${ns} || iris session $ISC_PACKAGE_INSTANCENAME -U ${ns}`,
     ]);
-    terminal.show();
   }
+  terminal.show();
   return terminal;
 }