@underpostnet/underpost 2.8.1 → 2.8.5

package/manifests/mariadb/service.yaml

@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: mariadb
+spec:
+  ports:
+    - port: 3306
+      targetPort: 3306
+  selector:
+    app: mariadb

package/manifests/mariadb/statefulset.yaml

@@ -0,0 +1,55 @@
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: mariadb-statefulset
+spec:
+  serviceName: mariadb
+  replicas: 1
+  selector:
+    matchLabels:
+      app: mariadb
+  template:
+    metadata:
+      labels:
+        app: mariadb
+    spec:
+      containers:
+        - name: mariadb
+          image: mariadb:latest
+          env:
+            - name: MYSQL_ROOT_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: mariadb-secret
+                  key: password
+            # - name: MYSQL_PASSWORD
+            #   valueFrom:
+            #     secretKeyRef:
+            #       name: mariadb-secret
+            #       key: password
+            # - name: MYSQL_USER
+            #   valueFrom:
+            #     secretKeyRef:
+            #       name: mariadb-secret
+            #       key: username
+            # - name: MYSQL_DATABASE
+            #   value: default
+          ports:
+            - containerPort: 3306
+          volumeMounts:
+            - mountPath: /var/lib/mysql
+              name: mariadb-storage
+      #       - mountPath: /etc/mysql/conf.d
+      #         name: config-volume
+      # volumes:
+      #   - name: config-volume
+      #     configMap:
+      #       name: mariadb-config
+  volumeClaimTemplates:
+    - metadata:
+        name: mariadb-storage
+      spec:
+        accessModes: ['ReadWriteOnce']
+        resources:
+          requests:
+            storage: 1Gi

package/manifests/mongodb/backup-access.yaml

@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: backup-access
+spec:
+  containers:
+    - name: busybox
+      image: busybox
+      command: ['sh', '-c', 'sleep 3600']
+      volumeMounts:
+        - name: backup-storage
+          mountPath: /backup
+  volumes:
+    - name: backup-storage
+      persistentVolumeClaim:
+        claimName: backup-pvc

package/manifests/mongodb/backup-cronjob.yaml

@@ -0,0 +1,42 @@
+apiVersion: batch/v1
+kind: CronJob
+metadata:
+  name: mongodb-backup
+spec:
+  schedule: '*/5 * * * *' # Runs backup every five minutes
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          containers:
+            - name: mongodump
+              image: docker.io/library/mongo:latest
+              command:
+                - sh
+                - -c
+                - |
+                  # Perform backup
+                  mongodump --host=mongodb-service --port=27017 --out=/backup/$(date +\%Y-\%m-\%dT\%H-\%M-\%S)
+                  # Remove backups older than 7 days
+                  find /backup -type d -mtime +7 -exec rm -rf {} +
+              volumeMounts:
+                - name: backup-storage
+                  mountPath: /backup
+          restartPolicy: Never
+          volumes:
+            - name: backup-storage
+              persistentVolumeClaim:
+                claimName: backup-pvc
+#     mongodump -u $MONGO_INITDB_ROOT_USERNAME -p $MONGO_INITDB_ROOT_PASSWORD --host=mongodb-service --port=27017 --out=/backup/$(date +\%Y-\%m-\%dT\%H-\%M-\%S)
+
+# env:
+#   - name: MONGO_INITDB_ROOT_USERNAME
+#     valueFrom:
+#       secretKeyRef:
+#         name: mongodb-secret
+#         key: username
+#   - name: MONGO_INITDB_ROOT_PASSWORD
+#     valueFrom:
+#       secretKeyRef:
+#         name: mongodb-secret
+#         key: password

package/manifests/mongodb/backup-pv-pvc.yaml

@@ -0,0 +1,22 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: backup-pv
+spec:
+  capacity:
+    storage: 5Gi
+  accessModes:
+    - ReadWriteOnce
+  hostPath:
+    path: /mnt/backup
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: backup-pvc
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 5Gi

package/manifests/mongodb/configmap.yaml

