@friggframework/devtools 2.0.0--canary.593.8eb6309.0 → 2.0.0--canary.596.6355e72.0

package/infrastructure/domains/integration/integration-builder.js

@@ -347,7 +347,9 @@ class IntegrationBuilder extends InfrastructureBuilder {
             console.log(`      ✓ Webhook handler function defined`);
         }
 
-        // Create HTTP API handler for integration (catch-all route AFTER webhooks)
+        // Create HTTP API handler for integration (catch-all route AFTER
+        // webhooks). Tier 3 extension routes are NOT folded in here — each
+        // binding gets its own function below so it can have its own DB infra.
         result.functions[integrationName] = {
             handler: `node_modules/@friggframework/core/handlers/routers/integration-defined-routers.handlers.${integrationName}.handler`,
             skipEsbuild: true, // Nested exports in node_modules - skip esbuild bundling
@@ -364,6 +366,47 @@ class IntegrationBuilder extends InfrastructureBuilder {
         };
         console.log(`      ✓ HTTP handler function defined`);
 
+        // Tier 3 Integration Extensions — one dedicated function per binding,
+        // namespaced under /{bindingKey} so multiple modules' extensions (e.g.
+        // hubspot + clockwork webhooks) never collide on the same path. The
+        // Prisma layer is attached only when the extension/binding declares
+        // useDatabase: true (default false → DB-free receiver, faster cold
+        // start). Route shape mirrors core's getExtensionRoutes; read directly
+        // to avoid coupling the build-time generator to a core runtime import.
+        const sanitizeBindingKey = (name) =>
+            String(name).replace(/[^A-Za-z0-9]/g, '');
+        const extensionEntries = Object.entries(
+            integration.Definition.extensions || {}
+        );
+        for (const [bindingKey, binding] of extensionEntries) {
+            const extension = binding && binding.extension;
+            const routes = (extension && extension.routes) || [];
+            if (routes.length === 0) continue;
+            const useDatabase =
+                binding.useDatabase ??
+                (extension && extension.useDatabase) ??
+                false;
+            const fnName = `${integrationName}__${sanitizeBindingKey(
+                bindingKey
+            )}`;
+            result.functions[fnName] = {
+                handler: `node_modules/@friggframework/core/handlers/routers/integration-defined-routers.handlers.${fnName}.handler`,
+                skipEsbuild: true,
+                package: functionPackageConfig,
+                ...(usePrismaLayer &&
+                    useDatabase && { layers: [{ Ref: 'PrismaLambdaLayer' }] }),
+                events: routes.map((route) => ({
+                    httpApi: {
+                        path: `/api/${integrationName}-integration/${bindingKey}${route.path}`,
+                        method: route.method,
+                    },
+                })),
+            };
+            console.log(
+                `      ✓ Extension handler function defined: ${fnName} (useDatabase: ${useDatabase})`
+            );
+        }
+
         // Create Queue Worker function
         const queueWorkerName = `${integrationName}QueueWorker`;
         result.functions[queueWorkerName] = {

package/infrastructure/domains/integration/integration-builder.test.js

@@ -568,6 +568,123 @@ describe('IntegrationBuilder', () => {
             ]);
         });
 
