underpost 2.8.31 → 2.8.41

package/.github/workflows/ghpkg.yml

@@ -19,6 +19,7 @@ jobs:
       id-token: write
     steps:
       - uses: actions/checkout@v3
+
       - uses: actions/setup-node@v4
         with:
           node-version: '22.x'
@@ -32,10 +33,10 @@ jobs:
           git config --global credential.helper ""
           git config credential.helper ""
           git config --global user.name 'underpostnet'
-          git config --global user.email 'fcoverdugoa@underpost.net'
+          git config --global user.email 'development@underpost.net'
           git config --global credential.interactive always
           git config user.name 'underpostnet'
-          git config user.email 'fcoverdugoa@underpost.net'
+          git config user.email 'development@underpost.net'
           git config credential.interactive always
 
       - name: Clone github package repository
@@ -59,6 +60,7 @@ jobs:
       id-token: write
     steps:
       - uses: actions/checkout@v3
+
       - uses: actions/setup-node@v4
         with:
           node-version: '22.x'
@@ -86,25 +88,26 @@ jobs:
 
       - name: Clone github package repository
         run: |
-          git clone https://github.com/underpostnet/pwa-microservices-template-ghpkg.git
+          git clone --bare https://github.com/underpostnet/pwa-microservices-template-ghpkg.git
           rm -rf ./.git
-          cp -a  ./pwa-microservices-template-ghpkg/.git ./.git
-          rm -rf ./pwa-microservices-template-ghpkg
+          cp -rf -a ./pwa-microservices-template-ghpkg.git ./.git
+          rm -rf ./pwa-microservices-template-ghpkg.git
 
       - name: Set git credentials
         run: |
           git config --global credential.helper ""
           git config credential.helper ""
           git config --global user.name 'underpostnet'
-          git config --global user.email 'fcoverdugoa@underpost.net'
+          git config --global user.email 'development@underpost.net'
           git config --global credential.interactive always
           git config user.name 'underpostnet'
-          git config user.email 'fcoverdugoa@underpost.net'
+          git config user.email 'development@underpost.net'
           git config credential.interactive always
 
       - name: Push to github package repository
         run: |
           pwd
+          git init
           git status
           git remote set-url origin git@github.com:underpostnet/pwa-microservices-template-ghpkg.git
           git add .       

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

@@ -32,6 +32,10 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        # with:
+        #   lfs: true
+      # - name: Checkout LFS objects
+      #   run: git lfs checkout
       - uses: actions/setup-node@v4
         with:
           node-version: '22.x'
@@ -39,9 +43,12 @@ jobs:
       - name: Build the site
         run: |
           npm install
-          node bin/deploy update-default-conf
-          npm run build-production github-pages underpostnet.github.io /pwa-microservices-template-ghpkg
-
+          node bin/deploy update-default-conf ghpkg
+          env-cmd -f .env.production node bin/deploy build-full-client github-pages underpostnet.github.io /pwa-microservices-template-ghpkg
+      # git lfs install
+      # git lfs track
+      # git lfs ls-files
+      # git lfs pull
       - name: Setup Pages
         uses: actions/configure-pages@v5
       - name: Upload artifact

package/.vscode/extensions.json

@@ -2,7 +2,16 @@
     "recommendations": [
         "antiantisepticeye.vscode-color-picker",
         "bashmish.es6-string-css",
+        "eamodio.gitlens",
         "esbenp.prettier-vscode",
+        "foxundermoon.shell-format",
+        "github.vscode-github-actions",
+        "mintlify.document",
+        "ms-python.black-formatter",
+        "ms-python.debugpy",
+        "ms-python.python",
+        "ms-python.vscode-pylance",
+        "streetsidesoftware.code-spell-checker",
         "tabnine.tabnine-vscode",
         "tobermory.es6-string-html"
     ]

package/.vscode/settings.json

@@ -48,6 +48,7 @@
     "Microdata",
     "minami",
     "MMORPG",