@@ -0,0 +1,26 @@
+# origin conf: /etc/mongod.conf
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: mongodb-config-file
+  namespace: default
+data:
+  mongod.conf: |
+    storage:
+      dbPath: /data/db
+    systemLog:
+      destination: file
+      logAppend: true
+      path: /var/log/mongodb/mongod.log
+    replication:
+      replSetName: rs0
+    net:
+      bindIp: 127.0.0.1
+      port: 27017
+    processManagement:
+      fork: true
+    setParameter:
+      enableLocalhostAuthBypass: false
+    security:
+      authorization: enabled
+      keyFile: /etc/mongodb-keyfile

package/manifests/mongodb/headless-service.yaml

@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: mongodb-service
+spec:
+  clusterIP: None
+  selector:
+    app: mongodb
+  ports:
+    - port: 27017

package/manifests/mongodb/kustomization.yaml

@@ -0,0 +1,11 @@
+---
+# kubectl apply -k core/.
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - pv-pvc.yaml
+  - headless-service.yaml
+  - statefulset.yaml
+  - backup-pv-pvc.yaml
+  - backup-cronjob.yaml
+  - backup-access.yaml

package/manifests/mongodb/pv-pvc.yaml

@@ -0,0 +1,23 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: mongodb-pv
+spec:
+  capacity:
+    storage: 5Gi
+  accessModes:
+    - ReadWriteOnce
+  hostPath:
+    path: /data/mongodb
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: mongodb-pvc
+spec:
+  storageClassName: ''
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 5Gi

package/manifests/mongodb/statefulset.yaml

@@ -0,0 +1,125 @@
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: mongodb # Specifies the name of the statefulset
+spec:
+  serviceName: 'mongodb-service' # Specifies the service to use
+  replicas: 2
+  selector:
+    matchLabels:
+      app: mongodb
+  template:
+    metadata:
+      labels:
+        app: mongodb
+    spec:
+      containers:
+        - name: mongodb
+          image: docker.io/library/mongo:latest
+          command:
+            - mongod
+            - '--replSet'
+            - 'rs0'
+            # - '--config'
+            # - '-f'
+            # - '/etc/mongod.conf'
+            # - '--auth'
+            # - '--clusterAuthMode'
+            # - 'keyFile'
+            # - '--keyFile'
+            # - '/etc/mongodb-keyfile'
+            # - '--interleave'
+            # - 'all'
+            # - '--wiredTigerCacheSizeGB'
+            # - '0.25'
+            # - '--setParameter'
+            # - 'authenticationMechanisms=SCRAM-SHA-1'
+            # - '--fork'
+            - '--logpath'
+            - '/var/log/mongodb/mongod.log'
+            - '--bind_ip_all'
+          # command: ['sh', '-c']
+          # args:
+          #   - |
+          #     mongod --replSet rs0 --bind_ip_all &
+          #     sleep 1000
+          #     if mongosh --host mongodb-0.mongodb-service:27017 --eval "rs.status()" | grep -q "not yet initialized"; then
+          #       mongosh --host mongodb-0.mongodb-service:27017 <<EOF
+          #       use admin;
+          #       rs.initiate({
+          #         _id: "rs0",
+          #         members: [
+          #           { _id: 0, host: "mongodb-0.mongodb-service:27017", priority: 1 },
+          #           { _id: 1, host: "mongodb-1.mongodb-service:27017", priority: 1 }
+          #         ]
+          #       });
+          #       db.getSiblingDB("admin").createUser({
+          #         user: process.env.MONGO_INITDB_ROOT_USERNAME,
+          #         pwd: process.env.MONGO_INITDB_ROOT_PASSWORD,
+          #         roles: [{ role: "userAdminAnyDatabase", db: "admin" }]
+          #       });
+          #       use default;
+          #       db.createUser(
+          #         {
+          #           user: process.env.MONGO_INITDB_ROOT_USERNAME,
+          #           pwd: process.env.MONGO_INITDB_ROOT_PASSWORD,
+          #           roles: [
+          #             { role: "read", db: "test" },
+          #             { role: "readWrite", db: "default" }
+          #           ]
+          #         }
+          #       );
+          #       EOF
+          #     fi
+          #     wait
+          ports:
+            - containerPort: 27017
+          volumeMounts:
+            - name: mongodb-storage
+              mountPath: /data/db
+            - name: keyfile
+              mountPath: /etc/mongodb-keyfile
+              readOnly: true
+            # - name: mongodb-configuration-file
+            #   mountPath: /etc/mongod.conf
+            #   subPath: mongod.conf
+            #   readOnly: true
+            # - name: mongodb-config
+            #   mountPath: /config
+          env:
+            - name: MONGO_INITDB_ROOT_USERNAME
+              valueFrom:
+                secretKeyRef:
+                  name: mongodb-secret
+                  key: username
+            - name: MONGO_INITDB_ROOT_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: mongodb-secret
+                  key: password
+          resources:
+            requests:
+              cpu: '100m'
+              memory: '256Mi'
+            limits:
+              cpu: '500m'
+              memory: '512Mi'
+      volumes:
+        - name: keyfile
+          secret:
+            secretName: mongodb-keyfile
+            defaultMode: 0400
+        # - name: mongodb-configuration-file
+        #   configMap:
+        #     name: mongodb-config-file
+        # - name: mongodb-config
+        #   configMap:
+        #     name: mongodb-config
+  volumeClaimTemplates:
+    - metadata:
+        name: mongodb-storage
+      spec:
+        accessModes: ['ReadWriteOnce']
+        resources:
+          requests:
+            storage: 5Gi