+        it('emits a dedicated per-binding function (namespaced) for Tier 3 extension routes; the main handler keeps only {proxy+}', async () => {
+            const appDefinition = {
+                integrations: [
+                    {
+                        Definition: {
+                            name: 'hubspot',
+                            extensions: {
+                                hubspotWebhooks: {
+                                    extension: {
+                                        name: 'hubspot-webhooks',
+                                        routes: [
+                                            {
+                                                path: '/webhooks',
+                                                method: 'POST',
+                                                event: 'HUBSPOT_WEBHOOK_RECEIVED',
+                                            },
+                                        ],
+                                        events: {
+                                            HUBSPOT_WEBHOOK_RECEIVED: {
+                                                type: 'LIFE_CYCLE_EVENT',
+                                                handler: () => {},
+                                            },
+                                        },
+                                    },
+                                    handlers: {},
+                                },
+                            },
+                        },
+                    },
+                ],
+            };
+
+            const result = await integrationBuilder.build(appDefinition, {});
+
+            // Dedicated per-binding function, namespaced under the binding key,
+            // pointing at its own handler export.
+            const fn = result.functions.hubspot__hubspotWebhooks;
+            expect(fn).toBeDefined();
+            expect(fn.handler).toBe(
+                'node_modules/@friggframework/core/handlers/routers/integration-defined-routers.handlers.hubspot__hubspotWebhooks.handler'
+            );
+            expect(fn.events).toEqual([
+                {
+                    httpApi: {
+                        path: '/api/hubspot-integration/hubspotWebhooks/webhooks',
+                        method: 'POST',
+                    },
+                },
+            ]);
+
+            // The main integration handler keeps only the catch-all.
+            expect(result.functions.hubspot.events).toEqual([
+                {
+                    httpApi: {
+                        path: '/api/hubspot-integration/{proxy+}',
+                        method: 'ANY',
+                    },
+                },
+            ]);
+
+            // useDatabase defaults to false → no Prisma layer on the receiver.
+            expect(fn.layers).toBeUndefined();
+        });
+
+        it('attaches the Prisma layer to a per-binding function only when useDatabase is true', async () => {
+            const mkDef = (useDatabase) => ({
+                integrations: [
+                    {
+                        Definition: {
+                            name: 'hs',
+                            extensions: {
+                                wh: {
+                                    extension: {
+                                        name: 'wh-ext',
+                                        useDatabase,
+                                        routes: [
+                                            {
+                                                path: '/webhooks',
+                                                method: 'POST',
+                                                event: 'E',
+                                            },
+                                        ],
+                                        events: { E: { handler: () => {} } },
+                                    },
+                                },
+                            },
+                        },
+                    },
+                ],
+            });
+
+            const withDb = await integrationBuilder.build(mkDef(true), {});
+            expect(withDb.functions.hs__wh.layers).toEqual([
+                { Ref: 'PrismaLambdaLayer' },
+            ]);
+
+            const withoutDb = await integrationBuilder.build(mkDef(false), {});
+            expect(withoutDb.functions.hs__wh.layers).toBeUndefined();
+        });
+
+        it('should only have the catch-all proxy route when no extensions are declared', async () => {
+            const appDefinition = {
+                integrations: [{ Definition: { name: 'plain' } }],
+            };
+
+            const result = await integrationBuilder.build(appDefinition, {});
+
+            expect(result.functions.plain.events).toEqual([
+                {
+                    httpApi: {
+                        path: '/api/plain-integration/{proxy+}',
+                        method: 'ANY',
+                    },
+                },
+            ]);
+        });
+
         it('should define webhook handler BEFORE catch-all proxy route (ordering bug fix)', async () => {
             const appDefinition = {
                 integrations: [

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.593.8eb6309.0",
+  "version": "2.0.0--canary.596.6355e72.0",
   "bin": {
     "frigg": "./frigg-cli/index.js"
   },
@@ -25,9 +25,9 @@
     "@babel/eslint-parser": "^7.18.9",
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
-    "@friggframework/core": "2.0.0--canary.593.8eb6309.0",
-    "@friggframework/schemas": "2.0.0--canary.593.8eb6309.0",
-    "@friggframework/test": "2.0.0--canary.593.8eb6309.0",
+    "@friggframework/core": "2.0.0--canary.596.6355e72.0",
+    "@friggframework/schemas": "2.0.0--canary.596.6355e72.0",
+    "@friggframework/test": "2.0.0--canary.596.6355e72.0",
     "@hapi/boom": "^10.0.1",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.7.2",
@@ -55,8 +55,8 @@
     "validate-npm-package-name": "^5.0.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.593.8eb6309.0",
-    "@friggframework/prettier-config": "2.0.0--canary.593.8eb6309.0",
+    "@friggframework/eslint-config": "2.0.0--canary.596.6355e72.0",
+    "@friggframework/prettier-config": "2.0.0--canary.596.6355e72.0",
     "aws-sdk-client-mock": "^4.1.0",
     "aws-sdk-client-mock-jest": "^4.1.0",
     "jest": "^30.1.3",
@@ -88,5 +88,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8eb6309937146ea407c6b683578e79637e62f3d5"
+  "gitHead": "6355e7230ef1f29f10e5336c88d4ddd257dffe18"
 }