+    "mongosh",
     "mysqldump",
     "neodrag",
     "nexodev",
@@ -69,9 +70,6 @@
     "xfwd",
     "youtu"
   ],
-  "[dockerfile]": {
-    "editor.defaultFormatter": "ms-azuretools.vscode-docker"
-  },
   "[php]": {
     "editor.defaultFormatter": "bmewburn.vscode-intelephense-client"
   },
@@ -107,5 +105,13 @@
   },
   "[solidity]": {
     "editor.defaultFormatter": "JuanBlanco.solidity"
-  }
+  },
+  "[dockerfile]": {
+    "editor.defaultFormatter": "foxundermoon.shell-format"
+  },
+  "[ignore]": {
+    "editor.defaultFormatter": "foxundermoon.shell-format"
+  },
+  "docwriter.progress.trackTypes": true,
+  "docwriter.hotkey.mac": "⌘ + ."
 }

package/AUTHORS.md

@@ -1,10 +1,21 @@
 # Authors
 
-#### Ordered by first contribution.
 
-- fcoverdugo ([fcoverdugoa@underpost.net](mailto:fcoverdugoa@underpost.net))
-- underpost.net ([52893447+underpostnet@users.noreply.github.com](mailto:52893447+underpostnet@users.noreply.github.com))
-- fcoverdugoa ([52893447+underpostnet@users.noreply.github.com](mailto:52893447+underpostnet@users.noreply.github.com))
-- underpostnet ([fcoverdugoa@underpost.net](mailto:fcoverdugoa@underpost.net))
+Author: fcoverdugoa <52893447+underpostnet@users.noreply.github.com>
+
+
+Author: fcoverdugoa <fcoverdugoa@underpost.net>
+
+
+Author: fcoverdugo <fcoverdugoa@underpost.net>
+
+
+Author: underpost.net <52893447+underpostnet@users.noreply.github.com>
+
+
+Author: underpostnet <fcoverdugoa@underpost.net>
+
+
+
 
 #### Generated by [underpost.net](https://underpost.net)

