underpost 2.6.2 → 2.7.1

package/.nycrc

@@ -3,7 +3,7 @@
   "include": ["test"],
   "output": "reports",
   "reporter": ["html", "text", "lcov", "text-lcov", "cobertura"],
-  "sourceMap": false,
-  "instrument": false,
+  "sourceMap": true,
+  "instrument": true,
   "all": true
 }

package/AUTHORS.md

@@ -0,0 +1,10 @@
+# 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))
+
+#### Generated by [underpost.net](https://underpost.net)

package/CHANGELOG.md

@@ -0,0 +1,91 @@
+### Changelog
+
+All notable changes to this project will be documented in this file. Dates are displayed in UTC.
+
+Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
+
+#### [v2.6.3](https://github.com/underpostnet/engine/compare/v2.6.2...v2.6.3)
+
+> 14 September 2024
+
+- update version 2.6.3 [`85c585d`](https://github.com/underpostnet/engine/commit/85c585d1cce30de4389772605cf56e774e2b7d3c)
+- update refactor docs and coverage [`b455016`](https://github.com/underpostnet/engine/commit/b455016f5f2b2bdc142aacb4dfd66ab890125662)
+- update [`b8f01f2`](https://github.com/underpostnet/engine/commit/b8f01f258999c9ebc1173b0616f0f7b8f7171048)
+
+#### [v2.6.2](https://github.com/underpostnet/engine/compare/v2.5.6...v2.6.2)
+
+> 13 September 2024
+
+- update version 2.6.2 [`0895afb`](https://github.com/underpostnet/engine/commit/0895afbde42dd5a573507ccfcb07c328648b4eb0)
+- update [`344d303`](https://github.com/underpostnet/engine/commit/344d303702ebce22dff50d8c0f8d8d870a2860ee)
+
+#### [v2.5.6](https://github.com/underpostnet/engine/compare/v2.5.2...v2.5.6)
+
+> 13 September 2024
+
+- update version 2.5.6 [`ca57b87`](https://github.com/underpostnet/engine/commit/ca57b87c56a544e7b7e53baa5a6e15415e16b99b)
+- update [`eec4943`](https://github.com/underpostnet/engine/commit/eec49433f50b4dfa7b7bbff48891a60f5be25545)
+- update [`5f0a6ac`](https://github.com/underpostnet/engine/commit/5f0a6aca1ae971bc42f654cf3f2bf7ace7fe613d)
+
+#### [v2.5.2](https://github.com/underpostnet/engine/compare/v2.5.1...v2.5.2)
+
+> 12 September 2024
+
+- update dependebot security [`1289b96`](https://github.com/underpostnet/engine/commit/1289b9627dc59bf08e66edbef1bf7bf08e53984c)
+- update [`ec11af8`](https://github.com/underpostnet/engine/commit/ec11af86e884ca3eeaeaa12695edddaa8b46492d)
+- remove toast-ui [`40c207f`](https://github.com/underpostnet/engine/commit/40c207f13f3e6d7ab71fc4cc203ce6ff02101bb5)
+
+#### [v2.5.1](https://github.com/underpostnet/engine/compare/v2.5.0...v2.5.1)
+
+> 27 August 2024
+
+- refactor ssr [`4fa5d24`](https://github.com/underpostnet/engine/commit/4fa5d24531f791fa860a4ba38b9784491f084a68)
+- bucket to document [`747cb0b`](https://github.com/underpostnet/engine/commit/747cb0bf5198e4b97df186e642413fa49ed9383f)
+- add user control table managements [`2cfb710`](https://github.com/underpostnet/engine/commit/2cfb7103a591b941897ff3834ad5874565cba6b4)
+
+#### [v2.5.0](https://github.com/underpostnet/engine/compare/v2.0.0...v2.5.0)
+
+> 23 August 2024
+
+- css refactor [`49b1904`](https://github.com/underpostnet/engine/commit/49b1904e83162f9066fbf843ced37d4e87db5581)
+- refactor [`dad4f95`](https://github.com/underpostnet/engine/commit/dad4f9567629b737254702ce8be6b243e68fb01e)
+- add sitemap builder [`53d05a6`](https://github.com/underpostnet/engine/commit/53d05a62d03ea327df3d37181a4b5c272d417289)
+
+### [v2.0.0](https://github.com/underpostnet/engine/compare/v1.0.4...v2.0.0)
+
+> 30 March 2024
+
+- seed-city assets [`6d9decb`](https://github.com/underpostnet/engine/commit/6d9decbae96b828aa001777f96dd75aab3fc71d1)
+- update [`1069fc5`](https://github.com/underpostnet/engine/commit/1069fc5268aa5ef7c101695393de59edfc14daf8)
+- update [`41ae7d4`](https://github.com/underpostnet/engine/commit/41ae7d4c969cce0608171c820e05ebab42610a7f)
+
+#### [v1.0.4](https://github.com/underpostnet/engine/compare/v1.0.3...v1.0.4)
+
+> 14 January 2023
+
+- update [`8109700`](https://github.com/underpostnet/engine/commit/81097008baa95ac50efb760b228dc4abae63c379)
+- update [`b6bb47f`](https://github.com/underpostnet/engine/commit/b6bb47f95bd56c0062066ecae5f03813cf1ed6f8)
+- update [`15c0ca9`](https://github.com/underpostnet/engine/commit/15c0ca9f9a8203bec53a9677d5a8edcd04a7f1df)
+
+#### [v1.0.3](https://github.com/underpostnet/engine/compare/v1.0.2...v1.0.3)
+
+> 21 December 2022
+
+- update [`69418ba`](https://github.com/underpostnet/engine/commit/69418ba34831983e07aa458d1ea4a742c7b66096)
+- update [`003412f`](https://github.com/underpostnet/engine/commit/003412fadf3efe6b819f037e99855192f13ccd7e)
+
+#### [v1.0.2](https://github.com/underpostnet/engine/compare/v1.0.1...v1.0.2)
+
+> 21 December 2022
+
+- update [`470f07a`](https://github.com/underpostnet/engine/commit/470f07a72398792ac9ecf07bf1ba5170bc427dc5)
+- update [`dacc20a`](https://github.com/underpostnet/engine/commit/dacc20a14971388bcf2a5077286989a77197aadc)
+- update [`d2efee0`](https://github.com/underpostnet/engine/commit/d2efee08f9b31dd9fca31a3b1b15bdaa0e75faea)
+
+#### v1.0.1
+
+> 11 October 2022
+
+- update [`bd40237`](https://github.com/underpostnet/engine/commit/bd402372513151a15a972a7727f7d77d014739f1)
+- update [`39dd3b9`](https://github.com/underpostnet/engine/commit/39dd3b9a5a6b4292b899840dd5cd333cc80410d1)
+- First Commit [`ad7b2a3`](https://github.com/underpostnet/engine/commit/ad7b2a3be0746b34fa19ba896d3faa7f1b4f40dc)

package/Dockerfile

@@ -76,11 +76,13 @@ RUN apt-get install -y mongodb-org
 RUN sed -i "s,\\(^[[:blank:]]*bindIp:\\) .*,\\1 0.0.0.0," /etc/mongod.conf
 
 # Bundle app source
-COPY . .
+# COPY . .
 
-RUN npm install
+# Install underpost cli
+RUN npm install -g underpost
 
-VOLUME [ "/code/logs" ]
+
+VOLUME [ "/code/app/logs" ]
 
 EXPOSE 22 80 443 3306 27017
 EXPOSE 3000-3020

package/README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="https://underpost.net/assets/splash/apple-touch-icon-precomposed.png" alt="underpost engine core server"/>
+  <img src="https://underpost.net/assets/splash/apple-touch-icon-precomposed.png" alt="underpost.net"/>
 </p>
 
 <div align="center">
@@ -22,7 +22,7 @@ template
 
 <div align="center">
 
-[![Node.js CI](https://github.com/underpostnet/engine/actions/workflows/docker-image.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/docker-image.yml) [![Test](https://github.com/underpostnet/engine/actions/workflows/coverall.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/coverall.yml) [![Coverage Status](https://coveralls.io/repos/github/underpostnet/engine/badge.svg?branch=master)](https://coveralls.io/github/underpostnet/engine?branch=master)
+[![Node.js CI](https://github.com/underpostnet/engine/actions/workflows/docker-image.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/docker-image.yml) [![Test](https://github.com/underpostnet/engine/actions/workflows/coverall.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) [![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)
 
 </div>
 
@@ -45,7 +45,52 @@ npm install -g underpost
 ```
 
 ```bash
-underpost new my-project-name
+underpost new app-name
 ```
 
 After template installation, the server will be running on [http://localhost:4001](http://localhost:4001)
+
+#### Usage
+
+```bash
+cd app-name
+```
+
+Build client bundle
+
+```bash
+npm run build
+```
+
+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/deploy.js

@@ -23,8 +23,9 @@ import {
   getDataDeploy,
 } from '../src/server/conf.js';
 import { buildClient } from '../src/server/client-build.js';
-import { range, setPad, timer } from '../src/client/components/core/CommonJs.js';
+import { range, setPad, timer, uniqueArray } from '../src/client/components/core/CommonJs.js';
 import toJsonSchema from 'to-json-schema';
+import simpleGit from 'simple-git';
 
 const logger = loggerFactory(import.meta);
 
@@ -337,7 +338,7 @@ try {
             if (argHost && argPath && (!argHost.includes(host) || !argPath.includes(path))) {
               delete serverConf[host][path];
             } else {
-              serverConf[host][path].lightBuild = process.argv.includes('l') ? true : false;
+              serverConf[host][path].liteBuild = process.argv.includes('l') ? true : false;
               serverConf[host][path].minifyBuild = process.env.NODE_ENV === 'production' ? true : false;
             }
           }
@@ -441,24 +442,46 @@ try {
         if (!proxyInstance) for (const host of Object.keys(serverConf)) port += Object.keys(serverConf[host]).length;
       }
       break;
+    case 'uml':
+      {
+        shellExec(`node bin/deploy fix-uml ${process.argv.slice(3).join(' ')}`);
+        shellExec(`node bin/deploy build-uml ${process.argv.slice(3).join(' ')}`);
+      }
+      break;
 
+    case 'fix-uml': {
+      // required: java jdk-11.0.1
+
+      // comment:
+      // '--add-opens=java.xml/com.sun.org.apache.xalan.internal.xsltc.trax="ALL-UNNAMED"'
+      // in plantuml.js src
+
+      // const deployId = process.argv[3];
+      // const clientId = process.argv[4];
+      // const folder = `./src/client/public/${clientId ? clientId : 'default'}/docs/plantuml`;
+      // const privateConfFolder = `./engine-private/conf/${deployId}`;
+      // const confData = !deployId
+      //   ? Config.default
+      //   : {
+      //       client: JSON.parse(fs.readFileSync(`${privateConfFolder}/conf.client.json`, 'utf8')),
+      //       ssr: JSON.parse(fs.readFileSync(`${privateConfFolder}/conf.ssr.json`, 'utf8')),
+      //       server: JSON.parse(fs.readFileSync(`${privateConfFolder}/conf.server.json`, 'utf8')),
+      //       cron: JSON.parse(fs.readFileSync(`${privateConfFolder}/conf.cron.json`, 'utf8')),
+      //     };
+
+      fs.writeFileSync(
+        `./node_modules/plantuml/lib/plantuml.js`,
+        fs
+          .readFileSync(`./node_modules/plantuml/lib/plantuml.js`, 'utf8')
+          .replace(`'--add-opens=java.xml/com.sun.org.apache.xalan.internal.xsltc.trax="ALL-UNNAMED"'`, `//`),
+      );
+    }
     case 'build-uml':
       {
-        // comment:
-        // '--add-opens=java.xml/com.sun.org.apache.xalan.internal.xsltc.trax="ALL-UNNAMED"'
-        // in plantuml.js src
-
-        const deployId = process.argv[3];
-        const clientId = process.argv[4];
-        const folder = `./src/client/public/${clientId ? clientId : 'default'}/plantuml`;
-        const confData = !deployId
-          ? Config.default
-          : {
-              client: '',
-              ssr: '',
-              server: '',
-              cron: '',
-            };
+        const host = process.argv[3];
+        const path = process.argv[4];
+        const folder = `./public/${host}${path}/docs/plantuml`;
+        const confData = Config.default;
 
         if (!fs.existsSync(folder)) fs.mkdirSync(folder, { recursive: true });
 
@@ -469,7 +492,7 @@ try {
                 ${JSON.stringify(confData[typeConf])}
               @endjson
             `);
-            fs.writeFileSync(`${folder}/${typeConf}-conf-default.svg`, svg);
+            fs.writeFileSync(`${folder}/${typeConf}-conf.svg`, svg);
           }
           {
             const svg = await plantuml(`
@@ -477,7 +500,7 @@ try {
               ${JSON.stringify(toJsonSchema(confData[typeConf]))}
             @endjson
           `);
-            fs.writeFileSync(`${folder}/${typeConf}-schema-default.svg`, svg);
+            fs.writeFileSync(`${folder}/${typeConf}-schema.svg`, svg);
           }
         }
       }
@@ -547,7 +570,12 @@ try {
         originPackageJson.version = newVersion;
         fs.writeFileSync(`package.json`, JSON.stringify(originPackageJson, null, 4), 'utf8');
 
-        {
+        const originPackageLockJson = JSON.parse(fs.readFileSync(`package-lock.json`, 'utf8'));
+        originPackageLockJson.version = newVersion;
+        originPackageLockJson.packages[''].version = newVersion;
+        fs.writeFileSync(`package-lock.json`, JSON.stringify(originPackageLockJson, null, 4), 'utf8');
+
+        if (fs.existsSync(`./engine-private/conf`)) {
           const files = await fs.readdir(`./engine-private/conf`, { recursive: true });
           for (const relativePath of files) {
             const filePah = `./engine-private/conf/${relativePath.replaceAll(`\\`, '/')}`;
@@ -567,13 +595,14 @@ try {
           'utf8',
         );
 
-        fs.writeFileSync(
-          `./.github/workflows/docker-image.yml`,
-          fs
-            .readFileSync(`./.github/workflows/docker-image.yml`, 'utf8')
-            .replaceAll(`underpost-engine:v${version}`, `underpost-engine:v${newVersion}`),
-          'utf8',
-        );
+        if (fs.existsSync(`./.github/workflows/docker-image.yml`))
+          fs.writeFileSync(
+            `./.github/workflows/docker-image.yml`,
+            fs
+              .readFileSync(`./.github/workflows/docker-image.yml`, 'utf8')
+              .replaceAll(`underpost-engine:v${version}`, `underpost-engine:v${newVersion}`),
+            'utf8',
+          );
 
         fs.writeFileSync(
           `./src/client/components/core/Docs.js`,
@@ -590,8 +619,40 @@ try {
             .replaceAll(`v${version}`, `v${newVersion}`),
           'utf8',
         );
+
+        fs.writeFileSync(
+          `./bin/index.js`,
+          fs.readFileSync(`./bin/index.js`, 'utf8').replaceAll(`${version}`, `${newVersion}`),
+          'utf8',
+        );
       }
       break;
+
+    case 'update-authors': {
+      // shellExec(`git log --reverse --format='%aN (<%aE>)' | sort -u`, { stdout: true });
+      const logs = await simpleGit().log();
+
+      fs.writeFileSync(
+        './AUTHORS.md',
+        `# Authors
+
+#### Ordered by first contribution.
+
+${uniqueArray(logs.all.map((log) => `- ${log.author_name} ([${log.author_email}](mailto:${log.author_email}))`)).join(`
+`)}
+
+#### Generated by [underpost.net](https://underpost.net)`,
+        'utf8',
+      );
+
+      // hash: '1c7418ad2f49c7798a6d28d370b34c69d31dce46',
+      // date: '2024-09-16T17:10:13-03:00',
+      // message: 'update',
+      // refs: '',
+      // body: '',
+      // author_name: 'fcoverdugo',
+      // author_email: 'fcoverdugoa@underpost.net'
+    }
     default:
       break;
   }

package/bin/index.js

@@ -1,29 +1,53 @@
 #! /usr/bin/env node
 
-import { loggerFactory } from '../src/server/logger.js';
 import dotenv from 'dotenv';
 import { shellCd, shellExec } from '../src/server/process.js';
 import fs from 'fs-extra';
+import { Command } from 'commander';
 
 dotenv.config();
 
-const logger = loggerFactory(import.meta);
-
-await logger.setUpInfo();
-
-switch (process.argv[2]) {
-  case 'new':
-    {
-      const projectName = process.argv[3] || 'my-project';
-      const globalBinFolder = shellExec(`npm root -g`, { stdout: true, silent: true }).trim();
-      const destFolder = `${process.cwd()}/${projectName}`;
-      fs.mkdirSync(destFolder, { recursive: true });
-      fs.copySync(`${globalBinFolder}/underpost`, destFolder);
-      shellCd(`${destFolder}`);
-      shellExec(`npm run install-template`);
-      shellExec(`npm run dev`);
-    }
-    break;
-  default:
-    break;
-}
+const globalBinFolder = `${shellExec(`npm root -g`, {
+  stdout: true,
+  silent: true,
+  disableLog: true,
+}).trim()}/underpost`;
+
+const program = new Command();
+
+const version = '2.7.1';
+
+program.name('underpost').description(`underpost.net ci/cd cli ${version}`).version(version);
+
+program
+  .command('new <app-name>')
+  .description('Create a new project')
+  .action((appName) => {
+    const destFolder = `${process.cwd()}/${appName}`;
+    console.log('Note: This process may take several minutes to complete');
+    console.log('build app', { destFolder });
+    fs.mkdirSync(destFolder, { recursive: true });
+    fs.copySync(globalBinFolder, destFolder);
+    fs.writeFileSync(`${destFolder}/.gitignore`, fs.readFileSync(`${globalBinFolder}/.dockerignore`, 'utf8'), 'utf8');
+    shellCd(`${destFolder}`);
+    shellExec(`git init && git add . && git commit -m "Base template implementation"`);
+    shellExec(`npm run install-template`);
+    shellExec(`npm run dev`);
+  });
+
+program
+  .command('test')
+  .description('Run tests')
+  .action(() => {
+    shellCd(`${globalBinFolder}`);
+    shellExec(`npm run test`);
+  });
+
+program
+  .command('help')
+  .description('Display help information')
+  .action(() => {
+    program.outputHelp();
+  });
+
+program.parse();

package/bin/ssl.js

@@ -29,6 +29,9 @@ try {
       cmd = `certbot certonly --webroot --webroot-path ${
         directory ? directory : `${getRootDirectory()}/public/${host}`
       } -d ${host}`;
+      // directory ? directory : `${getRootDirectory()}/public/${host}`
+      // directory ? directory : `${getRootDirectory()}/public/www.${host.split('.').slice(-2).join('.')}`
+
       // You can get multi domain cert by specifying (extra) -d
       // For example
       // certbot -d example.com -d example.net -d www.example.org

package/conf.js

@@ -179,7 +179,7 @@ const DefaultConf = {
         origins: [],
         minifyBuild: false,
         iconsBuild: true,
-        lightBuild: false,
+        liteBuild: false,
         docsBuild: false,
         ws: 'core',
         peer: true,
@@ -217,7 +217,7 @@ const DefaultConf = {
         apis: [],
         origins: [],
         minifyBuild: false,
-        lightBuild: true,
+        liteBuild: true,
         proxy: [80, 443],
       },
     },
@@ -238,6 +238,11 @@ const DefaultConf = {
         },
       ],
     },
+    backups: [
+      {
+        deployGroupId: 'default-group',
+      },
+    ],
   },
 };
 

package/docker-compose.yml

@@ -58,7 +58,7 @@ services:
           cpus: '0.25'
           memory: 20M
     labels: # labels in Compose file instead of Dockerfile
-      engine.version: '2.6.2'
+      engine.version: '2.7.1'
     networks:
       - load-balancer