mango-cms 0.3.35 → 0.3.37

package/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 import { Command } from 'commander';
-import { execSync, spawn } from 'child_process';
+import { execSync, spawn, spawnSync } from 'child_process';
 import path from 'path';
 import { fileURLToPath } from 'url';
 import inquirer from 'inquirer';
@@ -14,6 +14,22 @@ import os from 'os';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
+// When `mango` is invoked from a global install (npm i -g mango-cms) inside a
+// project that has its own mango-cms in node_modules, defer to the project-local
+// CLI so the version pinned in package.json always wins. This is what lets users
+// type plain `mango dev` / `mango deploy` instead of prefixing with `yarn`/`npx`.
+const localCli = path.join(process.cwd(), 'node_modules', 'mango-cms', 'cli.js');
+if (fs.existsSync(localCli)) {
+    let isSelf = false;
+    try {
+        isSelf = fs.realpathSync(localCli) === fs.realpathSync(__filename);
+    } catch (e) { /* fall through and run this copy */ }
+    if (!isSelf) {
+        const result = spawnSync(process.execPath, [localCli, ...process.argv.slice(2)], { stdio: 'inherit' });
+        process.exit(result.status ?? 0);
+    }
+}
+
 const program = new Command();
 
 // Helper function to download and extract versioned src zip file
@@ -521,16 +537,31 @@ async function detectWebServer() {
     }
 }
 
+// Deploy-identity key for pm2 process names and web server config filenames.
+// Defaults to `database` for backward compatibility (matches every existing
+// deployed site today), but `database` is meant to be safely shareable across
+// projects (e.g. a multi-tenant setup), while deploy identity must be unique
+// per project on a given box. Set "deployId" in settings.json to override
+// when a project intentionally shares its database with another deployed
+// project — otherwise `mango deploy`/`mango launch` will silently skip
+// creating a web server config for the second project (path already exists)
+// and reload the FIRST project's live pm2 processes instead of starting its
+// own (HAP-1990).
+function deployId(settings) {
+    return (settings.deployId || settings.database).toLowerCase();
+}
+
 // Helper function to generate nginx config
