edit

Author: JamesDAdams

handle-api.js

@@ -6,30 +6,25 @@ export async function handleApi(request, url, host, env, state) {
 
   // Toggle global maintenance mode
   if (url.pathname === '/worker/api/toggle-maintenance/global' && request.method === 'POST') {
-    const newState = { ...state, isGlobalMaintenance: !state.isGlobalMaintenance };
-    await env.MAINTENANCE_KV.put('MAINTENANCE_STATE', JSON.stringify(newState));
+    await env.MAINTENANCE_KV.put('MAINTENANCE_GLOBAL', state.isGlobalMaintenance ? 'false' : 'true');
     return new Response('Maintenance globale mise à jour');
   }
 
   // Add a subdomain to maintenance list
   if (url.pathname === '/worker/api/maintenance/subdomain/add' && request.method === 'POST') {
     const { subdomain } = await request.json();
-    if (typeof subdomain === 'string' && subdomain.trim() && !state.subdomainsMaintenance.includes(subdomain)) {
+    if (!state.subdomainsMaintenance.includes(subdomain)) {
       state.subdomainsMaintenance.push(subdomain);
-      const newState = { ...state, subdomainsMaintenance: state.subdomainsMaintenance };
-      await env.MAINTENANCE_KV.put('MAINTENANCE_STATE', JSON.stringify(newState));
+      await env.MAINTENANCE_KV.put('MAINTENANCE_SUBDOMAINS', JSON.stringify(state.subdomainsMaintenance));
     }
     return new Response('Sous-domaine ajouté');
   }
 
   // Remove a subdomain from maintenance list
   if (url.pathname === '/worker/api/maintenance/subdomain/remove' && request.method === 'POST') {
     const { subdomain } = await request.json();
-    if (typeof subdomain === 'string' && subdomain.trim()) {
-      const newList = state.subdomainsMaintenance.filter(d => d !== subdomain);
-      const newState = { ...state, subdomainsMaintenance: newList };
-      await env.MAINTENANCE_KV.put('MAINTENANCE_STATE', JSON.stringify(newState));
-    }
+    const newList = state.subdomainsMaintenance.filter(d => d !== subdomain);
+    await env.MAINTENANCE_KV.put('MAINTENANCE_SUBDOMAINS', JSON.stringify(newList));
     return new Response('Sous-domaine retiré');
   }
 
@@ -47,31 +42,28 @@ export async function handleApi(request, url, host, env, state) {
   // Add a subdomain to the banner list
   if (url.pathname === '/worker/api/banner/subdomains/add' && request.method === 'POST') {
     const { subdomain } = await request.json();
-    if (typeof subdomain === 'string' && subdomain.trim() && !state.bannerSubdomains.includes(subdomain)) {
+    if (typeof subdomain !== 'string') return new Response('Format attendu: { subdomain: "..." }', { status: 400 });
+    if (!state.bannerSubdomains.includes(subdomain)) {
       state.bannerSubdomains.push(subdomain);
-      const newState = { ...state, bannerSubdomains: state.bannerSubdomains };
-      await env.MAINTENANCE_KV.put('MAINTENANCE_STATE', JSON.stringify(newState));
+      await env.MAINTENANCE_KV.put('BANNER_SUBDOMAINS', JSON.stringify(state.bannerSubdomains));
     }
     return new Response('Sous-domaine ajouté au bandeau');
   }
 
   // Remove a subdomain from the banner list
   if (url.pathname === '/worker/api/banner/subdomains/remove' && request.method === 'POST') {
     const { subdomain } = await request.json();
-    if (typeof subdomain === 'string' && subdomain.trim()) {
-      const newList = state.bannerSubdomains.filter(d => d !== subdomain);
-      const newState = { ...state, bannerSubdomains: newList };
-      await env.MAINTENANCE_KV.put('MAINTENANCE_STATE', JSON.stringify(newState));
-    }
+    if (typeof subdomain !== 'string') return new Response('Format attendu: { subdomain: "..." }', { status: 400 });
+    const newList = state.bannerSubdomains.filter(d => d !== subdomain);
+    await env.MAINTENANCE_KV.put('BANNER_SUBDOMAINS', JSON.stringify(newList));
     return new Response('Sous-domaine retiré du bandeau');
   }
 
   // Set the banner message
   if (url.pathname === '/worker/api/banner/message' && request.method === 'POST') {
     const { message } = await request.json();
     if (typeof message === 'string') {
-      const newState = { ...state, bannerMessage: message };
-      await env.MAINTENANCE_KV.put('MAINTENANCE_STATE', JSON.stringify(newState));
+      await env.MAINTENANCE_KV.put('BANNER_MESSAGE', message);
       return new Response('Message du bandeau mis à jour');
     } else {
       return new Response('Format attendu: { message: "..." }', { status: 400 });

worker.js

@@ -9,22 +9,21 @@ function safeJsonParse(str, fallback) {
 
 // Read maintenance and banner states from KV
 async function getMaintenanceState(env, host) {
-  const rawState = await env.MAINTENANCE_KV.get('MAINTENANCE_STATE');
-  const state = safeJsonParse(rawState, {
-    globalMaintenance: false,
-    subdomainsMaintenance: [],
-    bannerSubdomains: [],
-    bannerMessage: '',
-    is4gMode: false
-  });
-
+  const globalMaintenance = await env.MAINTENANCE_KV.get('MAINTENANCE_GLOBAL');
+  const subdomainsMaintenanceRaw = await env.MAINTENANCE_KV.get('MAINTENANCE_SUBDOMAINS');
+  const subdomainsMaintenance = safeJsonParse(subdomainsMaintenanceRaw, []);
+  const bannerSubdomainsRaw = await env.MAINTENANCE_KV.get('BANNER_SUBDOMAINS');
+  const bannerMessage = await env.MAINTENANCE_KV.get('BANNER_MESSAGE');
+  const bannerSubdomains = safeJsonParse(bannerSubdomainsRaw, []);
+  const is4gMode = await env.MAINTENANCE_KV.get('wan-is-4g');
+  
   return {
-    isGlobalMaintenance: !!state.globalMaintenance,
-    subdomainsMaintenance: Array.isArray(state.subdomainsMaintenance) ? state.subdomainsMaintenance : [],
-    isSubdomainMaintenance: Array.isArray(state.subdomainsMaintenance) && state.subdomainsMaintenance.includes(host),
-    bannerSubdomains: Array.isArray(state.bannerSubdomains) ? state.bannerSubdomains : [],
-    bannerMessage: typeof state.bannerMessage === 'string' ? state.bannerMessage : '',
-    is4gMode: !!state.is4gMode
+    isGlobalMaintenance: globalMaintenance === 'true',
+    subdomainsMaintenance,
+    isSubdomainMaintenance: subdomainsMaintenance.includes(host),
+    bannerSubdomains,
+    bannerMessage: typeof bannerMessage === 'string' ? bannerMessage : '',
+    is4gMode: is4gMode === 'true'
   };
 }