underpost 2.8.872 → 2.8.873

package/.env.development

@@ -3,7 +3,8 @@ DEFAULT_DEPLOY_ID=dd-default
 NODE_ENV=development
 PORT=4000
 JWT_SECRET=test
-EXPIRE=168
+REFRESH_EXPIRE_MINUTES=5
+ACCESS_EXPIRE_MINUTES=1440
 NODE_OPTIONS=--max-old-space-size=8192
 BASE_API=api
 DEFAULT_DEPLOY_HOST=default.net

package/.env.production

@@ -3,7 +3,8 @@ DEFAULT_DEPLOY_ID=dd-default
 NODE_ENV=production
 PORT=3000
 JWT_SECRET=test
-EXPIRE=168
+REFRESH_EXPIRE_MINUTES=5
+ACCESS_EXPIRE_MINUTES=1440
 NODE_OPTIONS=--max-old-space-size=8192
 BASE_API=api
 DEFAULT_DEPLOY_HOST=default.net

package/.env.test

@@ -3,7 +3,8 @@ DEFAULT_DEPLOY_ID=dd-default
 NODE_ENV=test
 PORT=5000
 JWT_SECRET=test
-EXPIRE=168
+REFRESH_EXPIRE_MINUTES=5
+ACCESS_EXPIRE_MINUTES=1440
 NODE_OPTIONS=--max-old-space-size=8192
 BASE_API=api
 DEFAULT_DEPLOY_HOST=default.net

package/.github/workflows/ghpkg.ci.yml

@@ -14,7 +14,7 @@ jobs:
     name: Update github repo package Jobs
     runs-on: ubuntu-latest
     container:
-      image: rockylinux/rockylinux:9
+      image: quay.io/rockylinux/rockylinux:9
     permissions:
       contents: write
       packages: write

package/.github/workflows/npmpkg.ci.yml

@@ -14,7 +14,7 @@ jobs:
     name: Update npm repo package Jobs
     runs-on: ubuntu-latest
     container:
-      image: rockylinux/rockylinux:9
+      image: quay.io/rockylinux/rockylinux:9
     permissions:
       contents: write
       packages: write

package/.github/workflows/pwa-microservices-template-page.cd.yml

@@ -30,7 +30,7 @@ jobs:
       url: ${{ steps.deployment.outputs.page_url }}
     runs-on: ubuntu-latest
     container:
-      image: rockylinux/rockylinux:9
+      image: quay.io/rockylinux/rockylinux:9
     steps:
       - name: Checkout
         uses: actions/checkout@v4

package/.github/workflows/pwa-microservices-template-test.ci.yml

@@ -7,7 +7,7 @@ jobs:
     name: Template Test
     runs-on: ubuntu-latest
     container:
-      image: rockylinux/rockylinux:9
+      image: quay.io/rockylinux/rockylinux:9
       options: --entrypoint /bin/bash
     steps:
       - name: Clone repository

package/.github/workflows/release.cd.yml

@@ -2,7 +2,7 @@ name: CD | Release deployment | remote ssh
 
 on:
   workflow_run:
-    workflows: ['CI | Publish npm package']
+    workflows: ["CI | Publish npm package"]
     types:
       - completed
 
@@ -34,6 +34,4 @@ jobs:
             node bin run --dev pull
             underpost run secret
             underpost run underpost-config
-            underpost run ssh-deploy engine-core
-            underpost run ssh-deploy engine-lampp
-            underpost run ssh-deploy engine-cyberia
+            underpost run ssh-deploy engine-test

package/README.md

