lambda-live-debugger 1.1.2 → 1.2.0

package/.vitepress/config.mts

@@ -74,10 +74,10 @@ export default defineConfig({
           { text: 'CLI Parameters', link: '#cli-parameters' },
           { text: 'Configuration file', link: '#configuration-file' },
           { text: 'Debugging', link: '#debugging' },
+          { text: 'Removing', link: '#removing' },
           { text: 'Development Process', link: '#development-process' },
           { text: 'Observability Mode', link: '#observability-mode' },
           { text: 'Monorepo', link: '#monorepo-setup' },
-          { text: 'Removing', link: '#removing' },
         ],
       },
       {

package/README.md

@@ -167,21 +167,9 @@ Now, you have to press F5 or press Run -> Start Debugging, and you can set break
 
 For other tools, please send documentation to include here. WebStorm instructions are especially needed.
 
-## Development Process
-
-Since you deploy code to a real AWS account, it's best to have a dedicated environment only for yourself. It could be your personal environment or an environment created for a feature. That is [common practice when developing serverless systems](https://theburningmonk.com/2019/09/why-you-should-use-temporary-stacks-when-you-do-serverless/). If that's not feasible due to organizational or technical reasons, use Observability Mode.
-
-## Observability Mode
-
-In Observability Mode, Lambda Live Debugger intercepts requests and sends them to your computer without waiting for a response. The Lambda continues as usual. The response from your machine is ignored. This mode can be used in the development, testing, or even, if you are adventurous, production environment. It samples requests every 3 seconds by default (configurable with an `interval` setting) to avoid overloading the system.
-
-## Monorepo Setup
-
-Set the `subfolder` parameter if your framework is in a subfolder.
-
 ## Removing
 
-To remove Lambda Live Debugger from your AWS account
+When you no longer want to debug and want Lambda to execute the code deployed to the cloud, you need to remove the Lambda Live Debugger:
 
 ```
 lld -r
@@ -195,6 +183,18 @@ To also remove the Layer:
 lld -r=all
 ```
 
+## Development Process
+
+Since you deploy code to a real AWS account, it's best to have a dedicated environment only for yourself. It could be your personal environment or an environment created for a feature. That is [common practice when developing serverless systems](https://theburningmonk.com/2019/09/why-you-should-use-temporary-stacks-when-you-do-serverless/). If that's not feasible due to organizational or technical reasons, use Observability Mode.
+
+## Observability Mode
+
+In Observability Mode, Lambda Live Debugger intercepts requests and sends them to your computer without waiting for a response. The Lambda continues as usual. The response from your machine is ignored. This mode can be used in the development, testing, or even, if you are adventurous, production environment. It samples requests every 3 seconds by default (configurable with an `interval` setting) to avoid overloading the system.
+
+## Monorepo Setup
+
+Set the `subfolder` parameter if your framework is in a subfolder.
+
 ## Frameworks
 
 ### AWS CDK v2

package/dist/frameworks/slsFramework.d.ts

@@ -21,6 +21,6 @@ export declare class SlsFramework implements IFramework {
      * @returns Lambda functions
      */
     getLambdas(config: LldConfigBase): Promise<LambdaResource[]>;
-    protected getEsBuildOptions(serverless: Serverless): EsBuildOptions | undefined;
+    protected getEsBuildOptions(serverless: Serverless, config: LldConfigBase): EsBuildOptions | undefined;
 }
 export declare const slsFramework: SlsFramework;

package/dist/frameworks/slsFramework.mjs

@@ -47,6 +47,9 @@ export class SlsFramework {
         process.argv = [];
         let resolveConfigurationPath;
         let readConfiguration;
+        let resolveVariables;
+        let resolveVariablesMeta;
+        let sources;
         let Serverless;
         try {
             // lazy load modules
@@ -56,11 +59,43 @@ export class SlsFramework {
             readConfiguration = (await import(
             //@ts-ignore
             'serverless/lib/configuration/read.js')).default;
+            resolveVariables = (await import(
+            //@ts-ignore
+            'serverless/lib/configuration/variables/resolve.js')).default;
+            resolveVariablesMeta = (await import(
+            //@ts-ignore
+            'serverless/lib/configuration/variables/resolve-meta.js')).default;
+            const env = await import(
+            //@ts-ignore
+            'serverless/lib/configuration/variables/sources/env.js');
+            const file = await import(
+            //@ts-ignore
+            'serverless/lib/configuration/variables/sources/file.js');
+            const opt = await import(
+            //@ts-ignore
+            'serverless/lib/configuration/variables/sources/opt.js');
+            const self = await import(
+            //@ts-ignore
+            'serverless/lib/configuration/variables/sources/self.js');
+            const strToBool = await import(
+            //@ts-ignore
+            'serverless/lib/configuration/variables/sources/str-to-bool.js');
+            const sls = await import(
+            //@ts-ignores
+            'serverless/lib/configuration/variables/sources/instance-dependent/get-sls.js');
+            sources = {
+                env: env.default,
+                file: file.default,
+                opt: opt.default,
+                self: self.default,
+                strToBool: strToBool.default,
+                sls: sls.default(),
+            };
             Serverless = (await import('serverless')).default;
         }
         catch (error) {
             Logger.error('Error loading serverless modules', error);
-            Logger.log('If you are running Lambda Live Debugger from a global installation, install Serverless Framework globally as well.');
+            Logger.log('If you are running Lambda Live Debugger from a global installation, install Serverless Framework globally as well. If you are using monorepo, install Serverless Framework also in the project root folder.');
             throw new Error(`Error loading serverless modules. ${error.message}`, {
                 cause: error,
             });
@@ -83,7 +118,15 @@ export class SlsFramework {
         if (config.profile) {
             options.profile = config.profile;
         }
-        const variablesMeta = {};
+        const variablesMeta = resolveVariablesMeta(configuration);
+        await resolveVariables({
+            serviceDir,
+            configuration,
+            variablesMeta,
+            sources,
+            options,
+            fulfilledSources: new Set(),
+        });
         let serverless;
         try {
             serverless = new Serverless({
@@ -117,7 +160,7 @@ export class SlsFramework {
             });
         }
         const lambdasDiscovered = [];
-        const esBuildOptions = this.getEsBuildOptions(serverless);
+        const esBuildOptions = this.getEsBuildOptions(serverless, config);
         const lambdas = serverless.service.functions;
         Logger.verbose(`[SLS] Found Lambdas:`, JSON.stringify(lambdas, null, 2));
         for (const func in lambdas) {
@@ -165,7 +208,8 @@ export class SlsFramework {
         }
         return lambdasDiscovered;
     }
-    getEsBuildOptions(serverless) {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    getEsBuildOptions(serverless, config) {
         // 1) Get from from LLD specific options in custom.lldEsBuild
         let esBuildOptions = serverless.service.custom?.lldEsBuild;
         // 2) Get from serverless-esbuild plugin
@@ -189,7 +233,7 @@ export class SlsFramework {
                 const settings = serverless.service.custom?.serverlessPluginTypescript;
                 if (settings) {
                     esBuildOptions = {
-                        tsconfig: settings.tsConfigFileLocation,
+                        tsconfig: path.resolve(settings.tsConfigFileLocation),
                     };
                 }
             }

package/dist/infraDeploy.mjs

@@ -394,7 +394,6 @@ function getEnvironmentVarablesForDebugger(functionId, timeout) {
     return {
         LLD_FUNCTION_ID: functionId,
         AWS_LAMBDA_EXEC_WRAPPER: '/opt/lld-wrapper',
-        NODE_OPTIONS: '--enable-source-maps',
         LLD_DEBUGGER_ID: Configuration.config.debuggerId,
         LLD_INITIAL_TIMEOUT: timeout ? timeout.toString() : '-1', // should never be negative
         LLD_OBSERVABLE_MODE: Configuration.config.observable ? 'true' : 'false',

package/dist/lldebugger.mjs

@@ -80,4 +80,4 @@ async function run() {
     await LambdaConnection.connect();
     Logger.log('Debugger started!');
 }
-run().catch(Logger.error);
+run().catch(Logger.error);

package/dist/nodeWorker.mjs

@@ -14,12 +14,14 @@ async function runInWorker(input) {
     return new Promise((resolve, reject) => {
         let worker = workers.get(input.fuctionRequest.workerId);
         if (!worker) {
+            const environment = input.environment;
+            addEnableSourceMapsToEnv(environment);
             worker = startWorker({
                 handler: func.handler ?? 'handler',
                 artifactFile: input.artifactFile,
                 workerId: input.fuctionRequest.workerId,
                 functionId: input.fuctionRequest.functionId,
-                environment: input.environment,
+                environment,
                 verbose: Configuration.config.verbose,
             });
             worker.used = false;
@@ -54,6 +56,17 @@ async function runInWorker(input) {
         });
     });
 }
+/**
+ * Add NODE_OPTIONS: --enable-source-maps to the environment variables
+ * @param environment
+ */
+function addEnableSourceMapsToEnv(environment) {
+    const nodeOptions = environment.NODE_OPTIONS || '';
+    if (!nodeOptions.includes('--enable-source-maps')) {
+        environment.NODE_OPTIONS =
+            nodeOptions + (nodeOptions ? ' ' : '') + '--enable-source-maps';
+    }
+}
 /**
  * Start a new Node.js Worker Thread
  * @param input

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lambda-live-debugger",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "type": "module",
   "description": "Debug Lambda functions locally like it is running in the cloud",
   "repository": {
@@ -41,7 +41,7 @@
     "lint": "eslint . --fix",
     "prettier": "prettier . --write",
     "prepare": "husky",
-    "add-bang": "sed -i '1s|^|#!/usr/bin/env node\\n|' ./dist/lldebugger.mjs",
+    "add-bang": "printf '#!/usr/bin/env node\\n%s' \"$(cat ./dist/lldebugger.mjs)\" > ./dist/lldebugger.mjs.tmp && mv ./dist/lldebugger.mjs.tmp ./dist/lldebugger.mjs",
     "build": "tsc -p tsconfig.build.json && cp src/nodeWorkerRunner.mjs dist && cp src/frameworks/cdkFrameworkWorker.mjs dist/frameworks && node fix-imports.js && npm run add-bang && npm run bundle-extension",
     "bundle-extension": "cd src/extension && npm run build && cd ../../",
     "deploy-github-role": "aws cloudformation deploy --stack-name lld-deploy-role --template-file cloudformation/gitHubDeployRole.yaml --capabilities CAPABILITY_IAM CAPABILITY_NAMED_IAM --profile lldebugger",