ante-erp-cli 1.11.23 → 1.11.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ante-erp-cli",
-  "version": "1.11.23",
+  "version": "1.11.25",
   "description": "Comprehensive CLI tool for managing ANTE ERP self-hosted installations",
   "type": "module",
   "bin": {

package/src/commands/set-domain.js

@@ -402,73 +402,140 @@ export async function setDomain(options) {
         if (hasPosApp) posAppUrl = buildURL(ipConfig.ip, ipConfig.posAppPort);
       } else {
         // Manual URL input (domain configuration)
-        const domainPrompts = [
+
+        // First, ask if using ante.ph domain setup
+        const antePhSetup = await inquirer.prompt([
           {
-            type: 'input',
-            name: 'frontendUrl',
-            message: 'Frontend URL:\n  Examples: https://staging.ante.ph or http://143.198.91.153:8080\n  Enter URL',
-            default: currentFrontendUrl || 'http://localhost:8080',
-            validate: validateUrl
+            type: 'confirm',
+            name: 'useAntePh',
+            message: 'Are you setting up domains on ante.ph?',
+            default: false
           }
-        ];
+        ]);
 
-        if (hasGateApp) {
-          domainPrompts.push({
-            type: 'input',
-            name: 'gateAppUrl',
-            message: 'Gate App URL:\n  Examples: https://gate.ante.ph or http://143.198.91.153:8081\n  Enter URL',
-            default: currentGateAppUrl || 'http://localhost:8081',
-            validate: validateUrl
-          });
-        }
+        if (antePhSetup.useAntePh) {
+          // ante.ph subdomain-based setup
+          const subdomainPrompt = await inquirer.prompt([
+            {
+              type: 'input',
+              name: 'subdomain',
+              message: 'Enter subdomain prefix (e.g., "test" for test.ante.ph):',
+              validate: (input) => {
+                if (!input || input.trim() === '') {
+                  return 'Subdomain cannot be empty';
+                }
+                // Validate subdomain format (alphanumeric and hyphens only)
+                if (!/^[a-z0-9]([a-z0-9-]*[a-z0-9])?$/i.test(input.trim())) {
+                  return 'Subdomain must contain only letters, numbers, and hyphens (cannot start or end with hyphen)';
+                }
+                return true;
+              }
+            }
+          ]);
 
-        if (hasGuardianApp) {
-          domainPrompts.push({
-            type: 'input',
-            name: 'guardianAppUrl',
-            message: 'Guardian App URL:\n  Examples: https://guardian.ante.ph or http://143.198.91.153:8082\n  Enter URL',
-            default: currentGuardianAppUrl || 'http://localhost:8082',
-            validate: validateUrl
-          });
-        }
+          const subdomain = subdomainPrompt.subdomain.trim();
+
+          // Auto-generate URLs with ante.ph pattern
+          frontendUrl = `https://${subdomain}.ante.ph`;
+          apiUrl = `https://${subdomain}-api.ante.ph`;
+          if (hasGateApp) gateAppUrl = `https://${subdomain}-gate.ante.ph`;
+          if (hasGuardianApp) guardianAppUrl = `https://${subdomain}-guardian.ante.ph`;
+          if (hasFacialWeb) facialWebUrl = `https://${subdomain}-fr.ante.ph`;
+          if (hasPosApp) posAppUrl = `https://${subdomain}-pos.ante.ph`;
+
+          // Display generated domains for confirmation
+          console.log(chalk.cyan('\n📋 Generated Domain Configuration:\n'));
+          console.log(chalk.gray(`  Frontend:        ${frontendUrl}`));
+          console.log(chalk.gray(`  Backend API:     ${apiUrl}`));
+          if (hasGateApp) console.log(chalk.gray(`  Gate App:        ${gateAppUrl}`));
+          if (hasGuardianApp) console.log(chalk.gray(`  Guardian App:    ${guardianAppUrl}`));
+          if (hasFacialWeb) console.log(chalk.gray(`  Facial Web:      ${facialWebUrl}`));
+          if (hasPosApp) console.log(chalk.gray(`  POS App:         ${posAppUrl}`));
+          console.log('');
+
+          const confirmDomains = await inquirer.prompt([
+            {
+              type: 'confirm',
+              name: 'confirmed',
+              message: 'Proceed with these domains?',
+              default: true
+            }
+          ]);
 
-        if (hasFacialWeb) {
-          domainPrompts.push({
-            type: 'input',
-            name: 'facialWebUrl',
-            message: 'Facial Web URL:\n  Examples: https://facial.ante.ph or http://143.198.91.153:8083\n  Enter URL',
-            default: currentFacialWebUrl || 'http://localhost:8083',
-            validate: validateUrl
-          });
-        }
+          if (!confirmDomains.confirmed) {
+            console.log(chalk.yellow('\nDomain setup cancelled. Please run the command again.\n'));
+            process.exit(0);
+          }
+        } else {
+          // Manual URL input for custom domains
+          const domainPrompts = [
+            {
+              type: 'input',
+              name: 'frontendUrl',
+              message: 'Frontend URL:\n  Examples: https://staging.ante.ph or http://143.198.91.153:8080\n  Enter URL',
+              default: currentFrontendUrl || 'http://localhost:8080',
+              validate: validateUrl
+            }
+          ];
+
+          if (hasGateApp) {
+            domainPrompts.push({
+              type: 'input',
+              name: 'gateAppUrl',
+              message: 'Gate App URL:\n  Examples: https://gate.ante.ph or http://143.198.91.153:8081\n  Enter URL',
+              default: currentGateAppUrl || 'http://localhost:8081',
+              validate: validateUrl
+            });
+          }
+
+          if (hasGuardianApp) {
+            domainPrompts.push({
+              type: 'input',
+              name: 'guardianAppUrl',
+              message: 'Guardian App URL:\n  Examples: https://guardian.ante.ph or http://143.198.91.153:8082\n  Enter URL',
+              default: currentGuardianAppUrl || 'http://localhost:8082',
+              validate: validateUrl
+            });
+          }
+
+          if (hasFacialWeb) {
+            domainPrompts.push({
+              type: 'input',
+              name: 'facialWebUrl',
+              message: 'Facial Web URL:\n  Examples: https://facial.ante.ph or http://143.198.91.153:8083\n  Enter URL',
+              default: currentFacialWebUrl || 'http://localhost:8083',
+              validate: validateUrl
+            });
+          }
+
+          if (hasPosApp) {
+            domainPrompts.push({
+              type: 'input',
+              name: 'posAppUrl',
+              message: 'POS App URL:\n  Examples: https://pos.ante.ph or http://143.198.91.153:8084\n  Enter URL',
+              default: currentPosAppUrl || 'http://localhost:8084',
+              validate: validateUrl
+            });
+          }
 
-        if (hasPosApp) {
           domainPrompts.push({
             type: 'input',
-            name: 'posAppUrl',
-            message: 'POS App URL:\n  Examples: https://pos.ante.ph or http://143.198.91.153:8084\n  Enter URL',
-            default: currentPosAppUrl || 'http://localhost:8084',
+            name: 'apiUrl',
+            message: 'Backend API URL:\n  Examples: https://staging-api.ante.ph or http://143.198.91.153:3001\n  Enter URL',
+            default: currentApiUrl || 'http://localhost:3001',
             validate: validateUrl
           });
-        }
 
-        domainPrompts.push({
-          type: 'input',
-          name: 'apiUrl',
-          message: 'Backend API URL:\n  Examples: https://staging-api.ante.ph or http://143.198.91.153:3001\n  Enter URL',
-          default: currentApiUrl || 'http://localhost:3001',
-          validate: validateUrl
-        });
-
-        const answers = await inquirer.prompt(domainPrompts);
+          const answers = await inquirer.prompt(domainPrompts);
 
-        // Sanitize URLs to fix common formatting issues
-        frontendUrl = sanitizeUrl(answers.frontendUrl);
-        apiUrl = sanitizeUrl(answers.apiUrl);
-        if (hasGateApp) gateAppUrl = sanitizeUrl(answers.gateAppUrl);
-        if (hasGuardianApp) guardianAppUrl = sanitizeUrl(answers.guardianAppUrl);
-        if (hasFacialWeb) facialWebUrl = sanitizeUrl(answers.facialWebUrl);
-        if (hasPosApp) posAppUrl = sanitizeUrl(answers.posAppUrl);
+          // Sanitize URLs to fix common formatting issues
+          frontendUrl = sanitizeUrl(answers.frontendUrl);
+          apiUrl = sanitizeUrl(answers.apiUrl);
+          if (hasGateApp) gateAppUrl = sanitizeUrl(answers.gateAppUrl);
+          if (hasGuardianApp) guardianAppUrl = sanitizeUrl(answers.guardianAppUrl);
+          if (hasFacialWeb) facialWebUrl = sanitizeUrl(answers.facialWebUrl);
+          if (hasPosApp) posAppUrl = sanitizeUrl(answers.posAppUrl);
+        }
       }
     } else {
       // Non-interactive mode
@@ -603,7 +670,8 @@ export async function setDomain(options) {
             {
               type: 'input',
               name: 'email',
-              message: 'Email address for certificate notifications:',
+              message: 'Email address for certificate notifications (default: admin@ante.ph):',
+              default: 'admin@ante.ph',
               validate: validateEmail
             }
           ]);

