@milaboratories/pl-deployments 1.1.12 → 1.1.14

package/dist/index.mjs

@@ -1,5 +1,5 @@
-var V = Object.defineProperty;
-var Y = (s, r, t) => r in s ? V(s, r, { enumerable: !0, configurable: !0, writable: !0, value: t }) : s[r] = t;
+var Z = Object.defineProperty;
+var Y = (s, r, t) => r in s ? Z(s, r, { enumerable: !0, configurable: !0, writable: !0, value: t }) : s[r] = t;
 var w = (s, r, t) => Y(s, typeof r != "symbol" ? r + "" : r, t);
 import { spawn as Q } from "node:child_process";
 import { sleep as b, fileExists as g, assertNever as j, notEmpty as f, RetryablePromise as X } from "@milaboratories/ts-helpers";
@@ -16,7 +16,7 @@ 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 { generateSshPlConfigs as lt, getFreePort as P } from "@milaboratories/pl-config";
+import { generateSshPlConfigs as lt, getFreePort as v } from "@milaboratories/pl-config";
 import { z as p } from "zod";
 function ht(s, r) {
   return s.info(`Running:
@@ -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 = L(t, e, r, S(i), O(o)), { archiveUrl: c, alternativeArchiveGAUrl: a, archivePath: l } = n;
+  const n = G(t, e, r, S(i), O(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 = L(t, e, r, S(i), O(o)), { archiveUrl: c, alternativeArchiveGAUrl: a, archivePath: l, archiveType: h, targetFolder: u, baseName: y } = n;
+  const n = G(t, e, r, S(i), O(o)), { archiveUrl: c, alternativeArchiveGAUrl: a, archivePath: l, archiveType: h, targetFolder: u, baseName: y } = n;
   try {
     await C(s, c, l), n.wasDownloadedFrom = c;
   } catch {
@@ -89,7 +89,7 @@ async function mt(s, r, t, e, i, o) {
   }
   return await yt(s, l, h, u), n;
 }
-function L(s, r, t, e, i) {
+function G(s, r, t, e, i) {
   const o = `${r}-${e}`, n = $t[i], c = `${o}.${n}`, a = `${wt}/${s}/${i}/${c}`, l = `${ft}/${s}/${i}/${c}`, h = d.join(t, c), u = d.join(t, o);
   return {
     archiveUrl: a,
@@ -157,12 +157,12 @@ const $t = {
   windows: "zip"
 };
 function R() {
-  return "1.18.3";
+  return "1.20.1";
 }
-function Pt() {
+function vt() {
   return { type: "Download", version: R() };
 }
-async function vt(s, r, t) {
+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());
@@ -178,7 +178,7 @@ const St = {
   macos: "platforma",
   windows: "platforma.exe"
 };
-function G(s) {
+function L(s) {
   return d.join(s, "pl_pid");
 }
 async function Ct(s) {
@@ -196,7 +196,7 @@ function At() {
 function Ft(s, r, t) {
   return s[r] = t, t;
 }
-async function N(s, r) {
+async function B(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 N(this.logger, async (r, t) => {
+    await B(this.logger, async (r, t) => {
       this.wasStopped = !1;
       const e = ht(this.logger, this.startOptions);
       e.on("error", (o) => {
@@ -225,7 +225,7 @@ class Dt {
       }), 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 i = r("pidFile", G(this.workingDir));
+      const i = r("pidFile", L(this.workingDir));
       r("pid", f(e.pid)), r("pidWritten", await Et(i, f(e.pid))), this.nRuns++, this.instance = e, this.pid = e.pid, this.lastRunHistory = t;
     });
   }
@@ -254,18 +254,18 @@ class Dt {
 }
 async function fr(s, r) {
   const t = {
-    plBinary: Pt(),
+    plBinary: vt(),
     spawnOptions: {},
     closeOld: !0,
     ...r
   };
-  return await N(s, async (e, i) => {
+  return await B(s, async (e, i) => {
     e("startOptions", { ...t, config: "too wordy" });
     const o = d.resolve(t.workingDir);
     t.closeOld && e("closeOld", await kt(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 vt(s, c, t.plBinary), h = {
+    const c = d.join(o, "binaries"), a = await Pt(s, c, t.plBinary), h = {
       cmd: e("binaryPath", d.join("binaries", a)),
       args: ["-config", n],
       opts: {
@@ -296,8 +296,8 @@ async function fr(s, r) {
   });
 }
 async function kt(s, r) {
-  return await N(s, async (t, e) => {
-    const i = t("pidFilePath", G(r)), o = t("pid", await Ct(i)), n = t("wasAlive", await x(o));
+  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));
     return o !== void 0 && n && (t("stopped", J(o)), t("waitStopped", await M(o, 1e4))), e;
   });
 }
@@ -305,7 +305,7 @@ const xt = {
   keepaliveInterval: 6e4,
   keepaliveCountMax: 10
 };
-class U {
+class N {
   constructor(r, t) {
     w(this, "config");
     w(this, "homeDir");
@@ -321,7 +321,7 @@ class U {
     const e = {
       ...xt,
       ...t
-    }, i = new U(r, new F());
+    }, i = new N(r, new F());
     return await i.connect(e), i;
   }
   getForwardedServers() {
@@ -698,7 +698,7 @@ class U {
    * @param remotePath - The path to the remote directory.
    * @returns A promise that resolves when the directory is created.
    */
-  createRemoteDirectory(r, t = 493) {
+  ensureRemoteDirCreated(r, t = 493) {
     return this.withSftp(async (e) => {
       const i = r.split("/");
       let o = "";
@@ -758,7 +758,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 Nt = "minio-2024-12-18T13-15-44Z", Ut = "supervisord-0.7.3", Bt = "supervisord_0.7.3_Linux_64-bit";
+const Bt = "minio-2024-12-18T13-15-44Z", Nt = "supervisord-0.7.3", Ut = "supervisord_0.7.3_Linux_64-bit";
 function $(s) {
   return d.join(s, ".platforma_ssh");
 }
@@ -784,31 +784,31 @@ function _t(s, r) {
   return d.join(z(s, r), "minio");
 }
 function jt(s, r) {
-  return d.join(E(s), `supervisord-0.7.3-${S(r)}`, Bt);
+  return d.join(E(s), `supervisord-0.7.3-${S(r)}`, Ut);
 }
 function K(s, r) {
   return d.join(jt(s, r), "supervisord");
 }
-function q(s) {
+function V(s) {
   return d.join($(s), "supervisor.conf");
 }
 function I(s) {
   return d.join($(s), "connection.txt");
 }
 async function Ht(s, r, t) {
-  const e = await B(s, r, t, "--daemon");
+  const e = await U(s, r, t, "--daemon");
   if (e.stderr)
     throw new Error(`Can not run ssh Platforma ${e.stderr}`);
 }
 async function Jt(s, r, t) {
-  const e = await B(s, r, t, "ctl shutdown");
+  const e = await U(s, r, t, "ctl shutdown");
   if (e.stderr)
     throw new Error(`Can not stop ssh Platforma ${e.stderr}`);
 }
 async function Mt(s, r, t, e) {
   let i;
   try {
-    i = await B(r, t, e, "ctl status");
+    i = await U(r, t, e, "ctl status");
   } catch (a) {
     return { execError: String(a), allAlive: !1 };
   }
@@ -822,7 +822,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 Lt(s, r, t, e, i, o, n) {
+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;
   return `
 [supervisord]
@@ -855,8 +855,8 @@ directory=${e}
 autorestart=true
 `;
 }
-async function B(s, r, t, e) {
-  const i = K(r, t), o = q(r), n = `${i} --configuration ${o} ${e}`;
+async function U(s, r, t, e) {
+  const i = K(r, t), o = V(r), n = `${i} --configuration ${o} ${e}`;
   return await s.exec(n);
 }
 function _(s, r) {
@@ -866,38 +866,41 @@ function _(s, r) {
     return o === r && n === "Running";
   });
 }
-const v = p.object({
+const P = p.object({
   local: p.number(),
   remote: p.number()
-}), Gt = p.object({
-  grpc: v,
-  monitoring: v,
-  debug: v,
-  minioPort: v,
-  minioConsolePort: v
+}), Lt = p.object({
+  grpc: P,
+  monitoring: P,
+  debug: P,
+  minioPort: P,
+  minioConsolePort: P
 }), Wt = p.object({
   plUser: p.string(),
   plPassword: p.string(),
-  ports: Gt,
+  ports: Lt,
   // It's false by default because it was added later,
   // and in some deployments there won't be useGlobalAccess flag in the file.
-  useGlobalAccess: p.boolean().default(!1)
+  useGlobalAccess: p.boolean().default(!1),
+  // We added the field afterwards, the pl backend was this version.
+  plVersion: p.string().default("1.18.3")
 });
-function zt(s, r, t, e) {
+function zt(s, r, t, e, i) {
   return {
     plUser: s,
     plPassword: r,
     ports: t,
-    useGlobalAccess: e
+    useGlobalAccess: e,
+    plVersion: i
   };
 }
 function Kt(s) {
   return Wt.parse(JSON.parse(s));
 }
-function qt(s) {
+function Vt(s) {
   return JSON.stringify(s, void 0, 2);
 }
-class Z {
+class q {
   constructor(r, t, e) {
     w(this, "initState", {});
     this.logger = r, this.sshClient = t, this.username = e;
@@ -910,8 +913,8 @@ class Z {
   }
   static async init(r, t) {
     try {
-      const e = await U.init(r, t);
-      return new Z(r, e, f(t.username));
+      const e = await N.init(r, t);
+      return new q(r, e, f(t.username));
     } catch (e) {
       throw r.error(`Connection error in SshClient.init: ${e}`), e;
     }
@@ -964,18 +967,20 @@ class Z {
     const t = { localWorkdir: r.localWorkdir };
     try {
       const e = {
-        ...Zt,
+        ...qt,
         ...r
       };
-      if (t.arch = await this.getArch(), t.remoteHome = await this.getUserHomeDirectory(), t.alive = await this.isAlive(), t.alive.allAlive) {
+      if (t.plBinaryOps = e.plBinary, t.arch = await this.getArch(), t.remoteHome = await this.getUserHomeDirectory(), t.alive = await this.isAlive(), t.alive.allAlive) {
         if (t.userCredentials = await this.getUserCredentials(t.remoteHome), !t.userCredentials)
           throw new Error("SshPl.platformaInit: platforma is alive but userCredentials are not found");
-        if (!(t.userCredentials.useGlobalAccess != e.useGlobalAccess))
+        const a = t.userCredentials.useGlobalAccess == e.useGlobalAccess, l = t.userCredentials.plVersion == e.plBinary.version;
+        if (t.needRestart = !(a && l), this.logger.info(`SshPl.platformaInit: need restart? ${t.needRestart}`), !t.needRestart)
           return t.userCredentials;
-        await this.stopAndClean();
+        await this.stop();
       }
       const i = await this.downloadBinariesAndUploadToTheServer(
         e.localWorkdir,
+        e.plBinary,
         t.remoteHome,
         t.arch
       );
@@ -1003,8 +1008,8 @@ class Z {
       for (const [a, l] of Object.entries(o.filesToCreate))
         await this.sshClient.writeFileOnTheServer(a, l), this.logger.info(`Created file ${a}`);
       for (const a of o.dirsToCreate)
-        await this.sshClient.createRemoteDirectory(a), this.logger.info(`Created directory ${a}`);
-      const n = Lt(
+        await this.sshClient.ensureRemoteDirCreated(a), this.logger.info(`Created directory ${a}`);
+      const n = Gt(
         o.minioConfig.storageDir,
         o.minioConfig.envs,
         await this.getFreePortForPlatformaOnServer(t.remoteHome, t.arch),
@@ -1013,56 +1018,57 @@ class Z {
         t.binPaths.minioRelPath,
         t.binPaths.downloadedPl
       );
-      if (!await this.sshClient.writeFileOnTheServer(q(t.remoteHome), n))
+      if (!await this.sshClient.writeFileOnTheServer(V(t.remoteHome), n))
         throw new Error(`Can not write supervisord config on the server ${$(t.remoteHome)}`);
       return t.connectionInfo = zt(
         o.plUser,
         o.plPassword,
         t.ports,
-        f(e.useGlobalAccess)
+        f(e.useGlobalAccess),
+        e.plBinary.version
       ), await this.sshClient.writeFileOnTheServer(
         I(t.remoteHome),
-        qt(t.connectionInfo)
+        Vt(t.connectionInfo)
       ), await this.start(), t.started = !0, this.initState = t, t.connectionInfo;
     } catch (e) {
       const i = `SshPl.platformaInit: error occurred: ${e}, state: ${JSON.stringify(t)}`;
       throw this.logger.error(i), new Error(i);
     }
   }
-  async downloadBinariesAndUploadToTheServer(r, t, e) {
-    const i = [];
+  async downloadBinariesAndUploadToTheServer(r, t, e, i) {
+    const o = [];
     try {
-      const o = await this.downloadAndUntar(
+      const n = await this.downloadAndUntar(
         r,
-        t,
         e,
+        i,
         "pl",
-        `pl-${R()}`
+        `pl-${t.version}`
       );
-      i.push(o);
-      const n = await this.downloadAndUntar(
+      o.push(n);
+      const c = await this.downloadAndUntar(
         r,
-        t,
         e,
+        i,
         "supervisord",
-        Ut
+        Nt
       );
-      i.push(n);
-      const c = _t(t, e.arch), a = await this.downloadAndUntar(
+      o.push(c);
+      const a = _t(e, i.arch), l = await this.downloadAndUntar(
         r,
-        t,
         e,
+        i,
         "minio",
-        Nt
+        Bt
       );
-      return i.push(a), await this.sshClient.chmod(c, 488), {
-        history: i,
-        minioRelPath: c,
-        downloadedPl: T(t, e.arch)
+      return o.push(l), await this.sshClient.chmod(a, 488), {
+        history: o,
+        minioRelPath: a,
+        downloadedPl: T(e, i.arch)
       };
-    } catch (o) {
-      const n = `SshPl.downloadBinariesAndUploadToServer: error ${o} occurred, state: ${JSON.stringify(i)}`;
-      throw this.logger.error(n), o;
+    } catch (n) {
+      const c = `SshPl.downloadBinariesAndUploadToServer: error ${n} occurred, state: ${JSON.stringify(o)}`;
+      throw this.logger.error(c), n;
     }
   }
   /** We have to extract pl in the remote server,
@@ -1073,7 +1079,7 @@ class Z {
   * (it's not installed for Rocky Linux for example). */
   async downloadAndUntar(r, t, e, i, o) {
     const n = {};
-    n.binBasePath = E(t), await this.sshClient.createRemoteDirectory(n.binBasePath), n.binBasePathCreated = !0;
+    n.binBasePath = E(t), await this.sshClient.ensureRemoteDirCreated(n.binBasePath), n.binBasePathCreated = !0;
     let c = null;
     const a = 5;
     for (let h = 1; h <= a; h++)
@@ -1091,7 +1097,7 @@ class Z {
         if (await b(300), h == a)
           throw new Error(`downloadAndUntar: ${a} attempts, last error: ${u}`);
       }
-    n.downloadResult = f(c), n.localArchivePath = d.resolve(n.downloadResult.archivePath), n.remoteDir = d.join(n.binBasePath, n.downloadResult.baseName), n.remoteArchivePath = n.remoteDir + ".tgz", await this.sshClient.createRemoteDirectory(n.remoteDir), await this.sshClient.uploadFile(n.localArchivePath, n.remoteArchivePath);
+    n.downloadResult = f(c), n.localArchivePath = d.resolve(n.downloadResult.archivePath), n.remoteDir = d.join(n.binBasePath, n.downloadResult.baseName), n.remoteArchivePath = n.remoteDir + ".tgz", await this.sshClient.ensureRemoteDirCreated(n.remoteDir), await this.sshClient.uploadFile(n.localArchivePath, n.remoteArchivePath);
     const l = await this.sshClient.exec(
       `tar --warning=no-all -xvf ${n.remoteArchivePath} --directory=${n.remoteDir}`
     );
@@ -1119,23 +1125,23 @@ class Z {
   async fetchPorts(r, t) {
     return {
       grpc: {
-        local: await P(),
+        local: await v(),
         remote: await this.getFreePortForPlatformaOnServer(r, t)
       },
       monitoring: {
-        local: await P(),
+        local: await v(),
         remote: await this.getFreePortForPlatformaOnServer(r, t)
       },
       debug: {
-        local: await P(),
+        local: await v(),
         remote: await this.getFreePortForPlatformaOnServer(r, t)
       },
       minioPort: {
-        local: await P(),
+        local: await v(),
         remote: await this.getFreePortForPlatformaOnServer(r, t)
       },
       minioConsolePort: {
-        local: await P(),
+        local: await v(),
         remote: await this.getFreePortForPlatformaOnServer(r, t)
       }
     };
@@ -1175,21 +1181,25 @@ class Z {
     return r.trim();
   }
 }
-const Zt = {
-  useGlobalAccess: !1
+const qt = {
+  useGlobalAccess: !1,
+  plBinary: {
+    type: "Download",
+    version: R()
+  }
 };
 export {
   Wt as ConnectionInfo,
   bt as LocalConfigYaml,
   Dt as LocalPl,
-  v as PortPair,
-  U as SshClient,
-  Z as SshPl,
-  Gt as SshPlPorts,
+  P as PortPair,
+  N as SshClient,
+  q as SshPl,
+  Lt as SshPlPorts,
   R as getDefaultPlVersion,
   fr as localPlatformaInit,
   zt as newConnectionInfo,
   Kt as parseConnectionInfo,
-  qt as stringifyConnectionInfo
+  Vt as stringifyConnectionInfo
 };
 //# sourceMappingURL=index.mjs.map