underpost 2.8.87 → 2.8.88

package/src/server/backup.js

@@ -61,10 +61,10 @@ class BackUp {
         }
       shellExec(
         `cd ./engine-private/cron-backups` +
-          ` && underpost pull . underpostnet/cron-backups` +
+          ` && underpost pull . ${process.env.GITHUB_USERNAME}/cron-backups` +
           ` && git add .` +
           ` && underpost cmt . backup cron-job '${new Date().toLocaleDateString()}'` +
-          ` && underpost push . underpostnet/cron-backups`,
+          ` && underpost push . ${process.env.GITHUB_USERNAME}/cron-backups`,
         {
           disableLog: true,
         },

package/src/server/conf.js

@@ -14,6 +14,7 @@ import { loggerFactory } from './logger.js';
 import { shellExec } from './process.js';
 import { DefaultConf } from '../../conf.js';
 import splitFile from 'split-file';
+import UnderpostRootEnv from '../cli/env.js';
 
 colors.enable();
 
@@ -26,18 +27,19 @@ const Config = {
   build: async function (deployContext = 'dd-default', deployList, subConf) {
     if (typeof process.argv[2] === 'string' && process.argv[2].startsWith('dd-')) deployContext = process.argv[2];
     if (!fs.existsSync(`./tmp`)) fs.mkdirSync(`./tmp`, { recursive: true });
-    fs.writeFileSync(`./tmp/await-deploy`, '', 'utf8');
+    UnderpostRootEnv.API.set('await-deploy', new Date().toISOString());
     if (fs.existsSync(`./engine-private/replica/${deployContext}`))
       return loadConf(deployContext, process.env.NODE_ENV, subConf);
     else if (deployContext.startsWith('dd-')) return loadConf(deployContext, process.env.NODE_ENV, subConf);
     if (deployContext === 'proxy') Config.buildProxy(deployContext, deployList, subConf);
   },
-  deployIdFactory: function (deployId = 'dd-default') {
+  deployIdFactory: function (deployId = 'dd-default', options = { cluster: false }) {
     if (!deployId.startsWith('dd-')) deployId = `dd-${deployId}`;
 
     logger.info('Build deployId', deployId);
 
     const folder = `./engine-private/conf/${deployId}`;
+    const repoName = `engine-${deployId.split('dd-')[1]}`;
 
     if (!fs.existsSync(folder)) fs.mkdirSync(folder, { recursive: true });
     fs.writeFileSync(
@@ -55,10 +57,48 @@ const Config = {
       fs.readFileSync('./.env.test', 'utf8').replaceAll('dd-default', deployId),
       'utf8',
     );
-    fs.writeFileSync(`${folder}/package.json`, fs.readFileSync('./package.json', 'utf8'), 'utf8');
+    fs.writeFileSync(
+      `${folder}/package.json`,
+      fs.readFileSync('./package.json', 'utf8').replaceAll('dd-default', deployId),
+      'utf8',
+    );
 
     this.buildTmpConf(folder);
 
+    if (options.cluster === true) {
+      fs.writeFileSync(
+        `./.github/workflows/${repoName}.cd.yml`,
+        fs.readFileSync(`./.github/workflows/engine-test.cd.yml`, 'utf8').replaceAll('test', deployId.split('dd-')[1]),
+        'utf8',
+      );
+      fs.writeFileSync(
+        `./.github/workflows/${repoName}.ci.yml`,
+        fs.readFileSync(`./.github/workflows/engine-test.ci.yml`, 'utf8').replaceAll('test', deployId.split('dd-')[1]),
+        'utf8',
+      );
+      shellExec(`node bin/deploy update-default-conf ${deployId}`);
+
+      if (!fs.existsSync(`./engine-private/deploy/dd.router`))
+        fs.writeFileSync(`./engine-private/deploy/dd.router`, '', 'utf8');
+
+      fs.writeFileSync(
+        `./engine-private/deploy/dd.router`,
+        fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8').trim() + `,${deployId}`,
+        'utf8',
+      );
+      const updateRepo = (stage = 1) => {
+        shellExec(`git add . && git commit -m "Add base deployId ${deployId} cluster files stage:${stage}"`);
+        shellExec(
+          `cd engine-private && git add . && git commit -m "Add base deployId ${deployId} cluster files stage:${stage}"`,
+        );
+      };
+      updateRepo(1);
+      shellExec(`node bin run --build --dev sync`);
+      updateRepo(2);
+      shellExec(`node bin run --build sync`);
+      updateRepo(3);
+    }
+
     return { deployIdFolder: folder, deployId };
   },
   buildTmpConf: function (folder = './conf') {
@@ -556,7 +596,7 @@ const buildPortProxyRouter = (port, proxyRouter) => {
   // build router
   Object.keys(hosts).map((hostKey) => {
     let { host, path, target, proxy, peer } = hosts[hostKey];
-    if (process.env.NODE_ENV === 'development') host = `localhost`;
+    if (process.env.NODE_ENV === 'development' && process.argv.includes('localhost')) host = `localhost`;
 
     if (!proxy.includes(port)) {
       logger.warn('Proxy port not set on conf', { port, host, path, proxy, target });
@@ -656,7 +696,7 @@ const validateTemplatePath = (absolutePath = '') => {
   const confServer = DefaultConf.server[host][path];
   const confClient = DefaultConf.client[client];
   const confSsr = DefaultConf.ssr[ssr];
-  const clients = Object.keys(confClient).concat(['core', 'test', 'default', 'user']);
+  const clients = DefaultConf.client.default.services;
 
   if (absolutePath.match('src/api') && !confServer.apis.find((p) => absolutePath.match(`src/api/${p}/`))) {
     return false;
@@ -726,9 +766,9 @@ const validateTemplatePath = (absolutePath = '') => {
 };
 
 const awaitDeployMonitor = async (init = false, deltaMs = 1000) => {
-  if (init) fs.writeFileSync(`./tmp/await-deploy`, '', 'utf8');
+  if (init) UnderpostRootEnv.API.set('await-deploy', new Date().toISOString());
   await timer(deltaMs);
-  if (fs.existsSync(`./tmp/await-deploy`)) return await awaitDeployMonitor();
+  if (UnderpostRootEnv.API.get('await-deploy')) return await awaitDeployMonitor();
 };
 
 const getCronBackUpFolder = (host = '', path = '') => {
@@ -917,7 +957,7 @@ const buildCliDoc = (program, oldVersion, newVersion) => {
       baseOptions +
       `
       
-<a target="_top" href="https://github.com/underpostnet/pwa-microservices-template/blob/master/cli.md">See complete CLI Docs here.</a>
+<a target="_top" href="https://github.com/${process.env.GITHUB_USERNAME}/pwa-microservices-template/blob/master/cli.md">See complete CLI Docs here.</a>
       
 `
     ).replaceAll(oldVersion, newVersion),
@@ -925,6 +965,23 @@ const buildCliDoc = (program, oldVersion, newVersion) => {
   );
 };
 
+const getInstanceContext = async (options = { singleReplica, replicas, redirect: '' }) => {
+  const { singleReplica, replicas, redirect } = options;
+
+  if (singleReplica && replicas && replicas.length > 0)
+    return {
+      singleReplicaHost: true,
+    };
+
+  const redirectTarget = redirect
+    ? redirect[redirect.length - 1] === '/'
+      ? redirect.slice(0, -1)
+      : redirect
+    : undefined;
+
+  return { redirectTarget };
+};
+
 export {
   Cmd,
   Config,
@@ -957,4 +1014,5 @@ export {
   awaitDeployMonitor,
   rebuildConfFactory,
   buildCliDoc,
+  getInstanceContext,
 };

package/src/server/process.js

@@ -5,6 +5,7 @@ import dotenv from 'dotenv';
 import fs from 'fs-extra';
 import { loggerFactory } from './logger.js';
 import clipboard from 'clipboardy';
+import UnderpostRootEnv from '../cli/env.js';
 
 dotenv.config();
 
@@ -47,7 +48,7 @@ const ProcessController = {
       this.logger.info(`process on exit`, args);
     });
     this.onSigListen();
-    if (fs.existsSync(`./tmp/await-deploy`)) fs.remove(`./tmp/await-deploy`);
+    UnderpostRootEnv.API.delete('await-deploy');
   },
 };