underpost 2.8.837 → 2.8.838

package/README.md

@@ -24,16 +24,18 @@ template
 
 
 
+
 <!-- badges -->
 
 
-[![Node.js CI](https://github.com/underpostnet/engine/actions/workflows/docker-image.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/docker-image.yml) [![Test](https://github.com/underpostnet/engine/actions/workflows/coverall.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/coverall.yml) [![Downloads](https://img.shields.io/npm/dm/underpost.svg)](https://www.npmjs.com/package/underpost) [![Socket Badge](https://socket.dev/api/badge/npm/package/underpost/2.8.837)](https://socket.dev/npm/package/underpost/overview/2.8.837) [![Coverage Status](https://coveralls.io/repos/github/underpostnet/engine/badge.svg?branch=master)](https://coveralls.io/github/underpostnet/engine?branch=master) [![Version](https://img.shields.io/npm/v/underpost.svg)](https://www.npmjs.org/package/underpost) [![License](https://img.shields.io/npm/l/underpost.svg)](https://www.npmjs.com/package/underpost)
+[![Node.js CI](https://github.com/underpostnet/engine/actions/workflows/docker-image.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/docker-image.yml) [![Test](https://github.com/underpostnet/engine/actions/workflows/coverall.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/coverall.yml) [![Downloads](https://img.shields.io/npm/dm/underpost.svg)](https://www.npmjs.com/package/underpost) [![Socket Badge](https://socket.dev/api/badge/npm/package/underpost/2.8.838)](https://socket.dev/npm/package/underpost/overview/2.8.838) [![Coverage Status](https://coveralls.io/repos/github/underpostnet/engine/badge.svg?branch=master)](https://coveralls.io/github/underpostnet/engine?branch=master) [![Version](https://img.shields.io/npm/v/underpost.svg)](https://www.npmjs.org/package/underpost) [![License](https://img.shields.io/npm/l/underpost.svg)](https://www.npmjs.com/package/underpost)
 
 
 <!-- end-badges -->
 
 
 
+
 </div>
 
 <div align="center">
@@ -78,7 +80,7 @@ Run dev client server
 npm run dev
 ```
 <!-- -->
-## underpost ci/cd cli v2.8.837
+## underpost ci/cd cli v2.8.838
 
 ### Usage: `underpost [options] [command]`
   ```

package/cli.md

@@ -1,4 +1,4 @@
-## underpost ci/cd cli v2.8.837
+## underpost ci/cd cli v2.8.838
 
 ### Usage: `underpost [options] [command]`
   ```
@@ -556,7 +556,7 @@ Runs a script from the specified path.
 Arguments:
   runner-id                          The runner ID to run. Options:
                                      spark-template, gpu-env, tf-gpu-test, ide,
-                                     tf-vae-test, deploy-job.
+                                     monitor, tf-vae-test, deploy-job.
   path                               The absolute or relative directory path
                                      where the script is located.
 

package/docker-compose.yml

@@ -58,7 +58,7 @@ services:
           cpus: '0.25'
           memory: 20M
     labels: # labels in Compose file instead of Dockerfile
-      engine.version: '2.8.837'
+      engine.version: '2.8.838'
     networks:
       - load-balancer
 

package/manifests/deployment/dd-template-development/deployment.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: dd-template-development-blue
-          image: localhost/rockylinux9-underpost:v2.8.837
+          image: localhost/rockylinux9-underpost:v2.8.838
           #          resources:
           #            requests:
           #              memory: "124Ki"
@@ -100,7 +100,7 @@ spec:
     spec:
       containers:
         - name: dd-template-development-green
-          image: localhost/rockylinux9-underpost:v2.8.837
+          image: localhost/rockylinux9-underpost:v2.8.838
           #          resources:
           #            requests:
           #              memory: "124Ki"

package/manifests/maas/device-scan.sh

@@ -8,14 +8,14 @@ for iface_path in /sys/class/net/*; do
   operstate=$(< "$iface_path/operstate")
   mtu=$(< "$iface_path/mtu")
 
-  # Driver: módulo kernel que maneja esta interfaz
+  # Driver
   if [ -L "$iface_path/device/driver" ]; then
     driver=$(basename "$(readlink -f "$iface_path/device/driver")")
   else
     driver="—"
   fi
 
-  # Vendor:Device ID PCI
+  # Vendor device ID PCI
   pci_dev="$iface_path/device"
   if [ -f "$pci_dev/vendor" ] && [ -f "$pci_dev/device" ]; then
     vendor_id=$(< "$pci_dev/vendor")
@@ -28,7 +28,7 @@ for iface_path in /sys/class/net/*; do
     pci="—"
   fi
 
-  # Link Speed: lectura directa de /sys/class/net/<iface>/speed
+  # Link Speed
   speed=$(cat "$iface_path/speed" 2>/dev/null || echo "—")
 
   echo "Interface: $name"

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.8.837",
+    "version": "2.8.838",
     "description": "pwa api rest template",
     "scripts": {
         "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",

package/src/cli/baremetal.js

@@ -1,5 +1,5 @@
 import { getNpmRootPath, getUnderpostRootPath } from '../server/conf.js';
-import { pbcopy, shellExec } from '../server/process.js';
+import { openTerminal, pbcopy, shellExec } from '../server/process.js';
 import dotenv from 'dotenv';
 import { loggerFactory } from '../server/logger.js';
 import { getLocalIPv4Address } from '../server/dns.js';
@@ -699,18 +699,8 @@ menuentry '${menuentryStr}' {
               fs.writeFileSync(`${nfsHostPath}/underpost/token-secret`, token_secret, 'utf8');
 
               // Open new terminals for live cloud-init logs.
-              shellExec(
-                `gnome-terminal -- bash -c "node ${underpostRoot}/bin baremetal --logs cloud; exec bash" & disown`,
-                {
-                  async: true,
-                },
-              );
-              shellExec(
-                `gnome-terminal -- bash -c "node ${underpostRoot}/bin baremetal --logs machine; exec bash" & disown`,
-                {
-                  async: true,
-                },
-              );
+              openTerminal(`node ${underpostRoot}/bin baremetal --logs cloud`);
+              openTerminal(`node ${underpostRoot}/bin baremetal --logs machine`);
             } catch (error) {
               logger.error(error, error.stack);
             } finally {

package/src/cli/cluster.js

@@ -662,7 +662,7 @@ net.ipv4.ip_forward = 1' | sudo tee ${iptableConfPath}`);
       const archData = UnderpostBaremetal.API.getHostArch();
       logger.info('Installing essential host-level prerequisites for Kubernetes...', archData);
       // Install Docker and its dependencies
-      shellExec(`sudo dnf -y install dnf-plugins-core`);
+      shellExec(`sudo dnf -y install dnf-plugins-core dbus-x11`);
       shellExec(`sudo dnf config-manager --add-repo https://download.docker.com/linux/rhel/docker-ce.repo`);
       shellExec(`sudo dnf -y install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin`);
 

package/src/cli/run.js

@@ -1,9 +1,10 @@
-import { pbcopy, shellCd, shellExec } from '../server/process.js';
+import { getTerminalPid, openTerminal, pbcopy, shellCd, shellExec } from '../server/process.js';
 import read from 'read';
 import { getNpmRootPath } from '../server/conf.js';
 import { loggerFactory } from '../server/logger.js';
 import UnderpostTest from './test.js';
 import fs from 'fs-extra';
+import { timer } from '../client/components/core/CommonJs.js';
 
 const logger = loggerFactory(import.meta);
 
@@ -52,9 +53,73 @@ class UnderpostRun {
       const { underpostRoot } = options;
       shellExec(`node ${underpostRoot}/bin/vs ${path}`);
     },
+    monitor: (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      const pid = getTerminalPid();
+      logger.info('monitor pid', pid);
+      const checkPath = '/await';
+      const _monitor = async () => {
+        const result = JSON.parse(
+          shellExec(`kubectl exec ${path} -- test -f ${checkPath} && echo "true" || echo "false"`, {
+            stdout: true,
+            disableLog: true,
+            silent: true,
+          }).trim(),
+        );
+        logger.info('monitor', result);
+        if (result === true) {
+          switch (path) {
+            case 'tf-vae-test':
+              {
+                const nameSpace = 'default';
+                const podName = path;
+                const basePath = '/home/dd';
+                const scriptPath = '/site/en/tutorials/generative/cvae.py';
+                shellExec(
+                  `sudo kubectl cp ${nameSpace}/${podName}:${basePath}/docs${scriptPath} ${basePath}/lab/src/${scriptPath
+                    .split('/')
+                    .pop()}`,
+                );
+                const file = fs.readFileSync(`${basePath}/lab/src/${scriptPath.split('/').pop()}`, 'utf8');
+                fs.writeFileSync(
+                  `${basePath}/lab/src/${scriptPath.split('/').pop()}`,
+                  file.replace(
+                    `import time`,
+                    `import time
+print('=== SCRIPT UPDATE TEST ===')`,
+                  ),
+                  'utf8',
+                );
+                shellExec(
+                  `sudo kubectl cp ${basePath}/lab/src/${scriptPath
+                    .split('/')
+                    .pop()} ${nameSpace}/${podName}:${basePath}/docs${scriptPath}`,
+                );
+                // shellExec(`sudo kubectl exec -i ${podName} -- sh -c "ipython ${basePath}/docs${scriptPath}"`);
+                shellExec(`sudo kubectl exec -i ${podName} -- sh -c "rm -rf ${checkPath}"`);
+                shellExec(`sudo kill -9 ${pid}`);
+              }
+              break;
+
+            default:
+              break;
+          }
+          return;
+        }
+        await timer(1000);
+        _monitor();
+      };
+      _monitor();
+    },
     'tf-vae-test': async (path, options = UnderpostRun.DEFAULT_OPTION) => {
       const { underpostRoot } = options;
+      const podName = 'tf-vae-test';
       await UnderpostRun.RUNNERS['deploy-job']('', {
+        podName,
+        on: {
+          init: async () => {
+            openTerminal(`node bin run --dev monitor ${podName}`);
+          },
+        },
         args: [
           `pip install --upgrade \
                nbconvert \
@@ -68,7 +133,11 @@ class UnderpostRun {
           'git clone https://github.com/tensorflow/docs.git',
           'cd docs',
           'jupyter nbconvert --to python site/en/tutorials/generative/cvae.ipynb',
-          'ipython site/en/tutorials/generative/cvae.py',
+          `echo '' > /await`,
+          `echo '=== WAITING SCRIPT LAUNCH ==='`,
+          `while [ -f /await ]; do sleep 1; done`,
+          `ipython site/en/tutorials/generative/cvae.py`,
+          `echo '=== FINISHED ==='`,
         ],
       });
     },
@@ -134,6 +203,7 @@ EOF`;
       shellExec(cmd, { disableLog: true });
       const successInstance = await UnderpostTest.API.statusMonitor(podName);
       if (successInstance) {
+        options.on?.init ? await options.on.init() : null;
         shellExec(`kubectl logs -f ${podName}`);
       }
     },

package/src/index.js

@@ -34,7 +34,7 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v2.8.837';
+  static version = 'v2.8.838';
   /**
    * Repository cli API
    * @static

package/src/server/process.js

@@ -10,8 +10,6 @@ dotenv.config();
 
 const logger = loggerFactory(import.meta);
 
-// process.exit();
-
 const getRootDirectory = () => process.cwd().replace(/\\/g, '/');
 
 const ProcessController = {
@@ -63,27 +61,19 @@ const shellCd = (cd, options = { disableLog: false }) => {
   return shell.cd(cd);
 };
 
-function pbcopy(data) {
-  switch (process.platform) {
-    case 'linux':
-      {
-        // sudo dnf install xclip
-        // sudo apt update
-        // sudo apt install xclip
-        // paste: xclip -o
-        // copy:
-        // shellExec(`echo "${data}" | xclip -sel clip`, { async: true });
-      }
-
-      break;
+const openTerminal = (cmd) =>
+  shellExec(`gnome-terminal -- bash -c "${cmd}; exec bash" & disown`, {
+    async: true,
+    stdout: true,
+  });
 
-    default:
-      break;
-  }
+// list all terminals: pgrep gnome-terminal
+// list last terminal: pgrep -n gnome-terminal
+const getTerminalPid = () => JSON.parse(shellExec(`pgrep -n gnome-terminal`, { stdout: true, silent: true }));
 
+function pbcopy(data) {
   clipboard.writeSync(data || '🦄');
-
   logger.info(`copied to clipboard`, clipboard.readSync());
 }
 
-export { ProcessController, getRootDirectory, shellExec, shellCd, pbcopy };
+export { ProcessController, getRootDirectory, shellExec, shellCd, pbcopy, openTerminal, getTerminalPid };