underpost 2.8.878 → 2.8.882

package/.env.development

@@ -1,13 +1,45 @@
 DEPLOY_ID=dd-default
-DEFAULT_DEPLOY_ID=dd-default
 NODE_ENV=development
 PORT=4000
 JWT_SECRET=test
 REFRESH_EXPIRE_MINUTES=5
 ACCESS_EXPIRE_MINUTES=1440
 NODE_OPTIONS=--max-old-space-size=8192
-BASE_API=api
+TIME_ZONE=changethis
+GITHUB_TOKEN=changethis
+GITHUB_USERNAME=changethis
+GITHUB_BACKUP_REPO=changethis
+GITHUB_DNS_REPO=changethis
+DEFAULT_DEPLOY_ID=dd-default
 DEFAULT_DEPLOY_HOST=default.net
 DEFAULT_DEPLOY_PATH=/
+MARIADB_HOST=changethis
+MARIADB_USER=changethis
+MARIADB_PASSWORD=changethis
+DD_LAMPP_TEST_DB_0=changethis
+WIFI=changethis
+ROUTER=changethis
+CLOUDINARY_CLOUD_NAME=changethis
+CLOUDINARY_API_KEY=changethis
+CLOUDINARY_API_SECRET=changethis
+DB_PG_MAAS_NAME=changethis
+DB_PG_MAAS_PASS=changethis
+DB_PG_MAAS_USER=changethis
+DB_PG_MAAS_HOST=127.0.0.1
+DB_PG_MAAS_PORT=5432
+MAAS_ADMIN_USERNAME=changethis
+MAAS_API_KEY=changethis
+MAAS_ADMIN_EMAIL=admin@default.net
+MAAS_ADMIN_PASS=changethis
+TFTP_ROOT=changethis
+NETMASK=255.255.255.0
+RPI4_INTERFACE_NAME=changethis
+RPI4_IP=192.168.1.192
+MAAS_DNS=8.8.8.8
+MAAS_NTP_SERVER=changethis
+NFS_EXPORT_PATH=changethis
+RPI4_MAC_ADDRESS=changethis
+NVIDIA_API_KEY=changethis
 DEFAULT_ADMIN_EMAIL=admin@default.net
-DEFAULT_ADMIN_PASSWORD=changethis
+DEFAULT_ADMIN_PASSWORD=changethis
+BASE_API=api

package/.env.production

@@ -1,13 +1,50 @@
 DEPLOY_ID=dd-default
-DEFAULT_DEPLOY_ID=dd-default
 NODE_ENV=production
 PORT=3000
 JWT_SECRET=test
 REFRESH_EXPIRE_MINUTES=5
 ACCESS_EXPIRE_MINUTES=1440
 NODE_OPTIONS=--max-old-space-size=8192
-BASE_API=api
+TIME_ZONE=changethis
+GITHUB_TOKEN=changethis
+GITHUB_USERNAME=changethis
+GITHUB_BACKUP_REPO=changethis
+GITHUB_DNS_REPO=changethis
+DEFAULT_DEPLOY_ID=dd-default
 DEFAULT_DEPLOY_HOST=default.net
 DEFAULT_DEPLOY_PATH=/
+MARIADB_HOST=changethis
+MARIADB_USER=changethis
+MARIADB_PASSWORD=changethis
+DD_LAMPP_TEST_DB_0=changethis
+WIFI=changethis
+ROUTER=changethis
+CLOUDINARY_CLOUD_NAME=changethis
+CLOUDINARY_API_KEY=changethis
+CLOUDINARY_API_SECRET=changethis
+DB_PG_MAAS_NAME=changethis
+DB_PG_MAAS_PASS=changethis
+DB_PG_MAAS_USER=changethis
+DB_PG_MAAS_HOST=127.0.0.1
+DB_PG_MAAS_PORT=5432
+MAAS_ADMIN_USERNAME=changethis
+MAAS_API_KEY=changethis
+MAAS_ADMIN_EMAIL=admin@default.net
+MAAS_ADMIN_PASS=changethis
+TFTP_ROOT=changethis
+NETMASK=255.255.255.0
+RPI4_INTERFACE_NAME=changethis
+RPI4_IP=192.168.1.192
+MAAS_DNS=8.8.8.8
+MAAS_NTP_SERVER=changethis
+NFS_EXPORT_PATH=changethis
+RPI4_MAC_ADDRESS=changethis
+NVIDIA_API_KEY=changethis
 DEFAULT_ADMIN_EMAIL=admin@default.net
