lambda-live-debugger 1.0.0 → 1.0.3

package/.vitepress/config.mts

@@ -28,7 +28,7 @@ export default defineConfig({
     ['meta', { property: 'og:image', content: 'https://lldebugger.com/lambda_live_debugger.png' }],
     ['meta', { property: 'og:url', content: 'https://lldebugger.com/' }],
 
-    ['meta', { property: 'twitter:card', content: 'summary' }],
+    ['meta', { property: 'twitter:card', content: 'summary_large_image' }],
     ['meta', { property: 'twitter:site', content: '@serverlessl' }],
 
     [

package/README.md

@@ -1,6 +1,6 @@
 # ![Lambda Live Debugger](public/logo_landscape_light.svg)
 
-Lambda Live Debugger is an indispensable tool for debugging AWS Lambda functions from your computer, even though they are deployed in the cloud. It supports Lambdas written in JavaScript or TypeScript.
+Lambda Live Debugger is an indispensable tool for debugging AWS Lambda functions from your computer, even though they are deployed in the cloud. It supports Lambdas written in JavaScript or TypeScript. It is free and open source.
 
 This tool offers similar functionality to [SST](https://sst.dev/) and [Serverless Framework v4](https://www.serverless.com/blog/serverless-framework-v4-general-availability), with the addition of an Observability Mode.
 

package/dist/cloudFormation.mjs

@@ -51,7 +51,11 @@ async function getCloudFormationClient(awsConfiguration) {
  * @returns
  */
 async function getCloudFormationResources(stackName, awsConfiguration) {
+    // temporary disable console.error because SAM framework outputs useless errors
+    const originalConsoleError = console.error;
+    console.error = function () { };
     const { ListStackResourcesCommand } = await import('@aws-sdk/client-cloudformation');
+    console.error = originalConsoleError;
     const cloudFormationClient = await getCloudFormationClient(awsConfiguration);
     try {
         let nextToken = undefined;

package/dist/frameworks/cdkFramework.mjs

@@ -193,17 +193,54 @@ export class CdkFramework {
                 });
             },
         };
-        const compileOutput = path.join(getProjectDirname(), outputFolder, `compiledCdk.js`);
+        let isESM = false;
+        // get packgage.json
+        const packageJsonPath = await findPackageJson(entryFile);
+        if (packageJsonPath) {
+            try {
+                const packageJson = JSON.parse(await fs.readFile(packageJsonPath, { encoding: 'utf-8' }));
+                if (packageJson.type === 'module') {
+                    isESM = true;
+                    Logger.verbose(`[CDK] Using ESM format`);
+                }
+            }
+            catch (err) {
+                Logger.error(`Error reading CDK package.json (${packageJsonPath}): ${err.message}`, err);
+            }
+        }
+        const compileOutput = path.join(getProjectDirname(), outputFolder, `compiledCdk.${isESM ? 'mjs' : 'cjs'}`);
+        const dirname = path.join(...[getProjectDirname(), config.subfolder, 'x'].filter((p) => p));
         try {
             // Build CDK code
             await esbuild.build({
                 entryPoints: [entryFile],
                 bundle: true,
                 platform: 'node',
-                target: 'node18',
+                keepNames: true,
                 outfile: compileOutput,
                 sourcemap: false,
                 plugins: [injectCodePlugin],
+                ...(isESM
+                    ? {
+                        format: 'esm',
+                        target: 'esnext',
+                        mainFields: ['module', 'main'],
+                        banner: {
+                            js: [
+                                `import { createRequire as topLevelCreateRequire } from 'module';`,
+                                `global.require = global.require ?? topLevelCreateRequire(import.meta.url);`,
+                                `import { fileURLToPath as topLevelFileUrlToPath, URL as topLevelURL } from "url"`,
+                                `global.__dirname = '${dirname}'`,
+                            ].join('\n'),
+                        },
+                    }
+                    : {
+                        format: 'cjs',
+                        target: 'node18',
+                        banner: {
+                            js: [`__dirname = '${dirname}';`].join('\n'),
+                        },
+                    }),
             });
         }
         catch (error) {
@@ -296,6 +333,12 @@ export class CdkFramework {
                     reject(new Error(`CDK worker stopped with exit code ${code}`));
                 }
             });
+            // worker.stdout.on('data', (data: Buffer) => {
+            //   Logger.log(`[CDK]`, data.toString());
+            // });
+            // worker.stderr.on('data', (data: Buffer) => {
+            //   Logger.error(`[CDK]`, data.toString());
+            // });
             worker.postMessage({
                 compileOutput: compileCodeFile,
             });

package/dist/frameworks/cdkFrameworkWorker.mjs

@@ -4,56 +4,53 @@ const require = topLevelCreateRequire(import.meta.url);
 import path from 'path';
 
 import { workerData, parentPort } from 'node:worker_threads';
-import fs from 'fs/promises';
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+import fs from 'fs/promises'; // do not delete this line
 
 import { Logger } from '../logger.mjs';
 
 Logger.setVerbose(workerData.verbose);
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const __dirname = path.resolve(
-  path.join(
-    ...[workerData.projectDirname, workerData.subfolder, 'x'].filter((p) => p),
-  ),
-);
 
 Logger.verbose(`[CDK] [Worker] Started`);
 
 parentPort.on('message', async (data) => {
-  // this is global variable to store the data from the CDK code once it is executed
-  global.lambdas = [];
-
-  Logger.verbose(`[Worker ${workerData.workerId}] Received message`, data);
-
-  // execute code to get the data into global.lambdas
-  const codeFile = await fs.readFile(data.compileOutput, 'utf8');
-
-  await fixCdkPaths(workerData.awsCdkLibPath);
-
-  eval(codeFile);
-
-  if (!global.lambdas || global.lambdas?.length === 0) {
-    throw new Error('No Lambda functions found in the CDK code');
+  try {
+    // this is global variable to store the data from the CDK code once it is executed
+    global.lambdas = [];
+
+    Logger.verbose(`[Worker ${workerData.workerId}] Received message`, data);
+
+    // execute code to get the data into global.lambdas
+    await fixCdkPaths(workerData.awsCdkLibPath);
+    await import(data.compileOutput);
+
+    if (!global.lambdas || global.lambdas?.length === 0) {
+      throw new Error('No Lambda functions found in the CDK code');
+    }
+
+    const lambdas = global.lambdas.map((lambda) => ({
+      handler: lambda.handler,
+      stackName: lambda.stackName,
+      codePath: lambda.codePath,
+      code: {
+        path: lambda.code?.path,
+      },
+      cdkPath: lambda.node.defaultChild.node.path,
+      bundling: {
+        ...lambda.bundling,
+        commandHooks: undefined, // can not be serialized
+      },
+    }));
+
+    Logger.verbose(
+      `[CDK] [Worker] Sending found lambdas`,
+      JSON.stringify(lambdas, null, 2),
+    );
+    parentPort.postMessage(lambdas);
+  } catch (error) {
+    Logger.error(`[CDK] [Worker] Error`, error);
+    throw error;
   }
-
-  const lambdas = global.lambdas.map((lambda) => ({
-    handler: lambda.handler,
-    stackName: lambda.stackName,
-    codePath: lambda.codePath,
-    code: {
-      path: lambda.code?.path,
-    },
-    cdkPath: lambda.node.defaultChild.node.path,
-    bundling: {
-      ...lambda.bundling,
-      commandHooks: undefined, // can not be serialized
-    },
-  }));
-
-  Logger.verbose(
-    `[CDK] [Worker] Sending found lambdas`,
-    JSON.stringify(lambdas, null, 2),
-  );
-  parentPort.postMessage(lambdas);
 });
 
 /**
@@ -69,6 +66,24 @@ async function fixCdkPaths(awsCdkLibPath) {
   const pathsFix = {
     'custom-resource-handlers/': `${awsCdkLibPath}/custom-resource-handlers/`,
     'aws-custom-resource-handler': `${awsCdkLibPath}/custom-resource-handlers/dist/custom-resources/aws-custom-resource-handler`,
+    'auto-delete-objects-handler': `${awsCdkLibPath}/custom-resource-handlers/dist/aws-s3/auto-delete-objects-handler`,
+    'notifications-resource-handler': `${awsCdkLibPath}/custom-resource-handlers/dist/aws-s3/notifications-resource-handler`,
+    'drop-spam-handler': `${awsCdkLibPath}/custom-resource-handlers/dist/aws-ses/drop-spam-handler`,
+    'aws-stepfunctions-tasks/role-policy-handler': `${awsCdkLibPath}/custom-resource-handlers/dist/aws-stepfunctions-tasks/role-policy-handler`,
+    'eval-nodejs-handler': `${awsCdkLibPath}/custom-resource-handlers/dist/aws-stepfunctions-tasks/eval-nodejs-handler`,
+    'cross-account-zone-delegation-handler': `${awsCdkLibPath}/custom-resource-handlers/dist/aws-route53/cross-account-zone-delegation-handler`,
+    'delete-existing-record-set-handler': `${awsCdkLibPath}/custom-resource-handlers/dist/aws-route53/delete-existing-record-set-handler`,
+    'aws-api-handler': `${awsCdkLibPath}/custom-resource-handlers/dist/aws-events-targets/aws-api-handler`,
+    'log-retention-handler': `${awsCdkLibPath}/custom-resource-handlers/dist/aws-logs/log-retention-handler`,
+    'cluster-resource-handler': `${awsCdkLibPath}/custom-resource-handlers/dist/aws-eks/cluster-resource-handler`,
+    'auto-delete-images-handler': `${awsCdkLibPath}/custom-resource-handlers/dist/aws-ecr/auto-delete-images-handler`,
+    'bucket-deployment-handler': `${awsCdkLibPath}/custom-resource-handlers/dist/aws-s3-deployment/bucket-deployment-handler`,
+    'nodejs-entrypoint-handler': `${awsCdkLibPath}/custom-resource-handlers/dist/core/nodejs-entrypoint-handler`,
+    'restrict-default-security-group-handler': `${awsCdkLibPath}/custom-resource-handlers/dist/aws-ec2/restrict-default-security-group-handler`,
+    'dns-validated-certificate-handler': `${awsCdkLibPath}/custom-resource-handlers/dist/aws-certificatemanager/dns-validated-certificate-handler`,
+    'auto-delete-underlying-resources-handler': `${awsCdkLibPath}/custom-resource-handlers/dist/aws-synthetics/auto-delete-underlying-resources-handler`,
+    'replica-handler': `${awsCdkLibPath}/custom-resource-handlers/dist/aws-dynamodb/replica-handler`,
+    'oidc-handler': `${awsCdkLibPath}/custom-resource-handlers/dist/aws-iam/oidc-handler`,
   };
 
   // Create a proxy to intercept calls to the path module so we can fix paths
@@ -93,6 +108,23 @@ async function fixCdkPaths(awsCdkLibPath) {
 
             return resolvedPath;
           }
+          if (prop === 'join') {
+            let resolvedPath = target[prop].apply(target, args);
+
+            for (const [key, value] of Object.entries(pathsFix)) {
+              if (resolvedPath.includes(key)) {
+                // replace the beginning of the path with the value
+                const i = resolvedPath.indexOf(key);
+                const newResolvedPath = `${value}${resolvedPath.substring(i + key.length)}`;
+                Logger.verbose(
+                  `[CDK] [Worker] Fixing path ${resolvedPath} -> ${newResolvedPath}`,
+                );
+                resolvedPath = newResolvedPath;
+              }
+            }
+
+            return resolvedPath;
+          }
           return target[prop].apply(target, args);
         };
       }
@@ -105,3 +137,7 @@ async function fixCdkPaths(awsCdkLibPath) {
     exports: pathProxy,
   };
 }
+
+process.on('unhandledRejection', (error) => {
+  Logger.error(`[CDK] [Worker] Unhandled Rejection`, error);
+});

package/dist/nodeWorker.mjs

@@ -71,7 +71,7 @@ function startWorker(input) {
         Logger.log(`[Function ${input.functionId}]`, data.toString());
     });
     worker.stderr.on('data', (data) => {
-        Logger.log(`[Function ${input.functionId}]`, data.toString());
+        Logger.error(`[Function ${input.functionId}]`, data.toString());
     });
     worker.on('exit', () => {
         Logger.verbose(`[Function ${input.functionId}] [Worker ${input.workerId}] Worker exited`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lambda-live-debugger",
-  "version": "1.0.0",
+  "version": "1.0.3",
   "type": "module",
   "description": "Debug Lambda functions locally like it is running in the cloud",
   "repository": {
@@ -49,6 +49,8 @@
     "test": "npm run build && RUN_TEST_FROM_CLI=true vitest run && RUN_TEST_FROM_CLI=true OBSERVABLE_MODE=true vitest run",
     "test-cdk-basic": "npm run build && RUN_TEST_FROM_CLI=true vitest run test/cdk-basic.test.ts",
     "test-cdk-basic-observable": "npm run build && RUN_TEST_FROM_CLI=true OBSERVABLE_MODE=true vitest run test/cdk-basic.test.ts",
+    "test-cdk-esm": "npm run build && RUN_TEST_FROM_CLI=true vitest run test/cdk-esm.test.ts",
+    "test-cdk-esm-observable": "npm run build && RUN_TEST_FROM_CLI=true OBSERVABLE_MODE=true vitest run test/cdk-esm.test.ts",
     "test-sls-basic": "npm run build && RUN_TEST_FROM_CLI=true vitest run test/sls-basic.test.ts",
     "test-sls-basic-observable": "npm run build && RUN_TEST_FROM_CLI=true OBSERVABLE_MODE=true vitest run test/sls-basic.test.ts",
     "test-sls-esbuild-cjs": "npm run build && RUN_TEST_FROM_CLI=true vitest run test/sls-esbuild-cjs.test.ts",
@@ -130,6 +132,7 @@
     "src/extension/*",
     "test",
     "test/cdk-basic",
+    "test/cdk-esm",
     "test/cdk-config",
     "test/sls-basic",
     "test/sls-esbuild",