@friggframework/core 2.0.0--canary.490.10eff0a.0 → 2.0.0--canary.493.f8d621f.0

package/database/repositories/health-check-repository-mongodb.js

@@ -29,21 +29,32 @@ class HealthCheckRepositoryMongoDB extends HealthCheckRepositoryInterface {
         }
 
         return {
+            readyState: isConnected ? 1 : 0,
             readyState: isConnected ? 1 : 0,
             stateName,
             isConnected,
         };
     }
 
-    /**
-     * @param {number} maxTimeMS
-     * @returns {Promise<number>} Response time in milliseconds
-     */
     async pingDatabase(maxTimeMS = 2000) {
         const pingStart = Date.now();
-        await this.prisma.$queryRaw`SELECT 1`.catch(() => {
-            return this.prisma.$runCommandRaw({ ping: 1 });
-        });
+        
+        // Create a timeout promise that rejects after maxTimeMS
+        const timeoutPromise = new Promise((_, reject) => 
+            setTimeout(() => reject(new Error('Database ping timeout')), maxTimeMS)
+        );
+        
+        // Race between the database ping and the timeout
+        await Promise.race([
+            prisma.$queryRaw`SELECT 1`.catch(() => {
+                // For MongoDB, use runCommandRaw instead
+                return prisma.$runCommandRaw({ ping: 1 });
+            }),
+            timeoutPromise
+        ]);
+        
+        return Date.now() - pingStart;
+    }
         return Date.now() - pingStart;
     }
 

package/integrations/integration-router.js

@@ -113,6 +113,7 @@ function createIntegrationRouter() {
     const deleteIntegrationForUser = new DeleteIntegrationForUser({
         integrationRepository,
         integrationClasses,
+        moduleFactory,
     });
 
     const getIntegrationsForUser = new GetIntegrationsForUser({

package/integrations/use-cases/delete-integration-for-user.js

@@ -11,13 +11,15 @@ class DeleteIntegrationForUser {
      * @param {Object} params - Configuration parameters.
      * @param {import('../repositories/integration-repository-interface').IntegrationRepositoryInterface} params.integrationRepository - Repository for integration data operations.
      * @param {Array<import('../integration').Integration>} params.integrationClasses - Array of available integration classes.
+     * @param {import('../../modules/module-factory').ModuleFactory} params.moduleFactory - Service for module instantiation and management.
      */
-    constructor({ integrationRepository, integrationClasses }) {
+    constructor({ integrationRepository, integrationClasses, moduleFactory }) {
         /**
          * @type {import('../repositories/integration-repository-interface').IntegrationRepositoryInterface}
          */
         this.integrationRepository = integrationRepository;
         this.integrationClasses = integrationClasses;
+        this.moduleFactory = moduleFactory;
     }
 
     /**
@@ -51,6 +53,32 @@ class DeleteIntegrationForUser {
             );
         }
 
+        // Load modules with API clients for webhook deletion
+        const modules = [];
+        const failedModuleLoads = [];
+
+        for (const entityId of integrationRecord.entitiesIds) {
+            try {
+                const moduleInstance = await this.moduleFactory.getModuleInstance(
+                    entityId,
+                    integrationRecord.userId
+                );
+                modules.push(moduleInstance);
+            } catch (error) {
+                console.error(
+                    `[Integration Deletion] Failed to load module for entity ${entityId}:`,
+                    error.message
+                );
+                failedModuleLoads.push({ entityId, error: error.message });
+            }
+        }
+
+        if (failedModuleLoads.length > 0) {
+            console.warn(
+                `[Integration Deletion] ${failedModuleLoads.length}/${integrationRecord.entitiesIds.length} module(s) failed to load. Webhooks for these modules may require manual cleanup.`
+            );
+        }
+
         const integrationInstance = new integrationClass({
             id: integrationRecord.id,
             userId: integrationRecord.userId,
@@ -59,10 +87,10 @@ class DeleteIntegrationForUser {
             status: integrationRecord.status,
             version: integrationRecord.version,
             messages: integrationRecord.messages,
-            modules: [],
+            modules,
         });
 
-        // 6. Complete async initialization (load dynamic actions, register handlers)
+        // Complete async initialization (load dynamic actions, register handlers)
         await integrationInstance.initialize();
         await integrationInstance.send('ON_DELETE');
 

package/integrations/use-cases/get-integrations-for-user.js

@@ -64,19 +64,20 @@ class GetIntegrationsForUser {
                 modules.push(moduleInstance);
             }
 
-            const integrationInstance = new integrationClass({
+            const integrationData = {
                 id: integrationRecord.id,
                 userId: integrationRecord.userId,
                 entities: entities,
                 config: integrationRecord.config,
                 status: integrationRecord.status,
                 version: integrationRecord.version,
-                messages: integrationRecord.messages,
+                messages: integrationRecord.messages || { errors: [], warnings: [] },
                 modules,
-            });
+                options: integrationClass.getOptionDetails(),
+            };
 
             integrations.push(
-                mapIntegrationClassToIntegrationDTO(integrationInstance)
+                mapIntegrationClassToIntegrationDTO(integrationData)
             );
         }
 

package/integrations/utils/map-integration-dto.js

@@ -1,6 +1,7 @@
 /**
  * @param {import('../integration').Integration} integration
  * Convert an Integration domain instance to a plain DTO suitable for JSON responses.
+ * Can also accept a plain object with an 'options' property to avoid unnecessary instantiation.
  */
 function mapIntegrationClassToIntegrationDTO(integration) {
     if (!integration) return null;
@@ -14,7 +15,7 @@ function mapIntegrationClassToIntegrationDTO(integration) {
         version: integration.version,
         messages: integration.messages,
         userActions: integration.userActions,
-        options: integration.getOptionDetails(),
+        options: integration.options || (typeof integration.getOptionDetails === 'function' ? integration.getOptionDetails() : null),
     };
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@friggframework/core",
     "prettier": "@friggframework/prettier-config",
-    "version": "2.0.0--canary.490.10eff0a.0",
+    "version": "2.0.0--canary.493.f8d621f.0",
     "dependencies": {
         "@aws-sdk/client-apigatewaymanagementapi": "^3.588.0",
         "@aws-sdk/client-kms": "^3.588.0",
@@ -38,9 +38,9 @@
         }
     },
     "devDependencies": {
-        "@friggframework/eslint-config": "2.0.0--canary.490.10eff0a.0",
-        "@friggframework/prettier-config": "2.0.0--canary.490.10eff0a.0",
-        "@friggframework/test": "2.0.0--canary.490.10eff0a.0",
+        "@friggframework/eslint-config": "2.0.0--canary.493.f8d621f.0",
+        "@friggframework/prettier-config": "2.0.0--canary.493.f8d621f.0",
+        "@friggframework/test": "2.0.0--canary.493.f8d621f.0",
         "@prisma/client": "^6.17.0",
         "@types/lodash": "4.17.15",
         "@typescript-eslint/eslint-plugin": "^8.0.0",
@@ -80,5 +80,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "10eff0ae7ff87794900048cb0cc357714232e4cf"
+    "gitHead": "f8d621f5fdc06756c1351e99a4686767a46f7064"
 }