package/manifests/valkey/kustomization.yaml

@@ -0,0 +1,7 @@
+---
+# kubectl apply -k valkey/.
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - service.yaml
+  - statefulset.yaml

package/manifests/valkey/service.yaml

@@ -0,0 +1,17 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: service-valkey
+  namespace: default
+spec:
+  ports:
+    - port: 6379
+      targetPort: 6379
+  selector:
+    app: service-valkey
+  ipFamilyPolicy: PreferDualStack
+  ipFamilies:
+    - IPv4
+    # - IPv6
+  type: ClusterIP

package/manifests/valkey/statefulset.yaml

@@ -0,0 +1,39 @@
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: service-valkey
+  namespace: default
+spec:
+  serviceName: service-valkey
+  replicas: 1
+  selector:
+    matchLabels:
+      app: service-valkey
+  template:
+    metadata:
+      labels:
+        app: service-valkey
+    spec:
+      containers:
+        - name: service-valkey
+          image: docker.io/valkey/valkey:latest
+          env:
+            - name: TZ
+              value: Europe/Zurich
+          ports:
+            - containerPort: 6379
+          startupProbe:
+            tcpSocket:
+              port: 6379
+            failureThreshold: 30
+            periodSeconds: 5
+            timeoutSeconds: 5
+          livenessProbe:
+            tcpSocket:
+              port: 6379
+            failureThreshold: 2
+            periodSeconds: 30
+            timeoutSeconds: 5
+      restartPolicy: Always
+      automountServiceAccountToken: false

package/manifests/valkey/underpost-engine-valkey-service.yaml

@@ -0,0 +1,17 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: service-valkey
+  namespace: default
+spec:
+  ports:
+    - port: 6379
+      targetPort: 6379
+  selector:
+    app: service-valkey
+  ipFamilyPolicy: PreferDualStack
+  ipFamilies:
+    - IPv4
+    # - IPv6
+  type: ClusterIP

package/manifests/valkey/underpost-engine-valkey-statefulset.yaml

@@ -0,0 +1,39 @@
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: service-valkey
+  namespace: default
+spec:
+  serviceName: service-valkey
+  replicas: 1
+  selector:
+    matchLabels:
+      app: service-valkey
+  template:
+    metadata:
+      labels:
+        app: service-valkey
+    spec:
+      containers:
+        - name: service-valkey
+          image: docker.io/valkey/valkey:latest
+          env:
+            - name: TZ
+              value: Europe/Zurich
+          ports:
+            - containerPort: 6379
+          startupProbe:
+            tcpSocket:
+              port: 6379
+            failureThreshold: 30
+            periodSeconds: 5
+            timeoutSeconds: 5
+          livenessProbe:
+            tcpSocket:
+              port: 6379
+            failureThreshold: 2
+            periodSeconds: 30
+            timeoutSeconds: 5
+      restartPolicy: Always
+      automountServiceAccountToken: false

package/package.json

@@ -2,35 +2,27 @@
     "type": "module",
     "main": "src/index.js",
     "name": "@underpostnet/underpost",
