read port from docker-compose, and auto-open terminal

Author: daimor

package-lock.json

@@ -446,11 +446,6 @@
           "type": "boolean",
           "default": false
         },
-        "objectscript.conn.label": {
-          "description": "Server Name",
-          "type": "string",
-          "default": "LOCAL"
-        },
         "objectscript.conn.host": {
           "description": "Hostname",
           "format": "hostname",
@@ -460,7 +455,7 @@
         "objectscript.conn.port": {
           "description": "Port number",
           "type": "number",
-          "default": 57772
+          "default": 52773
         },
         "objectscript.conn.username": {
           "description": "Username",
@@ -477,18 +472,29 @@
           "type": "string",
           "default": "USER"
         },
-        "objectscript.conn.version": {
-          "description": "API Version number",
-          "type": "number",
-          "default": 3,
-          "readOnly": true,
-          "deprecationMessage": "This value loads from server"
-        },
         "objectscript.conn.https": {
           "description": "Use SSL to access to API",
           "type": "boolean",
           "default": false
         },
+        "objectscript.conn.docker-compose.service": {
+          "description": "Name of service in docker-compose",
+          "type": "string"
+        },
+        "objectscript.conn.docker-compose.port": {
+          "description": "Target port inside the service in docker-compose",
+          "type": "number",
+          "default": 52773
+        },
+        "objectscript.conn.docker-compose.file": {
+          "description": "docker-compose file",
+          "type": "string",
+          "default": "docker-compose.yml"
+        },
+        "objectscript.conn.docker-compose": {
+          "description": "Connect to server running in docker-compose",
+          "type": "object"
+        },
         "objectscript.export": {
           "type": "object",
           "description": "Export only the necessary stuff ",

package.json

@@ -4,7 +4,7 @@ import * as request from "request-promise";
 import * as url from "url";
 import * as vscode from "vscode";
 import * as Cache from "vscode-cache";
-import { config, extensionContext, FILESYSTEM_SCHEMA, workspaceState } from "../extension";
+import { config, extensionContext, FILESYSTEM_SCHEMA, workspaceState, panel } from "../extension";
 import { currentWorkspaceFolder, outputConsole, outputChannel } from "../utils";
 
 const DEFAULT_API_VERSION = 1;
@@ -24,6 +24,10 @@ export class AtelierAPI {
     return workspaceState.get(this.workspaceFolder + ":apiVersion", DEFAULT_API_VERSION);
   }
 
+  private get port(): number {
+    return workspaceState.get(this.workspaceFolder + ":port", this.config.port);
+  }
+
   private get iris(): boolean {
     return workspaceState.get(this.workspaceFolder + ":iris", false);
   }
@@ -34,7 +38,7 @@ export class AtelierAPI {
       if (wsOrFile instanceof vscode.Uri) {
         if (wsOrFile.scheme === FILESYSTEM_SCHEMA) {
           workspaceFolderName = wsOrFile.authority;
-          const query = url.parse(decodeURIComponent(wsOrFile.toString()), true).query;
+          const { query } = url.parse(wsOrFile.toString(), true);
           if (query) {
             if (query.ns && query.ns !== "") {
               const namespace = query.ns.toString();
@@ -61,8 +65,13 @@ export class AtelierAPI {
     return this.cache.get("cookies", []);
   }
 
+  public clearCookies(): void {
+    this.cache.set("cookies", []);
+  }
+
   public xdebugUrl(): string {
-    const { host, port, username, password, https } = this.config;
+    const { host, username, password, https } = this.config;
+    const port = this.port;
     const proto = https ? "wss" : "ws";
     const auth = this.iris
       ? `IRISUsername=${username}&IRISPassword=${password}`
@@ -88,7 +97,8 @@ export class AtelierAPI {
     this.workspaceFolder = workspaceFolderName;
     const conn = config("conn", workspaceFolderName);
     this.config = conn;
-    const { name, host, port } = this.config;
+    const { name, host } = this.config;
+    const port = this.port;
     this.cache = new Cache(extensionContext, `API:${name}:${host}:${port}`);
   }
 
@@ -134,7 +144,8 @@ export class AtelierAPI {
     }
     headers["Cache-Control"] = "no-cache";
 
-    const { host, port, username, password, https } = this.config;
+    const { host, username, password, https } = this.config;
+    const port = this.port;
     const proto = this.config.https ? "https" : "http";
     const http: any = this.config.https ? httpsModule : httpModule;
     const agent = new http.Agent({
@@ -151,11 +162,12 @@ export class AtelierAPI {
     } else if (!cookies.length) {
       auth = this.request(0, "HEAD");
     }
+    const connInfo = `${host}:${port}[${this.ns}]`;
     return auth.then(cookie => {
       return (
         request({
           agent,
-          auth: { username, password, sendImmediately: false },
+          auth: { username, password, sendImmediately: true },
           body: ["PUT", "POST"].includes(method) ? body : null,
           headers: {
             ...headers,
@@ -170,6 +182,7 @@ export class AtelierAPI {
           // .catch(error => error.error)
           .then(response => this.updateCookies(response.headers["set-cookie"]).then(() => response))
           .then(response => {
+            panel.text = `${connInfo} - Connected`;
             // console.log(`APIResponse: ${method} ${proto}://${host}:${port}${path}`)
             if (method === "HEAD") {
               return this.cookies;
@@ -203,10 +216,11 @@ export class AtelierAPI {
       if (info && info.result && info.result.content && info.result.content.api > 0) {
         const data = info.result.content;
         const apiVersion = data.api;
-        if (!data.namespaces.includes(this.ns)) {
+        if (!data.namespaces.includes(this.ns.toUpperCase())) {
           throw {
             code: "WrongNamespace",
-            message: "This server does not have specified namespace.",
+            message: `This server does not have specified namespace '${this.ns}'.\n
+            You must select one of the following: ${data.namespaces.join(", ")}.`,
           };
         }
         return Promise.all([

src/api/index.ts

@@ -26,49 +26,53 @@ function doMenuAction(uri: vscode.Uri, menuType: string): Promise<any> {
           list.concat(
             sub.items
               .filter(el => el.id !== "" && el.separator == 0 && el.enabled == 1)
-              .map(el => ({ ...el, id: `${sub.id},${el.id}`, label: el.name }))
+              .map(el => ({ ...el, id: `${sub.id},${el.id}`, label: el.name, itemId: el.id, type: sub.type }))
           ),
         []
       )
     )
+    .then(menuItems =>
+      menuItems.filter((item: any, index: number, self: any) => {
+        if (item && item.type === "main") {
+          return true;
+        }
+        return self.findIndex((el): boolean => el.itemId === item.itemId) === index;
+      })
+    )
     .then(menuItems => {
       return vscode.window.showQuickPick<StudioAction>(menuItems, { canPickMany: false });
     })
-    .then(({ id, label }) => ({
-      id: id,
-      label,
-      name,
-    }))
     .then(action => {
-      if (action) {
-        const query = "select * from %Atelier_v1_Utils.Extension_UserAction(?, ?, ?, ?)";
-        let selectedText = "";
-        const editor = vscode.window.activeTextEditor;
-        if (!editor) {
-            selectedText = ""
-        }
-        const selection = editor.selection;
-        selectedText = editor.document.getText(selection);
-        
-        const parameters = ["0", action.id, name, selectedText];
-        return vscode.window.withProgress(
-          {
-            cancellable: false,
-            location: vscode.ProgressLocation.Notification,
-            title: `Executing user action: ${action.label}`,
-          },
-          () =>
-            api
-              .actionQuery(query, parameters)
-              .then(data => data.result.content.pop())
-              .then(userAction => {
-                if (userAction && userAction.action != "0") {
-                  outputChannel.appendLine(`Studio Action "${action.label}" not supported`);
-                  outputChannel.show();
-                }
-              })
-        );
+      if (!action) {
+        return;
       }
+      const query = "select * from %Atelier_v1_Utils.Extension_UserAction(?, ?, ?, ?)";
+      let selectedText = "";
+      const editor = vscode.window.activeTextEditor;
+      if (!editor) {
+        selectedText = "";
+      }
+      const selection = editor.selection;
+      selectedText = editor.document.getText(selection);
+
+      const parameters = ["0", action.id, name, selectedText];
+      return vscode.window.withProgress(
+        {
+          cancellable: false,
+          location: vscode.ProgressLocation.Notification,
+          title: `Executing user action: ${action.label}`,
+        },
+        () =>
+          api
+            .actionQuery(query, parameters)
+            .then(data => data.result.content.pop())
+            .then(userAction => {
+              if (userAction && userAction.action != "0") {
+                outputChannel.appendLine(`Studio Action "${action.label}" not supported`);
+                outputChannel.show();
+              }
+            })
+      );
     });
 }
 

src/commands/studio.ts

@@ -46,7 +46,7 @@ import { ObjectScriptExplorerProvider } from "./explorer/explorer";
 import { WorkspaceNode } from "./explorer/models/workspaceNode";
 import { FileSystemProvider } from "./providers/FileSystemPovider/FileSystemProvider";
 import { WorkspaceSymbolProvider } from "./providers/WorkspaceSymbolProvider";
-import { currentWorkspaceFolder, outputChannel } from "./utils";
+import { currentWorkspaceFolder, outputChannel, portFromDockerCompose, terminalWithDocker } from "./utils";
 import { ObjectScriptDiagnosticProvider } from "./providers/ObjectScriptDiagnosticProvider";
 import { DocumentRangeFormattingEditProvider } from "./providers/DocumentRangeFormattingEditProvider";
 
@@ -59,6 +59,8 @@ export let explorerProvider: ObjectScriptExplorerProvider;
 export let documentContentProvider: DocumentContentProvider;
 export let workspaceState: vscode.Memento;
 export let extensionContext: vscode.ExtensionContext;
+export let panel: vscode.StatusBarItem;
+export let terminal: vscode.Terminal;
 
 import TelemetryReporter from "vscode-extension-telemetry";
 
@@ -112,13 +114,13 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
 
   vscode.window.registerTreeDataProvider("ObjectScriptExplorer", explorerProvider);
 
-  const panel = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left);
+  panel = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left);
 
   const debugAdapterFactory = new ObjectScriptDebugAdapterDescriptorFactory();
 
   panel.command = "vscode-objectscript.serverActions";
   panel.show();
-  const checkConnection = () => {
+  const checkConnection = (clearCookies = false) => {
     const conn = config("conn");
     const connInfo = `${conn.host}:${conn.port}[${conn.ns}]`;
     panel.text = connInfo;
@@ -128,11 +130,22 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
       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`;
+        // panel.text = `${connInfo} - Connected`;
       })
       .catch(error => {
         let message = error.message;
@@ -154,8 +167,10 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
       });
   };
   checkConnection();
-  vscode.workspace.onDidChangeConfiguration(() => {
-    checkConnection();
+  vscode.workspace.onDidChangeConfiguration(({ affectsConfiguration }) => {
+    if (affectsConfiguration("objectscript.conn")) {
+      checkConnection(true);
+    }
   });
 
   workspace.onDidSaveTextDocument(file => {

src/extension.ts

@@ -12,7 +12,6 @@ export class FileSearchProvider implements vscode.FileSearchProvider {
     options: vscode.FileSearchOptions,
     token: vscode.CancellationToken
   ): vscode.ProviderResult<vscode.Uri[]> {
-    console.log("options", options);
     return [];
   }
 }