-DEFAULT_ADMIN_PASSWORD=changethis
+DEFAULT_ADMIN_PASSWORD=changethis
+DEFAULT_SSH_USER=changethis
+DEFAULT_SSH_HOST=changethis
+DEFAULT_SSH_KEY_PATH=changethis
+BASE_API=api
+CERTBOT_LIVE_PATH=changethis
+CERTBOT_LIVE_PATH_WINDOWS=changethis

package/.env.test

@@ -1,13 +1,45 @@
 DEPLOY_ID=dd-default
-DEFAULT_DEPLOY_ID=dd-default
 NODE_ENV=test
 PORT=5000
 JWT_SECRET=test
 REFRESH_EXPIRE_MINUTES=5
 ACCESS_EXPIRE_MINUTES=1440
 NODE_OPTIONS=--max-old-space-size=8192
-BASE_API=api
+TIME_ZONE=changethis
+GITHUB_TOKEN=changethis
+GITHUB_USERNAME=changethis
+GITHUB_BACKUP_REPO=changethis
+GITHUB_DNS_REPO=changethis
+DEFAULT_DEPLOY_ID=dd-default
 DEFAULT_DEPLOY_HOST=default.net
 DEFAULT_DEPLOY_PATH=/
+MARIADB_HOST=changethis
+MARIADB_USER=changethis
+MARIADB_PASSWORD=changethis
+DD_LAMPP_TEST_DB_0=changethis
+WIFI=changethis
+ROUTER=changethis
+CLOUDINARY_CLOUD_NAME=changethis
+CLOUDINARY_API_KEY=changethis
+CLOUDINARY_API_SECRET=changethis
+DB_PG_MAAS_NAME=changethis
+DB_PG_MAAS_PASS=changethis
+DB_PG_MAAS_USER=changethis
+DB_PG_MAAS_HOST=127.0.0.1
+DB_PG_MAAS_PORT=5432
+MAAS_ADMIN_USERNAME=changethis
+MAAS_API_KEY=changethis
+MAAS_ADMIN_EMAIL=admin@default.net
+MAAS_ADMIN_PASS=changethis
+TFTP_ROOT=changethis
+NETMASK=255.255.255.0
+RPI4_INTERFACE_NAME=changethis
+RPI4_IP=192.168.1.192
+MAAS_DNS=8.8.8.8
+MAAS_NTP_SERVER=changethis
+NFS_EXPORT_PATH=changethis
+RPI4_MAC_ADDRESS=changethis
+NVIDIA_API_KEY=changethis
 DEFAULT_ADMIN_EMAIL=admin@default.net
-DEFAULT_ADMIN_PASSWORD=changethis
+DEFAULT_ADMIN_PASSWORD=changethis
+BASE_API=api

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
 
@@ -31,7 +31,7 @@ jobs:
             cd /home/dd/engine
             npm install -g underpost
             underpost run secret
-            node bin run --dev pull
+            underpost run pull
             underpost run secret
-            underpost run underpost-config
+            underpost cmt . --empty ci docker-image-engine
             underpost run ssh-deploy engine-test

package/README.md

@@ -50,6 +50,15 @@
 
 
 
+
+
+
+
+
+
+
+
+
 
 
 
