underpost 2.90.0 → 2.90.1

package/.env.production

@@ -51,6 +51,8 @@ DEFAULT_SSH_KEY_PATH=changethis
 NPM_TOKEN=changethis
 NPM_USER=changethis
 NPM_PASSWORD=changethis
+POSTMAN_EMAIL=admin@default.net
+POSTMAN_PASSWORD=changethis
 BASE_API=api
 CERTBOT_LIVE_PATH=changethis
 CERTBOT_LIVE_PATH_WINDOWS=changethis

package/README.md

@@ -18,7 +18,7 @@
 
 <!-- badges -->
 
-[![Node.js CI](https://github.com/underpostnet/engine/actions/workflows/docker-image.ci.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/docker-image.yml) [![Test](https://github.com/underpostnet/engine/actions/workflows/coverall.ci.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/coverall.ci.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.90.0)](https://socket.dev/npm/package/underpost/overview/2.90.0) [![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.ci.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/docker-image.yml) [![Test](https://github.com/underpostnet/engine/actions/workflows/coverall.ci.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/coverall.ci.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.90.1)](https://socket.dev/npm/package/underpost/overview/2.90.1) [![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 -->
 
@@ -66,7 +66,7 @@ Run dev client server
 npm run dev
 ```
 <!-- -->
-## underpost ci/cd cli v2.90.0
+## underpost ci/cd cli v2.90.1
 
 ### Usage: `underpost [options] [command]`
   ```
@@ -82,6 +82,7 @@ Commands:
   cmt [options] [path] [commit-type] [module-tag] [message]  Manages commits to a GitHub repository, supporting various commit types and options.
   push [options] <path> <uri>                                Pushes committed changes from a local repository to a remote GitHub repository.
   env [deploy-id] [env] [subConf]                            Sets environment variables and configurations related to a specific deployment ID.
+  static [options]                                           Manages static build of page, bundles, and documentation.
   config [options] <operator> [key] [value]                  Manages Underpost configurations using various operators.
   root                                                       Displays the root path of the npm installation.
   ip [options]                                               Displays the current public machine IP addresses.

package/bin/build.js

@@ -172,6 +172,10 @@ const { DefaultConf } = await import(`../conf.${confName}.js`);
       fs.copyFileSync(`./src/api/object-layer/README.md`, `${basePath}/README.md`);
       fs.copySync(`./hardhat`, `${basePath}/hardhat`);
       fs.copySync(`./hardhat/white-paper.md`, `${basePath}/white-paper.md`);
+      fs.copySync(
+        `./src/client/ssr/pages/CyberiaServerMetrics.js`,
+        `${basePath}/src/client/ssr/pages/CyberiaServerMetrics.js`,
+      );
     default:
       break;
   }

package/cli.md

@@ -1,4 +1,4 @@
-## underpost ci/cd cli v2.90.0
+## underpost ci/cd cli v2.90.1
 
 ### Usage: `underpost [options] [command]`
   ```
@@ -14,6 +14,7 @@ Commands:
   cmt [options] [path] [commit-type] [module-tag] [message]  Manages commits to a GitHub repository, supporting various commit types and options.
   push [options] <path> <uri>                                Pushes committed changes from a local repository to a remote GitHub repository.
   env [deploy-id] [env] [subConf]                            Sets environment variables and configurations related to a specific deployment ID.
+  static [options]                                           Manages static build of page, bundles, and documentation.
   config [options] <operator> [key] [value]                  Manages Underpost configurations using various operators.
   root                                                       Displays the root path of the npm installation.
   ip [options]                                               Displays the current public machine IP addresses.
@@ -194,6 +195,33 @@ Options:
 ```
   
 
+### `static` :
+```
+ Usage: underpost static [options]
+
+Manages static build of page, bundles, and documentation.
+
+Options:
+  --page <ssr-component-path>  Build custom static pages.
+  --title <title>              Sets a custom title for the static page.
+  --output-path <output-path>  Sets the output path for the generated static
+                               page.
+  --deploy-id <deploy-id>      Build static assets for a specific deployment
+                               ID.
+  --build                      Triggers the static build process for the
+                               specified deployment ID.
+  --build-host <build-host>    Sets a custom build host for static documents or
+                               assets.
+  --build-path <build-path>    Sets a custom build path for static documents or
+                               assets.
+  --env <env>                  Sets the environment for the static build (e.g.,
+                               "development", "production").
+  --dev                        Sets the development cli context
+  -h, --help                   display help for command
+ 
+```
+  
+
 ### `config` :
 ```
  Usage: underpost config [options] <operator> [key] [value]

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

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

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

@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
         - name: dd-test-development-blue
-          image: localhost/rockylinux9-underpost:v2.90.0
+          image: localhost/rockylinux9-underpost:v2.90.1
 
           command:
             - /bin/sh
@@ -103,7 +103,7 @@ spec:
     spec:
       containers:
         - name: dd-test-development-green
-          image: localhost/rockylinux9-underpost:v2.90.0
+          image: localhost/rockylinux9-underpost:v2.90.1
 
           command:
             - /bin/sh

package/package.json

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

package/src/cli/index.js

@@ -9,6 +9,7 @@ import UnderpostBaremetal from './baremetal.js';
 import UnderpostRun from './run.js';
 import Dns from '../server/dns.js';
 import { pbcopy } from '../server/process.js';
+import UnderpostStatic from './static.js';
 
 // Load environment variables from .env file
 const underpostRootPath = getUnderpostRootPath();
@@ -115,6 +116,22 @@ program
     loadConf(deployId, subConf);
   });
 
+// 'static' command: Manage static configurations
+program
+  .command('static')
+  .option('--page <ssr-component-path>', 'Build custom static pages.')
+  .option('--title <title>', 'Sets a custom title for the static page.')
+  .option('--output-path <output-path>', 'Sets the output path for the generated static page.')
+
+  .option('--deploy-id <deploy-id>', 'Build static assets for a specific deployment ID.')
+  .option('--build', 'Triggers the static build process for the specified deployment ID.')
+  .option('--build-host <build-host>', 'Sets a custom build host for static documents or assets.')
+  .option('--build-path <build-path>', 'Sets a custom build path for static documents or assets.')
+  .option('--env <env>', 'Sets the environment for the static build (e.g., "development", "production").')
+  .option('--dev', 'Sets the development cli context')
+  .description(`Manages static build of page, bundles, and documentation.`)
+  .action(UnderpostStatic.API.callback);
+
 // 'config' command: Manage Underpost configurations
 program
   .command('config')

package/src/cli/static.js

@@ -0,0 +1,84 @@
+/**
+ * Static site generation module
+ * @module src/cli/static.js
+ * @namespace UnderpostStatic
+ */
+
+import fs from 'fs-extra';
+import { ssrFactory } from '../server/ssr.js';
+import { shellExec } from '../server/process.js';
+import Underpost from '../index.js';
+import { JSONweb } from '../server/client-formatted.js';
+
+/**
+ * @class UnderpostStatic
+ * @description Static site generation class
+ * @memberof UnderpostStatic
+ */
+class UnderpostStatic {
+  static API = {
+    /**
+     * Generate static HTML file
+     * @param {Object} options - Options for static generation
+     * @param {string} options.page - Page identifier
+     * @param {string} options.title - Page title
+     * @param {string} options.outputPath - Output file path
+     * @param {string} options.deployId - Deployment identifier
+     * @param {string} options.buildHost - Build host
+     * @param {string} options.buildPath - Build path
+     * @param {string} options.env - Environment (development/production)
+     * @param {boolean} options.build - Whether to trigger build
+     * @param {boolean} options.dev - Development mode flag
+     * @memberof UnderpostStatic
+     * @returns {Promise<void>}
+     */
+    async callback(
+      options = {
+        page: '',
+        title: '',
+        outputPath: '',
+        deployId: '',
+        buildHost: '',
+        buildPath: '',
+        env: '',
+        build: false,
+        dev: false,
+      },
+    ) {
+      if (!options.outputPath) options.outputPath = '.';
+      if (!options.buildPath) options.buildPath = '/';
+      if (!options.env) options.env = 'production';
+
+      if (options.page) {
+        const Render = await ssrFactory();
+        const SsrComponent = await ssrFactory(options.page);
+        const htmlSrc = Render({
+          title: options.title || 'Home',
+          ssrPath: '/',
+          ssrHeadComponents: '',
+          ssrBodyComponents: SsrComponent(),
+          // buildId: options.deployId || 'local',
+          renderPayload: {
+            // apiBaseProxyPath,
+            // apiBaseHost,
+            // apiBasePath: process.env.BASE_API,
+            version: Underpost.version,
+            ...(options.env === 'development' ? { dev: true } : undefined),
+          },
+          renderApi: {
+            JSONweb,
+          },
+        });
+        fs.writeFileSync(options.outputPath, htmlSrc, 'utf8');
+      }
+      if (options.deployId && options.build) {
+        shellExec(`underpost env ${options.deployId} ${options.env}`);
+        shellExec(
+          `npm run build ${options.deployId}${options.buildHost ? ` ${options.buildHost} ${options.buildPath}` : ``}`,
+        );
+      }
+    },
+  };
+}
+
+export default UnderpostStatic;

package/src/index.js

@@ -20,6 +20,7 @@ import UnderpostRun from './cli/run.js';
 import UnderpostScript from './cli/script.js';
 import UnderpostSecret from './cli/secrets.js';
 import UnderpostSSH from './cli/ssh.js';
+import UnderpostStatic from './cli/static.js';
 import UnderpostTest from './cli/test.js';
 import UnderpostStartUp from './server/start.js';
 
@@ -35,7 +36,7 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v2.90.0';
+  static version = 'v2.90.1';
   /**
    * Repository cli API
    * @static
@@ -64,6 +65,14 @@ class Underpost {
    * @memberof Underpost
    */
   static start = UnderpostStartUp.API;
+  /**
+   * Static cli API
+   * @static
+   * @type {UnderpostStatic.API}
+   * @memberof Underpost
+   */
+  static static = UnderpostStatic.API;
+
   /**
    * Cluster cli API
    * @static

package/src/server/client-build.js

@@ -519,21 +519,15 @@ const buildClient = async (options = { liveClientBuildPaths: [], instances: [],
 
               for (const ssrBodyComponent of confSSR[view.ssr].body) {
                 const SrrComponent = await ssrFactory(`./src/client/ssr/body/${ssrBodyComponent}.js`);
-                if (ssrBodyComponent.match('SplashScreen')) {
-                  if (backgroundImage)
-                    ssrBodyComponents += SrrComponent({
-                      ...metadata,
-                      backgroundImage: (path === '/' ? path : `${path}/`) + backgroundImage,
-                    });
-                  else ssrBodyComponents += SrrComponent({ metadata });
-                } else
-                  ssrBodyComponents += SrrComponent({
-                    ssrPath,
-                    host,
-                    path,
-                    ttiLoadTimeLimit,
-                    version: Underpost.version,
-                  });
+                ssrBodyComponents += SrrComponent({
+                  ...metadata,
+                  ssrPath,
+                  host,
+                  path,
+                  ttiLoadTimeLimit,
+                  version: Underpost.version,
+                  backgroundImage: backgroundImage ? (path === '/' ? path : `${path}/`) + backgroundImage : undefined,
+                });
               }
             }