@friggframework/core 2.0.0--canary.461.02fc54a.0 → 2.0.0--canary.461.651659d.0

package/handlers/routers/health.js

@@ -1,5 +1,16 @@
 const { Router } = require('express');
 const { createAppHandler } = require('./../app-handler-helpers');
+const { loadAppDefinition } = require('./../app-definition-loader');
+const { ModuleFactory } = require('../../modules/module-factory');
+const {
+    getModulesDefinitionFromIntegrationClasses,
+} = require('../../integrations/utils/map-integration-dto');
+const {
+    createModuleRepository,
+} = require('../../modules/repositories/module-repository-factory');
+const {
+    createIntegrationRepository,
+} = require('../../integrations/repositories/integration-repository-factory');
 const {
     createHealthCheckRepository,
 } = require('../../database/repositories/health-check-repository-factory');
@@ -22,6 +33,27 @@ const {
 const router = Router();
 const healthCheckRepository = createHealthCheckRepository();
 
+// Load integrations and create factories just like auth router does
+// This verifies the system can properly load integrations
+let moduleFactory, integrationClasses;
+try {
+    const appDef = loadAppDefinition();
+    integrationClasses = appDef.integrations || [];
+    
+    const moduleRepository = createModuleRepository();
+    const moduleDefinitions = getModulesDefinitionFromIntegrationClasses(integrationClasses);
+    
+    moduleFactory = new ModuleFactory({
+        moduleRepository,
+        moduleDefinitions,
+    });
+} catch (error) {
+    console.error('Failed to load integrations for health check:', error.message);
+    // Factories will be undefined, health check will report unhealthy
+    moduleFactory = undefined;
+    integrationClasses = [];
+}
+
 const testEncryptionUseCase = new TestEncryptionUseCase({
     healthCheckRepository,
 });
@@ -32,11 +64,9 @@ const checkEncryptionHealthUseCase = new CheckEncryptionHealthUseCase({
     testEncryptionUseCase,
 });
 const checkExternalApisHealthUseCase = new CheckExternalApisHealthUseCase();
-// Module/Integration factories not available in health check context
-// Pass undefined - the use case will handle gracefully
 const checkIntegrationsHealthUseCase = new CheckIntegrationsHealthUseCase({
-    moduleFactory: undefined,
-    integrationFactory: undefined,
+    moduleFactory,
+    integrationClasses,
 });
 
 const validateApiKey = (req, res, next) => {

package/handlers/use-cases/check-integrations-health-use-case.js

@@ -1,20 +1,32 @@
 class CheckIntegrationsHealthUseCase {
-    constructor({ moduleFactory, integrationFactory }) {
+    constructor({ moduleFactory, integrationClasses }) {
         this.moduleFactory = moduleFactory;
-        this.integrationFactory = integrationFactory;
+        this.integrationClasses = integrationClasses;
     }
 
     execute() {
-        const moduleTypes = (this.moduleFactory && Array.isArray(this.moduleFactory.moduleTypes))
-            ? this.moduleFactory.moduleTypes
+        const moduleDefinitions = (this.moduleFactory && this.moduleFactory.moduleDefinitions)
+            ? this.moduleFactory.moduleDefinitions
             : [];
 
-        const integrationTypes = (this.integrationFactory && Array.isArray(
-            this.integrationFactory.integrationTypes
-        ))
-            ? this.integrationFactory.integrationTypes
+        const integrationClasses = Array.isArray(this.integrationClasses)
+            ? this.integrationClasses
             : [];
 
+        // Extract module names from definitions
+        const moduleTypes = Array.isArray(moduleDefinitions)
+            ? moduleDefinitions.map(def => def.moduleName || def.name || def.label || 'Unknown')
+            : [];
+
+        // Extract integration names from classes
+        const integrationNames = integrationClasses.map(IntegrationClass => {
+            try {
+                return IntegrationClass.Definition?.name || IntegrationClass.name || 'Unknown';
+            } catch {
+                return 'Unknown';
+            }
+        });
+
         return {
             status: 'healthy',
             modules: {
@@ -22,8 +34,8 @@ class CheckIntegrationsHealthUseCase {
                 available: moduleTypes,
             },
             integrations: {
-                count: integrationTypes.length,
-                available: integrationTypes,
+                count: integrationNames.length,
+                available: integrationNames,
             },
         };
     }

package/handlers/use-cases/check-integrations-health-use-case.test.js

@@ -10,16 +10,21 @@ describe('CheckIntegrationsHealthUseCase', () => {
     describe('execute()', () => {
         it('should return healthy status with module and integration counts', () => {
             const mockModuleFactory = {
-                moduleTypes: ['HubSpot', 'Salesforce', 'Slack'],
+                moduleDefinitions: [
+                    { moduleName: 'HubSpot' },
+                    { moduleName: 'Salesforce' },
+                    { moduleName: 'Slack' },
+                ],
             };
 
-            const mockIntegrationFactory = {
-                integrationTypes: ['HubSpot-to-Salesforce', 'Slack-Notifications'],
-            };
+            const mockIntegrationClasses = [
+                { Definition: { name: 'HubSpot-to-Salesforce' } },
+                { Definition: { name: 'Slack-Notifications' } },
+            ];
 
             const useCase = new CheckIntegrationsHealthUseCase({
                 moduleFactory: mockModuleFactory,
-                integrationFactory: mockIntegrationFactory,
+                integrationClasses: mockIntegrationClasses,
             });
 
             const result = useCase.execute();
@@ -32,13 +37,13 @@ describe('CheckIntegrationsHealthUseCase', () => {
         });
 
         it('should handle undefined moduleFactory gracefully', () => {
-            const mockIntegrationFactory = {
-                integrationTypes: ['Integration1'],
-            };
+            const mockIntegrationClasses = [
+                { Definition: { name: 'Integration1' } },
+            ];
 
             const useCase = new CheckIntegrationsHealthUseCase({
                 moduleFactory: undefined,
-                integrationFactory: mockIntegrationFactory,
+                integrationClasses: mockIntegrationClasses,
             });
 
             const result = useCase.execute();
@@ -49,14 +54,14 @@ describe('CheckIntegrationsHealthUseCase', () => {
             expect(result.integrations.count).toBe(1);
         });
 
-        it('should handle undefined integrationFactory gracefully', () => {
+        it('should handle undefined integrationClasses gracefully', () => {
             const mockModuleFactory = {
-                moduleTypes: ['Module1'],
+                moduleDefinitions: [{ moduleName: 'Module1' }],
             };
 
             const useCase = new CheckIntegrationsHealthUseCase({
                 moduleFactory: mockModuleFactory,
-                integrationFactory: undefined,
+                integrationClasses: undefined,
             });
 
             const result = useCase.execute();
@@ -67,10 +72,10 @@ describe('CheckIntegrationsHealthUseCase', () => {
             expect(result.integrations.available).toEqual([]);
         });
 
-        it('should handle both factories being undefined', () => {
+        it('should handle both moduleFactory and integrationClasses being undefined', () => {
             const useCase = new CheckIntegrationsHealthUseCase({
                 moduleFactory: undefined,
-                integrationFactory: undefined,
+                integrationClasses: undefined,
             });
 
             const result = useCase.execute();
@@ -82,18 +87,14 @@ describe('CheckIntegrationsHealthUseCase', () => {
             expect(result.integrations.available).toEqual([]);
         });
 
-        it('should handle non-array moduleTypes', () => {
+        it('should handle non-array moduleDefinitions', () => {
             const mockModuleFactory = {
-                moduleTypes: 'not-an-array',
-            };
-
-            const mockIntegrationFactory = {
-                integrationTypes: [],
+                moduleDefinitions: 'not-an-array',
             };
 
             const useCase = new CheckIntegrationsHealthUseCase({
                 moduleFactory: mockModuleFactory,
-                integrationFactory: mockIntegrationFactory,
+                integrationClasses: [],
             });
 
             const result = useCase.execute();
@@ -103,13 +104,12 @@ describe('CheckIntegrationsHealthUseCase', () => {
             expect(result.modules.available).toEqual([]);
         });
 
-        it('should handle factories with missing moduleTypes/integrationTypes properties', () => {
-            const mockModuleFactory = {}; // No moduleTypes property
-            const mockIntegrationFactory = {}; // No integrationTypes property
+        it('should handle moduleFactory with missing moduleDefinitions property', () => {
+            const mockModuleFactory = {}; // No moduleDefinitions property
 
             const useCase = new CheckIntegrationsHealthUseCase({
                 moduleFactory: mockModuleFactory,
-                integrationFactory: mockIntegrationFactory,
+                integrationClasses: [],
             });
 
             const result = useCase.execute();

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@friggframework/core",
     "prettier": "@friggframework/prettier-config",
-    "version": "2.0.0--canary.461.02fc54a.0",
+    "version": "2.0.0--canary.461.651659d.0",
     "dependencies": {
         "@aws-sdk/client-apigatewaymanagementapi": "^3.588.0",
         "@aws-sdk/client-kms": "^3.588.0",
@@ -37,9 +37,9 @@
         }
     },
     "devDependencies": {
-        "@friggframework/eslint-config": "2.0.0--canary.461.02fc54a.0",
-        "@friggframework/prettier-config": "2.0.0--canary.461.02fc54a.0",
-        "@friggframework/test": "2.0.0--canary.461.02fc54a.0",
+        "@friggframework/eslint-config": "2.0.0--canary.461.651659d.0",
+        "@friggframework/prettier-config": "2.0.0--canary.461.651659d.0",
+        "@friggframework/test": "2.0.0--canary.461.651659d.0",
         "@prisma/client": "^6.17.0",
         "@types/lodash": "4.17.15",
         "@typescript-eslint/eslint-plugin": "^8.0.0",
@@ -79,5 +79,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "02fc54ae7404113a9cb68b70437ce2879a7d7e5f"
+    "gitHead": "651659d3282b05bcecf571281d5a1a7e19c156bf"
 }