Sync DNS2 production changes - removed obsolete test suite and refactored structure

dashcaddy-api/routes/health.js

@@ -34,7 +34,7 @@ module.exports = function(ctx) {
 
       try {
         let url = null;
-        const checkType = 'http';
+        let checkType = 'http';
 
         // Determine URL to check
         url = resolveServiceUrl(serviceId, service, ctx.siteConfig, ctx.buildServiceUrl);
@@ -52,7 +52,7 @@ module.exports = function(ctx) {
           const response = await ctx.fetchT(url, {
             method: 'HEAD',
             signal: controller.signal,
-            redirect: 'follow',
+            redirect: 'follow'
           });
           clearTimeout(timeout);
 
@@ -60,7 +60,7 @@ module.exports = function(ctx) {
             status: response.ok || response.status < 500 ? 'healthy' : 'unhealthy',
             statusCode: response.status,
             url,
-            checkedAt: new Date().toISOString(),
+            checkedAt: new Date().toISOString()
           };
         } catch (fetchError) {
           clearTimeout(timeout);
@@ -73,7 +73,7 @@ module.exports = function(ctx) {
             const getResponse = await ctx.fetchT(url, {
               method: 'GET',
               signal: getController.signal,
-              redirect: 'follow',
+              redirect: 'follow'
             });
             clearTimeout(getTimeout);
 
@@ -81,14 +81,14 @@ module.exports = function(ctx) {
               status: getResponse.ok || getResponse.status < 500 ? 'healthy' : 'unhealthy',
               statusCode: getResponse.status,
               url,
-              checkedAt: new Date().toISOString(),
+              checkedAt: new Date().toISOString()
             };
           } catch (e) {
             health[serviceId] = {
               status: 'unhealthy',
               reason: e.name === 'AbortError' ? 'Timeout' : e.message,
               url,
-              checkedAt: new Date().toISOString(),
+              checkedAt: new Date().toISOString()
             };
           }
         }
@@ -96,7 +96,7 @@ module.exports = function(ctx) {
         health[serviceId] = {
           status: 'error',
           reason: e.message,
-          checkedAt: new Date().toISOString(),
+          checkedAt: new Date().toISOString()
         };
       }
     }));
@@ -113,7 +113,7 @@ module.exports = function(ctx) {
       success: true,
       health: paginatedHealth,
       checkedAt: lastHealthCheck,
-      ...(result.pagination && { pagination: result.pagination }),
+      ...(result.pagination && { pagination: result.pagination })
     });
   }, 'health-services'));
 
@@ -123,7 +123,7 @@ module.exports = function(ctx) {
       success: true,
       health: serviceHealthCache,
       lastCheck: lastHealthCheck,
-      cacheAge: lastHealthCheck ? Date.now() - new Date(lastHealthCheck).getTime() : null,
+      cacheAge: lastHealthCheck ? Date.now() - new Date(lastHealthCheck).getTime() : null
     });
   }, 'health-cached'));
 
@@ -157,7 +157,7 @@ module.exports = function(ctx) {
       const response = await ctx.fetchT(url, {
         method: 'GET',
         signal: controller.signal,
-        redirect: 'follow',
+        redirect: 'follow'
       });
       clearTimeout(timeout);
 
@@ -168,8 +168,8 @@ module.exports = function(ctx) {
           status: response.ok || response.status < 500 ? 'healthy' : 'unhealthy',
           statusCode: response.status,
           url,
-          checkedAt: new Date().toISOString(),
-        },
+          checkedAt: new Date().toISOString()
+        }
       });
     } catch (e) {
       clearTimeout(timeout);
@@ -180,8 +180,8 @@ module.exports = function(ctx) {
           status: 'unhealthy',
           reason: e.name === 'AbortError' ? 'Timeout' : e.message,
           url,
-          checkedAt: new Date().toISOString(),
-        },
+          checkedAt: new Date().toISOString()
+        }
       });
     }
   }, 'health-service'));
@@ -201,7 +201,7 @@ module.exports = function(ctx) {
         return res.json({
           status: 'error',
           message: 'Root CA certificate not found',
-          daysUntilExpiration: null,
+          daysUntilExpiration: null
         });
       }
 
@@ -232,14 +232,14 @@ module.exports = function(ctx) {
         status: status,
         message: message,
         daysUntilExpiration: daysUntilExpiration,
-        expiresAt: notAfter,
+        expiresAt: notAfter
       });
     } catch (error) {
       await ctx.logError('GET /api/health/ca', error);
       res.json({
         status: 'error',
         message: error.message,
-        daysUntilExpiration: null,
+        daysUntilExpiration: null
       });
     }
   }, 'health-ca'));