enhance maintenance handling and improve subdomain matching logic

Author: JamesDAdams

html/maintenance.js

@@ -14,8 +14,8 @@ export default function maintenanceHtml(globalMaintenance, subdomainsMaintenance
       bannerMessageLabel: 'Message du bandeau :',
       update: 'Mettre à jour',
       addBannerSubdomainLabel: 'Ajouter un sous-domaine pour le bandeau :',
-      bannerSubdomainPlaceholder: 'ex: admin.monsite.com',
-      bannerInfo: 'Le bandeau s\'affiche sur les sous-domaines listés ci-dessus'
+      bannerSubdomainPlaceholder: 'ex: admin.monsite.com ou *.monsite.com',
+      bannerInfo: 'Le bandeau s\'affiche sur les sous-domaines listés ci-dessus. Utilisez *.domaine.fr pour cibler tous les sous-domaines.'
     },
     EN: {
       title: 'Maintenance Control',
@@ -31,8 +31,8 @@ export default function maintenanceHtml(globalMaintenance, subdomainsMaintenance
       bannerMessageLabel: 'Banner message:',
       update: 'Update',
       addBannerSubdomainLabel: 'Add a subdomain for the banner:',
-      bannerSubdomainPlaceholder: 'ex: admin.mysite.com',
-      bannerInfo: 'The banner is displayed on the subdomains listed above'
+      bannerSubdomainPlaceholder: 'ex: admin.mysite.com or *.mysite.com',
+      bannerInfo: 'The banner is displayed on the subdomains listed above. Use *.domain.com to target all subdomains.'
     }
   };
 

worker.js

@@ -2,6 +2,18 @@ import { c_redirect } from './custom-redirect.js'
 import maintenanceHtml from './html/maintenance.js'
 import { handleApi } from './handle-api.js'
 
+// Check if a host matches any pattern in a list (supports *.domain.fr wildcards)
+function hostMatchesAny(host, patterns) {
+  if (!host || !Array.isArray(patterns)) return false;
+  return patterns.some(pattern => {
+    if (pattern.startsWith('*.')) {
+      const suffix = pattern.slice(1); // ".domain.fr"
+      return host.endsWith(suffix) && host !== pattern.slice(2);
+    }
+    return host === pattern;
+  });
+}
+
 // Helper to safely parse JSON
 function safeJsonParse(str, fallback) {
   try { return JSON.parse(str || ''); } catch { return fallback; }
@@ -190,7 +202,7 @@ export default {
     if (env.ENABLE_4G_BANNER && state.is4gMode) {
       showBanner = true;
       bannerMessage = env.TEXT_4G_BANNER_MESSAGE;
-    } else if (state.bannerMessage && state.bannerSubdomains.includes(host)) {
+    } else if (state.bannerMessage && hostMatchesAny(host, state.bannerSubdomains)) {
       showBanner = true;
       bannerMessage = state.bannerMessage;
     }