@@ -31,6 +31,16 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -45,7 +55,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.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.872)](https://socket.dev/npm/package/underpost/overview/2.8.872) [![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.873)](https://socket.dev/npm/package/underpost/overview/2.8.873) [![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 -->
@@ -65,6 +75,16 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -120,7 +140,7 @@ Run dev client server
 npm run dev
 ```
 <!-- -->
-## underpost ci/cd cli v2.8.872
+## underpost ci/cd cli v2.8.873
 
 ### Usage: `underpost [options] [command]`
   ```

package/bin/build.js

@@ -191,6 +191,10 @@ const { DefaultConf } = await import(`../conf.${confName}.js`);
   fs.copyFileSync(`./.github/workflows/${repoName}.ci.yml`, `${basePath}/.github/workflows/${repoName}.ci.yml`);
   fs.copyFileSync(`./.github/workflows/${repoName}.cd.yml`, `${basePath}/.github/workflows/${repoName}.cd.yml`);
 
+  fs.copyFileSync(`./conf.${confName}.js`, `${basePath}/conf.js`);
+  fs.copyFileSync(`./manifests/deployment/${confName}-development/proxy.yaml`, `${basePath}/proxy.yaml`);
+  fs.copyFileSync(`./manifests/deployment/${confName}-development/deployment.yaml`, `${basePath}/deployment.yaml`);
+
   if (fs.existsSync(`./src/ws/${confName.split('-')[1]}`)) {
     fs.copySync(`./src/ws/${confName.split('-')[1]}`, `${basePath}/src/ws/${confName.split('-')[1]}`);
   }

package/bin/deploy.js

@@ -372,6 +372,7 @@ try {
       shellExec(`node bin run kill 4002`);
       shellExec(`node bin run kill 4003`);
       shellExec(`npm run update-template`);
+      shellExec(`cd ../pwa-microservices-template && npm install`);
       shellExec(`cd ../pwa-microservices-template && npm run build && timeout 5s npm run dev`, {
         async: true,
       });
@@ -448,6 +449,9 @@ try {
       shellExec(
         `node bin deploy --kubeadm --build-manifest --sync --info-router --replicas 1 --node ${node} dd production`,
       );
+      shellExec(
+        `node bin deploy --kubeadm --build-manifest --sync --info-router --replicas 1 --node ${node} dd development `,
+      );
       for (const deployId of fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8').split(`,`)) {
         fs.copySync(
           `./engine-private/conf/${deployId}/build/development/deployment.yaml`,

package/cli.md

@@ -1,4 +1,4 @@
-## underpost ci/cd cli v2.8.872
+## underpost ci/cd cli v2.8.873
 
 ### Usage: `underpost [options] [command]`
   ```
@@ -298,6 +298,7 @@ Options:
                                     secrets.
   --replicas <replicas>             Sets a custom number of replicas for
                                     deployments.
+  --image <image>                   Sets a custom image for deployments.
   --versions <deployment-versions>  A comma-separated list of custom deployment
                                     versions.
   --traffic <traffic-versions>      A comma-separated list of custom deployment
@@ -599,7 +600,7 @@ Options:
 Runs a script from the specified path.
 
 Arguments:
-  runner-id                                The runner ID to run. Options: spark-template, rmi, kill, secret, underpost-config, gpu-env, tf-gpu-test, dev-cluster, ssh-cluster-info, cyberia-ide, engine-ide, template-deploy, clean, pull, release-deploy, ssh-deploy, ide, dev-client, dev-api, router-sync, monitor, db-client, promote, metrics, cluster, deploy, tf-vae-test, deploy-job.
+  runner-id                                The runner ID to run. Options: spark-template, rmi, kill, secret, underpost-config, gpu-env, tf-gpu-test, dev-cluster, ssh-cluster-info, cyberia-ide, engine-ide, template-deploy, clean, pull, release-deploy, ssh-deploy, ide, dev-client, dev-api, sync, ls-deployments, monitor, db-client, promote, metrics, cluster, deploy, tf-vae-test, deploy-job.
   path                                     The absolute or relative directory path where the script is located.
 
 Options:

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

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

@@ -0,0 +1,138 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: dd-test-development-blue
+  labels:
+    app: dd-test-development-blue
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: dd-test-development-blue
+  template:
+    metadata:
+      labels:
+        app: dd-test-development-blue
+    spec:
+      containers:
+        - name: dd-test-development-blue
+          image: localhost/rockylinux9-underpost:v2.8.873
+#          resources:
+#            requests:
+#              memory: "96294Ki"
+#              cpu: "75m"
+#            limits:
+#              memory: "1540709Ki"
+#              cpu: "1200m"
+          command:
+            - /bin/sh
+            - -c
+            - >
+              npm install -g npm@11.2.0 &&
+              npm install -g underpost &&
+              underpost secret underpost --create-from-file /etc/config/.env.development &&
+              underpost start --build --run dd-test development
+          volumeMounts:
+            - name: config-volume
+              mountPath: /etc/config
+      volumes:
+        - name: config-volume
+          configMap:
+            name: underpost-config
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: dd-test-development-blue-service
+spec:
+  selector:
+    app: dd-test-development-blue
+  ports:
+    - name: 'tcp-4021'
+      protocol: TCP
+      port: 4021
+      targetPort: 4021
+    - name: 'udp-4021'
+      protocol: UDP
+      port: 4021
+      targetPort: 4021
+
+    - name: 'tcp-4022'
+      protocol: TCP
+      port: 4022
+      targetPort: 4022
+    - name: 'udp-4022'
+      protocol: UDP
+      port: 4022
+      targetPort: 4022
+  type: LoadBalancer
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: dd-test-development-green
+  labels:
+    app: dd-test-development-green
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: dd-test-development-green
+  template:
+    metadata:
+      labels:
+        app: dd-test-development-green
+    spec:
+      containers:
+        - name: dd-test-development-green
+          image: localhost/rockylinux9-underpost:v2.8.873
+#          resources:
+#            requests:
+#              memory: "96294Ki"
+#              cpu: "75m"
+#            limits:
+#              memory: "1540709Ki"
+#              cpu: "1200m"
+          command:
+            - /bin/sh
+            - -c
+            - >
+              npm install -g npm@11.2.0 &&
+              npm install -g underpost &&
+              underpost secret underpost --create-from-file /etc/config/.env.development &&
+              underpost start --build --run dd-test development
+          volumeMounts:
+            - name: config-volume
+              mountPath: /etc/config
+      volumes:
+        - name: config-volume
+          configMap:
+            name: underpost-config
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: dd-test-development-green-service
+spec:
+  selector:
+    app: dd-test-development-green
+  ports:
+    - name: 'tcp-4021'
+      protocol: TCP
+      port: 4021
+      targetPort: 4021
+    - name: 'udp-4021'
+      protocol: UDP
+      port: 4021
+      targetPort: 4021
+
+    - name: 'tcp-4022'
+      protocol: TCP
+      port: 4022
+      targetPort: 4022
+    - name: 'udp-4022'
+      protocol: UDP
+      port: 4022
+      targetPort: 4022
+  type: LoadBalancer

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

@@ -0,0 +1,26 @@
+
+---
+apiVersion: projectcontour.io/v1
+kind: HTTPProxy
+metadata:
+  name: test.nexodev.org
+spec:
+  virtualhost:
+    fqdn: test.nexodev.org
+  routes:
+    - conditions:
+        - prefix: /
+      enableWebsockets: true
+      services:
+        - name: dd-test-development-blue-service
+          port: 4021
+          weight: 100
+    
+    - conditions:
+        - prefix: /peer
+      enableWebsockets: true
+      services:
+        - name: dd-test-development-blue-service
+          port: 4022
+          weight: 100
+    

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.8.872",
+    "version": "2.8.873",
     "description": "pwa api rest template",
     "scripts": {
         "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",
@@ -63,6 +63,7 @@
         "colors": "^1.4.0",
         "commander": "^12.1.0",
         "compression": "^1.7.4",
+        "cookie-parser": "^1.4.7",
         "cors": "^2.8.5",
         "d3": "^7.9.0",
         "dotenv": "^16.3.1",
@@ -70,9 +71,12 @@
         "env-cmd": "^10.1.0",
         "express": "^4.18.2",
         "express-fileupload": "^1.4.3",
+        "express-rate-limit": "^8.1.0",
+        "express-slow-down": "^3.0.0",
         "favicons": "^7.2.0",
         "fs-extra": "^11.1.1",
         "fullcalendar": "^6.1.15",
+        "helmet": "^8.1.0",
         "html-minifier-terser": "^7.2.0",
         "http-proxy-middleware": "^2.0.6",
         "ignore-walk": "^6.0.4",

package/src/api/core/core.router.js

@@ -1,4 +1,4 @@
-import { adminGuard, authMiddleware } from '../../server/auth.js';
+import { adminGuard } from '../../server/auth.js';
 import { loggerFactory } from '../../server/logger.js';
 import { CoreController } from './core.controller.js';
 import express from 'express';
@@ -7,6 +7,7 @@ const logger = loggerFactory(import.meta);
 
 const CoreRouter = (options) => {
   const router = express.Router();
+  const authMiddleware = options.authMiddleware;
   router.post(`/:id`, authMiddleware, adminGuard, async (req, res) => await CoreController.post(req, res, options));
   router.post(`/`, authMiddleware, adminGuard, async (req, res) => await CoreController.post(req, res, options));
   router.get(`/:id`, authMiddleware, adminGuard, async (req, res) => await CoreController.get(req, res, options));

package/src/api/default/default.controller.js

@@ -21,7 +21,12 @@ const DefaultController = {
   },
   get: async (req, res, options) => {
     try {
-      const result = await DefaultService.get(req, res, options);
+      const { page, limit } = req.query;
+      const result = await DefaultService.get(
+        { ...req, query: { ...req.query, page: parseInt(page), limit: parseInt(limit) } },
+        res,
+        options,
+      );
       return res.status(200).json({
         status: 'success',
         data: result,

package/src/api/default/default.router.js

@@ -1,4 +1,3 @@
-import { authMiddleware } from '../../server/auth.js';
 import { loggerFactory } from '../../server/logger.js';
 import { DefaultController } from './default.controller.js';
 import express from 'express';
@@ -7,9 +6,14 @@ const logger = loggerFactory(import.meta);
 
 const DefaultRouter = (options) => {
   const router = express.Router();
+  const authMiddleware = options.authMiddleware;
   router.post(`/:id`, async (req, res) => await DefaultController.post(req, res, options));
   router.post(`/`, async (req, res) => await DefaultController.post(req, res, options));
-  router.get(`/:id`, async (req, res) => await DefaultController.get(req, res, options));
+  router.get(
+    `/:id`,
+    // authMiddleware,
+    async (req, res) => await DefaultController.get(req, res, options),
+  );
   router.get(`/`, async (req, res) => await DefaultController.get(req, res, options));
   router.put(`/:id`, async (req, res) => await DefaultController.put(req, res, options));
   router.put(`/`, async (req, res) => await DefaultController.put(req, res, options));

package/src/api/default/default.service.js

@@ -13,7 +13,16 @@ const DefaultService = {
     /** @type {import('./default.model.js').DefaultModel} */
     const Default = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.Default;
     if (req.params.id) return await Default.findById(req.params.id);
-    return await Default.find();
+    const { query, page = 1, limit = 10, sort = { updatedAt: -1 } } = req.query;
+    const queryPayload = query ? JSON.parse(query) : {};
+    const skip = (page - 1) * limit;
+    const [data, total] = await Promise.all([
+      Default.find(queryPayload).sort(sort).limit(limit).skip(skip),
+      Default.countDocuments(queryPayload),
+    ]);
+
+    const totalPages = Math.ceil(total / limit);
+    return { data, total, page, totalPages };
   },
   put: async (req, res, options) => {
     /** @type {import('./default.model.js').DefaultModel} */

package/src/api/file/file.router.js

@@ -1,4 +1,4 @@
-import { adminGuard, authMiddleware } from '../../server/auth.js';
+import { adminGuard } from '../../server/auth.js';
 import { loggerFactory } from '../../server/logger.js';
 import { FileController } from './file.controller.js';
 import express from 'express';
@@ -6,6 +6,7 @@ const logger = loggerFactory(import.meta);
 
 const FileRouter = (options) => {
   const router = express.Router();
+  const authMiddleware = options.authMiddleware;
   router.post(`/:id`, authMiddleware, async (req, res) => await FileController.post(req, res, options));
   router.post(`/`, authMiddleware, async (req, res) => await FileController.post(req, res, options));
   router.get(`/blob/:id`, async (req, res) => await FileController.get(req, res, options));

package/src/api/test/test.router.js

@@ -1,4 +1,3 @@
-import { authMiddleware } from '../../server/auth.js';
 import { loggerFactory } from '../../server/logger.js';
 import { TestController } from './test.controller.js';
 import express from 'express';
@@ -7,6 +6,7 @@ const logger = loggerFactory(import.meta);
 
 const TestRouter = (options) => {
   const router = express.Router();
+  const authMiddleware = options.authMiddleware;
   router.post(`/:id`, async (req, res) => await TestController.post(req, res, options));
   router.post(`/`, authMiddleware, async (req, res) => await TestController.post(req, res, options));
   router.get(`/:id`, async (req, res) => await TestController.get(req, res, options));