lambda-live-debugger 1.1.3 → 1.2.1

package/dist/infraDeploy.mjs

@@ -11,6 +11,7 @@ let lambdaClient;
 let iamClient;
 const inlinePolicyName = 'LambdaLiveDebuggerPolicy';
 const layerName = 'LambdaLiveDebugger';
+const lldWrapperPath = '/opt/lld-wrapper';
 /**
  * Policy document to attach to the Lambda role
  */
@@ -217,7 +218,14 @@ async function removeLayerFromLambda(functionName) {
         else {
             Logger.verbose(`Skipping detaching layer from the function ${functionName}, no layer attached`);
         }
-        const ddlEnvironmentVariables = getEnvironmentVarablesForDebugger('xxx', 0);
+        const initalExecWraper = environmentVariables.LLD_INITIAL_AWS_LAMBDA_EXEC_WRAPPER;
+        const ddlEnvironmentVariables = getEnvironmentVarablesForDebugger({
+            // set dummy data, so we just get the list of environment variables
+            functionId: 'xxx',
+            timeout: 0,
+            verbose: true,
+            initalExecWraper: 'test',
+        });
         // check if environment variables are set for each property
         for (const [key] of Object.entries(ddlEnvironmentVariables)) {
             if (environmentVariables && environmentVariables[key]) {
@@ -231,9 +239,22 @@ async function removeLayerFromLambda(functionName) {
             //remove environment variables
             for (const [key] of Object.entries(ddlEnvironmentVariables)) {
                 if (environmentVariables && environmentVariables[key]) {
-                    delete environmentVariables[key];
+                    if (key === 'AWS_LAMBDA_EXEC_WRAPPER') {
+                        if (environmentVariables[key] === lldWrapperPath) {
+                            delete environmentVariables[key];
+                        }
+                        else {
+                            // do not remove the original AWS_LAMBDA_EXEC_WRAPPER that was set before LLD
+                        }
+                    }
+                    else {
+                        delete environmentVariables[key];
+                    }
                 }
             }
+            if (initalExecWraper) {
+                environmentVariables.AWS_LAMBDA_EXEC_WRAPPER = initalExecWraper;
+            }
             Logger.verbose('New environment variables', JSON.stringify(environmentVariables, null, 2));
             const updateFunctionConfigurationCommand = new UpdateFunctionConfigurationCommand({
                 FunctionName: functionName,
@@ -314,7 +335,19 @@ async function attachLayerToLambda(functionName, functionId, layerArn) {
         needToUpdate = true;
         Logger.verbose('Layer with the wrong version attached to the function');
     }
-    const ddlEnvironmentVariables = getEnvironmentVarablesForDebugger(functionId, initialTimeout);
+    // support for multiple internal Lambda extensions
+    const initalExecWraper = environmentVariables.AWS_LAMBDA_EXEC_WRAPPER !== lldWrapperPath
+        ? environmentVariables.AWS_LAMBDA_EXEC_WRAPPER
+        : undefined;
+    if (initalExecWraper) {
+        Logger.warn(`[Function ${functionName}] Another internal Lambda extension is already attached to the function, which might cause unpredictable behavior.`);
+    }
+    const ddlEnvironmentVariables = getEnvironmentVarablesForDebugger({
+        functionId,
+        timeout: initialTimeout,
+        verbose: Configuration.config.verbose,
+        initalExecWraper,
+    });
     // check if environment variables are already set for each property
     for (const [key, value] of Object.entries(ddlEnvironmentVariables)) {
         if (!environmentVariables || environmentVariables[key] !== value) {
@@ -386,20 +419,23 @@ async function addPolicyToLambdaRole(functionName) {
 }
 /**
  * Get the environment variables for the Lambda function
- * @param functionId
- * @param timeout
- * @returns
  */
-function getEnvironmentVarablesForDebugger(functionId, timeout) {
-    return {
+function getEnvironmentVarablesForDebugger({ functionId, timeout, verbose, initalExecWraper, }) {
+    const env = {
         LLD_FUNCTION_ID: functionId,
-        AWS_LAMBDA_EXEC_WRAPPER: '/opt/lld-wrapper',
-        NODE_OPTIONS: '--enable-source-maps',
+        AWS_LAMBDA_EXEC_WRAPPER: lldWrapperPath,
         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',
         LLD_OBSERVABLE_INTERVAL: Configuration.config.interval.toString(),
     };
+    if (initalExecWraper) {
+        env.LLD_INITIAL_AWS_LAMBDA_EXEC_WRAPPER = initalExecWraper;
+    }
+    if (verbose) {
+        env.LLD_VERBOSE = 'true';
+    }
+    return env;
 }
 /**
  * Remove the policy from the Lambda role

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/logger.d.ts

@@ -28,6 +28,11 @@ declare function verbose(...args: any[]): void;
  * @param enabled Whether verbose logging should be enabled
  */
 declare function setVerbose(enabled: boolean): void;
+/**
+ * Check if verbose logging is enabled
+ * @returns Whether verbose logging is enabled
+ */
+declare function isVerbose(): boolean;
 export declare const Logger: {
     log: typeof log;
     error: typeof error;
@@ -35,5 +40,6 @@ export declare const Logger: {
     important: typeof important;
     verbose: typeof verbose;
     setVerbose: typeof setVerbose;
+    isVerbose: typeof isVerbose;
 };
 export {};

package/dist/logger.mjs

@@ -55,6 +55,13 @@ function verbose(...args) {
 function setVerbose(enabled) {
     verboseEnabled = enabled;
 }
+/**
+ * Check if verbose logging is enabled
+ * @returns Whether verbose logging is enabled
+ */
+function isVerbose() {
+    return verboseEnabled;
+}
 export const Logger = {
     log,
     error,
@@ -62,4 +69,5 @@ export const Logger = {
     important,
     verbose,
     setVerbose,
+    isVerbose,
 };

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.3",
+  "version": "1.2.1",
   "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",