underpost 2.8.876 → 2.8.877

package/README.md

@@ -53,13 +53,15 @@
 
 
 
+
+
 
 
 
 <!-- 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.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.876)](https://socket.dev/npm/package/underpost/overview/2.8.876) [![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.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.877)](https://socket.dev/npm/package/underpost/overview/2.8.877) [![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 -->
@@ -101,6 +103,8 @@
 
 
 
+
+
 
 
 
@@ -148,7 +152,7 @@ Run dev client server
 npm run dev
 ```
 <!-- -->
-## underpost ci/cd cli v2.8.876
+## underpost ci/cd cli v2.8.877
 
 ### Usage: `underpost [options] [command]`
   ```

package/cli.md

@@ -1,4 +1,4 @@
-## underpost ci/cd cli v2.8.876
+## underpost ci/cd cli v2.8.877
 
 ### Usage: `underpost [options] [command]`
   ```
@@ -609,6 +609,8 @@ Options:
   --command <command-array>                Array of commands to run.
   --args <args-array>                      Array of arguments to pass to the command.
   --dev                                    Sets the development context environment for the script.
+  --build                                  Set builder context runner
+  --replicas <replicas>                    Sets a custom number of replicas for deployment.
   --pod-name <pod-name>                    Optional: Specifies the pod name for test execution.
   --volume-host-path <volume-host-path>    Optional: Specifies the volume host path for test execution.
   --volume-mount-path <volume-mount-path>  Optional: Specifies the volume mount path for test execution.

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.8.876
+          image: localhost/rockylinux9-underpost:v2.8.877
           #          resources:
           #            requests:
           #              memory: "124Ki"
@@ -100,7 +100,7 @@ spec:
     spec:
       containers:
         - name: dd-default-development-green
-          image: localhost/rockylinux9-underpost:v2.8.876
+          image: localhost/rockylinux9-underpost:v2.8.877
           #          resources:
           #            requests:
           #              memory: "124Ki"

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

@@ -17,13 +17,13 @@ spec:
     spec:
       containers:
         - name: dd-test-development-blue
-          image: localhost/rockylinux9-underpost:v2.8.876
+          image: localhost/rockylinux9-underpost:v2.8.877
 #          resources:
 #            requests:
-#              memory: "96294Ki"
+#              memory: "94Ki"
 #              cpu: "75m"
 #            limits:
-#              memory: "1540709Ki"
+#              memory: "1504Ki"
 #              cpu: "1200m"
           command:
             - /bin/sh
@@ -104,13 +104,13 @@ spec:
     spec:
       containers:
         - name: dd-test-development-green
-          image: localhost/rockylinux9-underpost:v2.8.876
+          image: localhost/rockylinux9-underpost:v2.8.877
 #          resources:
 #            requests:
-#              memory: "96294Ki"
+#              memory: "94Ki"
 #              cpu: "75m"
 #            limits:
-#              memory: "1540709Ki"
+#              memory: "1504Ki"
 #              cpu: "1200m"
           command:
             - /bin/sh

package/package.json

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

package/src/cli/deploy.js

@@ -384,7 +384,8 @@ EOF`);
         if (!options.remove === true) {
           if (!options.disableUpdateDeployment) shellExec(`sudo kubectl apply -f ./${manifestsPath}/deployment.yaml`);
           shellExec(`sudo kubectl apply -f ./${manifestsPath}/proxy.yaml`);
-          if (UnderpostDeploy.API.isValidTLSContext({ host, env, options }))
+
+          if (UnderpostDeploy.API.isValidTLSContext({ host: Object.keys(confServer)[0], env, options }))
             shellExec(`sudo kubectl apply -f ./${manifestsPath}/secret.yaml`);
         }
       }

package/src/cli/index.js

@@ -350,6 +350,8 @@ program
   .option('--command <command-array>', 'Array of commands to run.')
   .option('--args <args-array>', 'Array of arguments to pass to the command.')
   .option('--dev', 'Sets the development context environment for the script.')
+  .option('--build', 'Set builder context runner')
+  .option('--replicas <replicas>', 'Sets a custom number of replicas for deployment.')
   .option('--pod-name <pod-name>', 'Optional: Specifies the pod name for test execution.')
   .option('--volume-host-path <volume-host-path>', 'Optional: Specifies the volume host path for test execution.')
   .option('--volume-mount-path <volume-mount-path>', 'Optional: Specifies the volume mount path for test execution.')

