@friggframework/devtools 2.0.0--canary.482.caa9000.0 → 2.0.0--canary.482.f16726b.0

package/infrastructure/create-frigg-infrastructure.js

@@ -3,32 +3,65 @@ const fs = require('fs-extra');
 const { composeServerlessDefinition } = require('./infrastructure-composer');
 const { findNearestBackendPackageJson } = require('@friggframework/core');
 
+// Memoization cache to prevent duplicate infrastructure composition
+// when serverless framework loads configuration multiple times
+let cachedInfrastructure = null;
+let isComposing = false;
+
 async function createFriggInfrastructure() {
-    const backendPath = findNearestBackendPackageJson();
-    if (!backendPath) {
-        throw new Error('Could not find backend package.json');
+    // Return cached infrastructure if already composed
+    if (cachedInfrastructure) {
+        console.log('✓ Using cached infrastructure definition (already composed)');
+        return cachedInfrastructure;
     }
 
-    const backendDir = path.dirname(backendPath);
-    const backendFilePath = path.join(backendDir, 'index.js');
-    if (!fs.existsSync(backendFilePath)) {
-        throw new Error('Could not find index.js');
+    // Wait if another call is currently composing
+    if (isComposing) {
+        console.log('⏳ Infrastructure composition in progress - waiting...');
+        // Poll every 100ms until composition completes
+        while (isComposing) {
+            await new Promise(resolve => setTimeout(resolve, 100));
+        }
+        // Return the newly cached infrastructure
+        return cachedInfrastructure;
     }
 
-    const backend = require(backendFilePath);
-    const appDefinition = backend.Definition;
+    // Mark as composing to prevent concurrent composition
+    isComposing = true;
+
+    try {
+        const backendPath = findNearestBackendPackageJson();
+        if (!backendPath) {
+            throw new Error('Could not find backend package.json');
+        }
+
+        const backendDir = path.dirname(backendPath);
+        const backendFilePath = path.join(backendDir, 'index.js');
+        if (!fs.existsSync(backendFilePath)) {
+            throw new Error('Could not find index.js');
+        }
 
-    // const serverlessTemplate = require(path.resolve(
-    //     __dirname,
-    //     './serverless-template.js'
-    // ));
-    const definition = await composeServerlessDefinition(
-        appDefinition,
-    );
+        const backend = require(backendFilePath);
+        const appDefinition = backend.Definition;
 
-    return {
-        ...definition,
-    };
+        // const serverlessTemplate = require(path.resolve(
+        //     __dirname,
+        //     './serverless-template.js'
+        // ));
+        const definition = await composeServerlessDefinition(
+            appDefinition,
+        );
+
+        // Cache the composed infrastructure
+        cachedInfrastructure = {
+            ...definition,
+        };
+
+        return cachedInfrastructure;
+    } finally {
+        // Always clear composing flag
+        isComposing = false;
+    }
 }
 
 module.exports = { createFriggInfrastructure };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.482.caa9000.0",
+  "version": "2.0.0--canary.482.f16726b.0",
   "dependencies": {
     "@aws-sdk/client-ec2": "^3.835.0",
     "@aws-sdk/client-kms": "^3.835.0",
@@ -12,8 +12,8 @@
     "@babel/eslint-parser": "^7.18.9",
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
-    "@friggframework/schemas": "2.0.0--canary.482.caa9000.0",
-    "@friggframework/test": "2.0.0--canary.482.caa9000.0",
+    "@friggframework/schemas": "2.0.0--canary.482.f16726b.0",
+    "@friggframework/test": "2.0.0--canary.482.f16726b.0",
     "@hapi/boom": "^10.0.1",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.7.2",
@@ -35,8 +35,8 @@
     "serverless-http": "^2.7.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.482.caa9000.0",
-    "@friggframework/prettier-config": "2.0.0--canary.482.caa9000.0",
+    "@friggframework/eslint-config": "2.0.0--canary.482.f16726b.0",
+    "@friggframework/prettier-config": "2.0.0--canary.482.f16726b.0",
     "aws-sdk-client-mock": "^4.1.0",
     "aws-sdk-client-mock-jest": "^4.1.0",
     "jest": "^30.1.3",
@@ -68,5 +68,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "caa90009460831fdb4685c012c2cdf11b1df78de"
+  "gitHead": "f16726b784edfdeb427abdc037842fbbb763fb60"
 }