@milaboratories/pl-deployments 1.7.0 → 1.7.1

package/dist/index.mjs

@@ -16,7 +16,7 @@ import ct, { Client as b } from "ssh2";
 import G from "node:net";
 import lt from "node:dns";
 import { randomBytes as k } from "node:crypto";
-import { generateSshPlConfigs as ht, getFreePort as v } from "@milaboratories/pl-config";
+import { generateSshPlConfigs as ht, getFreePort as $ } from "@milaboratories/pl-config";
 import { z as p } from "zod";
 function dt(n, e) {
   return n.info(`Running:
@@ -81,16 +81,16 @@ async function mt(n, e, r, t, i, o) {
   return s;
 }
 async function gt(n, e, r, t, i, o) {
-  const s = L(r, t, e, P(i), O(o)), { archiveUrl: a, alternativeArchiveGAUrl: c, archivePath: l, archiveType: h, targetFolder: d, baseName: $ } = s;
+  const s = L(r, t, e, P(i), O(o)), { archiveUrl: a, alternativeArchiveGAUrl: c, archivePath: l, archiveType: h, targetFolder: d } = s;
   try {
     await C(n, a, l), s.wasDownloadedFrom = a;
   } catch {
     await C(n, c, l), s.wasDownloadedFrom = c;
   }
-  return await $t(n, l, h, d), s;
+  return await vt(n, l, h, d), s;
 }
 function L(n, e, r, t, i) {
-  const o = `${e}-${t}`, s = vt[i], a = `${o}.${s}`, c = `${ft}/${n}/${i}/${a}`, l = `${pt}/${n}/${i}/${a}`, h = u.join(r, a), d = u.join(r, o);
+  const o = `${e}-${t}`, s = $t[i], a = `${o}.${s}`, c = `${ft}/${n}/${i}/${a}`, l = `${pt}/${n}/${i}/${a}`, h = u.join(r, a), d = u.join(r, o);
   return {
     archiveUrl: c,
     alternativeArchiveGAUrl: l,
@@ -121,7 +121,7 @@ async function C(n, e, r) {
   }
 }
 const yt = ".ok";
-async function $t(n, e, r, t) {
+async function vt(n, e, r, t) {
   if (n.info("extracting archive..."), n.info(`  archive path: '${e}'`), n.info(`  target dir: '${t}'`), !await y(e)) {
     const o = `Platforma Backend binary archive not found at '${e}'`;
     throw n.error(o), new Error(o);
@@ -151,7 +151,7 @@ async function $t(n, e, r, t) {
   }
   await m.writeFile(i, "ok"), n.info("  ... unpack done.");
 }
-const vt = {
+const $t = {
   linux: "tgz",
   macos: "tgz",
   windows: "zip"
@@ -252,7 +252,7 @@ class kt {
     };
   }
 }
-async function gr(n, e) {
+async function mr(n, e) {
   const r = {
     plBinary: St(),
     spawnOptions: {},
@@ -352,7 +352,7 @@ class B {
     return new Promise((r, t) => {
       this.client.exec(e, (i, o) => {
         if (i)
-          return t(`ssh.exec: ${e}: ${i}`);
+          return t(new Error(`ssh.exec: ${e}: ${i}`));
         let s = "", a = "";
         o.on("close", (c) => {
           c === 0 ? r({ stdout: s, stderr: a }) : t(new Error(`Command ${e} exited with code ${c}, stdout: ${s}, stderr: ${a}`));
@@ -426,20 +426,20 @@ class B {
         let h;
         try {
           h = await i.ensure();
-        } catch ($) {
-          this.logger.info(`${l}.persistentClient.catch: ${$}`), c.end();
+        } catch (v) {
+          this.logger.info(`${l}.persistentClient.catch: ${v}`), c.end();
           return;
         }
         h.setNoDelay(!0), c.setNoDelay(!0);
         let d;
         try {
           d = await Nt(this.logger, h, "127.0.0.1", 0, "127.0.0.1", e.remotePort);
-        } catch ($) {
-          this.logger.error(`${l}.forwardOut.err: ${$}`), c.end();
+        } catch (v) {
+          this.logger.error(`${l}.forwardOut.err: ${v}`), c.end();
           return;
         }
-        c.pipe(d), d.pipe(c), c.resume(), d.on("error", ($) => {
-          this.logger.error(`${l}.stream.error: ${$}`), c.end(), d.end();
+        c.pipe(d), d.pipe(c), c.resume(), d.on("error", (v) => {
+          this.logger.error(`${l}.stream.error: ${v}`), c.end(), d.end();
         }), d.on("close", () => {
           c.end(), d.end();
         }), c.on("close", () => {
@@ -539,7 +539,7 @@ class B {
             try {
               await this.getForderStructure(e, l, t);
             } catch (h) {
-              return o(h);
+              return o(h instanceof Error ? h : new Error(String(h)));
             }
           } else
             t.files.push(l);
@@ -623,14 +623,12 @@ class B {
   }
   uploadFileUsingExistingSftp(e, r, t, i = 432) {
     return new Promise((o, s) => {
-      rt(r).then(async (a) => {
-        this.writeFile(e, t, a, i).then(() => {
-          o(void 0);
-        }).catch((c) => {
-          const l = `uploadFileUsingExistingSftp: ${c}`;
-          this.logger.error(l), s(new Error(l));
-        });
-      });
+      rt(r).then(async (a) => this.writeFile(e, t, a, i).then(() => {
+        o(void 0);
+      }).catch((c) => {
+        const l = `uploadFileUsingExistingSftp: ${c}`;
+        this.logger.error(l), s(new Error(l));
+      }));
     });
   }
   async __uploadDirectory(e, r, t, i = 432) {
@@ -759,23 +757,23 @@ async function Nt(n, e, r, t, i, o) {
     e.forwardOut(r, t, i, o, (c, l) => c ? (n.error(`forwardOut.error: ${c}`), a(c)) : s(l));
   });
 }
-const Bt = "minio-2024-12-18T13-15-44Z", Ut = "supervisord-0.7.3", Tt = "supervisord_0.7.3_Linux_64-bit";
+const Bt = "minio-2024-12-18T13-15-44Z", Ut = "supervisord-0.7.3", _t = "supervisord_0.7.3_Linux_64-bit";
 function g(n) {
   return u.join(n, ".platforma_ssh");
 }
 function E(n) {
   return u.join(g(n), "binaries");
 }
-function It(n, e) {
+function Tt(n, e) {
   return u.join(E(n), `pl-${R()}-${P(e)}`);
 }
 function V(n, e) {
-  return u.join(It(n, e), "binaries");
+  return u.join(Tt(n, e), "binaries");
 }
-function T(n, e) {
+function _(n, e) {
   return u.join(V(n, e), "platforma");
 }
-function _t(n, e) {
+function It(n, e) {
   return u.join(V(n, e), "free-port");
 }
 function q(n, e) {
@@ -785,7 +783,7 @@ function jt(n, e) {
   return u.join(q(n, e), "minio");
 }
 function Ht(n, e) {
-  return u.join(E(n), `supervisord-0.7.3-${P(e)}`, Tt);
+  return u.join(E(n), `supervisord-0.7.3-${P(e)}`, _t);
 }
 function z(n, e) {
   return u.join(Ht(n, e), "supervisord");
@@ -793,7 +791,7 @@ function z(n, e) {
 function K(n) {
   return u.join(g(n), "supervisor.conf");
 }
-function I(n) {
+function T(n) {
   return u.join(g(n), "connection.txt");
 }
 async function Gt(n, e, r) {
@@ -815,7 +813,7 @@ async function Jt(n, e, r, t) {
   }
   if (i.stderr)
     return n.info(`supervisord ctl status: stderr occurred: ${i.stderr}, stdout: ${i.stdout}`), { rawResult: i, allAlive: !1 };
-  const o = _(i.stdout, "platforma"), s = _(i.stdout, "minio"), a = {
+  const o = I(i.stdout, "platforma"), s = I(i.stdout, "minio"), a = {
     rawResult: i,
     platforma: o,
     minio: s,
@@ -860,7 +858,7 @@ async function U(n, e, r, t) {
   const i = z(e, r), o = K(e), s = `${i} --configuration ${o} ${t}`;
   return await n.exec(s);
 }
-function _(n, e) {
+function I(n, e) {
   return ((i) => i.replace(/\x1B\[[0-9;]*m/g, ""))(n).split(`
 `).some((i) => {
     const [o, s] = i.trim().split(/\s{2,}/);
@@ -1036,7 +1034,7 @@ class Z {
         f(i.useGlobalAccess),
         i.plBinary.version
       ), await this.sshClient.writeFileOnTheServer(
-        I(r.remoteHome),
+        T(r.remoteHome),
         Kt(r.connectionInfo)
       ), await (t == null ? void 0 : t("Connection information saved.")), await (t == null ? void 0 : t("Starting Platforma on the server...")), await this.start(), r.started = !0, this.initState = r, await (t == null ? void 0 : t("Platforma has been started successfully.")), r.connectionInfo;
     } catch (i) {
@@ -1073,7 +1071,7 @@ class Z {
       return o.push(l), await this.sshClient.chmod(c, 488), {
         history: o,
         minioRelPath: c,
-        downloadedPl: T(t, i.arch)
+        downloadedPl: _(t, i.arch)
       };
     } catch (s) {
       const a = `SshPl.downloadBinariesAndUploadToServer: ${s}, state: ${JSON.stringify(o)}`;
@@ -1120,7 +1118,7 @@ class Z {
     return s.untarDone = !0, s;
   }
   async needDownload(e, r) {
-    const t = z(e, r.arch), i = q(e, r.arch), o = T(e, r.arch);
+    const t = z(e, r.arch), i = q(e, r.arch), o = _(e, r.arch);
     return !await this.sshClient.checkFileExists(o) || !await this.sshClient.checkFileExists(i) || !await this.sshClient.checkFileExists(t);
   }
   async checkIsAliveWithInterval(e = 1e3, r = 15, t = !0) {
@@ -1133,29 +1131,29 @@ class Z {
     }
   }
   async getUserCredentials(e) {
-    const r = await this.sshClient.readFile(I(e));
+    const r = await this.sshClient.readFile(T(e));
     return zt(r);
   }
   async fetchPorts(e, r) {
     return {
       grpc: {
-        local: await v(),
+        local: await $(),
         remote: await this.getFreePortForPlatformaOnServer(e, r)
       },
       monitoring: {
-        local: await v(),
+        local: await $(),
         remote: await this.getFreePortForPlatformaOnServer(e, r)
       },
       debug: {
-        local: await v(),
+        local: await $(),
         remote: await this.getFreePortForPlatformaOnServer(e, r)
       },
       minioPort: {
-        local: await v(),
+        local: await $(),
         remote: await this.getFreePortForPlatformaOnServer(e, r)
       },
       minioConsolePort: {
-        local: await v(),
+        local: await $(),
         remote: await this.getFreePortForPlatformaOnServer(e, r)
       }
     };
@@ -1170,7 +1168,7 @@ class Z {
     });
   }
   async getFreePortForPlatformaOnServer(e, r) {
-    const t = _t(e, r.arch), { stdout: i, stderr: o } = await this.sshClient.exec(`${t}`);
+    const t = It(e, r.arch), { stdout: i, stderr: o } = await this.sshClient.exec(`${t}`);
     if (o)
       throw new Error(`getFreePortForPlatformaOnServer: stderr is not empty: ${o}, stdout: ${i}`);
     return +i;
@@ -1227,7 +1225,7 @@ export {
   Z as SshPl,
   Wt as SshPlPorts,
   R as getDefaultPlVersion,
-  gr as localPlatformaInit,
+  mr as localPlatformaInit,
   qt as newConnectionInfo,
   zt as parseConnectionInfo,
   Qt as parseGlibcVersion,