underpost 2.8.6 → 2.8.8

package/manifests/mysql/statefulset.yaml

@@ -0,0 +1,55 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: mysql
+  labels:
+    app: mysql
+spec:
+  ports:
+    - port: 3306
+      name: mysql
+  selector:
+    app: mysql
+  clusterIP: None
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: mysql
+spec:
+  serviceName: "mysql"
+  selector:
+    matchLabels:
+      app: mysql
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: mysql
+    spec:
+      containers:
+        - image: mysql:9
+          name: mysql
+          env:
+            - name: MYSQL_ROOT_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: mysql-secret
+                  key: password
+          ports:
+            - containerPort: 3306
+              name: mysql
+          volumeMounts:
+            - name: mysql-persistent-storage
+              mountPath: /var/lib/mysql
+              subPath: mysql
+  volumeClaimTemplates:
+    - metadata:
+        name: mysql-persistent-storage
+      spec:
+        storageClassName: manual
+        accessModes:
+          - ReadWriteOnce
+        resources:
+          requests:
+            storage: 20Gi

package/manifests/postgresql/configmap.yaml

@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: postgres-config
+  labels:
+    app: postgres
+data:
+  POSTGRES_DB: postgresdb
+  POSTGRES_USER: admin

package/manifests/postgresql/kustomization.yaml

@@ -0,0 +1,10 @@
+---
+# kubectl apply -k postgresql/.
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - pv.yaml
+  - pvc.yaml
+  - configmap.yaml
+  - statefulset.yaml
+  - service.yaml

package/manifests/postgresql/pv.yaml

@@ -0,0 +1,15 @@
+kind: PersistentVolume
+apiVersion: v1
+metadata:
+  name: postgres-pv-volume
+  labels:
+    type: local
+    app: postgres
+spec:
+  storageClassName: manual
+  capacity:
+    storage: 5Gi
+  accessModes:
+    - ReadWriteMany
+  hostPath:
+    path: '/mnt/data'

package/manifests/postgresql/pvc.yaml

@@ -0,0 +1,13 @@
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: postgres-pv-claim
+  labels:
+    app: postgres
+spec:
+  storageClassName: manual
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 5Gi

package/manifests/postgresql/service.yaml

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

package/manifests/postgresql/statefulset.yaml

@@ -0,0 +1,37 @@
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: postgres
+spec:
+  serviceName: postgres
+  replicas: 1
+  selector:
+    matchLabels:
+      app: postgres
+  template:
+    metadata:
+      labels:
+        app: postgres
+    spec:
+      containers:
+        - name: postgres
+          image: postgres:latest
+          imagePullPolicy: Never
+          ports:
+            - containerPort: 5432
+          envFrom:
+            - configMapRef:
+                name: postgres-config
+          env:
+            - name: POSTGRES_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: postgres-secret
+                  key: password
+          volumeMounts:
+            - mountPath: /var/lib/postgresql/data
+              name: postgredb
+      volumes:
+        - name: postgredb
+          persistentVolumeClaim:
+            claimName: postgres-pv-claim

package/manifests/valkey/service.yaml

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

package/manifests/valkey/statefulset.yaml

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

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.8.6",
+    "version": "2.8.8",
     "description": "pwa api rest template",
     "scripts": {
         "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",
@@ -11,6 +11,7 @@
         "dev": "env-cmd -f .env.development node src/client.dev default",
         "dev-img": "env-cmd -f .env.development node src/server",
         "prod-img": "env-cmd -f .env.production node src/server",
+        "monitor": "pm2 start bin/deploy.js --name monitor -- monitor",
         "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",
@@ -69,7 +70,6 @@
         "cors": "^2.8.5",
         "d3": "^7.9.0",
         "dotenv": "^16.3.1",
-        "easy-json-schema": "^0.0.2-beta",
         "easymde": "^2.18.0",
         "env-cmd": "^10.1.0",
         "express": "^4.18.2",
@@ -119,13 +119,7 @@
         "vanilla-jsoneditor": "^2.3.2",
         "winston": "^3.11.0"
     },
-    "devDependencies": {
-        "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": {},
     "publishConfig": {
         "provenance": true,
         "access": "public",

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

@@ -24,7 +24,7 @@ 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.findByIdAndDelete(req.params.id);
-    else return await await Default.deleteMany();
+    else return await Default.deleteMany();
   },
 };
 

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

