@friggframework/devtools 2.0.0--canary.580.f1cb41c.0 → 2.0.0--canary.580.9716b6d.0

package/infrastructure/domains/database/aurora-builder.js

@@ -21,6 +21,36 @@ const AuroraResourceResolver = require('./aurora-resolver');
 const { createEmptyDiscoveryResult } = require('../shared/types/discovery-result');
 const { ResourceOwnership } = require('../shared/types/resource-ownership');
 
+// Pool + timeout query params appended to DATABASE_URL for Lambda-to-Aurora
+// connections. Chosen to make worker Lambdas fail loud and fast on any DB
+// contention rather than silently hanging for Lambda's 900s timeout.
+//
+//   connection_limit=2  — two pg connections per Lambda container. One is too
+//                         tight: several core use cases (get-process.executeMany,
+//                         field-encryption-service batches) issue in-handler
+//                         Promise.all against Prisma, and would serialize
+//                         behind a single slot. Two removes that cliff while
+//                         still being safe against max_connections (at 4 ACU
+//                         Aurora pg 15 allows ~400 connections; 200 concurrent
+//                         Lambdas × 2 = 400, leaves cluster room for maint).
+//   pool_timeout=20     — wait up to 20s for a pool slot, then throw P2024.
+//                         Still fail-fast relative to 900s Lambda cap; gives
+//                         in-handler fan-outs headroom.
+//   connect_timeout=10  — bound TCP/TLS handshake.
+//   socket_timeout=60   — kill dead client sockets (server never responds).
+//   options=-c statement_timeout=30000 -c lock_timeout=10000
+//                       — Postgres-side hard caps. A query stuck >30s aborts
+//                         with SQLSTATE 57014; a lock wait >10s aborts with
+//                         SQLSTATE 55P03. URL encoding per libpq URI rules
+//                         (space→%20, `=`→%3D inside the options value).
+const LAMBDA_DATABASE_URL_QUERY_PARAMS = [
+    'connection_limit=2',
+    'pool_timeout=20',
+    'connect_timeout=10',
+    'socket_timeout=60',
+    'options=-c%20statement_timeout%3D30000%20-c%20lock_timeout%3D10000',
+].join('&');
+
 class AuroraBuilder extends InfrastructureBuilder {
     constructor() {
         super();
@@ -501,6 +531,10 @@ class AuroraBuilder extends InfrastructureBuilder {
         result.environment.DATABASE_PORT = String(dbConfig.port || 5432);
         result.environment.DATABASE_NAME = dbConfig.database || 'frigg';
         result.environment.DATABASE_USER = dbConfig.username || 'postgres';
+        // Consumers that build DATABASE_URL from components at runtime MUST
+        // append `?${DATABASE_URL_PARAMS}` to get the same hang-prevention
+        // timeouts as the managed path.
+        result.environment.DATABASE_URL_PARAMS = LAMBDA_DATABASE_URL_QUERY_PARAMS;
 
         console.log(`  ✅ Using existing cluster: ${dbConfig.endpoint}`);
     }
@@ -731,13 +765,18 @@ exports.handler = async (event, context) => {
             result.environment.DATABASE_HOST = discoveredResources.auroraClusterEndpoint;
             result.environment.DATABASE_PORT = String(discoveredResources.auroraPort || 5432);
             result.environment.DATABASE_NAME = dbName;
+            // Consumers that build DATABASE_URL from components at runtime MUST
+            // append `?${DATABASE_URL_PARAMS}` to get the same hang-prevention
+            // timeouts as the managed path.
+            result.environment.DATABASE_URL_PARAMS = LAMBDA_DATABASE_URL_QUERY_PARAMS;
 
             // Note: DATABASE_URL is NOT set here to avoid Serverless variable resolution errors
             // The application (Frigg Core) should construct it at runtime from:
-            // DATABASE_HOST, DATABASE_PORT, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD
+            // DATABASE_HOST, DATABASE_PORT, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD, DATABASE_URL_PARAMS
 
             console.log('  ℹ️  No Secrets Manager secret found - set DATABASE_USER and DATABASE_PASSWORD in Lambda environment');
             console.log('  ℹ️  Application will construct DATABASE_URL at runtime from DATABASE_HOST, DATABASE_PORT, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD');
+            console.log('  ℹ️  Append `?${DATABASE_URL_PARAMS}` to the constructed URL for pool/timeout safety.');
             console.log('  ℹ️  Or enable autoCreateCredentials=true to automatically create and rotate credentials');
         }
 
@@ -797,35 +836,11 @@ exports.handler = async (event, context) => {
             return `{{resolve:secretsmanager:${secretRefValue}:SecretString:password}}`;
         };
 
-        // Pool + timeout query params:
-        //  connection_limit=1       — one pg connection per Lambda container;
-        //                             rely on Lambda concurrency for parallelism
-        //                             rather than per-process pooling (AWS RDS/
-        //                             Lambda best practice).
-        //  pool_timeout=10          — throw P2024 instead of waiting forever for
-        //                             a pool slot.
-        //  connect_timeout=10       — bound TCP/TLS handshake to 10s.
-        //  socket_timeout=60        — kill the client socket if the server
-        //                             never responds (dead NAT/VPC route case).
-        //  options=-c statement_timeout=30000 -c lock_timeout=10000
-        //                           — Postgres-side hard caps on query and
-        //                             lock-wait duration; queries aborting
-        //                             with SQLSTATE 57014 / 55P03 surface as
-        //                             errors instead of 15-minute Lambda
-        //                             timeouts. URL-encoded per Postgres libpq
-        //                             conventions (space→%20, `=`→%3D inside
-        //                             the options value).
-        const queryParams = [
-            'connection_limit=1',
-            'pool_timeout=10',
-            'connect_timeout=10',
-            'socket_timeout=60',
-            'options=-c%20statement_timeout%3D30000%20-c%20lock_timeout%3D10000',
-        ].join('&');
-
+        // Query params are defined at module scope (LAMBDA_DATABASE_URL_QUERY_PARAMS)
+        // so runtime-URL-construction paths can emit the same timeouts as an env var.
         return {
             'Fn::Sub': [
-                `postgresql://\${Username}:\${Password}@\${Host}:\${Port}/\${Database}?${queryParams}`,
+                `postgresql://\${Username}:\${Password}@\${Host}:\${Port}/\${Database}?${LAMBDA_DATABASE_URL_QUERY_PARAMS}`,
                 {
                     Username: resolveSecretRef(secretRef),
                     Password: resolveSecretPassword(secretRef),

package/infrastructure/domains/database/aurora-builder.test.js

@@ -561,9 +561,12 @@ describe('AuroraBuilder', () => {
                 expect(dbUrl['Fn::Sub'][0]).toMatch(
                     /^postgresql:\/\/\$\{Username\}:\$\{Password\}@\$\{Host\}:\$\{Port\}\/\$\{Database\}\?/
                 );
-                expect(dbUrl['Fn::Sub'][0]).toContain('connection_limit=1');
-                expect(dbUrl['Fn::Sub'][0]).toContain('pool_timeout=10');
+                expect(dbUrl['Fn::Sub'][0]).toContain('connection_limit=2');
+                expect(dbUrl['Fn::Sub'][0]).toContain('pool_timeout=20');
+                expect(dbUrl['Fn::Sub'][0]).toContain('connect_timeout=10');
+                expect(dbUrl['Fn::Sub'][0]).toContain('socket_timeout=60');
                 expect(dbUrl['Fn::Sub'][0]).toContain('statement_timeout%3D30000');
+                expect(dbUrl['Fn::Sub'][0]).toContain('lock_timeout%3D10000');
 
                 // The Username and Password should use Fn::Sub to resolve the secret Ref, not literal "[object Object]"
                 expect(dbUrl['Fn::Sub'][1].Username['Fn::Sub']).toBeDefined();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.580.f1cb41c.0",
+  "version": "2.0.0--canary.580.9716b6d.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.580.f1cb41c.0",
-    "@friggframework/schemas": "2.0.0--canary.580.f1cb41c.0",
-    "@friggframework/test": "2.0.0--canary.580.f1cb41c.0",
+    "@friggframework/core": "2.0.0--canary.580.9716b6d.0",
+    "@friggframework/schemas": "2.0.0--canary.580.9716b6d.0",
+    "@friggframework/test": "2.0.0--canary.580.9716b6d.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.580.f1cb41c.0",
-    "@friggframework/prettier-config": "2.0.0--canary.580.f1cb41c.0",
+    "@friggframework/eslint-config": "2.0.0--canary.580.9716b6d.0",
+    "@friggframework/prettier-config": "2.0.0--canary.580.9716b6d.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": "f1cb41cac2478873b9f7de4f2021848d85587a2a"
+  "gitHead": "9716b6d61164b122128921fcdbed420549a0fe44"
 }