mango-cms 0.3.36 → 0.3.37

package/cli.js

@@ -537,6 +537,20 @@ 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, deployUi = false) {
     const domain = settings.mangoDomain;
@@ -735,8 +749,8 @@ async function configureWebServer(settings, buildPath, deployUi = false) {
         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
@@ -749,7 +763,7 @@ async function configureWebServer(settings, buildPath, deployUi = false) {
 
             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}`);
                 }
@@ -757,7 +771,7 @@ async function configureWebServer(settings, buildPath, deployUi = false) {
                 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`);
@@ -782,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
@@ -825,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'))) {

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.36",
+  "version": "0.3.37",
   "type": "module",
   "main": "./index.js",
   "exports": {