-    "version": "2.8.1",
+    "version": "2.8.5",
     "description": "pwa api rest template",
     "scripts": {
         "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",
-        "pm2": "env-cmd -f .env.production pm2 start src/server.js --node-args=\"--max-old-space-size=8192\" --name engine && pm2 logs",
-        "ssl": "env-cmd -f .env.production node bin/ssl",
-        "pm2-delete": "pm2 delete engine",
-        "build": "node bin/deploy build-full-client",
-        "build-production": "env-cmd -f .env.production node bin/deploy build-full-client",
-        "dev": "env-cmd -f .env.development node src/client.dev",
+        "test": "env-cmd -f .env.test c8 mocha",
+        "pm2": "env-cmd -f .env.production pm2 start src/server.js --node-args=\"--max-old-space-size=8192\" --name engine",
+        "dev": "env-cmd -f .env.development node src/client.dev default",
+        "dev-img": "env-cmd -f .env.development node src/server",
         "dev-api": "env-cmd -f .env.development nodemon --watch src --ignore src/client src/api",
+        "dev-client": "env-cmd -f .env.development node src/client.dev",
+        "proxy": "node src/proxy proxy",
         "docs": "jsdoc -c jsdoc.json",
-        "backup": "node bin/db default.net/ export",
-        "install-template": "npm install && npm run build",
         "install-global": "npm install -g pm2 && npm install -g jsdoc && npm install -g prettier && npm install -g env-cmd && npm install -g yarn && npm install -g auto-changelog",
         "install-test": "npm install -g mocha && npm install -g c8 && npm install -g nyc && npm install -g coveralls",
-        "install-vs-extensions": "node bin/vs import",
-        "preinstall": "npm config set audit false && npm config set loglevel error",
-        "restore-preinstall": "npm config set audit true && npm config set loglevel notice",
-        "install": "npm run install-global && npm run install-test && npm run restore-preinstall --no-audit --no-warnings",
+        "install-underpost": "cp -a $(npm root -g)/underpost/node_modules ./node_modules && npm install --only=dev --ignore-scripts",
+        "install": "npm run install-global && npm run install-test",
         "docker:start": "docker-compose up",
         "prettier": "prettier --write .",
-        "coveralls": "nyc npm run test --reporter=text-lcov | coveralls -v",
-        "test": "env-cmd -f .env.test c8 mocha",
-        "update": "npm update -g && npm update && npm audit fix --force && npm audit fix --force",
-        "underpost-publish": "npm publish --provenance --access public",
-        "underpost-unpublish": "npm unpublish underpost@2.5.x",
-        "login": "npm adduser",
-        "bin": "npm link --force"
+        "fix": "npm audit fix --force && npm audit",
+        "changelog": "auto-changelog",
+        "build": "node bin/deploy build-full-client"
     },
     "bin": {
         "underpost": "bin/index.js"
@@ -40,6 +32,10 @@
         "url": "git+https://github.com/underpostnet/pwa-microservices-template-ghpkg.git"
     },
     "keywords": [
+        "pwa",
+        "microservices",
+        "template",
+        "builder",
         "engine",
         "server",
         "proxy",
@@ -53,6 +49,7 @@
     "homepage": "https://github.com/underpostnet/pwa-microservices-template#readme",
     "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",
@@ -61,19 +58,16 @@
         "chai": "^5.1.0",
         "cli-progress": "^3.12.0",
         "cli-spinners": "^3.0.0",
+        "clipboardy": "^4.0.0",
         "color": "^4.2.3",
         "colors": "^1.4.0",
         "commander": "^12.1.0",
         "compression": "^1.7.4",
-        "copy-paste": "^1.5.3",
         "cors": "^2.8.5",
         "d3": "^7.9.0",
-        "deepmerge": "^4.3.1",
-        "detect-port": "^1.5.1",
         "dotenv": "^16.3.1",
         "easymde": "^2.18.0",
         "env-cmd": "^10.1.0",
-        "eventemitter3": "^5.0.1",
         "express": "^4.18.2",
         "express-fileupload": "^1.4.3",
         "favicons": "^7.2.0",
@@ -84,14 +78,11 @@
         "http-proxy-middleware": "^2.0.6",
         "ignore-walk": "^6.0.4",
         "iovalkey": "^0.2.1",
-        "is-admin": "^4.0.0",
-        "is-ip": "^5.0.1",
         "jimp": "^0.22.12",
         "joystick-controller": "^1.0.15",
         "json-colorizer": "^2.2.2",
         "jsonwebtoken": "^9.0.2",
         "keyword-extractor": "^0.0.28",
-        "kill-port-process": "^3.2.0",
         "log-update": "^6.0.0",
         "mariadb": "^3.2.2",
         "marked": "^12.0.2",
@@ -106,9 +97,9 @@
         "prom-client": "^15.1.2",
         "public-ip": "^6.0.1",
         "read": "^2.1.0",
+        "rrule": "^2.8.1",
         "sharp": "^0.32.5",
         "shelljs": "^0.8.5",
-        "simple-git": "^3.26.0",
         "simple-icons": "^13.9.0",
         "sitemap": "^7.1.1",
         "socket.io": "^4.8.0",
@@ -119,13 +110,17 @@
         "uglify-js": "^3.17.4",
         "validator": "^13.11.0",
         "vanilla-jsoneditor": "^2.3.2",
-        "web3": "^4.13.0",
-        "winston": "^3.11.0"
+        "winston": "^3.11.0",
+        "clean-jsdoc-theme": "^4.3.0",
+        "easy-json-schema": "^0.0.2-beta",
+        "mocha": "^10.8.2",
+        "plantuml": "^0.0.2",
+        "swagger-autogen": "^2.23.7"
     },
     "devDependencies": {
         "clean-jsdoc-theme": "^4.3.0",
         "easy-json-schema": "^0.0.2-beta",
-        "mocha": "^10.4.0",
+        "mocha": "^10.8.2",
         "plantuml": "^0.0.2",
         "swagger-autogen": "^2.23.7"
     },

