cdk-booster 1.1.0-alpha.1 → 1.1.0-alpha.3

package/dist/cdk-booster.mjs

@@ -53,7 +53,9 @@ async function run() {
             compileCodeFile,
         });
         Logger.verbose(`Found ${lambdas.length} Lambda functions in the CDK code:`, JSON.stringify(lambdas, null, 2));
-        const lambdasEsBuildCommands = lambdas;
+        let lambdasEsBuildCommands = lambdas;
+        // skip all lambdas that have SKIP_CDK_BOOSTER env var set to true in their bundling environment
+        lambdasEsBuildCommands = lambdasEsBuildCommands.filter((lambda) => lambda.environment?.SKIP_CDK_BOOSTER !== 'true');
         // Prepare bundling temp folders for each Lambda function
         await recreateBundlingTempFolders(lambdasEsBuildCommands);
         // Execute pre-bundling commands
@@ -97,9 +99,10 @@ async function bundle(lambdasEsBuildCommands) {
     for (const buildBatch of buildBatches) {
         const build = async () => {
             parallelCount++;
+            let context;
+            const buildOptions = buildBatch.buildOptions;
+            const entryPoints = buildBatch.entryPoints;
             try {
-                const buildOptions = buildBatch[0].buildOptions;
-                const entryPoints = buildBatch.map((b) => b.entryPoint);
                 const normalizedEsbuildArgs = normalizeEsbuildArgs(buildOptions.esbuildArgs);
                 const esBuildOpt = {
                     entryPoints,
@@ -136,13 +139,52 @@ async function bundle(lambdasEsBuildCommands) {
                 else {
                     Logger.log(`Bundling:\n - ${entryPoints.join('\n - ')}`);
                 }
-                const buildingResults = await esbuild.build(esBuildOpt);
+                // Create esbuild context for this build batch
+                context = await esbuild.context(esBuildOpt);
+                let buildingResults;
+                try {
+                    // Perform the build using the context
+                    buildingResults = await context.rebuild();
+                }
+                catch (err) {
+                    Logger.log(`Error creating esbuild context.`, err);
+                    // Esbuild’s child process was stopped; recreate the context once.
+                    if (String(err?.message || err).includes('The service was stopped') &&
+                        context) {
+                        Logger.log(`Retrying bundling.`);
+                        try {
+                            await context.dispose();
+                        }
+                        catch {
+                            // ignore
+                        }
+                        try {
+                            context = await esbuild.context(esBuildOpt);
+                            buildingResults = await context.rebuild();
+                            Logger.log(`Retry successful.`);
+                        }
+                        catch (err) {
+                            Logger.log(`Retry failed.`, err);
+                            throw err;
+                        }
+                    }
+                    else {
+                        throw err;
+                    }
+                }
                 outputs = {
                     ...outputs,
                     ...buildingResults.metafile?.outputs,
                 };
             }
+            catch (error) {
+                Logger.error(`The following functions failed to bundle:\n - ${entryPoints.join('\n - ')}. Set batch parameter (-b) to a smaller number, like 5, to lower the chance of this error, and in case of error, a smaller batch would be affected.`, error);
+            }
             finally {
+                // Always dispose of the context to free resources
+                if (context) {
+                    await context.dispose();
+                }
                 parallelCount--;
             }
         };
@@ -246,15 +288,24 @@ function createBuildCombinations(lambdasEsBuildCommands) {
     const uniqueBuildHashes = new Set(buildCombinations.map((b) => b.buildOptionsHash));
     for (const buildHash of uniqueBuildHashes) {
         const buildBatch = buildCombinations.filter((b) => b.buildOptionsHash === buildHash);
+        let entryPoints = buildBatch.map((b) => b.entryPoint);
+        // unique entry points
+        entryPoints = Array.from(new Set(entryPoints));
         // if batch size is set and if each buildOptionsHash has more than batchSize entries, split them
-        if (batchSize && buildBatch.length > batchSize) {
-            for (let i = 0; i < buildBatch.length; i += batchSize) {
-                const chunk = buildBatch.slice(i, i + batchSize);
-                buildBatches.push(chunk);
+        if (batchSize && entryPoints.length > batchSize) {
+            for (let i = 0; i < entryPoints.length; i += batchSize) {
+                const chunk = entryPoints.slice(i, i + batchSize);
+                buildBatches.push({
+                    entryPoints: chunk,
+                    buildOptions: buildBatch[0].buildOptions,
+                });
             }
         }
         else {
-            buildBatches.push(buildBatch);
+            buildBatches.push({
+                entryPoints,
+                buildOptions: buildBatch[0].buildOptions,
+            });
         }
     }
     return buildBatches;

package/dist/getConfigFromCliArgs.mjs

@@ -1,4 +1,4 @@
-import { Command } from 'commander';
+import { Command, InvalidArgumentError } from 'commander';
 import { getVersion } from './version.mjs';
 /**
  * Get configuration from CLI arguments
@@ -10,8 +10,8 @@ export async function getConfigFromCliArgs() {
     const program = new Command();
     program.name('cdk-booster').description('CDK Booster').version(version);
     program.option('-v, --verbose', 'Verbose logging');
-    program.option('-b, --batch <number>', 'Number of Lambdas bundled in a batch with ESBuild');
-    program.option('-p, --parallel <number>', 'Number of parallel ESBuild processes. You usually do not need to change this.');
+    program.option('-b, --batch <number>', 'Number of Lambdas bundled in a batch with ESBuild', parseInteger);
+    program.option('-p, --parallel <number>', 'Number of parallel ESBuild processes. You usually do not need to change this.', parseInteger);
     program.arguments('<string>');
     program.parse(process.argv);
     const args = program.opts();
@@ -23,3 +23,10 @@ export async function getConfigFromCliArgs() {
     args.entryFile = entryFile;
     return args;
 }
+function parseInteger(value) {
+    const parsedValue = parseInt(value, 10);
+    if (isNaN(parsedValue)) {
+        throw new InvalidArgumentError('Not a number.');
+    }
+    return parsedValue;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cdk-booster",
-  "version": "1.1.0-alpha.1",
+  "version": "1.1.0-alpha.3",
   "type": "module",
   "description": "Speed up AWS CDK's bundling of TypeScript/JavaScript Lambda handlers",
   "homepage": "https://www.cdkbooster.com",

package/dist/types/buildTask.d.ts

@@ -1,5 +0,0 @@
-import { BundleSettings } from './bundleSettings.js';
-export type BuildTask = {
-    buildOptions: BundleSettings;
-    entryPoint: string;
-};

package/dist/types/buildTask.mjs

@@ -1 +0,0 @@
-export {};