enable UPS banner functionality and update UPS message wording

Author: JamesDAdams

handle-api.js

@@ -9,15 +9,27 @@ async function getStateObj(env) {
 
 async function setStateObj(env, obj) {
   await env.MAINTENANCE_KV.put('MAINTENANCE_STATE', JSON.stringify(obj));
-  invalidateCache();
+  await invalidateCache(['MAINTENANCE_STATE']);
 }
 
-function invalidateCache() {
+async function invalidateCache(keys = ['MAINTENANCE_STATE', 'wan-is-4g', 'ups-on-battery']) {
+  // Invalidate in-memory cache
   if (globalThis.cache) {
     globalThis.cache.maintenance = { value: null, ts: 0 };
     globalThis.cache.is4g = { value: null, ts: 0 };
     globalThis.cache.upsOnBattery = { value: null, ts: 0 };
   }
+
+  // Invalidate Cloudflare Cache API
+  try {
+    const cache = caches.default;
+    for (const key of keys) {
+      const cacheUrl = `https://kv-cache.internal/${key}`;
+      await cache.delete(cacheUrl);
+    }
+  } catch (e) {
+    console.error('Cache API invalidation error:', e);
+  }
 }
 
 async function toggleGlobalMaintenance(env) {
@@ -96,7 +108,7 @@ async function toggle4gMode(env, state) {
     return new Response('Fonctionnalité 4G désactivée', { status: 403 });
   }
   await env.MAINTENANCE_KV.put('wan-is-4g', state.is4gMode ? 'false' : 'true');
-  invalidateCache();
+  await invalidateCache(['wan-is-4g']);
   return new Response('Mode 4G mis à jour');
 }
 
@@ -109,7 +121,7 @@ async function set4gMode(request, env) {
     return new Response('Format attendu: { enabled: true/false }', { status: 400 });
   }
   await env.MAINTENANCE_KV.put('wan-is-4g', enabled ? 'true' : 'false');
-  invalidateCache();
+  await invalidateCache(['wan-is-4g']);
   return new Response('Mode 4G mis à jour');
 }
 
@@ -118,7 +130,7 @@ async function toggleUpsMode(env, state) {
     return new Response('Fonctionnalité UPS désactivée', { status: 403 });
   }
   await env.MAINTENANCE_KV.put('ups-on-battery', state.upsOnBattery ? 'false' : 'true');
-  invalidateCache();
+  await invalidateCache(['ups-on-battery']);
   return new Response('Mode UPS mis à jour');
 }
 
@@ -131,7 +143,7 @@ async function setUpsMode(request, env) {
     return new Response('Format attendu: { enabled: true/false }', { status: 400 });
   }
   await env.MAINTENANCE_KV.put('ups-on-battery', enabled ? 'true' : 'false');
-  invalidateCache();
+  await invalidateCache(['ups-on-battery']);
   return new Response('Mode UPS mis à jour');
 }
 

worker.js

@@ -26,16 +26,59 @@ const cache = {
   upsOnBattery: { value: null, ts: 0 }
 };
 
-// Read a single KV key with optional in-memory cache
+// Read a single KV key with Cloudflare Cache API + in-memory cache
 async function getCachedKvValue(env, cacheEntry, kvKey, useCache, cacheEnabled, cacheTtl, now) {
+  // Check in-memory cache first (fastest)
   if (useCache && cacheEnabled && cacheEntry.value !== null && (now - cacheEntry.ts < cacheTtl)) {
     return cacheEntry.value;
   }
+
+  // Try Cloudflare Cache API (shared between worker instances)
+  if (useCache && cacheEnabled) {
+    try {
+      const cacheUrl = `https://kv-cache.internal/${kvKey}`;
+      const cache = caches.default;
+      const cachedResponse = await cache.match(cacheUrl);
+
+      if (cachedResponse) {
+        const value = await cachedResponse.text();
+        // Update in-memory cache
+        cacheEntry.value = value;
+        cacheEntry.ts = now;
+        return value;
+      }
+    } catch (e) {
+      // Fallback to KV if Cache API fails
+      console.error('Cache API error:', e);
+    }
+  }
+
+  // Read from KV
   const value = await env.MAINTENANCE_KV.get(kvKey);
+
+  // Store in both caches
   if (useCache && cacheEnabled) {
+    // Update in-memory cache
     cacheEntry.value = value;
     cacheEntry.ts = now;
+
+    // Store in Cloudflare Cache API
+    try {
+      const cacheUrl = `https://kv-cache.internal/${kvKey}`;
+      const cache = caches.default;
+      const response = new Response(value, {
+        headers: {
+          'Cache-Control': `max-age=${Math.floor(cacheTtl / 1000)}`,
+          'Content-Type': 'text/plain'
+        }
+      });
+      await cache.put(cacheUrl, response);
+    } catch (e) {
+      // Silent fail on cache storage
+      console.error('Cache API put error:', e);
+    }
   }
+
   return value;
 }
 