@@ -63,7 +72,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.878)](https://socket.dev/npm/package/underpost/overview/2.8.878) [![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.882)](https://socket.dev/npm/package/underpost/overview/2.8.882) [![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 -->
@@ -102,6 +111,15 @@
 
 
 
+
+
+
+
+
+
+
+
+
 
 
 
@@ -156,7 +174,7 @@ Run dev client server
 npm run dev
 ```
 <!-- -->
-## underpost ci/cd cli v2.8.878
+## underpost ci/cd cli v2.8.882
 
 ### Usage: `underpost [options] [command]`
   ```

package/bin/deploy.js

@@ -469,6 +469,7 @@ try {
       shellExec(`node bin new --deploy-id dd-default`);
       console.log(fs.existsSync(`./engine-private/conf/dd-default`));
       shellExec(`sudo rm -rf ./engine-private/conf/dd-default`);
+      shellExec(`node bin/deploy build-env`);
       break;
     }
 
@@ -535,6 +536,45 @@ ${shellExec(`git log | grep Author: | sort -u`, { stdout: true }).split(`\n`).jo
 
       break;
     }
+    case 'build-env': {
+      const buildEnv = (privateEnvPath, originEnv, env) => {
+        const privateEnv = dotenv.parse(fs.readFileSync(privateEnvPath, 'utf8'));
+        for (const key of Object.keys(privateEnv)) {
+          if (key in env) {
+            console.warn(`Key ${key} already exists in origin env`);
+            continue;
+          }
+          if (key in originEnv) {
+            console.warn(`Key ${key} already exists in origin env`);
+            env[key] = originEnv[key];
+            continue;
+          }
+          env[key] =
+            `${key}`.toUpperCase().match('API') ||
+            `${key}`.toUpperCase().match('KEY') ||
+            `${key}`.toUpperCase().match('SECRET') ||
+            `${key}`.toUpperCase().match('TOKEN') ||
+            `${key}`.toUpperCase().match('PASSWORD') ||
+            `${key}`.toUpperCase().match('MAC')
+              ? 'changethis'
+              : isNaN(parseFloat(privateEnv[key]))
+              ? `${privateEnv[key]}`.match(`@`)
+                ? 'admin@default.net'
+                : 'changethis'
+              : privateEnv[key];
+        }
+        return env;
+      };
+      for (let envPath of ['.env.development', '.env.production', '.env.test']) {
+        const originEnv = dotenv.parse(fs.readFileSync(`./${envPath}`, 'utf8'));
+
+        let env = {};
+        env = buildEnv(`./engine-private/conf/dd-cron/${envPath}`, originEnv, env);
+        env = buildEnv(`./engine-private/conf/dd-core/${envPath}`, originEnv, env);
+        writeEnv(envPath, env);
+      }
+      break;
+    }
 
     case 'update-default-conf': {
       const defaultServer = DefaultConf.server['default.net']['/'];

package/cli.md

@@ -1,4 +1,4 @@
-## underpost ci/cd cli v2.8.878
+## underpost ci/cd cli v2.8.882
 
 ### Usage: `underpost [options] [command]`
   ```
@@ -619,6 +619,8 @@ Options:
   --image-name <image-name>                Optional: Specifies the image name for test execution.
   --container-name <container-name>        Optional: Specifies the container name for test execution.
   --namespace <namespace>                  Optional: Specifies the namespace for test execution.
+  --kubeadm                                Flag to indicate Kubeadm cluster type context
+  --k3s                                    Flag to indicate K3s cluster type context
   -h, --help                               display help for command
  
 ```

package/conf.js

@@ -64,6 +64,7 @@ const DefaultConf = /**/ {
           '404',
           '500',
           'Pagination',
+          'windowGetDimensions',
         ],
         default: [
           'MenuDefault',
@@ -92,6 +93,16 @@ const DefaultConf = /**/ {
         { path: '/default-management', client: 'Default', ssr: 'Default' },
         { client: 'Default', ssr: 'Default', path: '/404', title: '404 Not Found' },
         { client: 'Default', ssr: 'Default', path: '/500', title: '500 Server Error' },
+        {
+          path: '/blog',
+          client: 'Default',
+          ssr: 'Default',
+        },
+        {
+          path: '/chat',
+          client: 'Default',
+          ssr: 'Default',
+        },
       ],
       dists: [
         {
@@ -108,7 +119,22 @@ const DefaultConf = /**/ {
           import_name_build: '/dist/sortablejs/sortable.complete.esm.js',
         },
         { folder: './node_modules/validator', public_folder: '/dist/validator' },
-        { folder: './node_modules/@loadingio/css-spinner/entries', public_folder: '/dist/loadingio' },
+        {
+          folder: './node_modules/easymde/dist',
+          public_folder: '/dist/easymde',
+        },
+        {
+          folder: './node_modules/marked/lib',
+          public_folder: '/dist/marked',
+          import_name: 'marked',
+          import_name_build: '/dist/marked/marked.esm.js',
+        },
+        {
+          folder: './node_modules/vanilla-jsoneditor/standalone.js',
+          public_folder: '/dist/vanilla-jsoneditor/standalone.js',
+          import_name: 'vanilla-jsoneditor',
+          import_name_build: '/dist/vanilla-jsoneditor/standalone.js',
+        },
         {
           import_name: 'ag-grid-community',
           import_name_build: '/dist/ag-grid-community/ag-grid-community.min.js',
@@ -125,7 +151,7 @@ const DefaultConf = /**/ {
         },
         { folder: './node_modules/peerjs/dist', public_folder: '/dist/peerjs' },
       ],
-      services: ['default', 'core', 'user', 'test', 'file'],
+      services: ['default', 'core', 'user', 'test', 'file', 'document'],
     },
   },
   ssr: {
@@ -145,7 +171,7 @@ const DefaultConf = /**/ {
       '/': {
         client: 'default',
         runtime: 'nodejs',
-        apis: ['default', 'core', 'user', 'test', 'file'],
+        apis: ['default', 'core', 'user', 'test', 'file', 'document'],
         origins: [],
         minifyBuild: false,
         iconsBuild: false,

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.878
+          image: localhost/rockylinux9-underpost:v2.8.882
           #          resources:
           #            requests:
           #              memory: "124Ki"
@@ -100,7 +100,7 @@ spec:
     spec:
       containers:
         - name: dd-default-development-green
-          image: localhost/rockylinux9-underpost:v2.8.878
+          image: localhost/rockylinux9-underpost:v2.8.882
           #          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.878
+          image: localhost/rockylinux9-underpost:v2.8.882
 #          resources:
 #            requests:
-#              memory: "94Ki"
+#              memory: "96294Ki"
 #              cpu: "75m"
 #            limits:
-#              memory: "1504Ki"
+#              memory: "1540709Ki"
 #              cpu: "1200m"
           command:
             - /bin/sh
@@ -104,13 +104,13 @@ spec:
     spec:
       containers:
         - name: dd-test-development-green
-          image: localhost/rockylinux9-underpost:v2.8.878
+          image: localhost/rockylinux9-underpost:v2.8.882
 #          resources:
 #            requests:
-#              memory: "94Ki"
+#              memory: "96294Ki"
 #              cpu: "75m"
 #            limits:
-#              memory: "1504Ki"
+#              memory: "1540709Ki"
 #              cpu: "1200m"
           command:
             - /bin/sh

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.8.878",
+    "version": "2.8.882",
     "description": "pwa api rest template",
     "scripts": {
         "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",
@@ -51,7 +51,6 @@
     "dependencies": {
         "@fortawesome/fontawesome-free": "^6.4.2",
         "@fullcalendar/rrule": "^6.1.15",
-        "@loadingio/css-spinner": "^2.0.2",
         "@neodrag/vanilla": "^2.0.3",
         "adm-zip": "^0.5.10",
         "ag-grid-community": "^31.3.4",

package/src/api/document/document.controller.js

@@ -0,0 +1,66 @@
+import { loggerFactory } from '../../server/logger.js';
+import { DocumentService } from './document.service.js';
+const logger = loggerFactory(import.meta);
+
+const DocumentController = {
+  post: async (req, res, options) => {
+    try {
+      return res.status(200).json({
+        status: 'success',
+        data: await DocumentService.post(req, res, options),
+      });
+    } catch (error) {
+      logger.error(error, error.stack);
+      return res.status(400).json({
+        status: 'error',
+        message: error.message,
+      });
+    }
+  },
+  get: async (req, res, options) => {
+    try {
+      return res.status(200).json({
+        status: 'success',
+        data: await DocumentService.get(req, res, options),
+      });
+    } catch (error) {
+      logger.error(error, error.stack);
+      return res.status(400).json({
+        status: 'error',
+        message: error.message,
+      });
+    }
+  },
+  delete: async (req, res, options) => {
+    try {
+      const result = await DocumentService.delete(req, res, options);
+      return res.status(200).json({
+        status: 'success',
+        data: result,
+      });
+    } catch (error) {
+      logger.error(error, error.stack);
+      return res.status(400).json({
+        status: 'error',
+        message: error.message,
+      });
+    }
+  },
+  put: async (req, res, options) => {
+    try {
+      const result = await DocumentService.put(req, res, options);
+      return res.status(200).json({
+        status: 'success',
+        data: result,
+      });
+    } catch (error) {
+      logger.error(error, error.stack);
+      return res.status(400).json({
+        status: 'error',
+        message: error.message,
+      });
+    }
+  },
+};
+
+export { DocumentController };

package/src/api/document/document.model.js

@@ -0,0 +1,51 @@
+import { Schema, model, Types } from 'mongoose';
+
+// https://mongoosejs.com/docs/2.7.x/docs/schematypes.html
+
+const DocumentSchema = new Schema(
+  {
+    userId: {
+      type: Schema.Types.ObjectId,
+      ref: 'User',
+    },
+    location: { type: String },
+    title: { type: String },
+    tags: [{ type: String }],
+    fileId: {
+      type: Schema.Types.ObjectId,
+      ref: 'File',
+    },
+    mdFileId: {
+      type: Schema.Types.ObjectId,
+      ref: 'File',
+    },
+  },
+  {
+    timestamps: true,
+  },
+);
+
+const DocumentModel = model('Document', DocumentSchema);
+
+const ProviderSchema = DocumentSchema;
+
+const DocumentDto = {
+  populate: {
+    file: () => {
+      return {
+        path: 'fileId',
+        model: 'File',
+        select: '_id name mimetype',
+      };
+    },
+    user: () => {
+      return {
+        path: 'userId',
+        model: 'User',
+        select: '_id email username',
+      };
+    },
+  },
+};
+
+export { DocumentSchema, DocumentModel, ProviderSchema, DocumentDto };

package/src/api/document/document.router.js

@@ -0,0 +1,24 @@
+import { loggerFactory } from '../../server/logger.js';
+import { DocumentController } from './document.controller.js';
+import express from 'express';
+import fs from 'fs-extra';
+const logger = loggerFactory(import.meta);
+
+const DocumentRouter = (options) => {
+  const router = express.Router();
+  const authMiddleware = options.authMiddleware;
+  router.post(`/:id`, authMiddleware, async (req, res) => await DocumentController.post(req, res, options));
+  router.post(`/`, authMiddleware, async (req, res) => await DocumentController.post(req, res, options));
+  router.get(`/public`, async (req, res) => await DocumentController.get(req, res, options));
+  router.get(`/:id`, authMiddleware, async (req, res) => await DocumentController.get(req, res, options));
+  router.get(`/`, authMiddleware, async (req, res) => await DocumentController.get(req, res, options));
+  router.put(`/:id`, authMiddleware, async (req, res) => await DocumentController.put(req, res, options));
+  router.put(`/`, authMiddleware, async (req, res) => await DocumentController.put(req, res, options));
+  router.delete(`/:id`, authMiddleware, async (req, res) => await DocumentController.delete(req, res, options));
+  router.delete(`/`, authMiddleware, async (req, res) => await DocumentController.delete(req, res, options));
+  return router;
+};
+
+const ApiRouter = DocumentRouter;
+
+export { ApiRouter, DocumentRouter };