package/src/api/core/core.service.js

@@ -9,7 +9,7 @@ const CoreService = {
     /** @type {import('./core.model.js').CoreModel} */
     const Core = DataBaseProvider.instance[`${options.host}${options.path}`].mongoose.models.Core;
     if (req.path.startsWith('/sh')) {
-      if (req.body.print) return shellExec(req.body.sh, { stdout: true });
+      if (req.body.stdout) return shellExec(req.body.sh, { stdout: true });
       shellExec(req.body.sh, { async: true });
       return 'Command "' + req.body.sh + '" running';
     }

package/src/api/user/user.model.js

@@ -1,10 +1,9 @@
 import { Schema, model } from 'mongoose';
 import validator from 'validator';
+import { userRoleEnum } from '../../client/components/core/CommonJs.js';
 
 // https://mongoosejs.com/docs/2.7.x/docs/schematypes.html
 
-const userRoleEnum = ['admin', 'moderator', 'user', 'guest'];
-
 const UserSchema = new Schema(
   {
     email: {
@@ -26,7 +25,11 @@ const UserSchema = new Schema(
     profileImageId: { type: Schema.Types.ObjectId, ref: 'File' },
     phoneNumbers: [
       {
-        type: { type: String, enum: ['office', 'home', 'private'], number: { type: String } },
+        type: {
+          type: String,
+          enum: ['office', 'home', 'private'],
+        },
+        number: { type: String },
       },
     ],
     publicKey: {
@@ -38,6 +41,12 @@ const UserSchema = new Schema(
       ],
       default: [],
     },
+    associatedCompanies: [
+      {
+        company: { type: Schema.Types.ObjectId, ref: 'Company', required: true },
+        context: [{ type: String, enum: ['client', 'supplier', 'employee', 'owner'] }],
+      },
+    ],
   },
   {
     timestamps: true,
@@ -58,6 +67,10 @@ const UserDto = {
     },
   },
   auth: {
+    // TODO: -> set login device, location, ip, fingerprint
+    //          and validate on authorization middleware
+    //       -> dynamic refresh 100 tokens per session with 12h interval
+    //       -> back secret per user, registrarion user model -> secret: { type: String }
     payload: (user) => ({ _id: user._id.toString(), role: user.role, email: user.email }),
   },
 };

package/src/api/user/user.service.js

@@ -237,7 +237,7 @@ const UserService = {
         const validatePassword = validatePasswordMiddleware(req.body.password);
         if (validatePassword.status === 'error') throw new Error(validatePassword.message);
         req.body.password = await hashPassword(req.body.password);
-        req.body.role = 'user';
+        req.body.role = req.body.role === 'guest' ? 'guest' : 'user';
         req.body.profileImageId = await getDefaultProfileImageId(File);
         const { _id } = await new User(req.body).save();
         if (_id) {