package/src/cli/repository.js

@@ -160,10 +160,18 @@ class UnderpostRepository {
           `Version mismatch: deploy-version:${packageJsonDeploy.version} !== engine-version:${packageJsonEngine.version},
 Prevent build private config repo.`,
         );
-        return { validVersion: false };
+        return {
+          validVersion: false,
+          engineVersion: packageJsonEngine.version,
+          deployVersion: packageJsonDeploy.version,
+        };
       }
       shellExec(`node bin/build ${deployId} conf`);
-      return { validVersion: true };
+      return {
+        validVersion: true,
+        engineVersion: packageJsonEngine.version,
+        deployVersion: packageJsonDeploy.version,
+      };
     },
   };
 }

package/src/cli/run.js

@@ -8,6 +8,7 @@ import { range, setPad, timer } from '../client/components/core/CommonJs.js';
 import UnderpostDeploy from './deploy.js';
 import UnderpostRootEnv from './env.js';
 import UnderpostRepository from './repository.js';
+import os from 'os';
 
 const logger = loggerFactory(import.meta);
 
@@ -20,6 +21,8 @@ class UnderpostRun {
     imageName: '',
     containerName: '',
     namespace: '',
+    build: false,
+    replicas: 1,
   };
   static RUNNERS = {
     'spark-template': (path, options = UnderpostRun.DEFAULT_OPTION) => {
@@ -154,17 +157,21 @@ class UnderpostRun {
       const env = options.dev ? 'development' : 'production';
       const baseCommand = options.dev || true ? 'node bin' : 'underpost';
       shellExec(`${baseCommand} run clean`);
-      const defaultPaht = ['dd', 1, ``, 'kind-control-plane'];
-      let [deployId, replicas, image, node] = path ? path.split(',') : defaultPaht;
-      deployId = deployId ?? defaultPaht[0];
-      replicas = replicas ?? defaultPaht[1];
-      image = image ?? defaultPaht[2];
-      node = node ?? defaultPaht[3];
+      const defaultPath = ['dd-default', 1, ``, ``, 'kind-control-plane'];
+      let [deployId, replicas, versions, image, node] = path ? path.split(',') : defaultPath;
+      deployId = deployId ?? defaultPath[0];
+      replicas = replicas ?? defaultPath[1];
+      versions = versions ?? defaultPath[2];
+      image = image ?? defaultPath[3];
+      node = node ?? defaultPath[4];
       shellExec(
         `${baseCommand} deploy --kubeadm --build-manifest --sync --info-router --replicas ${
           replicas ?? 1
-        } --node ${node}${image ? ` --image ${image}` : ''} ${deployId} ${env}`,
+        } --node ${node}${image ? ` --image ${image}` : ''}${
+          versions ? ` --versions ${versions.replaceAll('+', ',')}` : ''
+        } dd ${env}`,
       );
+      if (!options.build) shellExec(`${baseCommand} deploy --kubeadm ${deployId} ${env}`);
     },
     'ls-deployments': async (path, options = UnderpostRun.DEFAULT_OPTION) => {
       console.table(await UnderpostDeploy.API.get(path, 'deployments'));
@@ -303,13 +310,21 @@ class UnderpostRun {
     },
     deploy: async (path, options = UnderpostRun.DEFAULT_OPTION) => {
       const deployId = path;
-      const { validVersion } = UnderpostRepository.API.privateConfUpdate(deployId);
+      const { validVersion, deployVersion } = UnderpostRepository.API.privateConfUpdate(deployId);
       if (!validVersion) throw new Error('Version mismatch');
       const currentTraffic = UnderpostDeploy.API.getCurrentTraffic(deployId);
       const targetTraffic = currentTraffic === 'blue' ? 'green' : 'blue';
       const env = 'production';
       const ignorePods = UnderpostDeploy.API.get(`${deployId}-${env}-${targetTraffic}`).map((p) => p.NAME);
-      shellExec(`sudo kubectl rollout restart deployment/${deployId}-${env}-${targetTraffic}`);
+
+      if (options.build === true) {
+        // deployId, replicas, versions, image, node
+        shellExec(
+          `node bin run sync ${deployId},${options.replicas ?? 1},${targetTraffic},${
+            options.imageName ?? `localhost/rockylinux9-underpost:${deployVersion}`
+          },${os.hostname()}`,
+        );
+      } else shellExec(`sudo kubectl rollout restart deployment/${deployId}-${env}-${targetTraffic}`);
 
       let checkStatusIteration = 0;
       const checkStatusIterationMsDelay = 1000;

package/src/client/components/core/Auth.js

@@ -4,7 +4,6 @@ import { loggerFactory } from './Logger.js';
 import { LogIn } from './LogIn.js';
 import { LogOut } from './LogOut.js';
 import { NotificationManager } from './NotificationManager.js';
-import { SignUp } from './SignUp.js';
 import { Translate } from './Translate.js';
 import { s } from './VanillaJs.js';
 

package/src/client/services/core/core.service.js

@@ -35,8 +35,6 @@ const getWsBaseUrl = (options = { id: '', endpoint: '', wsBasePath: '' }) =>
 const headersFactory = (headerId = '') => {
   const headers = {
     Authorization: Auth.getJWT(),
-    withCredentials: true,
-    credentials: 'include', // no cors: 'same-origin'
   };
   switch (headerId) {
     case 'file':
@@ -71,29 +69,12 @@ const CoreService = {
           return reject(error);
         }),
     ),
-  getRandomImage: (options = { category: ['city'], mimetype: 'image/jpg' }) => {
-    const src = `https://api.api-ninjas.com/v1/randomimage?category=${options.category[0]}`;
-    return new Promise((resolve) => {
-      fetch(src, {
-        headers: { 'X-Api-Key': 'FyITmcxRXkCaUehbX6K0/g==uxZcFKL0dZUUg48G', Accept: options.mimetype },
-      })
-        .then((res) => res.blob())
-        .then(async (blob) => {
-          return resolve({
-            file: {
-              mimetype: 'image/jpg',
-              name: 'image.jpg',
-            },
-            url: URL.createObjectURL(blob),
-          });
-        });
-    });
-  },
   post: (options = { id: '', body: {} }) =>
     new Promise((resolve, reject) =>
       fetch(getApiBaseUrl({ id: options.id, endpoint }), {
         method: 'POST',
         headers: headersFactory(),
+        credentials: 'include',
         body: payloadFactory(options.body),
       })
         .then(async (res) => {
@@ -113,6 +94,7 @@ const CoreService = {
       fetch(getApiBaseUrl({ id: options.id, endpoint }), {
         method: 'PUT',
         headers: headersFactory(),
+        credentials: 'include',
         body: payloadFactory(options.body),
       })
         .then(async (res) => {
@@ -132,6 +114,7 @@ const CoreService = {
       fetch(getApiBaseUrl({ id: options.id, endpoint }), {
         method: 'GET',
         headers: headersFactory(),
+        credentials: 'include',
       })
         .then(async (res) => {
           return await res.json();
@@ -150,6 +133,7 @@ const CoreService = {
       fetch(getApiBaseUrl({ id: options.id, endpoint }), {
         method: 'DELETE',
         headers: headersFactory(),
+        credentials: 'include',
         body: payloadFactory(options.body),
       })
         .then(async (res) => {

package/src/client/services/default/default.service.js

@@ -14,6 +14,7 @@ const DefaultService = {
       fetch(getApiBaseUrl({ id: options.id, endpoint }), {
         method: 'POST',
         headers: headersFactory(),
+        credentials: 'include',
         body: payloadFactory(options.body),
       })
         .then(async (res) => {
@@ -33,6 +34,7 @@ const DefaultService = {
       fetch(getApiBaseUrl({ id: options.id, endpoint }), {
         method: 'PUT',
         headers: headersFactory(),
+        credentials: 'include',
         body: payloadFactory(options.body),
       })
         .then(async (res) => {
@@ -56,6 +58,7 @@ const DefaultService = {
       fetch(url.toString(), {
         method: 'GET',
         headers: headersFactory(),
+        credentials: 'include',
       })
         .then(async (res) => {
           return await res.json();
@@ -75,6 +78,7 @@ const DefaultService = {
       fetch(getApiBaseUrl({ id: options.id, endpoint }), {
         method: 'DELETE',
         headers: headersFactory(),
+        credentials: 'include',
         body: payloadFactory(options.body),
       })
         .then(async (res) => {

package/src/client/services/test/test.service.js

@@ -14,6 +14,7 @@ const TestService = {
       fetch(getApiBaseUrl({ id: options.id, endpoint }), {
         method: 'POST',
         headers: headersFactory(),
+        credentials: 'include',
         body: payloadFactory(options.body),
       })
         .then(async (res) => {
@@ -33,6 +34,7 @@ const TestService = {
       fetch(getApiBaseUrl({ id: options.id, endpoint }), {
         method: 'GET',
         headers: headersFactory(),
+        credentials: 'include',
       })
         .then(async (res) => {
           return await res.json();
@@ -51,6 +53,7 @@ const TestService = {
       fetch(getApiBaseUrl({ id: options.id, endpoint }), {
         method: 'DELETE',
         headers: headersFactory(),
+        credentials: 'include',
         body: payloadFactory(options.body),
       })
         .then(async (res) => {

package/src/client/services/user/user.service.js

@@ -22,6 +22,7 @@ const UserService = {
       fetch(getApiBaseUrl({ id: options.id, endpoint }), {
         method: 'POST',
         headers: headersFactory(),
+        credentials: 'include',
         body: payloadFactory(options.body),
       })
         .then(async (res) => {
@@ -47,6 +48,7 @@ const UserService = {
       fetch(url, {
         method: 'GET',
         headers: headersFactory(),
+        credentials: 'include',
       })
         .then(async (res) => {
           return await res.json();
@@ -66,6 +68,7 @@ const UserService = {
       fetch(getApiBaseUrl({ id: options.id, endpoint }), {
         method: 'DELETE',
         headers: headersFactory(),
+        credentials: 'include',
         body: payloadFactory(options.body),
       })
         .then(async (res) => {

package/src/index.js

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

package/src/server/auth.js

@@ -552,7 +552,7 @@ function applySecurity(app, opts = {}) {
       origin: origin || false,
       methods: ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'],
       credentials: true,
-      allowedHeaders: ['Content-Type', 'Authorization', 'X-Requested-With', 'Accept', 'withcredentials'],
+      allowedHeaders: ['Content-Type', 'Authorization', 'X-Requested-With', 'Accept', 'withcredentials', 'credentials'],
       maxAge: 600,
     }),
   );

package/src/server/runtime.js

@@ -63,6 +63,7 @@ const buildRuntime = async () => {
         singleReplica,
         replicas,
         valkey,
+        apiBaseHost,
       } = confServer[host][path];
 
       const { redirectTarget, singleReplicaHost } = await getInstanceContext({
@@ -188,97 +189,102 @@ const buildRuntime = async () => {
             await UnderpostStartUp.API.listenPortController(app, port, runningData);
             break;
           }
+          // instance server
+          const server = createServer({}, app);
+          if (peer) currentPort++;
 
-          const swaggerJsonPath = `./public/${host}${path === '/' ? path : `${path}/`}swagger-output.json`;
-          if (fs.existsSync(swaggerJsonPath)) {
-            // logger.info('Build swagger serve', swaggerJsonPath);
+          if (!apiBaseHost) {
+            const swaggerJsonPath = `./public/${host}${path === '/' ? path : `${path}/`}swagger-output.json`;
+            if (fs.existsSync(swaggerJsonPath)) {
+              // logger.info('Build swagger serve', swaggerJsonPath);
 
-            const swaggerInstance =
-              (swaggerDoc) =>
-              (...args) =>
-                swaggerUi.setup(swaggerDoc)(...args);
+              const swaggerInstance =
+                (swaggerDoc) =>
+                (...args) =>
+                  swaggerUi.setup(swaggerDoc)(...args);
 
-            const swaggerDoc = JSON.parse(fs.readFileSync(swaggerJsonPath, 'utf8'));
+              const swaggerDoc = JSON.parse(fs.readFileSync(swaggerJsonPath, 'utf8'));
 
-            app.use(`${path === '/' ? `/api-docs` : `${path}/api-docs`}`, swaggerUi.serve, swaggerInstance(swaggerDoc));
-          }
+              app.use(
+                `${path === '/' ? `/api-docs` : `${path}/api-docs`}`,
+                swaggerUi.serve,
+                swaggerInstance(swaggerDoc),
+              );
+            }
 
-          if (db && apis) await DataBaseProvider.load({ apis, host, path, db });
+            if (db && apis) await DataBaseProvider.load({ apis, host, path, db });
 
-          // valkey server
-          if (valkey) await createValkeyConnection({ host, path }, valkey);
+            // valkey server
+            if (valkey) await createValkeyConnection({ host, path }, valkey);
 
-          if (mailer) {
-            const mailerSsrConf = confSSR[getCapVariableName(client)];
-            await MailerProvider.load({
-              id: `${host}${path}`,
-              meta: `mailer-${host}${path}`,
-              host,
-              path,
-              ...mailer,
-              templates: mailerSsrConf ? mailerSsrConf.mailer : {},
-            });
-          }
-          if (apis) {
-            const authMiddleware = authMiddlewareFactory({ host, path });
+            if (mailer) {
+              const mailerSsrConf = confSSR[getCapVariableName(client)];
+              await MailerProvider.load({
+                id: `${host}${path}`,
+                meta: `mailer-${host}${path}`,
+                host,
+                path,
+                ...mailer,
+                templates: mailerSsrConf ? mailerSsrConf.mailer : {},
+              });
+            }
+            if (apis) {
+              const authMiddleware = authMiddlewareFactory({ host, path });
+
+              const apiPath = `${path === '/' ? '' : path}/${process.env.BASE_API}`;
+              for (const api of apis)
+                await (async () => {
+                  const { ApiRouter } = await import(`../api/${api}/${api}.router.js`);
+                  const router = ApiRouter({ host, path, apiPath, mailer, db, authMiddleware });
+                  // router.use(cors({ origin: origins }));
+                  // logger.info('Load api router', { host, path: apiPath, api });
+                  app.use(`${apiPath}/${api}`, router);
+                })();
+            }
+
+            // load ssr
+            const ssr = await ssrMiddlewareFactory({ app, directory, rootHostPath, path });
+            for (const [_, ssrMiddleware] of Object.entries(ssr)) app.use(ssrMiddleware);
 
-            const apiPath = `${path === '/' ? '' : path}/${process.env.BASE_API}`;
-            for (const api of apis)
+            if (ws)
               await (async () => {
-                const { ApiRouter } = await import(`../api/${api}/${api}.router.js`);
-                const router = ApiRouter({ host, path, apiPath, mailer, db, authMiddleware });
-                // router.use(cors({ origin: origins }));
-                // logger.info('Load api router', { host, path: apiPath, api });
-                app.use(`${apiPath}/${api}`, router);
+                const { createIoServer } = await import(`../ws/${ws}/${ws}.ws.server.js`);
+                // logger.info('Load socket.io ws router', { host, ws });
+                // start socket.io
+                const { options, meta } = await createIoServer(server, {
+                  host,
+                  path,
+                  db,
+                  port,
+                  origins,
+                });
+                await UnderpostStartUp.API.listenPortController(UnderpostStartUp.API.listenServerFactory(), port, {
+                  runtime: 'nodejs',
+                  client: null,
+                  host,
+                  path: options.path,
+                  meta,
+                });
               })();
-          }
-
-          // load ssr
-          const ssr = await ssrMiddlewareFactory({ app, directory, rootHostPath, path });
-          for (const [_, ssrMiddleware] of Object.entries(ssr)) app.use(ssrMiddleware);
 
-          // instance server
-          const server = createServer({}, app);
-
-          if (ws)
-            await (async () => {
-              const { createIoServer } = await import(`../ws/${ws}/${ws}.ws.server.js`);
-              // logger.info('Load socket.io ws router', { host, ws });
-              // start socket.io
-              const { options, meta } = await createIoServer(server, {
+            if (peer) {
+              const peerPort = newInstance(currentPort);
+              const { options, meta, peerServer } = await createPeerServer({
+                port: peerPort,
+                devPort: port,
+                origins,
                 host,
                 path,
-                db,
-                port,
-                origins,
               });
-              await UnderpostStartUp.API.listenPortController(UnderpostStartUp.API.listenServerFactory(), port, {
+
+              await UnderpostStartUp.API.listenPortController(peerServer, peerPort, {
                 runtime: 'nodejs',
                 client: null,
                 host,
                 path: options.path,
                 meta,
               });
-            })();
-
-          if (peer) {
-            currentPort++;
-            const peerPort = newInstance(currentPort);
-            const { options, meta, peerServer } = await createPeerServer({
-              port: peerPort,
-              devPort: port,
-              origins,
-              host,
-              path,
-            });
-
-            await UnderpostStartUp.API.listenPortController(peerServer, peerPort, {
-              runtime: 'nodejs',
-              client: null,
-              host,
-              path: options.path,
-              meta,
-            });
+            }
           }
 
           await UnderpostStartUp.API.listenPortController(server, port, runningData);