password prompt, live connection status

Author: daimor

src/api/index.ts

@@ -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, panel } from "../extension";
+import { config, extensionContext, FILESYSTEM_SCHEMA, workspaceState, panel, checkConnection } from "../extension";
 import { currentWorkspaceFolder, outputConsole, outputChannel } from "../utils";
 
 const DEFAULT_API_VERSION = 1;
@@ -28,6 +28,10 @@ export class AtelierAPI {
     return workspaceState.get(this.workspaceFolder + ":port", this.config.port);
   }
 
+  private get password(): string {
+    return workspaceState.get(this.workspaceFolder + ":password", this.config.password);
+  }
+
   private get iris(): boolean {
     return workspaceState.get(this.workspaceFolder + ":iris", false);
   }
@@ -70,8 +74,9 @@ export class AtelierAPI {
   }
 
   public xdebugUrl(): string {
-    const { host, username, password, https } = this.config;
+    const { host, username, https } = this.config;
     const port = this.port;
+    const password = this.password;
     const proto = https ? "wss" : "ws";
     const auth = this.iris
       ? `IRISUsername=${username}&IRISPassword=${password}`
@@ -144,8 +149,9 @@ export class AtelierAPI {
     }
     headers["Cache-Control"] = "no-cache";
 
-    const { host, username, password, https } = this.config;
+    const { host, username, https } = this.config;
     const port = this.port;
+    const password = this.password;
     const proto = this.config.https ? "https" : "http";
     const http: any = this.config.https ? httpsModule : httpModule;
     const agent = new http.Agent({
@@ -209,6 +215,9 @@ export class AtelierAPI {
             }
           })
           .catch(error => {
+            if (error.error && error.error.code === "ECONNREFUSED") {
+              setTimeout(checkConnection, 1000);
+            }
             console.error(error);
             throw error;
           })

src/commands/serverActions.ts

@@ -3,9 +3,10 @@ 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, links } = config("conn");
+  const { active, host, ns, https, port: defaultPort, username, password: defaultPassword, links } = config("conn");
   const workspaceFolder = currentWorkspaceFolder();
   const port = workspaceState.get(workspaceFolder + ":port", defaultPort);
+  const password = workspaceState.get(workspaceFolder + ":password", defaultPassword);
   const nsEncoded = encodeURIComponent(ns);
   const connInfo = `${host}:${port}[${nsEncoded}]`;
   const serverUrl = `${https ? "https" : "http"}://${host}:${port}`;
@@ -83,7 +84,7 @@ export async function serverActions(): Promise<void> {
           break;
         }
         case "refreshConnection": {
-          checkConnection();
+          checkConnection(true);
           break;
         }
         case "openDockerTerminal": {

src/extension.ts

@@ -9,6 +9,7 @@ export const OBJECTSCRIPTXML_FILE_SCHEMA = "objectscriptxml";
 export const FILESYSTEM_SCHEMA = "isfs";
 export const schemas = [OBJECTSCRIPT_FILE_SCHEMA, OBJECTSCRIPTXML_FILE_SCHEMA, FILESYSTEM_SCHEMA];
 
+import WebSocket = require("ws");
 import {
   importAndCompile,
   importFolder as importFileOrFolder,
@@ -101,7 +102,7 @@ let reporter: TelemetryReporter;
 
 export const checkConnection = (clearCookies = false): void => {
   const conn = config("conn");
-  const connInfo = `${conn.host}:${conn.port}[${conn.ns}]`;
+  let connInfo = `${conn.host}:${conn.port}[${conn.ns}]`;
   panel.text = connInfo;
   panel.tooltip = "";
   vscode.commands.executeCommand("setContext", "vscode-objectscript.connectActive", conn.active);
@@ -117,6 +118,7 @@ export const checkConnection = (clearCookies = false): void => {
     if (dockerPort !== conn.port) {
       workspaceState.update(currentWorkspaceFolder() + ":port", dockerPort);
     }
+    connInfo = `${conn.host}:${dockerPort}[${conn.ns}]`;
   }
 
   const api = new AtelierAPI(currentWorkspaceFolder());
@@ -131,10 +133,36 @@ export const checkConnection = (clearCookies = false): void => {
         serverVersion: info.result.content.version,
         healthshare: hasHS ? "yes" : "no",
       });
+      /// Use xdebug's websocket, to catch when server disconnected
+      const socket = new WebSocket(api.xdebugUrl());
+      socket.onopen = () => {
+        panel.text = `${connInfo} - Connected`;
+      };
+      socket.onclose = event => {
+        panel.text = `${connInfo} - Disconnected`;
+      };
     })
     .catch(error => {
       let message = error.message;
       if (error instanceof StatusCodeError && error.statusCode === 401) {
+        setTimeout(
+          () =>
+            vscode.window
+              .showInputBox({
+                password: true,
+                placeHolder: "Not Authorized, please enter password to connect",
+                ignoreFocusOut: true,
+              })
+              .then(password => {
+                if (password) {
+                  workspaceState.update(currentWorkspaceFolder() + ":password", password);
+                  checkConnection();
+                } else {
+                  vscode.workspace.getConfiguration().update("objectscript.conn.active", false);
+                }
+              }),
+          1000
+        );
         message = "Not Authorized";
         outputChannel.appendLine(
           `Authorization error: please check your username/password in the settings,
@@ -175,7 +203,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
   panel.command = "vscode-objectscript.serverActions";
   panel.show();
 
-  checkConnection();
+  checkConnection(true);
   vscode.workspace.onDidChangeConfiguration(({ affectsConfiguration }) => {
     if (affectsConfiguration("objectscript.conn")) {
       checkConnection(true);
@@ -184,13 +212,13 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
 
   workspace.onDidSaveTextDocument(file => {
     if (schemas.includes(file.uri.scheme) || languages.includes(file.languageId)) {
-      vscode.commands.executeCommand("vscode-objectscript.compile");
+      return vscode.commands.executeCommand("vscode-objectscript.compile");
     }
   });
 
   vscode.window.onDidChangeActiveTextEditor((textEditor: vscode.TextEditor) => {
     if (config("autoPreviewXML")) {
-      xml2doc(context, textEditor);
+      return xml2doc(context, textEditor);
     }
   });
 
@@ -379,4 +407,5 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
 export function deactivate() {
   // This will ensure all pending events get flushed
   reporter.dispose();
+  terminal.dispose();
 }