-function generateNginxConfig(settings, buildPath) {
+function generateNginxConfig(settings, buildPath, deployUi = false) {
     const domain = settings.mangoDomain;
     const port = settings.port || 3002;
     const frontPort = settings.frontPort || 3001;
     const uiDomain = settings.uiDomain;
     const uiPort = settings.uiPort || 3001;
 
-    // Reverse-proxy the Mango UI (Nuxt SSR server) on its own subdomain, when configured.
-    const uiServerBlock = uiDomain ? `
+    // Reverse-proxy the Mango UI (Nuxt SSR server) on its own subdomain,
+    // only when the UI is part of this deploy and a uiDomain is configured.
+    const uiServerBlock = (deployUi && uiDomain) ? `
 server {
     server_name ${uiDomain};
 
@@ -617,15 +648,16 @@ ${uiServerBlock}`;
 }
 
 // Helper function to generate apache config
-function generateApacheConfig(settings, buildPath) {
+function generateApacheConfig(settings, buildPath, deployUi = false) {
     const domain = settings.mangoDomain;
     const port = settings.port || 3002;
     const frontPort = settings.frontPort || 3001;
     const uiDomain = settings.uiDomain;
     const uiPort = settings.uiPort || 3001;
 
-    // Reverse-proxy the Mango UI (Nuxt SSR server) on its own subdomain, when configured.
-    const uiVirtualHost = uiDomain ? `
+    // Reverse-proxy the Mango UI (Nuxt SSR server) on its own subdomain,
+    // only when the UI is part of this deploy and a uiDomain is configured.
+    const uiVirtualHost = (deployUi && uiDomain) ? `
 <VirtualHost *:80>
     ServerName ${uiDomain}
 
@@ -697,7 +729,7 @@ ${uiVirtualHost}`;
 }
 
 // Helper function to configure web server
-async function configureWebServer(settings, buildPath) {
+async function configureWebServer(settings, buildPath, deployUi = false) {
     let webServer = await detectWebServer();
 
     if (!webServer) {
@@ -713,12 +745,12 @@ async function configureWebServer(settings, buildPath) {
     }
 
     const config = webServer === 'nginx' ?
-        generateNginxConfig(settings, buildPath) :
-        generateApacheConfig(settings, buildPath);
+        generateNginxConfig(settings, buildPath, deployUi) :
+        generateApacheConfig(settings, buildPath, deployUi);
 
     const configPath = webServer === 'nginx' ?
-        `/etc/nginx/sites-available/${settings.database.toLowerCase()}` :
-        `/etc/apache2/sites-available/${settings.database.toLowerCase()}.conf`;
+        `/etc/nginx/sites-available/${deployId(settings)}` :
+        `/etc/apache2/sites-available/${deployId(settings)}.conf`;
 
     try {
         // Check if config already exists
@@ -731,7 +763,7 @@ async function configureWebServer(settings, buildPath) {
 
             if (webServer === 'nginx') {
                 // Create symlink if it doesn't exist
-                const enabledPath = `/etc/nginx/sites-enabled/${settings.database.toLowerCase()}`;
+                const enabledPath = `/etc/nginx/sites-enabled/${deployId(settings)}`;
                 if (!fs.existsSync(enabledPath)) {
                     execSync(`sudo ln -s ${configPath} ${enabledPath}`);
                 }
@@ -739,7 +771,7 @@ async function configureWebServer(settings, buildPath) {
                 execSync('sudo systemctl reload nginx');
             } else {
                 // Enable apache site
-                execSync(`sudo a2ensite ${settings.database.toLowerCase()}`);
+                execSync(`sudo a2ensite ${deployId(settings)}`);
                 execSync('sudo systemctl reload apache2');
             }
             console.log(`${webServer} configuration has been updated and service reloaded`);
@@ -764,8 +796,8 @@ async function checkPM2() {
 
 // Helper function to manage PM2 process
 async function managePM2Process(settings) {
-    const processName = `${settings.database.toLowerCase()}-mango`;
-    const name = settings.database.toLowerCase()
+    const processName = `${deployId(settings)}-mango`;
+    const name = deployId(settings)
 
     try {
         // Check if process exists
@@ -796,7 +828,9 @@ async function managePM2Process(settings) {
     }
 }
 
-// Helper function to build and (re)start the Mango UI (Nuxt) under PM2
+// Helper function to build and (re)start the Mango UI (Nuxt) under PM2.
+// Only called when the UI deploy is explicitly enabled (--ui flag or
+// "deployUi": true in settings.json) — the admin UI is opt-in on deploy.
 async function manageUiPM2Process(settings, mangoCmsRoot, userProjectRoot) {
     if (!settings.uiDomain) {
         console.log('No uiDomain configured, skipping Mango UI deploy.');
@@ -805,7 +839,7 @@ async function manageUiPM2Process(settings, mangoCmsRoot, userProjectRoot) {
 
     const { dir: uiDir, ejected } = resolveUiDir(mangoCmsRoot, userProjectRoot);
     const uiPort = settings.uiPort || 3001;
-    const processName = `${settings.database.toLowerCase()}-ui`;
+    const processName = `${deployId(settings)}-ui`;
 
     // Install deps + build the Nuxt app (reads this project's mango/config).
     if (!fs.existsSync(path.join(uiDir, 'node_modules'))) {
@@ -843,29 +877,39 @@ async function manageUiPM2Process(settings, mangoCmsRoot, userProjectRoot) {
 program
     .command('deploy')
     .description('Build and deploy Mango CMS using PM2')
-    .action(async () => {
+    .option('--ui', 'also build and deploy the Mango admin UI (off by default; or set "deployUi": true in settings.json)')
+    .action(async (options) => {
         try {
             const configPath = path.join(process.cwd(), 'mango/config/settings.json');
             const settings = JSON.parse(fs.readFileSync(configPath, 'utf8'));
             const mangoCmsRoot = path.resolve(__dirname);
             const userProjectRoot = process.cwd();
 
+            // The admin UI is opt-in: deployed only with --ui or "deployUi": true.
+            const deployUi = Boolean(options.ui || settings.deployUi);
+
             // Run build command
             console.log('Building Mango CMS...');
             execSync('npm run mango build', { stdio: 'inherit' });
 
-            // Make sure a UI bundle is available for deploy.
-            await ensureUiExists(mangoCmsRoot);
+            // Make sure a UI bundle is available for deploy (only when deploying it).
+            if (deployUi) {
+                await ensureUiExists(mangoCmsRoot);
+            }
 
             // Check if PM2 is installed
             if (await checkPM2()) {
                 await managePM2Process(settings);
-                await manageUiPM2Process(settings, mangoCmsRoot, userProjectRoot);
+                if (deployUi) {
+                    await manageUiPM2Process(settings, mangoCmsRoot, userProjectRoot);
+                } else {
+                    console.log('Skipping Mango UI deploy (opt in with "mango deploy --ui" or "deployUi": true in settings.json).');
+                }
 
                 // Configure web server
                 const buildPath = path.join(process.cwd(), 'build');
                 try {
-                    await configureWebServer(settings, buildPath);
+                    await configureWebServer(settings, buildPath, deployUi);
                 } catch (error) {
                     console.warn('Warning: Could not configure web server:', error.message);
                     console.warn('You may need to configure your web server manually.');
@@ -881,8 +925,9 @@ program
 
 program
     .command('launch')
-    .description('One-shot server deploy: git pull, install, build the site, and deploy backend + UI')
-    .action(async () => {
+    .description('One-shot server deploy: git pull, install, build the site, and deploy the backend (add --ui for the admin UI)')
+    .option('--ui', 'also build and deploy the Mango admin UI (off by default; or set "deployUi": true in settings.json)')
+    .action(async (options) => {
         try {
             const cwd = process.cwd();
             const useYarn = fs.existsSync(path.join(cwd, 'yarn.lock'));
@@ -909,12 +954,14 @@ program
                 console.log('\n→ Skipping site build (no "build" script found)');
             }
 
-            // 4. Deploy backend + UI + web server config via the freshly installed mango.
-            //    `mango deploy` builds the backend, (re)starts PM2 for {db}-mango, {db}
-            //    and {db}-ui, and writes the nginx/apache blocks for all three domains.
-            run('Deploying backend + UI', 'npx mango deploy');
+            // 4. Deploy backend (+ UI when opted in) + web server config via the
+            //    freshly installed mango. `mango deploy` builds the backend and
+            //    (re)starts PM2 for {db}-mango and {db}; with --ui it also builds
+            //    the admin UI, starts {db}-ui, and writes its web server block.
+            const deployCmd = options.ui ? 'npx mango deploy --ui' : 'npx mango deploy';
+            run(options.ui ? 'Deploying backend + UI' : 'Deploying backend', deployCmd);
 
-            console.log('\n✨ Launch complete! Backend, site, and UI are deployed.');
+            console.log(`\n✨ Launch complete! Backend and site are deployed${options.ui ? ', along with the admin UI' : ''}.`);
         } catch (error) {
             console.error('\nLaunch failed:', error.message);
             process.exit(1);

package/default/package.json

@@ -24,7 +24,7 @@
         "dayjs": "^1.10.7",
         "express": "^4.18.1",
         "google-maps": "^4.3.3",
-        "mango-cms": "^0.3.31",
+        "mango-cms": "^0.3.36",
         "mapbox-gl": "^2.7.0",
         "vite": "^6.2.2",
         "vue": "^3.2.37",

package/default/public/index.js

@@ -54,6 +54,19 @@ let appPlaceholder = '<!--SSR-->'
 
 let serve = async function (req, res) {
 
+    // Check for a short url redirect
+    let shortUrl = req.path.split('/').slice(1).join('/').split('?')[0]
+    if (shortUrl) {
+        let redirect = (await axios.get(`http://localhost:${settings.port}/shortUrls/?search={"short":"${shortUrl}"}`))?.data?.response?.[0]
+        if (redirect?.target) {
+            let target = redirect.target.includes('http') ? redirect.target : `https://${settings.siteDomain}/${redirect.target}`
+            let redirectUrl = redirect.referralSource ? `${target}?referral=${redirect.referralSource}&referralType=Page&utm_source=${redirect.referralSource}` : target
+            // Increment the visit count
+            await axios.put(`http://localhost:${settings.port}/shortUrls/${redirect.id}`, { visits: redirect.visits + 1 })
+            return res.redirect(redirectUrl)
+        }
+    }
+
     let index = fs.readFileSync('./index.html', 'utf8')
 
     // Cookies

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mango-cms",
-  "version": "0.3.35",
+  "version": "0.3.37",
   "type": "module",
   "main": "./index.js",
   "exports": {