@milaboratories/pl-deployments 1.1.5 → 1.1.6

package/src/ssh/pl.ts

@@ -1,7 +1,7 @@
 import type * as ssh from 'ssh2';
 import { SshClient } from './ssh';
 import type { MiLogger } from '@milaboratories/ts-helpers';
-import { sleep, notEmpty, fileExists } from '@milaboratories/ts-helpers';
+import { sleep, notEmpty } from '@milaboratories/ts-helpers';
 import type { DownloadBinaryResult } from '../common/pl_binary_download';
 import { downloadBinaryNoExtract } from '../common/pl_binary_download';
 import upath from 'upath';
@@ -19,7 +19,7 @@ export class SshPl {
     public readonly logger: MiLogger,
     public readonly sshClient: SshClient,
     private readonly username: string,
-  ) {}
+  ) { }
 
   public info() {
     return {
@@ -38,6 +38,10 @@ export class SshPl {
     }
   }
 
+  public cleanUp() {
+    this.sshClient.close();
+  }
+
   public async isAlive(): Promise<boolean> {
     const arch = await this.getArch();
     const remoteHome = await this.getUserHomeDirectory();
@@ -89,6 +93,8 @@ export class SshPl {
     this.logger.info(`pl.reset: Deleting Platforma workDir ${workDir} on the server`);
     await this.sshClient.deleteFolder(plpath.workDir(workDir));
 
+    this.cleanUp();
+
     return true;
   }
 

package/src/ssh/ssh.ts

@@ -23,6 +23,7 @@ export type SshDirContent = {
 export class SshClient {
   private config?: ConnectConfig;
   public homeDir?: string;
+  private forwardedServers: net.Server[] = [];
 
   constructor(
     private readonly logger: MiLogger,
@@ -46,6 +47,10 @@ export class SshClient {
     return client;
   }
 
+  public getForwardedServers() {
+    return this.forwardedServers;
+  }
+
   public getFullHostName() {
     return `${this.config?.host}:${this.config?.port}`;
   }
@@ -224,6 +229,7 @@ export class SshClient {
 
       server.listen(ports.localPort, '127.0.0.1', () => {
         this.logger.info(`${log}.server: started listening`);
+        this.forwardedServers.push(server);
         resolve({ server });
       });
 
@@ -234,10 +240,25 @@ export class SshClient {
 
       server.on('close', () => {
         this.logger.info(`${log}.server: closed ${JSON.stringify(ports)}`);
+        this.forwardedServers = this.forwardedServers.filter((s) => s !== server);
       });
     });
   }
 
+  public closeForwardedPorts(): void {
+    this.logger.info('[SSH] Closing all forwarded ports...');
+    this.forwardedServers.forEach((server) => {
+      const rawAddress = server.address();
+      if (rawAddress && typeof rawAddress !== 'string') {
+        const address: net.AddressInfo = rawAddress;
+        this.logger.info(`[SSH] Closing port forward for server ${address.address}:${address.port}`);
+      }
+
+      server.close();
+    });
+    this.forwardedServers = [];
+  }
+
   /**
   * Checks if a specified host is available by performing a DNS lookup.
   * @param hostname - The hostname or IP address to check.
@@ -616,9 +637,10 @@ export class SshClient {
   }
 
   /**
-   * Closes the SSH client connection.
+   * Closes the SSH client connection and forwarded ports.
    */
   public close(): void {
+    this.closeForwardedPorts();
     this.client.end();
   }
 }