@milaboratories/pl-deployments 1.1.1 → 1.1.2

package/dist/index.mjs

@@ -78,7 +78,7 @@ async function ht(s, r, t, e, o) {
   return await H(s, n, a), await pt(s, a, c, l), i;
 }
 function ut(s, r, t, e, o) {
-  const i = `${r}-${e}`, n = j[o], a = `${i}.${n}`, c = `https://cdn.platforma.bio/software/${s}/${o}/${a}`, l = h.join(t, a), u = h.join(t, i);
+  const i = `${r}-${e}`, n = I[o], a = `${i}.${n}`, c = `https://cdn.platforma.bio/software/${s}/${o}/${a}`, l = h.join(t, a), u = h.join(t, i);
   return {
     archiveUrl: c,
     archivePath: l,
@@ -88,7 +88,7 @@ function ut(s, r, t, e, o) {
   };
 }
 function dt(s, r, t, e) {
-  const o = `pl-${s}-${t}`, i = j[e], n = `${o}.${i}`, a = `https://cdn.platforma.bio/software/pl/${e}/${n}`, c = h.join(r, n), l = h.join(r, o), u = h.join(o, "binaries", ft[e]);
+  const o = `pl-${s}-${t}`, i = I[e], n = `${o}.${i}`, a = `https://cdn.platforma.bio/software/pl/${e}/${n}`, c = h.join(r, n), l = h.join(r, o), u = h.join(o, "binaries", ft[e]);
   return {
     archiveUrl: a,
     archivePath: c,
@@ -149,7 +149,7 @@ async function pt(s, r, t, e) {
   }
   await w.writeFile(o, "ok"), s.info("  ... unpack done.");
 }
-const j = {
+const I = {
   linux: "tgz",
   macos: "tgz",
   windows: "zip"
@@ -174,7 +174,7 @@ async function yt(s, r, t) {
       N(t);
   }
 }
-function I(s) {
+function j(s) {
   return h.join(s, "pl_pid");
 }
 async function gt(s) {
@@ -221,7 +221,7 @@ class Et {
       }), e.on("close", () => {
         this.logger.warn(`platforma was closed, started opts: ${JSON.stringify(this.debugInfo())}`), this.onClose !== void 0 && this.onClose(this), this.onCloseAndError !== void 0 && this.onCloseAndError(this), this.onCloseAndErrorNoStop !== void 0 && !this.wasStopped && this.onCloseAndErrorNoStop(this);
       }), r("started", !0);
-      const o = r("pidFile", I(this.workingDir));
+      const o = r("pidFile", j(this.workingDir));
       r("pid", p(e.pid)), r("pidWritten", await $t(o, p(e.pid))), this.nRuns++, this.instance = e, this.pid = e.pid, this.lastRunHistory = t;
     });
   }
@@ -248,7 +248,7 @@ class Et {
     };
   }
 }
