@friggframework/core 2.0.0--canary.397.84ecb0e.0 → 2.0.0--canary.397.e634da9.0

package/handlers/backend-utils.js

@@ -1,9 +1,7 @@
 const { Router } = require('express');
 const { Worker } = require('@friggframework/core');
-const { loadAppDefinition } = require('./app-definition-loader');
 const { IntegrationRepository } = require('../integrations/integration-repository');
 const { ModuleFactory } = require('../modules/module-factory');
-const { GetIntegrationInstance } = require('../integrations/use-cases/get-integration-instance');
 const { getModulesDefinitionFromIntegrationClasses } = require('../integrations/utils/map-integration-dto');
 const { ModuleRepository } = require('../modules/module-repository');
 const { GetIntegrationInstanceByDefinition } = require('../integrations/use-cases/get-integration-instance-by-definition');
@@ -14,14 +12,15 @@ const loadRouterFromObject = (IntegrationClass, routerObject) => {
     const moduleRepository = new ModuleRepository();
     const moduleFactory = new ModuleFactory({
         moduleRepository,
-        moduleDefinitions: getModulesDefinitionFromIntegrationClasses(integrationClasses),
+        moduleDefinitions: getModulesDefinitionFromIntegrationClasses([IntegrationClass]),
     });
-
     const router = Router();
     const { path, method, event } = routerObject;
+
     console.log(
         `Registering ${method} ${path} for ${IntegrationClass.Definition.name}`
     );
+
     router[method.toLowerCase()](path, async (req, res, next) => {
         try {
             const getIntegrationInstanceByDefinition = new GetIntegrationInstanceByDefinition({
@@ -29,7 +28,7 @@ const loadRouterFromObject = (IntegrationClass, routerObject) => {
                 moduleFactory,
                 moduleRepository,
             });
-            const integration = await getIntegrationInstanceByDefinition.execute(IntegrationClass.Definition);
+            const integration = await getIntegrationInstanceByDefinition.execute(IntegrationClass);
             const result = await integration.send(event, { req, res, next });
             res.json(result);
         } catch (error) {
@@ -43,39 +42,25 @@ const loadRouterFromObject = (IntegrationClass, routerObject) => {
 //todo: this should be in a use case class
 const createQueueWorker = (integrationClass) => {
     class QueueWorker extends Worker {
+
+        integrationRepository = new IntegrationRepository();
+        moduleRepository = new ModuleRepository();
+        moduleFactory = new ModuleFactory({
+            moduleRepository: this.moduleRepository,
+            moduleDefinitions: getModulesDefinitionFromIntegrationClasses([integrationClass]),
+        });
+
         async _run(params, context) {
             try {
-                let integrationInstance;
-                if (!params.integrationId) {
-                    integrationInstance = new integrationClass();
-                    await integrationInstance.loadModules();
-                    await integrationInstance.registerEventHandlers();
-                    console.log(
-                        `${params.event} for ${integrationClass.Definition.name} integration with no integrationId`
-                    );
-                } else {
-                    const { integrations: integrationClasses } = loadAppDefinition();
-                    const integrationRepository = new IntegrationRepository();
-                    const moduleRepository = new ModuleRepository();
-                    const moduleFactory = new ModuleFactory({
-                        moduleRepository,
-                        moduleDefinitions: getModulesDefinitionFromIntegrationClasses(integrationClasses),
-                    });
-
-                    const getIntegrationInstance = new GetIntegrationInstance({
-                        integrationRepository,
-                        integrationClasses,
-                        moduleFactory,
-                    });
+                const getIntegrationInstanceByDefinition = new GetIntegrationInstanceByDefinition({
+                    integrationRepository: this.integrationRepository,
+                    moduleFactory: this.moduleFactory,
+                    moduleRepository: this.moduleRepository,
+                });
 
-                    // todo: are we going to have the userId available here?
-                    integrationInstance = await getIntegrationInstance.execute(params.integrationId, params.userId);
-                    console.log(
-                        `${params.event} for ${integrationInstance.record.config.type} of integrationId: ${params.integrationId}`
-                    );
-                }
+                const integration = await getIntegrationInstanceByDefinition.execute(integrationClass);
 
-                const res = await integrationInstance.send(params.event, {
+                const res = await integration.send(params.event, {
                     data: params.data,
                     context,
                 });

package/integrations/integration-base.js

@@ -69,7 +69,30 @@ class IntegrationBase {
         };
     }
 
-    constructor(params) {
+    constructor(params = {}) {
+        // Data from database record (when instantiated by use cases)
+        this.id = params.id;
+        this.userId = params.userId || params.integrationId; // fallback for legacy
+        this.entities = params.entities;
+        this.config = params.config;
+        this.status = params.status;
+        this.version = params.version;
+        this.messages = params.messages || { errors: [], warnings: [] };
+        
+        // Module instances (injected by factory)
+        this.modules = {};
+        if (params.modules) {
+            for (const mod of params.modules) {
+                const key = typeof mod.getName === 'function' ? mod.getName() : mod.name;
+                if (key) {
+                    this.modules[key] = mod;
+                    this[key] = mod; // Direct access (e.g., this.hubspot)
+                }
+            }
+        }
+
+        // Initialize events object (will be populated by child classes)
+        this.events = this.events || {};
 
         this.defaultEvents = {
             [constantsToBeMigrated.defaultEvents.ON_CREATE]: {
@@ -148,7 +171,7 @@ class IntegrationBase {
     async testAuth() {
         let didAuthPass = true;
 
-        for (const module of Object.keys(IntegrationBase.Definition.modules)) {
+        for (const module of Object.keys(this.constructor.Definition.modules)) {
             try {
                 await this[module].testAuth();
             } catch {
@@ -257,6 +280,81 @@ class IntegrationBase {
         };
         return options;
     }
+
+    // === Domain Methods (moved from Integration.js) ===
+    
+    getConfig() {
+        return this.config;
+    }
+
+    getModule(key) {
+        return this.modules[key];
+    }
+
+    setModule(key, module) {
+        this.modules[key] = module;
+        this[key] = module;
+    }
+
+    addError(error) {
+        if (!this.messages.errors) {
+            this.messages.errors = [];
+        }
+        this.messages.errors.push(error);
+        this.status = 'ERROR';
+    }
+
+    addWarning(warning) {
+        if (!this.messages.warnings) {
+            this.messages.warnings = [];
+        }
+        this.messages.warnings.push(warning);
+    }
+
+    isActive() {
+        return this.status === 'ENABLED' || this.status === 'ACTIVE';
+    }
+
+    needsConfiguration() {
+        return this.status === 'NEEDS_CONFIG';
+    }
+
+    hasErrors() {
+        return this.status === 'ERROR';
+    }
+
+    belongsToUser(userId) {
+        return this.userId.toString() === userId.toString();
+    }
+
+    async initialize() {
+        // Load dynamic user actions
+        try {
+            const additionalUserActions = await this.loadDynamicUserActions();
+            this.events = { ...this.events, ...additionalUserActions };
+        } catch (e) {
+            this.addError(e);
+        }
+
+        // Register event handlers
+        await this.registerEventHandlers();
+    }
+
+    getOptionDetails() {
+        const options = new Options({
+            module: Object.values(this.constructor.Definition.modules)[0],
+            ...this.constructor.Definition,
+        });
+        return options.get();
+    }
+
+    // Legacy method for backward compatibility
+    async loadModules() {
+        // This method was used in the old architecture for loading modules
+        // In the new architecture, modules are injected via constructor
+        // For backward compatibility, this is a no-op
+        return;
+    }
 }
 
 module.exports = { IntegrationBase };

package/integrations/integration-repository.js

@@ -4,7 +4,7 @@ class IntegrationRepository {
     async findIntegrationsByUserId(userId) {
         const integrationRecords = await IntegrationModel.find({ user: userId }, '', { lean: true }).populate('entities');
         return integrationRecords.map(integrationRecord => ({
-            id: integrationRecord._id,
+            id: integrationRecord._id.toString(),
             entitiesIds: integrationRecord.entities.map(e => e._id),
             userId: integrationRecord.user.toString(),
             config: integrationRecord.config,
@@ -21,7 +21,7 @@ class IntegrationRepository {
     async findIntegrationByName(name) {
         const integrationRecord = await IntegrationModel.findOne({ 'config.type': name }, '', { lean: true }).populate('entities');
         return {
-            id: integrationRecord._id,
+            id: integrationRecord._id.toString(),
             entitiesIds: integrationRecord.entities.map(e => e._id),
             userId: integrationRecord.user.toString(),
             config: integrationRecord.config,
@@ -34,7 +34,7 @@ class IntegrationRepository {
     async findIntegrationById(id) {
         const integrationRecord = await IntegrationModel.findById(id, '', { lean: true }).populate('entities');
         return {
-            id: integrationRecord._id,
+            id: integrationRecord._id.toString(),
             entitiesIds: integrationRecord.entities.map(e => e._id),
             userId: integrationRecord.user.toString(),
             config: integrationRecord.config,
@@ -66,7 +66,7 @@ class IntegrationRepository {
         });
 
         return {
-            id: integrationRecord._id,
+            id: integrationRecord._id.toString(),
             entitiesIds: integrationRecord.entities.map(e => e._id),
             userId: integrationRecord.user.toString(),
             config: integrationRecord.config,

package/integrations/integration.js

@@ -103,6 +103,19 @@ class Integration {
         });
     }
 
+    _rebindEventHandlers(events) {
+        const reboundEvents = {};
+        for (const [key, event] of Object.entries(events)) {
+            reboundEvents[key] = {
+                ...event,
+                handler: typeof event.handler === 'function' 
+                    ? event.handler.bind(this) 
+                    : event.handler
+            };
+        }
+        return reboundEvents;
+    }
+
     _initializeBasicBehavior() {
         // Initialize basic behavior (sync parts only)
         if (this.integrationClass) {
@@ -112,9 +125,9 @@ class Integration {
                 integrationId: this.id
             });
 
-            // Copy events
-            this.events = this.behavior.events || {};
-            this.defaultEvents = this.behavior.defaultEvents || {};
+            // Copy events and rebind handlers to the Integration wrapper
+            this.events = this._rebindEventHandlers(this.behavior.events || {});
+            this.defaultEvents = this._rebindEventHandlers(this.behavior.defaultEvents || {});
 
             // -----------------------------------------------------------------
             // Inject the real Module instances (with credentials) so that any
@@ -134,7 +147,7 @@ class Integration {
                 for (const key of Object.getOwnPropertyNames(proto)) {
                     if (key === 'constructor') continue;
                     if (typeof proto[key] === 'function' && this[key] === undefined) {
-                        this[key] = proto[key].bind(this.behavior);
+                        this[key] = proto[key].bind(this);
                     }
                 }
                 proto = Object.getPrototypeOf(proto);
@@ -148,7 +161,7 @@ class Integration {
             // Load dynamic user actions
             try {
                 const additionalUserActions = await this.loadDynamicUserActions();
-                this.events = { ...this.events, ...additionalUserActions };
+                this.events = { ...this.events, ...this._rebindEventHandlers(additionalUserActions) };
             } catch (e) {
                 this.addError(e);
             }

package/integrations/use-cases/create-integration.js

@@ -1,4 +1,4 @@
-const { Integration } = require('../integration');
+// Removed Integration wrapper - using IntegrationBase directly
 const { mapIntegrationClassToIntegrationDTO } = require('../utils/map-integration-dto');
 
 /**
@@ -50,7 +50,7 @@ class CreateIntegration {
             modules.push(moduleInstance);
         }
 
-        const integrationInstance = new Integration({
+        const integrationInstance = new integrationClass({
             id: integrationRecord.id,
             userId: integrationRecord.userId,
             entities: integrationRecord.entitiesIds,
@@ -58,7 +58,6 @@ class CreateIntegration {
             status: integrationRecord.status,
             version: integrationRecord.version,
             messages: integrationRecord.messages,
-            integrationClass: integrationClass,
             modules
         });
 

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

@@ -1,5 +1,5 @@
 const Boom = require('@hapi/boom');
-const { Integration } = require('../integration');
+// Removed Integration wrapper - using IntegrationBase directly
 
 /**
  * Use case for deleting an integration for a specific user.
@@ -49,7 +49,7 @@ class DeleteIntegrationForUser {
             );
         }
 
-        const integrationInstance = new Integration({
+        const integrationInstance = new integrationClass({
             id: integrationRecord.id,
             userId: integrationRecord.userId,
             entities: integrationRecord.entitiesIds,
@@ -57,7 +57,6 @@ class DeleteIntegrationForUser {
             status: integrationRecord.status,
             version: integrationRecord.version,
             messages: integrationRecord.messages,
-            integrationClass: integrationClass,
             modules: [],
         });
 

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

@@ -1,4 +1,4 @@
-const { Integration } = require('../integration');
+// Removed Integration wrapper - using IntegrationBase directly
 const { mapIntegrationClassToIntegrationDTO } = require('../utils/map-integration-dto');
 const Boom = require('@hapi/boom');
 
@@ -60,7 +60,7 @@ class GetIntegrationForUser {
             modules.push(moduleInstance);
         }
 
-        const integrationInstance = new Integration({
+        const integrationInstance = new integrationClass({
             id: integrationRecord._id,
             userId: integrationRecord.userId,
             entities: entities,
@@ -68,8 +68,6 @@ class GetIntegrationForUser {
             status: integrationRecord.status,
             version: integrationRecord.version,
             messages: integrationRecord.messages,
-            entityReference: integrationRecord.entityReference,
-            integrationClass: integrationClass,
             modules
         });
 

package/integrations/use-cases/get-integration-instance-by-definition.js

@@ -1,5 +1,4 @@
-const { Integration } = require('../integration');
-const { mapIntegrationClassToIntegrationDTO } = require('../utils/map-integration-dto');
+// Removed Integration wrapper - using IntegrationBase directly
 const Boom = require('@hapi/boom');
 
 /**
@@ -30,36 +29,37 @@ class GetIntegrationInstanceByDefinition {
      * @returns {Promise<Object>} The integration DTO for the specified definition.
      * @throws {Boom.notFound} When integration with the specified definition does not exist.
      */
-    async execute(definition) {
-        const integrationRecord = await this.integrationRepository.findIntegrationByName(definition.name);
-        const entities = await this.moduleRepository.findEntitiesByIds(integrationRecord.entitiesIds);
+    async execute(integrationClass) {
+        const integrationRecord = await this.integrationRepository.findIntegrationByName(integrationClass.Definition.name);
 
         if (!integrationRecord) {
-            throw Boom.notFound(`Integration with name of ${definition.name} does not exist`);
+            throw Boom.notFound(`Integration with name of ${integrationClass.Definition.name} does not exist`);
         }
 
+        const entities = await this.moduleRepository.findEntitiesByIds(integrationRecord.entitiesIds);
+
         const modules = [];
         for (const entity of entities) {
             const moduleInstance = await this.moduleFactory.getModuleInstance(
-                entity._id,
+                entity.id,
                 integrationRecord.userId
             );
             modules.push(moduleInstance);
         }
 
-        const integrationInstance = new Integration({
-            id: integrationRecord._id,
+        const integrationInstance = new integrationClass({
+            id: integrationRecord.id,
             userId: integrationRecord.userId,
             entities: entities,
             config: integrationRecord.config,
             status: integrationRecord.status,
             version: integrationRecord.version,
             messages: integrationRecord.messages,
-            entityReference: integrationRecord.entityReference,
-            integrationClass: integrationClass,
             modules
         });
 
+        await integrationInstance.initialize();
+
         return integrationInstance
     }
 }

package/integrations/use-cases/get-integration-instance.js

@@ -1,4 +1,4 @@
-const { Integration } = require('../integration');
+// Removed Integration wrapper - using IntegrationBase directly
 
 /**
  * Use case for retrieving a single integration instance by ID and user.
@@ -62,7 +62,7 @@ class GetIntegrationInstance {
             modules.push(moduleInstance);
         }
 
-        const integrationInstance = new Integration({
+        const integrationInstance = new integrationClass({
             id: integrationRecord.id,
             userId: integrationRecord.userId,
             entities: integrationRecord.entitiesIds,
@@ -70,11 +70,9 @@ class GetIntegrationInstance {
             status: integrationRecord.status,
             version: integrationRecord.version,
             messages: integrationRecord.messages,
-            integrationClass: integrationClass,
             modules
         });
 
-
         await integrationInstance.initialize();
 
         return integrationInstance;

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

@@ -1,4 +1,4 @@
-const { Integration } = require('../integration');
+// Removed Integration wrapper - using IntegrationBase directly
 const { mapIntegrationClassToIntegrationDTO } = require('../utils/map-integration-dto');
 
 /**
@@ -52,7 +52,7 @@ class GetIntegrationsForUser {
                 modules.push(moduleInstance);
             }
 
-            const integrationInstance = new Integration({
+            const integrationInstance = new integrationClass({
                 id: integrationRecord.id,
                 userId: integrationRecord.userId,
                 entities: entities,
@@ -60,7 +60,6 @@ class GetIntegrationsForUser {
                 status: integrationRecord.status,
                 version: integrationRecord.version,
                 messages: integrationRecord.messages,
-                integrationClass: integrationClass,
                 modules
             });
 

package/integrations/use-cases/update-integration.js

@@ -1,4 +1,4 @@
-const { Integration } = require('../integration');
+// Removed Integration wrapper - using IntegrationBase directly
 const { mapIntegrationClassToIntegrationDTO } = require('../utils/map-integration-dto');
 
 /**
@@ -68,7 +68,7 @@ class UpdateIntegration {
         }
 
         // 4. Create the Integration domain entity with modules and updated config
-        const integrationInstance = new Integration({
+        const integrationInstance = new integrationClass({
             id: integrationRecord.id,
             userId: integrationRecord.userId,
             entities: integrationRecord.entitiesIds,
@@ -76,7 +76,6 @@ class UpdateIntegration {
             status: integrationRecord.status,
             version: integrationRecord.version,
             messages: integrationRecord.messages,
-            integrationClass: integrationClass,
             modules
         });
 

package/modules/module-factory.js

@@ -34,7 +34,7 @@ class ModuleFactory {
 
         const moduleName = entity.moduleName;
         const moduleDefinition = this.moduleDefinitions.find((def) => {
-            return moduleName === def.modelName;
+            return moduleName === def.moduleName;
         });
 
         if (!moduleDefinition) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/core",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.397.84ecb0e.0",
+  "version": "2.0.0--canary.397.e634da9.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.397.84ecb0e.0",
-    "@friggframework/prettier-config": "2.0.0--canary.397.84ecb0e.0",
-    "@friggframework/test": "2.0.0--canary.397.84ecb0e.0",
+    "@friggframework/eslint-config": "2.0.0--canary.397.e634da9.0",
+    "@friggframework/prettier-config": "2.0.0--canary.397.e634da9.0",
+    "@friggframework/test": "2.0.0--canary.397.e634da9.0",
     "@types/lodash": "4.17.15",
     "@typescript-eslint/eslint-plugin": "^8.0.0",
     "chai": "^4.3.6",
@@ -53,5 +53,5 @@
   },
   "homepage": "https://github.com/friggframework/frigg#readme",
   "description": "",
-  "gitHead": "84ecb0ef85262bbb8c2c063dd595684d63599649"
+  "gitHead": "e634da9cd6c4e10ca19280b4f1e11d02eeeada51"
 }