@@ -225,8 +225,8 @@ const UserService = {
         } else throw new Error('invalid email or password');
 
       case 'guest': {
-        const user = await ValkeyAPI.valkeyObjectFactory('user', options);
-        await ValkeyAPI.setValkeyObject(user.email, user);
+        const user = await ValkeyAPI.valkeyObjectFactory(options, 'user');
+        await ValkeyAPI.setValkeyObject(options, user.email, user);
         return {
           token: hashJWT({ user: UserDto.auth.payload(user) }),
           user: selectDtoFactory(user, UserDto.select.get()),
@@ -325,15 +325,18 @@ const UserService = {
         return await User.find().select(UserDto.select.getAll());
 
       case 'auth': {
-        const user = (await ValkeyAPI.getValkeyObject(req.auth.user.email))
-          ? await ValkeyAPI.getValkeyObject(req.auth.user.email)
-          : await User.findOne({
-              _id: req.auth.user._id,
-            });
+        let user;
+        if (req.auth.user._id.match('guest')) {
+          user = await ValkeyAPI.getValkeyObject(options, req.auth.user.email);
+          if (!user) throw new Error('guest user expired');
+        } else
+          user = await User.findOne({
+            _id: req.auth.user._id,
+          });
 
         const file = await File.findOne({ _id: user.profileImageId });
 
-        if (!file && !(await ValkeyAPI.getValkeyObject(req.auth.user.email))) {
+        if (!file && !(await ValkeyAPI.getValkeyObject(options, req.auth.user.email))) {
           await User.findByIdAndUpdate(
             user._id,
             { profileImageId: await getDefaultProfileImageId(File) },
@@ -342,8 +345,8 @@ const UserService = {
             },
           );
         }
-        return (await ValkeyAPI.getValkeyObject(req.auth.user.email))
-          ? selectDtoFactory(await ValkeyAPI.getValkeyObject(req.auth.user.email), UserDto.select.get())
+        return (await ValkeyAPI.getValkeyObject(options, req.auth.user.email))
+          ? selectDtoFactory(await ValkeyAPI.getValkeyObject(options, req.auth.user.email), UserDto.select.get())
           : await User.findOne({
               _id: req.auth.user._id,
             }).select(UserDto.select.get());
@@ -378,7 +381,7 @@ const UserService = {
         switch (user.role) {
           case 'admin': {
             if (req.params.id) return await User.findByIdAndDelete(req.params.id);
-            else return await await User.deleteMany();
+            else return await User.deleteMany();
           }
           default:
             if (req.auth.user._id !== req.params.id) throw new Error(`Invalid token user id`);

package/src/cli/baremetal.js

@@ -0,0 +1,60 @@
+import { getNpmRootPath, getUnderpostRootPath } from '../server/conf.js';
+import { shellExec } from '../server/process.js';
+import dotenv from 'dotenv';
+class UnderpostBaremetal {
+  static API = {
+    callback(
+      options = {
+        dev: false,
+        controlServerInstall: false,
+        controlServerInitDb: false,
+        controlServerInit: false,
+        controlServerUninstall: false,
+        controlServerStop: false,
+        controlServerStart: false,
+      },
+    ) {
+      dotenv.config({ path: `${getUnderpostRootPath()}/.env`, override: true });
+      const npmRoot = getNpmRootPath();
+      const underpostRoot = options?.dev === true ? '.' : `${npmRoot}/underpost`;
+      const dbProviderId = 'postgresql-14';
+      if (options.controlServerUninstall === true) {
+        // Stop MAAS services
+        shellExec(`sudo systemctl stop maas.pebble || true`);
+        shellExec(`sudo snap stop maas`);
+        shellExec(`sudo snap remove maas --purge || true`);
+
+        // Remove Snap residual data
+        shellExec(`sudo rm -rf /var/snap/maas`);
+        shellExec(`sudo rm -rf ~/snap/maas`);
+
+        // Remove MAAS config and data directories
+        shellExec(`sudo rm -rf /etc/maas`);
+        shellExec(`sudo rm -rf /var/lib/maas`);
+        shellExec(`sudo rm -rf /var/log/maas`);
+      }
+      if (options.controlServerStart === true) {
+        shellExec(`sudo snap restart maas`);
+      }
+      if (options.controlServerStop === true) {
+        shellExec(`sudo snap stop maas`);
+      }
+      if (options.controlServerInitDb === true) {
+        shellExec(`node ${underpostRoot}/bin/deploy ${dbProviderId} install`);
+        shellExec(
+          `node ${underpostRoot}/bin/deploy pg-drop-db ${process.env.DB_PG_MAAS_NAME} ${process.env.DB_PG_MAAS_USER}`,
+        );
+        shellExec(`node ${underpostRoot}/bin/deploy maas db`);
+      }
+      if (options.controlServerInstall === true) {
+        shellExec(`chmod +x ${underpostRoot}/manifests/maas/maas-setup.sh`);
+        shellExec(`${underpostRoot}/manifests/maas/maas-setup.sh`);
+      }
+      if (options.controlServerInit === true) {
+        shellExec(`node ${underpostRoot}/bin/deploy maas reset`);
+      }
+    },
+  };
+}
+
+export default UnderpostBaremetal;