@friggframework/core 2.0.0--canary.419.a9bb30f.0 → 2.0.0--canary.419.8343c27.0

package/handlers/routers/health.js

@@ -15,20 +15,7 @@ const validateApiKey = (req, res, next) => {
     }
 
     if (!apiKey || apiKey !== process.env.HEALTH_API_KEY) {
-        const healthApiKey = process.env.HEALTH_API_KEY;
-        console.log('Incoming API Key Debug:', {
-            first3: apiKey ? apiKey.substring(0, 3) : 'undefined',
-            last3: apiKey ? apiKey.substring(apiKey.length - 3) : 'undefined',
-            length: apiKey ? apiKey.length : 0,
-        });
-        console.log('Health API Key Debug:', {
-            first3: healthApiKey ? healthApiKey.substring(0, 3) : 'undefined',
-            last3: healthApiKey
-                ? healthApiKey.substring(healthApiKey.length - 3)
-                : 'undefined',
-            length: healthApiKey ? healthApiKey.length : 0,
-        });
-        console.log('Unauthorized access attempt to health endpoint');
+        console.error('Unauthorized access attempt to health endpoint');
         return res.status(401).json({
             status: 'error',
             message: 'Unauthorized',
@@ -163,21 +150,6 @@ const createTestEncryptionModel = () => {
     );
 };
 
-const createTestDocument = async (TestModel) => {
-    const testData = {
-        testSecret: 'This is a secret value that should be encrypted',
-        normalField: 'This is a normal field that should not be encrypted',
-        nestedSecret: {
-            value: 'This is a nested secret that should be encrypted',
-        },
-    };
-
-    const testDoc = new TestModel(testData);
-    await testDoc.save();
-
-    return { testDoc, testData };
-};
-
 const verifyDecryption = (retrievedDoc, originalData) => {
     return (
         retrievedDoc &&
@@ -251,18 +223,51 @@ const evaluateEncryptionTestResults = (decryptionWorks, encryptionResults) => {
     };
 };
 
+const withTimeout = (promise, ms, errorMessage) => {
+    return Promise.race([
+        promise,
+        new Promise((_, reject) =>
+            setTimeout(() => reject(new Error(errorMessage)), ms)
+        ),
+    ]);
+};
+
 const testEncryption = async () => {
+    // eslint-disable-next-line no-console
+    console.log('Starting encryption test');
     const TestModel = createTestEncryptionModel();
-    const { testDoc, testData } = await createTestDocument(TestModel);
+    // eslint-disable-next-line no-console
+    console.log('Test model created');
+
+    const testData = {
+        testSecret: 'This is a secret value that should be encrypted',
+        normalField: 'This is a normal field that should not be encrypted',
+        nestedSecret: {
+            value: 'This is a nested secret that should be encrypted',
+        },
+    };
+
+    const testDoc = new TestModel(testData);
+    await withTimeout(testDoc.save(), 5000, 'Save operation timed out');
+    // eslint-disable-next-line no-console
+    console.log('Test document saved');
 
     try {
-        const retrievedDoc = await TestModel.findById(testDoc._id);
+        const retrievedDoc = await withTimeout(
+            TestModel.findById(testDoc._id),
+            5000,
+            'Find operation timed out'
+        );
+        // eslint-disable-next-line no-console
+        console.log('Test document retrieved');
         const decryptionWorks = verifyDecryption(retrievedDoc, testData);
-        const encryptionResults = await verifyEncryptionInDatabase(
-            testDoc,
-            testData,
-            TestModel
+        const encryptionResults = await withTimeout(
+            verifyEncryptionInDatabase(testDoc, testData, TestModel),
+            5000,
+            'Database verification timed out'
         );
+        // eslint-disable-next-line no-console
+        console.log('Encryption verification completed');
 
         const evaluation = evaluateEncryptionTestResults(
             decryptionWorks,
@@ -274,7 +279,13 @@ const testEncryption = async () => {
             encryptionWorks: decryptionWorks,
         };
     } finally {
-        await TestModel.deleteOne({ _id: testDoc._id });
+        await withTimeout(
+            TestModel.deleteOne({ _id: testDoc._id }),
+            5000,
+            'Delete operation timed out'
+        );
+        // eslint-disable-next-line no-console
+        console.log('Test document deleted');
     }
 };
 
@@ -282,6 +293,12 @@ const checkEncryptionHealth = async () => {
     const config = getEncryptionConfiguration();
 
     if (config.isBypassed || config.mode === 'none') {
+        // eslint-disable-next-line no-console
+        console.log('Encryption check bypassed:', {
+            stage: config.stage,
+            mode: config.mode,
+        });
+
         const testResult = config.isBypassed
             ? 'Encryption bypassed for this stage'
             : 'No encryption keys configured';
@@ -400,6 +417,8 @@ router.get('/health', async (_req, res) => {
 });
 
 router.get('/health/detailed', async (_req, res) => {
+    // eslint-disable-next-line no-console
+    console.log('Starting detailed health check');
     const startTime = Date.now();
     const response = buildHealthCheckResponse(startTime);
 
@@ -409,12 +428,16 @@ router.get('/health/detailed', async (_req, res) => {
         if (!dbState.isConnected) {
             response.status = 'unhealthy';
         }
+        // eslint-disable-next-line no-console
+        console.log('Database check completed:', response.checks.database);
     } catch (error) {
         response.checks.database = {
             status: 'unhealthy',
             error: error.message,
         };
         response.status = 'unhealthy';
+        // eslint-disable-next-line no-console
+        console.log('Database check error:', error.message);
     }
 
     try {
@@ -422,12 +445,16 @@ router.get('/health/detailed', async (_req, res) => {
         if (response.checks.encryption.status === 'unhealthy') {
             response.status = 'unhealthy';
         }
+        // eslint-disable-next-line no-console
+        console.log('Encryption check completed:', response.checks.encryption);
     } catch (error) {
         response.checks.encryption = {
             status: 'unhealthy',
             error: error.message,
         };
         response.status = 'unhealthy';
+        // eslint-disable-next-line no-console
+        console.log('Encryption check error:', error.message);
     }
 
     const { apiStatuses, allReachable } = await checkExternalAPIs();
@@ -435,15 +462,24 @@ router.get('/health/detailed', async (_req, res) => {
     if (!allReachable) {
         response.status = 'unhealthy';
     }
+    // eslint-disable-next-line no-console
+    console.log('External APIs check completed:', response.checks.externalApis);
 
     try {
         response.checks.integrations = checkIntegrations();
+        // eslint-disable-next-line no-console
+        console.log(
+            'Integrations check completed:',
+            response.checks.integrations
+        );
     } catch (error) {
         response.checks.integrations = {
             status: 'unhealthy',
             error: error.message,
         };
         response.status = 'unhealthy';
+        // eslint-disable-next-line no-console
+        console.log('Integrations check error:', error.message);
     }
 
     response.responseTime = response.calculateResponseTime();
@@ -451,6 +487,14 @@ router.get('/health/detailed', async (_req, res) => {
 
     const statusCode = response.status === 'healthy' ? 200 : 503;
     res.status(statusCode).json(response);
+
+    // eslint-disable-next-line no-console
+    console.log(
+        'Final health status:',
+        response.status,
+        'Response time:',
+        response.responseTime
+    );
 });
 
 router.get('/health/live', (_req, res) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/core",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.419.a9bb30f.0",
+  "version": "2.0.0--canary.419.8343c27.0",
   "dependencies": {
     "@hapi/boom": "^10.0.1",
     "aws-sdk": "^2.1200.0",
@@ -22,9 +22,9 @@
     "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.419.a9bb30f.0",
-    "@friggframework/prettier-config": "2.0.0--canary.419.a9bb30f.0",
-    "@friggframework/test": "2.0.0--canary.419.a9bb30f.0",
+    "@friggframework/eslint-config": "2.0.0--canary.419.8343c27.0",
+    "@friggframework/prettier-config": "2.0.0--canary.419.8343c27.0",
+    "@friggframework/test": "2.0.0--canary.419.8343c27.0",
     "@types/lodash": "4.17.15",
     "@typescript-eslint/eslint-plugin": "^8.0.0",
     "chai": "^4.3.6",
@@ -56,5 +56,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a9bb30f7ae26580e49e1a2ed7ac62e6df8db9638"
+  "gitHead": "8343c27a69423f9186421c9caf188399e56bbf67"
 }