package/CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v2.8.31](https://github.com/underpostnet/engine/compare/v2.8.1...v2.8.31)
+
+> 5 February 2025
+
+- build(clipboardy): 🛠 add cli copy paste [`18acbde`](https://github.com/underpostnet/engine/commit/18acbded151da88499a3a0f1c1bfdbdef2abfc6b)
+- HealthcareAppointmentService advance [`228257c`](https://github.com/underpostnet/engine/commit/228257c0aa2d875014e72f2550bb44aa6b009bed)
+- healthcare appoiment service advance [`207a299`](https://github.com/underpostnet/engine/commit/207a299ffc815870a574524907d5b6b3d9924f1a)
+
 #### [v2.8.1](https://github.com/underpostnet/engine/compare/v2.8.0...v2.8.1)
 
 > 20 January 2025

package/Dockerfile

@@ -9,39 +9,33 @@ WORKDIR /code
 # Set root password to root, format is 'user:password'.
 RUN echo 'root:root' | chpasswd
 
-RUN apt-get update --fix-missing && \
-    apt-get upgrade -y && \
-    # install sudo
-    apt-get -y install sudo && \
-    # net-tools provides netstat commands
-    apt-get -y install curl net-tools && \
-    apt-get -yq install openssh-server supervisor && \
-    # Few handy utilities which are nice to have
-    apt-get -y install nano vim less --no-install-recommends && \
-    apt-get clean
+RUN apt-get update --fix-missing
+RUN apt-get upgrade -y
+# install sudo
+RUN apt-get -y install sudo
+# net-tools provides netstat commands
+RUN apt-get -y install curl net-tools
+RUN apt-get -yq install openssh-server supervisor
+# Few handy utilities which are nice to have
+RUN apt-get -y install nano vim less --no-install-recommends
+RUN apt-get clean
 
 # install ssh
-RUN mkdir -p /var/run/sshd && \
-    # Allow root login via password
-    sed -ri 's/#PermitRootLogin prohibit-password/PermitRootLogin yes/g' /etc/ssh/sshd_config
+RUN mkdir -p /var/run/sshd
+# Allow root login via password
+RUN sed -ri 's/#PermitRootLogin prohibit-password/PermitRootLogin yes/g' /etc/ssh/sshd_config
 
 # copy supervisor config file to start openssh-server
 COPY supervisord-openssh-server.conf /etc/supervisor/conf.d/supervisord-openssh-server.conf
 
 # install open ssl git and others tools
-RUN apt-get install -yq --no-install-recommends \
-    libssl-dev \
-    curl \ 
-    wget \
-    git \
-    gnupg
+RUN apt-get install -yq --no-install-recommends libssl-dev curl wget git gnupg
 
 # install nodejs https://github.com/nodesource/distributions/blob/master/README.md#deb
-RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \
-    apt-get install -y nodejs \
-    build-essential && \
-    node --version && \ 
-    npm --version
+RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash -
+RUN apt-get install -y nodejs build-essential
+RUN node --version
+RUN npm --version
 
 # local test
 
@@ -55,7 +49,6 @@ RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \
 # EXPOSE 4000-4004
 # CMD [ "npm", "run", "dev" ]
 
-
 # EXPOSE 3000-3004
 # CMD [ "npm", "start" ]
 
@@ -73,4 +66,4 @@ EXPOSE 22 80 443 3306 27017
 # EXPOSE 22
 EXPOSE 4000-4004
 
-CMD [ "node", "./startup.cjs" ]
+CMD [ "node", "./startup.cjs" ]

package/README.md

@@ -16,7 +16,7 @@ template
 
 <div align="center">
 
-<a target="_top"  href='https://www.npmjs.com/package/npm/v/10.2.3' ><img alt='npm' src='https://img.shields.io/badge/npm v10.2.3-100000?style=flat&logo=npm&logoColor=white&labelColor=CB3837&color=727273'/></a> <a target="_top"  href='https://nodejs.org/download/release/v22.9.0/' ><img alt='nodedotjs' src='https://img.shields.io/badge/node v22.9.0-100000?style=flat&logo=nodedotjs&logoColor=white&labelColor=5FA04E&color=727273'/></a> <a target="_top"  href='https://pgp.mongodb.com/' ><img alt='mongodb' src='https://img.shields.io/badge/mongodb_server v7.0-100000?style=flat&logo=mongodb&logoColor=white&labelColor=47A248&color=727273'/></a>
+<a target="_top"  href='https://www.npmjs.com/package/npm/v/11.1.0' ><img alt='npm' src='https://img.shields.io/badge/npm v11.1.0-100000?style=flat&logo=npm&logoColor=white&labelColor=CB3837&color=727273'/></a> <a target="_top"  href='https://nodejs.org/download/release/v22.9.0/' ><img alt='nodedotjs' src='https://img.shields.io/badge/node v23.8.0-100000?style=flat&logo=nodedotjs&logoColor=white&labelColor=5FA04E&color=727273'/></a> <a target="_top"  href='https://pgp.mongodb.com/' ><img alt='mongodb' src='https://img.shields.io/badge/mongodb_server v7.0-100000?style=flat&logo=mongodb&logoColor=white&labelColor=47A248&color=727273'/></a>
 
 </div>
 

package/bin/build.js

@@ -0,0 +1,278 @@
+import fs from 'fs-extra';
+import { loggerFactory } from '../src/server/logger.js';
+import { shellExec } from '../src/server/process.js';
+import dotenv from 'dotenv';
+import { getCapVariableName } from '../src/client/components/core/CommonJs.js';
+import { buildProxyRouter, buildPortProxyRouter, Config, getPathsSSR, buildKindPorts } from '../src/server/conf.js';
+
+const baseConfPath = './engine-private/conf/dd-cron/.env.production';
+if (fs.existsSync(baseConfPath)) dotenv.config({ path: baseConfPath, override: true });
+
+const logger = loggerFactory(import.meta);
+
+// (async () => {
+//   return;
+//   const files = await fs.readdir(`./src`);
+//   for (const relativePath of files) {
+//   }
+// })();
+
+const confName = process.argv[2];
+const basePath = '../pwa-microservices-template';
+const repoName = `engine-${confName.split('dd-')[1]}-private`;
+const repoNameBackUp = `engine-${confName.split('dd-')[1]}-cron-backups`;
+const gitUrl = `https://${process.env.GITHUB_TOKEN}@github.com/underpostnet/${repoName}.git`;
+const gitBackUpUrl = `https://${process.env.GITHUB_TOKEN}@github.com/underpostnet/${repoNameBackUp}.git`;
+
+logger.info('', {
+  confName,
+  // gitUrl,
+  repoName,
+  repoNameBackUp,
+  basePath,
+});
+
+if (process.argv.includes('info')) process.exit(0);
+
+if (process.argv.includes('proxy')) {
+  const env = process.argv.includes('development') ? 'development' : 'production';
+  process.env.NODE_ENV = env;
+  process.env.PORT = process.env.NODE_ENV === 'development' ? 4000 : 3000;
+  process.argv[2] = 'proxy';
+  process.argv[3] = fs.readFileSync('./engine-private/deploy/dd-router', 'utf8').trim();
+
+  await Config.build();
+  process.env.NODE_ENV = 'production';
+  const router = buildPortProxyRouter(443, buildProxyRouter());
+  const confServer = JSON.parse(fs.readFileSync(`./engine-private/conf/${confName}/conf.server.json`, 'utf8'));
+  const confHosts = Object.keys(confServer);
+
+  for (const host of Object.keys(router)) {
+    if (!confHosts.find((_host) => host.match(_host))) {
+      delete router[host];
+    }
+  }
+
+  const ports = Object.values(router).map((p) => p.split(':')[2]);
+
+  const fromPort = ports[0];
+  const toPort = ports[ports.length - 1];
+
+  logger.info('port range', { fromPort, toPort, router });
+
+  const deploymentYamlFilePath = `./engine-private/conf/${confName}/build/${env}/deployment.yaml`;
+
+  const deploymentYamlParts = fs.readFileSync(deploymentYamlFilePath, 'utf8').split('ports:');
+  deploymentYamlParts[1] =
+    buildKindPorts(fromPort, toPort) +
+    `  type: LoadBalancer
+`;
+
+  fs.writeFileSync(
+    deploymentYamlFilePath,
+    deploymentYamlParts.join(`ports:
+`),
+  );
+
+  let proxyYaml = '';
+  let secretYaml = '';
+
+  for (const host of Object.keys(confServer)) {
+    if (env === 'production')
+      secretYaml += `
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: ${host}
+spec:
+  commonName: ${host}
+  dnsNames:
+  - ${host}
+  issuerRef:
+    name: letsencrypt-prod
+    kind: ClusterIssuer
+  secretName: ${host}`;
+
+    const pathPortConditions = [];
+    for (const path of Object.keys(confServer[host])) {
+      const { peer } = confServer[host][path];
+      const port = parseInt(router[`${host}${path === '/' ? '' : path}`].split(':')[2]);
+      // logger.info('', { host, port, path });
+      pathPortConditions.push({
+        port,
+        path,
+      });
+
+      if (peer) {
+        //  logger.info('', { host, port: port + 1, path: '/peer' });
+        pathPortConditions.push({
+          port: port + 1,
+          path: '/peer',
+        });
+      }
+    }
+    // logger.info('', { host, pathPortConditions });
+    proxyYaml += `
+---
+apiVersion: projectcontour.io/v1
+kind: HTTPProxy
+metadata:
+  name: ${host}
+spec:
+  virtualhost:
+    fqdn: ${host}${
+      env === 'development'
+        ? ''
+        : `
+    tls:
+      secretName: ${host}`
+    }
+  routes:`;
+    for (const conditionObj of pathPortConditions) {
+      const { path, port } = conditionObj;
+      proxyYaml += `
+    - conditions:
+        - prefix: ${path}
+      enableWebsockets: true
+      services:
+        - name: ${confName}-${env}-service
+          port: ${port}`;
+    }
+  }
+  const yamlPath = `./engine-private/conf/${confName}/build/${env}/proxy.yaml`;
+  fs.writeFileSync(yamlPath, proxyYaml, 'utf8');
+  if (env === 'production') {
+    const yamlPath = `./engine-private/conf/${confName}/build/${env}/secret.yaml`;
+    fs.writeFileSync(yamlPath, secretYaml, 'utf8');
+  }
+
+  process.exit(0);
+}
+if (process.argv.includes('conf')) {
+  if (!fs.existsSync(`../${repoName}`)) {
+    shellExec(`cd .. && git clone ${gitUrl}`, { silent: true });
+  } else {
+    shellExec(`cd ../${repoName} && git pull`);
+  }
+  const toPath = `../${repoName}/conf/${confName}`;
+  fs.removeSync(toPath);
+  fs.mkdirSync(toPath, { recursive: true });
+  fs.copySync(`./engine-private/conf/${confName}`, toPath);
+  shellExec(
+    `cd ../${repoName}` +
+      ` && git add .` +
+      ` && git commit -m "ci(engine-core-conf): ⚙️ Update ${confName} conf"` +
+      ` && git push`,
+  );
+  process.exit(0);
+}
+
+if (process.argv.includes('cron-backups')) {
+  if (!fs.existsSync(`../${repoNameBackUp}`)) {
+    shellExec(`cd .. && git clone ${gitBackUpUrl}`, { silent: true });
+  } else {
+    shellExec(`cd ../${repoNameBackUp} && git pull`);
+  }
+  const serverConf = JSON.parse(fs.readFileSync(`./engine-private/conf/${confName}/conf.server.json`, 'utf8'));
+  for (const host of Object.keys(serverConf)) {
+    for (let path of Object.keys(serverConf[host])) {
+      path = path.replaceAll('/', '-');
+      const toPath = `../${repoNameBackUp}/${host}${path}`;
+      const fromPath = `./engine-private/cron-backups/${host}${path}`;
+      if (fs.existsSync(fromPath)) {
+        if (fs.existsSync(toPath)) fs.removeSync(toPath);
+        logger.info('Build', { fromPath, toPath });
+        fs.copySync(fromPath, toPath);
+      }
+    }
+  }
+  shellExec(
+    `cd ../${repoNameBackUp}` +
+      ` && git add .` +
+      ` && git commit -m "ci(engine-core-cron-backups): ⚙️ Update ${confName} cron backups"` +
+      ` && git push`,
+  );
+  process.exit(0);
+}
+
+if (process.argv.includes('test')) {
+  fs.mkdirSync(`${basePath}/engine-private/conf`, { recursive: true });
+  fs.copySync(`./engine-private/conf/${confName}`, `${basePath}/engine-private/conf/${confName}`);
+}
+
+const { DefaultConf } = await import(`../conf.${confName}.js`);
+
+{
+  for (const host of Object.keys(DefaultConf.server)) {
+    for (const path of Object.keys(DefaultConf.server[host])) {
+      const { apis, ws } = DefaultConf.server[host][path];
+      if (apis)
+        for (const api of apis) {
+          {
+            const originPath = `./src/api/${api}`;
+            logger.info(`Build`, originPath);
+            fs.copySync(originPath, `${basePath}/src/api/${api}`);
+          }
+          {
+            const originPath = `./src/client/services/${api}`;
+            logger.info(`Build`, originPath);
+            fs.copySync(originPath, `${basePath}/src/client/services/${api}`);
+          }
+        }
+
+      if (ws && ws !== 'core' && ws !== 'default') {
+        fs.copySync(`./src/ws/${ws}`, `${basePath}/src/ws/${ws}`);
+      }
+    }
+  }
+}
+
+{
+  for (const client of Object.keys(DefaultConf.client)) {
+    const capName = getCapVariableName(client);
+    for (const component of Object.keys(DefaultConf.client[client].components)) {
+      const originPath = `./src/client/components/${component}`;
+      if (fs.existsSync(originPath)) {
+        logger.info(`Build`, originPath);
+        fs.copySync(originPath, `${basePath}/src/client/components/${component}`);
+      }
+    }
+    {
+      const originPath = `./src/client/${capName}.index.js`;
+      if (fs.existsSync(originPath)) {
+        logger.info(`Build`, originPath);
+        fs.copyFileSync(originPath, `${basePath}/src/client/${capName}.index.js`);
+      }
+    }
+    {
+      const originPath = `./src/client/public/${client}`;
+      if (fs.existsSync(originPath)) {
+        logger.info(`Build`, originPath);
+        fs.copySync(originPath, `${basePath}/src/client/public/${client}`);
+      }
+    }
+  }
+}
+
+{
+  for (const client of Object.keys(DefaultConf.ssr)) {
+    const ssrPaths = getPathsSSR(DefaultConf.ssr[client]);
+    for (const originPath of ssrPaths) {
+      if (fs.existsSync(originPath)) {
+        logger.info(`Build`, originPath);
+        fs.copySync(originPath, `${basePath}/${originPath}`);
+      }
+    }
+  }
+
+  fs.copyFileSync(`./conf.${confName}.js`, `${basePath}/conf.js`);
+  fs.copyFileSync(
+    `./.github/workflows/engine.${confName.split('dd-')[1]}.ci.yml`,
+    `${basePath}/.github/workflows/engine.${confName.split('dd-')[1]}.ci.yml`,
+  );
+
+  const packageJson = JSON.parse(fs.readFileSync(`${basePath}/package.json`, 'utf8'));
+  packageJson.name = repoName;
+  fs.writeFileSync(`${basePath}/package.json`, JSON.stringify(packageJson, null, 4), 'utf8');
+}

package/bin/db.js

@@ -4,10 +4,9 @@ import { loggerFactory } from '../src/server/logger.js';
 import { MariaDB } from '../src/db/mariadb/MariaDB.js';
 import { Xampp } from '../src/runtime/xampp/Xampp.js';
 import { Lampp } from '../src/runtime/lampp/Lampp.js';
-import { getCapVariableName, getRestoreCronCmd, loadConf } from '../src/server/conf.js';
+import { getCapVariableName, getRestoreCronCmd, loadConf, splitFileFactory } from '../src/server/conf.js';
 import { DataBaseProvider } from '../src/db/DataBaseProvider.js';
 import { hashPassword } from '../src/server/auth.js';
-import splitFile from 'split-file';
 
 const logger = loggerFactory(import.meta);
 
@@ -101,28 +100,7 @@ try {
 
             cmd = `mysqldump -u ${user} -p${password} ${name} > ${cmdBackupPath}`;
             shellExec(cmd);
-            const stats = fs.statSync(cmdBackupPath);
-            const maxSizeInBytes = 1024 * 1024 * 50; // 50 mb
-            const fileSizeInBytes = stats.size;
-            if (fileSizeInBytes > maxSizeInBytes) {
-              await new Promise((resolve) => {
-                splitFile
-                  .splitFileBySize(cmdBackupPath, maxSizeInBytes) // 50 mb
-                  .then((names) => {
-                    fs.writeFileSync(
-                      `${cmdBackupPath.split('/').slice(0, -1).join('/')}/${name}-parths.json`,
-                      JSON.stringify(names, null, 4),
-                      'utf8',
-                    );
-                    resolve();
-                  })
-                  .catch((err) => {
-                    console.log('Error: ', err);
-                    resolve();
-                  });
-              });
-              fs.removeSync(cmdBackupPath);
-            }
+            await splitFileFactory(name, cmdBackupPath);
           }
           break;
         case 'import':