underpost 3.2.4 → 3.2.8

package/src/server/conf.js

@@ -148,6 +148,23 @@ const getConfFolder = (deployId) => {
     : `./engine-private/conf/${deployId}`;
 };
 
+/**
+ * Reads `engine-private/deploy/dd.cron` and returns the deploy-id string,
+ * or `null` if the file does not exist or is empty.
+ *
+ * @method cronDeployIdResolve
+ * @returns {string|null} The deploy-id from dd.cron, or null.
+ * @memberof ServerConfBuilder
+ */
+const cronDeployIdResolve = () => {
+  const cronDeployFile = './engine-private/deploy/dd.cron';
+  if (fs.existsSync(cronDeployFile)) {
+    const id = fs.readFileSync(cronDeployFile, 'utf8').trim();
+    return id || null;
+  }
+  return null;
+};
+
 /**
  * Loads the deployment-specific `.env` file referenced by `engine-private/deploy/dd.cron`
  * into `process.env`. Uses `NODE_ENV` to select the environment variant
@@ -162,15 +179,12 @@ function loadCronDeployEnv() {
   const envName = process.env.NODE_ENV || 'production';
 
   // 1) Load dd.cron env (takes full precedence)
-  const cronDeployFile = './engine-private/deploy/dd.cron';
-  if (fs.existsSync(cronDeployFile)) {
-    const cronDeployId = fs.readFileSync(cronDeployFile, 'utf8').trim();
-    if (cronDeployId) {
-      const cronEnvPath = `./engine-private/conf/${cronDeployId}/.env.${envName}`;
-      if (fs.existsSync(cronEnvPath)) {
-        const cronEnv = dotenv.parse(fs.readFileSync(cronEnvPath, 'utf8'));
-        process.env = { ...process.env, ...cronEnv };
-      }
+  const cronDeployId = cronDeployIdResolve();
+  if (cronDeployId) {
+    const cronEnvPath = `./engine-private/conf/${cronDeployId}/.env.${envName}`;
+    if (fs.existsSync(cronEnvPath)) {
+      const cronEnv = dotenv.parse(fs.readFileSync(cronEnvPath, 'utf8'));
+      process.env = { ...process.env, ...cronEnv };
     }
   }
 
@@ -443,7 +457,7 @@ const loadConf = (deployId = DEFAULT_DEPLOY_ID, subConf) => {
     fs.removeSync(`${path}/.env.production`);
     fs.removeSync(`${path}/.env.development`);
     fs.removeSync(`${path}/.env.test`);
-    if (fs.existsSync(`${path}/jsdoc.json`)) shellExec(`git checkout ${path}/jsdoc.json`);
+    if (fs.existsSync(`${path}/typedoc.json`)) shellExec(`git checkout ${path}/typedoc.json`);
     shellExec(`git checkout ${path}/package.json`);
     shellExec(`git checkout ${path}/package-lock.json`);
     return;
@@ -1142,6 +1156,7 @@ const getDataDeploy = async (
 
   let buildDataDeploy = [];
   for (const deployObj of dataDeploy) {
+    const isReplicaDeploy = fs.existsSync(`./engine-private/replica/${deployObj.deployId}`);
     const serverConf = loadReplicas(
       deployObj.deployId,
       loadConfServerJson(`./engine-private/conf/${deployObj.deployId}/conf.server.json`),
@@ -1149,7 +1164,7 @@ const getDataDeploy = async (
     let replicaDataDeploy = [];
     for (const host of Object.keys(serverConf))
       for (const path of Object.keys(serverConf[host])) {
-        if (serverConf[host][path].replicas && serverConf[host][path].singleReplica) {
+        if (!isReplicaDeploy && serverConf[host][path].replicas && serverConf[host][path].singleReplica) {
           if (options && options.buildSingleReplica)
             await Underpost.repo.client(deployObj.deployId, '', host, path, {
               singleReplica: true,
@@ -1197,7 +1212,7 @@ const validateTemplatePath = (absolutePath = '') => {
     return false;
   }
   if (absolutePath.match('conf.dd-') && absolutePath.match('.js')) return false;
-  if (absolutePath.match('jsdoc.dd-') && absolutePath.match('.json')) return false;
+  if (absolutePath.match('typedoc.dd-') && absolutePath.match('.json')) return false;
   if (
     absolutePath.match('src/client/services/') &&
     !clients.find((p) => absolutePath.match(`src/client/services/${p}/`))
@@ -1213,7 +1228,7 @@ const validateTemplatePath = (absolutePath = '') => {
   ) {
     return false;
   }
-  if (absolutePath.match('src/client/sw/') && !clients.find((p) => absolutePath.match(`src/client/sw/${p}.sw.js`))) {
+  if (absolutePath.match('src/client/sw/') && !absolutePath.match('src/client/sw/core.sw.js')) {
     return false;
   }
   if (
@@ -1776,4 +1791,5 @@ export {
   readConfJson,
   DEFAULT_DEPLOY_ID,
   loadCronDeployEnv,
+  cronDeployIdResolve,
 };

package/src/server/cron.js

@@ -64,11 +64,11 @@ const cronJobYamlFactory = ({
     .replace(/^-|-$/g, '')
     .substring(0, 52);
 
-  const cronBin = dev ? 'node bin' : 'underpost';
+  const cronBin = 'node bin'; // dev ? 'node bin' : 'underpost';
   const flags = `${git ? '--git ' : ''}${dev ? '--dev ' : ''}${dryRun ? '--dry-run ' : ''}${k3s ? '--k3s ' : ''}${kind ? '--kind ' : ''}${kubeadm ? '--kubeadm ' : ''}`;
-  const commands = [`cd ${enginePath}`, `node bin run secret`];
+  const commands = [`cd ${enginePath}`]; // `node bin run secret`
   if (cmd) commands.push(cmd);
-  commands.push(`${cronBin} cron ${flags}${deployList} ${jobList}`);
+  commands.push(`${cronBin} cron ${deployList} ${jobList} ${flags}`);
   const fullCommand = commands.join(' &&\n                  ');
 
   return `apiVersion: batch/v1
@@ -272,17 +272,15 @@ class UnderpostCron {
         logger.warn(`package.json not found for deploy-id: ${deployId}`, { path: packageJsonPath });
       }
 
-      // Generate and apply cron job manifests for this deploy-id
-      const hasExplicitCluster = options.k3s || options.kind || options.kubeadm;
       await Underpost.cron.generateK8sCronJobs({
         deployId,
         namespace: options.namespace,
         image: options.image,
         apply: options.apply,
         createJobNow: options.createJobNow,
-        git: options.git !== undefined ? options.git : true,
-        dev: options.dev !== undefined ? options.dev : true,
-        kubeadm: hasExplicitCluster ? !!options.kubeadm : true,
+        git: !!options.git,
+        dev: !!options.dev,
+        kubeadm: !!options.kubeadm,
         cmd: options.cmd || `node bin env ${deployId} production`,
         k3s: !!options.k3s,
         kind: !!options.kind,

package/src/server/dns.js

@@ -265,7 +265,8 @@ class Dns {
    * @returns {Promise<void>}
    */
   static async callback(deployList) {
-    loadCronDeployEnv();
+    // loadCronDeployEnv();
+
     const isOnline = await Dns.isInternetConnection();
 
     if (!isOnline) return;