-async function Qt(s, r) {
+async function Xt(s, r) {
   const t = {
     plBinary: mt(),
     spawnOptions: {},
@@ -293,11 +293,15 @@ async function Qt(s, r) {
 }
 async function Ct(s, r) {
   return await A(s, async (t, e) => {
-    const o = t("pidFilePath", I(r)), i = t("pid", await gt(o)), n = t("wasAlive", await C(i));
+    const o = t("pidFilePath", j(r)), i = t("pid", await gt(o)), n = t("wasAlive", await C(i));
     return i !== void 0 && n && (t("stopped", U(i)), t("waitStopped", await B(i, 1e4))), e;
   });
 }
-class F {
+const bt = {
+  keepaliveInterval: 6e4,
+  keepaliveCountMax: 10
+};
+class D {
   constructor(r, t) {
     d(this, "config");
     d(this, "homeDir");
@@ -309,8 +313,11 @@ class F {
    * @returns A new instance of SshClient with an active connection.
    */
   static async init(r, t) {
-    const e = new F(r, new v());
-    return await e.connect(t), e;
+    const e = {
+      ...bt,
+      ...t
+    }, o = new D(r, new v());
+    return await o.connect(e), o;
   }
   /**
    * Connects to the SSH server using the specified configuration.
@@ -423,9 +430,9 @@ class F {
           this.logger.info(`Server closed ${JSON.stringify(r)}`), i && (this.logger.info("End SSH connection"), i.end());
         });
       }), i.on("error", (a) => {
-        console.error("[SSH] SSH connection error", "ports", r, a.message), n == null || n.close(), o(`ssh.forwardPort: conn.err: ${a}`);
+        this.logger.error(`[SSH] SSH connection error, ports: ${JSON.stringify(r)}, err: ${a.message}`), n == null || n.close(), o(`ssh.forwardPort: conn.err: ${a}`);
       }), i.on("close", () => {
-        this.logger.info(`[SSH] Connection closed, ports: ${r}`);
+        this.logger.info(`[SSH] Connection closed, ports: ${JSON.stringify(r)}`);
       }), i.connect(t);
     });
   }
@@ -660,36 +667,36 @@ class F {
     this.client.end();
   }
 }
-const bt = "minio-2024-12-18T13-15-44Z", At = "supervisord-0.7.3", Ft = "supervisord_0.7.3_Linux_64-bit";
+const At = "minio-2024-12-18T13-15-44Z", Dt = "supervisord-0.7.3", Ft = "supervisord_0.7.3_Linux_64-bit";
 function $(s) {
   return h.join(s, "platforma_ssh");
 }
 function P(s) {
   return h.join(s, "platforma_ssh", "binaries");
 }
-function Dt(s, r) {
+function xt(s, r) {
   return h.join(P(s), `pl-${b()}-${g(r)}`);
 }
-function M(s, r) {
-  return h.join(Dt(s, r), "binaries");
+function J(s, r) {
+  return h.join(xt(s, r), "binaries");
 }
 function O(s, r) {
-  return h.join(M(s, r), "platforma");
+  return h.join(J(s, r), "platforma");
 }
-function xt(s, r) {
-  return h.join(M(s, r), "free-port");
+function Ot(s, r) {
+  return h.join(J(s, r), "free-port");
 }
-function J(s, r) {
+function M(s, r) {
   return h.join(P(s), `minio-2024-12-18T13-15-44Z-${g(r)}`);
 }
-function Ot(s, r) {
-  return h.join(J(s, r), "minio");
-}
 function kt(s, r) {
+  return h.join(M(s, r), "minio");
+}
+function Rt(s, r) {
   return h.join(P(s), `supervisord-0.7.3-${g(r)}`, Ft);
 }
 function L(s, r) {
-  return h.join(kt(s, r), "supervisord");
+  return h.join(Rt(s, r), "supervisord");
 }
 function z(s) {
   return h.join($(s), "supervisor.conf");
@@ -697,18 +704,18 @@ function z(s) {
 function k(s) {
   return h.join($(s), "connection.txt");
 }
-async function Rt(s, r, t) {
-  const e = await D(s, r, t, "--daemon");
+async function Nt(s, r, t) {
+  const e = await F(s, r, t, "--daemon");
   if (e.stderr)
     throw new Error(`Can not run ssh Platforma ${e.stderr}`);
 }
-async function Nt(s, r, t) {
-  const e = await D(s, r, t, "ctl shutdown");
+async function Tt(s, r, t) {
+  const e = await F(s, r, t, "ctl shutdown");
   if (e.stderr)
     throw new Error(`Can not stop ssh Platforma ${e.stderr}`);
 }
-async function Tt(s, r, t, e) {
-  const o = await D(r, t, e, "ctl status");
+async function Ut(s, r, t, e) {
+  const o = await F(r, t, e, "ctl status");
   if (o.stderr)
     return s.info(`supervisord ctl status: stderr occurred: ${o.stderr}, stdout: ${o.stdout}`), !1;
   const i = {
@@ -717,7 +724,7 @@ async function Tt(s, r, t, e) {
   };
   return i.platforma && i.minio ? !0 : (i.minio || s.warn("Minio is not running on the server"), i.platforma || s.warn("Platforma is not running on the server"), !1);
 }
-function Ut(s, r, t, e, o, i, n) {
+function Bt(s, r, t, e, o, i, n) {
   const a = Object.entries(r).map(([u, m]) => `${u}="${m}"`).join(","), c = nt(16).toString("hex"), l = t;
   return `
 [supervisord]
@@ -750,7 +757,7 @@ directory=${e}
 autorestart=true
 `;
 }
-async function D(s, r, t, e) {
+async function F(s, r, t, e) {
   const o = L(r, t), i = z(r), n = `${o} --configuration ${i} ${e}`;
   return await s.exec(n);
 }
@@ -774,7 +781,7 @@ class W {
   }
   static async init(r, t) {
     try {
-      const e = await F.init(r, t);
+      const e = await D.init(r, t);
       return new W(r, e, p(t.username));
     } catch (e) {
       throw r.error(`Connection error in SshClient.init: ${e}`), e;
@@ -783,7 +790,7 @@ class W {
   async isAlive() {
     const r = await this.getArch(), t = await this.getUserHomeDirectory();
     try {
-      return await Tt(this.logger, this.sshClient, t, r.arch);
+      return await Ut(this.logger, this.sshClient, t, r.arch);
     } catch {
       return !1;
     }
@@ -791,7 +798,7 @@ class W {
   async start() {
     const r = await this.getArch(), t = await this.getUserHomeDirectory();
     try {
-      return await Rt(this.sshClient, t, r.arch), await this.checkIsAliveWithInterval();
+      return await Nt(this.sshClient, t, r.arch), await this.checkIsAliveWithInterval();
     } catch (e) {
       const o = `ssh.start: error occurred ${e}`;
       throw this.logger.error(o), new Error(o);
@@ -800,7 +807,7 @@ class W {
   async stop() {
     const r = await this.getArch(), t = await this.getUserHomeDirectory();
     try {
-      return await Nt(this.sshClient, t, r.arch), await this.checkIsAliveWithInterval(void 0, void 0, !1);
+      return await Tt(this.sshClient, t, r.arch), await this.checkIsAliveWithInterval(void 0, void 0, !1);
     } catch (e) {
       const o = `ssh.stop: error occurred ${e}`;
       throw this.logger.error(o), new Error(o);
@@ -845,7 +852,7 @@ class W {
         await this.sshClient.writeFileOnTheServer(a, c), this.logger.info(`Created file ${a}`);
       for (const a of o.dirsToCreate)
         await this.sshClient.createRemoteDirectory(a), this.logger.info(`Created directory ${a}`);
-      const i = Ut(
+      const i = Bt(
         o.minioConfig.storageDir,
         o.minioConfig.envs,
         await this.getFreePortForPlatformaOnServer(t.remoteHome, t.arch),
@@ -889,15 +896,15 @@ class W {
         t,
         e,
         "supervisord",
-        At
+        Dt
       );
       o.push(n);
-      const a = Ot(t, e.arch), c = await this.downloadAndUntar(
+      const a = kt(t, e.arch), c = await this.downloadAndUntar(
         r,
         t,
         e,
         "minio",
-        bt
+        At
       );
       return o.push(c), await this.sshClient.chmod(a, 488), {
         history: o,
@@ -942,7 +949,7 @@ class W {
     return n.plUntarDone = !0, n;
   }
   async needDownload(r, t) {
-    const e = L(r, t.arch), o = J(r, t.arch), i = O(r, t.arch);
+    const e = L(r, t.arch), o = M(r, t.arch), i = O(r, t.arch);
     return !await this.sshClient.checkFileExists(i) || !await this.sshClient.checkFileExists(o) || !await this.sshClient.checkFileExists(e);
   }
   async checkIsAliveWithInterval(r = 1e3, t = 15, e = !0) {
@@ -992,7 +999,7 @@ class W {
     });
   }
   async getFreePortForPlatformaOnServer(r, t) {
-    const e = xt(r, t.arch), { stdout: o, stderr: i } = await this.sshClient.exec(`${e}`);
+    const e = Ot(r, t.arch), { stdout: o, stderr: i } = await this.sshClient.exec(`${e}`);
     if (i)
       throw new Error(`getFreePortForPlatformaOnServer: stderr is not empty: ${i}, stdout: ${o}`);
     return +o;
@@ -1020,9 +1027,9 @@ class W {
 export {
   St as LocalConfigYaml,
   Et as LocalPl,
-  F as SshClient,
+  D as SshClient,
   W as SshPl,
   b as getDefaultPlVersion,
-  Qt as localPlatformaInit
+  Xt as localPlatformaInit
 };
 //# sourceMappingURL=index.mjs.map