@@ -50,17 +93,28 @@ async function getMaintenanceState(env, host, useCache = true) {
     isGlobalMaintenance: false, subdomainsMaintenance: [], bannerSubdomains: [], bannerMessage: ''
   });
 
-  const is4gMode = await getCachedKvValue(env, cache.is4g, 'wan-is-4g', useCache, cacheEnabled, cacheTtl, now);
-  const upsOnBattery = await getCachedKvValue(env, cache.upsOnBattery, 'ups-on-battery', useCache, cacheEnabled, cacheTtl, now);
+  // Conditional reads: only fetch if the feature is enabled (Solution #4)
+  let is4gMode = null;
+  let upsOnBattery = null;
+
+  if (envIsTrue(env.ENABLE_4G_BANNER)) {
+    const is4gRaw = await getCachedKvValue(env, cache.is4g, 'wan-is-4g', useCache, cacheEnabled, cacheTtl, now);
+    is4gMode = is4gRaw === 'true';
+  }
+
+  if (envIsTrue(env.ENABLE_UPS_BANNER)) {
+    const upsRaw = await getCachedKvValue(env, cache.upsOnBattery, 'ups-on-battery', useCache, cacheEnabled, cacheTtl, now);
+    upsOnBattery = upsRaw === 'true';
+  }
 
   return {
     isGlobalMaintenance: stateObj.isGlobalMaintenance === true || stateObj.isGlobalMaintenance === 'true',
     subdomainsMaintenance: Array.isArray(stateObj.subdomainsMaintenance) ? stateObj.subdomainsMaintenance : [],
     isSubdomainMaintenance: Array.isArray(stateObj.subdomainsMaintenance) ? stateObj.subdomainsMaintenance.includes(host) : false,
     bannerSubdomains: Array.isArray(stateObj.bannerSubdomains) ? stateObj.bannerSubdomains : [],
     bannerMessage: typeof stateObj.bannerMessage === 'string' ? stateObj.bannerMessage : '',
-    is4gMode: is4gMode === 'true',
-    upsOnBattery: upsOnBattery === 'true'
+    is4gMode: is4gMode === true,
+    upsOnBattery: upsOnBattery === true
   };
 }
 
@@ -140,6 +194,19 @@ function envIsTrue(value) {
   return value === true || value === 'true';
 }
 
+// Invalidate Cache API entries when state changes
+async function invalidateCacheApi(keys) {
+  try {
+    const cache = caches.default;
+    for (const key of keys) {
+      const cacheUrl = `https://kv-cache.internal/${key}`;
+      await cache.delete(cacheUrl);
+    }
+  } catch (e) {
+    console.error('Cache API invalidation error:', e);
+  }
+}
+
 // Determine which banner message to show, if any (UPS + 4G can combine)
 function getBannerMessage(env, state, host) {
   const messages = [];

wrangler.toml

@@ -18,7 +18,7 @@ enabled = false
 # Language setting (FR or EN)
 LANGUAGE = "FR"
 # Enable/disable cache (true/false) for limite api call between this worker and the kv storage, in Cloudflare free plan You have only 100 000 reads per day
-ENABLE_CACHE = false
+ENABLE_CACHE = true
 # Cache duration in ms (default: 60000 = 1 minute)
 CACHE_TTL_MS = 60000