package/src/commands/update.js

@@ -251,7 +251,7 @@ export async function update(options) {
     }
 
     // Detect which apps are installed
-    const { hasGateApp, hasGuardianApp, hasFacialWeb, hasPosApp } = detectInstalledApps(composeFile);
+    const { hasGateApp, hasGuardianApp, hasFacialWeb } = detectInstalledApps(composeFile);
 
     // Detect missing services that could be installed
     const missingServices = detectMissingServices(composeFile);
@@ -267,7 +267,7 @@ export async function update(options) {
     if (hasGateApp || missingServices.gateApp) totalSteps++; // Gate App health check
     if (hasGuardianApp || missingServices.guardianApp) totalSteps++; // Guardian App health check
     if (hasFacialWeb || missingServices.facialWeb) totalSteps++; // Facial Web health check
-    if (hasPosApp || missingServices.posApp) totalSteps++; // POS App health check
+    // POS App health check removed - not required
     if (!options.skipCleanup) totalSteps++; // Cleanup step
 
     // Pre-calculate step numbers for each task (fixes step numbering bug)
@@ -283,7 +283,7 @@ export async function update(options) {
     const stepGateHealth = (hasGateApp || missingServices.gateApp) ? ++currentStep : null;
     const stepGuardianHealth = (hasGuardianApp || missingServices.guardianApp) ? ++currentStep : null;
     const stepFacialHealth = (hasFacialWeb || missingServices.facialWeb) ? ++currentStep : null;
-    const stepPosHealth = (hasPosApp || missingServices.posApp) ? ++currentStep : null;
+    // POS App health check removed - not required
     const stepMigrations = ++currentStep;
     const stepCleanup = !options.skipCleanup ? ++currentStep : null;
 
@@ -410,16 +410,7 @@ export async function update(options) {
           }
         }
       },
-      {
-        title: stepPosHealth ? formatStepTitle(stepPosHealth, totalSteps, 'Waiting for POS App to be healthy') : '',
-        skip: () => !stepPosHealth ? 'POS App not installed' : false,
-        task: async () => {
-          const healthy = await waitForServiceHealthy(composeFile, 'ante-pos', 60);
-          if (!healthy) {
-            throw new Error('POS App did not become healthy within 60 seconds');
-          }
-        }
-      },
+      // POS App health check removed - not required
       {
         title: formatStepTitle(stepMigrations, totalSteps, 'Running database migrations'),
         task: async (ctx, task) => {