underpost 3.2.70 → 3.2.80

package/src/cli/run.js

@@ -14,7 +14,9 @@ import {
   etcHostFactory,
   getNpmRootPath,
   isDeployRunnerContext,
+  loadConfInstances,
   loadConfServerJson,
+  selectConfInstances,
   loadReplicas,
   writeEnv,
 } from '../server/conf.js';
@@ -49,6 +51,32 @@ const waitForPort = (port, host = '127.0.0.1', { maxAttempts = 30, interval = 20
 
 const logger = loggerFactory(import.meta);
 
+/**
+ * @method instanceProxyRoutesFactory
+ * @description Renders the HTTPProxy route block for every instance sharing a host.
+ * Routes are emitted longest-prefix first so a specific instance path (`/FOREST`)
+ * is never shadowed by the default instance's catch-all (`/`).
+ * @param {string} deployId - Parent deployment identifier.
+ * @param {Array<object>} instances - Expanded instance entries bound to one host.
+ * @param {string} env - `development` | `production`.
+ * @param {Object<string,string>} trafficById - Instance id → traffic colour.
+ * @returns {string} Concatenated route YAML.
+ */
+const instanceProxyRoutesFactory = ({ deployId, instances, env, trafficById }) =>
+  [...instances]
+    .sort((a, b) => (b.path || '/').length - (a.path || '/').length)
+    .map((instance) =>
+      Underpost.deploy.deploymentYamlServiceFactory({
+        path: instance.path,
+        port: env === 'development' && instance.fromDebugPort ? instance.fromDebugPort : instance.fromPort,
+        deployId: `${deployId}-${instance.id}`,
+        env,
+        deploymentVersions: [trafficById[instance.id] || 'blue'],
+        pathRewritePolicy: instance.pathRewritePolicy,
+      }),
+    )
+    .join('');
+
 /**
  * @constant DEFAULT_OPTION
  * @description Default options for the UnderpostRun class.
@@ -123,6 +151,7 @@ const logger = loggerFactory(import.meta);
  * @property {boolean} pullBundle - Whether to pull the bundle before running. Use together with --skip-full-build to skip the local build entirely (supported by: sync, template-deploy).
  * @property {boolean} remove - Whether to remove/teardown resources instead of creating them (e.g. delete-expose for k3s proxy devices in dev-cluster).
  * @property {boolean} test - Whether to enable test/generic-purpose mode (e.g. use self-signed TLS instead of cert-manager).
+ * @property {string} branch - The Git branch to use for operations (e.g., for template-deploy, ssh-deploy).
  * @memberof UnderpostRun
  */
 const DEFAULT_OPTION = {
@@ -193,6 +222,7 @@ const DEFAULT_OPTION = {
   pullBundle: false,
   remove: false,
   test: false,
+  branch: '',
 };
 
 /**
@@ -714,10 +744,11 @@ class UnderpostRun {
       if (deployConfId) inputs.deploy_conf_id = deployConfId;
       if (deployType) inputs.deploy_type = deployType;
 
+      // Omit `ref` so dispatchWorkflow auto-detects the repo's default branch
+      // (a fork may default to `main` rather than the monorepo's `master`).
       Underpost.repo.dispatchWorkflow({
         repo,
         workflowFile: 'npmpkg.ci.yml',
-        ref: 'master',
         inputs,
       });
     },
@@ -761,7 +792,7 @@ class UnderpostRun {
      * @memberof UnderpostRun
      */
     'docker-image': (path, options = DEFAULT_OPTION) => {
-      const repo = Underpost.repo.resolveInstanceRepo(path, options.dev);
+      const repo = Underpost.repo.resolveInstanceRepo(path, !options.test);
       Underpost.repo.dispatchWorkflow({
         repo,
         workflowFile: `docker-image${path ? `.${path}` : ''}${options.dev ? '.dev' : ''}.ci.yml`,
@@ -841,11 +872,13 @@ class UnderpostRun {
         job = 'init';
         confId = path.replace(/^init-/, '');
       }
-      const repo = Underpost.repo.resolveInstanceRepo(confId, options.dev);
+      const repo = Underpost.repo.resolveInstanceRepo(confId, !options.test);
+      // Omit `ref` so dispatchWorkflow auto-detects the target repo's default
+      // branch (getDefaultBranch): the monorepo is `master` but instance repos
+      // like engine-cyberia default to `main` — hardcoding either 422s.
       Underpost.repo.dispatchWorkflow({
         repo,
         workflowFile: `${confId}.cd.yml`,
-        ref: 'master',
         inputs: { job },
       });
     },
@@ -1182,66 +1215,54 @@ echo -e "[code]\nname=Visual Studio Code\nbaseurl=https://packages.microsoft.com
 
     'instance-promote': async (path, options = DEFAULT_OPTION) => {
       const env = options.dev ? 'development' : 'production';
-      const baseCommand = options.dev ? 'node bin' : 'underpost';
-      const baseClusterCommand = options.dev ? ' --dev' : '';
       let [deployId, id] = path.split(',');
-      const confInstances = JSON.parse(
-        fs.readFileSync(`./engine-private/conf/${deployId}/conf.instances.json`, 'utf8'),
-      );
+      const confInstances = loadConfInstances(deployId);
+      const promoted = selectConfInstances(confInstances, id);
       let promotedTraffic = '';
-      for (const instance of confInstances) {
-        let {
-          id: _id,
-          host: _host,
-          path: _path,
-          image: _image,
-          fromPort: _fromPort,
-          toPort: _toPort,
-          fromDebugPort: _fromDebugPort,
-          toDebugPort: _toDebugPort,
-          cmd: _cmd,
-          volumes: _volumes,
-          metadata: _metadata,
-        } = instance;
-        if (id !== _id) continue;
-        const _deployId = `${deployId}-${_id}`;
-        // Use debug ports in development when defined, fall back to production ports.
-        if (env === 'development' && _fromDebugPort) _fromPort = _fromDebugPort;
-        if (env === 'development' && _toDebugPort) _toPort = _toDebugPort;
-        const currentTraffic = Underpost.deploy.getCurrentTraffic(_deployId, {
-          hostTest: _host,
+
+      // A Contour HTTPProxy is named after its host, so every instance sharing a
+      // host shares one object. Rebuilding it from the promoted instance alone
+      // would drop its siblings' routes, so each host is rendered from the full
+      // set: promoted instances flip colour, the rest keep their live colour.
+      const promotedIds = new Set(promoted.map((instance) => instance.id));
+      const hosts = [...new Set(promoted.map((instance) => instance.host))];
+      const affected = confInstances.filter((instance) => hosts.includes(instance.host));
+      const trafficById = {};
+      for (const instance of affected) {
+        const currentTraffic = Underpost.deploy.getCurrentTraffic(`${deployId}-${instance.id}`, {
+          hostTest: instance.host,
           namespace: options.namespace,
+          env,
         });
-        const targetTraffic = currentTraffic ? (currentTraffic === 'blue' ? 'green' : 'blue') : 'blue';
-        promotedTraffic = targetTraffic;
+        if (!promotedIds.has(instance.id)) {
+          trafficById[instance.id] = currentTraffic || 'blue';
+          continue;
+        }
+        trafficById[instance.id] = currentTraffic ? (currentTraffic === 'blue' ? 'green' : 'blue') : 'blue';
+        promotedTraffic = trafficById[instance.id];
+      }
+
+      for (const host of hosts) {
+        const hostInstances = affected.filter((instance) => instance.host === host);
         let proxyYaml =
-          Underpost.deploy.baseProxyYamlFactory({ host: _host, env: options.tls ? 'production' : env, options }) +
-          Underpost.deploy.deploymentYamlServiceFactory({
-            path: _path,
-            port: _fromPort,
-            // serviceId: deployId,
-            deployId: _deployId,
-            env,
-            deploymentVersions: [targetTraffic],
-            // pathRewritePolicy,
-          });
+          Underpost.deploy.baseProxyYamlFactory({ host, env: options.tls ? 'production' : env, options }) +
+          instanceProxyRoutesFactory({ deployId, instances: hostInstances, env, trafficById });
         if (options.tls) {
           if (options.test) {
-            const sslDir = `./engine-private/ssl/${_host}`;
-            const nameSafe = _host.replace(/[^a-zA-Z0-9_.-]/g, '_');
+            const sslDir = `./engine-private/ssl/${host}`;
+            const nameSafe = host.replace(/[^a-zA-Z0-9_.-]/g, '_');
             fs.mkdirpSync(sslDir);
-            shellExec(`bash ./scripts/ssl.sh "${sslDir}" "${_host}"`);
-            shellExec(`kubectl delete secret ${_host} -n ${options.namespace} --ignore-not-found`);
+            shellExec(`bash ./scripts/ssl.sh "${sslDir}" "${host}"`);
+            shellExec(`kubectl delete secret ${host} -n ${options.namespace} --ignore-not-found`);
             shellExec(
-              `kubectl create secret tls ${_host} --cert="${sslDir}/${nameSafe}.pem" --key="${sslDir}/${nameSafe}-key.pem" -n ${options.namespace}`,
+              `kubectl create secret tls ${host} --cert="${sslDir}/${nameSafe}.pem" --key="${sslDir}/${nameSafe}-key.pem" -n ${options.namespace}`,
             );
           } else {
-            shellExec(`sudo kubectl delete Certificate ${_host} -n ${options.namespace} --ignore-not-found`);
-            proxyYaml += Underpost.deploy.buildCertManagerCertificate({ ...options, host: _host });
+            shellExec(`sudo kubectl delete Certificate ${host} -n ${options.namespace} --ignore-not-found`);
+            proxyYaml += Underpost.deploy.buildCertManagerCertificate({ ...options, host });
           }
         }
-        // console.log(proxyYaml);
-        shellExec(`kubectl delete HTTPProxy ${_host} --namespace ${options.namespace} --ignore-not-found`);
+        shellExec(`kubectl delete HTTPProxy ${host} --namespace ${options.namespace} --ignore-not-found`);
         shellExec(
           `kubectl apply -f - -n ${options.namespace} <<EOF
 ${proxyYaml}
@@ -1276,9 +1297,7 @@ EOF
       const baseClusterCommand = options.dev ? ' --dev' : '';
       let [deployId, id, replicas] = path.split(',');
       if (!replicas) replicas = options.replicas;
-      const confInstances = JSON.parse(
-        fs.readFileSync(`./engine-private/conf/${deployId}/conf.instances.json`, 'utf8'),
-      );
+      const confInstances = selectConfInstances(loadConfInstances(deployId), id);
       const etcHosts = [];
       for (const instance of confInstances) {
         let {
@@ -1297,7 +1316,6 @@ EOF
           readinessProbe: _readinessProbe,
           livenessProbe: _livenessProbe,
         } = instance;
-        if (id !== _id) continue;
         const _deployId = `${deployId}-${_id}`;
         // Use debug ports in development when defined, fall back to production ports.
         if (env === 'development' && _fromDebugPort) _fromPort = _fromDebugPort;
@@ -1321,6 +1339,7 @@ EOF
         const currentTraffic = Underpost.deploy.getCurrentTraffic(_deployId, {
           hostTest: _host,
           namespace: options.namespace,
+          env,
         });
 
         const targetTraffic = currentTraffic ? (currentTraffic === 'blue' ? 'green' : 'blue') : 'blue';
@@ -1426,13 +1445,15 @@ EOF
           logger.error(`Deployment ${deployId} did not become ready in time.`);
           return;
         }
-        shellExec(
-          `${baseCommand} run${baseClusterCommand} --namespace ${options.namespace}` +
-            `${options.nodeName ? ` --node-name ${options.nodeName}` : ''}` +
-            `${options.tls ? ` --tls ${options.test ? '--test' : ''}` : ''}` +
-            ` instance-promote '${path}'`,
-        );
       }
+      // Promote (switch the HTTPProxy to the new colour) ONLY after EVERY
+      // instance in the family is deployed and ready — never per-instance inside
+      // the loop. A per-variant switch would flip server.cyberiaonline.com to the
+      // default's new deployment while -forest/-test are still being created,
+      // pointing routes at services that don't exist yet. instance-promote
+      // rebuilds the whole host proxy (all variant routes) in one shot, so a
+      // single call with the family id promotes the family atomically.
+      if (!options.expose) await UnderpostRun.RUNNERS['instance-promote'](`${deployId},${id}`, options);
       if (options.etcHosts) {
         const hostListenResult = etcHostFactory(etcHosts);
         logger.info(hostListenResult.renderHosts);
@@ -1489,26 +1510,42 @@ EOF
       const env = options.dev ? 'development' : 'production';
       let [deployId, id, projectPath] = path.split(',');
       const rootPath = projectPath ? projectPath : '.';
+
+      const confInstances = loadConfInstances(deployId);
+      // Targeting a template id builds every world in the family. The fan-out
+      // re-enters this runner with `instanceOnly` because the default world
+      // keeps the template id verbatim — without it, selecting `mmo-server`
+      // would match the family again and recurse forever. Only that default
+      // world publishes to the project root, so the repo keeps exactly one
+      // canonical Dockerfile/deployment.yaml pair.
+      const selected = options.instanceOnly
+        ? confInstances.filter((instance) => instance.id === id)
+        : selectConfInstances(confInstances, id);
+      if (selected.length === 0) {
+        logger.error(`Instance with id '${id}' not found in conf.instances.json for deployId '${deployId}'`);
+        return;
+      }
+      if (!options.instanceOnly && (selected.length > 1 || selected[0].id !== id)) {
+        for (const instance of selected)
+          UnderpostRun.RUNNERS['instance-build-manifest'](
+            [deployId, instance.id, projectPath].filter((v) => v !== undefined).join(','),
+            { ...options, instanceOnly: true },
+          );
+        return;
+      }
+
       const envManifestPath = `${rootPath}/manifests/deployments/${id}-${env}`;
       const outputPath = `${envManifestPath}/deployment.yaml`;
       const dockerfileManifestPath = `${envManifestPath}/Dockerfile`;
 
       fs.mkdirpSync(envManifestPath);
 
-      const confInstances = JSON.parse(
-        fs.readFileSync(`./engine-private/conf/${deployId}/conf.instances.json`, 'utf8'),
-      );
-
-      const instance = confInstances.find((i) => i.id === id);
-      if (!instance) {
-        logger.error(`Instance with id '${id}' not found in conf.instances.json for deployId '${deployId}'`);
-        return;
-      }
+      const instance = selected[0];
+      const isDefaultInstance = instance.id === instance.templateId || !instance.templateId;
 
       let {
         id: _id,
         host: _host,
-        path: _path,
         image: _image,
         fromPort: _fromPort,
         toPort: _toPort,
@@ -1651,15 +1688,19 @@ EOF
         })}\n`;
       }
 
-      // proxy.yaml — HTTPProxy for the instance host (mirrors instance-promote).
+      // proxy.yaml — this instance's OWN route only (its sub-path → its own
+      // service), so each variant's build dir carries a distinct, instance-scoped
+      // fragment rather than an identical copy of the whole host proxy. The
+      // complete host HTTPProxy — every variant's route aggregated onto the one
+      // fqdn, each pointing at its live colour — is assembled and applied by
+      // `instance-promote` at deploy time, and only once EVERY variant is ready.
       const proxyYaml =
         Underpost.deploy.baseProxyYamlFactory({ host: _host, env, options }) +
-        Underpost.deploy.deploymentYamlServiceFactory({
-          path: _path,
-          port: _fromPort,
-          deployId: _deployId,
+        instanceProxyRoutesFactory({
+          deployId,
+          instances: [instance],
           env,
-          deploymentVersions: [targetTraffic],
+          trafficById: { [instance.id]: targetTraffic },
         });
 
       // grpc-service.yaml — the parent deploy's gRPC ClusterIP (shared; the
@@ -1693,7 +1734,39 @@ EOF
         grpcService: !!grpcServiceYaml,
       });
 
-      if (env === 'production') {
+      // --- Per-instance env files -----------------------------------------
+      // Each env file is seeded from the template instance's env file for the
+      // same mode so operator-owned keys (API keys, memory limits, service URLs)
+      // are inherited verbatim; only the keys the instance declares under
+      // `multiInstance.env` — plus the derived container id — are (re)written.
+      //
+      // A derived instance's env dir is generated in full: both development.env
+      // and production.env are written on every build, so a deploy in either
+      // environment always finds the env file its `cmd` sources, no matter which
+      // mode this build ran. The default/template instance owns the committed
+      // source files, so only its current-mode file is idempotently refreshed.
+      if (instance.templateId) {
+        const instanceEnvDir = `./engine-private/conf/${deployId}/instances/${_id}/env`;
+        fs.mkdirpSync(instanceEnvDir);
+        const envsToWrite = isDefaultInstance ? [env] : ['development', 'production'];
+        for (const targetEnv of envsToWrite) {
+          const templateEnvPath = `./engine-private/conf/${deployId}/instances/${instance.templateId}/env/${targetEnv}.env`;
+          const baseEnv = fs.existsSync(templateEnvPath) ? dotenv.parse(fs.readFileSync(templateEnvPath, 'utf8')) : {};
+          writeEnv(`${instanceEnvDir}/${targetEnv}.env`, {
+            ...baseEnv,
+            ...(instance.instanceEnv?.[targetEnv] || {}),
+            CONTAINER_DEPLOY_ID: `${_deployId}-${targetEnv}`,
+          });
+        }
+        logger.info('[instance-build-manifest] Instance env written', {
+          dir: instanceEnvDir,
+          instanceCode: instance.instanceCode,
+          envs: envsToWrite,
+          keys: Object.keys(instance.instanceEnv?.[env] || {}),
+        });
+      }
+
+      if (env === 'production' && isDefaultInstance) {
         if (fs.existsSync(dockerfileManifestPath)) {
           fs.copyFileSync(dockerfileManifestPath, `${rootPath}/Dockerfile`);
         }

package/src/cli/ssh.js

@@ -532,12 +532,28 @@ EOF`);
       if (!host) throw new Error('copyDirToNode requires a host');
       if (!localDir || !fs.existsSync(localDir)) throw new Error(`copyDirToNode: local dir not found: ${localDir}`);
       if (!remoteDir) throw new Error('copyDirToNode requires a remoteDir');
-      shellExec(`chmod 600 ${keyPath}`, { silent: true, silentOnError: true, disableLog: true });
-      const sshOpts = `-i ${keyPath} -o BatchMode=yes -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p ${port}`;
-      shellExec(`ssh ${sshOpts} ${user}@${host} 'mkdir -p ${remoteDir}'`);
-      shellExec(`tar -C ${localDir} -c . | ssh ${sshOpts} ${user}@${host} 'tar -C ${remoteDir} -x'`);
-      const fixups = `${owner ? `chown -R ${owner} ${remoteDir}; ` : ''}${mode ? `chmod -R ${mode} ${remoteDir}` : ''}`.trim();
-      if (fixups) shellExec(`ssh ${sshOpts} ${user}@${host} '${fixups}'`);
+      try {
+        shellExec(`chmod 600 ${keyPath}`, { silent: true, silentOnError: true, disableLog: true });
+        const sshOpts = `-i ${keyPath} -o BatchMode=yes -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p ${port}`;
+        shellExec(`ssh ${sshOpts} ${user}@${host} 'mkdir -p ${remoteDir}'`, {
+          silent: true,
+          disableLog: true,
+        });
+        shellExec(`tar -C ${localDir} -c . | ssh ${sshOpts} ${user}@${host} 'tar -C ${remoteDir} -x'`, {
+          silent: true,
+          disableLog: true,
+        });
+        const fixups =
+          `${owner ? `chown -R ${owner} ${remoteDir}; ` : ''}${mode ? `chmod -R ${mode} ${remoteDir}` : ''}`.trim();
+        if (fixups)
+          shellExec(`ssh ${sshOpts} ${user}@${host} '${fixups}'`, {
+            silent: true,
+            disableLog: true,
+          });
+      } catch (err) {
+        logger.error(`copyDirToNode failed`);
+        process.exit(1);
+      }
     },
 
     /**
@@ -703,11 +719,14 @@ EOF
 
       let last = { ok: false, code: 255, stdout: '', stderr: '', attempts: 0 };
       for (let attempt = 1; attempt <= retries; attempt++) {
-        const result = shellExec(`ssh ${sshOpts} ${user}@${host} bash -s <<'UNDERPOST_SSH_BATCH_EOF'\n${command}\nUNDERPOST_SSH_BATCH_EOF`, {
-          stdout: false,
-          silentOnError: true,
-          disableLog: true,
-        });
+        const result = shellExec(
+          `ssh ${sshOpts} ${user}@${host} bash -s <<'UNDERPOST_SSH_BATCH_EOF'\n${command}\nUNDERPOST_SSH_BATCH_EOF`,
+          {
+            stdout: false,
+            silentOnError: true,
+            disableLog: true,
+          },
+        );
         last = {
           ok: result.code === 0,
           code: result.code,

package/src/client/components/core/Modal.js

@@ -425,8 +425,8 @@ class Modal {
               s(`.main-body-btn-ui-menu-menu`).classList.add('hide');
               s(`.main-body-btn-ui-menu-close`).classList.remove('hide');
               if (s(`.btn-bar-center-icon-menu`)) {
-                s(`.btn-bar-center-icon-close`).classList.remove('hide');
-                s(`.btn-bar-center-icon-menu`).classList.add('hide');
+                sa(`.btn-bar-center-icon-close`).forEach((el) => el.classList.remove('hide'));
+                sa(`.btn-bar-center-icon-menu`).forEach((el) => el.classList.add('hide'));
               }
 
               s(`.main-body-btn-container`).style[
@@ -449,8 +449,8 @@ class Modal {
               s(`.main-body-btn-ui-menu-close`).classList.add('hide');
               s(`.main-body-btn-ui-menu-menu`).classList.remove('hide');
               if (s(`.btn-bar-center-icon-menu`)) {
-                s(`.btn-bar-center-icon-menu`).classList.remove('hide');
-                s(`.btn-bar-center-icon-close`).classList.add('hide');
+                sa(`.btn-bar-center-icon-menu`).forEach((el) => el.classList.remove('hide'));
+                sa(`.btn-bar-center-icon-close`).forEach((el) => el.classList.add('hide'));
               }
               s(`.main-body-btn-container`).style[
                 true || (options.mode && options.mode.match('right')) ? 'right' : 'left'
@@ -683,6 +683,34 @@ class Modal {
                       >
                     </div>`
                   : ''}
+                ${idModal === 'modal-menu' && options.mode !== 'slide-menu-right'
+                  ? html`<div
+                        class="abs main-btn-menu-top-container"
+                        style="bottom: 0px; left: 0px; z-index: 10; height: ${originHeightTopBar}px; width: ${originHeightTopBar}px"
+                      >
+                        ${await BtnIcon.instance({
+                          style: `height: 100%`,
+                          class: `in fll main-btn-menu-top action-bar-box action-btn-center-top`,
+                          label: html`<div class="abs center">
+                            <i class="far fa-square btn-bar-center-icon-square hide"></i>
+                            <span class="btn-bar-center-icon-close hide">${barConfig.buttons.close.label}</span>
+                            <span class="btn-bar-center-icon-menu">${barConfig.buttons.menu.label}</span>
+                          </div>`,
+                        })}
+                      </div>
+
+                      <style>
+                        .a-link-top-banner {
+                          padding-left: 35px;
+                        }
+                        .main-body-btn-bar-custom {
+                          top: 50px !important;
+                        }
+                        .main-body-btn-menu {
+                          display: none;
+                        }
+                      </style>`
+                  : ''}
               </div>`,
             );
             EventsUI.onClick(`.action-btn-profile-log-in`, () => {
@@ -697,6 +725,12 @@ class Modal {
               }
               s(`.main-btn-sign-up`).click();
             });
+            if (idModal === 'modal-menu' && options.mode !== 'slide-menu-right') {
+              EventsUI.onClick(`.action-btn-center-top`, (e) => {
+                e.preventDefault();
+                Modal.actionBtnCenter();
+              });
+            }
             s(`.input-info-${inputSearchBoxId}`).style.textAlign = 'left';
             htmls(`.input-info-${inputSearchBoxId}`, '');
             const inputInfoNode = s(`.input-info-${inputSearchBoxId}`).cloneNode(true);

package/src/index.js

@@ -45,7 +45,7 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v3.2.70';
+  static version = 'v3.2.80';
 
   /**
    * Required Node.js major version