fix: minor cleanup

Author: smorrisj

client/src/connection/ssh/auth.ts

@@ -48,9 +48,8 @@ class AuthPresenterImpl implements AuthPresenter {
   presentMultiplePrompts = async (prompts: Prompt[]): Promise<string[]> => {
     const answers: string[] = [];
     for (const prompt of prompts) {
-      this.presentSecurePrompt(prompt.prompt).then((answer) => {
-        answers.push(answer);
-      });
+      const answer = await this.presentSecurePrompt(prompt.prompt);
+      answers.push(answer);
     }
     return answers;
   };

client/src/connection/ssh/index.ts

@@ -39,9 +39,8 @@ export interface Config extends BaseConfig {
 
 export function getSession(c: Config): Session {
   if (!sessionInstance) {
-    sessionInstance = new SSHSession();
+    sessionInstance = new SSHSession(c, new Client());
   }
-  sessionInstance.config = c;
   return sessionInstance;
 }
 export class SSHSession extends Session {
@@ -57,10 +56,10 @@ export class SSHSession extends Session {
   private _workDirectory: string;
   private _workDirectoryParser: LineParser;
 
-  constructor(c?: Config) {
+  constructor(c?: Config, client?: Client) {
     super();
     this._config = c;
-    this._conn = new Client();
+    this._conn = client;
     this._authMethods = ["publickey", "password", "keyboard-interactive"];
     this._sessionReady = false;
     this._authHandler = new AuthHandler();
@@ -96,12 +95,17 @@ export class SSHSession extends Session {
         readyTimeout: SAS_LAUNCH_TIMEOUT,
         keepaliveInterval: KEEPALIVE_INTERVAL,
         keepaliveCountMax: KEEPALIVE_UNANSWERED_THRESHOLD,
+
         debug: (msg) => {
           console.log(msg);
         },
         authHandler: this.handleSSHAuthentication,
       };
 
+      if (!this._conn) {
+        this._conn = new Client();
+      }
+
       this._conn
         .on("ready", () => {
           this._conn.shell(this.onShell);
@@ -179,6 +183,7 @@ export class SSHSession extends Session {
     this.clearAuthState();
     this._workDirectory = undefined;
     this._conn.end();
+    sessionInstance = undefined;
     updateStatusBarItem(false);
   };
 
@@ -227,7 +232,7 @@ export class SSHSession extends Session {
       if (!line) {
         return;
       }
-      const trimmedLine = line.trim();
+      const trimmedLine = line.trimEnd();
       if (trimmedLine.endsWith(LineCodes.RunEndCode)) {
         // run completed
         this.getResult();