@milaboratories/pl-deployments 1.1.16 → 1.2.1

package/dist/index.mjs

@@ -15,7 +15,7 @@ import A from "node:os";
 import at, { Client as F } from "ssh2";
 import H from "node:net";
 import ct from "node:dns";
-import { randomBytes as k } from "node:crypto";
+import { randomBytes as x } from "node:crypto";
 import { generateSshPlConfigs as lt, getFreePort as v } from "@milaboratories/pl-config";
 import { z as p } from "zod";
 function ht(s, r) {
@@ -23,7 +23,7 @@ function ht(s, r) {
 cmd: ${JSON.stringify([r.cmd, ...r.args])}
 wd: ${r.opts.cwd}`), s.info("  spawning child process"), Q(r.cmd, r.args, r.opts);
 }
-async function x(s) {
+async function O(s) {
   try {
     return process.kill(s, 0), !0;
   } catch {
@@ -35,12 +35,12 @@ function J(s) {
 }
 async function M(s, r) {
   let e = 0;
-  for (; await x(s); )
+  for (; await O(s); )
     if (await b(100), e += 100, e > r)
       throw new Error(`The process did not stopped after ${r} ms.`);
 }
 const dt = ["linux", "macos", "windows"];
-function O(s) {
+function k(s) {
   switch (s.toLowerCase()) {
     case "darwin":
       return "macos";
@@ -72,7 +72,7 @@ function S(s) {
 }
 const wt = "https://cdn.platforma.bio/software", ft = "https://cdn-ga.pl-open.science/software";
 async function pt(s, r, t, e, i, o) {
-  const n = G(t, e, r, S(i), O(o)), { archiveUrl: c, alternativeArchiveGAUrl: a, archivePath: l } = n;
+  const n = G(t, e, r, S(i), k(o)), { archiveUrl: c, alternativeArchiveGAUrl: a, archivePath: l } = n;
   try {
     await C(s, c, l), n.wasDownloadedFrom = c;
   } catch {
@@ -81,7 +81,7 @@ async function pt(s, r, t, e, i, o) {
   return n;
 }
 async function mt(s, r, t, e, i, o) {
-  const n = G(t, e, r, S(i), O(o)), { archiveUrl: c, alternativeArchiveGAUrl: a, archivePath: l, archiveType: h, targetFolder: u, baseName: $ } = n;
+  const n = G(t, e, r, S(i), k(o)), { archiveUrl: c, alternativeArchiveGAUrl: a, archivePath: l, archiveType: h, targetFolder: u, baseName: $ } = n;
   try {
     await C(s, c, l), n.wasDownloadedFrom = c;
   } catch {
@@ -157,7 +157,7 @@ const $t = {
   windows: "zip"
 };
 function R() {
-  return "1.20.1";
+  return "1.23.0";
 }
 function vt() {
   return { type: "Download", version: R() };
@@ -166,7 +166,7 @@ async function Pt(s, r, t) {
   switch (t.type) {
     case "Download":
       const e = await mt(s, r, "pl", `pl-${t.version}`, A.arch(), A.platform());
-      return d.join(e.baseName, "binaries", St[O(A.platform())]);
+      return d.join(e.baseName, "binaries", St[k(A.platform())]);
     case "Local":
       return t.path;
     default:
@@ -196,7 +196,7 @@ function At() {
 function Ft(s, r, t) {
   return s[r] = t, t;
 }
-async function B(s, r) {
+async function N(s, r) {
   const t = At();
   try {
     return await r((i, o) => Ft(t, i, o), t);
@@ -215,7 +215,7 @@ class Dt {
     this.logger = r, this.workingDir = t, this.startOptions = e, this.initialStartHistory = i, this.onClose = o, this.onError = n, this.onCloseAndError = c, this.onCloseAndErrorNoStop = a;
   }
   async start() {
-    await B(this.logger, async (r, t) => {
+    await N(this.logger, async (r, t) => {
       this.wasStopped = !1;
       const e = ht(this.logger, this.startOptions);
       e.on("error", (o) => {
@@ -239,7 +239,7 @@ class Dt {
     return this.wasStopped;
   }
   async isAlive() {
-    return await x(f(this.pid));
+    return await O(f(this.pid));
   }
   debugInfo() {
     return {
@@ -259,15 +259,15 @@ async function fr(s, r) {
     closeOld: !0,
     ...r
   };
-  return await B(s, async (e, i) => {
+  return await N(s, async (e, i) => {
     e("startOptions", { ...t, config: "too wordy" });
     const o = d.resolve(t.workingDir);
-    t.closeOld && e("closeOld", await kt(s, o));
+    t.closeOld && e("closeOld", await xt(s, o));
     const n = d.join(o, bt);
     s.info(`writing configuration '${n}'...`), await m.writeFile(n, t.config);
     const c = d.join(o, "binaries"), a = await Pt(s, c, t.plBinary), h = {
       cmd: e("binaryPath", d.join("binaries", a)),
-      args: ["-config", n],
+      args: ["--config", n],
       opts: {
         env: { ...process.env },
         cwd: o,
@@ -295,17 +295,17 @@ async function fr(s, r) {
     return await u.start(), u;
   });
 }
-async function kt(s, r) {
-  return await B(s, async (t, e) => {
-    const i = t("pidFilePath", L(r)), o = t("pid", await Ct(i)), n = t("wasAlive", await x(o));
+async function xt(s, r) {
+  return await N(s, async (t, e) => {
+    const i = t("pidFilePath", L(r)), o = t("pid", await Ct(i)), n = t("wasAlive", await O(o));
     return o !== void 0 && n && (t("stopped", J(o)), t("waitStopped", await M(o, 1e4))), e;
   });
 }
-const xt = {
+const Ot = {
   keepaliveInterval: 6e4,
   keepaliveCountMax: 10
 };
-class N {
+class B {
   constructor(r, t) {
     w(this, "config");
     w(this, "homeDir");
@@ -319,9 +319,9 @@ class N {
    */
   static async init(r, t) {
     const e = {
-      ...xt,
+      ...Ot,
       ...t
-    }, i = new N(r, new F());
+    }, i = new B(r, new F());
     return await i.connect(e), i;
   }
   getForwardedServers() {
@@ -341,7 +341,7 @@ class N {
    * @returns A promise that resolves when the connection is established or rejects on error.
    */
   async connect(r) {
-    return this.config = r, await Ot(this.client, r);
+    return this.config = r, await kt(this.client, r);
   }
   /**
    * Executes a command on the SSH server.
@@ -408,7 +408,7 @@ class N {
    * @returns { server: net.Server } A promise resolving with the created server instance.
    */
   async forwardPort(r, t) {
-    const e = `ssh.forward:${r.localPort}:${r.remotePort}.id_${k(1).toString("hex")}`;
+    const e = `ssh.forward:${r.localPort}:${r.remotePort}.id_${x(1).toString("hex")}`;
     t = t ?? this.config;
     const i = new X((o) => new Promise((n, c) => {
       const a = new F();
@@ -422,7 +422,7 @@ class N {
     }));
     return await i.ensure(), new Promise((o, n) => {
       const c = H.createServer({ pauseOnConnect: !0 }, async (a) => {
-        const l = `${e}.sock_${k(1).toString("hex")}`;
+        const l = `${e}.sock_${x(1).toString("hex")}`;
         let h;
         try {
           h = await i.ensure();
@@ -430,6 +430,7 @@ class N {
           this.logger.info(`${l}.persistentClient.catch: ${$}`), a.end();
           return;
         }
+        h.setNoDelay(!0), a.setNoDelay(!0);
         let u;
         try {
           u = await Rt(this.logger, h, "127.0.0.1", 0, "127.0.0.1", r.remotePort);
@@ -743,14 +744,14 @@ class N {
     this.closeForwardedPorts(), this.client.end();
   }
 }
-async function Ot(s, r, t, e) {
+async function kt(s, r, t, e) {
   return new Promise((i, o) => {
     s.on("ready", () => {
       i(s);
     }), s.on("error", (n) => {
       o(new Error(`ssh.connect: error occurred: ${n}`));
     }), s.on("close", () => {
-    }), s.connect(r);
+    }), s.connect(r), s.setNoDelay(!0);
   });
 }
 async function Rt(s, r, t, e, i, o) {
@@ -758,7 +759,7 @@ async function Rt(s, r, t, e, i, o) {
     r.forwardOut(t, e, i, o, (a, l) => a ? (s.error(`forwardOut.error: ${a}`), c(a)) : n(l));
   });
 }
-const Bt = "minio-2024-12-18T13-15-44Z", Nt = "supervisord-0.7.3", Ut = "supervisord_0.7.3_Linux_64-bit";
+const Nt = "minio-2024-12-18T13-15-44Z", Bt = "supervisord-0.7.3", Ut = "supervisord_0.7.3_Linux_64-bit";
 function g(s) {
   return d.join(s, ".platforma_ssh");
 }
@@ -823,7 +824,7 @@ async function Mt(s, r, t, e) {
   return c.allAlive || (c.minio || s.warn("Minio is not running on the server"), c.platforma || s.warn("Platforma is not running on the server")), c;
 }
 function Gt(s, r, t, e, i, o, n) {
-  const c = Object.entries(r).map(([h, u]) => `${h}="${u}"`).join(","), a = k(16).toString("hex"), l = t;
+  const c = Object.entries(r).map(([h, u]) => `${h}="${u}"`).join(","), a = x(16).toString("hex"), l = t;
   return `
 [supervisord]
 logfile=${e}/supervisord.log
@@ -913,7 +914,7 @@ class q {
   }
   static async init(r, t) {
     try {
-      const e = await N.init(r, t);
+      const e = await B.init(r, t);
       return new q(r, e, f(t.username));
     } catch (e) {
       throw r.error(`Connection error in SshClient.init: ${e}`), e;
@@ -1051,7 +1052,7 @@ class q {
         e,
         i,
         "supervisord",
-        Nt
+        Bt
       );
       o.push(c);
       const a = _t(e, i.arch), l = await this.downloadAndUntar(
@@ -1059,7 +1060,7 @@ class q {
         e,
         i,
         "minio",
-        Bt
+        Nt
       );
       return o.push(l), await this.sshClient.chmod(a, 488), {
         history: o,
@@ -1193,7 +1194,7 @@ export {
   bt as LocalConfigYaml,
   Dt as LocalPl,
   P as PortPair,
-  N as SshClient,
+  B as SshClient,
   q as SshPl,
   Lt as SshPlPorts,
   R as getDefaultPlVersion,