@friggframework/devtools 2.0.0-next.86 → 2.0.0-next.88

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

@@ -347,13 +347,46 @@ class IntegrationBuilder extends InfrastructureBuilder {
             console.log(`      ✓ Webhook handler function defined`);
         }
 
-        // Create HTTP API handler for integration (catch-all route AFTER webhooks)
+        // Tier 3 Integration Extension routes (e.g. hubspot.extensions.webhooks).
+        // The integration-defined-routers handler already mounts these at
+        // runtime; emitting explicit httpApi events here registers them as
+        // dedicated routes (visible at startup, and matched ahead of the
+        // catch-all) instead of silently relying on {proxy+}. They point at
+        // the same handler as the catch-all. Route shape mirrors core's
+        // getExtensionRoutes; we read it directly to avoid coupling the
+        // build-time generator to a core runtime import.
+        const extensionBindings = Object.values(
+            integration.Definition.extensions || {}
+        );
+        const extensionRouteEvents = [];
+        for (const binding of extensionBindings) {
+            const routes =
+                (binding && binding.extension && binding.extension.routes) ||
+                [];
+            for (const route of routes) {
+                extensionRouteEvents.push({
+                    httpApi: {
+                        path: `/api/${integrationName}-integration${route.path}`,
+                        method: route.method,
+                    },
+                });
+            }
+        }
+        if (extensionRouteEvents.length > 0) {
+            console.log(
+                `      ✓ ${extensionRouteEvents.length} extension route(s) defined`
+            );
+        }
+
+        // Create HTTP API handler for integration (catch-all route AFTER
+        // webhooks and extension routes)
         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
             package: functionPackageConfig,
             ...(usePrismaLayer && { layers: [{ Ref: 'PrismaLambdaLayer' }] }), // HTTP handlers need Prisma for integration queries
             events: [
+                ...extensionRouteEvents,
                 {
                     httpApi: {
                         path: `/api/${integrationName}-integration/{proxy+}`,

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

@@ -568,6 +568,75 @@ describe('IntegrationBuilder', () => {
             ]);
         });
 
+        it('should emit dedicated httpApi events for Tier 3 extension routes, before the catch-all', 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, {});
+
+            // The extension route is registered on the same handler as the
+            // catch-all, and ordered before {proxy+}.
+            expect(result.functions.hubspot.events).toEqual([
+                {
+                    httpApi: {
+                        path: '/api/hubspot-integration/webhooks',
+                        method: 'POST',
+                    },
+                },
+                {
+                    httpApi: {
+                        path: '/api/hubspot-integration/{proxy+}',
+                        method: 'ANY',
+                    },
+                },
+            ]);
+        });
+
+        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-next.86",
+  "version": "2.0.0-next.88",
   "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-next.86",
-    "@friggframework/schemas": "2.0.0-next.86",
-    "@friggframework/test": "2.0.0-next.86",
+    "@friggframework/core": "2.0.0-next.88",
+    "@friggframework/schemas": "2.0.0-next.88",
+    "@friggframework/test": "2.0.0-next.88",
     "@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-next.86",
-    "@friggframework/prettier-config": "2.0.0-next.86",
+    "@friggframework/eslint-config": "2.0.0-next.88",
+    "@friggframework/prettier-config": "2.0.0-next.88",
     "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": "8862a43e3aa4be518fa1b35da41b76129b617a2e"
+  "gitHead": "613b1c6f878086fadaf5a400c4227e4911a06d3e"
 }