underpost 2.8.1 → 2.8.6

package/Dockerfile

@@ -2,89 +2,47 @@ ARG BASE_DEBIAN=buster
 
 FROM debian:${BASE_DEBIAN}
 
-ENV DEBIAN_FRONTEND noninteractive
+ENV DEBIAN_FRONTEND=noninteractive
 
-WORKDIR /code
+WORKDIR /home/dd
 
 # 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_23.x | bash -
+RUN apt-get install -y nodejs build-essential
+RUN node --version
+RUN npm --version
 
-
-# install lampp
-RUN curl -Lo xampp-linux-installer.run https://sourceforge.net/projects/xampp/files/XAMPP%20Linux/7.4.30/xampp-linux-x64-7.4.30-1-installer.run?from_af=true && \
-    chmod +x xampp-linux-installer.run && \
-    bash -c './xampp-linux-installer.run' && \
-    ln -sf /opt/lampp/lampp /usr/bin/lampp && \
-    # Enable XAMPP web interface(remove security checks)
-    sed -i.bak s'/Require local/Require all granted/g' /opt/lampp/etc/extra/httpd-xampp.conf && \
-    # Enable error display in php
-    sed -i.bak s'/display_errors=Off/display_errors=On/g' /opt/lampp/etc/php.ini && \
-    # Enable includes of several configuration files
-    mkdir /opt/lampp/apache2/conf.d && \
-    echo "IncludeOptional /opt/lampp/apache2/conf.d/*.conf" >> /opt/lampp/etc/httpd.conf && \
-    # Create a /www folder and a symbolic link to it in /opt/lampp/htdocs. It'll be accessible via http://localhost:[port]/www/
-    # This is convenient because it doesn't interfere with xampp, phpmyadmin or other tools in /opt/lampp/htdocs
-    # /opt/lampp/etc/httpd.conf
-    mkdir /www && \
-    ln -s /www /opt/lampp/htdocs
-
-
-# Install mongodb necessary libs
-RUN apt-get update && apt-get install -y apt-utils wget gnupg gnupg2 curl
-
-# Install mongodb
-RUN wget -qO - https://www.mongodb.org/static/pgp/server-4.2.asc | apt-key add -
-RUN echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.2 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.2.list
-RUN apt-get update
-RUN apt-get install -y mongodb-org
-
-# BIND TO ALL ADAPTERS IN CONTAINER
-RUN sed -i "s,\\(^[[:blank:]]*bindIp:\\) .*,\\1 0.0.0.0," /etc/mongod.conf
-
-# Bundle app source
-# COPY . .
-
-# Install underpost cli
 RUN npm install -g underpost
 
+VOLUME [ "/home/dd/engine/logs" ]
 
-VOLUME [ "/code/app/logs" ]
+EXPOSE 22
 
-EXPOSE 22 80 443 3306 27017
-EXPOSE 3000-3020
+EXPOSE 4000-4004
 
-CMD [ "node", "startup" ]
+CMD [ "underpost", "new", "service" ]

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>
 
@@ -67,30 +67,3 @@ Run dev client server
 ```bash
 npm run dev
 ```
-
-Run dev api server
-
-```bash
-npm run dev-api
-```
-
-Run on `pm2`
-
-```bash
-npm run pm2
-```
-
-Run on `docker-compose`
-
-```bash
-npm run start:docker
-```
-
-Run on `docker`
-
-```bash
-# build image
-docker build . -t app-name
-# run image
-docker run --name app-name-instance -p 41061:3001 -p 41062:3002 app-name
-```

package/bin/build.js

@@ -0,0 +1,186 @@
+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 { getPathsSSR } 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]}`;
+const deployList = (confName === 'dd' ? fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8') : confName).split(
+  ',',
+);
+
+logger.info('', {
+  confName,
+  repoName,
+  basePath,
+  deployList,
+});
+
+if (process.argv.includes('clean')) {
+  if (fs.existsSync(`${basePath}/images`)) fs.copySync(`${basePath}/images`, `./images`);
+  shellExec(`cd ${basePath} && git checkout .`);
+  shellExec(`cd ${basePath} && git clean -f -d`);
+  process.exit(0);
+}
+
+if (process.argv.includes('conf')) {
+  for (const _confName of deployList) {
+    const _repoName = `engine-${_confName.split('dd-')[1]}`;
+    const privateRepoName = `${_repoName}-private`;
+    const privateGitUri = `${process.env.GITHUB_USERNAME}/${privateRepoName}`;
+
+    if (!fs.existsSync(`../${privateRepoName}`)) {
+      shellExec(`cd .. && underpost clone ${privateGitUri}`, { silent: true });
+    } else {
+      shellExec(`cd ../${privateRepoName} && underpost pull . ${privateGitUri}`);
+    }
+    const toPath = `../${privateRepoName}/conf/${_confName}`;
+    fs.removeSync(toPath);
+    fs.mkdirSync(toPath, { recursive: true });
+    fs.copySync(`./engine-private/conf/${_confName}`, toPath);
+    if (fs.existsSync(`./engine-private/replica`)) {
+      const replicas = await fs.readdir(`./engine-private/replica`);
+      for (const replica of replicas)
+        if (replica.match(_confName))
+          fs.copySync(`./engine-private/replica/${replica}`, `../${privateRepoName}/replica/${replica}`);
+    }
+    if (fs.existsSync(`./engine-private/itc-scripts`)) {
+      const itcScripts = await fs.readdir(`./engine-private/itc-scripts`);
+      for (const itcScript of itcScripts)
+        if (itcScript.match(_confName))
+          fs.copySync(`./engine-private/itc-scripts/${itcScript}`, `../${privateRepoName}/itc-scripts/${itcScript}`);
+    }
+    shellExec(
+      `cd ../${privateRepoName}` +
+        ` && git add .` +
+        ` && underpost cmt . ci engine-core-conf 'Update ${_confName} conf'` +
+        ` && underpost push . ${privateGitUri}`,
+    );
+  }
+  process.exit(0);
+}
+
+if (confName === 'dd') {
+  for (const _confName of deployList) {
+    shellExec(`node bin/build ${_confName}`);
+  }
+  process.exit(0);
+}
+
+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}`);
+      }
+    }
+  }
+
+  shellExec(`node bin/deploy update-default-conf ${confName}`);
+
+  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`,
+  );
+
+  switch (confName) {
+    case 'dd-cyberia':
+      fs.copyFileSync(`./bin/cyberia.js`, `${basePath}/bin/cyberia.js`);
+      break;
+
+    default:
+      break;
+  }
+
+  const packageJson = JSON.parse(fs.readFileSync(`${basePath}/package.json`, 'utf8'));
+  packageJson.name = repoName;
+  fs.writeFileSync(
+    `${basePath}/package.json`,
+    JSON.stringify(packageJson, null, 4).replaceAll('pwa-microservices-template', repoName),
+    'utf8',
+  );
+
+  fs.copySync(`./src/cli`, `${basePath}/src/cli`);
+  if (!fs.existsSync(`${basePath}/images`)) fs.mkdirSync(`${basePath}/images`);
+
+  const env = process.argv.includes('development') ? 'development' : 'production';
+  const deploymentsFiles = ['Dockerfile', 'proxy.yaml', 'deployment.yaml', 'secret.yaml'];
+  // remove engine-private of .dockerignore for local testing
+  for (const file of deploymentsFiles) {
+    if (fs.existsSync(`./manifests/deployment/${confName}-${env}/${file}`)) {
+      fs.copyFileSync(`./manifests/deployment/${confName}-${env}/${file}`, `${basePath}/${file}`);
+    }
+  }
+}

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':